Fix NAE2 MixinDualityInterface

Author: tier940

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.7.8
+- Fix NAE2 MixinDualityInterface craftingList compatibility with AE2-UEL
+
+* * *
+
 # 2.7.7
 - Drop BQu Mixin [#363](https://github.com/GTModpackTeam/GTExpert-Core/pull/363)
 - Fix conflict ImplosionRecipe [#364](https://github.com/GTModpackTeam/GTExpert-Core/pull/364)

buildscript.properties

@@ -7,7 +7,7 @@ modGroup = com.github.gtexpert.core
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.7.7-beta
+modVersion = 2.7.8-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

src/main/java/com/github/gtexpert/core/core/NAE2PatchTransformer.java

@@ -12,9 +12,9 @@
 import com.github.gtexpert.core.api.util.GTELog;
 
 /**
- * ASM Transformer to patch NAE2's MixinDualityInterface by removing the problematic craftingList field
- * and any methods that reference it. This fixes compatibility issues with newer AE2 versions
- * where the craftingList field no longer exists.
+ * ASM Transformer to patch NAE2's MixinDualityInterface by removing the @Shadow craftingList field
+ * and replacing methods that reference it with no-ops. This fixes compatibility issues with newer
+ * AE2 versions where the craftingList field no longer exists, while preserving Mixin injection points.
  */
 public class NAE2PatchTransformer implements IClassTransformer {
 
@@ -65,30 +65,32 @@ private byte[] patchMixinDualityInterface(byte[] classBytes) {
                 if (method.name.contains("injectInventoryChange") ||
                         method.name.contains("handler$")) {
 
-                    // Remove any GETFIELD instructions that reference craftingList
+                    // Check for any GETFIELD/PUTFIELD instructions that reference craftingList
                     if (method.instructions != null) {
-                        boolean methodModified = false;
+                        boolean hasCraftingListRef = false;
                         Iterator<AbstractInsnNode> insnIterator = method.instructions.iterator();
-
                         while (insnIterator.hasNext()) {
                             AbstractInsnNode insn = insnIterator.next();
-
                             if (insn.getOpcode() == Opcodes.GETFIELD || insn.getOpcode() == Opcodes.PUTFIELD) {
                                 FieldInsnNode fieldInsn = (FieldInsnNode) insn;
                                 if ("craftingList".equals(fieldInsn.name)) {
-                                    GTELog.logger.info(
-                                            "Found reference to craftingList in method {}, removing the method entirely",
-                                            method.name);
-                                    methodIterator.remove();
-                                    modified = true;
-                                    methodModified = true;
+                                    hasCraftingListRef = true;
                                     break;
                                 }
                             }
                         }
 
-                        if (methodModified) {
-                            continue;
+                        if (hasCraftingListRef) {
+                            GTELog.logger.info(
+                                    "Found reference to craftingList in method {}, replacing with no-op",
+                                    method.name);
+                            method.instructions.clear();
+                            if (method.tryCatchBlocks != null) {
+                                method.tryCatchBlocks.clear();
+                            }
+                            method.localVariables = null;
+                            method.instructions.add(new InsnNode(Opcodes.RETURN));
+                            modified = true;
                         }
                     }
                 }