i feel so shrigma

changelog

@@ -11,3 +11,4 @@
 ## Fixed
 * Fixed taint destroying bedrock
 * Fixed ferrouranium plate not being castable
+* Fixed bayonet not rendering properly in third person

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

@@ -1855,6 +1855,10 @@ public class ModItems {
 	public static Item dns_plate;
 	public static Item dns_legs;
 	public static Item dns_boots;
+	public static Item taurun_helmet;
+	public static Item taurun_plate;
+	public static Item taurun_legs;
+	public static Item taurun_boots;
 	public static Item trenchmaster_helmet;
 	public static Item trenchmaster_plate;
 	public static Item trenchmaster_legs;
@@ -4478,6 +4482,16 @@ public class ModItems {
 		dns_legs = new ArmorDNT(aMatDNS, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_legs").setTextureName(RefStrings.MODID + ":dns_legs");
 		dns_boots = new ArmorDNT(aMatDNS, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_boots").setTextureName(RefStrings.MODID + ":dns_boots");
 
+		ArmorMaterial aMatTaurun = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100);
+		aMatTaurun.customCraftingMaterial = ModItems.plate_iron;
+		taurun_helmet = new ArmorTaurun(aMatTaurun, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png")
+				.addEffect(new PotionEffect(Potion.damageBoost.id, 20, 0))
+				.setStepSize(1)
+				.hides(EnumPlayerPart.HAT)
+				.setUnlocalizedName("taurun_helmet").setTextureName(RefStrings.MODID + ":taurun_helmet");
+		taurun_plate = new ArmorTaurun(aMatTaurun, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) taurun_helmet).setUnlocalizedName("taurun_plate").setTextureName(RefStrings.MODID + ":taurun_plate");
+		taurun_legs = new ArmorTaurun(aMatTaurun, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) taurun_helmet).setUnlocalizedName("taurun_legs").setTextureName(RefStrings.MODID + ":taurun_legs");
+		taurun_boots = new ArmorTaurun(aMatTaurun, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) taurun_helmet).setUnlocalizedName("taurun_boots").setTextureName(RefStrings.MODID + ":taurun_boots");
 		ArmorMaterial aMatTrench = EnumHelper.addArmorMaterial("HBM_TRENCH", 150, new int[] { 3, 8, 6, 3 }, 100);
 		aMatTrench.customCraftingMaterial = ModItems.plate_iron;
 		trenchmaster_helmet = new ArmorTrenchmaster(aMatTrench, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png")
@@ -6996,6 +7010,10 @@ public class ModItems {
 		GameRegistry.registerItem(dns_plate, dns_plate.getUnlocalizedName());
 		GameRegistry.registerItem(dns_legs, dns_legs.getUnlocalizedName());
 		GameRegistry.registerItem(dns_boots, dns_boots.getUnlocalizedName());
+		GameRegistry.registerItem(taurun_helmet, taurun_helmet.getUnlocalizedName());
+		GameRegistry.registerItem(taurun_plate, taurun_plate.getUnlocalizedName());
+		GameRegistry.registerItem(taurun_legs, taurun_legs.getUnlocalizedName());
+		GameRegistry.registerItem(taurun_boots, taurun_boots.getUnlocalizedName());
 		GameRegistry.registerItem(trenchmaster_helmet, trenchmaster_helmet.getUnlocalizedName());
 		GameRegistry.registerItem(trenchmaster_plate, trenchmaster_plate.getUnlocalizedName());
 		GameRegistry.registerItem(trenchmaster_legs, trenchmaster_legs.getUnlocalizedName());

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

@@ -0,0 +1,34 @@
+package com.hbm.items.armor;
+
+import com.hbm.render.model.ModelArmorTaurun;
+
+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.item.ItemStack;
+
+public class ArmorTaurun extends ArmorFSB {
+
+	public ArmorTaurun(ArmorMaterial material, int slot, String texture) {
+		super(material, slot, texture);
+		this.setMaxDamage(0);
+	}
+
+	@SideOnly(Side.CLIENT)
+	ModelArmorTaurun[] models;
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+
+		if(models == null) {
+			models = new ModelArmorTaurun[4];
+
+			for(int i = 0; i < 4; i++)
+				models[i] = new ModelArmorTaurun(i);
+		}
+
+		return models[armorSlot];
+	}
+}

src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java

@@ -1301,7 +1301,7 @@ public class Orchestras {
 			if(timer == 1) {
 				int cba = (stack.getItem() == ModItems.gun_aberrator_eott && ctx.configIndex == 0) ? -1 : 1;
 				SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory);
-				if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? -0.0625 : -0.25D * cba, -0.05, 0.25, -0.05 * cba, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 12.5F, casing.getName());
+				if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.5, aiming ? 0 : -0.125, aiming ? -0.0625 : -0.25D * cba, -0.05, 0.25, -0.05 * cba, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 10F, (float)entity.getRNG().nextGaussian() * 12.5F, casing.getName());
 			}
 		}
 

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

@@ -903,6 +903,7 @@ public class ResourceManager {
 	public static final IModelCustom armor_tail = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/tail_peep.obj"));
 	public static final IModelCustom player_manly_af = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/armor/player_fem.obj"));
 	public static final IModelCustom armor_envsuit = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/envsuit.obj"));
+	public static final IModelCustom armor_taurun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/taurun.obj"));
 	public static final IModelCustom armor_trenchmaster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/trenchmaster.obj"));
 
 	////Texture Items
@@ -1054,6 +1055,10 @@ public class ResourceManager {
 	public static final ResourceLocation rpa_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/rpa_chest.png");
 	public static final ResourceLocation rpa_arm = new ResourceLocation(RefStrings.MODID, "textures/armor/rpa_arm.png");
 
+	public static final ResourceLocation taurun_helmet = new ResourceLocation(RefStrings.MODID, "textures/armor/taurun_helmet.png");
+	public static final ResourceLocation taurun_leg = new ResourceLocation(RefStrings.MODID, "textures/armor/taurun_leg.png");
+	public static final ResourceLocation taurun_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/taurun_chest.png");
+	public static final ResourceLocation taurun_arm = new ResourceLocation(RefStrings.MODID, "textures/armor/taurun_arm.png");
 	public static final ResourceLocation trenchmaster_helmet = new ResourceLocation(RefStrings.MODID, "textures/armor/trenchmaster_helmet.png");
 	public static final ResourceLocation trenchmaster_leg = new ResourceLocation(RefStrings.MODID, "textures/armor/trenchmaster_leg.png");
 	public static final ResourceLocation trenchmaster_chest = new ResourceLocation(RefStrings.MODID, "textures/armor/trenchmaster_chest.png");

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMAS36.java

@@ -187,7 +187,7 @@ public class ItemRenderMAS36 extends ItemRenderWeaponBase {
 		ResourceManager.mas36.renderPart("Stock");
 		ResourceManager.mas36.renderPart("Bolt");
 		if(isScoped(stack)) ResourceManager.mas36.renderPart("Scope");
-		GL11.glTranslated(0, -1, -6);
+		if(type != ItemRenderType.EQUIPPED) GL11.glTranslated(0, -1, -6);
 		if(hasBayonet(stack)) ResourceManager.mas36.renderPart("Bayonet");
 		GL11.glShadeModel(GL11.GL_FLAT);
 	}

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

@@ -0,0 +1,60 @@
+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 ModelArmorTaurun extends ModelArmorBase {
+	
+	public ModelArmorTaurun(int type) {
+		super(type);
+
+		head = new ModelRendererObj(ResourceManager.armor_taurun, "Helmet");
+		body = new ModelRendererObj(ResourceManager.armor_taurun, "Chest");
+		leftArm = new ModelRendererObj(ResourceManager.armor_taurun, "LeftArm").setRotationPoint(-5.0F, 2.0F, 0.0F);
+		rightArm = new ModelRendererObj(ResourceManager.armor_taurun, "RightArm").setRotationPoint(5.0F, 2.0F, 0.0F);
+		leftLeg = new ModelRendererObj(ResourceManager.armor_taurun, "LeftLeg").setRotationPoint(1.9F, 12.0F, 0.0F);
+		rightLeg = new ModelRendererObj(ResourceManager.armor_taurun, "RightLeg").setRotationPoint(-1.9F, 12.0F, 0.0F);
+		leftFoot = new ModelRendererObj(ResourceManager.armor_taurun, "LeftBoot").setRotationPoint(1.9F, 12.0F, 0.0F);
+		rightFoot = new ModelRendererObj(ResourceManager.armor_taurun, "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();
+		
+		if(type == 0) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.taurun_helmet);
+			head.render(par7);
+		}
+		if(type == 1) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.taurun_chest);
+			body.render(par7);
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.taurun_arm);
+			leftArm.render(par7);
+			rightArm.render(par7);
+		}
+		if(type == 2) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.taurun_leg);
+			GL11.glTranslated(-0.01, 0, 0);
+			leftLeg.render(par7);
+			GL11.glTranslated(0.02, 0, 0);
+			rightLeg.render(par7);
+		}
+		if(type == 3) {
+			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.taurun_leg);
+			GL11.glTranslated(-0.01, 0, 0);
+			leftFoot.render(par7);
+			GL11.glTranslated(0.02, 0, 0);
+			rightFoot.render(par7);
+		}
+		
+		GL11.glPopMatrix();
+	}
+}

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

@@ -62,12 +62,16 @@ public class ModelArmorTrenchmaster extends ModelArmorBase {
 		}
 		if(type == 2) {
 			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.trenchmaster_leg);
+			GL11.glTranslated(-0.01, 0, 0);
 			leftLeg.render(par7);
+			GL11.glTranslated(0.02, 0, 0);
 			rightLeg.render(par7);
 		}
 		if(type == 3) {
 			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.trenchmaster_leg);
+			GL11.glTranslated(-0.01, 0, 0);
 			leftFoot.render(par7);
+			GL11.glTranslated(0.02, 0, 0);
 			rightFoot.render(par7);
 		}
 		

src/main/java/com/hbm/util/DamageResistanceHandler.java

@@ -151,6 +151,12 @@ public class DamageResistanceHandler {
 		registerSet(ModItems.dns_helmet, ModItems.dns_plate, ModItems.dns_legs, ModItems.dns_boots, new ResistanceStats()
 				.addCategory(CATEGORY_EXPLOSION, 100F, 0.99F)
 				.setOther(100F, 1F));
+		registerSet(ModItems.taurun_helmet, ModItems.taurun_plate, ModItems.taurun_legs, ModItems.taurun_boots, new ResistanceStats()
+				.addCategory(CATEGORY_PROJECTILE, 2F, 0.15F)
+				.addCategory(CATEGORY_FIRE, 1F, 0.25F)
+				.addCategory(CATEGORY_EXPLOSION, 0F, 0.25F)
+				.addExact(DamageSource.fall.damageType, 4F, 0.5F)
+				.setOther(2F, 0.1F));
 		registerSet(ModItems.trenchmaster_helmet, ModItems.trenchmaster_plate, ModItems.trenchmaster_legs, ModItems.trenchmaster_boots, new ResistanceStats()
 				.addCategory(CATEGORY_PROJECTILE, 5F, 0.5F)
 				.addCategory(CATEGORY_FIRE, 5F, 0.5F)