Skip to content

Item command for managing item highlight / auto drop / anti drop #5684

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Item command for managing item highlight / auto drop / anti drop #5684

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
5dd2c19
wip: start implementing .item
moxvallix Jul 8, 2024
68a579e
Merge branch 'master' into item-command
moxvallix Sep 5, 2025
20cf088
feat(command): implement .item command
moxvallix Sep 5, 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
1 change: 1 addition & 0 deletions src/main/java/meteordevelopment/meteorclient/commands/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public static void init() {
add(new InputCommand());
add(new WaspCommand());
add(new LocateCommand());
add(new ItemCommand());

COMMANDS.sort(Comparator.comparing(Command::getName));
}
Expand Down
306 changes: 306 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/commands/commands/ItemCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,306 @@
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
* Copyright (c) Meteor Development.
*/

package meteordevelopment.meteorclient.commands.commands;

import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import meteordevelopment.meteorclient.commands.Command;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.modules.misc.InventoryTweaks;
import meteordevelopment.meteorclient.systems.modules.render.ItemHighlight;
import net.minecraft.command.CommandSource;
import net.minecraft.command.argument.ItemStackArgument;
import net.minecraft.command.argument.ItemStackArgumentType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

import java.util.ArrayList;
import java.util.List;

public class ItemCommand extends Command {
final InventoryTweaks inventoryTweaks;
final ItemHighlight itemHighlight;

public ItemCommand() {
super("item", "Manages item related modules.");

inventoryTweaks = Modules.get().get(InventoryTweaks.class);
itemHighlight = Modules.get().get(ItemHighlight.class);
}

@Override
public void build(LiteralArgumentBuilder<CommandSource> builder) {
buildHighlight(builder);
buildBlock(builder);
buildLock(builder);
}

private void buildHighlight(LiteralArgumentBuilder<CommandSource> builder) {
builder.then(literal("highlight")
.executes(context -> {
List<Item> items = itemHighlight.items.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

itemHighlight.items.set(items);
itemHighlight.info("Added " + item.toString() + " to highlighted items.");

return SINGLE_SUCCESS;
})
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = itemHighlight.items.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

itemHighlight.items.set(items);
itemHighlight.info("Added " + item.toString() + " to highlighted items.");

return SINGLE_SUCCESS;
})
)
.then(literal("clear")
.executes(context -> {
List<Item> items = itemHighlight.items.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

itemHighlight.items.set(items);
itemHighlight.info("Removed " + item.toString() + " from highlighted items.");

return SINGLE_SUCCESS;
})
.then(literal("*")
.executes(context -> {
itemHighlight.items.set(new ArrayList<>());
itemHighlight.info("Removed all from highlighted items.");

return SINGLE_SUCCESS;
})
)
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = itemHighlight.items.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

itemHighlight.items.set(items);
itemHighlight.info("Removed " + item.toString() + " from highlighted items.");

return SINGLE_SUCCESS;
})
)
)
);
}

private void buildBlock(LiteralArgumentBuilder<CommandSource> builder) {
builder.then(literal("block")
.executes(context -> {
List<Item> items = inventoryTweaks.autoDropItems.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

inventoryTweaks.autoDropItems.set(items);
inventoryTweaks.info("Added " + item.toString() + " to automatically dropped items.");

return SINGLE_SUCCESS;
})
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = inventoryTweaks.autoDropItems.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

inventoryTweaks.autoDropItems.set(items);
inventoryTweaks.info("Added " + item.toString() + " to automatically dropped items.");

return SINGLE_SUCCESS;
})
)
.then(literal("clear")
.executes(context -> {
List<Item> items = inventoryTweaks.autoDropItems.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

inventoryTweaks.autoDropItems.set(items);
inventoryTweaks.info("Removed " + item.toString() + " from automatically dropped items.");

return SINGLE_SUCCESS;
})
.then(literal("*")
.executes(context -> {
inventoryTweaks.autoDropItems.set(new ArrayList<>());
inventoryTweaks.info("Removed all from automatically dropped items.");

return SINGLE_SUCCESS;
})
)
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = inventoryTweaks.autoDropItems.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

inventoryTweaks.autoDropItems.set(items);
inventoryTweaks.info("Removed " + item.toString() + " from automatically dropped items.");

return SINGLE_SUCCESS;
})
)
)
);
}

private void buildLock(LiteralArgumentBuilder<CommandSource> builder) {
builder.then(literal("lock")
.executes(context -> {
List<Item> items = inventoryTweaks.antiDropItems.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

inventoryTweaks.antiDropItems.set(items);
inventoryTweaks.info("Added " + item.toString() + " to anti drop items.");

return SINGLE_SUCCESS;
})
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = inventoryTweaks.antiDropItems.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (items.contains(item)) return SINGLE_SUCCESS;

items.add(item);

inventoryTweaks.antiDropItems.set(items);
inventoryTweaks.info("Added " + item.toString() + " to anti drop items.");

return SINGLE_SUCCESS;
})
)
.then(literal("clear")
.executes(context -> {
List<Item> items = inventoryTweaks.antiDropItems.get();
ItemStack itemStack = getItemStack();

if (itemStack == null) {
error("Not holding an item.");

return SINGLE_SUCCESS;
}

Item item = itemStack.getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

inventoryTweaks.antiDropItems.set(items);
inventoryTweaks.info("Removed " + item.toString() + " from anti drop items.");

return SINGLE_SUCCESS;
})
.then(literal("*")
.executes(context -> {
inventoryTweaks.antiDropItems.set(new ArrayList<>());
inventoryTweaks.info("Removed all from anti drop items.");

return SINGLE_SUCCESS;
})
)
.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
.executes(context -> {
List<Item> items = inventoryTweaks.antiDropItems.get();
Item item = context.getArgument("item", ItemStackArgument.class).getItem();

if (!items.contains(item)) return SINGLE_SUCCESS;

items.remove(item);

inventoryTweaks.antiDropItems.set(items);
inventoryTweaks.info("Removed " + item.toString() + " from anti drop items.");

return SINGLE_SUCCESS;
})
)
)
);
}

private ItemStack getItemStack() {
ItemStack itemStack = mc.player.getMainHandStack();
if (itemStack == null) itemStack = mc.player.getOffHandStack();
return itemStack.isEmpty() ? null : itemStack;
}
}
4 changes: 2 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/misc/InventoryTweaks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public class InventoryTweaks extends Module {

// Anti drop

private final Setting<List<Item>> antiDropItems = sgAntiDrop.add(new ItemListSetting.Builder()
public final Setting<List<Item>> antiDropItems = sgAntiDrop.add(new ItemListSetting.Builder()
.name("anti-drop-items")
.description("Items to prevent dropping. Doesn't work in creative inventory screen.")
.build()
Expand All @@ -127,7 +127,7 @@ public class InventoryTweaks extends Module {

// Auto Drop

private final Setting<List<Item>> autoDropItems = sgAutoDrop.add(new ItemListSetting.Builder()
public final Setting<List<Item>> autoDropItems = sgAutoDrop.add(new ItemListSetting.Builder()
.name("auto-drop-items")
.description("Items to drop.")
.build()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/meteordevelopment/meteorclient/systems/modules/render/ItemHighlight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public class ItemHighlight extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();

private final Setting<List<Item>> items = sgGeneral.add(new ItemListSetting.Builder()
public final Setting<List<Item>> items = sgGeneral.add(new ItemListSetting.Builder()
.name("items")
.description("Items to highlight.")
.build()
Expand Down