Remove core config

diff --git a/core/src/main/java/net/rizon/moo/plugin/core/conf/CoreConfiguration.java b/core/src/main/java/net/rizon/moo/plugin/core/conf/CoreConfiguration.java
deleted file mode 100644 (file)
index ace8c3b..0000000
--- a/core/src/main/java/net/rizon/moo/plugin/core/conf/CoreConfiguration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.rizon.moo.plugin.core.conf;
-
-import net.rizon.moo.conf.Configuration;
-import net.rizon.moo.conf.ConfigurationException;
-
-public class CoreConfiguration extends Configuration
-{
-       public ShellConfiguration shell;
-
-       public static CoreConfiguration load() throws Exception
-       {
-               return Configuration.load("core.yml", CoreConfiguration.class);
-       }
-
-       @Override
-       public void validate() throws ConfigurationException
-       {
-               shell.validate();
-       }
-}

diff --git a/core/src/main/java/net/rizon/moo/plugin/core/conf/ShellConfiguration.java b/core/src/main/java/net/rizon/moo/plugin/core/conf/ShellConfiguration.java
deleted file mode 100644 (file)
index ddb8712..0000000
--- a/core/src/main/java/net/rizon/moo/plugin/core/conf/ShellConfiguration.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.rizon.moo.plugin.core.conf;
-
-import net.rizon.moo.conf.Configuration;
-import net.rizon.moo.conf.ConfigurationException;
-import net.rizon.moo.conf.Validator;
-
-public class ShellConfiguration extends Configuration
-{
-       public boolean enabled;
-       public String base;
-
-       @Override
-       public void validate() throws ConfigurationException
-       {
-               Validator.validateNotNull("Core Shell enabled", enabled);
-               Validator.validatePath("Core Shell base", base);
-       }
-}

diff --git a/core/src/main/java/net/rizon/moo/plugin/core/core.java b/core/src/main/java/net/rizon/moo/plugin/core/core.java
index 7ceb7b38b50fd351780ef42eb3c046f4531081d6..a64e91850a4304855b42cb113b7fd513d17bf587 100644 (file)
--- a/core/src/main/java/net/rizon/moo/plugin/core/core.java
+++ b/core/src/main/java/net/rizon/moo/plugin/core/core.java
@@ -1,6 +1,5 @@
 package net.rizon.moo.plugin.core;
 
-import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.multibindings.Multibinder;
 import java.util.Arrays;
@@ -8,9 +7,6 @@ import java.util.List;
 import net.rizon.moo.Command;
 import net.rizon.moo.Plugin;
 import net.rizon.moo.events.EventListener;
-import net.rizon.moo.events.OnReload;
-import net.rizon.moo.plugin.core.conf.CoreConfiguration;
-import org.codehaus.plexus.util.cli.shell.CommandShell;
 import org.slf4j.Logger;
 
 public class core extends Plugin implements EventListener
@@ -18,8 +14,6 @@ public class core extends Plugin implements EventListener
        @Inject
        private static Logger logger;
 
-       private CoreConfiguration conf;
-
        @Inject
        private CommandHelp help;
 
@@ -44,7 +38,6 @@ public class core extends Plugin implements EventListener
        public core() throws Exception
        {
                super("Commands", "Core commands");
-               conf = CoreConfiguration.load();
        }
        
        @Override
@@ -52,8 +45,6 @@ public class core extends Plugin implements EventListener
        {
                bind(core.class).toInstance(this);
                
-               bind(CoreConfiguration.class).toInstance(conf);
-               
                Multibinder<Command> commandBinder = Multibinder.newSetBinder(binder(), Command.class);
                commandBinder.addBinding().to(CommandHelp.class);
                commandBinder.addBinding().to(CommandHost.class);
@@ -76,21 +67,6 @@ public class core extends Plugin implements EventListener
        public void stop()
        {
        }
-       
-       @Subscribe
-       public void onReload(OnReload evt)
-       {
-               try
-               {
-                       conf = CoreConfiguration.load();
-               }
-               catch (Exception ex)
-               {
-                       evt.getSource().reply("Error reloading core configuration: " + ex.getMessage());
-                       
-                       logger.warn("Unable to reload core configuration", ex);
-               }
-       }
 
        @Override
        public List<Command> getCommands()