decontaminator, guns using new bullet replacements

assets/hbm/lang/de_DE.lang

@@ -1074,7 +1074,7 @@ item.rod_waste.name=Atommüllstab
 item.rod_dual_waste.name=Doppelter Atommüllstab
 item.rod_quad_waste.name=Vierfacher Atommüllstab
 
-item.gun_rpg.name=Raketenwerfer
+item.gun_rpg.name=Carl Gustav Reaktive Panzerbüchse
 item.gun_rpg_ammo.name=Rakete
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_skystinger.name=The One Sky Stinger
@@ -1758,6 +1758,7 @@ tile.absorber.name=Strahlungs-Absorber
 tile.absorber_red.name=Verbesserter Strahlungs-Absorber
 tile.absorber_green.name=Fortgeschrittener Strahlungs-Absorber
 tile.absorber_pink.name=Elite Strahlungs-Absorber
+tile.decon.name=Spieler-Dekontaminierer
 
 item.schrabidium_hammer.name=Schrabidiumhammer
 item.shimmer_sledge.name=Shimmer Sledge

assets/hbm/lang/en_US.lang

@@ -1074,7 +1074,7 @@ item.rod_waste.name=Nuclear Waste Rod
 item.rod_dual_waste.name=Nuclear Waste Dual Rod
 item.rod_quad_waste.name=Nuclear Waste Quad Rod
 
-item.gun_rpg.name=Rocket Launcher
+item.gun_rpg.name=Carl Gustav Recoilless Rifle
 item.gun_rpg_ammo.name=Rocket
 item.gun_stinger.name=FIM-92 Stinger
 item.gun_skystinger.name=The One Sky Stinger
@@ -1758,6 +1758,7 @@ tile.absorber.name=Radiation Absorber
 tile.absorber_red.name=Enhanced Radiation Absorber
 tile.absorber_green.name=Advanced Radiation Absorber
 tile.absorber_pink.name=Elite Radiation Absorber
+tile.decon.name=Player Decontaminator
 
 item.schrabidium_hammer.name=Schrabidium Hammer
 item.shimmer_sledge.name=Shimmer Sledge

com/hbm/blocks/ModBlocks.java

@@ -571,6 +571,7 @@ public class ModBlocks {
 	public static Block absorber_red;
 	public static Block absorber_green;
 	public static Block absorber_pink;
+	public static Block decon;
 
 	public static Block mud_block;
 	public static Fluid mud_fluid;
@@ -1046,6 +1047,7 @@ public class ModBlocks {
 		absorber_red = new BlockAbsorber(Material.iron, 10F).setBlockName("absorber_red").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_red");
 		absorber_green = new BlockAbsorber(Material.iron, 100F).setBlockName("absorber_green").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_green");
 		absorber_pink = new BlockAbsorber(Material.iron, 10000F).setBlockName("absorber_pink").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":absorber_pink");
+		decon = new BlockDecon(Material.iron).setBlockName("decon").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":decon_side");
 
 		statue_elb = new DecoBlockAlt(Material.iron).setBlockName("#null").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
 		statue_elb_g = new DecoBlockAlt(Material.iron).setBlockName("#void").setHardness(Float.POSITIVE_INFINITY).setResistance(Float.POSITIVE_INFINITY);
@@ -1446,6 +1448,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(absorber_red, absorber_red.getUnlocalizedName());
 		GameRegistry.registerBlock(absorber_green, absorber_green.getUnlocalizedName());
 		GameRegistry.registerBlock(absorber_pink, absorber_pink.getUnlocalizedName());
+		GameRegistry.registerBlock(decon, decon.getUnlocalizedName());
 		
 		//Industrial Factories
 		GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName());

com/hbm/blocks/machine/BlockDecon.java

@@ -0,0 +1,59 @@
+package com.hbm.blocks.machine;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityDecon;
+import com.hbm.tileentity.machine.TileEntityMachineDeuterium;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class BlockDecon extends BlockContainer {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconTop;
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+		
+		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":decon_top");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":decon_side");
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		
+		return side == 1 ? this.iconTop : this.blockIcon;
+	}
+
+	public BlockDecon(Material mat) {
+		super(mat);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityDecon();
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) {
+		int l = p_149734_1_.getBlockMetadata(x, y, z);
+		float f = x + 0.5F;
+		float f1 = y + 1.0F;
+		float f2 = z + 0.5F;
+
+		p_149734_1_.spawnParticle("cloud", f, f1, f2, 0.0D, 0.1D, 0.0D);
+	}
+
+}

com/hbm/entity/projectile/EntityBulletBase.java

@@ -19,6 +19,7 @@ import com.hbm.main.MainRegistry;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IProjectile;
@@ -154,7 +155,7 @@ public class EntityBulletBase extends Entity implements IProjectile {
 		//entity detection
         Vec3 vecOrigin = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
         Vec3 vecDestination = Vec3.createVectorHelper(this.posX + this.motionX * this.config.velocity, this.posY + this.motionY * this.config.velocity, this.posZ + this.motionZ * this.config.velocity);
-        MovingObjectPosition movement = this.worldObj.rayTraceBlocks(vecOrigin, vecDestination);
+        MovingObjectPosition movement = this.worldObj.func_147447_a(vecOrigin, vecDestination, false, true, false);
         vecOrigin = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
         vecDestination = Vec3.createVectorHelper(this.posX + this.motionX * this.config.velocity, this.posY + this.motionY * this.config.velocity, this.posZ + this.motionZ * this.config.velocity);
 
@@ -224,7 +225,7 @@ public class EntityBulletBase extends Entity implements IProjectile {
         			onEntityHurt(victim);
         		
         	//handle block collision
-        	} else {
+        	} else if(worldObj.getBlock(movement.blockX, movement.blockY, movement.blockZ).getMaterial() != Material.air) {
         		
         		boolean hRic = rand.nextInt(100) < config.HBRC;
         		boolean doesRic = config.doesRicochet || hRic;

com/hbm/items/ModItems.java

@@ -1972,14 +1972,14 @@ public class ModItems {
 		stamp_9 = new ItemBlades(512).setUnlocalizedName("stamp_9").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_9");
 		stamp_50 = new ItemBlades(512).setUnlocalizedName("stamp_50").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_50");
 
-		blades_aluminium = new ItemBlades(1 * 1200).setUnlocalizedName("blades_aluminium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_aluminium");
+		blades_aluminium = new ItemBlades(10).setUnlocalizedName("blades_aluminium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_aluminium");
-		blades_gold = new ItemBlades(5 * 1200).setUnlocalizedName("blades_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_gold");
+		blades_gold = new ItemBlades(25).setUnlocalizedName("blades_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_gold");
-		blades_iron = new ItemBlades(10 * 1200).setUnlocalizedName("blades_iron").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_iron");
+		blades_iron = new ItemBlades(35).setUnlocalizedName("blades_iron").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_iron");
-		blades_steel = new ItemBlades(20 * 1200).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_steel");
+		blades_steel = new ItemBlades(50).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_steel");
-		blades_titanium = new ItemBlades(35 * 1200).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_titanium");
+		blades_titanium = new ItemBlades(65).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_titanium");
-		blades_advanced_alloy = new ItemBlades(50 * 1200).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_advanced_alloy");
+		blades_advanced_alloy = new ItemBlades(85).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_advanced_alloy");
-		blades_combine_steel = new ItemBlades(90 * 1200).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_combine_steel");
+		blades_combine_steel = new ItemBlades(150).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_combine_steel");
-		blades_schrabidium = new ItemBlades(120 * 1200).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_schrabidium");
+		blades_schrabidium = new ItemBlades(250).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_schrabidium");
 
 		part_lithium = new Item().setUnlocalizedName("part_lithium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_lithium");
 		part_beryllium = new Item().setUnlocalizedName("part_beryllium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":part_beryllium");
@@ -2251,50 +2251,50 @@ public class ModItems {
 		sat_interface = new ItemSatInterface().setUnlocalizedName("sat_interface").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":sat_interface");
 		
 		ammo_12gauge = new Item().setUnlocalizedName("ammo_12gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_12gauge");
-		ammo_12gauge_incendiary = new Item().setUnlocalizedName("ammo_12gauge_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_12gauge_incendiary");
+		ammo_12gauge_incendiary = new Item().setUnlocalizedName("ammo_12gauge_incendiary").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_12gauge_incendiary");
 		ammo_20gauge = new Item().setUnlocalizedName("ammo_20gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge");
 		ammo_20gauge_slug = new Item().setUnlocalizedName("ammo_20gauge_slug").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_slug");
-		ammo_20gauge_flechette = new Item().setUnlocalizedName("ammo_20gauge_flechette").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_flechette");
+		ammo_20gauge_flechette = new Item().setUnlocalizedName("ammo_20gauge_flechette").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_flechette");
-		ammo_20gauge_incendiary = new Item().setUnlocalizedName("ammo_20gauge_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_incendiary");
+		ammo_20gauge_incendiary = new Item().setUnlocalizedName("ammo_20gauge_incendiary").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_incendiary");
-		ammo_20gauge_explosive = new Item().setUnlocalizedName("ammo_20gauge_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_explosive");
+		ammo_20gauge_explosive = new Item().setUnlocalizedName("ammo_20gauge_explosive").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_explosive");
-		ammo_20gauge_caustic = new Item().setUnlocalizedName("ammo_20gauge_caustic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_caustic");
+		ammo_20gauge_caustic = new Item().setUnlocalizedName("ammo_20gauge_caustic").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_caustic");
-		ammo_20gauge_shock = new Item().setUnlocalizedName("ammo_20gauge_shock").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_shock");
+		ammo_20gauge_shock = new Item().setUnlocalizedName("ammo_20gauge_shock").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_shock");
-		ammo_20gauge_wither = new Item().setUnlocalizedName("ammo_20gauge_wither").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_wither");
+		ammo_20gauge_wither = new Item().setUnlocalizedName("ammo_20gauge_wither").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_20gauge_wither");
 		ammo_5mm = new Item().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm");
-		ammo_5mm_explosive = new Item().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive");
+		ammo_5mm_explosive = new Item().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive");
-		ammo_5mm_du = new Item().setUnlocalizedName("ammo_5mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_du");
+		ammo_5mm_du = new Item().setUnlocalizedName("ammo_5mm_du").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_5mm_du");
 		ammo_9mm = new Item().setUnlocalizedName("ammo_9mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm");
-		ammo_9mm_ap = new Item().setUnlocalizedName("ammo_9mm_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_ap");
+		ammo_9mm_ap = new Item().setUnlocalizedName("ammo_9mm_ap").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_9mm_ap");
-		ammo_9mm_du = new Item().setUnlocalizedName("ammo_9mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_du");
+		ammo_9mm_du = new Item().setUnlocalizedName("ammo_9mm_du").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_9mm_du");
 		ammo_50bmg = new Item().setUnlocalizedName("ammo_50bmg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg");
-		ammo_50bmg_incendiary = new Item().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary");
+		ammo_50bmg_incendiary = new Item().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary");
-		ammo_50bmg_explosive = new Item().setUnlocalizedName("ammo_50bmg_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_explosive");
+		ammo_50bmg_explosive = new Item().setUnlocalizedName("ammo_50bmg_explosive").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_50bmg_explosive");
-		ammo_50bmg_du = new Item().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_du");
+		ammo_50bmg_du = new Item().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_50bmg_du");
 		ammo_44 = new Item().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44");
-		ammo_44_ap = new Item().setUnlocalizedName("ammo_44_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_ap");
+		ammo_44_ap = new Item().setUnlocalizedName("ammo_44_ap").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_44_ap");
-		ammo_44_du = new Item().setUnlocalizedName("ammo_44_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_du");
+		ammo_44_du = new Item().setUnlocalizedName("ammo_44_du").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_44_du");
 		ammo_44_pip = new Item().setUnlocalizedName("ammo_44_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_pip");
-		ammo_44_bj = new Item().setUnlocalizedName("ammo_44_bj").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_bj");
+		ammo_44_bj = new Item().setUnlocalizedName("ammo_44_bj").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_44_bj");
 		ammo_22lr = new Item().setUnlocalizedName("ammo_22lr").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr");
-		ammo_22lr_ap = new Item().setUnlocalizedName("ammo_22lr_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr_ap");
+		ammo_22lr_ap = new Item().setUnlocalizedName("ammo_22lr_ap").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_22lr_ap");
 		ammo_folly = new ItemCustomLore().setUnlocalizedName("ammo_folly").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly");
 		ammo_folly_nuclear = new ItemCustomLore().setUnlocalizedName("ammo_folly_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly_nuclear");
 		ammo_folly_du = new ItemCustomLore().setUnlocalizedName("ammo_folly_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly_du");
 		ammo_rocket = new Item().setUnlocalizedName("ammo_rocket").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket");
-		ammo_rocket_he = new Item().setUnlocalizedName("ammo_rocket_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_he");
+		ammo_rocket_he = new Item().setUnlocalizedName("ammo_rocket_he").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_he");
-		ammo_rocket_incendiary = new Item().setUnlocalizedName("ammo_rocket_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_incendiary");
+		ammo_rocket_incendiary = new Item().setUnlocalizedName("ammo_rocket_incendiary").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_incendiary");
-		ammo_rocket_shrapnel = new Item().setUnlocalizedName("ammo_rocket_shrapnel").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_shrapnel");
+		ammo_rocket_shrapnel = new Item().setUnlocalizedName("ammo_rocket_shrapnel").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_shrapnel");
-		ammo_rocket_emp = new Item().setUnlocalizedName("ammo_rocket_emp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_emp");
+		ammo_rocket_emp = new Item().setUnlocalizedName("ammo_rocket_emp").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_emp");
-		ammo_rocket_glare = new Item().setUnlocalizedName("ammo_rocket_glare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_glare");
+		ammo_rocket_glare = new Item().setUnlocalizedName("ammo_rocket_glare").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_glare");
-		ammo_rocket_sleek = new Item().setUnlocalizedName("ammo_rocket_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_sleek");
+		ammo_rocket_sleek = new Item().setUnlocalizedName("ammo_rocket_sleek").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ammo_rocket_sleek");
 		ammo_grenade = new Item().setUnlocalizedName("ammo_grenade").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade");
 		ammo_grenade_he = new Item().setUnlocalizedName("ammo_grenade_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_he");
 		ammo_grenade_incendiary = new Item().setUnlocalizedName("ammo_grenade_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_incendiary");
 		ammo_grenade_toxic = new Item().setUnlocalizedName("ammo_grenade_toxic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_toxic");
 		ammo_grenade_sleek = new Item().setUnlocalizedName("ammo_grenade_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_sleek");
 		
-		gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_rpg_new");
+		gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_rpg");
-		gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt");
+		gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt");
 		gun_stinger = new GunStinger().setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger");
 		gun_skystinger = new GunStinger().setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger");
 		gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger_ammo");
@@ -2317,11 +2317,11 @@ public class ModItems {
 		gun_revolver_nightmare2_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare2_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2_ammo");
 		gun_revolver_nightmare2 = new GunNightmare().setMaxDamage(6).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2");
 		gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo");
-		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_revolver_pip = new GunRevolver(ammo_44_pip, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip");
 		gun_revolver_nopip_ammo = new Item().setUnlocalizedName("gun_revolver_nopip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_nopip_ammo");
-		gun_revolver_nopip = new GunRevolver(gun_revolver_nopip_ammo, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip");
+		gun_revolver_nopip = new GunRevolver(ammo_44, 25, 35, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip");
-		gun_revolver_blackjack = new GunRevolver(gun_revolver_nopip_ammo, 35, 45, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack");
+		gun_revolver_blackjack = new GunRevolver(ammo_44_bj, 35, 45, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack");
-		gun_revolver_red = new GunRevolver(gun_revolver_nopip_ammo, 100, 105, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_red").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_red");
+		gun_revolver_red = new GunRevolver(ammo_44, 100, 105, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_red").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_red");
 		gun_calamity_ammo = new ItemCustomLore().setUnlocalizedName("gun_calamity_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_calamity_ammo");
 		gun_calamity = new GunCalamity().setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity");
 		gun_calamity_dual = new GunCalamity().setUnlocalizedName("gun_calamity_dual").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity_dual");

com/hbm/items/weapon/GunBoltAction.java

@@ -60,7 +60,7 @@ public class GunBoltAction extends Item {
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
 
-		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_bolt_action_ammo)) {
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.ammo_20gauge_slug)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
@@ -83,7 +83,7 @@ public class GunBoltAction extends Item {
 			p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 5.0F, 0.75F);
 
 			if (flag) { } else {
-				p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_bolt_action_ammo);
+				p_77615_3_.inventory.consumeInventoryItem(ModItems.ammo_20gauge_slug);
 			}
 
 			if (!p_77615_2_.isRemote) {

com/hbm/items/weapon/GunCalamity.java

@@ -65,7 +65,7 @@ public class GunCalamity extends Item {
 					if (flag) {
 						entityarrow.canBePickedUp = 2;
 					} else {
-						player.inventory.consumeInventoryItem(ModItems.gun_calamity_ammo);
+						player.inventory.consumeInventoryItem(ModItems.ammo_50bmg);
 					}
 
 					if (!world.isRemote) {
@@ -82,7 +82,7 @@ public class GunCalamity extends Item {
 					if (flag) {
 						entityarrow.canBePickedUp = 2;
 					} else {
-						player.inventory.consumeInventoryItem(ModItems.gun_calamity_ammo);
+						player.inventory.consumeInventoryItem(ModItems.ammo_50bmg);
 					}
 
 					if (!world.isRemote) {

com/hbm/items/weapon/GunLacunae.java

@@ -62,18 +62,18 @@ public class GunLacunae extends Item implements IHoldableWeapon {
 		boolean flag = player.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
 
-				if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_lacunae_ammo)) && count % 1 == 0 && this.getMaxItemUseDuration(stack) - count > 15) {
+				if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_5mm)) && count % 1 == 0 && this.getMaxItemUseDuration(stack) - count > 15) {
 					
 					world.playSoundAtEntity(player, "hbm:weapon.lacunaeShoot", 1.0F, 1.0F);
 							
 					for(int i = 0; i < 3; i++) {
 						
-						if((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_lacunae_ammo))) {
+						if((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_5mm))) {
 							EntityBullet entityarrow = new EntityBullet(world, player, 3.0F);
 							entityarrow.setDamage(5);
 	
 							if(!flag)
-								player.inventory.consumeInventoryItem(ModItems.gun_lacunae_ammo);
+								player.inventory.consumeInventoryItem(ModItems.ammo_5mm);
 							
 							if (!world.isRemote) {
 								world.spawnEntityInWorld(entityarrow);

com/hbm/items/weapon/GunLeverAction.java

@@ -58,7 +58,7 @@ public class GunLeverAction extends Item {
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
 
-		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_lever_action_ammo)) {
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.ammo_12gauge)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
@@ -109,7 +109,7 @@ public class GunLeverAction extends Item {
 			p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShootAlt", 5.0F, 0.75F);
 
 			if (flag) { } else {
-				p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo);
+				p_77615_3_.inventory.consumeInventoryItem(ModItems.ammo_12gauge);
 			}
 
 			if (!p_77615_2_.isRemote) {

com/hbm/items/weapon/GunLeverActionS.java

@@ -56,7 +56,7 @@ public class GunLeverActionS extends Item {
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
 
-		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_lever_action_ammo)) {
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.ammo_12gauge)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
@@ -78,7 +78,7 @@ public class GunLeverActionS extends Item {
 			p_77615_3_.motionY += vec.yCoord * 0.75;
 			p_77615_3_.motionZ += vec.zCoord * 0.75;
 
-			p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_lever_action_ammo);
+			p_77615_3_.inventory.consumeInventoryItem(ModItems.ammo_12gauge);
 
 			p_77615_1_.damageItem(1, p_77615_3_);
 

com/hbm/items/weapon/GunRpg.java

@@ -48,7 +48,7 @@ public class GunRpg extends Item {
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
 
-		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_rpg_ammo)) {
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.ammo_rocket)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
@@ -72,7 +72,7 @@ public class GunRpg extends Item {
 			if (flag) {
 				entityarrow.canBePickedUp = 2;
 			} else {
-				p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_rpg_ammo);
+				p_77615_3_.inventory.consumeInventoryItem(ModItems.ammo_rocket);
 			}
 
 			if (!p_77615_2_.isRemote) {

com/hbm/items/weapon/GunSMG.java

@@ -58,7 +58,7 @@ public class GunSMG extends Item {
 
 		boolean flag = player.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
-		if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_mp40_ammo))
+		if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_9mm))
 				&& count % 2 == 0) {
 
 			EntityBulletBase bullet = new EntityBulletBase(world, BulletConfigSyncingUtil.TEST_CONFIG, player);
@@ -69,7 +69,7 @@ public class GunSMG extends Item {
 
 			if (flag) {
 			} else {
-				player.inventory.consumeInventoryItem(ModItems.gun_mp40_ammo);
+				player.inventory.consumeInventoryItem(ModItems.ammo_9mm);
 			}
 
 			if (!world.isRemote) {

com/hbm/items/weapon/GunShotgun.java

@@ -50,7 +50,7 @@ public class GunShotgun extends Item {
 		boolean flag = p_77615_3_.capabilities.isCreativeMode
 				|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
 
-		if (flag || p_77615_3_.inventory.hasItem(ModItems.gun_uboinik_ammo)) {
+		if (flag || p_77615_3_.inventory.hasItem(ModItems.ammo_12gauge)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
@@ -92,7 +92,7 @@ public class GunShotgun extends Item {
 			p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.shotgunShoot", 1.0F, 1.0F);
 
 			if (flag) { } else {
-				p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_uboinik_ammo);
+				p_77615_3_.inventory.consumeInventoryItem(ModItems.ammo_12gauge);
 			}
 
 			if (!p_77615_2_.isRemote) {

com/hbm/items/weapon/GunUZI.java

@@ -57,7 +57,7 @@ public class GunUZI extends Item implements IHoldableWeapon {
 
 		boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
 		
-		if (player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_uzi_ammo)) {
+		if (player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_22lr)) {
 			
 			EntityBullet entityarrow = new EntityBullet(world, player, 3.0F, 2, 4, false, false);
 			entityarrow.setDamage(2 + rand.nextInt(3));
@@ -73,7 +73,7 @@ public class GunUZI extends Item implements IHoldableWeapon {
 				world.playSoundAtEntity(player, "hbm:weapon.silencerShoot", 0.15F, 1.0F);
 
 			if (!flag) {
-				player.inventory.consumeInventoryItem(ModItems.gun_uzi_ammo);
+				player.inventory.consumeInventoryItem(ModItems.ammo_22lr);
 			}
 
 			if (!world.isRemote) {

com/hbm/items/weapon/ItemClip.java

@@ -56,7 +56,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_rpg)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_rocket, 3)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_rpg_ammo, 3), false);
         	}
@@ -116,7 +116,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_mp40)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_mp40_ammo, 32)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_9mm, 32)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false);
         	}
@@ -124,7 +124,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_uzi)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uzi_ammo, 32)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_22lr, 32)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_uzi_ammo, 32), false);
         	}
@@ -132,7 +132,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_uboinik)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uboinik_ammo, 24)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_12gauge, 24)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_uboinik_ammo, 24), false);
         	}
@@ -140,7 +140,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_lever_action)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action_ammo, 24)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge, 24)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_lever_action_ammo, 24), false);
         	}
@@ -148,7 +148,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_bolt_action)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_bolt_action_ammo, 24)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge_flechette, 24)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_bolt_action_ammo, 24), false);
         	}
@@ -212,7 +212,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_revolver_pip)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 6)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44_pip, 6)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false);
         	}
@@ -220,7 +220,7 @@ public class ItemClip extends Item {
 		
 		if(this == ModItems.clip_revolver_nopip)
 		{
-			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nopip_ammo, 12)))
+			if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44, 12)))
         	{
         		//player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false);
         	}
@@ -293,34 +293,34 @@ public class ItemClip extends Item {
 			if(player.inventory.hasItem(ModItems.gun_revolver_nightmare2))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 3));
 			if(player.inventory.hasItem(ModItems.gun_revolver_pip))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44_pip, 12));
 			if(player.inventory.hasItem(ModItems.gun_revolver_nopip))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nopip_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44, 12));
 			if(player.inventory.hasItem(ModItems.gun_revolver_blackjack))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nopip_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44_bj, 12));
 			if(player.inventory.hasItem(ModItems.gun_revolver_red))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nopip_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_44, 12));
 			if(player.inventory.hasItem(ModItems.gun_calamity))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_calamity_ammo, 16));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_50bmg, 16));
 			if(player.inventory.hasItem(ModItems.gun_calamity_dual))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_calamity_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_50bmg, 32));
 			if(player.inventory.hasItem(ModItems.gun_minigun)) {
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
 			}
 			if(player.inventory.hasItem(ModItems.gun_avenger)) {
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
 			}
 			if(player.inventory.hasItem(ModItems.gun_lacunae)) {
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lacunae_ammo, 64));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_5mm, 64));
 			}
 			if(player.inventory.hasItem(ModItems.gun_rpg))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_rocket, 3));
 			if(player.inventory.hasItem(ModItems.gun_stinger))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2));
 			if(player.inventory.hasItem(ModItems.gun_skystinger))
