cleanup

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommand.java

@@ -24,7 +24,6 @@ package me.lucko.luckperms.bukkit;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import me.lucko.luckperms.api.data.Callback;
 import me.lucko.luckperms.common.commands.CommandManager;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Patterns;
@@ -50,7 +49,7 @@ class BukkitCommand extends CommandManager implements CommandExecutor, TabExecut
                 plugin.getSenderFactory().wrap(sender),
                 label,
                 Util.stripQuotes(Splitter.on(Patterns.COMMAND_SEPARATOR).omitEmptyStrings().splitToList(Joiner.on(' ').join(args))),
-                Callback.empty()
+                null
         );
         return true;
     }

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

@@ -24,7 +24,6 @@ package me.lucko.luckperms.bungee;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import me.lucko.luckperms.api.data.Callback;
 import me.lucko.luckperms.common.commands.CommandManager;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Patterns;
@@ -50,7 +49,7 @@ class BungeeCommand extends Command implements TabExecutor {
                 plugin.getSenderFactory().wrap(sender),
                 "bperms",
                 Util.stripQuotes(Splitter.on(Patterns.COMMAND_SEPARATOR).omitEmptyStrings().splitToList(Joiner.on(' ').join(args))),
-                Callback.empty()
+                null
         );
     }
 

common/src/main/java/me/lucko/luckperms/common/api/internal/PermissionHolderLink.java

