From bd25da3593248eb428c3b8998b04268a739e7149 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Fri, 7 May 2021 19:46:26 -0400 Subject: [PATCH] Remove Steve64x32 Alternative >> Fixing Breasts >> Fixing Capes --- .../client/gui/model/GuiCreationScreen.java | 4 +- .../noppes/npcs/client/model/ModelMPM.java | 133 ++++++------------ .../npcs/client/model/part/ModelBreasts.java | 22 +-- .../renderer/ImageBufferDownloadAlt.java | 25 ++-- 4 files changed, 68 insertions(+), 116 deletions(-) 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 d51f8bcbb..75a9efdf4 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -279,10 +279,8 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol npc.display.modelType = 2; } else { + npc.display.skinType = 2; npc.display.modelType = 0; - if (npc.display.skinType == 3){ - npc.display.skinType = 2; - } } } diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index dca765973..6c7ad31de 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -73,6 +73,7 @@ public class ModelMPM extends ModelNPCMale{ float par2 = 0; this.bipedCloak = new ModelRenderer(this, 0, 0); + this.bipedCloak.setTextureSize(64,32); this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); this.bipedEars = new ModelRenderer(this, 24, 0); @@ -97,120 +98,71 @@ public class ModelMPM extends ModelNPCMale{ // this.bipedBodywear.setRotationPoint(0.0F, 0.0F + par2, 0.0F); // Steve 64x64 Model or Alex 64x64 Model - if(updated){ - if (arms){ - // Alex Version - this.bipedRightArm = (new ModelScaleRenderer(this, 40, 16)); - this.bipedRightArm.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1); - // this.bipedRightArm.setRotationPoint(-5.0F, 2.5F + par2, 0.0F); + if (arms){ + // Alex Version + this.bipedRightArm = (new ModelScaleRenderer(this, 40, 16)); + this.bipedRightArm.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1); + // this.bipedRightArm.setRotationPoint(-5.0F, 2.5F + par2, 0.0F); - this.bipedLeftArm = new ModelScaleRenderer(this, 32, 48); - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.5F + par2, 0.0F); + this.bipedLeftArm = new ModelScaleRenderer(this, 32, 48); + this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1); + this.bipedLeftArm.setRotationPoint(5.0F, 2.5F + par2, 0.0F); - this.bipedRightArmwear = (new ModelScaleRenderer(this, 40, 32)); - this.bipedRightArmwear.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); - this.bipedRightArm.addChild(this.bipedRightArmwear); - // this.bipedRightArmWear.setRotationPoint(-5.0F, 2.5F + par2, 0.0F); - - this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); - this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - // this.bipedLeftArmWear.setRotationPoint(5.0F, 2.5F + par2, 0.0F); - } - else{ - // Steve Version - 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, 32, 48); - this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); - - this.bipedRightArmwear = (new ModelScaleRenderer(this, 40, 32)); - this.bipedRightArmwear.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedRightArm.addChild(this.bipedRightArmwear); - //this.bipedRightArmWear.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); - - this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); - this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - //this.bipedLeftArmWear.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); - - // Changed for 64x64 Texture - this.bipedLeftLeg = new ModelScaleRenderer(this, 16, 48); - this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); - this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); - - this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 32)); - this.bipedRightLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedRightLeg.addChild(this.bipedRightLegWear); - // this.bipedRightLegWear.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); - - this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 48); - this.bipedLeftLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedLeftLeg.addChild(this.bipedLeftLegWear); - // this.bipedLeftLegWear.setRotationPoint(1.9F, 12.0F + par2, 0.0F); + this.bipedRightArmwear = (new ModelScaleRenderer(this, 40, 32)); + this.bipedRightArmwear.addBox(-2.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); + this.bipedRightArm.addChild(this.bipedRightArmwear); + // this.bipedRightArmWear.setRotationPoint(-5.0F, 2.5F + par2, 0.0F); + this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); + this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 3, 12, 4, par1 + 0.25F); + this.bipedLeftArm.addChild(this.bipedLeftArmwear); + // this.bipedLeftArmWear.setRotationPoint(5.0F, 2.5F + par2, 0.0F); } - // Steve 64x32 Model else{ - - this.bipedRightArm = new ModelScaleRenderer(this, 40, 16); + // Steve Version + 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 = new ModelScaleRenderer(this, 32, 48); this.bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1); this.bipedLeftArm.setRotationPoint(5.0F, 2.0F + par2, 0.0F); - // Arms - this.bipedRightArmwear = (new ModelScaleRenderer(this, 40, 16)); + this.bipedRightArmwear = (new ModelScaleRenderer(this, 40, 32)); this.bipedRightArmwear.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); this.bipedRightArm.addChild(this.bipedRightArmwear); //this.bipedRightArmWear.setRotationPoint(-5.0F, 2.0F + par2, 0.0F); - this.bipedLeftArmwear = new ModelScaleRenderer(this, 40, 16); - this.bipedLeftArmwear.mirror = true; + this.bipedLeftArmwear = new ModelScaleRenderer(this, 48, 48); this.bipedLeftArmwear.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, par1 + 0.25F); this.bipedLeftArm.addChild(this.bipedLeftArmwear); //this.bipedLeftArmWear.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); - - this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 16)); - this.bipedRightLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedRightLeg.addChild(this.bipedRightLegWear); - // this.bipedRightLegWear.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); - - this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 16); - this.bipedLeftArmwear.mirror = true; - this.bipedLeftLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); - this.bipedLeftLeg.addChild(this.bipedLeftLegWear); - // this.bipedLeftLegWear.setRotationPoint(1.9F, 12.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); + + // Changed for 64x64 Texture + this.bipedLeftLeg = new ModelScaleRenderer(this, 16, 48); + this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1); + this.bipedLeftLeg.setRotationPoint(1.9F, 12.0F + par2, 0.0F); + + this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 32)); + this.bipedRightLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); + this.bipedRightLeg.addChild(this.bipedRightLegWear); + // this.bipedRightLegWear.setRotationPoint(-1.9F, 12.0F + par2, 0.0F); + + this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 48); + this.bipedLeftLegWear.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1 + 0.25F); + this.bipedLeftLeg.addChild(this.bipedLeftLegWear); + headwear = new ModelHeadwear(this); legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 64); // bodywear = new ModelBodywear(this); - this.bipedBody.addChild(breasts = new ModelBreasts(this)); + this.bipedBody.addChild(breasts = new ModelBreasts(this, 64, 64)); if(!isArmor){ this.bipedHead.addChild(ears = new ModelEars(this)); this.bipedHead.addChild(mohawk = new ModelMohawk(this)); @@ -242,6 +194,7 @@ public class ModelMPM extends ModelNPCMale{ float par2 = 0; this.bipedCloak = new ModelRenderer(this, 0, 0); + this.bipedCloak.setTextureSize(64,32); this.bipedCloak.addBox(-5.0F, 0.0F, -1.0F, 10, 16, 1, par1); this.bipedEars = new ModelRenderer(this, 24, 0); @@ -305,7 +258,7 @@ public class ModelMPM extends ModelNPCMale{ headwear = new ModelHeadwear(this, true); legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 32); - this.bipedBody.addChild(breasts = new ModelBreasts(this)); + this.bipedBody.addChild(breasts = new ModelBreasts(this, 64, 32)); if(!isArmor){ this.bipedHead.addChild(ears = new ModelEars(this)); this.bipedHead.addChild(mohawk = new ModelMohawk(this)); 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 4570d5e25..14c209f40 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelBreasts.java @@ -12,10 +12,10 @@ public class ModelBreasts extends ModelPartInterface { private ModelRenderer breasts2; private ModelRenderer breasts3; - public ModelBreasts(ModelMPM base) { + public ModelBreasts(ModelMPM base, int width, int height) { super(base); - breasts = new Model2DRenderer(base, 20f, 22, 8, 3, 64, 64); + breasts = new Model2DRenderer(base, 20f, 22, 8, 3, width, height); breasts.setRotationPoint(-3.6F, 5.2f, -3f); breasts.setScale(0.17f, 0.19f); breasts.setThickness(1); @@ -24,7 +24,7 @@ public class ModelBreasts extends ModelPartInterface { breasts2 = new ModelRenderer(base); this.addChild(breasts2); - Model2DRenderer bottom = new Model2DRenderer(base, 20f, 22, 8, 4, 64, 64); + Model2DRenderer bottom = new Model2DRenderer(base, 20f, 22, 8, 4, width, height); bottom.setRotationPoint(-3.6F, 5f, -3.1f); bottom.setScale(0.225f, 0.20f); bottom.setThickness(2f); @@ -34,54 +34,54 @@ public class ModelBreasts extends ModelPartInterface { breasts3 = new ModelRenderer(base); this.addChild(breasts3); - Model2DRenderer right = new Model2DRenderer(base, 20f, 22, 3, 2, 64, 64); + Model2DRenderer right = new Model2DRenderer(base, 20f, 22, 3, 2, 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, 64, 64); + Model2DRenderer right2 = new Model2DRenderer(base, 20f, 22, 3, 1, width, height); right2.setRotationPoint(-3.8F, 4.1f, -3.14f); right2.setScale(0.06f, 0.07f); right2.setThickness(1.75f); right2.rotateAngleX = (float) (Math.PI / 9); breasts3.addChild(right2); - Model2DRenderer right3 = new Model2DRenderer(base, 20f, 24, 3, 1, 64, 64); + Model2DRenderer right3 = new Model2DRenderer(base, 20f, 24, 3, 1, width, height); right3.setRotationPoint(-3.8F, 5.3f, -3.6f); right3.setScale(0.06f, 0.07f); right3.setThickness(1.75f); right3.rotateAngleX = (float) (-Math.PI / 9); breasts3.addChild(right3); - Model2DRenderer right4 = new Model2DRenderer(base, 23f, 22, 1, 2, 64, 64); + Model2DRenderer right4 = new Model2DRenderer(base, 23f, 22, 1, 2, width, height); right4.setRotationPoint(-1.8f, 5.3f, -3.14f); right4.setScale(0.12f, 0.14f); right4.setThickness(1.75f); right4.rotateAngleY = (float) (Math.PI / 9); breasts3.addChild(right4); - Model2DRenderer left = new Model2DRenderer(base, 25f, 22, 3, 2, 64, 64); + Model2DRenderer left = new Model2DRenderer(base, 25f, 22, 3, 2, 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, 64, 64); + Model2DRenderer left2 = new Model2DRenderer(base, 25f, 22, 3, 1, width, height); left2.setRotationPoint(0.8F, 4.1f, -3.18f); left2.setScale(0.06f, 0.07f); left2.setThickness(1.75f); left2.rotateAngleX = (float) (Math.PI / 9); breasts3.addChild(left2); - Model2DRenderer left3 = new Model2DRenderer(base, 25f, 24, 3, 1, 64, 64); + Model2DRenderer left3 = new Model2DRenderer(base, 25f, 24, 3, 1, width, height); left3.setRotationPoint(0.8F, 5.3f, -3.6f); left3.setScale(0.06f, 0.07f); left3.setThickness(1.75f); left3.rotateAngleX = (float) (-Math.PI / 9); breasts3.addChild(left3); - Model2DRenderer left4 = new Model2DRenderer(base, 24f, 22, 1, 2, 64, 64); + Model2DRenderer left4 = new Model2DRenderer(base, 24f, 22, 1, 2, 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/renderer/ImageBufferDownloadAlt.java b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java index 6170e9938..fa2efcd66 100644 --- a/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/renderer/ImageBufferDownloadAlt.java @@ -23,30 +23,31 @@ public class ImageBufferDownloadAlt extends ImageBufferDownload { if(this.version){ imageWidth = bufferedimage.getWidth(null); - imageHeight = imageWidth / 2; imageHeight = bufferedimage.getHeight(null); + BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageWidth, 2); Graphics g = bufferedimage1.getGraphics(); g.drawImage(bufferedimage, 0, 0, null); g.dispose(); - imageData = ((DataBufferInt) bufferedimage1.getRaster().getDataBuffer()).getData(); + imageData = ((DataBufferInt) bufferedimage1.getRaster().getDataBuffer()).getData(); setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 4); return bufferedimage1; } - imageWidth = bufferedimage.getWidth(null); - imageHeight = imageWidth/2; + else{ + imageWidth = bufferedimage.getWidth(null); + imageHeight = imageWidth / 2; - BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageHeight, 2); - Graphics g = bufferedimage1.getGraphics(); - g.drawImage(bufferedimage, 0, 0, null); - g.dispose(); - imageData = ((DataBufferInt) bufferedimage1.getRaster().getDataBuffer()).getData(); + BufferedImage bufferedimage1 = new BufferedImage(imageWidth, imageHeight, 2); + Graphics g = bufferedimage1.getGraphics(); + g.drawImage(bufferedimage, 0, 0, null); + g.dispose(); + imageData = ((DataBufferInt)bufferedimage1.getRaster().getDataBuffer()).getData(); - setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 2); - - return bufferedimage1; + setAreaTransparent(imageWidth / 2, 0, imageWidth, imageHeight / 2); + return bufferedimage1; + } } /**