From c111f7dbbd5691f6ac22c8374ae43f6285f00556 Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Sun, 18 Feb 2024 12:24:53 -0300 Subject: [PATCH] =?UTF-8?q?Resolvido=20problema=20com=20sugest=C3=A3o=20de?= =?UTF-8?q?=20comandos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commands/relations/ArgumentRelations.java | 40 +++++++++++-------- .../commands/subs/BaseKeyCommand.java | 2 +- .../crazycrates/support/StructureHandler.java | 5 +-- paper/src/main/resources/plugin.yml | 11 +---- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/paper/src/main/java/com/badbones69/crazycrates/commands/relations/ArgumentRelations.java b/paper/src/main/java/com/badbones69/crazycrates/commands/relations/ArgumentRelations.java index 9463161b2..481df2e36 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/commands/relations/ArgumentRelations.java +++ b/paper/src/main/java/com/badbones69/crazycrates/commands/relations/ArgumentRelations.java @@ -35,16 +35,11 @@ public void build() { String commandOrder = "/" + command + " " + subCommand + " "; - String correctUsage = null; + String correctUsage = getCorrectUsage(command, subCommand, commandOrder); - switch (command) { - case "crates" -> correctUsage = getContext(subCommand, commandOrder); - case "keys" -> { - if (subCommand.equals("view")) correctUsage = "/keys " + subCommand; - } + if (!correctUsage.isEmpty()) { + send(sender, Messages.correct_usage.getMessage("%usage%", correctUsage).toString()); } - - if (correctUsage != null) send(sender, Messages.correct_usage.getMessage("%usage%", correctUsage).toString()); }); getBukkitCommandManager().registerMessage(MessageKey.NOT_ENOUGH_ARGUMENTS, (sender, context) -> { @@ -53,21 +48,34 @@ public void build() { String commandOrder = "/" + command + " " + subCommand + " "; - String correctUsage = null; + String correctUsage = getCorrectUsage(command, subCommand, commandOrder); - switch (command) { - case "crates" -> correctUsage = getContext(subCommand, commandOrder); - case "keys" -> { - if (subCommand.equals("view")) correctUsage = "/keys " + subCommand + " "; - } + if (!correctUsage.isEmpty()) { + send(sender, Messages.correct_usage.getMessage("%usage%", correctUsage).toString()); } - - if (correctUsage != null) send(sender, Messages.correct_usage.getMessage("%usage%", correctUsage).toString()); }); getBukkitCommandManager().registerMessage(MessageKey.UNKNOWN_COMMAND, (sender, context) -> send(sender, Messages.unknown_command.getString())); } + private String getCorrectUsage(@NotNull String command, String subCommand, String commandOrder) { + String correctUsage = ""; + + switch (command) { + case "crates" -> correctUsage = getContext(subCommand, commandOrder); + case "chave" -> { + if (subCommand.equals("ver")) { + correctUsage = commandOrder + " [jogador]"; + } + if (subCommand.equals("transferir")) { + correctUsage = commandOrder + " "; + } + } + } + + return correctUsage; + } + @Override public void send(@NotNull CommandSender sender, @NotNull String component) { sender.sendMessage(parse(component)); diff --git a/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java b/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java index eae219a64..a6a347640 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java +++ b/paper/src/main/java/com/badbones69/crazycrates/commands/subs/BaseKeyCommand.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; -@Command(value = "chaves", alias = {"chave"}) +@Command(value = "chave", alias = {"chaves"}) @Description("Views the amount of keys you/others have.") public class BaseKeyCommand extends BaseCommand { diff --git a/paper/src/main/java/com/badbones69/crazycrates/support/StructureHandler.java b/paper/src/main/java/com/badbones69/crazycrates/support/StructureHandler.java index ca5567add..d0d39e5e4 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/support/StructureHandler.java +++ b/paper/src/main/java/com/badbones69/crazycrates/support/StructureHandler.java @@ -1,7 +1,6 @@ package com.badbones69.crazycrates.support; import com.badbones69.crazycrates.CrazyCrates; -import com.google.common.collect.Lists; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -49,9 +48,7 @@ public void pasteStructure(Location location) { try { getBlocks(location); - getStructureManager() - .loadStructure(this.file) - .place(location.subtract(2, 0.0, 2), false, StructureRotation.NONE, Mirror.NONE, 0, 1F, new Random()); + getStructureManager().loadStructure(this.file).place(location.subtract(2, 0.0, 2), false, StructureRotation.NONE, Mirror.NONE, 0, 1F, new Random()); getStructureBlocks(location); } catch (Exception exception) { diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml index 6324011ac..453e8f569 100644 --- a/paper/src/main/resources/plugin.yml +++ b/paper/src/main/resources/plugin.yml @@ -8,13 +8,4 @@ api-version: "${apiVersion}" description: "${description}" website: "${website}" -softdepend: - [ - CMI, - DecentHolograms, - HolographicDisplays, - PlaceholderAPI, - ItemsAdder, - Oraxen, - ItemEdit, - ] +softdepend: [ CMI, DecentHolograms, HolographicDisplays, PlaceholderAPI, ItemsAdder, Oraxen, ItemEdit ]