26.1 support (#123)

* feat: initial 26.1 support

* chore: change fabric-loom to quiet-fabric-loom

* chore: remove cloud-minecraft-modded-common-fabric-repack

Author: toxicity188

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
               uses: actions/setup-java@v5
               with:
                   distribution: 'temurin'
-                  java-version: 21
+                  java-version: 25
             - uses: gradle/actions/setup-gradle@v5
               # gradle-build-action doesn't support caching files in the project dir
             - uses: actions/cache@v5

cloud-fabric/build.gradle.kts

@@ -3,7 +3,7 @@ import net.fabricmc.loom.task.AbstractRunTask
 plugins {
     id("conventions.base")
     id("conventions.publishing")
-    id("quiet-fabric-loom")
+    id("xyz.jpenilla.quiet-fabric-loom")
 }
 
 configurations {
@@ -17,25 +17,12 @@ configurations {
 
         exclude("org.checkerframework")
         exclude("org.apiguardian")
-        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
-    }
-    runtimeClasspath {
-        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
-    }
-    compileClasspath {
-        exclude("org.incendo", "cloud-minecraft-modded-common-fabric-repack")
     }
 }
 
 dependencies {
     minecraft(libs.minecraft)
-    mappings(
-        loom.layered {
-            officialMojangMappings()
-            parchment(property("neoForge.parchment.parchmentArtifact")!!)
-        }
-    )
-    modImplementation(libs.fabricLoader)
+    implementation(libs.fabricLoader)
 
     api(platform(libs.cloud.bom))
     api(libs.cloud.core)
@@ -45,18 +32,16 @@ dependencies {
     compileOnly(libs.cloud.minecraft.signed.arguments)
 
     offlineLinkedJavadoc(project(":cloud-minecraft-modded-common"))
-    localRuntime(project(":cloud-minecraft-modded-common"))
-    compileOnly(project(":cloud-minecraft-modded-common"))
-    api(project(":cloud-minecraft-modded-common-fabric-repack", configuration = "namedElements"))
-    include(project(":cloud-minecraft-modded-common-fabric-repack"))
-
-    modImplementation(platform(fabricApiLibs.bom))
-    modImplementation(fabricApiLibs.command.api.v2)
-    modImplementation(fabricApiLibs.networking.api.v1)
-    modImplementation(fabricApiLibs.lifecycle.events.v1)
-
-    modCompileOnly(libs.fabricPermissionsApi)
-    modLocalRuntime(libs.fabricPermissionsApi)
+    api(project(":cloud-minecraft-modded-common"))
+    include(project(":cloud-minecraft-modded-common"))
+
+    implementation(platform(fabricApiLibs.bom))
+    implementation(fabricApiLibs.command.api.v2)
+    implementation(fabricApiLibs.networking.api.v1)
+    implementation(fabricApiLibs.lifecycle.events.v1)
+
+    compileOnly(libs.fabricPermissionsApi)
+    localRuntime(libs.fabricPermissionsApi)
 }
 
 tasks {
@@ -97,14 +82,10 @@ val testmod: SourceSet by sourceSets.creating {
     dependencies.add(implementationConfigurationName, main.output)
 }
 
-loom {
-    createRemapConfigurations(testmod)
-}
-
 dependencies {
     localRuntime(libs.cloud.minecraft.signed.arguments)
-    modLocalRuntime(libs.adventureFabric)
-    "modTestmodImplementation"(libs.adventureFabric)
+    localRuntime(libs.adventureFabric)
+    "testmodImplementation"(libs.adventureFabric)
     "testmodImplementation"(libs.cloud.minecraft.extras)
     localRuntime(libs.cloud.minecraft.extras)
 }

cloud-fabric/common-repack/build.gradle.kts

@@ -28,8 +28,8 @@
 import com.mojang.brigadier.tree.RootCommandNode;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -90,7 +90,7 @@ public boolean registerCommand(final @NonNull Command<C> command) {
                 if (connection == null) {
                     throw new IllegalStateException("Expected connection to be present but it wasn't!");
                 }
-                final CommandDispatcher<FabricClientCommandSource> dispatcher = ClientCommandManager.getActiveDispatcher();
+                final CommandDispatcher<FabricClientCommandSource> dispatcher = ClientCommands.getActiveDispatcher();
                 if (dispatcher == null) {
                     throw new IllegalStateException("Expected an active dispatcher!");
                 }

cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricCommandRegistrationHandler.java

@@ -25,10 +25,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.18.2",
+    "fabricloader": ">=0.18.5",
     "fabric-command-api-v2": "*",
     "fabric-networking-api-v1": "*",
     "fabric-lifecycle-events-v1": "*",
-    "minecraft": ">=1.21.11"
+    "minecraft": ">=26.1"
   }
 }

cloud-fabric/src/main/resources/fabric.mod.json

@@ -121,7 +121,7 @@ public void onInitializeClient() {
                 .handler(ctx -> {
                     try {
                         ctx.sender().sendFeedback(
-                                ctx.<ItemInput>get("item").createItemStack(1, false).getDisplayName()
+                                ctx.<ItemInput>get("item").createItemStack(1).getDisplayName()
                         );
                     } catch (final CommandSyntaxException ex) {
                         ctx.sender().sendError(ComponentUtils.fromMessage(ex.getRawMessage()));

cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java

@@ -234,11 +234,11 @@ private static <C, S> void registerRegistryEntryMappings(
             }
 
             final Type generic = field.getGenericType(); /* RegistryKey<? extends Registry<?>> */
-            if (!(generic instanceof ParameterizedType)) {
+            if (!(generic instanceof ParameterizedType parameterizedType)) {
                 continue;
             }
 
-            Type registryType = ((ParameterizedType) generic).getActualTypeArguments()[0];
+            Type registryType = parameterizedType.getActualTypeArguments()[0];
             while (registryType instanceof WildcardType) {
                 registryType = ((WildcardType) registryType).getUpperBounds()[0];
             }

cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedParserMappings.java

@@ -321,10 +321,10 @@ private interface CommandSyntaxExceptionThrowingParseResultSupplier<O> {
         final @NonNull Function<CommandSourceStack, CompletableFuture<ArgumentParseResult<O>>> resultFunction
     ) {
         final SharedSuggestionProvider nativeSource = context.get(ModdedCommandContextKeys.SHARED_SUGGESTION_PROVIDER);
-        if (!(nativeSource instanceof CommandSourceStack) || isClientSource(nativeSource)) {
+        if (!(nativeSource instanceof CommandSourceStack commandSourceStack) || isClientSource(nativeSource)) {
             return ArgumentParseResult.failureFuture(serverOnly());
         }
-        return resultFunction.apply((CommandSourceStack) nativeSource);
+        return resultFunction.apply(commandSourceStack);
     }
 
     /**

cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/VanillaArgumentParsers.java

@@ -16,14 +16,14 @@ displayTest = "IGNORE_ALL_VERSION"
 [[dependencies.cloud]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21.9,)"
+versionRange = "[26.1,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.cloud]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.11,)"
+versionRange = "[26.1,)"
 ordering = "NONE"
 side = "BOTH"
 

cloud-neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -2,7 +2,7 @@ group=org.incendo
 version=2.0.0-SNAPSHOT
 description=Cloud implementations for modded Minecraft
 
-neoForge.parchment.parchmentArtifact=io.papermc.parchment.data:parchment:1.21.11+build.2
+neoForge.parchment.parchmentArtifact=io.papermc.parchment.data:parchment:1.21.11+build.9
 
 org.gradle.caching=true
 org.gradle.configuration-cache=true