chylex/Better-Controls
1
0
Fork 0
mirror of https://github.com/chylex/Better-Controls.git synced 2025-05-23 07:34:04 +02:00
Code

Fix narration of key bindings

Browse Source
This commit is contained in:
chylex 2021-10-02 14:16:31 +02:00
parent 145a7d016f
commit 25c7565a49
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
2 changed files with 6 additions and 5 deletions
src/main/java/chylex/bettercontrols/gui
BetterControlsScreen.java
elements
KeyBindingWidget.java

2
src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
View File

@ -205,7 +205,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final LiteralText text, final KeyBindingWithModifier binding) { private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final LiteralText text, final KeyBindingWithModifier binding) {
final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier); final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding); final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
bindingButton.linkButtonToBoundState(modifierButton); bindingButton.linkButtonToBoundState(modifierButton);
generateLeftSideText(y, elements, text); generateLeftSideText(y, elements, text);

9
src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
View File

@ -1,5 +1,6 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import chylex.bettercontrols.util.Key; import chylex.bettercontrols.util.Key;
import chylex.bettercontrols.util.LiteralText;
import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.KeyMapping; import net.minecraft.client.KeyMapping;
@ -23,16 +24,16 @@ public final class KeyBindingWidget extends Button {
private final Consumer<KeyBindingWidget> onEditingStarted; private final Consumer<KeyBindingWidget> onEditingStarted;
private boolean isEditing; private boolean isEditing;
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) { public KeyBindingWidget(final int x, final int y, final int width, final int height, final LiteralText bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
super(x, y, width, height, TextComponent.EMPTY, btn -> {}); super(x, y, width, height, TextComponent.EMPTY, btn -> {});
this.binding = binding; this.binding = binding;
this.bindingName = new TranslatableComponent(binding.saveString()); this.bindingName = bindingName;
this.onEditingStarted = onEditingStarted; this.onEditingStarted = onEditingStarted;
updateKeyBindingText(); updateKeyBindingText();
} }
public KeyBindingWidget(final int x, final int y, final int width, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) { public KeyBindingWidget(final int x, final int y, final int width, final LiteralText bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
this(x, y, width, 20, binding, onEditingStarted); this(x, y, width, 20, bindingName, binding, onEditingStarted);
} }
public void linkButtonToBoundState(final AbstractButton button) { public void linkButtonToBoundState(final AbstractButton button) {