New gun, dusts and more

assets/hbm/lang/de_DE.lang

@@ -288,6 +288,18 @@ item.powder_titanium.name=Titanstaub
 item.powder_tungsten.name=Wolframstaub
 item.powder_uranium.name=Uranstaub
 item.dust.name=Staub
+item.powder_coal.name=Kohlestaub
+item.powder_lapis.name=Lapis Lazuli-Staub
+item.powder_emerald.name=Smaragdstaub
+item.powder_diamond.name=Diamantstaub
+item.powder_red_copper.name=Roter Kupfer Staub
+item.powder_steel.name=Stahlstaub
+item.powder_magnetized_tungsten.name=Magnetisierter Wolframstaub
+item.powder_combine_steel.name=CMB-Stahlstaustaub
+item.powder_lithium.name=Lithiumstaub
+item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub
+item.powder_quartz.name=Quarzstaub
+item.powder_power.name=Energiepulver
 
 item.battery_generic.name=Batterie
 item.battery_advanced.name=Fortgeschrittene Batterie
@@ -323,6 +335,9 @@ item.cell_sas3.name=Schrabidiumtrisulfat-Zelle
 item.cell_anti_schrabidium.name=Antischrabidiumzelle
 item.singularity.name=Singularität
 item.singularity_counter_resonant.name=Eingefasste nicht-resonante Singularität
+item.singularity_super_heated.name=Supererhitzte resonante Singularität
+item.black_hole.name=Miniatur Schwarzes Loch
+item.crystal_xen.name=Künstlicher Xen-Kristall
 
 item.inf_water.name=Unendlicher Wassertank
 item.inf_deuterium.name=Unendlicher Deuteriumtank
@@ -451,6 +466,7 @@ item.grenade_plasma.name=Plasmagranate
 item.grenade_tau.name=Taugranate
 item.grenade_schrabidium.name=Schrabidiumgranate
 item.grenade_lemon.name=Zitronengranate
+item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas"
 item.grenade_nuke.name=Mark VI Bohrgranate
 item.grenade_nuclear.name=Nuka-Granate
 
@@ -514,16 +530,20 @@ tile.steel_scaffold.name=Stahlgerüst
 item.gun_revolver_iron.name=Einfacher Revolver
 item.gun_revolver.name=Verbesserter Revolver
 item.gun_revolver_gold.name=Goldener Revolver
+item.gun_revolver_lead.name=Nuka-Revolver
 item.gun_revolver_schrabidium.name=Schrabidiumrevolver
 item.gun_revolver_cursed.name=Verfluchte Pistole
 item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
 item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp
 item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte
 item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone"
+item.gun_super_shotgun.name=Super Shotgun
+item.gun_moist_nugget.name=Moisn-Nagant
 
 item.gun_revolver_iron_ammo.name=Patrone
 item.gun_revolver_ammo.name=Bleipatrone
 item.gun_revolver_gold_ammo.name=Goldene Kugel
+item.gun_revolver_lead_ammo.name=Mit Glas umhüllte Atompatrone
 item.gun_revolver_schrabidium_ammo.name=Schrabidiumpatrone
 item.gun_revolver_cursed_ammo.name=Stahlpatrone
 item.gun_fatman_ammo.name=Miniatombombe
@@ -724,6 +744,7 @@ item.matchstick.name=Streichholz
 
 item.redcoil_capacitor.name=Rotspulenkondensator
 item.detonator.name=Fernzünder
+item.crate_caller.name=Nachschub-Requester
 
 item.ingot_hes.name=Stark angereicherter Schrabidiumkernbrennstoffbarren
 item.ingot_les.name=Schwach angereicherter Schrabidiumkernbrennstoffbarren

assets/hbm/lang/en_US.lang

@@ -288,6 +288,18 @@ item.powder_titanium.name=Titanium Powder
 item.powder_tungsten.name=Tungsten Powder
 item.powder_uranium.name=Uranium Powder
 item.dust.name=Dust
