Remove broken containers

neoforged · May 3, 2024 · 475657f · 475657f
1 parent db7f6bf
commit 475657f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/loader/src/main/java/net/neoforged/fml/ModContainer.java b/loader/src/main/java/net/neoforged/fml/ModContainer.java
@@ -56,15 +56,6 @@ public ModContainer(IModInfo info) {
         this.modInfo = info;
     }
 
-    /**
-     * Errored container state, used for filtering. Does nothing.
-     */
-    ModContainer() {
-        modId = "BROKEN";
-        namespace = "BROKEN";
-        modInfo = null;
-    }
-
     /**
      * @return the modid for this mod
      */

diff --git a/loader/src/main/java/net/neoforged/fml/ModLoader.java b/loader/src/main/java/net/neoforged/fml/ModLoader.java
@@ -13,6 +13,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -24,7 +25,6 @@
 import java.util.stream.Collectors;
 import net.neoforged.bus.api.Event;
 import net.neoforged.bus.api.EventPriority;
-import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.event.IModBusEvent;
 import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
 import net.neoforged.fml.event.lifecycle.ParallelDispatchEvent;
@@ -42,7 +42,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Contains the logic to load mods, i.e. turn the {@link LoadingModList} into the {@link ModList},
@@ -242,7 +241,7 @@ private static List<ModContainer> buildMods(final IModFile modFile) {
                 .getMods()
                 .stream()
                 .map(info -> buildModContainerFromTOML(info, modFile.getScanResult()))
-                .filter(o -> o != null && !(o instanceof ErroredModContainer))
+                .filter(Objects::nonNull)
                 .toList();
     }
 
@@ -252,8 +251,8 @@ private static ModContainer buildModContainerFromTOML(final IModInfo modInfo, fi
         } catch (ModLoadingException mle) {
             // exceptions are caught and added to the error list for later handling
             loadingIssues.addAll(mle.getIssues());
-            // return an errored container instance here, because we tried and failed building a container.
-            return new ErroredModContainer();
+            // return a null container here because we tried and failed building a container.
+            return null;
         }
     }
 
@@ -337,15 +336,4 @@ public static List<ModLoadingIssue> getLoadingIssues() {
     public static void addLoadingIssue(ModLoadingIssue issue) {
         loadingIssues.add(issue);
     }
-
-    private static class ErroredModContainer extends ModContainer {
-        public ErroredModContainer() {
-            super();
-        }
-
-        @Override
-        public @Nullable IEventBus getEventBus() {
-            return null;
-        }
-    }
 }