Update to Minecraft 26.1

Author: lucko

.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

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

spark-fabric/build.gradle

@@ -1,13 +1,11 @@
-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 {
@@ -24,13 +22,15 @@ repositories {
 configurations {
     shade
     implementation.extendsFrom shade
+
+    jarInJar
+    implementation.extendsFrom jarInJar
 }
 
 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,17 +40,18 @@ 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'))
-
-    modImplementation('eu.pb4:placeholder-api:2.8.2+1.21.10')
+    jarInJar 'me.lucko:fabric-permissions-api:0.7.0'
+    implementation 'eu.pb4:placeholder-api:3.0.0-beta.2+26.1'
 
     shade project(':spark-common')
     shade project(':spark-minecraft')
 }
 
+loom.nestJars(tasks.named("shadowJar"), configurations.jarInJar)
+
 processResources {
     inputs.property 'version', project.version
 
@@ -72,7 +73,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 +93,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
 }

spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java

@@ -22,8 +22,8 @@
 
 import com.google.gson.JsonParseException;
 import com.mojang.serialization.JsonOps;
+import eu.pb4.placeholders.api.Placeholder;
 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;
@@ -40,14 +40,14 @@ public enum SparkFabricPlaceholderApi {
 
     public static void register(SparkPlatform platform) {
         for (SparkPlaceholder placeholder : SparkPlaceholder.values()) {
-            Placeholders.register(
+            Placeholders.registerCommon(
                     Identifier.fromNamespaceAndPath("spark", placeholder.getName()),
                     new Handler(platform, placeholder)
             );
         }
     }
 
-    private record Handler(SparkPlatform platform, SparkPlaceholder placeholder) implements PlaceholderHandler {
+    private record Handler(SparkPlatform platform, SparkPlaceholder placeholder) implements Placeholder.Handler<PlaceholderContext, String> {
         @Override
         public PlaceholderResult onPlaceholderRequest(PlaceholderContext context, @Nullable String argument) {
             return toResult(this.placeholder.resolve(this.platform, argument));

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" : "*",

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')

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");

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, // ?

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, // ?

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'
-}