From 05957f4a77674e54ca09e02d1c3109c4b5461f8b Mon Sep 17 00:00:00 2001 From: gniftygnome Date: Thu, 11 Apr 2024 23:56:15 -0700 Subject: [PATCH] Update for 1.20.5-pre1. - Update for 1.20.5-pre1 --- .github/workflows/check_build.yml | 4 ++-- .github/workflows/release_build.yml | 4 ++-- build.gradle | 4 ++-- .../impl/mixin/MixinFapiTheEndBiomes.java | 20 +++++++++---------- fabric/src/main/resources/fabric.mod.json | 5 +---- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.github/workflows/check_build.yml b/.github/workflows/check_build.yml index 19421a2..a7b8110 100644 --- a/.github/workflows/check_build.yml +++ b/.github/workflows/check_build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: # Use these Java versions - java: [17] + java: [21] os: [ubuntu-20.04] runs-on: ${{ matrix.os }} steps: @@ -32,7 +32,7 @@ jobs: - name: Build run: ./gradlew build --stacktrace - name: Capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from LTS java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS uses: actions/upload-artifact@v4 with: name: Artifacts diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index f97e2e2..cd6b43e 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: # Use these Java versions - java: [17] + java: [21] # and run on both Linux and Windows os: [ubuntu-20.04] runs-on: ${{ matrix.os }} @@ -56,7 +56,7 @@ jobs: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} DISCORD_ANNOUNCEMENT_WEBHOOK: ${{ secrets.DISCORD_ANNOUNCEMENT_WEBHOOK }} - name: Capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from LTS java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from LTS java on one OS uses: actions/upload-artifact@v4 with: name: Artifacts diff --git a/build.gradle b/build.gradle index 49ddc31..4e73fad 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id 'dev.architectury.loom' version '1.5-SNAPSHOT' apply(false) + id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply(false) } architectury { @@ -56,7 +56,7 @@ allprojects { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.getRelease().set(17) + it.options.getRelease().set(21) } java { diff --git a/fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinFapiTheEndBiomes.java b/fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinFapiTheEndBiomes.java index f759ae2..15d20c4 100644 --- a/fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinFapiTheEndBiomes.java +++ b/fabric/src/main/java/com/terraformersmc/biolith/impl/mixin/MixinFapiTheEndBiomes.java @@ -14,33 +14,33 @@ @Mixin(TheEndBiomes.class) public class MixinFapiTheEndBiomes { @Inject(method = "addMainIslandBiome", at = @At("HEAD"), cancellable = true) - private static void biolith$scrapeEndMainIslandReplacement(RegistryKey variant, double weight, CallbackInfo ci) { - BiomePlacement.replaceEnd(BiomeKeys.THE_END, variant, weight / (1d + weight)); + private static void biolith$scrapeEndMainIslandReplacement(RegistryKey biome, double weight, CallbackInfo ci) { + BiomePlacement.replaceEnd(BiomeKeys.THE_END, biome, weight / (1d + weight)); ci.cancel(); } @Inject(method = "addHighlandsBiome", at = @At("HEAD"), cancellable = true) - private static void biolith$scrapeEndHighlandsReplacement(RegistryKey variant, double weight, CallbackInfo ci) { - BiomePlacement.replaceEnd(BiomeKeys.END_HIGHLANDS, variant, weight / (1d + weight)); + private static void biolith$scrapeEndHighlandsReplacement(RegistryKey biome, double weight, CallbackInfo ci) { + BiomePlacement.replaceEnd(BiomeKeys.END_HIGHLANDS, biome, weight / (1d + weight)); ci.cancel(); } @Inject(method = "addSmallIslandsBiome", at = @At("HEAD"), cancellable = true) - private static void biolith$scrapeEndSmallIslandsReplacement(RegistryKey variant, double weight, CallbackInfo ci) { - BiomePlacement.replaceEnd(BiomeKeys.SMALL_END_ISLANDS, variant, weight / (1d + weight)); + private static void biolith$scrapeEndSmallIslandsReplacement(RegistryKey biome, double weight, CallbackInfo ci) { + BiomePlacement.replaceEnd(BiomeKeys.SMALL_END_ISLANDS, biome, weight / (1d + weight)); ci.cancel(); } @Inject(method = "addMidlandsBiome", at = @At("HEAD"), cancellable = true) - private static void biolith$scrapeEndMidlandsReplacement(RegistryKey highlands, RegistryKey variant, double weight, CallbackInfo ci) { - BiomePlacement.addSubEnd(BiomeKeys.END_MIDLANDS, variant, + private static void biolith$scrapeEndMidlandsReplacement(RegistryKey highlands, RegistryKey midlands, double weight, CallbackInfo ci) { + BiomePlacement.addSubEnd(BiomeKeys.END_MIDLANDS, midlands, SubBiomeMatcher.of(SubBiomeMatcher.Criterion.ofAlternate(SubBiomeMatcher.CriterionTargets.ALTERNATE, highlands, BiomeKeys.END_HIGHLANDS, false))); ci.cancel(); } @Inject(method = "addBarrensBiome", at = @At("HEAD"), cancellable = true) - private static void biolith$scrapeBarrensReplacement(RegistryKey highlands, RegistryKey variant, double weight, CallbackInfo ci) { - BiomePlacement.addSubEnd(BiomeKeys.END_BARRENS, variant, + private static void biolith$scrapeBarrensReplacement(RegistryKey highlands, RegistryKey barrens, double weight, CallbackInfo ci) { + BiomePlacement.addSubEnd(BiomeKeys.END_BARRENS, barrens, SubBiomeMatcher.of(SubBiomeMatcher.Criterion.ofAlternate(SubBiomeMatcher.CriterionTargets.ALTERNATE, highlands, BiomeKeys.END_HIGHLANDS, false))); ci.cancel(); } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 32930d6..32f94d6 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -42,9 +42,6 @@ "depends": { "fabricloader": ">=0.15", "fabric-api": "*", - "minecraft": ">=1.20.4 <1.21" - }, - "breaks": { - "terrablender": "<3.0.0" + "minecraft": ">1.20.4 <1.21" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index af90870..4170888 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,12 +10,12 @@ maven_group=com.terraformersmc enabled_platforms=fabric # Common -minecraft_version=24w07a -yarn_mappings=24w07a+build.4 +minecraft_version=1.20.5-pre1 +yarn_mappings=1.20.5-pre1+build.5 # Fabric -fabric_api_version=0.96.3+1.20.5 -fabric_loader_version=0.15.7 +fabric_api_version=0.96.15+1.20.5 +fabric_loader_version=0.15.9 # Forge forge_version=1.20.4-49.0.30 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..17655d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists