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

Migrate to Mojang mappings

Browse Source
This commit is contained in:
chylex 2021-10-02 14:36:21 +02:00
parent de07ba881b
commit 7f8065fa97
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
41 changed files with 361 additions and 357 deletions

4
build.gradle
View File

@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '0.9-SNAPSHOT'
id 'maven-publish'
}
@ -12,8 +12,8 @@ group = project.maven_group
dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
mappings minecraft.officialMojangMappings()
}
processResources {

1
gradle.properties
View File

@ -3,7 +3,6 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
minecraft_version=1.17
yarn_mappings=1.17+build.1
loader_version=0.11.3
# Mod Properties

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

@ -12,13 +12,14 @@ import chylex.bettercontrols.input.ModifierKey;
import chylex.bettercontrols.input.SprintMode;
import chylex.bettercontrols.util.Key;
import chylex.bettercontrols.util.LiteralText;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.screen.option.GameOptionsScreen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.screens.OptionsSubScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.glfw.GLFW;
import java.util.ArrayList;
import java.util.Arrays;
@ -32,7 +33,7 @@ import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
import static chylex.bettercontrols.util.LiteralText.text;
import static chylex.bettercontrols.util.Statics.OPTIONS;
public class BetterControlsScreen extends GameOptionsScreen {
public class BetterControlsScreen extends OptionsSubScreen {
public static final LiteralText TITLE = text("Better Controls");
private static final int BOTTOM_PADDING = 3;
@ -48,7 +49,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
// Options
private int generateSprintingOptions(int y, final List<Element> elements) {
private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@ -72,7 +73,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
return y;
}
private int generateSneakingOptions(int y, final List<Element> elements) {
private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@ -87,7 +88,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
}
@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
private int generateFlightOptions(int y, final List<Element> elements) {
private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@ -172,7 +173,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
return y;
}
private int generateMiscellaneousOptions(int y, final List<Element> elements) {
private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@ -202,7 +203,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
new Option<>(ModifierKey.ALT, text("Alt"))
);
private void generateKeyBindingWithModifierOption(final int y, final List<Element> 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 KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
bindingButton.linkButtonToBoundState(modifierButton);
@ -213,7 +214,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
allKeyBindings.add(bindingButton);
}
private static void generateLeftSideText(final int y, final List<Element> elements, final LiteralText text) {
private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final LiteralText text) {
elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
}
@ -223,7 +224,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
private KeyBindingWidget editingKeyBinding;
private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
public BetterControlsScreen(final Screen parentScreen) {
public BetterControlsScreen(@Nullable final Screen parentScreen) {
super(parentScreen, OPTIONS, TITLE);
}
@ -231,7 +232,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
public void init() {
allKeyBindings.clear();
final List<Element> elements = new ArrayList<>();
final List<GuiEventListener> elements = new ArrayList<>();
int y = 0;
elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@ -246,8 +247,8 @@ public class BetterControlsScreen extends GameOptionsScreen {
elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
addDrawableChild(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, ScreenTexts.DONE, btn -> client.openScreen(parent)));
addSelectableChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
}
@Override
@ -256,10 +257,10 @@ public class BetterControlsScreen extends GameOptionsScreen {
}
@Override
public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta) {
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
renderBackground(matrices);
optionsWidget.render(matrices, mouseX, mouseY, delta);
drawCenteredText(matrices, textRenderer, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
super.render(matrices, mouseX, mouseY, delta);
}
@ -303,7 +304,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
private void onKeyBindingEditingFinished() {
editingKeyBinding = null;
KeyBinding.updateKeysByCode();
KeyMapping.resetMapping();
for (final KeyBindingWidget widget : allKeyBindings) {
widget.updateKeyBindingText();

62
src/main/java/chylex/bettercontrols/gui/OptionListWidget.java
View File

@ -1,11 +1,11 @@
package chylex.bettercontrols.gui;
import chylex.bettercontrols.gui.OptionListWidget.Entry;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.ContainerObjectSelectionList;
import net.minecraft.client.gui.components.Widget;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratableEntry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -14,7 +14,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class OptionListWidget extends ElementListWidget<Entry> {
public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
public static final int ROW_WIDTH = 408;
public static final int ROW_PADDING = 2;
@ -29,19 +29,19 @@ public final class OptionListWidget extends ElementListWidget<Entry> {
return (column * ROW_WIDTH) / 4;
}
private static Offset getElementOffset(final Element element) {
if (element instanceof Widget) {
return new Offset(((Widget)element).getX(), ((Widget)element).getY());
private static Offset getElementOffset(final GuiEventListener element) {
if (element instanceof OptionWidget) {
return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
}
else if (element instanceof ClickableWidget) {
return new Offset(((ClickableWidget)element).x, ((ClickableWidget)element).y);
else if (element instanceof AbstractWidget) {
return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
}
else {
return new Offset(0, 0);
}
}
public interface Widget extends Element, Drawable {
public interface OptionWidget extends GuiEventListener, Widget {
int getX();
int getY();
void setX(int x);
@ -58,7 +58,7 @@ public final class OptionListWidget extends ElementListWidget<Entry> {
}
}
public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<Element> widgets, final int innerHeight) {
public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
super(MINECRAFT, width, height, top, bottom, innerHeight);
addEntry(new Entry(widgets));
}
@ -74,47 +74,49 @@ public final class OptionListWidget extends ElementListWidget<Entry> {
}
@Override
protected int getScrollbarPositionX() {
protected int getScrollbarPosition() {
return (width + ROW_WIDTH) / 2 + 4;
}
protected static final class Entry extends ElementListWidget.Entry<Entry> {
private final List<Element> elements;
private final List<Selectable> selectables;
private final Map<Element, Offset> offsets;
protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
private final List<GuiEventListener> elements;
private final List<NarratableEntry> narratables;
private final Map<GuiEventListener, Offset> offsets;
public Entry(final List<Element> elements) {
public Entry(final List<GuiEventListener> elements) {
this.elements = new ArrayList<>(elements);
this.selectables = elements.stream().filter(e -> e instanceof Selectable).map(e -> (Selectable)e).toList();
this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).collect(Collectors.toList());
this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
}
@Override
public List<? extends Element> children() {
public List<? extends GuiEventListener> children() {
return Collections.unmodifiableList(elements);
}
@Override
public List<? extends Selectable> method_37025() {
return Collections.unmodifiableList(selectables);
public List<? extends NarratableEntry> narratables() {
return Collections.unmodifiableList(narratables);
}
@Override
public void render(final MatrixStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
for (final Element element : elements) {
public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
for (final GuiEventListener element : elements) {
final Offset offset = offsets.get(element);
if (element instanceof final ClickableWidget button) {
if (element instanceof AbstractWidget) {
final AbstractWidget button = (AbstractWidget)element;
button.x = x + offset.x;
button.y = y + offset.y;
}
else if (element instanceof final Widget widget) {
else if (element instanceof OptionWidget) {
final OptionWidget widget = (OptionWidget)element;
widget.setX(x + offset.x);
widget.setY(y + offset.y);
}
if (element instanceof final Drawable drawable) {
drawable.render(matrices, mouseX, mouseY, tickDelta);
if (element instanceof Widget) {
((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
}
}
}

51
src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
View File

@ -1,15 +1,14 @@
package chylex.bettercontrols.gui;
import chylex.bettercontrols.mixin.AccessCyclingButtonWidgetFields;
import chylex.bettercontrols.mixin.AccessCycleButtonFields;
import chylex.bettercontrols.mixin.AccessOptionFields;
import chylex.bettercontrols.mixin.AccessScreenButtons;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.ParentElement;
import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.CyclingButtonWidget;
import net.minecraft.client.option.Option;
import net.minecraft.client.Option;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.components.events.ContainerEventHandler;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
import net.minecraft.client.gui.screens.controls.ControlsScreen;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
@ -18,44 +17,42 @@ import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class ScreenPatcher {
private ScreenPatcher() {}
public static void onControlsScreenOpened(final ControlsOptionsScreen screen) {
public static void onControlsScreenOpened(final ControlsScreen screen) {
final AccessScreenButtons accessor = (AccessScreenButtons)screen;
final List<? extends Element> children = screen.children();
final List<? extends GuiEventListener> children = screen.children();
final ClickableWidget autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
if (autoJump != null) {
final ButtonWidget widget = new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.copy().append("..."), btn -> {
MINECRAFT.openScreen(new BetterControlsScreen(screen));
final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
MINECRAFT.setScreen(new BetterControlsScreen(screen));
});
accessor.callRemove(autoJump);
accessor.getChildren().add(widget);
accessor.getSelectables().add(widget);
accessor.getDrawables().add(widget);
accessor.callRemoveWidget(autoJump);
accessor.callAddRenderableWidget(widget);
}
}
public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
walkChildren(screen.children(), it -> {
getOptionButton(it, Option.SPRINT_TOGGLED).ifPresent(button -> button.active = false);
getOptionButton(it, Option.SNEAK_TOGGLED).ifPresent(button -> button.active = false);
getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
});
}
private static void walkChildren(final List<? extends Element> elements, final Consumer<Element> callback) {
for (final Element element : elements) {
private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback) {
for (final GuiEventListener element : elements) {
callback.accept(element);
if (element instanceof ParentElement) {
walkChildren(((ParentElement)element).children(), callback);
if (element instanceof ContainerEventHandler) {
walkChildren(((ContainerEventHandler)element).children(), callback);
}
}
}
private static Optional<CyclingButtonWidget<?>> getOptionButton(final Element element, final Option option) {
if (element instanceof CyclingButtonWidget<?> && ((AccessOptionFields)option).getKey().equals(((AccessCyclingButtonWidgetFields)element).getOptionText())) {
return Optional.of((CyclingButtonWidget<?>)element);
private static Optional<CycleButton<?>> getOptionButton(final GuiEventListener element, final Option option) {
if (element instanceof CycleButton<?> && ((AccessOptionFields)option).getCaption().equals(((AccessCycleButtonFields)element).getName())) {
return Optional.of((CycleButton<?>)element);
}
else {
return Optional.empty();

10
src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java
View File

@ -1,14 +1,14 @@
package chylex.bettercontrols.gui.elements;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.CommonComponents;
public final class BooleanValueWidget extends ButtonWidget {
public final class BooleanValueWidget extends Button {
private final BooleanConsumer onChanged;
private boolean value;
public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged) {
super(x, y, width, height, currentValue ? ScreenTexts.ON : ScreenTexts.OFF, ignore -> {});
super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
this.value = currentValue;
this.onChanged = onChanged;
}
@ -21,7 +21,7 @@ public final class BooleanValueWidget extends ButtonWidget {
public void onPress() {
super.onPress();
value = !value;
setMessage(value ? ScreenTexts.ON : ScreenTexts.OFF);
setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
onChanged.accept(value);
}
}

4
src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java
View File

@ -1,9 +1,9 @@
package chylex.bettercontrols.gui.elements;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.components.Button;
import java.util.List;
import java.util.function.Consumer;
public class CycleButtonWidget<T> extends ButtonWidget {
public class CycleButtonWidget<T> extends Button {
private final List<Option<T>> options;
private final Consumer<T> onChanged;
private T selectedValue;

8
src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
View File

@ -1,10 +1,10 @@
package chylex.bettercontrols.gui.elements;
import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.util.math.MathHelper;
import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.util.Mth;
import java.util.List;
import java.util.function.Consumer;
public final class DiscreteValueSliderWidget<T> extends SliderWidget {
public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
private final List<Option<T>> options;
private final Consumer<T> onChanged;
private T selectedValue;
@ -21,7 +21,7 @@ public final class DiscreteValueSliderWidget<T> extends SliderWidget {
}
public Option<T> getSelectedOption() {
return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
}
@Override

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

@ -1,48 +1,48 @@
package chylex.bettercontrols.gui.elements;
import chylex.bettercontrols.util.Key;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import net.minecraft.text.LiteralText;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.ChatFormatting;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class KeyBindingWidget extends ButtonWidget {
private final KeyBinding binding;
private final Text bindingName;
public final class KeyBindingWidget extends Button {
private final KeyMapping binding;
private final Component bindingName;
private final List<ClickableWidget> linkedButtons = new ArrayList<>(1);
private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
private final Consumer<KeyBindingWidget> onEditingStarted;
private boolean isEditing;
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted) {
super(x, y, width, height, LiteralText.EMPTY, btn -> {});
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
super(x, y, width, height, TextComponent.EMPTY, btn -> {});
this.binding = binding;
this.bindingName = new TranslatableText(binding.getTranslationKey());
this.bindingName = new TranslatableComponent(binding.saveString());
this.onEditingStarted = onEditingStarted;
updateKeyBindingText();
}
public KeyBindingWidget(final int x, final int y, final int width, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted) {
public KeyBindingWidget(final int x, final int y, final int width, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
this(x, y, width, 20, binding, onEditingStarted);
}
public void linkButtonToBoundState(final ClickableWidget button) {
public void linkButtonToBoundState(final AbstractButton button) {
linkedButtons.add(button);
button.active = !Key.isUnbound(binding);
}
@Override
protected MutableText getNarrationMessage() {
return Key.isUnbound(binding) ? new TranslatableText("narrator.controls.unbound", bindingName) : new TranslatableText("narrator.controls.bound", bindingName, super.getNarrationMessage());
protected MutableComponent createNarrationMessage() {
return Key.isUnbound(binding) ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
}
@Override
@ -52,11 +52,11 @@ public final class KeyBindingWidget extends ButtonWidget {
updateKeyBindingText();
}
public void bindAndStopEditing(final InputUtil.Key key) {
public void bindAndStopEditing(final InputConstants.Key key) {
Key.bind(binding, key);
stopEditing();
for (final ClickableWidget button : linkedButtons) {
for (final AbstractButton button : linkedButtons) {
button.active = !Key.isUnbound(binding);
}
}
@ -70,7 +70,7 @@ public final class KeyBindingWidget extends ButtonWidget {
boolean hasConflict = false;
if (!Key.isUnbound(binding)) {
for (final KeyBinding other : OPTIONS.keysAll) {
for (final KeyMapping other : OPTIONS.keyMappings) {
if (binding != other && binding.equals(other)) {
hasConflict = true;
break;
@ -79,13 +79,13 @@ public final class KeyBindingWidget extends ButtonWidget {
}
if (isEditing) {
setMessage((new LiteralText("> ")).append(Key.getBoundKeyText(binding).copy().formatted(Formatting.YELLOW)).append(" <").formatted(Formatting.YELLOW));
setMessage((new TextComponent("> ")).append(Key.getBoundKeyText(binding).copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
}
else if (hasConflict) {
setMessage(Key.getBoundKeyText(binding).copy().formatted(Formatting.RED));
setMessage(Key.getBoundKeyText(binding).copy().withStyle(ChatFormatting.RED));
}
else {
setMessage(Key.isUnbound(binding) ? Text.of("(No Binding)") : Key.getBoundKeyText(binding));
setMessage(Key.isUnbound(binding) ? new TextComponent("(No Binding)") : Key.getBoundKeyText(binding));
}
}
}

26
src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
View File

@ -1,14 +1,14 @@
package chylex.bettercontrols.gui.elements;
import chylex.bettercontrols.gui.OptionListWidget.Widget;
import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
import chylex.bettercontrols.util.LiteralText;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.OrderedText;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiComponent;
import net.minecraft.util.FormattedCharSequence;
import java.util.List;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class TextWidget extends DrawableHelper implements Widget {
public final class TextWidget extends GuiComponent implements OptionWidget {
public static final int LEFT = 0;
public static final int CENTER = 1;
@ -57,17 +57,17 @@ public final class TextWidget extends DrawableHelper implements Widget {
}
@Override
public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta) {
final TextRenderer textRenderer = MINECRAFT.textRenderer;
final List<OrderedText> lines = textRenderer.wrapLines(text, width);
final int lineHeight = textRenderer.fontHeight + 1;
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
final Font textRenderer = MINECRAFT.font;
final List<FormattedCharSequence> lines = textRenderer.split(text, width);
final int lineHeight = textRenderer.lineHeight + 1;
final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getWidth).max().orElse(0) / 2) : x;
final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
for (int i = 0; i < lines.size(); i++) {
final OrderedText line = lines.get(i);
textRenderer.drawWithShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
final FormattedCharSequence line = lines.get(i);
textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
}
}
}

22
src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java
View File

@ -1,15 +1,15 @@
package chylex.bettercontrols.input;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil.Type;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import com.mojang.blaze3d.platform.InputConstants.Type;
import net.minecraft.client.KeyMapping;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import org.jetbrains.annotations.Nullable;
public class KeyBindingWithModifier extends KeyBinding {
public class KeyBindingWithModifier extends KeyMapping {
public static final String CATEGORY = "key.categories.bettercontrols";
public static boolean checkCategoryMatches(final Text text) {
return text instanceof TranslatableText && CATEGORY.equals(((TranslatableText)text).getKey());
public static boolean checkCategoryMatches(final Component text) {
return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
}
@Nullable
@ -29,12 +29,12 @@ public class KeyBindingWithModifier extends KeyBinding {
}
@Override
public boolean isPressed() {
return super.isPressed() && (modifier == null || modifier.isPressed());
public boolean isDown() {
return super.isDown() && (modifier == null || modifier.isPressed());
}
@Override
public boolean wasPressed() {
return super.wasPressed() && (modifier == null || modifier.isPressed());
public boolean consumeClick() {
return super.consumeClick() && (modifier == null || modifier.isPressed());
}
}

2
src/main/java/chylex/bettercontrols/input/ModifierKey.java
View File

@ -1,5 +1,5 @@
package chylex.bettercontrols.input;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screens.Screen;
public enum ModifierKey {
CONTROL(0) {

8
src/main/java/chylex/bettercontrols/input/ToggleTracker.java
View File

@ -1,10 +1,10 @@
package chylex.bettercontrols.input;
import chylex.bettercontrols.util.Key;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
public class ToggleTracker {
protected final KeyBinding bindingToggle;
protected final KeyBinding bindingReset;
protected final KeyMapping bindingToggle;
protected final KeyMapping bindingReset;
protected boolean isToggled;
@ -12,7 +12,7 @@ public class ToggleTracker {
private boolean hasToggledWhileHoldingReset;
private boolean skipNextToggle;
public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset) {
public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
this.bindingToggle = bindingToggle;
this.bindingReset = bindingReset;
}

8
src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java
View File

@ -1,20 +1,20 @@
package chylex.bettercontrols.input;
import chylex.bettercontrols.mixin.AccessKeyBindingFields;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
import java.util.HashSet;
import java.util.Set;
public final class ToggleTrackerForStickyKey extends ToggleTracker {
private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
public static boolean isOverrideEnabled(final KeyBinding binding) {
public static boolean isOverrideEnabled(final KeyMapping binding) {
return enabledOverrides.contains(binding);
}
private final BooleanConsumer setToggleState;
public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding bindingStickyReset, final BooleanConsumer setToggleState) {
public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState) {
super(bindingToggle, bindingStickyReset);
this.setToggleState = setToggleState;
this.setToggleState.accept(false);

8
src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
View File

@ -1,14 +1,10 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.render.Camera;
import net.minecraft.entity.Entity;
import net.minecraft.client.Camera;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Camera.class)
public interface AccessCameraFields {
@Accessor
Entity getFocusedEntity();
@Accessor
@Accessor("eyeHeight")
void setCameraY(float y);
}

6
src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java
View File

@ -1,10 +1,10 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ClientPlayerEntity.class)
@Mixin(LocalPlayer.class)
public interface AccessClientPlayerFields {
@Accessor
@Accessor("sprintTriggerTime")
void setTicksLeftToDoubleTapSprint(int value);
}

8
src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java
View File

@ -1,11 +1,11 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
import net.minecraft.text.Text;
import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CategoryEntry.class)
public interface AccessControlsListCategory {
@Accessor
Text getText();
@Accessor("name")
Component getText();
}

10
src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java
View File

@ -1,11 +1,11 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.screen.option.ControlsListWidget.KeyBindingEntry;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(KeyBindingEntry.class)
@Mixin(KeyEntry.class)
public interface AccessControlsListKeyBinding {
@Accessor
KeyBinding getBinding();
@Accessor("key")
KeyMapping getBinding();
}

12
src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java Normal file
View File

@ -0,0 +1,12 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CycleButton.class)
public interface AccessCycleButtonFields {
@Accessor("name")
Component getName();
}

12
src/main/java/chylex/bettercontrols/mixin/AccessCyclingButtonWidgetFields.java
View File

@ -1,12 +0,0 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.widget.CyclingButtonWidget;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CyclingButtonWidget.class)
public interface AccessCyclingButtonWidgetFields {
@Accessor
Text getOptionText();
}

10
src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java
View File

@ -1,10 +0,0 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.render.GameRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(GameRenderer.class)
public interface AccessGameRendererFields {
@Accessor
void setMovementFovMultiplier(float value);
}

10
src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
View File

@ -1,19 +1,19 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(KeyBinding.class)
@Mixin(KeyMapping.class)
public interface AccessKeyBindingFields {
@Accessor
@Accessor("CATEGORY_SORT_ORDER")
static Map<String, Integer> getCategoryOrderMap() {
throw new AssertionError();
}
@Accessor("pressed")
@Accessor("isDown")
boolean isPressedField();
@Accessor("pressed")
@Accessor("isDown")
void setPressedField(boolean value);
}

8
src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java
View File

@ -1,12 +1,12 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.option.Option;
import net.minecraft.text.Text;
import net.minecraft.client.Option;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Option.class)
public interface AccessOptionFields {
@Accessor
Text getKey();
@Accessor("caption")
Component getCaption();
}

6
src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
View File

@ -1,10 +1,10 @@
package chylex.bettercontrols.mixin;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(PlayerEntity.class)
@Mixin(Player.class)
public interface AccessPlayerFields {
@Accessor("abilityResyncCountdown")
@Accessor("jumpTriggerTime")
void setTicksLeftToDoubleTapFlight(int value);
}

22
src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
View File

@ -1,24 +1,16 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.Drawable;
import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.components.Widget;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratableEntry;
import net.minecraft.client.gui.screens.Screen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.List;
@Mixin(Screen.class)
public interface AccessScreenButtons {
@Accessor
List<Element> getChildren();
@Accessor
List<Selectable> getSelectables();
@Accessor
List<Drawable> getDrawables();
@Invoker
<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
@Invoker
void callRemove(Element child);
void callRemoveWidget(GuiEventListener widget);
}

8
src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java
View File

@ -1,16 +1,16 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.option.StickyKeyBinding;
import net.minecraft.client.ToggleKeyMapping;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.function.BooleanSupplier;
@Mixin(StickyKeyBinding.class)
@Mixin(ToggleKeyMapping.class)
public interface AccessStickyKeyBindingStateGetter {
@Accessor
@Accessor("needsToggle")
BooleanSupplier getToggleGetter();
@Accessor
@Accessor("needsToggle")
@Mutable
void setToggleGetter(final BooleanSupplier toggleGetter);
}

26
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java Normal file
View File

@ -0,0 +1,26 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
@Mixin(AbstractClientPlayer.class)
public abstract class HookClientPlayerFOV {
@Redirect(
method = "getFieldOfViewModifier",
at = @At(value = "INVOKE", target = "Ljava/lang/Float;isNaN(F)Z"),
slice = @Slice(
from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F"),
to = @At(value = "INVOKE", target = "Ljava/lang/Float;isInfinite(F)Z")
)
)
private boolean resetFOV(float movementSpeed) {
final LocalPlayer player = MINECRAFT.player;
return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
}
}

11
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
View File

@ -1,7 +1,8 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker;
import net.minecraft.client.input.KeyboardInput;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.player.Input;
import net.minecraft.client.player.KeyboardInput;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@ -11,10 +12,10 @@ import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(KeyboardInput.class)
public abstract class HookClientPlayerInputTick {
@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/KeyboardInput;pressingForward:Z", ordinal = 0, shift = AFTER))
@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
private void afterInputTick(final CallbackInfo info) {
final KeyboardInput input = (KeyboardInput)(Object)this;
final ClientPlayerEntity player = MINECRAFT.player;
final Input input = (Input)(Object)this;
final LocalPlayer player = MINECRAFT.player;
if (player != null) {
PlayerTicker.get(player).afterInputAssignsPressingForward(input);

24
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerTick.java
View File

@ -1,36 +1,36 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker;
import com.mojang.authlib.GameProfile;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(ClientPlayerEntity.class)
public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity {
protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile) {
@Mixin(LocalPlayer.class)
public abstract class HookClientPlayerTick extends AbstractClientPlayer {
protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
super(world, profile);
}
@Inject(method = "tickMovement()V", at = @At("HEAD"))
@Inject(method = "aiStep()V", at = @At("HEAD"))
private void atHead(final CallbackInfo info) {
final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).atHead(player);
}
@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", ordinal = 0, shift = AFTER))
@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
private void afterInputTick(final CallbackInfo info) {
final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterInputTick(player);
}
@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tickMovement()V", ordinal = 0, shift = AFTER))
@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
private void afterSuperCall(final CallbackInfo info) {
final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterSuperCall(player);
}
}

24
src/main/java/chylex/bettercontrols/mixin/HookControlsListWidget.java
View File

@ -1,33 +1,33 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.input.KeyBindingWithModifier;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.option.ControlsListWidget;
import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
import net.minecraft.client.gui.screen.option.ControlsListWidget.Entry;
import net.minecraft.client.gui.screen.option.ControlsListWidget.KeyBindingEntry;
import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.ContainerObjectSelectionList;
import net.minecraft.client.gui.screens.controls.ControlList;
import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
import net.minecraft.client.gui.screens.controls.ControlList.Entry;
import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
import net.minecraft.client.gui.screens.controls.ControlsScreen;
import org.apache.commons.lang3.ArrayUtils;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ControlsListWidget.class)
public abstract class HookControlsListWidget extends ElementListWidget<Entry> {
public HookControlsListWidget(final MinecraftClient client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
@Mixin(ControlList.class)
public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
super(client, width, height, top, bottom, itemHeight);
}
@Inject(method = "<init>", at = @At("TAIL"))
public void init(final ControlsOptionsScreen parent, final MinecraftClient client, final CallbackInfo ci) {
public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
children().removeIf(it -> {
if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
return true;
}
if (it instanceof KeyBindingEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
return true;
}

10
src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java
View File

@ -1,8 +1,8 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.input.KeyBindingWithModifier;
import net.minecraft.client.option.GameOptions;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Options;
import org.apache.commons.lang3.ArrayUtils;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
@ -12,14 +12,14 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GameOptions.class)
@Mixin(Options.class)
public abstract class HookLoadGameOptions {
private boolean hasLoaded = false;
@Mutable
@Final
@Shadow
public KeyBinding[] keysAll;
public KeyMapping[] keyMappings;
@Inject(method = "load()V", at = @At("HEAD"))
private void load(final CallbackInfo info) {
@ -28,7 +28,7 @@ public abstract class HookLoadGameOptions {
}
hasLoaded = true;
keysAll = ArrayUtils.addAll(keysAll, BetterControlsMod.config.getAllKeyBindings());
keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
}
}

18
src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java
View File

@ -1,24 +1,24 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.gui.ScreenPatcher;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.controls.ControlsScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
@Mixin(value = MinecraftClient.class, priority = 100)
@Mixin(value = Minecraft.class, priority = 100)
public abstract class HookOpenScreen {
@Inject(method = "openScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
@Inject(method = "setScreen", at = @At("TAIL"))
private void openScreen(final Screen ignore, final CallbackInfo ci) {
final Screen screen = MINECRAFT.currentScreen;
final Screen screen = MINECRAFT.screen;
if (screen != null && !Screen.hasAltDown()) {
if (screen.getClass() == ControlsOptionsScreen.class) {
ScreenPatcher.onControlsScreenOpened((ControlsOptionsScreen)screen);
if (screen.getClass() == ControlsScreen.class) {
ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
}
else if (screen.getClass() == AccessibilityOptionsScreen.class) {
ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);

18
src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java
View File

@ -1,25 +1,25 @@
package chylex.bettercontrols.mixin;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.world.World;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice;
@Mixin(PlayerEntity.class)
@Mixin(Player.class)
public abstract class HookPlayerFlightSpeed extends LivingEntity {
protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world) {
protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
super(type, world);
}
@Redirect(
method = "travel",
at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSprinting()Z"),
slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F"))
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"))
)
private boolean disableVanillaSprintBoost(final PlayerEntity player) {
private boolean disableVanillaSprintBoost(final Player player) {
return false;
}
}

16
src/main/java/chylex/bettercontrols/mixin/HookStickyKeyBindingState.java
View File

@ -1,7 +1,7 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.option.StickyKeyBinding;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.ToggleKeyMapping;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@ -10,17 +10,17 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.function.BooleanSupplier;
@Mixin(StickyKeyBinding.class)
public abstract class HookStickyKeyBindingState extends KeyBinding {
@Mixin(ToggleKeyMapping.class)
public abstract class HookStickyKeyBindingState extends KeyMapping {
@Shadow
@Final
private BooleanSupplier toggleGetter;
private BooleanSupplier needsToggle;
public HookStickyKeyBindingState(final String translationKey, final int code, final String category) {
super(translationKey, code, category);
}
@Inject(method = "setPressed(Z)V", at = @At("HEAD"), cancellable = true)
@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
public void setPressed(final boolean pressed, final CallbackInfo info) {
if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
((AccessKeyBindingFields)this).setPressedField(pressed);
@ -29,7 +29,7 @@ public abstract class HookStickyKeyBindingState extends KeyBinding {
}
@Override
public boolean isPressed() {
return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
public boolean isDown() {
return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
}
}

10
src/main/java/chylex/bettercontrols/player/FlightHelper.java
View File

@ -1,7 +1,7 @@
package chylex.bettercontrols.player;
import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.config.BetterControlsConfig;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.player.LocalPlayer;
final class FlightHelper {
private FlightHelper() {}
@ -13,15 +13,15 @@ final class FlightHelper {
return BetterControlsMod.config;
}
static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player) {
static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
}
static boolean shouldFlyOnGround(final ClientPlayerEntity player) {
static boolean shouldFlyOnGround(final LocalPlayer player) {
return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
}
static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost) {
static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
if (player.isCreative()) {
if (boost) {
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
@ -43,7 +43,7 @@ final class FlightHelper {
}
}
static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting) {
static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
if (player.isCreative()) {
if (isSprinting) {
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;

71
src/main/java/chylex/bettercontrols/player/PlayerTicker.java
View File

@ -7,13 +7,12 @@ import chylex.bettercontrols.input.ToggleTracker;
import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
import chylex.bettercontrols.mixin.AccessCameraFields;
import chylex.bettercontrols.mixin.AccessClientPlayerFields;
import chylex.bettercontrols.mixin.AccessGameRendererFields;
import chylex.bettercontrols.mixin.AccessPlayerFields;
import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
import chylex.bettercontrols.util.Key;
import net.minecraft.client.input.Input;
import net.minecraft.client.input.KeyboardInput;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.Camera;
import net.minecraft.client.player.Input;
import net.minecraft.client.player.LocalPlayer;
import java.lang.ref.WeakReference;
import java.util.function.BooleanSupplier;
import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
@ -26,7 +25,7 @@ import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class PlayerTicker {
private static PlayerTicker ticker = new PlayerTicker(null);
public static PlayerTicker get(final ClientPlayerEntity player) {
public static PlayerTicker get(final LocalPlayer player) {
if (ticker.ref.get() != player) {
ticker = new PlayerTicker(player);
}
@ -38,17 +37,17 @@ public final class PlayerTicker {
return BetterControlsMod.config;
}
private final WeakReference<ClientPlayerEntity> ref;
private final WeakReference<LocalPlayer> ref;
private PlayerTicker(final ClientPlayerEntity player) {
private PlayerTicker(final LocalPlayer player) {
this.ref = new WeakReference<>(player);
setup();
}
// Logic
private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.sprintToggled = toggled);
private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.sneakToggled = toggled);
private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
@ -74,7 +73,7 @@ public final class PlayerTicker {
sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
}
public void atHead(final ClientPlayerEntity player) {
public void atHead(final LocalPlayer player) {
if (FlightHelper.shouldFlyOnGround(player)) {
player.setOnGround(false);
}
@ -88,7 +87,7 @@ public final class PlayerTicker {
}
final SprintMode sprintMode = cfg().sprintMode;
final boolean wasSprintToggled = OPTIONS.sprintToggled;
final boolean wasSprintToggled = OPTIONS.toggleSprint;
final boolean isSprintToggled = toggleSprint.tick();
if (temporarySprintTimer > 0) {
@ -144,16 +143,16 @@ public final class PlayerTicker {
toggleSneak.tick();
}
public void afterInputAssignsPressingForward(final KeyboardInput input) {
if (MINECRAFT.currentScreen == null) {
input.pressingForward |= toggleWalkForward.tick();
public void afterInputAssignsPressingForward(final Input input) {
if (MINECRAFT.screen == null) {
input.up |= toggleWalkForward.tick();
}
}
public void afterInputTick(final ClientPlayerEntity player) {
public void afterInputTick(final LocalPlayer player) {
final Input input = player.input;
if (MINECRAFT.currentScreen == null && !player.getAbilities().flying) {
if (MINECRAFT.screen == null && !player.getAbilities().flying) {
input.jumping |= toggleJump.tick();
}
@ -163,13 +162,13 @@ public final class PlayerTicker {
final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
if (flightSpeed > 0F) {
player.getAbilities().setFlySpeed(flightSpeed);
player.getAbilities().setFlyingSpeed(flightSpeed);
}
if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
int direction = 0;
if (input.sneaking) {
if (input.shiftKeyDown) {
--direction;
}
@ -178,7 +177,7 @@ public final class PlayerTicker {
}
if (direction != 0) {
player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
}
}
}
@ -201,15 +200,11 @@ public final class PlayerTicker {
wasHittingObstacle = player.horizontalCollision;
wasSprintingBeforeHittingObstacle = false;
}
if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)) {
((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
}
}
public void afterSuperCall(final ClientPlayerEntity player) {
public void afterSuperCall(final LocalPlayer player) {
if (FlightHelper.shouldFlyOnGround(player)) {
final boolean isSneaking = player.isSneaking();
final boolean isSneaking = player.isShiftKeyDown();
final boolean isOnGround = player.isOnGround();
if (!isSneaking) {
@ -231,7 +226,7 @@ public final class PlayerTicker {
}
else if (holdingSneakWhileTouchingGround) {
player.getAbilities().flying = false;
player.sendAbilitiesUpdate();
player.onUpdateAbilities();
cancelLanding = false;
}
}
@ -249,12 +244,12 @@ public final class PlayerTicker {
if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
final Input input = player.input;
if (input.movementForward == 0F && input.movementSideways == 0F) {
player.setVelocity(player.getVelocity().multiply(0.0, 1.0, 0.0));
if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
}
if (!input.jumping && !input.sneaking) {
player.setVelocity(player.getVelocity().multiply(1.0, 0.0, 1.0));
if (!input.jumping && !input.shiftKeyDown) {
player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
}
}
@ -263,7 +258,7 @@ public final class PlayerTicker {
final boolean isFlying = !player.getAbilities().flying;
player.getAbilities().flying = isFlying;
player.sendAbilitiesUpdate();
player.onUpdateAbilities();
if (isFlying) {
temporaryFlyOnGroundTimer = 10;
@ -271,7 +266,7 @@ public final class PlayerTicker {
}
if (temporaryFlyOnGroundTimer > 0) {
if (player.isSneaking()) {
if (player.isShiftKeyDown()) {
temporaryFlyOnGroundTimer = 0;
}
else {
@ -285,10 +280,10 @@ public final class PlayerTicker {
}
if (!cfg().sneakingMovesCameraSmoothly) {
final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getCamera();
final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
if (camera.getFocusedEntity() == player) {
camera.setCameraY(player.getStandingEyeHeight());
if (camera.getEntity() == player) {
((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
}
}
@ -300,7 +295,11 @@ public final class PlayerTicker {
}
if (Key.isPressed(cfg().keyOpenMenu)) {
MINECRAFT.openScreen(new BetterControlsScreen(null));
MINECRAFT.setScreen(new BetterControlsScreen(null));
}
}
public boolean shouldResetFOV(final LocalPlayer player) {
return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
}
}

42
src/main/java/chylex/bettercontrols/util/Key.java
View File

@ -1,50 +1,50 @@
package chylex.bettercontrols.util;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import net.minecraft.text.Text;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.KeyMapping;
import net.minecraft.network.chat.Component;
public final class Key {
private Key() {}
public static final InputUtil.Key INVALID = InputUtil.UNKNOWN_KEY;
public static final InputConstants.Key INVALID = InputConstants.UNKNOWN;
public static boolean isUnbound(final KeyBinding binding) {
public static boolean isUnbound(final KeyMapping binding) {
return binding.isUnbound();
}
public static boolean isPressed(final KeyBinding binding) {
return binding.isPressed();
public static boolean isPressed(final KeyMapping binding) {
return binding.isDown();
}
public static boolean wasPressed(final KeyBinding binding) {
return binding.wasPressed();
public static boolean wasPressed(final KeyMapping binding) {
return binding.consumeClick();
}
public static Text getBoundKeyText(final KeyBinding binding) {
return binding.getBoundKeyLocalizedText();
public static Component getBoundKeyText(final KeyMapping binding) {
return binding.getTranslatedKeyMessage();
}
public static void bind(final KeyBinding binding, final InputUtil.Key input) {
binding.setBoundKey(input);
public static void bind(final KeyMapping binding, final InputConstants.Key input) {
binding.setKey(input);
}
public static String writeBinding(final KeyBinding binding) {
return binding.getBoundKeyTranslationKey();
public static String writeBinding(final KeyMapping binding) {
return binding.saveString();
}
public static void readBinding(final KeyBinding binding, final String serialized) {
public static void readBinding(final KeyMapping binding, final String serialized) {
try {
bind(binding, InputUtil.fromTranslationKey(serialized));
bind(binding, InputConstants.getKey(serialized));
} catch (final IllegalArgumentException e) {
e.printStackTrace(); // let's not crash if the config file has garbage, okay?
}
}
public static InputUtil.Key inputFromMouse(final int button) {
return InputUtil.Type.MOUSE.createFromCode(button);
public static InputConstants.Key inputFromMouse(final int button) {
return InputConstants.Type.MOUSE.getOrCreate(button);
}
public static InputUtil.Key inputFromKeyboard(final int keyCode, final int scanCode) {
return InputUtil.fromKeyCode(keyCode, scanCode);
public static InputConstants.Key inputFromKeyboard(final int keyCode, final int scanCode) {
return InputConstants.getKey(keyCode, scanCode);
}
}

3
src/main/java/chylex/bettercontrols/util/LiteralText.java
View File

@ -1,6 +1,7 @@
package chylex.bettercontrols.util;
import net.minecraft.network.chat.TextComponent;
public final class LiteralText extends net.minecraft.text.LiteralText {
public final class LiteralText extends TextComponent {
public static LiteralText text(final String text) {
return new LiteralText(text);
}

18
src/main/java/chylex/bettercontrols/util/Statics.java
View File

@ -1,16 +1,16 @@
package chylex.bettercontrols.util;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.GameOptions;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.Options;
public final class Statics {
private Statics() {}
public static final MinecraftClient MINECRAFT = MinecraftClient.getInstance();
public static final GameOptions OPTIONS = MINECRAFT.options;
public static final Minecraft MINECRAFT = Minecraft.getInstance();
public static final Options OPTIONS = MINECRAFT.options;
public static final KeyBinding KEY_SPRINT = OPTIONS.keySprint;
public static final KeyBinding KEY_SNEAK = OPTIONS.keySneak;
public static final KeyBinding KEY_FORWARD = OPTIONS.keyForward;
public static final KeyBinding KEY_JUMP = OPTIONS.keyJump;
public static final KeyMapping KEY_SPRINT = OPTIONS.keySprint;
public static final KeyMapping KEY_SNEAK = OPTIONS.keyShift;
public static final KeyMapping KEY_FORWARD = OPTIONS.keyUp;
public static final KeyMapping KEY_JUMP = OPTIONS.keyJump;
}

2
src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java
View File

@ -1,5 +1,5 @@
package io.github.prospector.modmenu.api;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screens.Screen;
@SuppressWarnings("unused")
@FunctionalInterface

4
src/main/resources/bettercontrols.mixins.json
View File

@ -8,13 +8,13 @@
"AccessClientPlayerFields",
"AccessControlsListCategory",
"AccessControlsListKeyBinding",
"AccessCyclingButtonWidgetFields",
"AccessGameRendererFields",
"AccessCycleButtonFields",
"AccessKeyBindingFields",
"AccessOptionFields",
"AccessPlayerFields",
"AccessScreenButtons",
"AccessStickyKeyBindingStateGetter",
"HookClientPlayerFOV",
"HookClientPlayerInputTick",
"HookClientPlayerTick",
"HookControlsListWidget",