From 6c50f408812a653ba14a63d8f98e8b8e39e04c8d Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 17 Aug 2018 23:18:54 +0200 Subject: [PATCH] Admittedly his was a better way of doing it. Especially not that models are more hierarchical in nature --- .../java/com/minelittlepony/model/AbstractPonyModel.java | 3 +-- src/main/java/com/minelittlepony/model/ModelMobPony.java | 2 -- .../com/minelittlepony/model/armour/ModelPonyArmor.java | 2 -- .../com/minelittlepony/model/player/ModelUnicorn.java | 2 -- .../minelittlepony/model/ponies/ModelEnderStallion.java | 8 -------- .../com/minelittlepony/model/ponies/ModelSeapony.java | 2 -- .../minelittlepony/model/ponies/ModelVillagerPony.java | 1 - .../com/minelittlepony/model/ponies/ModelWitchPony.java | 5 ----- 8 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index fdba4bff..0e691157 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -26,12 +26,11 @@ import net.minecraft.util.math.MathHelper; import java.util.Random; import static net.minecraft.client.renderer.GlStateManager.*; -import static com.minelittlepony.model.PonyModelConstants.*; /** * Foundation class for all types of ponies. */ -public abstract class AbstractPonyModel extends ModelPlayer implements IModel { +public abstract class AbstractPonyModel extends ModelPlayer implements IModel, PonyModelConstants { public boolean isSleeping; public boolean isFlying; diff --git a/src/main/java/com/minelittlepony/model/ModelMobPony.java b/src/main/java/com/minelittlepony/model/ModelMobPony.java index a2378cef..8cf588bf 100644 --- a/src/main/java/com/minelittlepony/model/ModelMobPony.java +++ b/src/main/java/com/minelittlepony/model/ModelMobPony.java @@ -1,7 +1,5 @@ package com.minelittlepony.model; -import static com.minelittlepony.model.PonyModelConstants.PI; - import com.minelittlepony.model.player.ModelAlicorn; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java index 969674e9..7d5af900 100644 --- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java +++ b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java @@ -8,8 +8,6 @@ import com.minelittlepony.model.capabilities.IModel; import com.minelittlepony.model.capabilities.IModelArmor; import com.minelittlepony.render.PonyRenderer; -import static com.minelittlepony.model.PonyModelConstants.*; - public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor { public PonyRenderer chestPiece; diff --git a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java b/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java index fac74733..0d93f856 100644 --- a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java +++ b/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java @@ -9,8 +9,6 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.model.capabilities.IModelUnicorn; -import static com.minelittlepony.model.PonyModelConstants.*; - /** * Used for both unicorns and alicorns since there's no logical way to keep them distinct and not duplicate stuff. */ diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java b/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java index d3d305fb..2d5c17c7 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java @@ -9,14 +9,6 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.model.components.PonySnout; import com.minelittlepony.render.PonyRenderer; -import static com.minelittlepony.model.PonyModelConstants.HEAD_CENTRE_X; -import static com.minelittlepony.model.PonyModelConstants.HEAD_CENTRE_Y; -import static com.minelittlepony.model.PonyModelConstants.HEAD_CENTRE_Z; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_X; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_Y; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_Z; -import static com.minelittlepony.model.PonyModelConstants.LEFT_WING_ROTATE_ANGLE_Z_SNEAK; - public class ModelEnderStallion extends ModelSkeletonPony { public boolean isCarrying; diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java index 188a52ab..61cb4c66 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.model.PonyModelConstants.*; - public class ModelSeapony extends ModelUnicorn { private static final float FIN_ROTY = PI / 6; diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java index 61346bb2..6d34fdf6 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java @@ -4,7 +4,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityZombieVillager; import net.minecraft.entity.passive.EntityVillager; -import static com.minelittlepony.model.PonyModelConstants.*; import com.minelittlepony.model.components.SaddleBags; import com.minelittlepony.model.player.ModelAlicorn; diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java index 3f72cb8e..fefa64b6 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java @@ -8,11 +8,6 @@ import net.minecraft.entity.monster.EntityWitch; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_X; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_Y; -import static com.minelittlepony.model.PonyModelConstants.HEAD_RP_Z; -import static com.minelittlepony.model.PonyModelConstants.PI; - import com.minelittlepony.model.player.ModelZebra; import com.minelittlepony.render.PonyRenderer;