feat: add Totem of Corruption to Deployable Display

Author: Fix3dll

src/main/java/com/fix3dll/skyblockaddons/features/deployable/Deployable.java

@@ -21,7 +21,10 @@ public enum Deployable {
     SOS_FLARE(1.25, 30, 25, 10, 5,  "c0062cc98ebda72a6a4b89783adcef2815b483a01d73ea87b3df76072a89d13b", 40*40, "sos"),
 
     // Umberella
-    UMBERELLA("Umberella ", 5, 30*30, "umberella");
+    UMBERELLA("Umberella ", 5, 30*30, "umberella"),
+
+    // Totem of Corruption
+    TOTEM_OF_CORRUPTION("Totem of Corruption", 30*30, "totem_of_corruption");
 
     /**
      * Start of the display name of the actual floating deployable entity.
@@ -79,32 +82,41 @@ public enum Deployable {
 
     // Orbs
     Deployable(String display, double healthRegen, double manaRegen, int strength, double vitality, double mending, int rangeSquared, String resourcePath) {
+        this(rangeSquared, resourcePath);
         this.display = display;
         this.healthRegen = healthRegen;
         this.manaRegen = manaRegen;
         this.strength = strength;
         this.vitality = vitality;
         this.mending = mending;
-        this.rangeSquared = rangeSquared;
-        this.resourceLocation = SkyblockAddons.resourceLocation("deployables/"+resourcePath+".png");
     }
 
     // Flares
     Deployable(double manaRegen, double vitality, int trueDefense, int ferocity, int bonusAttackSpeed, String textureId, int rangeSquared, String resourcePath) {
+        this(rangeSquared, resourcePath);
         this.manaRegen = manaRegen;
         this.vitality = vitality;
         this.trueDefense = trueDefense;
         this.ferocity = ferocity;
         this.bonusAttackSpeed = bonusAttackSpeed;
-        this.rangeSquared = rangeSquared;
-        this.resourceLocation = SkyblockAddons.resourceLocation("deployables/"+resourcePath+".png");
         this.textureId = textureId;
     }
 
     // Umberella
     Deployable(String display, int trophyFishChance, int rangeSquared, String resourcePath) {
+        this(rangeSquared, resourcePath);
         this.display = display;
         this.trophyFishChance = trophyFishChance;
+    }
+
+    // Totem of Corruption
+    Deployable(String display, int rangeSquared, String resourcePath) {
+        this(rangeSquared, resourcePath);
+        this.display = display;
+    }
+
+    // Base
+    Deployable(int rangeSquared, String resourcePath) {
         this.rangeSquared = rangeSquared;
         this.resourceLocation = SkyblockAddons.resourceLocation("deployables/"+resourcePath+".png");
     }

src/main/java/com/fix3dll/skyblockaddons/features/deployable/DeployableManager.java

@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.decoration.ArmorStand;
@@ -28,7 +29,9 @@ public class DeployableManager {
 
     /** The DeployableManager instance. */
     @Getter private static final DeployableManager instance = new DeployableManager();
+    private static final Minecraft MC = Minecraft.getInstance();
     private static final Pattern POWER_ORB_PATTERN = Pattern.compile("[A-Za-z ]* (?<seconds>[0-9]*)s");
+    private static final Pattern TOTEM_PATTERN = Pattern.compile("Remaining: (?:(?<minutes>\\d{1,2})m )?(?<seconds>\\d{1,2})s");
 
     /** Entry displaying {@link Deployable#SOS_FLARE} at 90 seconds for the edit screen */
     public static ArmorStand DUMMY_ARMOR_STAND;
@@ -37,7 +40,7 @@ public class DeployableManager {
     private final Map<Deployable, DeployableEntry> deployableEntryMap = new HashMap<>();
 
     static {
-        DUMMY_ARMOR_STAND = new ArmorStand(EntityType.ARMOR_STAND, Minecraft.getInstance().level);
+        DUMMY_ARMOR_STAND = new ArmorStand(EntityType.ARMOR_STAND, MC.level);
         DUMMY_ARMOR_STAND.setItemSlot(EquipmentSlot.HEAD, ItemUtils.getTexturedHead("SOS_FLARE"));
         DUMMY_ARMOR_STAND.setInvisible(true);
         DUMMY_DEPLOYABLE_ENTRY = new DeployableEntry(Deployable.SOS_FLARE, 90, DUMMY_ARMOR_STAND.getUUID());
@@ -70,48 +73,65 @@ public DeployableEntry getActiveDeployable() {
      * @param entityArmorStand The entity to detect whether it is a deployable or not.
      */
     public void detectDeployables(ArmorStand entityArmorStand) {
-        if (entityArmorStand.getCustomName() != null) {
-            Minecraft mc = Minecraft.getInstance();
-
-            String customNameTag;
-            if (entityArmorStand.getCustomName() != null) {
-                customNameTag = entityArmorStand.getCustomName().getString();
-            } else {
-                return;
-            }
-
-            Deployable orb = Deployable.getByDisplayName(customNameTag);
-
-            if (orb != null && orb.isInRadius(entityArmorStand.distanceToSqr(mc.player))) {
-                Matcher matcher = POWER_ORB_PATTERN.matcher(customNameTag);
+        Component customName = entityArmorStand.getCustomName();
 
-                if (matcher.matches()) {
-                    int seconds;
-                    try {
-                        // Apparently they don't have a second count for moment after spawning, that's what this try-catch is for
-                        seconds = Integer.parseInt(matcher.group("seconds"));
-                    } catch (NumberFormatException ex) {
-                        // It's okay, just don't add the deployable I guess...
-                        return;
-                    }
+        if (customName != null) {
+            String customNameString = customName.getString();
+            Deployable orb = Deployable.getByDisplayName(customNameString);
 
-                    if (mc.level == null) return;
-                    List<ArmorStand> surroundingArmorStands = mc.level.getEntitiesOfClass(
+            if (orb != null && orb.isInRadius(entityArmorStand.distanceToSqr(MC.player))) {
+                if (orb == Deployable.TOTEM_OF_CORRUPTION) {
+                    List<ArmorStand> surroundingArmorStands = MC.level.getEntitiesOfClass(
                             ArmorStand.class,
                             new AABB(
                                     entityArmorStand.getX() - 0.1,
                                     entityArmorStand.getY() - 1,
                                     entityArmorStand.getZ() - 0.1,
                                     entityArmorStand.getX() + 0.1,
-                                    entityArmorStand.getY() + 1,
+                                    entityArmorStand.getY(),
                                     entityArmorStand.getZ() + 0.1
-                            ),
-                            armorStandEntity -> armorStandEntity.getItemBySlot(EquipmentSlot.HEAD) != ItemStack.EMPTY
+                            )
                     );
-                    if (!surroundingArmorStands.isEmpty()) {
-                        ArmorStand orbArmorStand = surroundingArmorStands.getFirst();
-
-                        put(orb, seconds, orbArmorStand == null ? null : orbArmorStand.getUUID());
+                    for (ArmorStand entry : surroundingArmorStands) {
+                        Component entryCustomName = entry.getCustomName();
+                        if (entryCustomName == null) continue;
+
+                        Matcher matcher = TOTEM_PATTERN.matcher(entryCustomName.getString());
+                        if (matcher.matches()) {
+                            put(orb, getSeconds(matcher), entry.getUUID());
+                            break;
+                        }
+                    }
+                } else {
+                    Matcher matcher = POWER_ORB_PATTERN.matcher(customNameString);
+
+                    if (matcher.matches()) {
+                        int seconds;
+                        try {
+                            // Apparently they don't have a second count for moment after spawning, that's what this try-catch is for
+                            seconds = Integer.parseInt(matcher.group("seconds"));
+                        } catch (NumberFormatException ex) {
+                            // It's okay, just don't add the deployable I guess...
+                            return;
+                        }
+
+                        List<ArmorStand> surroundingArmorStands = MC.level.getEntitiesOfClass(
+                                ArmorStand.class,
+                                new AABB(
+                                        entityArmorStand.getX() - 0.1,
+                                        entityArmorStand.getY() - 1,
+                                        entityArmorStand.getZ() - 0.1,
+                                        entityArmorStand.getX() + 0.1,
+                                        entityArmorStand.getY() + 1,
+                                        entityArmorStand.getZ() + 0.1
+                                ),
+                                armorStandEntity -> armorStandEntity.getItemBySlot(EquipmentSlot.HEAD) != ItemStack.EMPTY
+                        );
+                        if (!surroundingArmorStands.isEmpty()) {
+                            ArmorStand orbArmorStand = surroundingArmorStands.getFirst();
+
+                            put(orb, seconds, orbArmorStand == null ? null : orbArmorStand.getUUID());
+                        }
                     }
                 }
             }
@@ -128,7 +148,7 @@ public void detectDeployables(ArmorStand entityArmorStand) {
                 if (decodedTextureUrl == null) return;
 
                 Deployable flare = Deployable.getByTextureId(decodedTextureUrl);
-                if (flare != null && flare.isInRadius(entityArmorStand.distanceToSqr(Minecraft.getInstance().player))) {
+                if (flare != null && flare.isInRadius(entityArmorStand.distanceToSqr(MC.player))) {
                     // Default exist time of flares
                     int seconds = 180;
                     // 1 tick = 50ms
@@ -140,6 +160,21 @@ public void detectDeployables(ArmorStand entityArmorStand) {
         }
     }
 
+    private static int getSeconds(Matcher matcher) {
+        String secondsStr = matcher.group("seconds");
+        int seconds = 0;
+        if (secondsStr != null && !secondsStr.isEmpty()) {
+            seconds = Integer.parseInt(secondsStr);
+        }
+
+        String minutesStr = matcher.group("minutes");
+        if (minutesStr != null && !minutesStr.isEmpty()) {
+            seconds += Integer.parseInt(minutesStr) * 60;
+        }
+
+        return seconds;
+    }
+
     @Getter @AllArgsConstructor
     public static class DeployableEntry {
         /** The Deployable type. */

src/main/java/com/fix3dll/skyblockaddons/listeners/RenderListener.java

@@ -2441,7 +2441,7 @@ private void drawCompactDeployableStatus(GuiGraphics graphics, float scale, Butt
             entity = DeployableManager.DUMMY_ARMOR_STAND;
         }
 
-        if (entity instanceof ArmorStand armorStand) {
+        if (entity instanceof ArmorStand armorStand && !isUnarmored(armorStand)) {
             drawDeployableArmorStand(graphics, armorStand, x, y, scale);
         } else {
             graphics.blit(RenderPipelines.GUI_TEXTURED, deployable.getResourceLocation(), (int) x, (int) y, 0, 0, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE);
@@ -2540,8 +2540,8 @@ private void drawDetailedDeployableStatus(GuiGraphics graphics, float scale, But
         int iconAndSecondsHeight = DEPLOYABLE_GUI_SIZE + MC.font.lineHeight;
 
         int effectsHeight = (MC.font.lineHeight + spacingBetweenLines) * display.size();
-        int width = DEPLOYABLE_GUI_SIZE + 2 + longestLine.map(MC.font::width).orElseGet(() ->
-                MC.font.width(display.getFirst())
+        int width = DEPLOYABLE_GUI_SIZE + 2 + longestLine.map(MC.font::width).orElseGet(
+                () -> display.isEmpty() ? 0 : MC.font.width(display.getFirst())
         );
         int height = Math.max(effectsHeight, iconAndSecondsHeight);
 
@@ -2571,7 +2571,7 @@ private void drawDetailedDeployableStatus(GuiGraphics graphics, float scale, But
             entity = DeployableManager.DUMMY_ARMOR_STAND;
         }
 
-        if (entity instanceof ArmorStand armorStand) {
+        if (entity instanceof ArmorStand armorStand && !isUnarmored(armorStand)) {
             drawDeployableArmorStand(graphics, armorStand, x, y, scale);
         } else {
             graphics.blit(RenderPipelines.GUI_TEXTURED, deployable.getResourceLocation(), (int) x, (int) y, 0, 0, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE, DEPLOYABLE_GUI_SIZE);
@@ -2598,6 +2598,19 @@ private void drawDetailedDeployableStatus(GuiGraphics graphics, float scale, But
         }
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    private boolean isUnarmored(LivingEntity livingEntity) {
+        for (EquipmentSlot slot : EquipmentSlot.values()) {
+            if (!slot.isArmor()) continue;
+            ItemStack slotItem = livingEntity.getItemBySlot(slot);
+
+            if (slotItem != ItemStack.EMPTY) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void setGui() {
         if (this.guiToOpen == GUIType.MAIN) {
             MC.setScreen(new SkyblockAddonsGui(this.guiPageToOpen, this.guiTabToOpen));