+item.powder_coal.name=Coal Powder
+item.powder_lapis.name=Lapis Lazuli Powder
+item.powder_emerald.name=Emerald Powder
+item.powder_diamond.name=Diamond Powder
+item.powder_red_copper.name=Red Copper Powder
+item.powder_steel.name=Steel Powder
+item.powder_magnetized_tungsten.name=Magnetized Tungsten Powder
+item.powder_combine_steel.name=CMB Steel Powder
+item.powder_lithium.name=Lithium Powder
+item.powder_advanced_alloy.name=Advanced Alloy Powder
+item.powder_quartz.name=Quartz Powder
+item.powder_power.name=Energy Powder
 
 item.battery_generic.name=Battery
 item.battery_advanced.name=Advanced Battery
@@ -323,6 +335,9 @@ item.cell_sas3.name=Schrabidium Trisulfide Cell
 item.cell_anti_schrabidium.name=Antischrabidium Cell
 item.singularity.name=Singularity
 item.singularity_counter_resonant.name=Contained Counter-Resonant Singularity
+item.singularity_super_heated.name=Superheated Resonating Singularity
+item.black_hole.name=Miniature Black Hole
+item.crystal_xen.name=Artificial Xen Crystal
 
 item.inf_water.name=Infinite Water Tank
 item.inf_deuterium.name=Infinite Deuterium Tank
@@ -451,6 +466,7 @@ item.grenade_plasma.name=Plasma Grenade
 item.grenade_tau.name=Tau Grenade
 item.grenade_schrabidium.name=Schrabidium Grenade
 item.grenade_lemon.name=Combustible Lemon
+item.grenade_mk2.name=Mk 2 Grenade "Ambassador Pineapple"
 item.grenade_nuke.name=Mark VI Drill Grenade
 item.grenade_nuclear.name=Nuka Grenade
 
@@ -514,16 +530,20 @@ tile.steel_scaffold.name=Steel Scaffold
 item.gun_revolver_iron.name=Simple Revolver
 item.gun_revolver.name=Enhanced Revolver
 item.gun_revolver_gold.name=Golden Revolver
+item.gun_revolver_lead.name=Nuka Revolver
 item.gun_revolver_schrabidium.name=Schrabidium Revolver
 item.gun_revolver_cursed.name=Cursed Revolver
 item.gun_fatman.name=M42 Nuclear Catapult "Fat Man"
 item.gun_xvl1456.name=XVL1456 Tau Cannon Prototype
 item.gun_osipr.name=Overwatch Standard Issue Pulse Rifle
 item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon"
+item.gun_super_shotgun.name=Super Shotgun
+item.gun_moist_nugget.name=Moisn-Nagant
 
 item.gun_revolver_iron_ammo.name=Bullet
 item.gun_revolver_ammo.name=Lead Bullet
 item.gun_revolver_gold_ammo.name=Golden Bullet
+item.gun_revolver_lead_ammo.name=Glass Covered Nuclear Bullet
 item.gun_revolver_schrabidium_ammo.name=Schrabidium Bullet
 item.gun_revolver_cursed_ammo.name=Steel Bullet
 item.gun_fatman_ammo.name=Mini Nuke
@@ -724,6 +744,7 @@ item.matchstick.name=Matchstick
 
 item.redcoil_capacitor.name=Redcoil Capacitor
 item.detonator.name=Detonator
+item.crate_caller.name=Supply Drop Requester
 
 item.ingot_hes.name=Highly Enriched Schrabidium Fuel Ingot
 item.ingot_les.name=Low Enriched Schrabidium Fuel Ingot

com/hbm/blocks/BlockCable.java

@@ -1,5 +1,7 @@
 package com.hbm.blocks;
 
+import com.hbm.tileentity.TileEntityCable;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;

com/hbm/blocks/BlockConverterHeRf.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityConverterHeRf;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.BlockContainer;

