R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed 2nd skin layer rotation

Browse Source
This commit is contained in:
SteveKunG 2017-09-18 23:08:26 +07:00 committed by GitHub
parent 4b70322112
commit 2e090805c1
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -325,6 +325,8 @@ public class RenderEvents
ModelRenderer fakeLeftArm = new ModelRenderer(model, 32, 48); ModelRenderer fakeLeftArm = new ModelRenderer(model, 32, 48);
ModelRenderer fakeRightArm = new ModelRenderer(model, 40, 16); ModelRenderer fakeRightArm = new ModelRenderer(model, 40, 16);
ModelRenderer fakeLeftArmwear = new ModelRenderer(model, 48, 48);
ModelRenderer fakeRightArmwear = new ModelRenderer(model, 40, 32);
player.setArrowCountInEntity(0); // TODO Temporary Fix player.setArrowCountInEntity(0); // TODO Temporary Fix
@ -349,6 +351,8 @@ public class RenderEvents
model.bipedLeftArm.isHidden = true; model.bipedLeftArm.isHidden = true;
model.bipedRightArm.isHidden = true; model.bipedRightArm.isHidden = true;
model.bipedLeftArmwear.isHidden = true;
model.bipedRightArmwear.isHidden = true;
Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc);
float rotation = -player.renderYawOffset; float rotation = -player.renderYawOffset;
@ -356,19 +360,23 @@ public class RenderEvents
if (aplayer.getSkinType().equals("default")) if (aplayer.getSkinType().equals("default"))
{ {
fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F); fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F);
fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F + 0.25F);
} }
else else
{ {
fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F); fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F);
fakeLeftArmwear.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 3, 12, 4, .08F + 0.25F);
} }
if (aplayer.getSkinType().equals("default")) if (aplayer.getSkinType().equals("default"))
{ {
fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F); fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F);
fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F + 0.25F);
} }
else else
{ {
fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F); fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F);
fakeRightArmwear.addBox(model.bipedRightArm.offsetX - 7.2F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 3, 12, 4, .08F + 0.25F);
} }
if (item == RegistrationHandler.itemTile) if (item == RegistrationHandler.itemTile)
@ -377,11 +385,15 @@ public class RenderEvents
{ {
fakeRightArm.rotateAngleX = -.9001F; fakeRightArm.rotateAngleX = -.9001F;
fakeLeftArm.rotateAngleX = -.9001F; fakeLeftArm.rotateAngleX = -.9001F;
fakeLeftArmwear.rotateAngleX = -.9001F;
fakeRightArmwear.rotateAngleX = -.9001F;
} }
else else
{ {
fakeRightArm.rotateAngleX = -1.4001F; fakeRightArm.rotateAngleX = -1.4001F;
fakeLeftArm.rotateAngleX = -1.4001F; fakeLeftArm.rotateAngleX = -1.4001F;
fakeLeftArmwear.rotateAngleX = -1.4001F;
fakeRightArmwear.rotateAngleX = -1.4001F;
} }
} }
else else
@ -390,25 +402,35 @@ public class RenderEvents
{ {
fakeRightArm.rotateAngleX = -1.2001F; fakeRightArm.rotateAngleX = -1.2001F;
fakeLeftArm.rotateAngleX = -1.2001F; fakeLeftArm.rotateAngleX = -1.2001F;
fakeLeftArmwear.rotateAngleX = -1.2001F;
fakeRightArmwear.rotateAngleX = -1.2001F;
} }
else else
{ {
fakeRightArm.rotateAngleX = -1.7001F; fakeRightArm.rotateAngleX = -1.7001F;
fakeLeftArm.rotateAngleX = -1.7001F; fakeLeftArm.rotateAngleX = -1.7001F;
fakeLeftArmwear.rotateAngleX = -1.7001F;
fakeRightArmwear.rotateAngleX = -1.7001F;
} }
fakeRightArm.rotateAngleY = -0.15f; fakeRightArm.rotateAngleY = -0.15f;
fakeLeftArm.rotateAngleY = 0.15f; fakeLeftArm.rotateAngleY = 0.15f;
fakeLeftArmwear.rotateAngleY = 0.15f;
fakeRightArmwear.rotateAngleY = 0.15f;
} }
model.bipedBody.addChild(fakeLeftArm); model.bipedBody.addChild(fakeLeftArm);
model.bipedBody.addChild(fakeRightArm); model.bipedBody.addChild(fakeRightArm);
model.bipedBody.addChild(fakeLeftArmwear);
model.bipedBody.addChild(fakeRightArmwear);
} }
else else
{ {
model.bipedLeftArm.isHidden = false; model.bipedLeftArm.isHidden = false;
model.bipedRightArm.isHidden = false; model.bipedRightArm.isHidden = false;
model.bipedLeftArmwear.isHidden = false;
model.bipedRightArmwear.isHidden = false;
if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty()) if (model.bipedBody.childModels != null && !model.bipedBody.childModels.isEmpty())
{ {
@ -428,6 +450,8 @@ public class RenderEvents
{ {
model.bipedLeftArm.isHidden = false; model.bipedLeftArm.isHidden = false;
model.bipedRightArm.isHidden = false; model.bipedRightArm.isHidden = false;
model.bipedLeftArmwear.isHidden = false;
model.bipedRightArmwear.isHidden = false;
} }
} }