Fixed gunpull, added proto MIRV, added new gasmask + overlays, decos

assets/hbm/lang/de_DE.lang

@@ -1091,6 +1091,7 @@ item.gun_revolver_nightmare.name=Nightmare-Revolver (Original)
 item.gun_revolver_nightmare2.name=Nightmare-Revolver (Dunkel)
 item.gun_revolver_pip.name=Lil' Pipsqueak
 item.gun_fatman.name=M42 Nukleares Katapult "Fat Man"
+item.gun_proto.name=M42 Nukleares Katapult "Proto MIRV"
 item.gun_mirv.name=M42 Nukleares Katapult "Experimentelles MIRV"
 item.gun_bf.name=M42_2 Nukleares Katapult "Antimaterienwerfer"
 item.gun_mp40.name=Maschinenpistole
@@ -1357,6 +1358,7 @@ item.paa_boots.name=PaA-"olle Latschen"
 
 item.goggles.name=Schutzbrille
 item.gas_mask.name=Gasmaske
+item.gas_mask_m65.name=M65-Z Gasmaske
 item.oxy_mask.name=Sauerstoffmaske
 item.t45_helmet.name=T45-Powerrüstungshelm
 item.t45_plate.name=T45-Powerrüstungsbrustpanzer

assets/hbm/lang/en_US.lang

@@ -1091,6 +1091,7 @@ item.gun_revolver_nightmare.name=Nightmare Revolver (Original)
 item.gun_revolver_nightmare2.name=Nightmare Revolver (Dark)
 item.gun_revolver_pip.name=Lil' Pipsqueak
 item.gun_fatman.name=M42 Nuclear Catapult "Fat Man"
+item.gun_proto.name=M42 Nuclear Catapult "Proto MIRV"
 item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV"
 item.gun_bf.name=M42_2 Nuclear Catapult "Antimatter Launcher"
 item.gun_mp40.name=Submachine Gun
@@ -1357,6 +1358,7 @@ item.paa_boots.name=PaA "good ol' shoes"
 
 item.goggles.name=Protection Goggles
 item.gas_mask.name=Gas Mask
+item.gas_mask_m65.name=M65-Z Gas Mask
 item.oxy_mask.name=Oxygen Mask
 item.t45_helmet.name=T45 Power Armor Helmet
 item.t45_plate.name=T45 Power Armor Chestplate

com/hbm/blocks/ModBlocks.java

@@ -110,6 +110,14 @@ public class ModBlocks {
 	public static Block block_daffergon;
 	public static Block block_verticium;
 
+	public static Block deco_titanium;
+	public static Block deco_red_copper;
+	public static Block deco_tungsten;
+	public static Block deco_aluminium;
+	public static Block deco_steel;
+	public static Block deco_lead;
+	public static Block deco_beryllium;
+
 	public static Block gravel_obsidian;
 	public static Block asphalt;
 	
@@ -605,6 +613,14 @@ public class ModBlocks {
 		block_daffergon = new BlockGeneric(Material.iron).setBlockName("block_daffergon").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_daffergon");
 		block_verticium = new BlockGeneric(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
 
+		deco_titanium = new BlockOre(Material.iron).setBlockName("deco_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_titanium");
+		deco_red_copper = new BlockOre(Material.iron).setBlockName("deco_red_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_red_copper");
+		deco_tungsten = new BlockOre(Material.iron).setBlockName("deco_tungsten").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_tungsten");
+		deco_aluminium = new BlockOre(Material.iron).setBlockName("deco_aluminium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_aluminium");
+		deco_steel = new BlockOre(Material.iron).setBlockName("deco_steel").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel");
+		deco_lead = new BlockOre(Material.iron).setBlockName("deco_lead").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_lead");
+		deco_beryllium = new BlockOre(Material.iron).setBlockName("deco_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_beryllium");
+		
 		gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
 		asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");
 
@@ -1007,6 +1023,15 @@ public class ModBlocks {
 		GameRegistry.registerBlock(block_daffergon, ItemOreBlock.class, block_daffergon.getUnlocalizedName());
 		GameRegistry.registerBlock(block_verticium, ItemOreBlock.class, block_verticium.getUnlocalizedName());
 		
+		//Deco Blocks
+		GameRegistry.registerBlock(deco_titanium, deco_titanium.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_red_copper, deco_red_copper.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_tungsten, deco_tungsten.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_aluminium, deco_aluminium.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_steel, deco_steel.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_lead, deco_lead.getUnlocalizedName());
+		GameRegistry.registerBlock(deco_beryllium, deco_beryllium.getUnlocalizedName());
+		
 		//Gravel
 		GameRegistry.registerBlock(gravel_obsidian, gravel_obsidian.getUnlocalizedName());
 

com/hbm/blocks/generic/BlockCrate.java

@@ -113,6 +113,7 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 8);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_stinger, 7);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_fatman, 5);
+    	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_proto, 3);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mirv, 3);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bf, 1);
     	BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp40, 9);

com/hbm/blocks/generic/BlockOre.java

@@ -136,6 +136,34 @@ public class BlockOre extends Block {
 			case 5: return ModItems.fragment_niobium;
 			}
 		}
+		if(this == ModBlocks.deco_aluminium)
+		{
+			return ModItems.ingot_aluminium;
+		}
+		if(this == ModBlocks.deco_beryllium)
+		{
+			return ModItems.ingot_beryllium;
+		}
+		if(this == ModBlocks.deco_lead)
+		{
+			return ModItems.ingot_lead;
+		}
+		if(this == ModBlocks.deco_red_copper)
+		{
+			return ModItems.ingot_red_copper;
+		}
+		if(this == ModBlocks.deco_steel)
+		{
+			return ModItems.ingot_steel;
+		}
+		if(this == ModBlocks.deco_titanium)
+		{
+			return ModItems.ingot_titanium;
+		}
+		if(this == ModBlocks.deco_tungsten)
+		{
+			return ModItems.ingot_tungsten;
+		}
 		
 		return Item.getItemFromBlock(this);
     }

com/hbm/entity/grenade/EntityGrenadeGas.java

@@ -38,9 +38,10 @@ public class EntityGrenadeGas extends EntityGrenadeBase
             ExplosionChaos.poison(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5);
             //for(int i = 0; 0 < 15; i++) {
 
-        	ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
+        	ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
-        	ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
+        	ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
-        	ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 15);
+        	ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
+        	ExplosionLarge.spawnParticlesRadial(worldObj, posX, posY, posZ, 50);
         
             //}
         }

com/hbm/items/ModItems.java

