Update to 26.1

Author: xpple

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: 'true'
 
@@ -65,19 +65,19 @@ jobs:
 
       - name: Capture shared library (ubuntu-latest)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: libcubiomes.so
           path: src/main/resources/libcubiomes.so
       - name: Capture shared library (macos-latest)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: libcubiomes.dylib
           path: src/main/resources/libcubiomes.dylib
       - name: Capture shared library (windows-latest)
         if: matrix.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cubiomes.dll
           path: src/main/resources/cubiomes.dll
@@ -90,20 +90,20 @@ jobs:
       LLVM_HOME: /usr/lib/llvm-13
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: 'true'
       - name: Capture shared library
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           merge-multiple: true
           path: src/main/resources/
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
-      - name: Setup JDK 23
-        uses: actions/setup-java@v4
+        uses: gradle/actions/wrapper-validation@v5
+      - name: Setup JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: 23
+          java-version: 25
           distribution: 'temurin'
       - name: Make Gradle wrapper executable
         run: |
@@ -120,7 +120,7 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Capture build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: SeedMapper
           path: build/libs/

build.gradle

@@ -3,14 +3,15 @@ import dev.xpple.seedmapper.buildscript.GenerateBuildInfoTask
 import net.fabricmc.loom.task.prod.ClientProductionRunTask
 
 plugins {
-	id 'fabric-loom' version "${fabric_loom_version}"
+	id 'net.fabricmc.fabric-loom' version "${fabric_loom_version}"
 	id 'maven-publish'
 }
 
