BasicMachine fluid tank manipulations in GUI

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>

3 files changed, 117 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
index 7e14061d2f..6cd7f9e8e3 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
@@ -4,11 +4,18 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.IFluidTank;
+
+import static gregtech.api.enums.GT_Values.NI;
+import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -179,18 +186,101 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank {
 
     @Override
     public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+        if (mTileEntity.getMetaTileEntity() == null) return null;
+        GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity();
         switch (aSlotIndex) {
             case 0:
-                if (mTileEntity.getMetaTileEntity() == null) return null;
-                ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mFluidTransfer = !((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mFluidTransfer;
+                machine.mFluidTransfer = !machine.mFluidTransfer;
                 return null;
             case 1:
                 if (mTileEntity.getMetaTileEntity() == null) return null;
-                ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer = !((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer;
+                machine.mItemTransfer = !machine.mItemTransfer;
                 return null;
+            case 2:
+                return pickupFluid(machine.getDrainableStack(), aPlayer);
             default:
-                return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+                if (aSlotIndex == OTHER_SLOT_COUNT + 1 + machine.mInputSlotCount + machine.mOutputItems.length) {
+                    // input fluid slot
+                    ItemStack tStackHeld = aPlayer.inventory.getItemStack();
+                    ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld);
+                    if (tStackSizedOne == null) return null;
+                    FluidStack tInputFluid = machine.getFillableStack();
+                    FluidStack tFluidHeld = GT_Utility.getFluidForFilledItem(tStackSizedOne, true);
+                    if (tInputFluid == null) {
+                        if (tFluidHeld == null)
+                            // both null -> no op
+                            return null;
+                        return fillFluid(machine, aPlayer, tFluidHeld);
+                    } else {
+                        if (tFluidHeld != null) {
+                            // both nonnull. actually both pickup and fill is reasonable, but I'll go with fill here
+                            return fillFluid(machine, aPlayer, tFluidHeld);
+                        } else {
+                            return pickupFluid(machine.getFillableStack(), aPlayer);
+                        }
+                    }
+                } else {
+                    return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+                }
+        }
+    }
+
+    private ItemStack pickupFluid(FluidStack aTankStack, EntityPlayer aPlayer) {
+        if (aTankStack == null) return null;
+        ItemStack tStackHeld = aPlayer.inventory.getItemStack();
+        ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld);
+        if (tStackSizedOne == null) return null;
+        ItemStack tFilled = GT_Utility.fillFluidContainer(aTankStack, tStackSizedOne, true, false);
+        if (tFilled == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) {
+            IFluidContainerItem tContainerItem = (IFluidContainerItem) tStackSizedOne.getItem();
+            int tFilledAmount = tContainerItem.fill(tStackSizedOne, aTankStack, true);
+            if (tFilledAmount > 0) {
+                tFilled = tStackSizedOne;
+                aTankStack.amount -= tFilledAmount;
+            }
+        }
+        if (tFilled != null) {
+            reduceStackSizeInHandByOne(aPlayer);
+            GT_Utility.addItemToPlayerInventory(aPlayer, tFilled);
         }
+        return tFilled;
+    }
+
+    private ItemStack fillFluid(IFluidTank aTank, EntityPlayer aPlayer, FluidStack aFluidHeld) {
+        ItemStack tStackHeld = aPlayer.inventory.getItemStack();
+        ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld);
+        if (tStackSizedOne == null)
+            return null;
+
+        int tFilled = aTank.fill(aFluidHeld, false);
+        if (tFilled == 0)  // filled nothing
+            return null;
+        ItemStack tStackEmptied = null;
+        if (tFilled == aFluidHeld.amount)
+            // fully accepted - try take it from item now
+            // IFluidContainerItem is intentionally not checked here. it will be checked later
+            tStackEmptied = GT_Utility.getContainerForFilledItem(tStackSizedOne, false);
+        if (tStackEmptied == null && tStackHeld.getItem() instanceof IFluidContainerItem) {
+            IFluidContainerItem container = (IFluidContainerItem) tStackHeld.getItem();
+            FluidStack tDrained = container.drain(tStackSizedOne, tFilled, true);
+            if (tDrained != null && tDrained.amount > 0)
+                // something is actually drained - change the cell and drop it to player
+                tStackEmptied = tStackSizedOne;
+        }
+        if (tStackEmptied == null)
+            // somehow the cell refuse to take that amount of fluid, no op then
+            return null;
+        aTank.fill(aFluidHeld, true);
+        GT_Utility.addItemToPlayerInventory(aPlayer, tStackEmptied);
+        reduceStackSizeInHandByOne(aPlayer);
+        return tStackEmptied;
+    }
+
+    private void reduceStackSizeInHandByOne(EntityPlayer aPlayer) {
+        ItemStack tStackHeld = aPlayer.inventory.getItemStack();
+        tStackHeld.stackSize -= 1;
+        if (tStackHeld.stackSize == 0)
+            aPlayer.inventory.setItemStack(NI);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Render.java b/src/main/java/gregtech/api/gui/GT_Slot_Render.java
index 92927e284e..8dd19a0e8e 100644
--- a/src/main/java/gregtech/api/gui/GT_Slot_Render.java
+++ b/src/main/java/gregtech/api/gui/GT_Slot_Render.java
@@ -1,5 +1,7 @@
 package gregtech.api.gui;
 
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 3055285ecf..a9ba9b9bbc 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -972,6 +972,15 @@ public class GT_Utility {
         return rStack;
     }
 
+    public static FluidStack getFluidFromDisplayStack(ItemStack aDisplayStack) {
+        if (!isStackValid(aDisplayStack) ||
+                aDisplayStack.getItem() != ItemList.Display_Fluid.getItem() ||
+                !aDisplayStack.hasTagCompound())
+            return null;
+        Fluid tFluid = FluidRegistry.getFluid(ItemList.Display_Fluid.getItem().getDamage(aDisplayStack));
+        return new FluidStack(tFluid, (int) aDisplayStack.getTagCompound().getLong("mFluidDisplayAmount"));
+    }
+
     public static boolean containsFluid(ItemStack aStack, FluidStack aFluid, boolean aCheckIFluidContainerItems) {
         if (isStackInvalid(aStack) || aFluid == null) return false;
         if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0)
@@ -2768,4 +2777,16 @@ public class GT_Utility {
                 )
         );
     }
+
+    /**
+     * Add an itemstack to player inventory, or drop on ground if full.
+     * Can be called on client but it probably won't work very well.
+     */
+    public static void addItemToPlayerInventory(EntityPlayer aPlayer, ItemStack aStack) {
+        if (isStackInvalid(aStack)) return;
+        if (!aPlayer.inventory.addItemStackToInventory(aStack) && !aPlayer.worldObj.isRemote) {
+            EntityItem dropItem = aPlayer.entityDropItem(aStack, 0);
+            dropItem.delayBeforeCanPickup = 0;
+        }
+    }
 }