From e051bf35787ccc8fb56a45610d3d3971ff8831e9 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Tue, 1 Dec 2020 22:37:58 +0300 Subject: [PATCH] WIP: custom armor models --- .../betterend/item/model/CrystaliteArmorProvider.java | 4 +++- .../ru/betterend/item/model/CrystaliteBootsModel.java | 5 +++-- .../item/model/CrystaliteChestplateModel.java | 10 ++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java b/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java index b687d78a..b8b3ab36 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteArmorProvider.java @@ -48,17 +48,19 @@ public class CrystaliteArmorProvider implements ModelProvider, TextureProvider { return HELMET_MODEL; } case CHEST: { - if (entity instanceof AbstractClientPlayerEntity && ((AbstractClientPlayerEntity) entity).getModel().equals("slim")) { + CHEST_MODEL_SLIM.setAttributes(defaultModel); return CHEST_MODEL_SLIM; } + CHEST_MODEL.setAttributes(defaultModel); return CHEST_MODEL; } case LEGS: { return LEGGINGS_MODEL; } case FEET: { + BOOTS_MODEL.setAttributes(defaultModel); return BOOTS_MODEL; } default: { diff --git a/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java b/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java index 89b62764..b3da534b 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteBootsModel.java @@ -35,8 +35,9 @@ public class CrystaliteBootsModel extends BipedEntityModel { } @Override - public void setAngles(LivingEntity livingEntity, float f, float g, float h, float i, float j) { - super.setAngles(livingEntity, f, g, h, i, j); + public void setAttributes(BipedEntityModel bipedEntityModel) { + this.leftLeg.copyPositionAndRotation(bipedEntityModel.leftLeg); + this.rightLeg.copyPositionAndRotation(bipedEntityModel.rightLeg); this.leftBoot.copyPositionAndRotation(leftLeg); this.rightBoot.copyPositionAndRotation(rightLeg); } diff --git a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java index 0c801afb..8aa25464 100644 --- a/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java +++ b/src/main/java/ru/betterend/item/model/CrystaliteChestplateModel.java @@ -29,7 +29,7 @@ public class CrystaliteChestplateModel extends BipedEntityModel { this.leftShoulder.setPivot(5.0F, 2.5F, 0.0F); this.leftShoulder.mirror = true; this.rightShoulder = new ModelPart(this, 41, 16); - this.rightShoulder.addCuboid(-2.0F, -2.5F, -12.0F, 3.0F, 12.0F, 4.0F, scale + 0.3F); + this.rightShoulder.addCuboid(-2.0F, -2.5F, -2.0F, 3.0F, 12.0F, 4.0F, scale + 0.3F); this.rightShoulder.setPivot(-5.0F, 2.5F, 10.0F); } else { this.leftShoulder = new ModelPart(this, 40, 32); @@ -37,7 +37,7 @@ public class CrystaliteChestplateModel extends BipedEntityModel { this.leftShoulder.setPivot(5.0F, 2.0F, 0.0F); this.leftShoulder.mirror = true; this.rightShoulder = new ModelPart(this, 40, 16); - this.rightShoulder.addCuboid(-3.0F, -2.5F, -12.1F, 4.0F, 12.0F, 4.0F, scale + 0.4F); + this.rightShoulder.addCuboid(-3.0F, -2.5F, -2.0F, 4.0F, 12.0F, 4.0F, scale + 0.4F); this.rightShoulder.setPivot(-5.0F, 2.0F, 10.0F); } } @@ -53,8 +53,10 @@ public class CrystaliteChestplateModel extends BipedEntityModel { } @Override - public void setAngles(LivingEntity livingEntity, float f, float g, float h, float i, float j) { - super.setAngles(livingEntity, f, g, h, i, j); + public void setAttributes(BipedEntityModel bipedEntityModel) { + this.torso.copyPositionAndRotation(bipedEntityModel.torso); + this.leftArm.copyPositionAndRotation(bipedEntityModel.leftArm); + this.rightArm.copyPositionAndRotation(bipedEntityModel.rightArm); this.leftShoulder.copyPositionAndRotation(leftArm); this.rightShoulder.copyPositionAndRotation(rightArm); }