final push for 1.10.2

src/main/java/com/flemmli97/fatemod/client/model/servant/ModelArthur.java

@@ -1,9 +1,5 @@
 package com.flemmli97.fatemod.client.model.servant;
 
-import org.lwjgl.opengl.GL11;
-
-import com.flemmli97.fatemod.common.entity.servant.EntityArthur;
-
 import net.minecraft.entity.Entity;
 
 public class ModelArthur extends ModelServant {

src/main/java/com/flemmli97/fatemod/client/render/RenderEA.java

@@ -11,7 +11,6 @@
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.Vec3d;
 
 public class RenderEA<T extends EntityEnumaElish> extends RenderProjectileBase<T>{
 

src/main/java/com/flemmli97/fatemod/client/render/RenderExcalibur.java

@@ -11,7 +11,6 @@
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.Vec3d;
 
 public class RenderExcalibur<T extends EntityExcalibur> extends RenderProjectileBase<T>{
 

src/main/java/com/flemmli97/fatemod/client/render/RenderGordiusWheel.java

@@ -0,0 +1,24 @@
+package com.flemmli97.fatemod.client.render;
+
+import com.flemmli97.fatemod.Fate;
+import com.flemmli97.fatemod.client.model.ModelGordiusWheel;
+import com.flemmli97.fatemod.common.entity.EntityGordiusWheel;
+
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderGordiusWheel extends RenderLiving<EntityGordiusWheel>{
+
+	public static ResourceLocation tex = new ResourceLocation(Fate.MODID+":textures/entity/gordiusWheel.png");
+
+	public RenderGordiusWheel(RenderManager rendermanagerIn) {
+		super(rendermanagerIn, new ModelGordiusWheel(), 1);
+	}
+
+	@Override
+	protected ResourceLocation getEntityTexture(EntityGordiusWheel entity) {
+		return tex;
+	}
+
+}

src/main/java/com/flemmli97/fatemod/client/render/layer/LayerHand.java

@@ -11,7 +11,6 @@
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
@@ -21,7 +20,6 @@
 import net.minecraft.client.renderer.entity.RenderLivingBase;
 import net.minecraft.client.renderer.entity.layers.LayerRenderer;
 import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.entity.EntityLivingBase;
@@ -31,7 +29,6 @@
 import net.minecraft.util.EnumHandSide;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -180,7 +177,8 @@ public static void renderQuadColor(VertexBuffer wr, BakedQuad quad, int auxColor
         putQuadColor(wr, quad, auxColor);
     }
 
-    public static void putQuadColor(VertexBuffer renderer, BakedQuad quad, int color)
+    @SuppressWarnings("unused")
+	public static void putQuadColor(VertexBuffer renderer, BakedQuad quad, int color)
     {
         float cb = color & 0xFF;
         float cg = (color >>> 8) & 0xFF;

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderArthur.java

@@ -18,7 +18,8 @@ public RenderArthur(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityArthur entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityArthur entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderCuchulainn.java

@@ -18,7 +18,8 @@ public RenderCuchulainn(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityCuchulainn entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityCuchulainn entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderDiarmuid.java

@@ -19,7 +19,8 @@ public RenderDiarmuid(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityDiarmuid entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityDiarmuid entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderEmiya.java

@@ -18,7 +18,8 @@ public RenderEmiya(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityEmiya entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityEmiya entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderGilgamesh.java

@@ -19,7 +19,8 @@ public RenderGilgamesh(RenderManager manager)
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityGilgamesh entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityGilgamesh entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderGilles.java

@@ -19,7 +19,8 @@ public RenderGilles(RenderManager renderManager)
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityGilles entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityGilles entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderHassan.java

@@ -18,7 +18,8 @@ public RenderHassan(RenderManager renderManager)
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityHassan entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityHassan entity)
     {
         return textures;
     }    

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderHassanCopy.java

@@ -0,0 +1,27 @@
+package com.flemmli97.fatemod.client.render.servant;
+
+import com.flemmli97.fatemod.Fate;
+import com.flemmli97.fatemod.client.model.servant.ModelHassan;
+import com.flemmli97.fatemod.common.entity.servant.EntityHassanCopy;
+
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.util.ResourceLocation;
+
+public class RenderHassanCopy extends RenderServant<EntityHassanCopy>
+{
+    private static final ResourceLocation textures = new ResourceLocation(Fate.MODID + ":textures/entity/servant/hassan.png");
+    public RenderHassanCopy(RenderManager renderManager)
+    {
+        super(renderManager, new ModelHassan(), 0.5F);
+    }
+
+    /**
+     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
+     */
+    @Override
+    protected ResourceLocation servantTexture(EntityHassanCopy entity)
+    {
+        return textures;
+    }    
+
+}

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderHeracles.java

@@ -18,7 +18,8 @@ public RenderHeracles(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityHeracles entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityHeracles entity)
     {
         return textures;
     }   

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderIskander.java

@@ -18,7 +18,8 @@ public RenderIskander(RenderManager renderManager)
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityIskander entityIskander)
+    @Override
+    protected ResourceLocation servantTexture(EntityIskander entityIskander)
     {
         return textures;
     }    

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderLancelot.java

@@ -18,7 +18,8 @@ public RenderLancelot(RenderManager renderManager)
     /**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityLancelot entityLancelot)
+    @Override
+    protected ResourceLocation servantTexture(EntityLancelot entityLancelot)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderMedea.java

@@ -20,6 +20,7 @@ public RenderMedea(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
+    @Override
     protected ResourceLocation getEntityTexture(EntityMedea entity)
     {
         return textures;

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderMedusa.java

@@ -18,7 +18,8 @@ public RenderMedusa(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntityMedusa entity)
+    @Override
+    protected ResourceLocation servantTexture(EntityMedusa entity)
     {
         return textures;
     }

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderSasaki.java

@@ -18,7 +18,8 @@ public RenderSasaki(RenderManager renderManager)
 	/**
      * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
      */
-    protected ResourceLocation getEntityTexture(EntitySasaki entitySasaki)
+    @Override
+    protected ResourceLocation servantTexture(EntitySasaki entitySasaki)
     {
         return textures;
     }    

src/main/java/com/flemmli97/fatemod/client/render/servant/RenderServant.java

@@ -8,16 +8,16 @@
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.layers.LayerCustomHead;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 
-public class RenderServant<T extends EntityServant> extends RenderLiving<T>{
+public abstract class RenderServant<T extends EntityServant> extends RenderLiving<T>{
 
 
     private static final ResourceLocation DEFAULT_RES_LOC = new ResourceLocation("textures/entity/steve.png");
     protected ModelServant modelServantMain;
+    protected ModelServant defaultModel = new ModelServant();
     protected float scale;
 
     public RenderServant(RenderManager renderManagerIn, ModelServant modelServant, float shadowSize)
@@ -29,9 +29,9 @@ public RenderServant(RenderManager renderManagerIn, ModelServant modelServant, f
     }
 
     @Override
-	protected void preRenderCallback(T entitylivingbaseIn, float partialTickTime) {
-    	ItemStack stackMain = entitylivingbaseIn.stackFromHand(EnumHand.MAIN_HAND);
-    	ItemStack stackOff = entitylivingbaseIn.stackFromHand(EnumHand.OFF_HAND);
+	protected void preRenderCallback(T servant, float partialTickTime) {
+    	ItemStack stackMain = servant.stackFromHand(EnumHand.MAIN_HAND);
+    	ItemStack stackOff = servant.stackFromHand(EnumHand.OFF_HAND);
 		modelServantMain.heldItemMain = 0;
 		modelServantMain.heldItemOff = 0;
     	if(stackMain!=null)
@@ -42,26 +42,26 @@ protected void preRenderCallback(T entitylivingbaseIn, float partialTickTime) {
     	{
     		modelServantMain.heldItemOff = 1;
     	}
-		super.preRenderCallback(entitylivingbaseIn, partialTickTime);
+    	if(!servant.showServant())
+    		this.mainModel=this.defaultModel;
+		super.preRenderCallback(servant, partialTickTime);
 	}
 
 	@Override
 	public void doRender(T entity, double x, double y, double z, float entityYaw, float partialTicks) {
     	super.doRender(entity, x, y, z, entityYaw, partialTicks);
 	}
-
+	@Override
 	protected ResourceLocation getEntityTexture(T entity)
     {
-        return DEFAULT_RES_LOC;
+        return entity.showServant()?this.servantTexture(entity):DEFAULT_RES_LOC;
     }
-
+
+	protected abstract ResourceLocation servantTexture(T entity);
+
+	@Override
     public void transformHeldFull3DItemLayer()
     {
         GlStateManager.translate(0.0F, 0.1875F, 0.0F);
     }
-
-    protected int shouldRenderPass(EntityLiving entity, int par1, float par2)
-    {
-        return -1;
-    }
 }