diff --git a/src/main/java/kam/npcs/LegacyCode.java b/src/main/java/kam/npcs/LegacyCode.java new file mode 100644 index 000000000..94a9add91 --- /dev/null +++ b/src/main/java/kam/npcs/LegacyCode.java @@ -0,0 +1,65 @@ +package kam.npcs; + +import net.minecraft.client.model.ModelBase; +import noppes.npcs.client.model.util.Model2DRenderer; + +public class LegacyCode { + + // Old MPM Model : Unused + + // public ModelMPM(float par1) { + // super(par1); + // isArmor = par1 > 0; + // float par2 = 0; + // this.bipedCloak = new ModelRenderer(this, 0, 0); + // this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); + // this.bipedEars = new ModelRenderer(this, 24, 0); + // this.bipedEars.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, par1); + // this.bipedHead = new ModelScaleRenderer(this, 0, 0); + // this.bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1); + // this.bipedHead.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + // this.bipedHeadwear = new ModelScaleRenderer(this, 32, 0); + // this.bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1 + 0.5F); + // this.bipedHeadwear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + // this.bipedBody = new ModelScaleRenderer(this, 16, 16); + // this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); + // this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + // this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); + // this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); + // this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); + // this.bipedLeftArm = new ModelScaleRenderer(this, 40, 16); + // this.bipedLeftArm.mirror = true; + // this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); + // this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); + // this.bipedRightLeg = new ModelScaleRenderer(this, 0, 16); + // this.bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); + // this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); + // this.bipedLeftLeg = new ModelScaleRenderer(this, 0, 16); + // this.bipedLeftLeg.mirror = true; + // this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); + // this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); + // + // headwear = new ModelHeadwear(this); + // legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg); + // + // this.bipedBody.addChild(breasts = new ModelBreasts(this)); + // if(!isArmor){ + // this.bipedHead.addChild(ears = new ModelEars(this)); + // this.bipedHead.addChild(mohawk = new ModelMohawk(this)); + // this.bipedHead.addChild(hair = new ModelHair(this)); + // this.bipedHead.addChild(beard = new ModelBeard(this)); + // this.bipedHead.addChild(snout = new ModelSnout(this)); + // this.bipedHead.addChild(horns = new ModelHorns(this)); + // + // tail = new ModelTail(this); + // + // this.bipedBody.addChild(wings = new ModelWings(this)); + // this.bipedBody.addChild(skirt = new ModelSkirt(this)); + // this.bipedBody.addChild(fin = new ModelFin(this)); + // + // this.bipedLeftArm.addChild(clawsL = new ModelClaws(this, false)); + // this.bipedRightArm.addChild(clawsR = new ModelClaws(this, true)); + // } + // } + +} diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index 613e7b7e5..ab3afd0f6 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -63,60 +63,7 @@ public class ModelMPM extends ModelNPCMale{ public boolean isArmor; public float alpha = 1; - public ModelMPM(float par1) { - super(par1); - isArmor = par1 > 0; - float par2 = 0; - this.bipedCloak = new ModelRenderer(this, 0, 0); - this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); - this.bipedEars = new ModelRenderer(this, 24, 0); - this.bipedEars.addBox(-3.0F, -6.0F, -1.0F, 6, 6, 1, par1); - this.bipedHead = new ModelScaleRenderer(this, 0, 0); - this.bipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1); - this.bipedHead.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - this.bipedHeadwear = new ModelScaleRenderer(this, 32, 0); - this.bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, par1 + 0.5F); - this.bipedHeadwear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - this.bipedBody = new ModelScaleRenderer(this, 16, 16); - this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); - this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); - this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); - this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); - this.bipedLeftArm = new ModelScaleRenderer(this, 40, 16); - this.bipedLeftArm.mirror = true; - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); - this.bipedRightLeg = new ModelScaleRenderer(this, 0, 16); - this.bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); - this.bipedLeftLeg = new ModelScaleRenderer(this, 0, 16); - this.bipedLeftLeg.mirror = true; - this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); - - headwear = new ModelHeadwear(this); - legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg); - - this.bipedBody.addChild(breasts = new ModelBreasts(this)); - if(!isArmor){ - this.bipedHead.addChild(ears = new ModelEars(this)); - this.bipedHead.addChild(mohawk = new ModelMohawk(this)); - this.bipedHead.addChild(hair = new ModelHair(this)); - this.bipedHead.addChild(beard = new ModelBeard(this)); - this.bipedHead.addChild(snout = new ModelSnout(this)); - this.bipedHead.addChild(horns = new ModelHorns(this)); - - tail = new ModelTail(this); - - this.bipedBody.addChild(wings = new ModelWings(this)); - this.bipedBody.addChild(skirt = new ModelSkirt(this)); - this.bipedBody.addChild(fin = new ModelFin(this)); - - this.bipedLeftArm.addChild(clawsL = new ModelClaws(this, false)); - this.bipedRightArm.addChild(clawsR = new ModelClaws(this, true)); - } - } + // Check Legacy Code for Old Version // Updated False = 64x32 Skin // Steve 64x64 and Alex 64x64 @@ -144,6 +91,7 @@ public class ModelMPM extends ModelNPCMale{ this.bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1); this.bipedBody.setRotationPoint(0.0F, 0.0F + par2, 0.0F); + // Steve 64x64 Model or Alex 64x64 Model if(updated){ if (arms){ // Alex Version @@ -175,11 +123,13 @@ public class ModelMPM extends ModelNPCMale{ this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); } + // Steve 64x32 Model else{ this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); this.bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1); this.bipedRightArm.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); + this.bipedLeftArm = new ModelScaleRenderer(this, 40, 16); this.bipedLeftArm.mirror = true; this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); @@ -189,15 +139,13 @@ public class ModelMPM extends ModelNPCMale{ this.bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); this.bipedLeftLeg = new ModelScaleRenderer(this, 0, 16); + this.bipedLeftLeg.mirror = true; this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); - } - - - headwear = new ModelHeadwear(this, arms); + headwear = new ModelHeadwear(this); legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg); this.bipedBody.addChild(breasts = new ModelBreasts(this)); @@ -206,16 +154,19 @@ public class ModelMPM extends ModelNPCMale{ this.bipedHead.addChild(mohawk = new ModelMohawk(this)); this.bipedHead.addChild(hair = new ModelHair(this)); this.bipedHead.addChild(beard = new ModelBeard(this)); + + // Completed this.bipedHead.addChild(snout = new ModelSnout(this)); this.bipedHead.addChild(horns = new ModelHorns(this)); + // Completed tail = new ModelTail(this); this.bipedBody.addChild(wings = new ModelWings(this)); - this.bipedBody.addChild(skirt = new ModelSkirt(this)); this.bipedBody.addChild(fin = new ModelFin(this)); - // NEED TO FIX + // Fix This + this.bipedBody.addChild(skirt = new ModelSkirt(this)); this.bipedLeftArm.addChild(clawsL = new ModelClaws(this, false)); this.bipedRightArm.addChild(clawsR = new ModelClaws(this, true)); } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java b/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java index eafd6337e..fe3c55358 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelHeadwear.java @@ -6,53 +6,8 @@ import noppes.npcs.client.model.util.Model2DRenderer; import noppes.npcs.client.model.util.ModelScaleRenderer; public class ModelHeadwear extends ModelScaleRenderer{ - - public ModelHeadwear(ModelBase base) { - super(base); - Model2DRenderer right = new Model2DRenderer(base, 32, 8, 8, 8, 64, 32); - right.setRotationPoint(-4.641F, .8f, 4.64f); - right.setScale(0.58f); - right.setThickness(0.65f); - setRotation(right, 0, (float)(Math.PI/2f), 0); - this.addChild(right); - - Model2DRenderer left = new Model2DRenderer(base, 48, 8, 8, 8, 64, 32); - left.setRotationPoint(4.639F, .8f, -4.64f); - left.setScale(0.58f); - left.setThickness(0.65f); - setRotation(left, 0, (float)(Math.PI/-2f), 0); - this.addChild(left); - - Model2DRenderer front = new Model2DRenderer(base, 40, 8, 8, 8, 64, 32); - front.setRotationPoint(-4.64F, .801f, -4.641f); - front.setScale(0.58f); - front.setThickness(0.65f); - setRotation(front, 0, 0, 0); - this.addChild(front); - - Model2DRenderer back = new Model2DRenderer(base, 56, 8, 8, 8, 64, 32); - back.setRotationPoint(4.64F, .801f, 4.639f); - back.setScale(0.58f); - back.setThickness(0.65f); - setRotation(back, 0, (float)(Math.PI), 0); - this.addChild(back); - - Model2DRenderer top = new Model2DRenderer(base, 40, 0, 8, 8, 64, 32); - top.setRotationPoint(-4.64F, -8.5f, -4.64f); - top.setScale(0.5799f); - top.setThickness(0.65f); - setRotation(top, (float)(Math.PI / -2), 0, 0); - this.addChild(top); - - Model2DRenderer bottom = new Model2DRenderer(base, 48, 0, 8, 8, 64, 32); - bottom.setRotationPoint(-4.64F, 0f, -4.64f); - bottom.setScale(0.5799f); - bottom.setThickness(0.65f); - setRotation(bottom, (float)(Math.PI / -2), 0, 0); - this.addChild(bottom); - } - public ModelHeadwear(ModelBase base, boolean alex) { + public ModelHeadwear(ModelBase base) { super(base); Model2DRenderer right = new Model2DRenderer(base, 32, 8, 8, 8, 64, 64); right.setRotationPoint(-4.641F, .8f, 4.64f); diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java index a28b5ce11..4568fd76d 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelBullHorns.java @@ -1,20 +1,19 @@ package noppes.npcs.client.model.part.horns; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import noppes.npcs.client.model.ModelMPM; public class ModelBullHorns extends ModelRenderer { public ModelBullHorns(ModelMPM base) { super(base); + ModelRenderer Left1 = new ModelRenderer(base, 36, 16); Left1.mirror = true; Left1.addBox(0F, 0F, 0F, 2, 2, 2); Left1.setRotationPoint(4F, -8F, -2F); addChild(Left1); - + ModelRenderer Right1 = new ModelRenderer(base, 36, 16); Right1.addBox(-3F, 0F, 0F, 2, 2, 2); Right1.setRotationPoint(-3F, -8F, -2F); @@ -26,13 +25,13 @@ public class ModelBullHorns extends ModelRenderer { Left2.setRotationPoint(5F, -8F, -2F); setRotation(Left2, 0.0371786F, 0.3346075F, -0.2602503F); addChild(Left2); - + ModelRenderer Right2 = new ModelRenderer(base, 12, 16); Right2.addBox(-2F, 0F, 0F, 2, 2, 2); Right2.setRotationPoint(-5F, -8F, -2F); setRotation(Right2, 0.0371786F, -0.3346075F, 0.2602503F); addChild(Right2); - + ModelRenderer Left3 = new ModelRenderer(base, 13, 17); Left3.mirror = true; Left3.addBox(-1F, 0F, 0F, 2, 1, 1); diff --git a/src/main/resources/assets/moreplayermodels/textures/horns/antennas.png b/src/main/resources/assets/moreplayermodels/textures/horns/antennas.png index 87fe86248..1ab9bcc8d 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/horns/antennas.png and b/src/main/resources/assets/moreplayermodels/textures/horns/antennas.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/horns/antlers.png b/src/main/resources/assets/moreplayermodels/textures/horns/antlers.png index 9f1dc0406..4ad6ec24b 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/horns/antlers.png and b/src/main/resources/assets/moreplayermodels/textures/horns/antlers.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/horns/bull.png b/src/main/resources/assets/moreplayermodels/textures/horns/bull.png index b2bf127de..4ac4d98d8 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/horns/bull.png and b/src/main/resources/assets/moreplayermodels/textures/horns/bull.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/beak1.png b/src/main/resources/assets/moreplayermodels/textures/snout/beak1.png index 5817706a3..2bbaeda2e 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/snout/beak1.png and b/src/main/resources/assets/moreplayermodels/textures/snout/beak1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/bunny1.png b/src/main/resources/assets/moreplayermodels/textures/snout/bunny1.png index 44f46d580..a0d78e8a2 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/snout/bunny1.png and b/src/main/resources/assets/moreplayermodels/textures/snout/bunny1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/large1.png b/src/main/resources/assets/moreplayermodels/textures/snout/large1.png index 34198e7cb..cb07e6b2d 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/snout/large1.png and b/src/main/resources/assets/moreplayermodels/textures/snout/large1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png b/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png index 637a33b06..c7aa53b01 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png and b/src/main/resources/assets/moreplayermodels/textures/snout/medium1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/snout/small1.png b/src/main/resources/assets/moreplayermodels/textures/snout/small1.png index b698b69e9..e5ddf74a3 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/snout/small1.png and b/src/main/resources/assets/moreplayermodels/textures/snout/small1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png b/src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png index fd2db401b..4406f7c7a 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png and b/src/main/resources/assets/moreplayermodels/textures/tail/dragon1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/fin1.png b/src/main/resources/assets/moreplayermodels/textures/tail/fin1.png index 39eaf3b60..3b3bbc515 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/fin1.png and b/src/main/resources/assets/moreplayermodels/textures/tail/fin1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/rodent1.png b/src/main/resources/assets/moreplayermodels/textures/tail/rodent1.png index de3b6a289..4413adf8c 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/rodent1.png and b/src/main/resources/assets/moreplayermodels/textures/tail/rodent1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png b/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png index af008fbd1..96b0b9c5c 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png and b/src/main/resources/assets/moreplayermodels/textures/tail/squirrel1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png b/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png index 8869897d5..2f875b3a0 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png and b/src/main/resources/assets/moreplayermodels/textures/tail/tail1.png differ diff --git a/src/main/resources/assets/moreplayermodels/textures/tail/tail2.png b/src/main/resources/assets/moreplayermodels/textures/tail/tail2.png index 3a0de50c3..c2def69a2 100644 Binary files a/src/main/resources/assets/moreplayermodels/textures/tail/tail2.png and b/src/main/resources/assets/moreplayermodels/textures/tail/tail2.png differ