diff --git a/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java b/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java index 71e07bae..6d810441 100644 --- a/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java +++ b/NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java @@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -167,16 +168,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java b/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java index 7599b52e..81b7acf9 100644 --- a/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java +++ b/NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java @@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -176,16 +177,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java b/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java index e60123d0..dd0a78ac 100644 --- a/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java +++ b/NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java @@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -176,16 +177,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java b/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java index 4b938cd4..63d18042 100644 --- a/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java +++ b/NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java @@ -43,6 +43,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -178,16 +179,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(CraftChatMessage.fromStringOrNull(name)); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(CraftChatMessage.fromStringOrNull(customName)); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return CraftChatMessage.fromComponent(super.getCustomName()); + return this.customName; } @Override diff --git a/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java b/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java index 0a83f665..dc99416d 100644 --- a/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java +++ b/NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java @@ -43,6 +43,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -178,16 +179,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(CraftChatMessage.fromStringOrNull(name)); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(CraftChatMessage.fromStringOrNull(customName)); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return CraftChatMessage.fromComponent(super.getCustomName()); + return this.customName; } @Override diff --git a/NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java b/NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java index 59812b7f..c64473fa 100644 --- a/NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java +++ b/NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java @@ -45,6 +45,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; private CraftEntity customBukkitEntity; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(EntityTypes.ARMOR_STAND, world); @@ -180,16 +181,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(CraftChatMessage.fromStringOrNull(name)); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(CraftChatMessage.fromStringOrNull(customName)); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return CraftChatMessage.fromComponent(super.getCustomName()); + return this.customName; } @Override diff --git a/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java b/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java index 69962488..db5e19ed 100644 --- a/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java +++ b/NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java @@ -41,6 +41,8 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -156,16 +158,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java b/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java index ff8e5e9a..9e13e7fb 100644 --- a/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java +++ b/NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java @@ -46,6 +46,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -166,16 +167,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java b/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java index 87041e41..5953628d 100644 --- a/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java +++ b/NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java @@ -46,6 +46,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -166,16 +167,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java b/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java index ef77f856..c1b36dc5 100644 --- a/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java +++ b/NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java @@ -44,6 +44,8 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -174,16 +176,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java b/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java index ac95f21e..8966d2ec 100644 --- a/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java +++ b/NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java @@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta private boolean lockTick; private HologramLine parentPiece; + private String customName; public EntityNMSArmorStand(World world, HologramLine parentPiece) { super(world); @@ -167,16 +168,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta @Override public void setCustomNameNMS(String name) { - if (name != null && name.length() > 300) { - name = name.substring(0, 300); - } - super.setCustomName(name); - super.setCustomNameVisible(name != null && !name.isEmpty()); + this.customName = Utils.limitLength(name, 300); + super.setCustomName(customName); + super.setCustomNameVisible(customName != null && !customName.isEmpty()); } @Override public String getCustomNameNMS() { - return super.getCustomName(); + return this.customName; } @Override diff --git a/Utils/src/main/java/com/gmail/filoghost/holographicdisplays/util/Utils.java b/Utils/src/main/java/com/gmail/filoghost/holographicdisplays/util/Utils.java index 71279e95..c955aa50 100644 --- a/Utils/src/main/java/com/gmail/filoghost/holographicdisplays/util/Utils.java +++ b/Utils/src/main/java/com/gmail/filoghost/holographicdisplays/util/Utils.java @@ -31,6 +31,14 @@ public class Utils extends Object { } + public static String limitLength(String s, int maxLength) { + if (s != null && s.length() > maxLength) { + s = s.substring(0, maxLength); + } + return s; + } + + public static int floor(double num) { int floor = (int) num; return floor == num ? floor : floor - (int) (Double.doubleToRawLongBits(num) >>> 63);