Merge branch 'master' of github.com:Polyfrost/OneConfig

1 files changed, 28 insertions, 3 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
index d7b3bea..6ff0254 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java
@@ -3,18 +3,24 @@ package cc.polyfrost.oneconfig.utils.gui;
 import cc.polyfrost.oneconfig.events.EventManager;
 import cc.polyfrost.oneconfig.events.event.RenderEvent;
 import cc.polyfrost.oneconfig.events.event.Stage;
-import cc.polyfrost.oneconfig.utils.TickDelay;
+import cc.polyfrost.oneconfig.gui.OneConfigGui;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
 import cc.polyfrost.oneconfig.libs.universal.UScreen;
-import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
+import cc.polyfrost.oneconfig.utils.TickDelay;
 import net.minecraft.client.gui.GuiScreen;
 
+import java.util.Deque;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
 /**
  * A class containing utility methods for working with GuiScreens.
  */
 public final class GuiUtils {
     private static long time = -1L;
     private static long deltaTime = 17L;
+    private static final Deque<Optional<GuiScreen>> screenQueue = new ConcurrentLinkedDeque<>();
 
     static {
         EventManager.INSTANCE.register(new GuiUtils());
@@ -26,7 +32,26 @@ public final class GuiUtils {
      * @param screen the screen to display.
      */
     public static void displayScreen(GuiScreen screen) {
-        new TickDelay(() -> UScreen.displayScreen(screen), 1);
+        displayScreen(screen, screen instanceof OneConfigGui ? 2 : 1);
+    }
+
+    /**
+     * Displays a screen after the specified amount of ticks.
+     *
+     * @param screen the screen to display.
+     * @param ticks the amount of ticks to wait for before displaying the screen.
+     */
+    public static void displayScreen(GuiScreen screen, int ticks) {
+        Optional<GuiScreen> optional = Optional.of(screen);
+        screenQueue.add(optional);
+        new TickDelay(() -> {
+            UScreen.displayScreen(screen);
+            screenQueue.remove(optional);
+        }, ticks);
+    }
+
+    public static Deque<Optional<GuiScreen>> getScreenQueue() {
+        return screenQueue;
     }
 
     /**