Release v1.2.0 for Minecraft 1.15.x

Fixes #6

.gitignore

@@ -27,4 +27,3 @@ bin/
 # fabric
 
 run/
-logs/

README.md

@@ -27,15 +27,12 @@ You can also bind a key that resets all **Toggle Keybinds** at once. That makes
 
 #### Flying
 
-* **Double Tap 'Jump' To Fly** can be turned off to prevent accidental flight toggling.
-* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **Sprint Key Mode While Flying** changes how the Sprint key behaves during flight.
 * **Disable Field Of View Changing** prevents sprinting, potions, and other factors from changing the FOV while flying in creative and spectator mode.
 * **Fly On Ground** lets you fly while touching the ground in creative mode (and also lets you stop flying by tapping Sneak while touching the ground).
 * **Flight Speed Multiplier** (0.25x - 8x) changes how fast you fly in creative and spectator mode.
 * **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying in creative and spectator mode.
 
-Both speed boosts can be configured separately for sprinting, which will be active when the Sprint key is held. Unlike in vanilla, the sprinting flight boost works in all directions.
-
 ## Installation
 
 The following mod loaders are supported:

build.gradle

@@ -1,35 +1,40 @@
 plugins {
-	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 archivesBaseName = project.archives_base_name
-version = 'v' + project.mod_version
+version = project.mod_version
 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 {
-	inputs.property "version", project.mod_version
+	inputs.property "version", project.version
 	
-	filesMatching("fabric.mod.json") {
-		expand "version": project.mod_version
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
+	}
+	
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
 	}
 }
 
 tasks.withType(JavaCompile) {
 	options.encoding = "UTF-8"
-	options.release = 16
 }
 
