diff --git a/src/main/java/com/minelittlepony/PonyRenderManager.java b/src/main/java/com/minelittlepony/PonyRenderManager.java index 5045a2e9..ac8c9898 100644 --- a/src/main/java/com/minelittlepony/PonyRenderManager.java +++ b/src/main/java/com/minelittlepony/PonyRenderManager.java @@ -58,10 +58,11 @@ public class PonyRenderManager { // Preview on the select skin gui ModUtilities.addRenderer(EntityPonyModel.class, new RenderPonyModel(manager)); - registerPlayerSkin(manager, PlayerModels.EARTH); - registerPlayerSkin(manager, PlayerModels.PEGASUS); - registerPlayerSkin(manager, PlayerModels.ALICORN); - registerPlayerSkin(manager, PlayerModels.ZEBRA); + for (PlayerModels i : PlayerModels.values()) { + if (i != PlayerModels.HUMAN) { + registerPlayerSkin(manager, i); + } + } } private void registerPlayerSkin(RenderManager manager, PlayerModels playerModel) { diff --git a/src/main/java/com/minelittlepony/model/PMAPI.java b/src/main/java/com/minelittlepony/model/PMAPI.java index 11cea302..0ac8d2f9 100644 --- a/src/main/java/com/minelittlepony/model/PMAPI.java +++ b/src/main/java/com/minelittlepony/model/PMAPI.java @@ -3,6 +3,7 @@ package com.minelittlepony.model; import com.minelittlepony.model.player.ModelAlicorn; import com.minelittlepony.model.player.ModelEarthPony; import com.minelittlepony.model.player.ModelPegasus; +import com.minelittlepony.model.player.ModelUnicorn; import com.minelittlepony.model.player.ModelZebra; import com.minelittlepony.model.ponies.ModelIllagerPony; import com.minelittlepony.model.ponies.ModelSeapony; @@ -29,6 +30,9 @@ public final class PMAPI { public static final ModelWrapper pegasus = new ModelWrapper(new ModelPegasus(false)); public static final ModelWrapper pegasusSmall = new ModelWrapper(new ModelPegasus(true)); + public static final ModelWrapper unicorn = new ModelWrapper(new ModelUnicorn(false)); + public static final ModelWrapper unicornSmall = new ModelWrapper(new ModelUnicorn(true)); + public static final ModelWrapper alicorn = new ModelWrapper(new ModelAlicorn(false)); public static final ModelWrapper alicornSmall = new ModelWrapper(new ModelAlicorn(true)); diff --git a/src/main/java/com/minelittlepony/model/player/PlayerModels.java b/src/main/java/com/minelittlepony/model/player/PlayerModels.java index 28f03673..57188584 100644 --- a/src/main/java/com/minelittlepony/model/player/PlayerModels.java +++ b/src/main/java/com/minelittlepony/model/player/PlayerModels.java @@ -10,6 +10,7 @@ public enum PlayerModels { @Deprecated HUMAN("default", "slim", () -> PMAPI.pony, () -> PMAPI.ponySmall), EARTH("earthpony", "slimearthpony", () -> PMAPI.earthpony, () -> PMAPI.earthponySmall), PEGASUS("pegasus", "slimpegasus", () -> PMAPI.pegasus, () -> PMAPI.pegasusSmall), + UNICORN("unicorn", "slimunicorn", () -> PMAPI.unicorn, () -> PMAPI.unicornSmall), ALICORN("alicorn", "slimalicorn", () -> PMAPI.alicorn, () -> PMAPI.alicornSmall), ZEBRA("zebra", "slimzebra", () -> PMAPI.zebra, () -> PMAPI.zebraSmall); diff --git a/src/main/java/com/minelittlepony/pony/data/PonyRace.java b/src/main/java/com/minelittlepony/pony/data/PonyRace.java index d0f973c8..59efb57d 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyRace.java +++ b/src/main/java/com/minelittlepony/pony/data/PonyRace.java @@ -7,7 +7,7 @@ public enum PonyRace implements ITriggerPixelMapped { HUMAN(0, PlayerModels.HUMAN, false, false), EARTH(0xf9b131, PlayerModels.EARTH,false, false), PEGASUS(0x88caf0, PlayerModels.PEGASUS, true, false), - UNICORN(0xd19fe4, PlayerModels.ALICORN, false, true), + UNICORN(0xd19fe4, PlayerModels.UNICORN, false, true), ALICORN(0xfef9fc, PlayerModels.ALICORN, true, true), CHANGELING(0x282b29, PlayerModels.ALICORN, true, true), ZEBRA(0xd0cccf, PlayerModels.ZEBRA, false, false),