yum delicious garbage

src/main/java/com/hbm/crafting/ArmorRecipes.java

@@ -105,7 +105,7 @@ public class ArmorRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_fly, 1), new Object[] { "ACA", "TLT", "D D", 'A', ModItems.cap_aluminium, 'C', ModItems.circuit_targeting_tier1, 'T', ModItems.tank_steel, 'L', Items.leather, 'D', ModItems.thruster_small });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_break, 1), new Object[] { "ICI", "TJT", "I I", 'C', ModItems.circuit_targeting_tier2, 'T', ModItems.ingot_dura_steel, 'J', ModItems.jetpack_fly, 'I', ModItems.plate_polymer });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_vector, 1), new Object[] { "TCT", "MJM", "B B", 'C', ModItems.circuit_targeting_tier3, 'T', ModItems.tank_steel, 'J', ModItems.jetpack_break, 'M', ModItems.motor, 'B', ModItems.bolt_dura_steel });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_boost, 1), new Object[] { "PCP", "DJD", "PAP", 'C', ModItems.circuit_targeting_tier4, 'P', BIGMT.plate(), 'D', "ingotDesh", 'J', ModItems.jetpack_vector, 'A', ModItems.board_copper });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_boost, 1), new Object[] { "PCP", "DJD", "PAP", 'C', ModItems.circuit_targeting_tier4, 'P', BIGMT.plate(), 'D', DESH.ingot(), 'J', ModItems.jetpack_vector, 'A', ModItems.board_copper });
 		
 		//Hazmat
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.hazmat_helmet, 1), new Object[] { "EEE", "EIE", " P ", 'E', ModItems.hazmat_cloth, 'I', KEY_ANYPANE, 'P', IRON.plate() });

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

@@ -84,9 +84,11 @@ public class EntityBulletBase extends Entity implements IProjectile {
 
 		this.setLocationAndAngles(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ, entity.rotationYaw, entity.rotationPitch);
 		
-		this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
-		this.posY -= 0.10000000149011612D;
-		this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
+		double sideOffset = 0.16D;
+		
+		this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * sideOffset;
+		this.posY -= 0.1D;
+		this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * sideOffset;
 		this.setPosition(this.posX, this.posY, this.posZ);
 		
 		this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI);