@@ -334,27 +334,27 @@ public class ItemClip extends Item {
 			if(player.inventory.hasItem(ModItems.gun_bf))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_bf_ammo, 1));
 			if(player.inventory.hasItem(ModItems.gun_mp40))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_mp40_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_9mm, 32));
 			if(player.inventory.hasItem(ModItems.gun_uzi))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uzi_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_22lr, 32));
 			if(player.inventory.hasItem(ModItems.gun_uzi_silencer))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uzi_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_22lr, 32));
 			if(player.inventory.hasItem(ModItems.gun_uzi_saturnite))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uzi_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_22lr, 32));
 			if(player.inventory.hasItem(ModItems.gun_uzi_saturnite_silencer))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uzi_ammo, 32));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_22lr, 32));
 			if(player.inventory.hasItem(ModItems.gun_uboinik))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_uboinik_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_12gauge, 12));
 			if(player.inventory.hasItem(ModItems.gun_lever_action))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge, 12));
 			if(player.inventory.hasItem(ModItems.gun_lever_action_dark))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge, 12));
 			if(player.inventory.hasItem(ModItems.gun_lever_action_sonata))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_lever_action_ammo, 1));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge, 1));
 			if(player.inventory.hasItem(ModItems.gun_bolt_action))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_bolt_action_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge_flechette, 12));
 			if(player.inventory.hasItem(ModItems.gun_bolt_action_green))
