Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import meteordevelopment.meteorclient.gui.widgets.pressable.WPlus;
import meteordevelopment.meteorclient.renderer.Fonts;
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.hud.elements.keyboard.KeyboardHud;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import net.minecraft.client.resource.language.I18n;
Expand Down Expand Up @@ -71,6 +72,7 @@ public DefaultSettingsWidgetFactory(GuiTheme theme) {
factories.put(ColorListSetting.class, (table, setting) -> colorListW(table, (ColorListSetting) setting));
factories.put(FontFaceSetting.class, (table, setting) -> fontW(table, (FontFaceSetting) setting));
factories.put(Vector3dSetting.class, (table, setting) -> vector3dW(table, (Vector3dSetting) setting));
factories.put(KeyboardHud.CustomKeyListSetting.class, (table, setting) -> customKeyListW(table, (KeyboardHud.CustomKeyListSetting) setting));
}

@Override
Expand Down Expand Up @@ -466,6 +468,11 @@ private WDoubleEdit addVectorComponent(WTable table, String label, double value,
return component;
}

private void customKeyListW(WTable table, KeyboardHud.CustomKeyListSetting setting) {
WTable wtable = table.add(theme.table()).expandX().widget();
KeyboardHud.fillTable(theme, wtable, setting);
}

// Other

private void selectW(WContainer c, Setting<?> setting, Runnable action) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void reset() {
if (Modules.get().isBinding()) {
Modules.get().setModuleToBind(null);
}
if (action != null) action.run();
}

private void refreshLabel() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import meteordevelopment.meteorclient.systems.System;
import meteordevelopment.meteorclient.systems.Systems;
import meteordevelopment.meteorclient.systems.hud.elements.*;
import meteordevelopment.meteorclient.systems.hud.elements.keyboard.KeyboardHud;
import meteordevelopment.meteorclient.systems.hud.screens.HudEditorScreen;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.misc.Keybind;
Expand Down Expand Up @@ -130,6 +131,7 @@ public void init() {
register(PotionTimersHud.INFO);
register(CombatHud.INFO);
register(MapHud.INFO);
register(KeyboardHud.INFO);

// Default config
if (isFirstInit) resetToDefaultElements();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
* Copyright (c) Meteor Development.
*/

package meteordevelopment.meteorclient.systems.hud.elements.keyboard;

enum KeyDimensions {
// Standard sizes
UNIT_1U(1.0),
UNIT_1_25U(1.25),
UNIT_1_5U(1.5),
UNIT_1_75U(1.75),
UNIT_2U(2.0),
UNIT_2_25U(2.25),
UNIT_2_75U(2.75),
UNIT_6_25U(6.25);

public final double units;

KeyDimensions(double units) {
this.units = units;
}

/**
* Converts this dimension to pixels, accounting for gaps.
* Multi-unit keys span gaps: 2u key = 2*baseUnit + 1*gap
*/
public double toPixels(double baseUnit, double gap) {
return units * baseUnit + (units - 1.0) * gap;
}

public double toPixels(double baseUnit) {
return units * baseUnit;
}

// Aliases for common keys
public static final KeyDimensions STANDARD = UNIT_1U;
public static final KeyDimensions TAB = UNIT_1_5U;
public static final KeyDimensions CAPS_LOCK = UNIT_1_75U;
public static final KeyDimensions ENTER_ANSI = UNIT_2_25U;
public static final KeyDimensions LEFT_SHIFT_ANSI = UNIT_2_25U;
public static final KeyDimensions RIGHT_SHIFT = UNIT_2_75U;
public static final KeyDimensions BACKSPACE = UNIT_2U;
public static final KeyDimensions LEFT_SHIFT_ISO = UNIT_1_25U;
public static final KeyDimensions ENTER_ISO_WIDTH = UNIT_1_25U;
public static final KeyDimensions ENTER_ISO_HEIGHT = UNIT_2U;
public static final KeyDimensions CTRL = UNIT_1_25U;
public static final KeyDimensions ALT = UNIT_1_25U;
public static final KeyDimensions GUI = UNIT_1_25U;
public static final KeyDimensions MENU = UNIT_1_25U;
public static final KeyDimensions SPACEBAR = UNIT_6_25U;
}
Loading