diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/dev/tylerm/khs/command/util/CommandGroup.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java) | 28 | ||||
| -rw-r--r-- | src/main/java/dev/tylerm/khs/command/util/ICommand.java (renamed from src/main/java/net/tylermurphy/hideAndSeek/command/util/ICommand.java) | 2 |
2 files changed, 14 insertions, 16 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java b/src/main/java/dev/tylerm/khs/command/util/CommandGroup.java index 907f031..02777a3 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java +++ b/src/main/java/dev/tylerm/khs/command/util/CommandGroup.java @@ -1,8 +1,10 @@ -package net.tylermurphy.hideAndSeek.command.util; +package dev.tylerm.khs.command.util; -import net.tylermurphy.hideAndSeek.command.map.Save; -import net.tylermurphy.hideAndSeek.util.Pair; -import net.tylermurphy.hideAndSeek.util.Tuple; +import dev.tylerm.khs.configuration.Config; +import dev.tylerm.khs.configuration.Localization; +import dev.tylerm.khs.util.Pair; +import dev.tylerm.khs.util.Tuple; +import dev.tylerm.khs.command.map.Save; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; @@ -10,10 +12,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.stream.Collectors; -import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix; -import static net.tylermurphy.hideAndSeek.configuration.Config.permissionsRequired; -import static net.tylermurphy.hideAndSeek.configuration.Localization.message; - public class CommandGroup { private final Map<String, Object> commandRegister; @@ -63,25 +61,25 @@ public class CommandGroup { String[] parameters = data.getRight(); if (Save.runningBackup) { - player.sendMessage(errorPrefix + message("MAPSAVE_INPROGRESS")); + player.sendMessage(Config.errorPrefix + Localization.message("MAPSAVE_INPROGRESS")); return; } - if (permissionsRequired && !player.hasPermission(permission)) { - player.sendMessage(errorPrefix + message("COMMAND_NOT_ALLOWED")); + if (Config.permissionsRequired && !player.hasPermission(permission)) { + player.sendMessage(Config.errorPrefix + Localization.message("COMMAND_NOT_ALLOWED")); return; } int parameterCount = (int) Arrays.stream(command.getUsage().split(" ")).filter(p -> p.startsWith("<") && !p.startsWith("<*")).count(); if(parameters.length < parameterCount) { - player.sendMessage(errorPrefix + message("ARGUMENT_COUNT")); + player.sendMessage(Config.errorPrefix + Localization.message("ARGUMENT_COUNT")); return; } try { command.execute(player, parameters); } catch (Exception e) { - player.sendMessage(errorPrefix + "An error has occurred."); + player.sendMessage(Config.errorPrefix + "An error has occurred."); e.printStackTrace(); } } @@ -122,10 +120,10 @@ public class CommandGroup { Object object = commandRegister.get(handle); if (object instanceof ICommand) { ICommand command = (ICommand) object; - return !permissionsRequired || player.hasPermission(permission + "." + command.getLabel()); + return !Config.permissionsRequired || player.hasPermission(permission + "." + command.getLabel()); } else if (object instanceof CommandGroup) { CommandGroup group = (CommandGroup) object; - return !permissionsRequired || group.hasPermission(player, permission + "." + group.getLabel()); + return !Config.permissionsRequired || group.hasPermission(player, permission + "." + group.getLabel()); } return false; }) diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/ICommand.java b/src/main/java/dev/tylerm/khs/command/util/ICommand.java index 1be678c..615f165 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/ICommand.java +++ b/src/main/java/dev/tylerm/khs/command/util/ICommand.java @@ -1,4 +1,4 @@ -package net.tylermurphy.hideAndSeek.command.util; +package dev.tylerm.khs.command.util; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; |