-				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_bolt_action_ammo, 12));
+				player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_20gauge_flechette, 12));
 			if(player.inventory.hasItem(ModItems.gun_xvl1456))
 				player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_xvl1456_ammo, 40));
 			if(player.inventory.hasItem(ModItems.gun_osipr)) {

com/hbm/lib/HbmChestContents.java

@@ -63,7 +63,7 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.bottle_cherry, 0, 1, 1, 2),
 			new WeightedRandomChestContent(ModItems.stealth_boy, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.cap_nuka, 0, 1, 15, 7),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 2) };
 
 	private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[] {
@@ -97,11 +97,9 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.canister_fuel, 0, 1, 2, 2),
 			new WeightedRandomChestContent(ModItems.canister_biofuel, 0, 1, 2, 3),
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 60, 1, 1, 5),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 2),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 1, 2),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 3, 1, 2, 2),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 4, 1, 2, 1),
 			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 4) };
 
 	private static WeightedRandomChestContent[] nukeTrash = new WeightedRandomChestContent[] {
@@ -174,34 +172,30 @@ public class HbmChestContents {
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 2, 2),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 3),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 2, 3),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 2, 2),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 1, 2) };
-			new WeightedRandomChestContent(ModItems.bomb_caller, 4, 1, 2, 1) };
 
 	private static WeightedRandomChestContent[] missile = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.missile_generic, 0, 1, 1, 4),
 			new WeightedRandomChestContent(ModItems.missile_incendiary, 0, 1, 1, 4),
 			new WeightedRandomChestContent(ModItems.missile_cluster, 0, 1, 1, 4),
 			new WeightedRandomChestContent(ModItems.missile_buster, 0, 1, 1, 4),
