Ugly workaround for neoforged/FancyModLoader#110

Changed finalization logic for all loaders for consistent behaviour.

Will look into a better alternative later

common/src/main/java/nl/elec332/minecraft/loader/impl/AnnotationDataHandler.java

@@ -31,7 +31,7 @@ enum AnnotationDataHandler {
 
     AnnotationDataHandler() {
         asmLoaderMap = Maps.newHashMap();
-        validStates = ImmutableList.copyOf(ModLoadingStage.values());
+        validStates = ImmutableList.copyOf(EnumSet.complementOf(EnumSet.of(ModLoadingStage.PRE_CONSTRUCT)));
         sideOnlyCache = Maps.newHashMap();
     }
 
@@ -314,18 +314,7 @@ void preProcess() {
     void process(ModLoadingStage state) {
         if (validStates.contains(state)) {
             Multimap<IModContainer, IAnnotationDataProcessor> dataProcessors = asmLoaderMap.get(state);
-            dataProcessors.forEach((mc, dataProcessor) -> {
-                Runnable exec = () -> dataProcessor.processASMData(asmDataHelper, state);;
-                if (state != ModLoadingStage.PRE_CONSTRUCT) {
-                    IModLoaderEventHandler.INSTANCE.enqueueDeferredWork(state, mc, exec);
-                } else {
-                    try {
-                        exec.run();
-                    } catch (Throwable e) {
-                        throw new RuntimeException("Failed to do pre-construct annotation processing work for mod: " + mc.getModId(), e);
-                    }
-                }
-            });
+            dataProcessors.forEach((mc, dataProcessor) -> IModLoaderEventHandler.INSTANCE.enqueueDeferredWork(state, mc, () -> dataProcessor.processASMData(asmDataHelper, state)));
             asmLoaderMap.remove(state);
         } else {
             throw new IllegalArgumentException();

common/src/main/java/nl/elec332/minecraft/loader/impl/DeferredModLoader.java

@@ -88,6 +88,9 @@ public MappingType getMappingTarget() {
     @Nullable
     @Override
     public IModContainer getModContainer(String id) {
+        if (!LoaderInitializer.INSTANCE.completedModList()) {
+            throw new IllegalStateException();
+        }
         return realModLoader.getModContainer(id);
     }
 
@@ -98,6 +101,9 @@ public IModContainer getModContainer(String id) {
 
     @Override
     public Set<IModContainer> getMods() {
+        if (!LoaderInitializer.INSTANCE.completedModList()) {
+            throw new IllegalStateException();
+        }
         return realModLoader.getMods();
     }
 

common/src/main/java/nl/elec332/minecraft/loader/impl/ElecModContainer.java

@@ -66,8 +66,10 @@ private void onEventFailed(IEventBus iEventBus, Event event, EventListener[] iEv
     }
 
     private void constructMod() {
-        if (!LoaderInitializer.INSTANCE.completedModList()) {
-            throw new IllegalStateException("ModList hasn't been finalized before instantiation!");
+        synchronized (ElecModContainer.class) {
+            if (!LoaderInitializer.INSTANCE.completedModList()) {
+                LoaderInitializer.INSTANCE.finalizeLoading();
+            }
         }
         try {
             LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());

common/src/main/java/nl/elec332/minecraft/loader/impl/LoaderInitializer.java

@@ -82,7 +82,6 @@ public void finalizeLoading() {
             getModLoader().finalizeLoading();
             AnnotationDataHandler.INSTANCE.preProcess();
             finalized = true;
-            AnnotationDataHandler.INSTANCE.process(ModLoadingStage.PRE_CONSTRUCT);
         }
     }
 

fabric/src/main/java/nl/elec332/minecraft/loader/impl/fabriclike/FabricModStages.java

@@ -18,7 +18,6 @@ public final class FabricModStages {
 
     public static void discover() {
         ElecModLoader.getModLoader().useDiscoveredMods((meta, type) -> new ElecModContainer(meta, type.getClassName(), Class::forName, (e, c) -> new RuntimeException("Failed to " + e.getKey() + " mod " + meta.getModId(), e.getValue())));
-        LoaderInitializer.INSTANCE.finalizeLoading();
         IModLoaderEventHandler.INSTANCE.postModEvent(ConstructModEvent::new);
         processQueue(ModLoadingStage.CONSTRUCT);
     }