upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 22:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Armor Fixes, Part Fixes, Naga Leg Fix, Digitigrade Leg Fix

Browse Source 
A few patches needed
This commit is contained in:
KAMKEEL committed 2021-05-08 00:17:26 -04:00
1 parent 2ba0339c19
commit 17d1656dab
493 files changed
+48 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/model/GuiModelLegs.java
+17 -6
View File
@@ -12,7 +12,7 @@ public class GuiModelLegs extends GuiModelInterface{
private GuiScreen parent;
private final String[] arrLegwear = new String[]{"gui.no","Both","Left","Right"};
private final String[] arrLegs = new String[]{"gui.no","Player","Player Naga","Spider","Horse","Naga", "Mermaid", "Mermaid 2","Digitigrade"};
private final String[] arrLegs = new String[]{"gui.no","Player","Player Naga","Spider","Horse","Naga", "Mermaid", "Mermaid 2", "Digitigrade"};
private final String[] arrTail = new String[]{"gui.no","Player", "Player Dragon","Cat","Wolf","Horse","Dragon", "Squirrel", "Fin", "Rodent", "Feather"};
public GuiModelLegs(GuiScreen parent, EntityCustomNpc npc){
super(npc);
@@ -41,18 +41,29 @@ public class GuiModelLegs extends GuiModelInterface{
if(tail != null)
addButton(new GuiNpcButton(12, guiLeft + 122, y, 40, 20, tail.getColor()));
}
private int getLegIndex(ModelPartData data) {
if(!data.playerTexture && data.type == 1)
return 5;
if(data.type == 4)
return 6;
// if(data.type == 6)
// return 7;
if(data.type == 5)
return 7;
if(data.type == 6)
return 8;
return data.type + 1;
}
// private int getLegIndex(ModelPartData data) {
// if(!data.playerTexture && data.type == 1)
// return 5;
// if(data.type == 4)
// return 6;
// if(data.type == 5)
// return 7;
// return data.type + 1;
// }
private int getTailIndex(ModelPartData data){
if(data == null)
return 0;
@@ -110,15 +121,15 @@ public class GuiModelLegs extends GuiModelInterface{
if(value == 5)
data.setTexture("legs/mermaid1", 4);
if(value == 6)
data.setTexture("legs/mermaid1", 5);
data.setTexture("legs/mermaid1", 6);
if(value == 7)
data.setTexture("", 6);
data.setTexture("", 5);
initGui();
}
if(button.id == 2){
if(button.id == 2){
int value = button.getValue();
if(value == 0)
playerdata.removePart("tail");
src/main/java/noppes/npcs/client/model/ModelMPM.java
+2 -15
View File
@@ -144,7 +144,7 @@ public class ModelMPM extends ModelNPCMale{
this.bipedRightLeg.setRotationPoint(-1.9F, 12.0F + par2, 0.0F);
this.bipedLeftLeg = new ModelScaleRenderer(this, 16, 48);
this.bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, par1);
this.bipedLeftLeg.addBox(-2.7F, 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));
@@ -152,6 +152,7 @@ public class ModelMPM extends ModelNPCMale{
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);
@@ -415,31 +416,17 @@ public class ModelMPM extends ModelNPCMale{
this.bipedLeftLeg.rotateAngleY = 0;
this.bipedLeftLeg.rotateAngleZ = 0;
this.bipedLeftLegWear.rotateAngleX = 0;
this.bipedLeftLegWear.rotateAngleY = 0;
this.bipedLeftLegWear.rotateAngleZ = 0;
this.bipedRightLeg.rotateAngleX = 0;
this.bipedRightLeg.rotateAngleY = 0;
this.bipedRightLeg.rotateAngleZ = 0;
this.bipedRightLegWear.rotateAngleX = 0;
this.bipedRightLegWear.rotateAngleY = 0;
this.bipedRightLegWear.rotateAngleZ = 0;
// Arm Rotations
this.bipedLeftArm.rotationPointY = 2;
this.bipedLeftArm.rotationPointZ = 0;
this.bipedLeftArmwear.rotationPointY = 2;
this.bipedLeftArmwear.rotationPointZ = 0;
this.bipedRightArm.rotationPointY = 2;
this.bipedRightArm.rotationPointZ = 0;
this.bipedRightArmwear.rotationPointY = 2;
this.bipedRightArmwear.rotationPointZ = 0;
super.setRotationAngles(par1, par2, par3, par4, par5, par6, entity);
if(!isArmor){
src/main/java/noppes/npcs/client/model/part/ModelLegs.java
+12 -11
View File
@@ -29,7 +29,6 @@ public class ModelLegs extends ModelScaleRenderer{
private ModelDigitigradeLegs digitigrade;
private ModelMermaidLegs mermaid;
private ModelMermaidLegs2 mermaid2;
private boolean mirror = true;
private ModelRenderer spiderLeg1;
private ModelRenderer spiderLeg2;
@@ -63,10 +62,6 @@ 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;
@@ -222,8 +217,14 @@ public class ModelLegs extends ModelScaleRenderer{
mermaid2 = new ModelMermaidLegs2(base);
this.addChild(mermaid);
this.addChild(mermaid2);
digitigrade = new ModelDigitigradeLegs(base, mirror);
boolean mirror = false;
if(textHeight != textWidth){
mirror = true;
}
digitigrade = new ModelDigitigradeLegs(base, mirror, textWidth, textHeight);
this.addChild(digitigrade);
}
public void setRotation(ModelRenderer model, float x, float y, float z) {
@@ -317,7 +318,7 @@ public class ModelLegs extends ModelScaleRenderer{
naga.isSneaking = base.isSneak;
naga.setRotationAngles(par1, par2, par3, par4, par5, par6, entity);
}
else if(part.type == 4){
else if(part.type == 4 || part.type == 6){
mermaid.isRiding = base.isRiding;
mermaid.isSleeping = base.isSleeping(entity);
mermaid.isCrawling = this.entity.currentAnimation == EnumAnimation.CRAWLING;
@@ -367,8 +368,8 @@ public class ModelLegs extends ModelScaleRenderer{
spider.isHidden = part.type != 2;
horse.isHidden = part.type != 3;
mermaid.isHidden = part.type != 4;
mermaid2.isHidden = part.type != 5;
digitigrade.isHidden = part.type != 6;
mermaid2.isHidden = part.type != 6;
digitigrade.isHidden = part.type != 5;
if(!horse.isHidden){
x = 0;
@@ -383,7 +384,7 @@ public class ModelLegs extends ModelScaleRenderer{
x = 0;
y *= 2f;
}
else if(!mermaid.isHidden || !digitigrade.isHidden){
else if(!mermaid.isHidden || !mermaid2.isHidden || !digitigrade.isHidden){
x = 0;
y *= 2f;
}
src/main/java/noppes/npcs/client/model/part/legs/ModelDigitigradeLegs.java
+17 -14
View File
@@ -22,62 +22,65 @@ public class ModelDigitigradeLegs extends ModelRenderer {
private ModelMPM base;
public ModelDigitigradeLegs(ModelMPM base, boolean mirror) {
public ModelDigitigradeLegs(ModelMPM base, boolean mirror, int textWidth, int textHeight) {
super(base);
this.base = base;
int adder = 0;
if(mirror == false){
adder = 32;
}
rightleg = new ModelRenderer(base, 0, 16);
rightleg.setTextureSize(textWidth, textHeight);
rightleg.addBox(-2F, 0F, -2F, 4, 6, 4);
rightleg.setRotationPoint(-2.1F, 11F, 0F);
setRotation(rightleg, -0.3F, 0F, 0F);
this.addChild(rightleg);
rightleg2 = new ModelRenderer(base, 0, 20);
rightleg2.setTextureSize(textWidth, textHeight);
rightleg2.addBox(-1.5F, -1F, -2F, 3, 7, 3);
rightleg2.setRotationPoint(0F, 4.1F, 0F);
setRotation(rightleg2, 1.1f, 0F, 0F);
rightleg.addChild(rightleg2);
rightleglow = new ModelRenderer(base, 0, 24);
rightleglow.setTextureSize(textWidth, textHeight);
rightleglow.addBox(-1.5F, 0F, -1F, 3, 5, 2);
rightleglow.setRotationPoint(0F, 5F, 0F);
setRotation(rightleglow, -1.35F, 0F, 0F);
rightleg2.addChild(rightleglow);
rightfoot = new ModelRenderer(base, 1, 26);
rightfoot.setTextureSize(textWidth, textHeight);
rightfoot.addBox(-1.5F, 0F, -5F, 3, 2, 4);
rightfoot.setRotationPoint(0F, 3.7F, 1.2F);
setRotation(rightfoot, 0.55F, 0F, 0F);
rightleglow.addChild(rightfoot);
leftleg = new ModelRenderer(base, 0, 16 + adder);
leftleg.mirror = mirror;
leftleg = new ModelRenderer(base, 0, 16);
leftleg.setTextureSize(textWidth, textHeight);
leftleg.mirror = true;
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 + adder);
leftleg2.mirror = mirror;
leftleg2 = new ModelRenderer(base, 0, 20);
leftleg2.setTextureSize(textWidth, textHeight);
leftleg2.mirror = true;
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 + adder);
leftleglow.mirror = mirror;
leftleglow = new ModelRenderer(base, 0, 24);
leftleglow.setTextureSize(textWidth, textHeight);
leftleglow.mirror = true;
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 + adder);
leftfoot.mirror = mirror;
leftfoot = new ModelRenderer(base, 1, 26);
leftfoot.setTextureSize(textWidth, textHeight);
leftfoot.mirror = true;
leftfoot.addBox(-1.5F, 0F, -5F, 3, 2, 4);
leftfoot.setRotationPoint(0F, 3.7F, 1.2F);
setRotation(leftfoot, 0.55F, 0F, 0F);
src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java
-15
View File
@@ -38,16 +38,8 @@ public class RenderNPCHumanMale extends RenderNPCInterface
protected ModelNPCMale modelArmorChestplate;
protected ModelNPCMale modelArmor;
protected final ModelNPCMale OGmodelArmorChestplate = new ModelMPM(1);
protected final ModelNPCMale OGmodelArmor = new ModelMPM(0.5f);
protected final ModelMPM steve = new ModelMPM(0, false);
protected final ModelMPM steveArmorChestplate = new ModelMPM(1, false);
protected final ModelMPM steveModelArmor = new ModelMPM(0.5f, false);
protected final ModelMPM alex = new ModelMPM(0, true);
protected final ModelMPM alexArmorChestplate = new ModelMPM(1, true);
protected final ModelMPM alexModelArmor = new ModelMPM(0.5f, true);
public RenderNPCHumanMale(ModelNPCMale mainmodel, ModelNPCMale armorChest, ModelNPCMale armor)
{
@@ -130,23 +122,16 @@ public class RenderNPCHumanMale extends RenderNPCInterface
if(modelVal == 1){
this.mainModel = steve;
this.modelBipedMain = steve;
this.modelArmorChestplate = steveArmorChestplate;
this.modelArmor = steveModelArmor;
}
else if(modelVal == 2){
this.mainModel = alex;
this.modelBipedMain = alex;
this.modelArmorChestplate = alexArmorChestplate;
this.modelArmor = alexModelArmor;
}
else{
((EntityCustomNpc) npc).modelData.bodywear = 0;
((EntityCustomNpc) npc).modelData.armwear = 0;
((EntityCustomNpc) npc).modelData.legwear = 0;
this.mainModel = originalModel;
this.modelBipedMain = (ModelNPCMale) originalModel;
this.modelArmorChestplate = OGmodelArmorChestplate;
this.modelArmor = OGmodelArmor;
}
}
}