@@ -40,8 +40,6 @@ import static me.lucko.luckperms.common.core.PermissionHolder.exportToLegacy;
 @SuppressWarnings("unused")
 @AllArgsConstructor
 public class PermissionHolderLink implements PermissionHolder {
-
-    @NonNull
     private final me.lucko.luckperms.common.core.PermissionHolder master;
 
     @Override

common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java

@@ -25,7 +25,6 @@ package me.lucko.luckperms.common.commands;
 import com.google.common.collect.ImmutableList;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import me.lucko.luckperms.api.data.Callback;
 import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.group.CreateGroup;
 import me.lucko.luckperms.common.commands.group.DeleteGroup;
@@ -49,6 +48,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @AllArgsConstructor
@@ -88,10 +88,12 @@ public class CommandManager {
      * @param args the arguments provided
      * @param result the callback to be called when the command has fully executed
      */
-    public void onCommand(Sender sender, String label, List<String> args, Callback<CommandResult> result) {
+    public void onCommand(Sender sender, String label, List<String> args, Consumer<CommandResult> result) {
         plugin.doAsync(() -> {
             CommandResult r = onCommand(sender, label, args);
-            plugin.doSync(() -> result.onComplete(r));
+            if (result != null) {
+                plugin.doSync(() -> result.accept(r));
+            }
         });
     }
 
@@ -344,6 +346,8 @@ public class CommandManager {
                 case "removetempsuffix":
                     args.add(2, "meta");
                     break;
+                default:
+                    break;
             }
 
             // Provide lazy set rewrite

common/src/main/java/me/lucko/luckperms/common/commands/SingleCommand.java

@@ -50,15 +50,15 @@ public abstract class SingleCommand extends BaseCommand<Void, Void> {
 
     @Override
     public void sendUsage(Sender sender, String label) {
-        String usage = "";
+        StringBuilder sb = new StringBuilder();
         if (getArgs().isPresent()) {
-            usage += "&3 - &7";
+            sb.append("&3 - &7");
             for (Arg arg : getArgs().get()) {
-                usage += arg.asPrettyString() + " ";
+                sb.append(arg.asPrettyString()).append(" ");
             }
         }
 
-        Util.sendPluginMessage(sender, "&3> &a" + getName().toLowerCase() + usage);
+        Util.sendPluginMessage(sender, "&3> &a" + getName().toLowerCase() + sb.toString());
     }
 
     @Override

common/src/main/java/me/lucko/luckperms/common/commands/SubCommand.java

@@ -55,15 +55,15 @@ public abstract class SubCommand<T> extends Command<T, Void> {
      */
     @Override
     public void sendUsage(Sender sender, String label) {
-        String usage = "";
+        StringBuilder sb = new StringBuilder();
         if (getArgs().isPresent()) {
-            usage += "&3 - &7";
+            sb.append("&3 - &7");
             for (Arg arg : getArgs().get()) {
-                usage += arg.asPrettyString() + " ";
+                sb.append(arg.asPrettyString()).append(" ");
             }
         }
 
-        Util.sendPluginMessage(sender, "&3> &a" + getName().toLowerCase() + usage);
+        Util.sendPluginMessage(sender, "&3> &a" + getName().toLowerCase() + sb.toString());
     }
 
     @Override

common/src/main/java/me/lucko/luckperms/common/commands/generic/SharedSubCommand.java

@@ -75,15 +75,15 @@ public abstract class SharedSubCommand {
     }
 
     public void sendUsage(Sender sender) {
-        String usage = "";
+        StringBuilder sb = new StringBuilder();
         if (args != null) {
-            usage += "&3 - &7";
+            sb.append("&3 - &7");
             for (Arg arg : args) {
-                usage += arg.asPrettyString() + " ";
+                sb.append(arg.asPrettyString()).append(" ");
             }
         }
 
-        Util.sendPluginMessage(sender, "&3> &a" + getName() + usage);
+        Util.sendPluginMessage(sender, "&3> &a" + getName() + sb.toString());
     }
 
     public void sendDetailedUsage(Sender sender) {

common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java

@@ -70,17 +70,13 @@ public class PermissionCheckInherits extends SharedSubCommand {
                 break;
         }
 
-        String location = null;
+        String location = result.getLocation().orElse(null);
-        if (result.getLocation().isPresent()) {
+        if (location != null && location.equalsIgnoreCase(holder.getObjectName())) {
-            if (result.getLocation().get().equals(holder.getObjectName())) {
+            location = "self";
-                location = "self";
-            } else {
-                location = result.getLocation().get();
-            }
         }
 
         Util.sendPluginMessage(sender, "&b" + node + ": " + Util.formatTristate(result.getResult()) +
-                (result.getLocation().isPresent() ? " &7(inherited from &a" + location + "&7)" : ""));
+                (location != null ? " &7(inherited from &a" + location + "&7)" : ""));
         return CommandResult.SUCCESS;
     }
 }

common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogRecent.java

@@ -98,7 +98,7 @@ public class LogRecent extends SubCommand<Log> {
                     return showLog(p, uuid, sender, log);
                 } catch (NumberFormatException e) {
                     // Invalid page
-                    return showLog(-1, null, null, null);
+                    return showLog(-1, null, sender, log);
                 }
             }
 
@@ -116,7 +116,7 @@ public class LogRecent extends SubCommand<Log> {
                 return showLog(p, u, sender, log);
             } catch (NumberFormatException e) {
                 // Invalid page
-                return showLog(-1, null, null, null);
+                return showLog(-1, null, sender, log);
             }
         }
     }

common/src/main/java/me/lucko/luckperms/common/commands/log/subcommands/LogUserHistory.java

@@ -62,7 +62,7 @@ public class LogUserHistory extends SubCommand<Log> {
                 page = Integer.parseInt(args.get(1));
             } catch (NumberFormatException e) {
                 // invalid page
-                return showLog(-1, null, null, null);
+                return showLog(-1, null, sender, log);
             }
         }
 

sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommand.java

@@ -24,7 +24,6 @@ package me.lucko.luckperms.sponge;
 
 import co.aikar.timings.Timing;
 import com.google.common.base.Splitter;
-import me.lucko.luckperms.api.data.Callback;
 import me.lucko.luckperms.common.commands.CommandManager;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Patterns;
@@ -57,7 +56,7 @@ class SpongeCommand extends CommandManager implements CommandCallable {
                     plugin.getSenderFactory().wrap(source),
                     "perms",
                     Util.stripQuotes(Splitter.on(Patterns.COMMAND_SEPARATOR).omitEmptyStrings().splitToList(s)),
-                    Callback.empty()
+                    null
             );
             return CommandResult.success();
         }