调整兼容

Author: Circulate233

.gitignore

@@ -6,6 +6,7 @@
 *.ipr
 *.iws
 
+lib/
 # IntelliJ
 out/
 # mpeltonen/sbt-idea plugin

build.gradle

@@ -210,18 +210,18 @@ 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"))
     implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
-    implementation(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
+    implementation("lib:ae2fc-2.7.0-unofficial:dev")
+    compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
     implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
     implementation(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
     implementation(rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:5778512"))
     implementation(rfg.deobf("curse.maven:libnine-322344:3509087"))
     implementation(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
-    implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:6945422"))
+    implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
     implementation(rfg.deobf("curse.maven:extended-crafting-terminals-for-applied-1157825:6895322"))
     implementation(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
     implementation(rfg.deobf("curse.maven:cofh-world-271384:2920434"))

lib/ae2fc-2.7.0-unofficial-dev.jar

@@ -6,10 +6,8 @@
 import com.glodblock.github.client.client.gui.GuiExtendedFluidPatternTerminal;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Intrinsic;
 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 {
@@ -18,18 +16,19 @@ public MixinGuiExtendedFluidPatternTerminal(Container container) {
         super(container);
     }
 
-    @Inject(method = "drawSlot", at = @At(value = "HEAD"))
-    private void drawSlotFake(Slot slot, CallbackInfo ci) {
+    @Intrinsic
+    public void drawSlot(Slot slot) {
         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 (!slotFake.getDisplayStack().isEmpty()) {
+                var item = slotFake.getDisplayStack();
                 if (r$getCraftablesCache().contains(MEHandler.packAEItem(item))) {
                     r$getPlusSlot().add(slotFake);
                 }
             }
         }
+        super.drawSlot(slot);
     }
 
 }

src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiExtendedFluidPatternTerminal.java

@@ -6,10 +6,8 @@
 import com.glodblock.github.client.client.gui.GuiFluidPatternTerminal;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Intrinsic;
 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 {
@@ -18,18 +16,19 @@ 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) {
+    @Intrinsic
+    public void drawSlot(Slot slot) {
         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);
+                    r$getPlusSlot().add(slotFake);
                 }
             }
         }
+        super.drawSlot(slot);
     }
 
 }

src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiFluidPatternTerminal.java

@@ -6,10 +6,8 @@
 import com.glodblock.github.client.client.gui.GuiWirelessFluidPatternTerminal;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+import org.spongepowered.asm.mixin.Intrinsic;
 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 {
@@ -18,8 +16,8 @@ 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) {
+    @Intrinsic
+    public void drawSlot(Slot slot) {
         if (slot.xPos < 0 || slot.yPos < 0) return;
         if (slot instanceof SlotFake slotFake) {
             if (!slotFake.shouldDisplay()) return;
@@ -30,6 +28,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
                 }
             }
         }
+        super.drawSlot(slot);
     }
 
 }