diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
index d24de707..cc84cbf1 100644
--- a/.github/workflows/deploy-development.yml
+++ b/.github/workflows/deploy-development.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
- uses: actions/checkout@v4.2.2
+ uses: actions/checkout@v6.0.3
- name: Bump Version
id: bump
uses: Plugily-Projects/version-bump-action@v10
@@ -23,27 +23,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
- uses: actions/checkout@v4.2.2
+ uses: actions/checkout@v6.0.3
with:
ref: 'development'
- name: Set up JDK
- uses: actions/setup-java@v4.6.0
+ uses: actions/setup-java@v5.2.0
with:
distribution: 'temurin'
java-version: '21'
java-package: jdk
- name: Set up Maven
- uses: stCarolas/setup-maven@v5
+ uses: stCarolas/setup-maven@v5.1
with:
maven-version: 3.8.2
- name: Cache
- uses: actions/cache@v4.2.2
+ uses: actions/cache@v5.0.5
with:
path: ~/.m2/repository
key: maven-${{ hashFiles('**/pom.xml') }}
restore-keys: maven-
- name: Publish with Maven
- uses: s4u/maven-settings-action@v3.1.0
+ uses: s4u/maven-settings-action@v4.0.0
with:
servers: |
[{
diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml
index 172d2f22..86d8ba81 100644
--- a/.github/workflows/deploy-master.yml
+++ b/.github/workflows/deploy-master.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
- uses: actions/checkout@v4.2.2
+ uses: actions/checkout@v6.0.3
- name: Bump Version
id: bump
uses: Plugily-Projects/version-bump-action@v10
@@ -26,27 +26,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Latest Commit
- uses: actions/checkout@v4.2.2
+ uses: actions/checkout@v6.0.3
with:
ref: 'master'
- name: Set up JDK
- uses: actions/setup-java@v4.6.0
+ uses: actions/setup-java@v5.2.0
with:
distribution: 'temurin'
java-version: '21'
java-package: jdk
- name: Set up Maven
- uses: stCarolas/setup-maven@v5
+ uses: stCarolas/setup-maven@v5.1
with:
maven-version: 3.8.2
- name: Cache
- uses: actions/cache@v4.2.2
+ uses: actions/cache@v5.0.5
with:
path: ~/.m2/repository
key: maven-${{ hashFiles('**/pom.xml') }}
restore-keys: maven-
- name: Publish with Maven
- uses: s4u/maven-settings-action@v3.1.0
+ uses: s4u/maven-settings-action@v4.0.0
with:
servers: |
[{
diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml
index db0afa54..868f3b2a 100644
--- a/MiniGamesBox API/pom.xml
+++ b/MiniGamesBox API/pom.xml
@@ -23,7 +23,7 @@
minigamesbox
plugily.projects
- 1.4.6
+ 1.4.6-SNAPSHOT1
4.0.0
diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml
index 3ce4443b..b0ebd5dd 100644
--- a/MiniGamesBox Classic/pom.xml
+++ b/MiniGamesBox Classic/pom.xml
@@ -23,7 +23,7 @@
minigamesbox
plugily.projects
- 1.4.6
+ 1.4.6-SNAPSHOT1
4.0.0
diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/commands/arguments/PluginArgumentsRegistry.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/commands/arguments/PluginArgumentsRegistry.java
index 9394fe32..59e52da9 100644
--- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/commands/arguments/PluginArgumentsRegistry.java
+++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/commands/arguments/PluginArgumentsRegistry.java
@@ -106,56 +106,77 @@ public PluginArgumentsRegistry(PluginMain plugin) {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+ String commandName = cmd.getName();
+
+ List arguments = null;
for(Map.Entry> entry : mappedArguments.entrySet()) {
- if(!cmd.getName().equalsIgnoreCase(entry.getKey())) {
- continue;
+ if(commandName.equalsIgnoreCase(entry.getKey())) {
+ arguments = entry.getValue();
+ break;
+ }
+ }
+ if(arguments == null) {
+ return false;
+ }
+
+ if(commandName.equalsIgnoreCase(plugin.getPluginNamePrefixLong())) {
+ if(args.length == 0 || args[0].equalsIgnoreCase("help")) {
+ sendHelpCommand(sender);
+ return true;
}
- if(cmd.getName().equalsIgnoreCase(plugin.getPluginNamePrefixLong())) {
- if(args.length == 0 || args[0].equalsIgnoreCase("help")) {
- sendHelpCommand(sender);
+ if(args.length > 1 && args[0].equalsIgnoreCase("edit")) {
+ if(!checkSenderIsExecutorType(sender, CommandArgument.ExecutorType.PLAYER)
+ || !plugin.getBukkitHelper().hasPermission(sender, plugin.getPluginNamePrefixLong() + ".admin.setup")) {
return true;
}
- if(args.length > 1 && args[0].equalsIgnoreCase("edit")) {
- if(!checkSenderIsExecutorType(sender, CommandArgument.ExecutorType.PLAYER)
- || !plugin.getBukkitHelper().hasPermission(sender, plugin.getPluginNamePrefixLong() + ".admin.setup")) {
- return true;
- }
- IPluginArena arena = plugin.getArenaRegistry().getArena(args[1]);
- if(arena == null) {
- new MessageBuilder("COMMANDS_NO_ARENA_LIKE_THAT").asKey().send(sender);
- return true;
- }
- plugin.getSetupInventory((Player) sender, arena.getId()).open();
+ IPluginArena arena = plugin.getArenaRegistry().getArena(args[1]);
+ if(arena == null) {
+ new MessageBuilder("COMMANDS_NO_ARENA_LIKE_THAT").asKey().send(sender);
return true;
}
+ plugin.getSetupInventory((Player) sender, arena.getId()).open();
+ return true;
}
- if(cmd.getName().equalsIgnoreCase(plugin.getCommandAdminPrefixLong()) && (args.length == 0 || args[0].equalsIgnoreCase("help"))) {
- if(!sender.hasPermission(plugin.getPluginNamePrefixLong() + ".admin")) {
- return true;
- }
- sendAdminHelpCommand(sender);
+ }
+
+ if(commandName.equalsIgnoreCase(plugin.getCommandAdminPrefixLong()) && (args.length == 0 || args[0].equalsIgnoreCase("help"))) {
+ if(!sender.hasPermission(plugin.getPluginNamePrefixLong() + ".admin")) {
return true;
}
- for(CommandArgument argument : entry.getValue()) {
- if(argument.getArgumentName().equalsIgnoreCase(args[0])) {
- for(String perm : argument.getPermissions()) {
- if(perm.isEmpty() || plugin.getBukkitHelper().hasPermission(sender, perm)) {
- return true;
- }
- }
- if(checkSenderIsExecutorType(sender, argument.getValidExecutors())) {
- argument.execute(sender, args);
- return true;
- }
- }
+ sendAdminHelpCommand(sender);
+ return true;
+ }
+
+ if(args.length == 0) {
+ return false;
+ }
+
+ for(CommandArgument argument : arguments) {
+ if(!argument.getArgumentName().equalsIgnoreCase(args[0])) {
+ continue;
}
+ boolean hasPermission = argument.getPermissions().stream()
+ .anyMatch(perm -> perm.isEmpty() || sender.hasPermission(perm));
- //sending did you mean help
- List matches = StringMatcher.match(args[0], entry.getValue().stream().map(CommandArgument::getArgumentName).collect(Collectors.toList()));
- if(!matches.isEmpty()) {
- new MessageBuilder("COMMANDS_DID_YOU_MEAN").asKey().value(label + " " + matches.get(0).getMatch()).send(sender);
+ if(!hasPermission) {
+ new MessageBuilder("COMMANDS_NO_PERMISSION").asKey().send(sender);
return true;
}
+
+ if(checkSenderIsExecutorType(sender, argument.getValidExecutors())) {
+ argument.execute(sender, args);
+ }
+ return true;
+ }
+
+ List argumentNames = arguments.stream()
+ .map(CommandArgument::getArgumentName)
+ .collect(Collectors.toList());
+
+ List matches = StringMatcher.match(args[0], argumentNames);
+ if(!matches.isEmpty()) {
+ new MessageBuilder("COMMANDS_DID_YOU_MEAN").asKey().value(label + " " + matches.get(0).getMatch()).send(sender);
+ return true;
}
return false;
}
diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml
index 957f3c82..22faee28 100644
--- a/MiniGamesBox Database/pom.xml
+++ b/MiniGamesBox Database/pom.xml
@@ -23,7 +23,7 @@
minigamesbox
plugily.projects
- 1.4.6
+ 1.4.6-SNAPSHOT1
4.0.0
diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml
index ebb6774d..909fff6f 100644
--- a/MiniGamesBox Inventory/pom.xml
+++ b/MiniGamesBox Inventory/pom.xml
@@ -23,7 +23,7 @@
minigamesbox
plugily.projects
- 1.4.6
+ 1.4.6-SNAPSHOT1
4.0.0
diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml
index 91ef82fc..811c7f65 100644
--- a/MiniGamesBox Utils/pom.xml
+++ b/MiniGamesBox Utils/pom.xml
@@ -23,7 +23,7 @@
minigamesbox
plugily.projects
- 1.4.6
+ 1.4.6-SNAPSHOT1
4.0.0
diff --git a/pom.xml b/pom.xml
index ba887349..e65d9bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
plugily.projects
minigamesbox
- 1.4.6
+ 1.4.6-SNAPSHOT1
pom