Merge remote-tracking branch 'origin/1.16' into 1.18

common/src/main/resources/assets/modernfix/lang/en_us.json

@@ -4,10 +4,11 @@
   "modernfix.jei_load": "Loading JEI, this may take a while",
   "modernfix.no_lazydfu": "LazyDFU is not installed. If Minecraft needs to update game data from an older version, there may be noticeable lag.",
   "modernfix.no_ferritecore": "FerriteCore is not installed. Memory usage will be very high.",
+  "modernfix.connectedness_dynresources": "Connectedness and ModernFix's dynamic resources option are not compatible. Remove Connectedness or disable dynamic resources in the ModernFix config.",
   "modernfix.perf_mod_warning": "It is recommended to install the mods, but the warning(s) can be disabled in the ModernFix config.",
   "modernfix.config": "ModernFix mixin config",
   "modernfix.config.done_restart": "Done (restart required)",
-  "modernfix.message.reload_config": "Run /mfrc after changing configs on disk for them to take effect.",
+  "modernfix.message.reload_config": "A mod config file change was detected. To prevent loading files that aren't done saving, reloading must be triggered by running /mfrc.",
   "modernfix.option.on": "on",
   "modernfix.option.off": "off",
   "modernfix.option.disabled": "disabled",

fabric/src/main/java/org/embeddedt/modernfix/ModernFixPreLaunchFabric.java

@@ -1,6 +1,9 @@
 package org.embeddedt.modernfix;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+import net.fabricmc.loader.impl.gui.FabricGuiEntry;
+import net.fabricmc.loader.impl.gui.FabricStatusTree;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.fabric.mappings.MappingsClearer;
 import org.embeddedt.modernfix.spark.SparkLaunchProfiler;
@@ -19,5 +22,18 @@ public class ModernFixPreLaunchFabric implements PreLaunchEntrypoint {
         if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.clear_fabric_mapping_tables.MappingsClearer")) {
             MappingsClearer.clear();
         }
+
+        // Prevent launching with Continuity when dynamic resources is on
+        if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.dynamic_resources.ContinuityCheck")
+                && FabricLoader.getInstance().isModLoaded("continuity")) {
+            CommonModUtil.runWithoutCrash(() -> {
+                FabricGuiEntry.displayError("Compatibility warning", null, tree -> {
+                    FabricStatusTree.FabricStatusTab crashTab = tree.addTab("Warning");
+                    crashTab.node.addMessage("Continuity and ModernFix's dynamic resources option are not compatible before Minecraft 1.19.4.", FabricStatusTree.FabricTreeWarningLevel.ERROR);
+                    crashTab.node.addMessage("Remove Continuity or disable dynamic resources in the ModernFix config.", FabricStatusTree.FabricTreeWarningLevel.ERROR);
+                    tree.tabs.removeIf(tab -> tab != crashTab);
+                }, true);
+            }, "display Continuity warning");
+        }
     }
 }

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java

@@ -19,11 +19,12 @@ import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.*;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
 import org.embeddedt.modernfix.ModernFixClient;
+import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.forge.config.NightConfigFixer;
 import org.embeddedt.modernfix.screen.ModernFixConfigScreen;
 
@@ -47,6 +48,12 @@ public class ModernFixClientForge {
     private void clientSetup(FMLClientSetupEvent event) {
         configKey = new KeyMapping("key.modernfix.config", KeyConflictContext.UNIVERSAL, InputConstants.UNKNOWN, "key.modernfix");
         ClientRegistry.registerKeyBinding(configKey);
+        if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.dynamic_resources.ConnectednessCheck")
+            && ModList.get().isLoaded("connectedness")) {
+            event.enqueueWork(() -> {
+                ModLoader.get().addWarning(new ModLoadingWarning(ModLoadingContext.get().getActiveContainer().getModInfo(), ModLoadingStage.SIDED_SETUP, "modernfix.connectedness_dynresoruces"));
+            });
+        }
     }
 
     @SubscribeEvent