diff options
Diffstat (limited to 'src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java')
-rw-r--r-- | src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java index 5523f3d..159602a 100644 --- a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java +++ b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java @@ -4,11 +4,9 @@ import java.util.Map; import javax.annotation.Nonnull; import com.google.common.collect.Maps; import com.mondecitronne.homunculus.EntityHomunculus; -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.minecraft.client.model.ModelPlayer; import net.minecraft.util.ResourceLocation; @@ -25,33 +23,17 @@ public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> { @Nonnull public String getModelType(EntityHomunculus entity) { - String modelType = DefaultPlayerSkin.getSkinType(entity.getUniqueID()); - Skin skin = entity.getSkin(); - if (skin != null) { - String type = skin.getModelType(); - if (type != null) { - modelType = type; - } - } - return modelType; + return "default"; } @Override protected ResourceLocation getEntityTexture(@Nonnull EntityHomunculus entity) { - ResourceLocation texture = DefaultPlayerSkin.getDefaultSkin(entity.getUniqueID()); - Skin skin = entity.getSkin(); - if (skin != null) { - ResourceLocation tex = skin.getTexture(); - if (tex != null) { - texture = tex; - } - } - return texture; + return entity.getSkin().getTexture(); } @Override public void doRender(EntityHomunculus entity, double x, double y, double z, float entityYaw, float partialTicks) { - mainModel = modelTypes.get(getModelType(entity)); + mainModel = modelTypes.get(entity.getSkin().getModelType()); super.doRender(entity, x, y, z, entityYaw, partialTicks); } |