Skip to content

Clean up some more NMS reflection code that's causing some errors #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
V1nc3ntWasTaken merged 1 commit into from
Sep 18, 2022
Merged

Clean up some more NMS reflection code that's causing some errors #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions 1.19.1/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -54,12 +52,6 @@ public class Compatibility {

}

private static String getVersionPackage(String minecraftVersion) {

return Compatibility.class.getPackage().getName();

}

private static <T> T instantiate(Class<T> clazz) {

if (clazz == null) return null;
Expand Down
28 changes: 2 additions & 26 deletions 1.19/src/main/java/me/doclic/noencryption/compatibility/Compatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -54,28 +52,6 @@ public class Compatibility {

}

private static String getVersionPackage(String minecraftVersion) {

return Compatibility.class.getPackage().getName();

}

private static <T> Class<? extends T> getCompatibleClass(Class<T> 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<? extends T>) compatibleClass;
} catch (ClassNotFoundException e) {
return null;
}

}

private static <T> T instantiate(Class<T> clazz) {

if (clazz == null) return null;
Expand Down