@@ -732,6 +732,7 @@ public class ModItems {
 	public static Item gun_revolver_pip;
 	public static Item gun_revolver_pip_ammo;
 	public static Item gun_fatman;
+	public static Item gun_proto;
 	public static Item gun_fatman_ammo;
 	public static Item gun_mirv;
 	public static Item gun_mirv_ammo;
@@ -951,6 +952,7 @@ public class ModItems {
 
 	public static Item goggles;
 	public static Item gas_mask;
+	public static Item gas_mask_m65;
 	public static Item oxy_mask;
 	
 	public static Item t45_helmet;
@@ -1916,6 +1918,7 @@ public class ModItems {
 		gun_revolver_pip = new GunRevolver(gun_revolver_pip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
 		gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman_ammo");
 		gun_fatman = new GunFatman().setMaxDamage(2500).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman");
+		gun_proto = new GunProtoMirv().setMaxDamage(2500).setUnlocalizedName("gun_proto").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman");
 		gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mirv_ammo");
 		gun_mirv = new GunMIRV().setMaxDamage(2500).setUnlocalizedName("gun_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mirv");
 		gun_bf_ammo = new Item().setUnlocalizedName("gun_bf_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf_ammo");
@@ -2231,6 +2234,7 @@ public class ModItems {
 		
 		goggles = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles");
 		gas_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask");
+		gas_mask_m65 = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask_m65").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_m65");
 		//oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask");
 		
 		t45_helmet = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 0).setUnlocalizedName("t45_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_helmet");
@@ -3264,6 +3268,7 @@ public class ModItems {
 		GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName());
 		GameRegistry.registerItem(gun_stinger, gun_stinger.getUnlocalizedName());
 		GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName());
+		GameRegistry.registerItem(gun_proto, gun_proto.getUnlocalizedName());
 		GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName());
 		GameRegistry.registerItem(gun_bf, gun_bf.getUnlocalizedName());
 		GameRegistry.registerItem(gun_mp40, gun_mp40.getUnlocalizedName());
@@ -3573,6 +3578,7 @@ public class ModItems {
 		//Conventional Armor
 		GameRegistry.registerItem(goggles, goggles.getUnlocalizedName());
 		GameRegistry.registerItem(gas_mask, gas_mask.getUnlocalizedName());
+		GameRegistry.registerItem(gas_mask_m65, gas_mask_m65.getUnlocalizedName());
 		//GameRegistry.registerItem(oxy_mask, oxy_mask.getUnlocalizedName());
 		
 		GameRegistry.registerItem(steel_helmet, steel_helmet.getUnlocalizedName());

com/hbm/items/gear/ArmorAsbestos.java

@@ -1,5 +1,9 @@
 package com.hbm.items.gear;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -7,13 +11,21 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
+
+import org.lwjgl.opengl.GL11;
+
 import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ArmorAsbestos extends ItemArmor implements ISpecialArmor {
-	private String [] armourTypes = new String [] {"asbestos_helmet", "asbestos_plate", "asbestos_legs", "asbestos_boots"};
+	
+	private ResourceLocation asbestosBlur = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_asbestos.png");
 	
 	public ArmorAsbestos(ArmorMaterial armorMaterial, int renderIndex, int armorType) {
 		super(armorMaterial, renderIndex, armorType);
@@ -73,4 +85,30 @@ public class ArmorAsbestos extends ItemArmor implements ISpecialArmor {
 		 player.extinguish();
 	}
 	
+    @SideOnly(Side.CLIENT)
+    public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){
+    	
+    	if(this != ModItems.asbestos_helmet)
+    		return;
+    	
+
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+        GL11.glDepthMask(false);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GL11.glDisable(GL11.GL_ALPHA_TEST);
+        Minecraft.getMinecraft().getTextureManager().bindTexture(asbestosBlur);
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        tessellator.addVertexWithUV(0.0D, (double)resolution.getScaledHeight(), -90.0D, 0.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), (double)resolution.getScaledHeight(), -90.0D, 1.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D);
+        tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+        tessellator.draw();
+        GL11.glDepthMask(true);
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    }
+
 }

com/hbm/items/gear/ArmorHazmat.java

@@ -1,14 +1,26 @@
 package com.hbm.items.gear;
 
+import org.lwjgl.opengl.GL11;
+
 import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 public class ArmorHazmat extends ItemArmor {
 
+	private ResourceLocation hazmatBlur = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_hazmat.png");
+
 	public ArmorHazmat(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) {
 		super(p_i45325_1_, p_i45325_2_, p_i45325_3_);
 	}
@@ -31,4 +43,30 @@ public class ArmorHazmat extends ItemArmor {
 		else return null;
 	}
 	
+    @SideOnly(Side.CLIENT)
+    public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){
+    	
+    	if(this != ModItems.hazmat_helmet && this != ModItems.hazmat_paa_helmet)
+    		return;
+    	
+
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+        GL11.glDepthMask(false);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GL11.glDisable(GL11.GL_ALPHA_TEST);
+        Minecraft.getMinecraft().getTextureManager().bindTexture(hazmatBlur);
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        tessellator.addVertexWithUV(0.0D, (double)resolution.getScaledHeight(), -90.0D, 0.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), (double)resolution.getScaledHeight(), -90.0D, 1.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D);
+        tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+        tessellator.draw();
+        GL11.glDepthMask(true);
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    }
+
 }

com/hbm/items/gear/ArmorModel.java

@@ -2,21 +2,30 @@ package com.hbm.items.gear;
 
 import java.util.List;
 
+import org.lwjgl.opengl.GL11;
+
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
+import com.hbm.lib.RefStrings;
 import com.hbm.render.model.ModelCloak;
 import com.hbm.render.model.ModelGasMask;
 import com.hbm.render.model.ModelGoggles;
+import com.hbm.render.model.ModelM65;
 import com.hbm.render.model.ModelOxygenMask;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 public class ArmorModel extends ItemArmor {
 	@SideOnly(Side.CLIENT)
@@ -24,6 +33,19 @@ public class ArmorModel extends ItemArmor {
 	private ModelGasMask modelGas;
 	private ModelCloak modelCloak;
 	private ModelOxygenMask modelOxy;
+	private ModelM65 modelM65;
+	private ResourceLocation goggleBlur0 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_0.png");
+	private ResourceLocation goggleBlur1 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_1.png");
+	private ResourceLocation goggleBlur2 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_2.png");
+	private ResourceLocation goggleBlur3 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_3.png");
+	private ResourceLocation goggleBlur4 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_4.png");
+	private ResourceLocation goggleBlur5 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_5.png");
+	private ResourceLocation gasmaskBlur0 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_0.png");
+	private ResourceLocation gasmaskBlur1 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_1.png");
+	private ResourceLocation gasmaskBlur2 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_2.png");
+	private ResourceLocation gasmaskBlur3 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_3.png");
+	private ResourceLocation gasmaskBlur4 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_4.png");
+	private ResourceLocation gasmaskBlur5 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_gasmask_5.png");
 
 	public ArmorModel(ArmorMaterial armorMaterial, int renderIndex, int armorType) {
 		super(armorMaterial, renderIndex, armorType);
@@ -37,6 +59,9 @@ public class ArmorModel extends ItemArmor {
 		if (this == ModItems.gas_mask) {
 			return armorType == 0;
 		}
+		if (this == ModItems.gas_mask_m65) {
+			return armorType == 0;
+		}
 		if (this == ModItems.oxy_mask) {
 			return armorType == 0;
 		}
@@ -89,6 +114,14 @@ public class ArmorModel extends ItemArmor {
 				return this.modelGas;
 			}
 		}
+		if (this == ModItems.gas_mask_m65) {
+			if (armorSlot == 0) {
+				if (this.modelM65 == null) {
+					this.modelM65 = new ModelM65();
+				}
+				return this.modelM65;
+			}
+		}
 		if (this == ModItems.oxy_mask) {
 			if (armorSlot == 0) {
 				if (this.modelOxy == null) {
@@ -124,6 +157,9 @@ public class ArmorModel extends ItemArmor {
 		if (stack.getItem() == ModItems.gas_mask) {
 			return "hbm:textures/models/GasMask.png";
 		}
+		if (stack.getItem() == ModItems.gas_mask_m65) {
+			return "hbm:textures/models/ModelM65.png";
+		}
 		if (stack.getItem() == ModItems.oxy_mask) {
 			return null;
 		}
@@ -157,6 +193,69 @@ public class ArmorModel extends ItemArmor {
 		return "hbm:textures/models/CapeUnknown.png";
 	}
 	
+    @SideOnly(Side.CLIENT)
+    public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){
+    	
+    	if(this != ModItems.goggles && this != ModItems.gas_mask && this != ModItems.gas_mask_m65)
+    		return;
+    	
+
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+        GL11.glDepthMask(false);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GL11.glDisable(GL11.GL_ALPHA_TEST);
+        
+        if(this == ModItems.goggles || this == ModItems.gas_mask_m65) {
+        	switch((int)((double)stack.getItemDamage() / (double)stack.getMaxDamage() * 6D)) {
+        	case 0:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur0); break;
+        	case 1:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur1); break;
+        	case 2:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur2); break;
+        	case 3:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur3); break;
+        	case 4:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur4); break;
+        	case 5:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur5); break;
+        	default:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(goggleBlur5); break;
+        	}
+        }
+        if(this == ModItems.gas_mask) {
+        	switch((int)((double)stack.getItemDamage() / (double)stack.getMaxDamage() * 6D)) {
+        	case 0:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur0); break;
+        	case 1:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur1); break;
+        	case 2:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur2); break;
+        	case 3:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur3); break;
+        	case 4:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur4); break;
+        	case 5:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur5); break;
+        	default:
+            	Minecraft.getMinecraft().getTextureManager().bindTexture(gasmaskBlur5); break;
+        	}
+        }
+        
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        tessellator.addVertexWithUV(0.0D, (double)resolution.getScaledHeight(), -90.0D, 0.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), (double)resolution.getScaledHeight(), -90.0D, 1.0D, 1.0D);
+        tessellator.addVertexWithUV((double)resolution.getScaledWidth(), 0.0D, -90.0D, 1.0D, 0.0D);
+        tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, 0.0D, 0.0D);
+        tessellator.draw();
+        GL11.glDepthMask(true);
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+    }
+
 	@Override
 	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
 

com/hbm/items/special/ItemStarterKit.java

