From 2dfb9a320017336f8c8cb6f16385eac3d5bbf78e Mon Sep 17 00:00:00 2001 From: HbmMods Date: Wed, 3 Feb 2016 19:36:23 +0100 Subject: [PATCH] Took first step to fix lagg error --- com/hbm/items/ItemCustomLore.java | 3 +- com/hbm/render/ModelGasMask.java | 72 +++++++++++------------------- com/hbm/render/ModelGoggles.java | 72 +++++++++--------------------- com/hbm/render/ModelT45Helmet.java | 19 ++++---- 4 files changed, 57 insertions(+), 109 deletions(-) diff --git a/com/hbm/items/ItemCustomLore.java b/com/hbm/items/ItemCustomLore.java index ebd1d60dc..ea57812af 100644 --- a/com/hbm/items/ItemCustomLore.java +++ b/com/hbm/items/ItemCustomLore.java @@ -14,8 +14,7 @@ public class ItemCustomLore extends Item { { if(this == ModItems.flame_pony) { - //list.add("Stop being so grumpy, just smeel."); - list.add("Don't compare the color codes, you know exactly who you are!!"); + list.add("Blue horse beats yellow horse, look it up!"); } if(this == ModItems.flame_conspiracy) { diff --git a/com/hbm/render/ModelGasMask.java b/com/hbm/render/ModelGasMask.java index 608c934e4..1600ee527 100644 --- a/com/hbm/render/ModelGasMask.java +++ b/com/hbm/render/ModelGasMask.java @@ -14,6 +14,7 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -32,44 +33,25 @@ public class ModelGasMask extends ModelBiped { textureWidth = 64; textureHeight = 32; + + bipedHead = new ModelRenderer(this, 0, 0); + bipedHead.addBox(0F - 4, 0F - 8 + 0.5F, 0F - 4, 8, 8, 3); + + bipedHead.setTextureOffset(22, 0); + bipedHead.addBox(1F - 4, 3F - 8 + 0.5F, -0.5333334F - 4, 2, 2, 1); - mask = new ModelRenderer(this, 0, 0); - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 8, 8, 3); - Shape1.setRotationPoint(0F - 4, 0F - 8 + 0.0625F / 2, 0F - 4); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 22, 0); - Shape2.addBox(0F, 0F, 0F, 2, 2, 1); - Shape2.setRotationPoint(1F - 4, 3F - 8 + 0.0625F / 2, -0.5333334F - 4); - Shape2.setTextureSize(64, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 22, 0); - Shape3.addBox(0F, 0F, 0F, 2, 2, 1); - Shape3.setRotationPoint(5F - 4, 3F - 8 + 0.0625F / 2, -0.5F - 4); - Shape3.setTextureSize(64, 32); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 11); - Shape4.addBox(0F, 0F, 0F, 2, 2, 2); - Shape4.setRotationPoint(3F - 4, 5F - 8 + 0.0625F / 2, 0F - 4); - Shape4.setTextureSize(64, 32); - Shape4.mirror = true; - setRotation(Shape4, -0.7853982F, 0F, 0F); - Shape5 = new ModelRenderer(this, 0, 15); - Shape5.addBox(0F, 2F, -0.5F, 3, 4, 3); - Shape5.setRotationPoint(2.5F - 4, 5F - 8 + 0.0625F / 2, 0F - 4); - Shape5.setTextureSize(64, 32); - Shape5.mirror = true; - setRotation(Shape5, -0.7853982F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 22); - Shape6.addBox(0F, 0F, 0F, 8, 1, 5); - Shape6.setRotationPoint(0F - 4, 3F - 8 + 0.0625F / 2, 3F - 4); - Shape6.setTextureSize(64, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); + bipedHead.setTextureOffset(22, 0); + bipedHead.addBox(5F - 4, 3F - 8 + 0.5F, -0.5F - 4, 2, 2, 1); + + bipedHead.setTextureOffset(0, 22); + bipedHead.addBox(0F - 4, 3F - 8 + 0.5F, 3F - 4, 8, 1, 5); + + mask = bipedHeadwear; + mask.setTextureOffset(0, 11); + mask.addBox(0 - 1, 0 + 2, 0F - 4, 2, 2, 2); + + mask.setTextureOffset(0, 15); + mask.addBox(0 - 1.5F, 2 + 0.5F - 0.5F + 2, -0.5F - 4, 3, 4, 3); } private void setRotation(ModelRenderer model, float x, float y, float z) @@ -83,24 +65,20 @@ public class ModelGasMask extends ModelBiped public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.bipedHead.rotationPointX = 0.0F; + this.bipedHead.rotationPointY = 0.0F; this.mask.rotationPointX = 0.0F; this.mask.rotationPointY = 0.0F; - this.mask.rotateAngleY = this.bipedHead.rotateAngleY; - this.mask.rotateAngleX = this.bipedHead.rotateAngleX; + this.mask.rotateAngleX = bipedHead.rotateAngleX - 45; } @Override public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); GL11.glPushMatrix(); - GL11.glScalef(1.125F, 1.125F, 1.125F); - this.mask.addChild(Shape1); - this.mask.addChild(Shape2); - this.mask.addChild(Shape3); - this.mask.addChild(Shape4); - this.mask.addChild(Shape5); - this.mask.addChild(Shape6); - this.mask.render(par7); + GL11.glScalef(1.2F, 1.2F, 1.2F); + bipedHead.render(par7); + mask.render(par7); GL11.glPopMatrix(); } diff --git a/com/hbm/render/ModelGoggles.java b/com/hbm/render/ModelGoggles.java index 57178251b..7ec51e794 100644 --- a/com/hbm/render/ModelGoggles.java +++ b/com/hbm/render/ModelGoggles.java @@ -19,50 +19,25 @@ import net.minecraft.entity.Entity; public class ModelGoggles extends ModelBiped { - //fields - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer google; - public ModelGoggles() { textureWidth = 64; textureHeight = 32; - - google = new ModelRenderer(this, 0, 0); - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 9, 3, 1); - Shape1.setRotationPoint(-4.5F, -3F - 2, -4.5F); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 4); - Shape2.addBox(0F, 0F, 0F, 9, 2, 5); - Shape2.setRotationPoint(-4.5F, -3F - 2, -3.5F); - Shape2.setTextureSize(64, 32); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 26, 0); - Shape5.addBox(0F, 0F, 0F, 2, 2, 1); - Shape5.setRotationPoint(1F, -2.5F - 2, -5F); - Shape5.setTextureSize(64, 32); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); - Shape6 = new ModelRenderer(this, 20, 0); - Shape6.addBox(0F, 0F, 0F, 2, 2, 1); - Shape6.setRotationPoint(-3F, -2.5F - 2, -5F); - Shape6.setTextureSize(64, 32); - Shape6.mirror = true; - setRotation(Shape6, 0F, 0F, 0F); - Shape7 = new ModelRenderer(this, 0, 11); - Shape7.addBox(0F, 0F, 0F, 9, 1, 4); - Shape7.setRotationPoint(-4.5F, -3F - 2, 0.5F); - Shape7.setTextureSize(64, 32); - Shape7.mirror = true; - setRotation(Shape7, 0F, 0F, 0F); + + bipedHead = new ModelRenderer(this, 0, 0); + bipedHead.addBox(-4.5F, -3F - 2, -4.5F, 9, 3, 1); + + bipedHead.setTextureOffset(0, 4); + bipedHead.addBox(-4.5F, -3F - 2, -3.5F, 9, 2, 5); + + bipedHead.setTextureOffset(26, 0); + bipedHead.addBox(1F, -2.5F - 2, -5F, 2, 2, 1); + + bipedHead.setTextureOffset(20, 0); + bipedHead.addBox(-3F, -2.5F - 2, -5F, 2, 2, 1); + + bipedHead.setTextureOffset(0, 11); + bipedHead.addBox(-4.5F, -3F - 2, 0.5F, 9, 1, 4); } /*public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) @@ -84,25 +59,20 @@ public class ModelGoggles extends ModelBiped } @Override -public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.google.rotationPointX = 0.0F; - this.google.rotationPointY = 0.0F; - this.google.rotateAngleY = this.bipedHead.rotateAngleY; - this.google.rotateAngleX = this.bipedHead.rotateAngleX; + this.bipedHead.rotationPointX = 0.0F; + this.bipedHead.rotationPointY = 0.0F; + this.bipedHead.rotateAngleY = this.bipedHead.rotateAngleY; + this.bipedHead.rotateAngleX = this.bipedHead.rotateAngleX; } @Override public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); GL11.glPushMatrix(); - this.google.addChild(Shape1); - this.google.addChild(Shape2); - this.google.addChild(Shape5); - this.google.addChild(Shape6); - this.google.addChild(Shape7); - this.google.render(par7); + bipedHead.render(par7); GL11.glPopMatrix(); } diff --git a/com/hbm/render/ModelT45Helmet.java b/com/hbm/render/ModelT45Helmet.java index 301a3a44a..47fc0a484 100644 --- a/com/hbm/render/ModelT45Helmet.java +++ b/com/hbm/render/ModelT45Helmet.java @@ -39,49 +39,49 @@ public class ModelT45Helmet extends ModelBiped helmet = new ModelRenderer(this, 0, 0); Shape1 = new ModelRenderer(this, 0, 0); Shape1.addBox(0F, 0F, 0F, 8, 8, 8); - Shape1.setRotationPoint(-4F, 0F - 8 + 0.0625F / 2, -4F); + Shape1.setRotationPoint(-4F, 0F - 8 + 0.0625F / 4, -4F); Shape1.setTextureSize(64, 32); Shape1.mirror = true; setRotation(Shape1, 0F, 0F, 0F); Shape2 = new ModelRenderer(this, 32, 0); Shape2.addBox(0F, 0F, 0F, 2, 2, 1); - Shape2.setRotationPoint(1F, 1F - 8 + 0.0625F / 2 + 1, -5F); + Shape2.setRotationPoint(1F, 1F - 8 + 0.0625F / 4 + 1, -5F); Shape2.setTextureSize(64, 32); Shape2.mirror = true; setRotation(Shape2, 0F, 0F, 0F); Shape3 = new ModelRenderer(this, 40, 6); Shape3.addBox(0F, 0F, 0F, 1, 1, 4); - Shape3.setRotationPoint(-5F, 1F - 8 + 0.0625F / 2, -5.466667F); + Shape3.setRotationPoint(-5F, 1F - 8 + 0.0625F / 4, -5.466667F); Shape3.setTextureSize(64, 32); Shape3.mirror = true; setRotation(Shape3, 0F, 0F, 0F); Shape4 = new ModelRenderer(this, 40, 0); Shape4.addBox(0F, 0F, 0F, 4, 2, 2); - Shape4.setRotationPoint(-2F, 5F - 8 + 0.0625F / 2, -4F); + Shape4.setRotationPoint(-2F, 5F - 8 + 0.0625F / 4, -4F); Shape4.setTextureSize(64, 32); Shape4.mirror = true; setRotation(Shape4, -0.7853982F, 0F, 0F); Shape5 = new ModelRenderer(this, 54, 0); Shape5.addBox(0F, 2F, 0F, 2, 1, 2); - Shape5.setRotationPoint(-1F, 5F - 8 + 0.0625F / 2, -4F); + Shape5.setRotationPoint(-1F, 5F - 8 + 0.0625F / 4, -4F); Shape5.setTextureSize(64, 32); Shape5.mirror = true; setRotation(Shape5, -0.7853982F, 0F, 0F); Shape6 = new ModelRenderer(this, 0, 16); Shape6.addBox(0F, 0F, 0F, 10, 1, 9); - Shape6.setRotationPoint(-5F, 6F - 8 + 0.0625F / 2, -4.5F); + Shape6.setRotationPoint(-5F, 6F - 8 + 0.0625F / 4, -4.5F); Shape6.setTextureSize(64, 32); Shape6.mirror = true; setRotation(Shape6, 0F, 0F, 0F); Shape7 = new ModelRenderer(this, 32, 7); Shape7.addBox(0F, 0F, 0F, 1, 1, 1); - Shape7.setRotationPoint(-1.5F, 5F - 8 + 0.0625F / 2, -4.5F); + Shape7.setRotationPoint(-1.5F, 5F - 8 + 0.0625F / 4, -4.5F); Shape7.setTextureSize(64, 32); Shape7.mirror = true; setRotation(Shape7, -0.7853982F, 0F, 0F); Shape8 = new ModelRenderer(this, 32, 5); Shape8.addBox(0F, 0F, 0F, 1, 1, 1); - Shape8.setRotationPoint(0.5F, 5F - 8 + 0.0625F / 2, -4.5F); + Shape8.setRotationPoint(0.5F, 5F - 8 + 0.0625F / 4, -4.5F); Shape8.setTextureSize(64, 32); Shape8.mirror = true; setRotation(Shape8, -0.7853982F, 0F, 0F); @@ -131,7 +131,8 @@ public void render(Entity par1Entity, float par2, float par3, float par4, float { setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity); GL11.glPushMatrix(); - GL11.glScalef(1.125F, 1.125F, 1.125F); + //GL11.glScalef(1.125F, 1.125F, 1.125F); + GL11.glScalef(1.0625F, 1.0625F, 1.0625F); this.helmet.addChild(Shape1); this.helmet.addChild(Shape2); this.helmet.addChild(Shape3);