mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
144 lines
7.9 KiB
Diff
144 lines
7.9 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
@@ -50,6 +50,13 @@
|
|
{
|
|
ItemStack itemstack = p_77032_1_.field_71071_by.func_70440_f(3 - p_77032_2_);
|
|
|
|
+ net.minecraftforge.client.event.RenderPlayerEvent.SetArmorModel event = new net.minecraftforge.client.event.RenderPlayerEvent.SetArmorModel(p_77032_1_, this, 3 - p_77032_2_, p_77032_3_, itemstack);
|
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event);
|
|
+ if (event.result != -1)
|
|
+ {
|
|
+ return event.result;
|
|
+ }
|
|
+
|
|
if (itemstack != null)
|
|
{
|
|
Item item = itemstack.func_77973_b();
|
|
@@ -57,7 +64,7 @@
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
ItemArmor itemarmor = (ItemArmor)item;
|
|
- this.func_110776_a(RenderBiped.func_110857_a(itemarmor, p_77032_2_));
|
|
+ this.func_110776_a(RenderBiped.getArmorResource(p_77032_1_, itemstack, p_77032_2_, null));
|
|
ModelBiped modelbiped = p_77032_2_ == 2 ? this.field_77111_i : this.field_77108_b;
|
|
modelbiped.field_78116_c.field_78806_j = p_77032_2_ == 0;
|
|
modelbiped.field_78114_d.field_78806_j = p_77032_2_ == 0;
|
|
@@ -66,14 +73,16 @@
|
|
modelbiped.field_78113_g.field_78806_j = p_77032_2_ == 1;
|
|
modelbiped.field_78123_h.field_78806_j = p_77032_2_ == 2 || p_77032_2_ == 3;
|
|
modelbiped.field_78124_i.field_78806_j = p_77032_2_ == 2 || p_77032_2_ == 3;
|
|
+ modelbiped = net.minecraftforge.client.ForgeHooksClient.getArmorModel(p_77032_1_, itemstack, p_77032_2_, modelbiped);
|
|
this.func_77042_a(modelbiped);
|
|
modelbiped.field_78095_p = this.field_77045_g.field_78095_p;
|
|
modelbiped.field_78093_q = this.field_77045_g.field_78093_q;
|
|
modelbiped.field_78091_s = this.field_77045_g.field_78091_s;
|
|
|
|
- if (itemarmor.func_82812_d() == ItemArmor.ArmorMaterial.CLOTH)
|
|
+ //Move outside if to allow for more then just CLOTH
|
|
+ int j = itemarmor.func_82814_b(itemstack);
|
|
+ if (j != -1)
|
|
{
|
|
- int j = itemarmor.func_82814_b(itemstack);
|
|
float f1 = (float)(j >> 16 & 255) / 255.0F;
|
|
float f2 = (float)(j >> 8 & 255) / 255.0F;
|
|
float f3 = (float)(j & 255) / 255.0F;
|
|
@@ -111,7 +120,7 @@
|
|
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
- this.func_110776_a(RenderBiped.func_110858_a((ItemArmor)item, p_82408_2_, "overlay"));
|
|
+ this.func_110776_a(RenderBiped.getArmorResource(p_82408_1_, itemstack, p_82408_2_, "overlay"));
|
|
GL11.glColor3f(1.0F, 1.0F, 1.0F);
|
|
}
|
|
}
|
|
@@ -119,6 +128,7 @@
|
|
|
|
public void func_76986_a(AbstractClientPlayer p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
|
|
{
|
|
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Pre(p_76986_1_, this, p_76986_9_))) return;
|
|
GL11.glColor3f(1.0F, 1.0F, 1.0F);
|
|
ItemStack itemstack = p_76986_1_.field_71071_by.func_70448_g();
|
|
this.field_77108_b.field_78120_m = this.field_77111_i.field_78120_m = this.field_77109_a.field_78120_m = itemstack != null ? 1 : 0;
|
|
@@ -149,6 +159,7 @@
|
|
this.field_77108_b.field_78118_o = this.field_77111_i.field_78118_o = this.field_77109_a.field_78118_o = false;
|
|
this.field_77108_b.field_78117_n = this.field_77111_i.field_78117_n = this.field_77109_a.field_78117_n = false;
|
|
this.field_77108_b.field_78120_m = this.field_77111_i.field_78120_m = this.field_77109_a.field_78120_m = 0;
|
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Post(p_76986_1_, this, p_76986_9_));
|
|
}
|
|
|
|
protected ResourceLocation func_110775_a(AbstractClientPlayer p_110775_1_)
|
|
@@ -158,12 +169,14 @@
|
|
|
|
protected void func_77029_c(AbstractClientPlayer p_77029_1_, float p_77029_2_)
|
|
{
|
|
+ net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre event = new net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre(p_77029_1_, this, p_77029_2_);
|
|
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) return;
|
|
GL11.glColor3f(1.0F, 1.0F, 1.0F);
|
|
super.func_77029_c(p_77029_1_, p_77029_2_);
|
|
super.func_85093_e(p_77029_1_, p_77029_2_);
|
|
ItemStack itemstack = p_77029_1_.field_71071_by.func_70440_f(3);
|
|
|
|
- if (itemstack != null)
|
|
+ if (itemstack != null && event.renderHelmet)
|
|
{
|
|
GL11.glPushMatrix();
|
|
this.field_77109_a.field_78116_c.func_78794_c(0.0625F);
|
|
@@ -171,7 +184,10 @@
|
|
|
|
if (itemstack.func_77973_b() instanceof ItemBlock)
|
|
{
|
|
- if (RenderBlocks.func_147739_a(Block.func_149634_a(itemstack.func_77973_b()).func_149645_b()))
|
|
+ net.minecraftforge.client.IItemRenderer customRenderer = net.minecraftforge.client.MinecraftForgeClient.getItemRenderer(itemstack, net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED);
|
|
+ boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED, itemstack, net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D));
|
|
+
|
|
+ if (is3D || RenderBlocks.func_147739_a(Block.func_149634_a(itemstack.func_77973_b()).func_149645_b()))
|
|
{
|
|
f1 = 0.625F;
|
|
GL11.glTranslatef(0.0F, -0.25F, 0.0F);
|
|
@@ -232,6 +248,7 @@
|
|
}
|
|
|
|
boolean flag = p_77029_1_.func_152122_n();
|
|
+ flag = event.renderCape && flag;
|
|
float f4;
|
|
|
|
if (flag && !p_77029_1_.func_82150_aj() && !p_77029_1_.func_82238_cc())
|
|
@@ -283,7 +300,7 @@
|
|
|
|
ItemStack itemstack1 = p_77029_1_.field_71071_by.func_70448_g();
|
|
|
|
- if (itemstack1 != null)
|
|
+ if (itemstack1 != null && event.renderItem)
|
|
{
|
|
GL11.glPushMatrix();
|
|
this.field_77109_a.field_78112_f.func_78794_c(0.0625F);
|
|
@@ -301,7 +318,10 @@
|
|
enumaction = itemstack1.func_77975_n();
|
|
}
|
|
|
|
- if (itemstack1.func_77973_b() instanceof ItemBlock && RenderBlocks.func_147739_a(Block.func_149634_a(itemstack1.func_77973_b()).func_149645_b()))
|
|
+ net.minecraftforge.client.IItemRenderer customRenderer = net.minecraftforge.client.MinecraftForgeClient.getItemRenderer(itemstack1, net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED);
|
|
+ boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED, itemstack1, net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D));
|
|
+
|
|
+ if (is3D || itemstack1.func_77973_b() instanceof ItemBlock && RenderBlocks.func_147739_a(Block.func_149634_a(itemstack1.func_77973_b()).func_149645_b()))
|
|
{
|
|
f2 = 0.5F;
|
|
GL11.glTranslatef(0.0F, 0.1875F, -0.3125F);
|
|
@@ -358,7 +378,7 @@
|
|
|
|
if (itemstack1.func_77973_b().func_77623_v())
|
|
{
|
|
- for (k = 0; k <= 1; ++k)
|
|
+ for (k = 0; k < itemstack1.func_77973_b().getRenderPasses(itemstack1.func_77960_j()); ++k)
|
|
{
|
|
int i = itemstack1.func_77973_b().func_82790_a(itemstack1, k);
|
|
f12 = (float)(i >> 16 & 255) / 255.0F;
|
|
@@ -380,6 +400,7 @@
|
|
|
|
GL11.glPopMatrix();
|
|
}
|
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Specials.Post(p_77029_1_, this, p_77029_2_));
|
|
}
|
|
|
|
protected void func_77041_b(AbstractClientPlayer p_77041_1_, float p_77041_2_)
|