Update to 1.20.5-pre1.

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

.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'
@@ -43,8 +43,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
 
@@ -83,7 +83,7 @@ allprojects {
 
 	tasks.withType(JavaCompile) {
 		it.options.encoding = "UTF-8"
-		it.options.release = 17
+		it.options.release = 21
 	}
 
 	repositories {

common/src/main/java/com/terraformersmc/terrestria/item/LogTurnerItem.java

@@ -6,7 +6,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.PillarBlock;
-import net.minecraft.client.item.TooltipContext;
+import net.minecraft.client.item.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
@@ -48,13 +48,11 @@ public ActionResult useOnBlock(ItemUsageContext context) {
 				}
 
 				world.setBlockState(pos, state);
-
-				return ActionResult.SUCCESS;
 			} else {
 				world.setBlockState(pos, state.cycle(PillarBlock.AXIS));
-
-				return ActionResult.SUCCESS;
 			}
+
+			return ActionResult.SUCCESS;
 		} else {
 			Direction.Axis newAxis = context.getSide().getAxis();
 
@@ -76,12 +74,12 @@ public ActionResult useOnBlock(ItemUsageContext context) {
 
 	@Override
 	@Environment(EnvType.CLIENT)
-	public void appendTooltip(ItemStack stack, World world, List<Text> tooltip, TooltipContext context) {
-		super.appendTooltip(stack, world, tooltip, context);
+	public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
+		super.appendTooltip(stack, context, tooltip, type);
 
 		String translation = Language.getInstance().get("item." + Terrestria.MOD_ID + ".log_turner.tooltip");
 
-		for(String line: translation.split("\n")) {
+		for (String line: translation.split("\n")) {
 			tooltip.add(Text.literal(line.trim()).formatted(Formatting.GRAY));
 		}
 	}

gradle.properties

@@ -4,10 +4,10 @@ fabric.loom.multiProjectOptimisation=true
 maven_group=com.terraformersmc
 archive_name=terrestria
 
-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.97.0+1.20.5
 
 # Terraform modules
 terraform_biome_remapper_api_version=10.0.0-alpha.9
@@ -19,7 +19,7 @@ terraform_tree_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
@@ -43,7 +43,7 @@ curseforge_optional_dependencies=
 # Modrinth Metadata
 modrinth_slug=terrestria
 modrinth_id=lsUDPMOT
-modrinth_game_versions=24w13a
+modrinth_game_versions=1.20.5-pre1
 modrinth_mod_loaders=fabric, quilt
 modrinth_required_dependencies=fabric-api
 #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

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
   "environment": "*",
   "depends": {
     "fabricloader": ">=0.15",
-    "fabric-api": ">=0.85.0",
+    "fabric-api": ">=0.97.0",
     "minecraft": ">1.20.4 <1.21",
     "java": ">=17"
   }