EntityRenderer, most of RenderGlobal, minor fix to LayerBipedArmor.

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -49,6 +49,7 @@ import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -100,7 +101,7 @@ public class ForgeHooksClient
         return FMLClientHandler.instance().getClient().renderEngine;
     }
 
-    public static String getArmorTexture(Entity entity, ItemStack armor, String _default, int slot, String type)
+    public static String getArmorTexture(Entity entity, ItemStack armor, String _default, EntityEquipmentSlot slot, String type)
     {
         String result = armor.getItem().getArmorTexture(armor, entity, slot, type);
         return result != null ? result : _default;
@@ -119,9 +120,9 @@ public class ForgeHooksClient
         }
     }
 
-    public static boolean onDrawBlockHighlight(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, ItemStack currentItem, float partialTicks)
+    public static boolean onDrawBlockHighlight(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, float partialTicks)
     {
-        return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent(context, player, target, subID, currentItem, partialTicks));
+        return MinecraftForge.EVENT_BUS.post(new DrawBlockHighlightEvent(context, player, target, subID, partialTicks));
     }
 
     public static void dispatchRenderLast(RenderGlobal context, float partialTicks)
@@ -164,9 +165,9 @@ public class ForgeHooksClient
         renderLayer.set(layer);
     }
 
-    public static ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int slotID, ModelBiped _default)
+    public static ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot slot, ModelBiped _default)
     {
-        ModelBiped model = itemStack.getItem().getArmorModel(entityLiving, itemStack, slotID, _default);
+        ModelBiped model = itemStack.getItem().getArmorModel(entityLiving, itemStack, slot, _default);
         return model == null ? _default : model;
     }
 
@@ -203,8 +204,8 @@ public class ForgeHooksClient
         return fovUpdateEvent.newfov;
     }
 
-    public static float getFOVModifier(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, float fov) {
-        EntityViewRenderEvent.FOVModifier event = new EntityViewRenderEvent.FOVModifier(renderer, entity, block, renderPartialTicks, fov);
+    public static float getFOVModifier(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, float fov) {
+        EntityViewRenderEvent.FOVModifier event = new EntityViewRenderEvent.FOVModifier(renderer, entity, state, renderPartialTicks, fov);
         MinecraftForge.EVENT_BUS.post(event);
         return event.getFOV();
     }
@@ -318,16 +319,16 @@ public class ForgeHooksClient
         MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.DrawScreenEvent.Post(screen, mouseX, mouseY, partialTicks));
     }
 
-    public static float getFogDensity(EntityRenderer renderer, Entity entity, Block block, float partial, float density)
+    public static float getFogDensity(EntityRenderer renderer, Entity entity, IBlockState state, float partial, float density)
     {
-        EntityViewRenderEvent.FogDensity event = new EntityViewRenderEvent.FogDensity(renderer, entity, block, partial, density);
+        EntityViewRenderEvent.FogDensity event = new EntityViewRenderEvent.FogDensity(renderer, entity, state, partial, density);
         if (MinecraftForge.EVENT_BUS.post(event)) return event.density;
         return -1;
     }
 
