Fix only one symbol displaying, fix resetting entity text displays

Author: Kalbskinder

src/main/java/net/kalbskinder/mobHealth/MobHealth.java

@@ -20,7 +20,7 @@ public final class MobHealth extends JavaPlugin {
 
     private final HealthColorUtil healthColorUtil = new HealthColorUtil();
     private final TextUtil textUtil = new TextUtil();
-    private final RenameMobService renameMobService = new RenameMobService(healthColorUtil, textUtil);
+    private final RenameMobService renameMobService = new RenameMobService(healthColorUtil, textUtil, this);
 
     @Getter private static MobHealth instance;
 

src/main/java/net/kalbskinder/mobHealth/service/RenameMobService.java

@@ -1,6 +1,5 @@
 package net.kalbskinder.mobHealth.service;
 
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.kalbskinder.mobHealth.MobHealth;
 import net.kalbskinder.mobHealth.configuration.Config;
@@ -15,11 +14,17 @@
 import org.bukkit.persistence.PersistentDataType;
 
 @Slf4j
-@RequiredArgsConstructor
 public class RenameMobService {
 
     private final HealthColorUtil healthColorUtil;
     private final TextUtil textUtil;
+    private final NamespacedKey healthDisplayKey;
+
+    public RenameMobService(HealthColorUtil healthColorUtil, TextUtil textUtil, MobHealth instance) {
+        this.healthColorUtil = healthColorUtil;
+        this.textUtil = textUtil;
+        this.healthDisplayKey = new NamespacedKey(instance, "mob_health_display");
+    }
 
     public double getDefaultMaxHealth(LivingEntity entity) {
         return entity.getAttribute(Attribute.MAX_HEALTH).getValue();
@@ -77,6 +82,8 @@ public void renameMob(Entity anyEntity, DisplaySetting activeDisplaySetting) {
     }
 
     private void renameMobSkyblock(LivingEntity entity, EntityProperties props) {
+        resetMobName(entity);
+        entity.setCustomNameVisible(false);
 
         String healthColor = healthColorUtil.getSkyblockHealthColor(props.health(), props.maxHealth());
         String prefix = Config.HealthBars.Skyblock.PREFIX();
@@ -105,7 +112,7 @@ private void renameMobSkyblock(LivingEntity entity, EntityProperties props) {
     }
 
     private void renameMobSprite(Entity entity, EntityProperties props) {
-        entity.setCustomNameVisible(false);
+        resetMobName(entity);
 
         int totalHalfHeartsHealth = (int) Math.round(props.health());
         int fullSprites = totalHalfHeartsHealth / 2;
@@ -148,18 +155,9 @@ private void renameMobSprite(Entity entity, EntityProperties props) {
         String displayName = "%s\n%s%s".formatted(convertedPrefix, heartsDisplay, convertedSuffix);
 
         World world = entity.getWorld();
-        NamespacedKey healthDisplayKey = new NamespacedKey(MobHealth.getInstance(), "mob_health_display");
-        NamespacedKey healthDisplayBgKey = new NamespacedKey(MobHealth.getInstance(), "mob_health_display_bg");
         String entityId = entity.getUniqueId().toString();
 
         // Remove any lingering background display from previous implementation
-        world.getEntities().stream()
-                .filter(e -> e instanceof TextDisplay)
-                .map(e -> (TextDisplay) e)
-                .filter(e -> e.getPersistentDataContainer().has(healthDisplayBgKey, PersistentDataType.STRING)
-                        && entityId.equals(e.getPersistentDataContainer().get(healthDisplayBgKey, PersistentDataType.STRING)))
-                .forEach(Entity::remove);
-
         TextDisplay textDisplay = world.getEntities().stream()
                 .filter(e -> e instanceof TextDisplay)
                 .map(e -> (TextDisplay) e)
@@ -183,6 +181,7 @@ private void renameMobSprite(Entity entity, EntityProperties props) {
     }
 
     public void renameMobSymbol(Entity entity, EntityProperties props) {
+        resetMobName(entity);
         String symbol = Config.HealthBars.Symbols.SYMBOL();
         String healthColor = healthColorUtil.getSymbolHealthColor(props.health(), props.maxHealth());
         String prefix = Config.HealthBars.Symbols.PREFIX();
@@ -192,12 +191,10 @@ public void renameMobSymbol(Entity entity, EntityProperties props) {
             prefix = "%s %s".formatted(props.levelPrefix(), prefix);
         }
 
-        double roundedHealth = Math.max(0, roundToHalf(props.health()));
-        String symbols = "";
-
-        for (int i = 0; i < (int) roundedHealth; i++) {
-            symbols = healthColor + symbol;
-        }
+        // 1 symbol per 2 HP, max 20, minimum 1
+        int symbolsToShow = (int) Math.ceil(props.health() / 2.0);
+        symbolsToShow = Math.max(1, Math.min(symbolsToShow, 20));
+        String symbols = symbol.repeat(symbolsToShow);
 
         String healthBarDisplay = String.format("%s%s", healthColor, symbols);
 
@@ -219,4 +216,16 @@ private void formatMobDisplayName(Entity entity, EntityProperties props, String
             entity.setCustomName(textUtil.parseLegacy(mobDisplayName));
         }
     }
+
+    private void resetMobName(Entity entity) {
+        String entityId = entity.getUniqueId().toString();
+        entity.getPassengers().stream()
+                .filter(e -> e instanceof TextDisplay)
+                .map(e -> (TextDisplay) e)
+                .filter(e -> e.getPersistentDataContainer().has(healthDisplayKey, PersistentDataType.STRING)
+                        && entityId.equals(e.getPersistentDataContainer().get(healthDisplayKey, PersistentDataType.STRING)))
+                .forEach(Entity::remove);
+
+        entity.setCustomName(null);
+    }
 }