Fixed PluginManager not using mod filter because collect was being ca…

…lled too soon
InnovativeOnlineIndustries · Jul 22, 2020 · e0ffca1 · e0ffca1
1 parent 85ec91d
commit e0ffca1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/java/com/hrznstudio/titanium/Titanium.java b/src/main/java/com/hrznstudio/titanium/Titanium.java
@@ -85,7 +85,6 @@ public class Titanium extends ModuleController {
     public static final Logger LOGGER = LogManager.getLogger(MODID);
     public static NetworkHandler NETWORK = new NetworkHandler(MODID);
     public static final PluginManager RESOURCES = new PluginManager(MODID, FeaturePlugin.FeaturePluginType.FEATURE, featurePlugin -> featurePlugin.value().equalsIgnoreCase(ResourceRegistry.PLUGIN_NAME), false);
-    ;
 
     public Titanium() {
         NETWORK.registerMessage(ButtonClickNetworkMessage.class);

diff --git a/src/main/java/com/hrznstudio/titanium/plugin/PluginManager.java b/src/main/java/com/hrznstudio/titanium/plugin/PluginManager.java
@@ -36,8 +36,8 @@ public PluginManager(String modid, FeaturePlugin.FeaturePluginType type, Predica
         this.modid = modid;
         this.type = type;
         this.predicate = predicate;
-        this.plugins = collect();
         this.useModIdFilter = useModIdFilter;
+        this.plugins = collect();
         this.plugins.forEach(aClass -> LOGGER.info("Found FeaturePluginInstance for class " + aClass.getSimpleName() + " for plugin " + ((FeaturePlugin) aClass.getAnnotation(FeaturePlugin.class)).value()));
     }