From a51b1563b1f67c0d6bbe620b35f6f15b42b0cd2a Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 11 Aug 2023 19:31:12 -0400
Subject: [PATCH] Try to make config reload message appear less often

Related: #210
---
 .../org/embeddedt/modernfix/ModernFixClient.java    |  2 +-
 .../modernfix/forge/config/NightConfigFixer.java    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
index 11cd9764..29c18315 100644
--- a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
+++ b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
@@ -27,7 +27,7 @@ public class ModernFixClient {
 
     public static float gameStartTimeSeconds = -1;
 
-    private static boolean recipesUpdated, tagsUpdated = false;
+    public static boolean recipesUpdated, tagsUpdated = false;
 
     public String brandingString = null;
 
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java b/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java
index 8ae460a7..8155f186 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java
@@ -7,6 +7,7 @@ import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.fml.loading.FMLLoader;
 import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.util.CommonModUtil;
 
@@ -16,11 +17,11 @@ import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 public class NightConfigFixer {
     public static final LinkedHashSet<Runnable> configsToReload = new LinkedHashSet<>();
+
     public static void monitorFileWatcher() {
         if(!ModernFixMixinPlugin.instance.isOptionEnabled("bugfix.fix_config_crashes.NightConfigFixerMixin"))
             return;
@@ -49,6 +50,7 @@ public class NightConfigFixer {
             }
         }
         ModernFix.LOGGER.info("Processed {} config reloads", runnablesToRun.size());
+        couldShowMessage = true;
     }
 
     static class MonitoringMap extends ConcurrentHashMap<Path, Object> {
@@ -74,13 +76,13 @@ public class NightConfigFixer {
         }
     }
 
-    private static long lastConfigTrigger = System.nanoTime();
+    private static boolean couldShowMessage = true;
 
     private static void triggerConfigMessage() {
-        if((System.nanoTime() - lastConfigTrigger) >= TimeUnit.SECONDS.toNanos(5)) {
-            lastConfigTrigger = System.nanoTime();
+        if(couldShowMessage && Minecraft.getInstance().level != null && ModernFixClient.recipesUpdated && ModernFixClient.tagsUpdated) {
             Minecraft.getInstance().execute(() -> {
                 if(Minecraft.getInstance().level != null) {
+                    couldShowMessage = false;
                     Minecraft.getInstance().gui.getChat().addMessage(new TranslatableComponent("modernfix.message.reload_config"));
                 }
             });
@@ -102,8 +104,9 @@ public class NightConfigFixer {
             synchronized(configsToReload) {
                 if(FMLLoader.getDist().isClient())
                     triggerConfigMessage();
-                if(configsToReload.size() == 0)
+                if(configsToReload.size() == 0) {
                     ModernFixMixinPlugin.instance.logger.info("Please use /{} to reload any changed mod config files", FMLLoader.getDist().isDedicatedServer() ? "mfsrc" : "mfrc");
+                }
                 configsToReload.add(configTracker);
             }
         }