修复bug

Author: Circulate233

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

src/main/java/com/circulation/random_complement/client/RCGuiScrollbar.java

@@ -13,10 +13,16 @@ public class RCGuiScrollbar extends GuiScrollbar {
 
     @Getter
     private final Rectangle rectangle = new Rectangle(getLeft(), getTop(), getWidth(), getHeight());
-    @Setter
     @Getter
     private boolean visible = true;
 
+    public void setVisible(boolean visible) {
+        if (this.visible != visible) {
+            this.visible = visible;
+            rcScrollbarGui.onCurrentScrollChance(getCurrentScroll());
+        }
+    }
+
     @Setter
     private RCScrollbarGui rcScrollbarGui;
 

src/main/java/com/circulation/random_complement/client/RCScrollbarGui.java

@@ -3,5 +3,4 @@
 public interface RCScrollbarGui {
 
     void onCurrentScrollChance(int currentScroll);
-
 }

src/main/java/com/circulation/random_complement/client/handler/RCJEIInputHandler.java

@@ -28,6 +28,7 @@ public class RCJEIInputHandler {
     private static Runnable shiftClickCache;
     @Getter
     private static XYPair xy;
+
     private RCJEIInputHandler() {
 
     }

src/main/java/com/circulation/random_complement/common/interfaces/RCPatternEncoder.java

@@ -1,8 +1,14 @@
 package com.circulation.random_complement.common.interfaces;
 
+import appeng.client.gui.widgets.GuiScrollbar;
+
 public interface RCPatternEncoder {
 
     void setRCSlot(int i);
 
+    void setRCSlot();
+
     boolean isRCPatternEncoder();
+
+    void setScrollbar(GuiScrollbar scrollbar);
 }

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

@@ -86,6 +86,7 @@ private void drawSlotME(Slot slot, CallbackInfo ci) {
 
     @Inject(method = "drawSlot", at = @At(value = "HEAD"))
     private void drawSlotFake(Slot slot, CallbackInfo ci) {
+        if (slot.xPos < 0 || slot.yPos < 0) return;
         if (Minecraft.getMinecraft().currentScreen instanceof SpecialLogic patternTerm) {
             if (patternTerm.r$notMonitorable()) return;
             if (slot instanceof SlotFake slotFake) {

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

@@ -1,6 +1,7 @@
 package com.circulation.random_complement.mixin.ae2.new_patten_gui;
 
 import appeng.api.storage.ITerminalHost;
+import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.container.implementations.ContainerMEMonitorable;
 import appeng.container.implementations.ContainerPatternEncoder;
 import appeng.container.slot.IOptionalSlotHost;
@@ -14,6 +15,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ContainerPatternEncoder.class)
 public abstract class MixinContainerPatternEncoder extends ContainerMEMonitorable implements RCPatternEncoder, IOptionalSlotHost {
@@ -33,20 +38,33 @@ public abstract class MixinContainerPatternEncoder extends ContainerMEMonitorabl
     @Unique
     protected OptionalSlotFake[][] r$outputSlotGroup;
 
+    @Unique
+    protected GuiScrollbar r$guiScrollbar;
+
     public MixinContainerPatternEncoder(InventoryPlayer ip, ITerminalHost monitorable) {
         super(ip, monitorable);
     }
 
+    @Intrinsic
+    public void setScrollbar(GuiScrollbar scrollbar) {
+        if (!isRCPatternEncoder()) return;
+        r$guiScrollbar = scrollbar;
+        setRCSlot();
+    }
+
     @Intrinsic
     public void setRCSlot(int i) {
         if (!isRCPatternEncoder()) return;
-        for (int j = 0; j < 9; j++) {
+        if (this.isCraftingMode()) i = 0;
+        for (int j = 0; j < 9; ++j) {
             if (j == i) {
                 for (int y = 0; y < 3; ++y) {
                     for (int x = 0; x < 3; ++x) {
-                        r$craftingSlotGroup[j][x + y * 3].xPos = 18 + x * 18;
+                        var input = r$craftingSlotGroup[j][x + y * 3];
+                        input.xPos = input.getX();
                     }
-                    r$outputSlotGroup[j][y].xPos = 110;
+                    var output = r$outputSlotGroup[j][y];
+                    output.xPos = this.isCraftingMode() ? -9000 : output.getX();
                 }
             } else {
                 for (var slot : r$craftingSlotGroup[j]) {
@@ -59,11 +77,41 @@ public void setRCSlot(int i) {
         }
     }
 
+    @Intrinsic
+    public void setRCSlot() {
+        if (!isRCPatternEncoder()) return;
+        if (r$guiScrollbar == null) return;
+        setRCSlot(r$guiScrollbar.getCurrentScroll());
+    }
+
+    @Inject(method = "updateOrderOfOutputSlots", at = @At("HEAD"), remap = false)
+    protected void updateOrderOfOutputSlots(CallbackInfo ci) {
+        if (!isRCPatternEncoder()) return;
+        if (this.isCraftingMode()) {
+            setRCSlot(0);
+        } else {
+            setRCSlot();
+        }
+    }
+
+    @Redirect(method = "getInputs", at = @At(value = "FIELD", args = "array=length", target = "Lappeng/container/implementations/ContainerPatternEncoder;craftingSlots:[Lappeng/container/slot/SlotFakeCraftingMatrix;"), remap = false)
+    protected int getInputs(SlotFakeCraftingMatrix[] array) {
+        var o = array.length;
+        if (!isRCPatternEncoder()) return o;
+        if (this.isCraftingMode()) {
+            return Math.min(9, o);
+        }
+        return o;
+    }
+
     @Shadow(remap = false)
     public abstract AbstractPartEncoder getPart();
 
+    @Shadow(remap = false)
+    public abstract boolean isCraftingMode();
+
     @Intrinsic
     public final boolean isRCPatternEncoder() {
-        return this.craftingSlots.length == 81;
+        return r$craftingSlotGroup != null;
     }
 }

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

@@ -15,36 +15,49 @@
 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.Redirect;
 
-@Mixin(value = ContainerWirelessPatternTerminal.class, remap = false)
+@Mixin(ContainerWirelessPatternTerminal.class)
 public abstract class MixinContainerWirelessPatternTerminal extends MixinContainerPatternEncoder {
 
-    @Shadow
+    @Shadow(remap = false)
     protected AppEngInternalInventory output;
 
     public MixinContainerWirelessPatternTerminal(InventoryPlayer ip, ITerminalHost monitorable) {
         super(ip, monitorable);
     }
 
-    @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, remap = false))
+    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);
+            }
+        };
     }
 
-    @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, 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);
+            }
+        };
     }
 
