Fix #2

Author: Circulate233

build.gradle

@@ -1,6 +1,7 @@
 /**
  * It is advised that you do not edit anything in the build.gradle; unless you are sure of what you are doing
  */
+//file:noinspection unused
 import com.gtnewhorizons.retrofuturagradle.mcp.InjectTagsTask
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.gradle.ext.Gradle
@@ -207,7 +208,7 @@ dependencies {
     implementation(rfg.deobf('curse.maven:baubles-227083:2518667')) //baubles
     compileOnly(rfg.deobf("curse.maven:thaumic-223628:2629023"))
     compileOnly(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
-    implementation(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
+    compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
     compileOnly(rfg.deobf("curse.maven:mekanism-energistics-1027681:5389347")) //mekeng
     compileOnly(rfg.deobf('curse.maven:opencomputers-223008:4630537')) //oc
     compileOnly(rfg.deobf("curse.maven:p455w0rdslib-255232:2830265"))

gradle.properties

@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 2.7.4-unofficial
+mod_version = 2.7.6-unofficial
 root_package = com.glodblock.github
 mod_id = ae2fc
 mod_name = AE2FluidCraft-Rework-Unofficial

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

@@ -20,11 +20,13 @@
 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 {
@@ -39,58 +41,66 @@ public MixinContainerCellWorkbench(final InventoryPlayer ip, final IUpgradeableH
 
     @Intrinsic
     public void doAction(final EntityPlayerMP player, final InventoryAction action, final int slotId, final long id) {
-        if (this.workBench.getCell() instanceof ItemViewCell) {
-            final Slot slot = getSlot(slotId);
-            final ItemStack stack = player.inventory.getItemStack();
-            if (slot instanceof SlotFake && !stack.isEmpty()
-                && stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null) && Util.getFluidFromItem(stack) != null) {
-                FluidStack fluid = null;
-                switch (action) {
-                    case PICKUP_OR_SET_DOWN:
-                        fluid = Util.getFluidFromItem(stack);
-                        slot.putStack(FakeFluids.packFluid2Drops(fluid));
-                        break;
-                    case SPLIT_OR_PLACE_SINGLE:
-                        fluid = Util.getFluidFromItem(ItemHandlerHelper.copyStackWithSize(stack, 1));
-                        final FluidStack origin = FakeItemRegister.getStack(slot.getStack());
-                        if (fluid != null && fluid.equals(origin)) {
-                            fluid.amount += origin.amount;
-                            if (fluid.amount <= 0) fluid = null;
-                        }
-                        slot.putStack(FakeFluids.packFluid2Drops(fluid));
-                        break;
+        if (id != 0 || slotId < 0 || slotId >= this.inventorySlots.size()
+            || !(this.workBench.getCell() instanceof ItemViewCell)) {
+            super.doAction(player, action, slotId, id);
+            return;
+        }
+        final Slot slot = getSlot(slotId);
+        final ItemStack stack = player.inventory.getItemStack();
+        if (slot instanceof SlotFake && !stack.isEmpty()
+            && stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null) && Util.getFluidFromItem(stack) != null) {
+            FluidStack fluid = null;
+            switch (action) {
+                case PICKUP_OR_SET_DOWN -> {
+                    fluid = Util.getFluidFromItem(stack);
+                    slot.putStack(FakeFluids.packFluid2Drops(fluid));
                 }
-                if (fluid == null) {
-                    super.doAction(player, action, slotId, id);
-                    return;
+                case SPLIT_OR_PLACE_SINGLE -> {
+                    fluid = Util.getFluidFromItem(ItemHandlerHelper.copyStackWithSize(stack, 1));
+                    final FluidStack origin = FakeItemRegister.getStack(slot.getStack());
+                    if (fluid != null && fluid.equals(origin)) {
+                        fluid.amount += origin.amount;
+                        if (fluid.amount <= 0) fluid = null;
+                    }
+                    slot.putStack(FakeFluids.packFluid2Drops(fluid));
                 }
-                return;
             }
-            if (ModAndClassUtil.GAS && slot instanceof SlotFake && !stack.isEmpty()
-                && stack.getItem() instanceof IGasItem && Util.getGasFromItem(stack) != null) {
-                GasStack gas = null;
-                switch (action) {
-                    case PICKUP_OR_SET_DOWN:
-                        gas = Util.getGasFromItem(stack);
-                        slot.putStack(FakeGases.packGas2Drops(gas));
-                        break;
-                    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));
-                        break;
-                }
-                if (gas == null) {
-                    super.doAction(player, action, slotId, id);
-                    return;
-                }
+            if (fluid == null) {
+                super.doAction(player, action, slotId, id);
                 return;
             }
+            return;
+        }
+        if (ModAndClassUtil.GAS && slot instanceof SlotFake && !stack.isEmpty()
+            && stack.getItem() instanceof IGasItem && Util.getGasFromItem(stack) != null) {
+            mek$doAction(player, action, slotId, id, slot, stack);
+            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) {
+        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));
+            }
+        }
+        if (gas == null) {
+            super.doAction(player, action, slotId, id);
+        }
+    }
+}