All this needs to be tested, but here :P

SlimeKnights · Feb 14, 2014 · e0a254f · e0a254f
1 parent 0f9cca0
commit e0a254f
Show file tree

Hide file tree

Showing 28 changed files with 149 additions and 100 deletions.
diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 
 import mantle.world.CoordTuple;
+import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -278,4 +279,4 @@ public void writeNetworkNBT (NBTTagCompound tags)
         if (activeLavaTank != null)
             tags.setIntArray("LavaTank", new int[] { activeLavaTank.x, activeLavaTank.y, activeLavaTank.z });
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java
@@ -128,7 +128,7 @@ public void readNetworkNBT (NBTTagCompound tags)
     {
         super.readNetworkNBT(tags);
 
-        NBTTagList tanks = tags.getTagList("Tanks", 11);
+        NBTTagList tanks = tags.getTagList("Tanks", 9);
         if (tanks != null)
         {
             lavaTanks.clear();

diff --git a/src/main/java/tconstruct/blocks/component/TankAirComponent.java b/src/main/java/tconstruct/blocks/component/TankAirComponent.java
@@ -20,4 +20,4 @@ public void overrideFluids (ArrayList<FluidStack> fluids)
     {
         fluidlist = fluids;
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java
@@ -1,5 +1,7 @@
 package tconstruct.blocks.logic;
 
+import tconstruct.TConstruct;
+import tconstruct.library.crafting.AlloyMix;
 import mantle.blocks.abstracts.MultiServantLogic;
 import mantle.blocks.iface.IFacingLogic;
 import mantle.blocks.iface.IMasterLogic;
@@ -29,7 +31,7 @@ public boolean canUpdate ()
     public boolean setPotentialMaster (IMasterLogic master, World world, int x, int y, int z)
     {
         // TConstruct.logger.info("Master: "+master);
-        return (master instanceof AdaptiveSmelteryLogic || master instanceof AdaptiveDrainLogic) && !hasValidMaster();
+        return (master instanceof AdaptiveSmelteryLogic || master instanceof AdaptiveDrainLogic) && !getHasMaster();
     }
 
     @Override
@@ -174,7 +176,7 @@ public Packet getDescriptionPacket ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readFromNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
@@ -30,6 +30,7 @@
 import tconstruct.TConstruct;
 import tconstruct.blocks.component.SmelteryComponent;
 import tconstruct.blocks.component.SmelteryScan;
+import tconstruct.common.TContent;
 import tconstruct.common.TRepo;
 import tconstruct.inventory.AdaptiveSmelteryContainer;
 import tconstruct.library.component.IComponentHolder;
@@ -572,8 +573,8 @@ public void writeNetworkNBT (NBTTagCompound tags)
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readNetworkNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
     }
 
     @Override
@@ -583,7 +584,7 @@ public Packet getDescriptionPacket ()
         writeNetworkNBT(tag);
         return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag);
     }
-
+    
     @Override
     public String getInventoryName ()
     {

diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
@@ -142,7 +142,7 @@ public int fill (FluidStack resource, boolean doFill)
                         castingDelay = recipe.coolTime;
                     }
                     renderOffset = copyLiquid.amount;
-                    worldObj.func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     this.liquid = copyLiquid;
                     needsUpdate = true;
                 }
@@ -164,7 +164,7 @@ else if (resource.isFluidEqual(this.liquid))
                     renderOffset = roomInTank;
                     castingDelay = TConstruct.basinCasting.getCastingDelay(this.liquid, inventory[0]);
                     this.liquid.amount = this.capacity;
-                    worldObj.func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     needsUpdate = true;
                 }
                 return roomInTank;
@@ -175,7 +175,7 @@ else if (resource.isFluidEqual(this.liquid))
                 if (doFill)
                 {
                     this.liquid.amount += resource.amount;
-                    worldObj.func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     needsUpdate = true;
                 }
                 return resource.amount;
@@ -192,14 +192,14 @@ else if (resource.isFluidEqual(this.liquid))
     public void markDirty () //Isn't actually called?
     {
         super.markDirty();
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         needsUpdate = true;
     }
 
     public ItemStack decrStackSize (int slot, int quantity)
     {
         ItemStack stack = super.decrStackSize(slot, quantity);
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         return stack;
     }
 
@@ -311,7 +311,7 @@ public void updateEntity ()
         if (renderOffset > 0)
         {
             renderOffset -= 6;
-            worldObj.func_147479_m(xCoord, yCoord, zCoord);
+            worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         }
 
         tick++;
@@ -396,8 +396,8 @@ public Packet getDescriptionPacket ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readFromNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java
@@ -574,7 +574,7 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readCustomNBT(packet.func_148857_g());
-        this.worldObj.func_147479_m(this.xCoord, this.yCoord, this.zCoord);
+        this.worldObj.markBlockRangeForRenderUpdate(this.xCoord, this.yCoord, this.zCoord, xCoord, yCoord, zCoord);
     }
 
     public int convertFDToInt (ForgeDirection dir)

diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java
@@ -1,5 +1,8 @@
 package tconstruct.blocks.logic;
 
