Merge pull request #135 from natemontgomery/merge-branch

Merge Refactor Plugin Loading patch from ElsIf.

Plugins that should be loaded on startup should be added to the initial_plugins structure instead of a auto_activate.
Various other quirks resolved.

Author: kamilion

base_plugin.py

@@ -18,14 +18,7 @@ class BasePlugin(object):
     name = "Base Plugin"
     description = "The common class for all plugins to inherit from."
     version = ".1"
-    depends = []
-    auto_activate = True
-
-    def __init__(self):
-        plugin_config = self.config.plugin_config
-        if 'auto_activate' not in plugin_config:
-            plugin_config['auto_activate'] = self.auto_activate
-        self.config.plugin_config = plugin_config
+    depends = [] 
 
     def activate(self):
         """
@@ -389,23 +382,22 @@ class SimpleCommandPlugin(BasePlugin):
     name = "simple_command_plugin"
     description = "Provides a simple parent class to define chat commands."
     version = "0.1"
-    depends = ["command_dispatcher"]
+    depends = ["command_plugin"]
     commands = []
     command_aliases = {}
-    auto_activate = True
 
     def activate(self):
         super(SimpleCommandPlugin, self).activate()
         for command in self.commands:
             f = getattr(self, command)
             if not callable(f):
                 raise CommandNameError("Could not find a method called %s" % command)
-            self.plugins['command_dispatcher'].register(f, command)
+            self.plugins['command_plugin'].register(f, command)
         for command, alias_list in self.command_aliases.iteritems():
             for alias in alias_list:
-                self.plugins['command_dispatcher'].register(alias, command)
+                self.plugins['command_plugin'].register(alias, command)
 
     def deactivate(self):
         super(SimpleCommandPlugin, self).deactivate()
         for command in self.commands:
-            self.plugins['command_dispatcher'].unregister(command)
+            self.plugins['command_plugin'].unregister(command)

config/config.json.default

@@ -12,55 +12,43 @@
         "owner": "^#F7434C;",
         "registered": "^#A0F743;"
     },
+    "initial_plugins": [
+        "admin_messenger",
+        "afk_plugin",
+        "announcer_plugin",
+        "bookmarks_plugin",
+        "brutus_whisper",
+        "chat_logger",
+        "claims",
+        "emotes",
+        "loginwho_plugin",
+        "mod_chatter",
+        "motd_plugin",
+        "new_player_greeter_plugin",
+        "planet_protect",
+        "planet_visitor_announcer_plugin",
+        "players_plugin",
+        "plugin_manager_plugin",
+        "poi_plugin",
+        "udp_forwarder",
+        "uptime_plugin"
+    ],
     "command_prefix": "/",
-    "core_plugin_path": "core_plugins",
     "log_level": "DEBUG",
+    "debug_file": "debug.log",
     "owner_uuid": "!!--REPLACE THIS--!!",
     "passthrough": false,
     "player_db": "config/player.db",
     "plugin_config": {
-        "Base Plugin": {
-            "auto_activate": true
-        },
-        "admin_messenger": {
-            "auto_activate": true
-        },
         "afk_plugin": {
             "afk_msg": "^gray;is now AFK.",
-            "afkreturn_msg": "^gray;has returned.",
-            "auto_activate": true
-        },
-        "announcer_plugin": {
-            "auto_activate": true
-        },
-        "bookmarks_plugin": {
-            "auto_activate": true
-        },
-        "brutus_whisper": {
-            "auto_activate": true
-        },
-        "chat_logger": {
-            "auto_activate": true
+            "afkreturn_msg": "^gray;has returned."
         },
         "claims": {
-            "auto_activate": true,
             "max_claims": 5,
             "unclaimable_planets": []
         },
-        "colored_names_plugin": {
-            "auto_activate": true
-        },
-        "command_dispatcher": {
-            "auto_activate": true
-        },
-        "emotes_plugin": {
-            "auto_activate": true
-        },
-        "fuelgiver_plugin": {
-            "auto_activate": false
-        },
         "irc": {
-            "auto_activate": false,
             "bot_nickname": "StarryPyBot",
             "channel": "##test",
             "color": "^#e39313;",
@@ -69,21 +57,10 @@
             "port": 6667,
             "server": "irc.freenode.net"
         },
-        "loginwho_plugin": {
-            "auto_activate": true
-        },
-        "mod_chatter": {
-            "auto_activate": true
-        },
         "motd_plugin": {
-            "auto_activate": true,
             "motd": "Welcome to the server! Play nice."
         },
-        "mute_manager": {
-            "auto_activate": true
-        },
         "new_player_greeter_plugin": {
-            "auto_activate": false,
             "items": [
                 [
                     "coalore",
@@ -93,7 +70,6 @@
             "message": "Welcome to the server!"
         },
         "planet_protect": {
-            "auto_activate": true,
             "bad_packets": [
                 "COLLECT_LIQUID",
                 "CONNECT_WIRE",
@@ -184,31 +160,14 @@
             "protected_planets": [
             ]
         },
-        "planet_visitor_announcer_plugin": {
-            "auto_activate": true
-        },
-        "player_manager": {
+        "player_manager_plugin": {
             "admin_ss": "tester",
-            "auto_activate": true,
             "name_removal_regexes": [
                 "\\^\\w+;|\\^#\\w+;|\\W",
                 "\\s\\s+"
             ]
         },
-        "players_plugin": {
-            "auto_activate": true
-        },
-        "plugin_manager": {
-            "auto_activate": true
-        },
-        "poi_plugin": {
-            "auto_activate": true
-        },
-        "starbound_config_manager": {
-            "auto_activate": true
-        },
         "starteritems_plugin": {
-            "auto_activate": false,
             "message": "Enjoy these gifts from us!",
             "items": [
                 [
@@ -217,17 +176,7 @@
                 ]
             ]
         },
-        "uptime_plugin": {
-            "auto_activate": true
-        },
-        "user_management_commands": {
-            "auto_activate": true
-        },
-        "warpy_plugin": {
-            "auto_activate": true
-        },
         "web_gui": {
-            "auto_activate": true,
             "cookie_token": "",
             "log_path": "webgui.log",
             "log_path_access": "webgui_access.log",