Merge 1.18 into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java

@@ -41,6 +41,8 @@ public ModernFixMixinPlugin() {
 
                     if (option.isUserDefined()) {
                         source = "user configuration";
+                    } else if (!ModernFixPlatformHooks.isLoadingNormally()) {
+                        source = "load error";
                     } else if (option.isModDefined()) {
                         source = "mods [" + String.join(", ", option.getDefiningMods()) + "]";
                     }

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -242,7 +242,7 @@ private ModernFixEarlyConfig(File file) {
 
     private void disableIfModPresent(String configName, String... ids) {
         for(String id : ids) {
-            if(modPresent(id)) {
+            if(!ModernFixPlatformHooks.isLoadingNormally() || modPresent(id)) {
                 Option option = this.options.get(configName);
                 if(option != null)
                     option.addModOverride(false, id);

common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java

@@ -26,6 +26,7 @@
 import net.minecraft.world.level.block.state.properties.Property;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
+import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -115,6 +116,8 @@ public static void gatherModelMaterials(ResourceManager manager, Predicate<PackR
                                             Set<ResourceLocation> modelFiles, UnbakedModel missingModel,
                                             Function<JsonElement, BlockModel> modelDeserializer,
                                             Function<ResourceLocation, UnbakedModel> bakeryModelGetter) {
+        if(!ModernFixPlatformHooks.isLoadingNormally())
+            return;
         Stopwatch stopwatch = Stopwatch.createStarted();
         final Object2IntOpenHashMap<String> blockstateErrors = new Object2IntOpenHashMap<>();
         /*

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

@@ -73,6 +73,8 @@ public static MinecraftServer getCurrentServer() {
     }
 
     public static boolean isLoadingNormally() {
+        if(!LoadingModList.get().getErrors().isEmpty())
+            return false;
         return ModLoader.isLoadingStateValid();
     }