diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 6bfe206d..257b6dc6 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model; -import com.minelittlepony.client.model.armour.ModelPonyArmour; +import com.minelittlepony.client.model.armour.PonyArmourModel; import com.minelittlepony.client.model.armour.ArmourWrapper; import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.model.BodyPart; @@ -45,7 +45,7 @@ public abstract class AbstractPonyModel extends ClientPo @Override public IEquestrianArmour createArmour() { - return new ArmourWrapper<>(ModelPonyArmour::new); + return new ArmourWrapper<>(PonyArmourModel::new); } /** diff --git a/src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java b/src/main/java/com/minelittlepony/client/model/DJPon3EarsModel.java similarity index 82% rename from src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java rename to src/main/java/com/minelittlepony/client/model/DJPon3EarsModel.java index 95ff0026..ea978acc 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelDeadMau5Ears.java +++ b/src/main/java/com/minelittlepony/client/model/DJPon3EarsModel.java @@ -4,9 +4,9 @@ import net.minecraft.client.render.entity.model.SkullEntityModel; import com.minelittlepony.mson.api.model.BoxBuilder; -public class ModelDeadMau5Ears extends SkullEntityModel { +public class DJPon3EarsModel extends SkullEntityModel { - public ModelDeadMau5Ears() { + public DJPon3EarsModel() { super(24, 0, 64, 64); ((BoxBuilder.ContentAccessor)skull).cubes().clear(); skull.addCuboid(-9, -13, -1, 6, 6, 1, 0); diff --git a/src/main/java/com/minelittlepony/client/model/ModelType.java b/src/main/java/com/minelittlepony/client/model/ModelType.java index 9b463be6..84fc7403 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelType.java +++ b/src/main/java/com/minelittlepony/client/model/ModelType.java @@ -5,23 +5,23 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.VexEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.armour.ModelPonyArmour; -import com.minelittlepony.client.model.entity.ModelBreezie; -import com.minelittlepony.client.model.entity.ModelEnderStallion; -import com.minelittlepony.client.model.entity.ModelGuardianPony; -import com.minelittlepony.client.model.entity.ModelIllagerPony; -import com.minelittlepony.client.model.entity.ModelPillagerPony; -import com.minelittlepony.client.model.entity.ModelSkeletonPony; -import com.minelittlepony.client.model.entity.ModelVillagerPony; -import com.minelittlepony.client.model.entity.ModelWitchPony; -import com.minelittlepony.client.model.entity.ModelZombiePony; -import com.minelittlepony.client.model.entity.ModelZombieVillagerPony; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; -import com.minelittlepony.client.model.entity.race.ModelChangeling; -import com.minelittlepony.client.model.entity.race.ModelEarthPony; -import com.minelittlepony.client.model.entity.race.ModelPegasus; -import com.minelittlepony.client.model.entity.race.ModelUnicorn; -import com.minelittlepony.client.model.entity.race.ModelZebra; +import com.minelittlepony.client.model.armour.PonyArmourModel; +import com.minelittlepony.client.model.entity.BreezieModel; +import com.minelittlepony.client.model.entity.EnderStallionModel; +import com.minelittlepony.client.model.entity.GuardianPonyModel; +import com.minelittlepony.client.model.entity.IllagerPonyModel; +import com.minelittlepony.client.model.entity.PillagerPonyModel; +import com.minelittlepony.client.model.entity.SkeleponyModel; +import com.minelittlepony.client.model.entity.VillagerPonyModel; +import com.minelittlepony.client.model.entity.WitchPonyModel; +import com.minelittlepony.client.model.entity.ZomponyModel; +import com.minelittlepony.client.model.entity.ZomponyVillagerModel; +import com.minelittlepony.client.model.entity.race.AlicornModel; +import com.minelittlepony.client.model.entity.race.ChangelingModel; +import com.minelittlepony.client.model.entity.race.EarthPonyModel; +import com.minelittlepony.client.model.entity.race.PegasusModel; +import com.minelittlepony.client.model.entity.race.UnicornModel; +import com.minelittlepony.client.model.entity.race.ZebraModel; import com.minelittlepony.client.model.gear.ChristmasHat; import com.minelittlepony.client.model.gear.Muffin; import com.minelittlepony.client.model.gear.SaddleBags; @@ -49,22 +49,22 @@ public final class ModelType { private static final Map> PLAYER_MODELS = new HashMap<>(); private static final Map> GEAR_MODELS = new HashMap<>(); - public static final ModelKey> VILLAGER = register("villager", ModelVillagerPony::new); - public static final ModelKey WITCH = register("witch", ModelWitchPony::new); - public static final ModelKey> ZOMBIE = register("zombie", ModelZombiePony::new); - public static final ModelKey ZOMBIE_VILLAGER = register("zombie_villager", ModelZombieVillagerPony::new); - public static final ModelKey> SKELETON = register("skeleton", ModelSkeletonPony::new); - public static final ModelKey> PILLAGER = register("pillager", ModelPillagerPony::new); - public static final ModelKey> ILLAGER = register("illager", ModelIllagerPony::new); - public static final ModelKey GUARDIAN = register("guardian", ModelGuardianPony::new); - public static final ModelKey ENDERMAN = register("enderman", ModelEnderStallion::new); - public static final ModelKey> BREEZIE = register("breezie", ModelBreezie::new); + public static final ModelKey> VILLAGER = register("villager", VillagerPonyModel::new); + public static final ModelKey WITCH = register("witch", WitchPonyModel::new); + public static final ModelKey> ZOMBIE = register("zombie", ZomponyModel::new); + public static final ModelKey ZOMBIE_VILLAGER = register("zombie_villager", ZomponyVillagerModel::new); + public static final ModelKey> SKELETON = register("skeleton", SkeleponyModel::new); + public static final ModelKey> PILLAGER = register("pillager", PillagerPonyModel::new); + public static final ModelKey> ILLAGER = register("illager", IllagerPonyModel::new); + public static final ModelKey GUARDIAN = register("guardian", GuardianPonyModel::new); + public static final ModelKey ENDERMAN = register("enderman", EnderStallionModel::new); + public static final ModelKey> BREEZIE = register("breezie", BreezieModel::new); public static final ModelKey> ELYTRA = register("elytra", PonyElytra::new); - public static final ModelKey SKULL = register("skull", ModelPonyHead::new); + public static final ModelKey SKULL = register("skull", PonySkullModel::new); - public static final ModelKey> ARMOUR_INNER = register("armour_inner", ModelPonyArmour::new); - public static final ModelKey> ARMOUR_OUTER = register("armour_outer", ModelPonyArmour::new); + public static final ModelKey> ARMOUR_INNER = register("armour_inner", PonyArmourModel::new); + public static final ModelKey> ARMOUR_OUTER = register("armour_outer", PonyArmourModel::new); public static final ModelKey STETSON = registerGear("stetson", Wearable.STETSON, Stetson::new); public static final ModelKey SADDLEBAGS = registerGear("saddlebags", Wearable.SADDLE_BAGS, SaddleBags::new); @@ -72,18 +72,18 @@ public final class ModelType { public static final ModelKey WITCH_HAT = registerGear("witch_hat", Wearable.HAT, WitchHat::new); public static final ModelKey ANTLERS = registerGear("antlers", Wearable.ANTLERS, ChristmasHat::new); - public static final PlayerModelKey> ALICORN = registerPlayer("alicorn", Race.ALICORN, ModelAlicorn::new); - public static final PlayerModelKey> UNICORN = registerPlayer("unicorn", Race.UNICORN, ModelUnicorn::new); - public static final PlayerModelKey> KIRIN = registerPlayer("kirin", Race.KIRIN, ModelUnicorn::new); - public static final PlayerModelKey> PEGASUS = registerPlayer("pegasus", Race.PEGASUS, ModelPegasus::new); - public static final PlayerModelKey> GRYPHON = registerPlayer("gryphon", Race.GRYPHON, ModelPegasus::new); - public static final PlayerModelKey> HIPPOGRIFF = registerPlayer("hippogriff", Race.HIPPOGRIFF, ModelPegasus::new); - public static final PlayerModelKey> EARTH_PONY = registerPlayer("earth_pony", Race.EARTH, ModelEarthPony::new); - public static final PlayerModelKey> SEA_PONY = registerPlayer("sea_pony", Race.SEAPONY, ModelEarthPony::new, PlayerSeaponyRenderer::new); - public static final PlayerModelKey> BAT_PONY = registerPlayer("bat_pony", Race.BATPONY, ModelPegasus::new); - public static final PlayerModelKey> CHANGELING = registerPlayer("changeling", Race.CHANGELING, ModelChangeling::new); - public static final PlayerModelKey> CHANGEDLING = registerPlayer("reformed_changeling", Race.CHANGEDLING, ModelChangeling::new); - public static final PlayerModelKey> ZEBRA = registerPlayer("zebra", Race.ZEBRA, ModelZebra::new); + public static final PlayerModelKey> ALICORN = registerPlayer("alicorn", Race.ALICORN, AlicornModel::new); + public static final PlayerModelKey> UNICORN = registerPlayer("unicorn", Race.UNICORN, UnicornModel::new); + public static final PlayerModelKey> KIRIN = registerPlayer("kirin", Race.KIRIN, UnicornModel::new); + public static final PlayerModelKey> PEGASUS = registerPlayer("pegasus", Race.PEGASUS, PegasusModel::new); + public static final PlayerModelKey> GRYPHON = registerPlayer("gryphon", Race.GRYPHON, PegasusModel::new); + public static final PlayerModelKey> HIPPOGRIFF = registerPlayer("hippogriff", Race.HIPPOGRIFF, PegasusModel::new); + public static final PlayerModelKey> EARTH_PONY = registerPlayer("earth_pony", Race.EARTH, EarthPonyModel::new); + public static final PlayerModelKey> SEA_PONY = registerPlayer("sea_pony", Race.SEAPONY, EarthPonyModel::new, PlayerSeaponyRenderer::new); + public static final PlayerModelKey> BAT_PONY = registerPlayer("bat_pony", Race.BATPONY, PegasusModel::new); + public static final PlayerModelKey> CHANGELING = registerPlayer("changeling", Race.CHANGELING, ChangelingModel::new); + public static final PlayerModelKey> CHANGEDLING = registerPlayer("reformed_changeling", Race.CHANGEDLING, ChangelingModel::new); + public static final PlayerModelKey> ZEBRA = registerPlayer("zebra", Race.ZEBRA, ZebraModel::new); static PlayerModelKey registerPlayer(String name, Race race, Function constructor) { return registerPlayer(name, race, constructor, PlayerPonyRenderer::new); diff --git a/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java similarity index 95% rename from src/main/java/com/minelittlepony/client/model/ModelPonyHead.java rename to src/main/java/com/minelittlepony/client/model/PonySkullModel.java index 98a45941..cb5b5a22 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java +++ b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java @@ -13,7 +13,7 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.SkullOverlayEntityModel; import net.minecraft.client.util.math.MatrixStack; -public class ModelPonyHead extends SkullOverlayEntityModel implements MsonModel, ICapitated { +public class PonySkullModel extends SkullOverlayEntityModel implements MsonModel, ICapitated { private PonySnout snout; diff --git a/src/main/java/com/minelittlepony/client/model/armour/ArmourWrapper.java b/src/main/java/com/minelittlepony/client/model/armour/ArmourWrapper.java index 92bd47ff..9c3191db 100644 --- a/src/main/java/com/minelittlepony/client/model/armour/ArmourWrapper.java +++ b/src/main/java/com/minelittlepony/client/model/armour/ArmourWrapper.java @@ -9,12 +9,12 @@ import com.minelittlepony.pony.IPonyData; import java.util.function.Supplier; -public class ArmourWrapper implements IEquestrianArmour> { +public class ArmourWrapper implements IEquestrianArmour> { - private final ModelPonyArmour outerLayer; - private final ModelPonyArmour innerLayer; + private final PonyArmourModel outerLayer; + private final PonyArmourModel innerLayer; - public ArmourWrapper(Supplier> supplier) { + public ArmourWrapper(Supplier> supplier) { outerLayer = ModelType.ARMOUR_INNER.createModel(supplier); innerLayer = ModelType.ARMOUR_OUTER.createModel(supplier); } @@ -27,7 +27,7 @@ public class ArmourWrapper implements IEquestrianArmour< } @Override - public ModelPonyArmour getArmorForLayer(ArmourLayer layer) { + public PonyArmourModel getArmorForLayer(ArmourLayer layer) { if (layer == ArmourLayer.INNER) { return innerLayer; diff --git a/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java b/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java similarity index 97% rename from src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java rename to src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java index 4034d634..846cb542 100644 --- a/src/main/java/com/minelittlepony/client/model/armour/ModelPonyArmour.java +++ b/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java @@ -12,7 +12,7 @@ import com.minelittlepony.model.armour.ArmourVariant; import com.minelittlepony.model.armour.IArmour; import com.minelittlepony.mson.api.ModelContext; -public class ModelPonyArmour extends AbstractPonyModel implements IArmour { +public class PonyArmourModel extends AbstractPonyModel implements IArmour { private ModelPart chestPiece; @@ -21,7 +21,7 @@ public class ModelPonyArmour extends AbstractPonyModel extends MsonBiped implements MsonModel { +public class BreezieModel extends MsonBiped implements MsonModel { private ModelPart neck; private ModelPart leftWing; private ModelPart rightWing; - public ModelBreezie() { + public BreezieModel() { textureHeight = 64; } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java rename to src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java index 24a7bf16..d1ba478a 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java +++ b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.mson.api.ModelContext; -public class ModelEnderStallion extends ModelSkeletonPony { +public class EnderStallionModel extends SkeleponyModel { public boolean isCarrying; public boolean isAttacking; @@ -19,7 +19,7 @@ public class ModelEnderStallion extends ModelSkeletonPony { private ModelPart leftHorn; private ModelPart rightHorn; - public ModelEnderStallion() { + public EnderStallionModel() { super(); attributes.visualHeight = 3; } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java b/src/main/java/com/minelittlepony/client/model/entity/GuardianPonyModel.java similarity index 80% rename from src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java rename to src/main/java/com/minelittlepony/client/model/entity/GuardianPonyModel.java index 50fbcb46..fd18208b 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/GuardianPonyModel.java @@ -8,9 +8,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.GuardianEntity; import com.minelittlepony.client.model.IPonyMixinModel; +import com.minelittlepony.client.model.entity.race.SeaponyModel; -public class ModelGuardianPony extends GuardianEntityModel implements IPonyMixinModel.Caster, ModelPart> { - private final ModelSeapony mixin = new ModelSeapony<>(); +public class GuardianPonyModel extends GuardianEntityModel implements IPonyMixinModel.Caster, ModelPart> { + private final SeaponyModel mixin = new SeaponyModel<>(); @Override public void setAngles(GuardianEntity entity, float move, float swing, float ticks, float headYaw, float headPitch) { @@ -33,7 +34,7 @@ public class ModelGuardianPony extends GuardianEntityModel implements IPonyMixin } @Override - public ModelSeapony mixin() { + public SeaponyModel mixin() { return mixin; } } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/IllagerPonyModel.java similarity index 91% rename from src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/IllagerPonyModel.java index 55dea469..c005be55 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/IllagerPonyModel.java @@ -5,11 +5,11 @@ import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.util.Arm; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; -public class ModelIllagerPony extends ModelAlicorn { +public class IllagerPonyModel extends AlicornModel { - public ModelIllagerPony() { + public IllagerPonyModel() { super(false); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/PillagerPonyModel.java similarity index 83% rename from src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/PillagerPonyModel.java index 28e668a1..6c8a92da 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/PillagerPonyModel.java @@ -4,11 +4,11 @@ import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.entity.mob.PillagerEntity; import net.minecraft.util.Arm; -import com.minelittlepony.client.model.entity.race.ModelChangeling; +import com.minelittlepony.client.model.entity.race.ChangelingModel; -public class ModelPillagerPony extends ModelChangeling { +public class PillagerPonyModel extends ChangelingModel { - public ModelPillagerPony() { + public PillagerPonyModel() { super(false); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java b/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java similarity index 92% rename from src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java rename to src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java index d969c32b..999392c6 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java @@ -10,15 +10,15 @@ import net.minecraft.util.Arm; import net.minecraft.util.Hand; import com.minelittlepony.client.model.IMobModel; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; -public class ModelSkeletonPony extends ModelAlicorn implements IMobModel { +public class SkeleponyModel extends AlicornModel implements IMobModel { public boolean isUnicorn; public boolean isWithered; - public ModelSkeletonPony() { + public SkeleponyModel() { super(false); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java similarity index 93% rename from src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java index 23e9bc3e..e12d1aab 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java @@ -10,20 +10,20 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; import com.minelittlepony.client.render.entity.npc.PonyTextures; import com.minelittlepony.model.IPart; import com.minelittlepony.mson.api.ModelContext; import com.minelittlepony.pony.meta.Race; -public class ModelVillagerPony extends ModelAlicorn implements ModelWithHat { +public class VillagerPonyModel extends AlicornModel implements ModelWithHat { private ModelPart apron; private ModelPart trinket; private IPart batWings; - public ModelVillagerPony() { + public VillagerPonyModel() { super(false); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java b/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java similarity index 93% rename from src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java rename to src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java index 982d1e94..ef006082 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java @@ -3,14 +3,14 @@ package com.minelittlepony.client.model.entity; import net.minecraft.entity.mob.WitchEntity; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.client.model.entity.race.ModelZebra; +import com.minelittlepony.client.model.entity.race.ZebraModel; import com.minelittlepony.client.render.EquineRenderManager; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Wearable; -public class ModelWitchPony extends ModelZebra { +public class WitchPonyModel extends ZebraModel { - public ModelWitchPony() { + public WitchPonyModel() { super(false); attributes.visualHeight = 2.5F; } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java similarity index 85% rename from src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java rename to src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java index f858323a..817eac9a 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ZomponyModel.java @@ -1,17 +1,17 @@ package com.minelittlepony.client.model.entity; import com.minelittlepony.client.model.IMobModel; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; import com.minelittlepony.mson.api.model.MsonPart; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.util.math.MathHelper; -public class ModelZombiePony extends ModelAlicorn implements IMobModel { +public class ZomponyModel extends AlicornModel implements IMobModel { private boolean isPegasus; - public ModelZombiePony() { + public ZomponyModel() { super(false); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/ZomponyVillagerModel.java similarity index 89% rename from src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ZomponyVillagerModel.java index d65a00e6..57521353 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ZomponyVillagerModel.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.IMobModel; import com.minelittlepony.mson.api.model.MsonPart; -public class ModelZombieVillagerPony extends ModelVillagerPony implements IMobModel { +public class ZomponyVillagerModel extends VillagerPonyModel implements IMobModel { @Override protected void rotateLegs(float move, float swing, float ticks, ZombieVillagerEntity entity) { diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java b/src/main/java/com/minelittlepony/client/model/entity/race/AlicornModel.java similarity index 91% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java rename to src/main/java/com/minelittlepony/client/model/entity/race/AlicornModel.java index 8b0a866b..61675a28 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/AlicornModel.java @@ -8,11 +8,11 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; -public class ModelAlicorn extends ModelUnicorn implements IPegasus { +public class AlicornModel extends UnicornModel implements IPegasus { private IPart wings; - public ModelAlicorn(boolean smallArms) { + public AlicornModel(boolean smallArms) { super(smallArms); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java b/src/main/java/com/minelittlepony/client/model/entity/race/ChangelingModel.java similarity index 80% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ChangelingModel.java index 5f66cd05..e78d1169 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ChangelingModel.java @@ -3,9 +3,9 @@ package com.minelittlepony.client.model.entity.race; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.MathHelper; -public class ModelChangeling extends ModelAlicorn { +public class ChangelingModel extends AlicornModel { - public ModelChangeling(boolean smallArms) { + public ChangelingModel(boolean smallArms) { super(smallArms); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java b/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java similarity index 95% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java rename to src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java index f67f3047..21a4205d 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java @@ -9,7 +9,7 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; -public class ModelEarthPony extends AbstractPonyModel { +public class EarthPonyModel extends AbstractPonyModel { private final boolean smallArms; @@ -17,7 +17,7 @@ public class ModelEarthPony extends AbstractPonyModel protected PonySnout snout; protected IPart ears; - public ModelEarthPony(boolean smallArms) { + public EarthPonyModel(boolean smallArms) { this.smallArms = smallArms; } diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java b/src/main/java/com/minelittlepony/client/model/entity/race/PegasusModel.java similarity index 90% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java rename to src/main/java/com/minelittlepony/client/model/entity/race/PegasusModel.java index a58fafd5..0ef82ac7 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/PegasusModel.java @@ -8,11 +8,11 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; -public class ModelPegasus extends ModelEarthPony implements IPegasus { +public class PegasusModel extends EarthPonyModel implements IPegasus { private IPart wings; - public ModelPegasus(boolean smallArms) { + public PegasusModel(boolean smallArms) { super(smallArms); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java similarity index 93% rename from src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java rename to src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java index 4a56ab5d..6992b996 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java @@ -1,7 +1,6 @@ -package com.minelittlepony.client.model.entity; +package com.minelittlepony.client.model.entity.race; -import com.minelittlepony.client.model.armour.ModelPonyArmour; -import com.minelittlepony.client.model.entity.race.ModelUnicorn; +import com.minelittlepony.client.model.armour.PonyArmourModel; import com.minelittlepony.client.render.EquineRenderManager; import com.minelittlepony.client.model.armour.ArmourWrapper; import com.minelittlepony.model.BodyPart; @@ -15,7 +14,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.MathHelper; -public class ModelSeapony extends ModelUnicorn { +public class SeaponyModel extends UnicornModel { private ModelPart bodyCenter; @@ -23,12 +22,12 @@ public class ModelSeapony extends ModelUnicorn { private ModelPart centerFin; private ModelPart rightFin; - public ModelSeapony(boolean smallArms) { + public SeaponyModel(boolean smallArms) { super(smallArms); textureHeight = 64; } - public ModelSeapony() { + public SeaponyModel() { this(false); } @@ -154,7 +153,7 @@ public class ModelSeapony extends ModelUnicorn { rightFin.visible = visible; } - class Armour extends ModelPonyArmour { + class Armour extends PonyArmourModel { @Override public void showBoots() { diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/entity/race/UnicornModel.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java rename to src/main/java/com/minelittlepony/client/model/entity/race/UnicornModel.java index 5214acfe..605a9ead 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/UnicornModel.java @@ -16,14 +16,14 @@ import net.minecraft.util.math.MathHelper; /** * Used for both unicorns and alicorns since there's no logical way to keep them distinct and not duplicate stuff. */ -public class ModelUnicorn extends ModelEarthPony implements IUnicorn { +public class UnicornModel extends EarthPonyModel implements IUnicorn { protected ModelPart unicornArmRight; protected ModelPart unicornArmLeft; protected UnicornHorn horn; - public ModelUnicorn(boolean smallArms) { + public UnicornModel(boolean smallArms) { super(smallArms); } diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java b/src/main/java/com/minelittlepony/client/model/entity/race/ZebraModel.java similarity index 82% rename from src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ZebraModel.java index 0d727dfb..41b61fb7 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ZebraModel.java @@ -3,14 +3,14 @@ package com.minelittlepony.client.model.entity.race; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; -import com.minelittlepony.client.model.armour.ModelPonyArmour; +import com.minelittlepony.client.model.armour.PonyArmourModel; import com.minelittlepony.client.model.armour.ArmourWrapper; import com.minelittlepony.model.BodyPart; import com.minelittlepony.model.armour.IEquestrianArmour; -public class ModelZebra extends ModelEarthPony { +public class ZebraModel extends EarthPonyModel { - public ModelZebra(boolean useSmallArms) { + public ZebraModel(boolean useSmallArms) { super(useSmallArms); } @@ -25,7 +25,7 @@ public class ModelZebra extends ModelEarthPony { super.transform(part, stack); } - class Armour extends ModelPonyArmour { + class Armour extends PonyArmourModel { @Override public void transform(BodyPart part, MatrixStack stack) { applyLongNeck(part, stack); diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java index 39594ce5..843418a2 100644 --- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java @@ -3,14 +3,14 @@ package com.minelittlepony.client.render.blockentity.skull; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; -import com.minelittlepony.client.model.ModelPonyHead; +import com.minelittlepony.client.model.PonySkullModel; import com.minelittlepony.client.model.ModelType; import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull; import com.minelittlepony.pony.IPony; public abstract class AbstractPonySkull implements ISkull { - private ModelPonyHead ponyHead = ModelType.SKULL.createModel(); + private PonySkullModel ponyHead = ModelType.SKULL.createModel(); @Override public void setAngles(float angle, float poweredTicks) { diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java index b5a5028e..5df54b61 100644 --- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.blockentity.skull; import com.minelittlepony.client.SkinsProxy; -import com.minelittlepony.client.model.ModelDeadMau5Ears; +import com.minelittlepony.client.model.DJPon3EarsModel; import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyLevel; import com.mojang.authlib.GameProfile; @@ -16,7 +16,7 @@ import javax.annotation.Nullable; public class PonySkull extends AbstractPonySkull { - private final ModelDeadMau5Ears deadMau5 = new ModelDeadMau5Ears(); + private final DJPon3EarsModel deadMau5 = new DJPon3EarsModel(); @Override public boolean canRender(PonyConfig config) { diff --git a/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java index 97d197f9..99e572c3 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entity; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelEnderStallion; +import com.minelittlepony.client.model.entity.EnderStallionModel; import com.minelittlepony.client.render.entity.feature.GlowingEyesFeature; import com.minelittlepony.client.render.entity.feature.HeldItemFeature; import com.minelittlepony.client.render.entity.feature.GlowingItemFeature; @@ -18,7 +18,7 @@ import net.minecraft.util.Identifier; import java.util.Random; -public class EnderStallionRenderer extends PonyRenderer implements IGlowingRenderer { +public class EnderStallionRenderer extends PonyRenderer implements IGlowingRenderer { public static final Identifier ENDERMAN = new Identifier("minelittlepony", "textures/entity/enderman/enderman_pony.png"); private static final Identifier EYES = new Identifier("minelittlepony", "textures/entity/enderman/enderman_pony_eyes.png"); @@ -37,8 +37,8 @@ public class EnderStallionRenderer extends PonyRenderer createItemHoldingLayer() { - return new GlowingItemFeature(this) { + protected HeldItemFeature createItemHoldingLayer() { + return new GlowingItemFeature(this) { @Override protected ItemStack getRightItem(EndermanEntity entity) { BlockState state = entity.getCarriedBlock(); @@ -58,7 +58,7 @@ public class EnderStallionRenderer extends PonyRenderer ponyRenderer; + private final Proxy ponyRenderer; public SeaponyRenderer(EntityRenderDispatcher manager) { super(manager); features.clear(); - ponyRenderer = new Proxy(features, manager, ModelType.GUARDIAN) { + ponyRenderer = new Proxy(features, manager, ModelType.GUARDIAN) { @Override public Identifier findTexture(GuardianEntity entity) { return SEAPONY; } @Override - protected HeldItemFeature createItemHoldingLayer() { + protected HeldItemFeature createItemHoldingLayer() { return new GlowingItemFeature<>(this); } }; diff --git a/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java index 0ba98633..3bbe9779 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/SkeleponyRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entity; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelSkeletonPony; +import com.minelittlepony.client.model.entity.SkeleponyModel; import com.minelittlepony.client.render.entity.feature.HeldItemFeature; import com.minelittlepony.client.render.entity.feature.GlowingItemFeature; import com.minelittlepony.client.render.entity.feature.StrayClothingFeature; @@ -13,7 +13,7 @@ import net.minecraft.entity.mob.StrayEntity; import net.minecraft.entity.mob.WitherSkeletonEntity; import net.minecraft.util.Identifier; -public class SkeleponyRenderer extends PonyRenderer> { +public class SkeleponyRenderer extends PonyRenderer> { public static final Identifier SKELETON = new Identifier("minelittlepony", "textures/entity/skeleton/skeleton_pony.png"); public static final Identifier WITHER = new Identifier("minelittlepony", "textures/entity/skeleton/skeleton_wither_pony.png"); @@ -29,7 +29,7 @@ public class SkeleponyRenderer extends } @Override - protected HeldItemFeature> createItemHoldingLayer() { + protected HeldItemFeature> createItemHoldingLayer() { return new GlowingItemFeature<>(this); } diff --git a/src/main/java/com/minelittlepony/client/render/entity/VexRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/VexRenderer.java index 62eace5c..72aae701 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/VexRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/VexRenderer.java @@ -7,12 +7,12 @@ import net.minecraft.entity.mob.VexEntity; import net.minecraft.util.Identifier; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelBreezie; +import com.minelittlepony.client.model.entity.BreezieModel; /** * AKA a breezie :D */ -public class VexRenderer extends BipedEntityRenderer> { +public class VexRenderer extends BipedEntityRenderer> { private static final Identifier VEX = new Identifier("minelittlepony", "textures/entity/illager/vex_pony.png"); private static final Identifier VEX_CHARGING = new Identifier("minelittlepony", "textures/entity/illager/vex_charging_pony.png"); diff --git a/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java index 99bdd6c8..4c5c1838 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entity; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelWitchPony; +import com.minelittlepony.client.model.entity.WitchPonyModel; import com.minelittlepony.client.render.entity.feature.HeldItemFeature; import net.minecraft.client.render.entity.EntityRenderDispatcher; @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Arm; import net.minecraft.util.Identifier; -public class WitchRenderer extends PonyRenderer { +public class WitchRenderer extends PonyRenderer { private static final Identifier WITCH_TEXTURES = new Identifier("minelittlepony", "textures/entity/witch_pony.png"); @@ -22,8 +22,8 @@ public class WitchRenderer extends PonyRenderer { } @Override - protected HeldItemFeature createItemHoldingLayer() { - return new HeldItemFeature(this) { + protected HeldItemFeature createItemHoldingLayer() { + return new HeldItemFeature(this) { @Override protected void preItemRender(WitchEntity entity, ItemStack drop, ModelTransformation.Type transform, Arm hand, MatrixStack stack) { stack.translate(0, -0.3F, -0.8F); diff --git a/src/main/java/com/minelittlepony/client/render/entity/ZomponyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/ZomponyRenderer.java index 4521e6a0..ccc62724 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/ZomponyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/ZomponyRenderer.java @@ -10,9 +10,9 @@ import net.minecraft.entity.mob.ZombiePigmanEntity; import net.minecraft.util.Identifier; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelZombiePony; +import com.minelittlepony.client.model.entity.ZomponyModel; -public class ZomponyRenderer extends PonyRenderer.Caster> { +public class ZomponyRenderer extends PonyRenderer.Caster> { public static final Identifier ZOMBIE = new Identifier("minelittlepony", "textures/entity/zombie/zombie_pony.png"); public static final Identifier HUSK = new Identifier("minelittlepony", "textures/entity/zombie/husk_pony.png"); @@ -71,7 +71,7 @@ public class ZomponyRenderer extends PonyRenderer.C } - public static class Giant extends PonyRenderer.Caster> { + public static class Giant extends PonyRenderer.Caster> { public Giant(EntityRenderDispatcher manager) { super(manager, ModelType.ZOMBIE); diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java index a7132ea2..dd4a2299 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java @@ -8,13 +8,13 @@ import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.util.math.MatrixStack; import com.minelittlepony.client.model.IPonyModel; -import com.minelittlepony.client.model.ModelDeadMau5Ears; +import com.minelittlepony.client.model.DJPon3EarsModel; import com.minelittlepony.client.render.IPonyRenderContext; import com.minelittlepony.model.BodyPart; public class DJPon3Feature & IPonyModel> extends AbstractPonyFeature { - private final ModelDeadMau5Ears deadMau5 = new ModelDeadMau5Ears(); + private final DJPon3EarsModel deadMau5 = new DJPon3EarsModel(); public DJPon3Feature(IPonyRenderContext context) { super(context); diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/IllagerHeldItemFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/IllagerHeldItemFeature.java index 70167dc1..c23c10a5 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/IllagerHeldItemFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/IllagerHeldItemFeature.java @@ -5,10 +5,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.util.Arm; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; import com.minelittlepony.client.render.IPonyRenderContext; -public class IllagerHeldItemFeature> extends HeldItemFeature { +public class IllagerHeldItemFeature> extends HeldItemFeature { public IllagerHeldItemFeature(IPonyRenderContext livingPony) { super(livingPony); diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/StrayClothingFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/StrayClothingFeature.java index 9cb3b2fb..585f4afe 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/StrayClothingFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/StrayClothingFeature.java @@ -4,20 +4,20 @@ import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.entity.mob.AbstractSkeletonEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.entity.ModelSkeletonPony; +import com.minelittlepony.client.model.entity.SkeleponyModel; -public class StrayClothingFeature extends AbstractClothingFeature> { +public class StrayClothingFeature extends AbstractClothingFeature> { public static final Identifier STRAY_SKELETON_OVERLAY = new Identifier("minelittlepony", "textures/entity/skeleton/stray_pony_overlay.png"); - private final ModelSkeletonPony overlayModel = new ModelSkeletonPony<>(); + private final SkeleponyModel overlayModel = new SkeleponyModel<>(); - public StrayClothingFeature(LivingEntityRenderer> render) { + public StrayClothingFeature(LivingEntityRenderer> render) { super(render); } @Override - protected ModelSkeletonPony getOverlayModel() { + protected SkeleponyModel getOverlayModel() { return overlayModel; } diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java index a5804932..7cea9b62 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/IllagerPonyRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entity.npc; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelIllagerPony; +import com.minelittlepony.client.model.entity.IllagerPonyModel; import com.minelittlepony.client.render.entity.feature.IllagerHeldItemFeature; import com.minelittlepony.client.render.entity.PonyRenderer; import com.minelittlepony.client.render.entity.feature.HeldItemFeature; @@ -17,7 +17,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -public abstract class IllagerPonyRenderer extends PonyRenderer> { +public abstract class IllagerPonyRenderer extends PonyRenderer> { public static final Identifier ILLUSIONIST = new Identifier("minelittlepony", "textures/entity/illager/illusionist_pony.png"); public static final Identifier EVOKER = new Identifier("minelittlepony", "textures/entity/illager/evoker_pony.png"); @@ -28,7 +28,7 @@ public abstract class IllagerPonyRenderer extends PonyR } @Override - protected HeldItemFeature> createItemHoldingLayer() { + protected HeldItemFeature> createItemHoldingLayer() { return new IllagerHeldItemFeature<>(this); } diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/PillagerRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/npc/PillagerRenderer.java index 242e6ebc..1f835634 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/PillagerRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/PillagerRenderer.java @@ -5,12 +5,12 @@ import net.minecraft.entity.mob.PillagerEntity; import net.minecraft.util.Identifier; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelPillagerPony; +import com.minelittlepony.client.model.entity.PillagerPonyModel; import com.minelittlepony.client.render.entity.feature.IllagerHeldItemFeature; import com.minelittlepony.client.render.entity.PonyRenderer; import com.minelittlepony.client.render.entity.feature.HeldItemFeature; -public class PillagerRenderer extends PonyRenderer> { +public class PillagerRenderer extends PonyRenderer> { private static final Identifier TEXTURES = new Identifier("minelittlepony", "textures/entity/illager/pillager_pony.png"); @@ -24,7 +24,7 @@ public class PillagerRenderer extends PonyRenderer> createItemHoldingLayer() { + protected HeldItemFeature> createItemHoldingLayer() { return new IllagerHeldItemFeature<>(this); } } diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyVillager.java b/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyVillager.java index 3e2843ed..0e87af87 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyVillager.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.render.entity.npc; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelVillagerPony; +import com.minelittlepony.client.model.entity.VillagerPonyModel; import com.minelittlepony.util.resources.ITextureSupplier; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.passive.VillagerEntity; -public class RenderPonyVillager extends AbstractVillagerRenderer> { +public class RenderPonyVillager extends AbstractVillagerRenderer> { private static final String TYPE = "villager"; private static final ITextureSupplier FORMATTER = ITextureSupplier.formatted("minelittlepony", "textures/entity/villager/%s.png"); diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyZombieVillager.java b/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyZombieVillager.java index 3cafd46a..84585215 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyZombieVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/RenderPonyZombieVillager.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.render.entity.npc; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.ModelZombieVillagerPony; +import com.minelittlepony.client.model.entity.ZomponyVillagerModel; import com.minelittlepony.util.resources.ITextureSupplier; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.ZombieVillagerEntity; -public class RenderPonyZombieVillager extends AbstractVillagerRenderer { +public class RenderPonyZombieVillager extends AbstractVillagerRenderer { private static final String TYPE = "zombie_villager"; private static final ITextureSupplier FORMATTER = ITextureSupplier.formatted("minelittlepony", "textures/entity/zombie_villager/zombie_%s.png"); diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/TraderRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/npc/TraderRenderer.java index 86f45d50..b025ca2c 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/TraderRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/TraderRenderer.java @@ -6,11 +6,10 @@ import net.minecraft.entity.passive.WanderingTraderEntity; import net.minecraft.util.Identifier; import com.minelittlepony.client.model.ModelType; -import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.AlicornModel; import com.minelittlepony.client.render.entity.PonyRenderer; -import com.minelittlepony.client.render.entity.PonyRenderer.Caster; -public class TraderRenderer extends PonyRenderer.Caster> { +public class TraderRenderer extends PonyRenderer.Caster> { public static final Identifier TEXTURE = new Identifier("minelittlepony", "textures/entity/wandering_trader_pony.png"); diff --git a/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java b/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java index eb177018..caf521cb 100644 --- a/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java +++ b/src/main/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -209,11 +209,11 @@ public enum PonyTransformation { } }; - private static final Map sizeToTransform = Maps.newEnumMap(Size.class); + private static final Map REGISTRY = Maps.newEnumMap(Size.class); static { for (PonyTransformation i : values()) { - sizeToTransform.put(i.size, i); + REGISTRY.put(i.size, i); } } @@ -233,6 +233,6 @@ public enum PonyTransformation { public abstract void transform(IModel model, BodyPart part, MatrixStack stack); public static PonyTransformation forSize(Size size) { - return sizeToTransform.getOrDefault(size, NORMAL); + return REGISTRY.getOrDefault(size, NORMAL); } }