com/hbm/blocks/BlockConverterRfHe.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityConverterRfHe;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.BlockContainer;

com/hbm/blocks/BlockCrashedBomb.java

@@ -9,6 +9,7 @@ import com.hbm.explosion.ExplosionParticleB;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityCrashedBomb;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/BlockCrate.java

@@ -7,6 +7,7 @@ import java.util.Random;
 import com.hbm.items.ModItems;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockFalling;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -16,9 +17,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
 
-public class Crate extends Block {
+public class BlockCrate extends BlockFalling {
 
-	protected Crate(Material p_i45394_1_) {
+	protected BlockCrate(Material p_i45394_1_) {
 		super(p_i45394_1_);
 	}
 
@@ -41,7 +42,7 @@ public class Crate extends Block {
 			}
     	}
     	
-    	return false;
+    	return true;
     }
     
     public void dropItems(World world, int x, int y, int z) {
@@ -133,6 +134,7 @@ public class Crate extends Block {
     		list.add(ModItems.clip_rpg);
     		list.add(ModItems.clip_revolver_iron);
     		list.add(ModItems.syringe_metal_stimpak);
+    		break;
     	case 20:
     		list.add(ModItems.clip_rpg);
     		list.add(ModItems.clip_revolver);

com/hbm/blocks/BombMulti.java

@@ -24,6 +24,7 @@ import com.hbm.explosion.ExplosionChaos;
 import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityBombMulti;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 

com/hbm/blocks/DecoBlock.java

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

com/hbm/blocks/DecoBlockAlt.java

@@ -4,6 +4,10 @@ import java.util.Random;
 
 import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityDecoBlockAlt;
+import com.hbm.tileentity.TileEntityDecoBlockAltF;
+import com.hbm.tileentity.TileEntityDecoBlockAltG;
+import com.hbm.tileentity.TileEntityDecoBlockAltW;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/DecoPoleSatelliteReceiver.java

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

com/hbm/blocks/DecoPoleTop.java

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

com/hbm/blocks/DecoSteelPoles.java

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

com/hbm/blocks/DecoTapeRecorder.java

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

com/hbm/blocks/FactoryCoreAdvanced.java

@@ -2,6 +2,8 @@ package com.hbm.blocks;
 
 import java.util.Random;
 
+import com.hbm.tileentity.TileEntityCoreAdvanced;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

com/hbm/blocks/FactoryCoreTitanium.java

@@ -2,6 +2,8 @@ package com.hbm.blocks;
 
 import java.util.Random;
 
+import com.hbm.tileentity.TileEntityCoreTitanium;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

com/hbm/blocks/FactoryHatch.java

@@ -4,6 +4,8 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityCoreAdvanced;
+import com.hbm.tileentity.TileEntityCoreTitanium;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/FusionCore.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityFusionMultiblock;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/FusionHatch.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityFusionMultiblock;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/LaunchPad.java

@@ -22,6 +22,7 @@ import com.hbm.entity.EntityMissileStrong;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityLaunchPad;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineBattery.java

@@ -4,6 +4,8 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityDiFurnace;
+import com.hbm.tileentity.TileEntityMachineBattery;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineCMBFactory.java

@@ -0,0 +1,145 @@
+package com.hbm.blocks;
+
+import java.util.Random;
+
+import com.hbm.lib.RefStrings;
+import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineCMBFactory;
+import com.hbm.tileentity.TileEntityMachineDiesel;
+
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class MachineCMBFactory extends BlockContainer {
+
+    private final Random field_149933_a = new Random();
+	private Random rand;
+	private static boolean keepInventory;
+	
+	@SideOnly(Side.CLIENT)
+	private IIcon iconBottom;
+	private IIcon iconTop;
+	private IIcon iconSide;
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_bottom");
+		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_top");
+		this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_side");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_front");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		if(side == 0)
+			return iconBottom;
+		if(side == 1)
+			return iconTop;
+		if(side == 2 || side == 3)
+			return blockIcon;
+		if(side == 4 || side == 5)
+			return iconSide;
+		
+		return null;
+	}
+	
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+    {
+        return Item.getItemFromBlock(ModBlocks.machine_combine_factory);
+    }
+
+	protected MachineCMBFactory(Material p_i45386_1_) {
+		super(p_i45386_1_);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityMachineCMBFactory();
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			return true;
+		} else if(!player.isSneaking())
+		{
+			TileEntityMachineCMBFactory entity = (TileEntityMachineCMBFactory) world.getTileEntity(x, y, z);
+			if(entity != null)
+			{
+				FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_combine_factory, world, x, y, z);
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	@Override
+	public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
+    {
+        if (!keepInventory)
+        {
+        	TileEntityMachineCMBFactory tileentityfurnace = (TileEntityMachineCMBFactory)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
+
+            if (tileentityfurnace != null)
+            {
+                for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1)
+                {
+                    ItemStack itemstack = tileentityfurnace.getStackInSlot(i1);
+
+                    if (itemstack != null)
+                    {
+                        float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+                        float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+                        float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F;
+
+                        while (itemstack.stackSize > 0)
+                        {
+                            int j1 = this.field_149933_a.nextInt(21) + 10;
+
+                            if (j1 > itemstack.stackSize)
+                            {
+                                j1 = itemstack.stackSize;
+                            }
+
+                            itemstack.stackSize -= j1;
+                            EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
+
+                            if (itemstack.hasTagCompound())
+                            {
+                                entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy());
+                            }
+
+                            float f3 = 0.05F;
+                            entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3;
+                            entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F;
+                            entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3;
+                            p_149749_1_.spawnEntityInWorld(entityitem);
+                        }
+                    }
+                }
+
+                p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_);
+            }
+        }
+
+        super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
+    }
+}

