Added HasGivenFromInventoryCommand and HasInInventoryCommand

Author: randombyte-developer

src/main/kotlin/de/randombyte/commandutils/CommandUtils.kt

@@ -179,6 +179,24 @@ class CommandUtils @Inject constructor(
                 .executor(HasGivenFromHandCommand(HandTypes.MAIN_HAND))
                 .build()
 
+        val hasInInventoryCommandSpec = CommandSpec.builder()
+                .permission("$ROOT_PERMISSION.in-inventory")
+                .arguments(
+                        userUuidFromNameOrUuid,
+                        string(ITEM_ARG.toText()),
+                        optional(integer(QUANTITY_ARG.toText())))
+                .executor(HasInInventoryCommand())
+                .build()
+
+        val hasGivenFromInventoryCommandSpec = CommandSpec.builder()
+                .permission("$ROOT_PERMISSION.given-from-inventory")
+                .arguments(
+                        userUuidFromNameOrUuid,
+                        string(ITEM_ARG.toText()),
+                        optional(integer(QUANTITY_ARG.toText())))
+                .executor(HasGivenFromInventoryCommand())
+                .build()
+
         val executeParsedCommandSpec = CommandSpec.builder()
                 .permission("$ROOT_PERMISSION.parsed")
                 .arguments(
@@ -213,10 +231,12 @@ class CommandUtils @Inject constructor(
                         .child(hasChanceCommandSpec, "chance")
                         .child(CommandSpec.builder()
                                 .child(hasInHandCommandSpec, "hand")
+                                .child(hasInInventoryCommandSpec, "inventory")
                                 .build(), "in")
                         .child(CommandSpec.builder()
                                 .child(CommandSpec.builder()
                                         .child(hasGivenFromHandCommandSpec, "hand")
+                                        .child(hasGivenFromInventoryCommandSpec, "inventory")
                                         .build(), "from")
                                 .build(), "given")
                 .build(), "has")

src/main/kotlin/de/randombyte/commandutils/conditions/HasGivenFromInventoryCommand.kt

@@ -0,0 +1,29 @@
+package de.randombyte.commandutils.conditions
+
+import de.randombyte.commandutils.CommandUtils
+import de.randombyte.commandutils.execute.getPlayer
+import de.randombyte.commandutils.execute.isTruthy
+import de.randombyte.kosp.extensions.tryAsByteItem
+import org.spongepowered.api.command.CommandResult
+import org.spongepowered.api.command.CommandSource
+import org.spongepowered.api.command.args.CommandContext
+import org.spongepowered.api.item.inventory.Inventory
+import org.spongepowered.api.item.inventory.query.QueryOperationTypes
+
+class HasGivenFromInventoryCommand : HasInInventoryCommand() {
+    override fun execute(src: CommandSource, args: CommandContext): CommandResult {
+        val hasInInventoryCommandResult = super.execute(src, args)
+        if (!hasInInventoryCommandResult.isTruthy()) return CommandResult.empty()
+
+        // safe call due to 'isTruthy()'
+        val neededQuantity = hasInInventoryCommandResult.successCount.get()
+        val requiredItem = args.getOne<String>(CommandUtils.ITEM_ARG).get().tryAsByteItem().createStack()
+
+        val player = args.getPlayer()
+        player.inventory
+                .query<Inventory>(QueryOperationTypes.ITEM_STACK_IGNORE_QUANTITY.of(requiredItem))
+                .poll(neededQuantity)
+
+        return CommandResult.successCount(neededQuantity)
+    }
+}

src/main/kotlin/de/randombyte/commandutils/conditions/HasInInventoryCommand.kt

@@ -0,0 +1,32 @@
+package de.randombyte.commandutils.conditions
+
+import de.randombyte.commandutils.CommandUtils
+import de.randombyte.commandutils.execute.getPlayer
+import de.randombyte.kosp.extensions.orNull
+import de.randombyte.kosp.extensions.toText
+import de.randombyte.kosp.extensions.tryAsByteItem
+import org.spongepowered.api.command.CommandException
+import org.spongepowered.api.command.CommandResult
+import org.spongepowered.api.command.CommandSource
+import org.spongepowered.api.command.args.CommandContext
+import org.spongepowered.api.command.spec.CommandExecutor
+import org.spongepowered.api.item.inventory.Inventory
+import org.spongepowered.api.item.inventory.query.QueryOperationTypes
+
+open class HasInInventoryCommand : CommandExecutor {
+    override fun execute(src: CommandSource, args: CommandContext): CommandResult {
+        val player = args.getPlayer()
+        val itemString = args.getOne<String>(CommandUtils.ITEM_ARG).get()
+        var requiredQuantity = args.getOne<Int>(CommandUtils.QUANTITY_ARG).orNull()
+
+        val requiredItem = itemString.tryAsByteItem().createStack()
+        val foundSlots = player.inventory.query<Inventory>(QueryOperationTypes.ITEM_STACK_IGNORE_QUANTITY.of(requiredItem))
+
+        if (requiredQuantity == null) requiredQuantity = requiredItem.quantity
+        if (requiredQuantity < 1) throw CommandException("'quantity' must be greater than zero!".toText())
+
+        if (foundSlots.totalItems() < requiredQuantity) return CommandResult.empty()
+
+        return CommandResult.successCount(requiredQuantity)
+    }
+}