3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port scoreboard

Browse Source
This commit is contained in:
ThisIsALegitUsername 2022-12-29 02:26:43 +00:00
parent ee505e9daa
commit 2c3e5764c6
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/6.0/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

8
src/main/java/net/minecraft/client/gui/GuiIngame.java
View File

@ -13,6 +13,8 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import dev.resent.Resent; import dev.resent.Resent;
import dev.resent.ui.mods.HUDConfigScreen;
import dev.resent.util.misc.W;
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer; import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -290,7 +292,7 @@ public class GuiIngame extends Gui {
ScoreObjective scoreobjective1 = scoreobjective != null ? scoreobjective ScoreObjective scoreobjective1 = scoreobjective != null ? scoreobjective
: scoreboard.getObjectiveInDisplaySlot(1); : scoreboard.getObjectiveInDisplaySlot(1);
if (scoreobjective1 != null) { if (scoreobjective1 != null && W.scoreboard().isEnabled()) {
this.renderScoreboard(scoreobjective1, scaledresolution); this.renderScoreboard(scoreobjective1, scaledresolution);
} }
@ -315,7 +317,9 @@ public class GuiIngame extends Gui {
this.overlayPlayerList.renderPlayerlist(i, scoreboard, scoreobjective1); this.overlayPlayerList.renderPlayerlist(i, scoreboard, scoreobjective1);
} }
Resent.INSTANCE.modManager.renderMods(); if(!(mc.currentScreen instanceof HUDConfigScreen)){
Resent.INSTANCE.modManager.renderMods();
}
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();