-			new WeightedRandomChestContent(ModItems.missile_strong, 0, 1, 1, 3),
-			new WeightedRandomChestContent(ModItems.missile_incendiary_strong, 0, 1, 1, 3),
 			new WeightedRandomChestContent(Item.getItemFromBlock(ModBlocks.launch_pad), 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.gas_mask_m65, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.designator, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.crate_caller, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.thruster_small, 0, 1, 1, 5),
-			new WeightedRandomChestContent(ModItems.thruster_medium, 0, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.thruster_medium, 0, 1, 1, 4),
-			new WeightedRandomChestContent(ModItems.thruster_large, 0, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.thruster_large, 0, 1, 1, 2),
-			new WeightedRandomChestContent(ModItems.fuel_tank_small, 0, 1, 1, 5),
-			new WeightedRandomChestContent(ModItems.fuel_tank_medium, 0, 1, 1, 5),
 			new WeightedRandomChestContent(ModItems.fuel_tank_small, 0, 1, 1, 5),
+			new WeightedRandomChestContent(ModItems.fuel_tank_medium, 0, 1, 1, 4),
+			new WeightedRandomChestContent(ModItems.fuel_tank_small, 0, 1, 1, 2),
 			new WeightedRandomChestContent(ModItems.warhead_mirvlet, 0, 1, 1, 1),
 			new WeightedRandomChestContent(ModItems.warhead_nuclear, 0, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 0, 1, 1, 1),
