Skip to content

Enhance DropCommand to support item quantity #5664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2025
Merged

Enhance DropCommand to support item quantity #5664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
489ca7c
Enhance `DropCommand` to support item quantity
IExploitableMan Aug 27, 2025
7bf8bb4
Error if not enough items
IExploitableMan Aug 27, 2025
d703b55
revert the error changes
Wide-Cat Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions src/main/java/meteordevelopment/meteorclient/commands/commands/DropCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

package meteordevelopment.meteorclient.commands.commands;

import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import meteordevelopment.meteorclient.commands.Command;
Expand Down Expand Up @@ -67,17 +69,38 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
})));

// Specific item
builder.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS)).executes(context -> drop(player -> {
ItemStack stack = ItemStackArgumentType.getItemStackArgument(context, "item").createStack(1, false);
builder.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> drop(player -> {
dropItem(player, context, Integer.MAX_VALUE);
}))
.then(argument("amount", IntegerArgumentType.integer(1))
.executes(context -> drop(player -> {
int amount = IntegerArgumentType.getInteger(context, "amount");
dropItem(player, context, amount);
})))
);
}

if (stack == null || stack.getItem() == Items.AIR) throw NO_SUCH_ITEM.create();
private void dropItem(ClientPlayerEntity player, CommandContext<CommandSource> context, int amount) throws CommandSyntaxException {
ItemStack stack = ItemStackArgumentType.getItemStackArgument(context, "item").createStack(1, false);
if (stack == null || stack.getItem() == Items.AIR) throw NO_SUCH_ITEM.create();

for (int i = 0; i < player.getInventory().size(); i++) {
if (stack.getItem() == player.getInventory().getStack(i).getItem()) {
InvUtils.drop().slot(i);
for (int i = 0; i < player.getInventory().size() && amount > 0; i++) {
ItemStack invStack = player.getInventory().getStack(i);
if (invStack.isEmpty() || stack.getItem() != invStack.getItem()) continue;

int dropCount = Math.min(amount, invStack.getCount());

if (dropCount == invStack.getCount()) {
InvUtils.drop().slot(i);
} else {
for (int j = 0; j < dropCount; j++) {
InvUtils.dropOne().slot(i);
}
}
})));

amount -= dropCount;
}
}

private int drop(PlayerConsumer consumer) throws CommandSyntaxException {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/utils/player/InvUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@ public static Action drop() {
return ACTION;
}

public static Action dropOne() {
ACTION.type = SlotActionType.THROW;
ACTION.data = 0;
return ACTION;
}

public static void dropHand() {
if (!mc.player.currentScreenHandler.getCursorStack().isEmpty()) mc.interactionManager.clickSlot(mc.player.currentScreenHandler.syncId, ScreenHandler.EMPTY_SPACE_SLOT_INDEX, 0, SlotActionType.PICKUP, mc.player);
}
Expand Down