补充性的兼容修正

Circulate233 · Circulate233 · commit 2814cfbed9bc · 2025-12-14T00:01:16.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -210,6 +210,7 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:1.18.24")
 
     implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
+    compileOnly("lib:ae2fc-2.7.0-unofficial:dev")
     implementation(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
     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"))
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.8.2
+mod_version = 1.8.3
 root_package = com.circulation
 mod_id = random_complement
 mod_name = RandomComplement
diff --git a/src/main/java/com/circulation/random_complement/client/RegItemTooltip.java b/src/main/java/com/circulation/random_complement/client/RegItemTooltip.java
@@ -3,10 +3,8 @@
 import appeng.client.gui.AEBaseGui;
 import appeng.container.slot.SlotFake;
 import com.circulation.random_complement.client.handler.ItemTooltipHandler;
-import com.glodblock.github.client.GuiExtendedFluidPatternTerminal;
-import com.glodblock.github.client.GuiFluidPatternTerminal;
+import com.circulation.random_complement.mixin.util.FCClassUtil;
 import com.glodblock.github.client.GuiUltimateEncoder;
-import com.glodblock.github.client.GuiWirelessFluidPatternTerminal;
 import it.unimi.dsi.fastutil.objects.ObjectLists;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
@@ -32,9 +30,11 @@ private static void regAE2FCTooltips() {
             return ObjectLists.emptyList();
         };
 
-        ItemTooltipHandler.regItemTooltip(GuiFluidPatternTerminal.class, t);
-        ItemTooltipHandler.regItemTooltip(GuiExtendedFluidPatternTerminal.class, t);
-        ItemTooltipHandler.regItemTooltip(GuiWirelessFluidPatternTerminal.class, t);
+        ItemTooltipHandler.regItemTooltip(FCClassUtil.extendedFluidPatternTerminal, t);
+        ItemTooltipHandler.regItemTooltip(FCClassUtil.fluidPatternTerminal, t);
+        ItemTooltipHandler.regItemTooltip(FCClassUtil.wirelessFluidPatternTerminal, t);
+
+
         ItemTooltipHandler.regItemTooltip(GuiUltimateEncoder.class, t);
     }
 }
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiExtendedFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiExtendedFluidPatternTerminal.java
@@ -0,0 +1,35 @@
+package com.circulation.random_complement.mixin.ae2fc.news;
+
+import appeng.container.slot.SlotFake;
+import com.circulation.random_complement.common.util.MEHandler;
+import com.circulation.random_complement.mixin.ae2.gui.MixinGuiMEMonitorable;
+import com.glodblock.github.client.client.gui.GuiExtendedFluidPatternTerminal;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = GuiExtendedFluidPatternTerminal.class)
+public abstract class MixinGuiExtendedFluidPatternTerminal extends MixinGuiMEMonitorable {
+
+    public MixinGuiExtendedFluidPatternTerminal(Container container) {
+        super(container);
+    }
+
+    @Inject(method = "drawSlot", at = @At(value = "HEAD"))
+    private void drawSlotFake(Slot slot, CallbackInfo ci) {
+        if (slot.xPos < 0 || slot.yPos < 0) return;
+        if (slot instanceof SlotFake slotFake) {
+            if (!slotFake.shouldDisplay()) return;
+            var item = slotFake.getDisplayStack();
+            if (!item.isEmpty()) {
+                if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
+                    r$getPlusSlot().add(slotFake);
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiFluidPatternTerminal.java
@@ -0,0 +1,35 @@
+package com.circulation.random_complement.mixin.ae2fc.news;
+
+import appeng.container.slot.SlotFake;
+import com.circulation.random_complement.common.util.MEHandler;
+import com.circulation.random_complement.mixin.ae2.gui.MixinGuiMEMonitorable;
+import com.glodblock.github.client.client.gui.GuiFluidPatternTerminal;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = GuiFluidPatternTerminal.class)
+public abstract class MixinGuiFluidPatternTerminal extends MixinGuiMEMonitorable {
+
+    public MixinGuiFluidPatternTerminal(Container container) {
+        super(container);
+    }
+
+    @Inject(method = "drawSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Slot;getStack()Lnet/minecraft/item/ItemStack;", ordinal = 0))
+    private void drawSlotFake(Slot slot, CallbackInfo ci) {
+        if (slot.xPos < 0 || slot.yPos < 0) return;
+        if (slot instanceof SlotFake slotFake) {
+            if (!slotFake.shouldDisplay()) return;
+            if (!slotFake.getDisplayStack().isEmpty()) {
+                var item = slotFake.getDisplayStack();
+                if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
+                    r$getPlusSlot().add(slot);
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiWirelessFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiWirelessFluidPatternTerminal.java
@@ -0,0 +1,35 @@
+package com.circulation.random_complement.mixin.ae2fc.news;
+
+import appeng.container.slot.SlotFake;
+import com.circulation.random_complement.common.util.MEHandler;
+import com.circulation.random_complement.mixin.ae2.gui.MixinGuiMEMonitorable;
+import com.glodblock.github.client.client.gui.GuiWirelessFluidPatternTerminal;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = GuiWirelessFluidPatternTerminal.class)
+public abstract class MixinGuiWirelessFluidPatternTerminal extends MixinGuiMEMonitorable {
+
+    public MixinGuiWirelessFluidPatternTerminal(Container container) {
+        super(container);
+    }
+
+    @Inject(method = "drawSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Slot;getStack()Lnet/minecraft/item/ItemStack;", ordinal = 0))
+    private void drawSlotFake(Slot slot, CallbackInfo ci) {
+        if (slot.xPos < 0 || slot.yPos < 0) return;
+        if (slot instanceof SlotFake slotFake) {
+            if (!slotFake.shouldDisplay()) return;
+            if (!slotFake.getDisplayStack().isEmpty()) {
+                var item = slotFake.getDisplayStack();
+                if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
+                    r$getPlusSlot().add(slotFake);
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiExtendedFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiExtendedFluidPatternTerminal.java
@@ -1,4 +1,4 @@
-package com.circulation.random_complement.mixin.ae2fc.gui;
+package com.circulation.random_complement.mixin.ae2fc.old;
 
 import appeng.container.slot.SlotFake;
 import com.circulation.random_complement.common.util.MEHandler;
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiFluidPatternTerminal.java
@@ -1,4 +1,4 @@
-package com.circulation.random_complement.mixin.ae2fc.gui;
+package com.circulation.random_complement.mixin.ae2fc.old;
 
 import appeng.container.slot.SlotFake;
 import com.circulation.random_complement.common.util.MEHandler;
diff --git a/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiWirelessFluidPatternTerminal.java b/src/main/java/com/circulation/random_complement/mixin/ae2fc/old/MixinGuiWirelessFluidPatternTerminal.java
@@ -1,4 +1,4 @@
-package com.circulation.random_complement.mixin.ae2fc.gui;
+package com.circulation.random_complement.mixin.ae2fc.old;
 
 import appeng.container.slot.SlotFake;
 import com.circulation.random_complement.common.util.MEHandler;
diff --git a/src/main/java/com/circulation/random_complement/mixin/rcLateMixinLoader.java b/src/main/java/com/circulation/random_complement/mixin/rcLateMixinLoader.java
@@ -70,7 +70,11 @@ public class rcLateMixinLoader implements ILateMixinLoader {
         }
         addMixinCFG("mixins.random_complement.threng.json",
             () -> modLoaded("threng") && RCConfig.LazyAE.EnableRepair);
-        addModdedMixinCFG("mixins.random_complement.ae2fc.json", "ae2fc");
+        if (modLoaded("ae2fc")) {
+            addMixinCFG("mixins.random_complement.ae2fc.json");
+            addMixinCFG("mixins.random_complement.ae2fc.old.json", () -> isClassPresent("com.glodblock.github.common.tile.TileFluidLevelMaintainer"));
+            addMixinCFG("mixins.random_complement.ae2fc.new.json", () -> !isClassPresent("com.glodblock.github.common.tile.TileFluidLevelMaintainer"));
+        }
         addModdedMixinCFG("mixins.random_complement.ic2.json", "ic2");
         addModdedMixinCFG("mixins.random_complement.te5.json", "thermalexpansion");
         addModdedMixinCFG("mixins.random_complement.thaumicenergistics.json", "thaumicenergistics");
diff --git a/src/main/java/com/circulation/random_complement/mixin/util/FCClassUtil.java b/src/main/java/com/circulation/random_complement/mixin/util/FCClassUtil.java
@@ -0,0 +1,32 @@
+package com.circulation.random_complement.mixin.util;
+
+import appeng.client.gui.AEBaseGui;
+
+public class FCClassUtil {
+
+    public static final Class<AEBaseGui> fluidPatternTerminal;
+    public static final Class<AEBaseGui> wirelessFluidPatternTerminal;
+    public static final Class<AEBaseGui> extendedFluidPatternTerminal;
+
+    static {
+        Class<AEBaseGui> fluidPatternTerminal1;
+        Class<AEBaseGui> extendedFluidPatternTerminal1;
+        Class<AEBaseGui> wirelessFluidPatternTerminal1;
+        try {
+            fluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.GuiFluidPatternTerminal");
+            extendedFluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.GuiExtendedFluidPatternTerminal");
+            wirelessFluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.GuiWirelessFluidPatternTerminal");
+        } catch (ClassNotFoundException ignored) {
+            try {
+                fluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.client.gui.GuiFluidPatternTerminal");
+                extendedFluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.client.gui.GuiExtendedFluidPatternTerminal");
+                wirelessFluidPatternTerminal1 = (Class<AEBaseGui>) Class.forName("com.glodblock.github.client.client.gui.GuiWirelessFluidPatternTerminal");
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        fluidPatternTerminal = fluidPatternTerminal1;
+        extendedFluidPatternTerminal = extendedFluidPatternTerminal1;
+        wirelessFluidPatternTerminal = wirelessFluidPatternTerminal1;
+    }
+}
diff --git a/src/main/resources/mixins.random_complement.ae2fc.json b/src/main/resources/mixins.random_complement.ae2fc.json
@@ -13,10 +13,7 @@
   ],
   "server": [],
   "client": [
-    "gui.MixinGuiExtendedFluidPatternTerminal",
     "gui.MixinGuiFCCraftConfirm",
-    "gui.MixinGuiFluidPatternTerminal",
-    "gui.MixinGuiUltimateEncoder",
-    "gui.MixinGuiWirelessFluidPatternTerminal"
+    "gui.MixinGuiUltimateEncoder"
   ]
 }
diff --git a/src/main/resources/mixins.random_complement.ae2fc.new.json b/src/main/resources/mixins.random_complement.ae2fc.new.json
@@ -0,0 +1,13 @@
+{
+  "package": "com.circulation.random_complement.mixin.ae2fc.news",
+  "required": true,
+  "refmap": "mixins.random_complement.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8.5",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinGuiExtendedFluidPatternTerminal",
+    "MixinGuiFluidPatternTerminal",
+    "MixinGuiWirelessFluidPatternTerminal"
+  ]
+}
diff --git a/src/main/resources/mixins.random_complement.ae2fc.old.json b/src/main/resources/mixins.random_complement.ae2fc.old.json
@@ -0,0 +1,13 @@
+{
+  "package": "com.circulation.random_complement.mixin.ae2fc.old",
+  "required": true,
+  "refmap": "mixins.random_complement.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8.5",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "MixinGuiExtendedFluidPatternTerminal",
+    "MixinGuiFluidPatternTerminal",
+    "MixinGuiWirelessFluidPatternTerminal"
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.circulation.random_complement.mixin.ae2fc.gui;`
	`1`	`+package com.circulation.random_complement.mixin.ae2fc.old;`
`2`	`2`
`3`	`3`	`import appeng.container.slot.SlotFake;`
`4`	`4`	`import com.circulation.random_complement.common.util.MEHandler;`