Organise the packages

src/main/java/com/minelittlepony/client/GuiPonySettings.java

@@ -1,11 +1,10 @@
-package com.minelittlepony.client.gui;
+package com.minelittlepony.client;
 
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.LiteralText;
 
-import com.minelittlepony.client.MineLittlePony;
-import com.minelittlepony.client.render.entities.MobRenderers;
+import com.minelittlepony.client.render.entity.MobRenderers;
 import com.minelittlepony.client.settings.ClientPonyConfig;
 import com.minelittlepony.common.client.gui.GameGui;
 import com.minelittlepony.common.client.gui.ScrollContainer;
@@ -23,7 +22,7 @@ import javax.annotation.Nullable;
  * In-Game options menu.
  *
  */
-public class GuiPonySettings extends GameGui {
+class GuiPonySettings extends GameGui {
 
     private static final String OPTIONS_PREFIX = "minelp.options.";
 

src/main/java/com/minelittlepony/client/LegacySkinConverter.java

@@ -12,7 +12,7 @@ import static com.minelittlepony.common.event.SkinFilterCallback.copy;
  * do is copy the wing across.
  *
  */
-public class LegacySkinConverter implements SkinFilterCallback {
+class LegacySkinConverter implements SkinFilterCallback {
 
     @Override
     public void processImage(NativeImage image, boolean legacy) {

src/main/java/com/minelittlepony/client/MineLittlePony.java

@@ -1,9 +1,8 @@
 package com.minelittlepony.client;
 
-import com.minelittlepony.client.gui.GuiPonySettings;
 import com.minelittlepony.client.hdskins.IndirectHDSkins;
 import com.minelittlepony.client.pony.PonyManager;
-import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer;
+import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer;
 import com.minelittlepony.client.settings.ClientPonyConfig;
 import com.minelittlepony.common.client.gui.VisibilityMode;
 import com.minelittlepony.common.client.gui.element.Button;

src/main/java/com/minelittlepony/client/PonyRenderManager.java

@@ -4,11 +4,11 @@ import java.util.Map;
 
 import com.google.common.collect.Maps;
 import com.minelittlepony.client.model.IPonyModel;
-import com.minelittlepony.client.model.races.PlayerModels;
+import com.minelittlepony.client.model.entity.race.PlayerModels;
 import com.minelittlepony.client.render.LevitatingItemRenderer;
+import com.minelittlepony.client.render.entity.MobRenderers;
+import com.minelittlepony.client.render.entity.RenderPonyPlayer;
 import com.minelittlepony.client.render.IPonyRender;
-import com.minelittlepony.client.render.entities.MobRenderers;
-import com.minelittlepony.client.render.entities.player.RenderPonyPlayer;
 
 import javax.annotation.Nullable;
 

src/main/java/com/minelittlepony/client/hdskins/DummyPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.hdskins.gui;
+package com.minelittlepony.client.hdskins;
 
 import com.minelittlepony.hdskins.dummy.DummyPlayer;
 import com.minelittlepony.hdskins.dummy.TextureProxy;
@@ -8,7 +8,7 @@ import com.minelittlepony.hdskins.resources.LocalTexture;
 /**
  * Dummy model used for the skin uploading screen.
  */
-public class DummyPony extends DummyPlayer {
+class DummyPony extends DummyPlayer {
 
     public boolean wet = false;
 

src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java

@@ -1,15 +1,15 @@
-package com.minelittlepony.client.hdskins.gui;
+package com.minelittlepony.client.hdskins;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.model.ClientPonyModel;
 import com.minelittlepony.client.model.ModelWrapper;
-import com.minelittlepony.client.model.races.PlayerModels;
+import com.minelittlepony.client.model.entity.race.PlayerModels;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.client.render.RenderPony;
-import com.minelittlepony.client.render.layer.LayerGear;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
-import com.minelittlepony.client.render.layer.LayerPonyArmor;
-import com.minelittlepony.client.render.layer.LayerPonyElytra;
+import com.minelittlepony.client.render.entity.feature.LayerGear;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.render.entity.feature.LayerPonyArmor;
+import com.minelittlepony.client.render.entity.feature.LayerPonyElytra;
 import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer;
 import com.minelittlepony.hdskins.profile.SkinType;
 import com.minelittlepony.pony.IPony;
@@ -24,7 +24,7 @@ import net.minecraft.util.Identifier;
 /**
  * Renderer used for the dummy pony model when selecting a skin.
  */
-public class DummyPonyRenderer extends DummyPlayerRenderer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
+class DummyPonyRenderer extends DummyPlayerRenderer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
 
     protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this);
 

src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.hdskins.gui;
+package com.minelittlepony.client.hdskins;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.common.client.gui.element.IconicToggle;

src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java

@@ -2,8 +2,6 @@ package com.minelittlepony.client.hdskins;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.SkinsProxy;
-import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP;
-import com.minelittlepony.client.hdskins.gui.DummyPonyRenderer;
 import com.minelittlepony.common.event.ClientReadyCallback;
 import com.minelittlepony.hdskins.SkinCacheClearCallback;
 import com.minelittlepony.hdskins.dummy.DummyPlayer;

src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.hdskins.gui;
+package com.minelittlepony.client.hdskins;
 
 import net.minecraft.util.Identifier;
 

src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java

@@ -1,7 +1,7 @@
 package com.minelittlepony.client.mixin;
 
 import com.minelittlepony.client.MineLittlePony;
-import com.minelittlepony.client.model.races.PlayerModels;
+import com.minelittlepony.client.model.entity.race.PlayerModels;
 import com.minelittlepony.pony.IPonyManager;
 import com.minelittlepony.settings.PonyLevel;
 

src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java

@@ -1,7 +1,8 @@
 package com.minelittlepony.client.mixin;
 
 import com.minelittlepony.client.MineLittlePony;
-import com.minelittlepony.client.model.races.PlayerModels;
+import com.minelittlepony.client.model.entity.race.PlayerModels;
+
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.entity.Entity;

src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java

@@ -1,8 +1,8 @@
 package com.minelittlepony.client.model;
 
 import com.minelittlepony.client.model.armour.ModelPonyArmour;
+import com.minelittlepony.client.model.part.PonySnout;
 import com.minelittlepony.client.model.armour.ArmourWrapper;
-import com.minelittlepony.client.model.components.PonySnout;
 import com.minelittlepony.client.transform.PonyTransformation;
 import com.minelittlepony.model.BodyPart;
 import com.minelittlepony.model.IPart;

src/main/java/com/minelittlepony/client/model/ModelPonyHead.java

@@ -1,7 +1,7 @@
 package com.minelittlepony.client.model;
 
-import com.minelittlepony.client.model.components.PonySnout;
-import com.minelittlepony.client.model.components.UnicornHorn;
+import com.minelittlepony.client.model.part.PonySnout;
+import com.minelittlepony.client.model.part.UnicornHorn;
 import com.minelittlepony.client.pony.PonyData;
 import com.minelittlepony.client.util.render.Part;
 import com.minelittlepony.model.ICapitated;

src/main/java/com/minelittlepony/client/model/entity/ModelBreezie.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.entity.model.BipedEntityModel;

src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.VertexConsumer;

src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.VertexConsumer;

src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java

@@ -1,11 +1,11 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.entity.mob.IllagerEntity;
 import net.minecraft.util.Arm;
 import net.minecraft.util.math.MathHelper;
 
-import com.minelittlepony.client.model.races.ModelAlicorn;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
 
 public class ModelIllagerPony<T extends IllagerEntity> extends ModelAlicorn<T> {
 

src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java

@@ -1,10 +1,10 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.entity.mob.IllagerEntity;
 import net.minecraft.entity.mob.PillagerEntity;
 import net.minecraft.util.Arm;
 
-import com.minelittlepony.client.model.races.ModelChangeling;
+import com.minelittlepony.client.model.entity.race.ModelChangeling;
 
 public class ModelPillagerPony<T extends PillagerEntity> extends ModelChangeling<T> {
 

src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java

@@ -1,8 +1,8 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import com.minelittlepony.client.model.armour.ModelPonyArmour;
+import com.minelittlepony.client.model.entity.race.ModelUnicorn;
 import com.minelittlepony.client.model.armour.ArmourWrapper;
-import com.minelittlepony.client.model.races.ModelUnicorn;
 import com.minelittlepony.model.BodyPart;
 import com.minelittlepony.model.armour.IEquestrianArmour;
 import com.minelittlepony.pony.IPony;

src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.entity.mob.WitherSkeletonEntity;
 import net.minecraft.client.render.VertexConsumer;
@@ -10,7 +10,7 @@ import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 
 import com.minelittlepony.client.model.IMobModel;
-import com.minelittlepony.client.model.races.ModelAlicorn;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
 
 public class ModelSkeletonPony<T extends HostileEntity> extends ModelAlicorn<T> implements IMobModel {
 

src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.VertexConsumer;
@@ -10,8 +10,8 @@ import net.minecraft.util.math.MathHelper;
 import net.minecraft.village.VillagerDataContainer;
 import net.minecraft.village.VillagerProfession;
 
-import com.minelittlepony.client.model.races.ModelAlicorn;
-import com.minelittlepony.client.render.entities.villager.PonyTextures;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
+import com.minelittlepony.client.render.entity.villager.PonyTextures;
 import com.minelittlepony.model.IPart;
 import com.minelittlepony.pony.meta.Race;
 

src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java

@@ -1,9 +1,9 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.entity.mob.WitchEntity;
 import net.minecraft.util.math.MathHelper;
 
-import com.minelittlepony.client.model.races.ModelZebra;
+import com.minelittlepony.client.model.entity.race.ModelZebra;
 import com.minelittlepony.pony.IPony;
 import com.minelittlepony.pony.meta.Wearable;
 

src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java

@@ -1,7 +1,7 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import com.minelittlepony.client.model.IMobModel;
-import com.minelittlepony.client.model.races.ModelAlicorn;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
 import com.minelittlepony.mson.api.model.MsonPart;
 
 import net.minecraft.entity.mob.HostileEntity;

src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.model.entity;
 
 import net.minecraft.entity.mob.ZombieVillagerEntity;
 import net.minecraft.util.math.MathHelper;

src/main/java/com/minelittlepony/client/model/entity/package-info.java

@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package com.minelittlepony.client.hdskins.gui;
+package com.minelittlepony.client.model.entity;
 
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import com.minelittlepony.model.IPart;
 import com.minelittlepony.model.IPegasus;

src/main/java/com/minelittlepony/client/model/entity/race/ModelBatpony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import net.minecraft.entity.LivingEntity;
 

src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;

src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import com.minelittlepony.client.model.AbstractPonyModel;
 

src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java

@@ -1,6 +1,6 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
-import com.minelittlepony.client.model.components.PegasusWings;
+import com.minelittlepony.client.model.part.PegasusWings;
 import com.minelittlepony.model.IPart;
 import com.minelittlepony.model.IPegasus;
 

src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java

@@ -1,6 +1,6 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
-import com.minelittlepony.client.model.components.UnicornHorn;
+import com.minelittlepony.client.model.part.UnicornHorn;
 import com.minelittlepony.model.IUnicorn;
 import com.minelittlepony.mson.api.model.MsonPart;
 

src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;

src/main/java/com/minelittlepony/client/model/entity/race/PlayerModels.java

@@ -1,10 +1,10 @@
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.model.entity.race;
 
 import com.google.common.collect.Maps;
 import com.minelittlepony.client.model.ModelWrapper;
-import com.minelittlepony.client.model.entities.ModelSeapony;
-import com.minelittlepony.client.render.entities.player.RenderPonyPlayer;
-import com.minelittlepony.client.render.entities.player.RenderSeaponyPlayer;
+import com.minelittlepony.client.model.entity.ModelSeapony;
+import com.minelittlepony.client.render.entity.RenderPonyPlayer;
+import com.minelittlepony.client.render.entity.RenderSeaponyPlayer;
 import com.minelittlepony.model.IModel;
 import com.minelittlepony.pony.meta.Race;
 

src/main/java/com/minelittlepony/client/model/entity/race/package-info.java

@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.entity.race;
 
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/model/part/BatWings.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 import net.minecraft.client.render.VertexConsumer;

src/main/java/com/minelittlepony/client/model/part/BugWings.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 

src/main/java/com/minelittlepony/client/model/part/PegasusWings.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelPart;

src/main/java/com/minelittlepony/client/model/part/PonyEars.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelPart;

src/main/java/com/minelittlepony/client/model/part/PonySnout.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelPart;

src/main/java/com/minelittlepony/client/model/part/PonyTail.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelPart;

src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import com.minelittlepony.client.model.AbstractPonyModel;
 import com.minelittlepony.client.model.IPonyModel;

src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.model.components;
+package com.minelittlepony.client.model.part;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.model.Model;

src/main/java/com/minelittlepony/client/model/part/package-info.java

@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package com.minelittlepony.client.gui;
+package com.minelittlepony.client.model.part;
 
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java

@@ -72,7 +72,7 @@ public class LevitatingItemRenderer {
     }
 
     private void setColor(int glowColor) {
-        Color.glBlendColour(glowColor, 0.2F);
+        GL14.glBlendColor(Color.r(glowColor), Color.g(glowColor), Color.b(glowColor), 0.2F);
     }
 
     private void unsetColor() {

src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerSkullRenderer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.tileentities.skull;
+package com.minelittlepony.client.render.blockentity.skull;
 
 import com.minelittlepony.client.SkinsProxy;
 import com.minelittlepony.client.model.ModelDeadMau5Ears;

src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java

@@ -1,10 +1,10 @@
-package com.minelittlepony.client.render.tileentities.skull;
+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.render.tileentities.skull.PonySkullRenderer.ISkull;
+import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull;
 import com.minelittlepony.pony.IPony;
 
 public abstract class PonySkull implements ISkull {

src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.tileentities.skull;
+package com.minelittlepony.client.render.blockentity.skull;
 
 import com.google.common.collect.Maps;
 import com.minelittlepony.client.MineLittlePony;

src/main/java/com/minelittlepony/client/render/blockentity/skull/SkeletonSkullRenderer.java

@@ -1,7 +1,7 @@
-package com.minelittlepony.client.render.tileentities.skull;
+package com.minelittlepony.client.render.blockentity.skull;
 
-import com.minelittlepony.client.render.entities.MobRenderers;
-import com.minelittlepony.client.render.entities.RenderPonySkeleton;
+import com.minelittlepony.client.render.entity.MobRenderers;
+import com.minelittlepony.client.render.entity.RenderPonySkeleton;
 import com.minelittlepony.settings.PonyConfig;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.util.Identifier;

src/main/java/com/minelittlepony/client/render/blockentity/skull/WitherSkullRenderer.java

@@ -1,7 +1,7 @@
-package com.minelittlepony.client.render.tileentities.skull;
+package com.minelittlepony.client.render.blockentity.skull;
 
-import com.minelittlepony.client.render.entities.MobRenderers;
-import com.minelittlepony.client.render.entities.RenderPonySkeleton;
+import com.minelittlepony.client.render.entity.MobRenderers;
+import com.minelittlepony.client.render.entity.RenderPonySkeleton;
 import com.minelittlepony.settings.PonyConfig;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.util.Identifier;

src/main/java/com/minelittlepony/client/render/blockentity/skull/ZombieSkullRenderer.java

@@ -1,7 +1,7 @@
-package com.minelittlepony.client.render.tileentities.skull;
+package com.minelittlepony.client.render.blockentity.skull;
 
-import com.minelittlepony.client.render.entities.MobRenderers;
-import com.minelittlepony.client.render.entities.RenderPonyZombie;
+import com.minelittlepony.client.render.entity.MobRenderers;
+import com.minelittlepony.client.render.entity.RenderPonyZombie;
 import com.minelittlepony.settings.PonyConfig;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.util.Identifier;

src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java

@@ -0,0 +1,4 @@
+@ParametersAreNonnullByDefault
+package com.minelittlepony.client.render.blockentity.skull;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/entities/package-info.java

@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.minelittlepony.client.render.entities;
-
-import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/entities/player/package-info.java

@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.minelittlepony.client.render.entities.player;
-
-import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/entity/MobRenderers.java

@@ -1,8 +1,8 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.PonyRenderManager;
-import com.minelittlepony.client.render.entities.villager.*;
+import com.minelittlepony.client.render.entity.villager.*;
 import com.minelittlepony.common.util.settings.Setting;
 
 import java.util.Arrays;

src/main/java/com/minelittlepony/client/render/entity/RenderEnderStallion.java

@@ -1,10 +1,10 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
-import com.minelittlepony.client.model.entities.ModelEnderStallion;
-import com.minelittlepony.client.render.layer.LayerEyeGlow;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
-import com.minelittlepony.client.render.layer.LayerEyeGlow.IGlowingRenderer;
+import com.minelittlepony.client.model.entity.ModelEnderStallion;
+import com.minelittlepony.client.render.entity.feature.LayerEyeGlow;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.render.entity.feature.LayerEyeGlow.IGlowingRenderer;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.block.BlockState;

src/main/java/com/minelittlepony/client/render/entity/RenderPonyGuardian.java

@@ -1,12 +1,12 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import javax.annotation.Nonnull;
 
 import com.minelittlepony.client.mixin.IResizeable;
-import com.minelittlepony.client.model.entities.ModelGuardianPony;
-import com.minelittlepony.client.render.entities.RenderPonyMob.Proxy;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.model.entity.ModelGuardianPony;
+import com.minelittlepony.client.render.entity.RenderPonyMob.Proxy;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;

src/main/java/com/minelittlepony/client/render/entity/RenderPonyIllager.java

@@ -1,8 +1,8 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
-import com.minelittlepony.client.model.entities.ModelIllagerPony;
-import com.minelittlepony.client.render.layer.LayerHeldItemIllager;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
+import com.minelittlepony.client.model.entity.ModelIllagerPony;
+import com.minelittlepony.client.render.entity.feature.LayerHeldItemIllager;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.VertexConsumerProvider;

src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.model.ClientPonyModel;
@@ -7,12 +7,12 @@ import com.minelittlepony.client.model.ModelWrapper;
 import com.minelittlepony.client.render.DebugBoundingBoxRenderer;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.client.render.RenderPony;
-import com.minelittlepony.client.render.layer.LayerGear;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
-import com.minelittlepony.client.render.layer.LayerPonyArmor;
-import com.minelittlepony.client.render.layer.LayerPonyCustomHead;
-import com.minelittlepony.client.render.layer.LayerPonyElytra;
+import com.minelittlepony.client.render.entity.feature.LayerGear;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.render.entity.feature.LayerPonyArmor;
+import com.minelittlepony.client.render.entity.feature.LayerPonyCustomHead;
+import com.minelittlepony.client.render.entity.feature.LayerPonyElytra;
 import com.minelittlepony.model.IUnicorn;
 import com.minelittlepony.pony.IPony;
 

src/main/java/com/minelittlepony/client/render/entity/RenderPonyPillager.java

@@ -1,13 +1,13 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.entity.mob.PillagerEntity;
 import net.minecraft.util.Identifier;
 
-import com.minelittlepony.client.model.entities.ModelPillagerPony;
-import com.minelittlepony.client.render.layer.LayerHeldItemIllager;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
+import com.minelittlepony.client.model.entity.ModelPillagerPony;
+import com.minelittlepony.client.render.entity.feature.LayerHeldItemIllager;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
 
 public class RenderPonyPillager extends RenderPonyMob<PillagerEntity, ModelPillagerPony<PillagerEntity>> {
 

src/main/java/com/minelittlepony/client/render/entity/RenderPonyPlayer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities.player;
+package com.minelittlepony.client.render.entity;
 
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.model.ClientPonyModel;
@@ -7,14 +7,14 @@ import com.minelittlepony.client.model.gear.SaddleBags;
 import com.minelittlepony.client.render.DebugBoundingBoxRenderer;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.client.render.RenderPony;
-import com.minelittlepony.client.render.layer.LayerDJPon3Head;
-import com.minelittlepony.client.render.layer.LayerEntityOnPonyShoulder;
-import com.minelittlepony.client.render.layer.LayerGear;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
-import com.minelittlepony.client.render.layer.LayerPonyArmor;
-import com.minelittlepony.client.render.layer.LayerPonyCape;
-import com.minelittlepony.client.render.layer.LayerPonyCustomHead;
-import com.minelittlepony.client.render.layer.LayerPonyElytra;
+import com.minelittlepony.client.render.entity.feature.LayerDJPon3Head;
+import com.minelittlepony.client.render.entity.feature.LayerEntityOnPonyShoulder;
+import com.minelittlepony.client.render.entity.feature.LayerGear;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.render.entity.feature.LayerPonyArmor;
+import com.minelittlepony.client.render.entity.feature.LayerPonyCape;
+import com.minelittlepony.client.render.entity.feature.LayerPonyCustomHead;
+import com.minelittlepony.client.render.entity.feature.LayerPonyElytra;
 import com.minelittlepony.model.gear.IGear;
 import com.minelittlepony.pony.IPony;
 import com.minelittlepony.pony.meta.Race;

src/main/java/com/minelittlepony/client/render/entity/RenderPonySkeleton.java

@@ -1,9 +1,9 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
-import com.minelittlepony.client.model.entities.ModelSkeletonPony;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
-import com.minelittlepony.client.render.layer.LayerPonyStrayOverlay;
+import com.minelittlepony.client.model.entity.ModelSkeletonPony;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical;
+import com.minelittlepony.client.render.entity.feature.LayerPonyStrayOverlay;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;

src/main/java/com/minelittlepony/client/render/entity/RenderPonyTrader.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
@@ -6,7 +6,7 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.passive.WanderingTraderEntity;
 import net.minecraft.util.Identifier;
 
-import com.minelittlepony.client.model.races.ModelAlicorn;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
 
 public class RenderPonyTrader extends RenderPonyMob.Caster<WanderingTraderEntity, ModelAlicorn<WanderingTraderEntity>> {
 

src/main/java/com/minelittlepony/client/render/entity/RenderPonyVex.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.BipedEntityRenderer;
@@ -7,7 +7,7 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.VexEntity;
 import net.minecraft.util.Identifier;
 
-import com.minelittlepony.client.model.entities.ModelBreezie;
+import com.minelittlepony.client.model.entity.ModelBreezie;
 
 /**
  * AKA a breezie :D

src/main/java/com/minelittlepony/client/render/entity/RenderPonyWitch.java

@@ -1,7 +1,7 @@
-package com.minelittlepony.client.render.entities;
+package com.minelittlepony.client.render.entity;
 
-import com.minelittlepony.client.model.entities.ModelWitchPony;
-import com.minelittlepony.client.render.layer.LayerHeldPonyItem;
+import com.minelittlepony.client.model.entity.ModelWitchPony;
+import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;

src/main/java/com/minelittlepony/client/render/entity/RenderPonyZombie.java

@@ -1,6 +1,4 @@
-package com.minelittlepony.client.render.entities;
-
-import com.minelittlepony.client.model.entities.ModelZombiePony;
+package com.minelittlepony.client.render.entity;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
@@ -12,6 +10,8 @@ import net.minecraft.entity.mob.ZombieEntity;
 import net.minecraft.entity.mob.ZombiePigmanEntity;
 import net.minecraft.util.Identifier;
 
+import com.minelittlepony.client.model.entity.ModelZombiePony;
+
 public class RenderPonyZombie<Zombie extends ZombieEntity> extends RenderPonyMob.Caster<Zombie, ModelZombiePony<Zombie>> {
 
     public static final Identifier ZOMBIE = new Identifier("minelittlepony", "textures/entity/zombie/zombie_pony.png");

src/main/java/com/minelittlepony/client/render/entity/RenderSeaponyPlayer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities.player;
+package com.minelittlepony.client.render.entity;
 
 import com.minelittlepony.client.model.ClientPonyModel;
 import com.minelittlepony.client.model.ModelWrapper;

src/main/java/com/minelittlepony/client/render/entity/feature/AbstractPonyLayer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.model.IPonyModel;
 import com.minelittlepony.client.render.IPonyRender;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerDJPon3Head.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.OverlayTexture;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerEntityOnPonyShoulder.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerEyeGlow.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerGear.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldItemIllager.java

@@ -1,11 +1,11 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.IllagerEntity;
 import net.minecraft.util.Arm;
 
-import com.minelittlepony.client.model.races.ModelAlicorn;
+import com.minelittlepony.client.model.entity.race.ModelAlicorn;
 import com.minelittlepony.client.render.IPonyRender;
 
 public class LayerHeldItemIllager<T extends IllagerEntity, M extends ModelAlicorn<T>> extends LayerHeldPonyItem<T, M> {

src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItem.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.model.IPonyModel;
 import com.minelittlepony.client.render.IPonyRender;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItemMagical.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.PonyRenderManager;
 import com.minelittlepony.client.model.IPonyModel;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerOverlayBase.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.ForgeProxy;
 import com.minelittlepony.client.model.IPonyModel;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCape.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.model.ClientPonyModel;
 import com.minelittlepony.client.render.IPonyRender;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCustomHead.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.model.AbstractPonyModel;
 import com.minelittlepony.client.model.IPonyModel;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyElytra.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import com.minelittlepony.client.model.IPonyModel;
 import com.minelittlepony.client.model.PonyElytra;

src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyStrayOverlay.java

@@ -1,10 +1,10 @@
-package com.minelittlepony.client.render.layer;
+package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.entity.mob.AbstractSkeletonEntity;
 import net.minecraft.util.Identifier;
 
-import com.minelittlepony.client.model.entities.ModelSkeletonPony;
+import com.minelittlepony.client.model.entity.ModelSkeletonPony;
 
 public class LayerPonyStrayOverlay<Skeleton extends AbstractSkeletonEntity> extends LayerOverlayBase<Skeleton, ModelSkeletonPony<Skeleton>> {
 

src/main/java/com/minelittlepony/client/render/entity/feature/package-info.java

@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package com.minelittlepony.client.model.entities;
+package com.minelittlepony.client.render.entity.feature;
 
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/entity/package-info.java

@@ -1,4 +1,4 @@
 @ParametersAreNonnullByDefault
-package com.minelittlepony.client.model.races;
+package com.minelittlepony.client.render.entity;
 
 import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/entity/villager/AbstractVillagerRenderer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities.villager;
+package com.minelittlepony.client.render.entity.villager;
 
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
@@ -9,8 +9,8 @@ import net.minecraft.village.VillagerDataContainer;
 import net.minecraft.village.VillagerProfession;
 
 import com.minelittlepony.client.model.ClientPonyModel;
-import com.minelittlepony.client.render.entities.RenderPonyMob;
-import com.minelittlepony.client.render.layer.LayerGear;
+import com.minelittlepony.client.render.entity.RenderPonyMob;
+import com.minelittlepony.client.render.entity.feature.LayerGear;
 import com.minelittlepony.model.IUnicorn;
 import com.minelittlepony.model.gear.IGear;
 import com.minelittlepony.util.resources.ITextureSupplier;

src/main/java/com/minelittlepony/client/render/entity/villager/ClothingLayer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities.villager;
+package com.minelittlepony.client.render.entity.villager;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.entity.feature.FeatureRendererContext;

src/main/java/com/minelittlepony/client/render/entity/villager/PonyTextures.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.client.render.entities.villager;
+package com.minelittlepony.client.render.entity.villager;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.LivingEntity;

src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyVillager.java

@@ -1,6 +1,6 @@
-package com.minelittlepony.client.render.entities.villager;
+package com.minelittlepony.client.render.entity.villager;
 
-import com.minelittlepony.client.model.entities.ModelVillagerPony;
+import com.minelittlepony.client.model.entity.ModelVillagerPony;
 import com.minelittlepony.util.resources.ITextureSupplier;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;

src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyZombieVillager.java

@@ -1,6 +1,6 @@
-package com.minelittlepony.client.render.entities.villager;
+package com.minelittlepony.client.render.entity.villager;
 
-import com.minelittlepony.client.model.entities.ModelZombieVillagerPony;
+import com.minelittlepony.client.model.entity.ModelZombieVillagerPony;
 import com.minelittlepony.util.resources.ITextureSupplier;
 
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;

src/main/java/com/minelittlepony/client/render/layer/package-info.java

@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.minelittlepony.client.render.layer;
-
-import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/render/tileentities/skull/package-info.java

@@ -1,4 +0,0 @@
-@ParametersAreNonnullByDefault
-package com.minelittlepony.client.render.tileentities.skull;
-
-import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java

@@ -3,7 +3,7 @@ package com.minelittlepony.client.settings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
 
-import com.minelittlepony.client.render.entities.MobRenderers;
+import com.minelittlepony.client.render.entity.MobRenderers;
 import com.minelittlepony.common.client.gui.VisibilityMode;
 import com.minelittlepony.common.util.settings.Setting;
 import com.minelittlepony.settings.PonyConfig;

src/main/java/com/minelittlepony/client/util/render/Color.java

@@ -1,9 +1,5 @@
 package com.minelittlepony.client.util.render;
 
-import org.lwjgl.opengl.GL14;
-
-import com.mojang.blaze3d.platform.GlStateManager;
-
 /**
  * Colouration Utilities
  */
@@ -57,42 +53,4 @@ public interface Color {
     static int abgrToArgb(int color) {
         return argbToHex(a(color), b(color), g(color), r(color));
     }
-
-    /**
-     * Applies a GLTint based on the given colour hex code.
-     *
-     * @param hex The colour to apply
-     */
-    static void glColor(int hex) {
-        glColor(hex, a(hex));
-    }
-
-    /**
-     * Applies a GLTint based on the given colour hex code.
-     *
-     * @param hex The colour to apply
-     * @param alpha The opacity to use
-     */
-    static void glColor(int hex, float alpha) {
-        GlStateManager.color4f(r(hex), g(hex), b(hex), alpha);
-    }
-
-    /**
-     * Applies a GLBlendTint based on the given colour hex code.
-     *
-     * @param hex The colour to apply
-     */
-    static void glBlendColour(int hex) {
-        glBlendColour(hex, a(hex));
-    }
-
-    /**
-     * Applies a GLBlendTint based on the given colour hex code.
-     *
-     * @param hex The colour to apply
-     * @param alpha The opacity to use
-     */
-    static void glBlendColour(int hex, float alpha) {
-        GL14.glBlendColor(r(hex), g(hex), b(hex), alpha);
-    }
 }