Reduce updates on Casting Channels, Smeltery should interact better w…

…ith dumb pipes
SlimeKnights · Sep 19, 2013 · cb84235 · cb84235
1 parent 89c0f2e
commit cb84235
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/src/tconstruct/blocks/CastingChannelBlock.java b/src/tconstruct/blocks/CastingChannelBlock.java
@@ -40,10 +40,10 @@ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer
             }
             else
             {
-                int amount = 0;
-                if (tile.getFluid() != null)
-                    amount = tile.getLiquidAmount();
-                player.addChatMessage("LiquidAmount: " + amount);
+                //int amount = 0;
+                //if (tile.getFluid() != null)
+                    //amount = tile.getLiquidAmount();
+                //player.addChatMessage("LiquidAmount: " + amount);
                 tile.setActive(true);
             }
         }

diff --git a/src/tconstruct/blocks/LavaTankBlock.java b/src/tconstruct/blocks/LavaTankBlock.java
@@ -248,6 +248,7 @@ public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockI
         }
     }
 
+    @Override
     public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int y, int z)
     {
         player.addExhaustion(0.025F);

diff --git a/src/tconstruct/blocks/logic/CastingChannelLogic.java b/src/tconstruct/blocks/logic/CastingChannelLogic.java
@@ -51,7 +51,7 @@ public void updateEntity ()
             if (this.pullingLiquids)
                 pullLiquids();
         }
-        this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+        //this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
         if (ticks == 20)
         {
             if (recentlyFilledDelay != 0)
@@ -419,7 +419,7 @@ public int fill (FluidStack stack, boolean doFill)
 
             if (doFill)
             {
-                this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+                this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
                 this.liquid = transfered;
             }
             recentlyFilledDelay = 2;
@@ -436,15 +436,15 @@ public int fill (FluidStack stack, boolean doFill)
                 if ((doFill) && (spaceInTank > 0))
                 {
                     this.liquid.amount = this.fillMax;
-                    this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+                    this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
                 }
                 return spaceInTank;
             }
 
             if (doFill)
             {
                 this.liquid.amount += stack.amount;
-                this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
+                this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             }
             return stack.amount;
         }
@@ -491,6 +491,7 @@ public FluidStack drain (int maxDrain, boolean doDrain)
         }
         if (doDrain)
         {
+            this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this));
         }
         return drained;
@@ -626,7 +627,8 @@ public boolean getActive ()
     @Override
     public void setActive (boolean flag)
     {
-        pullingLiquids = flag;
+        //pullingLiquids = flag;
+        pullingLiquids = !pullingLiquids;
     }
 
     @Override

diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/tconstruct/blocks/logic/SmelteryDrainLogic.java
@@ -68,7 +68,8 @@ public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDra
     @Override
     public boolean canFill (ForgeDirection from, Fluid fluid)
     {
-        return from == getForgeDirection().getOpposite();
+        //return true;
+        return from == getForgeDirection();//.getOpposite();
     }
 
     @Override
@@ -89,7 +90,7 @@ public boolean canDrain (ForgeDirection from, Fluid fluid)
                 }
             }
         }
-        return from == getForgeDirection() && containsFluid;
+        return from == getForgeDirection().getOpposite() && containsFluid;
     }
 
     @Override

diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java
@@ -957,9 +957,12 @@ public FluidStack drain (int maxDrain, boolean doDrain)
     @Override
     public int fill (FluidStack resource, boolean doFill)
     {
-        if (resource != null && resource.amount + currentLiquid < maxLiquid)
+        if (resource != null && currentLiquid < maxLiquid)//resource.amount + currentLiquid < maxLiquid)
         {
+            if (resource.amount + currentLiquid > maxLiquid)
+                resource.amount = maxLiquid - currentLiquid;
             int amount = resource.amount;
+
             if (doFill)
             {
                 if (addMoltenMetal(resource, false))