PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-15 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up these old human fields

Browse source
This commit is contained in:
Sollace 2018-06-22 01:46:10 +02:00
parent 8e173fc859
commit 16634d9957
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/PonyRenderManager.java
View file

@ -34,10 +34,10 @@ public class PonyRenderManager {
// Preview on the select skin gui
ModUtilities.addRenderer(EntityPonyModel.class, new RenderPonyModel(manager));
for (PlayerModels i : PlayerModels.values()) {
if (i != PlayerModels.HUMAN) {
registerPlayerSkin(manager, i);
}
PlayerModels[] models = PlayerModels.values();
for (int i = 1; i < models.length; i++) {
registerPlayerSkin(manager, models[i]);
}
}

3
src/main/java/com/minelittlepony/model/PMAPI.java
View file

@ -21,9 +21,6 @@ import java.lang.reflect.Field;
*/
public final class PMAPI {
public static final ModelWrapper pony = new ModelWrapper(new ModelAlicorn(false));
public static final ModelWrapper ponySmall = new ModelWrapper(new ModelAlicorn(true));
public static final ModelWrapper earthpony = new ModelWrapper(new ModelEarthPony(false));
public static final ModelWrapper earthponySmall = new ModelWrapper(new ModelEarthPony(true));

4
src/main/java/com/minelittlepony/model/player/PlayerModels.java
View file

@ -5,9 +5,9 @@ import com.minelittlepony.model.ModelWrapper;
public enum PlayerModels {
/**
* @deprecated Will be removed in a later revision
* The default non-pony model. This is typically handled my the vanilla renderer.
*/
@Deprecated HUMAN("default", "slim", () -> PMAPI.pony, () -> PMAPI.ponySmall),
DEFAULT("default", "slim", () -> PMAPI.earthpony, () -> PMAPI.earthponySmall),
EARTH("earthpony", "slimearthpony", () -> PMAPI.earthpony, () -> PMAPI.earthponySmall),
PEGASUS("pegasus", "slimpegasus", () -> PMAPI.pegasus, () -> PMAPI.pegasusSmall),
UNICORN("unicorn", "slimunicorn", () -> PMAPI.unicorn, () -> PMAPI.unicornSmall),

2
src/main/java/com/minelittlepony/pony/data/PonyRace.java
View file

@ -4,7 +4,7 @@ import com.minelittlepony.model.player.PlayerModels;
public enum PonyRace implements ITriggerPixelMapped<PonyRace> {
HUMAN(0, PlayerModels.HUMAN, false, false),
HUMAN(0, PlayerModels.DEFAULT, false, false),
EARTH(0xf9b131, PlayerModels.EARTH,false, false),
PEGASUS(0x88caf0, PlayerModels.PEGASUS, true, false),
UNICORN(0xd19fe4, PlayerModels.UNICORN, false, true),

2
src/main/java/com/minelittlepony/render/ponies/RenderPonyPigman.java
View file

@ -12,7 +12,7 @@ public class RenderPonyPigman extends RenderPonyMob<EntityPigZombie> {
private static final ResourceLocation PIGMAN = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pigman_pony.png");
public RenderPonyPigman(RenderManager manager) {
super(manager, PMAPI.pony);
super(manager, PMAPI.alicorn);
}
@Override