Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

changelog

@@ -5,8 +5,15 @@
 * Removed forgotten bricks
 * Updated CMB brick texture
 * The ICF machine block now renders with its 3d model in the creative inventory
+* "Toggle backpack" keybind is now called "toggle jetpack" to reduce confusion
 
 ## Fixed
 * Fixed pumpjack gauges not syncing properly
 * Fixed some concrete variants not being revertable into uncolored concrete
-* Fixed the ore density scanner not using proper translations for the HUD
+* Fixed the ore density scanner not using proper translations for the HUD
+* Fixed the solar boiler's rays rendering on fast graphics instead of on fancy graphics
+* Fixed hydroreactive items not exploding when submerged in water
+* Fixed fluid valves visually disconnecting when switching state
+* Fixed fluid valves no visually connecting when type is set
+* Fixed falling blocks spawned by nukes or impulse grenades dropping blocks that don't have drops
+* Added even more exception handling to CompStacks, hopefully fixing an incompatibility with Mana Metal

src/main/java/api/hbm/energymk2/IEnergyProviderMK2.java

@@ -1,7 +1,7 @@
 package api.hbm.energymk2;
 
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
 
 import api.hbm.energymk2.Nodespace.PowerNode;

src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java

@@ -1,7 +1,7 @@
 package api.hbm.energymk2;
 
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
 
 import api.hbm.energymk2.Nodespace.PowerNode;

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

@@ -1,8 +1,8 @@
 package api.hbm.fluid;
 
 import com.hbm.inventory.fluid.FluidType;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
 
 import api.hbm.tile.ILoadedTile;

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

@@ -2,8 +2,8 @@ package api.hbm.fluid;
 
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.tank.FluidTank;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/api/hbm/item/IButtonReceiver.java

@@ -1,17 +0,0 @@
-package api.hbm.item;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public interface IButtonReceiver {
-
-	/**
-	 * Called in ModEventHandlerClient for any keyboard input related to this item
-	 * @param stack
-	 * @param player
-	 */
-	@SideOnly(Side.CLIENT)
-	public void handleKeyboardInput(ItemStack stack, EntityPlayer player);
-}

src/main/java/api/hbm/item/IClickReceiver.java

@@ -1,20 +0,0 @@
-package api.hbm.item;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public interface IClickReceiver {
-
-	/**
-	 * Called in ModEventHandlerClient for any mouse input related to this item
-	 * @param stack
-	 * @param player
-	 * @param button
-	 * @param state
-	 * @return true if the event should be canceled
-	 */
-	@SideOnly(Side.CLIENT)
-	public boolean handleMouseInput(ItemStack stack, EntityPlayer player, int button, boolean state);
-}

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

