mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
196 lines
9.6 KiB
Diff
196 lines
9.6 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/EntityRenderer.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/EntityRenderer.java
|
|
@@ -51,6 +51,12 @@
|
|
import org.lwjgl.opengl.GL11;
|
|
import org.lwjgl.opengl.GLContext;
|
|
import org.lwjgl.util.glu.Project;
|
|
+import net.minecraftforge.client.ForgeHooksClient;
|
|
+import net.minecraftforge.client.IRenderHandler;
|
|
+import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
|
+import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent;
|
|
+import net.minecraftforge.client.event.RenderWorldLastEvent;
|
|
+import net.minecraftforge.common.MinecraftForge;
|
|
|
|
@SideOnly(Side.CLIENT)
|
|
public class EntityRenderer implements IResourceManagerReloadListener
|
|
@@ -358,7 +364,7 @@
|
|
|
|
if (d3 < d2 || d2 == 0.0D)
|
|
{
|
|
- if (entity == this.field_78531_r.field_71451_h.field_70154_o)
|
|
+ if (entity == this.field_78531_r.field_71451_h.field_70154_o && !entity.canRiderInteract())
|
|
{
|
|
if (d2 == 0.0D)
|
|
{
|
|
@@ -392,8 +398,15 @@
|
|
|
|
private void func_78477_e()
|
|
{
|
|
- EntityPlayerSP entityplayersp = (EntityPlayerSP)this.field_78531_r.field_71451_h;
|
|
- this.field_78501_T = entityplayersp.func_71151_f();
|
|
+ if (field_78531_r.field_71451_h instanceof EntityPlayerSP)
|
|
+ {
|
|
+ EntityPlayerSP entityplayersp = (EntityPlayerSP)this.field_78531_r.field_71451_h;
|
|
+ this.field_78501_T = entityplayersp.func_71151_f();
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ this.field_78501_T = field_78531_r.field_71439_g.func_71151_f();
|
|
+ }
|
|
this.field_78506_S = this.field_78507_R;
|
|
this.field_78507_R += (this.field_78501_T - this.field_78507_R) * 0.5F;
|
|
|
|
@@ -416,7 +429,7 @@
|
|
}
|
|
else
|
|
{
|
|
- EntityPlayer entityplayer = (EntityPlayer)this.field_78531_r.field_71451_h;
|
|
+ EntityLivingBase entityplayer = (EntityLivingBase)this.field_78531_r.field_71451_h;
|
|
float f1 = 70.0F;
|
|
|
|
if (p_78481_2_)
|
|
@@ -497,15 +510,7 @@
|
|
|
|
if (!this.field_78531_r.field_71474_y.field_74325_U)
|
|
{
|
|
- Block block = this.field_78531_r.field_71441_e.func_147439_a(MathHelper.func_76128_c(entitylivingbase.field_70165_t), MathHelper.func_76128_c(entitylivingbase.field_70163_u), MathHelper.func_76128_c(entitylivingbase.field_70161_v));
|
|
-
|
|
- if (block == Blocks.field_150324_C)
|
|
- {
|
|
- int i = this.field_78531_r.field_71441_e.func_72805_g(MathHelper.func_76128_c(entitylivingbase.field_70165_t), MathHelper.func_76128_c(entitylivingbase.field_70163_u), MathHelper.func_76128_c(entitylivingbase.field_70161_v));
|
|
- int j = i & 3;
|
|
- GL11.glRotatef((float)(j * 90), 0.0F, 1.0F, 0.0F);
|
|
- }
|
|
-
|
|
+ ForgeHooksClient.orientBedCamera(field_78531_r, entitylivingbase);
|
|
GL11.glRotatef(entitylivingbase.field_70126_B + (entitylivingbase.field_70177_z - entitylivingbase.field_70126_B) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
|
|
GL11.glRotatef(entitylivingbase.field_70127_C + (entitylivingbase.field_70125_A - entitylivingbase.field_70127_C) * p_78467_1_, -1.0F, 0.0F, 0.0F);
|
|
}
|
|
@@ -1052,7 +1057,9 @@
|
|
|
|
try
|
|
{
|
|
- this.field_78531_r.field_71462_r.func_73863_a(k, l, p_78480_1_);
|
|
+ if (!MinecraftForge.EVENT_BUS.post(new DrawScreenEvent.Pre(this.field_78531_r.field_71462_r, k, l, p_78480_1_)))
|
|
+ this.field_78531_r.field_71462_r.func_73863_a(k, l, p_78480_1_);
|
|
+ MinecraftForge.EVENT_BUS.post(new DrawScreenEvent.Post(this.field_78531_r.field_71462_r, k, l, p_78480_1_));
|
|
}
|
|
catch (Throwable throwable)
|
|
{
|
|
@@ -1213,7 +1220,10 @@
|
|
GL11.glPushMatrix();
|
|
RenderHelper.func_74519_b();
|
|
this.field_78531_r.field_71424_I.func_76318_c("entities");
|
|
+ net.minecraftforge.client.ForgeHooksClient.setRenderPass(0);
|
|
renderglobal.func_147589_a(entitylivingbase, frustrum, p_78471_1_);
|
|
+ net.minecraftforge.client.ForgeHooksClient.setRenderPass(0);
|
|
+ //ToDo: Try and figure out how to make particles render sorted correctly.. {They render behind water}
|
|
RenderHelper.func_74518_a();
|
|
this.func_78483_a((double)p_78471_1_);
|
|
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
|
@@ -1225,7 +1235,10 @@
|
|
entityplayer = (EntityPlayer)entitylivingbase;
|
|
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
|
this.field_78531_r.field_71424_I.func_76318_c("outline");
|
|
- renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_78471_1_);
|
|
+ if (!ForgeHooksClient.onDrawBlockHighlight(renderglobal, entityplayer, field_78531_r.field_71476_x, 0, entityplayer.field_71071_by.func_70448_g(), p_78471_1_))
|
|
+ {
|
|
+ renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_78471_1_);
|
|
+ }
|
|
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
|
}
|
|
}
|
|
@@ -1238,14 +1251,17 @@
|
|
entityplayer = (EntityPlayer)entitylivingbase;
|
|
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
|
this.field_78531_r.field_71424_I.func_76318_c("outline");
|
|
- renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_78471_1_);
|
|
+ if (!ForgeHooksClient.onDrawBlockHighlight(renderglobal, entityplayer, field_78531_r.field_71476_x, 0, entityplayer.field_71071_by.func_70448_g(), p_78471_1_))
|
|
+ {
|
|
+ renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_78471_1_);
|
|
+ }
|
|
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
|
}
|
|
|
|
this.field_78531_r.field_71424_I.func_76318_c("destroyProgress");
|
|
GL11.glEnable(GL11.GL_BLEND);
|
|
OpenGlHelper.func_148821_a(770, 1, 1, 0);
|
|
- renderglobal.func_72717_a(Tessellator.field_78398_a, (EntityPlayer)entitylivingbase, p_78471_1_);
|
|
+ renderglobal.drawBlockDamageTexture(Tessellator.field_78398_a, entitylivingbase, p_78471_1_);
|
|
GL11.glDisable(GL11.GL_BLEND);
|
|
|
|
if (this.field_78532_q == 0)
|
|
@@ -1313,6 +1329,16 @@
|
|
renderglobal.func_72719_a(entitylivingbase, 1, (double)p_78471_1_);
|
|
}
|
|
|
|
+ if (this.field_78532_q == 0) //Only render if render pass 0 happens as well.
|
|
+ {
|
|
+ RenderHelper.func_74519_b();
|
|
+ this.field_78531_r.field_71424_I.func_76318_c("entities");
|
|
+ ForgeHooksClient.setRenderPass(1);
|
|
+ renderglobal.func_147589_a(entitylivingbase, frustrum, p_78471_1_);
|
|
+ ForgeHooksClient.setRenderPass(-1);
|
|
+ RenderHelper.func_74518_a();
|
|
+ }
|
|
+
|
|
GL11.glDepthMask(true);
|
|
GL11.glEnable(GL11.GL_CULL_FACE);
|
|
GL11.glDisable(GL11.GL_BLEND);
|
|
@@ -1324,9 +1350,12 @@
|
|
this.func_82829_a(renderglobal, p_78471_1_);
|
|
}
|
|
|
|
+ this.field_78531_r.field_71424_I.func_76318_c("FRenderLast");
|
|
+ ForgeHooksClient.dispatchRenderLast(renderglobal, p_78471_1_);
|
|
+
|
|
this.field_78531_r.field_71424_I.func_76318_c("hand");
|
|
|
|
- if (this.field_78503_V == 1.0D)
|
|
+ if (!ForgeHooksClient.renderFirstPersonHand(renderglobal, p_78471_1_, j) && this.field_78503_V == 1.0D)
|
|
{
|
|
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
|
|
this.func_78476_b(p_78471_1_, j);
|
|
@@ -1442,6 +1471,13 @@
|
|
|
|
protected void func_78474_d(float p_78474_1_)
|
|
{
|
|
+ IRenderHandler renderer = null;
|
|
+ if ((renderer = this.field_78531_r.field_71441_e.field_73011_w.getWeatherRenderer()) != null)
|
|
+ {
|
|
+ renderer.render(p_78474_1_, this.field_78531_r.field_71441_e, field_78531_r);
|
|
+ return;
|
|
+ }
|
|
+
|
|
float f1 = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
|
|
|
|
if (f1 > 0.0F)
|
|
@@ -1791,6 +1827,13 @@
|
|
this.field_78533_p = f7;
|
|
}
|
|
|
|
+ net.minecraftforge.client.event.EntityViewRenderEvent.FogColors event = new net.minecraftforge.client.event.EntityViewRenderEvent.FogColors(this, entitylivingbase, block, p_78466_1_, this.field_78518_n, this.field_78519_o, this.field_78533_p);
|
|
+ MinecraftForge.EVENT_BUS.post(event);
|
|
+
|
|
+ this.field_78518_n = event.red;
|
|
+ this.field_78533_p = event.blue;
|
|
+ this.field_78519_o = event.green;
|
|
+
|
|
GL11.glClearColor(this.field_78518_n, this.field_78519_o, this.field_78533_p, 0.0F);
|
|
}
|
|
|
|
@@ -1826,6 +1869,13 @@
|
|
Block block = ActiveRenderInfo.func_151460_a(this.field_78531_r.field_71441_e, entitylivingbase, p_78468_2_);
|
|
float f1;
|
|
|
|
+ net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity event = new net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity(this, entitylivingbase, block, p_78468_2_, 0.1F);
|
|
+
|
|
+ if (MinecraftForge.EVENT_BUS.post(event))
|
|
+ {
|
|
+ GL11.glFogf(GL11.GL_FOG_DENSITY, event.density);
|
|
+ }
|
|
+ else
|
|
if (entitylivingbase.func_70644_a(Potion.field_76440_q))
|
|
{
|
|
f1 = 5.0F;
|