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

Author: Circulate233

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

@@ -9,10 +9,8 @@
 import appeng.tile.misc.TileCellWorkbench;
 import com.glodblock.github.common.item.fake.FakeFluids;
 import com.glodblock.github.common.item.fake.FakeItemRegister;
-import com.glodblock.github.integration.mek.FakeGases;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.Util;
-import mekanism.api.gas.GasStack;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
@@ -81,24 +79,10 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action,
     @Unique
     @Optional.Method(modid = "mekeng")
     private void mek$doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id, Slot slot, ItemStack stack) {
-        GasStack gas = null;
-        switch (action) {
-            case PICKUP_OR_SET_DOWN -> {
-                gas = Util.getGasFromItem(stack);
-                slot.putStack(FakeGases.packGas2Drops(gas));
-            }
-            case SPLIT_OR_PLACE_SINGLE -> {
-                gas = Util.getGasFromItem(ItemHandlerHelper.copyStackWithSize(stack, 1));
-                final GasStack origin = FakeItemRegister.getStack(slot.getStack());
-                if (gas != null && gas.equals(origin)) {
-                    gas.amount += origin.amount;
-                    if (gas.amount <= 0) gas = null;
-                }
-                slot.putStack(FakeGases.packGas2Drops(gas));
-            }
-        }
+        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

@@ -13,11 +13,13 @@
 import appeng.core.localization.PlayerMessages;
 import appeng.fluids.util.AEFluidInventory;
 import appeng.fluids.util.AEFluidStack;
+import appeng.helpers.InventoryAction;
 import appeng.parts.reporting.AbstractPartEncoder;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import com.glodblock.github.common.item.fake.FakeFluids;
+import com.glodblock.github.common.item.fake.FakeItemRegister;
 import com.glodblock.github.integration.mek.FakeGases;
 import com.glodblock.github.inventory.GuiType;
 import com.glodblock.github.inventory.InventoryHandler;
@@ -48,6 +50,7 @@
 import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
+import net.minecraftforge.items.ItemHandlerHelper;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -402,4 +405,25 @@ public static void onPatternTerminalChangeCrafting(final AbstractPartEncoder par
         }
     }
 
+    @Optional.Method(modid = "mekeng")
+    public static GasStack gasAction(InventoryAction action, Slot slot, ItemStack stack) {
+        GasStack gas = null;
+        switch (action) {
+            case PICKUP_OR_SET_DOWN -> {
+                gas = Util.getGasFromItem(stack);
+                slot.putStack(FakeGases.packGas2Drops(gas));
+            }
+            case SPLIT_OR_PLACE_SINGLE -> {
+                gas = Util.getGasFromItem(ItemHandlerHelper.copyStackWithSize(stack, 1));
+                final GasStack origin = FakeItemRegister.getStack(slot.getStack());
+                if (gas != null && gas.equals(origin)) {
+                    gas.amount += origin.amount;
+                    if (gas.amount <= 0) gas = null;
+                }
+                slot.putStack(FakeGases.packGas2Drops(gas));
+            }
+        }
+        return gas;
+    }
+
 }