fix: turtle helmet wearing

sakura-ryoko · Sep 13, 2024 · a881371 · a881371
1 parent 51615eb
commit a881371
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ author = masa
 mod_file_name = malilib-fabric
 
 # Current mod version
-mod_version = 0.20.3-sakura.1
+mod_version = 0.20.3-sakura.2
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21

diff --git a/src/main/java/fi/dy/masa/malilib/render/RenderUtils.java b/src/main/java/fi/dy/masa/malilib/render/RenderUtils.java
@@ -469,6 +469,8 @@ public static int getHudOffsetForPotions(HudAlignment alignment, double scale, P
             }
 
             Collection<StatusEffectInstance> effects = player.getStatusEffects();
+            boolean hasTurtleHelmet = EntityUtils.hasTurtleHelmetEquipped(player);
+            // Turtle Helmets only add their status effects when in water
 
             if (effects.isEmpty() == false)
             {
@@ -493,8 +495,17 @@ public static int getHudOffsetForPotions(HudAlignment alignment, double scale, P
                     }
                 }
 
+                if (hasTurtleHelmet && y1 == 0)
+                {
+                    y1 = 26;
+                }
+
                 return (int) (Math.max(y1, y2) / scale);
             }
+            else if (hasTurtleHelmet)
+            {
+                return (int) ((int) 26 / scale);
+            }
         }
 
         return 0;

diff --git a/src/main/java/fi/dy/masa/malilib/util/EntityUtils.java b/src/main/java/fi/dy/masa/malilib/util/EntityUtils.java
@@ -1,8 +1,13 @@
 package fi.dy.masa.malilib.util;
 
 import javax.annotation.Nullable;
+
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 
 public class EntityUtils
 {
@@ -23,4 +28,21 @@ public static Entity getCameraEntity()
 
         return entity;
     }
+
+    /**
+     * Returns weather or not the Entity has a Turtle Helmet equipped
+     * @param player (The Player)
+     * @return (True/False)
+     */
+    public static boolean hasTurtleHelmetEquipped(PlayerEntity player)
+    {
+        if (player == null)
+        {
+            return false;
+        }
+
+        ItemStack stack = player.getEquippedStack(EquipmentSlot.HEAD);
+
+        return !stack.isEmpty() && stack.isOf(Items.TURTLE_HELMET);
+    }
 }