1.21.5 support

Author: samolego

gradle.properties

@@ -1,15 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
-loader_version=0.16.10
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.13
 
 # Fabric API
-fabric_version=0.119.2+1.21.4
+fabric_version=0.119.9+1.21.5
 
 # Mod Properties
-mod_version=1.5.2
+mod_version=1.5.3
 maven_group=org.samo_lego
 archives_base_name=healthcare
 # Dependencies

src/main/java/org/samo_lego/healthcare/healthbar/PlayerHealthbar.java

@@ -38,15 +38,15 @@ public void toTag(CompoundTag tag) {
     }
 
     public void fromTag(CompoundTag tag) {
-        this.healthbarStyle = HealthbarStyle.valueOf(tag.getString("Style"));
-        this.enabled = tag.getBoolean("Enabled");
-        this.showType = tag.getBoolean("ShowType");
-        this.alwaysVisible = tag.getBoolean("AlwaysVisible");
+        this.healthbarStyle = HealthbarStyle.valueOf(tag.getString("Style").orElse(this.healthbarStyle.name()));
+        this.enabled = tag.getBoolean("Enabled").orElse(this.enabled);
+        this.showType = tag.getBoolean("ShowType").orElse(this.showType);
+        this.alwaysVisible = tag.getBoolean("AlwaysVisible").orElse(this.alwaysVisible);
 
         if (this.healthbarStyle == HealthbarStyle.CUSTOM) {
-            this.customFullChar = (char) tag.getInt("FullChar");
-            this.customEmptyChar = (char) tag.getInt("EmptyChar");
-            this.customLength = tag.getInt("Length");
+            this.customFullChar = tag.getInt("FullChar").map(integer -> (char) integer.intValue()).orElse(this.customFullChar);
+            this.customEmptyChar = tag.getInt("EmptyChar").map(integer -> (char) integer.intValue()).orElse(this.customEmptyChar);
+            this.customLength = tag.getInt("Length").orElse(this.customLength);
         }
     }
 }

src/main/java/org/samo_lego/healthcare/mixin/PlayerEntityMixinCast_Preferences.java

@@ -48,10 +48,7 @@ private void writeCustomDataToTag(CompoundTag tag, CallbackInfo ci) {
 
     @Inject(method = "readAdditionalSaveData", at = @At("TAIL"))
     private void readCustomDataFromTag(CompoundTag tag, CallbackInfo ci) {
-        if (tag.contains("Healthbar")) {
-            CompoundTag healthbar = tag.getCompound("Healthbar");
-            this.hc_healthbar.fromTag(healthbar);
-        }
+        tag.getCompound("Healthbar").ifPresent(this.hc_healthbar::fromTag);
     }
 
     @Override

src/main/java/org/samo_lego/healthcare/mixin/ServerCommonPacketListenerMixin_HealthTag.java

@@ -1,6 +1,5 @@
 package org.samo_lego.healthcare.mixin;
 
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.chat.Component;