Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-12-21 00:07:48 +01:00
Code Issues Projects Releases Wiki Activity

Cache custom name for armor stands in Minecraft 1.13+

Browse Source
This commit is contained in:
filoghost 2019-10-21 17:55:02 +02:00
parent 8293f8b642
commit 66666dc510
12 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NMS/v1_10_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java
View File

@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -167,16 +168,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_11_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java
View File

@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -176,16 +177,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_12_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java
View File

@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -176,16 +177,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_13_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java
View File

@ -43,6 +43,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -178,16 +179,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(CraftChatMessage.fromStringOrNull(customName));
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(CraftChatMessage.fromStringOrNull(name));
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return CraftChatMessage.fromComponent(super.getCustomName()); return this.customName;
} }
@Override @Override

11
NMS/v1_13_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java
View File

@ -43,6 +43,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -178,16 +179,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(CraftChatMessage.fromStringOrNull(customName));
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(CraftChatMessage.fromStringOrNull(name));
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return CraftChatMessage.fromComponent(super.getCustomName()); return this.customName;
} }
@Override @Override

11
NMS/v1_14_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java
View File

@ -45,6 +45,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private CraftEntity customBukkitEntity; private CraftEntity customBukkitEntity;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(EntityTypes.ARMOR_STAND, world); super(EntityTypes.ARMOR_STAND, world);
@ -180,16 +181,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(CraftChatMessage.fromStringOrNull(customName));
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(CraftChatMessage.fromStringOrNull(name));
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return CraftChatMessage.fromComponent(super.getCustomName()); return this.customName;
} }
@Override @Override

12
NMS/v1_8_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R1/EntityNMSArmorStand.java
View File

@ -41,6 +41,8 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -156,16 +158,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_8_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java
View File

@ -46,6 +46,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -166,16 +167,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_8_R3/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java
View File

@ -46,6 +46,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -166,16 +167,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

12
NMS/v1_9_R1/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java
View File

@ -44,6 +44,8 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -174,16 +176,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

11
NMS/v1_9_R2/src/main/java/com/gmail/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java
View File

@ -41,6 +41,7 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
private boolean lockTick; private boolean lockTick;
private HologramLine parentPiece; private HologramLine parentPiece;
private String customName;
public EntityNMSArmorStand(World world, HologramLine parentPiece) { public EntityNMSArmorStand(World world, HologramLine parentPiece) {
super(world); super(world);
@ -167,16 +168,14 @@ public class EntityNMSArmorStand extends EntityArmorStand implements NMSArmorSta
@Override @Override
public void setCustomNameNMS(String name) { public void setCustomNameNMS(String name) {
if (name != null && name.length() > 300) { this.customName = Utils.limitLength(name, 300);
name = name.substring(0, 300); super.setCustomName(customName);
} super.setCustomNameVisible(customName != null && !customName.isEmpty());
super.setCustomName(name);
super.setCustomNameVisible(name != null && !name.isEmpty());
} }
@Override @Override
public String getCustomNameNMS() { public String getCustomNameNMS() {
return super.getCustomName(); return this.customName;
} }
@Override @Override

8
Utils/src/main/java/com/gmail/filoghost/holographicdisplays/util/Utils.java
View File

@ -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) { public static int floor(double num) {
int floor = (int) num; int floor = (int) num;
return floor == num ? floor : floor - (int) (Double.doubleToRawLongBits(num) >>> 63); return floor == num ? floor : floor - (int) (Double.doubleToRawLongBits(num) >>> 63);