@@ -893,7 +893,6 @@ public class ModBlocks {
 	public static Block watz_element;
 	public static Block watz_cooler;
 	public static Block watz_end;
-	public static Block watz_conductor;
 
 	public static Block balefire;
 	public static Block fire_digamma;
@@ -1997,7 +1996,6 @@ public class ModBlocks {
 		watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side");
 		watz_cooler = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_cooler_top").setBlockName("watz_cooler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_cooler_side");
 		watz_end = new BlockToolConversion(Material.iron).addVariant("_bolted").setBlockName("watz_end").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_casing");
-		watz_conductor = new BlockCableConnect(Material.iron).setBlockName("watz_conductor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":watz_conductor_top");
 		watz = new Watz().setBlockName("watz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		watz_pump = new WatzPump().setBlockName("watz_pump").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		
@@ -3310,6 +3308,12 @@ public class ModBlocks {
 		GameRegistry.registerBlock(plasma, ItemBlockLore.class, plasma.getUnlocalizedName());
 		GameRegistry.registerBlock(iter, iter.getUnlocalizedName());
 		GameRegistry.registerBlock(plasma_heater, plasma_heater.getUnlocalizedName());
+
+		register(watz_element);
+		register(watz_cooler);
+		register(watz_end);
+		register(watz);
+		register(watz_pump);
 		
 		register(machine_icf_press);
 		register(icf_laser_component);
@@ -3317,13 +3321,6 @@ public class ModBlocks {
 		register(icf_block);
 		register(icf_component);
 		register(icf);
-
-		GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName());
-		GameRegistry.registerBlock(watz_cooler, watz_cooler.getUnlocalizedName());
-		register(watz_end);
-		GameRegistry.registerBlock(watz_conductor, watz_conductor.getUnlocalizedName());
-		GameRegistry.registerBlock(watz, watz.getUnlocalizedName());
-		GameRegistry.registerBlock(watz_pump, watz_pump.getUnlocalizedName());
 		
 		//E
 		GameRegistry.registerBlock(balefire, balefire.getUnlocalizedName());

src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java

@@ -7,8 +7,8 @@ import com.hbm.config.BombConfig;
 import com.hbm.entity.logic.EntityBalefire;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.bomb.TileEntityCrashedBomb;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/blocks/bomb/BlockVolcano.java

@@ -9,8 +9,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.entity.projectile.EntityShrapnel;
 import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;

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

@@ -4,9 +4,9 @@ import java.awt.Color;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.IBufPacketReceiver;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import api.hbm.block.IToolable;
 import com.hbm.tileentity.TileEntityLoadedBase;

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

@@ -3,8 +3,8 @@ package com.hbm.blocks.generic;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ParticleUtil;
 
 import api.hbm.block.IToolable;

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

@@ -10,8 +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.BufPacket;
-import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.IBufPacketReceiver;
 import com.hbm.tileentity.IPersistentNBT;
 import com.hbm.tileentity.TileEntityLoadedBase;
@@ -22,7 +20,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;

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

@@ -11,8 +11,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.BlockICF.TileEntityBlockICF;
 import com.hbm.blocks.machine.BlockICFLaserComponent.EnumICFPart;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.machine.TileEntityICFController;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;

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

@@ -9,8 +9,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.BlockPWR.TileEntityBlockPWR;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.machine.TileEntityPWRController;
 import com.hbm.util.fauxpointtwelve.BlockPos;
 

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

@@ -8,8 +8,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.inventory.material.Mats;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityZirnoxDestroyed;
 

src/main/java/com/hbm/blocks/machine/pile/BlockGraphite.java

@@ -4,7 +4,7 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockFlammable;
 import com.hbm.items.ModItems;
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.ParticleBurstPacket;
+import com.hbm.packet.toclient.ParticleBurstPacket;
 
 import api.hbm.block.IToolable;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

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

@@ -4,8 +4,8 @@ import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.Block;

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

@@ -5,8 +5,8 @@ import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.items.ModItems;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.ContaminationUtil.ContaminationType;
 import com.hbm.util.ContaminationUtil.HazardType;

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

@@ -54,6 +54,7 @@ public class FluidValve extends FluidDuctBase implements ILookOverlay {
 		
 		if(!player.isSneaking()) {
 			int meta = world.getBlockMetadata(x, y, z);
+			TileEntityFluidValve te = (TileEntityFluidValve) world.getTileEntity(x, y, z);
 			if(meta == 0) {
 				world.setBlockMetadataWithNotify(x, y, z, 1, 2);
 				world.playSoundEffect(x, y, z, "hbm:block.reactorStart", 1.0F, 1.0F);
@@ -62,7 +63,6 @@ public class FluidValve extends FluidDuctBase implements ILookOverlay {
 				world.playSoundEffect(x, y, z, "hbm:block.reactorStart", 1.0F, 0.85F);
 			}
 			
-			TileEntityFluidValve te = (TileEntityFluidValve) world.getTileEntity(x, y, z);
 			te.updateState();
 			
 			return true;

src/main/java/com/hbm/entity/item/EntityFallingBlockNT.java

@@ -109,6 +109,7 @@ public class EntityFallingBlockNT extends Entity {
 				int x = MathHelper.floor_double(this.posX);
 				int y = MathHelper.floor_double(this.posY);
 				int z = MathHelper.floor_double(this.posZ);
+				int meta = this.getMeta();
 
 				if(this.fallingTicks == 1) {
 					if(this.worldObj.getBlock(x, y, z) != this.getBlock()) {
@@ -127,10 +128,10 @@ public class EntityFallingBlockNT extends Entity {
 					if(this.worldObj.getBlock(x, y, z) != Blocks.piston_extension) {
 						this.setDead();
 
-						if(!this.destroyOnLand && replacementCheck(x, y, z) && this.worldObj.setBlock(x, y, z, this.getBlock(), this.getMeta(), 3)) {
+						if(!this.destroyOnLand && replacementCheck(x, y, z) && this.worldObj.setBlock(x, y, z, this.getBlock(), meta, 3)) {
 
-							if(this.getBlock() instanceof BlockFalling) ((BlockFalling) this.getBlock()).func_149828_a(this.worldObj, x, y, z, this.getMeta());
+							if(this.getBlock() instanceof BlockFalling) ((BlockFalling) this.getBlock()).func_149828_a(this.worldObj, x, y, z, meta);
-							if(this.getBlock() instanceof BlockFallingNT) ((BlockFallingNT) this.getBlock()).onLand(this.worldObj, x, y, z, this.getMeta());
+							if(this.getBlock() instanceof BlockFallingNT) ((BlockFallingNT) this.getBlock()).onLand(this.worldObj, x, y, z, meta);
 
 							if(this.tileNBT != null && this.getBlock() instanceof ITileEntityProvider) {
 								TileEntity tileentity = this.worldObj.getTileEntity(x, y, z);
@@ -153,13 +154,13 @@ public class EntityFallingBlockNT extends Entity {
 									tileentity.markDirty();
 								}
 							}
-						} else if(this.canDrop && !this.destroyOnLand) {
+						} else if(this.canDrop && !this.destroyOnLand && this.getBlock().getItemDropped(meta, rand, 0) != null) {
-							this.entityDropItem(new ItemStack(this.getBlock(), 1, this.getBlock().damageDropped(this.getMeta())), 0.0F);
+							this.entityDropItem(new ItemStack(this.getBlock().getItemDropped(meta, rand, 0), 1, this.getBlock().damageDropped(meta)), 0.0F);
 						}
 					}
 				} else if(this.fallingTicks > 100 && !this.worldObj.isRemote && (y < 1 || y > 256) || this.fallingTicks > 600) {
-					if(this.canDrop) {
+					if(this.canDrop && this.getBlock().getItemDropped(meta, rand, 0) != null) {
-						this.entityDropItem(new ItemStack(this.getBlock(), 1, this.getBlock().damageDropped(this.getMeta())), 0.0F);
+						this.entityDropItem(new ItemStack(this.getBlock().getItemDropped(meta, rand, 0), 1, this.getBlock().damageDropped(meta)), 0.0F);
 					}
 
 					this.setDead();

src/main/java/com/hbm/entity/item/EntityFireworks.java

@@ -1,7 +1,7 @@
 package com.hbm.entity.item;
 
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.Entity;

src/main/java/com/hbm/entity/item/EntityMagnusCartus.java

@@ -1,8 +1,8 @@
 package com.hbm.entity.item;
 
 import com.hbm.entity.cart.EntityMinecartBogie;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.Entity;

src/main/java/com/hbm/entity/logic/EntityBomber.java

@@ -11,8 +11,8 @@ import com.hbm.explosion.ExplosionChaos;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.LoopedEntitySoundPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.LoopedEntitySoundPacket;
 import com.hbm.util.ParticleUtil;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/entity/logic/EntityDeathBlast.java

@@ -2,8 +2,8 @@ package com.hbm.entity.logic;
 
 import com.hbm.entity.projectile.EntityBulletBaseNT;
 import com.hbm.handler.BulletConfigSyncingUtil;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/entity/logic/EntityEMP.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.ParticleBurstPacket;
+import com.hbm.packet.toclient.ParticleBurstPacket;
 
 import api.hbm.energymk2.IEnergyHandlerMK2;
 import cofh.api.energy.IEnergyProvider;

src/main/java/com/hbm/entity/logic/EntityNukeExplosionMK3.java

@@ -16,8 +16,8 @@ import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.explosion.ExplosionSolinium;
 import com.hbm.interfaces.Spaghetti;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/com/hbm/entity/missile/EntityMissileShuttle.java

@@ -8,8 +8,8 @@ import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.init.Blocks;

src/main/java/com/hbm/entity/mob/EntityCreeperNuclear.java

@@ -9,8 +9,8 @@ import com.hbm.items.ModItems;
 import com.hbm.items.ItemAmmoEnums.AmmoFatman;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.ContaminationUtil.ContaminationType;
 import com.hbm.util.ContaminationUtil.HazardType;

src/main/java/com/hbm/entity/mob/EntityHunterChopper.java

@@ -5,8 +5,8 @@ import com.hbm.entity.projectile.EntityChopperMine;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import api.hbm.entity.IRadiationImmune;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/entity/mob/EntityPigeon.java

@@ -8,8 +8,8 @@ import com.hbm.entity.mob.ai.EntityAIStopFlying;
 import com.hbm.entity.mob.ai.EntityAISwimmingConditional;
 import com.hbm.entity.mob.ai.EntityAIWanderConditional;
 import com.hbm.items.tool.ItemFertilizer;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.Block;

src/main/java/com/hbm/entity/mob/EntityTaintCrab.java

@@ -6,8 +6,8 @@ import java.util.List;
 import com.hbm.entity.projectile.EntityBulletBaseNT;
 import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.items.ModItems;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
 import com.hbm.tileentity.machine.TileEntityTesla;
 

src/main/java/com/hbm/entity/mob/EntityUFO.java

@@ -9,8 +9,8 @@ import com.hbm.handler.BulletConfigSyncingUtil;
 import com.hbm.items.ModItems;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.ContaminationUtil.ContaminationType;
 import com.hbm.util.ContaminationUtil.HazardType;

src/main/java/com/hbm/entity/mob/glyphid/EntityGlyphid.java

@@ -15,8 +15,8 @@ import com.hbm.handler.pollution.PollutionHandler;
 import com.hbm.handler.pollution.PollutionHandler.PollutionType;
 import com.hbm.items.ModItems;
 import com.hbm.main.ResourceManager;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.Block;

src/main/java/com/hbm/entity/mob/glyphid/EntityGlyphidNuclear.java

@@ -11,8 +11,8 @@ import com.hbm.explosion.vanillant.standard.EntityProcessorStandard;
 import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
 import com.hbm.main.MainRegistry;
 import com.hbm.main.ResourceManager;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.entity.Entity;

src/main/java/com/hbm/entity/mob/siege/EntitySiegeCraft.java

@@ -5,8 +5,8 @@ import java.util.List;
 import com.hbm.entity.mob.EntityUFOBase;
 import com.hbm.entity.projectile.EntitySiegeLaser;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.ContaminationUtil.ContaminationType;
 import com.hbm.util.ContaminationUtil.HazardType;

src/main/java/com/hbm/entity/projectile/EntityBombletZeta.java

@@ -4,8 +4,8 @@ import com.hbm.config.BombConfig;
 import com.hbm.entity.logic.EntityNukeExplosionMK5;
 import com.hbm.explosion.ExplosionChaos;
 import com.hbm.explosion.ExplosionLarge;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/entity/projectile/EntityBulletBaseNT.java

@@ -25,8 +25,8 @@ import com.hbm.handler.BulletConfiguration;
 import com.hbm.handler.GunConfiguration;
 import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
 import com.hbm.util.ArmorUtil;
 import com.hbm.util.BobMathUtil;

src/main/java/com/hbm/entity/projectile/EntityCog.java

@@ -2,8 +2,8 @@ package com.hbm.entity.projectile;
 
 import com.hbm.items.ModItems;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/entity/projectile/EntityRubble.java

@@ -2,7 +2,7 @@ package com.hbm.entity.projectile;
 
 import com.hbm.lib.ModDamageSource;
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.ParticleBurstPacket;
+import com.hbm.packet.toclient.ParticleBurstPacket;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.Block;

src/main/java/com/hbm/entity/projectile/EntitySawblade.java

@@ -2,8 +2,8 @@ package com.hbm.entity.projectile;
 
 import com.hbm.items.ModItems;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/explosion/ExplosionChaos.java

@@ -70,29 +70,6 @@ public class ExplosionChaos {
 		}
 	}
 
-	public static void antiCheat(World world, int x, int y, int z, int bombStartStrength) {
-
-		int r = bombStartStrength;
-		int r2 = r * r;
-		int r22 = r2 / 2;
-		for (int xx = -r; xx < r; xx++) {
-			int X = xx + x;
-			int XX = xx * xx;
-			for (int yy = -r; yy < r; yy++) {
-				int Y = yy + y;
-				int YY = XX + yy * yy;
-				for (int zz = -r; zz < r; zz++) {
-					int Z = zz + z;
-					int ZZ = YY + zz * zz;
-					if (ZZ < r22) {
-						if (rand.nextInt(15) == 0 && world.getBlock(X, Y, Z) != Blocks.air)
-							world.setBlock(X, Y, Z, ModBlocks.cheater_virus);
-					}
-				}
-			}
-		}
-	}
-
 	public static void hardenVirus(World world, int x, int y, int z, int bombStartStrength) {
 
 		int r = bombStartStrength;
@@ -405,7 +382,6 @@ public class ExplosionChaos {
 	}
 
 	public static void pDestruction(World world, int x, int y, int z) {
-
 		EntityFallingBlockNT entityfallingblock = new EntityFallingBlockNT(world, (double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), world.getBlock(x, y, z), world.getBlockMetadata(x, y, z));
 		world.spawnEntityInWorld(entityfallingblock);
 	}

src/main/java/com/hbm/explosion/ExplosionLarge.java

@@ -5,8 +5,8 @@ import java.util.Random;
 
 import com.hbm.entity.projectile.EntityRubble;
 import com.hbm.entity.projectile.EntityShrapnel;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.ParticleUtil;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/explosion/ExplosionNukeSmall.java

@@ -5,8 +5,9 @@ import com.hbm.entity.logic.EntityNukeExplosionMK5;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
 import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;

src/main/java/com/hbm/explosion/vanillant/standard/ExplosionEffectAmat.java

@@ -2,8 +2,8 @@ package com.hbm.explosion.vanillant.standard;
 
 import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.interfaces.IExplosionSFX;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/com/hbm/explosion/vanillant/standard/ExplosionEffectStandard.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.interfaces.IExplosionSFX;
-import com.hbm.packet.ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.util.MathHelper;

src/main/java/com/hbm/explosion/vanillant/standard/PlayerProcessorStandard.java

@@ -5,8 +5,8 @@ import java.util.Map.Entry;
 
 import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.interfaces.IPlayerProcessor;
-import com.hbm.packet.ExplosionKnockbackPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.ExplosionKnockbackPacket;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;

src/main/java/com/hbm/extprop/HbmLivingProps.java

@@ -8,9 +8,9 @@ import com.hbm.config.RadiationConfig;
 import com.hbm.entity.mob.EntityDuck;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.PlayerInformPacket;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.packet.toclient.PlayerInformPacket;
 import com.hbm.util.ChatBuilder;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/handler/BossSpawnHandler.java

@@ -245,8 +245,9 @@ public class BossSpawnHandler {
 		Vec3 vec;
 		if(repell) {
 			vec = Vec3.createVectorHelper(meteor.posX - player.posX, 0, meteor.posZ - player.posZ).normalize();
-			vec.xCoord = vec.xCoord * meteorRand.nextDouble() - 0.5D;
+			double vel = meteorRand.nextDouble();
-			vec.zCoord = vec.zCoord * meteorRand.nextDouble() - 0.5D;
+			vec.xCoord = vec.xCoord * vel;
+			vec.zCoord = vec.zCoord * vel;
 			meteor.safe = true;
 		} else {
 			vec = Vec3.createVectorHelper(meteorRand.nextDouble() - 0.5D, 0, 0);

src/main/java/com/hbm/handler/EntityEffectHandler.java

@@ -20,10 +20,10 @@ import com.hbm.interfaces.IArmorModDash;
 import com.hbm.items.armor.ArmorFSB;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.packet.toclient.ExtPropPacket;
 import com.hbm.potion.HbmPotion;
-import com.hbm.packet.ExtPropPacket;
 import com.hbm.saveddata.AuxSavedData;
 import com.hbm.util.ArmorRegistry;
 import com.hbm.util.ArmorUtil;

src/main/java/com/hbm/handler/HbmKeybinds.java

@@ -1,13 +1,14 @@
 package com.hbm.handler;
 
 import com.hbm.inventory.gui.GUICalculator;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import org.lwjgl.input.Keyboard;
 
 import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.KeybindPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.KeybindPacket;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -21,10 +22,14 @@ public class HbmKeybinds {
 	public static KeyBinding calculatorKey = new KeyBinding(category + ".calculator", Keyboard.KEY_N, category);
 	public static KeyBinding jetpackKey = new KeyBinding(category + ".toggleBack", Keyboard.KEY_C, category);
 	public static KeyBinding hudKey = new KeyBinding(category + ".toggleHUD", Keyboard.KEY_V, category);
-	public static KeyBinding reloadKey = new KeyBinding(category + ".reload", Keyboard.KEY_R, category);
 	public static KeyBinding dashKey = new KeyBinding(category + ".dash", Keyboard.KEY_LSHIFT, category);
 	public static KeyBinding trainKey = new KeyBinding(category + ".trainInv", Keyboard.KEY_R, category);
 
+	public static KeyBinding reloadKey = new KeyBinding(category + ".reload", Keyboard.KEY_R, category);
+	public static KeyBinding gunPrimaryKey = new KeyBinding(category + ".gunPrimary", -100, category);
+	public static KeyBinding gunSecondaryKey = new KeyBinding(category + ".gunSecondary", -99, category);
+	public static KeyBinding gunTertiaryKey = new KeyBinding(category + ".gunTertitary", -98, category);
+
 	public static KeyBinding craneUpKey = new KeyBinding(category + ".craneMoveUp", Keyboard.KEY_UP, category);
 	public static KeyBinding craneDownKey = new KeyBinding(category + ".craneMoveDown", Keyboard.KEY_DOWN, category);
 	public static KeyBinding craneLeftKey = new KeyBinding(category + ".craneMoveLeft", Keyboard.KEY_LEFT, category);
@@ -35,10 +40,14 @@ public class HbmKeybinds {
 		ClientRegistry.registerKeyBinding(calculatorKey);
 		ClientRegistry.registerKeyBinding(jetpackKey);
 		ClientRegistry.registerKeyBinding(hudKey);
-		ClientRegistry.registerKeyBinding(reloadKey);
 		ClientRegistry.registerKeyBinding(dashKey);
 		ClientRegistry.registerKeyBinding(trainKey);
 
+		ClientRegistry.registerKeyBinding(reloadKey);
+		ClientRegistry.registerKeyBinding(gunPrimaryKey);
+		ClientRegistry.registerKeyBinding(gunSecondaryKey);
+		ClientRegistry.registerKeyBinding(gunTertiaryKey);
+
 		ClientRegistry.registerKeyBinding(craneUpKey);
 		ClientRegistry.registerKeyBinding(craneDownKey);
 		ClientRegistry.registerKeyBinding(craneLeftKey);
@@ -69,13 +78,17 @@ public class HbmKeybinds {
 		JETPACK,
 		TOGGLE_JETPACK,
 		TOGGLE_HEAD,
-		RELOAD,
 		DASH,
 		TRAIN,
 		CRANE_UP,
 		CRANE_DOWN,
 		CRANE_LEFT,
 		CRANE_RIGHT,
-		CRANE_LOAD
+		CRANE_LOAD,
+
+		GUN_PRIMARY,
+		GUN_SECONDARY,
+		GUN_TERTIARY,
+		RELOAD,
 	}
 }

src/main/java/com/hbm/handler/HbmKeybindsServer.java

@@ -0,0 +1,25 @@
+package com.hbm.handler;
+
+import com.hbm.extprop.HbmPlayerProps;
+import com.hbm.handler.HbmKeybinds.EnumKeybind;
+import com.hbm.items.IKeybindReceiver;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+public class HbmKeybindsServer {
+	
+	/** Can't put this in HbmKeybinds because it's littered with clientonly stuff */
+	public static void onPressedServer(EntityPlayer player, EnumKeybind key, boolean state) {
+		
+		// EXTPROP HANDLING
+		HbmPlayerProps props = HbmPlayerProps.getData(player);
+		props.setKeyPressed(key, state);
+		
+		// ITEM HANDLING
+		ItemStack held = player.getHeldItem();
+		if(held != null && held.getItem() instanceof IKeybindReceiver) {
+			((IKeybindReceiver) held.getItem()).handleKeybind(player, held, key, state);
+		}
+	}
+}

src/main/java/com/hbm/handler/WeaponAbility.java

@@ -4,8 +4,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockBobble.BobbleType;
 import com.hbm.items.ModItems;
 import com.hbm.items.tool.IItemAbility;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
 import com.hbm.util.ContaminationUtil;
 

src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java

@@ -14,8 +14,8 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ItemAmmoEnums.*;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
 import com.hbm.util.ArmorRegistry;
 import com.hbm.util.ArmorRegistry.HazardClass;

src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java

@@ -11,8 +11,8 @@ import com.hbm.items.ModItems;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.ResourceManager;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;

src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java

@@ -17,8 +17,8 @@ import com.hbm.lib.HbmCollection;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.ResourceManager;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;

src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java

@@ -19,8 +19,8 @@ import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.ResourceManager;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;

src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java

@@ -14,8 +14,8 @@ import com.hbm.items.ItemAmmoEnums.AmmoLunaticSniper;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.RefStrings;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;

src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java

@@ -12,8 +12,8 @@ import com.hbm.items.ItemAmmoEnums.Ammo556mm;
 import com.hbm.items.ModItems;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.potion.HbmPotion;

src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java

@@ -10,8 +10,8 @@ import com.hbm.items.ModItems;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.lib.ModDamageSource;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.potion.HbmPotion;
 import com.hbm.render.anim.BusAnimation;
 import com.hbm.render.anim.BusAnimationSequence;

src/main/java/com/hbm/handler/guncfg/GunDetonatorFactory.java

@@ -11,7 +11,7 @@ import com.hbm.main.MainRegistry;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.packet.PacketDispatcher;
-import com.hbm.packet.PlayerInformPacket;
+import com.hbm.packet.toclient.PlayerInformPacket;
 import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.util.ChatBuilder;
 

src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java

@@ -19,9 +19,9 @@ import com.hbm.items.ModItems;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
-import com.hbm.packet.ExplosionKnockbackPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.packet.toclient.ExplosionKnockbackPacket;
 import com.hbm.potion.HbmPotion;
 import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 import com.hbm.tileentity.IRepairable;

src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java

@@ -17,8 +17,8 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
 import com.hbm.items.ItemAmmoEnums.AmmoFatman;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.render.util.RenderScreenOverlay.Crosshair;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java

@@ -12,8 +12,8 @@ import com.hbm.items.ItemAmmoEnums.AmmoGrenade;
 import com.hbm.lib.HbmCollection;
 import com.hbm.lib.HbmCollection.EnumGunManufacturer;
 import com.hbm.main.ResourceManager;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.particle.SpentCasing;
 import com.hbm.particle.SpentCasing.CasingType;
 import com.hbm.render.anim.HbmAnimations.AnimType;

src/main/java/com/hbm/handler/guncfg/GunNPCFactory.java

@@ -12,8 +12,8 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.main.MainRegistry;
-import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.BobMathUtil;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;

src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java

@@ -5,8 +5,8 @@ import java.util.Map.Entry;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.config.RadiationConfig;
-import com.hbm.packet.AuxParticlePacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacket;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.material.Material;

src/main/java/com/hbm/hazard/type/HazardTypeHydroactive.java

@@ -6,6 +6,7 @@ import com.hbm.config.RadiationConfig;
 import com.hbm.hazard.modifier.HazardModifier;
 import com.hbm.util.I18nUtil;
 
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -32,7 +33,7 @@ public class HazardTypeHydroactive extends HazardTypeBase {
 		if(RadiationConfig.disableHydro)
 			return;
 		
-		if(item.isWet()) {
+		if(item.isWet() || item.worldObj.getBlock((int) Math.floor(item.posX), (int) Math.floor(item.posY), (int) Math.floor(item.posZ)).getMaterial() == Material.water) {
 			item.setDead();
 			item.worldObj.newExplosion(null, item.posX, item.posY + item.height * 0.5, item.posZ, level, false, true);
 		}

src/main/java/com/hbm/inventory/RecipesCommon.java

@@ -116,10 +116,17 @@ public class RecipesCommon {
 				this.stacksize = 1;
 				return;
 			}
-			this.item = stack.getItem();
+			try {
-			if(this.item == null) this.item = ModItems.nothing; //i'm going to bash some fuckard's head in
+				this.item = stack.getItem();
-			this.stacksize = stack.stackSize;
+				if(this.item == null) this.item = ModItems.nothing; //i'm going to bash some fuckard's head in
-			this.meta = stack.getItemDamage();
+				this.stacksize = stack.stackSize;
+				this.meta = stack.getItemDamage();
+			} catch(Exception ex) {
+				this.item = ModItems.nothing;
+				if(!GeneralConfig.enableSilentCompStackErrors) {
+					ex.printStackTrace();
+				}
+			}
 		}
 		
 		public ComparableStack makeSingular() {

src/main/java/com/hbm/inventory/gui/GUIAnvil.java

@@ -17,8 +17,8 @@ import com.hbm.inventory.recipes.anvil.AnvilRecipes;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilConstructionRecipe;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AnvilCraftPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AnvilCraftPacket;
 
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;

src/main/java/com/hbm/inventory/gui/GUIBarrel.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerBarrel;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.storage.TileEntityBarrel;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICombustionEngine.java

@@ -9,8 +9,8 @@ import com.hbm.inventory.fluid.trait.FT_Combustible;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemPistons.EnumPistonType;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineCombustionEngine;
 import com.hbm.util.EnumUtil;
 

src/main/java/com/hbm/inventory/gui/GUICompressor.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCompressor;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineCompressor;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java

@@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCoreEmitter;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityCoreEmitter;
 import com.hbm.util.BobMathUtil;
 

src/main/java/com/hbm/inventory/gui/GUICoreStabilizer.java

@@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCoreStabilizer;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityCoreStabilizer;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICounterTorch.java

@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCounterTorch;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityRadioTorchCounter;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUICraneBoxer.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCraneBoxer;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityCraneBoxer;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICraneExtractor.java

@@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCraneExtractor;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityCraneExtractor;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICraneGrabber.java

@@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerCraneGrabber;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityCraneGrabber;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUICraneRouter.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 import com.hbm.inventory.container.ContainerCraneRouter;
 import com.hbm.lib.RefStrings;
 import com.hbm.module.ModulePatternMatcher;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityCraneRouter;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIDroneCrate.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerDroneCrate;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.network.TileEntityDroneCrate;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIElectrolyserFluid.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerElectrolyserFluid;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityElectrolyser;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIElectrolyserMetal.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 import com.hbm.inventory.container.ContainerElectrolyserMetal;
 import com.hbm.inventory.material.Mats;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityElectrolyser;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUIFEL.java

@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 import com.hbm.inventory.container.ContainerFEL;
 import com.hbm.items.machine.ItemFELCrystal.EnumWavelengths;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityFEL;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIForceField.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerForceField;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityForceField;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIFunnel.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerFunnel;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineFunnel;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIHadron.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerHadron;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityHadron;
 import com.hbm.tileentity.machine.TileEntityHadron.EnumHadronState;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIHeaterHeatex.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerHeaterHeatex;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityHeaterHeatex;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIITER.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerITER;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.TileEntityITER;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUILaunchPadRusted.java

@@ -10,8 +10,8 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.container.ContainerLaunchPadRusted;
 import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.render.item.ItemRenderMissileGeneric;
 import com.hbm.tileentity.bomb.TileEntityLaunchPadRusted;
 

src/main/java/com/hbm/inventory/gui/GUIMachineArcFurnaceLarge.java

@@ -11,8 +11,8 @@ import com.hbm.inventory.container.ContainerMachineArcFurnaceLarge;
 import com.hbm.inventory.material.Mats;
 import com.hbm.inventory.material.Mats.MaterialStack;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineArcFurnaceLarge;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java

@@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineBattery;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.storage.TileEntityMachineBattery;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIMachineExcavator.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineExcavator;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineExcavator;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineFluidTank;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIMachineGasFlare.java

@@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL11;
 import com.hbm.inventory.container.ContainerMachineGasFlare;
 import com.hbm.inventory.fluid.trait.FT_Flammable;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.oil.TileEntityMachineGasFlare;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java

@@ -6,8 +6,8 @@ import com.hbm.inventory.container.ContainerLaunchTable;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemCustomMissilePart.PartSize;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.render.util.MissileMultipart;
 import com.hbm.render.util.MissilePronter;
 import com.hbm.tileentity.bomb.TileEntityLaunchTable;

src/main/java/com/hbm/inventory/gui/GUIMachineMissileAssembly.java

@@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineMissileAssembly;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.AuxButtonPacket;
 import com.hbm.render.util.MissileMultipart;
 import com.hbm.render.util.MissilePart;
 import com.hbm.render.util.MissilePronter;

src/main/java/com/hbm/inventory/gui/GUIMachineRadarNT.java

@@ -5,8 +5,8 @@ import java.util.Arrays;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineRadarNT;
 import com.hbm.util.BobMathUtil;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIMachineTurbineGas.java

@@ -11,8 +11,8 @@ import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.fluid.trait.FT_Combustible;
 import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineTurbineGas;
 import com.hbm.util.I18nUtil;
 

src/main/java/com/hbm/inventory/gui/GUIMachineWoodBurner.java

@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMachineWoodBurner;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.TileEntityMachineWoodBurner;
 
 import net.minecraft.client.Minecraft;

src/main/java/com/hbm/inventory/gui/GUIMassStorage.java

@@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerMassStorage;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toserver.NBTControlPacket;
 import com.hbm.tileentity.machine.storage.TileEntityMassStorage;
 
 import net.minecraft.client.Minecraft;