仍然是尝试解决mek的依赖问题 3

Author: Circulate233

src/main/java/com/glodblock/github/coremod/mixin/ae2/container/MixinContainerCellWorkbench.java

@@ -17,13 +17,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.items.ItemHandlerHelper;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(value = ContainerCellWorkbench.class, remap = false)
 public abstract class MixinContainerCellWorkbench extends ContainerUpgradeable {
@@ -69,20 +67,13 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action,
             }
             return;
         }
-        if (ModAndClassUtil.GAS && slot instanceof SlotFake && !stack.isEmpty() && Util.getGasFromItem(stack) != null) {
-            mek$doAction(player, action, slotId, id, slot, stack);
+        if (ModAndClassUtil.GAS && slot instanceof SlotFake && !stack.isEmpty()) {
+            if (Util.gasAction(action, slot, stack)) {
+                super.doAction(player, action, slotId, id);
+            }
             return;
         }
         super.doAction(player, action, slotId, id);
     }
 
-    @Unique
-    @Optional.Method(modid = "mekeng")
-    private void mek$doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id, Slot slot, ItemStack stack) {
-        Object gas = Util.gasAction(action, slot, stack);
-        if (gas == null) {
-            super.doAction(player, action, slotId, id);
-        }
-    }
-
 }

src/main/java/com/glodblock/github/util/Util.java

@@ -406,7 +406,8 @@ public static void onPatternTerminalChangeCrafting(final AbstractPartEncoder par
     }
 
     @Optional.Method(modid = "mekeng")
-    public static GasStack gasAction(InventoryAction action, Slot slot, ItemStack stack) {
+    public static boolean gasAction(InventoryAction action, Slot slot, ItemStack stack) {
+        if (getGasFromItem(stack) == null) return true;
         GasStack gas = null;
         switch (action) {
             case PICKUP_OR_SET_DOWN -> {
@@ -423,7 +424,7 @@ public static GasStack gasAction(InventoryAction action, Slot slot, ItemStack st
                 slot.putStack(FakeGases.packGas2Drops(gas));
             }
         }
-        return gas;
+        return gas == null;
     }
 
 }