Port to 1.20.6

Author: Ambossmann

.github/workflows/gradle.yml

@@ -16,10 +16,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: gradle
     - name: Grant execute permission for gradlew

.github/workflows/release.yml

@@ -1,7 +1,8 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
     id "com.diffplug.spotless" version "6.25.0"
+    id 'com.gradleup.shadow' version '8.3.6' apply false
 }
 
 architectury {
@@ -24,6 +25,23 @@ subprojects {
             parchment("org.parchmentmc.data:parchment-${rootProject.parchment_minecraft_version}:${rootProject.parchment_version}")
         }
     }
+
+    processResources {
+        var replaceProperties = [
+                minecraft_version      : rootProject.minecraft_version,
+                minecraft_version_range: rootProject.minecraft_version_range,
+                neo_version_range      : rootProject.neo_version_range,
+                loader_version_range   : rootProject.loader_version_range,
+                mod_version            : rootProject.mod_version,
+                architectury_version   : rootProject.architectury_version,
+        ]
+        inputs.properties replaceProperties
+        replaceProperties.put 'project', project
+
+        filesMatching(['META-INF/neoforge.mods.toml', 'fabric.mod.json']) {
+            expand replaceProperties
+        }
+    }
 }
 
 allprojects {
@@ -49,29 +67,11 @@ allprojects {
         }
     }
 
-    tasks.withType(ProcessResources).configureEach {
-        var replaceProperties = [
-                minecraft_version      : rootProject.minecraft_version,
-                minecraft_version_range: rootProject.minecraft_version_range,
-                neo_version            : rootProject.neo_version,
-                neo_version_range      : rootProject.neo_version_range,
-                loader_version_range   : rootProject.loader_version_range,
-                mod_version            : rootProject.mod_version,
-                architectury_version   : rootProject.architectury_version,
-                architectury_next_api  : Integer.toString(Integer.parseInt(rootProject.architectury_version.split("\\.")[0]) + 1)
-        ]
-        inputs.properties replaceProperties
-
-        filesMatching(['META-INF/mods.toml', 'fabric.mod.json']) {
-            expand replaceProperties + [project: project]
-        }
-    }
-
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {

build.gradle

@@ -24,7 +24,7 @@
 import org.slf4j.LoggerFactory;
 
 public class AnvilclientCommon {
-	public static final String MOD_ID = "de/ambossmann/anvilclient";
+	public static final String MOD_ID = "anvilclient";
 	public static final String KEY_CATEGORY = "anvilclient.key.categories.anvilclient";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 

common/src/main/java/de/ambossmann/anvilclient/AnvilclientCommon.java

@@ -32,7 +32,6 @@ public class Features {
 	public static final AutoTool AUTO_TOOL = new AutoTool();
 	public static final Coordinates COORDINATES = new Coordinates();
 	public static final Fullbright FULLBRIGHT = new Fullbright();
-	//	public static final BedwarsInfo BEDWARS_INFO = new BedwarsInfo();
 	public static final FPSDisplay FPS_DISPLAY = new FPSDisplay();
 	public static final CPSDisplay CPS_DISPLAY = new CPSDisplay();
 	public static final ArmorDurability ARMOR_DURABILITY = new ArmorDurability();

common/src/main/java/de/ambossmann/anvilclient/features/Features.java

@@ -122,7 +122,7 @@ private int getSilkTouchEnchantmentLevel(ItemStack tool) {
 	}
 
 	private int getFortuneEnchantmentLevel(ItemStack tool) {
-		return EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, tool);
+		return EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FORTUNE, tool);
 	}
 
 	private Slot getBestTool(BlockPos blockPos) {

common/src/main/java/de/ambossmann/anvilclient/features/building/AutoTool.java

@@ -108,8 +108,7 @@ public enum DisplayDirection implements OptionEnum {
 		private final String translationKey;
 
 		DisplayDirection() {
-			this.translationKey =
-					"anvilclient.feature.autoTool.armorDurability." + this.toString().toLowerCase();
+			this.translationKey = "anvilclient.feature.armorDurability." + this.toString().toLowerCase();
 		}
 
 		@Override

common/src/main/java/de/ambossmann/anvilclient/features/info/ArmorDurability.java

@@ -38,9 +38,9 @@ protected void addOptions() {
 
 		for (Feature feature : featureList) {
 			if (feature.getFeatureToggle() != null) {
-				this.optionsList.addSmall(SettingUtils.getOptionListForFeature(feature, this));
+				this.list.addSmall(SettingUtils.getOptionListForFeature(feature, this));
 			} else {
-				this.optionsList.addBig(
+				this.list.addBig(
 						SettingUtils.getClickOption(
 								"anvilclient.feature." + feature.getName(),
 								() -> Minecraft.getInstance().setScreen(new FeatureGui(feature, this))));