From 00ab4b617d7386992a9c4c8ba22b3f4d2c776813 Mon Sep 17 00:00:00 2001 From: Vincent <79623093+V1nc3ntWasTaken@users.noreply.github.com> Date: Sun, 18 Sep 2022 13:14:51 -0500 Subject: [PATCH] Cleaned up some more NMS reflection code that caused some errors --- .../compatibility/Compatibility.java | 8 ------ .../compatibility/Compatibility.java | 28 ++----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/1.19.1/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java b/1.19.1/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java index 251d26d..7765d14 100644 --- a/1.19.1/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java +++ b/1.19.1/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java @@ -36,8 +36,6 @@ public class Compatibility { if (minecraftVersion != null && minecraftVersion.equals(PLUGIN_COMPATIBLE_VERSION)) { - final String versionPackage = getVersionPackage(minecraftVersion); - COMPATIBLE_PLAYER = instantiate(CompatiblePlayer.class); COMPATIBLE_PACKET_LISTENER = instantiate(CompatiblePacketListener.class); @@ -54,12 +52,6 @@ public class Compatibility { } - private static String getVersionPackage(String minecraftVersion) { - - return Compatibility.class.getPackage().getName(); - - } - private static T instantiate(Class clazz) { if (clazz == null) return null; diff --git a/1.19/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java b/1.19/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java index 79786b2..bc4ee5f 100644 --- a/1.19/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java +++ b/1.19/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java @@ -36,10 +36,8 @@ public class Compatibility { if (minecraftVersion != null && minecraftVersion.equals(PLUGIN_COMPATIBLE_VERSION)) { - final String versionPackage = getVersionPackage(minecraftVersion); - - COMPATIBLE_PLAYER = instantiate(getCompatibleClass(CompatiblePlayer.class, minecraftVersion, versionPackage)); - COMPATIBLE_PACKET_LISTENER = instantiate(getCompatibleClass(CompatiblePacketListener.class, minecraftVersion, versionPackage)); + COMPATIBLE_PLAYER = instantiate(CompatiblePlayer.class); + COMPATIBLE_PACKET_LISTENER = instantiate(CompatiblePacketListener.class); SERVER_COMPATIBLE = true; @@ -54,28 +52,6 @@ public class Compatibility { } - private static String getVersionPackage(String minecraftVersion) { - - return Compatibility.class.getPackage().getName(); - - } - - private static Class getCompatibleClass(Class clazz, String minecraftVersion, String versionPackage) { - - try { - final Class compatibleClass = Class.forName(versionPackage + "." + clazz.getSimpleName()); - if (compatibleClass.getSuperclass() != clazz && !Arrays.asList(compatibleClass.getInterfaces()).contains(clazz)) { - return null; - } - else - //noinspection unchecked - return (Class) compatibleClass; - } catch (ClassNotFoundException e) { - return null; - } - - } - private static T instantiate(Class clazz) { if (clazz == null) return null;