Changed render hook checks to all use ItemStack instead of itemID

This commit is contained in:
newthead committed 2012-03-19 11:37:51 -07:00
1 parent 0597c30ac2
commit be07279984
5 files changed
+36 -29

No files matched your search

@@ -259,7 +259,7 @@ public class ForgeHooksClient
public static void renderEquippedItem(IItemRenderer customRenderer, RenderBlocks renderBlocks, EntityLiving entity, ItemStack item)
{
if (customRenderer.renderEquippedItemAsBlock(item.itemID))
if (customRenderer.renderEquippedItemAsBlock(item))
{
GL11.glPushMatrix();
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
@@ -8,12 +8,12 @@ import net.minecraft.src.RenderBlocks;
public interface IItemRenderer
{
/** Checks if this renderer should handle a specific item's render type
* @param itemID The item we are trying to render
* @param item The item we are trying to render
* @param type A render type to check if this renderer handles
* @return true if this renderer should handle the given render type,
* otherwise false
*/
public boolean handleRenderType(int itemID, ItemRenderType type);
public boolean handleRenderType(ItemStack item, ItemRenderType type);
/** Called to render an in-world item, e.g. one that has been thrown or
* dropped. The appropriate OpenGL transformations and scaling have already
@@ -26,15 +26,17 @@ public interface IItemRenderer
/** Determines if a rotation effect should be used when rendering an
* EntityItem, like most default blocks do.
* @param item the item we are trying to render
* @return true if the EntityItem should rotate, otherwise false
*/
public boolean useEntityItemRotationEffect(int itemID);
public boolean useEntityItemRotationEffect(ItemStack item);
/** Determines if an up-and-down bobbing effect should be used when
* rendering an EntityItem, like all default blocks and items do.
* @param item the item we are trying to render
* @return true if the EntityItem should bob up and down, otherwise false
*/
public boolean useEntityItemBobbingEffect(int itemID);
public boolean useEntityItemBobbingEffect(ItemStack item);
/** Called to render an item currently held in-hand by a living entity. If
* rendering as a 3D block, the item will be rotated to a 45-degree angle.
@@ -49,10 +51,11 @@ public interface IItemRenderer
/** Determines if the currently equipped item should be rendered as a 3D
* block or as a 2D texture.
* @param item the item we are trying to render
* @return true if the equipped item should be rendered as a 3D block,
* otherwise false
*/
public boolean renderEquippedItemAsBlock(int itemID);
public boolean renderEquippedItemAsBlock(ItemStack item);
/** Called to render an item in a GUI inventory slot. If rendering as a 3D
* block, the appropriate OpenGL translations and scaling have already been
@@ -66,9 +69,10 @@ public interface IItemRenderer
/** Determines if the item should be rendered in GUI inventory slots as a 3D
* block or as a 2D texture.
* @param item the item we are trying to render
* @return true if the inventory item should be rendered as a 3D block,
* otherwise false
*/
public boolean renderInventoryItemAsBlock(int itemID);
public boolean renderInventoryItemAsBlock(ItemStack item);
}
@@ -7,6 +7,7 @@ package net.minecraft.src.forge;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.ModLoader;
import net.minecraft.src.RenderBlocks;
@@ -98,11 +99,11 @@ public class MinecraftForgeClient
customItemRenderers[itemID] = renderer;
}
public static IItemRenderer getItemRenderer(int itemID, ItemRenderType type)
public static IItemRenderer getItemRenderer(ItemStack item, ItemRenderType type)
{
IItemRenderer renderer = customItemRenderers[itemID];
if (renderer != null && renderer.handleRenderType(itemID, type)) {
return renderer;
IItemRenderer renderer = customItemRenderers[item.itemID];
if (renderer != null && renderer.handleRenderType(item, type)) {
return customItemRenderers[item.itemID];
}
return null;
}
@@ -16,7 +16,7 @@
public void renderItem(EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3)
{
GL11.glPushMatrix();
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack.itemID, ItemRenderType.EQUIPPED);
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par2ItemStack, ItemRenderType.EQUIPPED);
- if (par2ItemStack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par2ItemStack.itemID].getRenderType()))
+ if (customRenderer != null)
@@ -34,9 +34,9 @@
- GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/terrain.png"));
+ GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", par2ItemStack.getItem())));
+ this.renderBlocksInstance.renderBlockAsItem(Block.blocksList[par2ItemStack.itemID], par2ItemStack.getItemDamage(), 1.0F);
}
else
{
}
else
{
- GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture("/gui/items.png"));
- }
+ GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.mc.renderEngine.getTexture(ForgeHooksClient.getTexture(par2ItemStack.itemID < 256 ? "/terrain.png" : "/gui/items.png", Block.blocksList[par2ItemStack.itemID])));
@@ -17,20 +17,21 @@
float var18;
float var23;
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(var10.itemID, ItemRenderType.ENTITY);
- if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(var10, ItemRenderType.ENTITY);
+ if (customRenderer != null)
+ {
+ if (customRenderer.useEntityItemRotationEffect(var10.itemID))
{
+ if (customRenderer.useEntityItemRotationEffect(var10))
+ {
+ GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F);
+ }
+ if (!customRenderer.useEntityItemBobbingEffect(var10.itemID))
+ if (!customRenderer.useEntityItemBobbingEffect(var10))
+ {
+ GL11.glTranslatef(0.0F, -var11, 0.0F);
+ }
+
if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
{
+ if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
+ {
+ this.loadTexture(ForgeHooksClient.getTexture("/terrain.png", var10.getItem()));
+ float var21 = 0.25F;
+ var15 = Block.blocksList[var10.itemID].getRenderType();
@@ -127,16 +128,16 @@
}
var8 = Item.itemsList[par3].getColorFromDamage(par4, 0);
@@ -279,7 +332,59 @@
@@ -279,8 +332,59 @@
{
if (par3ItemStack != null)
{
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par3ItemStack.itemID, ItemRenderType.INVENTORY);
- this.drawItemIntoGui(par1FontRenderer, par2RenderEngine, par3ItemStack.itemID, par3ItemStack.getItemDamage(), par3ItemStack.getIconIndex(), par4, par5);
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(par3ItemStack, ItemRenderType.INVENTORY);
+ if (customRenderer != null)
+ {
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(ForgeHooksClient.getTexture(par3ItemStack.itemID < 256 ? "/terrain.png" : "/gui/items.png", Item.itemsList[par3ItemStack.itemID])));
+
+ if (customRenderer.renderInventoryItemAsBlock(par3ItemStack.itemID))
+ if (customRenderer.renderInventoryItemAsBlock(par3ItemStack))
+ {
+ GL11.glPushMatrix();
+ GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel);
@@ -164,7 +165,7 @@
+ GL11.glDisable(GL11.GL_LIGHTING);
+ GL11.glPushMatrix();
+ GL11.glTranslatef((float)(par4), (float)(par5), -3.0F + this.zLevel);
+
+ int color = Item.itemsList[par3ItemStack.itemID].getColorFromDamage(par4, 0);
+ float r = (float)(color >> 16 & 255) / 255.0F;
+ float g = (float)(color >> 8 & 255) / 255.0F;
@@ -182,8 +183,9 @@
+ }
+ else
+ {
this.drawItemIntoGui(par1FontRenderer, par2RenderEngine, par3ItemStack.itemID, par3ItemStack.getItemDamage(), par3ItemStack.getIconIndex(), par4, par5);
+ this.drawItemIntoGui(par1FontRenderer, par2RenderEngine, par3ItemStack.itemID, par3ItemStack.getItemDamage(), par3ItemStack.getIconIndex(), par4, par5);
+ }
+
if (par3ItemStack != null && par3ItemStack.hasEffect())
{
GL11.glDepthFunc(GL11.GL_GREATER);