diff --git a/src/main/java/com/minelittlepony/ForgeProxy.java b/src/client/java/com/minelittlepony/ForgeProxy.java similarity index 100% rename from src/main/java/com/minelittlepony/ForgeProxy.java rename to src/client/java/com/minelittlepony/ForgeProxy.java diff --git a/src/main/java/com/minelittlepony/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java similarity index 59% rename from src/main/java/com/minelittlepony/LiteModMineLittlePony.java rename to src/client/java/com/minelittlepony/LiteModMineLittlePony.java index 2baf7712..06f1b250 100644 --- a/src/main/java/com/minelittlepony/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java @@ -6,6 +6,9 @@ import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.Tickable; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.modconfig.ConfigPanel; +import com.mumfrey.liteloader.modconfig.ConfigStrategy; +import com.mumfrey.liteloader.modconfig.Exposable; +import com.mumfrey.liteloader.modconfig.ExposableOptions; import net.minecraft.client.Minecraft; @@ -13,8 +16,6 @@ import java.io.File; public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Configurable { - private MineLittlePony mlp; - @Override public String getName() { return MineLittlePony.MOD_NAME; @@ -31,21 +32,34 @@ public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Co @Override public void init(File configPath) { - mlp = new MineLittlePony(); + Config config = new Config(); + + MineLittlePony.getInstance().init(config); + + LiteLoader.getInput().registerKeyBinding(MineLittlePony.SETTINGS_GUI); + LiteLoader.getInstance().registerExposable(config, null); } @Override public void onInitCompleted(Minecraft minecraft, LiteLoader loader) { - mlp.postInit(minecraft); + MineLittlePony.getInstance().postInit(minecraft); } @Override public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) { - mlp.onTick(minecraft, inGame); + MineLittlePony.getInstance().onTick(minecraft, inGame); } @Override public Class getConfigPanelClass() { return GuiPonySettings.class; } + + @ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) + class Config extends PonyConfig implements Exposable { + @Override + public void save() { + LiteLoader.getInstance().writeConfig(this); + } + } } diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/client/java/com/minelittlepony/MineLittlePony.java similarity index 88% rename from src/main/java/com/minelittlepony/MineLittlePony.java rename to src/client/java/com/minelittlepony/MineLittlePony.java index 98e6cffc..092713bd 100644 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ b/src/client/java/com/minelittlepony/MineLittlePony.java @@ -2,11 +2,10 @@ package com.minelittlepony; import com.minelittlepony.gui.GuiPonySettings; import com.minelittlepony.hdskins.gui.GuiSkinsMineLP; -import com.minelittlepony.pony.data.IPonyData; +import com.minelittlepony.pony.data.PonyData; import com.minelittlepony.pony.data.PonyDataSerialiser; import com.minelittlepony.pony.data.PonyManager; import com.minelittlepony.render.skull.PonySkullRenderer; -import com.mumfrey.liteloader.core.LiteLoader; import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.server.LegacySkinServer; import com.voxelmodpack.hdskins.server.SkinServer; @@ -40,35 +39,27 @@ public class MineLittlePony { private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com"; private static final String MINELP_LEGACY_GATEWAY = "http://minelpskinmanager.voxelmodpack.com"; - private static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); + static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); - private static MineLittlePony instance; - - private final PonyConfig config; - private final PonyManager ponyManager; - - private final PonyRenderManager renderManager; + private static final MineLittlePony instance = new MineLittlePony(); private static int modelUpdateCounter = 0; private static boolean reloadingModels = false; - MineLittlePony() { - instance = this; + private PonyConfig config; + private PonyManager ponyManager; - LiteLoader.getInput().registerKeyBinding(SETTINGS_GUI); + private final PonyRenderManager renderManager = new PonyRenderManager(); - config = new PonyConfig(); + void init(PonyConfig newConfig) { + config = newConfig; ponyManager = new PonyManager(config); - renderManager = new PonyRenderManager(); - - LiteLoader.getInstance().registerExposable(config, null); - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); irrm.registerReloadListener(ponyManager); MetadataSerializer ms = Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer; - ms.registerMetadataSectionType(new PonyDataSerialiser(), IPonyData.class); + ms.registerMetadataSectionType(new PonyDataSerialiser(), PonyData.class); // This also makes it the default gateway server. SkinServer.defaultServers.add(new LegacySkinServer(MINELP_LEGACY_SERVER, MINELP_LEGACY_GATEWAY)); @@ -124,11 +115,12 @@ public class MineLittlePony { PonySkullRenderer.resolve(); } + /** * Gets the global MineLP instance. */ public static MineLittlePony getInstance() { - return instance; + return MineLittlePony.instance; } /** @@ -155,5 +147,4 @@ public class MineLittlePony { public static PonyConfig getConfig() { return getInstance().config; } - } diff --git a/src/main/java/com/minelittlepony/PonyRenderManager.java b/src/client/java/com/minelittlepony/PonyRenderManager.java similarity index 100% rename from src/main/java/com/minelittlepony/PonyRenderManager.java rename to src/client/java/com/minelittlepony/PonyRenderManager.java diff --git a/src/main/java/com/minelittlepony/PonySkinModifier.java b/src/client/java/com/minelittlepony/PonySkinModifier.java similarity index 100% rename from src/main/java/com/minelittlepony/PonySkinModifier.java rename to src/client/java/com/minelittlepony/PonySkinModifier.java diff --git a/src/main/java/com/minelittlepony/PonySkinParser.java b/src/client/java/com/minelittlepony/PonySkinParser.java similarity index 100% rename from src/main/java/com/minelittlepony/PonySkinParser.java rename to src/client/java/com/minelittlepony/PonySkinParser.java diff --git a/src/main/java/com/minelittlepony/ducks/IRenderItem.java b/src/client/java/com/minelittlepony/ducks/IRenderItem.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/IRenderItem.java rename to src/client/java/com/minelittlepony/ducks/IRenderItem.java diff --git a/src/main/java/com/minelittlepony/ducks/IRenderPony.java b/src/client/java/com/minelittlepony/ducks/IRenderPony.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/IRenderPony.java rename to src/client/java/com/minelittlepony/ducks/IRenderPony.java diff --git a/src/main/java/com/minelittlepony/ducks/package-info.java b/src/client/java/com/minelittlepony/ducks/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/package-info.java rename to src/client/java/com/minelittlepony/ducks/package-info.java diff --git a/src/main/java/com/minelittlepony/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java similarity index 97% rename from src/main/java/com/minelittlepony/gui/GuiPonySettings.java rename to src/client/java/com/minelittlepony/gui/GuiPonySettings.java index b8ebb023..3edf3346 100644 --- a/src/main/java/com/minelittlepony/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java @@ -5,7 +5,6 @@ import com.minelittlepony.PonyConfig; import com.minelittlepony.PonyConfig.PonySettings; import com.minelittlepony.pony.data.PonyLevel; import com.minelittlepony.render.ponies.MobRenderers; -import com.mumfrey.liteloader.core.LiteLoader; /** * In-Game options menu. @@ -100,7 +99,7 @@ public class GuiPonySettings extends SettingsPanel { @Override public void onGuiClosed() { - LiteLoader.getInstance().writeConfig(config); + config.save(); } @Override diff --git a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java rename to src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java diff --git a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java rename to src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java diff --git a/src/main/java/com/minelittlepony/hdskins/gui/package-info.java b/src/client/java/com/minelittlepony/hdskins/gui/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/package-info.java rename to src/client/java/com/minelittlepony/hdskins/gui/package-info.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java rename to src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinGlStateManager.java b/src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinGlStateManager.java rename to src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java b/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java rename to src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderItem.java b/src/client/java/com/minelittlepony/mixin/MixinRenderItem.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinRenderItem.java rename to src/client/java/com/minelittlepony/mixin/MixinRenderItem.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderManager.java b/src/client/java/com/minelittlepony/mixin/MixinRenderManager.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinRenderManager.java rename to src/client/java/com/minelittlepony/mixin/MixinRenderManager.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java b/src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java rename to src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java diff --git a/src/main/java/com/minelittlepony/mixin/package-info.java b/src/client/java/com/minelittlepony/mixin/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/package-info.java rename to src/client/java/com/minelittlepony/mixin/package-info.java diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/model/AbstractPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/model/AbstractPonyModel.java rename to src/client/java/com/minelittlepony/model/AbstractPonyModel.java diff --git a/src/main/java/com/minelittlepony/model/ModelMobPony.java b/src/client/java/com/minelittlepony/model/ModelMobPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ModelMobPony.java rename to src/client/java/com/minelittlepony/model/ModelMobPony.java diff --git a/src/main/java/com/minelittlepony/model/ModelWrapper.java b/src/client/java/com/minelittlepony/model/ModelWrapper.java similarity index 89% rename from src/main/java/com/minelittlepony/model/ModelWrapper.java rename to src/client/java/com/minelittlepony/model/ModelWrapper.java index 3b7334ea..5d7e3241 100644 --- a/src/main/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/model/ModelWrapper.java @@ -1,7 +1,7 @@ package com.minelittlepony.model; import com.minelittlepony.MineLittlePony; -import com.minelittlepony.model.armour.IEquestrianArmor; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.pony.data.IPonyData; @@ -12,7 +12,7 @@ public class ModelWrapper implements IModelWrapper { private final AbstractPonyModel body; - private final IEquestrianArmor armor; + private final IEquestrianArmour armor; private int lastModelUpdate = 0; @@ -38,7 +38,7 @@ public class ModelWrapper implements IModelWrapper { /** * Returns the contained armour model. */ - public IEquestrianArmor getArmor() { + public IEquestrianArmour getArmor() { return armor; } diff --git a/src/main/java/com/minelittlepony/model/PMAPI.java b/src/client/java/com/minelittlepony/model/PMAPI.java similarity index 100% rename from src/main/java/com/minelittlepony/model/PMAPI.java rename to src/client/java/com/minelittlepony/model/PMAPI.java diff --git a/src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java similarity index 90% rename from src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java rename to src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java index 85e5dc18..44df7f5e 100644 --- a/src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java @@ -10,20 +10,19 @@ import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; import com.minelittlepony.ForgeProxy; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; import javax.annotation.Nullable; import java.io.IOException; import java.util.Map; -public class DefaultPonyArmorTextureResolver implements IArmorTextureResolver { +public class DefaultPonyArmorTextureResolver implements IArmourTextureResolver { private final Map HUMAN_ARMOUR = Maps.newHashMap(); private final Map PONY_ARMOUR = Maps.newHashMap(); @Override - public ResourceLocation getArmorTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, @Nullable String type) { + public ResourceLocation getArmourTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, @Nullable String type) { ItemArmor item = (ItemArmor) itemstack.getItem(); String texture = item.getArmorMaterial().getName(); @@ -38,7 +37,7 @@ public class DefaultPonyArmorTextureResolver impleme String customType = type == null ? "" : String.format("_%s", type); String ponyRes = String.format("%s:textures/models/armor/%s_layer_%s%s.png", domain, texture, layer.name().toLowerCase(), customType); - String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmorLayer.INNER ? 2 : 1, customType); + String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmourLayer.INNER ? 2 : 1, customType); ResourceLocation human = getArmorTexture(entity, itemstack, ponyRes, slot, type); ResourceLocation pony = ponifyResource(human); diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java similarity index 97% rename from src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java rename to src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java index d527bd9d..fe567afa 100644 --- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java @@ -5,10 +5,10 @@ import net.minecraft.entity.Entity; import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelArmor; +import com.minelittlepony.model.capabilities.IModelArmour; import com.minelittlepony.render.model.PonyRenderer; -public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor { +public class ModelPonyArmor extends AbstractPonyModel implements IModelArmour { public PonyRenderer chestPiece; diff --git a/src/main/java/com/minelittlepony/model/armour/PonyArmor.java b/src/client/java/com/minelittlepony/model/armour/PonyArmor.java similarity index 78% rename from src/main/java/com/minelittlepony/model/armour/PonyArmor.java rename to src/client/java/com/minelittlepony/model/armour/PonyArmor.java index 94dc05de..e630aab4 100644 --- a/src/main/java/com/minelittlepony/model/armour/PonyArmor.java +++ b/src/client/java/com/minelittlepony/model/armour/PonyArmor.java @@ -2,7 +2,7 @@ package com.minelittlepony.model.armour; import com.minelittlepony.pony.data.IPonyData; -public class PonyArmor implements IEquestrianArmor { +public class PonyArmor implements IEquestrianArmour { private final ModelPonyArmor outerLayer; private final ModelPonyArmor innerLayer; @@ -25,9 +25,9 @@ public class PonyArmor implements IEquestrianArmor { } @Override - public ModelPonyArmor getArmorForLayer(ArmorLayer layer) { + public ModelPonyArmor getArmorForLayer(ArmourLayer layer) { - if (layer == ArmorLayer.INNER) { + if (layer == ArmourLayer.INNER) { return innerLayer; } diff --git a/src/main/java/com/minelittlepony/model/capabilities/ICapitated.java b/src/client/java/com/minelittlepony/model/capabilities/ICapitated.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/ICapitated.java rename to src/client/java/com/minelittlepony/model/capabilities/ICapitated.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModel.java b/src/client/java/com/minelittlepony/model/capabilities/IModel.java similarity index 96% rename from src/main/java/com/minelittlepony/model/capabilities/IModel.java rename to src/client/java/com/minelittlepony/model/capabilities/IModel.java index 1a1fc419..d17cec5e 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModel.java +++ b/src/client/java/com/minelittlepony/model/capabilities/IModel.java @@ -1,7 +1,7 @@ package com.minelittlepony.model.capabilities; import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.armour.IEquestrianArmor; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.pony.data.IPonyData; import com.minelittlepony.pony.data.PonySize; import com.minelittlepony.pony.data.PonyWearable; @@ -32,7 +32,7 @@ public interface IModel extends ICapitated { /** * Returns a new pony armour to go with this model. Called on startup by a model wrapper. */ - IEquestrianArmor createArmour(); + IEquestrianArmour createArmour(); /** * Gets the skin metadata associated with this model. diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java b/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java similarity index 95% rename from src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java index 1a24fd94..714c9184 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java +++ b/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java @@ -3,9 +3,9 @@ package com.minelittlepony.model.capabilities; import net.minecraft.client.model.ModelBiped; import net.minecraft.inventory.EntityEquipmentSlot; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; +import com.minelittlepony.model.armour.ArmourLayer; -public interface IModelArmor { +public interface IModelArmour { /** * Called to synchronise this model's legs with that of another. * @@ -26,7 +26,7 @@ public interface IModelArmor { * * @return false to skip this render pass. */ - default boolean prepareToRender(EntityEquipmentSlot slot, ArmorLayer layer) { + default boolean prepareToRender(EntityEquipmentSlot slot, ArmourLayer layer) { setInVisible(); switch (layer) { diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java b/src/client/java/com/minelittlepony/model/capabilities/IModelPart.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelPart.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelPart.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPegasus.java b/src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelPegasus.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java b/src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/package-info.java b/src/client/java/com/minelittlepony/model/capabilities/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/package-info.java rename to src/client/java/com/minelittlepony/model/capabilities/package-info.java diff --git a/src/main/java/com/minelittlepony/model/components/BatWings.java b/src/client/java/com/minelittlepony/model/components/BatWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/BatWings.java rename to src/client/java/com/minelittlepony/model/components/BatWings.java diff --git a/src/main/java/com/minelittlepony/model/components/BugWings.java b/src/client/java/com/minelittlepony/model/components/BugWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/BugWings.java rename to src/client/java/com/minelittlepony/model/components/BugWings.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelBatWing.java b/src/client/java/com/minelittlepony/model/components/ModelBatWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelBatWing.java rename to src/client/java/com/minelittlepony/model/components/ModelBatWing.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java b/src/client/java/com/minelittlepony/model/components/ModelBugWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelBugWing.java rename to src/client/java/com/minelittlepony/model/components/ModelBugWing.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java b/src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java rename to src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/model/components/ModelPonyHead.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelPonyHead.java rename to src/client/java/com/minelittlepony/model/components/ModelPonyHead.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelWing.java b/src/client/java/com/minelittlepony/model/components/ModelWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelWing.java rename to src/client/java/com/minelittlepony/model/components/ModelWing.java diff --git a/src/main/java/com/minelittlepony/model/components/PegasusWings.java b/src/client/java/com/minelittlepony/model/components/PegasusWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PegasusWings.java rename to src/client/java/com/minelittlepony/model/components/PegasusWings.java diff --git a/src/main/java/com/minelittlepony/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/model/components/PonyElytra.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonyElytra.java rename to src/client/java/com/minelittlepony/model/components/PonyElytra.java diff --git a/src/main/java/com/minelittlepony/model/components/PonySnout.java b/src/client/java/com/minelittlepony/model/components/PonySnout.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonySnout.java rename to src/client/java/com/minelittlepony/model/components/PonySnout.java diff --git a/src/main/java/com/minelittlepony/model/components/PonyTail.java b/src/client/java/com/minelittlepony/model/components/PonyTail.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonyTail.java rename to src/client/java/com/minelittlepony/model/components/PonyTail.java diff --git a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java b/src/client/java/com/minelittlepony/model/components/SeaponyTail.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/SeaponyTail.java rename to src/client/java/com/minelittlepony/model/components/SeaponyTail.java diff --git a/src/main/java/com/minelittlepony/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/model/components/UnicornHorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/UnicornHorn.java rename to src/client/java/com/minelittlepony/model/components/UnicornHorn.java diff --git a/src/main/java/com/minelittlepony/model/components/package-info.java b/src/client/java/com/minelittlepony/model/components/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/package-info.java rename to src/client/java/com/minelittlepony/model/components/package-info.java diff --git a/src/main/java/com/minelittlepony/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/model/gear/AbstractGear.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/AbstractGear.java rename to src/client/java/com/minelittlepony/model/gear/AbstractGear.java diff --git a/src/main/java/com/minelittlepony/model/gear/ChristmasHat.java b/src/client/java/com/minelittlepony/model/gear/ChristmasHat.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/ChristmasHat.java rename to src/client/java/com/minelittlepony/model/gear/ChristmasHat.java diff --git a/src/main/java/com/minelittlepony/model/gear/IGear.java b/src/client/java/com/minelittlepony/model/gear/IGear.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/IGear.java rename to src/client/java/com/minelittlepony/model/gear/IGear.java diff --git a/src/main/java/com/minelittlepony/model/gear/IStackable.java b/src/client/java/com/minelittlepony/model/gear/IStackable.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/IStackable.java rename to src/client/java/com/minelittlepony/model/gear/IStackable.java diff --git a/src/main/java/com/minelittlepony/model/gear/Muffin.java b/src/client/java/com/minelittlepony/model/gear/Muffin.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/Muffin.java rename to src/client/java/com/minelittlepony/model/gear/Muffin.java diff --git a/src/main/java/com/minelittlepony/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/model/gear/SaddleBags.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/SaddleBags.java rename to src/client/java/com/minelittlepony/model/gear/SaddleBags.java diff --git a/src/main/java/com/minelittlepony/model/gear/Stetson.java b/src/client/java/com/minelittlepony/model/gear/Stetson.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/Stetson.java rename to src/client/java/com/minelittlepony/model/gear/Stetson.java diff --git a/src/main/java/com/minelittlepony/model/gear/WitchHat.java b/src/client/java/com/minelittlepony/model/gear/WitchHat.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/WitchHat.java rename to src/client/java/com/minelittlepony/model/gear/WitchHat.java diff --git a/src/main/java/com/minelittlepony/model/package-info.java b/src/client/java/com/minelittlepony/model/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/package-info.java rename to src/client/java/com/minelittlepony/model/package-info.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/client/java/com/minelittlepony/model/player/ModelAlicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelAlicorn.java rename to src/client/java/com/minelittlepony/model/player/ModelAlicorn.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelBatpony.java b/src/client/java/com/minelittlepony/model/player/ModelBatpony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelBatpony.java rename to src/client/java/com/minelittlepony/model/player/ModelBatpony.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelChangeling.java b/src/client/java/com/minelittlepony/model/player/ModelChangeling.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelChangeling.java rename to src/client/java/com/minelittlepony/model/player/ModelChangeling.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelEarthPony.java b/src/client/java/com/minelittlepony/model/player/ModelEarthPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelEarthPony.java rename to src/client/java/com/minelittlepony/model/player/ModelEarthPony.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelPegasus.java b/src/client/java/com/minelittlepony/model/player/ModelPegasus.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelPegasus.java rename to src/client/java/com/minelittlepony/model/player/ModelPegasus.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java b/src/client/java/com/minelittlepony/model/player/ModelUnicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelUnicorn.java rename to src/client/java/com/minelittlepony/model/player/ModelUnicorn.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelZebra.java b/src/client/java/com/minelittlepony/model/player/ModelZebra.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelZebra.java rename to src/client/java/com/minelittlepony/model/player/ModelZebra.java diff --git a/src/main/java/com/minelittlepony/model/player/PlayerModels.java b/src/client/java/com/minelittlepony/model/player/PlayerModels.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/PlayerModels.java rename to src/client/java/com/minelittlepony/model/player/PlayerModels.java diff --git a/src/main/java/com/minelittlepony/model/player/package-info.java b/src/client/java/com/minelittlepony/model/player/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/package-info.java rename to src/client/java/com/minelittlepony/model/player/package-info.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelBreezie.java b/src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelBreezie.java rename to src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java b/src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java rename to src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelIllagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelIllagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java b/src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/package-info.java b/src/client/java/com/minelittlepony/model/ponies/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/package-info.java rename to src/client/java/com/minelittlepony/model/ponies/package-info.java diff --git a/src/main/java/com/minelittlepony/package-info.java b/src/client/java/com/minelittlepony/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/package-info.java rename to src/client/java/com/minelittlepony/package-info.java diff --git a/src/main/java/com/minelittlepony/pony/data/Pony.java b/src/client/java/com/minelittlepony/pony/data/Pony.java similarity index 99% rename from src/main/java/com/minelittlepony/pony/data/Pony.java rename to src/client/java/com/minelittlepony/pony/data/Pony.java index e70a15d9..bd4edd36 100644 --- a/src/main/java/com/minelittlepony/pony/data/Pony.java +++ b/src/client/java/com/minelittlepony/pony/data/Pony.java @@ -231,7 +231,7 @@ public class Pony extends Touchable implements IPony { return new AxisAlignedBB( - width, (entity.height * scale), -width, - width, 0, width).offset(pos); + width, 0, width).offset(pos); } @Override diff --git a/src/main/java/com/minelittlepony/pony/data/PonyData.java b/src/client/java/com/minelittlepony/pony/data/PonyData.java similarity index 95% rename from src/main/java/com/minelittlepony/pony/data/PonyData.java rename to src/client/java/com/minelittlepony/pony/data/PonyData.java index a8059de0..3582a845 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyData.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyData.java @@ -1,5 +1,7 @@ package com.minelittlepony.pony.data; +import net.minecraft.client.resources.data.IMetadataSection; + import com.google.common.base.MoreObjects; import com.minelittlepony.model.anim.BasicEasingInterpolator; import com.minelittlepony.model.anim.IInterpolator; @@ -15,7 +17,7 @@ import javax.annotation.concurrent.Immutable; * */ @Immutable -public class PonyData implements IPonyData { +public class PonyData implements IPonyData, IMetadataSection { private final PonyRace race; private final TailLengths tailSize; private final PonyGender gender; diff --git a/src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java b/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java similarity index 97% rename from src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java rename to src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java index 2397c129..0083e9c2 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java @@ -7,7 +7,7 @@ import net.minecraft.client.resources.data.IMetadataSectionSerializer; import java.lang.reflect.Type; -public class PonyDataSerialiser implements IMetadataSectionSerializer { +public class PonyDataSerialiser implements IMetadataSectionSerializer { public static final String NAME = "pony"; diff --git a/src/main/java/com/minelittlepony/pony/data/PonyManager.java b/src/client/java/com/minelittlepony/pony/data/PonyManager.java similarity index 99% rename from src/main/java/com/minelittlepony/pony/data/PonyManager.java rename to src/client/java/com/minelittlepony/pony/data/PonyManager.java index 27661205..139d44bf 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyManager.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyManager.java @@ -46,7 +46,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl */ private List backgroundPonyList = Lists.newArrayList(); - private PonyConfig config; + private final PonyConfig config; private final ChronicCache poniesCache = new ChronicCache<>(); diff --git a/src/main/java/com/minelittlepony/pony/data/PonyRace.java b/src/client/java/com/minelittlepony/pony/data/PonyRace.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyRace.java rename to src/client/java/com/minelittlepony/pony/data/PonyRace.java diff --git a/src/main/java/com/minelittlepony/pony/data/package-info.java b/src/client/java/com/minelittlepony/pony/data/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/package-info.java rename to src/client/java/com/minelittlepony/pony/data/package-info.java diff --git a/src/main/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java rename to src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java diff --git a/src/main/java/com/minelittlepony/render/FrustrumCheck.java b/src/client/java/com/minelittlepony/render/FrustrumCheck.java similarity index 100% rename from src/main/java/com/minelittlepony/render/FrustrumCheck.java rename to src/client/java/com/minelittlepony/render/FrustrumCheck.java diff --git a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java rename to src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java diff --git a/src/main/java/com/minelittlepony/render/RenderPony.java b/src/client/java/com/minelittlepony/render/RenderPony.java similarity index 100% rename from src/main/java/com/minelittlepony/render/RenderPony.java rename to src/client/java/com/minelittlepony/render/RenderPony.java diff --git a/src/main/java/com/minelittlepony/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/render/RenderPonyMob.java similarity index 100% rename from src/main/java/com/minelittlepony/render/RenderPonyMob.java rename to src/client/java/com/minelittlepony/render/RenderPonyMob.java diff --git a/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java b/src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java rename to src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerDJPon3Head.java rename to src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java rename to src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerEyeGlow.java b/src/client/java/com/minelittlepony/render/layer/LayerEyeGlow.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerEyeGlow.java rename to src/client/java/com/minelittlepony/render/layer/LayerEyeGlow.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/render/layer/LayerGear.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerGear.java rename to src/client/java/com/minelittlepony/render/layer/LayerGear.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java b/src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java rename to src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java similarity index 70% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java index 4157f177..c60395eb 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java @@ -2,11 +2,11 @@ package com.minelittlepony.render.layer; import com.minelittlepony.ForgeProxy; import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.armour.IEquestrianArmor; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; -import com.minelittlepony.model.armour.IArmorTextureResolver; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.ArmourLayer; import com.minelittlepony.model.armour.DefaultPonyArmorTextureResolver; -import com.minelittlepony.model.capabilities.IModelArmor; +import com.minelittlepony.model.capabilities.IModelArmour; import com.minelittlepony.util.render.Color; import net.minecraft.client.model.ModelBase; @@ -24,7 +24,7 @@ import net.minecraft.util.ResourceLocation; public class LayerPonyArmor extends AbstractPonyLayer { - private static final IArmorTextureResolver textures = new DefaultPonyArmorTextureResolver<>(); + private static final IArmourTextureResolver textures = new DefaultPonyArmorTextureResolver<>(); private ModelWrapper pony; @@ -38,13 +38,13 @@ public class LayerPonyArmor extends AbstractPonyLaye for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) { if (i.getSlotType() == Type.ARMOR) { - renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmorLayer.INNER); - renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmorLayer.OUTER); + renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmourLayer.INNER); + renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmourLayer.OUTER); } } } - private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmorLayer layer) { + private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmourLayer layer) { ItemStack itemstack = entity.getItemStackFromSlot(armorSlot); if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) { @@ -59,9 +59,9 @@ public class LayerPonyArmor extends AbstractPonyLaye armour.synchroniseLegs(pony.getBody()); @SuppressWarnings("unchecked") - IArmorTextureResolver resolver = armour instanceof IArmorTextureResolver ? (IArmorTextureResolver)armour : (IArmorTextureResolver)textures; + IArmourTextureResolver resolver = armour instanceof IArmourTextureResolver ? (IArmourTextureResolver)armour : (IArmourTextureResolver)textures; - ResourceLocation armourTexture = resolver.getArmorTexture(entity, itemstack, armorSlot, layer, null); + ResourceLocation armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, null); getRenderer().bindTexture(armourTexture); @@ -70,7 +70,7 @@ public class LayerPonyArmor extends AbstractPonyLaye if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) { Color.glColor(itemarmor.getColor(itemstack), 1); armour.render(entity, move, swing, ticks, headYaw, headPitch, scale); - armourTexture = resolver.getArmorTexture(entity, itemstack, armorSlot, layer, "overlay"); + armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, "overlay"); getRenderer().bindTexture(armourTexture); } @@ -85,15 +85,15 @@ public class LayerPonyArmor extends AbstractPonyLaye } @SuppressWarnings("unchecked") - private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, V def) { + private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, V def) { ModelBase model = ForgeProxy.getArmorModel(entity, itemstack, slot, def); - if (model instanceof IModelArmor) { + if (model instanceof IModelArmour) { return (V)model; } - if (model instanceof IEquestrianArmor) { - return ((IEquestrianArmor) model).getArmorForLayer(layer); + if (model instanceof IEquestrianArmour) { + return ((IEquestrianArmour) model).getArmorForLayer(layer); } return def; diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java diff --git a/src/main/java/com/minelittlepony/render/layer/package-info.java b/src/client/java/com/minelittlepony/render/layer/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/package-info.java rename to src/client/java/com/minelittlepony/render/layer/package-info.java diff --git a/src/main/java/com/minelittlepony/render/model/GlowRenderer.java b/src/client/java/com/minelittlepony/render/model/GlowRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/GlowRenderer.java rename to src/client/java/com/minelittlepony/render/model/GlowRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/ModelGlow.java b/src/client/java/com/minelittlepony/render/model/ModelGlow.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/ModelGlow.java rename to src/client/java/com/minelittlepony/render/model/ModelGlow.java diff --git a/src/main/java/com/minelittlepony/render/model/ModelPlane.java b/src/client/java/com/minelittlepony/render/model/ModelPlane.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/ModelPlane.java rename to src/client/java/com/minelittlepony/render/model/ModelPlane.java diff --git a/src/main/java/com/minelittlepony/render/model/Plane.java b/src/client/java/com/minelittlepony/render/model/Plane.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/Plane.java rename to src/client/java/com/minelittlepony/render/model/Plane.java diff --git a/src/main/java/com/minelittlepony/render/model/PlaneRenderer.java b/src/client/java/com/minelittlepony/render/model/PlaneRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/PlaneRenderer.java rename to src/client/java/com/minelittlepony/render/model/PlaneRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/PonyRenderer.java b/src/client/java/com/minelittlepony/render/model/PonyRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/PonyRenderer.java rename to src/client/java/com/minelittlepony/render/model/PonyRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/package-info.java b/src/client/java/com/minelittlepony/render/model/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/package-info.java rename to src/client/java/com/minelittlepony/render/model/package-info.java diff --git a/src/main/java/com/minelittlepony/render/package-info.java b/src/client/java/com/minelittlepony/render/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/package-info.java rename to src/client/java/com/minelittlepony/render/package-info.java diff --git a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java rename to src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java diff --git a/src/main/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java rename to src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java diff --git a/src/main/java/com/minelittlepony/render/player/package-info.java b/src/client/java/com/minelittlepony/render/player/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/package-info.java rename to src/client/java/com/minelittlepony/render/player/package-info.java diff --git a/src/main/java/com/minelittlepony/render/ponies/MobRenderers.java b/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/MobRenderers.java rename to src/client/java/com/minelittlepony/render/ponies/MobRenderers.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderEnderStallion.java b/src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderEnderStallion.java rename to src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyIllager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyIllager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyPigman.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyPigman.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVex.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyVex.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyWitch.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyWitch.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyZombie.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyZombie.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java b/src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java rename to src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java diff --git a/src/main/java/com/minelittlepony/render/ponies/package-info.java b/src/client/java/com/minelittlepony/render/ponies/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/package-info.java rename to src/client/java/com/minelittlepony/render/ponies/package-info.java diff --git a/src/main/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/PonySkull.java b/src/client/java/com/minelittlepony/render/skull/PonySkull.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/PonySkull.java rename to src/client/java/com/minelittlepony/render/skull/PonySkull.java diff --git a/src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java similarity index 99% rename from src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java index 08d8dfd9..791aefa5 100644 --- a/src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java @@ -162,7 +162,6 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende */ public interface ISkull { - void preRender(boolean transparency); void render(float animateTicks, float rotation, float scale); diff --git a/src/main/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/WitherSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/WitherSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/package-info.java b/src/client/java/com/minelittlepony/render/skull/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/package-info.java rename to src/client/java/com/minelittlepony/render/skull/package-info.java diff --git a/src/main/java/com/minelittlepony/transform/PonyPosture.java b/src/client/java/com/minelittlepony/transform/PonyPosture.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PonyPosture.java rename to src/client/java/com/minelittlepony/transform/PonyPosture.java diff --git a/src/main/java/com/minelittlepony/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/transform/PonyTransformation.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PonyTransformation.java rename to src/client/java/com/minelittlepony/transform/PonyTransformation.java diff --git a/src/main/java/com/minelittlepony/transform/PostureElytra.java b/src/client/java/com/minelittlepony/transform/PostureElytra.java similarity index 91% rename from src/main/java/com/minelittlepony/transform/PostureElytra.java rename to src/client/java/com/minelittlepony/transform/PostureElytra.java index 7314c582..68769224 100644 --- a/src/main/java/com/minelittlepony/transform/PostureElytra.java +++ b/src/client/java/com/minelittlepony/transform/PostureElytra.java @@ -1,6 +1,5 @@ package com.minelittlepony.transform; -import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.capabilities.IModel; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/minelittlepony/transform/PostureFalling.java b/src/client/java/com/minelittlepony/transform/PostureFalling.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureFalling.java rename to src/client/java/com/minelittlepony/transform/PostureFalling.java diff --git a/src/main/java/com/minelittlepony/transform/PostureFlight.java b/src/client/java/com/minelittlepony/transform/PostureFlight.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureFlight.java rename to src/client/java/com/minelittlepony/transform/PostureFlight.java diff --git a/src/main/java/com/minelittlepony/transform/PostureSwimming.java b/src/client/java/com/minelittlepony/transform/PostureSwimming.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureSwimming.java rename to src/client/java/com/minelittlepony/transform/PostureSwimming.java diff --git a/src/main/java/com/minelittlepony/transform/package-info.java b/src/client/java/com/minelittlepony/transform/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/package-info.java rename to src/client/java/com/minelittlepony/transform/package-info.java diff --git a/src/main/java/com/minelittlepony/util/render/AbstractBoxRenderer.java b/src/client/java/com/minelittlepony/util/render/AbstractBoxRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/AbstractBoxRenderer.java rename to src/client/java/com/minelittlepony/util/render/AbstractBoxRenderer.java diff --git a/src/main/java/com/minelittlepony/util/render/Box.java b/src/client/java/com/minelittlepony/util/render/Box.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Box.java rename to src/client/java/com/minelittlepony/util/render/Box.java diff --git a/src/main/java/com/minelittlepony/util/render/Color.java b/src/client/java/com/minelittlepony/util/render/Color.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Color.java rename to src/client/java/com/minelittlepony/util/render/Color.java diff --git a/src/main/java/com/minelittlepony/util/render/Quad.java b/src/client/java/com/minelittlepony/util/render/Quad.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Quad.java rename to src/client/java/com/minelittlepony/util/render/Quad.java diff --git a/src/main/java/com/minelittlepony/util/render/Vertex.java b/src/client/java/com/minelittlepony/util/render/Vertex.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Vertex.java rename to src/client/java/com/minelittlepony/util/render/Vertex.java diff --git a/src/main/java/com/minelittlepony/util/render/package-info.java b/src/client/java/com/minelittlepony/util/render/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/package-info.java rename to src/client/java/com/minelittlepony/util/render/package-info.java diff --git a/src/main/java/com/minelittlepony/MissingRendererException.java b/src/common/java/com/minelittlepony/MissingRendererException.java similarity index 100% rename from src/main/java/com/minelittlepony/MissingRendererException.java rename to src/common/java/com/minelittlepony/MissingRendererException.java diff --git a/src/main/java/com/minelittlepony/PonyConfig.java b/src/common/java/com/minelittlepony/PonyConfig.java similarity index 88% rename from src/main/java/com/minelittlepony/PonyConfig.java rename to src/common/java/com/minelittlepony/PonyConfig.java index efa6dd23..d17f66be 100644 --- a/src/main/java/com/minelittlepony/PonyConfig.java +++ b/src/common/java/com/minelittlepony/PonyConfig.java @@ -5,16 +5,13 @@ import net.minecraft.util.math.MathHelper; import com.google.gson.annotations.Expose; import com.minelittlepony.pony.data.PonyLevel; import com.minelittlepony.settings.SensibleConfig; -import com.mumfrey.liteloader.modconfig.ConfigStrategy; -import com.mumfrey.liteloader.modconfig.Exposable; -import com.mumfrey.liteloader.modconfig.ExposableOptions; + import com.voxelmodpack.hdskins.HDSkinManager; /** * Storage container for MineLP client settings. */ -@ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) -public class PonyConfig extends SensibleConfig implements Exposable { +public abstract class PonyConfig extends SensibleConfig { @Expose private PonyLevel ponylevel = PonyLevel.PONIES; diff --git a/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java b/src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java rename to src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java diff --git a/src/main/java/com/minelittlepony/model/BodyPart.java b/src/common/java/com/minelittlepony/model/BodyPart.java similarity index 100% rename from src/main/java/com/minelittlepony/model/BodyPart.java rename to src/common/java/com/minelittlepony/model/BodyPart.java diff --git a/src/main/java/com/minelittlepony/model/PonyModelConstants.java b/src/common/java/com/minelittlepony/model/PonyModelConstants.java similarity index 100% rename from src/main/java/com/minelittlepony/model/PonyModelConstants.java rename to src/common/java/com/minelittlepony/model/PonyModelConstants.java diff --git a/src/main/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java b/src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java rename to src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java diff --git a/src/main/java/com/minelittlepony/model/anim/IInterpolator.java b/src/common/java/com/minelittlepony/model/anim/IInterpolator.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/IInterpolator.java rename to src/common/java/com/minelittlepony/model/anim/IInterpolator.java diff --git a/src/main/java/com/minelittlepony/model/anim/package-info.java b/src/common/java/com/minelittlepony/model/anim/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/package-info.java rename to src/common/java/com/minelittlepony/model/anim/package-info.java diff --git a/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java new file mode 100644 index 00000000..c12457d4 --- /dev/null +++ b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java @@ -0,0 +1,15 @@ +package com.minelittlepony.model.armour; + +/** + * The layer used to render a given armour piece. + */ +public enum ArmourLayer { + /** + * Fits snugly to the player's model. + */ + INNER, + /** + * Hanging loose and sagging free + */ + OUTER +} \ No newline at end of file diff --git a/src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java similarity index 57% rename from src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java rename to src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java index 0e84ca88..800a1be9 100644 --- a/src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java @@ -5,14 +5,12 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; - import javax.annotation.Nullable; -public interface IArmorTextureResolver { +public interface IArmourTextureResolver { /** * Gets the armour texture to be used for the given entity, armour piece, slot, and render layer. */ - ResourceLocation getArmorTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, @Nullable String type); + ResourceLocation getArmourTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, @Nullable String type); } diff --git a/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java new file mode 100644 index 00000000..981f8c9c --- /dev/null +++ b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java @@ -0,0 +1,11 @@ +package com.minelittlepony.model.armour; + +import com.minelittlepony.model.capabilities.IModelArmour; +import com.minelittlepony.model.capabilities.IModelWrapper; + +public interface IEquestrianArmour extends IModelWrapper { + /** + * Gets the armour model to render for the given layer. + */ + V getArmorForLayer(ArmourLayer layer); +} diff --git a/src/main/java/com/minelittlepony/model/armour/package-info.java b/src/common/java/com/minelittlepony/model/armour/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/armour/package-info.java rename to src/common/java/com/minelittlepony/model/armour/package-info.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java rename to src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java diff --git a/src/main/java/com/minelittlepony/pony/data/IPony.java b/src/common/java/com/minelittlepony/pony/data/IPony.java similarity index 91% rename from src/main/java/com/minelittlepony/pony/data/IPony.java rename to src/common/java/com/minelittlepony/pony/data/IPony.java index 54e6123f..3f560051 100644 --- a/src/main/java/com/minelittlepony/pony/data/IPony.java +++ b/src/common/java/com/minelittlepony/pony/data/IPony.java @@ -1,6 +1,5 @@ package com.minelittlepony.pony.data; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -9,13 +8,6 @@ import net.minecraft.util.math.Vec3d; import com.minelittlepony.MineLittlePony; public interface IPony { - /** - * Gets or creates a new pony associated with the provided player. - * The results of this method should not be cached. - */ - static IPony forPlayer(AbstractClientPlayer player) { - return MineLittlePony.getInstance().getManager().getPony(player); - } /** * Gets or creates a new pony associated with the provided resource location. diff --git a/src/main/java/com/minelittlepony/pony/data/IPonyData.java b/src/common/java/com/minelittlepony/pony/data/IPonyData.java similarity index 89% rename from src/main/java/com/minelittlepony/pony/data/IPonyData.java rename to src/common/java/com/minelittlepony/pony/data/IPonyData.java index 317deb5e..6dc10227 100644 --- a/src/main/java/com/minelittlepony/pony/data/IPonyData.java +++ b/src/common/java/com/minelittlepony/pony/data/IPonyData.java @@ -4,12 +4,10 @@ import com.minelittlepony.model.anim.IInterpolator; import java.util.UUID; -import net.minecraft.client.resources.data.IMetadataSection; - /** * Metadata for a pony. */ -public interface IPonyData extends IMetadataSection { +public interface IPonyData { /** * Gets this pony's race. */ diff --git a/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java b/src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java rename to src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyGender.java b/src/common/java/com/minelittlepony/pony/data/PonyGender.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyGender.java rename to src/common/java/com/minelittlepony/pony/data/PonyGender.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyLevel.java b/src/common/java/com/minelittlepony/pony/data/PonyLevel.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyLevel.java rename to src/common/java/com/minelittlepony/pony/data/PonyLevel.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonySize.java b/src/common/java/com/minelittlepony/pony/data/PonySize.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonySize.java rename to src/common/java/com/minelittlepony/pony/data/PonySize.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyWearable.java b/src/common/java/com/minelittlepony/pony/data/PonyWearable.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyWearable.java rename to src/common/java/com/minelittlepony/pony/data/PonyWearable.java diff --git a/src/main/java/com/minelittlepony/pony/data/TailLengths.java b/src/common/java/com/minelittlepony/pony/data/TailLengths.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/TailLengths.java rename to src/common/java/com/minelittlepony/pony/data/TailLengths.java diff --git a/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java b/src/common/java/com/minelittlepony/pony/data/TriggerPixels.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/TriggerPixels.java rename to src/common/java/com/minelittlepony/pony/data/TriggerPixels.java diff --git a/src/main/java/com/minelittlepony/settings/SensibleConfig.java b/src/common/java/com/minelittlepony/settings/SensibleConfig.java similarity index 92% rename from src/main/java/com/minelittlepony/settings/SensibleConfig.java rename to src/common/java/com/minelittlepony/settings/SensibleConfig.java index d3210663..c8bdb91f 100644 --- a/src/main/java/com/minelittlepony/settings/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/settings/SensibleConfig.java @@ -3,7 +3,7 @@ package com.minelittlepony.settings; import com.minelittlepony.gui.IGuiCallback; /** - * A sensible config container that actually lets us programatically index values by a key. + * A sensible config container that actually lets us programmatically index values by a key. * * Reflection because Mumfrey pls. * @@ -17,6 +17,8 @@ public abstract class SensibleConfig { instance = this; } + public abstract void save(); + public interface Setting extends IGuiCallback { String name(); @@ -27,7 +29,6 @@ public abstract class SensibleConfig { return instance.getValue(this); } - /** * Sets the config value associated with this entry. */ diff --git a/src/main/java/com/minelittlepony/transform/MotionCompositor.java b/src/common/java/com/minelittlepony/transform/MotionCompositor.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/MotionCompositor.java rename to src/common/java/com/minelittlepony/transform/MotionCompositor.java diff --git a/src/main/java/com/minelittlepony/util/chron/ChronicCache.java b/src/common/java/com/minelittlepony/util/chron/ChronicCache.java similarity index 100% rename from src/main/java/com/minelittlepony/util/chron/ChronicCache.java rename to src/common/java/com/minelittlepony/util/chron/ChronicCache.java diff --git a/src/main/java/com/minelittlepony/util/chron/Touchable.java b/src/common/java/com/minelittlepony/util/chron/Touchable.java similarity index 100% rename from src/main/java/com/minelittlepony/util/chron/Touchable.java rename to src/common/java/com/minelittlepony/util/chron/Touchable.java diff --git a/src/main/java/com/minelittlepony/util/math/MathUtil.java b/src/common/java/com/minelittlepony/util/math/MathUtil.java similarity index 100% rename from src/main/java/com/minelittlepony/util/math/MathUtil.java rename to src/common/java/com/minelittlepony/util/math/MathUtil.java diff --git a/src/main/java/com/minelittlepony/util/math/package-info.java b/src/common/java/com/minelittlepony/util/math/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/util/math/package-info.java rename to src/common/java/com/minelittlepony/util/math/package-info.java diff --git a/src/main/java/com/minelittlepony/util/render/FormattedTextureSupplier.java b/src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/FormattedTextureSupplier.java rename to src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java diff --git a/src/main/java/com/minelittlepony/util/render/ITextureSupplier.java b/src/common/java/com/minelittlepony/util/render/ITextureSupplier.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/ITextureSupplier.java rename to src/common/java/com/minelittlepony/util/render/ITextureSupplier.java diff --git a/src/main/java/com/minelittlepony/util/render/IntStringMapper.java b/src/common/java/com/minelittlepony/util/render/IntStringMapper.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/IntStringMapper.java rename to src/common/java/com/minelittlepony/util/render/IntStringMapper.java diff --git a/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java b/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java deleted file mode 100644 index 44df57f0..00000000 --- a/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.minelittlepony.model.armour; - -import net.minecraft.client.model.ModelBiped; - -import com.minelittlepony.model.capabilities.IModelArmor; -import com.minelittlepony.model.capabilities.IModelWrapper; - -public interface IEquestrianArmor extends IModelWrapper { - /** - * Gets the armour model to render for the given layer. - */ - V getArmorForLayer(ArmorLayer layer); - - /** - * The layer used to render a given armour piece. - */ - enum ArmorLayer { - /** - * Fits snugly to the player's model. - */ - INNER, - /** - * Hanging loose and sagging free - */ - OUTER - } -}