Sponge support

bungee/src/main/java/me/lucko/luckperms/BungeeCommand.java

@@ -10,10 +10,10 @@ import net.md_5.bungee.api.plugin.TabExecutor;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 
-class MainCommand extends Command implements TabExecutor {
+class BungeeCommand extends Command implements TabExecutor {
     private final CommandManager manager;
 
-    public MainCommand(CommandManager manager) {
+    public BungeeCommand(CommandManager manager) {
         super("luckpermsbungee", null, "bperms", "lpb", "bpermissions", "bp", "bperm");
         this.manager = manager;
     }

bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java

@@ -1,6 +1,7 @@
 package me.lucko.luckperms;
 
 import lombok.Getter;
+import me.lucko.luckperms.api.Logger;
 import me.lucko.luckperms.api.implementation.ApiProvider;
 import me.lucko.luckperms.commands.CommandManager;
 import me.lucko.luckperms.data.Datastore;
@@ -13,6 +14,7 @@ import me.lucko.luckperms.tracks.TrackManager;
 import me.lucko.luckperms.users.BungeeUserManager;
 import me.lucko.luckperms.users.UserManager;
 import me.lucko.luckperms.utils.LPConfiguration;
+import me.lucko.luckperms.utils.LogUtil;
 import me.lucko.luckperms.utils.UuidCache;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -33,43 +35,43 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
 
     @Override
     public void onEnable() {
-        getLogger().info("Loading configuration...");
+        getLog().info("Loading configuration...");
         configuration = new BungeeConfig(this);
 
         // register events
         getProxy().getPluginManager().registerListener(this, new PlayerListener(this));
 
         // register commands
-        getLogger().info("Registering commands...");
-        getProxy().getPluginManager().registerCommand(this, new MainCommand(new CommandManager(this)));
+        getLog().info("Registering commands...");
+        getProxy().getPluginManager().registerCommand(this, new BungeeCommand(new CommandManager(this)));
 
         // disable the default Bungee /perms command so it gets handled by the Bukkit plugin
         getProxy().getDisabledCommands().add("perms");
 
-        getLogger().info("Detecting storage method...");
+        getLog().info("Detecting storage method...");
         final String storageMethod = configuration.getStorageMethod();
         if (storageMethod.equalsIgnoreCase("mysql")) {
-            getLogger().info("Using MySQL as storage method.");
+            getLog().info("Using MySQL as storage method.");
             datastore = new MySQLDatastore(this, configuration.getDatabaseValues());
         } else if (storageMethod.equalsIgnoreCase("flatfile")) {
-            getLogger().info("Using Flatfile (JSON) as storage method.");
+            getLog().info("Using Flatfile (JSON) as storage method.");
             datastore = new FlatfileDatastore(this, getDataFolder());
         } else {
-            getLogger().severe("Storage method '" + storageMethod + "' was not recognised. Using Flatfile as fallback.");
+            getLog().severe("Storage method '" + storageMethod + "' was not recognised. Using Flatfile as fallback.");
             datastore = new FlatfileDatastore(this, getDataFolder());
         }
 
-        getLogger().info("Initialising datastore...");
+        getLog().info("Initialising datastore...");
         datastore.init();
 
-        getLogger().info("Loading internal permission managers...");
+        getLog().info("Loading internal permission managers...");
         uuidCache = new UuidCache(getConfiguration().getOnlineMode());
         userManager = new BungeeUserManager(this);
         groupManager = new GroupManager(this);
         trackManager = new TrackManager();
 
         // Run update task to refresh any online users
-        getLogger().info("Scheduling Update Task to refresh any online users.");
+        getLog().info("Scheduling Update Task to refresh any online users.");
         try {
             new UpdateTask(this).run();
         } catch (Exception e) {
@@ -81,21 +83,26 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
             getProxy().getScheduler().schedule(this, new UpdateTask(this), mins, mins, TimeUnit.MINUTES);
         }
 
-        getLogger().info("Registering API...");
+        getLog().info("Registering API...");
         LuckPerms.registerProvider(new ApiProvider(this));
 
-        getLogger().info("Successfully loaded.");
+        getLog().info("Successfully loaded.");
     }
 
     @Override
     public void onDisable() {
-        getLogger().info("Closing datastore...");
+        getLog().info("Closing datastore...");
         datastore.shutdown();
 
-        getLogger().info("Unregistering API...");
+        getLog().info("Unregistering API...");
         LuckPerms.unregisterProvider();
     }
 
+    @Override
+    public Logger getLog() {
+        return LogUtil.wrap(getLogger());
+    }
+
     @Override
     public String getVersion() {
         return getDescription().getVersion();

bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java

@@ -57,7 +57,7 @@ public class PlayerListener implements Listener {
             plugin.getDatastore().loadOrCreateUser(cache.getUUID(c.getUniqueId()), c.getName());
             final long time = System.currentTimeMillis() - startTime;
             if (time >= 1000) {
-                plugin.getLogger().warning("Processing login for " + c.getName() + " took " + time + "ms.");
+                plugin.getLog().warn("Processing login for " + c.getName() + " took " + time + "ms.");
             }
             e.completeIntent(plugin);
         });

bungee/src/main/java/me/lucko/luckperms/users/BungeeUser.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.UUID;
 
 public class BungeeUser extends User {
-
     private final LPBungeePlugin plugin;
 
     BungeeUser(UUID uuid, LPBungeePlugin plugin) {