-			new WeightedRandomChestContent(ModItems.bomb_caller, 1, 1, 2, 1),
+			new WeightedRandomChestContent(ModItems.bomb_caller, 3, 1, 1, 1) };
-			new WeightedRandomChestContent(ModItems.bomb_caller, 2, 1, 2, 1) };
 
 	private static WeightedRandomChestContent[] spaceship = new WeightedRandomChestContent[] {
 			new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 5),

com/hbm/main/CraftingManager.java

@@ -1288,7 +1288,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.linker, 1), new Object[] { "I I", "ICI", "GGG", 'I', "plateIron", 'G', "plateGold", 'C', ModItems.circuit_gold }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.oil_detector, 1), new Object[] { "W I", "WCI", "PPP", 'W', ModItems.wire_gold, 'I', "ingotCopper", 'C', ModItems.circuit_red_copper, 'P', "plateSteel" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.turret_chip, 1), new Object[] { "WWW", "CPC", "WWW", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, });
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_biometry, 1), new Object[] { "CC ", "GGS", "III", 'C', ModItems.circuit_copper, 'S', "plateSteel", 'G', ModItems.circuit_red_copper, 'I', "plateLead" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_biometry, 1), new Object[] { "CC ", "GGS", "SSS", 'C', ModItems.circuit_copper, 'S', "plateSteel", 'G', "plateGold", 'I', "plateLead" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.survey_scanner, 1), new Object[] { "SWS", " G ", "PCP", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, 'S', "plateSteel", 'G', "ingotGold" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium }));
 
@@ -1481,6 +1481,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.absorber_red, 1), new Object[] { "ICI", "CPC", "ICI", 'I', "ingotTitanium", 'C', "dustCoal", 'P', ModBlocks.absorber }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.absorber_green, 1), new Object[] { "ICI", "CPC", "ICI", 'I', "ingotPolymer", 'C', ModItems.powder_desh_mix, 'P', ModBlocks.absorber_red }));
 		GameRegistry.addRecipe(new ItemStack(ModBlocks.absorber_pink, 1), new Object[] { "ICI", "CPC", "ICI", 'I', ModItems.ingot_saturnite, 'C', ModItems.powder_nitan_mix, 'P', ModBlocks.absorber_green });
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.decon, 1), new Object[] { "BGB", "SAS", "BSB", 'B', "ingotBeryllium", 'G', Blocks.iron_bars, 'S', "ingotSteel", 'A', ModBlocks.absorber }));
 
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) });
 		GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) });