-    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerWirelessPatternTerminal;addSlotToContainer(Lnet/minecraft/inventory/Slot;)Lnet/minecraft/inventory/Slot;", remap = true))
+    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerWirelessPatternTerminal;addSlotToContainer(Lnet/minecraft/inventory/Slot;)Lnet/minecraft/inventory/Slot;"))
     public Slot redirectAddSlot(ContainerWirelessPatternTerminal instance, Slot slot, Operation<Slot> original) {
         if (slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs) {
             return null;
         }
         return original.call(instance, slot);
     }
 
-    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/slot/SlotRestrictedInput;setStackLimit(I)Lnet/minecraft/inventory/Slot;"))
+    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/slot/SlotRestrictedInput;setStackLimit(I)Lnet/minecraft/inventory/Slot;", remap = false))
     public Slot onInit(SlotRestrictedInput instance, int size, Operation<Slot> original) {
         this.craftingSlots = new SlotFakeCraftingMatrix[81];
         this.outputSlots = new OptionalSlotFake[27];

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

@@ -26,6 +26,7 @@
 public abstract class MixinGuiMEMonitorableTwo extends AEBaseGui implements ISortSource {
 
     @Unique
+    @NotNull
     private final List<RCGuiScrollbar> r$guiScrollbars = new ObjectArrayList<>();
     @Mutable
     @Shadow(remap = false)

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

@@ -46,7 +46,7 @@ public MixinGuiPatternTerm(Container container) {
 
     @Intrinsic
     public void onCurrentScrollChance(int currentScroll) {
-        ((RCPatternEncoder) container).setRCSlot(currentScroll);
+        ((RCPatternEncoder) container).setRCSlot();
     }
 
     @Inject(method = "initGui", at = @At("TAIL"))
@@ -59,13 +59,13 @@ public void onInitGui(CallbackInfo ci) {
         }
         r$scrollbar.setWidthEx(175);
         r$scrollbar.setTop(r$slotTop).setLeft(r$slotLeft - 14).setHeight(3 * 18 - 2).setWidth(12);
-        r$scrollbar.setRange(0, 9, 1);
+        r$scrollbar.setRange(0, 8, 1);
         r$scrollbar.setRcScrollbarGui(this);
         r$scrollbar.setDrawBG(() -> {
             GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
             this.drawTexturedModalRect(r$slotLeft - 13 + guiLeft - 2, r$slotTop + guiTop - 1, 174, 17, 14, 3 * 18);
         });
-        ((RCPatternEncoder) container).setRCSlot(r$scrollbar.getCurrentScroll());
+        ((RCPatternEncoder) container).setScrollbar(r$scrollbar);
     }
 
     @Override