Skip to content

Macros tab changes #5608

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 2 commits into
base: master
Choose a base branch
from
Open

Macros tab changes #5608

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb71aa6
align macro keybinds to right of column, add color
shanktank Jul 31, 2025
d2de0b2
readd preceding space for long macro names
shanktank Jul 31, 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
12 changes: 10 additions & 2 deletions src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import meteordevelopment.meteorclient.settings.Settings;
import meteordevelopment.meteorclient.systems.macros.Macro;
import meteordevelopment.meteorclient.systems.macros.Macros;
import meteordevelopment.meteorclient.utils.misc.Keybind;
import meteordevelopment.meteorclient.utils.misc.NbtUtils;
import meteordevelopment.meteorclient.utils.render.color.Color;
import net.minecraft.client.gui.screen.Screen;

import static meteordevelopment.meteorclient.MeteorClient.mc;
Expand Down Expand Up @@ -58,9 +60,15 @@ private void initTable(WTable table) {
if (Macros.get().isEmpty()) return;

for (Macro macro : Macros.get()) {
table.add(theme.label(macro.name.get() + " (" + macro.keybind.get() + ")"));
table.add(theme.label(macro.name.get()));

WButton edit = table.add(theme.button(GuiRenderer.EDIT)).expandCellX().right().widget();
Keybind keybind = macro.keybind.get();
Color keybindColor = keybind.isSet() ? Color.GREEN : Color.LIGHT_GRAY;
table.add(theme.label(" (")).expandCellX().right();
table.add(theme.label(keybind.toString()).color(keybindColor)).center();
table.add(theme.label(")")).right();

WButton edit = table.add(theme.button(GuiRenderer.EDIT)).widget();
edit.action = () -> mc.setScreen(new EditMacroScreen(theme, macro, this::reload));

WMinus remove = table.add(theme.minus()).widget();
Expand Down