+version = 'v' + version
+
 jar {
 	from "LICENSE"
 	exclude "io/github/prospector/"

gradle.properties

@@ -2,12 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.17
-loader_version=0.11.3
+minecraft_version=1.15.2
+yarn_mappings=1.15.2+build.17
+loader_version=0.10.2+build.210
 
 # Mod Properties
 mod_version=1.2.0
 maven_group=chylex.bettercontrols
-archives_base_name=BetterControls-1.17+
+archives_base_name=BetterControls-1.15.x
 
-# https://modmuss50.me/fabric.html
+# https://fabricmc.net/use
+# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,6 +64,21 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
@@ -71,7 +86,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -1,5 +1,6 @@
 pluginManagement {
 	repositories {
+		jcenter()
 		maven {
 			name = 'Fabric'
 			url = 'https://maven.fabricmc.net/'

src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java

@@ -4,6 +4,11 @@ import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
 
 public class ModMenuSupport implements ModMenuApi{
+	@Override
+	public String getModId(){
+		return "bettercontrols";
+	}
+	
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory(){
 		return BetterControlsScreen::new;

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, keyBinding.saveString());
+		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
 		
 		if (keyBinding.getModifier() != null){
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
@@ -61,11 +61,7 @@ final class Json {
 	
 	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
 		if (obj.has(key + KEY_SUFFIX)){
-			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?
-			}
+			Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
 		}
 		
 		if (obj.has(key + MOD_SUFFIX)){

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

@@ -10,18 +10,16 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import com.mojang.blaze3d.platform.InputConstants;
-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 net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+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.options.GameOptionsScreen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil;
 import org.lwjgl.glfw.GLFW;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,14 +29,11 @@ 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 OptionsSubScreen {
-	private static TextComponent text(final String text) {
-		return new TextComponent(text);
-	}
-	
-	public static final Component TITLE = text("Better Controls");
+public class BetterControlsScreen extends GameOptionsScreen{
+	public static final LiteralText TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
 	private static final int TEXT_PADDING_RIGHT = 4;
@@ -53,7 +48,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSprintingOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@@ -77,7 +72,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSneakingOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@@ -92,7 +87,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
-	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
+	private int generateFlightOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@@ -177,7 +172,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
+	private int generateMiscellaneousOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@@ -207,9 +202,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
+	private void generateKeyBindingWithModifierOption(final int y, final List<Element> 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, text, binding, this::startEditingKeyBinding);
+		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -218,7 +213,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final Component text) {
+	private static void generateLeftSideText(final int y, final List<Element> elements, final LiteralText text){
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -228,7 +223,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+	public BetterControlsScreen(final Screen parentScreen){
 		super(parentScreen, OPTIONS, TITLE);
 	}
 	
@@ -236,7 +231,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	public void init(){
 		allKeyBindings.clear();
 		
-		final List<GuiEventListener> elements = new ArrayList<>();
+		final List<Element> elements = new ArrayList<>();
 		int y = 0;
 		
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@@ -251,8 +246,8 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		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));
+		addButton(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, I18n.translate("gui.done"), btn -> minecraft.openScreen(parent)));
+		children.add(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
@@ -261,11 +256,11 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(matrices);
-		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
-		super.render(matrices, mouseX, mouseY, delta);
+	public void render(final int mouseX, final int mouseY, final float delta){
+		renderBackground();
+		optionsWidget.render(mouseX, mouseY, delta);
+		drawCenteredString(font, title.asFormattedString(), width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		super.render(mouseX, mouseY, delta);
 	}
 	
 	private void startEditingKeyBinding(final KeyBindingWidget widget){
@@ -279,7 +274,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	@Override
 	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
 		if (editingKeyBinding != null){
-			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
+			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
@@ -292,10 +287,10 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
 		if (editingKeyBinding != null){
 			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
-				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
+				editingKeyBinding.bindAndStopEditing(Key.INVALID);
 			}
 			else{
-				editingKeyBinding.bindAndStopEditing(InputConstants.getKey(keyCode, scanCode));
+				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
@@ -308,7 +303,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	private void onKeyBindingEditingFinished(){
 		editingKeyBinding = null;
-		KeyMapping.resetMapping();
+		KeyBinding.updateKeysByCode();
 		
 		for(final KeyBindingWidget widget : allKeyBindings){
 			widget.updateKeyBindingText();

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

@@ -1,11 +1,9 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-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 net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -14,7 +12,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
+public final class OptionListWidget extends ElementListWidget<Entry>{
 	public static final int ROW_WIDTH = 408;
 	public static final int ROW_PADDING = 2;
 	
@@ -29,19 +27,19 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(final GuiEventListener element) {
-		if (element instanceof OptionWidget) {
-			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
+	private static Offset getElementOffset(final Element element){
+		if (element instanceof Widget){
+			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractWidget) {
-			return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
+		else if (element instanceof AbstractButtonWidget){
+			return new Offset(((AbstractButtonWidget)element).x, ((AbstractButtonWidget)element).y);
 		}
 		else{
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Widget {
+	public interface Widget extends Element, Drawable{
 		int getX();
 		int getY();
 		void setX(int x);
@@ -58,13 +56,13 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		}
 	}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
+	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<Element> widgets, final int innerHeight){
 		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	public int getRowLeft() {
+	protected int getRowLeft(){
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
@@ -78,45 +76,38 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	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;
+	protected static final class Entry extends ElementListWidget.Entry<Entry>{
+		private final List<Element> elements;
+		private final Map<Element, Offset> offsets;
 		
-		public Entry(final List<GuiEventListener> elements) {
+		public Entry(final List<Element> elements){
 			this.elements = new ArrayList<>(elements);
-			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 GuiEventListener> children() {
+		public List<? extends Element> children(){
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public List<? extends NarratableEntry> narratables() {
-			return Collections.unmodifiableList(narratables);
-		}
-		
-		@Override
-		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) {
+		public void render(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){
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractWidget) {
-					final AbstractWidget button = (AbstractWidget)element;
+				if (element instanceof AbstractButtonWidget){
+					final AbstractButtonWidget button = (AbstractButtonWidget)element;
 					button.x = x + offset.x;
 					button.y = y + offset.y;
 				}
-				else if (element instanceof OptionWidget) {
-					final OptionWidget widget = (OptionWidget)element;
+				else if (element instanceof Widget){
+					final Widget widget = (Widget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Widget) {
-					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof Drawable){
+					((Drawable)element).render(mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,61 +1,63 @@
 package chylex.bettercontrols.gui;
-import chylex.bettercontrols.mixin.AccessCycleButtonFields;
-import chylex.bettercontrols.mixin.AccessOptionFields;
+import chylex.bettercontrols.mixin.AccessOptionButtonWidgetOption;
 import chylex.bettercontrols.mixin.AccessScreenButtons;
-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 net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.ParentElement;
+import net.minecraft.client.gui.screen.options.AccessibilityScreen;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.OptionButtonWidget;
+import net.minecraft.client.options.Option;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Consumer;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
 public final class ScreenPatcher{
 	private ScreenPatcher(){}
 	
-	public static void onControlsScreenOpened(final ControlsScreen screen) {
+	public static void onControlsScreenOpened(final ControlsOptionsScreen screen){
 		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
-		final List<? extends GuiEventListener> children = screen.children();
 		
-		final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
+		final List<? extends Element> children = screen.children();
+		final List<AbstractButtonWidget> buttons = accessor.getButtons();
+		
+		final AbstractButtonWidget autoJump = buttons
+			.stream()
+			.filter(it -> it instanceof OptionButtonWidget && ((AccessOptionButtonWidgetOption)it).getOption() == Option.AUTO_JUMP)
+			.findAny()
+			.orElse(null);
 		
 		if (autoJump != null){
-			final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
-				MINECRAFT.setScreen(new BetterControlsScreen(screen));
-			});
+			children.remove(autoJump);
+			buttons.remove(autoJump);
 			
-			accessor.callRemoveWidget(autoJump);
-			accessor.callAddRenderableWidget(widget);
+			accessor.callAddButton(new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), 20, BetterControlsScreen.TITLE.copy().append("...").asFormattedString(), btn -> {
+				MINECRAFT.openScreen(new BetterControlsScreen(screen));
+			}));
 		}
 	}
 	
-	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
+	public static void onAccessibilityScreenOpened(final AccessibilityScreen screen){
 		walkChildren(screen.children(), it -> {
-			getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
-			getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
+			if (it instanceof OptionButtonWidget){
+				final OptionButtonWidget button = (OptionButtonWidget)it;
+				final Option option =  ((AccessOptionButtonWidgetOption)button).getOption();
+				
+				if (option == Option.SPRINT_TOGGLED || option == Option.SNEAK_TOGGLED){
+					button.active = false;
+				}
+			}
 		});
 	}
 	
-	private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback) {
-		for (final GuiEventListener element : elements) {
+	private static void walkChildren(final List<? extends Element> elements, final Consumer<Element> callback){
+		for(final Element element : elements){
 			callback.accept(element);
 			
-			if (element instanceof ContainerEventHandler) {
-				walkChildren(((ContainerEventHandler)element).children(), callback);
+			if (element instanceof ParentElement){
+				walkChildren(((ParentElement)element).children(), callback);
 			}
 		}
 	}
-	
-	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();
-		}
-	}
 }

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.components.Button;
-import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.resource.language.I18n;
 
-public final class BooleanValueWidget extends Button {
+public final class BooleanValueWidget extends ButtonWidget{
 	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 ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
+		super(x, y, width, height, I18n.translate(currentValue ? "options.on" : "options.off"), ignore -> {});
 		this.value = currentValue;
 		this.onChanged = onChanged;
 	}
@@ -21,7 +21,7 @@ public final class BooleanValueWidget extends Button {
 	public void onPress(){
 		super.onPress();
 		value = !value;
-		setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
+		setMessage(I18n.translate(value ? "options.on" : "options.off"));
 		onChanged.accept(value);
 	}
 }

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

@@ -1,15 +1,15 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class CycleButtonWidget<T> extends Button {
+public class CycleButtonWidget<T> extends ButtonWidget{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
 	public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), btn -> {});
+		super(x, y, width, height, Option.find(options, selectedValue).getText().asFormattedString(), btn -> {});
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
@@ -31,6 +31,6 @@ public class CycleButtonWidget<T> extends Button {
 		
 		selectedValue = newSelectedOption.getValue();
 		onChanged.accept(selectedValue);
-		setMessage(newSelectedOption.getText());
+		setMessage(newSelectedOption.getText().asFormattedString());
 	}
 }

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

@@ -1,19 +1,20 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.util.Mth;
+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.util.math.MathHelper;
 import java.util.List;
 import java.util.function.Consumer;
 
-public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
+public final class DiscreteValueSliderWidget<T> extends SliderWidget{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
 	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
+		super(x, y, width, height, options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
+		updateMessage();
 	}
 	
 	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
@@ -21,12 +22,12 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 	}
 	
 	public Option<T> getSelectedOption(){
-		return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
+		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
 	}
 	
 	@Override
 	protected void updateMessage(){
-		setMessage(getSelectedOption().getText());
+		setMessage(getSelectedOption().getText().asFormattedString());
 	}
 	
 	@Override

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

@@ -1,47 +1,45 @@
 package chylex.bettercontrols.gui.elements;
-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 chylex.bettercontrols.util.Key;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil;
+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 Button {
-	private final KeyMapping binding;
-	private final Component bindingName;
+public final class KeyBindingWidget extends ButtonWidget{
+	private final KeyBinding binding;
+	private final String bindingName;
 	
-	private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
+	private final List<AbstractButtonWidget> 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 Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
-		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
+	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, "", btn -> {});
 		this.binding = binding;
-		this.bindingName = bindingName;
+		this.bindingName = I18n.translate(binding.getId());
 		this.onEditingStarted = onEditingStarted;
 		updateKeyBindingText();
 	}
 	
-	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, bindingName, binding, onEditingStarted);
+	public KeyBindingWidget(final int x, final int y, final int width, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
+		this(x, y, width, 20, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButton button) {
+	public void linkButtonToBoundState(final AbstractButtonWidget button){
 		linkedButtons.add(button);
-		button.active = !binding.isUnbound();
+		button.active = !Key.isUnbound(binding);
 	}
 	
 	@Override
-	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+	protected String getNarrationMessage(){
+		return Key.isUnbound(binding) ? I18n.translate("narrator.controls.unbound", bindingName) : I18n.translate("narrator.controls.bound", bindingName, super.getNarrationMessage());
 	}
 	
 	@Override
@@ -51,12 +49,12 @@ public final class KeyBindingWidget extends Button {
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputConstants.Key key) {
-		binding.setKey(key);
+	public void bindAndStopEditing(final InputUtil.KeyCode key){
+		Key.bind(binding, key);
 		stopEditing();
 		
-		for (final AbstractButton button : linkedButtons) {
-			button.active = !binding.isUnbound();
+		for(final AbstractButtonWidget button : linkedButtons){
+			button.active = !Key.isUnbound(binding);
 		}
 	}
 	
@@ -68,8 +66,8 @@ public final class KeyBindingWidget extends Button {
 	public void updateKeyBindingText(){
 		boolean hasConflict = false;
 		
-		if (!binding.isUnbound()) {
-			for (final KeyMapping other : OPTIONS.keyMappings) {
+		if (!Key.isUnbound(binding)){
+			for(final KeyBinding other : OPTIONS.keysAll){
 				if (binding != other && binding.equals(other)){
 					hasConflict = true;
 					break;
@@ -78,13 +76,13 @@ public final class KeyBindingWidget extends Button {
 		}
 		
 		if (isEditing){
-			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
+			setMessage(Formatting.WHITE + "> " + Formatting.YELLOW + binding.getLocalizedName() + Formatting.WHITE + " <");
 		}
 		else if (hasConflict){
-			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
+			setMessage(Formatting.RED + Key.getBoundKeyText(binding));
 		}
 		else{
-			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
+			setMessage(Key.isUnbound(binding) ? "(No Binding)" : Key.getBoundKeyText(binding));
 		}
 	}
 }

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

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

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

@@ -1,25 +1,23 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.FormattedCharSequence;
+import chylex.bettercontrols.gui.OptionListWidget.Widget;
+import chylex.bettercontrols.util.LiteralText;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
 import java.util.List;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class TextWidget extends GuiComponent implements OptionWidget {
+public final class TextWidget extends DrawableHelper implements Widget{
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	private final Component text;
+	private final LiteralText 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 Component text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align){
 		this.x = x;
 		this.y = y;
 		this.width = width;
@@ -28,11 +26,11 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Component text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align){
 		this(x, y, width, 20, text, align);
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Component text) {
+	public TextWidget(final int x, final int y, final int width, final LiteralText text){
 		this(x, y, width, 20, text, LEFT);
 	}
 	
@@ -57,17 +55,17 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 	}
 	
 	@Override
-	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;
+	public void render(final int mouseX, final int mouseY, final float delta){
+		final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+		final List<String> lines = textRenderer.wrapStringToWidthAsList(text.asFormattedString(), width);
+		final int lineHeight = textRenderer.fontHeight + 1;
 		
-		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
+		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getStringWidth).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 FormattedCharSequence line = lines.get(i);
-			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+			final String line = lines.get(i);
+			textRenderer.drawWithShadow(line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

@@ -1,15 +1,14 @@
 package chylex.bettercontrols.input;
-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 javax.annotation.Nullable;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil.Type;
+import org.jetbrains.annotations.Nullable;
 
-public class KeyBindingWithModifier extends KeyMapping {
+public class KeyBindingWithModifier extends KeyBinding{
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Component text) {
-		return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
+	public static boolean checkCategoryMatches(final String name){
+		return I18n.translate(CATEGORY).equals(name);
 	}
 	
 	@Nullable
@@ -29,12 +28,12 @@ public class KeyBindingWithModifier extends KeyMapping {
 	}
 	
 	@Override
-	public boolean isDown() {
-		return super.isDown() && (modifier == null || modifier.isPressed());
+	public boolean isPressed(){
+		return super.isPressed() && (modifier == null || modifier.isPressed());
 	}
 	
 	@Override
-	public boolean consumeClick() {
-		return super.consumeClick() && (modifier == null || modifier.isPressed());
+	public boolean wasPressed(){
+		return super.wasPressed() && (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.screens.Screen;
+import net.minecraft.client.gui.screen.Screen;
 
 public enum ModifierKey{
 	CONTROL(0){
@@ -32,11 +32,11 @@ public enum ModifierKey {
 	public abstract boolean isPressed();
 	
 	public static ModifierKey getById(final int id){
-		return switch (id) {
-			case 0 -> CONTROL;
-			case 1 -> SHIFT;
-			case 2 -> ALT;
-			default -> null;
-		};
+		switch(id){
+			case 0: return CONTROL;
+			case 1: return SHIFT;
+			case 2: return ALT;
+			default: return null;
+		}
 	}
 }

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

@@ -1,9 +1,10 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.KeyMapping;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.options.KeyBinding;
 
 public class ToggleTracker{
-	protected final KeyMapping bindingToggle;
-	protected final KeyMapping bindingReset;
+	protected final KeyBinding bindingToggle;
+	protected final KeyBinding bindingReset;
 	
 	protected boolean isToggled;
 	
@@ -11,7 +12,7 @@ public class ToggleTracker {
 	private boolean hasToggledWhileHoldingReset;
 	private boolean skipNextToggle;
 	
-	public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
+	public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset){
 		this.bindingToggle = bindingToggle;
 		this.bindingReset = bindingReset;
 	}
@@ -43,7 +44,7 @@ public class ToggleTracker {
 	public boolean tick(){
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (bindingToggle.isDown()) {
+		if (Key.isPressed(bindingToggle)){
 			if (!waitForRelease){
 				if (skipNextToggle){
 					skipNextToggle = false;
@@ -78,7 +79,7 @@ public class ToggleTracker {
 	}
 	
 	protected boolean isResetKeyPressed(){
-		return bindingReset.isDown();
+		return Key.isPressed(bindingReset);
 	}
 	
 	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.KeyMapping;
+import net.minecraft.client.options.KeyBinding;
 import java.util.HashSet;
 import java.util.Set;
 
 public final class ToggleTrackerForStickyKey extends ToggleTracker{
-	private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
+	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
 	
-	public static boolean isOverrideEnabled(final KeyMapping binding) {
+	public static boolean isOverrideEnabled(final KeyBinding binding){
 		return enabledOverrides.contains(binding);
 	}
 	
 	private final BooleanConsumer setToggleState;
 	
-	public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState) {
+	public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding bindingStickyReset, final BooleanConsumer setToggleState){
 		super(bindingToggle, bindingStickyReset);
 		this.setToggleState = setToggleState;
 		this.setToggleState.accept(false);

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

@@ -1,10 +1,14 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.Camera;
+import net.minecraft.client.render.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("eyeHeight")
+	@Accessor
+	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.player.LocalPlayer;
+import net.minecraft.client.network.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(LocalPlayer.class)
+@Mixin(ClientPlayerEntity.class)
 public interface AccessClientPlayerFields{
-	@Accessor("sprintTriggerTime")
+	@Accessor("field_3935")
 	void setTicksLeftToDoubleTapSprint(int value);
 }

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

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

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

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

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

@@ -1,12 +0,0 @@
-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/AccessGameRendererFields.java

@@ -0,0 +1,10 @@
+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.KeyMapping;
+import net.minecraft.client.options.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.Map;
 
-@Mixin(KeyMapping.class)
+@Mixin(KeyBinding.class)
 public interface AccessKeyBindingFields{
-	@Accessor("CATEGORY_SORT_ORDER")
+	@Accessor
 	static Map<String, Integer> getCategoryOrderMap(){
 		throw new AssertionError();
 	}
 	
-	@Accessor("isDown")
+	@Accessor("pressed")
 	boolean isPressedField();
 	
-	@Accessor("isDown")
+	@Accessor("pressed")
 	void setPressedField(boolean value);
 }

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

@@ -0,0 +1,11 @@
+package chylex.bettercontrols.mixin;
+import net.minecraft.client.gui.widget.OptionButtonWidget;
+import net.minecraft.client.options.Option;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(OptionButtonWidget.class)
+public interface AccessOptionButtonWidgetOption{
+	@Accessor
+	Option getOption();
+}

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

@@ -1,12 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-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("caption")
-	Component getCaption();
-}

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

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

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

@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-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 net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
 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{
-	@Invoker
-	<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
+	@Accessor
+	List<AbstractButtonWidget> getButtons();
 	
 	@Invoker
-	void callRemoveWidget(GuiEventListener widget);
+	<T extends AbstractButtonWidget> T callAddButton(T button);
 }

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

@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.ToggleKeyMapping;
+import net.minecraft.client.options.StickyKeyBinding;
 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(ToggleKeyMapping.class)
+@Mixin(StickyKeyBinding.class)
 public interface AccessStickyKeyBindingStateGetter{
-	@Accessor("needsToggle")
+	@Accessor
 	BooleanSupplier getToggleGetter();
 	
-	@Accessor("needsToggle")
+	@Accessor
 	@Mutable
 	void setToggleGetter(final BooleanSupplier toggleGetter);
 }

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

@@ -1,27 +0,0 @@
-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,8 +1,7 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.player.Input;
-import net.minecraft.client.player.KeyboardInput;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.network.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -12,10 +11,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/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
+	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/KeyboardInput;pressingForward:Z", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info){
-		final Input input = (Input)(Object)this;
-		final LocalPlayer player = MINECRAFT.player;
+		final KeyboardInput input = (KeyboardInput)(Object)this;
+		final ClientPlayerEntity 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.multiplayer.ClientLevel;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
 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(LocalPlayer.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayer {
-	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
+@Mixin(ClientPlayerEntity.class)
+public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
+	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){
 		super(world, profile);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At("HEAD"))
+	@Inject(method = "tickMovement()V", at = @At("HEAD"))
 	private void atHead(final CallbackInfo info){
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info){
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
+	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tickMovement()V", ordinal = 0, shift = AFTER))
 	private void afterSuperCall(final CallbackInfo info){
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+		final ClientPlayerEntity player = (ClientPlayerEntity)(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.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 net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.options.ControlsListWidget;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.Entry;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
+import net.minecraft.client.gui.widget.ElementListWidget;
 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(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) {
+@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){
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
 	@Inject(method = "<init>", at = @At("TAIL"))
-	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
+	public void init(final ControlsOptionsScreen parent, final MinecraftClient client, final CallbackInfo ci){
 		children().removeIf(it -> {
-			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
+			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getName())){
 				return true;
 			}
 			
-			if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
+			if (it instanceof KeyBindingEntry && 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.KeyMapping;
-import net.minecraft.client.Options;
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
 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(Options.class)
+@Mixin(GameOptions.class)
 public abstract class HookLoadGameOptions{
 	private boolean hasLoaded = false;
 	
 	@Mutable
 	@Final
 	@Shadow
-	public KeyMapping[] keyMappings;
+	public KeyBinding[] keysAll;
 	
 	@Inject(method = "load()V", at = @At("HEAD"))
 	private void load(final CallbackInfo info){
@@ -28,7 +28,7 @@ public abstract class HookLoadGameOptions {
 		}
 		
 		hasLoaded = true;
-		keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
+		keysAll = ArrayUtils.addAll(keysAll, BetterControlsMod.config.getAllKeyBindings());
 		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

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

@@ -1,28 +1,27 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.ScreenPatcher;
-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 net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.options.AccessibilityScreen;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 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;
 
-@SuppressWarnings("MethodMayBeStatic")
-@Mixin(value = Minecraft.class, priority = 100)
+@Mixin(value = MinecraftClient.class, priority = 100)
 public abstract class HookOpenScreen{
-	@Inject(method = "setScreen", at = @At("TAIL"))
+	@Inject(method = "openScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
 	private void openScreen(final Screen ignore, final CallbackInfo ci){
-		final Screen screen = MINECRAFT.screen;
+		final Screen screen = MINECRAFT.currentScreen;
 		
 		if (screen != null && !Screen.hasAltDown()){
-			if (screen.getClass() == ControlsScreen.class) {
-				ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
+			if (screen.getClass() == ControlsOptionsScreen.class){
+				ScreenPatcher.onControlsScreenOpened((ControlsOptionsScreen)screen);
 			}
-			else if (screen.getClass() == AccessibilityOptionsScreen.class) {
-				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);
+			else if (screen.getClass() == AccessibilityScreen.class){
+				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityScreen)screen);
 			}
 		}
 	}

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

@@ -1,26 +1,25 @@
 package chylex.bettercontrols.mixin;
-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 net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.World;
 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;
 
-@SuppressWarnings("MethodMayBeStatic")
-@Mixin(Player.class)
+@Mixin(PlayerEntity.class)
 public abstract class HookPlayerFlightSpeed extends LivingEntity{
-	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
+	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world){
 		super(type, world);
 	}
 	
 	@Redirect(
 		method = "travel",
-		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"))
+		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"))
 	)
-	private boolean disableVanillaSprintBoost(final Player player) {
+	private boolean disableVanillaSprintBoost(final PlayerEntity 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.KeyMapping;
-import net.minecraft.client.ToggleKeyMapping;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.options.StickyKeyBinding;
 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(ToggleKeyMapping.class)
-public abstract class HookStickyKeyBindingState extends KeyMapping {
+@Mixin(StickyKeyBinding.class)
+public abstract class HookStickyKeyBindingState extends KeyBinding{
 	@Shadow
 	@Final
-	private BooleanSupplier needsToggle;
+	private BooleanSupplier toggleGetter;
 	
 	public HookStickyKeyBindingState(final String translationKey, final int code, final String category){
 		super(translationKey, code, category);
 	}
 	
-	@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
+	@Inject(method = "setPressed(Z)V", 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 KeyMapping {
 	}
 	
 	@Override
-	public boolean isDown() {
-		return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
+	public boolean isPressed(){
+		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.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.player.LocalPlayer;
+import net.minecraft.client.network.ClientPlayerEntity;
 
 final class FlightHelper{
 	private FlightHelper(){}
@@ -13,15 +13,15 @@ final class FlightHelper {
 		return BetterControlsMod.config;
 	}
 	
-	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
-		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
+	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
+		return player.abilities.flying && (player.isCreative() || player.isSpectator());
 	}
 	
-	static boolean shouldFlyOnGround(final LocalPlayer player) {
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
+	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.flying;
 	}
 	
-	static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
+	static float getFlightSpeed(final ClientPlayerEntity 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 LocalPlayer player, final boolean isSprinting) {
+	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
 		if (player.isCreative()){
 			if (isSprinting){
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;

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

@@ -7,11 +7,13 @@ 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 net.minecraft.client.Camera;
-import net.minecraft.client.player.Input;
-import net.minecraft.client.player.LocalPlayer;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.network.ClientPlayerEntity;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
 import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
@@ -24,7 +26,7 @@ import static chylex.bettercontrols.util.Statics.OPTIONS;
 public final class PlayerTicker{
 	private static PlayerTicker ticker = new PlayerTicker(null);
 	
-	public static PlayerTicker get(final LocalPlayer player) {
+	public static PlayerTicker get(final ClientPlayerEntity player){
 		if (ticker.ref.get() != player){
 			ticker = new PlayerTicker(player);
 		}
@@ -36,17 +38,17 @@ public final class PlayerTicker {
 		return BetterControlsMod.config;
 	}
 	
-	private final WeakReference<LocalPlayer> ref;
+	private final WeakReference<ClientPlayerEntity> ref;
 	
-	private PlayerTicker(final LocalPlayer player) {
+	private PlayerTicker(final ClientPlayerEntity player){
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
 	
 	// Logic
 	
-	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 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 toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
 	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
@@ -72,9 +74,9 @@ public final class PlayerTicker {
 		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final LocalPlayer player) {
+	public void atHead(final ClientPlayerEntity player){
 		if (FlightHelper.shouldFlyOnGround(player)){
-			player.setOnGround(false);
+			player.onGround = false;
 		}
 		
 		if (!cfg().doubleTapForwardToSprint){
@@ -86,7 +88,7 @@ public final class PlayerTicker {
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
-		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		final boolean wasSprintToggled = OPTIONS.sprintToggled;
 		final boolean isSprintToggled = toggleSprint.tick();
 		
 		if (temporarySprintTimer > 0){
@@ -96,7 +98,7 @@ public final class PlayerTicker {
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
+			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
 			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
@@ -113,7 +115,7 @@ public final class PlayerTicker {
 			waitingForSprintKeyRelease = true;
 		}
 		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
-			if (KEY_SPRINT.isDown()) {
+			if (Key.isPressed(KEY_SPRINT)){
 				if (!waitingForSprintKeyRelease){
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
@@ -128,12 +130,12 @@ public final class PlayerTicker {
 			}
 		}
 		else if (sprintMode == SprintMode.HOLD){
-			if (KEY_SPRINT.isDown()) {
+			if (Key.isPressed(KEY_SPRINT)){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
+		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -142,32 +144,32 @@ public final class PlayerTicker {
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final Input input) {
-		if (MINECRAFT.screen == null) {
-			input.up |= toggleWalkForward.tick();
+	public void afterInputAssignsPressingForward(final KeyboardInput input){
+		if (MINECRAFT.currentScreen == null){
+			input.pressingForward |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(final LocalPlayer player) {
+	public void afterInputTick(final ClientPlayerEntity player){
 		final Input input = player.input;
 		
-		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+		if (MINECRAFT.currentScreen == null && !player.abilities.flying){
 			input.jumping |= toggleJump.tick();
 		}
 		
 		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
-			final boolean boost = KEY_SPRINT.isDown();
+			final boolean boost = Key.isPressed(KEY_SPRINT);
 			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
 			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
 			
 			if (flightSpeed > 0F){
-				player.getAbilities().setFlyingSpeed(flightSpeed);
+				player.abilities.setFlySpeed(flightSpeed);
 			}
 			
 			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()){
 				int direction = 0;
 				
-				if (input.shiftKeyDown) {
+				if (input.sneaking){
 					--direction;
 				}
 				
@@ -176,7 +178,7 @@ public final class PlayerTicker {
 				}
 				
 				if (direction != 0){
-					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+					player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
@@ -184,7 +186,7 @@ public final class PlayerTicker {
 		if (cfg().resumeSprintingAfterHittingObstacle){
 			if (wasHittingObstacle != player.horizontalCollision){
 				if (!wasHittingObstacle){
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
 				}
 				else if (wasSprintingBeforeHittingObstacle){
 					wasSprintingBeforeHittingObstacle = false;
@@ -199,12 +201,16 @@ public final class PlayerTicker {
 			wasHittingObstacle = player.horizontalCollision;
 			wasSprintingBeforeHittingObstacle = false;
 		}
+		
+		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
+			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
+		}
 	}
 	
-	public void afterSuperCall(final LocalPlayer player) {
+	public void afterSuperCall(final ClientPlayerEntity player){
 		if (FlightHelper.shouldFlyOnGround(player)){
-			final boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.isOnGround();
+			final boolean isSneaking = player.isSneaking();
+			final boolean isOnGround = player.onGround;
 			
 			if (!isSneaking){
 				wasSneakingBeforeTouchingGround = false;
@@ -224,14 +230,14 @@ public final class PlayerTicker {
 						holdingSneakWhileTouchingGround = true;
 					}
 					else if (holdingSneakWhileTouchingGround){
-						player.getAbilities().flying = false;
-						player.onUpdateAbilities();
+						player.abilities.flying = false;
+						player.sendAbilitiesUpdate();
 						cancelLanding = false;
 					}
 				}
 				
 				if (cancelLanding){
-					player.setOnGround(false);
+					player.onGround = false;
 				}
 			}
 		}
@@ -243,21 +249,21 @@ public final class PlayerTicker {
 		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
 			final Input input = player.input;
 			
-			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
+			if (input.movementForward == 0F && input.movementSideways == 0F){
+				player.setVelocity(player.getVelocity().multiply(0.0, 1.0, 0.0));
 			}
 			
-			if (!input.jumping && !input.shiftKeyDown) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
+			if (!input.jumping && !input.sneaking){
+				player.setVelocity(player.getVelocity().multiply(1.0, 0.0, 1.0));
 			}
 		}
 		
 		if (player.isCreative()){
-			if (cfg().keyToggleFlight.consumeClick()) {
-				final boolean isFlying = !player.getAbilities().flying;
+			if (Key.wasPressed(cfg().keyToggleFlight)){
+				final boolean isFlying = !player.abilities.flying;
 				
-				player.getAbilities().flying = isFlying;
-				player.onUpdateAbilities();
+				player.abilities.flying = isFlying;
+				player.sendAbilitiesUpdate();
 				
 				if (isFlying){
 					temporaryFlyOnGroundTimer = 10;
@@ -265,12 +271,12 @@ public final class PlayerTicker {
 			}
 			
 			if (temporaryFlyOnGroundTimer > 0){
-				if (player.isShiftKeyDown()) {
+				if (player.isSneaking()){
 					temporaryFlyOnGroundTimer = 0;
 				}
 				else{
 					--temporaryFlyOnGroundTimer;
-					player.setOnGround(false);
+					player.onGround = false;
 				}
 			}
 		}
@@ -279,26 +285,22 @@ public final class PlayerTicker {
 		}
 		
 		if (!cfg().sneakingMovesCameraSmoothly){
-			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
+			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getCamera();
 			
-			if (camera.getEntity() == player) {
-				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
+			if (camera.getFocusedEntity() == player){
+				camera.setCameraY(player.getStandingEyeHeight());
 			}
 		}
 		
-		if (cfg().keyResetAllToggles.consumeClick()) {
+		if (Key.wasPressed(cfg().keyResetAllToggles)){
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+		if (Key.isPressed(cfg().keyOpenMenu)){
+			MINECRAFT.openScreen(new BetterControlsScreen(null));
 		}
 	}
-	
-	public boolean shouldResetFOV(final LocalPlayer player) {
-		return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
-	}
 }

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

@@ -0,0 +1,45 @@
+package chylex.bettercontrols.util;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+
+public final class Key{
+	private Key(){}
+	
+	public static final InputUtil.KeyCode INVALID = InputUtil.UNKNOWN_KEYCODE;
+	
+	public static boolean isUnbound(final KeyBinding binding){
+		return binding.isNotBound();
+	}
+	
+	public static boolean isPressed(final KeyBinding binding){
+		return binding.isPressed();
+	}
+	
+	public static boolean wasPressed(final KeyBinding binding){
+		return binding.wasPressed();
+	}
+	
+	public static String getBoundKeyText(final KeyBinding binding){
+		return binding.getLocalizedName();
+	}
+	
+	public static void bind(final KeyBinding binding, final InputUtil.KeyCode input){
+		binding.setKeyCode(input);
+	}
+	
+	public static String writeBinding(final KeyBinding binding){
+		return binding.getName();
+	}
+	
+	public static void readBinding(final KeyBinding binding, final String serialized){
+		bind(binding, InputUtil.fromName(serialized));
+	}
+	
+	public static InputUtil.KeyCode inputFromMouse(final int button){
+		return InputUtil.Type.MOUSE.createFromCode(button);
+	}
+	
+	public static InputUtil.KeyCode inputFromKeyboard(final int keyCode, final int scanCode){
+		return InputUtil.getKeyCode(keyCode, scanCode);
+	}
+}

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

@@ -0,0 +1,11 @@
+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.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
 
 public final class Statics{
 	private Statics(){}
 	
-	public static final Minecraft MINECRAFT = Minecraft.getInstance();
-	public static final Options OPTIONS = MINECRAFT.options;
+	public static final MinecraftClient MINECRAFT = MinecraftClient.getInstance();
+	public static final GameOptions OPTIONS = MINECRAFT.options;
 	
-	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;
+	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;
 }

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.screens.Screen;
+import net.minecraft.client.gui.screen.Screen;
 
 @SuppressWarnings("unused")
 @FunctionalInterface

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

@@ -4,6 +4,8 @@ import java.util.Map;
 
 @SuppressWarnings("unused")
 public interface ModMenuApi{
+	String getModId();
+	
 	default ConfigScreenFactory<?> getModConfigScreenFactory(){
 		return ignore -> null;
 	}

src/main/resources/bettercontrols.mixins.json

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

src/main/resources/fabric.mod.json

@@ -28,6 +28,6 @@
   
   "depends": {
     "fabricloader": ">=0.7.4",
-    "minecraft": ">=1.17"
+    "minecraft": "1.15.x"
   }
 }