Implement IFluidHandler properly on all blocks.

Should fix all ExtraCells dupe bugs.
SlimeKnights · Sep 8, 2014 · 79b0c5e · 79b0c5e
1 parent b13e2b5
commit 79b0c5e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java
@@ -263,6 +263,8 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
     @Override
     public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
     {
+        if(liquid.getFluid() == resource.getFluid())
+            this.drain(resource.amount, doDrain);
         return null;
     }
 

diff --git a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java
@@ -263,6 +263,8 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
     @Override
     public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
     {
+        if(liquid.getFluid() == resource.getFluid())
+            this.drain(resource.amount, doDrain);
         return null;
     }
 

diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java
@@ -53,7 +53,13 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
     @Override
     public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
     {
-        return null;
+        if(tank.getFluidAmount() == 0)
+            return null;
+        if(tank.getFluid().getFluid() != resource.getFluid())
+            return null;
+
+        // same fluid, k
+        return this.drain(from, resource.amount, doDrain);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java
@@ -60,10 +60,10 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
     @Override
     public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
     {
-        if (hasValidMaster() && canDrain(from, null))
+        if (hasValidMaster() && canDrain(from, resource.getFluid()))
         {
             SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z);
-            if(resource.getFluid() == smeltery.getFluid()){
+            if(resource.getFluid() == smeltery.getFluid().getFluid()) {
                 return smeltery.drain(resource.amount, doDrain);
             }
         }