upgradle etc, better remap = false usage, 1.14-1.15.2 compat fix

.github/workflows/build.yml

@@ -1,5 +1,11 @@
 name: build
-on: [ push, pull_request, workflow_dispatch ]
+on:
+  push:
+    # ignores tags
+    branches:
+      - "**"
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -8,18 +14,12 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: 17
+        uses: gradle/actions/wrapper-validation@v4
       - name: build
         run: |
           chmod +x ./gradlew
           ./gradlew build
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: build/libs/
-

1.12/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.12
-yarn_build=542
+yarn_build=566

1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -32,7 +32,7 @@ private int setSpawnX(Random random, int bounds, Operation<Integer> original, @L
 
         if (((MinecraftServerExtended) server).setspawnmod$shouldModifySpawn()) {
             ((MinecraftServerExtended) server).setspawnmod$setShouldModifySpawn(false);
-            seed.set(SetSpawn.findSeedObjectFromLong(server.method_0_6351().method_8412()));
+            seed.set(SetSpawn.findSeedObjectFromLong(server.getWorld().method_8412()));
         }
         Seed seedObject = seed.get();
         if (seedObject == null) {

1.13.x/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.13.2
-yarn_build=541
+yarn_build=565

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java

@@ -22,7 +22,7 @@ private boolean checkIfNewWorld(boolean initialized) {
     @Group
     // method_3786 -> createWorlds
     // LevelProperties#isInitialized
-    @ModifyExpressionValue(method = "method_3786(Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_31;method_222()Z", remap = false), require = 0)
+    @ModifyExpressionValue(method = "method_3786(Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/class_31;method_222()Z"), require = 0, remap = false)
     private boolean checkIfNewWorld2(boolean initialized) {
         this.shouldModifySpawn = !initialized;
         return initialized;

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -94,10 +94,12 @@ private void sendErrorMessage(CallbackInfo ci) {
 
     @Dynamic
     @Group
-    @Inject(method = "method_14235(Lnet/minecraft/class_1703;)V", at = @At("TAIL"), require = 0)
+    @Inject(method = "method_14235(Lnet/minecraft/class_1703;)V", at = @At("TAIL"), require = 0, remap = false)
     private void sendErrorMessage2(CallbackInfo ci) {
         if (this.setSpawnError != null) {
-            this.sendMessage(new LiteralText(this.setSpawnError + " This run is not verifiable.").formatted(Formatting.RED), false);
+            // MutableText#formatted moved from BaseText in 1.16, can't compile against it
+            BaseText message = new LiteralText(this.setSpawnError + " This run is not verifiable.");
+            this.sendMessage(message.setStyle(message.getStyle().withFormatting(Formatting.RED)), false);
             this.setSpawnError = null;
         }
     }

1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -96,7 +96,7 @@ private void failOnNonRandomSpawns(CallbackInfo ci, @Share("seed") LocalRef<Seed
                     @At(value = "INVOKE", target = "Lnet/minecraft/class_3218;method_8587(Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z", ordinal = 1),
                     @At(value = "INVOKE", target = "Lnet/minecraft/class_3222;method_61274(Lnet/minecraft/class_3218;Lnet/minecraft/class_238;)Z", ordinal = 1)
             },
-            require = 0, allow = 1
+            require = 0, allow = 1, remap = false
     )
     private void failOnNonRandomSpawns2(CallbackInfoReturnable<Boolean> cir, @Share("seed") LocalRef<Seed> seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) {
         if (!isRandomSpawn.get() && seed.get() != null) {

1.3-1.5.2/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.3.2
-yarn_build=541
+yarn_build=565

1.6.x/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.6.4
-yarn_build=541
+yarn_build=565

1.7.x/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.7.10
-yarn_build=541
+yarn_build=565

1.8-1.12.2/gradle.properties

@@ -1,2 +1,2 @@
 minecraft_version=1.12.2
-yarn_build=541
+yarn_build=565

build.gradle

@@ -12,5 +12,4 @@ dependencies {
     minecraft libs.minecraft
     mappings variantOf(libs.yarn.mappings) { classifier "v2" }
     modImplementation libs.fabric.loader
-    vineflowerDecompilerClasspath libs.vineflower
 }

buildSrc/build.gradle

@@ -6,7 +6,7 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
     maven { url "https://maven.fabricmc.net" }
-    maven { url "https://repo.legacyfabric.net/repository/legacyfabric" }
+    maven { url "https://maven.legacyfabric.net" }
 }
 
 dependencies {

buildSrc/gradle.properties

@@ -1,2 +1,2 @@
-loom_version=1.7-SNAPSHOT
-legacy_looming_version=1.7-SNAPSHOT
+loom_version=1.10-SNAPSHOT
+legacy_looming_version=1.10-SNAPSHOT

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 4.1.1
+mod_version = 4.1.2
 archives_name = setspawnmod
 base_archives_name = setspawnmod-common
 maven_group = me.bdamja

gradle/libs.versions.toml

@@ -1,11 +1,9 @@
 [versions]
 minecraft = "1.16.1"
-yarn_mappings = "1.16.1-build.22"
-fabric_loader = "0.16.0"
-vineflower = "1.10.1"
+yarn_mappings = "1.16.1-build.28"
+fabric_loader = "0.16.10"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 yarn_mappings = { module = "dev.tildejustin:yarn", version.ref = "yarn_mappings" }
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
-vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1,7 +1,5 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.fabricmc.net" }
-        maven { url "https://repo.legacyfabric.net/repository/legacyfabric" }
         maven { url "https://jitpack.io" }
         mavenCentral()
         gradlePluginPortal()