From 7258d577cd3109c6948572104aacea4c71649db9 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Fri, 13 Nov 2015 00:05:19 +0300 Subject: [PATCH] Overlay patch fix: use the correct block position. --- .../client/renderer/ItemRenderer.java.patch | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 21f3f31660..09748f96f5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -9,15 +9,29 @@ { this.func_178097_a(abstractclientplayer, f2, f, f1); } -@@ -384,6 +384,7 @@ +@@ -366,6 +366,7 @@ + if (this.mc.thePlayer.isEntityInsideOpaqueBlock()) + { + IBlockState iblockstate = this.mc.theWorld.getBlockState(new BlockPos(this.mc.thePlayer)); ++ BlockPos overlayPos = new BlockPos(this.mc.thePlayer); + EntityPlayer entityplayer = this.mc.thePlayer; + + for (int i = 0; i < 8; ++i) +@@ -379,11 +380,13 @@ + if (iblockstate1.getBlock().isVisuallyOpaque()) + { + iblockstate = iblockstate1; ++ overlayPos = blockpos; + } + } if (iblockstate.getBlock().getRenderType() != -1) { -+ if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(mc.thePlayer, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, iblockstate, new BlockPos(this.mc.thePlayer))) ++ if (!net.minecraftforge.event.ForgeEventFactory.renderBlockOverlay(mc.thePlayer, p_78447_1_, net.minecraftforge.client.event.RenderBlockOverlayEvent.OverlayType.BLOCK, iblockstate, overlayPos)) this.func_178108_a(p_78447_1_, this.mc.getBlockRendererDispatcher().getBlockModelShapes().getTexture(iblockstate)); } } -@@ -392,11 +393,13 @@ +@@ -392,11 +395,13 @@ { if (this.mc.thePlayer.isInsideOfMaterial(Material.water)) { @@ -31,7 +45,7 @@ this.renderFireInFirstPerson(p_78447_1_); } } -@@ -513,6 +516,12 @@ +@@ -513,6 +518,12 @@ { if (!this.itemToRender.getIsItemStackEqual(itemstack)) {