Fix errors in preInit being lost when followed by a crash in fireRegistryEvents or objectHolder

src/main/java/net/minecraftforge/fml/common/LoadController.java

@@ -174,11 +174,18 @@ public class LoadController
         }
     }
 
+    @Deprecated // TODO remove in 1.13
     public void checkErrorsAfterAvailable()
+    {
+        checkErrors();
+    }
+
+    public void checkErrors()
     {
         if (errors.size() > 0)
         {
-            FMLLog.log.fatal("Fatal errors were detected during {}. Loading cannot continue", LoaderState.AVAILABLE);
+            FMLLog.log.fatal("Fatal errors were detected during {}. Loading cannot continue.", state);
+            state = state.transition(true);
             throw throwStoredErrors();
         }
     }

src/main/java/net/minecraftforge/fml/common/Loader.java

@@ -600,6 +600,7 @@ public class Loader
         ItemStackHolderInjector.INSTANCE.findHolders(discoverer.getASMTable());
         CapabilityManager.INSTANCE.injectCapabilities(discoverer.getASMTable());
         modController.distributeStateMessage(LoaderState.PREINITIALIZATION, discoverer.getASMTable(), canonicalConfigDir);
+        modController.checkErrors();
         GameData.fireRegistryEvents(rl -> !rl.equals(GameData.RECIPES));
         FMLCommonHandler.instance().fireSidedRegistryEvents();
         ObjectHolderRegistry.INSTANCE.applyObjectHolders();
@@ -725,7 +726,7 @@ public class Loader
         progressBar.step("Finishing up");
         modController.transition(LoaderState.AVAILABLE, false);
         modController.distributeStateMessage(LoaderState.AVAILABLE);
-        modController.checkErrorsAfterAvailable();
+        modController.checkErrors();
         GameData.freezeData();
         FMLLog.log.info("Forge Mod Loader has successfully loaded {} mod{}", mods.size(), mods.size() == 1 ? "" : "s");
         progressBar.step("Completing Minecraft initialization");