com/hbm/blocks/MachineCentrifuge.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineCentrifuge;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineCoal.java

@@ -19,6 +19,7 @@ import net.minecraft.world.World;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineCoal;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineDeuterium.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineDeuterium;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineDiFurnace.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityDiFurnace;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineDiesel.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineDiesel;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineElectricFurnace.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineElectricFurnace;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineGenerator.java

@@ -5,6 +5,7 @@ import java.util.Random;
 import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineGenerator;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineNukeFurnace.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeFurnace;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachinePuF6Tank.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachinePuF6Tank;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineReactor.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineReactor;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineRtgFurnace.java

@@ -19,6 +19,7 @@ import net.minecraft.world.World;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityRtgFurnace;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineSchrabidiumTransmutator.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/MachineShredder.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineShredder;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -35,10 +36,10 @@ public class MachineShredder extends BlockContainer {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconRegister) {
-		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom");
-		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top");
-		this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side");
-		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front");
+		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom_alt");
+		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top_alt");
+		this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side_alt");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front_alt");
 	}
 	
 	@Override

com/hbm/blocks/MachineUF6Tank.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityMachineUF6Tank;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/ModBlocks.java

@@ -249,6 +249,9 @@ public class ModBlocks {
 	public static Block machine_shredder;
 	public static final int guiID_machine_shredder = 34;
 
+	public static Block machine_combine_factory;
+	public static final int guiID_combine_factory = 35;
+
 	public static Block launch_pad;
 	public static Block launch_pad_generic;
 	public static Block launch_pad_incendiary;
@@ -419,6 +422,8 @@ public class ModBlocks {
 
 		machine_shredder = new MachineShredder(Material.iron).setBlockName("machine_shredder").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
 
+		machine_combine_factory = new MachineCMBFactory(Material.iron).setBlockName("machine_combine_factory").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
+
 		red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":red_wire_coated");
 		red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":red_cable_icon");
 
@@ -485,7 +490,7 @@ public class ModBlocks {
 		
 		book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke);
 		