+import tconstruct.TConstruct;
+import tconstruct.library.crafting.CastingRecipe;
+import tconstruct.library.util.IPattern;
 import mantle.blocks.abstracts.InventoryLogic;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -17,9 +20,6 @@
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.fluids.IFluidTank;
-import tconstruct.TConstruct;
-import tconstruct.library.crafting.CastingRecipe;
-import tconstruct.library.util.IPattern;
 
 public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory
 {
@@ -142,7 +142,7 @@ public int fill (FluidStack resource, boolean doFill)
                         castingDelay = recipe.coolTime;
                     }
                     renderOffset = copyLiquid.amount;
-                    getWorld().func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     this.liquid = copyLiquid;
                     needsUpdate = true;
                 }
@@ -164,7 +164,7 @@ else if (resource.isFluidEqual(this.liquid))
                     renderOffset = roomInTank;
                     castingDelay = TConstruct.tableCasting.getCastingDelay(this.liquid, inventory[0]);
                     this.liquid.amount = this.capacity;
-                    getWorld().func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     needsUpdate = true;
                 }
                 return roomInTank;
@@ -175,7 +175,7 @@ else if (resource.isFluidEqual(this.liquid))
                 if (doFill)
                 {
                     this.liquid.amount += resource.amount;
-                    getWorld().func_147479_m(xCoord, yCoord, zCoord);
+                    worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
                     needsUpdate = true;
                 }
                 return resource.amount;
@@ -192,14 +192,14 @@ else if (resource.isFluidEqual(this.liquid))
     public void markDirty () //Isn't actually called?
     {
         super.markDirty();
-        getWorld().func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         needsUpdate = true;
     }
 
     public ItemStack decrStackSize (int slot, int quantity)
     {
         ItemStack stack = super.decrStackSize(slot, quantity);
-        getWorld().func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         return stack;
     }
 
@@ -228,7 +228,7 @@ public FluidStack drain (int maxDrain, boolean doDrain)
             liquid = null;
 
         if (doDrain)
-            FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.getWorld(), this.xCoord, this.yCoord, this.zCoord, this));
+            FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this));
 
         return drained;
     }
@@ -264,6 +264,7 @@ public boolean canFill (ForgeDirection from, Fluid fluid)
     @Override
     public boolean canDrain (ForgeDirection from, Fluid fluid)
     {
+        // TODO Auto-generated method stub
         return false;
     }
 
@@ -311,15 +312,15 @@ public void updateEntity ()
         if (renderOffset > 0)
         {
             renderOffset -= 6;
-            getWorld().func_147479_m(xCoord, yCoord, zCoord);
+            worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         }
 
         tick++;
         if (tick % 20 == 0)
         {
             tick = 0;
             if (needsUpdate)
-                getWorld().markBlockForUpdate(xCoord, yCoord, zCoord);
+                worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
         }
     }
 
@@ -332,7 +333,7 @@ public void castLiquid ()
             if (recipe.consumeCast)
                 inventory[0] = null;
             liquid = null;
-            getWorld().markBlockForUpdate(xCoord, yCoord, zCoord);
+            worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
         }
     }
 
@@ -387,15 +388,15 @@ public void writeCustomNBT (NBTTagCompound tags)
     public Packet getDescriptionPacket ()
     {
         NBTTagCompound tag = new NBTTagCompound();
-        readFromNBT(tag);
+        writeToNBT(tag);
         return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag);
     }
 
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readFromNBT(packet.func_148857_g());
-        getWorld().func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     @Override
@@ -450,4 +451,4 @@ public void openInventory ()
         // TODO Auto-generated method stub
 
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java
@@ -115,7 +115,7 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readCustomNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     @SideOnly(Side.CLIENT)

diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java
@@ -180,7 +180,7 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readCustomNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
@@ -296,7 +296,7 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readNetworkNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java
@@ -13,6 +13,7 @@
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
 
 public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
 {
@@ -107,7 +108,6 @@ public int getBrightness ()
             int id = tank.getFluid().fluidID;
             if (id < 4096)
             {
-                //TODO check this!!
                 Block block = Block.getBlockById(id);
                 return block.getLightValue();
             }
@@ -160,8 +160,8 @@ public Packet getDescriptionPacket ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readCustomNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
     }
 
     /* Updating */
@@ -176,7 +176,7 @@ public void updateEntity ()
         if (renderOffset > 0)
         {
             renderOffset -= 6;
-            worldObj.func_147479_m(xCoord, yCoord, zCoord);
+            worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         }
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java
@@ -18,7 +18,7 @@ public boolean canUpdate ()
     public void setLiquidType (int tex)
     {
         texturePos = tex;
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 
     public int getLiquidType ()
@@ -59,7 +59,7 @@ public Packet getDescriptionPacket ()
     @Override
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
         readCustomNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
     }
-}
+}
diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java
@@ -67,6 +67,6 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readCustomNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
 }
diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java
@@ -1,5 +1,6 @@
 package tconstruct.blocks.logic;
 
+import tconstruct.library.crafting.AlloyMix;
 import mantle.blocks.abstracts.MultiServantLogic;
 import mantle.blocks.iface.IFacingLogic;
 import net.minecraft.entity.EntityLivingBase;
@@ -181,6 +182,6 @@ public Packet getDescriptionPacket ()
     public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
     {
         readFromNBT(packet.func_148857_g());
-        worldObj.func_147479_m(xCoord, yCoord, zCoord);
+        worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
     }
-}
+}