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

Small refactor of NMSReflect + trying to find why it doesn't load on 1.18.2

Browse Source
This commit is contained in:
Marc Baloup 2022-06-22 00:46:06 +02:00
parent bf21151856
commit 7958589d1a
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@ import net.fabricmc.mappingio.tree.MemoryMappingTree;
public class NMSReflect { public class NMSReflect {
private static ReflectClass<?> PAPER_OBFHELPER_CLASS;
private static String OBF_NAMESPACE; private static String OBF_NAMESPACE;
private static String MOJ_NAMESPACE; private static String MOJ_NAMESPACE;
@ -44,18 +43,20 @@ public class NMSReflect {
static { static {
try {
PAPER_OBFHELPER_CLASS = Reflect.ofClass("io.papermc.paper.util.ObfHelper");
OBF_NAMESPACE = (String) PAPER_OBFHELPER_CLASS.field("SPIGOT_NAMESPACE").getStaticValue();
MOJ_NAMESPACE = (String) PAPER_OBFHELPER_CLASS.field("MOJANG_PLUS_YARN_NAMESPACE").getStaticValue();
} catch (ReflectiveOperationException e) {
throw new RuntimeException("Unable to find the Paper ofbuscation mapping class or class members.", e);
}
try { try {
ReflectClass<?> obfHelperClass;
try {
obfHelperClass = Reflect.ofClass("io.papermc.paper.util.ObfHelper");
List<ClassMapping> mappings = loadMappings(); OBF_NAMESPACE = (String) obfHelperClass.field("SPIGOT_NAMESPACE").getStaticValue();
MOJ_NAMESPACE = (String) obfHelperClass.field("MOJANG_PLUS_YARN_NAMESPACE").getStaticValue();
} catch (ReflectiveOperationException e) {
throw new ReflectiveOperationException("Unable to find the Paper ofbuscation mapping class or class members.", e);
}
List<ClassMapping> mappings = loadMappings(obfHelperClass);
for (ClassMapping clazz : mappings) { for (ClassMapping clazz : mappings) {
CLASSES_BY_OBF.put(clazz.obfName, clazz); CLASSES_BY_OBF.put(clazz.obfName, clazz);
CLASSES_BY_MOJ.put(clazz.mojName, clazz); CLASSES_BY_MOJ.put(clazz.mojName, clazz);
@ -72,13 +73,13 @@ public class NMSReflect {
try { try {
Class.forName(clazz.obfName); Class.forName(clazz.obfName);
IS_SERVER_OBFUSCATED = true; IS_SERVER_OBFUSCATED = true;
Log.info("NMS classes are obfuscated."); Log.info("[NMSReflect] NMS classes are obfuscated.");
break; break;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
try { try {
Class.forName(clazz.mojName); Class.forName(clazz.mojName);
IS_SERVER_OBFUSCATED = false; IS_SERVER_OBFUSCATED = false;
Log.info("NMS classes are using mojang mapping."); Log.info("[NMSReflect] NMS classes are using mojang mapping.");
break; break;
} catch (ClassNotFoundException ee) { } catch (ClassNotFoundException ee) {
ee.addSuppressed(e); ee.addSuppressed(e);
@ -98,8 +99,8 @@ public class NMSReflect {
for (ClassMapping clazz : mappings) { for (ClassMapping clazz : mappings) {
clazz.cacheReflectClass(); clazz.cacheReflectClass();
} }
} catch (ReflectiveOperationException e) { } catch (Throwable t) {
Log.severe(e); Log.severe("[NMSReflect] The plugin will not be able to access NMS stuff because the obfuscation mapping couldn't be loaded.", t);
} }
} }
@ -124,8 +125,8 @@ public class NMSReflect {
private static List<ClassMapping> loadMappings() { private static List<ClassMapping> loadMappings(ReflectClass<?> obfHelperClass) throws IOException {
try (final InputStream mappingsInputStream = PAPER_OBFHELPER_CLASS.get().getClassLoader().getResourceAsStream("META-INF/mappings/reobf.tiny")) { try (final InputStream mappingsInputStream = obfHelperClass.get().getClassLoader().getResourceAsStream("META-INF/mappings/reobf.tiny")) {
if (mappingsInputStream == null) { if (mappingsInputStream == null) {
throw new RuntimeException("Unable to find the ofbuscation mapping file in the Paper jar."); throw new RuntimeException("Unable to find the ofbuscation mapping file in the Paper jar.");
} }
@ -138,9 +139,6 @@ public class NMSReflect {
classes.add(new ClassMapping(cls)); classes.add(new ClassMapping(cls));
} }
return classes; return classes;
} catch (IOException e) {
Log.severe("Failed to load mappings.", e);
return Collections.emptyList();
} }
} }

7
Paper/src/main/java/fr/pandacube/lib/paper/reflect/ReflectRegistry.java
View File

@ -481,13 +481,8 @@ public class ReflectRegistry {
if (Modifier.isStatic(f.getModifiers())) if (Modifier.isStatic(f.getModifiers()))
f.get(null); f.get(null);
} }
} catch (ExceptionInInitializerError e) {
Log.severe("Error while initilizing a ReflectRegistry entry at " + cl.getName(), e.getCause());
} catch (NoClassDefFoundError e) {
// if a previously initialized class failed to actually initialize
Log.severe("Error while initilizing a ReflectRegistry entry at " + cl.getName() + " due to a previously failed initialization (" + e.getMessage() + ")");
} catch (Throwable t) { } catch (Throwable t) {
Log.severe("Wut?", t); Log.severe("Error while initilizing a ReflectRegistry entry at " + cl.getName(), t);
} }
for (Class<?> declaredClass : cl.getDeclaredClasses()) { for (Class<?> declaredClass : cl.getDeclaredClasses()) {
initRecursively(declaredClass); initRecursively(declaredClass);