Refector to simplify further

Author: tastybento

src/main/java/world/bentobox/aoneblock/AOneBlock.java

@@ -161,7 +161,7 @@ public void onDisable() {
 
         // Clear holograms
         if (holoListener != null) {
-            holoListener.clear();
+            holoListener.onDisable();
         }
     }
 

src/main/java/world/bentobox/aoneblock/listeners/HoloListener.java

@@ -2,11 +2,9 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.entity.Display.Billboard;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -27,19 +25,18 @@
 
 /**
  * Handles Holographic elements
- *
- * @author tastybento, HSGamer
  */
 public class HoloListener implements Listener {
     private final AOneBlock addon;
-    private final Set<Location> holograms;
+    private final Set<Location> activeHolograms;
+    private static final Vector DEFAULT_OFFSET = new Vector(0.5, 1.1, 0.5);
 
     /**
      * @param addon - OneBlock
      */
     public HoloListener(@NonNull AOneBlock addon) {
         this.addon = addon;
-        this.holograms = new HashSet<>();
+        this.activeHolograms = new HashSet<>();
     }
 
     /**
@@ -50,173 +47,149 @@ public HoloListener(@NonNull AOneBlock addon) {
      */
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onDeletedIsland(IslandDeleteEvent e) {
-        deleteHologram(e.getIsland());
+        removeHologramAt(e.getIsland());
     }
 
     /**
-     * Creates a new hologram (TextDisplay) at the island's center plus offset.
-     * Caches the hologram for future reference.
-     *
-     * @param island the island to create the hologram for
-     * @return the created TextDisplay
+     * Clears all cached holograms and removes their entities.
+     * Called when disabling
      */
-    private TextDisplay createHologram(Island island) {
-        Location pos = island.getCenter().clone().add(parseVector(addon.getSettings().getOffset()));
-        World world = pos.getWorld();
-        assert world != null;
-
-        TextDisplay newDisplay = world.spawn(pos, TextDisplay.class);
-        newDisplay.setAlignment(TextDisplay.TextAlignment.CENTER);
-        newDisplay.setBillboard(Billboard.CENTER);
-        // Save location so it can be deleted
-        holograms.add(pos);
-
-        return newDisplay;
+    public void onDisable() {
+        activeHolograms.forEach(this::cleanupHologram);
+        activeHolograms.clear();
     }
 
     /**
-     * Parses a string in the format "x,y,z" into a Vector.
-     * If parsing fails, returns a default vector.
+     * Sets up the hologram for a specific island.
+     * If it's a new island, sets the starting hologram line.
      *
-     * @param str the string to parse
-     * @return the parsed Vector
+     * @param island the island to set up
+     * @param is the OneBlockIslands data object
+     * @param newIsland whether this is a new island
      */
-    private static Vector parseVector(String str) {
-        if (str == null) {
-            return new Vector(0.5, 1.1, 0.5);
-        }
-        String[] parts = str.split(",");
-        if (parts.length != 3) {
-            return new Vector(0.5, 1.1, 0.5);
+    protected void setUp(@NonNull Island island, @NonNull OneBlockIslands is, boolean newIsland) {
+        if (!addon.getSettings().isUseHolograms() || island.getOwner() == null) {
+            return;
         }
 
-        try {
-            double x = Double.parseDouble(parts[0].trim());
-            double y = Double.parseDouble(parts[1].trim());
-            double z = Double.parseDouble(parts[2].trim());
-            return new Vector(x, y, z);
-        } catch (NumberFormatException e) {
-            return new Vector(0.5, 1.1, 0.5);
+        if (newIsland) {
+            String startingText = User.getInstance(island.getOwner())
+                .getTranslation("aoneblock.island.starting-hologram");
+            is.setHologram(startingText == null ? "" : startingText);
         }
+        updateHologram(island, is.getHologram());
+    }
+
+    /**
+     * Processes the phase change for an island and updates its hologram.
+     *
+     * @param i the island
+     * @param is the OneBlockIslands data object
+     * @param phase the current OneBlockPhase
+     */
+    protected void process(@NonNull Island i, @NonNull OneBlockIslands is, @NonNull OneBlockPhase phase) {
+        String holoText = phase.getHologramLine(is.getBlockNumber());
+        is.setHologram(holoText == null ? "" : Util.translateColorCodes(holoText));
+        updateHologram(i, is.getHologram());
     }
 
     /**
      * Updates the hologram lines for the given island.
      * Handles creation, updating, and scheduled deletion of holograms.
      *
      * @param island the island to update
-     * @param oneBlockIsland the OneBlockIslands data object
+     * @param text the text to display
      */
-    private void updateLines(Island island, OneBlockIslands oneBlockIsland) {
-        // Ignore if holograms are disabled
-        if (!addon.getSettings().isUseHolograms()) {
-            return;
-        }
-        // Delete the old hologram, if any
-        this.deleteHologram(island);
-        // Get the new hologram
-        String holoLine = oneBlockIsland.getHologram();
-
-        // Return hologram if empty
-        if (holoLine.isBlank()) {
+    private void updateHologram(Island island, String text) {
+        if (!addon.getSettings().isUseHolograms() || text.isBlank()) {
             return;
         }
 
-        // Get or create hologram if needed
-        TextDisplay hologram = createHologram(island);
-
-        // Doesn't seem to do much but can't harm
-        hologram.setPersistent(true);
-
-        // Set lines to hologram
-        hologram.setText(holoLine);
+        removeHologramAt(island);
+        Location pos = getHologramLocation(island);
+        createHologram(pos, text);
 
         // Set up auto delete if duration is set
         if (addon.getSettings().getHologramDuration() > 0) {
-            Bukkit.getScheduler().runTaskLater(addon.getPlugin(), () -> deleteHologram(island), addon.getSettings().getHologramDuration() * 20L);
+            Bukkit.getScheduler().runTaskLater(addon.getPlugin(), 
+                () -> removeHologramAt(island), 
+                addon.getSettings().getHologramDuration() * 20L);
         }
     }
 
     /**
-     * Setup holograms on startup
+     * Gets the location for the hologram based on the island's center and the configured offset.
+     *
+     * @param island the island
+     * @return the location for the hologram
      */
-    public void setUp() {
-        addon.getIslands().getIslands().stream()
-        .filter(i -> addon.inWorld(i.getWorld()))
-        .forEach(island -> setUp(island, addon.getOneBlocksIsland(island), false));
+    private Location getHologramLocation(Island island) {
+        Vector offset = parseVector(addon.getSettings().getOffset());
+        return island.getCenter().clone().add(offset);
     }
 
     /**
-     * Clears all cached holograms and removes their entities.
-     * Called when disabling
+     * Creates a new hologram (TextDisplay) at the given location.
+     * Caches the hologram for future reference.
+     *
+     * @param pos the location to create the hologram at
+     * @param text the text to display
      */
-    public void clear() {
-        holograms.forEach(this::removeHologram);
-        holograms.clear();
+    private void createHologram(Location pos, String text) {
+        TextDisplay display = pos.getWorld().spawn(pos, TextDisplay.class);
+        display.setAlignment(TextDisplay.TextAlignment.CENTER);
+        display.setBillboard(Billboard.CENTER);
+        display.setPersistent(true);
+        display.setText(text);
+        activeHolograms.add(pos);
     }
 
     /**
      * Deletes the hologram for the given island and removes any residual holograms nearby.
      *
      * @param island the island whose hologram should be deleted
      */
-    private void deleteHologram(@NonNull Island island) {
+    private void removeHologramAt(@NonNull Island island) {
         if (island.getWorld() == null || island.getCenter() == null) {
             return;
         }
-        Location pos = island.getCenter().clone().add(parseVector(addon.getSettings().getOffset()));
-        removeHologram(pos);
+        cleanupHologram(getHologramLocation(island));
     }
 
     /**
      * Removes any holograms at this location
      * @param pos location
      */
-    private void removeHologram(Location pos) {
-        holograms.remove(pos);
+    private void cleanupHologram(Location pos) {
+        activeHolograms.remove(pos);
         // Chunks have to be loaded for the entity to exist to be deleted
-        Util.getChunkAtAsync(pos).thenRun(() -> {
-            // Search for entities in a small radius (e.g., 1 block around)
-            for (Entity entity : pos.getWorld().getNearbyEntities(pos, 1, 1, 1)) {
-                if (entity.getType() == EntityType.TEXT_DISPLAY) {
-                    ((TextDisplay) entity).remove();
-                }
-            }
-        });    
+        Util.getChunkAtAsync(pos).thenRun(() -> 
+            pos.getWorld().getNearbyEntities(pos, 1, 1, 1).stream()
+                .filter(e -> e.getType() == EntityType.TEXT_DISPLAY)
+                .forEach(Entity::remove));
     }
 
     /**
-     * Sets up the hologram for a specific island.
-     * If it's a new island, sets the starting hologram line.
+     * Parses a string in the format "x,y,z" into a Vector.
+     * If parsing fails, returns a default vector.
      *
-     * @param island the island to set up
-     * @param is the OneBlockIslands data object
-     * @param newIsland whether this is a new island
+     * @param str the string to parse
+     * @return the parsed Vector
      */
-    protected void setUp(@NonNull Island island, @NonNull OneBlockIslands is, boolean newIsland) {
-        UUID ownerUUID = island.getOwner();
-        if (ownerUUID == null) {
-            return;
+    private static Vector parseVector(String str) {
+        if (str == null) {
+            return DEFAULT_OFFSET;
         }
-
-        User owner = User.getInstance(ownerUUID);
-        if (newIsland) {
-            String holoLine = owner.getTranslation("aoneblock.island.starting-hologram");
-            is.setHologram(holoLine == null ? "" : holoLine);
+        try {
+            String[] parts = str.split(",");
+            return parts.length == 3 
+                ? new Vector(
+                    Double.parseDouble(parts[0].trim()),
+                    Double.parseDouble(parts[1].trim()),
+                    Double.parseDouble(parts[2].trim()))
+                : DEFAULT_OFFSET;
+        } catch (NumberFormatException e) {
+            return DEFAULT_OFFSET;
         }
-        updateLines(island, is);
-    }
-
-    /**
-     * Processes the phase change for an island and updates its hologram.
-     *
-     * @param i the island
-     * @param is the OneBlockIslands data object
-     * @param phase the current OneBlockPhase
-     */
-    protected void process(@NonNull Island i, @NonNull OneBlockIslands is, @NonNull OneBlockPhase phase) {
-        String holoLine = phase.getHologramLine(is.getBlockNumber());
-        is.setHologram(holoLine == null ? "" : Util.translateColorCodes(holoLine));
-        updateLines(i, is);
     }
 }