修复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.6
+mod_version = 1.7.5
 root_package = com.circulation
 mod_id = random_complement
 mod_name = RandomComplement

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

@@ -15,16 +15,16 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
-@Mixin(value = ContainerPatternEncoder.class, remap = false)
+@Mixin(ContainerPatternEncoder.class)
 public abstract class MixinContainerPatternEncoder extends ContainerMEMonitorable implements RCPatternEncoder, IOptionalSlotHost {
 
-    @Shadow
+    @Shadow(remap = false)
     protected SlotFakeCraftingMatrix[] craftingSlots;
 
-    @Shadow
+    @Shadow(remap = false)
     protected OptionalSlotFake[] outputSlots;
 
-    @Shadow
+    @Shadow(remap = false)
     protected IItemHandler crafting;
 
     @Unique
@@ -59,7 +59,7 @@ public void setRCSlot(int i) {
         }
     }
 
-    @Shadow
+    @Shadow(remap = false)
     public abstract AbstractPartEncoder getPart();
 
     @Intrinsic

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

@@ -13,14 +13,14 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(value = ContainerPatternTerm.class, remap = false)
+@Mixin(ContainerPatternTerm.class)
 public abstract class MixinContainerPatternTerm extends MixinContainerPatternEncoder {
 
     public MixinContainerPatternTerm(InventoryPlayer ip, ITerminalHost monitorable) {
         super(ip, monitorable);
     }
 
-    @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/MixinContainerWirelessPatternTerminal.java

@@ -36,7 +36,7 @@ public AppEngInternalInventory newOutput(IAEAppEngInventory inventory, int size,
         return original.call(inventory, 27);
     }
 
-    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerWirelessPatternTerminal;addSlotToContainer(Lnet/minecraft/inventory/Slot;)Lnet/minecraft/inventory/Slot;"))
+    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerWirelessPatternTerminal;addSlotToContainer(Lnet/minecraft/inventory/Slot;)Lnet/minecraft/inventory/Slot;", remap = true))
     public Slot redirectAddSlot(ContainerWirelessPatternTerminal instance, Slot slot, Operation<Slot> original) {
         if (slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs) {
             return null;

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

@@ -11,7 +11,7 @@
 @Mixin(value = CraftingCPUCluster.class, remap = false)
 public class MixinCraftingCPUCluster {
 
-    @WrapOperation(method = "executeCrafting", at = @At(value = "NEW", target = "(Lnet/minecraft/inventory/Container;II)Lnet/minecraft/inventory/InventoryCrafting;", ordinal = 1))
+    @WrapOperation(method = "executeCrafting", at = @At(value = "NEW", target = "(Lnet/minecraft/inventory/Container;II)Lnet/minecraft/inventory/InventoryCrafting;", ordinal = 1, remap = true))
     private InventoryCrafting newRCInventory(Container eventHandlerIn, int width, int height, Operation<InventoryCrafting> original) {
         return original.call(eventHandlerIn, 10, 10);
     }

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

@@ -22,21 +22,21 @@
 import java.io.IOException;
 import java.util.List;
 
-@Mixin(value = GuiMEMonitorable.class, remap = false)
+@Mixin(GuiMEMonitorable.class)
 public abstract class MixinGuiMEMonitorableTwo extends AEBaseGui implements ISortSource {
 
     @Unique
     private final List<RCGuiScrollbar> r$guiScrollbars = new ObjectArrayList<>();
     @Mutable
-    @Shadow
+    @Shadow(remap = false)
     @Final
     protected ItemRepo repo;
 
     public MixinGuiMEMonitorableTwo(Container container) {
         super(container);
     }
 
-    @Shadow
+    @Shadow(remap = false)
     protected abstract String getBackground();
 
     @Unique
@@ -68,14 +68,14 @@ public void onInitGui(CallbackInfo ci) {
 
     }
 
-    @Inject(method = "setScrollBar", at = @At("TAIL"))
+    @Inject(method = "setScrollBar", at = @At("TAIL"), remap = false)
     private void setScrollBar(CallbackInfo ci) {
         if (!r$getScrollBars().isEmpty()) {
             r$setScrollBar();
         }
     }
 
-    @Inject(method = "drawFG", at = @At("HEAD"))
+    @Inject(method = "drawFG", at = @At("HEAD"), remap = false)
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY, CallbackInfo ci) {
         for (var guiScrollbar : r$guiScrollbars) {
             guiScrollbar.draw(this);
@@ -110,7 +110,7 @@ public void handleMouseInput() throws IOException {
         super.handleMouseInput();
     }
 
-    @Inject(method = "drawBG", at = @At("TAIL"))
+    @Inject(method = "drawBG", at = @At("TAIL"), remap = false)
     public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY, CallbackInfo ci) {
         if (r$getScrollBars().isEmpty()) return;
         this.bindTexture(this.getBackground());

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

@@ -40,7 +40,7 @@ public MixinGuiPatternTerm(Container container) {
     }
 
     @Override
-    protected void r$addScrollBars(){
+    protected void r$addScrollBars() {
         r$getScrollBars().add(r$scrollbar = new RCGuiScrollbar());
     }
 

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

@@ -11,7 +11,7 @@
 @Mixin(value = PatternHelper.class, remap = false)
 public class MixinPatternHelper {
 
-    @WrapOperation(method = "<init>", at = @At(value = "NEW", target = "(Lnet/minecraft/inventory/Container;II)Lnet/minecraft/inventory/InventoryCrafting;"))
+    @WrapOperation(method = "<init>", at = @At(value = "NEW", target = "(Lnet/minecraft/inventory/Container;II)Lnet/minecraft/inventory/InventoryCrafting;", remap = true))
     public InventoryCrafting onInit(Container eventHandlerIn, int width, int height, Operation<InventoryCrafting> original) {
         return original.call(eventHandlerIn, 10, 10);
     }