PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ok so you can have weird exception when loading random classes from NMS. We are now dealing with that properly

Browse Source
This commit is contained in:
Marc Baloup 2022-06-24 00:50:31 +02:00
parent 013635e095
commit 90ce5be020
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java
View File

@ -53,8 +53,6 @@ public class NMSReflect {
Log.info("[NMSReflect] Initializing NMS obfuscation mapping..."); Log.info("[NMSReflect] Initializing NMS obfuscation mapping...");
boolean clearIfError = true;
try { try {
ReflectClass<?> obfHelperClass; ReflectClass<?> obfHelperClass;
try { try {
@ -107,28 +105,33 @@ public class NMSReflect {
Log.info("[NMSReflect] NMS runtime classes are mojang mapped."); Log.info("[NMSReflect] NMS runtime classes are mojang mapped.");
} }
boolean missingRuntimeClasses = false; int missingRuntimeClasses = 0;
for (ClassMapping clazz : mappings) { for (ClassMapping clazz : mappings) {
try { try {
clazz.cacheReflectClass(); clazz.cacheReflectClass();
} catch (ClassNotFoundException e) { } catch (Throwable e) {
missingRuntimeClasses = true; if (missingRuntimeClasses == 0) { // first
Log.severe("[NMSReflect] Missing runtime class " + e.getMessage() + (IS_SERVER_OBFUSCATED ? (" (moj class: " + clazz.mojName + ")") : "")); Log.severe("[NMSReflect] Error while loading runtime classes referenced by the obfuscation mapping.");
}
missingRuntimeClasses++;
if (e instanceof ClassNotFoundException cnfe) {
Log.severe("[NMSReflect] Missing runtime class " + cnfe.getMessage() + (IS_SERVER_OBFUSCATED ? (" (moj class: " + clazz.mojName + ")") : ""));
}
else {
Log.severe("[NMSReflect] Unable to load runtime class " + (IS_SERVER_OBFUSCATED ? (clazz.obfName + " (moj class: " + clazz.mojName + ")") : clazz.mojName), e);
}
CLASSES_BY_OBF.remove(clazz.obfName); CLASSES_BY_OBF.remove(clazz.obfName);
CLASSES_BY_MOJ.remove(clazz.mojName); CLASSES_BY_MOJ.remove(clazz.mojName);
} }
} }
clearIfError = false; if (missingRuntimeClasses > 0) {
Log.severe("[NMSReflect] " + missingRuntimeClasses + " class have been removed from the mapping data due to errors.");
if (missingRuntimeClasses) }
throw new ClassNotFoundException("Unable to find all the following runtime classes referenced by the obfuscation mapping. They are removed from the mapping data.");
} catch (Throwable t) { } catch (Throwable t) {
if (clearIfError) {
CLASSES_BY_OBF.clear(); CLASSES_BY_OBF.clear();
CLASSES_BY_MOJ.clear(); CLASSES_BY_MOJ.clear();
}
Log.severe("[NMSReflect] The plugin will have limited access to NMS stuff due to an error while loading the obfuscation mapping."); Log.severe("[NMSReflect] The plugin will have limited access to NMS stuff due to an error while loading the obfuscation mapping.");
Log.severe(t.toString()); Log.severe(t.toString());
t.printStackTrace(); t.printStackTrace();