PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fixing a shit ton of warning / code style and stuff (code inspector from IDEA)

Browse Source
This commit is contained in:
Marc Baloup
2022-07-10 00:55:56 +02:00
parent 276b1d323a
commit b6104a76c1
118 changed files with 1116 additions and 1574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Bungee/src/main/java/fr/pandacube/lib/bungee/commands/BrigadierCommand.java
View File

@@ -33,9 +33,7 @@ import net.md_5.bungee.api.plugin.TabExecutor;
import net.md_5.bungee.command.ConsoleCommandSender;
public abstract class BrigadierCommand extends ChatStatic {
private LiteralCommandNode<CommandSender> commandNode;
protected BrigadierDispatcher dispatcher;
public BrigadierCommand() {
@@ -56,8 +54,8 @@ public abstract class BrigadierCommand extends ChatStatic {
}
if (aliases == null)
aliases = new String[0];
commandNode = dispatcher.register(builder);
LiteralCommandNode<CommandSender> commandNode = dispatcher.register(builder);
// still have to be registered for console
BungeeCord.getInstance().getPluginManager().registerCommand(dispatcher.plugin, new CommandRelay(commandNode.getLiteral()));
@@ -75,7 +73,7 @@ public abstract class BrigadierCommand extends ChatStatic {
}
private class CommandRelay extends Command implements TabExecutor {
private String alias;
private final String alias;
public CommandRelay(String alias) {
super(alias);
this.alias = alias;
@@ -98,7 +96,7 @@ public abstract class BrigadierCommand extends ChatStatic {
return suggestions.getList()
.stream()
.filter(s -> s.getRange().equals(supportedRange))
.map(s -> s.getText())
.map(Suggestion::getText)
.collect(Collectors.toList());
}
}
@@ -125,7 +123,7 @@ public abstract class BrigadierCommand extends ChatStatic {
}
public static Predicate<CommandSender> isPlayer() {
return sender -> isPlayer(sender);
return BrigadierCommand::isPlayer;
}
public static boolean isPlayer(CommandSender sender) {
@@ -133,7 +131,7 @@ public abstract class BrigadierCommand extends ChatStatic {
}
public static Predicate<CommandSender> isConsole() {
return sender -> isConsole(sender);
return BrigadierCommand::isConsole;
}
public static boolean isConsole(CommandSender sender) {
@@ -172,16 +170,14 @@ public abstract class BrigadierCommand extends ChatStatic {
String message = builder.getInput();
try {
int tokenStartPos = builder.getStart();
List<String> results = Collections.emptyList();
int firstSpacePos = message.indexOf(" ");
String[] args = (firstSpacePos + 1 > tokenStartPos - 1) ? new String[0]
: message.substring(firstSpacePos + 1, tokenStartPos - 1).split(" ", -1);
args = Arrays.copyOf(args, args.length + 1);
args[args.length - 1] = message.substring(tokenStartPos);
results = suggestions.getSuggestions(sender, args.length - 1, args[args.length - 1], args);
List<String> results = suggestions.getSuggestions(sender, args.length - 1, args[args.length - 1], args);
for (String s : results) {
if (s != null)

14
Bungee/src/main/java/fr/pandacube/lib/bungee/commands/BrigadierDispatcher.java
View File

@@ -46,8 +46,8 @@ public class BrigadierDispatcher implements Listener {
private CommandDispatcher<CommandSender> dispatcher;
/* package */ Plugin plugin;
private final CommandDispatcher<CommandSender> dispatcher;
/* package */ final Plugin plugin;
private BrigadierDispatcher(Plugin pl) {
plugin = pl;
@@ -114,27 +114,23 @@ public class BrigadierDispatcher implements Listener {
event.setCancelled(true);
ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> {
execute((ProxiedPlayer) event.getSender(), commandLine);
});
ProxyServer.getInstance().getScheduler().runAsync(plugin, () -> execute((ProxiedPlayer) event.getSender(), commandLine));
}
/* package */ int execute(CommandSender sender, String commandWithoutSlash) {
/* package */ void execute(CommandSender sender, String commandWithoutSlash) {
ParseResults<CommandSender> parsed = dispatcher.parse(commandWithoutSlash, sender);
try {
return dispatcher.execute(parsed);
dispatcher.execute(parsed);
} catch (CommandSyntaxException e) {
sender.sendMessage(Chat.failureText("Erreur d'utilisation de la commande : " + e.getMessage()).get());
return 0;
} catch (Throwable e) {
sender.sendMessage(Chat.failureText("Erreur lors de l'exécution de la commande : " + e.getMessage()).get());
Log.severe(e);
return 0;
}
}

2
Bungee/src/main/java/fr/pandacube/lib/bungee/util/PluginMessagePassthrough.java
View File

@@ -25,7 +25,7 @@ public class PluginMessagePassthrough implements Listener {
public static void clear() {
synchronized (channels) {
new ArrayList<>(channels).forEach(c -> unregister(c));
unregisterAll(channels.toArray(new String[0]));
}
}