PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 05:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move hdskins to the minelittlepony group

Browse source
This commit is contained in:
Sollace 2019-03-23 21:58:50 +02:00
parent fa2c8b075b
commit 711a5c6ff3
188 changed files with 438 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.client; package com.minelittlepony.client;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.gui.GuiPonySettings; import com.minelittlepony.client.gui.GuiPonySettings;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.common.settings.PonyConfig;
import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.Configurable;
import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.InitCompleteListener;
import com.mumfrey.liteloader.Tickable; import com.mumfrey.liteloader.Tickable;

14
src/client/java/com/minelittlepony/client/MineLPClient.java
View file

@ -1,17 +1,17 @@
package com.minelittlepony.client; package com.minelittlepony.client;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.gui.GuiPonySettings; import com.minelittlepony.client.gui.GuiPonySettings;
import com.minelittlepony.client.gui.hdskins.GuiSkinsMineLP;
import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.pony.PonyData;
import com.minelittlepony.client.pony.PonyDataSerialiser; import com.minelittlepony.client.pony.PonyDataSerialiser;
import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.pony.PonyManager;
import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.hdskins.HDSkinManager;
import com.minelittlepony.common.settings.PonyConfig; import com.minelittlepony.hdskins.server.LegacySkinServer;
import com.minelittlepony.hdskins.client.gui.GuiSkinsMineLP; import com.minelittlepony.hdskins.server.SkinServer;
import com.voxelmodpack.hdskins.HDSkinManager; import com.minelittlepony.hdskins.server.ValhallaSkinServer;
import com.voxelmodpack.hdskins.server.LegacySkinServer; import com.minelittlepony.settings.PonyConfig;
import com.voxelmodpack.hdskins.server.SkinServer;
import com.voxelmodpack.hdskins.server.ValhallaSkinServer;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;

4
src/client/java/com/minelittlepony/client/PonyRenderManager.java
View file

@ -4,14 +4,14 @@ import java.util.Map;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.gui.hdskins.RenderPonyModel;
import com.minelittlepony.client.mixin.MixinRenderManager; import com.minelittlepony.client.mixin.MixinRenderManager;
import com.minelittlepony.client.model.races.PlayerModels; import com.minelittlepony.client.model.races.PlayerModels;
import com.minelittlepony.client.render.LevitatingItemRenderer; import com.minelittlepony.client.render.LevitatingItemRenderer;
import com.minelittlepony.client.render.entities.MobRenderers; import com.minelittlepony.client.render.entities.MobRenderers;
import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; 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.hdskins.entity.EntityPonyModel;
import com.minelittlepony.settings.PonyConfig;
import com.mumfrey.liteloader.util.ModUtilities; import com.mumfrey.liteloader.util.ModUtilities;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
src/client/java/com/minelittlepony/client/PonySkinModifier.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.client; package com.minelittlepony.client;
import com.voxelmodpack.hdskins.ISkinModifier; import com.minelittlepony.hdskins.ISkinModifier;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Image; import java.awt.Image;

6
src/client/java/com/minelittlepony/client/PonySkinParser.java
View file

@ -1,11 +1,11 @@
package com.minelittlepony.client; package com.minelittlepony.client;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.model.races.PlayerModels; 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.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.voxelmodpack.hdskins.ISkinParser;
import com.voxelmodpack.hdskins.VanillaModels;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

6
src/client/java/com/minelittlepony/client/ducks/IRenderPony.java
View file

@ -3,9 +3,9 @@ package com.minelittlepony.client.ducks;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.render.RenderPony; import com.minelittlepony.client.render.RenderPony;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.PonyModelConstants; import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;

16
src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java
View file

