diff --git a/Client/bin/pixelmon/PixelmonIDList.class b/Client/bin/pixelmon/PixelmonIDList.class index b6b741b..9ead74a 100644 Binary files a/Client/bin/pixelmon/PixelmonIDList.class and b/Client/bin/pixelmon/PixelmonIDList.class differ diff --git a/Client/bin/pixelmon/Pokemon/ModelVulpix.class b/Client/bin/pixelmon/Pokemon/ModelVulpix.class index 34f8b8a..09268e4 100644 Binary files a/Client/bin/pixelmon/Pokemon/ModelVulpix.class and b/Client/bin/pixelmon/Pokemon/ModelVulpix.class differ diff --git a/Client/src/pixelmon/PixelmonIDList.java b/Client/src/pixelmon/PixelmonIDList.java index fd09701..45528ea 100644 --- a/Client/src/pixelmon/PixelmonIDList.java +++ b/Client/src/pixelmon/PixelmonIDList.java @@ -64,6 +64,7 @@ public class PixelmonIDList { public static int mareepId; public static int solrockId; public static int lunatoneId; + public static int tentacoolId; public static int i=0; public static void load(Configuration configuration) { @@ -125,5 +126,7 @@ public static void load(Configuration configuration) { magnetonId = Integer.parseInt(configuration.getOrCreateIntProperty("Magneton", "pokemon", i++).value); vibravaId = Integer.parseInt(configuration.getOrCreateIntProperty("Vibrava", "pokemon", i++).value); mareepId = Integer.parseInt(configuration.getOrCreateIntProperty("Mareep", "pokemon", i++).value); + tentacoolId = Integer.parseInt(configuration.getOrCreateIntProperty("Tentacool", "pokemon", i++).value); } -} + + diff --git a/Client/src/pixelmon/Pokemon/ModelEevee.java b/Client/src/pixelmon/Pokemon/ModelEevee.java index 0217983..f598c30 100644 --- a/Client/src/pixelmon/Pokemon/ModelEevee.java +++ b/Client/src/pixelmon/Pokemon/ModelEevee.java @@ -167,6 +167,12 @@ public void setRotationAngles(float f, float f1, float f2, float f3, float f4, f { super.setRotationAngles(f, f1, f2, f3, f4, f5); + Head.rotateAngleX = f4 / 57.29578F; + Head.rotateAngleY = f3 / 57.29578F; + rightear.rotateAngleX = f4 / 57.29578F; + rightear.rotateAngleY = f3 / 57.29578F; + leftear.rotateAngleY = f4 / 2F; + leftear.rotateAngleX = f3 / 57.29578F; Leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; Leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + (float)Math.PI) * 1.4F * f1; Leg1.rotateAngleY = 0.0F; diff --git a/Client/src/pixelmon/Pokemon/ModelGoldeen.java b/Client/src/pixelmon/Pokemon/ModelGoldeen.java index a2c910c..938ae1e 100644 --- a/Client/src/pixelmon/Pokemon/ModelGoldeen.java +++ b/Client/src/pixelmon/Pokemon/ModelGoldeen.java @@ -254,6 +254,10 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + Tail_fin.rotateAngleX = MathHelper.cos(f * 1F) * .75F * f1; + Right_fin.rotateAngleZ = MathHelper.cos(f * .5F) * 1F * f1; + Left_fin.rotateAngleZ = MathHelper.cos(f * .5F + 3.141593F) * 1F * f1; } } \ No newline at end of file diff --git a/Client/src/pixelmon/Pokemon/ModelMiltank.java b/Client/src/pixelmon/Pokemon/ModelMiltank.java index 8a73e61..ef5eff8 100644 --- a/Client/src/pixelmon/Pokemon/ModelMiltank.java +++ b/Client/src/pixelmon/Pokemon/ModelMiltank.java @@ -6,6 +6,7 @@ package pixelmon.Pokemon; import net.minecraft.src.Entity; +import net.minecraft.src.MathHelper; import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; @@ -196,6 +197,11 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + leftleg.rotateAngleX = MathHelper.cos(f * 1.3F) * .7F * f1; + rightleg.rotateAngleX = MathHelper.cos(f * 1.3F + 3.141593F) * .7F * f1; + rightarm.rotateAngleX = MathHelper.cos(f * 1.3F) * .7F * f1; + leftarm.rotateAngleX = MathHelper.cos(f * 1.3F + 3.141593F) * .7F * f1; } } diff --git a/Client/src/pixelmon/Pokemon/ModelPsyduck.java b/Client/src/pixelmon/Pokemon/ModelPsyduck.java index 2f12cfb..8d597f4 100644 --- a/Client/src/pixelmon/Pokemon/ModelPsyduck.java +++ b/Client/src/pixelmon/Pokemon/ModelPsyduck.java @@ -6,6 +6,7 @@ package pixelmon.Pokemon; import net.minecraft.src.Entity; +import net.minecraft.src.MathHelper; import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; @@ -141,6 +142,12 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + left_foot.rotateAngleX = MathHelper.cos(f * 1.5F) * .5F * f1; + right_foot.rotateAngleX = MathHelper.cos(f * 1.5F + 3.14159F) * .5F * f1; + tail.rotateAngleY = MathHelper.cos(f * 1F) * .75F * f1; + left_wing.rotateAngleZ = MathHelper.cos(f * 1F + 3.14159F) * .4F * f1 - 1; + right_wing.rotateAngleZ = MathHelper.cos(f * 1F) * .4F * f1 + 1; } } diff --git a/Client/src/pixelmon/Pokemon/ModelSandile.java b/Client/src/pixelmon/Pokemon/ModelSandile.java index 8555c85..880f30a 100644 --- a/Client/src/pixelmon/Pokemon/ModelSandile.java +++ b/Client/src/pixelmon/Pokemon/ModelSandile.java @@ -316,6 +316,11 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + Left_Front.rotateAngleX = MathHelper.cos(f * 1.2F) * .5F * f1; + Left_Back.rotateAngleX = MathHelper.cos(f * 1.2F + 3.14159F) * .5F * f1; + Right_Front.rotateAngleX = MathHelper.cos(f * 1.2F + 3.14159F) * .5F * f1; + Right_Back.rotateAngleX = MathHelper.cos(f * 1.2F) * .5F * f1; } } diff --git a/Client/src/pixelmon/Pokemon/ModelTentacool.java b/Client/src/pixelmon/Pokemon/ModelTentacool.java new file mode 100644 index 0000000..77f11d0 --- /dev/null +++ b/Client/src/pixelmon/Pokemon/ModelTentacool.java @@ -0,0 +1,287 @@ +// Date: 7/18/2012 11:58:51 AM +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + + + + + + +package pixelmon.Pokemon; + +import net.minecraft.src.Entity; +import net.minecraft.src.ModelBase; +import net.minecraft.src.ModelRenderer; + +public class ModelTentacool extends ModelBase +{ + //fields + ModelRenderer Right_Tentecal; + ModelRenderer Left_Tentecal; + ModelRenderer Head; + ModelRenderer Piece1; + ModelRenderer Piece2; + ModelRenderer Piece3; + ModelRenderer Piece4; + ModelRenderer Piece5; + ModelRenderer Piece6; + ModelRenderer Piece11; + ModelRenderer Piece22; + ModelRenderer Piece33; + ModelRenderer Piece44; + ModelRenderer Piece55; + ModelRenderer Piece66; + ModelRenderer Left; + ModelRenderer Right; + ModelRenderer Back; + ModelRenderer Red_Dot_Mound; + ModelRenderer Red_Dot1; + ModelRenderer Red_Thing_Mound; + ModelRenderer Red_Thing_; + ModelRenderer Red_Thing_2; + ModelRenderer Nose; + ModelRenderer extension; + ModelRenderer Body; + ModelRenderer Eyebrow; + ModelRenderer Eyebrow_1; + ModelRenderer Eyebrow_2; + ModelRenderer Eyebrow_3; + ModelRenderer Red_Thing_2_Mound; + ModelRenderer Red_Dot; + + + public ModelTentacool() + { + textureWidth = 64; + textureHeight = 32; + setTextureOffset("Right_Tentecal.a1", 58, 24); + setTextureOffset("Piece1.a2", 58, 24); + setTextureOffset("Piece2.a3", 58, 24); + setTextureOffset("Piece3.a4", 58, 24); + setTextureOffset("Piece4.a5", 58, 24); + setTextureOffset("Piece5.a6", 58, 24); + setTextureOffset("Piece6.a7", 58, 24); + setTextureOffset("Left_Tentecal.a11", 58, 24); + setTextureOffset("Piece11.a22", 58, 24); + setTextureOffset("Piece22.a33", 58, 24); + setTextureOffset("Piece33.a44", 58, 24); + setTextureOffset("Piece44.a55", 58, 24); + setTextureOffset("Piece55.a66", 58, 24); + setTextureOffset("Piece66.a77", 58, 24); + setTextureOffset("Head.Flaps", 0, 0); + setTextureOffset("Head.Body", 0, 0); + + Right_Tentecal = new ModelRenderer(this, "Right_Tentecal"); + Right_Tentecal.setRotationPoint(-2F, -5F, 1F); + setRotation(Right_Tentecal, 0F, 0F, 0F); + Right_Tentecal.mirror = true; + Right_Tentecal.addBox("a1", -0.5F, 0F, -0.5F, 1, 3, 1); + Piece1 = new ModelRenderer(this, "Piece1"); + Piece1.setRotationPoint(0F, 3F, 0F); + setRotation(Piece1, 0F, 0F, 0F); + Piece1.mirror = true; + Piece1.addBox("a2", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece2 = new ModelRenderer(this, "Piece2"); + Piece2.setRotationPoint(0F, 2F, 0F); + setRotation(Piece2, 0F, 0F, 0F); + Piece2.mirror = true; + Piece2.addBox("a3", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece3 = new ModelRenderer(this, "Piece3"); + Piece3.setRotationPoint(0F, 2F, 0F); + setRotation(Piece3, 0F, 0F, 0F); + Piece3.mirror = true; + Piece3.addBox("a4", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece4 = new ModelRenderer(this, "Piece4"); + Piece4.setRotationPoint(0F, 2F, 0F); + setRotation(Piece4, 0F, 0F, 0F); + Piece4.mirror = true; + Piece4.addBox("a5", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece5 = new ModelRenderer(this, "Piece5"); + Piece5.setRotationPoint(0F, 2F, 0F); + setRotation(Piece5, 0F, 0F, 0F); + Piece5.mirror = true; + Piece5.addBox("a6", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece6 = new ModelRenderer(this, "Piece6"); + Piece6.setRotationPoint(0F, 2F, 0F); + setRotation(Piece6, 0F, 0F, 0F); + Piece6.mirror = true; + Piece6.addBox("a7", -0.5F, 0F, -1F, 1, 3, 2); + Piece5.addChild(Piece6); + Piece4.addChild(Piece5); + Piece3.addChild(Piece4); + Piece2.addChild(Piece3); + Piece1.addChild(Piece2); + Right_Tentecal.addChild(Piece1); + Left_Tentecal = new ModelRenderer(this, "Left_Tentecal"); + Left_Tentecal.setRotationPoint(2F, -5F, 1F); + setRotation(Left_Tentecal, 0F, 0F, 0F); + Left_Tentecal.mirror = true; + Left_Tentecal.addBox("a11", -0.5F, 0F, -0.5F, 1, 3, 1); + Piece11 = new ModelRenderer(this, "Piece11"); + Piece11.setRotationPoint(0F, 3F, 0F); + setRotation(Piece11, 0F, 0F, 0F); + Piece11.mirror = true; + Piece11.addBox("a22", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece22 = new ModelRenderer(this, "Piece22"); + Piece22.setRotationPoint(0F, 2F, 0F); + setRotation(Piece22, 0F, 0F, 0F); + Piece22.mirror = true; + Piece22.addBox("a33", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece33 = new ModelRenderer(this, "Piece33"); + Piece33.setRotationPoint(0F, 2F, 0F); + setRotation(Piece33, 0F, 0F, 0F); + Piece33.mirror = true; + Piece33.addBox("a44", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece44 = new ModelRenderer(this, "Piece44"); + Piece44.setRotationPoint(0F, 2F, 0F); + setRotation(Piece44, 0F, 0F, 0F); + Piece44.mirror = true; + Piece44.addBox("a55", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece55 = new ModelRenderer(this, "Piece55"); + Piece55.setRotationPoint(0F, 2F, 0F); + setRotation(Piece55, 0F, 0F, 0F); + Piece55.mirror = true; + Piece55.addBox("a66", -0.5F, 0F, -0.5F, 1, 2, 1); + Piece66 = new ModelRenderer(this, "Piece66"); + Piece66.setRotationPoint(0F, 2F, 0F); + setRotation(Piece66, 0F, 0F, 0F); + Piece66.mirror = true; + Piece66.addBox("a77", -0.5F, 0F, -1F, 1, 3, 2); + Piece55.addChild(Piece66); + Piece44.addChild(Piece55); + Piece33.addChild(Piece44); + Piece22.addChild(Piece33); + Piece11.addChild(Piece22); + Left_Tentecal.addChild(Piece11); + Head = new ModelRenderer(this, "Head"); + Head.setRotationPoint(0F, 0F, 0F); + setRotation(Head, 0F, 0F, 0F); + Head.mirror = true; + Red_Dot = new ModelRenderer(this, 0, 0); + Red_Dot.addBox(-3F, 0F, 0F, 6, 1, 1); + Red_Dot.setRotationPoint(0F, -5F, -2F); + Red_Dot.setTextureSize(64, 32); + Red_Dot.mirror = true; + setRotation(Red_Dot, -0.1858931F, 0F, 0F); + Back = new ModelRenderer(this, 0, 0); + Back.addBox(-3F, 0F, -1F, 6, 3, 1); + Back.setRotationPoint(0F, -5F, 4F); + Back.setTextureSize(64, 32); + Back.mirror = true; + setRotation(Back, 0.3717861F, 0F, 0F); + Right = new ModelRenderer(this, 0, 0); + Right.addBox(0F, 0F, -3F, 1, 3, 6); + Right.setRotationPoint(-3F, -5F, 1F); + Right.setTextureSize(64, 32); + Right.mirror = true; + setRotation(Right, 0F, 0F, 0.5576792F); + Left = new ModelRenderer(this, 0, 0); + Left.addBox(-1F, 0F, -3F, 1, 3, 6); + Left.setRotationPoint(3F, -5F, 1F); + Left.setTextureSize(64, 32); + Left.mirror = true; + setRotation(Left, 0F, 0F, -0.5576792F); + Red_Dot_Mound = new ModelRenderer(this, 0, 0); + Red_Dot_Mound.addBox(-1F, -3.5F, -3.2F, 2, 2, 1); + Red_Dot_Mound.setRotationPoint(0F, -5F, 1F); + Red_Dot_Mound.setTextureSize(64, 32); + Red_Dot_Mound.mirror = true; + setRotation(Red_Dot_Mound, 0F, 0F, 0F); + Red_Dot1 = new ModelRenderer(this, 60, 0); + Red_Dot1.addBox(-0.5F, -3F, -3.5F, 1, 1, 1); + Red_Dot1.setRotationPoint(0F, -5F, 1F); + Red_Dot1.setTextureSize(64, 32); + Red_Dot1.mirror = true; + setRotation(Red_Dot1, 0F, 0F, 0F); + Red_Thing_Mound = new ModelRenderer(this, 0, 0); + Red_Thing_Mound.addBox(-3.25F, -8.25F, -2.5F, 2, 4, 5); + Red_Thing_Mound.setRotationPoint(0F, -5F, 1F); + Red_Thing_Mound.setTextureSize(64, 32); + Red_Thing_Mound.mirror = true; + setRotation(Red_Thing_Mound, 0F, 0F, 0F); + Red_Thing_ = new ModelRenderer(this, 43, 6); + Red_Thing_.addBox(-3.5F, -8.5F, -2F, 2, 4, 4); + Red_Thing_.setRotationPoint(0F, -5F, 1F); + Red_Thing_.setTextureSize(64, 32); + Red_Thing_.mirror = true; + setRotation(Red_Thing_, 0F, 0F, 0F); + Red_Thing_2 = new ModelRenderer(this, 39, 0); + Red_Thing_2.addBox(2.5F, -8.5F, -2F, 2, 4, 4); + Red_Thing_2.setRotationPoint(-1F, -5F, 1F); + Red_Thing_2.setTextureSize(64, 32); + Red_Thing_2.mirror = true; + setRotation(Red_Thing_2, 0F, 0F, 0F); + Nose = new ModelRenderer(this, 0, 0); + Nose.addBox(-0.5F, 0F, -0.5F, 1, 3, 1); + Nose.setRotationPoint(0F, -7.5F, -1.7F); + Nose.setTextureSize(64, 32); + Nose.mirror = true; + setRotation(Nose, 0.0371786F, 0F, 0F); + extension = new ModelRenderer(this, 0, 0); + extension.addBox(-0.5F, 0.5F, 0F, 1, 1, 1); + extension.setRotationPoint(0F, -5F, -2F); + extension.setTextureSize(64, 32); + extension.mirror = true; + setRotation(extension, -0.1858931F, 0F, 0F); + Red_Thing_2_Mound = new ModelRenderer(this, 0, 0); + Red_Thing_2_Mound.addBox(1.3F, -8.25F, -2.5F, 2, 4, 5); + Red_Thing_2_Mound.setRotationPoint(0F, -5F, 1F); + Red_Thing_2_Mound.setTextureSize(64, 32); + Red_Thing_2_Mound.mirror = true; + setRotation(Red_Thing_2_Mound, 0F, 0F, 0F); + Eyebrow = new ModelRenderer(this, 0, 0); + Eyebrow.addBox(-0.5F, 0F, -0.5F, 1, 3, 1); + Eyebrow.setRotationPoint(-2.5F, -6.5F, -1.6F); + Eyebrow.setTextureSize(64, 32); + Eyebrow.mirror = true; + setRotation(Eyebrow, 0F, 0F, -1.396263F); + Eyebrow_1 = new ModelRenderer(this, 0, 0); + Eyebrow_1.addBox(-0.5F, 0F, -0.5F, 1, 1, 1); + Eyebrow_1.setRotationPoint(-2.5F, -7F, -1.6F); + Eyebrow_1.setTextureSize(64, 32); + Eyebrow_1.mirror = true; + setRotation(Eyebrow_1, 0F, 0F, 0F); + Eyebrow_3 = new ModelRenderer(this, 0, 0); + Eyebrow_3.addBox(-0.5F, 0F, -0.5F, 1, 1, 1); + Eyebrow_3.setRotationPoint(2.5F, -7F, -1.6F); + Eyebrow_3.setTextureSize(64, 32); + Eyebrow_3.mirror = true; + setRotation(Eyebrow_3, 0F, 0F, 0F); + Eyebrow_2 = new ModelRenderer(this, 0, 0); + Eyebrow_2.addBox(-0.5F, 0F, -0.5F, 1, 3, 1); + Eyebrow_2.setRotationPoint(2.5F, -6.5F, -1.6F); + Eyebrow_2.setTextureSize(64, 32); + Eyebrow_2.mirror = true; + setRotation(Eyebrow_2, 0F, 0F, 1.396263F); + Body = new ModelRenderer(this, 0, 18); + Body.addBox(-3F, -8F, -3F, 6, 8, 6); + Body.setRotationPoint(0F, -5F, 1F); + Body.setTextureSize(64, 32); + Body.mirror = true; + setRotation(Body, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5); + Right_Tentecal.render(f5); + Left_Tentecal.render(f5); + Head.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5); + } + +} diff --git a/Client/src/pixelmon/Pokemon/ModelTrapinch.java b/Client/src/pixelmon/Pokemon/ModelTrapinch.java index 4acb4b7..2ccc3e9 100644 --- a/Client/src/pixelmon/Pokemon/ModelTrapinch.java +++ b/Client/src/pixelmon/Pokemon/ModelTrapinch.java @@ -7,6 +7,7 @@ package pixelmon.Pokemon; import net.minecraft.src.Entity; +import net.minecraft.src.MathHelper; import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; @@ -101,6 +102,11 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + Leg1.rotateAngleX = MathHelper.cos(f * 0.7F) * 1F * f1; + Leg2.rotateAngleX = MathHelper.cos(f * 0.7F + 3.14159F) * 1F * f1; + Leg3.rotateAngleX = MathHelper.cos(f * 0.7F + 3.14159F) * 1F * f1; + Leg4.rotateAngleX = MathHelper.cos(f * 0.7F) * 1F * f1; } } diff --git a/Client/src/pixelmon/Pokemon/ModelVulpix.java b/Client/src/pixelmon/Pokemon/ModelVulpix.java index aea3f02..99cf6a4 100644 --- a/Client/src/pixelmon/Pokemon/ModelVulpix.java +++ b/Client/src/pixelmon/Pokemon/ModelVulpix.java @@ -1,39 +1,37 @@ -// Date: 5/9/2012 1:53:15 PM +// Date: 7/18/2012 12:04:55 PM // Template version 1.1 // Java generated by Techne // Keep in mind that you still need to fill in some blanks // - ZeuX + + + + + + package pixelmon.Pokemon; -import net.minecraft.src.Entity; +import net.minecraft.src.MathHelper; import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; +import net.minecraft.src.Entity; public class ModelVulpix extends ModelBase { //fields - ModelRenderer Shape1; - ModelRenderer Head; ModelRenderer Body; ModelRenderer Mane; ModelRenderer Leg1; ModelRenderer Leg2; ModelRenderer Leg3; ModelRenderer Leg4; - ModelRenderer Ear1; - ModelRenderer Ear2; - ModelRenderer Nose; - ModelRenderer Bangs; - ModelRenderer HCurlM; - ModelRenderer HCurlL; - ModelRenderer HCurlR; ModelRenderer TailInnerL; ModelRenderer TailInnerR; ModelRenderer TailMiddleR; ModelRenderer TailMiddleL; ModelRenderer TailOuterR; - ModelRenderer TailOuterR2; + ModelRenderer TailOuterL; ModelRenderer TCurlInnerR; ModelRenderer TCurlInnerL; ModelRenderer TCurlMiddleL; @@ -46,24 +44,22 @@ public class ModelVulpix extends ModelBase ModelRenderer TFluffMiddleL; ModelRenderer TFluffOuterL; ModelRenderer TFluffOuterR; + ModelRenderer Head; + ModelRenderer HCurlL; + ModelRenderer HCurlM; + ModelRenderer HCurlR; + ModelRenderer Ear1; + ModelRenderer Ear2; + ModelRenderer Nose; + ModelRenderer Shape1; + ModelRenderer Bangs; public ModelVulpix() { textureWidth = 64; textureHeight = 32; + setTextureOffset("Head.Head_pieces", 0, 0); - Shape1 = new ModelRenderer(this, 26, 0); - Shape1.addBox(-0.5F, -0.5F, -3F, 1, 1, 4); - Shape1.setRotationPoint(0F, 14.9F, -6.2F); - Shape1.setTextureSize(64, 32); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Head = new ModelRenderer(this, 10, 1); - Head.addBox(-3F, -3F, -2F, 4, 4, 4); - Head.setRotationPoint(1F, 16F, -5F); - Head.setTextureSize(64, 32); - Head.mirror = true; - setRotation(Head, 0F, 0F, 0F); Body = new ModelRenderer(this, 27, 20); Body.addBox(-4F, -2F, -3F, 4, 5, 4); Body.setRotationPoint(2F, 17F, 1F); @@ -82,6 +78,7 @@ public ModelVulpix() Leg1.setTextureSize(64, 32); Leg1.mirror = true; setRotation(Leg1, 0F, 0F, 0F); + Leg1.mirror = false; Leg2 = new ModelRenderer(this, 18, 22); Leg2.addBox(-1F, 0F, -1F, 2, 5, 2); Leg2.setRotationPoint(1.1F, 19F, 3F); @@ -94,54 +91,13 @@ public ModelVulpix() Leg3.setTextureSize(64, 32); Leg3.mirror = true; setRotation(Leg3, 0F, 0F, 0F); + Leg3.mirror = false; Leg4 = new ModelRenderer(this, 18, 22); Leg4.addBox(-1F, 0F, -1F, 2, 5, 2); Leg4.setRotationPoint(1.1F, 19F, -4F); Leg4.setTextureSize(64, 32); Leg4.mirror = true; setRotation(Leg4, 0F, 0F, 0F); - Ear1 = new ModelRenderer(this, 10, 16); - Ear1.addBox(-1F, -3F, -0.5F, 2, 3, 1); - Ear1.setRotationPoint(-1.2F, 13.5F, -4F); - Ear1.setTextureSize(64, 32); - Ear1.mirror = true; - setRotation(Ear1, 0F, 0.4363323F, -0.8726646F); - Ear2 = new ModelRenderer(this, 10, 16); - Ear2.addBox(-1F, -3F, -0.5F, 2, 3, 1); - Ear2.setRotationPoint(1.2F, 13.5F, -4F); - Ear2.setTextureSize(64, 32); - Ear2.mirror = true; - setRotation(Ear2, 0F, -0.4363323F, 0.8726646F); - Nose = new ModelRenderer(this, 1, 11); - Nose.addBox(-1F, -1F, -2F, 2, 2, 2); - Nose.setRotationPoint(0F, 15.5F, -7F); - Nose.setTextureSize(64, 32); - Nose.mirror = true; - setRotation(Nose, 0F, 0F, 0F); - Bangs = new ModelRenderer(this, 1, 1); - Bangs.addBox(-2F, 0F, -2F, 2, 0, 2); - Bangs.setRotationPoint(-0.2F, 12.2F, -4.8F); - Bangs.setTextureSize(64, 32); - Bangs.mirror = true; - setRotation(Bangs, 0.1919862F, -0.9250245F, -0.2792527F); - HCurlM = new ModelRenderer(this, 1, 4); - HCurlM.addBox(-0.5F, -2.5F, -2F, 1, 3, 3); - HCurlM.setRotationPoint(0F, 13.2F, -4.2F); - HCurlM.setTextureSize(64, 32); - HCurlM.mirror = true; - setRotation(HCurlM, 0.3490659F, 0F, 0F); - HCurlL = new ModelRenderer(this, 1, 4); - HCurlL.addBox(-0.5F, -2.5F, -2F, 1, 3, 3); - HCurlL.setRotationPoint(0F, 13.2F, -4.2F); - HCurlL.setTextureSize(64, 32); - HCurlL.mirror = true; - setRotation(HCurlL, 0.3490659F, -0.2617994F, 0.6108652F); - HCurlR = new ModelRenderer(this, 1, 4); - HCurlR.addBox(-0.5F, -2.5F, -2F, 1, 3, 3); - HCurlR.setRotationPoint(0F, 13.2F, -4.2F); - HCurlR.setTextureSize(64, 32); - HCurlR.mirror = true; - setRotation(HCurlR, 0.3490659F, 0.2617994F, -0.6108652F); TailInnerL = new ModelRenderer(this, 10, 21); TailInnerL.addBox(-0.5F, 0F, -1F, 1, 4, 2); TailInnerL.setRotationPoint(0F, 17F, 2.8F); @@ -172,12 +128,12 @@ public ModelVulpix() TailOuterR.setTextureSize(64, 32); TailOuterR.mirror = true; setRotation(TailOuterR, 2.96706F, 0F, -1.48353F); - TailOuterR2 = new ModelRenderer(this, 10, 21); - TailOuterR2.addBox(-0.5F, 0F, -1F, 1, 4, 2); - TailOuterR2.setRotationPoint(0F, 17F, 3F); - TailOuterR2.setTextureSize(64, 32); - TailOuterR2.mirror = true; - setRotation(TailOuterR2, 2.96706F, 0F, 1.48353F); + TailOuterL = new ModelRenderer(this, 10, 21); + TailOuterL.addBox(-0.5F, 0F, -1F, 1, 4, 2); + TailOuterL.setRotationPoint(0F, 17F, 3F); + TailOuterL.setTextureSize(64, 32); + TailOuterL.mirror = true; + setRotation(TailOuterL, 2.96706F, 0F, 1.48353F); TCurlInnerR = new ModelRenderer(this, 1, 21); TCurlInnerR.addBox(-0.5F, -0.5F, -2F, 1, 3, 3); TCurlInnerR.setRotationPoint(-1F, 13.3F, 3.6F); @@ -250,33 +206,82 @@ public ModelVulpix() TFluffOuterR.setTextureSize(64, 32); TFluffOuterR.mirror = true; setRotation(TFluffOuterR, 2.443461F, 0F, -1.48353F); + Head = new ModelRenderer(this, "Head"); + Head.setRotationPoint(0F, 17F, -3F); + setRotation(Head, 0F, 0F, 0F); + Head.mirror = true; + Head = new ModelRenderer(this, 10, 1); + Head.addBox(-2F, -4F, -4F, 4, 4, 4); + Head.setRotationPoint(0F, 0F, 0F); + Head.setTextureSize(64, 32); + Head.mirror = true; + setRotation(Head, 0F, 0F, 0F); + Ear1 = new ModelRenderer(this, 10, 16); + Ear1.addBox(-11F, -10.8F, -1.6F, 2, 3, 1); + Ear1.setRotationPoint(0F, 0F, 0F); + Ear1.setTextureSize(64, 32); + Ear1.mirror = true; + setRotation(Ear1, 0F, 0.4363323F, -0.8726646F); + Ear2 = new ModelRenderer(this, 10, 16); + Ear2.addBox(9F, -10.8F, -1.6F, 2, 3, 1); + Ear2.setRotationPoint(0F, 0F, 0F); + Ear2.setTextureSize(64, 32); + Ear2.mirror = true; + setRotation(Ear2, 0F, -0.4363323F, 0.8726646F); + HCurlM = new ModelRenderer(this, 1, 4); + HCurlM.addBox(-0.5F, -8.5F, -7.4F, 1, 3, 3); + HCurlM.setRotationPoint(0F, 0F, 0F); + HCurlM.setTextureSize(64, 32); + HCurlM.mirror = true; + setRotation(HCurlM, 0.3490659F, 0F, 0F); + HCurlL = new ModelRenderer(this, 1, 4); + HCurlL.addBox(6.15F, -10.1F, -6.7F, 1, 3, 3); + HCurlL.setRotationPoint(0F, 0F, 0F); + HCurlL.setTextureSize(64, 32); + HCurlL.mirror = true; + setRotation(HCurlL, 0.3490659F, -0.2617994F, 0.6108652F); + HCurlR = new ModelRenderer(this, 1, 4); + HCurlR.addBox(-7.15F, -10.1F, -6.7F, 1, 3, 3); + HCurlR.setRotationPoint(0F, 0F, 0F); + HCurlR.setTextureSize(64, 32); + HCurlR.mirror = true; + setRotation(HCurlR, 0.3490659F, 0.2617994F, -0.6108652F); + Nose = new ModelRenderer(this, 1, 11); + Nose.addBox(-1F, -2.5F, -6F, 2, 2, 2); + Nose.setRotationPoint(0F, 0F, 0F); + Nose.setTextureSize(64, 32); + Nose.mirror = true; + setRotation(Nose, 0F, 0F, 0F); + Bangs = new ModelRenderer(this, 1, 1); + Bangs.addBox(-9F, -7F, -3.65F, 2, 0, 2); + Bangs.setRotationPoint(0F, 0F, 0F); + Bangs.setTextureSize(64, 32); + Bangs.mirror = true; + setRotation(Bangs, 0.1919862F, -0.9250245F, -0.2792527F); + Shape1 = new ModelRenderer(this, 26, 0); + Shape1.addBox(-0.5F, -2.6F, -6.2F, 1, 1, 4); + Shape1.setRotationPoint(0F, 0F, 0F); + Shape1.setTextureSize(64, 32); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); } public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5); - Shape1.render(f5); - Head.render(f5); Body.render(f5); Mane.render(f5); Leg1.render(f5); Leg2.render(f5); Leg3.render(f5); Leg4.render(f5); - Ear1.render(f5); - Ear2.render(f5); - Nose.render(f5); - Bangs.render(f5); - HCurlM.render(f5); - HCurlL.render(f5); - HCurlR.render(f5); TailInnerL.render(f5); TailInnerR.render(f5); TailMiddleR.render(f5); TailMiddleL.render(f5); TailOuterR.render(f5); - TailOuterR.render(f5); + TailOuterL.render(f5); TCurlInnerR.render(f5); TCurlInnerL.render(f5); TCurlMiddleL.render(f5); @@ -289,6 +294,16 @@ public void render(Entity entity, float f, float f1, float f2, float f3, float f TFluffMiddleL.render(f5); TFluffOuterL.render(f5); TFluffOuterR.render(f5); + Head.render(f5); + Ear1.render(f5); + Ear2.render(f5); + HCurlL.render(f5); + HCurlM.render(f5); + HCurlR.render(f5); + Nose.render(f5); + Shape1.render(f5); + Bangs.render(f5); + } private void setRotation(ModelRenderer model, float x, float y, float z) @@ -301,6 +316,15 @@ private void setRotation(ModelRenderer model, float x, float y, float z) public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) { super.setRotationAngles(f, f1, f2, f3, f4, f5); + + Leg1.rotateAngleX = MathHelper.cos(f * 0.6662F) * 0.4F * f1; + Leg2.rotateAngleX = MathHelper.cos(f * 0.6662F + (float)Math.PI) * 0.4F * f1; + Leg1.rotateAngleY = 0.0F; + Leg2.rotateAngleY = 0.0F; + Leg4.rotateAngleX = MathHelper.cos(f * 0.6662F) * 1.4F * f1; + Leg3.rotateAngleX = MathHelper.cos(f * 0.6662F + (float)Math.PI) * 0.4F * f1; + Leg4.rotateAngleY = 0.0F; + Leg3.rotateAngleY = 0.0F; } } diff --git a/Client/src/pixelmon/entities/PixelmonEntityList.java b/Client/src/pixelmon/entities/PixelmonEntityList.java index 8a7a8e1..9bf58db 100644 --- a/Client/src/pixelmon/entities/PixelmonEntityList.java +++ b/Client/src/pixelmon/entities/PixelmonEntityList.java @@ -220,7 +220,7 @@ public static ClassType getClassTypeFromID(int par0) { addMapping(EntityMagneton.class, "Magneton", PixelmonIDList.magnetonId, new RenderPixelmon(new ModelMagneton(), 0.5F), ClassType.Pixelmon); addMapping(EntityVibrava.class, "Vibrava", PixelmonIDList.vibravaId, new RenderPixelmon(new ModelVibrava(), 0.5F), ClassType.Pixelmon); // addMapping(EntityMareep.class, "Mareep", mod_Pixelmon.mareepId, new RenderPixelmon(new ModelMareepUnshaven(), 0.5F), ClassType.Pixelmon); - + addMapping(EntityOmanyte.class, "Tentacool", PixelmonIDList.tentacoolId, new RenderFreeWaterPixelmon(new ModelTentacool(), 0.5F), ClassType.Pixelmon); addMapping(EntityTrainerYoungster.class, "Youngster", TrainerIDList.trainerYoungsterId, new RenderTrainer(new ModelYoungster(), 0.5F), ClassType.Trainer); addMapping(EntityTrainerYoungster02.class, "Youngster2", TrainerIDList.trainerYoungster2Id, new RenderTrainer(new ModelYoungster02(), 0.5F), ClassType.Trainer);