From 130dc42e5f86b10953e04f7450ade9b266cd2196 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 18 Jun 2023 17:07:08 +0800 Subject: [PATCH] Use new method --- .../citizensnpcs/nms/v1_10_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_11_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_12_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_13_R2/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_14_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_15_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_16_R3/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_17_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_18_R2/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_19_R3/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_20_R1/entity/HumanController.java | 8 +------- .../citizensnpcs/nms/v1_8_R3/entity/HumanController.java | 8 +------- 12 files changed, 12 insertions(+), 84 deletions(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java index 26d353872..0925fe2a5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java index 513e1a282..8668fcc01 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java index f4804e7ef..6ed6d9c0f 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java index 1b80b353b..1d579db3e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java index 4b3729f3a..fb8baafe4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java index 405fc0643..095805684 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java index 225491e8c..bce1972a1 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java index 02cebbda4..d9b7168be 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final ServerLevel nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java index f378f61ec..21de104dc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final ServerLevel nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java index 553c90174..6047301cf 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final ServerLevel nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/entity/HumanController.java b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/entity/HumanController.java index ea00736ab..6c5c09d00 100644 --- a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/entity/HumanController.java +++ b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final ServerLevel nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName; diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java index 61a9ebdcd..d17b71b4a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java @@ -31,13 +31,7 @@ public class HumanController extends AbstractEntityController { final WorldServer nmsWorld = ((CraftWorld) at.getWorld()).getHandle(); String coloredName = npc.getFullName(); String name = coloredName.length() > 16 ? coloredName.substring(0, 16) : coloredName; - UUID uuid = npc.getUniqueId(); - if (uuid.version() == 4) { // set version to 2 - long msb = uuid.getMostSignificantBits(); - msb &= ~0x0000000000004000L; - msb |= 0x0000000000002000L; - uuid = new UUID(msb, uuid.getLeastSignificantBits()); - } + UUID uuid = npc.getMinecraftUniqueId(); final String teamName = Util.getTeamName(uuid); if (npc.requiresNameHologram()) { name = teamName;