keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed FPS graph and new debug lines not being rendered in Debug screen. Closes #3054

This commit is contained in:
LexManos 2016-07-01 13:53:26 -07:00
parent 03b54774aa
commit f58d1cae1a
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/minecraftforge/client/GuiIngameForge.java
View File

@ -169,6 +169,7 @@ public class GuiIngameForge extends GuiIngame
renderToolHighlight(res);
renderHUDText(width, height);
renderFPSGraph();
renderPotionIcons(res);
renderRecordOverlay(width, height, partialTicks);
renderSubtitles(res);
@ -717,6 +718,15 @@ public class GuiIngameForge extends GuiIngame
post(TEXT);
}
protected void renderFPSGraph()
{
if (this.mc.gameSettings.showDebugInfo && this.mc.gameSettings.showLagometer && !pre(FPS_GRAPH))
{
this.debugOverlay.renderLagometer();
post(FPS_GRAPH);
}
}
protected void renderRecordOverlay(int width, int height, float partialTicks)
{
if (recordPlayingUpFor > 0)
@ -884,10 +894,22 @@ public class GuiIngameForge extends GuiIngame
private class GuiOverlayDebugForge extends GuiOverlayDebug
{
private GuiOverlayDebugForge(Minecraft mc){ super(mc); }
private Minecraft mc;
private GuiOverlayDebugForge(Minecraft mc)
{
super(mc);
this.mc = mc;
}
@Override protected void renderDebugInfoLeft(){}
@Override protected void renderDebugInfoRight(ScaledResolution res){}
private List<String> getLeft(){ return this.call(); }
private List<String> getLeft()
{
List<String> ret = this.call();
ret.add("");
ret.add("Debug: Pie [shift]: " + (this.mc.gameSettings.showDebugProfilerChart ? "visible" : "hidden") + " FPS [alt]: " + (this.mc.gameSettings.showLagometer ? "visible" : "hidden"));
ret.add("For help: press F3 + Q");
return ret;
}
private List<String> getRight(){ return this.getDebugInfoRight(); }
}
}

3
src/main/java/net/minecraftforge/client/event/RenderGameOverlayEvent.java
View File

@ -66,7 +66,8 @@ public class RenderGameOverlayEvent extends Event
PLAYER_LIST,
DEBUG,
POTION_ICONS,
SUBTITLES
SUBTITLES,
FPS_GRAPH
}
private final float partialTicks;

5
src/main/resources/forge_at.cfg
View File

@ -273,4 +273,7 @@ private-f net.minecraft.world.storage.loot.LootPool field_186455_c # rolls
private-f net.minecraft.world.storage.loot.LootPool field_186456_d # bonusRolls
#NBTPrimitive
public net.minecraft.nbt.NBTPrimitive
public net.minecraft.nbt.NBTPrimitive
#GuiOverlayDebug
public net.minecraft.client.gui.GuiOverlayDebug func_181554_e()V # renderLagometer