@@ -190,7 +192,6 @@ public class EntityBulletBase extends Entity implements IProjectile {
 	
 	@Override
 	public void onUpdate() {
-		
 		super.onUpdate();
 		
 		if(config == null)
@@ -201,6 +202,22 @@ public class EntityBulletBase extends Entity implements IProjectile {
 			return;
 		}
 		
+		if(this.config.blackPowder) {
+			this.setDead();
+			
+			for(int i = 0; i < 15; i++) {
+				double mod = rand.nextDouble();
+				this.worldObj.spawnParticle("smoke", this.posX, this.posY, this.posZ,
+						(this.motionX + rand.nextGaussian() * 0.05) * mod,
+						(this.motionY + rand.nextGaussian() * 0.05) * mod,
+						(this.motionZ + rand.nextGaussian() * 0.05) * mod);
+			}
+			
+			double mod = 0.5;
+			this.worldObj.spawnParticle("flame", this.posX + this.motionX * mod, this.posY + this.motionY * mod, this.posZ + this.motionZ * mod, 0, 0, 0);
+			return;
+		}
+		
 		if(config.maxAge == 0) {
 			this.setDead();
 			return;

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

@@ -64,6 +64,8 @@ public class BulletConfiguration {
 	//whether the bullet should stay alive after colliding with a block
 	public boolean liveAfterImpact;
 	
+	public boolean blackPowder = true;
+	
 	//bullet effects
 	public List<PotionEffect> effects;
 	public int incendiary;

src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java

@@ -197,7 +197,7 @@ public class AnvilRecipes {
 						new ComparableStack(ModBlocks.deco_pipe_quad, 12),
 						new OreDictStack("dustSulfur", 32),
 				},
-				new AnvilOutput(new ItemStack(ModBlocks.machine_deuterium_tower))).setTier(5));
+				new AnvilOutput(new ItemStack(ModBlocks.machine_deuterium_tower))).setTier(4));
 		
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new AStack[] {

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

@@ -1955,11 +1955,15 @@ public class ModItems {
 	public static Item oxy_mask;
 	public static Item hat;
 	public static Item beta;
-	
+
 	public static Item t45_helmet;
 	public static Item t45_plate;
 	public static Item t45_legs;
 	public static Item t45_boots;
+	public static Item steamsuit_helmet;
+	public static Item steamsuit_plate;
+	public static Item steamsuit_legs;
+	public static Item steamsuit_boots;
 
 	public static Item chainsaw;
 
@@ -4807,7 +4811,7 @@ public class ModItems {
 		dnt_plate = new ArmorFSB(aMatDNT, 7, 1, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_plate").setTextureName(RefStrings.MODID + ":dnt_plate");
 		dnt_legs = new ArmorFSB(aMatDNT, 7, 2, RefStrings.MODID + ":textures/armor/dnt_2.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_legs").setTextureName(RefStrings.MODID + ":dnt_legs");
 		dnt_boots = new ArmorFSB(aMatDNT, 7, 3, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_boots").setTextureName(RefStrings.MODID + ":dnt_boots");
-		
+
 		ArmorMaterial aMatT45 = EnumHelper.addArmorMaterial("HBM_T45", 150, new int[] { 3, 8, 6, 3 }, 0);
 		aMatT45.customCraftingMaterial = ModItems.plate_armor_titanium;
 		t45_helmet = new ArmorT45(aMatT45, 2, 0, 1000000, 10000, 1000, 5).setCap(10F).setMod(0.5F)
@@ -4824,6 +4828,20 @@ public class ModItems {
 		t45_legs = new ArmorT45(aMatT45, 2, 2, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs");
 		t45_boots = new ArmorT45(aMatT45, 2, 3, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots");
 		
+		ArmorMaterial aMatDesh = EnumHelper.addArmorMaterial("HBM_DESH", 150, new int[] { 3, 8, 6, 3 }, 0);
+		aMatDesh.customCraftingMaterial = ModItems.ingot_desh;
+		steamsuit_helmet = new ArmorDesh(aMatDesh, 2, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setCap(15F).setMod(0.5F)
+				.setFireproof(true)
+				.setHasHardLanding(true)
+				.addEffect(new PotionEffect(Potion.digSpeed.id, 20, 2))
+				.setBlastProtection(0.5F)
+				.addResistance("monoxide", 0F)
+				.addResistance("fall", 0)
+				.setUnlocalizedName("steamsuit_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_helmet");
+		steamsuit_plate = new ArmorDesh(aMatDesh, 2, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_plate");
+		steamsuit_legs = new ArmorDesh(aMatDesh, 2, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_legs");
+		steamsuit_boots = new ArmorDesh(aMatDesh, 2, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_boots");
+		
 		ArmorMaterial aMatAJR = EnumHelper.addArmorMaterial("HBM_T45AJR", 150, new int[] { 3, 8, 6, 3 }, 100);
 		aMatAJR.customCraftingMaterial = ModItems.plate_armor_ajr;
 		ajr_helmet = new ArmorAJR(aMatAJR, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.25F).setCap(6.0F).setThreshold(4F)
@@ -7721,6 +7739,10 @@ public class ModItems {
 		GameRegistry.registerItem(custom_fall, custom_fall.getUnlocalizedName());
 		
 		//Power Armor
+		GameRegistry.registerItem(steamsuit_helmet, steamsuit_helmet.getUnlocalizedName());
+		GameRegistry.registerItem(steamsuit_plate, steamsuit_plate.getUnlocalizedName());
+		GameRegistry.registerItem(steamsuit_legs, steamsuit_legs.getUnlocalizedName());
+		GameRegistry.registerItem(steamsuit_boots, steamsuit_boots.getUnlocalizedName());
 		GameRegistry.registerItem(t45_helmet, t45_helmet.getUnlocalizedName());
 		GameRegistry.registerItem(t45_plate, t45_plate.getUnlocalizedName());
 		GameRegistry.registerItem(t45_legs, t45_legs.getUnlocalizedName());

src/main/java/com/hbm/items/armor/ArmorDesh.java

@@ -0,0 +1,46 @@
+package com.hbm.items.armor;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.hbm.handler.ArmorModHandler;
+import com.hbm.render.model.ModelArmorDesh;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.item.ItemStack;
+
+public class ArmorDesh extends ArmorFSB {
+
+	public ArmorDesh(ArmorMaterial material, int layer, int slot, String texture) {
+		super(material, layer, slot, texture);
+	}
+	
+	@Override
+	public Multimap getItemAttributeModifiers() {
+
+		Multimap multimap = HashMultimap.create();
+		multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(ArmorModHandler.fixedUUIDs[this.armorType], "Armor modifier", -0.025D, 1));
+		return multimap;
+	}
+
+	@SideOnly(Side.CLIENT)
+	ModelArmorDesh[] models;
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+		
+		if(models == null) {
+			models = new ModelArmorDesh[4];
+			
+			for(int i = 0; i < 4; i++)
+				models[i] = new ModelArmorDesh(i);
+		}
+		
+		return models[armorSlot];
+	}
+}

src/main/java/com/hbm/items/armor/ArmorFSB.java

@@ -35,7 +35,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;

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

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (4054)";
+	public static final String VERSION = "1.0.27 BETA (4060)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/main/ResourceManager.java

@@ -604,6 +604,7 @@ public class ResourceManager {
 	public static final IModelCustom armor_goggles = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/goggles.obj"));
 	public static final IModelCustom armor_fau = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/fau.obj"));
 	public static final IModelCustom armor_dnt = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/dnt.obj"));
+	public static final IModelCustom armor_steamsuit = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/steamsuit.obj"));
 	public static final IModelCustom armor_mod_tesla = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/mod_tesla.obj"));
 	public static final IModelCustom armor_wings = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/murk.obj"));
 	public static final IModelCustom armor_solstice = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/solstice.obj"));
@@ -702,6 +703,11 @@ public class ResourceManager {
 	public static final ResourceLocation dnt_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/dnt_chest.png");
 	public static final ResourceLocation dnt_arm = new ResourceLocation(RefStrings.MODID, "textures/armor/dnt_arm.png");
 
+	public static final ResourceLocation steamsuit_helmet = new ResourceLocation(RefStrings.MODID, "textures/armor/steamsuit_helmet.png");
+	public static final ResourceLocation steamsuit_leg = new ResourceLocation(RefStrings.MODID, "textures/armor/steamsuit_leg.png");
+	public static final ResourceLocation steamsuit_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/steamsuit_chest.png");
+	public static final ResourceLocation steamsuit_arm = new ResourceLocation(RefStrings.MODID, "textures/armor/steamsuit_arm.png");
+
 	public static final ResourceLocation mod_tesla = new ResourceLocation(RefStrings.MODID, "textures/armor/mod_tesla.png");
 
 	public static final ResourceLocation wings_murk = new ResourceLocation(RefStrings.MODID, "textures/armor/wings_murk.png");

src/main/java/com/hbm/render/model/ModelArmorDesh.java

@@ -0,0 +1,59 @@
+package com.hbm.render.model;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.main.ResourceManager;
+import com.hbm.render.loader.ModelRendererObj;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.Entity;
+
+public class ModelArmorDesh extends ModelArmorBase {
+	
+	public ModelArmorDesh(int type) {
+		super(type);
+
+		head = new ModelRendererObj(ResourceManager.armor_steamsuit, "Head");
+		body = new ModelRendererObj(ResourceManager.armor_steamsuit, "Body");
+		leftArm = new ModelRendererObj(ResourceManager.armor_steamsuit, "LeftArm").setRotationPoint(-5.0F, 2.0F, 0.0F);
+		rightArm = new ModelRendererObj(ResourceManager.armor_steamsuit, "RightArm").setRotationPoint(5.0F, 2.0F, 0.0F);
+		leftLeg = new ModelRendererObj(ResourceManager.armor_steamsuit, "LeftLeg").setRotationPoint(1.9F, 12.0F, 0.0F);
+		rightLeg = new ModelRendererObj(ResourceManager.armor_steamsuit, "RightLeg").setRotationPoint(-1.9F, 12.0F, 0.0F);
+		leftFoot = new ModelRendererObj(ResourceManager.armor_steamsuit, "LeftBoot").setRotationPoint(1.9F, 12.0F, 0.0F);
+		rightFoot = new ModelRendererObj(ResourceManager.armor_steamsuit, "RightBoot").setRotationPoint(-1.9F, 12.0F, 0.0F);
+	}
+
+	@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.glShadeModel(GL11.GL_SMOOTH);
+		
+		if(type == 0) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.steamsuit_helmet);
+			head.render(par7);
+		}
+		if(type == 1) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.steamsuit_chest);
+			body.render(par7);
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.steamsuit_arm);
+			leftArm.render(par7);
+			rightArm.render(par7);
+		}
+		if(type == 2) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.steamsuit_leg);
+			leftLeg.render(par7);
+			rightLeg.render(par7);
+		}
+		if(type == 3) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.steamsuit_leg);
+			leftFoot.render(par7);
+			rightFoot.render(par7);
+		}
+		
+		GL11.glShadeModel(GL11.GL_FLAT);
+		GL11.glPopMatrix();
+	}
+}

src/main/java/com/hbm/render/tileentity/RenderBobble.java

@@ -5,16 +5,21 @@ import org.lwjgl.opengl.GL12;
 
 import com.hbm.blocks.generic.BlockBobble.BobbleType;
 import com.hbm.blocks.generic.BlockBobble.TileEntityBobble;
+import com.hbm.items.ModItems;
 import com.hbm.lib.RefStrings;
 import com.hbm.main.ResourceManager;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.AdvancedModelLoader;
 import net.minecraftforge.client.model.IModelCustom;
@@ -164,6 +169,10 @@ public class RenderBobble extends TileEntitySpecialRenderer {
 		case BLUEHAT:
 			rotLeftArm = new double[]{0, 90, 60};
 			break;
+		case FRIZZLE:
+			rotLeftArm = new double[]{0, 15, 45};
+			rotRightArm = new double[]{0, 0, 80};
+			break;
 		}
 	}
 	
@@ -301,6 +310,29 @@ public class RenderBobble extends TileEntitySpecialRenderer {
 			bindTexture(ResourceManager.hev_helmet);
 			ResourceManager.armor_hev.renderPart("Head");
 			break;
+		case FRIZZLE:
+			GL11.glPushMatrix();
+			GL11.glTranslated(0.7, 1.7, 0.4);
+			GL11.glScaled(0.5, 0.5, 0.5);
+			GL11.glRotated(-90, 0, 1, 0);
+			GL11.glRotated(-10, 1, 0, 0);
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_dark); ResourceManager.ff_nightmare.renderPart("Grip");
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_normal); ResourceManager.ff_nightmare.renderPart("Dark");
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_bright); ResourceManager.ff_nightmare.renderPart("Light");
+			GL11.glPopMatrix();
+			
+			bindTexture(TextureMap.locationItemsTexture);
+			IIcon icon = new ItemStack(ModItems.coin_siege, 1, 5).getIconIndex();
+			float f14 = icon.getMinU();
+			float f15 = icon.getMaxU();
+			float f4 = icon.getMinV();
+			float f5 = icon.getMaxV();
+			
+			GL11.glTranslated(0.3, 1.4, -0.2);
+			GL11.glRotated(-100, 1, 0, 0);
+			GL11.glScaled(0.5, 0.5, 0.5);
+			ItemRenderer.renderItemIn2D(Tessellator.instance, f15, f4, f14, f5, icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
+			break;
 		}
 	}
 	

src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java

@@ -45,7 +45,6 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
 			
 			int convert = Math.min(tanks[0].getFill(), tanks[1].getMaxFill() - tanks[1].getFill());
 			tanks[0].setFill(tanks[0].getFill() - convert);
-			tanks[1].setFill(tanks[1].getFill() + convert);
 			
 			int light = this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, this.xCoord, this.yCoord, this.zCoord);
 			

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "hbm",
   "name": "Hbm's Nuclear Tech",
   "description": "A mod that adds weapons, nuclear themed stuff and machines",
-  "version":"1.0.27_X4054",
+  "version":"1.0.27_X4060",
   "mcversion": "1.7.10",
   "url": "",
   "updateUrl": "",