Update to 1.20.6 (#84)

* Update to 1.20.6

* Updates workflow build.gradle to require new minimum java version 21

.github/workflows/build.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         # Use these Java versions
-        # 17 -> Current Java LTS & minimum supported by Minecraft
-        java: [17]
+        # 21 -> Current Java LTS & minimum supported by Minecraft
+        java: [21]
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ ubuntu-20.04 ]
 
     steps:

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.os }}
     steps:

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version "1.4-SNAPSHOT"
+    id 'fabric-loom' version "1.6-SNAPSHOT"
     id 'maven-publish'
 }
 
@@ -60,8 +60,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -2,19 +2,19 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version = 2.6.1
+mod_version = 2.6.2
 maven_group = net.fabricmc
 archives_base_name = simple-hud-utilities
 
 # Fabric Properties
 # https://modmuss50.me/fabric.html
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
+loader_version=0.15.11
 
 #Fabric api
-fabric_version=0.92.0+1.20.4
+fabric_version=0.99.4+1.20.6
 
 # Libraries
-cloth_config_version = 13.0.121
-modmenu_version = 9.0.0
+cloth_config_version = 14.0.126
+modmenu_version = 10.0.0-beta.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/net/johnvictorfs/simple_utilities/hud/GameInfoHud.java

@@ -20,6 +20,7 @@
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.Direction;
@@ -139,14 +140,14 @@ private String secondsToString(int pTime) {
 
     private void drawStatusEffectInfo() {
         if (this.client.player != null) {
-            Map<StatusEffect, StatusEffectInstance> effects = this.client.player.getActiveStatusEffects();
+            Map<RegistryEntry<StatusEffect>, StatusEffectInstance> effects = this.client.player.getActiveStatusEffects();
 
-            for (Map.Entry<StatusEffect, StatusEffectInstance> effect : effects.entrySet()) {
-                String effectName = I18n.translate(effect.getKey().getTranslationKey());
+            for (Map.Entry<RegistryEntry<StatusEffect>, StatusEffectInstance> effect : effects.entrySet()) {
+                String effectName = I18n.translate(effect.getValue().getEffectType().value().getTranslationKey());
 
                 String duration = secondsToString(effect.getValue().getDuration() / 20);
 
-                int color = effect.getKey().getColor();
+                int color = effect.getValue().getEffectType().value().getColor();
 
                 this.context.drawTextWithShadow(this.fontRenderer, effectName + " " + duration, 40, 200, color);
             }

src/main/java/net/johnvictorfs/simple_utilities/mixin/GameInfoMixin.java

@@ -23,8 +23,8 @@ public abstract class GameInfoMixin {
     @Final
     private MinecraftClient client;
 
-    @Inject(method = "<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/render/item/ItemRenderer;)V", at = @At(value = "RETURN"))
-    private void onInit(MinecraftClient client, ItemRenderer render, CallbackInfo ci) {
+    @Inject(method = "<init>(Lnet/minecraft/client/MinecraftClient;)V", at = @At(value = "RETURN"))
+    private void onInit(MinecraftClient client, CallbackInfo ci) {
         // Start Mixin
         System.out.println("Init Coordinates Mixin");
         this.hudInfo = new GameInfoHud(client);

src/main/resources/fabric.mod.json

@@ -14,7 +14,8 @@
     "rogama25",
     "SpencerBurgess",
     "SoRadGaming",
-    "Ogg-Vorbis"
+    "Ogg-Vorbis",
+    "Euronite"
   ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/simple-utilities",
@@ -36,9 +37,9 @@
     "simple_utilities.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.15.3",
+    "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "minecraft": ">=1.20.6"
   },
   "suggests": {
     "modmenu": ">=4.0.0"

src/main/resources/simple_utilities.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "net.johnvictorfs.simple_utilities.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [