From 04b57fc8ea31e8bb232fad6fc27a3e915766a305 Mon Sep 17 00:00:00 2001 From: Mqzn Date: Thu, 27 Mar 2025 20:31:33 +0200 Subject: [PATCH] Removed unnecessary code --- .../pyr/znpcsplus/skin/BaseSkinDescriptor.java | 9 ++++++--- .../skin/descriptor/UUIDFetchingDescriptor.java | 2 +- .../java/lol/pyr/znpcsplus/util/UUIDUtil.java | 16 ---------------- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 plugin/src/main/java/lol/pyr/znpcsplus/util/UUIDUtil.java diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/skin/BaseSkinDescriptor.java b/plugin/src/main/java/lol/pyr/znpcsplus/skin/BaseSkinDescriptor.java index 66dd9a4..1fe1623 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/skin/BaseSkinDescriptor.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/skin/BaseSkinDescriptor.java @@ -7,7 +7,6 @@ import lol.pyr.znpcsplus.skin.descriptor.NameFetchingDescriptor; import lol.pyr.znpcsplus.skin.descriptor.MirrorDescriptor; import lol.pyr.znpcsplus.skin.descriptor.PrefetchedDescriptor; import lol.pyr.znpcsplus.skin.descriptor.UUIDFetchingDescriptor; -import lol.pyr.znpcsplus.util.UUIDUtil; import org.bukkit.entity.Player; import java.util.ArrayList; @@ -25,9 +24,13 @@ public interface BaseSkinDescriptor extends SkinDescriptor { static BaseSkinDescriptor deserialize(MojangSkinCache skinCache, String str) { String[] arr = str.split(";"); if (arr[0].equalsIgnoreCase("mirror")) return new MirrorDescriptor(skinCache); - else if (arr[0].equalsIgnoreCase("fetching")) { + else if (arr[0].equalsIgnoreCase("fetching-uuid")) { String value = String.join(";", Arrays.copyOfRange(arr, 1, arr.length)); - return UUIDUtil.isUUID(value) ? new UUIDFetchingDescriptor(skinCache, UUID.fromString(value)) : new NameFetchingDescriptor(skinCache, value); + return new UUIDFetchingDescriptor(skinCache, UUID.fromString(value)); + } + else if(arr[0].equalsIgnoreCase("fetching")) { + String value = String.join(";", Arrays.copyOfRange(arr, 1, arr.length)); + return new NameFetchingDescriptor(skinCache, value); } else if (arr[0].equalsIgnoreCase("prefetched")) { List properties = new ArrayList<>(); diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/skin/descriptor/UUIDFetchingDescriptor.java b/plugin/src/main/java/lol/pyr/znpcsplus/skin/descriptor/UUIDFetchingDescriptor.java index d4db046..685c786 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/skin/descriptor/UUIDFetchingDescriptor.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/skin/descriptor/UUIDFetchingDescriptor.java @@ -36,7 +36,7 @@ public class UUIDFetchingDescriptor implements BaseSkinDescriptor, SkinDescripto @Override public String serialize() { - return "fetching;" + uuid.toString(); + return "fetching-uuid;" + uuid.toString(); } } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/UUIDUtil.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/UUIDUtil.java deleted file mode 100644 index c85b73e..0000000 --- a/plugin/src/main/java/lol/pyr/znpcsplus/util/UUIDUtil.java +++ /dev/null @@ -1,16 +0,0 @@ -package lol.pyr.znpcsplus.util; - - -import java.util.regex.Pattern; - -public final class UUIDUtil { - - - public final static Pattern UUID_REGEX = - Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); - - public static boolean isUUID(String uuid) { - return UUID_REGEX.matcher(uuid).matches(); - } - -}