Merge pull request #1733 from BallOfEnergy1/Optimization

NTM Optimization Update!

src/main/java/api/hbm/fluid/PipeNet.java

@@ -138,6 +138,7 @@ public class PipeNet implements IPipeNet {
 					tile.getWorldObj().markTileEntityChunkModified(tile.xCoord, tile.yCoord, tile.zCoord, tile);
 				}
 
+				/* debug code
 				if(trackingInstances != null) {
 					for(int j = 0; j < trackingInstances.size(); j++) {
 						PipeNet net = trackingInstances.get(j);
@@ -146,6 +147,7 @@ public class PipeNet implements IPipeNet {
 						log(net, sdf.format(new Date(System.currentTimeMillis())) + " Sending " + given + "mB to " + conToString(con));
 					}
 				}
+				*/
 			}
 		}
 

src/main/java/com/hbm/blocks/BlockBase.java

@@ -1,7 +1,6 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;

src/main/java/com/hbm/blocks/BlockDummyable.java

@@ -1,15 +1,10 @@
 package com.hbm.blocks;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.handler.ThreeInts;
 import com.hbm.interfaces.ICopiable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IPersistentNBT;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -33,6 +28,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 public abstract class BlockDummyable extends BlockContainer implements ICustomBlockHighlight, ICopiable {
 
 	public BlockDummyable(Material mat) {

src/main/java/com/hbm/blocks/BlockEnumMulti.java

@@ -1,9 +1,6 @@
 package com.hbm.blocks;
 
-import java.util.Locale;
-
 import com.hbm.util.EnumUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -11,6 +8,8 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import java.util.Locale;
+
 public class BlockEnumMulti extends BlockMulti {
 
 	public Class<? extends Enum> theEnum;

src/main/java/com/hbm/blocks/BlockFallingNT.java

@@ -1,9 +1,6 @@
 package com.hbm.blocks;
 
-import java.util.Random;
-
 import com.hbm.entity.item.EntityFallingBlockNT;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -14,6 +11,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class BlockFallingNT extends Block {
 
 	public static boolean fallInstantly;

src/main/java/com/hbm/blocks/BlockMulti.java

@@ -1,7 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -9,6 +7,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import java.util.List;
+
 public abstract class BlockMulti extends BlockBase implements IBlockMulti {
 
 	public BlockMulti() {

src/main/java/com/hbm/blocks/BlockRemap.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.ArrayList;
-import java.util.Random;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -12,6 +9,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.Random;
+
 public class BlockRemap extends Block implements ILookOverlay {
 
 	public Block remapBlock;

src/main/java/com/hbm/blocks/IAnalyzable.java

@@ -1,9 +1,9 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public interface IAnalyzable {
 
 	public List<String> getDebugInfo(World world, int x, int y, int z);

src/main/java/com/hbm/blocks/ICustomBlockHighlight.java

@@ -1,12 +1,11 @@
 package com.hbm.blocks;
 
-import org.lwjgl.opengl.GL11;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
+import org.lwjgl.opengl.GL11;
 
 public interface ICustomBlockHighlight {
 

src/main/java/com/hbm/blocks/ILookOverlay.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
@@ -11,6 +7,9 @@ import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import org.lwjgl.opengl.GL11;
+
+import java.util.List;
 
 public interface ILookOverlay {
 

src/main/java/com/hbm/blocks/IPersistentInfoProvider.java

@@ -1,11 +1,11 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import java.util.List;
+
 public interface IPersistentInfoProvider {
 
 	public void addInformation(ItemStack stack, NBTTagCompound persistentTag, EntityPlayer player, List list, boolean ext);

src/main/java/com/hbm/blocks/ITooltipProvider.java

@@ -1,16 +1,14 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
-import org.lwjgl.input.Keyboard;
-
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import org.lwjgl.input.Keyboard;
+
+import java.util.List;
 
 public interface ITooltipProvider {
 

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -1,7 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.ArrayList;
-
 import com.hbm.blocks.BlockEnums.*;
 import com.hbm.blocks.bomb.*;
 import com.hbm.blocks.fluid.*;
@@ -13,7 +11,10 @@ import com.hbm.blocks.machine.pile.*;
 import com.hbm.blocks.machine.rbmk.*;
 import com.hbm.blocks.network.*;
 import com.hbm.blocks.rail.*;
-import com.hbm.blocks.test.*;
+import com.hbm.blocks.test.TestCharge;
+import com.hbm.blocks.test.TestCore;
+import com.hbm.blocks.test.TestEventTester;
+import com.hbm.blocks.test.TestObjTester;
 import com.hbm.blocks.turret.*;
 import com.hbm.items.block.*;
 import com.hbm.items.bomb.ItemPrototypeBlock;
@@ -37,6 +38,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
+import java.util.ArrayList;
+
 public class ModBlocks {
 
 	public static void mainRegistry()

src/main/java/com/hbm/blocks/generic/BlockBobble.java

@@ -198,7 +198,7 @@ public class BlockBobble extends BlockContainer implements IGUIProvider {
 		NOS(			"Dr Nostalgia",						"Dr Nostalgia",		"SSG and Vortex models",									"Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie",					true,	ScrapType.BOARD_TRANSISTOR),
 		DRILLGON(		"Drillgon200",						"Drillgon200",		"1.12 Port",												null,																								false,	ScrapType.CPU_LOGIC),
 		CIRNO(			"Cirno",							"Cirno",			"the only multi layered skin i had",						"No brain. Head empty.",																			true,	ScrapType.BOARD_BLANK),
-		MICROWAVE(		"Microwave",						"Microwave",		"OC Compatibility",											"they call me the food heater",																		true,	ScrapType.BOARD_CONVERTER),
+		MICROWAVE(		"Microwave",						"Microwave",		"OC Compatibility and massive RBMK/packet optimizations",		"they call me the food heater$john optimization",												true,	ScrapType.BOARD_CONVERTER),
 		PEEP(			"Peep",								"LePeeperSauvage",	"Coilgun, Leadburster and Congo Lake models, BDCL QC",		"Fluffy ears can't hide in ash, nor snow.",															true,	ScrapType.CARD_BOARD),
 		MELLOW(			"MELLOWARPEGGIATION",				"Mellow",			"Industrial lighting, animation tools",						"Make something cool now, ask for permission later.",												true,	ScrapType.CARD_PROCESSOR);
 

src/main/java/com/hbm/blocks/generic/BlockEmitter.java

@@ -6,13 +6,13 @@ import java.util.List;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
-import com.hbm.packet.toclient.NBTPacket;
-import com.hbm.tileentity.INBTPacketReceiver;
 
 import api.hbm.block.IToolable;
+import com.hbm.tileentity.TileEntityLoadedBase;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockPistonBase;
@@ -103,7 +103,7 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 		return false;
 	}
 
-	public static class TileEntityEmitter extends TileEntity implements INBTPacketReceiver {
+	public static class TileEntityEmitter extends TileEntityLoadedBase {
 
 		public static final int range = 100;
 		public int color;
@@ -176,12 +176,8 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 					}
 				}
 
-				NBTTagCompound data = new NBTTagCompound();
+				networkPackNT(150);
-				data.setInteger("beam", this.beam);
+
-				data.setInteger("color", this.color);
-				data.setFloat("girth", this.girth);
-				data.setInteger("effect", this.effect);
-				PacketDispatcher.wrapper.sendToAllAround(new NBTPacket(data, xCoord, yCoord, zCoord), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 150));
 			}
 		}
 
@@ -225,11 +221,19 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 		}
 
 		@Override
-		public void networkUnpack(NBTTagCompound nbt) {
+		public void serialize(ByteBuf buf) {
-			this.beam = nbt.getInteger("beam");
+			buf.writeInt(this.beam);
-			this.color = nbt.getInteger("color");
+			buf.writeInt(this.color);
-			this.girth = nbt.getFloat("girth");
+			buf.writeFloat(this.girth);
-			this.effect = nbt.getInteger("effect");
+			buf.writeInt(this.effect);
+		}
+
+		@Override
+		public void deserialize(ByteBuf buf) {
+			this.beam = buf.readInt();
+			this.color = buf.readInt();
+			this.girth = buf.readFloat();
+			this.effect = buf.readInt();
 		}
 	}
 

src/main/java/com/hbm/blocks/machine/BlockICFLaserComponent.java

@@ -2,7 +2,6 @@ package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockEnumMulti;
 import com.hbm.lib.RefStrings;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;

src/main/java/com/hbm/blocks/machine/DummyBlockAssembler.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.TileEntityMachineAssembler;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/com/hbm/blocks/machine/DummyBlockTurbofan.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.TileEntityMachineTurbofan;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/com/hbm/blocks/machine/FoundryCastingBase.java

@@ -1,9 +1,7 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
+import api.hbm.block.ICrucibleAcceptor;
-import java.util.List;
+import api.hbm.block.IToolable;
-import java.util.Random;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.material.Mats.MaterialStack;
 import com.hbm.items.ModItems;
@@ -12,9 +10,6 @@ import com.hbm.items.machine.ItemMold.Mold;
 import com.hbm.items.machine.ItemScraps;
 import com.hbm.tileentity.machine.TileEntityFoundryCastingBase;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.block.ICrucibleAcceptor;
-import api.hbm.block.IToolable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -30,6 +25,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 public abstract class FoundryCastingBase extends BlockContainer implements ICrucibleAcceptor, IToolable, ILookOverlay {
 
 	protected FoundryCastingBase() {

src/main/java/com/hbm/blocks/machine/FurnaceCombination.java

@@ -1,18 +1,17 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityFurnaceCombination;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class FurnaceCombination extends BlockDummyable implements ITooltipProvider {
 
 	public FurnaceCombination() {

src/main/java/com/hbm/blocks/machine/MachineArcFurnaceLarge.java

@@ -7,7 +7,6 @@ import com.hbm.items.machine.ItemScraps;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineArcFurnaceLarge;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;

src/main/java/com/hbm/blocks/machine/MachineAutocrafter.java

@@ -1,11 +1,8 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityMachineAutocrafter;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -22,6 +19,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineAutocrafter extends BlockContainer {
 
 	@SideOnly(Side.CLIENT) private IIcon iconTop;

src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.handler.MultiblockHandlerXR;
@@ -14,7 +11,6 @@ import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IPersistentNBT;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.storage.TileEntityMachineBAT9000;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +24,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineBigAssTank9000 extends BlockDummyable implements IPersistentInfoProvider {
 
 	public MachineBigAssTank9000(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineBrickFurnace.java

@@ -1,13 +1,10 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityFurnaceBrick;
 import com.hbm.util.ItemStackUtil;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -24,6 +21,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineBrickFurnace extends BlockContainer {
 
 	private final Random rand = new Random();

src/main/java/com/hbm/blocks/machine/MachineCapacitor.java

@@ -10,9 +10,6 @@ import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.toclient.BufPacket;
-import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.IPersistentNBT;
 import com.hbm.tileentity.TileEntityLoadedBase;
 import com.hbm.util.BobMathUtil;
@@ -22,7 +19,6 @@ import com.hbm.util.fauxpointtwelve.BlockPos;
 import api.hbm.energymk2.IEnergyProviderMK2;
 import api.hbm.energymk2.IEnergyReceiverMK2;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
@@ -153,7 +149,7 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP
 		player.addExhaustion(0.025F);
 	}
 
-	public static class TileEntityCapacitor extends TileEntityLoadedBase implements IEnergyProviderMK2, IEnergyReceiverMK2, IBufPacketReceiver, IPersistentNBT {
+	public static class TileEntityCapacitor extends TileEntityLoadedBase implements IEnergyProviderMK2, IEnergyReceiverMK2, IPersistentNBT {
 
 		public long power;
 		protected long maxPower;
@@ -199,7 +195,7 @@ public class MachineCapacitor extends BlockContainer implements ILookOverlay, IP
 
 				this.trySubscribe(worldObj, xCoord + opp.offsetX, yCoord + opp.offsetY, zCoord + opp.offsetZ, opp);
 
-				PacketDispatcher.wrapper.sendToAllAround(new BufPacket(xCoord, yCoord, zCoord, this), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 15));
+				networkPackNT(15);
 
 				this.powerSent = 0;
 				this.powerReceived = 0;

src/main/java/com/hbm/blocks/machine/MachineCapacitorBus.java

@@ -1,11 +1,8 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
+import api.hbm.energymk2.IEnergyConnectorBlock;
-
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.lib.RefStrings;
-
-import api.hbm.energymk2.IEnergyConnectorBlock;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -20,6 +17,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineCapacitorBus extends Block implements IEnergyConnectorBlock, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) private IIcon topIcon;

src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.handler.MultiblockHandlerXR;
@@ -11,7 +8,6 @@ import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticCracker;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -23,6 +19,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineCatalyticCracker extends BlockDummyable implements ILookOverlay {
 
 	public MachineCatalyticCracker(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineCatalyticReformer.java

@@ -1,7 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.handler.MultiblockHandlerXR;
@@ -9,7 +7,6 @@ import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticReformer;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -19,6 +16,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineCatalyticReformer extends BlockDummyable implements IPersistentInfoProvider {
 
 	public MachineCatalyticReformer(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineChimneyBrick.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityChimneyBrick;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -14,6 +11,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineChimneyBrick extends BlockDummyable implements ITooltipProvider {
 
 	public MachineChimneyBrick(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineChimneyIndustrial.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityChimneyIndustrial;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -14,6 +11,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineChimneyIndustrial extends BlockDummyable implements ITooltipProvider {
 
 	public MachineChimneyIndustrial(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineCombustionEngine.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineCombustionEngine;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/MachineCondenserPowered.java

@@ -1,15 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityCondenserPowered;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
@@ -17,6 +13,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineCondenserPowered extends BlockDummyable implements ILookOverlay {
 
 	public MachineCondenserPowered(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineConveyorPress.java

@@ -1,8 +1,7 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
+import api.hbm.block.IToolable;
-import java.util.List;
+import api.hbm.conveyor.IConveyorBelt;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
@@ -10,9 +9,6 @@ import com.hbm.items.machine.ItemStamp;
 import com.hbm.tileentity.machine.TileEntityConveyorPress;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.block.IToolable;
-import api.hbm.conveyor.IConveyorBelt;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,6 +21,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineConveyorPress extends BlockDummyable implements IConveyorBelt, ILookOverlay, IToolable, ITooltipProvider {
 
 	public MachineConveyorPress(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/com/hbm/blocks/machine/MachineDeuteriumExtractor.java

@@ -1,14 +1,10 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityDeuteriumExtractor;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
@@ -20,6 +16,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineDeuteriumExtractor extends BlockContainer implements ILookOverlay {
 
 	public MachineDeuteriumExtractor(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineDiFurnaceExtension.java

@@ -6,7 +6,6 @@ import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityDiFurnace;
 import com.hbm.util.Compat;
-
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityDiFurnaceRTG;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,6 +22,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineDiFurnaceRTG extends BlockContainer {
 
 	private final Random rand = new Random();

src/main/java/com/hbm/blocks/machine/MachineElectricFurnace.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,6 +22,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineElectricFurnace extends BlockContainer {
 
     private final Random field_149933_a = new Random();

src/main/java/com/hbm/blocks/machine/MachineElectrolyser.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityElectrolyser;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/MachineExposureChamber.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineExposureChamber;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/MachineFieldDisturber.java

@@ -1,14 +1,13 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.entity.logic.EntityNukeExplosionMK3;
 import com.hbm.entity.logic.EntityNukeExplosionMK3.ATEntry;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineFieldDisturber extends Block {
 
 	public MachineFieldDisturber() {

src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.handler.MultiblockHandlerXR;
@@ -13,7 +10,6 @@ import com.hbm.tileentity.IPersistentNBT;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineFrackingTower;
 import com.hbm.util.BobMathUtil;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -24,6 +20,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineFrackingTower extends BlockDummyable implements IPersistentInfoProvider {
 
 	public MachineFrackingTower() {

src/main/java/com/hbm/blocks/machine/MachineFractionTower.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.fluid.FluidType;
@@ -10,7 +7,6 @@ import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -22,6 +18,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineFractionTower extends BlockDummyable implements ILookOverlay {
 
 	public MachineFractionTower(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineHeatBoilerIndustrial.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
@@ -14,7 +10,6 @@ import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityHeatBoilerIndustrial;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -27,6 +22,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 public class MachineHeatBoilerIndustrial extends BlockDummyable implements ILookOverlay, ITooltipProvider {
 
 	public MachineHeatBoilerIndustrial() {

src/main/java/com/hbm/blocks/machine/MachineHydrotreater.java

@@ -1,14 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.IPersistentInfoProvider;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineHydrotreater;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -18,6 +15,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineHydrotreater extends BlockDummyable implements IPersistentInfoProvider {
 
 	public MachineHydrotreater(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineICFController.java

@@ -1,11 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.BlockICF.TileEntityBlockICF;
@@ -17,7 +11,6 @@ import com.hbm.tileentity.machine.TileEntityICFController;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
 import com.hbm.util.fauxpointtwelve.BlockPos;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -36,6 +29,12 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+
 public class MachineICFController extends BlockContainer implements ILookOverlay {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java

@@ -1,13 +1,10 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineLargeTurbine;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
@@ -18,6 +15,8 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineLargeTurbine extends BlockDummyable implements ITooltipProvider {
 
 	public MachineLargeTurbine(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -14,6 +11,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineLiquefactor extends BlockDummyable implements ITooltipProvider {
 
 	public MachineLiquefactor() {

src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java

@@ -1,14 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.TileEntityProxyEnergy;
 import com.hbm.tileentity.machine.TileEntityMachineMiningLaser;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +14,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class MachineMiningLaser extends BlockDummyable implements ITooltipProvider {
 
 	public MachineMiningLaser(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java

@@ -1,11 +1,8 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.handler.BossSpawnHandler;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
@@ -20,6 +17,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineMissileAssembly extends BlockContainer {
 
 	public MachineMissileAssembly(Material p_i45386_1_) {

src/main/java/com/hbm/blocks/machine/MachineNukeFurnace.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityNukeFurnace;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,6 +22,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineNukeFurnace extends BlockContainer {
 
     private final Random field_149933_a = new Random();

src/main/java/com/hbm/blocks/machine/MachinePWRController.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks.machine;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.BlockPWR.TileEntityBlockPWR;
@@ -13,7 +9,6 @@ import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.machine.TileEntityPWRController;
 import com.hbm.util.fauxpointtwelve.BlockPos;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -32,6 +27,10 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
 public class MachinePWRController extends BlockContainer implements ITooltipProvider {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java

@@ -1,14 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachinePlasmaHeater;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -22,6 +19,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.Random;
+
 public class MachinePlasmaHeater extends BlockDummyable {
 
 	public MachinePlasmaHeater() {

src/main/java/com/hbm/blocks/machine/MachineRadarScreen.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityMachineRadarNT;
 import com.hbm.tileentity.machine.TileEntityMachineRadarScreen;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java

@@ -4,7 +4,6 @@ import com.hbm.blocks.BlockDummyable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.TileEntityProxyInventory;
 import com.hbm.tileentity.machine.TileEntityMachineReactorBreeding;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/com/hbm/blocks/machine/MachineReactorControl.java

@@ -1,11 +1,8 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityReactorControl;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,6 +22,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineReactorControl extends BlockContainer {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/machine/MachineRotaryFurnace.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineRotaryFurnace;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.machine;
 
-import java.util.Random;
-
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -23,6 +20,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class MachineSchrabidiumTransmutator extends BlockContainer {
 
     private final Random field_149933_a = new Random();

src/main/java/com/hbm/blocks/machine/MachineSolarBoiler.java

@@ -1,15 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntitySolarBoiler;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
@@ -17,6 +13,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MachineSolarBoiler extends BlockDummyable implements ILookOverlay {
 
 	public MachineSolarBoiler(Material mat) {

src/main/java/com/hbm/blocks/machine/MachineSolderingStation.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityMachineSolderingStation;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/MachineSteamEngine.java

@@ -1,16 +1,11 @@
 package com.hbm.blocks.machine;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntitySteamEngine;
 import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -20,6 +15,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 public class MachineSteamEngine extends BlockDummyable implements ILookOverlay, ITooltipProvider {
 
 	public MachineSteamEngine() {

src/main/java/com/hbm/blocks/machine/MachineTransformer.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineTransformer;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;

src/main/java/com/hbm/blocks/machine/MachineVacuumDistill.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineVacuumDistill;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/com/hbm/blocks/machine/PinkCloudBroadcaster.java

@@ -1,7 +1,6 @@
 package com.hbm.blocks.machine;
 
 import com.hbm.tileentity.machine.TileEntityBroadcaster;
-
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;

src/main/java/com/hbm/blocks/machine/PistonInserter.java

@@ -4,11 +4,13 @@ import java.util.List;
 
 import com.hbm.blocks.BlockContainerBase;
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.tileentity.INBTPacketReceiver;
 
 import api.hbm.block.IInsertable;
+import com.hbm.tileentity.TileEntityLoadedBase;
+import com.hbm.util.BufferUtil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;
@@ -206,7 +208,7 @@ public class PistonInserter extends BlockContainerBase implements ITooltipProvid
 	//		|___..---'			   _|____`-----..-----'\
 	//		|_____________________|	@	|			    )
 	// average coding session involving tile entities
-	public static class TileEntityPistonInserter extends TileEntity implements IInventory, INBTPacketReceiver {
+	public static class TileEntityPistonInserter extends TileEntityLoadedBase implements IInventory {
 
 		public ItemStack slot;
 
@@ -257,15 +259,7 @@ public class PistonInserter extends BlockContainerBase implements ITooltipProvid
 					delay--;
 				}
 
-				NBTTagCompound data = new NBTTagCompound();
+				networkPackNT(25);
-				data.setInteger("extend", extend);
-				if(this.slot != null) {
-					NBTTagCompound stack = new NBTTagCompound();
-					slot.writeToNBT(stack);
-					data.setTag("stack", stack);
-				}
-				
-				INBTPacketReceiver.networkPack(this, data, 25);
 
 			} else {
 				this.lastExtend = this.renderExtend;
@@ -281,11 +275,23 @@ public class PistonInserter extends BlockContainerBase implements ITooltipProvid
 		}
 
 		@Override
-		public void networkUnpack(NBTTagCompound nbt) {
+		public void serialize(ByteBuf buf) {
-			this.syncExtend = nbt.getInteger("extend");
+			buf.writeInt(extend);
 
-			if(nbt.hasKey("stack")) {
+			buf.writeBoolean(this.slot != null);
-				NBTTagCompound stack = nbt.getCompoundTag("stack");
+			if(this.slot != null) {
+				BufferUtil.writeNBT(buf, slot.stackTagCompound);
+			}
+
+			this.turnProgress = 2;
+		}
+
+		@Override
+		public void deserialize(ByteBuf buf) {
+			this.syncExtend = buf.readInt();
+
+			if(buf.readBoolean()) {
+				NBTTagCompound stack = BufferUtil.readNBT(buf);
 				this.slot = ItemStack.loadItemStackFromNBT(stack);
 			} else
 				this.slot = null;
@@ -293,8 +299,6 @@ public class PistonInserter extends BlockContainerBase implements ITooltipProvid
 			this.turnProgress = 2;
 		}
 
-		/* :3 NBT stuff */
-		
 		@Override
 		public void writeToNBT(NBTTagCompound nbt) {
 			super.writeToNBT(nbt);

src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java

@@ -3,6 +3,8 @@ package com.hbm.blocks.machine.rbmk;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.handler.MultiblockHandlerXR;
+import com.hbm.handler.neutron.NeutronNodeWorld;
+import com.hbm.handler.neutron.RBMKNeutronHandler.RBMKNeutronNode;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemRBMKLid;
 import com.hbm.lib.RefStrings;
@@ -11,6 +13,7 @@ import com.hbm.tileentity.machine.rbmk.RBMKDials;
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase;
 
 import api.hbm.block.IToolable;
+import com.hbm.util.fauxpointtwelve.BlockPos;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -171,6 +174,10 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo
 				
 				if(rbmk.hasLid() && rbmk.isLidRemovable()) {
 
+					RBMKNeutronNode node = (RBMKNeutronNode) NeutronNodeWorld.getNode(new BlockPos(te));
+					if (node != null)
+						node.removeLid();
+					
 					if(!world.isRemote) {
 						if(i == DIR_NORMAL_LID.ordinal() + offset) {
 							world.spawnEntityInWorld(new EntityItem(world, pos[0] + 0.5, pos[1] + 0.5 + RBMKDials.getColumnHeight(world), pos[2] + 0.5, new ItemStack(ModItems.rbmk_lid)));

src/main/java/com/hbm/blocks/network/BlockCable.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.network;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.network.TileEntityCableBaseNT;
-
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

src/main/java/com/hbm/blocks/network/BlockCableGauge.java

@@ -1,23 +1,19 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.energymk2.PowerNetMK2;
-import java.util.List;
-
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.handler.CompatHandler;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.block.RenderBlockMultipass;
-import com.hbm.tileentity.INBTPacketReceiver;
 import com.hbm.tileentity.network.TileEntityCableBaseNT;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.energymk2.PowerNetMK2;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import li.cil.oc.api.machine.Arguments;
 import li.cil.oc.api.machine.Callback;
 import li.cil.oc.api.machine.Context;
@@ -29,13 +25,15 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class BlockCableGauge extends BlockContainer implements IBlockMultiPass, ILookOverlay, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) protected IIcon overlayGauge;
@@ -105,7 +103,7 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass,
 	}
 
 	@Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")})
-	public static class TileEntityCableGauge extends TileEntityCableBaseNT implements INBTPacketReceiver, SimpleComponent, CompatHandler.OCComponent {
+	public static class TileEntityCableGauge extends TileEntityCableBaseNT implements SimpleComponent, CompatHandler.OCComponent {
 
 		private long deltaTick = 0;
 		private long deltaSecond = 0;
@@ -129,17 +127,20 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass,
 					this.deltaSecond += deltaTick;
 				}
 
-				NBTTagCompound data = new NBTTagCompound();
+				networkPackNT(25);
-				data.setLong("deltaT", deltaTick);
-				data.setLong("deltaS", deltaLastSecond);
-				INBTPacketReceiver.networkPack(this, data, 25);
 			}
 		}
 
 		@Override
-		public void networkUnpack(NBTTagCompound nbt) {
+		public void serialize(ByteBuf buf) {
-			this.deltaTick = Math.max(nbt.getLong("deltaT"), 0);
+			buf.writeLong(deltaTick);
-			this.deltaLastSecond = Math.max(nbt.getLong("deltaS"), 0);
+			buf.writeLong(deltaLastSecond);
+		}
+
+		@Override
+		public void deserialize(ByteBuf buf) {
+			this.deltaTick = Math.max(buf.readLong(), 0);
+			this.deltaLastSecond = Math.max(buf.readLong(), 0);
 		}
 
 		@Override

src/main/java/com/hbm/blocks/network/BlockCablePaintable.java

@@ -1,11 +1,10 @@
 package com.hbm.blocks.network;
 
+import api.hbm.block.IToolable;
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.tileentity.network.TileEntityCableBaseNT;
-
-import api.hbm.block.IToolable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/network/BlockConveyorBase.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
+import api.hbm.conveyor.IConveyorBelt;
-
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.entity.item.EntityMovingItem;
 import com.hbm.lib.RefStrings;
-
-import api.hbm.conveyor.IConveyorBelt;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -26,6 +23,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public abstract class BlockConveyorBase extends Block implements IConveyorBelt, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/network/BlockConveyorClassic.java

@@ -1,9 +1,8 @@
 package com.hbm.blocks.network;
 
+import api.hbm.conveyor.IConveyorBelt;
 import com.hbm.entity.item.EntityMovingItem;
 import com.hbm.lib.RefStrings;
-
-import api.hbm.conveyor.IConveyorBelt;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/network/CableDetector.java

@@ -2,7 +2,6 @@ package com.hbm.blocks.network;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityCableSwitch;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/network/CableDiode.java

@@ -1,22 +1,18 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.block.IToolable;
-import java.util.List;
+import api.hbm.energymk2.IEnergyConnectorBlock;
-
+import api.hbm.energymk2.IEnergyConnectorMK2;
+import api.hbm.energymk2.IEnergyReceiverMK2;
+import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
+import api.hbm.energymk2.Nodespace;
+import api.hbm.energymk2.Nodespace.PowerNode;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.TileEntityLoadedBase;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.Compat;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.block.IToolable;
-import api.hbm.energymk2.IEnergyConnectorBlock;
-import api.hbm.energymk2.IEnergyConnectorMK2;
-import api.hbm.energymk2.IEnergyReceiverMK2;
-import api.hbm.energymk2.Nodespace;
-import api.hbm.energymk2.Nodespace.PowerNode;
-import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -37,6 +33,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CableDiode extends BlockContainer implements IEnergyConnectorBlock, ILookOverlay, IToolable, ITooltipProvider {
 
 	public CableDiode(Material mat) {

src/main/java/com/hbm/blocks/network/CableSwitch.java

@@ -2,7 +2,6 @@ package com.hbm.blocks.network;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityCableSwitch;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;

src/main/java/com/hbm/blocks/network/ConnectorRedWire.java

@@ -1,10 +1,7 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.lib.Library;
 import com.hbm.tileentity.network.TileEntityConnector;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -15,6 +12,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class ConnectorRedWire extends PylonBase {
 
 	public ConnectorRedWire(Material mat) {

src/main/java/com/hbm/blocks/network/CraneInserter.java

@@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityCraneBase;
 import com.hbm.tileentity.network.TileEntityCraneInserter;
 import com.hbm.util.InventoryUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/network/CranePartitioner.java

@@ -1,21 +1,15 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.conveyor.IConveyorBelt;
-import java.util.Comparator;
+import api.hbm.conveyor.IConveyorItem;
-import java.util.List;
+import api.hbm.conveyor.IConveyorPackage;
-import java.util.Random;
+import api.hbm.conveyor.IEnterableBlock;
-
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.entity.item.EntityMovingItem;
 import com.hbm.inventory.recipes.CrystallizerRecipes;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.TileEntityMachineBase;
 import com.hbm.util.InventoryUtil;
-
-import api.hbm.conveyor.IConveyorBelt;
-import api.hbm.conveyor.IConveyorItem;
-import api.hbm.conveyor.IConveyorPackage;
-import api.hbm.conveyor.IEnterableBlock;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -37,6 +31,11 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
+
 public class CranePartitioner extends BlockContainer implements IConveyorBelt, IEnterableBlock, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) public IIcon iconTop;

src/main/java/com/hbm/blocks/network/CraneRouter.java

@@ -1,8 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.conveyor.IConveyorBelt;
-import java.util.List;
+import api.hbm.conveyor.IConveyorItem;
-
+import api.hbm.conveyor.IConveyorPackage;
+import api.hbm.conveyor.IEnterableBlock;
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.entity.item.EntityMovingItem;
@@ -11,11 +12,6 @@ import com.hbm.main.MainRegistry;
 import com.hbm.module.ModulePatternMatcher;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.tileentity.network.TileEntityCraneRouter;
-
-import api.hbm.conveyor.IConveyorBelt;
-import api.hbm.conveyor.IConveyorItem;
-import api.hbm.conveyor.IConveyorPackage;
-import api.hbm.conveyor.IEnterableBlock;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -33,6 +29,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CraneRouter extends BlockContainer implements IBlockMultiPass, IEnterableBlock, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) protected IIcon iconOverlay;

src/main/java/com/hbm/blocks/network/CraneSplitter.java

@@ -1,17 +1,14 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
-import com.hbm.blocks.BlockDummyable;
-import com.hbm.blocks.ITooltipProvider;
-import com.hbm.entity.item.EntityMovingItem;
-import com.hbm.lib.RefStrings;
-import com.hbm.tileentity.network.TileEntityCraneSplitter;
-
 import api.hbm.conveyor.IConveyorBelt;
 import api.hbm.conveyor.IConveyorItem;
 import api.hbm.conveyor.IConveyorPackage;
 import api.hbm.conveyor.IEnterableBlock;
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.blocks.ITooltipProvider;
+import com.hbm.entity.item.EntityMovingItem;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.network.TileEntityCraneSplitter;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -26,6 +23,8 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class CraneSplitter extends BlockDummyable implements IConveyorBelt, IEnterableBlock, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) public IIcon iconTopLeft;

src/main/java/com/hbm/blocks/network/DroneCrate.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.items.ModItems;
@@ -11,7 +7,6 @@ import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.network.TileEntityDroneCrate;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -28,6 +23,10 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 public class DroneCrate extends BlockContainer implements ILookOverlay, ITooltipProvider {
 
 	private static Random rand = new Random();

src/main/java/com/hbm/blocks/network/DroneDock.java

@@ -1,14 +1,11 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.network.TileEntityDroneDock;
 import com.hbm.tileentity.network.TileEntityDroneProvider;
 import com.hbm.tileentity.network.TileEntityDroneRequester;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -21,6 +18,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class DroneDock extends BlockContainer implements ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) private IIcon iconTop;

src/main/java/com/hbm/blocks/network/DroneWaypoint.java

@@ -1,14 +1,10 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.items.ModItems;
 import com.hbm.tileentity.network.TileEntityDroneWaypoint;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -25,6 +21,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DroneWaypoint extends BlockContainer implements ILookOverlay, ITooltipProvider {
 
 	public DroneWaypoint() {

src/main/java/com/hbm/blocks/network/DroneWaypointRequest.java

@@ -1,7 +1,6 @@
 package com.hbm.blocks.network;
 
 import com.hbm.tileentity.network.TileEntityDroneWaypointRequest;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/network/FluidDuctBase.java

@@ -1,8 +1,7 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.fluid.IPipeNet;
-import java.util.List;
+import api.hbm.fluid.PipeNet;
-
 import com.hbm.blocks.IAnalyzable;
 import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.handler.HbmKeybinds;
@@ -10,9 +9,6 @@ import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.items.machine.ItemFluidIDMulti;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
-
-import api.hbm.fluid.IPipeNet;
-import api.hbm.fluid.PipeNet;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -22,6 +18,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidDuctBase extends BlockContainer implements IBlockFluidDuct, IAnalyzable {
 
 	public FluidDuctBase(Material mat) {

src/main/java/com/hbm/blocks/network/FluidDuctBox.java

@@ -1,15 +1,11 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.IBlockMulti;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.lib.Library;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -27,6 +23,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidDuctBox extends FluidDuctBase implements IBlockMulti, ILookOverlay {
 
 	@SideOnly(Side.CLIENT) public IIcon[] iconStraight;

src/main/java/com/hbm/blocks/network/FluidDuctBoxExhaust.java

@@ -1,15 +1,11 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.Library;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityPipeExhaust;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -24,6 +20,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidDuctBoxExhaust extends FluidDuctBox {
 
 	public FluidDuctBoxExhaust(Material mat) {

src/main/java/com/hbm/blocks/network/FluidDuctGauge.java

@@ -1,10 +1,6 @@
 package com.hbm.blocks.network;
 
-import java.math.BigInteger;
+import api.hbm.fluid.IPipeNet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
@@ -12,14 +8,12 @@ import com.hbm.handler.CompatHandler;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.block.RenderBlockMultipass;
-import com.hbm.tileentity.INBTPacketReceiver;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.fluid.IPipeNet;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import li.cil.oc.api.machine.Arguments;
 import li.cil.oc.api.machine.Callback;
 import li.cil.oc.api.machine.Context;
@@ -30,13 +24,17 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, ILookOverlay, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT) protected IIcon overlay;
@@ -109,7 +107,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL
 	}
 
 	@Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")})
-	public static class TileEntityPipeGauge extends TileEntityPipeBaseNT implements INBTPacketReceiver, SimpleComponent, CompatHandler.OCComponent {
+	public static class TileEntityPipeGauge extends TileEntityPipeBaseNT implements SimpleComponent, CompatHandler.OCComponent {
 
 		private BigInteger lastMeasurement = BigInteger.valueOf(10);
 		private long deltaTick = 0;
@@ -140,17 +138,20 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL
 					} catch(Exception ex) { }
 				}
 
-				NBTTagCompound data = new NBTTagCompound();
+				networkPackNT(25);
-				data.setLong("deltaT", deltaTick);
-				data.setLong("deltaS", deltaLastSecond);
-				INBTPacketReceiver.networkPack(this, data, 25);
 			}
 		}
 
 		@Override
-		public void networkUnpack(NBTTagCompound nbt) {
+		public void serialize(ByteBuf buf) {
-			this.deltaTick = Math.max(nbt.getLong("deltaT"), 0);
+			buf.writeLong(deltaTick);
-			this.deltaLastSecond = Math.max(nbt.getLong("deltaS"), 0);
+			buf.writeLong(deltaLastSecond);
+		}
+
+		@Override
+		public void deserialize(ByteBuf buf) {
+			this.deltaTick = Math.max(buf.readLong(), 0);
+			this.deltaLastSecond = Math.max(buf.readLong(), 0);
 		}
 
 		@Optional.Method(modid = "OpenComputers")

src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java

@@ -1,16 +1,12 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
+import api.hbm.block.IToolable;
-import java.util.List;
-
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
 import com.hbm.util.I18nUtil;
-
-import api.hbm.block.IToolable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -26,6 +22,9 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidDuctPaintable extends FluidDuctBase implements IToolable, IBlockMultiPass, ILookOverlay {
 
 	@SideOnly(Side.CLIENT) protected IIcon overlay;

src/main/java/com/hbm/blocks/network/FluidDuctStandard.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.IBlockMulti;
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.fluid.FluidType;
@@ -11,7 +8,6 @@ import com.hbm.lib.Library;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityPipeBaseNT;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -31,6 +27,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidDuctStandard extends FluidDuctBase implements IBlockMulti, ILookOverlay {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/network/FluidSwitch.java

@@ -1,13 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityFluidValve;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -18,6 +14,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidSwitch extends FluidDuctBase implements ILookOverlay {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/network/FluidValve.java

@@ -1,13 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.network.TileEntityFluidValve;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -18,6 +14,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FluidValve extends FluidDuctBase implements ILookOverlay {
 
 	@SideOnly(Side.CLIENT)

src/main/java/com/hbm/blocks/network/IBlockFluidDuct.java

@@ -1,7 +1,6 @@
 package com.hbm.blocks.network;
 
 import com.hbm.inventory.fluid.FluidType;
-
 import net.minecraft.world.World;
 
 public interface IBlockFluidDuct {

src/main/java/com/hbm/blocks/network/PylonBase.java

@@ -2,7 +2,6 @@ package com.hbm.blocks.network;
 
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.network.TileEntityPylonBase;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

src/main/java/com/hbm/blocks/network/PylonLarge.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.network.TileEntityPylonBase;
 import com.hbm.tileentity.network.TileEntityPylonLarge;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +14,8 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 public class PylonLarge extends BlockDummyable implements ITooltipProvider {
 
 	public PylonLarge(Material mat) {

src/main/java/com/hbm/blocks/network/PylonMedium.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.tileentity.network.TileEntityPylonBase;
 import com.hbm.tileentity.network.TileEntityPylonMedium;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +12,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class PylonMedium extends BlockDummyable implements ITooltipProvider {
 
 	public PylonMedium(Material mat) {

src/main/java/com/hbm/blocks/network/PylonRedWire.java

@@ -1,9 +1,6 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.tileentity.network.TileEntityPylon;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -11,6 +8,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class PylonRedWire extends PylonBase {
 
 	public PylonRedWire(Material material) {

src/main/java/com/hbm/blocks/network/RadioTelex.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.network;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.network.TileEntityRadioTelex;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/com/hbm/blocks/network/RadioTorchBase.java

@@ -1,12 +1,9 @@
 package com.hbm.blocks.network;
 
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IGUIProvider;
-
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -23,6 +20,8 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.List;
+
 /**
  * Base class for all torch-like RTTY blocks
  * @author hbm

src/main/java/com/hbm/blocks/network/RadioTorchCounter.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks.network;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.hbm.blocks.ILookOverlay;
 import com.hbm.inventory.container.ContainerCounterTorch;
 import com.hbm.inventory.gui.GUICounterTorch;
@@ -10,7 +7,6 @@ import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.network.TileEntityRadioTorchCounter;
 import com.hbm.util.Compat;
 import com.hbm.util.I18nUtil;
-
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -24,6 +20,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class RadioTorchCounter extends RadioTorchBase {
 
 	@Override