+version = project.mod_version
+group = project.maven_group
+
 base {
 	archivesName = project.archives_base_name
-	version = project.mod_version
-	group = project.maven_group
 }
 
 loom {
@@ -23,10 +24,6 @@ repositories {
 		name = 'xpple'
 		url = 'https://maven.xpple.dev/maven2'
 	}
-	maven {
-		name = 'ParchmentMC'
-		url = 'https://maven.parchmentmc.org'
-	}
 	maven {
 		name = 'DJtheRedstoner'
 		url = 'https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1'
@@ -39,29 +36,23 @@ repositories {
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.layered {
-		officialMojangMappings {
-			nameSyntheticMembers = true
-		}
-		parchment "org.parchmentmc.data:${project.parchment_mappings}"
-	}
-	modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 	productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
-	include modImplementation("dev.xpple:clientarguments:${project.clientarguments_version}")
-	include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
-	include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
+	include implementation("dev.xpple:clientarguments:${project.clientarguments_version}")
+	include implementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
+	include implementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
 
-	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+	runtimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
 		exclude group: 'net.fabricmc', module: 'fabric-loader'
 	}
 	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
 		exclude group: 'net.fabricmc', module: 'fabric-loader'
 	}
 
-	modCompileOnly "meteordevelopment:baritone:${project.baritone_version}"
+	compileOnly "meteordevelopment:baritone:${project.baritone_version}"
 
 	testImplementation platform("org.junit:junit-bom:${project.junit_version}")
 	testImplementation 'org.junit.jupiter:junit-jupiter'
@@ -89,7 +80,7 @@ tasks.register("prodClient", ClientProductionRunTask) {
 	jvmArgs.add("-Ddevauth.enabled=true")
 
 	javaLauncher = javaToolchains.launcherFor {
-		languageVersion = JavaLanguageVersion.of(23)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }
 
@@ -116,12 +107,12 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 23
+	it.options.release = 25
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_23
-	targetCompatibility = JavaVersion.VERSION_23
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 test {

gradle.properties

@@ -8,21 +8,19 @@ maven_group=dev.xpple
 archives_base_name=seedmapper
 
 # Minecraft properties
-minecraft_version=1.21.11
-minecraft_version_dependency=>=1.21.11 <1.22
+minecraft_version=26.1-rc-2
+minecraft_version_dependency=>=26.1-rc.1 <26.2
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-# https://maven.parchmentmc.org/org/parchmentmc/data/
-fabric_api_version=0.139.4+1.21.11
-parchment_mappings=parchment-1.21.9:2025.10.05@zip
-fabric_loader_version=0.18.2
-fabric_loom_version=1.14-SNAPSHOT
+fabric_api_version=0.144.0+26.1
+fabric_loader_version=0.18.4
+fabric_loom_version=1.15-SNAPSHOT
 
 # Library dependencies
-betterconfig_version=2.5.0
-clientarguments_version=1.11.6
-simplewaypoints_version=1.2.1
+betterconfig_version=2.6.0
+clientarguments_version=1.12.0
+simplewaypoints_version=1.3.0
 
 # Optional library dependencies
 baritone_version=1.21.11-SNAPSHOT

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -31,11 +31,11 @@
 import dev.xpple.seedmapper.util.SeedIdentifier;
 import dev.xpple.simplewaypoints.api.SimpleWaypointsAPI;
 import net.fabricmc.api.ClientModInitializer;
-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.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.KeyMapping;
@@ -57,7 +57,8 @@ public class SeedMapper implements ClientModInitializer {
 
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    public static final boolean BARITONE_AVAILABLE = FabricLoader.getInstance().getModContainer("baritone-meteor").isPresent();
+    // FIXME
+    public static final boolean BARITONE_AVAILABLE = false; // FabricLoader.getInstance().getModContainer("baritone-meteor").isPresent();
 
     static {
         String libraryName = System.mapLibraryName("cubiomes");
@@ -82,7 +83,7 @@ public void onInitializeClient() {
             .registerGlobalChangeHook(event -> {
                 if (event.config().equals("DevMode")) {
                     try {
-                        ClientCommandManager.refreshCommandCompletions();
+                        ClientCommands.refreshCommandCompletions();
                     } catch (IllegalStateException _) {
                     }
                 }
@@ -94,8 +95,8 @@ public void onInitializeClient() {
         SeedDatabaseHelper.fetchSeeds();
 
         KeyMapping.Category category = KeyMapping.Category.register(Identifier.fromNamespaceAndPath(MOD_ID, MOD_ID));
-        KeyMapping seedMapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, category));
-        KeyMapping minimapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.minimap", InputConstants.KEY_COMMA, category));
+        KeyMapping seedMapKeyMapping = KeyMappingHelper.registerKeyMapping(new KeyMapping("key.seedMap", InputConstants.KEY_M, category));
+        KeyMapping minimapKeyMapping = KeyMappingHelper.registerKeyMapping(new KeyMapping("key.minimap", InputConstants.KEY_COMMA, category));
         ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
             while (seedMapKeyMapping.consumeClick()) {
                 minecraft.player.connection.sendCommand("sm:seedmap");

gradlew

@@ -38,30 +38,30 @@ public class CustomClientCommandSource extends ClientSuggestionProvider implemen
     private final Entity entity;
     private final Vec3 position;
     private final Vec2 rotation;
-    private final ClientLevel world;
+    private final ClientLevel level;
     private final Map<String, Object> meta;
 
-    public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel world, PermissionSet permissionSet, Map<String, Object> meta) {
+    public CustomClientCommandSource(ClientPacketListener listener, Minecraft minecraft, Entity entity, Vec3 position, Vec2 rotation, ClientLevel level, PermissionSet permissionSet, Map<String, Object> meta) {
         super(listener, minecraft, permissionSet);
 
         this.client = minecraft;
         this.entity = entity;
         this.position = position;
         this.rotation = rotation;
-        this.world = world;
+        this.level = level;
         this.meta = meta;
     }
 
     public static CustomClientCommandSource of(FabricClientCommandSource source) {
         if (source instanceof CustomClientCommandSource custom) {
             return custom;
         }
-        return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getWorld(), source.permissions(), new HashMap<>());
+        return new CustomClientCommandSource(source.getClient().getConnection(), source.getClient(), source.getEntity(), source.getPosition(), source.getRotation(), source.getLevel(), source.permissions(), new HashMap<>());
     }
 
     @Override
     public void sendFeedback(Component message) {
-        this.client.gui.getChat().addMessage(message);
+        this.client.gui.getChat().addClientSystemMessage(message);
         this.client.getNarrator().saySystemChatQueued(message);
     }
 
@@ -96,8 +96,8 @@ public Vec2 getRotation() {
     }
 
     @Override
-    public ClientLevel getWorld() {
-        return this.world;
+    public ClientLevel getLevel() {
+        return this.level;
     }
 
     @Override
@@ -106,19 +106,19 @@ public ClientLevel getWorld() {
     }
 
     public CustomClientCommandSource withEntity(Entity entity) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.world, this.permissions(), this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, entity, this.position, this.rotation, this.level, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withPosition(Vec3 position) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.world, this.permissions(), this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, position, this.rotation, this.level, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withRotation(Vec2 rotation) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.world, this.permissions(), this.meta);
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, rotation, this.level, this.permissions(), this.meta);
     }
 
-    public CustomClientCommandSource withWorld(ClientLevel world) {
-        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, world, this.permissions(), this.meta);
+    public CustomClientCommandSource withLevel(ClientLevel level) {
+        return new CustomClientCommandSource(this.client.getConnection(), this.client, this.entity, this.position, this.rotation, level, this.permissions(), this.meta);
     }
 
     public CustomClientCommandSource withMeta(String key, Object value) {
@@ -139,7 +139,7 @@ public Pair<SeedResolutionArgument.SeedResolution.Method, SeedIdentifier> getSee
                 case ONLINE_DATABASE -> {
                     // match SeedCrackerX's key format
                     String key = this.client.getConnection().getConnection().getRemoteAddress().toString();
-                    yield SeedDatabaseHelper.getSeed(key, this.getWorld().getBiomeManager().biomeZoomSeed);
+                    yield SeedDatabaseHelper.getSeed(key, this.getLevel().getBiomeManager().biomeZoomSeed);
                 }
             };
             if (seed != null) {
@@ -155,10 +155,10 @@ public int getDimension() throws CommandSyntaxException {
             return (int) dimensionMeta;
         }
         try {
-            return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().identifier().getPath()));
+            return DimensionArgument.dimension().parse(new StringReader(this.getLevel().dimension().identifier().getPath()));
         } catch (CommandSyntaxException _) {
         }
-        return inferDimension(this.getWorld().dimensionType());
+        return inferDimension(this.getLevel().dimensionType());
     }
 
     public int getVersion() throws CommandSyntaxException {

jextract

@@ -132,6 +132,7 @@ public class VersionArgument implements ArgumentType<Integer> {
         .put("1.21.9", Cubiomes.MC_1_21_9())
         .put("1.21.10", Cubiomes.MC_1_21_9())
         .put("1.21.11", Cubiomes.MC_1_21_11())
+        .put("26.1", Cubiomes.MC_1_21_11())
         .build();
     //</editor-fold>