From 2eddcabdb7dda351cf51e59e33abf5a9b513ed51 Mon Sep 17 00:00:00 2001
From: ChampionAsh5357 <championash5357@gmail.com>
Date: Sat, 10 Jun 2023 07:01:33 -0400
Subject: [PATCH] Reorder overlay layers to match vanilla (#9550)

---
 .../client/gui/overlay/VanillaGuiOverlay.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/gui/overlay/VanillaGuiOverlay.java b/src/main/java/net/minecraftforge/client/gui/overlay/VanillaGuiOverlay.java
index 2835d66705..b3bc4b51b3 100644
--- a/src/main/java/net/minecraftforge/client/gui/overlay/VanillaGuiOverlay.java
+++ b/src/main/java/net/minecraftforge/client/gui/overlay/VanillaGuiOverlay.java
@@ -109,13 +109,6 @@ public enum VanillaGuiOverlay
             gui.renderFood(screenWidth, screenHeight, guiGraphics);
         }
     }),
-    MOUNT_HEALTH("mount_health", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
-        if (!gui.getMinecraft().options.hideGui && gui.shouldDrawSurvivalElements())
-        {
-            gui.setupOverlayRenderState(true, false);
-            gui.renderHealthMount(screenWidth, screenHeight, guiGraphics);
-        }
-    }),
     AIR_LEVEL("air_level", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         if (!gui.getMinecraft().options.hideGui && gui.shouldDrawSurvivalElements())
         {
@@ -123,6 +116,13 @@ public enum VanillaGuiOverlay
             gui.renderAir(screenWidth, screenHeight, guiGraphics);
         }
     }),
+    MOUNT_HEALTH("mount_health", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
+        if (!gui.getMinecraft().options.hideGui && gui.shouldDrawSurvivalElements())
+        {
+            gui.setupOverlayRenderState(true, false);
+            gui.renderHealthMount(screenWidth, screenHeight, guiGraphics);
+        }
+    }),
     JUMP_BAR("jump_bar", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         PlayerRideableJumping playerRideableJumping = gui.getMinecraft().player.jumpableVehicle();
         if (playerRideableJumping != null && !gui.getMinecraft().options.hideGui)
@@ -155,33 +155,33 @@ public enum VanillaGuiOverlay
     SLEEP_FADE("sleep_fade", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         gui.renderSleepFade(screenWidth, screenHeight, guiGraphics);
     }),
+    POTION_ICONS("potion_icons", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
+        gui.renderEffects(guiGraphics);
+    }),
     DEBUG_TEXT("debug_text", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         gui.renderHUDText(screenWidth, screenHeight, guiGraphics);
     }),
     FPS_GRAPH("fps_graph", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         gui.renderFPSGraph(guiGraphics);
     }),
-    POTION_ICONS("potion_icons", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
-        gui.renderEffects(guiGraphics);
-    }),
     RECORD_OVERLAY("record_overlay", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         if (!gui.getMinecraft().options.hideGui)
         {
             gui.renderRecordOverlay(screenWidth, screenHeight, partialTick, guiGraphics);
         }
     }),
-    SUBTITLES("subtitles", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
-        if (!gui.getMinecraft().options.hideGui)
-        {
-            gui.renderSubtitles(guiGraphics);
-        }
-    }),
     TITLE_TEXT("title_text", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
         if (!gui.getMinecraft().options.hideGui)
         {
             gui.renderTitle(screenWidth, screenHeight, partialTick, guiGraphics);
         }
     }),
+    SUBTITLES("subtitles", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
+        if (!gui.getMinecraft().options.hideGui)
+        {
+            gui.renderSubtitles(guiGraphics);
+        }
+    }),
     SCOREBOARD("scoreboard", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> {
 
         Scoreboard scoreboard = gui.getMinecraft().level.getScoreboard();