@@ -328,6 +328,9 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_doomsday, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_taint, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_micro, 1));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_bhole, 1));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_schrabidium, 1));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_emp, 1));
 		}
 		
 		if(this == ModItems.t45_kit)

com/hbm/items/tool/ItemSatInterface.java

@@ -32,8 +32,10 @@ public class ItemSatInterface extends ItemSatChip {
 		if(!world.isRemote) {
 		    SatelliteSavedData data = (SatelliteSavedData)entity.worldObj.perWorldStorage.loadData(SatelliteSavedData.class, "satellites");
 			
-		    for(int j = 0; j < data.satellites.size(); j++) {
+		    if(data != null) {
-		    	PacketDispatcher.wrapper.sendToAll(new SatPanelPacket(data.satellites.get(j)));
+			    for(int j = 0; j < data.satellites.size(); j++) {
+			    	PacketDispatcher.wrapper.sendToAll(new SatPanelPacket(data.satellites.get(j)));
+			    }
 		    }
 		}
     }

com/hbm/items/weapon/GunBaleFlare.java

@@ -110,14 +110,8 @@ public class GunBaleFlare extends Item {
 	@Override
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
-		MinecraftForge.EVENT_BUS.post(event);
-		if (event.isCanceled()) {
-			return event.result;
-		}
 		
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_bf_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunBoltAction.java

@@ -134,10 +134,8 @@ public class GunBoltAction extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_bolt_action_ammo)) {
+		if(this.getAnim(p_77659_1_) == 0)
-			if(this.getAnim(p_77659_1_) == 0)
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-				p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunEMPRay.java

@@ -43,9 +43,8 @@ public class GunEMPRay extends Item {
 	@Override
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
-		{
+		
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunFatman.java

@@ -43,9 +43,9 @@ public class GunFatman extends Item {
 
 		ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
 		MinecraftForge.EVENT_BUS.post(event);
-		/*if (event.isCanceled()) {
+		if (event.isCanceled()) {
 			return;
-		}*/
+		}
 		j = event.charge;
 
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
@@ -114,13 +114,8 @@ public class GunFatman extends Item {
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
-		if (event.isCanceled()) {
-			return event.result;
-		}
 		
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_fatman_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunLeverAction.java

@@ -206,10 +206,8 @@ public class GunLeverAction extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_lever_action_ammo)) {
+		if(this.getAnim(p_77659_1_) == 0)
-			if(this.getAnim(p_77659_1_) == 0)
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-				p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunLeverActionS.java

@@ -140,10 +140,8 @@ public class GunLeverActionS extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_lever_action_ammo)) {
+		if(this.getAnim(p_77659_1_) == 0)
-			if(this.getAnim(p_77659_1_) == 0)
+			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-				p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunMIRV.java

@@ -110,13 +110,8 @@ public class GunMIRV extends Item {
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
-		if (event.isCanceled()) {
-			return event.result;
-		}
 		
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_mirv_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunNightmare.java

@@ -166,10 +166,8 @@ public class GunNightmare extends Item {
 		MinecraftForge.EVENT_BUS.post(event);
 
 		if (!p_77659_3_.isSneaking()) {
-			boolean flag = p_77659_3_.capabilities.isCreativeMode
-					|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77659_1_) > 0;
 
-			if (flag || p_77659_1_.getItemDamage() < 6) {
+			if (p_77659_1_.getItemDamage() < 6) {
 				p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
 
 			} else {

com/hbm/items/weapon/GunProtoMirv.java

@@ -0,0 +1,139 @@
+package com.hbm.items.weapon;
+
+import java.util.List;
+
+import com.google.common.collect.Multimap;
+import com.hbm.entity.projectile.EntityMiniNuke;
+import com.hbm.items.ModItems;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.ArrowLooseEvent;
+import net.minecraftforge.event.entity.player.ArrowNockEvent;
+
+public class GunProtoMirv extends Item {
+
+	public GunProtoMirv() {
+		this.maxStackSize = 1;
+		this.setMaxDamage(2500);
+	}
+
+	@Override
+	public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int integer) {
+		int j = this.getMaxItemUseDuration(stack) - integer;
+
+		ArrowLooseEvent event = new ArrowLooseEvent(player, stack, j);
+		MinecraftForge.EVENT_BUS.post(event);
+		if (event.isCanceled()) {
+			return;
+		}
+		j = event.charge;
+
+		boolean flag = player.capabilities.isCreativeMode
+				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
+
+		boolean f1 = false;
+				
+		for(int i = 0; i < 8; i++) {
+			if (flag || player.inventory.hasItem(ModItems.gun_fatman_ammo)) {
+				
+				f1 = true;
+				
+				float f = j / 20.0F;
+				f = (f * f + f * 2.0F) / 3.0F;
+	
+				if (j < 25.0D) {
+					return;
+				}
+	
+				if (j > 25.0F) {
+					f = 25.0F;
+				}
+	
+				EntityMiniNuke entityarrow = new EntityMiniNuke(world, player, 3.0F);
+	
+				entityarrow.setIsCritical(true);
+				entityarrow.gravity = 0.3;
+				entityarrow.setDamage(1000);
+				
+				entityarrow.motionX += world.rand.nextGaussian() * 0.4;
+				entityarrow.motionY += world.rand.nextGaussian() * 0.4;
+				entityarrow.motionZ += world.rand.nextGaussian() * 0.4;
+	
+				stack.damageItem(1, player);
+	
+				if (!flag) {
+					player.inventory.consumeInventoryItem(ModItems.gun_fatman_ammo);
+				}
+	
+				if (!world.isRemote) {
+					world.spawnEntityInWorld(entityarrow);
+				}
+			}
+		}
+		
+		if(f1)
+			world.playSoundAtEntity(player, "hbm:weapon.fatmanShoot", 1.0F, 1F);
+	}
+
+	@Override
+	public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) {
+		return p_77654_1_;
+	}
+
+	@Override
+	public int getMaxItemUseDuration(ItemStack p_77626_1_) {
+		return 72000;
+	}
+
+	@Override
+	public EnumAction getItemUseAction(ItemStack p_77661_1_) {
+		return EnumAction.bow;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
+		MinecraftForge.EVENT_BUS.post(event);
+		
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+
+		return p_77659_1_;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public Multimap getItemAttributeModifiers() {
+		Multimap multimap = super.getItemAttributeModifiers();
+		multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(),
+				new AttributeModifier(field_111210_e, "Weapon modifier", -0.3, 1));
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(),
+				new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0));
+		return multimap;
+	}
+
+	@Override
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
+
+		list.add("Excessive, who's being excessive!?");
+		list.add("");
+		list.add("Ammo: Mini Nukes");
+		list.add("Damage: 1000");
+		list.add("Shoots up to eight mini nukes at once!");
+	}
+}

com/hbm/items/weapon/GunRevolver.java

@@ -180,9 +180,7 @@ public class GunRevolver extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunRpg.java

@@ -112,13 +112,8 @@ public class GunRpg extends Item {
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
-		if (event.isCanceled()) {
-			return event.result;
-		}
 		
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_rpg_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunShotgun.java

@@ -152,9 +152,7 @@ public class GunShotgun extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_uboinik_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunSpark.java

@@ -105,9 +105,7 @@ public class GunSpark extends Item {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_spark_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunStinger.java

@@ -125,13 +125,8 @@ public class GunStinger extends Item {
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
 		MinecraftForge.EVENT_BUS.post(event);
-		if (event.isCanceled()) {
-			return event.result;
-		}
 
-		if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ModItems.gun_stinger_ammo)) {
+		p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-			p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-		}
 
 		return p_77659_1_;
 	}

com/hbm/items/weapon/GunSuicide.java

@@ -126,10 +126,7 @@ public class GunSuicide extends Item {
         ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
         MinecraftForge.EVENT_BUS.post(event);
 
-        if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ammo))
+        p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-        {
-            p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
-        }
 
         return p_77659_1_;
     }

com/hbm/lib/HbmWorldGen.java

@@ -194,7 +194,7 @@ public class HbmWorldGen implements IWorldGenerator {
 			(new WorldGenMinable(ModBlocks.ore_rare, 5)).generate(world, rand, randPosX, randPosY, randPosZ);
 		}
 
