mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
94 lines
4.7 KiB
Diff
94 lines
4.7 KiB
Diff
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
@@ -16,10 +16,17 @@
|
|
import net.minecraft.item.EnumAction;
|
|
import net.minecraft.item.EnumArmorMaterial;
|
|
import net.minecraft.item.Item;
|
|
+import net.minecraft.item.ItemBlock;
|
|
import net.minecraft.item.ItemArmor;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.util.MathHelper;
|
|
import org.lwjgl.opengl.GL11;
|
|
+
|
|
+import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*;
|
|
+import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*;
|
|
+import net.minecraftforge.client.IItemRenderer;
|
|
+import net.minecraftforge.client.MinecraftForgeClient;
|
|
+import net.minecraftforge.client.ForgeHooksClient;
|
|
|
|
@SideOnly(Side.CLIENT)
|
|
public class RenderPlayer extends RenderLiving
|
|
@@ -28,6 +35,8 @@
|
|
private ModelBiped modelArmorChestplate;
|
|
private ModelBiped modelArmor;
|
|
public static String[] armorFilenamePrefix = new String[] {"cloth", "chain", "iron", "diamond", "gold"};
|
|
+ public static float NAME_TAG_RANGE = 64.0f;
|
|
+ public static float NAME_TAG_RANGE_SNEAK = 32.0f;
|
|
|
|
public RenderPlayer()
|
|
{
|
|
@@ -51,7 +60,7 @@
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
ItemArmor itemarmor = (ItemArmor)item;
|
|
- this.loadTexture("/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png");
|
|
+ this.loadTexture(ForgeHooksClient.getArmorTexture(itemstack, "/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + ".png"));
|
|
ModelBiped modelbiped = par2 == 2 ? this.modelArmor : this.modelArmorChestplate;
|
|
modelbiped.bipedHead.showModel = par2 == 0;
|
|
modelbiped.bipedHeadwear.showModel = par2 == 0;
|
|
@@ -120,7 +129,7 @@
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
ItemArmor itemarmor = (ItemArmor)item;
|
|
- this.loadTexture("/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png");
|
|
+ this.loadTexture(ForgeHooksClient.getArmorTexture(itemstack, "/armor/" + armorFilenamePrefix[itemarmor.renderIndex] + "_" + (par2 == 2 ? 2 : 1) + "_b.png"));
|
|
float f1 = 1.0F;
|
|
GL11.glColor3f(f1, f1, f1);
|
|
}
|
|
@@ -172,7 +181,7 @@
|
|
float f = 1.6F;
|
|
float f1 = 0.016666668F * f;
|
|
double d3 = par1EntityPlayer.getDistanceSqToEntity(this.renderManager.livingPlayer);
|
|
- float f2 = par1EntityPlayer.isSneaking() ? 32.0F : 64.0F;
|
|
+ float f2 = par1EntityPlayer.isSneaking() ? NAME_TAG_RANGE_SNEAK : NAME_TAG_RANGE;
|
|
|
|
if (d3 < (double)(f2 * f2))
|
|
{
|
|
@@ -239,9 +248,12 @@
|
|
this.modelBipedMain.bipedHead.postRender(0.0625F);
|
|
float f2;
|
|
|
|
- if (itemstack.getItem().itemID < 256)
|
|
- {
|
|
- if (RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
|
+ if (itemstack != null && itemstack.getItem() instanceof ItemBlock)
|
|
+ {
|
|
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemstack, EQUIPPED);
|
|
+ boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, itemstack, BLOCK_3D));
|
|
+
|
|
+ if (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
|
{
|
|
f2 = 0.625F;
|
|
GL11.glTranslatef(0.0F, -0.25F, 0.0F);
|
|
@@ -359,7 +371,10 @@
|
|
enumaction = itemstack1.getItemUseAction();
|
|
}
|
|
|
|
- if (itemstack1.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack1.itemID].getRenderType()))
|
|
+ IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemstack1, EQUIPPED);
|
|
+ boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, itemstack1, BLOCK_3D));
|
|
+
|
|
+ if (itemstack1.getItem() instanceof ItemBlock && (is3D || RenderBlocks.renderItemIn3d(Block.blocksList[itemstack1.itemID].getRenderType())))
|
|
{
|
|
f3 = 0.5F;
|
|
GL11.glTranslatef(0.0F, 0.1875F, -0.3125F);
|
|
@@ -416,7 +431,7 @@
|
|
|
|
if (itemstack1.getItem().requiresMultipleRenderPasses())
|
|
{
|
|
- for (j = 0; j <= 1; ++j)
|
|
+ for (j = 0; j < itemstack1.getItem().getRenderPasses(itemstack1.getItemDamage()); ++j)
|
|
{
|
|
int k = itemstack1.getItem().getColorFromItemStack(itemstack1, j);
|
|
f12 = (float)(k >> 16 & 255) / 255.0F;
|