116 lines
5.0 KiB
Diff
116 lines
5.0 KiB
Diff
--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000
|
|
+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000
|
|
@@ -1,6 +1,9 @@
|
|
package net.minecraft.src;
|
|
|
|
import java.util.Random;
|
|
+
|
|
+import net.minecraft.src.forge.ForgeHooksClient;
|
|
+
|
|
import org.lwjgl.opengl.GL11;
|
|
import org.lwjgl.opengl.GL12;
|
|
|
|
@@ -54,11 +57,15 @@
|
|
float var19;
|
|
float var18;
|
|
float var23;
|
|
-
|
|
- if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
|
|
+
|
|
+ if (ForgeHooksClient.renderEntityItem(par1EntityItem, var10, var11, var12, random, renderManager.renderEngine, renderBlocks))
|
|
+ {
|
|
+ ;
|
|
+ }
|
|
+ else if (var10.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType()))
|
|
{
|
|
GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F);
|
|
- this.loadTexture("/terrain.png");
|
|
+ this.loadTexture(Block.blocksList[var10.itemID].getTextureFile());
|
|
float var21 = 0.25F;
|
|
var15 = Block.blocksList[var10.itemID].getRenderType();
|
|
|
|
@@ -94,10 +101,11 @@
|
|
if (var10.getItem().requiresMultipleRenderPasses())
|
|
{
|
|
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
|
- this.loadTexture("/gui/items.png");
|
|
+ this.loadTexture(Item.itemsList[var10.itemID].getTextureFile());
|
|
|
|
- for (var14 = 0; var14 <= 1; ++var14)
|
|
+ for (var14 = 0; var14 < var10.getItem().getRenderPasses(var10.getItemDamage()); ++var14)
|
|
{
|
|
+ this.random.setSeed(187L); //Fixes Vanilla bug where layers would not render aligns properly.
|
|
var15 = var10.getItem().func_46057_a(var10.getItemDamage(), var14);
|
|
var16 = 1.0F;
|
|
|
|
@@ -117,15 +125,8 @@
|
|
{
|
|
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
|
var14 = var10.getIconIndex();
|
|
-
|
|
- if (var10.itemID < 256)
|
|
- {
|
|
- this.loadTexture("/terrain.png");
|
|
- }
|
|
- else
|
|
- {
|
|
- this.loadTexture("/gui/items.png");
|
|
- }
|
|
+
|
|
+ this.loadTexture(var10.getItem().getTextureFile());
|
|
|
|
if (this.field_27004_a)
|
|
{
|
|
@@ -187,9 +188,9 @@
|
|
float var12;
|
|
float var13;
|
|
|
|
- if (par3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType()))
|
|
+ if (Item.itemsList[par3] instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType()))
|
|
{
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/terrain.png"));
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Block.blocksList[par3].getTextureFile()));
|
|
Block var15 = Block.blocksList[par3];
|
|
GL11.glPushMatrix();
|
|
GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel);
|
|
@@ -221,9 +222,9 @@
|
|
if (Item.itemsList[par3].requiresMultipleRenderPasses())
|
|
{
|
|
GL11.glDisable(GL11.GL_LIGHTING);
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png"));
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Item.itemsList[par3].getTextureFile()));
|
|
|
|
- for (var8 = 0; var8 <= 1; ++var8)
|
|
+ for (var8 = 0; var8 < Item.itemsList[par3].getRenderPasses(par4); ++var8)
|
|
{
|
|
int var9 = Item.itemsList[par3].func_46057_a(par4, var8);
|
|
var10 = Item.itemsList[par3].getColorFromDamage(par4, var8);
|
|
@@ -245,14 +246,7 @@
|
|
{
|
|
GL11.glDisable(GL11.GL_LIGHTING);
|
|
|
|
- if (par3 < 256)
|
|
- {
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/terrain.png"));
|
|
- }
|
|
- else
|
|
- {
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png"));
|
|
- }
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Item.itemsList[par3].getTextureFile()));
|
|
|
|
var8 = Item.itemsList[par3].getColorFromDamage(par4, 0);
|
|
float var14 = (float)(var8 >> 16 & 255) / 255.0F;
|
|
@@ -279,7 +273,10 @@
|
|
{
|
|
if (par3ItemStack != null)
|
|
{
|
|
- this.drawItemIntoGui(par1FontRenderer, par2RenderEngine, par3ItemStack.itemID, par3ItemStack.getItemDamage(), par3ItemStack.getIconIndex(), par4, par5);
|
|
+ if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, field_27004_a, zLevel, (float)par4, (float)par5))
|
|
+ {
|
|
+ this.drawItemIntoGui(par1FontRenderer, par2RenderEngine, par3ItemStack.itemID, par3ItemStack.getItemDamage(), par3ItemStack.getIconIndex(), par4, par5);
|
|
+ }
|
|
|
|
if (par3ItemStack != null && par3ItemStack.hasEffect())
|
|
{
|