@ -1,14 +1,14 @@
package com.minelittlepony.client.gui; package com.minelittlepony.client.gui;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.render.entities.MobRenderers; import com.minelittlepony.client.render.entities.MobRenderers;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.common.gui.Checkbox;
import com.minelittlepony.common.settings.PonyConfig; import com.minelittlepony.common.gui.Label;
import com.minelittlepony.common.settings.PonyLevel; import com.minelittlepony.common.gui.SettingsPanel;
import com.minelittlepony.common.settings.PonyConfig.PonySettings; import com.minelittlepony.common.gui.Slider;
import com.minelittlepony.gui.Checkbox; import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.gui.Label; import com.minelittlepony.settings.PonyLevel;
import com.minelittlepony.gui.SettingsPanel; import com.minelittlepony.settings.PonyConfig.PonySettings;
import com.minelittlepony.gui.Slider;
/** /**
* In-Game options menu. * In-Game options menu.

16
src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java → src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java
View file

@ -1,16 +1,16 @@
package com.minelittlepony.hdskins.client.gui; package com.minelittlepony.client.gui.hdskins;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.pony.IPonyManager; import com.minelittlepony.common.gui.IconicToggle;
import com.minelittlepony.gui.IconicToggle; import com.minelittlepony.common.gui.Style;
import com.minelittlepony.gui.Style;
import com.minelittlepony.hdskins.entity.EntityPonyModel; 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.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; 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.Items;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;

10
src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java → src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java
View file

@ -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.ducks.IRenderPony;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.model.races.PlayerModels; 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.RenderPony;
import com.minelittlepony.client.render.layer.LayerGear; import com.minelittlepony.client.render.layer.LayerGear;
import com.minelittlepony.client.render.layer.LayerPonyElytra; 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.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.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.voxelmodpack.hdskins.gui.RenderPlayerModel;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelElytra; import net.minecraft.client.model.ModelElytra;

2
src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java → src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java
View file

@ -1,6 +1,6 @@
@MethodsReturnNonnullByDefault @MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
package com.minelittlepony.hdskins.client.gui; package com.minelittlepony.client.gui.hdskins;
import mcp.MethodsReturnNonnullByDefault; import mcp.MethodsReturnNonnullByDefault;

6
src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.client.mixin; package com.minelittlepony.client.mixin;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.model.races.PlayerModels; import com.minelittlepony.client.model.races.PlayerModels;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.common.pony.IPonyManager; import com.minelittlepony.settings.PonyLevel;
import com.minelittlepony.common.settings.PonyLevel;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

2
src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.ThreadDownloadImageData;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; 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; import java.awt.image.BufferedImage;

14
src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -9,13 +9,13 @@ import com.minelittlepony.client.transform.PonyTransformation;
import com.minelittlepony.client.util.render.AbstractRenderer; import com.minelittlepony.client.util.render.AbstractRenderer;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import com.minelittlepony.common.model.PonyModelConstants; import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.pony.meta.Size;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import javax.annotation.Nullable; import javax.annotation.Nullable;

4
src/client/java/com/minelittlepony/client/model/IClientModel.java
View file

@ -2,8 +2,8 @@ package com.minelittlepony.client.model;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import com.minelittlepony.common.model.ICapitated; import com.minelittlepony.model.ICapitated;
import com.minelittlepony.common.model.IModel; import com.minelittlepony.model.IModel;
public interface IClientModel extends IModel, ICapitated<ModelRenderer> { public interface IClientModel extends IModel, ICapitated<ModelRenderer> {

6
src/client/java/com/minelittlepony/client/model/ModelWrapper.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.client.model; package com.minelittlepony.client.model;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.common.pony.IPonyData;
import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.model.capabilities.IModelWrapper;
import com.minelittlepony.pony.IPonyData;
/** /**
* Container class for the various models and their associated piece of armour. * Container class for the various models and their associated piece of armour.

4
src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java
View file

@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.client.ForgeProxy; import com.minelittlepony.client.ForgeProxy;
import com.minelittlepony.common.model.armour.ArmourLayer; import com.minelittlepony.model.armour.ArmourLayer;
import com.minelittlepony.common.model.armour.IArmourTextureResolver; import com.minelittlepony.model.armour.IArmourTextureResolver;
import javax.annotation.Nullable; import javax.annotation.Nullable;

4
src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java
View file

@ -5,8 +5,8 @@ import net.minecraft.entity.Entity;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.IModel; import com.minelittlepony.model.IModel;
import com.minelittlepony.common.model.armour.IArmour; import com.minelittlepony.model.armour.IArmour;
public class ModelPonyArmor extends AbstractPonyModel implements IArmour { public class ModelPonyArmor extends AbstractPonyModel implements IArmour {

6
src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.client.model.armour; package com.minelittlepony.client.model.armour;
import com.minelittlepony.common.model.armour.ArmourLayer; import com.minelittlepony.model.armour.ArmourLayer;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
public class PonyArmor implements IEquestrianArmour<ModelPonyArmor> { public class PonyArmor implements IEquestrianArmour<ModelPonyArmor> {

2
src/client/java/com/minelittlepony/client/model/components/BatWings.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony.client.model.components;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import java.util.UUID; import java.util.UUID;

2
src/client/java/com/minelittlepony/client/model/components/BugWings.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.model.components; package com.minelittlepony.client.model.components;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
public class BugWings<T extends AbstractPonyModel & IPegasus> extends PegasusWings<T> { public class BugWings<T extends AbstractPonyModel & IPegasus> extends PegasusWings<T> {

2
src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
public class ModelBatWing<T extends AbstractPonyModel & IPegasus> extends ModelWing<T> { public class ModelBatWing<T extends AbstractPonyModel & IPegasus> extends ModelWing<T> {

2
src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
public class ModelBugWing<T extends AbstractPonyModel & IPegasus> extends ModelWing<T> { public class ModelBugWing<T extends AbstractPonyModel & IPegasus> extends ModelWing<T> {

4
src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java
View file

@ -2,8 +2,8 @@ package com.minelittlepony.client.model.components;
import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.pony.PonyData;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.ICapitated; import com.minelittlepony.model.ICapitated;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
import javax.annotation.Nullable; import javax.annotation.Nullable;

6
src/client/java/com/minelittlepony/client/model/components/ModelWing.java
View file

@ -2,9 +2,9 @@ package com.minelittlepony.client.model.components;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import com.minelittlepony.common.model.PonyModelConstants; import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

8
src/client/java/com/minelittlepony/client/model/components/PegasusWings.java
View file

@ -3,13 +3,13 @@ package com.minelittlepony.client.model.components;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID; import java.util.UUID;
import static com.minelittlepony.common.model.PonyModelConstants.*; import static com.minelittlepony.model.PonyModelConstants.*;
public class PegasusWings<T extends AbstractPonyModel & IPegasus> implements IPart { public class PegasusWings<T extends AbstractPonyModel & IPegasus> implements IPart {

2
src/client/java/com/minelittlepony/client/model/components/PonyElytra.java
View file

@ -10,7 +10,7 @@ import net.minecraft.util.math.Vec3d;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import static com.minelittlepony.common.model.PonyModelConstants.*; import static com.minelittlepony.model.PonyModelConstants.*;
/** /**
* Modified from ModelElytra. * Modified from ModelElytra.

10
src/client/java/com/minelittlepony/client/model/components/PonySnout.java
View file

@ -1,14 +1,14 @@
package com.minelittlepony.client.model.components; package com.minelittlepony.client.model.components;
import static com.minelittlepony.common.model.PonyModelConstants.*;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.model.ICapitated;
import com.minelittlepony.common.model.ICapitated; import com.minelittlepony.pony.meta.Gender;
import com.minelittlepony.common.pony.meta.Gender;
import static com.minelittlepony.model.PonyModelConstants.*;
public class PonySnout { public class PonySnout {

4
src/client/java/com/minelittlepony/client/model/components/PonyTail.java
View file

@ -5,11 +5,11 @@ import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import java.util.UUID; import java.util.UUID;
import static com.minelittlepony.common.model.PonyModelConstants.*; import static com.minelittlepony.model.PonyModelConstants.*;
public class PonyTail extends PlaneRenderer implements IPart { public class PonyTail extends PlaneRenderer implements IPart {

4
src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java
View file

@ -4,11 +4,11 @@ import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import java.util.UUID; 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.client.renderer.GlStateManager;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;

6
src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java
View file

@ -2,12 +2,12 @@ package com.minelittlepony.client.model.components;
import com.minelittlepony.client.util.render.GlowRenderer; import com.minelittlepony.client.util.render.GlowRenderer;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.ICapitated; import com.minelittlepony.model.ICapitated;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import java.util.UUID; 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.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

2
src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java
View file

@ -8,7 +8,7 @@ import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.util.render.PonyRenderer; 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 { public class ModelBreezie extends ModelBiped {

6
src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java
View file

@ -6,9 +6,9 @@ import com.minelittlepony.client.model.components.SeaponyTail;
import com.minelittlepony.client.model.races.ModelUnicorn; import com.minelittlepony.client.model.races.ModelUnicorn;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java
View file

@ -7,7 +7,7 @@ import net.minecraft.entity.passive.EntityVillager;
import com.minelittlepony.client.model.ModelMobPony; import com.minelittlepony.client.model.ModelMobPony;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; 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 { public class ModelVillagerPony extends ModelMobPony {

4
src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java
View file

@ -6,8 +6,8 @@ import net.minecraft.entity.monster.EntityWitch;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.model.races.ModelZebra; import com.minelittlepony.client.model.races.ModelZebra;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
public class ModelWitchPony extends ModelZebra { public class ModelWitchPony extends ModelZebra {

2
src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java
View file

@ -9,7 +9,7 @@ import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.minelittlepony.client.model.AbstractPonyModel; 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 { public abstract class AbstractGear extends ModelBase implements IGear, PonyModelConstants {

4
src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java
View file

@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.Color;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.Calendar; import java.util.Calendar;
import java.util.UUID; import java.util.UUID;

4
src/client/java/com/minelittlepony/client/model/gear/IGear.java
View file

@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.IPart; import com.minelittlepony.model.IPart;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;

4
src/client/java/com/minelittlepony/client/model/gear/Muffin.java
View file

@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID; import java.util.UUID;

6
src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java
View file

@ -2,9 +2,9 @@ package com.minelittlepony.client.model.gear;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID; import java.util.UUID;

4
src/client/java/com/minelittlepony/client/model/gear/Stetson.java
View file

@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.client.util.render.plane.PlaneRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID; import java.util.UUID;

4
src/client/java/com/minelittlepony/client/model/gear/WitchHat.java
View file

@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID; import java.util.UUID;

2
src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.model.races; package com.minelittlepony.client.model.races;
import com.minelittlepony.client.model.components.PegasusWings; import com.minelittlepony.client.model.components.PegasusWings;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races;
import com.minelittlepony.client.model.components.BatWings; import com.minelittlepony.client.model.components.BatWings;
import com.minelittlepony.client.util.render.PonyRenderer; 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 { public class ModelBatpony extends ModelPegasus {

2
src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony.client.model.races;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import com.minelittlepony.client.model.components.BugWings; 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 { public class ModelChangeling extends ModelAlicorn {

2
src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.model.races; package com.minelittlepony.client.model.races;
import com.minelittlepony.client.model.components.PegasusWings; import com.minelittlepony.client.model.components.PegasusWings;
import com.minelittlepony.common.model.IPegasus; import com.minelittlepony.model.IPegasus;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races;
import com.minelittlepony.client.model.components.UnicornHorn; import com.minelittlepony.client.model.components.UnicornHorn;
import com.minelittlepony.client.util.render.PonyRenderer; 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.entity.Entity;
import net.minecraft.util.EnumHandSide; import net.minecraft.util.EnumHandSide;

4
src/client/java/com/minelittlepony/client/model/races/ModelZebra.java
View file

@ -5,8 +5,8 @@ import net.minecraft.client.renderer.GlStateManager;
import com.minelittlepony.client.model.armour.ModelPonyArmor; import com.minelittlepony.client.model.armour.ModelPonyArmor;
import com.minelittlepony.client.model.armour.PonyArmor; import com.minelittlepony.client.model.armour.PonyArmor;
import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.PonyRenderer;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
public class ModelZebra extends ModelEarthPony { public class ModelZebra extends ModelEarthPony {

5
src/client/java/com/minelittlepony/client/model/races/PlayerModels.java
View file

@ -6,12 +6,11 @@ import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.model.entities.ModelSeapony; import com.minelittlepony.client.model.entities.ModelSeapony;
import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; import com.minelittlepony.client.render.entities.player.RenderPonyPlayer;
import com.minelittlepony.client.render.entities.player.RenderSeaponyPlayer; 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 net.minecraft.client.renderer.entity.RenderManager;
import com.voxelmodpack.hdskins.VanillaModels;
import java.util.Map; import java.util.Map;
public enum PlayerModels { public enum PlayerModels {

16
src/client/java/com/minelittlepony/client/pony/Pony.java
View file

@ -1,18 +1,18 @@
package com.minelittlepony.client.pony; package com.minelittlepony.client.pony;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.PonyRenderManager;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.client.transform.PonyTransformation;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.hdskins.resources.texture.IBufferedTexture;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.hdskins.util.ProfileTextureUtil;
import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.meta.Size; 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.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.block.material.Material;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

14
src/client/java/com/minelittlepony/client/pony/PonyData.java
View file

@ -3,13 +3,13 @@ package com.minelittlepony.client.pony;
import net.minecraft.client.resources.data.IMetadataSection; import net.minecraft.client.resources.data.IMetadataSection;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.common.pony.meta.Gender; import com.minelittlepony.pony.meta.Gender;
import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Size;
import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.pony.meta.TailLength;
import com.minelittlepony.common.pony.meta.TailLength; import com.minelittlepony.pony.meta.TriggerPixels;
import com.minelittlepony.common.pony.meta.TriggerPixels; import com.minelittlepony.pony.meta.Wearable;
import com.minelittlepony.util.animation.BasicEasingInterpolator; import com.minelittlepony.util.animation.BasicEasingInterpolator;
import com.minelittlepony.util.animation.IInterpolator; import com.minelittlepony.util.animation.IInterpolator;

14
src/client/java/com/minelittlepony/client/pony/PonyManager.java
View file

@ -3,15 +3,15 @@ package com.minelittlepony.client.pony;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.hdskins.ISkinCacheClearListener;
import com.minelittlepony.common.pony.IPonyManager; import com.minelittlepony.hdskins.util.MoreStreams;
import com.minelittlepony.common.settings.PonyConfig; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.settings.PonyLevel; 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.chron.ChronicCache;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import com.voxelmodpack.hdskins.ISkinCacheClearListener;
import com.voxelmodpack.hdskins.util.MoreStreams;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java
View file

@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import static net.minecraft.client.renderer.GlStateManager.*; import static net.minecraft.client.renderer.GlStateManager.*;

2
src/client/java/com/minelittlepony/client/render/FrustrumCheck.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
public class FrustrumCheck<T extends EntityLivingBase> implements ICamera { public class FrustrumCheck<T extends EntityLivingBase> implements ICamera {

4
src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -2,11 +2,11 @@ package com.minelittlepony.client.render;
import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GL14;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.ducks.IRenderItem;
import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer;
import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.Color;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.IPony;
import com.mumfrey.liteloader.client.overlays.IMinecraft; import com.mumfrey.liteloader.client.overlays.IMinecraft;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

4
src/client/java/com/minelittlepony/client/render/RenderPony.java
View file

@ -1,12 +1,12 @@
package com.minelittlepony.client.render; package com.minelittlepony.client.render;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.PonyRenderManager;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.transform.PonyPosture; import com.minelittlepony.client.transform.PonyPosture;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.IPony;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

6
src/client/java/com/minelittlepony/client/render/RenderPonyMob.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client.render; package com.minelittlepony.client.render;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.render.layer.LayerGear; 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.LayerPonyArmor;
import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyCustomHead;
import com.minelittlepony.client.render.layer.LayerPonyElytra; import com.minelittlepony.client.render.layer.LayerPonyElytra;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.hdskins.HDSkinManager;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import com.voxelmodpack.hdskins.HDSkinManager;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.culling.ICamera;

4
src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.client.render.entities; package com.minelittlepony.client.render.entities;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.PonyRenderManager;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.common.SensibleConfig.Setting;
import com.minelittlepony.common.settings.SensibleConfig.Setting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;

2
src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony.client.render.entities;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.util.resources.ITextureSupplier; import com.minelittlepony.util.resources.ITextureSupplier;
import java.io.IOException; import java.io.IOException;

4
src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client.render.entities.player; package com.minelittlepony.client.render.entities.player;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.render.DebugBoundingBoxRenderer; 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.LayerPonyCape;
import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyCustomHead;
import com.minelittlepony.client.render.layer.LayerPonyElytra; import com.minelittlepony.client.render.layer.LayerPonyElytra;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.IPony;
import net.minecraft.block.BlockBed; import net.minecraft.block.BlockBed;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

2
src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.render.entities.player; package com.minelittlepony.client.render.entities.player;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;

2
src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer;
import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.model.AbstractPonyModel; 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.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.RenderLivingBase;

2
src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java
View file

@ -5,7 +5,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.RenderLivingBase;
import com.minelittlepony.client.model.components.ModelDeadMau5Ears; import com.minelittlepony.client.model.components.ModelDeadMau5Ears;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
public class LayerDJPon3Head extends AbstractPonyLayer<AbstractClientPlayer> { public class LayerDJPon3Head extends AbstractPonyLayer<AbstractClientPlayer> {

2
src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java
View file

@ -10,7 +10,7 @@ import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
src/client/java/com/minelittlepony/client/render/layer/LayerGear.java
View file

@ -18,7 +18,7 @@ import com.minelittlepony.client.model.gear.Muffin;
import com.minelittlepony.client.model.gear.SaddleBags; import com.minelittlepony.client.model.gear.SaddleBags;
import com.minelittlepony.client.model.gear.Stetson; import com.minelittlepony.client.model.gear.Stetson;
import com.minelittlepony.client.model.gear.WitchHat; 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.HashMap;
import java.util.List; import java.util.List;

2
src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.render.layer; package com.minelittlepony.client.render.layer;
import com.minelittlepony.client.model.IClientModel; 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.Minecraft;
import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBiped;

2
src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer;
import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.PonyRenderManager;
import com.minelittlepony.client.util.render.PonyRenderer; 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.GlStateManager;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;

8
src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java
View file

@ -4,10 +4,10 @@ import com.minelittlepony.client.ForgeProxy;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.model.armour.DefaultPonyArmorTextureResolver; import com.minelittlepony.client.model.armour.DefaultPonyArmorTextureResolver;
import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.Color;
import com.minelittlepony.common.model.armour.ArmourLayer; import com.minelittlepony.model.armour.ArmourLayer;
import com.minelittlepony.common.model.armour.IArmour; import com.minelittlepony.model.armour.IArmour;
import com.minelittlepony.common.model.armour.IArmourTextureResolver; import com.minelittlepony.model.armour.IArmourTextureResolver;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelBiped;

4
src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.render.layer; package com.minelittlepony.client.render.layer;
import com.minelittlepony.client.model.AbstractPonyModel; 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.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.RenderLivingBase;
@ -12,7 +12,7 @@ import net.minecraft.util.math.MathHelper;
import javax.annotation.Nonnull; 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.*; import static net.minecraft.client.renderer.GlStateManager.*;
public class LayerPonyCape extends AbstractPonyLayer<AbstractClientPlayer> { public class LayerPonyCape extends AbstractPonyLayer<AbstractClientPlayer> {

2
src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
View file

@ -12,7 +12,7 @@ import com.minelittlepony.client.model.AbstractPonyModel;
import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.IClientModel;
import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; 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 com.mojang.authlib.GameProfile;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;

2
src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.render.layer; package com.minelittlepony.client.render.layer;
import com.minelittlepony.client.model.components.PonyElytra; 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.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

7
src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java
View file

@ -3,11 +3,12 @@ package com.minelittlepony.client.render.tileentities.skull;
import com.minelittlepony.client.model.components.ModelDeadMau5Ears; import com.minelittlepony.client.model.components.ModelDeadMau5Ears;
import com.minelittlepony.client.pony.Pony; import com.minelittlepony.client.pony.Pony;
import com.minelittlepony.client.render.RenderPony; import com.minelittlepony.client.render.RenderPony;
import com.minelittlepony.common.settings.PonyConfig; import com.minelittlepony.hdskins.HDSkinManager;
import com.minelittlepony.common.settings.PonyLevel; import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.settings.PonyLevel;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.voxelmodpack.hdskins.HDSkinManager;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.DefaultPlayerSkin;

2
src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java
View file

@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft;
import com.minelittlepony.client.model.components.ModelPonyHead; import com.minelittlepony.client.model.components.ModelPonyHead;
import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull; 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 { public abstract class PonySkull implements ISkull {

6
src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.client.render.tileentities.skull; package com.minelittlepony.client.render.tileentities.skull;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.ducks.IRenderItem;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.common.pony.IPony; import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.common.settings.PonyConfig;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mumfrey.liteloader.util.ModUtilities; import com.mumfrey.liteloader.util.ModUtilities;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;

2
src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java
View file

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

2
src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java
View file

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

2
src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java
View file

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

6
src/client/java/com/minelittlepony/client/transform/PonyTransformation.java
View file

@ -6,9 +6,9 @@ import static net.minecraft.client.renderer.GlStateManager.translate;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.IModel; import com.minelittlepony.model.IModel;
import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.pony.meta.Size;
import java.util.Map; import java.util.Map;

6
src/common/java/com/minelittlepony/common/MineLittlePony.java → src/common/java/com/minelittlepony/MineLittlePony.java
View file

@ -1,10 +1,10 @@
package com.minelittlepony.common; package com.minelittlepony;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import com.minelittlepony.common.pony.IPonyManager; import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.common.settings.PonyConfig; import com.minelittlepony.settings.PonyConfig;
public abstract class MineLittlePony { public abstract class MineLittlePony {

2
src/common/java/com/minelittlepony/common/MissingRendererException.java → src/common/java/com/minelittlepony/MissingRendererException.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common; package com.minelittlepony;
public class MissingRendererException extends RuntimeException { public class MissingRendererException extends RuntimeException {
private static final long serialVersionUID = -6059469512902628663L; private static final long serialVersionUID = -6059469512902628663L;

4
src/common/java/com/minelittlepony/common/settings/SensibleConfig.java → src/common/java/com/minelittlepony/common/SensibleConfig.java
View file

@ -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. * A sensible config container that actually lets us programmatically index values by a key.

7
src/common/java/com/minelittlepony/common/model/armour/package-info.java
View file

@ -1,7 +0,0 @@
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package com.minelittlepony.common.model.armour;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.hdskins.entity; package com.minelittlepony.hdskins.entity;
import com.minelittlepony.hdskins.gui.EntityPlayerModel;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.voxelmodpack.hdskins.gui.EntityPlayerModel;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

2
src/common/java/com/minelittlepony/common/model/BodyPart.java → src/common/java/com/minelittlepony/model/BodyPart.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
public enum BodyPart { public enum BodyPart {
HEAD, HEAD,

2
src/common/java/com/minelittlepony/common/model/ICapitated.java → src/common/java/com/minelittlepony/model/ICapitated.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
import javax.annotation.Nullable; import javax.annotation.Nullable;

12
src/common/java/com/minelittlepony/common/model/IModel.java → src/common/java/com/minelittlepony/model/IModel.java
View file

@ -1,10 +1,10 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
import com.minelittlepony.common.model.BodyPart; import com.minelittlepony.model.BodyPart;
import com.minelittlepony.common.model.armour.IEquestrianArmour; import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Size;
import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.pony.meta.Wearable;
public interface IModel { public interface IModel {

2
src/common/java/com/minelittlepony/common/model/IPart.java → src/common/java/com/minelittlepony/model/IPart.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
import java.util.UUID; import java.util.UUID;

6
src/common/java/com/minelittlepony/common/model/IPegasus.java → src/common/java/com/minelittlepony/model/IPegasus.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import static com.minelittlepony.common.model.PonyModelConstants.ROTATE_270; import static com.minelittlepony.model.PonyModelConstants.ROTATE_270;
import static com.minelittlepony.common.model.PonyModelConstants.WING_ROT_Z_SNEAK; import static com.minelittlepony.model.PonyModelConstants.WING_ROT_Z_SNEAK;
public interface IPegasus extends IModel { public interface IPegasus extends IModel {

2
src/common/java/com/minelittlepony/common/model/IUnicorn.java → src/common/java/com/minelittlepony/model/IUnicorn.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
import net.minecraft.util.EnumHandSide; import net.minecraft.util.EnumHandSide;

2
src/common/java/com/minelittlepony/common/model/PonyModelConstants.java → src/common/java/com/minelittlepony/model/PonyModelConstants.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model; package com.minelittlepony.model;
public interface PonyModelConstants { public interface PonyModelConstants {

2
src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java → src/common/java/com/minelittlepony/model/armour/ArmourLayer.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model.armour; package com.minelittlepony.model.armour;
/** /**
* The layer used to render a given armour piece. * The layer used to render a given armour piece.

4
src/common/java/com/minelittlepony/common/model/armour/IArmour.java → src/common/java/com/minelittlepony/model/armour/IArmour.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.common.model.armour; package com.minelittlepony.model.armour;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;
import com.minelittlepony.common.model.IModel; import com.minelittlepony.model.IModel;
public interface IArmour { public interface IArmour {
/** /**

2
src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java → src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model.armour; package com.minelittlepony.model.armour;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;

2
src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java → src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.model.armour; package com.minelittlepony.model.armour;
import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.model.capabilities.IModelWrapper;

2
src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java → src/common/java/com/minelittlepony/model/armour/package-info.java
View file

@ -1,6 +1,6 @@
@MethodsReturnNonnullByDefault @MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
package com.voxelmodpack.hdskins.server; package com.minelittlepony.model.armour;
import mcp.MethodsReturnNonnullByDefault; import mcp.MethodsReturnNonnullByDefault;

2
src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.model.capabilities; package com.minelittlepony.model.capabilities;
import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.pony.IPonyData;
public interface IModelWrapper { public interface IModelWrapper {
/** /**

6
src/common/java/com/minelittlepony/common/pony/IPony.java → src/common/java/com/minelittlepony/pony/IPony.java
View file

@ -1,12 +1,12 @@
package com.minelittlepony.common.pony; package com.minelittlepony.pony;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import com.minelittlepony.common.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.pony.meta.Race;
public interface IPony { public interface IPony {

12
src/common/java/com/minelittlepony/common/pony/IPonyData.java → src/common/java/com/minelittlepony/pony/IPonyData.java
View file

@ -1,10 +1,10 @@
package com.minelittlepony.common.pony; package com.minelittlepony.pony;
import com.minelittlepony.common.pony.meta.Gender; import com.minelittlepony.pony.meta.Gender;
import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.common.pony.meta.Wearable; import com.minelittlepony.pony.meta.Size;
import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.pony.meta.TailLength;
import com.minelittlepony.common.pony.meta.TailLength; import com.minelittlepony.pony.meta.Wearable;
import com.minelittlepony.util.animation.IInterpolator; import com.minelittlepony.util.animation.IInterpolator;
import java.util.UUID; import java.util.UUID;

2
src/common/java/com/minelittlepony/common/pony/IPonyManager.java → src/common/java/com/minelittlepony/pony/IPonyManager.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.common.pony; package com.minelittlepony.pony;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

2
src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java → src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java
View file

@ -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. * Interface for enums that can be parsed from an image trigger pixel value.

4
src/common/java/com/minelittlepony/common/pony/meta/Gender.java → src/common/java/com/minelittlepony/pony/meta/Gender.java
View file

@ -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<Gender> { public enum Gender implements ITriggerPixelMapped<Gender> {
MARE(0), MARE(0),

Some files were not shown because too many files have changed in this diff Show more