diff --git a/src/main/java/com/brohoof/minelittlepony/ducks/IRenderPony.java b/src/main/java/com/brohoof/minelittlepony/ducks/IRenderPony.java deleted file mode 100644 index e8216d02..00000000 --- a/src/main/java/com/brohoof/minelittlepony/ducks/IRenderPony.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.brohoof.minelittlepony.ducks; - -import com.brohoof.minelittlepony.model.PlayerModel; - -public interface IRenderPony { - - PlayerModel getPony(); -} diff --git a/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java b/src/main/java/com/minelittlepony/LiteModMineLittlePony.java similarity index 96% rename from src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java rename to src/main/java/com/minelittlepony/LiteModMineLittlePony.java index 1a18c290..60cc07c7 100644 --- a/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java +++ b/src/main/java/com/minelittlepony/LiteModMineLittlePony.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import java.io.File; diff --git a/src/main/java/com/brohoof/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java similarity index 88% rename from src/main/java/com/brohoof/minelittlepony/MineLittlePony.java rename to src/main/java/com/minelittlepony/MineLittlePony.java index acacd334..ec4d61e4 100644 --- a/src/main/java/com/brohoof/minelittlepony/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/MineLittlePony.java @@ -1,17 +1,17 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import org.lwjgl.input.Keyboard; -import com.brohoof.minelittlepony.gui.PonySettingPanel; -import com.brohoof.minelittlepony.hdskins.gui.EntityPonyModel; -import com.brohoof.minelittlepony.hdskins.gui.GuiSkinsMineLP; -import com.brohoof.minelittlepony.hdskins.gui.RenderPonyModel; -import com.brohoof.minelittlepony.renderer.RenderPonyPigman; -import com.brohoof.minelittlepony.renderer.RenderPonySkeleton; -import com.brohoof.minelittlepony.renderer.RenderPonyVillager; -import com.brohoof.minelittlepony.renderer.RenderPonyZombie; -import com.brohoof.minelittlepony.renderer.RenderPonyZombieVillager; -import com.brohoof.minelittlepony.util.MineLPLogger; +import com.minelittlepony.gui.PonySettingPanel; +import com.minelittlepony.hdskins.gui.EntityPonyModel; +import com.minelittlepony.hdskins.gui.GuiSkinsMineLP; +import com.minelittlepony.hdskins.gui.RenderPonyModel; +import com.minelittlepony.renderer.RenderPonyPigman; +import com.minelittlepony.renderer.RenderPonySkeleton; +import com.minelittlepony.renderer.RenderPonyVillager; +import com.minelittlepony.renderer.RenderPonyZombie; +import com.minelittlepony.renderer.RenderPonyZombieVillager; +import com.minelittlepony.util.MineLPLogger; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.util.ModUtilities; import com.voxelmodpack.hdskins.HDSkinManager; diff --git a/src/main/java/com/brohoof/minelittlepony/Pony.java b/src/main/java/com/minelittlepony/Pony.java similarity index 96% rename from src/main/java/com/brohoof/minelittlepony/Pony.java rename to src/main/java/com/minelittlepony/Pony.java index 1bc56121..bf1a6191 100644 --- a/src/main/java/com/brohoof/minelittlepony/Pony.java +++ b/src/main/java/com/minelittlepony/Pony.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import java.awt.image.BufferedImage; import java.io.IOException; @@ -6,14 +6,14 @@ import java.util.List; import javax.annotation.Nonnull; -import com.brohoof.minelittlepony.model.PMAPI; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.util.MineLPLogger; -import com.brohoof.minelittlepony.util.PonyFields; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Splitter; import com.google.common.collect.Lists; +import com.minelittlepony.model.PMAPI; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.util.MineLPLogger; +import com.minelittlepony.util.PonyFields; import com.mojang.authlib.GameProfile; import com.mumfrey.webprefs.WebPreferencesManager; import com.mumfrey.webprefs.interfaces.IWebPreferences; diff --git a/src/main/java/com/brohoof/minelittlepony/PonyConfig.java b/src/main/java/com/minelittlepony/PonyConfig.java similarity index 96% rename from src/main/java/com/brohoof/minelittlepony/PonyConfig.java rename to src/main/java/com/minelittlepony/PonyConfig.java index e0564c5a..94276322 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyConfig.java +++ b/src/main/java/com/minelittlepony/PonyConfig.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import com.google.gson.annotations.Expose; import com.mumfrey.liteloader.modconfig.ConfigStrategy; diff --git a/src/main/java/com/brohoof/minelittlepony/PonyData.java b/src/main/java/com/minelittlepony/PonyData.java similarity index 99% rename from src/main/java/com/brohoof/minelittlepony/PonyData.java rename to src/main/java/com/minelittlepony/PonyData.java index 253f4f28..e4fd04ee 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyData.java +++ b/src/main/java/com/minelittlepony/PonyData.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import java.awt.image.BufferedImage; import java.util.Map; diff --git a/src/main/java/com/brohoof/minelittlepony/PonyGender.java b/src/main/java/com/minelittlepony/PonyGender.java similarity index 58% rename from src/main/java/com/brohoof/minelittlepony/PonyGender.java rename to src/main/java/com/minelittlepony/PonyGender.java index fb2bfe79..060295f3 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyGender.java +++ b/src/main/java/com/minelittlepony/PonyGender.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; public enum PonyGender { MARE, diff --git a/src/main/java/com/brohoof/minelittlepony/PonyLevel.java b/src/main/java/com/minelittlepony/PonyLevel.java similarity index 63% rename from src/main/java/com/brohoof/minelittlepony/PonyLevel.java rename to src/main/java/com/minelittlepony/PonyLevel.java index 5aaa3f69..6b9b8edb 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyLevel.java +++ b/src/main/java/com/minelittlepony/PonyLevel.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; public enum PonyLevel { diff --git a/src/main/java/com/brohoof/minelittlepony/PonyManager.java b/src/main/java/com/minelittlepony/PonyManager.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/PonyManager.java rename to src/main/java/com/minelittlepony/PonyManager.java index 11ad14ab..13057c2f 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyManager.java +++ b/src/main/java/com/minelittlepony/PonyManager.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import java.io.IOException; import java.io.InputStream; @@ -9,13 +9,13 @@ import java.util.UUID; import org.apache.commons.compress.utils.IOUtils; -import com.brohoof.minelittlepony.model.PMAPI; -import com.brohoof.minelittlepony.util.MineLPLogger; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonParseException; +import com.minelittlepony.model.PMAPI; +import com.minelittlepony.util.MineLPLogger; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.resources.IResource; diff --git a/src/main/java/com/brohoof/minelittlepony/PonyRace.java b/src/main/java/com/minelittlepony/PonyRace.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/PonyRace.java rename to src/main/java/com/minelittlepony/PonyRace.java index 32b620bd..cf2f9d22 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyRace.java +++ b/src/main/java/com/minelittlepony/PonyRace.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; public enum PonyRace { EARTH(false, false), diff --git a/src/main/java/com/brohoof/minelittlepony/PonySize.java b/src/main/java/com/minelittlepony/PonySize.java similarity index 65% rename from src/main/java/com/brohoof/minelittlepony/PonySize.java rename to src/main/java/com/minelittlepony/PonySize.java index 4d2e0979..9ac55246 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonySize.java +++ b/src/main/java/com/minelittlepony/PonySize.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; public enum PonySize { NORMAL, diff --git a/src/main/java/com/brohoof/minelittlepony/PonySkinModifier.java b/src/main/java/com/minelittlepony/PonySkinModifier.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/PonySkinModifier.java rename to src/main/java/com/minelittlepony/PonySkinModifier.java index eb3f0153..70af9972 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonySkinModifier.java +++ b/src/main/java/com/minelittlepony/PonySkinModifier.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; import java.awt.Graphics; import java.awt.Image; diff --git a/src/main/java/com/brohoof/minelittlepony/ProxyContainer.java b/src/main/java/com/minelittlepony/ProxyContainer.java similarity index 65% rename from src/main/java/com/brohoof/minelittlepony/ProxyContainer.java rename to src/main/java/com/minelittlepony/ProxyContainer.java index 0637f2e7..8e565a7d 100644 --- a/src/main/java/com/brohoof/minelittlepony/ProxyContainer.java +++ b/src/main/java/com/minelittlepony/ProxyContainer.java @@ -1,7 +1,7 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; -import com.brohoof.minelittlepony.forge.IPonyArmor; -import com.brohoof.minelittlepony.forge.MLPCommonProxy; +import com.minelittlepony.forge.IPonyArmor; +import com.minelittlepony.forge.MLPCommonProxy; public class ProxyContainer extends MLPCommonProxy { diff --git a/src/main/java/com/brohoof/minelittlepony/TailLengths.java b/src/main/java/com/minelittlepony/TailLengths.java similarity index 87% rename from src/main/java/com/brohoof/minelittlepony/TailLengths.java rename to src/main/java/com/minelittlepony/TailLengths.java index c0f39f89..d85138ac 100644 --- a/src/main/java/com/brohoof/minelittlepony/TailLengths.java +++ b/src/main/java/com/minelittlepony/TailLengths.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony; +package com.minelittlepony; public enum TailLengths { diff --git a/src/main/java/com/minelittlepony/ducks/IRenderPony.java b/src/main/java/com/minelittlepony/ducks/IRenderPony.java new file mode 100644 index 00000000..439a3268 --- /dev/null +++ b/src/main/java/com/minelittlepony/ducks/IRenderPony.java @@ -0,0 +1,8 @@ +package com.minelittlepony.ducks; + +import com.minelittlepony.model.PlayerModel; + +public interface IRenderPony { + + PlayerModel getPony(); +} diff --git a/src/main/java/com/brohoof/minelittlepony/forge/IPonyArmor.java b/src/main/java/com/minelittlepony/forge/IPonyArmor.java similarity index 89% rename from src/main/java/com/brohoof/minelittlepony/forge/IPonyArmor.java rename to src/main/java/com/minelittlepony/forge/IPonyArmor.java index 2a0003ea..c16caf6a 100644 --- a/src/main/java/com/brohoof/minelittlepony/forge/IPonyArmor.java +++ b/src/main/java/com/minelittlepony/forge/IPonyArmor.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.forge; +package com.minelittlepony.forge; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/forge/MLPCommonProxy.java b/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java similarity index 87% rename from src/main/java/com/brohoof/minelittlepony/forge/MLPCommonProxy.java rename to src/main/java/com/minelittlepony/forge/MLPCommonProxy.java index bfbcc997..40c9d20d 100644 --- a/src/main/java/com/brohoof/minelittlepony/forge/MLPCommonProxy.java +++ b/src/main/java/com/minelittlepony/forge/MLPCommonProxy.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.forge; +package com.minelittlepony.forge; public abstract class MLPCommonProxy { diff --git a/src/main/java/com/brohoof/minelittlepony/forge/MLPForge.java b/src/main/java/com/minelittlepony/forge/MLPForge.java similarity index 84% rename from src/main/java/com/brohoof/minelittlepony/forge/MLPForge.java rename to src/main/java/com/minelittlepony/forge/MLPForge.java index 876df4a4..63cacb65 100644 --- a/src/main/java/com/brohoof/minelittlepony/forge/MLPForge.java +++ b/src/main/java/com/minelittlepony/forge/MLPForge.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.forge; +package com.minelittlepony.forge; -import com.brohoof.minelittlepony.MineLittlePony; +import com.minelittlepony.MineLittlePony; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; diff --git a/src/main/java/com/brohoof/minelittlepony/forge/PonyArmors.java b/src/main/java/com/minelittlepony/forge/PonyArmors.java similarity index 93% rename from src/main/java/com/brohoof/minelittlepony/forge/PonyArmors.java rename to src/main/java/com/minelittlepony/forge/PonyArmors.java index 2623b2fc..f9cb3739 100644 --- a/src/main/java/com/brohoof/minelittlepony/forge/PonyArmors.java +++ b/src/main/java/com/minelittlepony/forge/PonyArmors.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.forge; +package com.minelittlepony.forge; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/gui/PonySettingPanel.java b/src/main/java/com/minelittlepony/gui/PonySettingPanel.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/gui/PonySettingPanel.java rename to src/main/java/com/minelittlepony/gui/PonySettingPanel.java index f7672e11..2ef71df0 100644 --- a/src/main/java/com/brohoof/minelittlepony/gui/PonySettingPanel.java +++ b/src/main/java/com/minelittlepony/gui/PonySettingPanel.java @@ -1,10 +1,10 @@ -package com.brohoof.minelittlepony.gui; +package com.minelittlepony.gui; import java.io.IOException; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.PonyConfig; -import com.brohoof.minelittlepony.PonyLevel; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyConfig; +import com.minelittlepony.PonyLevel; import com.mumfrey.liteloader.client.gui.GuiCheckbox; import com.mumfrey.liteloader.core.LiteLoader; diff --git a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java b/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java similarity index 83% rename from src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java rename to src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java index 28240f7e..d16fc047 100644 --- a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java +++ b/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.gui; import com.mojang.authlib.GameProfile; import com.voxelmodpack.hdskins.gui.EntityPlayerModel; diff --git a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java similarity index 82% rename from src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java rename to src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java index 6390f5c2..8d77402e 100644 --- a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java @@ -1,14 +1,14 @@ -package com.brohoof.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.gui; import java.awt.image.BufferedImage; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.PonyManager; -import com.brohoof.minelittlepony.PonyRace; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.TailLengths; -import com.brohoof.minelittlepony.util.MineLPLogger; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyGender; +import com.minelittlepony.PonyManager; +import com.minelittlepony.PonyRace; +import com.minelittlepony.PonySize; +import com.minelittlepony.TailLengths; +import com.minelittlepony.util.MineLPLogger; import com.mojang.authlib.GameProfile; import com.voxelmodpack.hdskins.gui.EntityPlayerModel; import com.voxelmodpack.hdskins.gui.GuiSkins; diff --git a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java similarity index 83% rename from src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java rename to src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java index b0551fd8..f0e2e92e 100644 --- a/src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java +++ b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java @@ -1,13 +1,13 @@ -package com.brohoof.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.gui; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.Pony; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.PonyRace; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.TailLengths; -import com.brohoof.minelittlepony.model.PlayerModel; import com.google.common.base.Optional; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.Pony; +import com.minelittlepony.PonyGender; +import com.minelittlepony.PonyRace; +import com.minelittlepony.PonySize; +import com.minelittlepony.TailLengths; +import com.minelittlepony.model.PlayerModel; import com.voxelmodpack.hdskins.gui.RenderPlayerModel; import net.minecraft.client.model.ModelPlayer; diff --git a/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java rename to src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java index 6bd492d5..c8e678c6 100644 --- a/src/main/java/com/brohoof/minelittlepony/mixin/MixinRenderPlayer.java +++ b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.mixin; +package com.minelittlepony.mixin; import static net.minecraft.client.renderer.GlStateManager.scale; @@ -11,19 +11,19 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.Pony; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.PMAPI; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; -import com.brohoof.minelittlepony.renderer.layer.LayerHeldPonyItem; -import com.brohoof.minelittlepony.renderer.layer.LayerPonyArmor; -import com.brohoof.minelittlepony.renderer.layer.LayerPonyCape; -import com.brohoof.minelittlepony.renderer.layer.LayerPonyElytra; -import com.brohoof.minelittlepony.renderer.layer.LayerPonySkull; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.Pony; +import com.minelittlepony.PonySize; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.PMAPI; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.renderer.layer.LayerHeldPonyItem; +import com.minelittlepony.renderer.layer.LayerPonyArmor; +import com.minelittlepony.renderer.layer.LayerPonyCape; +import com.minelittlepony.renderer.layer.LayerPonyElytra; +import com.minelittlepony.renderer.layer.LayerPonySkull; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelPlayer; diff --git a/src/main/java/com/brohoof/minelittlepony/model/AbstractArmor.java b/src/main/java/com/minelittlepony/model/AbstractArmor.java similarity index 82% rename from src/main/java/com/brohoof/minelittlepony/model/AbstractArmor.java rename to src/main/java/com/minelittlepony/model/AbstractArmor.java index 43a58d4c..c5d83bde 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/AbstractArmor.java +++ b/src/main/java/com/minelittlepony/model/AbstractArmor.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; -import com.brohoof.minelittlepony.PonyData; +import com.minelittlepony.PonyData; public abstract class AbstractArmor { diff --git a/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java rename to src/main/java/com/minelittlepony/model/AbstractPonyModel.java index 5e457915..5af3794d 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -1,17 +1,17 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; import static net.minecraft.client.renderer.GlStateManager.*; import java.util.List; import java.util.Random; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.model.part.IPonyPart; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; -import com.brohoof.minelittlepony.renderer.PlaneRenderer; import com.google.common.collect.Lists; +import com.minelittlepony.PonyData; +import com.minelittlepony.PonySize; +import com.minelittlepony.model.part.IPonyPart; +import com.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.renderer.PlaneRenderer; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/brohoof/minelittlepony/model/BodyPart.java b/src/main/java/com/minelittlepony/model/BodyPart.java similarity index 64% rename from src/main/java/com/brohoof/minelittlepony/model/BodyPart.java rename to src/main/java/com/minelittlepony/model/BodyPart.java index c3b03209..080c569d 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/BodyPart.java +++ b/src/main/java/com/minelittlepony/model/BodyPart.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; public enum BodyPart { HEAD, diff --git a/src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java b/src/main/java/com/minelittlepony/model/ModelHornGlow.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java rename to src/main/java/com/minelittlepony/model/ModelHornGlow.java index 44809c27..2ae81f03 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java +++ b/src/main/java/com/minelittlepony/model/ModelHornGlow.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; -import com.brohoof.minelittlepony.renderer.HornGlowRenderer; +import com.minelittlepony.renderer.HornGlowRenderer; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.PositionTextureVertex; diff --git a/src/main/java/com/brohoof/minelittlepony/model/ModelPlane.java b/src/main/java/com/minelittlepony/model/ModelPlane.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/model/ModelPlane.java rename to src/main/java/com/minelittlepony/model/ModelPlane.java index d8cfc386..ac1853bd 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/ModelPlane.java +++ b/src/main/java/com/minelittlepony/model/ModelPlane.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; -import com.brohoof.minelittlepony.renderer.PlaneRenderer; +import com.minelittlepony.renderer.PlaneRenderer; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.PositionTextureVertex; diff --git a/src/main/java/com/brohoof/minelittlepony/model/ModelPonyElytra.java b/src/main/java/com/minelittlepony/model/ModelPonyElytra.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/ModelPonyElytra.java rename to src/main/java/com/minelittlepony/model/ModelPonyElytra.java index 79727c4a..428404ce 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/ModelPonyElytra.java +++ b/src/main/java/com/minelittlepony/model/ModelPonyElytra.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/brohoof/minelittlepony/model/PMAPI.java b/src/main/java/com/minelittlepony/model/PMAPI.java similarity index 65% rename from src/main/java/com/brohoof/minelittlepony/model/PMAPI.java rename to src/main/java/com/minelittlepony/model/PMAPI.java index a7e10e0f..031d5ed1 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/PMAPI.java +++ b/src/main/java/com/minelittlepony/model/PMAPI.java @@ -1,16 +1,16 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; import java.lang.reflect.Field; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; -import com.brohoof.minelittlepony.model.pony.ModelSkeletonPony; -import com.brohoof.minelittlepony.model.pony.ModelVillagerPony; -import com.brohoof.minelittlepony.model.pony.ModelZombiePony; -import com.brohoof.minelittlepony.model.pony.armor.HumanArmors; -import com.brohoof.minelittlepony.model.pony.armor.PonyArmors; -import com.brohoof.minelittlepony.model.pony.armor.SkeletonPonyArmors; -import com.brohoof.minelittlepony.model.pony.armor.ZombiePonyArmors; +import com.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.model.pony.ModelSkeletonPony; +import com.minelittlepony.model.pony.ModelVillagerPony; +import com.minelittlepony.model.pony.ModelZombiePony; +import com.minelittlepony.model.pony.armor.HumanArmors; +import com.minelittlepony.model.pony.armor.PonyArmors; +import com.minelittlepony.model.pony.armor.SkeletonPonyArmors; +import com.minelittlepony.model.pony.armor.ZombiePonyArmors; public final class PMAPI { diff --git a/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java b/src/main/java/com/minelittlepony/model/PlayerModel.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java rename to src/main/java/com/minelittlepony/model/PlayerModel.java index 77d11e64..a4e9c566 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java +++ b/src/main/java/com/minelittlepony/model/PlayerModel.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; -import com.brohoof.minelittlepony.PonyData; +import com.minelittlepony.PonyData; public class PlayerModel { diff --git a/src/main/java/com/brohoof/minelittlepony/model/PonyModelConstants.java b/src/main/java/com/minelittlepony/model/PonyModelConstants.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/PonyModelConstants.java rename to src/main/java/com/minelittlepony/model/PonyModelConstants.java index c0a93859..080ff761 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/PonyModelConstants.java +++ b/src/main/java/com/minelittlepony/model/PonyModelConstants.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model; +package com.minelittlepony.model; public interface PonyModelConstants { diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/AbstractHeadPart.java b/src/main/java/com/minelittlepony/model/part/AbstractHeadPart.java similarity index 70% rename from src/main/java/com/brohoof/minelittlepony/model/part/AbstractHeadPart.java rename to src/main/java/com/minelittlepony/model/part/AbstractHeadPart.java index 6d023925..84aba8af 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/AbstractHeadPart.java +++ b/src/main/java/com/minelittlepony/model/part/AbstractHeadPart.java @@ -1,8 +1,8 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; +import com.minelittlepony.PonyData; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; public abstract class AbstractHeadPart implements IPonyPart { diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/IPonyPart.java b/src/main/java/com/minelittlepony/model/part/IPonyPart.java similarity index 71% rename from src/main/java/com/brohoof/minelittlepony/model/part/IPonyPart.java rename to src/main/java/com/minelittlepony/model/part/IPonyPart.java index 442d58ef..8e2b5bae 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/IPonyPart.java +++ b/src/main/java/com/minelittlepony/model/part/IPonyPart.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; -import com.brohoof.minelittlepony.PonyData; +import com.minelittlepony.PonyData; public interface IPonyPart { diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/PegasusWings.java b/src/main/java/com/minelittlepony/model/part/PegasusWings.java similarity index 97% rename from src/main/java/com/brohoof/minelittlepony/model/part/PegasusWings.java rename to src/main/java/com/minelittlepony/model/part/PegasusWings.java index 2991d3e7..5c2b6424 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/PegasusWings.java +++ b/src/main/java/com/minelittlepony/model/part/PegasusWings.java @@ -1,9 +1,9 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.PonyData; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PonyModelConstants; import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/PonyEars.java b/src/main/java/com/minelittlepony/model/part/PonyEars.java similarity index 83% rename from src/main/java/com/brohoof/minelittlepony/model/part/PonyEars.java rename to src/main/java/com/minelittlepony/model/part/PonyEars.java index 20f17d01..49ed71b4 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/PonyEars.java +++ b/src/main/java/com/minelittlepony/model/part/PonyEars.java @@ -1,8 +1,8 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.PonyData; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.PonyModelConstants; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/PonySnout.java b/src/main/java/com/minelittlepony/model/part/PonySnout.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/model/part/PonySnout.java rename to src/main/java/com/minelittlepony/model/part/PonySnout.java index 12fa55c0..ff5c14b1 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/model/part/PonySnout.java @@ -1,14 +1,14 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; import java.util.Map; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.PonyModelConstants; -import com.brohoof.minelittlepony.renderer.PlaneRenderer; import com.google.common.collect.ImmutableMap; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyData; +import com.minelittlepony.PonyGender; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.renderer.PlaneRenderer; public class PonySnout extends AbstractHeadPart implements PonyModelConstants { diff --git a/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java b/src/main/java/com/minelittlepony/model/part/UnicornHorn.java similarity index 89% rename from src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java rename to src/main/java/com/minelittlepony/model/part/UnicornHorn.java index ef2439b0..3ff1ac52 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/part/UnicornHorn.java +++ b/src/main/java/com/minelittlepony/model/part/UnicornHorn.java @@ -1,13 +1,13 @@ -package com.brohoof.minelittlepony.model.part; +package com.minelittlepony.model.part; import static net.minecraft.client.renderer.GlStateManager.*; import org.lwjgl.opengl.GL11; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.PonyModelConstants; -import com.brohoof.minelittlepony.renderer.HornGlowRenderer; +import com.minelittlepony.PonyData; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.renderer.HornGlowRenderer; import net.minecraft.client.model.ModelBiped.ArmPose; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelHumanPlayer.java b/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java similarity index 76% rename from src/main/java/com/brohoof/minelittlepony/model/pony/ModelHumanPlayer.java rename to src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java index 23165e08..5fb29243 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelHumanPlayer.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelHumanPlayer.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony; +package com.minelittlepony.model.pony; -import com.brohoof.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.AbstractPonyModel; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java b/src/main/java/com/minelittlepony/model/pony/ModelPlayerPony.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java rename to src/main/java/com/minelittlepony/model/pony/ModelPlayerPony.java index 47f2df94..2423bca5 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelPlayerPony.java @@ -1,15 +1,15 @@ -package com.brohoof.minelittlepony.model.pony; +package com.minelittlepony.model.pony; import static net.minecraft.client.renderer.GlStateManager.*; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.PonyModelConstants; -import com.brohoof.minelittlepony.model.part.PegasusWings; -import com.brohoof.minelittlepony.model.part.PonyEars; -import com.brohoof.minelittlepony.model.part.PonySnout; -import com.brohoof.minelittlepony.model.part.UnicornHorn; -import com.brohoof.minelittlepony.renderer.PlaneRenderer; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.model.part.PegasusWings; +import com.minelittlepony.model.part.PonyEars; +import com.minelittlepony.model.part.PonySnout; +import com.minelittlepony.model.part.UnicornHorn; +import com.minelittlepony.renderer.PlaneRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelSkeletonPony.java b/src/main/java/com/minelittlepony/model/pony/ModelSkeletonPony.java similarity index 99% rename from src/main/java/com/brohoof/minelittlepony/model/pony/ModelSkeletonPony.java rename to src/main/java/com/minelittlepony/model/pony/ModelSkeletonPony.java index d8d5f081..92a7a572 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelSkeletonPony.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelSkeletonPony.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model.pony; +package com.minelittlepony.model.pony; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelVillagerPony.java b/src/main/java/com/minelittlepony/model/pony/ModelVillagerPony.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/pony/ModelVillagerPony.java rename to src/main/java/com/minelittlepony/model/pony/ModelVillagerPony.java index 53ac879d..33861dd1 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelVillagerPony.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony; +package com.minelittlepony.model.pony; -import com.brohoof.minelittlepony.renderer.PlaneRenderer; +import com.minelittlepony.renderer.PlaneRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelZombiePony.java b/src/main/java/com/minelittlepony/model/pony/ModelZombiePony.java similarity index 99% rename from src/main/java/com/brohoof/minelittlepony/model/pony/ModelZombiePony.java rename to src/main/java/com/minelittlepony/model/pony/ModelZombiePony.java index 661c083d..df0af606 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelZombiePony.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelZombiePony.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model.pony; +package com.minelittlepony.model.pony; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/HumanArmors.java b/src/main/java/com/minelittlepony/model/pony/armor/HumanArmors.java similarity index 54% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/HumanArmors.java rename to src/main/java/com/minelittlepony/model/pony/armor/HumanArmors.java index 500477ba..07b9c6ff 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/HumanArmors.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/HumanArmors.java @@ -1,7 +1,7 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; -import com.brohoof.minelittlepony.model.AbstractArmor; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.AbstractArmor; +import com.minelittlepony.model.pony.ModelHumanPlayer; public class HumanArmors extends AbstractArmor { diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelPonyArmor.java b/src/main/java/com/minelittlepony/model/pony/armor/ModelPonyArmor.java similarity index 99% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelPonyArmor.java rename to src/main/java/com/minelittlepony/model/pony/armor/ModelPonyArmor.java index 8e763ac6..c81e231f 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelPonyArmor.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/ModelPonyArmor.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.model.pony.ModelPlayerPony; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java b/src/main/java/com/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java rename to src/main/java/com/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java index d94838ed..7383fbdf 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java b/src/main/java/com/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java rename to src/main/java/com/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java index 44e5f8d5..b63c54c5 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/PonyArmors.java b/src/main/java/com/minelittlepony/model/pony/armor/PonyArmors.java similarity index 63% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/PonyArmors.java rename to src/main/java/com/minelittlepony/model/pony/armor/PonyArmors.java index 78625be8..48a5ba7e 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/PonyArmors.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/PonyArmors.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; -import com.brohoof.minelittlepony.model.AbstractArmor; +import com.minelittlepony.model.AbstractArmor; public class PonyArmors extends AbstractArmor { diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/SkeletonPonyArmors.java b/src/main/java/com/minelittlepony/model/pony/armor/SkeletonPonyArmors.java similarity index 67% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/SkeletonPonyArmors.java rename to src/main/java/com/minelittlepony/model/pony/armor/SkeletonPonyArmors.java index f667307d..82b16793 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/SkeletonPonyArmors.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/SkeletonPonyArmors.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; -import com.brohoof.minelittlepony.model.AbstractArmor; +import com.minelittlepony.model.AbstractArmor; public class SkeletonPonyArmors extends AbstractArmor { diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ZombiePonyArmors.java b/src/main/java/com/minelittlepony/model/pony/armor/ZombiePonyArmors.java similarity index 66% rename from src/main/java/com/brohoof/minelittlepony/model/pony/armor/ZombiePonyArmors.java rename to src/main/java/com/minelittlepony/model/pony/armor/ZombiePonyArmors.java index 81df282f..2257aa4c 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ZombiePonyArmors.java +++ b/src/main/java/com/minelittlepony/model/pony/armor/ZombiePonyArmors.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.model.pony.armor; +package com.minelittlepony.model.pony.armor; -import com.brohoof.minelittlepony.model.AbstractArmor; +import com.minelittlepony.model.AbstractArmor; public class ZombiePonyArmors extends AbstractArmor { diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java b/src/main/java/com/minelittlepony/renderer/HornGlowRenderer.java similarity index 95% rename from src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java rename to src/main/java/com/minelittlepony/renderer/HornGlowRenderer.java index 0bad3c08..bb4e7385 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java +++ b/src/main/java/com/minelittlepony/renderer/HornGlowRenderer.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; -import com.brohoof.minelittlepony.model.ModelHornGlow; +import com.minelittlepony.model.ModelHornGlow; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java b/src/main/java/com/minelittlepony/renderer/PlaneRenderer.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java rename to src/main/java/com/minelittlepony/renderer/PlaneRenderer.java index 84825cdf..8b96536e 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java +++ b/src/main/java/com/minelittlepony/renderer/PlaneRenderer.java @@ -1,7 +1,7 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; -import com.brohoof.minelittlepony.model.ModelPlane; -import com.brohoof.minelittlepony.model.ModelPlane.Face; +import com.minelittlepony.model.ModelPlane; +import com.minelittlepony.model.ModelPlane.Face; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java b/src/main/java/com/minelittlepony/renderer/RenderPonyMob.java similarity index 77% rename from src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java rename to src/main/java/com/minelittlepony/renderer/RenderPonyMob.java index 09be89c1..3557123c 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyMob.java @@ -1,15 +1,15 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.PonyRace; -import com.brohoof.minelittlepony.TailLengths; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.renderer.layer.LayerHeldPonyItem; -import com.brohoof.minelittlepony.renderer.layer.LayerPonyArmor; -import com.brohoof.minelittlepony.renderer.layer.LayerPonySkull; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyGender; +import com.minelittlepony.PonyRace; +import com.minelittlepony.TailLengths; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.renderer.layer.LayerHeldPonyItem; +import com.minelittlepony.renderer.layer.LayerPonyArmor; +import com.minelittlepony.renderer.layer.LayerPonySkull; import com.voxelmodpack.hdskins.HDSkinManager; import net.minecraft.client.renderer.entity.RenderLiving; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyPigman.java b/src/main/java/com/minelittlepony/renderer/RenderPonyPigman.java similarity index 86% rename from src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyPigman.java rename to src/main/java/com/minelittlepony/renderer/RenderPonyPigman.java index e875d680..bbe6bb8f 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyPigman.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyPigman.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; -import com.brohoof.minelittlepony.model.PMAPI; +import com.minelittlepony.model.PMAPI; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityPigZombie; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java b/src/main/java/com/minelittlepony/renderer/RenderPonySkeleton.java similarity index 90% rename from src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java rename to src/main/java/com/minelittlepony/renderer/RenderPonySkeleton.java index ef270c9f..27b8c802 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonySkeleton.java @@ -1,13 +1,13 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; import java.util.Random; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.PonyRace; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.TailLengths; -import com.brohoof.minelittlepony.model.PMAPI; -import com.brohoof.minelittlepony.renderer.layer.LayerPonyStrayOverlay; +import com.minelittlepony.PonyGender; +import com.minelittlepony.PonyRace; +import com.minelittlepony.PonySize; +import com.minelittlepony.TailLengths; +import com.minelittlepony.model.PMAPI; +import com.minelittlepony.renderer.layer.LayerPonyStrayOverlay; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java b/src/main/java/com/minelittlepony/renderer/RenderPonyVillager.java similarity index 91% rename from src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java rename to src/main/java/com/minelittlepony/renderer/RenderPonyVillager.java index 952d0b2d..6819d2f7 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyVillager.java @@ -1,8 +1,8 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.model.PMAPI; -import com.brohoof.minelittlepony.model.pony.ModelVillagerPony; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.model.PMAPI; +import com.minelittlepony.model.pony.ModelVillagerPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java b/src/main/java/com/minelittlepony/renderer/RenderPonyZombie.java similarity index 91% rename from src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java rename to src/main/java/com/minelittlepony/renderer/RenderPonyZombie.java index 221594de..f93ba01d 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java +++ b/src/main/java/com/minelittlepony/renderer/RenderPonyZombie.java @@ -1,12 +1,12 @@ -package com.brohoof.minelittlepony.renderer; +package com.minelittlepony.renderer; import java.util.Random; -import com.brohoof.minelittlepony.PonyGender; -import com.brohoof.minelittlepony.PonyRace; -import com.brohoof.minelittlepony.PonySize; -import com.brohoof.minelittlepony.TailLengths; -import com.brohoof.minelittlepony.model.PMAPI; +import com.minelittlepony.PonyGender; +import com.minelittlepony.PonyRace; +import com.minelittlepony.PonySize; +import com.minelittlepony.TailLengths; +import com.minelittlepony.model.PMAPI; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java b/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java similarity index 93% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java index 4826419c..527bc478 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerHeldPonyItem.java @@ -1,17 +1,17 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; -import com.brohoof.minelittlepony.PonyData; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.PonyData; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.pony.ModelPlayerPony; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerOverlayBase.java b/src/main/java/com/minelittlepony/renderer/layer/LayerOverlayBase.java similarity index 96% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerOverlayBase.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerOverlayBase.java index 8aca93f4..ec9422d6 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerOverlayBase.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerOverlayBase.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java similarity index 95% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java index b842179b..c3a699a6 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java @@ -1,16 +1,16 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; import java.io.IOException; import java.util.Map; -import com.brohoof.minelittlepony.MineLittlePony; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.forge.IPonyArmor; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; -import com.brohoof.minelittlepony.model.pony.armor.ModelPonyArmor; import com.google.common.collect.Maps; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.forge.IPonyArmor; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.model.pony.armor.ModelPonyArmor; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyCape.java similarity index 93% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerPonyCape.java index f582bbc7..da6d7f70 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyCape.java @@ -1,11 +1,11 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.model.pony.ModelHumanPlayer; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyElytra.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyElytra.java similarity index 89% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyElytra.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerPonyElytra.java index 0a62cb06..fb1376fa 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyElytra.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyElytra.java @@ -1,10 +1,10 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.ModelPonyElytra; -import com.brohoof.minelittlepony.model.pony.ModelHumanPlayer; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.ModelPonyElytra; +import com.minelittlepony.model.pony.ModelHumanPlayer; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonySkull.java similarity index 92% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerPonySkull.java index 11324925..ee73ee49 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonySkull.java @@ -1,12 +1,12 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; -import com.brohoof.minelittlepony.ducks.IRenderPony; -import com.brohoof.minelittlepony.model.AbstractPonyModel; -import com.brohoof.minelittlepony.model.BodyPart; -import com.brohoof.minelittlepony.model.PlayerModel; -import com.brohoof.minelittlepony.model.pony.ModelPlayerPony; +import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.model.AbstractPonyModel; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PlayerModel; +import com.minelittlepony.model.pony.ModelPlayerPony; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java similarity index 91% rename from src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java rename to src/main/java/com/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java index 55ed0ab2..c781a20f 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java +++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyStrayOverlay.java @@ -1,6 +1,6 @@ -package com.brohoof.minelittlepony.renderer.layer; +package com.minelittlepony.renderer.layer; -import com.brohoof.minelittlepony.model.pony.ModelSkeletonPony; +import com.minelittlepony.model.pony.ModelSkeletonPony; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java b/src/main/java/com/minelittlepony/util/MineLPLogger.java similarity index 98% rename from src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java rename to src/main/java/com/minelittlepony/util/MineLPLogger.java index 18bde8ca..e5cdc6ed 100644 --- a/src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java +++ b/src/main/java/com/minelittlepony/util/MineLPLogger.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.util; +package com.minelittlepony.util; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/brohoof/minelittlepony/util/PonyFields.java b/src/main/java/com/minelittlepony/util/PonyFields.java similarity index 95% rename from src/main/java/com/brohoof/minelittlepony/util/PonyFields.java rename to src/main/java/com/minelittlepony/util/PonyFields.java index ce4886b5..a470854b 100644 --- a/src/main/java/com/brohoof/minelittlepony/util/PonyFields.java +++ b/src/main/java/com/minelittlepony/util/PonyFields.java @@ -1,4 +1,4 @@ -package com.brohoof.minelittlepony.util; +package com.minelittlepony.util; import java.awt.image.BufferedImage; diff --git a/src/main/resources/mixin.minelp.json b/src/main/resources/mixin.minelp.json index cc6a736e..121623fd 100644 --- a/src/main/resources/mixin.minelp.json +++ b/src/main/resources/mixin.minelp.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.4.10", - "package": "com.brohoof.minelittlepony.mixin", + "package": "com.minelittlepony.mixin", "refmap": "mixin.minelp.refmap.json", "mixins": [ "MixinRenderPlayer"