Jona123/NPCLib
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Hologram

Browse Source
This commit is contained in:
MrMicky
2020-04-10 13:58:41 +02:00
parent 89e2a63777
commit 493118fa3b
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/net/jitse/npclib/hologram/Hologram.java
+15 -23
View File
@@ -15,11 +15,6 @@ import java.util.List;
public class Hologram { public class Hologram {
private final List<Object> armorStands = new ArrayList<>();
private final List<Object> showPackets = new ArrayList<>();
private final List<Object> hidePackets = new ArrayList<>();
private final List<Object> metaPackets = new ArrayList<>();
private static final double DELTA = 0.3; private static final double DELTA = 0.3;
// Classes: // Classes:
@@ -52,7 +47,7 @@ public class Hologram {
.getConstructor(PACKET_PLAY_OUT_ENTITY_METADATA_CLAZZ, int.class, DATAWATCHER_CLAZZ, boolean.class); .getConstructor(PACKET_PLAY_OUT_ENTITY_METADATA_CLAZZ, int.class, DATAWATCHER_CLAZZ, boolean.class);
// Fields: // Fields:
private static final Reflection.FieldAccessor<?> playerConnectionField = Reflection.getField(ENTITY_PLAYER_CLAZZ, private static final Reflection.FieldAccessor<?> PLAYER_CONNECTION_FIELD = Reflection.getField(ENTITY_PLAYER_CLAZZ,
"playerConnection", PLAYER_CONNECTION_CLAZZ); "playerConnection", PLAYER_CONNECTION_CLAZZ);
// Methods: // Methods:
@@ -75,6 +70,11 @@ public class Hologram {
private static final Reflection.MethodInvoker GET_DATAWATCHER_METHOD = Reflection.getMethod(ENTITY_CLAZZ, private static final Reflection.MethodInvoker GET_DATAWATCHER_METHOD = Reflection.getMethod(ENTITY_CLAZZ,
"getDataWatcher"); "getDataWatcher");
private final List<Object> armorStands = new ArrayList<>();
private final List<Object> showPackets = new ArrayList<>();
private final List<Object> hidePackets = new ArrayList<>();
private final List<Object> metaPackets = new ArrayList<>();
private final MinecraftVersion version; private final MinecraftVersion version;
private final Location start; private final Location start;
private final Object worldServer; private final Object worldServer;
@@ -86,8 +86,7 @@ public class Hologram {
this.start = location; this.start = location;
this.text = text; this.text = text;
this.worldServer = Reflection.getMethod(CRAFT_BUKKIT_CLASS, "getHandle") this.worldServer = Reflection.getMethod(CRAFT_BUKKIT_CLASS, "getHandle").invoke(location.getWorld());
.invoke(CRAFT_BUKKIT_CLASS.cast(location.getWorld()));
createPackets(); createPackets();
} }
@@ -97,13 +96,10 @@ public class Hologram {
Reflection.getMethod(ENTITY_CLAZZ, "setNoGravity", boolean.class) : Reflection.getMethod(ENTITY_CLAZZ, "setNoGravity", boolean.class) :
Reflection.getMethod(ENTITY_ARMOR_STAND_CLAZZ, "setGravity", boolean.class)); Reflection.getMethod(ENTITY_ARMOR_STAND_CLAZZ, "setGravity", boolean.class));
Reflection.MethodInvoker customNameMethod = (version.isAboveOrEqual(MinecraftVersion.V1_12_R1) Reflection.MethodInvoker customNameMethod = Reflection.getMethod(ENTITY_CLAZZ, "setCustomName",
? Reflection.getMethod(ENTITY_CLAZZ, "setCustomName", version.isAboveOrEqual(MinecraftVersion.V1_13_R1) ? CHAT_BASE_COMPONENT_CLAZZ : String.class) version.isAboveOrEqual(MinecraftVersion.V1_13_R1) ? CHAT_BASE_COMPONENT_CLAZZ : String.class);
: Reflection.getMethod(ENTITY_ARMOR_STAND_CLAZZ, "setCustomName", String.class));
Reflection.MethodInvoker customNameVisibilityMethod = (version.isAboveOrEqual(MinecraftVersion.V1_12_R1) ? Reflection.MethodInvoker customNameVisibilityMethod = Reflection.getMethod(ENTITY_CLAZZ, "setCustomNameVisible", boolean.class);
Reflection.getMethod(ENTITY_CLAZZ, "setCustomNameVisible", boolean.class) :
Reflection.getMethod(ENTITY_ARMOR_STAND_CLAZZ, "setCustomNameVisible", boolean.class));
Location location = start.clone().add(0, DELTA * text.size(), 0); Location location = start.clone().add(0, DELTA * text.size(), 0);
Class<?> worldClass = worldServer.getClass().getSuperclass(); Class<?> worldClass = worldServer.getClass().getSuperclass();
@@ -157,9 +153,8 @@ public class Hologram {
throw new IllegalArgumentException("When updating the text, the old and new text should have the same amount of lines"); throw new IllegalArgumentException("When updating the text, the old and new text should have the same amount of lines");
} }
Reflection.MethodInvoker customNameMethod = (version.isAboveOrEqual(MinecraftVersion.V1_12_R1) Reflection.MethodInvoker customNameMethod = Reflection.getMethod(ENTITY_CLAZZ, "setCustomName",
? Reflection.getMethod(ENTITY_CLAZZ, "setCustomName", version.isAboveOrEqual(MinecraftVersion.V1_13_R1) ? CHAT_BASE_COMPONENT_CLAZZ : String.class) version.isAboveOrEqual(MinecraftVersion.V1_13_R1) ? CHAT_BASE_COMPONENT_CLAZZ : String.class);
: Reflection.getMethod(ENTITY_ARMOR_STAND_CLAZZ, "setCustomName", String.class));
for (int i = 0; i < text.size(); i++) { for (int i = 0; i < text.size(); i++) {
Object entityArmorStand = armorStands.get(i); Object entityArmorStand = armorStands.get(i);
@@ -190,8 +185,7 @@ public class Hologram {
} }
public void update(Player player, List<Object> updatePackets) { public void update(Player player, List<Object> updatePackets) {
Object playerConnection = playerConnectionField.get(PLAYER_GET_HANDLE_METHOD Object playerConnection = PLAYER_CONNECTION_FIELD.get(PLAYER_GET_HANDLE_METHOD.invoke(player));
.invoke(CRAFT_PLAYER_CLAZZ.cast(player)));
for (Object packet : updatePackets) { for (Object packet : updatePackets) {
SEND_PACKET_METHOD.invoke(playerConnection, packet); SEND_PACKET_METHOD.invoke(playerConnection, packet);
@@ -199,8 +193,7 @@ public class Hologram {
} }
public void show(Player player) { public void show(Player player) {
Object playerConnection = playerConnectionField.get(PLAYER_GET_HANDLE_METHOD Object playerConnection = PLAYER_CONNECTION_FIELD.get(PLAYER_GET_HANDLE_METHOD.invoke(player));
.invoke(CRAFT_PLAYER_CLAZZ.cast(player)));
for (int i = 0; i < text.size(); i++) { for (int i = 0; i < text.size(); i++) {
if (text.get(i).isEmpty()) continue; // No need to spawn the line. if (text.get(i).isEmpty()) continue; // No need to spawn the line.
@@ -212,8 +205,7 @@ public class Hologram {
} }
public void hide(Player player) { public void hide(Player player) {
Object playerConnection = playerConnectionField.get(PLAYER_GET_HANDLE_METHOD Object playerConnection = PLAYER_CONNECTION_FIELD.get(PLAYER_GET_HANDLE_METHOD.invoke(player));
.invoke(CRAFT_PLAYER_CLAZZ.cast(player)));
for (int i = 0; i < text.size(); i++) { for (int i = 0; i < text.size(); i++) {
if (text.get(i).isEmpty()) continue; // No need to hide the line (as it was never spawned). if (text.get(i).isEmpty()) continue; // No need to hide the line (as it was never spawned).