Unify with Forge codebase

build.gradle

@@ -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,9 @@ 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()
+	compileOnly "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 processResources {

gradle.properties

@@ -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

src/main/java/chylex/bettercontrols/config/Json.java

@@ -1,8 +1,8 @@
 package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
-import chylex.bettercontrols.util.Key;
 import com.google.gson.JsonObject;
+import com.mojang.blaze3d.platform.InputConstants;
 
 final class Json {
 	private Json() {}
@@ -52,7 +52,7 @@ final class Json {
 	private static final String MOD_SUFFIX = ".Mod";
 	
 	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
-		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
+		obj.addProperty(key + KEY_SUFFIX, keyBinding.saveString());
 		
 		if (keyBinding.getModifier() != null) {
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
@@ -61,7 +61,11 @@ final class Json {
 	
 	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
 		if (obj.has(key + KEY_SUFFIX)) {
-			Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
+			try {
+				keyBinding.setKey(InputConstants.getKey(obj.get(key + KEY_SUFFIX).getAsString()));
+			} catch (final IllegalArgumentException e) {
+				e.printStackTrace(); // let's not crash if the config file has garbage, okay?
+			}
 		}
 		
 		if (obj.has(key + MOD_SUFFIX)) {

src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java

@@ -10,16 +10,18 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import chylex.bettercontrols.util.Key;
+import com.mojang.blaze3d.platform.InputConstants;
-import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screen.option.GameOptionsScreen;
+import net.minecraft.client.gui.screens.OptionsSubScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.option.KeyBinding;
+import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import org.lwjgl.glfw.GLFW;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -29,11 +31,14 @@ import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 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 TextComponent text(final String text) {
+		return new TextComponent(text);
+	}
+	
+	public static final Component TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
 	private static final int TEXT_PADDING_RIGHT = 4;
@@ -48,7 +53,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 +77,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 +92,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 +177,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,9 +207,9 @@ 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 Component 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);
+		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -213,7 +218,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 Component text) {
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -223,7 +228,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 +236,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 +251,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)));
+		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
-		addSelectableChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
@@ -256,10 +261,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);
 	}
 	
