修复bug

Author: Circulate233

gradle.properties

@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.2.7
+mod_version = 1.2.8
 root_package = com.circulation
 mod_id = ae2wut
 mod_name = AE2UELWirelessUniversalTerminal

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/AccessorGuiCraftAmount.java

@@ -0,0 +1,14 @@
+package com.circulation.ae2wut.mixin.ae2.gui;
+
+
+import appeng.client.gui.implementations.GuiCraftAmount;
+import appeng.core.sync.GuiBridge;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(value = GuiCraftAmount.class, remap = false)
+public interface AccessorGuiCraftAmount {
+
+    @Accessor
+    GuiBridge getOriginalGui();
+}

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/AccessorGuiCraftConfirm.java

@@ -0,0 +1,13 @@
+package com.circulation.ae2wut.mixin.ae2.gui;
+
+import appeng.client.gui.implementations.GuiCraftConfirm;
+import appeng.core.sync.GuiBridge;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(value = GuiCraftConfirm.class, remap = false)
+public interface AccessorGuiCraftConfirm {
+
+    @Accessor
+    GuiBridge getOriginalGui();
+}

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/AccessorGuiCraftingStatus.java

@@ -0,0 +1,13 @@
+package com.circulation.ae2wut.mixin.ae2.gui;
+
+import appeng.client.gui.implementations.GuiCraftingStatus;
+import appeng.core.sync.GuiBridge;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(value = GuiCraftingStatus.class, remap = false)
+public interface AccessorGuiCraftingStatus {
+
+    @Accessor
+    GuiBridge getOriginalGui();
+}

src/main/java/com/circulation/ae2wut/mixin/ae2fc/MixinGuiFCCraftAmount.java

@@ -6,6 +6,7 @@
 import appeng.container.AEBaseContainer;
 import appeng.helpers.WirelessTerminalGuiObject;
 import com.circulation.ae2wut.item.ItemWirelessUniversalTerminal;
+import com.circulation.ae2wut.mixin.ae2.gui.AccessorGuiCraftAmount;
 import com.glodblock.github.client.GuiFCCraftAmount;
 import com.glodblock.github.inventory.GuiType;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -19,7 +20,7 @@
 import java.util.Objects;
 
 @Mixin(value = GuiFCCraftAmount.class, remap = false)