-		if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) {
+		/*if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) {
 			for (int k = 0; k < 1; k++) {
 				int randPosX = i + rand.nextInt(16);
 				int randPosY = rand.nextInt(25);
@@ -202,7 +202,7 @@ public class HbmWorldGen implements IWorldGenerator {
 
 				(new WorldGenMinable(ModBlocks.yellow_barrel, 10)).generate(world, rand, randPosX, randPosY, randPosZ);
 			}
-		}
+		}*/
 
 		if (MainRegistry.enableDungeons) {
 

com/hbm/main/ClientProxy.java

@@ -176,6 +176,7 @@ public class ClientProxy extends ServerProxy
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare2));
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman, new ItemRenderFatMan());
+		MinecraftForgeClient.registerItemRenderer(ModItems.gun_proto, new ItemRenderFatMan());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_mirv, new ItemRenderMIRVLauncher());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_bf, new ItemRenderBFLauncher());
 		MinecraftForgeClient.registerItemRenderer(ModItems.gun_xvl1456, new ItemRenderXVL1456());

com/hbm/render/model/ModelGasMask.java

@@ -4,11 +4,6 @@
 // Keep in mind that you still need to fill in some blanks
 // - ZeuX
 
-
-
-
-
-
 package com.hbm.render.model;
 
 import org.lwjgl.opengl.GL11;
@@ -18,112 +13,106 @@ import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 
-public class ModelGasMask extends ModelBiped
+public class ModelGasMask extends ModelBiped {
-{
+	// fields
-  //fields
+	ModelRenderer mask;
-    ModelRenderer mask;
+	ModelRenderer Shape1;
-    ModelRenderer Shape1;
+	ModelRenderer Shape2;
-    ModelRenderer Shape2;
+	ModelRenderer Shape3;
-    ModelRenderer Shape3;
+	ModelRenderer Shape4;
-    ModelRenderer Shape4;
+	ModelRenderer Shape5;
-    ModelRenderer Shape5;
+	ModelRenderer Shape6;
-    ModelRenderer Shape6;
 
-  public ModelGasMask()
+	public ModelGasMask() {
-  {
+		textureWidth = 64;
-    textureWidth = 64;
+		textureHeight = 32;
-    textureHeight = 32;
 
-    mask = new ModelRenderer(this, 0, 0);
+		mask = new ModelRenderer(this, 0, 0);
-    Shape1 = new ModelRenderer(this, 0, 0);
+		Shape1 = new ModelRenderer(this, 0, 0);
-      Shape1.addBox(0F, 0F, 0F, 8, 8, 3);
+		Shape1.addBox(0F, 0F, 0F, 8, 8, 3);
-      Shape1.setRotationPoint(0F - 4, 0F - 8 + 0.075F / 2, 0F - 4);
+		Shape1.setRotationPoint(0F - 4, 0F - 8 + 0.075F / 2, 0F - 4);
-      Shape1.setTextureSize(64, 32);
+		Shape1.setTextureSize(64, 32);
-      Shape1.mirror = true;
+		Shape1.mirror = true;
-      setRotation(Shape1, 0F, 0F, 0F);
+		setRotation(Shape1, 0F, 0F, 0F);
-      convertToChild(mask, Shape1);
+		convertToChild(mask, Shape1);
-      Shape2 = new ModelRenderer(this, 22, 0);
+		Shape2 = new ModelRenderer(this, 22, 0);
-      Shape2.addBox(0F, 0F, 0F, 2, 2, 1);
+		Shape2.addBox(0F, 0F, 0F, 2, 2, 1);
-      Shape2.setRotationPoint(1F - 4, 3F - 8 + 0.075F / 2, -0.5333334F - 4);
+		Shape2.setRotationPoint(1F - 4, 3F - 8 + 0.075F / 2, -0.5333334F - 4);
-      Shape2.setTextureSize(64, 32);
+		Shape2.setTextureSize(64, 32);
-      Shape2.mirror = true;
+		Shape2.mirror = true;
-      setRotation(Shape2, 0F, 0F, 0F);
+		setRotation(Shape2, 0F, 0F, 0F);
-      convertToChild(mask, Shape2);
+		convertToChild(mask, Shape2);
-      Shape3 = new ModelRenderer(this, 22, 0);
+		Shape3 = new ModelRenderer(this, 22, 0);
-      Shape3.addBox(0F, 0F, 0F, 2, 2, 1);
+		Shape3.addBox(0F, 0F, 0F, 2, 2, 1);
-      Shape3.setRotationPoint(5F - 4, 3F - 8 + 0.075F / 2, -0.5F - 4);
+		Shape3.setRotationPoint(5F - 4, 3F - 8 + 0.075F / 2, -0.5F - 4);
-      Shape3.setTextureSize(64, 32);
+		Shape3.setTextureSize(64, 32);
-      Shape3.mirror = true;
+		Shape3.mirror = true;
-      setRotation(Shape3, 0F, 0F, 0F);
+		setRotation(Shape3, 0F, 0F, 0F);
-      convertToChild(mask, Shape3);
+		convertToChild(mask, Shape3);
-      Shape4 = new ModelRenderer(this, 0, 11);
+		Shape4 = new ModelRenderer(this, 0, 11);
-      Shape4.addBox(0F, 0F, 0F, 2, 2, 2);
+		Shape4.addBox(0F, 0F, 0F, 2, 2, 2);
-      Shape4.setRotationPoint(3F - 4, 5F - 8 + 0.075F / 2, 0F - 4);
+		Shape4.setRotationPoint(3F - 4, 5F - 8 + 0.075F / 2, 0F - 4);
-      Shape4.setTextureSize(64, 32);
+		Shape4.setTextureSize(64, 32);
-      Shape4.mirror = true;
+		Shape4.mirror = true;
-      setRotation(Shape4, -0.7853982F, 0F, 0F);
+		setRotation(Shape4, -0.7853982F, 0F, 0F);
-      convertToChild(mask, Shape4);
+		convertToChild(mask, Shape4);
-      Shape5 = new ModelRenderer(this, 0, 15);
+		Shape5 = new ModelRenderer(this, 0, 15);
-      Shape5.addBox(0F, 2F, -0.5F, 3, 4, 3);
+		Shape5.addBox(0F, 2F, -0.5F, 3, 4, 3);
-      Shape5.setRotationPoint(2.5F - 4, 5F - 8 + 0.075F / 2, 0F - 4);
+		Shape5.setRotationPoint(2.5F - 4, 5F - 8 + 0.075F / 2, 0F - 4);
-      Shape5.setTextureSize(64, 32);
+		Shape5.setTextureSize(64, 32);
-      Shape5.mirror = true;
+		Shape5.mirror = true;
-      setRotation(Shape5, -0.7853982F, 0F, 0F);
+		setRotation(Shape5, -0.7853982F, 0F, 0F);
-      convertToChild(mask, Shape5);
+		convertToChild(mask, Shape5);
-      Shape6 = new ModelRenderer(this, 0, 22);
+		Shape6 = new ModelRenderer(this, 0, 22);
-      Shape6.addBox(0F, 0F, 0F, 8, 1, 5);
+		Shape6.addBox(0F, 0F, 0F, 8, 1, 5);
-      Shape6.setRotationPoint(0F - 4, 3F - 8 + 0.075F / 2, 3F - 4);
+		Shape6.setRotationPoint(0F - 4, 3F - 8 + 0.075F / 2, 3F - 4);
-      Shape6.setTextureSize(64, 32);
+		Shape6.setTextureSize(64, 32);
-      Shape6.mirror = true;
+		Shape6.mirror = true;
-      setRotation(Shape6, 0F, 0F, 0F);
+		setRotation(Shape6, 0F, 0F, 0F);
-      convertToChild(mask, Shape6);
+		convertToChild(mask, Shape6);
-  }
+	}
 
-  private void setRotation(ModelRenderer model, float x, float y, float z)
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
-  {
+		model.rotateAngleX = x;
-    model.rotateAngleX = x;
+		model.rotateAngleY = y;
-    model.rotateAngleY = y;
+		model.rotateAngleZ = z;
-    model.rotateAngleZ = z;
+	}
-  }
 
-  @Override
+	@Override
-public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
-  {
+		EntityPlayer player = (EntityPlayer) entity;
-	  EntityPlayer player = (EntityPlayer)entity;
+		if (player.isSneaking()) {
-	  if(player.isSneaking())
+			this.isSneak = true;
-	  {
+		} else {
-		  this.isSneak = true;
+			this.isSneak = false;
-	  } else {
+		}
-		  this.isSneak = false;
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-	  }
+		this.mask.rotationPointX = this.bipedHead.rotationPointX;
-    super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		this.mask.rotationPointY = this.bipedHead.rotationPointY;
-    this.mask.rotationPointX = this.bipedHead.rotationPointX;
+		this.mask.rotateAngleY = this.bipedHead.rotateAngleY;
-    this.mask.rotationPointY = this.bipedHead.rotationPointY;
+		this.mask.rotateAngleX = this.bipedHead.rotateAngleX;
-    this.mask.rotateAngleY = this.bipedHead.rotateAngleY;
+	}
-    this.mask.rotateAngleX = this.bipedHead.rotateAngleX;
-  }
-  @Override
-public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7)
-  {
-	setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
-    GL11.glPushMatrix();
-    GL11.glScalef(1.15F, 1.15F, 1.15F);
-    this.mask.render(par7);
-    GL11.glPopMatrix();
-  }
 
