some post merge cleanup

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

@@ -75,10 +75,10 @@ public class BlockCrate extends BlockFalling {
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_uboinik, 7);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_lever_action, 5);
     	BlockCrate.addToListWithWeight(crateList, ModItems.clip_bolt_action, 5);
-    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade.stackFromEnum(AmmoHandGrenade.GENERIC), 8);
-    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade.stackFromEnum(AmmoHandGrenade.STRONG), 6);
-//    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_mk2, 4);
-    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade.stackFromEnum(AmmoHandGrenade.FLARE), 4);
+    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_generic, 8);
+    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_strong, 6);
+    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_mk2, 4);
+    	BlockCrate.addToListWithWeight(crateList, ModItems.grenade_flare, 4);
     	BlockCrate.addToListWithWeight(crateList, ModItems.ammo_container, 2);
     	
     	//Weapon Crate

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

@@ -145,8 +145,8 @@ public class BobmazonOfferFactory {
 		weapons.add(new Offer(new ItemStack(ModItems.ammo_20gauge, 6), Requirement.OIL, 18 * inflation));
 		weapons.add(new Offer(ModItems.ammo_20gauge.stackFromEnum(6, Ammo20Gauge.SLUG), Requirement.OIL, 20 * inflation));
 		weapons.add(new Offer(ModItems.ammo_20gauge.stackFromEnum(6, Ammo20Gauge.FLECHETTE), Requirement.OIL, 22 * inflation));
-		weapons.add(new Offer(ModItems.grenade.stackFromEnum(3, AmmoHandGrenade.IF_GENERIC), Requirement.CHEMICS, 15 * inflation));
-		weapons.add(new Offer(ModItems.grenade.stackFromEnum(3, AmmoHandGrenade.IF_HE), Requirement.CHEMICS, 25 * inflation));
+		//weapons.add(new Offer(ModItems.grenade.stackFromEnum(3, AmmoHandGrenade.IF_GENERIC), Requirement.CHEMICS, 15 * inflation));
+		//weapons.add(new Offer(ModItems.grenade.stackFromEnum(3, AmmoHandGrenade.IF_HE), Requirement.CHEMICS, 25 * inflation));
 		weapons.add(new Offer(new ItemStack(ModItems.gun_hp_ammo, 1), Requirement.ASSEMBLY, 1000 * inflation));
 
 		tools.add(new Offer(new ItemStack(ModBlocks.crate_can, 1), Requirement.STEEL, 20 * inflation));

src/main/java/com/hbm/items/ModItems.java

@@ -1638,7 +1638,7 @@ public class ModItems {
 	public static Item stick_semtex;
 	public static Item stick_c4;
 	
-	public static ItemEnumMulti grenade;
+	//public static ItemEnumMulti grenade;
 	
 	public static Item grenade_generic;
 	public static Item grenade_strong;
@@ -4283,7 +4283,7 @@ public class ModItems {
 		stick_semtex = new Item().setUnlocalizedName("stick_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_semtex");
 		stick_c4 = new Item().setUnlocalizedName("stick_c4").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_c4");
 		
-		grenade = (ItemEnumMulti) new ItemGrenadeEnum().setUnlocalizedName("grenade").setCreativeTab(MainRegistry.weaponTab);
+		//grenade = (ItemEnumMulti) new ItemGrenadeEnum().setUnlocalizedName("grenade").setCreativeTab(MainRegistry.weaponTab);
 		
 		grenade_generic = new ItemGrenade(4).setUnlocalizedName("grenade_generic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_generic");
 		grenade_strong = new ItemGrenade(5).setUnlocalizedName("grenade_strong").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_strong");
@@ -7169,7 +7169,7 @@ public class ModItems {
 		GameRegistry.registerItem(ammo_container, ammo_container.getUnlocalizedName());
 		
 		//Grenades
-		GameRegistry.registerItem(grenade, grenade.getUnlocalizedName());
+		//GameRegistry.registerItem(grenade, grenade.getUnlocalizedName());
 		
 		GameRegistry.registerItem(stick_dynamite, stick_dynamite.getUnlocalizedName()); //heave-ho!
 		GameRegistry.registerItem(stick_tnt, stick_tnt.getUnlocalizedName());
@@ -8108,7 +8108,7 @@ public class ModItems {
 	}
 	
 	public static void addRemap(String unloc, Item item, int meta) {
-		Item remap = new ItemRemap(item, meta).setUnlocalizedName(unloc).setTextureName(RefStrings.MODID + ":plate_armor_titanium");;
+		Item remap = new ItemRemap(item, meta).setUnlocalizedName(unloc).setTextureName(RefStrings.MODID + ":plate_armor_titanium");
 		GameRegistry.registerItem(remap, remap.getUnlocalizedName());
 	}
 }

src/main/java/com/hbm/items/weapon/ItemGrenadeEnum.java

@@ -212,8 +212,8 @@ public class ItemGrenadeEnum extends ItemEnumMulti
 			final World world = loc.getWorld();
 			if (nade.ticksExisted > 10)
             	ExplosionLarge.explode(world, loc.posX(), loc.posY(), loc.posZ(), 5.0F, true, false, false);
-            else
-            	world.spawnEntityInWorld(new EntityItem(world, loc.posX(), loc.posY(), loc.posZ(), ModItems.grenade.stackFromEnum(AmmoHandGrenade.SMART)));
+            //else
+            //	world.spawnEntityInWorld(new EntityItem(world, loc.posX(), loc.posY(), loc.posZ(), ModItems.grenade.stackFromEnum(AmmoHandGrenade.SMART)));
 		});
 		tmpMap.put(AmmoHandGrenade.MIRV, (thrower, loc, nade) ->
 		{

src/main/java/com/hbm/lib/HbmCollection.java

@@ -550,7 +550,7 @@ public final class HbmCollection
 				};
 		grenadeKit = new ItemStack[]
 				{// TODO Finish
-						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.GENERIC),
+						/*ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.GENERIC),
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.STRONG),
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.FRAG),
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.FIRE),
@@ -579,7 +579,7 @@ public final class HbmCollection
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.NUKE),
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.NUCLEAR),
 						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.ZOMG),
-						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.BLACK_HOLE),
+						ModItems.grenade.stackFromEnum(6, AmmoHandGrenade.BLACK_HOLE),*/
 				};
 		fleijaKit = new ItemStack[]
 				{

src/main/java/com/hbm/main/ClientProxy.java

@@ -1142,8 +1142,8 @@ public class ClientProxy extends ServerProxy {
 	    RenderingRegistry.registerEntityRenderingHandler(EntitySawblade.class, new RenderSawblade());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityChemical.class, new RenderChemical());
 		//grenades
-	    for (AmmoHandGrenade grenade : AmmoHandGrenade.values())
-	    	RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBouncyBaseNT.class, new RenderSnowball(ModItems.grenade, grenade.ordinal()));
+	    //for (AmmoHandGrenade grenade : AmmoHandGrenade.values())
+	    //	RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBouncyBaseNT.class, new RenderSnowball(ModItems.grenade, grenade.ordinal()));
 	    
 		RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGeneric.class, new RenderSnowball(ModItems.grenade_generic));
 		RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeStrong.class, new RenderSnowball(ModItems.grenade_strong));

src/main/java/com/hbm/particle/ParticleSpentCasing.java

@@ -126,11 +126,8 @@ public class ParticleSpentCasing extends EntityFX
 	}
 	
 	@Override
-	public void renderParticle(
-			Tessellator tessellator, float interp, float x, float y, float z,
-			float tx, float tz
-	)
-	{
+	public void renderParticle(Tessellator tessellator, float interp, float x, float y, float z, float tx, float tz) {
+		
 		GL11.glPushMatrix();
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glEnable(GL11.GL_LIGHTING);