-public class MixinGuiFCCraftAmount extends GuiCraftAmount {
+public abstract class MixinGuiFCCraftAmount extends GuiCraftAmount implements AccessorGuiCraftAmount {
 
     @Shadow
     private GuiType originGui;
@@ -32,6 +33,7 @@ public MixinGuiFCCraftAmount(InventoryPlayer inventoryPlayer, ITerminalHost te)
 
     @Inject(method = "initGui", at = @At(value = "TAIL"), cancellable = true, remap = true)
     public void onInitGui(CallbackInfo ci) {
+        if (getOriginalGui() != null) return;
         Object te = ((AEBaseContainer) this.inventorySlots).getTarget();
         ItemStack icon = ItemStack.EMPTY;
         if (te instanceof WirelessTerminalGuiObject) {

src/main/java/com/circulation/ae2wut/mixin/ae2fc/MixinGuiFCCraftConfirm.java

@@ -5,6 +5,7 @@
 import appeng.container.AEBaseContainer;
 import appeng.helpers.WirelessTerminalGuiObject;
 import com.circulation.ae2wut.item.ItemWirelessUniversalTerminal;
+import com.circulation.ae2wut.mixin.ae2.gui.AccessorGuiCraftConfirm;
 import com.glodblock.github.client.GuiFCCraftConfirm;
 import com.glodblock.github.inventory.GuiType;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -16,7 +17,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = GuiFCCraftConfirm.class, remap = false)
-public class MixinGuiFCCraftConfirm extends GuiCraftConfirm {
+public abstract class MixinGuiFCCraftConfirm extends GuiCraftConfirm implements AccessorGuiCraftConfirm {
     @Shadow
     private GuiType originGui;
 
@@ -26,6 +27,7 @@ public MixinGuiFCCraftConfirm(InventoryPlayer inventoryPlayer, ITerminalHost te)
 
     @Inject(method = "initGui", at = @At(value = "TAIL"), remap = true)
     public void onInitGui(CallbackInfo ci) {
+        if (getOriginalGui() != null) return;
         Object te = ((AEBaseContainer) this.inventorySlots).getTarget();
         if (te instanceof WirelessTerminalGuiObject) {
             ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();

src/main/java/com/circulation/ae2wut/mixin/ae2fc/MixinGuiFluidPatternTerminalCraftingStatus.java

@@ -6,6 +6,7 @@
 import appeng.helpers.WirelessTerminalGuiObject;
 import com.circulation.ae2wut.AE2UELWirelessUniversalTerminal;
 import com.circulation.ae2wut.item.ItemWirelessUniversalTerminal;
+import com.circulation.ae2wut.mixin.ae2.gui.AccessorGuiCraftingStatus;
 import com.glodblock.github.client.GuiFluidPatternTerminalCraftingStatus;
 import com.glodblock.github.util.Ae2ReflectClient;
 import net.minecraft.client.gui.GuiButton;
@@ -20,7 +21,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = GuiFluidPatternTerminalCraftingStatus.class, remap = false)
-public class MixinGuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus {
+public abstract class MixinGuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus implements AccessorGuiCraftingStatus {
 
     @Mutable
     @Final
@@ -35,6 +36,7 @@ public MixinGuiFluidPatternTerminalCraftingStatus(InventoryPlayer inventoryPlaye
 
     @Inject(method = "<init>", at = @At("TAIL"))
     public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, CallbackInfo ci) {
+        if (getOriginalGui() != null) return;
         if (te instanceof WirelessTerminalGuiObject) {
             ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
             if (tool.getItem() instanceof ItemWirelessUniversalTerminal) {
@@ -45,6 +47,7 @@ public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, CallbackIn
 
     @Inject(method = "actionPerformed", at = @At(value = "HEAD"), remap = true)
     public void onActionPerformed(GuiButton btn, CallbackInfo ci) {
+        if (getOriginalGui() != null) return;
         if (btn == this.originalGuiBtn) {
             if (this.part instanceof WirelessTerminalGuiObject t) {
                 ItemStack tool = t.getItemStack();

src/main/java/com/circulation/ae2wut/recipes/AllWUTRecipe.java

@@ -24,6 +24,7 @@
 
 import java.util.List;
 
+import static com.circulation.ae2wut.handler.WutRegisterHandler.isClassPresent;
 import static com.circulation.ae2wut.item.ItemWirelessUniversalTerminal.NAME;
 
 public class AllWUTRecipe {
@@ -63,7 +64,12 @@ private static Int2ObjectMap<ItemStack> getIngredient() {
 
     @Optional.Method(modid = "ae2fc")
     private static void addAE2FC(Int2ObjectMap<ItemStack> map) {
-        map.put(4, new ItemStack(FCItems.WIRELESS_FLUID_PATTERN_TERMINAL));
+        try {
+            if (isClassPresent("com.glodblock.github.common.tile.TileFluidLevelMaintainer"))
+                map.put(4, new ItemStack(FCItems.WIRELESS_FLUID_PATTERN_TERMINAL));
+        } catch (Throwable ignored) {
+
+        }
     }
 
     @Optional.Method(modid = "mekeng")

src/main/resources/mixins.ae2wut.json

@@ -5,6 +5,9 @@
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
   "client": [
+    "gui.AccessorGuiCraftAmount",
+    "gui.AccessorGuiCraftConfirm",
+    "gui.AccessorGuiCraftingStatus",
     "gui.MixinGuiMEMonitorable",
     "gui.MixinGuiWirelessFluidTerminal",
     "gui.MixinGuiWirelessInterfaceTerminal"