-		crate = new Crate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate");
+		crate = new BlockCrate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate");
 
 		machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock);
 

com/hbm/blocks/NukeBoy.java

@@ -6,6 +6,7 @@ import com.hbm.entity.EntityNukeCloudSmall;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeBoy;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/NukeFleija.java

@@ -4,9 +4,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
+import com.hbm.entity.EntityCloudFleija;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeFleija;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;
@@ -149,6 +151,12 @@ public class NukeFleija extends BlockContainer implements IBomb {
     		entity.waste = false;
     	
     		world.spawnEntityInWorld(entity);
+    		
+    		EntityCloudFleija cloud = new EntityCloudFleija(world, r);
+    		cloud.posX = x;
+    		cloud.posY = y;
+    		cloud.posZ = z;
+    		world.spawnEntityInWorld(cloud);
     	}
     	
 		return false;

com/hbm/blocks/NukeGadget.java

@@ -8,6 +8,7 @@ import com.hbm.entity.EntityNukeCloudSmall;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeGadget;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/NukeMan.java

@@ -8,6 +8,7 @@ import com.hbm.entity.EntityNukeCloudSmall;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeMan;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/NukeMike.java

@@ -9,6 +9,7 @@ import com.hbm.entity.EntityNukeCloudSmall;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeMike;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/NukePrototype.java

@@ -4,10 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
+import com.hbm.entity.EntityCloudFleija;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukePrototype;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;
@@ -160,6 +162,12 @@ public class NukePrototype extends BlockContainer implements IBomb {
     		entity.waste = false;
     	
     		world.spawnEntityInWorld(entity);
+    		
+    		EntityCloudFleija cloud = new EntityCloudFleija(world, r);
+    		cloud.posX = x;
+    		cloud.posY = y;
+    		cloud.posZ = z;
+    		world.spawnEntityInWorld(cloud);
     	}
     	
 		return false;

com/hbm/blocks/NukeTsar.java

@@ -7,6 +7,7 @@ import java.util.Random;
 import com.hbm.entity.EntityNukeExplosionAdvanced;
 import com.hbm.interfaces.IBomb;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityNukeTsar;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/ReactorCore.java

@@ -3,6 +3,7 @@ package com.hbm.blocks;
 import java.util.Random;
 
 import com.hbm.explosion.ExplosionNukeGeneric;
+import com.hbm.tileentity.TileEntityReactorMultiblock;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;

com/hbm/blocks/ReactorHatch.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityReactorMultiblock;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/RedBarrel.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityRedBarrel;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/TestBombAdvanced.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityTestBombAdvanced;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/TestContainer.java

@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.Random;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityTestContainer;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/TestMissile.java

@@ -1,6 +1,8 @@
 package com.hbm.blocks;
 
 import com.hbm.entity.EntityTestMissile;
+import com.hbm.tileentity.TileEntityTestNuke;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;

com/hbm/blocks/TestNuke.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Random;
 
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityTestNuke;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.Block;

com/hbm/blocks/TestObjTester.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityObjTester;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/TestRender.java

@@ -1,6 +1,8 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityTestRender;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;

com/hbm/blocks/TestRotationTester.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityRotationTester;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/blocks/WatzCore.java

@@ -1,5 +1,7 @@
 package com.hbm.blocks;
 
+import com.hbm.tileentity.TileEntityWatzCore;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;

com/hbm/blocks/WatzHatch.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityWatzCore;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

com/hbm/blocks/WireCoated.java

@@ -1,5 +1,7 @@
 package com.hbm.blocks;
 
+import com.hbm.tileentity.TileEntityWireCoated;
+
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;

com/hbm/blocks/YellowBarrel.java

@@ -4,6 +4,7 @@ import java.util.Random;
 
 import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.TileEntityYellowBarrel;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

com/hbm/entity/EntityBullet.java

