Update to Minecraft 26.1

lucko · lucko · commit bdd52cf78daf · 2026-03-25T08:29:19.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'dev.yumi.gradle.licenser' version '2.2.2' apply false
     id 'com.gradleup.shadow' version '8.3.8' apply false
-    id 'net.fabricmc.fabric-loom-remap' version '1.15-SNAPSHOT' apply false
+    id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' apply false
 }
 
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
@@ -1,13 +1,13 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'net.fabricmc.fabric-loom-remap'
+    id 'net.fabricmc.fabric-loom'
     id 'com.gradleup.shadow'
 }
 
 tasks.withType(JavaCompile).configureEach {
-    // override, compile targeting J21
-    options.release = 21
+    // override, compile targeting J25
+    options.release = 25
 }
 
 repositories {
@@ -28,9 +28,8 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.21.11'
-    mappings loom.officialMojangMappings()
-    modImplementation 'net.fabricmc:fabric-loader:0.18.4'
+    minecraft 'com.mojang:minecraft:26.1'
+    implementation 'net.fabricmc:fabric-loader:0.18.4'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,12 +39,12 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.141.3+1.21.11'))
+        implementation(fabricApi.module(it, '0.144.0+26.1'))
     }
 
-    include(modImplementation('me.lucko:fabric-permissions-api:0.6.1'))
+    include(implementation('me.lucko:fabric-permissions-api:0.7.0'))
 
-    modImplementation('eu.pb4:placeholder-api:2.8.2+1.21.10')
+    //implementation('eu.pb4:placeholder-api:2.8.2+1.21.10')
 
     shade project(':spark-common')
     shade project(':spark-minecraft')
@@ -72,7 +71,7 @@ license {
 }
 
 shadowJar {
-    archiveFileName = "spark-fabric-${project.pluginVersion}-dev.jar"
+    archiveFileName = "spark-fabric-${project.pluginVersion}.jar"
     configurations = [project.configurations.shade]
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
@@ -92,15 +91,6 @@ shadowJar {
     }
 }
 
-tasks.register('remappedShadowJar', RemapJarTask) {
-    dependsOn tasks.shadowJar
-    input = tasks.shadowJar.archiveFile
-    addNestedDependencies = true
-    archiveFileName = "spark-${project.pluginVersion}-fabric.jar"
-}
-
-tasks.assemble.dependsOn tasks.remappedShadowJar
-
 artifacts {
-    archives remappedShadowJar
+    archives shadowJar
 }
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
@@ -22,10 +22,10 @@
 
 import com.google.gson.JsonParseException;
 import com.mojang.serialization.JsonOps;
-import eu.pb4.placeholders.api.PlaceholderContext;
-import eu.pb4.placeholders.api.PlaceholderHandler;
-import eu.pb4.placeholders.api.PlaceholderResult;
-import eu.pb4.placeholders.api.Placeholders;
+//import eu.pb4.placeholders.api.PlaceholderContext;
+//import eu.pb4.placeholders.api.PlaceholderHandler;
+//import eu.pb4.placeholders.api.PlaceholderResult;
+//import eu.pb4.placeholders.api.Placeholders;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.util.SparkPlaceholder;
 import net.kyori.adventure.text.Component;
