diff --git a/src/main/java/com/minelittlepony/client/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/GuiPonySettings.java index eb7ef21b..fe46a25c 100644 --- a/src/main/java/com/minelittlepony/client/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/GuiPonySettings.java @@ -90,7 +90,7 @@ public class GuiPonySettings extends GameGui { content.addButton(new Label(LEFT, row += 30)).getStyle().setText("minelp.debug.scale"); content.addButton(new Slider(LEFT, row += 15, 0.1F, 3, config.getGlobalScaleFactor()) .onChange(config::setGlobalScaleFactor) - .setFormatter(value -> describeCurrentScale(value))); + .setFormatter(this::describeCurrentScale)); content.addButton(new Label(LEFT, row += 30)).getStyle().setText("minelp.debug.size"); content.addButton(new EnumSlider<>(LEFT, row += 15, config.sizeOverride.get()) .onChange(config.sizeOverride::set)); diff --git a/src/main/java/com/minelittlepony/client/model/IPonyModel.java b/src/main/java/com/minelittlepony/client/model/IPonyModel.java index 36edeef1..07680cb9 100644 --- a/src/main/java/com/minelittlepony/client/model/IPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/IPonyModel.java @@ -17,9 +17,4 @@ public interface IPonyModel extends PonyModelConstants, void copyAttributes(BipedEntityModel other); void updateLivingState(T entity, IPony pony, EquineRenderManager.Mode mode); - - @Override - default boolean hasHeadGear() { - return getAttributes().hasHeadGear; - } } diff --git a/src/main/java/com/minelittlepony/client/model/PonySkullModel.java b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java index d26603c5..e159eebe 100644 --- a/src/main/java/com/minelittlepony/client/model/PonySkullModel.java +++ b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java @@ -39,11 +39,6 @@ public class PonySkullModel extends SkullOverlayEntityModel implements MsonModel return skull; } - @Override - public boolean hasHeadGear() { - return false; - } - @Override public void render(float poweredTicks, float yaw, float pitch) { super.render(poweredTicks, yaw, pitch); diff --git a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java index 83baace0..6f5c0551 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -5,7 +5,6 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.model.ICapitated; import com.minelittlepony.model.IPart; import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.mson.api.MsonModel; @@ -22,11 +21,8 @@ public class PonySnout implements IPart, MsonModel { private ModelPart mare; private ModelPart stallion; - private ICapitated head; - @Override public void init(ModelContext context) { - head = context.getModel(); mare = context.findByName("mare"); stallion = context.findByName("stallion"); @@ -50,7 +46,7 @@ public class PonySnout implements IPart, MsonModel { } public void setGender(Gender gender) { - boolean show = visible && !head.hasHeadGear() && MineLittlePony.getInstance().getConfig().snuzzles.get(); + boolean show = visible && MineLittlePony.getInstance().getConfig().snuzzles.get(); mare.visible = (show && gender.isMare()); stallion.visible = (show && gender.isStallion()); diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java index c2772a43..e6566c13 100644 --- a/src/main/java/com/minelittlepony/client/pony/Pony.java +++ b/src/main/java/com/minelittlepony/client/pony/Pony.java @@ -14,12 +14,8 @@ import net.minecraft.block.Material; import net.minecraft.block.StairsBlock; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; -import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; @@ -127,19 +123,6 @@ public class Pony implements IPony { return new Vec3d(entity.getX(), entity.getY() + (double) entity.getEyeHeight(entity.getPose()) * size.getScaleFactor(), entity.getZ()); } - @Override - public boolean isWearingHeadgear(LivingEntity entity) { - ItemStack stack = entity.getEquippedStack(EquipmentSlot.HEAD); - - if (stack.isEmpty()) { - return false; - } - - Item item = stack.getItem(); - - return !(item instanceof ArmorItem) || ((ArmorItem) item).getSlotType() != EquipmentSlot.HEAD; - } - @Override public Race getRace(boolean ignorePony) { return metadata.getRace().getEffectiveRace(ignorePony); diff --git a/src/main/java/com/minelittlepony/model/ICapitated.java b/src/main/java/com/minelittlepony/model/ICapitated.java index 39270e67..f207547e 100644 --- a/src/main/java/com/minelittlepony/model/ICapitated.java +++ b/src/main/java/com/minelittlepony/model/ICapitated.java @@ -5,10 +5,4 @@ public interface ICapitated { * Gets the head of this capitated object. */ ModelRenderer getHead(); - - /** - * Returns true if we're wearing any unconventional headgear (ie. a Pumpkin) - */ - boolean hasHeadGear(); - } diff --git a/src/main/java/com/minelittlepony/model/ModelAttributes.java b/src/main/java/com/minelittlepony/model/ModelAttributes.java index aa6c69a1..7e66ec86 100644 --- a/src/main/java/com/minelittlepony/model/ModelAttributes.java +++ b/src/main/java/com/minelittlepony/model/ModelAttributes.java @@ -57,10 +57,6 @@ public class ModelAttributes { * Flag indicating that this model is performing a rainboom (flight). */ public boolean isGoingFast; - /** - * True if the model is wearing any unconventional headgear (ie. a Pumpkin) - */ - public boolean hasHeadGear; /** * Vertical pitch whilst flying. @@ -105,7 +101,6 @@ public class ModelAttributes { isSwimming = mode == Mode.THIRD_PERSON && pony.isSwimming(entity); isSwimmingRotated = mode == Mode.THIRD_PERSON && isSwimming && (entity instanceof PlayerEntity || entity instanceof IRotatedSwimmer); isRidingInteractive = pony.isRidingInteractive(entity); - hasHeadGear = pony.isWearingHeadgear(entity); interpolatorId = entity.getUuid(); isLeftHanded = entity.getMainArm() == Arm.LEFT; } diff --git a/src/main/java/com/minelittlepony/pony/IPony.java b/src/main/java/com/minelittlepony/pony/IPony.java index 9452b0c2..89973764 100644 --- a/src/main/java/com/minelittlepony/pony/IPony.java +++ b/src/main/java/com/minelittlepony/pony/IPony.java @@ -70,14 +70,6 @@ public interface IPony { */ boolean isPartiallySubmerged(LivingEntity entity); - /** - * Returns true if an entity is wearing any headgear. This is used to hide things like the snout when wearing items - * such as the pumpkin, a player's head, or any other types of blocks. - * - * In this case the helmet does not count as headgear because those generally don't interfere with snuzzle rendering. - */ - boolean isWearingHeadgear(LivingEntity entity); - /** * Gets the race associated with this pony. *