diff --git a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java index 66566c2a..bcb54573 100644 --- a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java @@ -1,8 +1,8 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.Tickable; diff --git a/src/client/java/com/minelittlepony/client/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java index 8b04218f..98cccef9 100644 --- a/src/client/java/com/minelittlepony/client/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -1,17 +1,17 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; +import com.minelittlepony.client.gui.hdskins.GuiSkinsMineLP; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.pony.PonyDataSerialiser; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.hdskins.client.gui.GuiSkinsMineLP; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.server.LegacySkinServer; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.server.LegacySkinServer; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.settings.PonyConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/client/java/com/minelittlepony/client/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java index 47d9ce2a..49f0e4f0 100644 --- a/src/client/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -4,14 +4,14 @@ import java.util.Map; import com.google.common.collect.Maps; import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.gui.hdskins.RenderPonyModel; import com.minelittlepony.client.mixin.MixinRenderManager; import com.minelittlepony.client.model.races.PlayerModels; import com.minelittlepony.client.render.LevitatingItemRenderer; import com.minelittlepony.client.render.entities.MobRenderers; import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.hdskins.client.gui.RenderPonyModel; import com.minelittlepony.hdskins.entity.EntityPonyModel; +import com.minelittlepony.settings.PonyConfig; import com.mumfrey.liteloader.util.ModUtilities; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/PonySkinModifier.java b/src/client/java/com/minelittlepony/client/PonySkinModifier.java index f14d58ce..ce98efa8 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinModifier.java +++ b/src/client/java/com/minelittlepony/client/PonySkinModifier.java @@ -1,6 +1,6 @@ package com.minelittlepony.client; -import com.voxelmodpack.hdskins.ISkinModifier; +import com.minelittlepony.hdskins.ISkinModifier; import java.awt.Graphics; import java.awt.Image; diff --git a/src/client/java/com/minelittlepony/client/PonySkinParser.java b/src/client/java/com/minelittlepony/client/PonySkinParser.java index 1e8cda09..b9fd0536 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinParser.java +++ b/src/client/java/com/minelittlepony/client/PonySkinParser.java @@ -1,11 +1,11 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.model.races.PlayerModels; -import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.hdskins.ISkinParser; +import com.minelittlepony.hdskins.VanillaModels; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.voxelmodpack.hdskins.ISkinParser; -import com.voxelmodpack.hdskins.VanillaModels; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java index 7cd64eb3..0b79ddf6 100644 --- a/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java +++ b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java @@ -3,9 +3,9 @@ package com.minelittlepony.client.ducks; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.RenderPony; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.entity.EntityLivingBase; diff --git a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java index 5334e1f9..1222242c 100644 --- a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.gui; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; -import com.minelittlepony.common.settings.PonyConfig.PonySettings; -import com.minelittlepony.gui.Checkbox; -import com.minelittlepony.gui.Label; -import com.minelittlepony.gui.SettingsPanel; -import com.minelittlepony.gui.Slider; +import com.minelittlepony.common.gui.Checkbox; +import com.minelittlepony.common.gui.Label; +import com.minelittlepony.common.gui.SettingsPanel; +import com.minelittlepony.common.gui.Slider; +import com.minelittlepony.settings.PonyConfig; +import com.minelittlepony.settings.PonyLevel; +import com.minelittlepony.settings.PonyConfig.PonySettings; /** * In-Game options menu. diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java similarity index 87% rename from src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java index 040c19ac..e5613af5 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -1,16 +1,16 @@ -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.gui.IconicToggle; -import com.minelittlepony.gui.Style; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.common.gui.IconicToggle; +import com.minelittlepony.common.gui.Style; import com.minelittlepony.hdskins.entity.EntityPonyModel; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.GuiSkins; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.GuiSkins; -import com.voxelmodpack.hdskins.server.SkinServer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java similarity index 94% rename from src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java index d4418d1b..ba992239 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java @@ -1,5 +1,6 @@ -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.races.PlayerModels; @@ -7,12 +8,11 @@ import com.minelittlepony.client.pony.Pony; import com.minelittlepony.client.render.RenderPony; import com.minelittlepony.client.render.layer.LayerGear; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.hdskins.entity.EntityPonyModel; +import com.minelittlepony.hdskins.gui.RenderPlayerModel; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.meta.Race; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.RenderPlayerModel; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelElytra; diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java b/src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java similarity index 77% rename from src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java index 3e29ba42..6d929f54 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index 68a195d9..d7da649b 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.mixin; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.model.races.PlayerModels; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.pony.IPonyManager; +import com.minelittlepony.settings.PonyLevel; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java index 86d0a178..37b11984 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.ThreadDownloadImageData; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture; +import com.minelittlepony.hdskins.resources.texture.IBufferedTexture; import java.awt.image.BufferedImage; diff --git a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java index 0a6d22e9..6bd63628 100644 --- a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -9,13 +9,13 @@ import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.client.util.render.AbstractRenderer; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPart; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPart; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Size; import com.minelittlepony.util.math.MathUtil; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/IClientModel.java b/src/client/java/com/minelittlepony/client/model/IClientModel.java index 2f696cb9..a844f68a 100644 --- a/src/client/java/com/minelittlepony/client/model/IClientModel.java +++ b/src/client/java/com/minelittlepony/client/model/IClientModel.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.model; import net.minecraft.client.model.ModelRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.model.IModel; public interface IClientModel extends IModel, ICapitated { diff --git a/src/client/java/com/minelittlepony/client/model/ModelWrapper.java b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java index 07b22853..8a9ab0aa 100644 --- a/src/client/java/com/minelittlepony/client/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.model; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.model.capabilities.IModelWrapper; +import com.minelittlepony.pony.IPonyData; /** * Container class for the various models and their associated piece of armour. diff --git a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java index dbb5f752..6fec91f8 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java @@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; import com.minelittlepony.client.ForgeProxy; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IArmourTextureResolver; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java index b920bed0..e9fdb9dc 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java @@ -5,8 +5,8 @@ import net.minecraft.entity.Entity; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IModel; -import com.minelittlepony.common.model.armour.IArmour; +import com.minelittlepony.model.IModel; +import com.minelittlepony.model.armour.IArmour; public class ModelPonyArmor extends AbstractPonyModel implements IArmour { diff --git a/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java index 23bf380c..e0669358 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.model.armour; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPonyData; public class PonyArmor implements IEquestrianArmour { diff --git a/src/client/java/com/minelittlepony/client/model/components/BatWings.java b/src/client/java/com/minelittlepony/client/model/components/BatWings.java index e62565e0..f6f7a221 100644 --- a/src/client/java/com/minelittlepony/client/model/components/BatWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BatWings.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.model.components; import net.minecraft.client.renderer.GlStateManager; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/components/BugWings.java b/src/client/java/com/minelittlepony/client/model/components/BugWings.java index 55fa6c1f..3076e8f8 100644 --- a/src/client/java/com/minelittlepony/client/model/components/BugWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BugWings.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class BugWings extends PegasusWings { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java index 9cfc40c9..912dae62 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class ModelBatWing extends ModelWing { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java index 695cf5ed..41d8da96 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class ModelBugWing extends ModelWing { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java index 92a1e9de..d36c1e41 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.pony.IPonyData; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java index 84d3d344..f465a1f5 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java @@ -2,9 +2,9 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.pony.meta.Wearable; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java index a984efee..b7a40a25 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java @@ -3,13 +3,13 @@ package com.minelittlepony.client.model.components; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPart; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.IPart; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; public class PegasusWings implements IPart { diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java index 2d7fc889..a4e6a7eb 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.Vec3d; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; /** * Modified from ModelElytra. diff --git a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java index c98371de..4caa6c7f 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.model.components; -import static com.minelittlepony.common.model.PonyModelConstants.*; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.pony.meta.Gender; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.pony.meta.Gender; + +import static com.minelittlepony.model.PonyModelConstants.*; public class PonySnout { diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java index 50afe4e9..2ab3057c 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java @@ -5,11 +5,11 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; public class PonyTail extends PlaneRenderer implements IPart { diff --git a/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java index e2098b82..44878ca6 100644 --- a/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java @@ -4,11 +4,11 @@ import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.math.MathHelper; diff --git a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java index cc6bfc83..20599373 100644 --- a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java +++ b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java @@ -2,12 +2,12 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.util.render.GlowRenderer; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java index cd331b48..8b665de6 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.common.model.PonyModelConstants.PI; +import static com.minelittlepony.model.PonyModelConstants.PI; public class ModelBreezie extends ModelBiped { diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java index 4583d574..9376d877 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java @@ -6,9 +6,9 @@ import com.minelittlepony.client.model.components.SeaponyTail; import com.minelittlepony.client.model.races.ModelUnicorn; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java index 7a81d2ec..d0a9b75f 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java @@ -7,7 +7,7 @@ import net.minecraft.entity.passive.EntityVillager; import com.minelittlepony.client.model.ModelMobPony; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelVillagerPony extends ModelMobPony { diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java index 409ddb39..c06f4ec0 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java @@ -6,8 +6,8 @@ import net.minecraft.entity.monster.EntityWitch; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.races.ModelZebra; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.meta.Wearable; public class ModelWitchPony extends ModelZebra { diff --git a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java index 7f6a3a3a..4d12823a 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java @@ -9,7 +9,7 @@ import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.PonyModelConstants; +import com.minelittlepony.model.PonyModelConstants; public abstract class AbstractGear extends ModelBase implements IGear, PonyModelConstants { diff --git a/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java index 5ccd8fa4..41e1eb08 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java @@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.Calendar; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/IGear.java b/src/client/java/com/minelittlepony/client/model/gear/IGear.java index 3e77c8a8..6da7757c 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/IGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/IGear.java @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPart; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/gear/Muffin.java b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java index 24eb0bb1..c4143f79 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/Muffin.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java index 91a368fe..fc726f2f 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java +++ b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java @@ -2,9 +2,9 @@ package com.minelittlepony.client.model.gear; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/Stetson.java b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java index 22d22934..cecb665c 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/Stetson.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java index b1450d65..31cd1479 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java index e73d0d77..596f41b8 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.PegasusWings; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java index 749125ec..d2bd7cb3 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.BatWings; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelBatpony extends ModelPegasus { diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java index cdbefb9a..c477c89d 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.model.races; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.components.BugWings; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelChangeling extends ModelAlicorn { diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java index 981ac926..fbd25102 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.PegasusWings; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java index f5116f63..1cba3bff 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.UnicornHorn; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IUnicorn; +import com.minelittlepony.model.IUnicorn; import net.minecraft.entity.Entity; import net.minecraft.util.EnumHandSide; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java index 5bc05671..3c18b44b 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.GlStateManager; import com.minelittlepony.client.model.armour.ModelPonyArmor; import com.minelittlepony.client.model.armour.PonyArmor; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; public class ModelZebra extends ModelEarthPony { diff --git a/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java index 6a0e805a..d8cef749 100644 --- a/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java +++ b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java @@ -6,12 +6,11 @@ import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.entities.ModelSeapony; import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; import com.minelittlepony.client.render.entities.player.RenderSeaponyPlayer; -import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.hdskins.VanillaModels; +import com.minelittlepony.pony.meta.Race; import net.minecraft.client.renderer.entity.RenderManager; -import com.voxelmodpack.hdskins.VanillaModels; - import java.util.Map; public enum PlayerModels { diff --git a/src/client/java/com/minelittlepony/client/pony/Pony.java b/src/client/java/com/minelittlepony/client/pony/Pony.java index d019a056..ef7a1683 100644 --- a/src/client/java/com/minelittlepony/client/pony/Pony.java +++ b/src/client/java/com/minelittlepony/client/pony/Pony.java @@ -1,18 +1,18 @@ package com.minelittlepony.client.pony; import com.google.common.base.MoreObjects; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.transform.PonyTransformation; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.IBufferedTexture; +import com.minelittlepony.hdskins.util.ProfileTextureUtil; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; import com.minelittlepony.util.chron.Touchable; -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture; -import com.voxelmodpack.hdskins.util.ProfileTextureUtil; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/pony/PonyData.java b/src/client/java/com/minelittlepony/client/pony/PonyData.java index ea2bbc86..a2d29c70 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyData.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyData.java @@ -3,13 +3,13 @@ package com.minelittlepony.client.pony; import net.minecraft.client.resources.data.IMetadataSection; import com.google.common.base.MoreObjects; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Gender; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; -import com.minelittlepony.common.pony.meta.TailLength; -import com.minelittlepony.common.pony.meta.TriggerPixels; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Gender; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.TailLength; +import com.minelittlepony.pony.meta.TriggerPixels; +import com.minelittlepony.pony.meta.Wearable; import com.minelittlepony.util.animation.BasicEasingInterpolator; import com.minelittlepony.util.animation.IInterpolator; diff --git a/src/client/java/com/minelittlepony/client/pony/PonyManager.java b/src/client/java/com/minelittlepony/client/pony/PonyManager.java index 56a1948c..bce90c4a 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyManager.java @@ -3,15 +3,15 @@ package com.minelittlepony.client.pony; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.hdskins.ISkinCacheClearListener; +import com.minelittlepony.hdskins.util.MoreStreams; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.IPonyManager; +import com.minelittlepony.settings.PonyConfig; +import com.minelittlepony.settings.PonyLevel; import com.minelittlepony.util.chron.ChronicCache; import com.minelittlepony.util.math.MathUtil; -import com.voxelmodpack.hdskins.ISkinCacheClearListener; -import com.voxelmodpack.hdskins.util.MoreStreams; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java index 68a84c9b..cccbeb5d 100644 --- a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java index 5e0eda87..bfb8e8f0 100644 --- a/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java +++ b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; public class FrustrumCheck implements ICamera { diff --git a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index bd8027ea..bd0ea2c7 100644 --- a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -2,11 +2,11 @@ package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.client.util.render.Color; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.mumfrey.liteloader.client.overlays.IMinecraft; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/render/RenderPony.java b/src/client/java/com/minelittlepony/client/render/RenderPony.java index 5bab850d..3cc464f4 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPony.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPony.java @@ -1,12 +1,12 @@ package com.minelittlepony.client.render; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.transform.PonyPosture; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java index cb80ab0f..e660cfa2 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java @@ -1,5 +1,6 @@ package com.minelittlepony.client.render; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.layer.LayerGear; @@ -8,9 +9,8 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.pony.IPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.culling.ICamera; diff --git a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java index dea67d51..f4630712 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.render.entities; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.SensibleConfig.Setting; +import com.minelittlepony.common.SensibleConfig.Setting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java index fd308f57..bbd5b6a8 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java +++ b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.render.entities; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.util.resources.ITextureSupplier; import java.io.IOException; diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java index dc5e89ad..6241f54e 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java @@ -1,5 +1,6 @@ package com.minelittlepony.client.render.entities.player; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.DebugBoundingBoxRenderer; @@ -12,8 +13,7 @@ import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyCape; import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import net.minecraft.block.BlockBed; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java index 9caa7fc6..b7d64563 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entities.player; import com.minelittlepony.client.model.ModelWrapper; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java index b16964ba..d65685ae 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java +++ b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.IModel; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java index 894c820a..411f4027 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; import com.minelittlepony.client.model.components.ModelDeadMau5Ears; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; public class LayerDJPon3Head extends AbstractPonyLayer { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java index 13491767..798cdac4 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java @@ -10,7 +10,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java index c85276f0..8417e02e 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java @@ -18,7 +18,7 @@ import com.minelittlepony.client.model.gear.Muffin; import com.minelittlepony.client.model.gear.SaddleBags; import com.minelittlepony.client.model.gear.Stetson; import com.minelittlepony.client.model.gear.WitchHat; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import java.util.HashMap; import java.util.List; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java index 4343ee53..14462e65 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.IClientModel; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java index 3c8e4856..c2fa9bcb 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IUnicorn; +import com.minelittlepony.model.IUnicorn; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java index e1d722db..9f5f5d12 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java @@ -4,10 +4,10 @@ import com.minelittlepony.client.ForgeProxy; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.armour.DefaultPonyArmorTextureResolver; import com.minelittlepony.client.util.render.Color; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IArmour; -import com.minelittlepony.common.model.armour.IArmourTextureResolver; -import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IArmour; +import com.minelittlepony.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.IEquestrianArmour; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java index bc985cb6..20164c9a 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderLivingBase; @@ -12,7 +12,7 @@ import net.minecraft.util.math.MathHelper; import javax.annotation.Nonnull; -import static com.minelittlepony.common.model.PonyModelConstants.PI; +import static com.minelittlepony.model.PonyModelConstants.PI; import static net.minecraft.client.renderer.GlStateManager.*; public class LayerPonyCape extends AbstractPonyLayer { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java index c21543e2..18be4670 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java @@ -12,7 +12,7 @@ import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java index 520537ad..8d0f0446 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.components.PonyElytra; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java index 1378f3aa..b9a94c97 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java @@ -3,11 +3,12 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.model.components.ModelDeadMau5Ears; import com.minelittlepony.client.pony.Pony; import com.minelittlepony.client.render.RenderPony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.settings.PonyConfig; +import com.minelittlepony.settings.PonyLevel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.voxelmodpack.hdskins.HDSkinManager; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.DefaultPlayerSkin; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java index 314412aa..e767abf2 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import com.minelittlepony.client.model.components.ModelPonyHead; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; public abstract class PonySkull implements ISkull { diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 4a61d0bb..0179a2d8 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.render.tileentities.skull; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderItem; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java index 39e493c0..90274fa2 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonySkeleton; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java index 6fc2ab14..330892d9 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonySkeleton; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java index 25c14599..95116790 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonyZombie; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java index 5eadaa63..372ece64 100644 --- a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java +++ b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -6,9 +6,9 @@ import static net.minecraft.client.renderer.GlStateManager.translate; import net.minecraft.util.math.Vec3d; import com.google.common.collect.Maps; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IModel; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IModel; +import com.minelittlepony.pony.meta.Size; import java.util.Map; diff --git a/src/common/java/com/minelittlepony/common/MineLittlePony.java b/src/common/java/com/minelittlepony/MineLittlePony.java similarity index 87% rename from src/common/java/com/minelittlepony/common/MineLittlePony.java rename to src/common/java/com/minelittlepony/MineLittlePony.java index c9d893d6..1e58f5eb 100644 --- a/src/common/java/com/minelittlepony/common/MineLittlePony.java +++ b/src/common/java/com/minelittlepony/MineLittlePony.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common; +package com.minelittlepony; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.pony.IPonyManager; +import com.minelittlepony.settings.PonyConfig; public abstract class MineLittlePony { diff --git a/src/common/java/com/minelittlepony/common/MissingRendererException.java b/src/common/java/com/minelittlepony/MissingRendererException.java similarity index 88% rename from src/common/java/com/minelittlepony/common/MissingRendererException.java rename to src/common/java/com/minelittlepony/MissingRendererException.java index 8081ca66..4ae09414 100644 --- a/src/common/java/com/minelittlepony/common/MissingRendererException.java +++ b/src/common/java/com/minelittlepony/MissingRendererException.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common; +package com.minelittlepony; public class MissingRendererException extends RuntimeException { private static final long serialVersionUID = -6059469512902628663L; diff --git a/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java b/src/common/java/com/minelittlepony/common/SensibleConfig.java similarity index 94% rename from src/common/java/com/minelittlepony/common/settings/SensibleConfig.java rename to src/common/java/com/minelittlepony/common/SensibleConfig.java index 4d175482..b9d35b51 100644 --- a/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/common/SensibleConfig.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.common; -import com.minelittlepony.gui.IGuiCallback; +import com.minelittlepony.common.gui.IGuiCallback; /** * A sensible config container that actually lets us programmatically index values by a key. diff --git a/src/common/java/com/minelittlepony/common/model/armour/package-info.java b/src/common/java/com/minelittlepony/common/model/armour/package-info.java deleted file mode 100644 index 9aea6ba1..00000000 --- a/src/common/java/com/minelittlepony/common/model/armour/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.common.model.armour; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java index 6f8a9919..023e1903 100644 --- a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java +++ b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java @@ -1,8 +1,8 @@ package com.minelittlepony.hdskins.entity; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/common/model/BodyPart.java b/src/common/java/com/minelittlepony/model/BodyPart.java similarity index 67% rename from src/common/java/com/minelittlepony/common/model/BodyPart.java rename to src/common/java/com/minelittlepony/model/BodyPart.java index a6003f74..12a7bdfe 100644 --- a/src/common/java/com/minelittlepony/common/model/BodyPart.java +++ b/src/common/java/com/minelittlepony/model/BodyPart.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; public enum BodyPart { HEAD, diff --git a/src/common/java/com/minelittlepony/common/model/ICapitated.java b/src/common/java/com/minelittlepony/model/ICapitated.java similarity index 90% rename from src/common/java/com/minelittlepony/common/model/ICapitated.java rename to src/common/java/com/minelittlepony/model/ICapitated.java index 272a4dfa..3b607e6c 100644 --- a/src/common/java/com/minelittlepony/common/model/ICapitated.java +++ b/src/common/java/com/minelittlepony/model/ICapitated.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import javax.annotation.Nullable; diff --git a/src/common/java/com/minelittlepony/common/model/IModel.java b/src/common/java/com/minelittlepony/model/IModel.java similarity index 89% rename from src/common/java/com/minelittlepony/common/model/IModel.java rename to src/common/java/com/minelittlepony/model/IModel.java index 1bb1e984..319ed481 100644 --- a/src/common/java/com/minelittlepony/common/model/IModel.java +++ b/src/common/java/com/minelittlepony/model/IModel.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.Wearable; public interface IModel { diff --git a/src/common/java/com/minelittlepony/common/model/IPart.java b/src/common/java/com/minelittlepony/model/IPart.java similarity index 94% rename from src/common/java/com/minelittlepony/common/model/IPart.java rename to src/common/java/com/minelittlepony/model/IPart.java index a6ea504b..ff61ef9e 100644 --- a/src/common/java/com/minelittlepony/common/model/IPart.java +++ b/src/common/java/com/minelittlepony/model/IPart.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import java.util.UUID; diff --git a/src/common/java/com/minelittlepony/common/model/IPegasus.java b/src/common/java/com/minelittlepony/model/IPegasus.java similarity index 78% rename from src/common/java/com/minelittlepony/common/model/IPegasus.java rename to src/common/java/com/minelittlepony/model/IPegasus.java index a0b24015..2329662f 100644 --- a/src/common/java/com/minelittlepony/common/model/IPegasus.java +++ b/src/common/java/com/minelittlepony/model/IPegasus.java @@ -1,9 +1,9 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.common.model.PonyModelConstants.ROTATE_270; -import static com.minelittlepony.common.model.PonyModelConstants.WING_ROT_Z_SNEAK; +import static com.minelittlepony.model.PonyModelConstants.ROTATE_270; +import static com.minelittlepony.model.PonyModelConstants.WING_ROT_Z_SNEAK; public interface IPegasus extends IModel { diff --git a/src/common/java/com/minelittlepony/common/model/IUnicorn.java b/src/common/java/com/minelittlepony/model/IUnicorn.java similarity index 93% rename from src/common/java/com/minelittlepony/common/model/IUnicorn.java rename to src/common/java/com/minelittlepony/model/IUnicorn.java index 74692b3b..bbeefb3a 100644 --- a/src/common/java/com/minelittlepony/common/model/IUnicorn.java +++ b/src/common/java/com/minelittlepony/model/IUnicorn.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import net.minecraft.util.EnumHandSide; diff --git a/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java b/src/common/java/com/minelittlepony/model/PonyModelConstants.java similarity index 97% rename from src/common/java/com/minelittlepony/common/model/PonyModelConstants.java rename to src/common/java/com/minelittlepony/model/PonyModelConstants.java index 804dcf15..ce620e7d 100644 --- a/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java +++ b/src/common/java/com/minelittlepony/model/PonyModelConstants.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; public interface PonyModelConstants { diff --git a/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java similarity index 81% rename from src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java rename to src/common/java/com/minelittlepony/model/armour/ArmourLayer.java index 3d55980c..c12457d4 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java +++ b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; /** * The layer used to render a given armour piece. diff --git a/src/common/java/com/minelittlepony/common/model/armour/IArmour.java b/src/common/java/com/minelittlepony/model/armour/IArmour.java similarity index 96% rename from src/common/java/com/minelittlepony/common/model/armour/IArmour.java rename to src/common/java/com/minelittlepony/model/armour/IArmour.java index 95f78586..51bb5492 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IArmour.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmour.java @@ -1,8 +1,8 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import net.minecraft.inventory.EntityEquipmentSlot; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.IModel; public interface IArmour { /** diff --git a/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java similarity index 91% rename from src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java rename to src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java index 46263470..800a1be9 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java similarity index 84% rename from src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java rename to src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java index a8d771f8..f15fd821 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java +++ b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import com.minelittlepony.model.capabilities.IModelWrapper; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java b/src/common/java/com/minelittlepony/model/armour/package-info.java similarity index 79% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java rename to src/common/java/com/minelittlepony/model/armour/package-info.java index 997d41b5..ce1fed56 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java +++ b/src/common/java/com/minelittlepony/model/armour/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.model.armour; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java index a927eeb5..7de7ba93 100644 --- a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java +++ b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java @@ -1,6 +1,6 @@ package com.minelittlepony.model.capabilities; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.pony.IPonyData; public interface IModelWrapper { /** diff --git a/src/common/java/com/minelittlepony/common/pony/IPony.java b/src/common/java/com/minelittlepony/pony/IPony.java similarity index 96% rename from src/common/java/com/minelittlepony/common/pony/IPony.java rename to src/common/java/com/minelittlepony/pony/IPony.java index 19bf163d..d588d6cd 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPony.java +++ b/src/common/java/com/minelittlepony/pony/IPony.java @@ -1,12 +1,12 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.meta.Race; public interface IPony { diff --git a/src/common/java/com/minelittlepony/common/pony/IPonyData.java b/src/common/java/com/minelittlepony/pony/IPonyData.java similarity index 76% rename from src/common/java/com/minelittlepony/common/pony/IPonyData.java rename to src/common/java/com/minelittlepony/pony/IPonyData.java index 69e8b288..c532fde4 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPonyData.java +++ b/src/common/java/com/minelittlepony/pony/IPonyData.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; -import com.minelittlepony.common.pony.meta.Gender; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; -import com.minelittlepony.common.pony.meta.TailLength; +import com.minelittlepony.pony.meta.Gender; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.TailLength; +import com.minelittlepony.pony.meta.Wearable; import com.minelittlepony.util.animation.IInterpolator; import java.util.UUID; diff --git a/src/common/java/com/minelittlepony/common/pony/IPonyManager.java b/src/common/java/com/minelittlepony/pony/IPonyManager.java similarity index 98% rename from src/common/java/com/minelittlepony/common/pony/IPonyManager.java rename to src/common/java/com/minelittlepony/pony/IPonyManager.java index 57db4402..51258f1f 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPonyManager.java +++ b/src/common/java/com/minelittlepony/pony/IPonyManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java b/src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java similarity index 95% rename from src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java rename to src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java index 73df1965..8249dce9 100644 --- a/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java +++ b/src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; /** * Interface for enums that can be parsed from an image trigger pixel value. diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Gender.java b/src/common/java/com/minelittlepony/pony/meta/Gender.java similarity index 81% rename from src/common/java/com/minelittlepony/common/pony/meta/Gender.java rename to src/common/java/com/minelittlepony/pony/meta/Gender.java index 624dad67..3faac243 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Gender.java +++ b/src/common/java/com/minelittlepony/pony/meta/Gender.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum Gender implements ITriggerPixelMapped { MARE(0), diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Race.java b/src/common/java/com/minelittlepony/pony/meta/Race.java similarity index 92% rename from src/common/java/com/minelittlepony/common/pony/meta/Race.java rename to src/common/java/com/minelittlepony/pony/meta/Race.java index 734ec0a1..f8ee6271 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Race.java +++ b/src/common/java/com/minelittlepony/pony/meta/Race.java @@ -1,8 +1,8 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.ITriggerPixelMapped; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.ITriggerPixelMapped; +import com.minelittlepony.settings.PonyLevel; import javax.annotation.Nonnull; diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Size.java b/src/common/java/com/minelittlepony/pony/meta/Size.java similarity index 86% rename from src/common/java/com/minelittlepony/common/pony/meta/Size.java rename to src/common/java/com/minelittlepony/pony/meta/Size.java index 5dc82fd1..89441a53 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Size.java +++ b/src/common/java/com/minelittlepony/pony/meta/Size.java @@ -1,7 +1,7 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum Size implements ITriggerPixelMapped { TALL(0x534b76, 0.45f, 1.1F), diff --git a/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java b/src/common/java/com/minelittlepony/pony/meta/TailLength.java similarity index 77% rename from src/common/java/com/minelittlepony/common/pony/meta/TailLength.java rename to src/common/java/com/minelittlepony/pony/meta/TailLength.java index 87f95934..49cbce2b 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java +++ b/src/common/java/com/minelittlepony/pony/meta/TailLength.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum TailLength implements ITriggerPixelMapped { diff --git a/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java b/src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java similarity index 96% rename from src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java rename to src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java index 5ee79956..0790ccd5 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java +++ b/src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; import java.awt.image.BufferedImage; diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java b/src/common/java/com/minelittlepony/pony/meta/Wearable.java similarity index 87% rename from src/common/java/com/minelittlepony/common/pony/meta/Wearable.java rename to src/common/java/com/minelittlepony/pony/meta/Wearable.java index 33478f24..b6cbaffe 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java +++ b/src/common/java/com/minelittlepony/pony/meta/Wearable.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; import java.util.ArrayList; import java.util.List; diff --git a/src/common/java/com/minelittlepony/common/settings/PonyConfig.java b/src/common/java/com/minelittlepony/settings/PonyConfig.java similarity index 94% rename from src/common/java/com/minelittlepony/common/settings/PonyConfig.java rename to src/common/java/com/minelittlepony/settings/PonyConfig.java index d3999818..8ec7ffb1 100644 --- a/src/common/java/com/minelittlepony/common/settings/PonyConfig.java +++ b/src/common/java/com/minelittlepony/settings/PonyConfig.java @@ -1,9 +1,10 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.settings; import net.minecraft.util.math.MathHelper; import com.google.gson.annotations.Expose; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.common.SensibleConfig; +import com.minelittlepony.hdskins.HDSkinManager; /** * Storage container for MineLP client settings. diff --git a/src/common/java/com/minelittlepony/common/settings/PonyLevel.java b/src/common/java/com/minelittlepony/settings/PonyLevel.java similarity index 86% rename from src/common/java/com/minelittlepony/common/settings/PonyLevel.java rename to src/common/java/com/minelittlepony/settings/PonyLevel.java index 117136bf..ace30eb2 100644 --- a/src/common/java/com/minelittlepony/common/settings/PonyLevel.java +++ b/src/common/java/com/minelittlepony/settings/PonyLevel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.settings; public enum PonyLevel { PONIES, diff --git a/src/hdskins/java/com/minelittlepony/gui/Button.java b/src/hdskins/java/com/minelittlepony/common/gui/Button.java similarity index 97% rename from src/hdskins/java/com/minelittlepony/gui/Button.java rename to src/hdskins/java/com/minelittlepony/common/gui/Button.java index bd30d290..bbfa577f 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Button.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Button.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import java.util.List; diff --git a/src/hdskins/java/com/minelittlepony/gui/Checkbox.java b/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java similarity index 97% rename from src/hdskins/java/com/minelittlepony/gui/Checkbox.java rename to src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java index 76325a64..f00dcb40 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Checkbox.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import com.mumfrey.liteloader.client.gui.GuiCheckbox; diff --git a/src/hdskins/java/com/minelittlepony/gui/GameGui.java b/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java similarity index 98% rename from src/hdskins/java/com/minelittlepony/gui/GameGui.java rename to src/hdskins/java/com/minelittlepony/common/gui/GameGui.java index 562526ee..d8510578 100644 --- a/src/hdskins/java/com/minelittlepony/gui/GameGui.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import org.apache.commons.lang3.text.WordUtils; diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiAction.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java similarity index 88% rename from src/hdskins/java/com/minelittlepony/gui/IGuiAction.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java index 3aa0ae2a..249067aa 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiAction.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; /** * Response actions for UI events. diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java similarity index 88% rename from src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java index 69da7620..57918bd3 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; /** * Response actions for UI events. diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java index 32fba593..a6a059ff 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java b/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java similarity index 66% rename from src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java rename to src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java index 58611cb4..452ded55 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; @FunctionalInterface public interface IStyleFactory { diff --git a/src/hdskins/java/com/minelittlepony/gui/IconicButton.java b/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java similarity index 95% rename from src/hdskins/java/com/minelittlepony/gui/IconicButton.java rename to src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java index 711b3b56..d2c686b2 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IconicButton.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/hdskins/java/com/minelittlepony/gui/IconicToggle.java b/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java similarity index 93% rename from src/hdskins/java/com/minelittlepony/gui/IconicToggle.java rename to src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java index a246c38e..ce7a2bf8 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IconicToggle.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java @@ -1,6 +1,6 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; -import com.voxelmodpack.hdskins.util.MoreStreams; +import com.minelittlepony.hdskins.util.MoreStreams; public class IconicToggle extends IconicButton { diff --git a/src/hdskins/java/com/minelittlepony/gui/Label.java b/src/hdskins/java/com/minelittlepony/common/gui/Label.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Label.java rename to src/hdskins/java/com/minelittlepony/common/gui/Label.java index a136cd93..565080be 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Label.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Label.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java b/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java similarity index 98% rename from src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java rename to src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java index 7a6a1590..9ed7156c 100644 --- a/src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import java.io.IOException; diff --git a/src/hdskins/java/com/minelittlepony/gui/Slider.java b/src/hdskins/java/com/minelittlepony/common/gui/Slider.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Slider.java rename to src/hdskins/java/com/minelittlepony/common/gui/Slider.java index d5436400..73a7886d 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Slider.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Slider.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.gui.GuiSlider; import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; diff --git a/src/hdskins/java/com/minelittlepony/gui/Style.java b/src/hdskins/java/com/minelittlepony/common/gui/Style.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Style.java rename to src/hdskins/java/com/minelittlepony/common/gui/Style.java index 3920077c..ce75f261 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Style.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Style.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java index b21b8e8c..d5f268ad 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; @@ -11,6 +11,20 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Streams; +import com.minelittlepony.hdskins.ducks.INetworkPlayerInfo; +import com.minelittlepony.hdskins.gui.GuiSkins; +import com.minelittlepony.hdskins.resources.SkinResourceManager; +import com.minelittlepony.hdskins.resources.TextureLoader; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; +import com.minelittlepony.hdskins.server.BethlehemSkinServer; +import com.minelittlepony.hdskins.server.LegacySkinServer; +import com.minelittlepony.hdskins.server.ServerType; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.hdskins.util.CallableFutures; +import com.minelittlepony.hdskins.util.MoreStreams; +import com.minelittlepony.hdskins.util.PlayerUtil; +import com.minelittlepony.hdskins.util.ProfileTextureUtil; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; @@ -18,20 +32,7 @@ import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.util.log.LiteLoaderLogger; -import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo; -import com.voxelmodpack.hdskins.gui.GuiSkins; -import com.voxelmodpack.hdskins.resources.SkinResourceManager; -import com.voxelmodpack.hdskins.resources.TextureLoader; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; -import com.voxelmodpack.hdskins.server.BethlehemSkinServer; -import com.voxelmodpack.hdskins.server.LegacySkinServer; -import com.voxelmodpack.hdskins.server.ServerType; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.ValhallaSkinServer; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.MoreStreams; -import com.voxelmodpack.hdskins.util.PlayerUtil; -import com.voxelmodpack.hdskins.util.ProfileTextureUtil; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java similarity index 73% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java index d1a21d0f..f8f2f36d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; @FunctionalInterface public interface ISkinCacheClearListener { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java similarity index 83% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java index a29d1d4b..e534ee94 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java index d75bb198..06825979 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java rename to src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java index 43a63b0d..00f4490a 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java @@ -1,7 +1,13 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.HDSkinsConfigPanel; +import com.minelittlepony.hdskins.gui.RenderPlayerModel; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinServerSerializer; +import com.minelittlepony.hdskins.upload.GLWindow; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.ViewportListener; @@ -11,12 +17,6 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel; import com.mumfrey.liteloader.modconfig.ConfigStrategy; import com.mumfrey.liteloader.modconfig.ExposableOptions; import com.mumfrey.liteloader.util.ModUtilities; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.HDSkinsConfigPanel; -import com.voxelmodpack.hdskins.gui.RenderPlayerModel; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.SkinServerSerializer; -import com.voxelmodpack.hdskins.upload.GLWindow; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java b/src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java rename to src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java index 4bcabb16..db3ce94f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; -import com.voxelmodpack.hdskins.upload.IFileDialog; -import com.voxelmodpack.hdskins.upload.ThreadOpenFilePNG; -import com.voxelmodpack.hdskins.upload.ThreadSaveFilePNG; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.upload.IFileDialog; +import com.minelittlepony.hdskins.upload.ThreadOpenFilePNG; +import com.minelittlepony.hdskins.upload.ThreadSaveFilePNG; +import com.minelittlepony.hdskins.util.MoreHttpResponses; import net.minecraft.client.Minecraft; import org.apache.commons.io.FileUtils; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java rename to src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java index 9fa67f10..86655c41 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; @@ -8,19 +8,19 @@ import net.minecraft.util.ResourceLocation; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.resources.PreviewTextureManager; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinUpload; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.exceptions.AuthenticationUnavailableException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mumfrey.liteloader.util.log.LiteLoaderLogger; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.resources.PreviewTextureManager; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.SkinUpload; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; import java.io.Closeable; import java.io.File; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java b/src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java rename to src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java index 3595381a..289701cb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; public class VanillaModels { public static final String SLIM = "slim"; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java b/src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java similarity index 62% rename from src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java rename to src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java index 2a4365f8..c314b290 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.ducks; +package com.minelittlepony.hdskins.ducks; public interface INetworkPlayerInfo { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java index ecfd9e02..28bb9f26 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import static net.minecraft.client.renderer.GlStateManager.color; import static net.minecraft.client.renderer.GlStateManager.colorMask; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java index cb31c298..031629d5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java index 59c08af9..431ce670 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java @@ -1,12 +1,12 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import com.minelittlepony.hdskins.SkinUploader; +import com.minelittlepony.hdskins.resources.LocalTexture; +import com.minelittlepony.hdskins.resources.LocalTexture.IBlankSkinSupplier; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.SkinUploader; -import com.voxelmodpack.hdskins.resources.LocalTexture; -import com.voxelmodpack.hdskins.resources.LocalTexture.IBlankSkinSupplier; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.SkinManager; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java index 0f77d1ab..4a4ce0e0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; /** * Represents the possible features that a skin server can implement. diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java index b58ca283..728b97a8 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java @@ -1,24 +1,24 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import com.google.common.base.Splitter; -import com.minelittlepony.gui.Button; -import com.minelittlepony.gui.GameGui; -import com.minelittlepony.gui.IGuiAction; -import com.minelittlepony.gui.IconicButton; -import com.minelittlepony.gui.IconicToggle; -import com.minelittlepony.gui.Label; -import com.minelittlepony.gui.Style; +import com.minelittlepony.common.gui.Button; +import com.minelittlepony.common.gui.GameGui; +import com.minelittlepony.common.gui.IGuiAction; +import com.minelittlepony.common.gui.IconicButton; +import com.minelittlepony.common.gui.IconicToggle; +import com.minelittlepony.common.gui.Label; +import com.minelittlepony.common.gui.Style; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.SkinChooser; +import com.minelittlepony.hdskins.SkinUploader; +import com.minelittlepony.hdskins.VanillaModels; +import com.minelittlepony.hdskins.SkinUploader.ISkinUploadHandler; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.upload.GLWindow; +import com.minelittlepony.hdskins.util.CallableFutures; +import com.minelittlepony.hdskins.util.Edge; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.SkinChooser; -import com.voxelmodpack.hdskins.SkinUploader; -import com.voxelmodpack.hdskins.SkinUploader.ISkinUploadHandler; -import com.voxelmodpack.hdskins.VanillaModels; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.upload.GLWindow; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.Edge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java similarity index 74% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java index 7844d53a..5e128ed6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; -import com.minelittlepony.gui.Checkbox; -import com.minelittlepony.gui.SettingsPanel; -import com.voxelmodpack.hdskins.LiteModHDSkins; -import com.voxelmodpack.hdskins.upload.GLWindow; +import com.minelittlepony.common.gui.Checkbox; +import com.minelittlepony.common.gui.SettingsPanel; +import com.minelittlepony.hdskins.LiteModHDSkins; +import com.minelittlepony.hdskins.upload.GLWindow; public class HDSkinsConfigPanel extends SettingsPanel { @Override diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java index b27de299..4ca1b1e7 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java similarity index 80% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java index e502527b..be234747 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.gui; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java similarity index 84% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java index bbd6b6fb..47461256 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java @@ -1,7 +1,7 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; -import com.minelittlepony.gui.IconicButton; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.common.gui.IconicButton; +import com.minelittlepony.hdskins.HDSkinManager; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java index 58be43b9..47985127 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java @@ -1,6 +1,5 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; -import com.voxelmodpack.hdskins.HDSkinManager; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ImageBufferDownload; import org.spongepowered.asm.mixin.Mixin; @@ -8,6 +7,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.minelittlepony.hdskins.HDSkinManager; + import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java index d85e905a..32750614 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java @@ -1,11 +1,11 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.voxelmodpack.hdskins.upload.GLWindow; +import com.minelittlepony.hdskins.upload.GLWindow; import net.minecraft.client.Minecraft; import net.minecraft.crash.CrashReport; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java index a2452b3c..376ec613 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java @@ -1,10 +1,11 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.ducks.INetworkPlayerInfo; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo; + import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java index 45938558..eaa933ba 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java @@ -1,8 +1,9 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; +import com.minelittlepony.hdskins.HDSkinManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; + import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntitySkull; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java similarity index 79% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java index 60837fe6..6039acff 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.mixin; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/package-info.java similarity index 81% rename from src/hdskins/java/com/voxelmodpack/hdskins/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/package-info.java index 4e927d8f..2793f2ee 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java index 92770458..5fc2520a 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.cache.CacheLoader; import com.google.common.util.concurrent.ListenableFuture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java index f2ed6f67..b007b067 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java @@ -1,12 +1,12 @@ -package com.voxelmodpack.hdskins.resources; - -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.util.ResourceLocation; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; + import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java index 2d6c855b..ea4ddce5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java index dd25aa9a..7f4c78b7 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java @@ -1,10 +1,10 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraft.util.ResourceLocation; -import com.voxelmodpack.hdskins.VanillaModels; +import com.minelittlepony.hdskins.VanillaModels; import javax.annotation.Nullable; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java similarity index 88% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java index b4e8500f..af3ff4df 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java @@ -1,10 +1,10 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.collect.Maps; +import com.minelittlepony.hdskins.resources.texture.ISkinAvailableCallback; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; -import com.voxelmodpack.hdskins.resources.texture.ISkinAvailableCallback; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java index 348ed2cc..d32100b0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java index d894617f..b72a94dd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.collect.Maps; import com.google.gson.Gson; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java index 82877c3b..07c16dbd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.ITextureObject; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java similarity index 77% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java index a8901f0a..3bd7a16b 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java index f076acee..1a9e5809 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java similarity index 75% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java index ece6a358..a5f36d78 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import java.awt.image.BufferedImage; import javax.annotation.Nullable; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java similarity index 83% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java index 3f593aa6..c74b8167 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import net.minecraft.client.renderer.IImageBuffer; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java index 7c438910..c5c61a6c 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java @@ -1,7 +1,7 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; +import com.minelittlepony.hdskins.HDSkinManager; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; import javax.annotation.Nullable; import java.awt.Graphics; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java index 2728877b..06382d60 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java @@ -1,6 +1,5 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureUtil; @@ -18,6 +17,8 @@ import org.apache.http.impl.client.HttpClients; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.minelittlepony.hdskins.util.MoreHttpResponses; + import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java index 0569d146..eedfbd22 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java @@ -1,16 +1,16 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; import java.io.IOException; import java.util.Locale; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java index f66897d3..cff02a27 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java @@ -1,21 +1,22 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.CallableFutures; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; +import com.minelittlepony.hdskins.util.TexturesPayloadBuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; -import com.voxelmodpack.hdskins.util.TexturesPayloadBuilder; + import net.minecraft.client.Minecraft; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java b/src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java similarity index 90% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java index 1509dd56..946fc26f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java index 8b3552bd..3740f8ee 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java @@ -1,17 +1,18 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.CallableFutures; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; import com.mumfrey.liteloader.modconfig.Exposable; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.CallableFutures; + import net.minecraft.client.Minecraft; import net.minecraft.util.Session; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java index 01779cbf..1d5624a5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -8,7 +8,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkinManager; import java.lang.reflect.Type; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java index 4e35bf0b..e4ab1f86 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import net.minecraft.util.Session; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java index c132d694..43ea208e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.MoreObjects; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java index 63f2b698..cf936339 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java @@ -1,16 +1,17 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.Preconditions; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; + import net.minecraft.client.Minecraft; import net.minecraft.util.Session; import org.apache.http.HttpHeaders; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java new file mode 100644 index 00000000..de870a42 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.server; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java index d6b2a84e..5cc57cc6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java index 42b600aa..e4f4b161 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import org.lwjgl.opengl.Display; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java index daa9de14..ae6d44d0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import com.google.common.collect.Lists; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java similarity index 75% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java index 69a416f6..28c3de0d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import java.io.File; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java similarity index 61% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java index 7b996303..5d26ea64 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; public interface IFileDialog extends Runnable { void start(); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java index 913df35c..8d364f22 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import javax.swing.JFrame; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java index 8dccbb54..c3c92b6e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; @@ -8,7 +8,8 @@ import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; import org.apache.commons.lang3.StringUtils; -import com.voxelmodpack.hdskins.LiteModHDSkins; + +import com.minelittlepony.hdskins.LiteModHDSkins; /** * Base class for "open file" dialog threads diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java index fffbe344..b3b548bc 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java index a7251581..97009799 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java index 786db60d..e43a40c0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java new file mode 100644 index 00000000..71836634 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.upload; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java b/src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java index 11112f8e..aa8e326d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.common.util.concurrent.Runnables; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java b/src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java index 0d3a6767..385ded25 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; public abstract class Edge { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java b/src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java index e0e4c467..c8ab61cb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java index 2246331d..f5e0c299 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.gson.JsonObject; -import com.voxelmodpack.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinServer; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java index b33a72da..8b583ff1 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import java.util.List; import java.util.function.Function; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java b/src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java index a479d198..15148b58 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java @@ -1,12 +1,13 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; -import com.voxelmodpack.hdskins.HDSkinManager; import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; +import com.minelittlepony.hdskins.HDSkinManager; + import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java b/src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java index ef83a260..5c9e3ccd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java b/src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java index 6ce74e56..69f64489 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.mojang.authlib.minecraft.MinecraftProfileTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java b/src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java index deb6fa35..59c7a399 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java deleted file mode 100644 index 188351cf..00000000 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.upload; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault;