修复与ae2ctl的兼容性问题

Author: Circulate233

build.gradle

@@ -214,7 +214,7 @@ dependencies {
     runtimeOnly(rfg.deobf("curse.maven:Cucumber-1.12.2-1.1.3-272335:2645867"))
     implementation(rfg.deobf("curse.maven:CodeChickenLib-1.12.2-3.2.4.1-universal-242818:2779848"))
     implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
-    implementation(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7332070"))
+    implementation(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7336029"))
     compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
     implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
     implementation(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
@@ -247,6 +247,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
     implementation(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
     implementation(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
+    implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
 
     compileOnly(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
 }

src/main/java/com/circulation/random_complement/RCConfig.java

@@ -85,7 +85,10 @@ public static class ae2 {
         @Config.Name("debugEnergy")
         public boolean debugEnergy = false;
 
-        @Config.Comment({"Use the new Patten Terminal Gui"})
+        @Config.Comment({
+            "Use the new Patten Terminal Gui",
+            "Closing will cause all patterns created while enabled to become invalid."
+        })
         @Config.Name("newPattenGui")
         public boolean newPattenGui = true;
 

src/main/java/com/circulation/random_complement/mixin/ae2/AccessorCraftingTreeNode.java

@@ -2,6 +2,7 @@
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.crafting.CraftingJob;
 import appeng.crafting.CraftingTreeNode;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -19,4 +20,7 @@ public interface AccessorCraftingTreeNode {
 
     @Accessor
     boolean isCanEmit();
+
+    @Accessor
+    CraftingJob getJob();
 }

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/ae2ctl/MixinLiteCraftTreeNode.java

@@ -0,0 +1,25 @@
+package com.circulation.random_complement.mixin.ae2.miss_craft.ae2ctl;
+
+import com.circulation.random_complement.common.interfaces.RCCraftingJob;
+import github.kasuminova.ae2ctl.common.integration.ae2.data.LiteCraftTreeNode;
+import github.kasuminova.ae2ctl.mixin.ae2.AccessorCraftingTreeNode;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = LiteCraftTreeNode.class,remap = false)
+public class MixinLiteCraftTreeNode {
+
+    @Redirect(method = "of",at = @At(value = "INVOKE", target = "Lgithub/kasuminova/ae2ctl/mixin/ae2/AccessorCraftingTreeNode;getMissing()J"))
+    private static long getMissing(AccessorCraftingTreeNode instance) {
+        if (!((RCCraftingJob) r$pack(instance).getJob()).canIgnoredInput()) return instance.getMissing();
+        if (r$pack(instance).isCanEmit()) return instance.getMissing();
+        return r$pack(instance).getHowManyEmitted();
+    }
+
+    @Unique
+    private static com.circulation.random_complement.mixin.ae2.AccessorCraftingTreeNode r$pack(AccessorCraftingTreeNode node) {
+        return (com.circulation.random_complement.mixin.ae2.AccessorCraftingTreeNode) node;
+    }
+}

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

@@ -31,6 +31,8 @@ public class rcLateMixinLoader implements ILateMixinLoader {
             addMixinCFG("mixins.random_complement.ae2.json");
             addMixinCFG("mixins.random_complement.ae2.miss_craft.json", 
                 () -> RCConfig.AE2.enableMissCraft);
+            addMixinCFG("mixins.random_complement.ae2.miss_craft.ae2ctl.json",
+                () -> RCConfig.AE2.enableMissCraft && modLoaded("ae2ctl"));
             addMixinCFG("mixins.random_complement.ae2.new_patten_gui.json",
                 () -> RCConfig.AE2.newPattenGui);
             addMixinCFG("mixins.random_complement.ae2fc.new_patten_gui.json",

src/main/resources/mixins.random_complement.ae2.miss_craft.ae2ctl.json

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