Update Fabric target to 26.2

build.gradle.kts

@@ -1,18 +1,18 @@
-import java.io.ByteArrayOutputStream
+import org.gradle.api.Project
 
 plugins {
     id("java-library")
     id("maven-publish")
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.gradleup.shadow") version "9.5.1"
 }
 
 subprojects {
     plugins.apply("java-library")
     plugins.apply("maven-publish")
-    plugins.apply("io.github.goooler.shadow")
+    plugins.apply("com.gradleup.shadow")
 
     group = "${project.property("group")}"
-    version = "${project.property("version")}.${commitsSinceLastTag()}"
+    version = "${project.property("version")}.${project.commitsSinceLastTag()}"
 
     repositories {
         mavenCentral()
@@ -27,7 +27,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(21))
+            languageVersion.set(JavaLanguageVersion.of(25))
         }
         withSourcesJar()
     }
@@ -72,14 +72,12 @@ subprojects {
     }
 }
 
-fun commitsSinceLastTag(): String {
-    val tagDescription = ByteArrayOutputStream()
-    exec {
+fun Project.commitsSinceLastTag(): String {
+    val tagDescription = providers.exec {
         commandLine("git", "describe", "--tags")
-        standardOutput = tagDescription
-    }
-    if (tagDescription.toString().indexOf('-') < 0) {
+    }.standardOutput.asText.get()
+    if (tagDescription.indexOf('-') < 0) {
         return "0"
     }
-    return tagDescription.toString().split('-')[1]
+    return tagDescription.split('-')[1]
 }

bukkit/build.gradle.kts

@@ -25,10 +25,12 @@ tasks {
     processResources {
         filesMatching("plugin.yml") {
             expand(
-                "version" to project.version,
-                "group" to project.group,
-                "author" to project.property("author"),
-                "description" to project.property("description")
+                mapOf(
+                    "version" to project.version.toString(),
+                    "group" to project.group.toString(),
+                    "author" to project.property("author").toString(),
+                    "description" to project.property("description").toString()
+                )
             )
         }
     }

common/build.gradle.kts

@@ -18,8 +18,10 @@ tasks {
     processResources {
         filesMatching("version.properties") {
             expand(
-                "version" to project.version,
-                "target" to project.property("target")
+                mapOf(
+                    "version" to project.version.toString(),
+                    "target" to project.property("target").toString()
+                )
             )
         }
     }

fabric/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("dev.architectury.loom") version "1.10-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version "1.17.13"
 }
 
 val shade: Configuration by configurations.creating
@@ -13,12 +13,27 @@ repositories {
     }
 }
 
+loom {
+    splitEnvironmentSourceSets()
+    mods {
+        create(rootProject.name) {
+            sourceSet(sourceSets["main"])
+            sourceSet(sourceSets["client"])
+        }
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(25))
+    }
+}
+
 dependencies {
-    minecraft(group = "com.mojang", name = "minecraft", version = "1.21.4")
-    mappings(group = "net.fabricmc", name = "yarn", version = "1.21.4+build.1", classifier = "v2")
-    modImplementation(group = "net.fabricmc", name = "fabric-loader", version = "0.16.7")
-    modImplementation(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.111.0+1.21.4")
-    modImplementation(group = "org.popcraft", name = "chunky-fabric", version = "${project.property("target")}")
+    minecraft("com.mojang:minecraft:26.2")
+    implementation("net.fabricmc:fabric-loader:0.19.3")
+    implementation("net.fabricmc.fabric-api:fabric-api:0.154.2+26.2")
+    implementation("org.popcraft:chunky-fabric:${project.property("target_fabric")}")
     compileOnly(group = "us.dynmap", name = "DynmapCoreAPI", version = "${project.property("target_dynmap")}")
     compileOnly(group = "com.github.BlueMap-Minecraft", name = "BlueMapAPI", version = "${project.property("target_bluemap")}")
     compileOnly(group = "xyz.jpenilla", name = "squaremap-api", version = "${project.property("target_squaremap")}")
@@ -28,26 +43,29 @@ dependencies {
 }
 
 tasks {
+    withType<JavaCompile> {
+        options.release = 25
+    }
     processResources {
         filesMatching("fabric.mod.json") {
             expand(
-                "id" to rootProject.name,
-                "version" to project.version,
-                "name" to project.property("artifactName"),
-                "description" to project.property("description"),
-                "author" to project.property("author"),
-                "github" to project.property("github"),
-                "target" to project.property("target")
+                mapOf(
+                    "id" to rootProject.name,
+                    "version" to project.version.toString(),
+                    "name" to project.property("artifactName").toString(),
+                    "description" to project.property("description").toString(),
+                    "author" to project.property("author").toString(),
+                    "github" to project.property("github").toString(),
+                    "target" to project.property("target_fabric").toString()
+                )
             )
         }
     }
     shadowJar {
+        dependsOn("clientClasses")
+        from(sourceSets["client"].output)
         configurations = listOf(shade)
         archiveClassifier.set("dev")
-        archiveFileName.set(null as String?)
-    }
-    remapJar {
-        inputFile.set(shadowJar.get().archiveFile)
         archiveFileName.set("${project.property("artifactName")}-Fabric-${project.version}.jar")
     }
 }

fabric/src/main/java/org/popcraft/chunkyborder/ChunkyBorderFabricClient.java → fabric/src/client/java/org/popcraft/chunkyborder/ChunkyBorderFabricClient.java

@@ -6,8 +6,8 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.util.Identifier;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.resources.Identifier;
 import org.popcraft.chunkyborder.packet.BorderPayload;
 import org.popcraft.chunkyborder.platform.Config;
 import org.popcraft.chunkyborder.shape.BorderShape;
@@ -40,7 +40,7 @@ public void onInitializeClient() {
         final Path configPath = FabricLoader.getInstance().getConfigDir().resolve("chunkyborder/config.json");
         ChunkyBorderFabricClient.setConfig(new FabricConfig(configPath));
         BorderColor.parseColor(config.visualizerColor());
-        PayloadTypeRegistry.playS2C().register(BorderPayload.ID, CustomPayload.codecOf(BorderPayload::write, BorderPayload::new));
+        PayloadTypeRegistry.clientboundPlay().register(BorderPayload.ID, CustomPacketPayload.codec(BorderPayload::write, BorderPayload::new));
         ClientPlayNetworking.registerGlobalReceiver(BorderPayload.ID, (borderPayload, context) -> {
             final ClientBorder clientBorder = borderPayload.getBorder();
             if (clientBorder.worldKey() == null) {