-  protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild)
+	@Override
-  {
+	public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
-     // move child rotation point to be relative to parent
+		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
-     parChild.rotationPointX -= parParent.rotationPointX;
+		GL11.glPushMatrix();
-     parChild.rotationPointY -= parParent.rotationPointY;
+		GL11.glScalef(1.15F, 1.15F, 1.15F);
-     parChild.rotationPointZ -= parParent.rotationPointZ;
+		this.mask.render(par7);
-     // make rotations relative to parent
+		GL11.glPopMatrix();
-     parChild.rotateAngleX -= parParent.rotateAngleX;
+	}
-     parChild.rotateAngleY -= parParent.rotateAngleY;
+
-     parChild.rotateAngleZ -= parParent.rotateAngleZ;
+	protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) {
-     // create relationship
+		// move child rotation point to be relative to parent
-     parParent.addChild(parChild);
+		parChild.rotationPointX -= parParent.rotationPointX;
-  }
+		parChild.rotationPointY -= parParent.rotationPointY;
+		parChild.rotationPointZ -= parParent.rotationPointZ;
+		// make rotations relative to parent
+		parChild.rotateAngleX -= parParent.rotateAngleX;
+		parChild.rotateAngleY -= parParent.rotateAngleY;
+		parChild.rotateAngleZ -= parParent.rotateAngleZ;
+		// create relationship
+		parParent.addChild(parChild);
+	}
 
 }

com/hbm/render/model/ModelM65.java

@@ -0,0 +1,152 @@
+// Date: 10.08.2018 10:17:16
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+package com.hbm.render.model;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+
+public class ModelM65 extends ModelBiped {
+	// fields
+	ModelRenderer mask;
+	ModelRenderer Shape1;
+	ModelRenderer Shape2;
+	ModelRenderer Shape3;
+	ModelRenderer Shape4;
+	ModelRenderer Shape5;
+	ModelRenderer Shape6;
+	ModelRenderer Shape7;
+	ModelRenderer Shape8;
+	ModelRenderer Shape9;
+	ModelRenderer Shape10;
+
+	public ModelM65() {
+		textureWidth = 32;
+		textureHeight = 32;
+
+		mask = new ModelRenderer(this, 0, 0);
+		Shape1 = new ModelRenderer(this, 0, 0);
+		Shape1.addBox(0F, 0F, 0F, 8, 8, 8);
+		Shape1.setRotationPoint(-4F, -8F, -4F);
+		Shape1.setTextureSize(32, 32);
+		Shape1.mirror = true;
+		setRotation(Shape1, 0F, 0F, 0F);
+		convertToChild(mask, Shape1);
+		Shape2 = new ModelRenderer(this, 0, 16);
+		Shape2.addBox(0F, 0F, 0F, 3, 3, 1);
+		Shape2.setRotationPoint(-1.5F, -3.5F, -5F);
+		Shape2.setTextureSize(32, 32);
+		Shape2.mirror = true;
+		setRotation(Shape2, 0F, 0F, 0F);
+		convertToChild(mask, Shape2);
+		Shape3 = new ModelRenderer(this, 0, 20);
+		Shape3.addBox(0F, -2F, 0F, 2, 2, 1);
+		Shape3.setRotationPoint(-1F, -3.5F, -5F);
+		Shape3.setTextureSize(32, 32);
+		Shape3.mirror = true;
+		setRotation(Shape3, -0.4799655F, 0F, 0F);
+		convertToChild(mask, Shape3);
+		Shape4 = new ModelRenderer(this, 8, 16);
+		Shape4.addBox(0F, 0F, -2F, 3, 2, 2);
+		Shape4.setRotationPoint(-1.5F, -2F, -4F);
+		Shape4.setTextureSize(32, 32);
+		Shape4.mirror = true;
+		setRotation(Shape4, 0.6108652F, 0F, 0F);
+		convertToChild(mask, Shape4);
+		Shape5 = new ModelRenderer(this, 0, 23);
+		Shape5.addBox(0F, 0F, 0F, 3, 3, 0);
+		Shape5.setRotationPoint(-3.5F, -6F, -4.2F);
+		Shape5.setTextureSize(32, 32);
+		Shape5.mirror = true;
+		setRotation(Shape5, 0F, 0F, 0F);
+		convertToChild(mask, Shape5);
+		Shape6 = new ModelRenderer(this, 0, 26);
+		Shape6.addBox(0F, 0F, 0F, 3, 3, 0);
+		Shape6.setRotationPoint(0.5F, -6F, -4.2F);
+		Shape6.setTextureSize(32, 32);
+		Shape6.mirror = true;
+		setRotation(Shape6, 0F, 0F, 0F);
+		convertToChild(mask, Shape6);
+		Shape7 = new ModelRenderer(this, 6, 20);
+		Shape7.addBox(0F, 0F, 0F, 2, 2, 1);
+		Shape7.setRotationPoint(-1F, -3.2F, -6F);
+		Shape7.setTextureSize(32, 32);
+		Shape7.mirror = true;
+		setRotation(Shape7, 0F, 0F, 0F);
+		convertToChild(mask, Shape7);
+		Shape8 = new ModelRenderer(this, 6, 23);
+		Shape8.addBox(0F, 0F, -3F, 2, 2, 1);
+		Shape8.setRotationPoint(-1F, -2F, -4F);
+		Shape8.setTextureSize(32, 32);
+		Shape8.mirror = true;
+		setRotation(Shape8, 0.6108652F, 0F, 0F);
+		convertToChild(mask, Shape8);
+		Shape9 = new ModelRenderer(this, 18, 21);
+		Shape9.addBox(0F, -1F, -5F, 3, 4, 2);
+		Shape9.setRotationPoint(-1.5F, -2F, -4F);
+		Shape9.setTextureSize(32, 32);
+		Shape9.mirror = true;
+		setRotation(Shape9, 0.6108652F, 0F, 0F);
+		convertToChild(mask, Shape9);
+		Shape10 = new ModelRenderer(this, 18, 16);
+		Shape10.addBox(0F, -0.5F, -5F, 4, 3, 2);
+		Shape10.setRotationPoint(-2F, -2F, -4F);
+		Shape10.setTextureSize(32, 32);
+		Shape10.mirror = true;
+		setRotation(Shape10, 0.6108652F, 0F, 0F);
+		convertToChild(mask, Shape10);
+	}
+
+	@Override
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
+		EntityPlayer player = (EntityPlayer) entity;
+		if (player.isSneaking()) {
+			this.isSneak = true;
+		} else {
+			this.isSneak = false;
+		}
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		this.mask.rotationPointX = this.bipedHead.rotationPointX;
+		this.mask.rotationPointY = this.bipedHead.rotationPointY;
+		this.mask.rotateAngleY = this.bipedHead.rotateAngleY;
+		this.mask.rotateAngleX = this.bipedHead.rotateAngleX;
+	}
+
+	@Override
+	public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
+		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
+		GL11.glPushMatrix();
+		double d = 1D / 16D * 18D;
+		GL11.glScaled(d, d, d);
+		this.mask.render(par7);
+		GL11.glPopMatrix();
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+	protected void convertToChild(ModelRenderer parParent, ModelRenderer parChild) {
+		// move child rotation point to be relative to parent
+		parChild.rotationPointX -= parParent.rotationPointX;
+		parChild.rotationPointY -= parParent.rotationPointY;
+		parChild.rotationPointZ -= parParent.rotationPointZ;
+		// make rotations relative to parent
+		parChild.rotateAngleX -= parParent.rotateAngleX;
+		parChild.rotateAngleY -= parParent.rotateAngleY;
+		parChild.rotateAngleZ -= parParent.rotateAngleZ;
+		// create relationship
+		parParent.addChild(parChild);
+	}
+
+}

