Expose all fluids to FluidTankInfo[]

SlimeKnights · Sep 19, 2013 · 89c0f2e · 89c0f2e
1 parent cbecc93
commit 89c0f2e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/resources/assets/tinker/textures/gui/googirl.png b/resources/assets/tinker/textures/gui/googirl.png
diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java
@@ -61,7 +61,7 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
     @Override
     public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
     {
-    	// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
         return null;
     }
 
@@ -74,28 +74,32 @@ public boolean canFill (ForgeDirection from, Fluid fluid)
     @Override
     public boolean canDrain (ForgeDirection from, Fluid fluid)
     {
-    	// Check that the drain is coming from the from the front of the block 
-    	// and that the fluid to be drained is in the smeltery.
-    	boolean containsFluid = fluid == null;
-    	if(fluid!=null){
-    		SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z);
-    		for (FluidStack fstack : smeltery.moltenMetal){
-    			if(fstack.fluidID == fluid.getID()){
-    				containsFluid = true;
-    				break;
-    			}
-    		}
-    	}
+        // Check that the drain is coming from the from the front of the block 
+        // and that the fluid to be drained is in the smeltery.
+        boolean containsFluid = fluid == null;
+        if (fluid != null)
+        {
+            SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z);
+            for (FluidStack fstack : smeltery.moltenMetal)
+            {
+                if (fstack.fluidID == fluid.getID())
+                {
+                    containsFluid = true;
+                    break;
+                }
+            }
+        }
         return from == getForgeDirection() && containsFluid;
     }
 
     @Override
     public FluidTankInfo[] getTankInfo (ForgeDirection from)
     {
-    	if (hasValidMaster() && (from==getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN))
+        if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN))
         {
             SmelteryLogic smeltery = (SmelteryLogic) worldObj.getBlockTileEntity(master.x, master.y, master.z);
-            return new FluidTankInfo[] { smeltery.getInfo() };
+            return smeltery.getMultiTankInfo();
+            //return new FluidTankInfo[] { smeltery.getInfo() };
         }
         return null;
     }

diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java
@@ -999,6 +999,18 @@ public FluidTankInfo getInfo ()
     {
         return new FluidTankInfo(this);
     }
+
+    public FluidTankInfo[] getMultiTankInfo()
+    {
+        FluidTankInfo[] info = new FluidTankInfo[moltenMetal.size() + 1];
+        for (int i = 0; i < moltenMetal.size(); i++)
+        {
+            FluidStack fluid = moltenMetal.get(i);
+            info[i] = new FluidTankInfo(fluid.copy(), fluid.amount);
+        }
+        info[moltenMetal.size()] = new FluidTankInfo(null, maxLiquid - currentLiquid);
+        return info;
+    }
 
     /* NBT */