Translated the Faucet entries to ConfigMe properties

Author: jamezrin

pom.xml

@@ -96,16 +96,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
-        <!-- TODO Ditch this dependency, move to ConfigMe
         <dependency>
-            <groupId>me.jaimemartz</groupId>
-            <artifactId>faucet-bungee</artifactId>
-            <version>1.0</version>
+            <groupId>ch.jalu</groupId>
+            <artifactId>injector</artifactId>
+            <version>0.4</version>
             <scope>compile</scope>
         </dependency>
-        -->
 
         <!-- TODO Replace with HTTP call to Spigot's API -->
         <dependency>

src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

@@ -1,22 +1,23 @@
 package com.jaimemartz.playerbalancer;
 
+import ch.jalu.injector.Injector;
+import ch.jalu.injector.InjectorBuilder;
 import com.jaimemartz.playerbalancer.commands.FallbackCommand;
 import com.jaimemartz.playerbalancer.commands.MainCommand;
 import com.jaimemartz.playerbalancer.commands.ManageCommand;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
 import com.jaimemartz.playerbalancer.listener.*;
 import com.jaimemartz.playerbalancer.manager.PasteHelper;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.ping.StatusManager;
 import com.jaimemartz.playerbalancer.section.SectionManager;
-import com.jaimemartz.playerbalancer.utils.DigitUtils;
+import com.jaimemartz.playerbalancer.settings.Settings;
+import com.jaimemartz.playerbalancer.settings.SettingsProvider;
 import lombok.Getter;
-import me.jaimemartz.faucet.ConfigFactory;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.config.Configuration;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.bungeecord.Metrics.SingleLineChart;
 import org.inventivetalent.update.bungee.BungeeUpdater;
@@ -26,28 +27,31 @@
 import java.util.stream.Stream;
 
 public class PlayerBalancer extends Plugin {
-    private static final int LAST_VER_CONFIG_UPDATE = 20950000;
-
-    @Getter private ConfigFactory factory;
-
     @Getter private boolean failed = false;
 
-    @Getter private StatusManager statusManager;
-    @Getter private SectionManager sectionManager;
-    @Getter private static PlayerBalancer instance;
+    //Private instances
+    private Injector injector;
+    private Settings settings;
+    private StatusManager statusManager;
+    private SectionManager sectionManager;
 
     private Command fallbackCommand, mainCommand, manageCommand;
     private Listener connectListener, kickListener, messageListener, reloadListener;
 
     @Override
     public void onEnable() {
-        instance = this;
+        getDataFolder().mkdir();
 
-        if (factory == null) {
-            factory = new ConfigFactory(this);
-            factory.register(0, "config.yml");
-            factory.submit(ConfigEntries.class);
-        }
+        injector = new InjectorBuilder()
+                .addDefaultHandlers(getClass().getPackage().getName())
+                .create();
+
+        injector.register(PlayerBalancer.class, this);
+        injector.register(ProxyServer.class, this.getProxy());
+        injector.register(SettingsProvider.class, new SettingsProvider(this.getDataFolder()));
+        injector.registerProvider(Settings.class, SettingsProvider.class);
+
+        settings = injector.getSingleton(Settings.class);
 
         Metrics metrics = new Metrics(this);
         if (this.enable()) {
@@ -56,18 +60,9 @@ public void onEnable() {
     }
 
     private boolean enable() {
-        factory.load(0, true);
-
         mainCommand = new MainCommand(this);
         getProxy().getPluginManager().registerCommand(this, mainCommand);
 
-        String text = ConfigEntries.CONFIG_VERSION.get();
-        int configVersion = DigitUtils.getDigits(text, 8);
-        if (configVersion < LAST_VER_CONFIG_UPDATE) {
-            this.failed = true;
-            throw new IllegalStateException("Your config is outdated, please reset it and configure it again");
-        }
-
         if (ConfigEntries.PLUGIN_ENABLED.get()) {
             if (ConfigEntries.SILENT_STARTUP.get()) {
                 getLogger().setLevel(Level.WARNING);
@@ -192,15 +187,12 @@ public boolean reloadPlugin() {
         long starting = System.currentTimeMillis();
 
         this.disable();
+        settings.reload();
         this.enable();
 
         long ending = System.currentTimeMillis() - starting;
         getLogger().info(String.format("The plugin has been reloaded, took %sms", ending));
 
         return !failed;
     }
-
-    public Configuration getConfigHandle() {
-        return factory.get(0).getHandle();
-    }
 }

src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java

@@ -1,9 +1,9 @@
 package com.jaimemartz.playerbalancer.commands;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;

src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java

@@ -2,10 +2,10 @@
 
 import com.google.common.base.Strings;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;

src/main/java/com/jaimemartz/playerbalancer/configuration/ConfigEntries.java

@@ -1,10 +1,10 @@
 package com.jaimemartz.playerbalancer.connection;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class ConnectionIntent {
     protected final PlayerBalancer plugin;

src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java

@@ -1,9 +1,9 @@
 package com.jaimemartz.playerbalancer.listener;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.plugin.Listener;

src/main/java/com/jaimemartz/playerbalancer/listener/PlayerDisconnectListener.java

@@ -1,11 +1,11 @@
 package com.jaimemartz.playerbalancer.listener;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.config.ServerInfo;

src/main/java/com/jaimemartz/playerbalancer/listener/ServerConnectListener.java

@@ -1,10 +1,10 @@
 package com.jaimemartz.playerbalancer.listener;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.chat.TextComponent;

src/main/java/com/jaimemartz/playerbalancer/listener/ServerKickListener.java

@@ -1,7 +1,7 @@
 package com.jaimemartz.playerbalancer.manager;
 
 import com.imaginarycode.minecraft.redisbungee.RedisBungee;
-import com.jaimemartz.playerbalancer.configuration.ConfigEntries;
+import com.jaimemartz.playerbalancer.settings.ConfigEntries;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;