From da2ccc75fcf45d0d7949835383ee6bdcf41dc8db Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 3 Nov 2022 00:46:04 +0100 Subject: [PATCH] Remove the boolean argument from Pony.getRace --- src/main/java/com/minelittlepony/api/pony/IPony.java | 11 +++++++---- src/main/java/com/minelittlepony/client/HorseCam.java | 2 +- .../com/minelittlepony/client/hdskins/DummyPony.java | 3 ++- .../com/minelittlepony/client/mixin/MixinCamera.java | 2 +- .../client/mixin/MixinClientPlayerEntity.java | 2 +- .../client/mixin/MixinDefaultPlayerSkin.java | 2 +- .../client/mixin/MixinEntityRenderDispatcher.java | 2 +- .../java/com/minelittlepony/client/pony/Pony.java | 4 ++-- .../client/render/IPonyRenderContext.java | 2 +- .../render/blockentity/skull/PlayerPonySkull.java | 2 +- .../client/render/entity/npc/AbstractNpcRenderer.java | 2 +- 11 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/minelittlepony/api/pony/IPony.java b/src/main/java/com/minelittlepony/api/pony/IPony.java index e5878d08..525b89f6 100644 --- a/src/main/java/com/minelittlepony/api/pony/IPony.java +++ b/src/main/java/com/minelittlepony/api/pony/IPony.java @@ -28,7 +28,7 @@ public interface IPony { * Returns true if this pony has wings and the will to use them. */ default boolean canFly() { - return getMetadata().getRace().hasWings(); + return getRace().hasWings(); } /** @@ -75,12 +75,15 @@ public interface IPony { */ boolean isPartiallySubmerged(LivingEntity entity); + @Deprecated + default Race getRace(boolean ignorePony) { + return com.minelittlepony.client.pony.Pony.getEffectiveRace(getMetadata().getRace(), ignorePony); + } + /** * Gets the race associated with this pony. - * - * @param ignorePony True to ignore the client's current pony level setting. */ - Race getRace(boolean ignorePony); + Race getRace(); /** * Returns true if an entity is sitting as when riding a vehicle or diff --git a/src/main/java/com/minelittlepony/client/HorseCam.java b/src/main/java/com/minelittlepony/client/HorseCam.java index 5d2004d2..166d8f97 100644 --- a/src/main/java/com/minelittlepony/client/HorseCam.java +++ b/src/main/java/com/minelittlepony/client/HorseCam.java @@ -47,7 +47,7 @@ public class HorseCam { IPony pony = MineLittlePony.getInstance().getManager().getPony(player); - if (!pony.getRace(false).isHuman()) { + if (!pony.getRace().isHuman()) { float factor = pony.getMetadata().getSize().getEyeHeightFactor(); pitch = rescaleCameraPitch(player.getStandingEyeHeight() / factor, pitch); } diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java index 691bc6df..848a4ec7 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java @@ -39,7 +39,8 @@ class DummyPony extends DummyPlayer implements IPreviewModel, ModelAttributes.Sw } return MineLittlePony.getInstance().getManager() .getPony(this) - .getRace(true) + .getMetadata() + .getRace() .getModelId(super.getModel().contains("slim")); } } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java index d4fb9758..8a9a97a6 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java @@ -21,7 +21,7 @@ abstract class MixinCamera { IPony pony = MineLittlePony.getInstance().getManager().getPony(MinecraftClient.getInstance().player); - if (!pony.getRace(false).isHuman()) { + if (!pony.getRace().isHuman()) { value *= pony.getMetadata().getSize().getEyeDistanceFactor(); } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java index bba1f36d..ee52e2d9 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java @@ -46,7 +46,7 @@ abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity implem IPony pony = MineLittlePony.getInstance().getManager().getPony(this); - if (!pony.getRace(false).isHuman()) { + if (!pony.getRace().isHuman()) { float factor = pony.getMetadata().getSize().getEyeHeightFactor(); if (factor != 1) { value *= factor; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index 87cd3aae..9a6826ed 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -41,7 +41,7 @@ abstract class MixinDefaultPlayerSkin { cir.setReturnValue(MineLittlePony.getInstance().getManager() .getPony(IPonyManager.getDefaultSkin(uuid), uuid) - .getRace(false) + .getRace() .getModelId(IPonyManager.isSlimSkin(uuid))); } } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java b/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java index 9bab9448..74b4585f 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java @@ -23,7 +23,7 @@ abstract class MixinEntityRenderDispatcher { } return MineLittlePony.getInstance().getManager() .getPony(player) - .getRace(false) + .getRace() .getModelId(player.getModel().contains("slim")); } } diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java index c3517276..ba857d7a 100644 --- a/src/main/java/com/minelittlepony/client/pony/Pony.java +++ b/src/main/java/com/minelittlepony/client/pony/Pony.java @@ -158,8 +158,8 @@ public class Pony implements IPony { } @Override - public Race getRace(boolean ignorePony) { - return getEffectiveRace(getMetadata().getRace(), ignorePony); + public Race getRace() { + return getEffectiveRace(getMetadata().getRace(), true); } @Override diff --git a/src/main/java/com/minelittlepony/client/render/IPonyRenderContext.java b/src/main/java/com/minelittlepony/client/render/IPonyRenderContext.java index 8414992c..8f025f09 100644 --- a/src/main/java/com/minelittlepony/client/render/IPonyRenderContext.java +++ b/src/main/java/com/minelittlepony/client/render/IPonyRenderContext.java @@ -36,7 +36,7 @@ public interface IPonyRenderContext } public void render(T entity, float entityYaw, float tickDelta, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv) { - model = manager.setModel(models.computeIfAbsent(getEntityPony(entity).getRace(false), this::createModel)).body(); + model = manager.setModel(models.computeIfAbsent(getEntityPony(entity).getRace(), this::createModel)).body(); super.render(entity, entityYaw, tickDelta, stack, renderContext, lightUv); }