Small cleanup

core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologram.java

@@ -5,7 +5,6 @@
  */
 package me.filoghost.holographicdisplays.core.hologram;
 
-import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -43,6 +42,4 @@ public interface StandardHologram {
 
     void setDeleted();
 
-    NMSManager getNMSManager();
-
 }

core/src/main/java/me/filoghost/holographicdisplays/core/nms/ChatComponentAdapter.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) filoghost and contributors
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-package me.filoghost.holographicdisplays.core.nms;
-
-import java.util.List;
-
-public interface ChatComponentAdapter<T> {
-    
-    T cast(Object chatComponentObject);
-    
-    String getText(T chatComponent);
-    
-    List<T> getSiblings(T chatComponent);
-    
-    void addSibling(T chatComponent, T newSibling);
-    
-    default T cloneComponent(T chatComponent) {
-        return cloneComponent(chatComponent, getText(chatComponent));
-    }
-    
-    T cloneComponent(T chatComponent, String newText);
-    
-}

core/src/main/java/me/filoghost/holographicdisplays/core/nms/ChatComponentCustomNameEditor.java

@@ -7,37 +7,30 @@ package me.filoghost.holographicdisplays.core.nms;
 
 import java.util.List;
 
-public class CustomNameHelper {
+public interface ChatComponentCustomNameEditor<T> extends CustomNameEditor {
     
-    
+    @Override
-    public static String replaceCustomNameString(Object customNameObject, String target, String replacement) {
+    default T replaceCustomName(Object customNameObject, String target, String replacement) {
-        String customName = (String) customNameObject;
-        if (customName.contains(target)) {
-            return customName.replace(target, replacement);
-        } else {
-            return customName;
-        }
-    }
-    
-    public static <T> T replaceCustomNameChatComponent(ChatComponentAdapter<T> versionAdapter, Object customNameObject, String target, String replacement) {
         // Custom name is expected to be a ChatComponentText with empty text and child components (called "siblings") that do not contain more components.
-        T rootComponent = versionAdapter.cast(customNameObject);
+        @SuppressWarnings("unchecked")
-        if (!versionAdapter.getText(rootComponent).isEmpty()) {
+        T rootComponent = (T) customNameObject;
+        
+        if (!getText(rootComponent).isEmpty()) {
             throw new IllegalArgumentException("Expected root component with empty text");
         }
         
         boolean[] childrenContainingTarget = null;
-        List<T> children = versionAdapter.getSiblings(rootComponent);
+        List<T> children = getSiblings(rootComponent);
         int childrenSize = children.size();
         
         for (int i = 0; i < childrenSize; i++) {
-            T childComponent = versionAdapter.cast(children.get(i));
+            T childComponent = children.get(i);
 
-            if (!versionAdapter.getSiblings(childComponent).isEmpty()) {
+            if (!getSiblings(childComponent).isEmpty()) {
                 throw new IllegalArgumentException("Expected child component without sub-nodes");
             }
             
-            if (versionAdapter.getText(childComponent).contains(target)) {
+            if (getText(childComponent).contains(target)) {
                 // Lazy initialization for performance, since this method can be called frequently.
                 if (childrenContainingTarget == null) {
                     childrenContainingTarget = new boolean[childrenSize];
@@ -52,20 +45,32 @@ public class CustomNameHelper {
         }
         
         // Clone all the objects and apply replacements where needed.
-        T clonedRoot = versionAdapter.cloneComponent(rootComponent);
+        T clonedRoot = cloneComponent(rootComponent);
         for (int i = 0; i < childrenSize; i++) {
             T childComponent = children.get(i);
             
-            String newText = versionAdapter.getText(childComponent);
+            String newText = getText(childComponent);
             if (childrenContainingTarget[i]) {
                 newText = newText.replace(target, replacement);
             }
             
-            T clonedChild = versionAdapter.cloneComponent(childComponent, newText);
+            T clonedChild = cloneComponent(childComponent, newText);
-            versionAdapter.addSibling(clonedRoot, clonedChild);
+            addSibling(clonedRoot, clonedChild);
         }
         
         return clonedRoot;
     }
 
+    String getText(T chatComponent);
+    
+    List<T> getSiblings(T chatComponent);
+    
+    void addSibling(T chatComponent, T newSibling);
+    
+    default T cloneComponent(T chatComponent) {
+        return cloneComponent(chatComponent, getText(chatComponent));
+    }
+    
+    T cloneComponent(T chatComponent, String newText);
+    
 }

core/src/main/java/me/filoghost/holographicdisplays/core/nms/CustomNameEditor.java

@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) filoghost and contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+package me.filoghost.holographicdisplays.core.nms;
+
+public interface CustomNameEditor {
+
+    Object replaceCustomName(Object customNameObject, String target, String replacement);
+
+}

core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSCommons.java

@@ -11,7 +11,7 @@ import org.bukkit.ChatColor;
 public class NMSCommons {
 
     // This is used on hologram icons, to prevent vanilla items from merging with them.
-    public static final String ANTISTACK_LORE = ChatColor.BLACK.toString() + Math.random();
+    public static final String ANTI_STACK_LORE = ChatColor.BLACK.toString() + Math.random();
 
     private static final boolean IS_PAPER_SERVER = Bukkit.getName().equals("Paper");
 

core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSManager.java

@@ -30,6 +30,6 @@ public interface NMSManager {
 
     NMSEntityBase getNMSEntityBaseFromID(org.bukkit.World bukkitWorld, int entityID);
 
-    Object replaceCustomNameText(Object customNameObject, String target, String replacement);
+    CustomNameEditor getCustomNameChatComponentEditor();
 
 }

core/src/main/java/me/filoghost/holographicdisplays/core/nms/StringCustomNameEditor.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) filoghost and contributors
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+package me.filoghost.holographicdisplays.core.nms;
+
+public enum StringCustomNameEditor implements CustomNameEditor {
+    
+    INSTANCE;
+
+    @Override
+    public String replaceCustomName(Object customNameNMSObject, String target, String replacement) {
+        String customName = (String) customNameNMSObject;
+        if (customName.contains(target)) {
+            return customName.replace(target, replacement);
+        } else {
+            return customName;
+        }
+    }
+    
+}

nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java

@@ -194,7 +194,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
         
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_10_R1.Entity;
 import net.minecraft.server.v1_10_R1.EntityTypes;
 import net.minecraft.server.v1_10_R1.MathHelper;
@@ -142,8 +143,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
 
 }

nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java

@@ -168,7 +168,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_11_R1.Entity;
 import net.minecraft.server.v1_11_R1.EntityTypes;
 import net.minecraft.server.v1_11_R1.MathHelper;
@@ -150,8 +151,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
 
 }

nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java

@@ -168,7 +168,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_12_R1.Entity;
 import net.minecraft.server.v1_12_R1.EntityTypes;
 import net.minecraft.server.v1_12_R1.MathHelper;
@@ -150,8 +151,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
     
 }

nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java

@@ -168,7 +168,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSCommons;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
@@ -167,18 +167,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -204,6 +199,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java

@@ -168,7 +168,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSCommons;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
@@ -168,18 +168,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -205,6 +200,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java

@@ -170,7 +170,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
@@ -155,22 +155,17 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
             
         private boolean useNewGetSiblingsMethod = true;
         private final ReflectField<List<IChatBaseComponent>> OLD_SIBLINGS_FIELD = ReflectField.lookup(new ClassToken<List<IChatBaseComponent>>(){}, ChatBaseComponent.class, "a");
 
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
-            
         @Override
         public String getText(IChatBaseComponent chatComponent) {
             return chatComponent.getText();
@@ -209,6 +204,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSItem.java

@@ -170,7 +170,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(NBTTagString.a(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(NBTTagString.a(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
 
         setItemStack(newItem);

nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
@@ -154,18 +154,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -191,6 +186,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java

@@ -170,7 +170,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(NBTTagString.a(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(NBTTagString.a(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
 
         setItemStack(newItem);

nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
@@ -154,18 +154,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -192,6 +187,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSItem.java

@@ -170,7 +170,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(NBTTagString.a(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(NBTTagString.a(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
 
         setItemStack(newItem);

nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
@@ -145,18 +145,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -183,6 +178,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSItem.java

@@ -170,7 +170,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
 
         NBTTagList tagList = new NBTTagList();
-        tagList.add(NBTTagString.a(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(NBTTagString.a(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
 
         setItemStack(newItem);

nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java

@@ -10,8 +10,8 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.ChatComponentAdapter;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.nms.ChatComponentCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
@@ -145,18 +145,13 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameChatComponent(NMSChatComponentAdapter.INSTANCE, customNameObject, target, replacement);
+        return VersionChatComponentCustomNameEditor.INSTANCE;
     }
     
-    private enum NMSChatComponentAdapter implements ChatComponentAdapter<IChatBaseComponent> {
+    private enum VersionChatComponentCustomNameEditor implements ChatComponentCustomNameEditor<IChatBaseComponent> {
 
-        INSTANCE {
+        INSTANCE;
-            
-            @Override
-            public ChatComponentText cast(Object chatComponentObject) {
-                return (ChatComponentText) chatComponentObject;
-            }
 
         @Override
         public String getText(IChatBaseComponent chatComponent) {
@@ -183,6 +178,4 @@ public class VersionNMSManager implements NMSManager {
         
     }
     
-    }
-    
 }

nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java

@@ -154,7 +154,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
         
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_8_R2.Entity;
 import net.minecraft.server.v1_8_R2.EntityTypes;
 import net.minecraft.server.v1_8_R2.MathHelper;
@@ -147,8 +148,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
     
 }

nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java

@@ -154,7 +154,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
         
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_8_R3.Entity;
 import net.minecraft.server.v1_8_R3.EntityTypes;
 import net.minecraft.server.v1_8_R3.MathHelper;
@@ -147,8 +148,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
 
 }

nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java

@@ -192,7 +192,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
         
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_9_R1.Entity;
 import net.minecraft.server.v1_9_R1.EntityTypes;
 import net.minecraft.server.v1_9_R1.MathHelper;
@@ -142,8 +143,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
     
 }

nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java

@@ -194,7 +194,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
         }
         
         NBTTagList tagList = new NBTTagList();
-        tagList.add(new NBTTagString(NMSCommons.ANTISTACK_LORE)); // Antistack lore
+        tagList.add(new NBTTagString(NMSCommons.ANTI_STACK_LORE)); // Antistack lore
         display.set("Lore", tagList);
         
         setItemStack(newItem);

nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java

@@ -10,14 +10,15 @@ import me.filoghost.fcommons.reflection.ClassToken;
 import me.filoghost.fcommons.reflection.ReflectField;
 import me.filoghost.fcommons.reflection.ReflectMethod;
 import me.filoghost.holographicdisplays.core.DebugLogger;
-import me.filoghost.holographicdisplays.core.nms.CustomNameHelper;
+import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
+import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.CustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.PacketController;
+import me.filoghost.holographicdisplays.core.nms.StringCustomNameEditor;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityBase;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
-import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
-import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine;
 import net.minecraft.server.v1_9_R2.Entity;
 import net.minecraft.server.v1_9_R2.EntityTypes;
 import net.minecraft.server.v1_9_R2.MathHelper;
@@ -142,8 +143,8 @@ public class VersionNMSManager implements NMSManager {
     }
     
     @Override
-    public Object replaceCustomNameText(Object customNameObject, String target, String replacement) {
+    public CustomNameEditor getCustomNameChatComponentEditor() {
-        return CustomNameHelper.replaceCustomNameString(customNameObject, target, replacement);
+        return StringCustomNameEditor.INSTANCE;
     }
     
 }

plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/MetadataHelper.java

@@ -20,13 +20,15 @@ class MetadataHelper {
     
     private final int itemSlotIndex;
     private final int entityStatusIndex;
-    private final int airLevelWatcherIndex;
+    private final int airLevelIndex;
     private final int customNameIndex;
     private final int customNameVisibleIndex;
     private final int noGravityIndex;
     private final int armorStandStatusIndex;
     private final int slimeSizeIndex;
 
+    private final boolean customNameUsesChatComponents;
+
     private Serializer itemSerializer;
     private Serializer intSerializer;
     private Serializer byteSerializer;
@@ -53,7 +55,7 @@ class MetadataHelper {
         }
         
         entityStatusIndex = 0;
-        airLevelWatcherIndex = 1;
+        airLevelIndex = 1;
         customNameIndex = 2;
         customNameVisibleIndex = 3;
         noGravityIndex = 5;
@@ -68,7 +70,10 @@ class MetadataHelper {
         }
         
         if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_13_R1)) {
+            customNameUsesChatComponents = true;
             chatComponentSerializer = Registry.get(MinecraftReflection.getIChatBaseComponentClass(), true);
+        } else {
+            customNameUsesChatComponents = false;
         }
     }
     
@@ -101,7 +106,7 @@ class MetadataHelper {
             return null;
         }
         
-        if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_13_R1)) {
+        if (customNameUsesChatComponents) {
             if (!(customNameNMSObject instanceof Optional)) {
                 throw new IllegalArgumentException("Expected custom name of type " + Optional.class);
             }
@@ -119,7 +124,7 @@ class MetadataHelper {
     
     
     public void setCustomNameNMSObject(WrappedWatchableObject customNameWatchableObject, Object customNameNMSObject) {
-        if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_13_R1)) {
+        if (customNameUsesChatComponents) {
             customNameWatchableObject.setValue(Optional.ofNullable(customNameNMSObject));
         } else {
             customNameWatchableObject.setValue(customNameNMSObject);
@@ -130,14 +135,13 @@ class MetadataHelper {
     public void setCustomNameNMSObject(WrappedDataWatcher dataWatcher, Object customNameNMSObject) {
         requireMinimumVersion(NMSVersion.v1_9_R1);
         
-        if (NMSVersion.isGreaterEqualThan(NMSVersion.v1_13_R1)) {
+        if (customNameUsesChatComponents) {
             dataWatcher.setObject(new WrappedDataWatcherObject(customNameIndex, chatComponentSerializer), Optional.ofNullable(customNameNMSObject));
         } else {
             dataWatcher.setObject(new WrappedDataWatcherObject(customNameIndex, stringSerializer), customNameNMSObject);
         }
     }
 
-    
     public void setCustomNameVisible(WrappedDataWatcher dataWatcher, boolean customNameVisible) {
         requireMinimumVersion(NMSVersion.v1_9_R1);
         dataWatcher.setObject(new WrappedDataWatcherObject(customNameVisibleIndex, booleanSerializer), customNameVisible);
@@ -163,11 +167,11 @@ class MetadataHelper {
             } else {
                 dataWatcher.setObject(new WrappedDataWatcherObject(itemSlotIndex, itemSerializer), com.google.common.base.Optional.of(nmsItemStack));
             }
-            dataWatcher.setObject(new WrappedDataWatcherObject(airLevelWatcherIndex, intSerializer), 300);
+            dataWatcher.setObject(new WrappedDataWatcherObject(airLevelIndex, intSerializer), 300);
             dataWatcher.setObject(new WrappedDataWatcherObject(entityStatusIndex, byteSerializer), (byte) 0);
         } else {
             dataWatcher.setObject(itemSlotIndex, nmsItemStack);
-            dataWatcher.setObject(airLevelWatcherIndex, 300);
+            dataWatcher.setObject(airLevelIndex, 300);
             dataWatcher.setObject(entityStatusIndex, (byte) 0);
         }
     }

plugin/src/main/java/me/filoghost/holographicdisplays/bridge/protocollib/PacketListener.java

@@ -174,7 +174,10 @@ class PacketListener extends PacketAdapter {
         
         Object replacedCustomNameNMSObject = originalCustomNameNMSObject;
         for (RelativePlaceholder relativePlaceholder : relativePlaceholders) {
-            replacedCustomNameNMSObject = nmsManager.replaceCustomNameText(replacedCustomNameNMSObject, relativePlaceholder.getTextPlaceholder(), relativePlaceholder.getReplacement(player));
+            replacedCustomNameNMSObject = nmsManager.getCustomNameChatComponentEditor().replaceCustomName(
+                    replacedCustomNameNMSObject, 
+                    relativePlaceholder.getTextPlaceholder(), 
+                    relativePlaceholder.getReplacement(player));
         }
         
         if (replacedCustomNameNMSObject == originalCustomNameNMSObject) {

plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/CreateCommand.java

@@ -16,7 +16,6 @@ import me.filoghost.holographicdisplays.disk.ConfigManager;
 import me.filoghost.holographicdisplays.object.internal.InternalHologram;
 import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
 import me.filoghost.holographicdisplays.object.internal.InternalHologramManager;
-import me.filoghost.holographicdisplays.object.internal.InternalTextLine;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -71,7 +70,7 @@ public class CreateCommand extends HologramSubCommand {
         } else {
             String defaultText = "Default hologram. Change it with " 
                     + Colors.PRIMARY + "/" + context.getRootLabel() + " edit " + hologram.getName();
-            line = new InternalTextLine(hologram, defaultText, defaultText.replace(ChatColor.COLOR_CHAR, '&'));
+            line = hologram.createTextLine(defaultText, defaultText.replace(ChatColor.COLOR_CHAR, '&'));
         }
 
         hologram.getLinesUnsafe().add(line);

plugin/src/main/java/me/filoghost/holographicdisplays/commands/subs/ReadimageCommand.java

@@ -114,7 +114,7 @@ public class ReadimageCommand extends LineEditingCommand {
                 hologram.clearLines();
             }
             for (String newLine : newLines) {
-                InternalTextLine line = new InternalTextLine(hologram, newLine, newLine);
+                InternalTextLine line = hologram.createTextLine(newLine, newLine);
                 hologram.getLinesUnsafe().add(line);
             }
             hologram.refresh();

plugin/src/main/java/me/filoghost/holographicdisplays/disk/HologramLineParser.java

@@ -11,8 +11,6 @@ import me.filoghost.holographicdisplays.nbt.parser.MojangsonParseException;
 import me.filoghost.holographicdisplays.nbt.parser.MojangsonParser;
 import me.filoghost.holographicdisplays.object.internal.InternalHologram;
 import me.filoghost.holographicdisplays.object.internal.InternalHologramLine;
-import me.filoghost.holographicdisplays.object.internal.InternalItemLine;
-import me.filoghost.holographicdisplays.object.internal.InternalTextLine;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -28,7 +26,7 @@ public class HologramLineParser {
         if (serializedLine.toLowerCase().startsWith(ICON_PREFIX)) {
             String serializedIcon = serializedLine.substring(ICON_PREFIX.length());
             ItemStack icon = parseItemStack(serializedIcon, checkMaterialValidity);
-            hologramLine = new InternalItemLine(hologram, icon, serializedLine);
+            hologramLine = hologram.createItemLine(icon, serializedLine);
             
         } else {
             String displayText;
@@ -38,7 +36,7 @@ public class HologramLineParser {
                 displayText = StringConverter.toReadableFormat(serializedLine);
             }
             
-            hologramLine = new InternalTextLine(hologram, displayText, serializedLine);
+            hologramLine = hologram.createTextLine(displayText, serializedLine);
         }
         
         return hologramLine;

plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIHologram.java

@@ -57,7 +57,7 @@ public class APIHologram extends BaseHologram implements Hologram {
     public TextLine appendTextLine(String text) {
         checkState();
 
-        APITextLine line = new APITextLine(this, text);
+        APITextLine line = createTextLine(text);
         lines.add(line);
         refresh();
         return line;
@@ -68,7 +68,7 @@ public class APIHologram extends BaseHologram implements Hologram {
         checkState();
         Preconditions.notNull(itemStack, "itemStack");
 
-        APIItemLine line = new APIItemLine(this, itemStack);
+        APIItemLine line = createItemLine(itemStack);
         lines.add(line);
         refresh();
         return line;
@@ -78,7 +78,7 @@ public class APIHologram extends BaseHologram implements Hologram {
     public TextLine insertTextLine(int index, String text) {
         checkState();
 
-        APITextLine line = new APITextLine(this, text);
+        APITextLine line = createTextLine(text);
         lines.add(index, line);
         refresh();
         return line;
@@ -89,12 +89,20 @@ public class APIHologram extends BaseHologram implements Hologram {
         checkState();
         Preconditions.notNull(itemStack, "itemStack");
 
-        APIItemLine line = new APIItemLine(this, itemStack);
+        APIItemLine line = createItemLine(itemStack);
         lines.add(index, line);
         refresh();
         return line;
     }
 
+    private APITextLine createTextLine(String text) {
+        return new APITextLine(this, getNMSManager(), text);
+    }
+
+    private APIItemLine createItemLine(ItemStack itemStack) {
+        return new APIItemLine(this, getNMSManager(), itemStack);
+    }
+
     @Override
     public HologramLine getLine(int index) {
         return lines.get(index);

plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APIItemLine.java

@@ -2,6 +2,7 @@ package me.filoghost.holographicdisplays.object.api;
 
 import me.filoghost.holographicdisplays.api.Hologram;
 import me.filoghost.holographicdisplays.api.line.ItemLine;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.object.base.BaseItemLine;
 import org.bukkit.inventory.ItemStack;
 
@@ -9,8 +10,8 @@ public class APIItemLine extends BaseItemLine implements ItemLine, APIHologramLi
 
     private final APIHologram parent;
 
-    public APIItemLine(APIHologram parent, ItemStack itemStack) {
+    public APIItemLine(APIHologram parent, NMSManager nmsManager, ItemStack itemStack) {
-        super(parent, itemStack);
+        super(parent, nmsManager, itemStack);
         this.parent = parent;
     }
 

plugin/src/main/java/me/filoghost/holographicdisplays/object/api/APITextLine.java

@@ -2,14 +2,15 @@ package me.filoghost.holographicdisplays.object.api;
 
 import me.filoghost.holographicdisplays.api.Hologram;
 import me.filoghost.holographicdisplays.api.line.TextLine;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.object.base.BaseTextLine;
 
 public class APITextLine extends BaseTextLine implements TextLine, APIHologramLine {
 
     private final APIHologram parent;
 
-    public APITextLine(APIHologram parent, String text) {
+    public APITextLine(APIHologram parent, NMSManager nmsManager, String text) {
-        super(parent, text);
+        super(parent, nmsManager, text);
         this.parent = parent;
     }
 

plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologram.java

@@ -40,8 +40,7 @@ public abstract class BaseHologram extends BaseHologramComponent implements Stan
         }
     }
     
-    @Override
+    protected final NMSManager getNMSManager() {
-    public NMSManager getNMSManager() {
         return nmsManager;
     }
     

plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseHologramLine.java

@@ -13,22 +13,24 @@ import org.bukkit.World;
 
 public abstract class BaseHologramLine extends BaseHologramComponent implements StandardHologramLine {
     
-    private final StandardHologram parent;
+    private final StandardHologram hologram;
+    private final NMSManager nmsManager;
 
     private boolean isSpawned;
 
-    protected BaseHologramLine(StandardHologram parent) {
+    protected BaseHologramLine(StandardHologram hologram, NMSManager nmsManager) {
-        Preconditions.notNull(parent, "parent hologram");
+        Preconditions.notNull(hologram, "parent hologram");
-        this.parent = parent;
+        this.hologram = hologram;
+        this.nmsManager = nmsManager;
     }
     
     @Override
     public final StandardHologram getHologram() {
-        return parent;
+        return hologram;
     }
 
     protected final NMSManager getNMSManager() {
-        return parent.getNMSManager();
+        return nmsManager;
     }
 
     @Override
@@ -61,7 +63,7 @@ public abstract class BaseHologramLine extends BaseHologramComponent implements
         isSpawned = false;
     }
     
-    protected boolean isSpawned() {
+    protected final boolean isSpawned() {
         return isSpawned;
     }
 

plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseItemLine.java

@@ -10,6 +10,7 @@ import me.filoghost.fcommons.logging.Log;
 import me.filoghost.holographicdisplays.api.handler.PickupHandler;
 import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
 import me.filoghost.holographicdisplays.core.hologram.StandardItemLine;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSItem;
 import org.bukkit.World;
@@ -26,8 +27,8 @@ public abstract class BaseItemLine extends BaseTouchableLine implements Standard
     private NMSArmorStand vehicleEntity;
     private PickupHandler pickupHandler;
 
-    public BaseItemLine(StandardHologram parent, ItemStack itemStack) {
+    public BaseItemLine(StandardHologram hologram, NMSManager nmsManager, ItemStack itemStack) {
-        super(parent);
+        super(hologram, nmsManager);
         setItemStack(itemStack);
     }
     

plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTextLine.java

@@ -7,6 +7,7 @@ package me.filoghost.holographicdisplays.object.base;
 
 import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
 import me.filoghost.holographicdisplays.core.hologram.StandardTextLine;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.placeholder.RelativePlaceholder;
 import me.filoghost.holographicdisplays.placeholder.PlaceholdersManager;
@@ -21,8 +22,8 @@ public abstract class BaseTextLine extends BaseTouchableLine implements Standard
     private String text;
     private NMSArmorStand nameableEntity;
     
-    public BaseTextLine(StandardHologram parent, String text) {
+    public BaseTextLine(StandardHologram hologram, NMSManager nmsManager, String text) {
-        super(parent);
+        super(hologram, nmsManager);
         this.relativePlaceholders = new ArrayList<>();
         setText(text);
     }

plugin/src/main/java/me/filoghost/holographicdisplays/object/base/BaseTouchableLine.java

@@ -9,6 +9,7 @@ import me.filoghost.fcommons.logging.Log;
 import me.filoghost.holographicdisplays.api.handler.TouchHandler;
 import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
 import me.filoghost.holographicdisplays.core.hologram.StandardTouchableLine;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand;
 import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime;
 import org.bukkit.World;
@@ -26,7 +27,7 @@ public abstract class BaseTouchableLine extends BaseHologramLine implements Stan
 
     private static final double SLIME_HEIGHT = 0.5;
     
-    private static final Map<Player, Long> anticlickSpam = new WeakHashMap<>();
+    private static final Map<Player, Long> lastClickByPlayer = new WeakHashMap<>();
 
     private TouchHandler touchHandler;
 
@@ -34,8 +35,8 @@ public abstract class BaseTouchableLine extends BaseHologramLine implements Stan
     private NMSArmorStand vehicleEntity;
     
 
-    protected BaseTouchableLine(StandardHologram parent) {
+    protected BaseTouchableLine(StandardHologram hologram, NMSManager nmsManager) {
-        super(parent);
+        super(hologram, nmsManager);
     }
 
     @Override
@@ -44,12 +45,13 @@ public abstract class BaseTouchableLine extends BaseHologramLine implements Stan
             return;
         }
 
-        Long lastClick = anticlickSpam.get(player);
+        Long lastClick = lastClickByPlayer.get(player);
-        if (lastClick != null && System.currentTimeMillis() - lastClick < 100) {
+        long now = System.currentTimeMillis();
+        if (lastClick != null && now - lastClick < 100) {
             return;
         }
 
-        anticlickSpam.put(player, System.currentTimeMillis());
+        lastClickByPlayer.put(player, now);
 
         try {
             touchHandler.onTouch(player);

plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalHologram.java

@@ -10,6 +10,7 @@ import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.object.base.BaseHologram;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 
 import java.util.ArrayList;
@@ -30,6 +31,14 @@ public class InternalHologram extends BaseHologram {
         return name;
     }
 
+    public InternalTextLine createTextLine(String text, String serializedConfigValue) {
+        return new InternalTextLine(this, getNMSManager(), text, serializedConfigValue);
+    }
+
+    public InternalItemLine createItemLine(ItemStack icon, String serializedConfigValue) {
+        return new InternalItemLine(this, getNMSManager(), icon, serializedConfigValue);
+    }
+
     @Override
     public Plugin getOwnerPlugin() {
         return HolographicDisplays.getInstance();

plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalItemLine.java

@@ -6,6 +6,7 @@
 package me.filoghost.holographicdisplays.object.internal;
 
 import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.object.base.BaseItemLine;
 import org.bukkit.inventory.ItemStack;
 
@@ -13,11 +14,12 @@ public class InternalItemLine extends BaseItemLine implements InternalHologramLi
 
     private final String serializedConfigValue;
 
-    public InternalItemLine(StandardHologram parent, ItemStack itemStack, String serializedConfigValue) {
+    protected InternalItemLine(StandardHologram hologram, NMSManager nmsManager, ItemStack itemStack, String serializedConfigValue) {
-        super(parent, itemStack);
+        super(hologram, nmsManager, itemStack);
         this.serializedConfigValue = serializedConfigValue;
     }
 
+    @Override
     public String getSerializedConfigValue() {
         return serializedConfigValue;
     }

plugin/src/main/java/me/filoghost/holographicdisplays/object/internal/InternalTextLine.java

@@ -6,14 +6,15 @@
 package me.filoghost.holographicdisplays.object.internal;
 
 import me.filoghost.holographicdisplays.core.hologram.StandardHologram;
+import me.filoghost.holographicdisplays.core.nms.NMSManager;
 import me.filoghost.holographicdisplays.object.base.BaseTextLine;
 
 public class InternalTextLine extends BaseTextLine implements InternalHologramLine {
 
     private final String serializedConfigValue;
 
-    public InternalTextLine(StandardHologram parent, String text, String serializedConfigValue) {
+    protected InternalTextLine(StandardHologram hologram, NMSManager nmsManager, String text, String serializedConfigValue) {
-        super(parent, text);
+        super(hologram, nmsManager, text);
         this.serializedConfigValue = serializedConfigValue;
     }
 
@@ -22,6 +23,7 @@ public class InternalTextLine extends BaseTextLine implements InternalHologramLi
         return true;
     }
 
+    @Override
     public String getSerializedConfigValue() {
         return serializedConfigValue;
     }