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

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java

@@ -8,6 +8,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.embeddedt.modernfix.util.PackTypeHelper;
 
 import java.io.IOException;
@@ -163,6 +164,8 @@ public static void track(ICachingResourcePack pack) {
     }
 
     public static void invalidate() {
+        if(!ModernFixPlatformHooks.isDevEnv())
+            return;
         synchronized (cachingPacks) {
             cachingPacks.keySet().forEach(pack -> {
                 if(pack != null)

forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java

@@ -19,7 +19,6 @@
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator;
 import net.minecraftforge.network.PacketDistributor;
 import net.minecraftforge.server.ServerLifecycleHooks;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
@@ -62,7 +61,7 @@ public static boolean modPresent(String modId) {
     }
 
     public static boolean isDevEnv() {
-        return !FMLLoader.isProduction() && FMLLoader.getLoadingModList().getModFileById("modernfix").getFile().getLocator() instanceof ExplodedDirectoryLocator;
+        return !FMLLoader.isProduction();
     }
 
     public static MinecraftServer getCurrentServer() {