修复bug

Author: Circulate233

build.gradle

@@ -230,7 +230,7 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
     compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:5351260"))
     compileOnly(rfg.deobf("curse.maven:mekeng-1027681:5775101"))
-    implementation(rfg.deobf("curse.maven:had-enough-items-557549:7282920"))
+    implementation(rfg.deobf("curse.maven:had-enough-items-557549:7340288"))
     implementation(rfg.deobf("curse.maven:thaumic-223628:2629023"))
     implementation(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
     implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))

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.7
+mod_version = 1.8.8
 root_package = com.circulation
 mod_id = random_complement
 mod_name = RandomComplement

src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinAEBaseContainer.java

@@ -2,13 +2,18 @@
 
 import appeng.container.AEBaseContainer;
 import com.circulation.random_complement.common.interfaces.RCAEBaseContainer;
+import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(value = AEBaseContainer.class, remap = false)
 public abstract class MixinAEBaseContainer extends Container implements RCAEBaseContainer {
 
+    @Shadow
+    public abstract InventoryPlayer getPlayerInv();
+
     @Unique
     private Container rc$oldContainer;
 

src/main/java/com/circulation/random_complement/mixin/ae2/container/MixinContainerCraftConfirm.java

@@ -1,21 +1,25 @@
 package com.circulation.random_complement.mixin.ae2.container;
 
 import appeng.container.implementations.ContainerCraftConfirm;
+import com.circulation.random_complement.RandomComplement;
 import com.circulation.random_complement.common.interfaces.RCAEBaseContainer;
+import com.circulation.random_complement.common.network.ContainerRollBACK;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.ContainerPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = ContainerCraftConfirm.class, remap = false)
-public abstract class MixinContainerCraftConfirm implements RCAEBaseContainer {
+public abstract class MixinContainerCraftConfirm extends MixinAEBaseContainer implements RCAEBaseContainer {
 
     @Shadow
     public abstract void setAutoStart(boolean autoStart);
 
     @Inject(
-        method = "startJob()V",
+        method = "startJob",
         at = @At(
             value = "INVOKE",
             target = "Lappeng/api/networking/crafting/ICraftingGrid;submitJob(Lappeng/api/networking/crafting/ICraftingJob;Lappeng/api/networking/crafting/ICraftingRequester;Lappeng/api/networking/crafting/ICraftingCPU;ZLappeng/api/networking/security/IActionSource;)Lappeng/api/networking/crafting/ICraftingLink;",
@@ -25,7 +29,23 @@ public abstract class MixinContainerCraftConfirm implements RCAEBaseContainer {
     public void startJob0(CallbackInfo ci) {
         if (this.rc$getOldContainer() != null) {
             this.setAutoStart(false);
+            if (this.getPlayerInv().player instanceof EntityPlayerMP entityPlayerMP) {
+                var oldContainer = this.rc$getOldContainer();
+                if (oldContainer != null) {
+                    if (oldContainer instanceof ContainerPlayer) {
+                        entityPlayerMP.closeContainer();
+                    } else {
+                        entityPlayerMP.getNextWindowId();
+                        entityPlayerMP.closeContainer();
+                        int windowId = entityPlayerMP.currentWindowId;
+                        entityPlayerMP.openContainer = oldContainer;
+                        entityPlayerMP.openContainer.windowId = windowId;
+                    }
+                }
+                RandomComplement.NET_CHANNEL.sendTo(new ContainerRollBACK(), entityPlayerMP);
+            }
             ci.cancel();
         }
     }
+
 }

src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinGuiCraftConfirm.java

@@ -1,12 +1,15 @@
 package com.circulation.random_complement.mixin.ae2.gui;
 
+import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.implementations.GuiCraftConfirm;
 import appeng.core.AELog;
+import appeng.core.sync.GuiBridge;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketValueConfig;
+import appeng.tile.misc.TileSecurityStation;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import com.circulation.random_complement.RandomComplement;
@@ -25,6 +28,7 @@
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.Loader;
@@ -53,6 +57,9 @@ public MixinGuiCraftConfirm(Container container) {
         super(container);
     }
 
+    @Shadow(remap = false)
+    private GuiBridge OriginalGui;
+
     @Unique
     private static String randomComplement$getItemInformation(final Object o) {
         String dspToolTip = "";
@@ -100,6 +107,14 @@ public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
 
     }
 
+    @Inject(method = "<init>", at = @At("TAIL"))
+    public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, CallbackInfo ci) {
+        if (te instanceof TileSecurityStation) {
+            this.OriginalGui = GuiBridge.GUI_SECURITY;
+        }
+
+    }
+
     @Inject(method = "drawFG", at = @At("TAIL"), remap = false)
     private void onDrawFG(int offsetX, int offsetY, int mouseX, int mouseY, CallbackInfo ci) {
         if (r$getCancel().isMouseOver() && Loader.isModLoaded("jei")) {
@@ -108,7 +123,7 @@ private void onDrawFG(int offsetX, int offsetY, int mouseX, int mouseY, Callback
     }
 
     @Inject(method = "actionPerformed", at = @At("HEAD"), cancellable = true)
-    public void onActionPerformed1(GuiButton btn, CallbackInfo ci) {
+    public void onActionPerformed(GuiButton btn, CallbackInfo ci) {
         if (Loader.isModLoaded("jei") && btn == r$getCancel() && isShiftKeyDown()) rc$addMissBookmark();
         if (RCInputHandler.getOldGui() == null) return;
         if (btn == this.start || btn == r$getCancel()) {
@@ -123,7 +138,9 @@ public void onActionPerformed1(GuiButton btn, CallbackInfo ci) {
             GuiScreen oldGui;
             if ((oldGui = RCInputHandler.getOldGui()) != null) {
                 RCInputHandler.setDelayMethod(() -> Minecraft.getMinecraft().displayGuiScreen(oldGui));
-                RandomComplement.NET_CHANNEL.sendToServer(new ContainerRollBACK());
+                if (btn == r$getCancel()) {
+                    RandomComplement.NET_CHANNEL.sendToServer(new ContainerRollBACK());
+                }
             }
             ci.cancel();
         }