No more drop drops from interface (#265)

Co-authored-by: Maya <[email protected]>

src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java

@@ -1,11 +1,13 @@
 package com.glodblock.github.common.tile;
 
 import java.io.IOException;
+import java.util.List;
 
 import javax.annotation.Nullable;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -218,4 +220,11 @@ public class TileFluidInterface extends TileInterface implements IDualHost {
             getInternalFluid().setFluidInSlot(id, fluid);
         }
     }
+
+    @Override
+    public void getDrops(World w, int x, int y, int z, List<ItemStack> drops) {
+        this.fluidDuality.addDrops(drops);
+        this.fluidDuality.convertDrops(drops, this.getInterfaceDuality().getWaitingToSend());
+        super.getDrops(w, x, y, z, drops);
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.glodblock.github.util;
 
+import java.util.List;
 import java.util.Objects;
 
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -458,4 +460,24 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
             super(tileInterface.tanks);
         }
     }
+
+    public void addDrops(final List<ItemStack> drops) {
+        for (int i = 0; i < NUMBER_OF_TANKS; i++) {
+            ItemStack is = ItemFluidPacket.newStack(this.tanks.getFluidStackInSlot(i));
+            if (is != null) {
+                drops.add(is);
+            }
+        }
+    }
+
+    public void convertDrops(final List<ItemStack> drops, final List<ItemStack> waitingToSend) {
+        if (waitingToSend != null) {
+            for (final ItemStack is : waitingToSend) {
+                if (is != null && is.getItem() instanceof ItemFluidDrop) {
+                    drops.add(ItemFluidPacket.newStack(ItemFluidDrop.getFluidStack(is)));
+                    is.stackSize = 0;
+                }
+            }
+        }
+    }
 }