Fix: Register ClassInfos for generated classes.

LlamaLad7 · May 8, 2023 · fa9edbd · fa9edbd
1 parent 568546d
commit fa9edbd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/com/llamalad7/mixinextras/utils/ClassGenUtils.java b/src/main/java/com/llamalad7/mixinextras/utils/ClassGenUtils.java
@@ -47,6 +47,7 @@ public static void defineClass(ClassNode node, MethodHandles.Lookup scope) {
         ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
         node.accept(writer);
         DEFINER.define(node.name.replace('/', '.'), writer.toByteArray(), scope);
+        MixinInternals.registerClassInfo(node);
     }
 
     @FunctionalInterface

diff --git a/src/main/java/com/llamalad7/mixinextras/utils/MixinInternals.java b/src/main/java/com/llamalad7/mixinextras/utils/MixinInternals.java
@@ -8,6 +8,7 @@
 import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
 import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode;
 import org.spongepowered.asm.mixin.injection.struct.Target;
+import org.spongepowered.asm.mixin.transformer.ClassInfo;
 import org.spongepowered.asm.mixin.transformer.IMixinTransformer;
 import org.spongepowered.asm.mixin.transformer.ext.Extensions;
 import org.spongepowered.asm.mixin.transformer.ext.IExtension;
@@ -31,6 +32,7 @@ public class MixinInternals {
     private static final Field INJECTION_INFO_TARGET_NODES_FIELD;
     private static final Field INJECTION_NODE_DECORATIONS_FIELD;
     private static final Field INJECTION_INFO_INJECTOR_FIELD;
+    private static final Method CLASS_INFO_FROM_CLASS_NODE_METHOD;
 
     static {
         try {
@@ -53,6 +55,8 @@ public class MixinInternals {
             INJECTION_NODE_DECORATIONS_FIELD.setAccessible(true);
             INJECTION_INFO_INJECTOR_FIELD = InjectionInfo.class.getDeclaredField("injector");
             INJECTION_INFO_INJECTOR_FIELD.setAccessible(true);
+            CLASS_INFO_FROM_CLASS_NODE_METHOD = ClassInfo.class.getDeclaredMethod("fromClassNode", ClassNode.class);
+            CLASS_INFO_FROM_CLASS_NODE_METHOD.setAccessible(true);
         } catch (ClassNotFoundException | NoSuchFieldException | NoSuchMethodException e) {
             throw new RuntimeException("Failed to access some mixin internals, please report to LlamaLad7!", e);
         }
@@ -139,4 +143,12 @@ private static ClassNode getClassNode(IMixinInfo mixin) {
         }
     }
 
+    public static void registerClassInfo(ClassNode classNode) {
+        try {
+            CLASS_INFO_FROM_CLASS_NODE_METHOD.invoke(null, classNode);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Failed to use mixin internals, please report to LlamaLad7!", e);
+        }
+    }
+
 }