From 145213afa8e68e512146fcf5afea9044895095a5 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:51:38 -0500
Subject: [PATCH] Minor bugfixes to faster singleplayer load

---
 src/main/java/org/embeddedt/modernfix/ModernFixClient.java | 2 +-
 src/main/java/org/embeddedt/modernfix/util/JEIUtil.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
index 27b1df1b..4d1a3ce4 100644
--- a/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
+++ b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
@@ -55,7 +55,7 @@ public class ModernFixClient {
 
     @SubscribeEvent
     public void onRenderTickEnd(TickEvent.RenderTickEvent event) {
-        if(event.phase == TickEvent.Phase.END && worldLoadStartTime != -1 && Minecraft.getInstance().player != null && numRenderTicks++ >= 10) {
+        if(event.phase == TickEvent.Phase.END && !(Minecraft.getInstance().screen instanceof DeferredLevelLoadingScreen) && worldLoadStartTime != -1 && Minecraft.getInstance().player != null && numRenderTicks++ >= 10) {
             float timeSpentLoading = ((float)(System.nanoTime() - worldLoadStartTime) / 1000000000f);
             ModernFix.LOGGER.warn("Time from main menu to in-game was " + timeSpentLoading + " seconds");
             ModernFix.LOGGER.warn("Total time to load game and open world was " + (timeSpentLoading + gameStartTimeSeconds) + " seconds");
diff --git a/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java b/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java
index 230045ea..59e6b244 100644
--- a/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java
+++ b/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java
@@ -10,6 +10,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import org.embeddedt.modernfix.screen.DeferredLevelLoadingScreen;
 
 import java.util.function.Supplier;
 
@@ -23,7 +24,8 @@ public class JEIUtil {
 
     @SubscribeEvent
     public static void renderLoad(GuiScreenEvent.DrawScreenEvent.Post event) {
-        if(isLoading.get()) {
+        /* Don't show the JEI indicator on the level loading screen, that looks weird */
+        if(isLoading.get() && !(event.getGui() instanceof DeferredLevelLoadingScreen)) {
             Gui.drawString(new PoseStack(), Minecraft.getInstance().font, new TranslatableComponent("modernfix.jei_load"), 0, 0, 0xffffff);
         }
     }