From e72672ad71d3f201f9efe197c6f121f2605071ad Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Mon, 11 Apr 2022 23:01:41 -0400 Subject: [PATCH] Revert to Original :frowning: --- .../noppes/npcs/client/model/ModelMPM.java | 100 +----------------- .../npcs/client/model/ModelNPCMale.java | 9 +- .../client/renderer/RenderNPCHumanMale.java | 6 +- 3 files changed, 7 insertions(+), 108 deletions(-) diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index 7c89c0894..a4d158aa0 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -25,6 +25,7 @@ import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.roles.JobPuppet; import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; public class ModelMPM extends ModelNPCMale{ private ModelPartInterface wings; @@ -66,9 +67,9 @@ public class ModelMPM extends ModelNPCMale{ public float alpha = 1; // Steve 64x64 and Alex 64x64 - public ModelMPM(float par1, boolean alex, boolean steve32) { + public ModelMPM(float par1, boolean alex) { - super(par1, alex, steve32); + super(par1, alex); isArmor = par1 > 0; float par2 = 0; @@ -192,101 +193,6 @@ public class ModelMPM extends ModelNPCMale{ } } - // Fake Steve32 - public ModelMPM(float par1, boolean fakeSteve) { - super(par1, false, true); - - isArmor = par1 > 0; - 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); - 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); - - // Body - this.bipedBodywear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedBody.addChild(this.bipedBodywear); - - // Arms - this.bipedRightArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightArm.addChild(this.bipedRightArmWear); - this.solidRightArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightArm.addChild(this.solidRightArmWear); - this.bipedLeftArmwear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftArm.addChild(this.bipedLeftArmwear); - this.solidLeftArmWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedLeftArm.addChild(this.solidLeftArmWear); - - // Legs - this.bipedRightLegWear = (new ModelScaleRenderer(this, 0, 0)); - this.bipedRightLeg.addChild(this.bipedRightLegWear); - this.solidRightLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedRightLeg.addChild(this.solidRightLegWear); - this.bipedLeftLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftLeg.addChild(this.bipedLeftLegWear); - this.solidLeftLegWear = new ModelScaleRenderer(this, 0, 0); - this.bipedLeftLeg.addChild(this.solidLeftLegWear); - - headwear = new ModelHeadwear(this, true); - legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 32); - - 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)); - 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(fin = new ModelFin(this)); - - // 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)); - } - } - // Steve 64x32 public ModelMPM(float par1) { diff --git a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java index 395c469bc..ae9a23cb9 100644 --- a/src/main/java/noppes/npcs/client/model/ModelNPCMale.java +++ b/src/main/java/noppes/npcs/client/model/ModelNPCMale.java @@ -28,15 +28,10 @@ public class ModelNPCMale extends ModelBiped init(f, 0.0F); } - public ModelNPCMale(float f, boolean alex, boolean fakeSteve) + public ModelNPCMale(float f, boolean alex) { super(f, 0.0F, 64, 64); - if(fakeSteve){ - init(f, 0.0F); - } - else{ - init(f, 0.0F, alex); - } + init(f, 0.0F, alex); } @Override diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index 5ecc71d49..f608a0703 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -34,9 +34,8 @@ public class RenderNPCHumanMale extends RenderNPCInterface protected ModelNPCMale modelArmor; protected final ModelNPCMale originalBipedMain; - protected final static ModelMPM steve32fake = new ModelMPM(0, true); - protected final static ModelMPM steve64 = new ModelMPM(0, false, false); - protected final static ModelMPM alex = new ModelMPM(0, true, false); + protected final static ModelMPM steve64 = new ModelMPM(0, false); + protected final static ModelMPM alex = new ModelMPM(0, true); public RenderNPCHumanMale(ModelNPCMale mainmodel, ModelNPCMale armorChest, ModelNPCMale armor) { @@ -112,7 +111,6 @@ public class RenderNPCHumanMale extends RenderNPCInterface public void renderPlayer(EntityNPCInterface npc, double d, double d1, double d2, float f, float f1) { - // SEEMS TO WORK FOR NOW. Keeps NPC from out-syncing with Creature Models if(npc instanceof EntityCustomNpc){ EntityCustomNpc test = (EntityCustomNpc) npc; if(test.modelData.entityClass == null){