Force Mystcraft plugin to load unconditionally.

This cannot be overridden by TDynstruct.cfg for balance sake.
SlimeKnights · Nov 29, 2013 · ca4f420 · ca4f420
1 parent dfde917
commit ca4f420
Showing 1 changed file with 31 additions and 23 deletions.
diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java
@@ -53,29 +53,35 @@ public void registerPlugin(ICompatPlugin plugin)
         boolean shouldLoad = conf.get("Plugins", plugin.getModId(), true).getBoolean(true);
         conf.save();
 
-        if (shouldLoad && Loader.isModLoaded(plugin.getModId()))
+        if (shouldLoad)
+            loadPlugin(plugin);
+    }
+
+    // This does the actual plugin loading if mod is present; needed to allow force-enabling.
+    private void loadPlugin(ICompatPlugin plugin)
+    {
+        if (!Loader.isModLoaded(plugin.getModId())) return;
+
+        TConstruct.logger.info("[PluginController] Registering compat plugin for " + plugin.getModId());
+        plugins.add(plugin);
+
+        switch (currPhase) // Play catch-up if plugin is registered late
         {
-            TConstruct.logger.info("[PluginController] Registering compat plugin for " + plugin.getModId());
-            plugins.add(plugin);
-
-            switch (currPhase) // Play catch-up if plugin is registered late
-            {
-                case DONE:
-                case POSTINIT:
-                    plugin.preInit();
-                    plugin.init();
-                    plugin.postInit();
-                    break;
-                case INIT:
-                    plugin.preInit();
-                    plugin.init();
-                    break;
-                case PREINIT:
-                    plugin.preInit();
-                    break;
-                default:
-                    break;
-            }
+            case DONE:
+            case POSTINIT:
+                plugin.preInit();
+                plugin.init();
+                plugin.postInit();
+                break;
+            case INIT:
+                plugin.preInit();
+                plugin.init();
+                break;
+            case PREINIT:
+                plugin.preInit();
+                break;
+            default:
+                break;
         }
     }
 
@@ -100,11 +106,13 @@ public void postInit()
 
     public void registerBuiltins()
     {
+        // Mystcraft is pushed in through the backdoor so it can't be disabled.
+        loadPlugin(new Mystcraft());
+
         registerPlugin(new AppEng());
         registerPlugin(new BuildcraftTransport());
         registerPlugin(new ForgeMultiPart());
         registerPlugin(new MineFactoryReloaded());
-        registerPlugin(new Mystcraft());
         registerPlugin(new NotEnoughItems());
         registerPlugin(new Thaumcraft());
         registerPlugin(new Waila());