@@ -40,31 +40,31 @@ public enum SparkFabricPlaceholderApi {
 
     public static void register(SparkPlatform platform) {
         for (SparkPlaceholder placeholder : SparkPlaceholder.values()) {
-            Placeholders.register(
-                    Identifier.fromNamespaceAndPath("spark", placeholder.getName()),
-                    new Handler(platform, placeholder)
-            );
+            //Placeholders.register(
+            //        Identifier.fromNamespaceAndPath("spark", placeholder.getName()),
+            //        new Handler(platform, placeholder)
+            //);
         }
     }
 
-    private record Handler(SparkPlatform platform, SparkPlaceholder placeholder) implements PlaceholderHandler {
-        @Override
-        public PlaceholderResult onPlaceholderRequest(PlaceholderContext context, @Nullable String argument) {
-            return toResult(this.placeholder.resolve(this.platform, argument));
-        }
-
-        private static PlaceholderResult toResult(Component component) {
-            return component == null
-                    ? PlaceholderResult.invalid()
-                    : PlaceholderResult.value(toText(component));
-        }
-
-        private static net.minecraft.network.chat.Component toText(Component component) {
-            return ComponentSerialization.CODEC.decode(
-                    RegistryAccess.EMPTY.createSerializationContext(JsonOps.INSTANCE),
-                    GsonComponentSerializer.gson().serializeToTree(component)
-            ).getOrThrow(JsonParseException::new).getFirst();
-        }
-    }
+    //private record Handler(SparkPlatform platform, SparkPlaceholder placeholder) implements PlaceholderHandler {
+    //    @Override
+    //    public PlaceholderResult onPlaceholderRequest(PlaceholderContext context, @Nullable String argument) {
+    //        return toResult(this.placeholder.resolve(this.platform, argument));
+    //    }
+    //
+    //    private static PlaceholderResult toResult(Component component) {
+    //        return component == null
+    //                ? PlaceholderResult.invalid()
+    //                : PlaceholderResult.value(toText(component));
+    //    }
+    //
+    //    private static net.minecraft.network.chat.Component toText(Component component) {
+    //        return ComponentSerialization.CODEC.decode(
+    //                RegistryAccess.EMPTY.createSerializationContext(JsonOps.INSTANCE),
+    //                GsonComponentSerializer.gson().serializeToTree(component)
+    //        ).getOrThrow(JsonParseException::new).getFirst();
+    //    }
+    //}
 
 }