@@ -9,13 +9,19 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.item.EntityItemFrame;
+import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.play.server.S2BPacketChangeGameState;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
@@ -27,6 +33,7 @@ import com.hbm.blocks.DecoBlockAlt;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.RedBarrel;
 import com.hbm.items.ModItems;
+import com.hbm.lib.Library;
 import com.hbm.lib.ModDamageSource;
 
 import cpw.mods.fml.relauncher.Side;
@@ -56,6 +63,7 @@ public class EntityBullet extends Entity implements IProjectile {
 	private int dmgMax = 1;
 	private boolean isTau = false;
 	private boolean instakill = false;
+	private boolean rad = false;
 
 	public EntityBullet(World p_i1753_1_) {
 		super(p_i1753_1_);
@@ -100,7 +108,7 @@ public class EntityBullet extends Entity implements IProjectile {
 	}
 
 	public EntityBullet(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax,
-			boolean instakill) {
+			boolean instakill, boolean rad) {
 		super(p_i1756_1_);
 		this.renderDistanceWeight = 10.0D;
 		this.shootingEntity = p_i1756_2_;
@@ -127,6 +135,7 @@ public class EntityBullet extends Entity implements IProjectile {
 		// this.dmgMin = dmgMin;
 		// this.dmgMax = dmgMax;
 		this.instakill = instakill;
+		this.rad = rad;
 	}
 
 	public EntityBullet(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax,
@@ -428,6 +437,34 @@ public class EntityBullet extends Entity implements IProjectile {
 							if (movingobjectposition.entityHit instanceof EntityLivingBase) {
 								EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.entityHit;
 
+								if (rad) {
+									if (entitylivingbase instanceof EntityPlayer
+											&& Library.checkForHazmat((EntityPlayer) entitylivingbase)) {
+									} else if (entitylivingbase instanceof EntityCreeper) {
+										EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj);
+										creep.setLocationAndAngles(entitylivingbase.posX, entitylivingbase.posY, entitylivingbase.posZ,
+												entitylivingbase.rotationYaw, entitylivingbase.rotationPitch);
+										if (!entitylivingbase.isDead)
+											if (!worldObj.isRemote)
+												worldObj.spawnEntityInWorld(creep);
+										entitylivingbase.setDead();
+									} else if (entitylivingbase instanceof EntityVillager) {
+										EntityZombie creep = new EntityZombie(this.worldObj);
+										creep.setLocationAndAngles(entitylivingbase.posX, entitylivingbase.posY, entitylivingbase.posZ,
+												entitylivingbase.rotationYaw, entitylivingbase.rotationPitch);
+										entitylivingbase.setDead();
+										if (!this.worldObj.isRemote)
+											this.worldObj.spawnEntityInWorld(creep);
+									} else if (entitylivingbase instanceof EntityLivingBase
+											&& !(entitylivingbase instanceof EntityNuclearCreeper)
+											&& !(entitylivingbase instanceof EntityMooshroom)
+											&& !(entitylivingbase instanceof EntityZombie)) {
+										entitylivingbase.addPotionEffect(new PotionEffect(Potion.poison.getId(), 2 * 60 * 20, 2));
+										entitylivingbase.addPotionEffect(new PotionEffect(Potion.wither.getId(), 20, 4));
+										entitylivingbase.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 1 * 60 * 20, 1));
+									}
+								}
+								
 								if (this.knockbackStrength > 0) {
 									f4 = MathHelper
 											.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);

com/hbm/entity/EntityCloudFleija.java

@@ -0,0 +1,84 @@
+package com.hbm.entity;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public class EntityCloudFleija extends Entity {
+	
+	public int maxAge = 100;
+	public int age;
+    public float scale = 0;
+
+	public EntityCloudFleija(World p_i1582_1_) {
+		super(p_i1582_1_);
+		this.setSize(1, 4);
+		this.ignoreFrustumCheck = true;
+		this.isImmuneToFire = true;
+		this.age = 0;
+    	scale = 0;
+	}
+
+	@Override
+	protected void entityInit() {
+		this.dataWatcher.addObject(16, Integer.valueOf((int) 0));
+	}
+
+    @Override
+	@SideOnly(Side.CLIENT)
+    public int getBrightnessForRender(float p_70070_1_)
+    {
+        return 15728880;
+    }
+
+    @Override
+	public float getBrightness(float p_70013_1_)
+    {
+        return 1.0F;
+    }
+
+	public EntityCloudFleija(World p_i1582_1_, int maxAge) {
+		super(p_i1582_1_);
+		this.setSize(20, 40);
+		this.isImmuneToFire = true;
+		this.setMaxAge(maxAge);
+	}
+
+    @Override
+	public void onUpdate() {
+        this.age++;
+        this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY + 200, this.posZ));
+        
+        if(this.age >= this.getMaxAge())
+        {
+    		this.age = 0;
+        	this.setDead();
+        }
+        
+        this.scale++;
+    }
+
+	@Override
+	protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {
+		age = p_70037_1_.getShort("age");
+		scale = p_70037_1_.getShort("scale");
+	}
+
+	@Override
+	protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {
+		p_70014_1_.setShort("age", (short)age);
+		p_70014_1_.setShort("scale", (short)scale);
+		
+	}
+	
+	public void setMaxAge(int i) {
+		this.dataWatcher.updateObject(16, Integer.valueOf(i));
+	}
+	
+	public int getMaxAge() {
+		return this.dataWatcher.getWatchableObjectInt(16);
+	}
+}

com/hbm/entity/EntityGrenadeMk2.java

@@ -0,0 +1,52 @@
+package com.hbm.entity;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class EntityGrenadeMk2 extends EntityThrowable {
+	
+	    private static final String __OBFID = "CL_00001722";
+
+	    public EntityGrenadeMk2(World p_i1773_1_)
+	    {
+	        super(p_i1773_1_);
+	    }
+
+	    public EntityGrenadeMk2(World p_i1774_1_, EntityLivingBase p_i1774_2_)
+	    {
+	        super(p_i1774_1_, p_i1774_2_);
+	    }
+
+	    public EntityGrenadeMk2(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_)
+	    {
+	        super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_);
+	    }
+
+	    @Override
+		protected void onImpact(MovingObjectPosition p_70184_1_)
+	    {
+	        if (p_70184_1_.entityHit != null)
+	        {
+	            byte b0 = 0;
+
+	            if (p_70184_1_.entityHit instanceof EntityBlaze)
+	            {
+	                b0 = 3;
+	            }
+
+	            p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
+	        }
+
+	        if (!this.worldObj.isRemote)
+	        {
+	            this.setDead();
+	            this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 7.5F, true);
+	        }
+	    }
+}

