Update to 1.20.5-pre1.

- Update to 1.20.5-pre1
- The Java version is now 21
- Update Biolith for bclib compatibility

Author: gniftygnome

.github/workflows/check_build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17    # Minimum
+          21    # Minimum
         ]
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: ./gradlew build --stacktrace -x runDatagen
       - 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

.github/workflows/release.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 }}
@@ -58,7 +58,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

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
     id 'idea'
     id 'eclipse'
-    id 'fabric-loom' version '1.5.+'
+    id 'fabric-loom' version '1.6.+'
 }
 
 apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.6/ferry.gradle'
@@ -44,8 +44,8 @@ allprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'fabric-loom'
 
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 
     group = project.maven_group
 
@@ -84,7 +84,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         it.options.encoding = "UTF-8"
-        it.options.release = 17
+        it.options.release = 21
     }
 
     repositories {

client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java

@@ -73,7 +73,7 @@ public void onInitializeClient() {
                 CinderscapesBlocks.POTTED_POLYPITE_SULFUR_QUARTZ
         );
 
-        ItemTooltipCallback.EVENT.register((stack, context, lines) -> {
+        ItemTooltipCallback.EVENT.register((stack, context, type, lines) -> {
             if (stack.isOf(CinderscapesBlocks.NODZOL.asItem())) {
                 lines.add(Text.translatable("block.cinderscapes.nodzol.description").setStyle(Style.EMPTY.withColor(Formatting.GRAY)));
             }

common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java

@@ -245,7 +245,7 @@ public static void init() {
 
         ASH_PILE = CinderscapesRegistry.register("ash_pile", new Item(new Item.Settings()));
 
-        BRAMBLE_BERRIES = CinderscapesRegistry.register("bramble_berries", new AliasedBlockItem(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).alwaysEdible().snack().statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 600, 0), 0.8F).build())));
+        BRAMBLE_BERRIES = CinderscapesRegistry.register("bramble_berries", new AliasedBlockItem(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().nutrition(2).saturationModifier(0.1F).alwaysEdible().snack().statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 600, 0), 0.8F).build())));
 
         NODZOL = CinderscapesRegistry.registerBlockItem("nodzol", CinderscapesBlocks.NODZOL);
 

gradle.properties

@@ -4,25 +4,25 @@ fabric.loom.multiProjectOptimisation=true
 maven_group=com.terraformersmc
 archive_name=cinderscapes
 
-minecraft_version=24w13a
-yarn_mappings=24w13a+build.2
-loader_version=0.15.7
-fabric_version=0.96.13+1.20.5
+minecraft_version=1.20.5-pre1
+yarn_mappings=1.20.5-pre1+build.5
+loader_version=0.15.9
+fabric_version=0.96.15+1.20.5
 
 # Terraform modules
-terraform_biome_remapper_api_version=10.0.0-alpha.8
-terraform_shapes_api_version=10.0.0-alpha.8
-terraform_surfaces_api_version=10.0.0-alpha.8
-terraform_wood_api_version=10.0.0-alpha.8
+terraform_biome_remapper_api_version=10.0.0-alpha.9
+terraform_shapes_api_version=10.0.0-alpha.9
+terraform_surfaces_api_version=10.0.0-alpha.9
+terraform_wood_api_version=10.0.0-alpha.9
 
 # Biolith for worldgen module and testing
-biolith_version=2.1.0-alpha.1
+biolith_version=2.1.0-alpha.2
 
 # TerraBlender for worldgen module and testing
 terrablender_version=1.20.4-3.3.0.12
 
 # Other Things
-clothconfig_version=14.0.122
+clothconfig_version=14.0.125
 modmenu_version=10.0.0-alpha.3
 vistas_version=2.5.2
 
@@ -44,7 +44,7 @@ curseforge_optional_dependencies=
 # Modrinth Metadata
 modrinth_slug=cinderscapes
 modrinth_id=QC4wcUXZ
-modrinth_game_versions=24w13a
+modrinth_game_versions=1.20.5-pre1
 modrinth_mod_loaders=fabric, quilt
 #modrinth_embedded_dependencies=biolith
 

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