mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
150 lines
6.3 KiB
Diff
150 lines
6.3 KiB
Diff
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
|
|
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderItem.java
|
|
@@ -13,11 +13,14 @@
|
|
import net.minecraft.entity.Entity;
|
|
import net.minecraft.entity.item.EntityItem;
|
|
import net.minecraft.item.Item;
|
|
+import net.minecraft.item.ItemBlock;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.util.MathHelper;
|
|
import org.lwjgl.opengl.GL11;
|
|
import org.lwjgl.opengl.GL12;
|
|
|
|
+import net.minecraftforge.client.ForgeHooksClient;
|
|
+
|
|
@SideOnly(Side.CLIENT)
|
|
public class RenderItem extends Render
|
|
{
|
|
@@ -74,13 +77,16 @@
|
|
|
|
GL11.glTranslatef((float)par2, (float)par4 + var11, (float)par6);
|
|
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
|
- Block var14 = Block.blocksList[var10.itemID];
|
|
int var16;
|
|
float var19;
|
|
float var20;
|
|
float var24;
|
|
|
|
- if (var14 != null && RenderBlocks.renderItemIn3d(var14.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);
|
|
|
|
@@ -91,9 +97,9 @@
|
|
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
|
|
}
|
|
|
|
- this.loadTexture("/terrain.png");
|
|
+ this.loadTexture(Block.blocksList[var10.itemID].getTextureFile());
|
|
float var22 = 0.25F;
|
|
- var16 = var14.getRenderType();
|
|
+ var16 = Block.blocksList[var10.itemID].getRenderType();
|
|
|
|
if (var16 == 1 || var16 == 19 || var16 == 12 || var16 == 2)
|
|
{
|
|
@@ -115,7 +121,7 @@
|
|
}
|
|
|
|
var24 = 1.0F;
|
|
- this.renderBlocks.renderBlockAsItem(var14, var10.getItemDamage(), var24);
|
|
+ this.renderBlocks.renderBlockAsItem(Block.blocksList[var10.itemID], var10.getItemDamage(), var24);
|
|
GL11.glPopMatrix();
|
|
}
|
|
}
|
|
@@ -136,12 +142,12 @@
|
|
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
|
}
|
|
|
|
- this.loadTexture("/gui/items.png");
|
|
-
|
|
- for (var15 = 0; var15 <= 1; ++var15)
|
|
+ this.loadTexture(Item.itemsList[var10.itemID].getTextureFile());
|
|
+
|
|
+ for (var15 = 0; var15 <= var10.getItem().getRenderPasses(var10.getItemDamage()); ++var15)
|
|
{
|
|
this.random.setSeed(187L);
|
|
- var16 = var10.getItem().getIconFromDamageForRenderPass(var10.getItemDamage(), var15);
|
|
+ var16 = var10.getItem().getIconIndex(var10, var15);
|
|
var17 = 1.0F;
|
|
|
|
if (this.field_77024_a)
|
|
@@ -173,14 +179,7 @@
|
|
|
|
var15 = var10.getIconIndex();
|
|
|
|
- if (var14 != null)
|
|
- {
|
|
- this.loadTexture("/terrain.png");
|
|
- }
|
|
- else
|
|
- {
|
|
- this.loadTexture("/gui/items.png");
|
|
- }
|
|
+ this.loadTexture(var10.getItem().getTextureFile());
|
|
|
|
if (this.field_77024_a)
|
|
{
|
|
@@ -348,10 +347,10 @@
|
|
float var13;
|
|
float var16;
|
|
|
|
- if (var6 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var6].getRenderType()))
|
|
- {
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/terrain.png"));
|
|
+ if (par3ItemStack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.blocksList[par3ItemStack.itemID].getRenderType()))
|
|
+ {
|
|
Block var15 = Block.blocksList[var6];
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(var15.getTextureFile()));
|
|
GL11.glPushMatrix();
|
|
GL11.glTranslatef((float)(par4 - 2), (float)(par5 + 3), -3.0F + this.zLevel);
|
|
GL11.glScalef(10.0F, 10.0F, 10.0F);
|
|
@@ -382,11 +381,11 @@
|
|
if (Item.itemsList[var6].requiresMultipleRenderPasses())
|
|
{
|
|
GL11.glDisable(GL11.GL_LIGHTING);
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png"));
|
|
-
|
|
- for (var9 = 0; var9 <= 1; ++var9)
|
|
- {
|
|
- var10 = Item.itemsList[var6].getIconFromDamageForRenderPass(var7, var9);
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(Item.itemsList[var6].getTextureFile()));
|
|
+
|
|
+ for (var9 = 0; var9 < Item.itemsList[var6].getRenderPasses(var7); ++var9)
|
|
+ {
|
|
+ var10 = Item.itemsList[var6].getIconIndex(par3ItemStack, var9);
|
|
int var11 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, var9);
|
|
var12 = (float)(var11 >> 16 & 255) / 255.0F;
|
|
var13 = (float)(var11 >> 8 & 255) / 255.0F;
|
|
@@ -406,14 +405,7 @@
|
|
{
|
|
GL11.glDisable(GL11.GL_LIGHTING);
|
|
|
|
- if (var6 < 256)
|
|
- {
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/terrain.png"));
|
|
- }
|
|
- else
|
|
- {
|
|
- par2RenderEngine.bindTexture(par2RenderEngine.getTexture("/gui/items.png"));
|
|
- }
|
|
+ par2RenderEngine.bindTexture(par2RenderEngine.getTexture(par3ItemStack.getItem().getTextureFile()));
|
|
|
|
var9 = Item.itemsList[var6].getColorFromItemStack(par3ItemStack, 0);
|
|
float var17 = (float)(var9 >> 16 & 255) / 255.0F;
|
|
@@ -440,7 +432,10 @@
|
|
{
|
|
if (par3ItemStack != null)
|
|
{
|
|
- this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5);
|
|
+ if (!ForgeHooksClient.renderInventoryItem(renderBlocks, par2RenderEngine, par3ItemStack, field_77024_a, zLevel, (float)par4, (float)par5))
|
|
+ {
|
|
+ this.renderItemIntoGUI(par1FontRenderer, par2RenderEngine, par3ItemStack, par4, par5);
|
|
+ }
|
|
|
|
if (par3ItemStack != null && par3ItemStack.hasEffect())
|
|
{
|