mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
171 lines
8.0 KiB
Diff
171 lines
8.0 KiB
Diff
--- ../src_base/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
+++ ../src_work/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
|
|
@@ -21,7 +21,16 @@
|
|
import net.minecraft.scoreboard.ScoreObjective;
|
|
import net.minecraft.scoreboard.Scoreboard;
|
|
import net.minecraft.util.MathHelper;
|
|
+import net.minecraftforge.client.ForgeHooksClient;
|
|
+import net.minecraftforge.client.IItemRenderer;
|
|
+import net.minecraftforge.client.MinecraftForgeClient;
|
|
+import net.minecraftforge.client.event.RenderPlayerEvent;
|
|
+import net.minecraftforge.common.MinecraftForge;
|
|
+
|
|
import org.lwjgl.opengl.GL11;
|
|
+import net.minecraft.item.ItemBlock;
|
|
+import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED;
|
|
+import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D;
|
|
|
|
@SideOnly(Side.CLIENT)
|
|
public class RenderPlayer extends RendererLivingEntity
|
|
@@ -43,6 +52,13 @@
|
|
{
|
|
ItemStack itemstack = par1AbstractClientPlayer.inventory.armorItemInSlot(3 - par2);
|
|
|
|
+ RenderPlayerEvent.SetArmorModel event = new RenderPlayerEvent.SetArmorModel(par1AbstractClientPlayer, this, 3 - par2, par3, itemstack);
|
|
+ MinecraftForge.EVENT_BUS.post(event);
|
|
+ if (event.result != -1)
|
|
+ {
|
|
+ return event.result;
|
|
+ }
|
|
+
|
|
if (itemstack != null)
|
|
{
|
|
Item item = itemstack.getItem();
|
|
@@ -50,7 +66,7 @@
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
ItemArmor itemarmor = (ItemArmor)item;
|
|
- this.func_110776_a(RenderBiped.func_110857_a(itemarmor, par2));
|
|
+ this.func_110776_a(RenderBiped.getArmorResource(par1AbstractClientPlayer, itemstack, par2, null));
|
|
ModelBiped modelbiped = par2 == 2 ? this.modelArmor : this.modelArmorChestplate;
|
|
modelbiped.bipedHead.showModel = par2 == 0;
|
|
modelbiped.bipedHeadwear.showModel = par2 == 0;
|
|
@@ -59,15 +75,17 @@
|
|
modelbiped.bipedLeftArm.showModel = par2 == 1;
|
|
modelbiped.bipedRightLeg.showModel = par2 == 2 || par2 == 3;
|
|
modelbiped.bipedLeftLeg.showModel = par2 == 2 || par2 == 3;
|
|
+ modelbiped = ForgeHooksClient.getArmorModel(par1AbstractClientPlayer, itemstack, par2, modelbiped);
|
|
this.setRenderPassModel(modelbiped);
|
|
modelbiped.onGround = this.mainModel.onGround;
|
|
modelbiped.isRiding = this.mainModel.isRiding;
|
|
modelbiped.isChild = this.mainModel.isChild;
|
|
float f1 = 1.0F;
|
|
|
|
- if (itemarmor.getArmorMaterial() == EnumArmorMaterial.CLOTH)
|
|
- {
|
|
- int j = itemarmor.getColor(itemstack);
|
|
+ //Move outside if to allow for more then just CLOTH
|
|
+ int j = itemarmor.getColor(itemstack);
|
|
+ if (j != -1)
|
|
+ {
|
|
float f2 = (float)(j >> 16 & 255) / 255.0F;
|
|
float f3 = (float)(j >> 8 & 255) / 255.0F;
|
|
float f4 = (float)(j & 255) / 255.0F;
|
|
@@ -105,7 +123,7 @@
|
|
|
|
if (item instanceof ItemArmor)
|
|
{
|
|
- this.func_110776_a(RenderBiped.func_110858_a((ItemArmor)item, par2, "overlay"));
|
|
+ this.func_110776_a(RenderBiped.getArmorResource(par1AbstractClientPlayer, itemstack, par2, "overlay"));
|
|
float f1 = 1.0F;
|
|
GL11.glColor3f(f1, f1, f1);
|
|
}
|
|
@@ -114,6 +132,7 @@
|
|
|
|
public void func_110819_a(AbstractClientPlayer par1AbstractClientPlayer, double par2, double par4, double par6, float par8, float par9)
|
|
{
|
|
+ if (MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Pre(par1AbstractClientPlayer, this))) return;
|
|
float f2 = 1.0F;
|
|
GL11.glColor3f(f2, f2, f2);
|
|
ItemStack itemstack = par1AbstractClientPlayer.inventory.getCurrentItem();
|
|
@@ -145,6 +164,7 @@
|
|
this.modelArmorChestplate.aimedBow = this.modelArmor.aimedBow = this.modelBipedMain.aimedBow = false;
|
|
this.modelArmorChestplate.isSneak = this.modelArmor.isSneak = this.modelBipedMain.isSneak = false;
|
|
this.modelArmorChestplate.heldItemRight = this.modelArmor.heldItemRight = this.modelBipedMain.heldItemRight = 0;
|
|
+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Post(par1AbstractClientPlayer, this));
|
|
}
|
|
|
|
protected ResourceLocation func_110817_a(AbstractClientPlayer par1AbstractClientPlayer)
|
|
@@ -154,21 +174,30 @@
|
|
|
|
protected void func_110820_a(AbstractClientPlayer par1AbstractClientPlayer, float par2)
|
|
{
|
|
+ RenderPlayerEvent.Specials.Pre event = new RenderPlayerEvent.Specials.Pre(par1AbstractClientPlayer, this, par2);
|
|
+ if (MinecraftForge.EVENT_BUS.post(event))
|
|
+ {
|
|
+ return;
|
|
+ }
|
|
+
|
|
float f1 = 1.0F;
|
|
GL11.glColor3f(f1, f1, f1);
|
|
super.renderEquippedItems(par1AbstractClientPlayer, par2);
|
|
super.renderArrowsStuckInEntity(par1AbstractClientPlayer, par2);
|
|
ItemStack itemstack = par1AbstractClientPlayer.inventory.armorItemInSlot(3);
|
|
|
|
- if (itemstack != null)
|
|
+ if (itemstack != null && event.renderHelmet)
|
|
{
|
|
GL11.glPushMatrix();
|
|
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);
|
|
@@ -220,6 +249,7 @@
|
|
boolean flag = par1AbstractClientPlayer.func_110310_o().func_110557_a();
|
|
boolean flag1 = !par1AbstractClientPlayer.isInvisible();
|
|
boolean flag2 = !par1AbstractClientPlayer.getHideCape();
|
|
+ flag = event.renderCape && flag;
|
|
float f6;
|
|
|
|
if (flag && flag1 && flag2)
|
|
@@ -271,7 +301,7 @@
|
|
|
|
ItemStack itemstack1 = par1AbstractClientPlayer.inventory.getCurrentItem();
|
|
|
|
- if (itemstack1 != null)
|
|
+ if (itemstack1 != null && event.renderItem)
|
|
{
|
|
GL11.glPushMatrix();
|
|
this.modelBipedMain.bipedRightArm.postRender(0.0625F);
|
|
@@ -291,7 +321,11 @@
|
|
|
|
float f11;
|
|
|
|
- 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));
|
|
+ boolean isBlock = itemstack1.itemID < Block.blocksList.length && itemstack1.getItemSpriteNumber() == 0;
|
|
+
|
|
+ if (is3D || (isBlock && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack1.itemID].getRenderType())))
|
|
{
|
|
f11 = 0.5F;
|
|
GL11.glTranslatef(0.0F, 0.1875F, -0.3125F);
|
|
@@ -348,7 +382,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);
|
|
f13 = (float)(k >> 16 & 255) / 255.0F;
|
|
@@ -370,6 +404,7 @@
|
|
|
|
GL11.glPopMatrix();
|
|
}
|
|
+ MinecraftForge.EVENT_BUS.post(new RenderPlayerEvent.Specials.Post(par1AbstractClientPlayer, this, par2));
|
|
}
|
|
|
|
protected void renderPlayerScale(AbstractClientPlayer par1AbstractClientPlayer, float par2)
|