make homunculi leashable

2 files changed, 4 insertions, 9 deletions

diff --git a/src/main/java/com/mondecitronne/homunculus/EntityHomunculus.java b/src/main/java/com/mondecitronne/homunculus/EntityHomunculus.java
index 548aa78..bf2332b 100644
--- a/src/main/java/com/mondecitronne/homunculus/EntityHomunculus.java
+++ b/src/main/java/com/mondecitronne/homunculus/EntityHomunculus.java
@@ -7,7 +7,7 @@ import com.mondecitronne.homunculus.skin.HTTPSkin;
 import com.mondecitronne.homunculus.skin.PlayerSkin;
 import com.mondecitronne.homunculus.skin.Skin;
 import io.netty.util.internal.StringUtil;
-import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityCreature;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTUtil;
 import net.minecraft.network.datasync.DataParameter;
@@ -15,7 +15,7 @@ import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.network.datasync.EntityDataManager;
 import net.minecraft.world.World;
 
-public class EntityHomunculus extends EntityLiving {
+public class EntityHomunculus extends EntityCreature {
 	private static final DataParameter<NBTTagCompound> SKIN_SOURCE = EntityDataManager.createKey(EntityHomunculus.class,
 			DataSerializers.COMPOUND_TAG);
 
diff --git a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
index 804cf85..5cdceb7 100644
--- a/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
+++ b/src/main/java/com/mondecitronne/homunculus/client/RenderHomunculus.java
@@ -5,13 +5,13 @@ import javax.annotation.Nonnull;
 import com.google.common.collect.Maps;
 import com.mondecitronne.homunculus.EntityHomunculus;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderLivingBase;
+import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraftforge.fml.client.registry.IRenderFactory;
 import net.minecraft.client.model.ModelPlayer;
 import net.minecraft.util.ResourceLocation;
 
-public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> {
+public class RenderHomunculus extends RenderLiving<EntityHomunculus> {
 	public static final Factory FACTORY = new Factory();
 	private final Map<String, ModelPlayer> modelTypes = Maps.<String, ModelPlayer>newHashMap();
 
@@ -37,11 +37,6 @@ public class RenderHomunculus extends RenderLivingBase<EntityHomunculus> {
 		super.doRender(entity, x, y, z, entityYaw, partialTicks);
 	}
 
-	@Override
-	protected boolean canRenderName(EntityHomunculus entity) {
-		return super.canRenderName(entity) && entity.hasCustomName();
-	}
-
 	public static class Factory implements IRenderFactory<EntityHomunculus> {
 		@Override
 		public Render<? super EntityHomunculus> createRenderFor(RenderManager manager) {