diff --git a/spark-fabric/src/main/resources/fabric.mod.json b/spark-fabric/src/main/resources/fabric.mod.json
@@ -27,7 +27,8 @@
         "spark.mixins.json"
     ],
     "depends": {
-        "fabricloader": ">=0.4.0",
+        "fabricloader": ">=0.18.4",
+        "minecraft": ">=26.1",
         "fabric-api-base": "*",
         "fabric-command-api-v2": "*",
         "fabric-lifecycle-events-v1" : "*",
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
@@ -4,12 +4,11 @@ plugins {
 }
 
 tasks.withType(JavaCompile) {
-    // override, compile targeting J21
-    options.release = 21
+    // override, compile targeting J25
+    options.release = 25
 }
 
 minecraft {
-    mappings channel: 'official', version: '1.21.11'
     accessTransformer = true
 }
 
@@ -25,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    implementation minecraft.dependency('net.minecraftforge:forge:1.21.11-61.1.3')
+    implementation minecraft.dependency('net.minecraftforge:forge:26.1-62.0.1')
     annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1'
     shade project(':spark-common')
     shade project(':spark-minecraft')
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlatformInfo.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgePlatformInfo.java
@@ -46,7 +46,7 @@ public String getName() {
 
     @Override
     public String getBrand() {
-        return ModList.get().getModContainerById(ForgeVersion.MOD_ID)
+        return ModList.getModContainerById(ForgeVersion.MOD_ID)
                 .map(ModContainer::getModInfo)
                 .map(IModInfo::getDisplayName)
                 .orElse("Forge");
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java
@@ -123,7 +123,7 @@ public ClassSourceLookup createClassSourceLookup() {
     @Override
     public Collection<SourceMetadata> getKnownSources() {
         return SourceMetadata.gather(
-                ModList.get().getMods(),
+                ModList.getMods(),
                 IModInfo::getModId,
                 mod -> mod.getVersion().toString(),
                 mod -> null, // ?
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java
@@ -188,7 +188,7 @@ public ClassSourceLookup createClassSourceLookup() {
     @Override
     public Collection<SourceMetadata> getKnownSources() {
         return SourceMetadata.gather(
-                ModList.get().getMods(),
+                ModList.getMods(),
                 IModInfo::getModId,
                 mod -> mod.getVersion().toString(),
                 mod -> null, // ?
diff --git a/spark-minecraft/build.gradle b/spark-minecraft/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'net.fabricmc.fabric-loom-remap'
+    id 'net.fabricmc.fabric-loom'
 }
 
 tasks.withType(JavaCompile) {
-    // override, compile targeting J21
-    options.release = 21
+    // override, compile targeting J25
+    options.release = 25
 }
 
 repositories {
@@ -13,12 +13,8 @@ repositories {
 }
 
 dependencies {
-    minecraft 'com.mojang:minecraft:1.21.11'
-    mappings loom.officialMojangMappings()
+    minecraft 'com.mojang:minecraft:26.1'
 
     implementation project(':spark-common')
 }
 
-remapJar {
-    targetNamespace = 'named'
-}
diff --git a/spark-minecraft/src/main/java/me/lucko/spark/minecraft/MinecraftWorldInfoProvider.java b/spark-minecraft/src/main/java/me/lucko/spark/minecraft/MinecraftWorldInfoProvider.java
@@ -100,7 +100,7 @@ public ChunksResult<MinecraftChunkInfo> pollChunks() {
                 Long2ObjectOpenHashMap<MinecraftChunkInfo> worldInfos = new Long2ObjectOpenHashMap<>();
 
                 for (Entity entity : level.getAllEntities()) {
-                    MinecraftChunkInfo info = worldInfos.computeIfAbsent(entity.chunkPosition().toLong(), MinecraftChunkInfo::new);
+                    MinecraftChunkInfo info = worldInfos.computeIfAbsent(entity.chunkPosition().pack(), MinecraftChunkInfo::new);
                     info.entityCounts.increment(entity.getType());
                 }
 
@@ -174,7 +174,7 @@ public ChunksResult<MinecraftChunkInfo> pollChunks() {
             Long2ObjectOpenHashMap<MinecraftChunkInfo> worldInfos = new Long2ObjectOpenHashMap<>();
 
             for (Entity entity : getAllEntities(level)) {
-                MinecraftChunkInfo info = worldInfos.computeIfAbsent(entity.chunkPosition().toLong(), MinecraftChunkInfo::new);
+                MinecraftChunkInfo info = worldInfos.computeIfAbsent(entity.chunkPosition().pack(), MinecraftChunkInfo::new);
                 info.entityCounts.increment(entity.getType());
             }
 
diff --git a/spark-neoforge/build.gradle b/spark-neoforge/build.gradle
@@ -1,21 +1,21 @@
 plugins {
     id 'com.gradleup.shadow'
-    id 'net.neoforged.moddev' version '2.0.140'
+    id 'net.neoforged.moddev' version '2.0.141'
 }
 
 tasks.withType(JavaCompile).configureEach {
-    // override, compile targeting J21
-    options.release = 21
+    // override, compile targeting J25
+    options.release = 25
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
 neoForge {
-    version = "21.11.38-beta"
+    version = "26.1.0.1-beta"
     validateAccessTransformers = true
 
     runs {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'dev.yumi.gradle.licenser' version '2.2.2' apply false`
`3`	`3`	`id 'com.gradleup.shadow' version '8.3.8' apply false`
`4`		`- id 'net.fabricmc.fabric-loom-remap' version '1.15-SNAPSHOT' apply false`
	`4`	`+ id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' apply false`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,11 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`tasks.withType(JavaCompile) {`
`7`		`- // override, compile targeting J21`
`8`		`- options.release = 21`
	`7`	`+ // override, compile targeting J25`
	`8`	`+ options.release = 25`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`minecraft {`
`12`		`- mappings channel: 'official', version: '1.21.11'`
`13`	`12`	`accessTransformer = true`
`14`	`13`	`}`
`15`	`14`
`@@ -25,7 +24,7 @@ repositories {`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`dependencies {`
`28`		`- implementation minecraft.dependency('net.minecraftforge:forge:1.21.11-61.1.3')`
	`27`	`+ implementation minecraft.dependency('net.minecraftforge:forge:26.1-62.0.1')`
`29`	`28`	`annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1'`
`30`	`29`	`shade project(':spark-common')`
`31`	`30`	`shade project(':spark-minecraft')`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`plugins {`
`2`		`- id 'net.fabricmc.fabric-loom-remap'`
	`2`	`+ id 'net.fabricmc.fabric-loom'`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`tasks.withType(JavaCompile) {`
`6`		`- // override, compile targeting J21`
`7`		`- options.release = 21`
	`6`	`+ // override, compile targeting J25`
	`7`	`+ options.release = 25`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`repositories {`
`@@ -13,12 +13,8 @@ repositories {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- minecraft 'com.mojang:minecraft:1.21.11'`
`17`		`- mappings loom.officialMojangMappings()`
	`16`	`+ minecraft 'com.mojang:minecraft:26.1'`
`18`	`17`
`19`	`18`	`implementation project(':spark-common')`
`20`	`19`	`}`
`21`	`20`
`22`		`-remapJar {`
`23`		`- targetNamespace = 'named'`
`24`		`-}`