com/hbm/world/Antenna.java

@@ -83,7 +83,7 @@ public class Antenna extends WorldGenerator
 		world.setBlock(x + 1, y + 0, z + 0, ModBlocks.steel_poles, 2, 3);
 		world.setBlock(x + 2, y + 0, z + 0, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 1, ModBlocks.steel_poles, 4, 3);
-		world.setBlock(x + 1, y + 0, z + 1, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 1, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 2, y + 0, z + 1, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 0, y + 0, z + 2, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 0, z + 2, ModBlocks.steel_poles, 3, 3);
@@ -94,19 +94,19 @@ public class Antenna extends WorldGenerator
 		world.setBlock(x + 1, y + 1, z + 0, ModBlocks.steel_poles, 2, 3);
 		world.setBlock(x + 2, y + 1, z + 0, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 1, ModBlocks.steel_poles, 4, 3);
-		world.setBlock(x + 1, y + 1, z + 1, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 1, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 2, y + 1, z + 1, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 0, y + 1, z + 2, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 1, z + 2, ModBlocks.steel_poles, 3, 3);
 		world.setBlock(x + 2, y + 1, z + 2, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 0, Blocks.air, 0, 3);
-		world.setBlock(x + 1, y + 2, z + 0, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 0, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 2, y + 2, z + 0, Blocks.air, 0, 3);
-		world.setBlock(x + 0, y + 2, z + 1, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 0, y + 2, z + 1, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 1, y + 2, z + 1, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 1, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 2, z + 1, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 2, z + 1, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 2, Blocks.air, 0, 3);
-		world.setBlock(x + 1, y + 2, z + 2, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 2, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 2, y + 2, z + 2, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 3, z + 0, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 3, z + 0, Blocks.air, 0, 3);

com/hbm/world/Bunker.java

@@ -22,8 +22,8 @@ public class Bunker extends WorldGenerator
 	Block Block1 = ModBlocks.reinforced_brick;
 	Block Block2 = ModBlocks.brick_concrete;
 	Block Block3 = ModBlocks.reinforced_light;
-	Block Block4 = ModBlocks.block_steel;
+	Block Block4 = ModBlocks.deco_steel;
-	Block Block5 = ModBlocks.block_tungsten;
+	Block Block5 = ModBlocks.deco_tungsten;
 	
 	protected Block[] GetValidSpawnBlocks()
 	{

com/hbm/world/CrashedVertibird.java

@@ -18,10 +18,10 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 
 public class CrashedVertibird extends WorldGenerator
 {
-	Block Block1 = ModBlocks.block_steel;
+	Block Block1 = ModBlocks.deco_steel;
-	Block Block2 = ModBlocks.block_tungsten;
+	Block Block2 = ModBlocks.deco_tungsten;
 	Block Block3 = ModBlocks.reinforced_glass;
-	Block Block4 = ModBlocks.block_titanium;
+	Block Block4 = ModBlocks.deco_titanium;
 	
 	protected Block[] GetValidSpawnBlocks()
 	{

com/hbm/world/DesertAtom001.java

@@ -21,9 +21,9 @@ public class DesertAtom001 extends WorldGenerator
 	Block Block2 = ModBlocks.yellow_barrel;
 	Block Block3 = ModBlocks.reinforced_sand;
 	Block Block4 = ModBlocks.nuke_man;
-	Block Block5 = ModBlocks.block_steel;
+	Block Block5 = ModBlocks.deco_steel;
 	Block Block6 = ModBlocks.brick_light;
-	Block Block7 = ModBlocks.block_tungsten;
+	Block Block7 = ModBlocks.deco_tungsten;
 	Block Block8 = ModBlocks.steel_poles;
 	Block Block9 = ModBlocks.tape_recorder;
 	Block Block10 = ModBlocks.machine_nuke_furnace_off;
@@ -31,7 +31,7 @@ public class DesertAtom001 extends WorldGenerator
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
 	Block Block14 = ModBlocks.machine_generator;
-	Block Block15 = ModBlocks.block_titanium;
+	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.machine_reactor;
 	Block Block17 = ModBlocks.ore_schrabidium;
 	Block Block18 = ModBlocks.waste_planks;
@@ -40,7 +40,7 @@ public class DesertAtom001 extends WorldGenerator
 	Block Block21 = ModBlocks.machine_puf6_tank;
 	Block Block22 = ModBlocks.reinforced_brick;
 	Block Block23 = ModBlocks.waste_earth;
-	Block Block24 = ModBlocks.block_lead;
+	Block Block24 = ModBlocks.deco_lead;
 	Block Block25 = ModBlocks.red_wire_coated;
 	Block Block26 = ModBlocks.block_uranium;
 	Block Block27 = ModBlocks.pole_top;

com/hbm/world/DesertAtom002.java

@@ -20,9 +20,9 @@ public class DesertAtom002
 	Block Block2 = ModBlocks.yellow_barrel;
 	Block Block3 = ModBlocks.reinforced_sand;
 	Block Block4 = ModBlocks.nuke_man;
-	Block Block5 = ModBlocks.block_steel;
+	Block Block5 = ModBlocks.deco_steel;
 	Block Block6 = ModBlocks.brick_light;
-	Block Block7 = ModBlocks.block_tungsten;
+	Block Block7 = ModBlocks.deco_tungsten;
 	Block Block8 = ModBlocks.steel_poles;
 	Block Block9 = ModBlocks.tape_recorder;
 	Block Block10 = ModBlocks.machine_nuke_furnace_off;
@@ -30,7 +30,7 @@ public class DesertAtom002
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
 	Block Block14 = ModBlocks.machine_generator;
-	Block Block15 = ModBlocks.block_titanium;
+	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.machine_reactor;
 	Block Block17 = ModBlocks.ore_nether_plutonium;
 	Block Block18 = ModBlocks.waste_planks;
@@ -39,7 +39,7 @@ public class DesertAtom002
 	Block Block21 = ModBlocks.machine_puf6_tank;
 	Block Block22 = ModBlocks.reinforced_brick;
 	Block Block23 = ModBlocks.waste_earth;
-	Block Block24 = ModBlocks.block_lead;
+	Block Block24 = ModBlocks.deco_lead;
 	Block Block25 = ModBlocks.red_wire_coated;
 	Block Block26 = ModBlocks.block_uranium;
 	Block Block27 = ModBlocks.pole_top;

com/hbm/world/DesertAtom003.java

@@ -24,9 +24,9 @@ public class DesertAtom003
 	Block Block2 = ModBlocks.yellow_barrel;
 	Block Block3 = ModBlocks.reinforced_sand;
 	Block Block4 = ModBlocks.nuke_man;
-	Block Block5 = ModBlocks.block_steel;
+	Block Block5 = ModBlocks.deco_steel;
 	Block Block6 = ModBlocks.brick_light;
-	Block Block7 = ModBlocks.block_tungsten;
+	Block Block7 = ModBlocks.deco_tungsten;
 	Block Block8 = ModBlocks.steel_poles;
 	Block Block9 = ModBlocks.tape_recorder;
 	Block Block10 = ModBlocks.machine_nuke_furnace_off;
@@ -34,7 +34,7 @@ public class DesertAtom003
 	Block Block12 = ModBlocks.reinforced_lamp_off;
 	Block Block13 = ModBlocks.pole_satellite_receiver;
 	Block Block14 = ModBlocks.machine_generator;
-	Block Block15 = ModBlocks.block_titanium;
+	Block Block15 = ModBlocks.deco_titanium;
 	Block Block16 = ModBlocks.machine_reactor;
 	Block Block17 = ModBlocks.ore_schrabidium;
 	Block Block18 = ModBlocks.waste_planks;
@@ -43,7 +43,7 @@ public class DesertAtom003
 	Block Block21 = ModBlocks.machine_puf6_tank;
 	Block Block22 = ModBlocks.reinforced_brick;
 	Block Block23 = ModBlocks.waste_earth;
-	Block Block24 = ModBlocks.block_lead;
+	Block Block24 = ModBlocks.deco_lead;
 	Block Block25 = ModBlocks.red_wire_coated;
 	Block Block26 = ModBlocks.block_uranium;
 	Block Block27 = ModBlocks.pole_top;

com/hbm/world/Radio01.java

@@ -434,20 +434,20 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 5, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 5, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 6, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 4, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 0, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 0, z + 6, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 0, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 8, y + 0, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 0, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 7, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 7, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 7, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 7, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 7, Blocks.web, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 0, z + 7, Blocks.air, 0, 3);
@@ -456,8 +456,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 8, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 8, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 3, y + 0, z + 8, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 4, y + 0, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 8, Blocks.air, 0, 3);
@@ -468,9 +468,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 9, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 9, Blocks.oak_stairs, 0, 3);
 		world.setBlock(x + 6, y + 0, z + 9, Blocks.air, 0, 3);
