1 files changed, 3 insertions, 23 deletions

diff --git a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
index 16ade41..5523f3d 100644
--- a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
+++ b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
@@ -2,25 +2,17 @@ package com.mondecitronne.homunculus.client;
 
 import java.util.Map;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.collect.Maps;
 import com.mondecitronne.homunculus.EntityHomunculus;
-import com.mondecitronne.homunculus.PlayerSkin;
-import com.mondecitronne.homunculus.proxy.SkinHandlerClientProxy;
-import com.mondecitronne.homunculus.proxy.SkinHandlerProxy;
-
+import com.mondecitronne.homunculus.skin.Skin;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderLivingBase;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraftforge.fml.client.registry.IRenderFactory;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelPlayer;
 import net.minecraft.util.ResourceLocation;
 
-@SideOnly(Side.CLIENT)
 public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> {
 	public static final Factory FACTORY = new Factory();
 	private final Map<String, ModelPlayer> modelTypes = Maps.<String, ModelPlayer>newHashMap();
@@ -31,22 +23,10 @@ public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> {
         modelTypes.put("slim", new ModelPlayer(0.0F, true));
 	}
 	
-	@Nullable
-	protected static PlayerSkin getSkin(EntityHomunculus entity) {
-		SkinHandlerProxy.SkinOwner owner = entity.getSkinOwner();
-		if (owner != null) {
-			PlayerSkin skin = ((SkinHandlerClientProxy.SkinOwner) entity.getSkinOwner()).getPlayerSkin();
-			skin.loadSkin();
-			return skin;
-		} else {
-			return null;
-		}
-	}
-	
 	@Nonnull
 	public String getModelType(EntityHomunculus entity) {
 		String modelType = DefaultPlayerSkin.getSkinType(entity.getUniqueID());
-		PlayerSkin skin = getSkin(entity);
+		Skin skin = entity.getSkin();
 		if (skin != null) {
 			String type = skin.getModelType();
 			if (type != null) {
@@ -59,7 +39,7 @@ public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> {
 	@Override
 	protected ResourceLocation getEntityTexture(@Nonnull EntityHomunculus entity) {
 		ResourceLocation texture = DefaultPlayerSkin.getDefaultSkin(entity.getUniqueID());
-		PlayerSkin skin = getSkin(entity);
+		Skin skin = entity.getSkin();
 		if (skin != null) {
 			ResourceLocation tex = skin.getTexture();
 			if (tex != null) {