diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/item/ItemCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/item/ItemCommand.java index 6bacbc81d..e6c73fb0a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/item/ItemCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/item/ItemCommand.java @@ -10,7 +10,6 @@ import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Context; import dev.rollczi.litecommands.annotations.execute.Execute; -import dev.rollczi.litecommands.annotations.optional.OptionalArg; import dev.rollczi.litecommands.annotations.permission.Permission; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -38,7 +37,7 @@ void execute(@Context Player player, @Arg Material material) { @Execute @DescriptionDocs(description = "Gives an item with a custom amount", arguments = " [amount]") - void execute(@Context Player player, @Arg Material material, @OptionalArg(StackAmountArgument.KEY) int amount) { + void execute(@Context Player player, @Arg Material material, @Arg(StackAmountArgument.KEY) int amount) { boolean isSuccess = this.giveService.giveItem(player, player, material, amount); if (isSuccess) { diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/StackAmountArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/StackAmountArgument.java index 6505d7d08..d92670b4c 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/StackAmountArgument.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/StackAmountArgument.java @@ -29,14 +29,14 @@ public ParseResult parse(Invocation invocation, String a try { int value = Integer.parseInt(argument); - if (value < 0) { - return ParseResult.failure(translation.argument().numberBiggerThanOrEqualZero()); + if (value <= 0) { + return ParseResult.failure(translation.argument().numberBiggerThanZero()); } return ParseResult.success(value); } catch (NumberFormatException exception) { - return ParseResult.failure(translation.argument().numberBiggerThanOrEqualZero()); + return ParseResult.failure(translation.argument().stackNumberIncorrect()); } } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java index 173f21d23..1459feedd 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java @@ -12,6 +12,7 @@ public interface ArgumentMessages { Notice onlyPlayer(); Notice numberBiggerThanZero(); Notice numberBiggerThanOrEqualZero(); + Notice stackNumberIncorrect(); Notice noItem(); Notice noArgument(); Notice worldDoesntExist(); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java index ed36907f6..a0c06af70 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java @@ -23,6 +23,7 @@ public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages Notice onlyPlayer = Notice.chat("Command is only for players!"); Notice numberBiggerThanZero = Notice.chat("The number must be greater than 0!"); Notice numberBiggerThanOrEqualZero = Notice.chat("The number must be greater than or equal to 0!"); + Notice stackNumberIncorrect = Notice.chat("Incorrect number!"); Notice noItem = Notice.chat("You need item to use this command!"); Notice noMaterial = Notice.chat("This item doesn't exist"); Notice noArgument = Notice.chat("This argument doesn't exist"); diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java index 9602ff9ee..d360cc204 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java @@ -24,6 +24,7 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages Notice onlyPlayer = Notice.chat("Ta komenda jest dostępna tylko dla graczy!"); Notice numberBiggerThanZero = Notice.chat("Liczba musi być większa od 0!"); Notice numberBiggerThanOrEqualZero = Notice.chat("Liczba musi być równa lub większa od 0!"); + Notice stackNumberIncorrect = Notice.chat("Musisz trzymać przedmiot w dłoni!"); Notice noMaterial = Notice.chat("Taki materiał nie istnieje!"); Notice noArgument = Notice.chat("Taki argument nie istnieje!");