From 3b5b4bf011357814add63064763b21369aaf494d Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Tue, 20 Dec 2016 05:28:56 -0500 Subject: [PATCH] Rename PonyArmors to be more obvious that it wraps ForgeHooks. --- src/main/java/com/minelittlepony/ProxyContainer.java | 11 +++++++---- .../forge/{PonyArmors.java => ForgePonyHooks.java} | 2 +- .../forge/{IPonyArmor.java => IForgeHooks.java} | 2 +- .../java/com/minelittlepony/forge/MLPCommonProxy.java | 2 +- src/main/java/com/minelittlepony/forge/MLPForge.java | 2 +- .../minelittlepony/renderer/layer/LayerPonyArmor.java | 6 +++--- 6 files changed, 14 insertions(+), 11 deletions(-) rename src/main/java/com/minelittlepony/forge/{PonyArmors.java => ForgePonyHooks.java} (92%) rename src/main/java/com/minelittlepony/forge/{IPonyArmor.java => IForgeHooks.java} (92%) diff --git a/src/main/java/com/minelittlepony/ProxyContainer.java b/src/main/java/com/minelittlepony/ProxyContainer.java index 8e565a7d..de950d01 100644 --- a/src/main/java/com/minelittlepony/ProxyContainer.java +++ b/src/main/java/com/minelittlepony/ProxyContainer.java @@ -1,18 +1,21 @@ package com.minelittlepony; -import com.minelittlepony.forge.IPonyArmor; +import com.minelittlepony.forge.IForgeHooks; import com.minelittlepony.forge.MLPCommonProxy; +import javax.annotation.Nullable; + public class ProxyContainer extends MLPCommonProxy { - private IPonyArmor ponyArmors; + private IForgeHooks ponyArmors; @Override - public void setPonyArmors(IPonyArmor armors) { + public void setForgeHooks(IForgeHooks armors) { this.ponyArmors = armors; } - public IPonyArmor getPonyArmors() { + @Nullable + public IForgeHooks getHooks() { return ponyArmors; } } diff --git a/src/main/java/com/minelittlepony/forge/PonyArmors.java b/src/main/java/com/minelittlepony/forge/ForgePonyHooks.java similarity index 92% rename from src/main/java/com/minelittlepony/forge/PonyArmors.java rename to src/main/java/com/minelittlepony/forge/ForgePonyHooks.java index f9cb3739..e6d00447 100644 --- a/src/main/java/com/minelittlepony/forge/PonyArmors.java +++ b/src/main/java/com/minelittlepony/forge/ForgePonyHooks.java @@ -5,7 +5,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; -public class PonyArmors implements IPonyArmor { +public class ForgePonyHooks implements IForgeHooks { @Override public String getArmorTexture(EntityLivingBase entity, ItemStack armor, String def, int slot, String type) { diff --git a/src/main/java/com/minelittlepony/forge/IPonyArmor.java b/src/main/java/com/minelittlepony/forge/IForgeHooks.java similarity index 92% rename from src/main/java/com/minelittlepony/forge/IPonyArmor.java rename to src/main/java/com/minelittlepony/forge/IForgeHooks.java index c16caf6a..01d22673 100644 --- a/src/main/java/com/minelittlepony/forge/IPonyArmor.java +++ b/src/main/java/com/minelittlepony/forge/IForgeHooks.java @@ -4,7 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -public interface IPonyArmor { +public interface IForgeHooks { String getArmorTexture(EntityLivingBase e, ItemStack item, String def, int slot, String type); diff --git a/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java b/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java index 40c9d20d..cee67c6a 100644 --- a/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java +++ b/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java @@ -12,5 +12,5 @@ public abstract class MLPCommonProxy { instance = this; } - public abstract void setPonyArmors(IPonyArmor armors); + public abstract void setForgeHooks(IForgeHooks armors); } diff --git a/src/main/java/com/minelittlepony/forge/MLPForge.java b/src/main/java/com/minelittlepony/forge/MLPForge.java index 89c6b7ac..67001a02 100644 --- a/src/main/java/com/minelittlepony/forge/MLPForge.java +++ b/src/main/java/com/minelittlepony/forge/MLPForge.java @@ -15,6 +15,6 @@ public class MLPForge { @SuppressWarnings("unused") @EventHandler public void init(FMLPostInitializationEvent init) { - MLPCommonProxy.getInstance().setPonyArmors(new PonyArmors()); + MLPCommonProxy.getInstance().setForgeHooks(new ForgePonyHooks()); } } diff --git a/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java index 3f88d72d..53bda257 100644 --- a/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java @@ -3,7 +3,7 @@ package com.minelittlepony.renderer.layer; import com.google.common.collect.Maps; import com.minelittlepony.MineLittlePony; import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.forge.IPonyArmor; +import com.minelittlepony.forge.IForgeHooks; import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.PlayerModel; import com.minelittlepony.model.pony.ModelHumanPlayer; @@ -205,7 +205,7 @@ public class LayerPonyArmor implements LayerRenderer { } private static String getArmorTexture(EntityLivingBase entity, ItemStack item, String def, int slot, String type) { - IPonyArmor armor = MineLittlePony.getProxy().getPonyArmors(); + IForgeHooks armor = MineLittlePony.getProxy().getHooks(); if (armor != null) { return armor.getArmorTexture(entity, item, def, slot, type); } @@ -213,7 +213,7 @@ public class LayerPonyArmor implements LayerRenderer { } private static AbstractPonyModel getArmorModel(EntityLivingBase entity, ItemStack itemstack, int slot, AbstractPonyModel def) { - IPonyArmor armor = MineLittlePony.getProxy().getPonyArmors(); + IForgeHooks armor = MineLittlePony.getProxy().getHooks(); if (armor != null) { ModelBase model = armor.getArmorModel(entity, itemstack, slot, def); if (model instanceof ModelPonyArmor) {