Fix HUD info showing while GUI is hidden

juliand665 · Jun 23, 2024 · a5dffb4 · a5dffb4
1 parent 8d4c635
commit a5dffb4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java b/platforms/common/src/main/java/dynamic_fps/impl/util/HudInfoRenderer.java
@@ -17,6 +17,10 @@ public final class HudInfoRenderer {
 	private static final Minecraft minecraft = Minecraft.getInstance();
 
 	public static void renderInfo(GuiGraphics guiGraphics) {
+		if (minecraft.options.hideGui || minecraft.screen != null) {
+			return;
+		}
+
 		if (DynamicFPSConfig.INSTANCE.batteryTracker().enabled()) {
 			drawBatteryOverlay(guiGraphics);
 		}
@@ -35,7 +39,7 @@ private static void drawCenteredText(GuiGraphics guiGraphics, Component componen
 	}
 
 	private static void drawBatteryOverlay(GuiGraphics graphics) {
-		if (minecraft.screen != null || minecraft.getDebugOverlay().showDebugScreen() || !BatteryTracker.hasBatteries()) {
+		if (minecraft.getDebugOverlay().showDebugScreen() || !BatteryTracker.hasBatteries()) {
 			return;
 		}
 

diff --git a/platforms/fabric/src/main/java/net/lostluma/dynamic_fps/impl/fabric/mixin/GuiMixin.java b/platforms/fabric/src/main/java/net/lostluma/dynamic_fps/impl/fabric/mixin/GuiMixin.java
@@ -15,7 +15,7 @@ public class GuiMixin {
 	 * Render info on whether Dynamic FPS is disabled or always reducing the user's FPS.
 	 */
 	@Inject(method = "renderSavingIndicator", at = @At("HEAD"))
-	private void renderSavingIndicator(CallbackInfo callbackInfo, @Local GuiGraphics guiGraphics) {
+	private void renderSavingIndicator(CallbackInfo callbackInfo, @Local(argsOnly = true) GuiGraphics guiGraphics) {
 		HudInfoRenderer.renderInfo(guiGraphics);
 	}
 }
diff --git a/platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/mixin/GuiMixin.java b/platforms/quilt/src/main/java/net/lostluma/dynamic_fps/impl/quilt/mixin/GuiMixin.java
@@ -15,7 +15,7 @@ public class GuiMixin {
 	 * Render info on whether Dynamic FPS is disabled or always reducing the user's FPS.
 	 */
 	@Inject(method = "renderSavingIndicator", at = @At("HEAD"))
-	private void renderSavingIndicator(CallbackInfo callbackInfo, @Local GuiGraphics guiGraphics) {
+	private void renderSavingIndicator(CallbackInfo callbackInfo, @Local(argsOnly = true) GuiGraphics guiGraphics) {
 		HudInfoRenderer.renderInfo(guiGraphics);
 	}
 }