@@ -490,8 +490,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 10, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 11, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 11, ModBlocks.block_titanium, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 11, ModBlocks.deco_titanium, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 11, ModBlocks.block_titanium, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 11, ModBlocks.deco_titanium, 0, 3);
 		world.setBlock(x + 3, y + 0, z + 11, ModBlocks.steel_poles, 5, 3);
 		world.setBlock(x + 4, y + 0, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 11, Blocks.flower_pot, 0, 3);
@@ -503,9 +503,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 11, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 12, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 12, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 0, z + 12, Blocks.flower_pot, 0, 3);
@@ -514,9 +514,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 12, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 13, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 13, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 13, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 13, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 0, z + 13, Blocks.air, 0, 3);
@@ -526,9 +526,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 0, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 13, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 14, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 0, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 0, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 0, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 0, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 0, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 0, z + 14, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 0, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 0, z + 14, Blocks.air, 0, 3);
@@ -634,24 +634,24 @@ public class Radio01 extends WorldGenerator
         ItemDoor.placeDoorBlock(world, x + 2, y + 0, z + 23, 0, Blocks.wooden_door);
 		world.setBlock(x + 3, y + 0, z + 23, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 0, z + 23, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 0, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 0, z + 23, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 0, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 0, z + 23, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 0, z + 23, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 0, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 0, z + 23, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 0, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 0, z + 23, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 23, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 0, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 0, z + 24, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 3, y + 0, z + 24, ModBlocks.pole_top, 2, 3);
 		world.setBlock(x + 4, y + 0, z + 24, ModBlocks.pole_top, 2, 3);
-		world.setBlock(x + 5, y + 0, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 0, z + 24, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 0, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 0, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 0, z + 24, Blocks.chest, 2, 3);
 		world.setBlockMetadataWithNotify(x + 7, y + 0, z + 24, 5, 3);
         WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(2), (TileEntityChest)world.getTileEntity(x + 7, y + 0, z + 24), 8);
-		world.setBlock(x + 8, y + 0, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 0, z + 24, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 0, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 0, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 0, z + 24, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 0, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 0, z + 25, Blocks.air, 0, 3);
@@ -731,19 +731,19 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 5, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 5, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 6, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 1, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 1, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 4, y + 1, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 1, z + 6, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 6, ModBlocks.tape_recorder, 3, 3);
-		world.setBlock(x + 6, y + 1, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 1, z + 6, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 1, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 8, y + 1, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 1, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 7, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 7, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 7, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 3, y + 1, z + 7, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 4, y + 1, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 7, Blocks.air, 0, 3);
@@ -753,8 +753,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 8, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 8, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 3, y + 1, z + 8, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 4, y + 1, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 8, Blocks.air, 0, 3);
@@ -764,8 +764,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 9, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 3, y + 1, z + 9, ModBlocks.tape_recorder, 5, 3);
 		world.setBlock(x + 4, y + 1, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 9, Blocks.air, 0, 3);
@@ -786,8 +786,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 10, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 11, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 11, ModBlocks.block_titanium, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 11, ModBlocks.deco_titanium, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 11, ModBlocks.block_titanium, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 11, ModBlocks.deco_titanium, 0, 3);
 		world.setBlock(x + 3, y + 1, z + 11, ModBlocks.steel_poles, 5, 3);
 		world.setBlock(x + 4, y + 1, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 11, Blocks.air, 0, 3);
@@ -797,9 +797,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 11, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 12, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 1, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 1, z + 12, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 1, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 1, z + 12, Blocks.air, 0, 3);
@@ -808,10 +808,10 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 12, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 13, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 13, ModBlocks.block_tungsten, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 13, ModBlocks.deco_tungsten, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 13, ModBlocks.block_tungsten, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 13, ModBlocks.deco_tungsten, 0, 3);
-		world.setBlock(x + 3, y + 1, z + 13, ModBlocks.block_tungsten, 0, 3);
+		world.setBlock(x + 3, y + 1, z + 13, ModBlocks.deco_tungsten, 0, 3);
-		world.setBlock(x + 4, y + 1, z + 13, ModBlocks.block_tungsten, 0, 3);
+		world.setBlock(x + 4, y + 1, z + 13, ModBlocks.deco_tungsten, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 1, z + 13, Blocks.air, 0, 3);
 		//world.setBlock(x + 7, y + 1, z + 13, Blocks.iron_door, 8, 3);
@@ -819,9 +819,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 1, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 13, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 14, ModBlocks.brick_concrete, 0, 3);
-		world.setBlock(x + 1, y + 1, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 1, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 2, y + 1, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 2, y + 1, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 3, y + 1, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 3, y + 1, z + 14, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 4, y + 1, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 1, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 1, z + 14, Blocks.web, 0, 3);
@@ -922,22 +922,22 @@ public class Radio01 extends WorldGenerator
 		//world.setBlock(x + 2, y + 1, z + 23, Blocks.wooden_door, 8, 3);
 		world.setBlock(x + 3, y + 1, z + 23, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 1, z + 23, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 1, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 1, z + 23, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 1, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 1, z + 23, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 1, z + 23, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 1, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 1, z + 23, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 1, z + 23, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 1, z + 23, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 23, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 1, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 1, z + 24, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 3, y + 1, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 1, z + 24, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 1, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 1, z + 24, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 1, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 1, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 1, z + 24, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 1, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 1, z + 24, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 1, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 1, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 1, z + 24, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 1, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 1, y + 1, z + 25, Blocks.air, 0, 3);
@@ -1039,7 +1039,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 9, y + 2, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 2, z + 7, Blocks.glass_pane, 0, 3);
 		world.setBlock(x + 0, y + 2, z + 8, ModBlocks.pole_satellite_receiver, 2, 3);
-		world.setBlock(x + 1, y + 2, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 1, y + 2, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 2, y + 2, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 2, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 2, z + 8, Blocks.web, 0, 3);
@@ -1606,8 +1606,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 7, y + 4, z + 6, Blocks.chest, 4, 3);
 		world.setBlockMetadataWithNotify(x + 7, y + 4, z + 6, 5, 3);
         WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(1), (TileEntityChest)world.getTileEntity(x + 7, y + 4, z + 6), 8);
-		world.setBlock(x + 8, y + 4, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 4, z + 6, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 4, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 4, z + 6, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 4, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 4, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 4, z + 7, Blocks.air, 0, 3);
@@ -1619,7 +1619,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 6, y + 4, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 4, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 4, z + 7, ModBlocks.tape_recorder, 4, 3);
-		world.setBlock(x + 9, y + 4, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 4, z + 7, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 4, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 4, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 4, z + 8, Blocks.air, 0, 3);
@@ -1629,8 +1629,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 5, y + 4, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 4, z + 8, Blocks.oak_stairs, 2, 3);
 		world.setBlock(x + 7, y + 4, z + 8, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 4, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 4, z + 8, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 4, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 4, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 4, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 4, z + 9, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 4, z + 9, Blocks.air, 0, 3);
@@ -1640,8 +1640,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 5, y + 4, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 4, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 4, z + 9, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 4, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 4, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 4, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 4, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 4, z + 9, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 4, z + 10, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 4, z + 10, Blocks.air, 0, 3);
@@ -1810,7 +1810,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 4, y + 4, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 4, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 4, z + 24, Blocks.air, 0, 3);
-		world.setBlock(x + 7, y + 4, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 7, y + 4, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 8, y + 4, z + 24, ModBlocks.tape_recorder, 2, 3);
 		world.setBlock(x + 9, y + 4, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 4, z + 24, ModBlocks.brick_concrete, 0, 3);