-    public static void onFogRender(EntityRenderer renderer, Entity entity, Block block, float partial, int mode, float distance)
+    public static void onFogRender(EntityRenderer renderer, Entity entity, IBlockState state, float partial, int mode, float distance)
     {
-        MinecraftForge.EVENT_BUS.post(new EntityViewRenderEvent.RenderFogEvent(renderer, entity, block, partial, mode, distance));
+        MinecraftForge.EVENT_BUS.post(new EntityViewRenderEvent.RenderFogEvent(renderer, entity, state, partial, mode, distance));
     }
 
     /*

src/main/java/net/minecraftforge/client/event/DrawBlockHighlightEvent.java

@@ -14,7 +14,6 @@ public class DrawBlockHighlightEvent extends Event
     public final EntityPlayer player;
     public final RayTraceResult target;
     public final int subID;
-    public final ItemStack currentItem;
     public final float partialTicks;
 
     public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, ItemStack currentItem, float partialTicks)
@@ -23,7 +22,6 @@ public class DrawBlockHighlightEvent extends Event
         this.player = player;
         this.target = target;
         this.subID = subID;
-        this.currentItem = currentItem;
         this.partialTicks= partialTicks;
     }
 

src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java

@@ -1,6 +1,7 @@
 package net.minecraftforge.client.event;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraftforge.fml.common.eventhandler.Cancelable;
@@ -12,20 +13,40 @@ import net.minecraftforge.fml.common.eventhandler.Event;
  */
 public abstract class EntityViewRenderEvent extends Event
 {
-    public final EntityRenderer renderer;
-    public final Entity entity;
-    public final Block block;
-    public final double renderPartialTicks;
+    private final EntityRenderer renderer;
+    private final Entity entity;
+    private final IBlockState state;
+    private final double renderPartialTicks;
 
-    public EntityViewRenderEvent(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks)
+    public EntityViewRenderEvent(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks)
     {
         this.renderer = renderer;
         this.entity = entity;
-        this.block = block;
+        this.state = state;
         this.renderPartialTicks = renderPartialTicks;
     }
 
-    /**
+    public EntityRenderer getRenderer()
+    {
+	    return renderer;
+	}
+
+    public Entity getEntity()
+    {
+        return entity;
+    }
+
+    public IBlockState getState()
+    {
+        return state;
+    }
+
+    public double getRenderPartialTicks()
+    {
+        return renderPartialTicks;
+    }
+
+	/**
      * Event that allows any feature to customize the fog density the player sees.
      * NOTE: In order to make this event have an effect, you must cancel the event
      */
@@ -34,9 +55,9 @@ public abstract class EntityViewRenderEvent extends Event
     {
         public float density;
 
-        public FogDensity(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, float density)
+        public FogDensity(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, float density)
         {
-            super(renderer, entity, block, renderPartialTicks);
+            super(renderer, entity, state, renderPartialTicks);
             this.density = density;
         }
     }
@@ -50,9 +71,9 @@ public abstract class EntityViewRenderEvent extends Event
         public final int fogMode;
         public final float farPlaneDistance;
 
-        public RenderFogEvent(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, int fogMode, float farPlaneDistance)
+        public RenderFogEvent(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, int fogMode, float farPlaneDistance)
         {
-            super(renderer, entity, block, renderPartialTicks);
+            super(renderer, entity, state, renderPartialTicks);
             this.fogMode = fogMode;
             this.farPlaneDistance = farPlaneDistance;
         }
@@ -68,9 +89,9 @@ public abstract class EntityViewRenderEvent extends Event
         public float green;
         public float blue;
 
-        public FogColors(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, float red, float green, float blue)
+        public FogColors(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, float red, float green, float blue)
         {
-            super(renderer, entity, block, renderPartialTicks);
+            super(renderer, entity, state, renderPartialTicks);
             this.red = red;
             this.green = green;
             this.blue = blue;
@@ -86,9 +107,9 @@ public abstract class EntityViewRenderEvent extends Event
         public float pitch;
         public float roll;
 
-        public CameraSetup(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, float yaw, float pitch, float roll)
+        public CameraSetup(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, float yaw, float pitch, float roll)
         {
-            super(renderer, entity, block, renderPartialTicks);
+            super(renderer, entity, state, renderPartialTicks);
             this.yaw = yaw;
             this.pitch = pitch;
             this.roll = roll;
@@ -103,8 +124,8 @@ public abstract class EntityViewRenderEvent extends Event
     {
         private float fov;
         
-        public FOVModifier(EntityRenderer renderer, Entity entity, Block block, double renderPartialTicks, float fov) {
-            super(renderer, entity, block, renderPartialTicks);
+        public FOVModifier(EntityRenderer renderer, Entity entity, IBlockState state, double renderPartialTicks, float fov) {
+            super(renderer, entity, state, renderPartialTicks);
             this.setFOV(fov);
         }