PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 22:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some jankyness with seapony models

Browse source
This commit is contained in:
Sollace 2021-10-11 17:29:55 +02:00
parent e1f54c3155
commit b9538495d0
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -5,7 +5,6 @@ import com.minelittlepony.api.model.BodyPart;
import com.minelittlepony.api.model.ModelAttributes; import com.minelittlepony.api.model.ModelAttributes;
import com.minelittlepony.api.model.armour.IArmour; import com.minelittlepony.api.model.armour.IArmour;
import com.minelittlepony.api.model.fabric.PonyModelPrepareCallback; import com.minelittlepony.api.model.fabric.PonyModelPrepareCallback;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Sizes; import com.minelittlepony.api.pony.meta.Sizes;
import com.minelittlepony.client.model.armour.ArmourWrapper; import com.minelittlepony.client.model.armour.ArmourWrapper;
import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.client.transform.PonyTransformation;
@ -578,11 +577,8 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
renderStage(BodyPart.HEAD, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderHead); renderStage(BodyPart.HEAD, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderHead);
renderStage(BodyPart.LEGS, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderLegs); renderStage(BodyPart.LEGS, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderLegs);
if (getMetadata().getRace() != Race.SEAPONY) {
renderStage(BodyPart.LEGS, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderSleeves); renderStage(BodyPart.LEGS, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderSleeves);
renderStage(BodyPart.BODY, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderVest); renderStage(BodyPart.BODY, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderVest);
}
renderStage(BodyPart.HEAD, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderHelmet); renderStage(BodyPart.HEAD, stack, vertices, overlayUv, lightUv, red, green, blue, alpha, this::renderHelmet);
} }

10
src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
View file

@ -97,13 +97,6 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
super.rotateLegsOnGround(move, swing, ticks, entity); super.rotateLegsOnGround(move, swing, ticks, entity);
} }
@Override
public void render(MatrixStack stack, VertexConsumer vertices, int overlayUv, int lightUv, float red, float green, float blue, float alpha) {
setVisible(leftSleeve.visible);
super.render(stack, vertices, overlayUv, lightUv, red, green, blue, alpha);
}
@Override @Override
public void transform(BodyPart part, MatrixStack stack) { public void transform(BodyPart part, MatrixStack stack) {
stack.translate(0, 0.6F, 0); stack.translate(0, 0.6F, 0);
@ -132,6 +125,9 @@ public class SeaponyModel<T extends LivingEntity> extends UnicornModel<T> {
super.setVisible(visible); super.setVisible(visible);
upperTorsoOverlay.visible = false; upperTorsoOverlay.visible = false;
leftSleeve.visible = false;
rightSleeve.visible = false;
jacket.visible = false;
// hide the back legs // hide the back legs
leftLeg.visible = false; leftLeg.visible = false;