Update to 26.1-snapshot-3

Author: Pyrofab

build.gradle.kts

@@ -4,16 +4,16 @@ import net.fabricmc.loom.task.RemapJarTask
 import java.net.URI
 
 plugins {
-    id("fabric-loom") version "1.13.3"
-    id("io.github.ladysnake.chenille") version "0.16.1"
+    id("net.fabricmc.fabric-loom") version "1.14-SNAPSHOT"
+    id("io.github.ladysnake.chenille") version "0.18.0-SNAPSHOT"
 }
 
 val fabricApiVersion: String = providers.gradleProperty("fabric_api_version").get()
 
 allprojects {
     apply(plugin = "java-library")
     apply(plugin = "maven-publish")
-    apply(plugin = "fabric-loom")
+    apply(plugin = "net.fabricmc.fabric-loom")
     apply(plugin = "io.github.ladysnake.chenille")
 
     chenille {
@@ -62,20 +62,21 @@ allprojects {
             name = "JitPack"
             url = URI("https://jitpack.io")
         }
+        mavenLocal()
     }
 
     dependencies {
         val props = project.properties
         minecraft("com.mojang:minecraft:${props["minecraft_version"]}")
-        mappings("net.fabricmc:yarn:${props["minecraft_version"]}+build.${props["yarn_mappings"]}:v2")
-        modApi("net.fabricmc:fabric-loader:${props["loader_version"]}")
-        modApi(fabricApi.module("fabric-api-base", fabricApiVersion))
-        modImplementation(fabricApi.module("fabric-entity-events-v1", fabricApiVersion))
-        modImplementation(fabricApi.module("fabric-networking-api-v1", fabricApiVersion))
-        modImplementation(fabricApi.module("fabric-lifecycle-events-v1", fabricApiVersion))
+//        mappings("net.fabricmc:yarn:${props["minecraft_version"]}+build.${props["yarn_mappings"]}:v2")
+        api("net.fabricmc:fabric-loader:${props["loader_version"]}")
+        api(fabricApi.module("fabric-api-base", fabricApiVersion))
+        implementation(fabricApi.module("fabric-entity-events-v1", fabricApiVersion))
+        implementation(fabricApi.module("fabric-networking-api-v1", fabricApiVersion))
+        implementation(fabricApi.module("fabric-lifecycle-events-v1", fabricApiVersion))
 
-        modCompileOnly(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
-        modLocalImplementation("org.ladysnake:elmendorf:${props["elmendorf_version"]}")
+        compileOnly(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
+        localImplementation("org.ladysnake:elmendorf:${props["elmendorf_version"]}")
 
         compileOnly("com.google.code.findbugs:jsr305:3.0.2")
         compileOnly("org.jetbrains:annotations:24.0.1")
@@ -212,45 +213,43 @@ subprojects {
     }
 }
 
-val remapMavenJar by tasks.registering(RemapJarTask::class) {
-    inputFile.set(tasks.jar.flatMap { it.archiveFile })
-    archiveFileName.set("${project.properties["archivesBaseName"]}-${project.version}-maven.jar")
-    addNestedDependencies = false
-    dependsOn(tasks.jar)
-}
-tasks.assemble.configure {
-    dependsOn(remapMavenJar)
-}
-
-extensions.configure(PublishingExtension::class.java) {
-    publications {
-        val mavenJava by creating(MavenPublication::class) {
-            artifact(remapMavenJar) {
-                builtBy(remapMavenJar)
-            }
-
-            artifact(tasks.named("sourcesJar")) {
-                builtBy(tasks.remapSourcesJar)
-            }
-
-            artifact(tasks.named("javadocJar"))
-
-            pom.withXml {
-                val depsNode = asNode().appendNode("dependencies")
-                subprojects.forEach {
-                    val depNode = depsNode.appendNode("dependency")
-                    depNode.appendNode("groupId", it.group)
-                    depNode.appendNode("artifactId", it.name)
-                    depNode.appendNode("version", it.version)
-                    depNode.appendNode("scope", "compile")
-                }
-            }
-        }
-        // Required until the deprecation is removed. CCA's main jar that is published to maven does not contain sub modules.
-        @Suppress("UnstableApiUsage")
-        loom.disableDeprecatedPomGeneration(mavenJava)
-    }
-}
+//val remapMavenJar by tasks.registering(RemapJarTask::class) {
+//    inputFile.set(tasks.jar.flatMap { it.archiveFile })
+//    archiveFileName.set("${project.properties["archivesBaseName"]}-${project.version}-maven.jar")
+//    addNestedDependencies = false
+//    dependsOn(tasks.jar)
+//}
+//tasks.assemble.configure {
+//    dependsOn(remapMavenJar)
+//}
+//
+//extensions.configure(PublishingExtension::class.java) {
+//    publications {
+//        val mavenJava by creating(MavenPublication::class) {
+//            artifact(remapMavenJar) {
+//                builtBy(remapMavenJar)
+//            }
+//
+//            artifact(tasks.named("sourcesJar"))
+//
+//            artifact(tasks.named("javadocJar"))
+//
+//            pom.withXml {
+//                val depsNode = asNode().appendNode("dependencies")
+//                subprojects.forEach {
+//                    val depNode = depsNode.appendNode("dependency")
+//                    depNode.appendNode("groupId", it.group)
+//                    depNode.appendNode("artifactId", it.name)
+//                    depNode.appendNode("version", it.version)
+//                    depNode.appendNode("scope", "compile")
+//                }
+//            }
+//        }
+//        // Required until the deprecation is removed. CCA's main jar that is published to maven does not contain sub modules.
+//        @Suppress("UnstableApiUsage")
+//        loom.disableDeprecatedPomGeneration(mavenJava)
+//    }
+//}
 
 chenille {
     configureTestmod {
@@ -268,33 +267,29 @@ extensions.configure(GithubReleaseExtension::class.java) {
     owner = providers.gradleProperty("owners")
 }
 
-subprojects.forEach { tasks.remapJar.configure { dependsOn("${it.path}:remapJar") } }
-
 dependencies {
     // used by the test mod
-    modImplementation(fabricApi.module("fabric-api-base", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-object-builder-api-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-rendering-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-lifecycle-events-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-item-api-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-item-group-api-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-events-interaction-v0", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-api-lookup-api-v1", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-command-api-v2", fabricApiVersion))
-    modImplementation(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
-    modRuntimeOnly(fabricApi.module("fabric-networking-api-v1", fabricApiVersion))
-    modRuntimeOnly(fabricApi.module("fabric-resource-loader-v0", fabricApiVersion))
-    modRuntimeOnly(fabricApi.module("fabric-events-interaction-v0", fabricApiVersion))
-    modRuntimeOnly(fabricApi.module("fabric-registry-sync-v0", fabricApiVersion))
+    implementation(fabricApi.module("fabric-api-base", fabricApiVersion))
+    implementation(fabricApi.module("fabric-object-builder-api-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-rendering-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-lifecycle-events-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-item-api-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-creative-tab-api-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-events-interaction-v0", fabricApiVersion))
+    implementation(fabricApi.module("fabric-api-lookup-api-v1", fabricApiVersion))
+    implementation(fabricApi.module("fabric-command-api-v2", fabricApiVersion))
+    implementation(fabricApi.module("fabric-gametest-api-v1", fabricApiVersion))
+    runtimeOnly(fabricApi.module("fabric-networking-api-v1", fabricApiVersion))
+    runtimeOnly(fabricApi.module("fabric-resource-loader-v0", fabricApiVersion))
+    runtimeOnly(fabricApi.module("fabric-events-interaction-v0", fabricApiVersion))
+    runtimeOnly(fabricApi.module("fabric-registry-sync-v0", fabricApiVersion))
 
     testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
 
-    afterEvaluate {
-        subprojects.forEach {
-            api(project(path = ":${it.name}", configuration = "namedElements"))
-            include(project("${it.name}:"))
-            "testmodImplementation"(project("${it.name}:").sourceSets["testmod"].output)
-        }
+    subprojects.forEach {
+        api(project(":${it.name}"))
+        include(project("${it.name}:"))
+        "testmodImplementation"(it.sourceSets["testmod"].output)
     }
 }
 

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentKey.java

@@ -28,9 +28,8 @@
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
+import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
@@ -44,6 +43,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import static net.minecraft.network.chat.Component.literal;
+
 /**
  * A key for retrieving {@link Component} instances from component providers.
  *
@@ -210,7 +211,7 @@ public void syncWith(ServerPlayer player, ComponentProvider provider, ComponentP
                 } else {
                     if (predicate.isRequiredOnClient()) {
                         String specificMod = FabricLoader.getInstance().getModContainer(this.id.getNamespace()).map(c -> c.getMetadata().getName() + " and ").orElse("");
-                        player.connection.disconnect(Component.literal(
+                        player.connection.disconnect(literal(
                             "This server requires " + specificMod + "Cardinal Components API " +
                                 "(unhandled packet: " + payload.type().id() + ")" +
                                 ComponentsInternals.getClientOptionalModAdvice()));

cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/CcaClientInternals.java

@@ -24,13 +24,15 @@
 
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.network.DisconnectionDetails;
-import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
 
+import static net.minecraft.network.chat.Component.literal;
+
 public final class CcaClientInternals {
     public static <T extends ComponentUpdatePayload<?>> void registerComponentSync(CustomPacketPayload.Type<T> packetId, BiFunction<T, ClientPlayNetworking.Context, Optional<? extends Component>> getter) {
         ClientPlayNetworking.registerGlobalReceiver(packetId, (payload, ctx) -> {
@@ -41,7 +43,7 @@ public static <T extends ComponentUpdatePayload<?>> void registerComponentSync(C
                     }
                 });
             } catch (UnknownComponentException e) {
-                ctx.player().connection.onDisconnect(new DisconnectionDetails(Component.literal(
+                ctx.player().connection.onDisconnect(new DisconnectionDetails(literal(
                     e.getMessage() + "\n(you are probably missing a mod installed on the server)" + ComponentsInternals.getClientOptionalModAdvice())
                 ));
             } finally {

cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/ComponentUpdatePayload.java

@@ -24,10 +24,9 @@
 
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload.Type;
 import net.minecraft.resources.Identifier;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.api.v3.component.ComponentRegistry;
@@ -46,7 +45,7 @@ public static <T> CustomPacketPayload.Type<ComponentUpdatePayload<T>> id(String
     }
 
     public static <T> void register(Type<ComponentUpdatePayload<T>> id, StreamCodec<? super RegistryFriendlyByteBuf, T> targetDataCodec) {
-        PayloadTypeRegistry.playS2C().register(id, codec(id, targetDataCodec));
+        PayloadTypeRegistry.clientboundPlay().register(id, codec(id, targetDataCodec));
     }
 
     public static <T> StreamCodec<RegistryFriendlyByteBuf, ComponentUpdatePayload<T>> codec(Type<ComponentUpdatePayload<T>> id, StreamCodec<? super RegistryFriendlyByteBuf, T> targetDataCodec) {

cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/asm/CcaAsmHelper.java

@@ -24,7 +24,6 @@
 
 import it.unimi.dsi.fastutil.objects.ReferenceArraySet;
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -73,7 +72,7 @@ public final class CcaAsmHelper {
     public static final String COMPONENT_CONTAINER = Type.getInternalName(ComponentContainer.class);
     public static final String COMPONENT_TYPE = Type.getInternalName(ComponentKey.class);
     public static final String DYNAMIC_COMPONENT_CONTAINER_IMPL = Type.getInternalName(AbstractComponentContainer.class);
-    public static final String IDENTIFIER = FabricLoader.getInstance().getMappingResolver().mapClassName("intermediary", "net.minecraft.class_2960").replace('.', '/');
+    public static final String IDENTIFIER = "net/minecraft/resources/Identifier";
     public static final String EVENT = Type.getInternalName(Event.class);
     // generated references
     public static final String STATIC_COMPONENT_CONTAINER = createClassName("GeneratedComponentContainer");

cardinal-components-base/src/testmod/java/org/ladysnake/cca/internal/base/ComponentRegistryImplTest.java

@@ -23,22 +23,24 @@
 package org.ladysnake.cca.internal.base;
 
 import net.fabricmc.fabric.api.gametest.v1.GameTest;
-import net.minecraft.world.level.storage.ValueInput;
-import net.minecraft.world.level.storage.ValueOutput;
 import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.test.base.CardinalGameTest;
+import org.ladysnake.elmendorf.ElmendorfTestContext;
+
+import static net.minecraft.network.chat.Component.literal;
 
 public class ComponentRegistryImplTest implements CardinalGameTest {
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     @GameTest
     public void checksRegisteredClasses(GameTestHelper ctx) {
         ComponentRegistryImpl registry = ComponentRegistryImpl.INSTANCE;
-        ctx.assertThrows("Component class must extend Component", IllegalArgumentException.class, () -> registry.getOrCreate(CcaTesting.TEST_ID_1, (Class) TestNotComponentItf.class));
+        ((ElmendorfTestContext) ctx).assertThrows("Component class must extend Component", IllegalArgumentException.class, () -> registry.getOrCreate(CcaTesting.TEST_ID_1, (Class) TestNotComponentItf.class));
         registry.getOrCreate(CcaTesting.TEST_ID_1, TestComponentNotItf.class);
         registry.getOrCreate(CcaTesting.TEST_ID_2, TestComponentItf.class);
     }
@@ -48,10 +50,11 @@ public void doesNotDuplicateComponentTypes(GameTestHelper ctx) {
         ComponentRegistryImpl registry = ComponentRegistryImpl.INSTANCE;
         Identifier id = CcaTesting.TEST_ID_1;
         ComponentKey<?> type = registry.getOrCreate(id, TestComponentItf.class);
-        ctx.assertThrows(IllegalStateException.class, () -> registry.getOrCreate(id, TestComponentItf2.class));
-        ctx.assertThrows(IllegalStateException.class, () -> registry.getOrCreate(id, TestComponentItf3.class));
-        ctx.assertValueEqual(type, registry.getOrCreate(id, TestComponentItf.class), Component.literal("component key"));
-        ctx.assertValueEqual(1L, registry.stream().map(ComponentKey::getId).filter(CcaTesting.ALL_TEST_IDS::contains).count(), Component.literal("number of registrations"));
+        var elmendorfCtx = ((ElmendorfTestContext) ctx);
+        elmendorfCtx.assertThrows(IllegalStateException.class, () -> registry.getOrCreate(id, TestComponentItf2.class));
+        elmendorfCtx.assertThrows(IllegalStateException.class, () -> registry.getOrCreate(id, TestComponentItf3.class));
+        ctx.assertValueEqual(type, registry.getOrCreate(id, TestComponentItf.class), literal("component key"));
+        ctx.assertValueEqual(1L, registry.stream().map(ComponentKey::getId).filter(CcaTesting.ALL_TEST_IDS::contains).count(), literal("number of registrations"));
     }
 
     @Override