@@ -1900,7 +1900,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 6, y + 5, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 5, z + 6, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 5, z + 6, ModBlocks.tape_recorder, 4, 3);
-		world.setBlock(x + 9, y + 5, z + 6, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 5, z + 6, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 6, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 5, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 5, z + 7, Blocks.air, 0, 3);
@@ -1911,7 +1911,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 6, y + 5, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 5, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 5, z + 7, ModBlocks.tape_recorder, 4, 3);
-		world.setBlock(x + 9, y + 5, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 5, z + 7, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 7, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 5, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 5, z + 8, Blocks.air, 0, 3);
@@ -1921,8 +1921,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 5, y + 5, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 5, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 5, z + 8, Blocks.air, 0, 3);
-		world.setBlock(x + 8, y + 5, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 5, z + 8, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 9, y + 5, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 5, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 8, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 5, z + 9, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 5, z + 9, Blocks.air, 0, 3);
@@ -1933,7 +1933,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 6, y + 5, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 5, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 5, z + 9, ModBlocks.tape_recorder, 4, 3);
-		world.setBlock(x + 9, y + 5, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 9, y + 5, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 9, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 0, y + 5, z + 10, ModBlocks.brick_concrete, 0, 3);
 		world.setBlock(x + 1, y + 5, z + 10, Blocks.air, 0, 3);
@@ -2096,8 +2096,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 4, y + 5, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 5, y + 5, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 5, z + 24, Blocks.air, 0, 3);
-		world.setBlock(x + 7, y + 5, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 7, y + 5, z + 24, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 8, y + 5, z + 24, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 5, z + 24, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 9, y + 5, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 24, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 5, z + 25, Blocks.air, 0, 3);
@@ -2108,7 +2108,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 5, y + 5, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 6, y + 5, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 5, z + 25, ModBlocks.pole_satellite_receiver, 4, 3);
-		world.setBlock(x + 8, y + 5, z + 25, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 8, y + 5, z + 25, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 9, y + 5, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 5, z + 25, Blocks.air, 0, 3);
 		world.setBlock(x + 0, y + 6, z + 0, ModBlocks.brick_concrete, 0, 3);
@@ -2765,7 +2765,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 8, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 8, z + 7, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 7, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 7, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 8, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 7, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 7, Blocks.air, 0, 3);
@@ -2776,7 +2776,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 8, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 8, z + 8, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 8, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 8, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 8, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 8, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 8, Blocks.air, 0, 3);
@@ -2786,9 +2786,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 9, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 9, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 8, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 9, Blocks.air, 0, 3);
@@ -2797,10 +2797,10 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 10, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 10, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 10, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 8, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 10, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 7, y + 8, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 7, y + 8, z + 10, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 10, y + 8, z + 10, ModBlocks.brick_concrete, 0, 3);
@@ -2808,11 +2808,11 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 11, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 11, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 11, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 5, y + 8, z + 11, Blocks.chest, 4, 3);
 		world.setBlockMetadataWithNotify(x + 5, y + 8, z + 11, 5, 3);
         WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(3), (TileEntityChest)world.getTileEntity(x + 5, y + 8, z + 11), 16);
-		world.setBlock(x + 6, y + 8, z + 11, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 11, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 11, Blocks.air, 0, 3);
@@ -2821,9 +2821,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 12, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 12, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 8, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 12, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 12, Blocks.air, 0, 3);
@@ -2832,9 +2832,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 13, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 13, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 13, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 8, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 13, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 13, Blocks.air, 0, 3);
@@ -2843,9 +2843,9 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 1, y + 8, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 2, y + 8, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 14, Blocks.air, 0, 3);
-		world.setBlock(x + 4, y + 8, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 4, y + 8, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 14, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 8, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 8, z + 14, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 8, z + 14, Blocks.air, 0, 3);
@@ -2855,7 +2855,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 8, z + 15, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 8, z + 15, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 8, z + 15, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 8, z + 15, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 8, z + 15, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 8, z + 15, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 8, z + 15, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 8, z + 15, Blocks.air, 0, 3);
@@ -3075,7 +3075,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 9, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 9, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 9, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 9, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 9, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 9, z + 9, Blocks.air, 0, 3);
@@ -3086,8 +3086,8 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 10, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 10, ModBlocks.deco_steel, 0, 3);
-		world.setBlock(x + 6, y + 9, z + 10, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 6, y + 9, z + 10, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 9, z + 10, Blocks.air, 0, 3);
 		world.setBlock(x + 9, y + 9, z + 10, Blocks.air, 0, 3);
@@ -3097,7 +3097,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 11, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 11, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 11, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 9, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 11, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 9, z + 11, Blocks.air, 0, 3);
@@ -3108,7 +3108,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 12, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 12, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 12, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 9, z + 12, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 12, Blocks.air, 0, 3);
 
@@ -3127,7 +3127,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 13, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 13, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 13, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 9, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 13, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 9, z + 13, Blocks.air, 0, 3);
@@ -3138,7 +3138,7 @@ public class Radio01 extends WorldGenerator
 		world.setBlock(x + 2, y + 9, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 3, y + 9, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 4, y + 9, z + 14, Blocks.air, 0, 3);
-		world.setBlock(x + 5, y + 9, z + 14, ModBlocks.block_steel, 0, 3);
+		world.setBlock(x + 5, y + 9, z + 14, ModBlocks.deco_steel, 0, 3);
 		world.setBlock(x + 6, y + 9, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 7, y + 9, z + 14, Blocks.air, 0, 3);
 		world.setBlock(x + 8, y + 9, z + 14, Blocks.air, 0, 3);

com/hbm/world/Relay.java

@@ -20,13 +20,13 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 public class Relay extends WorldGenerator
 {
 	Block Block1 = ModBlocks.reinforced_brick;
-	Block Block2 = ModBlocks.block_steel;
+	Block Block2 = ModBlocks.deco_steel;
 	Block Block3 = ModBlocks.brick_concrete;
 	Block Block4 = ModBlocks.steel_scaffold;
 	Block Block5 = ModBlocks.reinforced_glass;
-	Block Block6 = ModBlocks.block_beryllium;
+	Block Block6 = ModBlocks.deco_beryllium;
-	Block Block7 = ModBlocks.block_red_copper;
+	Block Block7 = ModBlocks.deco_red_copper;
-	Block Block8 = ModBlocks.block_tungsten;
+	Block Block8 = ModBlocks.deco_tungsten;
 	Block Block9 = ModBlocks.pole_top;
 	
 	protected Block[] GetValidSpawnBlocks()

com/hbm/world/Satellite.java

@@ -19,12 +19,12 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 public class Satellite extends WorldGenerator
 {
 	Block Block1 = ModBlocks.brick_concrete;
-	Block Block2 = ModBlocks.block_steel;
+	Block Block2 = ModBlocks.deco_steel;
 	Block Block3 = ModBlocks.steel_scaffold;
-	Block Block4 = ModBlocks.block_beryllium;
+	Block Block4 = ModBlocks.deco_beryllium;
-	Block Block5 = ModBlocks.block_titanium;
+	Block Block5 = ModBlocks.deco_titanium;
 	Block Block6 = ModBlocks.tape_recorder;
-	Block Block7 = ModBlocks.block_tungsten;
+	Block Block7 = ModBlocks.deco_tungsten;
 	
 	protected Block[] GetValidSpawnBlocks()
 	{

com/hbm/world/Silo.java

@@ -23,7 +23,7 @@ public class Silo extends WorldGenerator
 	Block Block3 = ModBlocks.reinforced_light;
 	Block Block4 = ModBlocks.tape_recorder;
 	Block Block5 = ModBlocks.reinforced_glass;
-	Block Block6 = ModBlocks.block_steel;
+	Block Block6 = ModBlocks.deco_steel;
 	
 	protected Block[] GetValidSpawnBlocks()
 	{

com/hbm/world/Spaceship.java

@@ -17,9 +17,9 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 
 public class Spaceship extends WorldGenerator
 {
-	Block Block1 = ModBlocks.block_tungsten;
+	Block Block1 = ModBlocks.deco_tungsten;
 	Block Block2 = ModBlocks.fusion_conductor;
-	Block Block3 = ModBlocks.block_steel;
+	Block Block3 = ModBlocks.deco_steel;
 	Block Block4 = ModBlocks.fusion_heater;
 	Block Block5 = ModBlocks.block_meteor;
 	Block Block6 = ModBlocks.reactor_element;

com/hbm/world/Vertibird.java

@@ -18,10 +18,10 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 
 public class Vertibird extends WorldGenerator
 {
-	Block Block2 = ModBlocks.block_steel;
+	Block Block2 = ModBlocks.deco_steel;
-	Block Block1 = ModBlocks.block_tungsten;
+	Block Block1 = ModBlocks.deco_tungsten;
 	Block Block4 = ModBlocks.reinforced_glass;
-	Block Block3 = ModBlocks.block_titanium;
+	Block Block3 = ModBlocks.deco_titanium;
 	
 	protected Block[] GetValidSpawnBlocks()
 	{