对旧存档的兼容性问题

Author: Circulate233

src/main/java/com/circulation/random_complement/mixin/ae2/new_patten_gui/MixinContainerWirelessPatternTerminal.java

@@ -31,21 +31,15 @@ public MixinContainerWirelessPatternTerminal(InventoryPlayer ip, ITerminalHost m
     public AppEngInternalInventory newCrafting(IAEAppEngInventory inventory, int size) {
         return new AppEngInternalInventory(inventory, 81) {
             @Override
-            public void setSize(int size) {
-                if (size < getSlots()) return;
-                super.setSize(size);
-            }
+            public void setSize(int size) {}
         };
     }
 
     @Redirect(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/util/inv/IAEAppEngInventory;I)Lappeng/tile/inventory/AppEngInternalInventory;", ordinal = 1, remap = false))
     public AppEngInternalInventory newOutput(IAEAppEngInventory inventory, int size) {
         return new AppEngInternalInventory(inventory, 27) {
             @Override
-            public void setSize(int size) {
-                if (size < getSlots()) return;
-                super.setSize(size);
-            }
+            public void setSize(int size) {}
         };
     }
 

src/main/java/com/circulation/random_complement/mixin/ae2/new_patten_gui/MixinPartPatternTerminal.java

@@ -3,21 +3,26 @@
 import appeng.parts.reporting.PartPatternTerminal;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.inv.IAEAppEngInventory;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(value = PartPatternTerminal.class, remap = false)
 public class MixinPartPatternTerminal {
 
-    @WrapOperation(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/util/inv/IAEAppEngInventory;I)Lappeng/tile/inventory/AppEngInternalInventory;", ordinal = 0))
-    public AppEngInternalInventory newCrafting(IAEAppEngInventory inventory, int size, Operation<AppEngInternalInventory> original) {
-        return original.call(inventory, 81);
+    @Redirect(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/util/inv/IAEAppEngInventory;I)Lappeng/tile/inventory/AppEngInternalInventory;", ordinal = 0))
+    public AppEngInternalInventory newCrafting(IAEAppEngInventory inventory, int size) {
+        return new AppEngInternalInventory(inventory, 81) {
+            @Override
+            public void setSize(int size) {}
+        };
     }
 
-    @WrapOperation(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/util/inv/IAEAppEngInventory;I)Lappeng/tile/inventory/AppEngInternalInventory;", ordinal = 1))
-    public AppEngInternalInventory newOutput(IAEAppEngInventory inventory, int size, Operation<AppEngInternalInventory> original) {
-        return original.call(inventory, 27);
+    @Redirect(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/util/inv/IAEAppEngInventory;I)Lappeng/tile/inventory/AppEngInternalInventory;", ordinal = 1))
+    public AppEngInternalInventory newOutput(IAEAppEngInventory inventory, int size) {
+        return new AppEngInternalInventory(inventory, 27) {
+            @Override
+            public void setSize(int size) {}
+        };
     }
 }

src/main/java/com/circulation/random_complement/mixin/ae2fc/new_patten_gui/MixinPartFluidPatternTerminal.java

@@ -0,0 +1,21 @@
+package com.circulation.random_complement.mixin.ae2fc.new_patten_gui;
+
+import appeng.tile.inventory.AppEngInternalInventory;
+import com.glodblock.github.common.part.PartFluidPatternTerminal;
+import com.glodblock.github.inventory.ExAppEngInternalInventory;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(PartFluidPatternTerminal.class)
+public class MixinPartFluidPatternTerminal {
+
+    @Redirect(method = "<init>", at = @At(value = "NEW", target = "(Lappeng/tile/inventory/AppEngInternalInventory;)Lcom/glodblock/github/inventory/ExAppEngInternalInventory;", remap = false))
+    public ExAppEngInternalInventory newCrafting(AppEngInternalInventory inv) {
+        return new ExAppEngInternalInventory(inv) {
+            @Override
+            public void setSize(int size) {
+            }
+        };
+    }
+}

src/main/java/com/circulation/random_complement/mixin/rcLateMixinLoader.java

@@ -30,6 +30,7 @@ public class rcLateMixinLoader implements ILateMixinLoader {
         if (modLoaded("appliedenergistics2")) {
             addMixinCFG("mixins.random_complement.ae2.json");
             addMixinCFG("mixins.random_complement.ae2.new_patten_gui.json", () -> RCConfig.AE2.newPattenGui);
+            addMixinCFG("mixins.random_complement.ae2fc.new_patten_gui.json", () -> modLoaded("ae2fc") && RCConfig.AE2.newPattenGui);
             addModdedMixinCFG("mixins.random_complement.ae2.jei.json", "jei");
             addModdedMixinCFG("mixins.random_complement.ae2e.json", "ae2exttable");
             addModdedMixinCFG("mixins.random_complement.nae2.json", "nae2");

src/main/resources/mixins.random_complement.ae2fc.new_patten_gui.json

@@ -0,0 +1,10 @@
+{
+  "package": "com.circulation.random_complement.mixin.ae2fc.new_patten_gui",
+  "refmap": "mixins.random_complement.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8.5",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "MixinPartFluidPatternTerminal"
+  ]
+}