com/hbm/entity/EntityNukeExplosionAdvanced.java

@@ -50,6 +50,8 @@ public class EntityNukeExplosionAdvanced extends Entity {
         	this.did = true;
         }
         
+        speed = 160;
+        
         boolean flag = false;
         boolean flag2 = false;
         boolean flag3 = false;
@@ -95,46 +97,5 @@ public class EntityNukeExplosionAdvanced extends Entity {
 	protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {
 		
 	}
-	
-	private void removeEntities(World world, int x, int y, int z) {
-		float f = 10;
-        HashSet hashset = new HashSet();
-        int i;
-        int j;
-        int k;
-        double d5;
-        double d6;
-        double d7;
-        boolean isOccupied = false;
-        
-        i = MathHelper.floor_double(x - f - 1.0D);
-        j = MathHelper.floor_double(x + f + 1.0D);
-        k = MathHelper.floor_double(y - f - 1.0D);
-        int i2 = MathHelper.floor_double(y + f + 1.0D);
-        int l = MathHelper.floor_double(z - f - 1.0D);
-        int j2 = MathHelper.floor_double(z + f + 1.0D);
-        List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2));
-        Vec3 vec3 = Vec3.createVectorHelper(x, y, z);
-
-        for (int i1 = 0; i1 < list.size(); ++i1)
-        {
-            Entity entity = (Entity)list.get(i1);
-            double d4 = entity.getDistance(x, y, z) / f;
-
-            if (d4 <= 1.0D)
-            {
-                d5 = entity.posX - x;
-                d6 = entity.posY + entity.getEyeHeight() - y;
-                d7 = entity.posZ - z;
-                double d9 = MathHelper.sqrt_double(d5 * d5 + d6 * d6 + d7 * d7);
-                if (d9 < f && (entity instanceof EntityNukeCloudSmall))
-                {
-                    {
-                    	entity.setDead();
-                    }
-            	}
-            }
-        }
-	}
 
 }

