26.1 support (#123)

toxicity188 · web-flow · commit 00a592b99100 · 2026-03-28T18:10:15.000-07:00
* feat: initial 26.1 support

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

* chore: remove cloud-minecraft-modded-common-fabric-repack
diff --git a/.github/workflows/build.yml b/.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
diff --git a/cloud-fabric/build.gradle.kts b/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)
 }
diff --git a/cloud-fabric/common-repack/build.gradle.kts b/cloud-fabric/common-repack/build.gradle.kts
diff --git a/cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricCommandRegistrationHandler.java b/cloud-fabric/src/main/java/org/incendo/cloud/fabric/FabricCommandRegistrationHandler.java
@@ -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!");
                 }
diff --git a/cloud-fabric/src/main/resources/fabric.mod.json b/cloud-fabric/src/main/resources/fabric.mod.json
@@ -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"
   }
 }
diff --git a/cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java b/cloud-fabric/src/testmod/java/org/incendo/cloud/fabric/testmod/FabricClientExample.java
@@ -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()));
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedParserMappings.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/internal/ModdedParserMappings.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];
             }
diff --git a/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/VanillaArgumentParsers.java b/cloud-minecraft-modded-common/src/main/java/org/incendo/cloud/minecraft/modded/parser/VanillaArgumentParsers.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);
     }
 
     /**
diff --git a/cloud-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/cloud-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -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"
 
diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts b/gradle/build-logic/src/main/kotlin/conventions.base.gradle.kts
@@ -17,9 +17,9 @@ tasks {
 indra {
     checkstyle().set(libs.versions.checkstyle)
     javaVersions {
-        target(21)
-        testWith().set(setOf(21))
-        minimumToolchain(21)
+        target(25)
+        testWith().set(setOf(25))
+        minimumToolchain(25)
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,20 +3,20 @@ cloud-build-logic = "0.0.18"
 checkstyle = "10.12.5"
 stylecheck = "0.2.1"
 ktlint = "1.8.0"
-errorprone = "2.27.1"
+errorprone = "2.48.0"
 
 cloud = "2.0.0"
 cloudMinecraft = "2.0.0-beta.14"
 geantyref = "1.3.16"
 
 immutables = "2.12.1"
 
-minecraft = "1.21.11"
-fabricLoader = "0.18.4"
-fabricPermissionsApi = "0.6.1"
-neoforge = "21.11.37-beta"
-neoform = "1.21.11-20251209.172050"
-adventureMod = "6.8.0"
+minecraft = "26.1"
+fabricLoader = "0.18.5"
+fabricPermissionsApi = "0.7.0"
+neoforge = "26.1.0.6-beta"
+neoform = "26.1-1"
+adventureMod = "6.9.0-SNAPSHOT"
 
 [libraries]
 cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "cloud-build-logic" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,7 +16,7 @@ pluginManagement {
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
-    id("quiet-fabric-loom") version "1.15-SNAPSHOT"
+    id("xyz.jpenilla.quiet-fabric-loom-repositories") version "1.15-SNAPSHOT"
     id("net.neoforged.moddev.repositories") version "2.0.140"
 }
 
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("fabricApiLibs") {
-            from("net.fabricmc.fabric-api:fabric-api-catalog:0.141.1+1.21.11")
+            from("net.fabricmc.fabric-api:fabric-api-catalog:0.144.3+26.1")
         }
     }
 }
@@ -43,6 +43,4 @@ rootProject.name = "cloud-minecraft-modded"
 
 include("cloud-minecraft-modded-common")
 include("cloud-fabric")
-include("cloud-fabric/common-repack")
-findProject(":cloud-fabric/common-repack")?.name = "cloud-minecraft-modded-common-fabric-repack"
 include("cloud-neoforge")

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@`
`25`	`25`	`],`
`26`	`26`
`27`	`27`	`"depends": {`
`28`		`- "fabricloader": ">=0.18.2",`
	`28`	`+ "fabricloader": ">=0.18.5",`
`29`	`29`	`"fabric-command-api-v2": "*",`
`30`	`30`	`"fabric-networking-api-v1": "*",`
`31`	`31`	`"fabric-lifecycle-events-v1": "*",`
`32`		`- "minecraft": ">=1.21.11"`
	`32`	`+ "minecraft": ">=26.1"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,11 +234,11 @@ private static <C, S> void registerRegistryEntryMappings(`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`final Type generic = field.getGenericType(); /* RegistryKey<? extends Registry<?>> */`
`237`		`- if (!(generic instanceof ParameterizedType)) {`
	`237`	`+ if (!(generic instanceof ParameterizedType parameterizedType)) {`
`238`	`238`	`continue;`
`239`	`239`	`}`
`240`	`240`
`241`		`- Type registryType = ((ParameterizedType) generic).getActualTypeArguments()[0];`
	`241`	`+ Type registryType = parameterizedType.getActualTypeArguments()[0];`
`242`	`242`	`while (registryType instanceof WildcardType) {`
`243`	`243`	`registryType = ((WildcardType) registryType).getUpperBounds()[0];`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,10 @@ private interface CommandSyntaxExceptionThrowingParseResultSupplier<O> {`
`321`	`321`	`final @NonNull Function<CommandSourceStack, CompletableFuture<ArgumentParseResult<O>>> resultFunction`
`322`	`322`	`) {`
`323`	`323`	`final SharedSuggestionProvider nativeSource = context.get(ModdedCommandContextKeys.SHARED_SUGGESTION_PROVIDER);`
`324`		`- if (!(nativeSource instanceof CommandSourceStack) \|\| isClientSource(nativeSource)) {`
	`324`	`+ if (!(nativeSource instanceof CommandSourceStack commandSourceStack) \|\| isClientSource(nativeSource)) {`
`325`	`325`	`return ArgumentParseResult.failureFuture(serverOnly());`
`326`	`326`	`}`
`327`		`- return resultFunction.apply((CommandSourceStack) nativeSource);`
	`327`	`+ return resultFunction.apply(commandSourceStack);`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`/**`