add: Hide Haunted Skulls from Soulweaver Gloves

Author: Fix3dll

src/main/java/codes/biscuit/skyblockaddons/asm/hooks/RenderManagerHook.java

@@ -6,6 +6,7 @@
 import codes.biscuit.skyblockaddons.core.Location;
 import codes.biscuit.skyblockaddons.core.npc.NPCUtils;
 import codes.biscuit.skyblockaddons.features.JerryPresent;
+import codes.biscuit.skyblockaddons.utils.ItemUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.client.particle.EntityFX;
@@ -20,6 +21,7 @@
 public class RenderManagerHook {
 
     private static final int HIDE_RADIUS_SQUARED = 7 * 7;
+    private static final String HAUNTED_SKULL_TEXTURE = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmYyNGVkNjg3NTMwNGZhNGExZjBjNzg1YjJjYjZhNmE3MjU2M2U5ZjNlMjRlYTU1ZTE4MTc4NDUyMTE5YWE2NiJ9fX0=";
 
     public static void shouldRender(Entity entityIn, ReturnValue<Boolean> returnValue) {
         Minecraft mc = Minecraft.getMinecraft();
@@ -36,6 +38,15 @@ public static void shouldRender(Entity entityIn, ReturnValue<Boolean> returnValu
                     }
                 }
             }
+            if (main.getConfigValues().isEnabled(Feature.HIDE_HAUNTED_SKULLS) && currentLocation == Location.THE_CATACOMBS) {
+                if (entityIn instanceof EntityArmorStand && entityIn.isInvisible()) {
+                    EntityArmorStand armorStand = (EntityArmorStand) entityIn;
+                    String skullID = ItemUtils.getSkullTexture(armorStand.getEquipmentInSlot(4));
+                    if (HAUNTED_SKULL_TEXTURE.equals(skullID)) {
+                        returnValue.cancel();
+                    }
+                }
+            }
             if (mc.theWorld != null && main.getConfigValues().isEnabled(Feature.HIDE_PLAYERS_NEAR_NPCS) && currentLocation != Location.GUEST_ISLAND && currentLocation != Location.THE_CATACOMBS) {
                 if (entityIn instanceof EntityOtherPlayerMP && !NPCUtils.isNPC(entityIn) && NPCUtils.isNearNPC(entityIn)) {
                     returnValue.cancel();

src/main/java/codes/biscuit/skyblockaddons/core/Feature.java

@@ -233,6 +233,7 @@ public enum Feature {
     FIRE_FREEZE_TIMER(238, "settings.fireFreezeTimer", new GuiFeatureData(EnumUtils.DrawType.TEXT, ColorCode.YELLOW), false, EnumUtils.FeatureSetting.FIRE_FREEZE_SOUND, EnumUtils.FeatureSetting.FIRE_FREEZE_WHEN_HOLDING),
     FIRE_FREEZE_SOUND(239, "", null, false),
     FIRE_FREEZE_WHEN_HOLDING(240, "", null, false),
+    HIDE_HAUNTED_SKULLS(241, "settings.hideHauntedSkulls", null, true),
 
 
     WARNING_TIME(-1, "settings.warningDuration", null, false),

src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java

@@ -311,7 +311,7 @@ public enum FeatureCredit {
         HANNIBAL2("Hannibal2", "github.com/hannibal00212", Feature.CRIMSON_ARMOR_ABILITY_STACKS, Feature.HIDE_TRUE_DEFENSE),
         JASON54("jason54jg", "github.com/jason54jg", Feature.INFERNO_SLAYER_TRACKER, Feature.INFERNO_COLOR_BY_RARITY, Feature.INFERNO_TEXT_MODE),
         SOULTWISTRUNE("soultwistrune", "github.com/soultwistrune", Feature.RIFTSTALKER_SLAYER_TRACKER, Feature.RIFTSTALKER_COLOR_BY_RARITY, Feature.RIFTSTALKER_TEXT_MODE),
-        FIX3DLL("Fix3dll", "github.com/Fix3dll", Feature.FIRE_FREEZE_TIMER);
+        FIX3DLL("Fix3dll", "github.com/Fix3dll", Feature.FIRE_FREEZE_TIMER, Feature.HIDE_HAUNTED_SKULLS);
 
         private final Set<Feature> features;
         private final String author;

src/main/java/codes/biscuit/skyblockaddons/utils/ItemUtils.java

@@ -17,6 +17,7 @@
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.*;
+import net.minecraftforge.common.util.Constants;
 import org.apache.commons.lang3.text.WordUtils;
 
 import java.io.ByteArrayOutputStream;
@@ -558,6 +559,22 @@ public static String getSkullOwnerID(ItemStack skull) {
         return null;
     }
 
+    /**
+     * Given a skull ItemStack, returns the texture, or null if it doesn't exist.
+     */
+    public static String getSkullTexture(ItemStack skull) {
+        if (skull == null || !skull.hasTagCompound()) {
+            return null;
+        }
+
+        NBTTagCompound nbt = skull.getTagCompound();
+        if (nbt.hasKey("SkullOwner", 10)) {
+            return nbt.getCompoundTag("SkullOwner").getCompoundTag("Properties")
+                    .getTagList("textures", Constants.NBT.TAG_COMPOUND).getCompoundTagAt(0).getString("Value");
+        }
+        return null;
+    }
+
     public static NBTTagByteArray getCompressedNBT(ItemStack[] items) {
         if (items == null) {
             return null;

src/main/resources/lang/en_US.json

@@ -236,7 +236,8 @@
     "hideOnlyOutsideRift": "Hide only outside Rift Dimension",
     "fireFreezeTimer": "Fire Freeze Timer F3/M3",
     "fireFreezeSound": "When countdown hit 0 play sound",
-    "fireFreezeWhenHolding": "Only show while holding Fire Freeze"
+    "fireFreezeWhenHolding": "Only show while holding Fire Freeze",
+    "hideHauntedSkulls": "Hide Haunted Skulls from Soulweaver Gloves"
   },
   "messages": {
     "enchants": "Enchants",