com/hbm/main/MainRegistry.java

@@ -273,6 +273,7 @@ import com.hbm.tileentity.machine.TileEntityCoreAdvanced;
 import com.hbm.tileentity.machine.TileEntityCoreTitanium;
 import com.hbm.tileentity.machine.TileEntityCrateIron;
 import com.hbm.tileentity.machine.TileEntityCrateSteel;
+import com.hbm.tileentity.machine.TileEntityDecon;
 import com.hbm.tileentity.machine.TileEntityDiFurnace;
 import com.hbm.tileentity.machine.TileEntityDummy;
 import com.hbm.tileentity.machine.TileEntityFF;
@@ -754,6 +755,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityReactorControl.class, "tileentity_reactor_remote_control");
 		GameRegistry.registerTileEntity(TileEntityMachineReactorLarge.class, "tileentity_large_reactor");
 		GameRegistry.registerTileEntity(TileEntityWasteDrum.class, "tileentity_waste_drum");
+		GameRegistry.registerTileEntity(TileEntityDecon.class, "tileentity_decon");
 
 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);

com/hbm/saveddata/RadEntitySavedData.java

@@ -47,6 +47,9 @@ public class RadEntitySavedData extends WorldSavedData {
     	if(!(e instanceof EntityLivingBase))
     		return;
     	
+    	if(rad < 0)
+    		rad = 0;
+    	
     	for(int i = 0; i < contaminated.size(); i++) {
     		if(new UUID(contaminated.get(i).hID, contaminated.get(i).lID).equals(e.getUniqueID())) {
     			contaminated.get(i).rad = rad;

com/hbm/tileentity/machine/TileEntityDecon.java

@@ -0,0 +1,33 @@
+package com.hbm.tileentity.machine;
+
+import java.util.List;
+
+import com.hbm.packet.AuxElectricityPacket;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.saveddata.RadEntitySavedData;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+
+public class TileEntityDecon extends TileEntity {
+
+	@Override
+	public void updateEntity() {
+		
+		if (!this.worldObj.isRemote) {
+			List<Entity> entities = this.worldObj.getEntitiesWithinAABB(Entity.class,
+					AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, this.yCoord, this.zCoord - 0.5, this.xCoord + 1.5,
+							this.yCoord + 2, this.zCoord + 1.5));
+			
+			if (!entities.isEmpty()) {
+				for (Entity e : entities) {
+
+					RadEntitySavedData entityData = RadEntitySavedData.getData(worldObj);
+					entityData.increaseRad(e, -0.5F);
+				}
+			}
+		}
+	}
+
+}

com/hbm/tileentity/machine/TileEntityMachineShredder.java

@@ -218,12 +218,12 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven
 				progress++;
 				
 				power -= 5;
-
-				this.slots[27].setItemDamage(this.slots[27].getItemDamage() + 1);
-				this.slots[28].setItemDamage(this.slots[28].getItemDamage() + 1);
 				
 				if(this.progress == TileEntityMachineShredder.processingSpeed)
 				{
+					this.slots[27].setItemDamage(this.slots[27].getItemDamage() + 1);
+					this.slots[28].setItemDamage(this.slots[28].getItemDamage() + 1);
+					
 					this.progress = 0;
 					this.processItem();
 					flag1 = true;

com/hbm/tileentity/machine/TileEntityMachineTeleporter.java

@@ -55,7 +55,7 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer
 		
 		if (!this.worldObj.isRemote) {
 			List<Entity> entities = this.worldObj.getEntitiesWithinAABB(Entity.class,
-					AxisAlignedBB.getBoundingBox(this.xCoord - 0.5, this.yCoord, this.zCoord - 0.5, this.xCoord + 1.5,
+					AxisAlignedBB.getBoundingBox(this.xCoord - 0.25, this.yCoord, this.zCoord - 0.25, this.xCoord + 1.5,
 							this.yCoord + 2, this.zCoord + 1.5));
 			if (!entities.isEmpty())
 				for (Entity e : entities) {
@@ -80,7 +80,7 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer
 		TileEntity te = this.worldObj.getTileEntity(targetX, targetY, targetZ);
 
 		if (te == null || !(te instanceof TileEntityMachineTeleporter) || ((TileEntityMachineTeleporter) te).mode) {
-			entity.attackEntityFrom(ModDamageSource.teleporter, Float.POSITIVE_INFINITY);
+			entity.attackEntityFrom(ModDamageSource.teleporter, 10000);
 		} else {
 			if ((entity instanceof EntityPlayerMP)) {
 				((EntityPlayerMP) entity).setPositionAndUpdate(this.targetX + 0.5D,