From 416b60ef717f4f7183f54a4a7362e0c540928c8d Mon Sep 17 00:00:00 2001 From: Wyvest <45589059+Wyvest@users.noreply.github.com> Date: Thu, 16 Jun 2022 22:16:28 +0700 Subject: fast render compat (i hate fast render) --- .../cc/polyfrost/oneconfig/utils/TickDelay.java | 10 +++++-- .../cc/polyfrost/oneconfig/utils/gui/GuiUtils.java | 31 +++++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) (limited to 'src/main/java/cc/polyfrost/oneconfig/utils') diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/TickDelay.java b/src/main/java/cc/polyfrost/oneconfig/utils/TickDelay.java index b51ee85..b7ee2c8 100644 --- a/src/main/java/cc/polyfrost/oneconfig/utils/TickDelay.java +++ b/src/main/java/cc/polyfrost/oneconfig/utils/TickDelay.java @@ -7,14 +7,20 @@ import cc.polyfrost.oneconfig.libs.eventbus.Subscribe; /** * Schedules a Runnable to be called after a certain amount of ticks. + * + * If the amount of ticks is below 1, the Runnable will be called immediately. */ public class TickDelay { private final Runnable function; private int delay; public TickDelay(Runnable functionName, int ticks) { - EventManager.INSTANCE.register(this); - delay = ticks; + if (ticks < 1) { + functionName.run(); + } else { + EventManager.INSTANCE.register(this); + delay = ticks; + } function = functionName; } 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> 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 optional = Optional.of(screen); + screenQueue.add(optional); + new TickDelay(() -> { + UScreen.displayScreen(screen); + screenQueue.remove(optional); + }, ticks); + } + + public static Deque> getScreenQueue() { + return screenQueue; } /** -- cgit