diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fc102f..0c1660e 100644 --- a/.github/workflows/build.yml +++ b/.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/ - diff --git a/1.12/gradle.properties b/1.12/gradle.properties index b9ed28e..0512dcf 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.12 -yarn_build=542 +yarn_build=566 diff --git a/1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java b/1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java index d39e92b..8572271 100644 --- a/1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java +++ b/1.12/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java @@ -32,7 +32,7 @@ private int setSpawnX(Random random, int bounds, Operation 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) { diff --git a/1.13.x/gradle.properties b/1.13.x/gradle.properties index 1bf35a5..6634fd3 100644 --- a/1.13.x/gradle.properties +++ b/1.13.x/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.13.2 -yarn_build=541 +yarn_build=565 diff --git a/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java b/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java index a2e4dda..d916f56 100644 --- a/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java +++ b/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; diff --git a/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java b/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java index d8207de..19aaddc 100644 --- a/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java +++ b/1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java @@ -94,7 +94,7 @@ 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); diff --git a/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java b/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java index 0ac56d3..89771f7 100644 --- a/1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java +++ b/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 cir, @Share("seed") LocalRef seed, @Share("isRandomSpawn") LocalBooleanRef isRandomSpawn) { if (!isRandomSpawn.get() && seed.get() != null) { diff --git a/1.3-1.5.2/gradle.properties b/1.3-1.5.2/gradle.properties index f54937b..e5de500 100644 --- a/1.3-1.5.2/gradle.properties +++ b/1.3-1.5.2/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.3.2 -yarn_build=541 +yarn_build=565 diff --git a/1.6.x/gradle.properties b/1.6.x/gradle.properties index dff0da7..088b434 100644 --- a/1.6.x/gradle.properties +++ b/1.6.x/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.6.4 -yarn_build=541 +yarn_build=565 diff --git a/1.7.x/gradle.properties b/1.7.x/gradle.properties index ddbe1ba..395ad79 100644 --- a/1.7.x/gradle.properties +++ b/1.7.x/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.7.10 -yarn_build=541 +yarn_build=565 diff --git a/1.8-1.12.2/gradle.properties b/1.8-1.12.2/gradle.properties index 3b9eedd..9c37dc2 100644 --- a/1.8-1.12.2/gradle.properties +++ b/1.8-1.12.2/gradle.properties @@ -1,2 +1,2 @@ minecraft_version=1.12.2 -yarn_build=541 +yarn_build=565 diff --git a/build.gradle b/build.gradle index 687b8e8..1f7e284 100644 --- a/build.gradle +++ b/build.gradle @@ -12,5 +12,4 @@ dependencies { minecraft libs.minecraft mappings variantOf(libs.yarn.mappings) { classifier "v2" } modImplementation libs.fabric.loader - vineflowerDecompilerClasspath libs.vineflower } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 9de6942..2fae7ae 100644 --- a/buildSrc/build.gradle +++ b/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 { diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 87bbdf3..a539d8f 100644 --- a/buildSrc/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 360f6c6..53d4558 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..9bbc975 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dedd5d1..ed4c299 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index f5feea6..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/settings.gradle b/settings.gradle index 32b79c6..2037117 100644 --- a/settings.gradle +++ b/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()