From 2c3e5764c650a7070cf4fefd4bcbb0afd8ede6d0 Mon Sep 17 00:00:00 2001
From: ThisIsALegitUsername <andrewsouchien@gmail.com>
Date: Thu, 29 Dec 2022 02:26:43 +0000
Subject: [PATCH] Port scoreboard

---
 .gradle/6.0/fileHashes/fileHashes.lock            | Bin 38 -> 17 bytes
 .../buildOutputCleanup/buildOutputCleanup.lock    | Bin 38 -> 17 bytes
 .../java/net/minecraft/client/gui/GuiIngame.java  |   8 ++++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gradle/6.0/fileHashes/fileHashes.lock b/.gradle/6.0/fileHashes/fileHashes.lock
index 87c186a7746ced58e2c576ce5160836fce0c9afc..6807a1fd483625101199aac310783bc080a166a2 100644
GIT binary patch
literal 17
VcmZRUe|qqkkB~nT0~lOh2mmes1hN1C

literal 38
qcmZRUe|qqkkB~nT0~lOh$jrbn`^c%yithvC_4yfCj1A3=7#INC#0p>l

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9ac50e84c4e15042eed57a4c2ef7ec5091ff16e0..f8132177042c545e02b604f12000272cbc300c60 100644
GIT binary patch
literal 17
UcmZR6D;XS8_%!Jb0|b--05pOGy8r+H

literal 38
pcmZR6D;XS8_%!Jb0|b;YGce3P^2=ZYV^+WkUj`OqLvter1_0v03YY)@

diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java
index f31d6013..12d27cf5 100644
--- a/src/main/java/net/minecraft/client/gui/GuiIngame.java
+++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java
@@ -13,6 +13,8 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 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.WorldRenderer;
 import net.minecraft.block.material.Material;
@@ -290,7 +292,7 @@ public class GuiIngame extends Gui {
 
 		ScoreObjective scoreobjective1 = scoreobjective != null ? scoreobjective
 				: scoreboard.getObjectiveInDisplaySlot(1);
-		if (scoreobjective1 != null) {
+		if (scoreobjective1 != null && W.scoreboard().isEnabled()) {
 			this.renderScoreboard(scoreobjective1, scaledresolution);
 		}
 
@@ -315,7 +317,9 @@ public class GuiIngame extends Gui {
 			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.disableLighting();
 		GlStateManager.enableAlpha();