From e842fd95b488e5437a937965b7cd386d10f1d133 Mon Sep 17 00:00:00 2001 From: rhilenova Date: Sun, 29 Sep 2013 11:43:29 -0400 Subject: [PATCH 1/2] Added pre/post to player list rendering in GuiIngameForge. --- client/net/minecraftforge/client/GuiIngameForge.java | 2 ++ .../minecraftforge/client/event/RenderGameOverlayEvent.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/net/minecraftforge/client/GuiIngameForge.java b/client/net/minecraftforge/client/GuiIngameForge.java index 24ac8a8656..1d1120f1c9 100644 --- a/client/net/minecraftforge/client/GuiIngameForge.java +++ b/client/net/minecraftforge/client/GuiIngameForge.java @@ -733,6 +733,7 @@ public class GuiIngameForge extends GuiIngame protected void renderPlayerList(int width, int height) { + if (pre(PLAYER_LIST)) return; ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().func_96539_a(0); NetClientHandler handler = mc.thePlayer.sendQueue; @@ -805,6 +806,7 @@ public class GuiIngameForge extends GuiIngame } } } + post(PLAYER_LIST); } protected void renderHealthMount(int width, int height) diff --git a/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java b/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java index 68ab5f73f7..9422be8735 100644 --- a/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java +++ b/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java @@ -24,7 +24,8 @@ public class RenderGameOverlayEvent extends Event EXPERIENCE, TEXT, HEALTHMOUNT, - JUMPBAR + JUMPBAR, + PLAYER_LIST } public final float partialTicks; From 5e998776cbefd0787e4c5918ebd444bda0414cc6 Mon Sep 17 00:00:00 2001 From: rhilenova Date: Mon, 30 Sep 2013 20:06:04 -0400 Subject: [PATCH 2/2] Moved PLAYER_LIST event inside display check. --- client/net/minecraftforge/client/GuiIngameForge.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/net/minecraftforge/client/GuiIngameForge.java b/client/net/minecraftforge/client/GuiIngameForge.java index 1d1120f1c9..16d30e8a88 100644 --- a/client/net/minecraftforge/client/GuiIngameForge.java +++ b/client/net/minecraftforge/client/GuiIngameForge.java @@ -733,12 +733,12 @@ public class GuiIngameForge extends GuiIngame protected void renderPlayerList(int width, int height) { - if (pre(PLAYER_LIST)) return; ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().func_96539_a(0); NetClientHandler handler = mc.thePlayer.sendQueue; if (mc.gameSettings.keyBindPlayerList.pressed && (!mc.isIntegratedServerRunning() || handler.playerInfoList.size() > 1 || scoreobjective != null)) { + if (pre(PLAYER_LIST)) return; this.mc.mcProfiler.startSection("playerList"); List players = handler.playerInfoList; int maxPlayers = handler.currentServerMaxPlayers; @@ -805,8 +805,8 @@ public class GuiIngameForge extends GuiIngame zLevel -= 100.0F; } } + post(PLAYER_LIST); } - post(PLAYER_LIST); } protected void renderHealthMount(int width, int height)