From 0e2508cf756d7f21cccea2fab84700f91a693a42 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Fri, 7 May 2021 20:56:44 -0400 Subject: [PATCH] Fixed Part Data All parts, including cloaks and naga models are fixed. Refixed texture sizes. --- .../client/gui/model/GuiCreationScreen.java | 4 ++- .../npcs/client/gui/model/GuiModelLegs.java | 7 ++++- .../npcs/client/model/part/ModelBreasts.java | 12 +++++++++ .../npcs/client/model/part/ModelDuckBeak.java | 7 +++++ .../npcs/client/model/part/ModelLegs.java | 8 +++++- .../npcs/client/model/part/ModelSnout.java | 6 +++++ .../npcs/client/model/part/ModelTail.java | 1 + .../model/part/horns/ModelAntennasBack.java | 5 ++++ .../model/part/horns/ModelAntennasFront.java | 5 ++++ .../model/part/horns/ModelAntlerHorns.java | 22 ++++++++++++++++ .../model/part/horns/ModelBullHorns.java | 9 +++++++ .../model/part/legs/ModelDigitigradeLegs.java | 24 +++++++++++------- .../client/model/part/legs/ModelNagaLegs.java | 11 ++++---- .../model/part/tails/ModelDragonTail.java | 10 ++++++++ .../model/part/tails/ModelFeatherTail.java | 5 ++++ .../model/part/tails/ModelRodentTail.java | 3 +++ .../client/model/part/tails/ModelTailFin.java | 8 ++++++ .../textures/parts/horns/antennas.png | Bin 288 -> 242 bytes .../textures/parts/horns/antlers.png | Bin 256 -> 234 bytes .../customnpcs/textures/parts/horns/bull.png | Bin 354 -> 291 bytes .../customnpcs/textures/parts/legs/naga2.png | Bin 0 -> 735 bytes 21 files changed, 130 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 75a9efdf4..11448c9ea 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -279,7 +279,9 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol npc.display.modelType = 2; } else { - npc.display.skinType = 2; + if (npc.display.skinType == 3){ + npc.display.skinType = 2; + } npc.display.modelType = 0; } } diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java index 5bb0f4b52..a7ee32613 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java @@ -101,7 +101,12 @@ public class GuiModelLegs extends GuiModelInterface{ if(value == 3) data.setTexture("legs/horse1", 3); if(value == 4) - data.setTexture("legs/naga1", 1); + if (npc.display.modelType == 1 || npc.display.modelType == 2){ + data.setTexture("legs/naga2", 1); + } + else{ + data.setTexture("legs/naga1", 1); + } if(value == 5) data.setTexture("legs/mermaid1", 4); if(value == 6) diff --git a/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java b/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java index 14c209f40..0e2b969a2 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java @@ -16,15 +16,18 @@ public class ModelBreasts extends ModelPartInterface { super(base); breasts = new Model2DRenderer(base, 20f, 22, 8, 3, width, height); + breasts.setTextureSize(width, height); breasts.setRotationPoint(-3.6F, 5.2f, -3f); breasts.setScale(0.17f, 0.19f); breasts.setThickness(1); this.addChild(breasts); breasts2 = new ModelRenderer(base); + breasts2.setTextureSize(width, height); this.addChild(breasts2); Model2DRenderer bottom = new Model2DRenderer(base, 20f, 22, 8, 4, width, height); + bottom.setTextureSize(width, height); bottom.setRotationPoint(-3.6F, 5f, -3.1f); bottom.setScale(0.225f, 0.20f); bottom.setThickness(2f); @@ -32,15 +35,18 @@ public class ModelBreasts extends ModelPartInterface { breasts2.addChild(bottom); breasts3 = new ModelRenderer(base); + breasts3.setTextureSize(width, height); this.addChild(breasts3); Model2DRenderer right = new Model2DRenderer(base, 20f, 22, 3, 2, width, height); + right.setTextureSize(width, height); right.setRotationPoint(-3.8F, 5.3f, -3.6f); right.setScale(0.12f, 0.14f); right.setThickness(1.75f); breasts3.addChild(right); Model2DRenderer right2 = new Model2DRenderer(base, 20f, 22, 3, 1, width, height); + right2.setTextureSize(width, height); right2.setRotationPoint(-3.8F, 4.1f, -3.14f); right2.setScale(0.06f, 0.07f); right2.setThickness(1.75f); @@ -48,6 +54,7 @@ public class ModelBreasts extends ModelPartInterface { breasts3.addChild(right2); Model2DRenderer right3 = new Model2DRenderer(base, 20f, 24, 3, 1, width, height); + right3.setTextureSize(width, height); right3.setRotationPoint(-3.8F, 5.3f, -3.6f); right3.setScale(0.06f, 0.07f); right3.setThickness(1.75f); @@ -55,6 +62,7 @@ public class ModelBreasts extends ModelPartInterface { breasts3.addChild(right3); Model2DRenderer right4 = new Model2DRenderer(base, 23f, 22, 1, 2, width, height); + right4.setTextureSize(width, height); right4.setRotationPoint(-1.8f, 5.3f, -3.14f); right4.setScale(0.12f, 0.14f); right4.setThickness(1.75f); @@ -62,12 +70,14 @@ public class ModelBreasts extends ModelPartInterface { breasts3.addChild(right4); Model2DRenderer left = new Model2DRenderer(base, 25f, 22, 3, 2, width, height); + left.setTextureSize(width, height); left.setRotationPoint(0.8F, 5.3f, -3.6f); left.setScale(0.12f, 0.14f); left.setThickness(1.75f); breasts3.addChild(left); Model2DRenderer left2 = new Model2DRenderer(base, 25f, 22, 3, 1, width, height); + left2.setTextureSize(width, height); left2.setRotationPoint(0.8F, 4.1f, -3.18f); left2.setScale(0.06f, 0.07f); left2.setThickness(1.75f); @@ -75,6 +85,7 @@ public class ModelBreasts extends ModelPartInterface { breasts3.addChild(left2); Model2DRenderer left3 = new Model2DRenderer(base, 25f, 24, 3, 1, width, height); + left3.setTextureSize(width, height); left3.setRotationPoint(0.8F, 5.3f, -3.6f); left3.setScale(0.06f, 0.07f); left3.setThickness(1.75f); @@ -82,6 +93,7 @@ public class ModelBreasts extends ModelPartInterface { breasts3.addChild(left3); Model2DRenderer left4 = new Model2DRenderer(base, 24f, 22, 1, 2, width, height); + left4.setTextureSize(width, height); left4.setRotationPoint(0.8f, 5.3f, -3.6f); left4.setScale(0.12f, 0.14f); left4.setThickness(1.75f); diff --git a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java b/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java index 58749c6df..acadd0262 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelDuckBeak.java @@ -21,39 +21,46 @@ public class ModelDuckBeak extends ModelRenderer { super(base); Top3 = new ModelRenderer(base, 14, 0); + Top3.setTextureSize(64,32); Top3.addBox(0F, 0F, 0F, 2, 1, 3); Top3.setRotationPoint(-1F, -2F, -5F); setRotation(Top3, 0.3346075F, 0F, 0F); addChild(Top3); Top2 = new ModelRenderer(base, 0, 0); + Top2.setTextureSize(64,32); Top2.addBox(0F, 0F, -0.4F, 4, 1, 3); Top2.setRotationPoint(-2F, -3F, -2F); setRotation(Top2, 0.3346075F, 0F, 0F); addChild(Top2); Bottom = new ModelRenderer(base, 24, 0); + Bottom.setTextureSize(64,32); Bottom.addBox(0F, 0F, 0F, 2, 1, 5); Bottom.setRotationPoint(-1F, -1F, -5F); addChild(Bottom); Left = new ModelRenderer(base, 0, 4); + Left.setTextureSize(64,32); Left.mirror = true; Left.addBox(0F, 0F, 0F, 1, 3, 2); Left.setRotationPoint(0.98F, -3F, -2F); addChild(Left); Right = new ModelRenderer(base, 0, 4); + Right.setTextureSize(64,32); Right.addBox(0F, 0F, 0F, 1, 3, 2); Right.setRotationPoint(-1.98F, -3F, -2F); addChild(Right); Middle = new ModelRenderer(base, 3, 0); + Middle.setTextureSize(64,32); Middle.addBox(0F, 0F, 0F, 2, 1, 3); Middle.setRotationPoint(-1F, -2F, -5F); addChild(Middle); Top = new ModelRenderer(base, 6, 4); + Top.setTextureSize(64,32); Top.addBox(0F, 0F, 0F, 2, 2, 1); Top.setRotationPoint(-1F, -4.4F, -1F); addChild(Top); diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java index 5383015b1..ce127880d 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java @@ -29,6 +29,7 @@ public class ModelLegs extends ModelScaleRenderer{ private ModelDigitigradeLegs digitigrade; private ModelMermaidLegs mermaid; private ModelMermaidLegs2 mermaid2; + private boolean mirror = true; private ModelRenderer spiderLeg1; private ModelRenderer spiderLeg2; @@ -61,6 +62,11 @@ public class ModelLegs extends ModelScaleRenderer{ public ModelLegs(ModelMPM base, ModelScaleRenderer leg1, ModelScaleRenderer leg2, int textWidth, int textHeight) { super(base); + + if(textHeight != textWidth){ + this.mirror = true; + } + this.base = base; this.leg1 = leg1; this.leg2 = leg2; @@ -217,7 +223,7 @@ public class ModelLegs extends ModelScaleRenderer{ this.addChild(mermaid); this.addChild(mermaid2); - digitigrade = new ModelDigitigradeLegs(base); + digitigrade = new ModelDigitigradeLegs(base, mirror); this.addChild(digitigrade); } public void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java index d44c2c2ec..b15165f2c 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelSnout.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelSnout.java @@ -19,31 +19,37 @@ public class ModelSnout extends ModelPartInterface { super(base); small = new ModelRenderer(base, 24, 0); + small.setTextureSize(64,32); small.addBox(0F, 0F, 0F, 4, 3, 1); small.setRotationPoint(-2F, -3F, -5F); this.addChild(small); medium = new ModelRenderer(base, 24, 0); + medium.setTextureSize(64,32); medium.addBox(0F, 0F, 0F, 4, 3, 2); medium.setRotationPoint(-2F, -3F, -6F); this.addChild(medium); large = new ModelRenderer(base, 24, 0); + large.setTextureSize(64,32); large.addBox(0F, 0F, 0F, 4, 3, 3); large.setRotationPoint(-2F, -3F, -7F); this.addChild(large); bunny = new ModelRenderer(base, 24, 0); + bunny.setTextureSize(64,32); bunny.addBox(1F, 1F, 0F, 4, 2, 1); bunny.setRotationPoint(-3F, -4F, -5F); this.addChild(bunny); ModelRenderer tooth = new ModelRenderer(base, 24, 3); + tooth.setTextureSize(64,32); tooth.addBox(2F, 3f, 0F, 2, 1, 1); tooth.setRotationPoint(0F, 0F, 0F); bunny.addChild(tooth); beak = new ModelDuckBeak(base); + beak.setTextureSize(64,32); beak.setRotationPoint(0, 0, -4F); this.addChild(beak); } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java index 50d01355a..86c056087 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -39,6 +39,7 @@ public class ModelTail extends ModelScaleRenderer { this.rotationPointY = 11; tail = new ModelRenderer(base, 56, 21); + tail.setTextureSize(64, 32); tail.addBox(-1F, 0F, 0F, 2, 9, 2); tail.setRotationPoint(0F, 0, 1F); setRotation(tail, 0.8714253F, 0F, 0F); diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java index 3d5ecb310..45dc32564 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasBack.java @@ -9,13 +9,16 @@ public class ModelAntennasBack extends ModelRenderer { public ModelAntennasBack(ModelMPM base) { super(base); + ModelRenderer rightantenna1 = new ModelRenderer(base, 36, 0); + rightantenna1.setTextureSize(64,32); rightantenna1.addBox(-1F, 0F, 0F, 1, 4, 1); rightantenna1.setRotationPoint(3F, -10.9F, 0F); setRotation(rightantenna1, -0.7504916F, 0.0698132F, 0.0698132F); addChild(rightantenna1); ModelRenderer leftantenna1 = new ModelRenderer(base, 32, 0); + leftantenna1.setTextureSize(64,32); leftantenna1.mirror = true; leftantenna1.addBox(0F, 0F, 0F, 1, 4, 1); leftantenna1.setRotationPoint(-3F, -10.9F, 0F); @@ -23,12 +26,14 @@ public class ModelAntennasBack extends ModelRenderer { addChild(leftantenna1); ModelRenderer rightantenna2 = new ModelRenderer(base, 36, 0); + rightantenna2.setTextureSize(64,32); rightantenna2.addBox(-1F, 0F, 0F, 1, 4, 1); rightantenna2.setRotationPoint(4.6F, -12.2F, 3.4F); setRotation(rightantenna2, -1.22173F, 0.4363323F, 0.0698132F); addChild(rightantenna2); ModelRenderer leftantenna2 = new ModelRenderer(base, 32, 0); + leftantenna2.setTextureSize(64,32); leftantenna2.mirror = true; leftantenna2.addBox(0F, 0F, 0F, 1, 4, 1); leftantenna2.setRotationPoint(-4.6F, -12.2F, 3.4F); diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java index 4200a1e6f..e0aadfe73 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntennasFront.java @@ -9,13 +9,16 @@ public class ModelAntennasFront extends ModelRenderer { public ModelAntennasFront(ModelMPM base) { super(base); + ModelRenderer rightantenna1 = new ModelRenderer(base, 36, 0); + rightantenna1.setTextureSize(64,32); rightantenna1.addBox(0F, 0F, 0F, 1, 4, 1); rightantenna1.setRotationPoint(2F, -9.4F, -2F); setRotation(rightantenna1, 0.4014257F, 0.0698132F, 0.0698132F); addChild(rightantenna1); ModelRenderer leftantenna1 = new ModelRenderer(base, 32, 0); + leftantenna1.setTextureSize(64,32); leftantenna1.mirror = true; leftantenna1.addBox(-1F, 0F, 0F, 1, 4, 1); leftantenna1.setRotationPoint(-2F, -9.4F, -2F); @@ -23,12 +26,14 @@ public class ModelAntennasFront extends ModelRenderer { addChild(leftantenna1); ModelRenderer rightantenna2 = new ModelRenderer(base, 36, 0); + rightantenna2.setTextureSize(64,32); rightantenna2.addBox(0F, 0F, 0F, 1, 4, 1); rightantenna2.setRotationPoint(3F, -10.2F, -5.3F); setRotation(rightantenna2, 1.22173F, -0.2094395F, 0.0698132F); addChild(rightantenna2); ModelRenderer leftantenna2 = new ModelRenderer(base, 32, 0); + leftantenna2.setTextureSize(64,32); leftantenna2.mirror = true; leftantenna2.addBox(-1F, 0F, 0F, 1, 4, 1); leftantenna2.setRotationPoint(-3F, -10.2F, -5.3F); diff --git a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java index 83cc12118..6d0142f74 100644 --- a/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java +++ b/src/main/java/noppes/npcs/client/model/part/horns/ModelAntlerHorns.java @@ -9,53 +9,75 @@ public class ModelAntlerHorns extends ModelRenderer { public ModelAntlerHorns(ModelMPM base) { super(base); + + textureWidth = 64; + textureHeight = 32; + ModelRenderer right_base_horn = new ModelRenderer(base, 58, 20); + right_base_horn.setTextureSize(64,32); right_base_horn.addBox(0F, -5F, 0F, 1, 6, 1); right_base_horn.setRotationPoint(-2.5F, -6F, -1F); setRotation(right_base_horn, 0F, 0F, -0.2F); addChild(right_base_horn); + ModelRenderer right_horn1 = new ModelRenderer(base, 58, 20); + right_horn1.setTextureSize(64,32); right_horn1.addBox(0F, -5F, 0F, 1, 5, 1); right_horn1.setRotationPoint(0F, -4F, 0F); setRotation(right_horn1, 1F, 0F, -1F); right_base_horn.addChild(right_horn1); + ModelRenderer right_horn2 = new ModelRenderer(base, 58, 20); + right_horn2.setTextureSize(64,32); right_horn2.addBox(0F, -4F, 0F, 1, 5, 1); right_horn2.setRotationPoint(-0F, -6F, -0F); setRotation(right_horn2, -0.5F, -0.5F, 0F); right_base_horn.addChild(right_horn2); + ModelRenderer things1 = new ModelRenderer(base, 58, 20); + things1.setTextureSize(64,32); things1.addBox(0F, -5F, 0F, 1, 5, 1); things1.setRotationPoint(0F, -3F, 1F); setRotation(things1, 2F, 0.5f, 0.5f); right_horn2.addChild(things1); + ModelRenderer things2 = new ModelRenderer(base, 58, 20); + things2.setTextureSize(64,32); things2.addBox(0F, -5F, 0F, 1, 5, 1); things2.setRotationPoint(0F, -3F, 1F); setRotation(things2, 2F, -0.5f, -0.5f); right_horn2.addChild(things2); ModelRenderer left_base_horn = new ModelRenderer(base, 58, 20); + left_base_horn.setTextureSize(64,32); left_base_horn.addBox(0F, -5F, 0F, 1, 6, 1); left_base_horn.setRotationPoint(1.5F, -6F, -1F); setRotation(left_base_horn, 0F, 0F, 0.2F); addChild(left_base_horn); + ModelRenderer left_horn1 = new ModelRenderer(base, 58, 20); + left_horn1.setTextureSize(64,32); left_horn1.addBox(0F, -5F, 0F, 1, 5, 1); left_horn1.setRotationPoint(0F, -5F, 0F); setRotation(left_horn1, 1F, 0F, 1F); left_base_horn.addChild(left_horn1); + ModelRenderer left_horn2 = new ModelRenderer(base, 58, 20); + left_horn2.setTextureSize(64,32); left_horn2.addBox(0F, -4F, 0F, 1, 5, 1); left_horn2.setRotationPoint(0F, -6F, 1F); setRotation(left_horn2, -0.5F, 0.5F, 0F); left_base_horn.addChild(left_horn2); + ModelRenderer things8 = new ModelRenderer(base, 58, 20); + things8.setTextureSize(64,32); things8.addBox(0F, -5F, 0F, 1, 5, 1); things8.setRotationPoint(0F, -3F, 1F); setRotation(things8, 2F, -0.5f, -0.5f); left_horn2.addChild(things8); + ModelRenderer things4 = new ModelRenderer(base, 58, 20); + things4.setTextureSize(64,32); things4.addBox(0F, -5F, 0F, 1, 5, 1); things4.setRotationPoint(0F, -3F, 1F); setRotation(things4, 2F, 0.5f, 0.5f); 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 4568fd76d..b1fe8e393 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 @@ -8,18 +8,24 @@ public class ModelBullHorns extends ModelRenderer { public ModelBullHorns(ModelMPM base) { super(base); + textureWidth = 64; + textureHeight = 32; + ModelRenderer Left1 = new ModelRenderer(base, 36, 16); + Left1.setTextureSize(64,32); 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.setTextureSize(64,32); Right1.addBox(-3F, 0F, 0F, 2, 2, 2); Right1.setRotationPoint(-3F, -8F, -2F); addChild(Right1); ModelRenderer Left2 = new ModelRenderer(base, 12, 16); + Left2.setTextureSize(64,32); Left2.mirror = true; Left2.addBox(0F, 0F, 0F, 2, 2, 2); Left2.setRotationPoint(5F, -8F, -2F); @@ -27,12 +33,14 @@ public class ModelBullHorns extends ModelRenderer { addChild(Left2); ModelRenderer Right2 = new ModelRenderer(base, 12, 16); + Right2.setTextureSize(64,32); 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.setTextureSize(64,32); Left3.mirror = true; Left3.addBox(-1F, 0F, 0F, 2, 1, 1); Left3.setRotationPoint(7F, -8F, -2F); @@ -40,6 +48,7 @@ public class ModelBullHorns extends ModelRenderer { addChild(Left3); ModelRenderer Right3 = new ModelRenderer(base, 13, 17); + Right3.setTextureSize(64,32); Right3.addBox(-1F, 0F, 0F, 2, 1, 1); Right3.setRotationPoint(-7F, -8F, -2F); setRotation(Right3, -0.2602503F, -0.8551081F, 0.4089647F); diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java index 6f02c6086..0110f65a4 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java @@ -22,9 +22,15 @@ public class ModelDigitigradeLegs extends ModelRenderer { private ModelMPM base; - public ModelDigitigradeLegs(ModelMPM base) { + public ModelDigitigradeLegs(ModelMPM base, boolean mirror) { super(base); this.base = base; + + int adder = 0; + if(mirror == false){ + adder = 32; + } + rightleg = new ModelRenderer(base, 0, 16); rightleg.addBox(-2F, 0F, -2F, 4, 6, 4); rightleg.setRotationPoint(-2.1F, 11F, 0F); @@ -49,29 +55,29 @@ public class ModelDigitigradeLegs extends ModelRenderer { setRotation(rightfoot, 0.55F, 0F, 0F); rightleglow.addChild(rightfoot); - leftleg = new ModelRenderer(base, 0, 16); - leftleg.mirror = true; + leftleg = new ModelRenderer(base, 0, 16 + adder); + leftleg.mirror = mirror; leftleg.addBox(-2F, 0F, -2F, 4, 6, 4); leftleg.setRotationPoint(2.1F, 11F, 0F); setRotation(leftleg, -0.3F, 0F, 0F); this.addChild(leftleg); - leftleg2 = new ModelRenderer(base, 0, 20); - leftleg2.mirror = true; + leftleg2 = new ModelRenderer(base, 0, 20 + adder); + leftleg2.mirror = mirror; leftleg2.addBox(-1.5F, -1F, -2F, 3, 7, 3); leftleg2.setRotationPoint(0F, 4.1F, 0F); setRotation(leftleg2, 1.1f, 0F, 0F); leftleg.addChild(leftleg2); - leftleglow = new ModelRenderer(base, 0, 24); - leftleglow.mirror = true; + leftleglow = new ModelRenderer(base, 0, 24 + adder); + leftleglow.mirror = mirror; leftleglow.addBox(-1.5F, 0F, -1F, 3, 5, 2); leftleglow.setRotationPoint(0F, 5F, 0F); setRotation(leftleglow, -1.35F, 0F, 0F); leftleg2.addChild(leftleglow); - leftfoot = new ModelRenderer(base, 1, 26); - leftfoot.mirror = true; + leftfoot = new ModelRenderer(base, 1, 26 + adder); + leftfoot.mirror = mirror; leftfoot.addBox(-1.5F, 0F, -5F, 3, 2, 4); leftfoot.setRotationPoint(0F, 3.7F, 1.2F); setRotation(leftfoot, 0.55F, 0F, 0F); diff --git a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java index 8d23ef5af..f45c8699f 100644 --- a/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java +++ b/src/main/java/noppes/npcs/client/model/part/legs/ModelNagaLegs.java @@ -25,9 +25,10 @@ public class ModelNagaLegs extends ModelRenderer{ super(base); nagaPart1 = new ModelRenderer(base,0,0); - nagaPart1.setTextureSize(64,32); +// nagaPart1.setTextureSize(64,32); ModelRenderer legPart = new ModelRenderer(base,0,16); +// legPart.setTextureSize(64,32); legPart.addBox(0, -2, -2, 4, 4, 4); legPart.setRotationPoint(-4, 0, 0); @@ -38,11 +39,11 @@ public class ModelNagaLegs extends ModelRenderer{ nagaPart1.addChild(legPart); nagaPart2 = new ModelRenderer(base,0,0); - nagaPart2.setTextureSize(64,32); +// nagaPart2.setTextureSize(64,32); nagaPart2.childModels = nagaPart1.childModels; nagaPart3 = new ModelRenderer(base,0,0); - nagaPart3.setTextureSize(64,32); +// nagaPart3.setTextureSize(64,32); ModelPlaneRenderer plane = new ModelPlaneRenderer(base, 4, 24); plane.addBackPlane(0,-2, 0, 4, 4); @@ -93,11 +94,11 @@ public class ModelNagaLegs extends ModelRenderer{ nagaPart3.addChild(plane); nagaPart4 = new ModelRenderer(base,0,0); - nagaPart4.setTextureSize(64,32); +// nagaPart4.setTextureSize(64,32); nagaPart4.childModels = nagaPart3.childModels; nagaPart5 = new ModelRenderer(base,0,0); - nagaPart5.setTextureSize(64,32); +// nagaPart5.setTextureSize(64,32); legPart = new ModelRenderer(base,56,20); legPart.addBox(0, 0, -2, 2, 5, 2); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java index 09b4c86e3..8516d385d 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelDragonTail.java @@ -19,34 +19,44 @@ public class ModelDragonTail extends ModelRenderer { this.addChild(dragon); ModelRenderer DragonTail2 = new ModelRenderer(base, x, y); + DragonTail2.setTextureSize(64, 32); DragonTail2.setRotationPoint(0F, 2F, 2F); ModelRenderer DragonTail3 = new ModelRenderer(base, x, y); + DragonTail3.setTextureSize(64, 32); DragonTail3.setRotationPoint(0F, 4.5F, 4F); ModelRenderer DragonTail4 = new ModelRenderer(base, x, y); + DragonTail4.setTextureSize(64, 32); DragonTail4.setRotationPoint(0F, 7F, 5.75F); ModelRenderer DragonTail5 = new ModelRenderer(base, x, y); + DragonTail5.setTextureSize(64, 32); DragonTail5.setRotationPoint(0F, 9F, 8F); ModelPlaneRenderer planeLeft = new ModelPlaneRenderer(base, x, y); + planeLeft.setTextureSize(64, 32); planeLeft.addSidePlane(-1.5F, -1.5F, -1.5F, 3, 3); ModelPlaneRenderer planeRight = new ModelPlaneRenderer(base, x, y); + planeRight.setTextureSize(64, 32); planeRight.addSidePlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeRight, (float)Math.PI, (float)Math.PI ,0); ModelPlaneRenderer planeTop = new ModelPlaneRenderer(base, x, y); + planeTop.setTextureSize(64, 32); planeTop.addTopPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeTop, 0 ,-(float)Math.PI / 2,0); ModelPlaneRenderer planeBottom = new ModelPlaneRenderer(base, x, y); + planeBottom.setTextureSize(64, 32); planeBottom.addTopPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeBottom, 0 ,-(float)Math.PI / 2, (float)Math.PI); ModelPlaneRenderer planeBack = new ModelPlaneRenderer(base, x, y); + planeBack.setTextureSize(64, 32); planeBack.addBackPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeBack, 0, 0 ,(float)Math.PI / 2); ModelPlaneRenderer planeFront = new ModelPlaneRenderer(base, x, y); + planeFront.setTextureSize(64, 32); planeFront.addBackPlane(-1.5F, -1.5F, -1.5F, 3, 3); setRotation(planeFront, 0, (float)Math.PI ,-(float)Math.PI / 2); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java index 90f3fdc83..5f2feac0c 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelFeatherTail.java @@ -19,18 +19,21 @@ public class ModelFeatherTail extends ModelRenderer { int y = 16; feather1 = new ModelRenderer(base, x, y); + feather1.setTextureSize(64,32); feather1.addBox(-1.5F, 0F, 0F, 3, 8, 0); feather1.setRotationPoint(1F, -0.5F, 2F); setRotation(feather1, 1.482807F, 0.2602503F, 0.1487144F); addChild(feather1); feather2 = new ModelRenderer(base, x, y); + feather2.setTextureSize(64,32); feather2.addBox(-1.5F, 0F, 0F, 3, 8, 0); feather2.setRotationPoint(0F, -0.5F, 1F); setRotation(feather2, 1.200559F, 0.3717861F, 0.1858931F); addChild(feather2); feather3 = new ModelRenderer(base, x, y); + feather3.setTextureSize(64,32); feather3.mirror = true; feather3.addBox(-1.5F, -0.5F, 0F, 3, 8, 0); feather3.setRotationPoint(-1F, 0, 2F); @@ -38,12 +41,14 @@ public class ModelFeatherTail extends ModelRenderer { addChild(feather3); feather4 = new ModelRenderer(base, x, y); + feather4.setTextureSize(64,32); feather4.addBox(-1.5F, 0F, 0F, 3, 8, 0); feather4.setRotationPoint(0F, -0.5F, 2F); setRotation(feather4, 1.786329F, 0F, 0F); addChild(feather4); feather5 = new ModelRenderer(base, x, y); + feather5.setTextureSize(64,32); feather5.mirror = true; feather5.addBox(-1.5F, 0F, 0F, 3, 8, 0); feather5.setRotationPoint(-1F, -0.5F, 2F); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java index 98c3a1e3c..bd9a1d811 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelRodentTail.java @@ -11,13 +11,16 @@ public class ModelRodentTail extends ModelRenderer { public ModelRodentTail(ModelMPM base) { super(base); + Shape1 = new ModelRenderer(base, 0, 0); + Shape1.setTextureSize(64,32); Shape1.addBox(-0.5333334F, -0.4666667F, -1F, 1, 1, 6); Shape1.setRotationPoint(0F, 0F, 2F); setRotation(Shape1, -0.9294653F, 0F, 0F); addChild(Shape1); Shape2 = new ModelRenderer(base, 1, 1); + Shape2.setTextureSize(64,32); Shape2.addBox(-0.5F, -0.1666667F, 1F, 1, 1, 5); Shape2.setRotationPoint(0F, 3F, 4F); setRotation(Shape2, -0.4833219F, 0F, 0F); diff --git a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java b/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java index b6d5f7def..b89691ea0 100644 --- a/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java +++ b/src/main/java/noppes/npcs/client/model/part/tails/ModelTailFin.java @@ -8,25 +8,33 @@ public class ModelTailFin extends ModelRenderer { public ModelTailFin(ModelMPM base) { super(base); + + textureWidth = 64; + textureHeight = 32; + ModelRenderer Shape1 = new ModelRenderer(base, 0, 0); + Shape1.setTextureSize(64,32); Shape1.addBox(-2F, -2F, -2F, 3, 3, 8); Shape1.setRotationPoint(0.5F, 0F, 1F); setRotation(Shape1, -0.669215F, 0F, 0F); addChild(Shape1); ModelRenderer Shape2 = new ModelRenderer(base, 2, 2); + Shape2.setTextureSize(64,32); Shape2.addBox(-1F, -1F, 1F, 3, 2, 6); Shape2.setRotationPoint(-0.5F, 3F, 4.5F); setRotation(Shape2, -0.2602503F, 0F, 0F); addChild(Shape2); ModelRenderer Shape3 = new ModelRenderer(base, 0, 11); + Shape3.setTextureSize(64,32); Shape3.addBox(-1F, -1F, -1F, 3, 1, 6); Shape3.setRotationPoint(0.5F, 5F, 12F); setRotation(Shape3, 0F, 1.07818F, 0F); addChild(Shape3); ModelRenderer Shape4 = new ModelRenderer(base, 0, 11); + Shape4.setTextureSize(64,32); Shape4.mirror = true; Shape4.addBox(-2F, 0F, -1F, 3, 1, 6); Shape4.setRotationPoint(-0.5F, 4F, 12F); diff --git a/src/main/resources/assets/customnpcs/textures/parts/horns/antennas.png b/src/main/resources/assets/customnpcs/textures/parts/horns/antennas.png index 1ab9bcc8d930f3b2ad377e99dccd6fd6ff4c0ad6..fefff18cab2019ae901d9d224ca5e531a3e3d3d1 100644 GIT binary patch delta 199 zcmZ3$^oenTIF|wk8v_HwqPcY~6BQNeISV`@iy0XB4uLSEsD@VqP_o_A#W5tq`Rx^7 zzGel1w!{Th|Enim;cbmj@M-lEmpgFd#qXSbl84d`_5WnoR9(5XYn$7YZP%|wNgtjT z9IFAOY8DKH1Rj~?Z5ls-tUQjKP=rE7$3F&nW7O( uv>gg8W*N#~SRB2~Ve2_okdUXVpUXO@geCyt*is|_ delta 245 zcmeywxPWPbIF|zlGXn#|-0h8TCMqh_>jwCQxB~g#zJ2@i=g$v}#~B*-rqs2&M0T)8u2AyA65z$3Dl zfr0NZ2s0kfUy%Y7O!Rbd42f`md%>Eo!GMP)@B|x&{r&$5JC01+&9QUAf|)P3ebBav zycTn2iA1tyz}AebyC*P3zrG&daH+ris`9e{t`~b&m298k{8JccyA9BOh6BtDA7ISi c(gxKGkIn9_cjC$D0oumk>FVdQ&MBb@0B!AelmGw# diff --git a/src/main/resources/assets/customnpcs/textures/parts/horns/antlers.png b/src/main/resources/assets/customnpcs/textures/parts/horns/antlers.png index 4ad6ec24b9b9cc9ceccfaaff28b053756cf644e1..a0f7f52a2349f2053b33d8c8cf0d05da29f9d773 100644 GIT binary patch delta 191 zcmZo*dc`}T;wuhP4D&OlDdWCsKxZM)pxW_+pM!lUIP#p+7SRLfGd8^s^!rya$RW6CB;s1OQ!xybf$0T0v qoqsO%+UfI#$F8h;y@l~Xnv%Y=qM?=X$8$X(3p`!@T-G@yGywofD^T(P delta 213 zcmaFG*uXSFoXdfOnSp^}?)Jtv6BQNe6$5-iT!H)#A3ps4{rl_JumAu5|NQy$+qZ9D zzkdDW$B%#i{()3K5^V-j+$BMN!9WF2z~JT2_z5V?S>O>_%)r2R7=#&*=dVZs3I=+* zIEF;HzddItbijav`5=Ru;-CKq4JWIw_!7IY$UVH9k->+7!Qt}5hM#hb9TA$0Z1*b_N5mDq)5LEEoPVD&3l&y2_350?>2@Pgg&ebxsLQ00Zb- AtpET3 diff --git a/src/main/resources/assets/customnpcs/textures/parts/horns/bull.png b/src/main/resources/assets/customnpcs/textures/parts/horns/bull.png index 4ac4d98d8629b533ba32eb19f228577ab4fa8304..68aec3de29e2a55e67e80f448d1ca86d6aea8c64 100644 GIT binary patch delta 248 zcmVI+)`)OjT8;>pD05ba0Wcm)QW+_r34Jd+u*TP@d-HPai&f`1$kaojZ44ym;~M-MdSd zEKC+mBf$uN~Gak=hkpdL0_H=O! ziEw{=;Wk&Zfj~>*+*wDq$VIKrz4za9cHR~%yRT=A7z7@C%qm&8)j@pv^2;d=auxN{)?e6ZR?}Gc>u>3-bN@Pj lgY-Hm12GislJdx8TXd!7`|%sR%Yg1+@O1TaS?83{1OUXOr+WYZ diff --git a/src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png b/src/main/resources/assets/customnpcs/textures/parts/legs/naga2.png new file mode 100644 index 0000000000000000000000000000000000000000..bff895fbb8acd8ccf59d425051b8821537fdf022 GIT binary patch literal 735 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`125AX?b1=8i^iZ<3Rf^YZetva(jKTJ`z!=f8jdCM6~15-0DEewIs+d7^s+Hz_97vMhl>UoCO|{#S9F5`$3q| zf;CtL7`PsuE{-7)?r*0=`!^d%wCxUR+nkjdo7j3ykuUMH!SkDE&tCrbKYxm+8g1sfax3%_t=-&wmoer8_?V}AaFchf_bDTgx1%g7}@x_qi+ zN!)?Hb{h`&sV_MMl)6e8JdaFdu0FQifm87`gW??RG9$jl6HXnmHN7sjBh~Y0nOm) L>gTe~DWM4fL}6>Q literal 0 HcmV?d00001