com/hbm/entity/EntityRainbow.java

@@ -224,7 +224,7 @@ public class EntityRainbow extends Entity implements IProjectile
             block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); 
             AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
         	if(!worldObj.isRemote)
-        		ExplosionChaos.explode(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
+        		ExplosionChaos.explodeZOMG(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
         }
 
         if (this.arrowShake > 0)
@@ -359,7 +359,7 @@ public class EntityRainbow extends Entity implements IProjectile
                             {
                             	movingobjectposition.entityHit.attackEntityFrom(damagesource, 100000F);
                             	if(!worldObj.isRemote)
-                            		ExplosionChaos.explode(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
+                            		ExplosionChaos.explodeZOMG(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
                             }
                         }
                     }

com/hbm/explosion/ExplosionChaos.java

@@ -62,6 +62,33 @@ public class ExplosionChaos {
     	}
     }
     
+    public static void explodeZOMG(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(!(world.getBlock(X, Y, Z) == Blocks.bedrock && Y <= 0))
+    						world.setBlock(X, Y, Z, Blocks.air);
+    				}
+    			}
+    		}
+    	}
+    }
+    
     public static void spawnExplosion(World world, int x, int y, int z, int bound) {
     	
     	int randX;

com/hbm/gui/ContainerBombMulti.java

@@ -1,13 +1,13 @@
 package com.hbm.gui;
 
+import com.hbm.tileentity.TileEntityBombMulti;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import com.hbm.blocks.TileEntityBombMulti;
-
 public class ContainerBombMulti extends Container {
 
 private TileEntityBombMulti bombMulti;

com/hbm/gui/ContainerCentrifuge.java

@@ -1,5 +1,7 @@
 package com.hbm.gui;
 
+import com.hbm.tileentity.TileEntityMachineCentrifuge;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -7,8 +9,6 @@ import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import com.hbm.blocks.TileEntityMachineCentrifuge;
-
 public class ContainerCentrifuge extends Container {
 	
 	private TileEntityMachineCentrifuge diFurnace;

com/hbm/gui/ContainerConverterHeRf.java

@@ -1,7 +1,7 @@
 package com.hbm.gui;
 
-import com.hbm.blocks.TileEntityConverterHeRf;
-import com.hbm.blocks.TileEntityConverterRfHe;
+import com.hbm.tileentity.TileEntityConverterHeRf;
+import com.hbm.tileentity.TileEntityConverterRfHe;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

com/hbm/gui/ContainerConverterRfHe.java

@@ -1,7 +1,7 @@
 package com.hbm.gui;
 
-import com.hbm.blocks.TileEntityConverterRfHe;
-import com.hbm.blocks.TileEntityReactorMultiblock;
+import com.hbm.tileentity.TileEntityConverterRfHe;
+import com.hbm.tileentity.TileEntityReactorMultiblock;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

com/hbm/gui/ContainerCoreAdvanced.java

@@ -1,7 +1,7 @@
 package com.hbm.gui;
 
-import com.hbm.blocks.TileEntityCoreAdvanced;
-import com.hbm.blocks.TileEntityCoreTitanium;
+import com.hbm.tileentity.TileEntityCoreAdvanced;
+import com.hbm.tileentity.TileEntityCoreTitanium;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;