PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 13:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bracelets being offset slightly

Browse source
This commit is contained in:
Sollace 2022-01-04 17:58:09 +02:00
parent fbc82ec6bc
commit 9fc4c384cb
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java
View file

@ -35,8 +35,8 @@ class BangleGear implements IGear {
public BangleGear() { public BangleGear() {
Dilation dilation = new Dilation(0.3F); Dilation dilation = new Dilation(0.3F);
steveModel = new BraceletModel(BraceletModel.getData(dilation, false, -1, 4, 0).createModel(), false); steveModel = new BraceletModel(BraceletModel.getData(dilation, false, -1, 4, 0).createModel());
alexModel = new BraceletModel(BraceletModel.getData(dilation, true, -1, 4, 0).createModel(), true); alexModel = new BraceletModel(BraceletModel.getData(dilation, true, -1, 4, 0).createModel());
} }
@Override @Override
@ -57,11 +57,6 @@ class BangleGear implements IGear {
@Override @Override
public void setModelAttributes(IModel model, Entity entity) { public void setModelAttributes(IModel model, Entity entity) {
Dilation dilation = new Dilation(0.3F);
steveModel = new BraceletModel(BraceletModel.getData(dilation, false, -1, 4, 0).createModel(), false);
alexModel = new BraceletModel(BraceletModel.getData(dilation, true, -1, 4, 0).createModel(), true);
ItemStack item = ((LivingEntity)entity).getEquippedStack(EquipmentSlot.CHEST); ItemStack item = ((LivingEntity)entity).getEquippedStack(EquipmentSlot.CHEST);
color = ((DyeableItem)item.getItem()).getColor(item); color = ((DyeableItem)item.getItem()).getColor(item);

16
src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java
View file

@ -43,8 +43,8 @@ public class BraceletFeatureRenderer<E extends LivingEntity> implements Accessor
public BraceletFeatureRenderer(FeatureRendererContext<E, ? extends BipedEntityModel<E>> context) { public BraceletFeatureRenderer(FeatureRendererContext<E, ? extends BipedEntityModel<E>> context) {
this.context = context; this.context = context;
Dilation dilation = new Dilation(0.3F); Dilation dilation = new Dilation(0.3F);
steveModel = new BraceletModel(BraceletModel.getData(dilation, false, 0, 0, 0).createModel(), false); steveModel = new BraceletModel(BraceletModel.getData(dilation, false, 0, 0, 0).createModel());
alexModel = new BraceletModel(BraceletModel.getData(dilation, true, 0, 0, 0).createModel(), true); alexModel = new BraceletModel(BraceletModel.getData(dilation, true, 0, 0, 0).createModel());
} }
@Override @Override
@ -90,7 +90,7 @@ public class BraceletFeatureRenderer<E extends LivingEntity> implements Accessor
boolean glowing = ((GlowableItem)item.getItem()).isGlowing(item); boolean glowing = ((GlowableItem)item.getItem()).isGlowing(item);
if (!MineLPConnector.getPlayerPonyRace().isDefault()) { if (!MineLPConnector.getPlayerPonyRace((ClientPlayerEntity)entity).isDefault()) {
stack.translate(side == Arm.LEFT ? 0.06 : -0.06, 0.3, 0); stack.translate(side == Arm.LEFT ? 0.06 : -0.06, 0.3, 0);
} else { } else {
stack.translate(0, -0.1, 0); stack.translate(0, -0.1, 0);
@ -109,11 +109,8 @@ public class BraceletFeatureRenderer<E extends LivingEntity> implements Accessor
private final ModelPart leftArm; private final ModelPart leftArm;
private final ModelPart rightArm; private final ModelPart rightArm;
private final boolean alex; public BraceletModel(ModelPart tree) {
public BraceletModel(ModelPart tree, boolean alex) {
super(RenderLayer::getEntityTranslucent); super(RenderLayer::getEntityTranslucent);
this.alex = alex;
this.leftArm = tree.getChild(EntityModelPartNames.LEFT_ARM); this.leftArm = tree.getChild(EntityModelPartNames.LEFT_ARM);
this.rightArm = tree.getChild(EntityModelPartNames.RIGHT_ARM); this.rightArm = tree.getChild(EntityModelPartNames.RIGHT_ARM);
} }
@ -122,7 +119,7 @@ public class BraceletFeatureRenderer<E extends LivingEntity> implements Accessor
ModelData data = new ModelData(); ModelData data = new ModelData();
ModelPartData root = data.getRoot(); ModelPartData root = data.getRoot();
root.addChild(EntityModelPartNames.RIGHT_ARM, ModelPartBuilder.create().uv(0, alex ? 6 : 0).cuboid(-3 + x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); root.addChild(EntityModelPartNames.RIGHT_ARM, ModelPartBuilder.create().uv(0, alex ? 6 : 0).cuboid(-2 + x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE);
root.addChild(EntityModelPartNames.LEFT_ARM, ModelPartBuilder.create().mirrored().uv(0, alex ? 6 : 0).cuboid(-1 - x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE); root.addChild(EntityModelPartNames.LEFT_ARM, ModelPartBuilder.create().mirrored().uv(0, alex ? 6 : 0).cuboid(-1 - x, 7 + y, -2 + z, alex ? 3 : 4, 2, 4, dilation), ModelTransform.NONE);
return TexturedModelData.of(data, 64, 32); return TexturedModelData.of(data, 64, 32);
@ -131,9 +128,6 @@ public class BraceletFeatureRenderer<E extends LivingEntity> implements Accessor
public void setAngles(BipedEntityModel<?> biped) { public void setAngles(BipedEntityModel<?> biped) {
leftArm.copyTransform(biped.leftArm); leftArm.copyTransform(biped.leftArm);
rightArm.copyTransform(biped.rightArm); rightArm.copyTransform(biped.rightArm);
if (alex) {
rightArm.pivotX++;
}
} }
public void setVisible(Arm arm) { public void setVisible(Arm arm) {