@@ -274,7 +279,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
 	@Override
 	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
 		if (editingKeyBinding != null) {
-			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
+			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
@@ -287,10 +292,10 @@ public class BetterControlsScreen extends GameOptionsScreen {
 	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
 		if (editingKeyBinding != null) {
 			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-				editingKeyBinding.bindAndStopEditing(Key.INVALID);
+				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
 			}
 			else {
-				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
+				editingKeyBinding.bindAndStopEditing(InputConstants.getKey(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
@@ -303,7 +308,7 @@ public class BetterControlsScreen extends GameOptionsScreen {
 	
 	private void onKeyBindingEditingFinished() {
 		editingKeyBinding = null;
-		KeyBinding.updateKeysByCode();
+		KeyMapping.resetMapping();
 		
 		for (final KeyBindingWidget widget : allKeyBindings) {
 			widget.updateKeyBindingText();

src/main/java/chylex/bettercontrols/gui/OptionListWidget.java

@@ -1,11 +1,11 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import net.minecraft.client.gui.Drawable;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.util.math.MatrixStack;
+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) {
+	private static Offset getElementOffset(final GuiEventListener element) {
-		if (element instanceof Widget) {
+		if (element instanceof OptionWidget) {
-			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
+			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
 		}
-		else if (element instanceof ClickableWidget) {
+		else if (element instanceof AbstractWidget) {
-			return new Offset(((ClickableWidget)element).x, ((ClickableWidget)element).y);
+			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> {
+	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
-		private final List<Element> elements;
+		private final List<GuiEventListener> elements;
-		private final List<Selectable> selectables;
+		private final List<NarratableEntry> narratables;
-		private final Map<Element, Offset> offsets;
+		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() {
+		public List<? extends NarratableEntry> narratables() {
-			return Collections.unmodifiableList(selectables);
+			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) {
+		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 Element element : elements) {
+			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) {
+				if (element instanceof Widget) {
-					drawable.render(matrices, mouseX, mouseY, tickDelta);
+					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java

@@ -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.Option;
-import net.minecraft.client.gui.ParentElement;
+import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
+import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
+import net.minecraft.client.gui.components.events.ContainerEventHandler;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.widget.CyclingButtonWidget;
+import net.minecraft.client.gui.screens.controls.ControlsScreen;
-import net.minecraft.client.option.Option;
 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 -> {
+			final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
-				MINECRAFT.openScreen(new BetterControlsScreen(screen));
+				MINECRAFT.setScreen(new BetterControlsScreen(screen));
 			});
 			
-			accessor.callRemove(autoJump);
+			accessor.callRemoveWidget(autoJump);
-			accessor.getChildren().add(widget);
+			accessor.callAddRenderableWidget(widget);
-			accessor.getSelectables().add(widget);
-			accessor.getDrawables().add(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.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
-			getOptionButton(it, Option.SNEAK_TOGGLED).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) {
+	private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback) {
-		for (final Element element : elements) {
+		for (final GuiEventListener element : elements) {
 			callback.accept(element);
 			
-			if (element instanceof ParentElement) {
+			if (element instanceof ContainerEventHandler) {
-				walkChildren(((ParentElement)element).children(), callback);
+				walkChildren(((ContainerEventHandler)element).children(), callback);
 			}
 		}
 	}
 	
-	private static Optional<CyclingButtonWidget<?>> getOptionButton(final Element element, final Option option) {
+	private static Optional<CycleButton<?>> getOptionButton(final GuiEventListener element, final Option option) {
-		if (element instanceof CyclingButtonWidget<?> && ((AccessOptionFields)option).getKey().equals(((AccessCyclingButtonWidgetFields)element).getOptionText())) {
+		if (element instanceof CycleButton<?> && ((AccessOptionFields)option).getCaption().equals(((AccessCycleButtonFields)element).getName())) {
-			return Optional.of((CyclingButtonWidget<?>)element);
+			return Optional.of((CycleButton<?>)element);
 		}
 		else {
 			return Optional.empty();

src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java

@@ -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.components.Button;
-import net.minecraft.client.gui.widget.ButtonWidget;
+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);
 	}
 }

src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java

@@ -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;

src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java

@@ -1,10 +1,10 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.util.math.MathHelper;
+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

src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java

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

src/main/java/chylex/bettercontrols/gui/elements/Option.java

@@ -1,13 +1,13 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.util.LiteralText;
+import net.minecraft.network.chat.Component;
 import java.util.List;
 import java.util.Objects;
 
 public final class Option<T> {
 	private final T value;
-	private final LiteralText text;
+	private final Component text;
 	
-	public Option(final T value, final LiteralText text) {
+	public Option(final T value, final Component text) {
 		this.value = value;
 		this.text = text;
 	}
@@ -16,7 +16,7 @@ public final class Option<T> {
 		return value;
 	}
 	
-	public LiteralText getText() {
+	public Component getText() {
 		return text;
 	}
 	

src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java

@@ -1,25 +1,25 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.gui.OptionListWidget.Widget;
+import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.network.chat.Component;
-import net.minecraft.text.OrderedText;
+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;
 	
-	private final LiteralText text;
+	private final Component text;
 	private int x;
 	private int y;
 	private final int width;
 	private final int height;
 	private final int align;
 	
-	public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final int height, final Component text, final int align) {
 		this.x = x;
 		this.y = y;
 		this.width = width;
@@ -28,11 +28,11 @@ public final class TextWidget extends DrawableHelper implements Widget {
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final Component text, final int align) {
 		this(x, y, width, 20, text, align);
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final LiteralText text) {
+	public TextWidget(final int x, final int y, final int width, final Component text) {
 		this(x, y, width, 20, text, LEFT);
 	}
 	
@@ -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) {
+	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		final TextRenderer textRenderer = MINECRAFT.textRenderer;
+		final Font textRenderer = MINECRAFT.font;
-		final List<OrderedText> lines = textRenderer.wrapLines(text, width);
+		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
-		final int lineHeight = textRenderer.fontHeight + 1;
+		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);
+			final FormattedCharSequence line = lines.get(i);
-			textRenderer.drawWithShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java

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

src/main/java/chylex/bettercontrols/input/ModifierKey.java

@@ -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) {

src/main/java/chylex/bettercontrols/input/ToggleTracker.java

@@ -1,10 +1,9 @@
 package chylex.bettercontrols.input;
-import chylex.bettercontrols.util.Key;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.option.KeyBinding;
 
 public class ToggleTracker {
-	protected final KeyBinding bindingToggle;
+	protected final KeyMapping bindingToggle;
-	protected final KeyBinding bindingReset;
+	protected final KeyMapping bindingReset;
 	
 	protected boolean isToggled;
 	
@@ -12,7 +11,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;
 	}
@@ -44,7 +43,7 @@ public class ToggleTracker {
 	public boolean tick() {
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (Key.isPressed(bindingToggle)) {
+		if (bindingToggle.isDown()) {
 			if (!waitForRelease) {
 				if (skipNextToggle) {
 					skipNextToggle = false;
@@ -79,7 +78,7 @@ public class ToggleTracker {
 	}
 	
 	protected boolean isResetKeyPressed() {
-		return Key.isPressed(bindingReset);
+		return bindingReset.isDown();
 	}
 	
 	public void reset() {

src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java

@@ -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);

src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java

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

src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java

@@ -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);
 }

src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java

@@ -1,11 +1,11 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.text.Text;
+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
+	@Accessor("name")
-	Text getText();
+	Component getText();
 }

src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java

@@ -1,11 +1,11 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screen.option.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.option.KeyBinding;
+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
+	@Accessor("key")
-	KeyBinding getBinding();
+	KeyMapping getBinding();
 }

src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java

@@ -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();
+}

src/main/java/chylex/bettercontrols/mixin/AccessCyclingButtonWidgetFields.java

@@ -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();
-}

src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java

@@ -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);
-}

src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java

@@ -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);
 }

src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java

@@ -1,12 +1,12 @@
 package chylex.bettercontrols.mixin;
 
-import net.minecraft.client.option.Option;
+import net.minecraft.client.Option;
-import net.minecraft.text.Text;
+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
+	@Accessor("caption")
-	Text getKey();
+	Component getCaption();
 }

src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java

@@ -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);
 }

src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java

@@ -1,24 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screen.Screen;
+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
+	@Invoker
-	List<Element> getChildren();
+	<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
-	
-	@Accessor
-	List<Selectable> getSelectables();
-	
-	@Accessor
-	List<Drawable> getDrawables();
 	
 	@Invoker
-	void callRemove(Element child);
+	void callRemoveWidget(GuiEventListener widget);
 }

src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java

@@ -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);
 }

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java

@@ -0,0 +1,27 @@
+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;
+
+@SuppressWarnings("MethodMayBeStatic")
+@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(final float movementSpeed) {
+		final LocalPlayer player = MINECRAFT.player;
+		return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
+	}
+}

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java

@@ -1,7 +1,8 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.player.Input;
-import net.minecraft.client.network.ClientPlayerEntity;
+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 Input input = (Input)(Object)this;
-		final ClientPlayerEntity player = MINECRAFT.player;
+		final LocalPlayer player = MINECRAFT.player;
 		
 		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerTick.java

@@ -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.multiplayer.ClientLevel;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.world.ClientWorld;
+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)
+@Mixin(LocalPlayer.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity {
+public abstract class HookClientPlayerTick extends AbstractClientPlayer {
-	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile) {
+	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);
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookControlsListWidget.java

@@ -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.Minecraft;
-import net.minecraft.client.gui.screen.option.ControlsListWidget;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screens.controls.ControlList;
-import net.minecraft.client.gui.screen.option.ControlsListWidget.Entry;
+import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.client.gui.screen.option.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.gui.screens.controls.ControlList.Entry;
-import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
+import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
-import net.minecraft.client.gui.widget.ElementListWidget;
+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)
+@Mixin(ControlList.class)
-public abstract class HookControlsListWidget extends ElementListWidget<Entry> {
+public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final MinecraftClient client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
+	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;
 			}
 			

src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java

@@ -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.KeyMapping;
-import net.minecraft.client.option.KeyBinding;
+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));
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java

@@ -1,24 +1,25 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.ScreenPatcher;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
+import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
+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)
+@SuppressWarnings("MethodMayBeStatic")
+@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) {
+			if (screen.getClass() == ControlsScreen.class) {
-				ScreenPatcher.onControlsScreenOpened((ControlsOptionsScreen)screen);
+				ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
 			}
 			else if (screen.getClass() == AccessibilityOptionsScreen.class) {
 				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);

src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java

@@ -1,25 +1,26 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.entity.EntityType;
+import net.minecraft.world.entity.EntityType;
-import net.minecraft.entity.LivingEntity;
+import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.World;
+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)
+@SuppressWarnings("MethodMayBeStatic")
+@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"),
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
-		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F"))
+		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;
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookStickyKeyBindingState.java

@@ -1,7 +1,7 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
-import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.option.StickyKeyBinding;
+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)
+@Mixin(ToggleKeyMapping.class)
-public abstract class HookStickyKeyBindingState extends KeyBinding {
+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() {
+	public boolean isDown() {
-		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
+		return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
 	}
 }

src/main/java/chylex/bettercontrols/player/FlightHelper.java

@@ -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;

src/main/java/chylex/bettercontrols/player/PlayerTicker.java

@@ -7,13 +7,11 @@ 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.Camera;
-import net.minecraft.client.input.Input;
+import net.minecraft.client.player.Input;
-import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.network.ClientPlayerEntity;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
 import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
@@ -26,7 +24,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 +36,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 toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.sneakToggled = 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 +72,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 +86,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) {
@@ -98,7 +96,7 @@ public final class PlayerTicker {
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)) {
+			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
 			else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
@@ -115,7 +113,7 @@ public final class PlayerTicker {
 			waitingForSprintKeyRelease = true;
 		}
 		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
-			if (Key.isPressed(KEY_SPRINT)) {
+			if (KEY_SPRINT.isDown()) {
 				if (!waitingForSprintKeyRelease) {
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
@@ -130,12 +128,12 @@ public final class PlayerTicker {
 			}
 		}
 		else if (sprintMode == SprintMode.HOLD) {
-			if (Key.isPressed(KEY_SPRINT)) {
+			if (KEY_SPRINT.isDown()) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)) {
+		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -144,32 +142,32 @@ public final class PlayerTicker {
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final KeyboardInput input) {
+	public void afterInputAssignsPressingForward(final Input input) {
-		if (MINECRAFT.currentScreen == null) {
+		if (MINECRAFT.screen == null) {
-			input.pressingForward |= toggleWalkForward.tick();
+			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();
 		}
 		
 		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			final boolean boost = Key.isPressed(KEY_SPRINT);
+			final boolean boost = KEY_SPRINT.isDown();
 			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
 			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 +176,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));
 				}
 			}
 		}
@@ -186,7 +184,7 @@ public final class PlayerTicker {
 		if (cfg().resumeSprintingAfterHittingObstacle) {
 			if (wasHittingObstacle != player.horizontalCollision) {
 				if (!wasHittingObstacle) {
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
 				}
 				else if (wasSprintingBeforeHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = false;
@@ -201,15 +199,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 +225,7 @@ public final class PlayerTicker {
 					}
 					else if (holdingSneakWhileTouchingGround) {
 						player.getAbilities().flying = false;
-						player.sendAbilitiesUpdate();
+						player.onUpdateAbilities();
 						cancelLanding = false;
 					}
 				}
@@ -249,21 +243,21 @@ public final class PlayerTicker {
 		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
 			final Input input = player.input;
 			
-			if (input.movementForward == 0F && input.movementSideways == 0F) {
+			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
-				player.setVelocity(player.getVelocity().multiply(0.0, 1.0, 0.0));
+				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
 			}
 			
-			if (!input.jumping && !input.sneaking) {
+			if (!input.jumping && !input.shiftKeyDown) {
-				player.setVelocity(player.getVelocity().multiply(1.0, 0.0, 1.0));
+				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
 			}
 		}
 		
 		if (player.isCreative()) {
-			if (Key.wasPressed(cfg().keyToggleFlight)) {
+			if (cfg().keyToggleFlight.consumeClick()) {
 				final boolean isFlying = !player.getAbilities().flying;
 				
 				player.getAbilities().flying = isFlying;
-				player.sendAbilitiesUpdate();
+				player.onUpdateAbilities();
 				
 				if (isFlying) {
 					temporaryFlyOnGroundTimer = 10;
@@ -271,7 +265,7 @@ public final class PlayerTicker {
 			}
 			
 			if (temporaryFlyOnGroundTimer > 0) {
-				if (player.isSneaking()) {
+				if (player.isShiftKeyDown()) {
 					temporaryFlyOnGroundTimer = 0;
 				}
 				else {
@@ -285,22 +279,26 @@ public final class PlayerTicker {
 		}
 		
 		if (!cfg().sneakingMovesCameraSmoothly) {
-			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getCamera();
+			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
-			if (camera.getFocusedEntity() == player) {
+			if (camera.getEntity() == player) {
-				camera.setCameraY(player.getStandingEyeHeight());
+				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
 			}
 		}
 		
-		if (Key.wasPressed(cfg().keyResetAllToggles)) {
+		if (cfg().keyResetAllToggles.consumeClick()) {
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (Key.isPressed(cfg().keyOpenMenu)) {
+		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.openScreen(new BetterControlsScreen(null));
+			MINECRAFT.setScreen(new BetterControlsScreen(null));
 		}
 	}
+	
+	public boolean shouldResetFOV(final LocalPlayer player) {
+		return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
+	}
 }

src/main/java/chylex/bettercontrols/util/Key.java

@@ -1,50 +0,0 @@
-package chylex.bettercontrols.util;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.text.Text;
-
-public final class Key {
-	private Key() {}
-	
-	public static final InputUtil.Key INVALID = InputUtil.UNKNOWN_KEY;
-	
-	public static boolean isUnbound(final KeyBinding binding) {
-		return binding.isUnbound();
-	}
-	
-	public static boolean isPressed(final KeyBinding binding) {
-		return binding.isPressed();
-	}
-	
-	public static boolean wasPressed(final KeyBinding binding) {
-		return binding.wasPressed();
-	}
-	
-	public static Text getBoundKeyText(final KeyBinding binding) {
-		return binding.getBoundKeyLocalizedText();
-	}
-	
-	public static void bind(final KeyBinding binding, final InputUtil.Key input) {
-		binding.setBoundKey(input);
-	}
-	
-	public static String writeBinding(final KeyBinding binding) {
-		return binding.getBoundKeyTranslationKey();
-	}
-	
-	public static void readBinding(final KeyBinding binding, final String serialized) {
-		try {
-			bind(binding, InputUtil.fromTranslationKey(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 InputUtil.Key inputFromKeyboard(final int keyCode, final int scanCode) {
-		return InputUtil.fromKeyCode(keyCode, scanCode);
-	}
-}

src/main/java/chylex/bettercontrols/util/LiteralText.java

@@ -1,11 +0,0 @@
-package chylex.bettercontrols.util;
-
-public final class LiteralText extends net.minecraft.text.LiteralText {
-	public static LiteralText text(final String text) {
-		return new LiteralText(text);
-	}
-	
-	public LiteralText(final String msg) {
-		super(msg);
-	}
-}

src/main/java/chylex/bettercontrols/util/Statics.java

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

src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java

@@ -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

src/main/resources/bettercontrols.mixins.json

@@ -3,18 +3,18 @@
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
   "compatibilityLevel": "JAVA_16",
-  "mixins": [
+  "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
     "AccessControlsListCategory",
     "AccessControlsListKeyBinding",
-    "AccessCyclingButtonWidgetFields",
+    "AccessCycleButtonFields",
-    "AccessGameRendererFields",
     "AccessKeyBindingFields",
     "AccessOptionFields",
     "AccessPlayerFields",
     "AccessScreenButtons",
     "AccessStickyKeyBindingStateGetter",
+    "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
     "HookControlsListWidget",