Altitude/LiteFlags
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.21.6 and java 21 using cosmos

Browse Source
This commit is contained in:
stijn
2025-06-28 04:52:39 +02:00
parent e4ca6d986f
commit 42a9701959
25 changed files with 272 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/liteflags/commands/CommandManager.java
+22 -21
View File
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
public class CommandManager implements CommandExecutor, TabExecutor {
private final List<SubCommand> subCommands;
private SubCommand flagPlayer = new CommandFlagPlayer();
private final SubCommand flagPlayer = new CommandFlagPlayer();
public CommandManager() {
LiteFlags liteFlags = LiteFlags.getInstance();
@@ -33,32 +33,32 @@ public class CommandManager implements CommandExecutor, TabExecutor {
command.setTabCompleter(this);
subCommands = Arrays.asList(//TODO add the flag player command separately
new CommandHelp(this),
new CommandFlagList(),
new CommandFlagPlayer(),
new CommandFlagRemove(),
new CommandReload()
);
new CommandHelp(this),
new CommandFlagList(),
new CommandFlagPlayer(),
new CommandFlagRemove(),
new CommandReload()
);
}
@Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) {
if (!commandSender.hasPermission("liteflags.use")) {
commandSender.sendMiniMessage(Config.NO_PERMISSION, null);
commandSender.sendRichMessage(Config.NO_PERMISSION);
return true;
}
if (args.length == 0) {
commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", subCommands.stream()
commandSender.sendRichMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", subCommands.stream()
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getHelpMessage)
.collect(Collectors.joining("\n"))), null);
.collect(Collectors.joining("\n"))));
return true;
}
SubCommand subCommand = getSubCommand(args[0]);
if (!commandSender.hasPermission(subCommand.getPermission())) {
commandSender.sendMiniMessage(Config.NO_PERMISSION, null);
commandSender.sendRichMessage(Config.NO_PERMISSION);
return true;
}
@@ -71,19 +71,20 @@ public class CommandManager implements CommandExecutor, TabExecutor {
if (args.length <= 1) {
res.addAll(subCommands.stream()
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getName)
.filter(Objects::nonNull)
.filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
.collect(Collectors.toList()));
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getName)
.filter(Objects::nonNull)
.filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
.toList());
res.addAll(Bukkit.getOnlinePlayers().stream()
.map(Player::getName)
.filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
.collect(Collectors.toList()));
.map(Player::getName)
.filter(name -> args.length == 0 || name.startsWith(args[0].toLowerCase()))
.toList());
} else {
SubCommand subCommand = getSubCommand(args[0]);
if (subCommand != null && commandSender.hasPermission(subCommand.getPermission()))
if (subCommand != null && commandSender.hasPermission(subCommand.getPermission())) {
res.addAll(subCommand.getTabComplete(commandSender, args));
}
}
return res;
}
@@ -99,4 +100,4 @@ public class CommandManager implements CommandExecutor, TabExecutor {
.findFirst()
.orElse(flagPlayer);
}
}
}