Release v1.2.0 for Minecraft 1.17+

.gitignore

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

build.gradle

@@ -1,13 +1,13 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
-version = project.mod_version
+version = 'v' + project.mod_version
 group = project.maven_group
 
 dependencies {
@@ -17,24 +17,18 @@ dependencies {
 }
 
 processResources {
-	inputs.property "version", project.version
+	inputs.property "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"
+	filesMatching("fabric.mod.json") {
+		expand "version": project.mod_version
 	}
 }
 
 tasks.withType(JavaCompile) {
 	options.encoding = "UTF-8"
+	options.release = 16
 }
 
-version = 'v' + version
-
 jar {
 	from "LICENSE"
 	exclude "io/github/prospector/"

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.16.4
-yarn_mappings=1.16.4+build.1
-loader_version=0.10.6+build.214
+minecraft_version=1.17
+yarn_mappings=1.17+build.1
+loader_version=0.11.3
 
 # Mod Properties
 mod_version=1.2.0
 maven_group=chylex.bettercontrols
-archives_base_name=BetterControls-1.16.2+
+archives_base_name=BetterControls-1.17+
 
 # https://modmuss50.me/fabric.html

settings.gradle

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

src/main/java/chylex/bettercontrols/BetterControlsMod.java

@@ -3,9 +3,9 @@ import chylex.bettercontrols.config.BetterControlsConfig;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 
-public final class BetterControlsMod implements ClientModInitializer{
+public final class BetterControlsMod implements ClientModInitializer {
 	public static final BetterControlsConfig config = BetterControlsConfig.load(FabricLoader.getInstance().getConfigDir().resolve("BetterControls.json"));
 	
 	@Override
-	public void onInitializeClient(){}
+	public void onInitializeClient() {}
 }

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

@@ -3,9 +3,9 @@ import chylex.bettercontrols.gui.BetterControlsScreen;
 import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
 
-public class ModMenuSupport implements ModMenuApi{
+public class ModMenuSupport implements ModMenuApi {
 	@Override
-	public ConfigScreenFactory<?> getModConfigScreenFactory(){
+	public ConfigScreenFactory<?> getModConfigScreenFactory() {
 		return BetterControlsScreen::new;
 	}
 }

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

@@ -3,8 +3,8 @@ import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
 import java.nio.file.Path;
 
-public final class BetterControlsConfig{
-	public static BetterControlsConfig load(final Path path){
+public final class BetterControlsConfig {
+	public static BetterControlsConfig load(final Path path) {
 		return ConfigSerializer.deserialize(path).setPath(path);
 	}
 	
@@ -37,15 +37,15 @@ public final class BetterControlsConfig{
 	public final KeyBindingWithModifier keyResetAllToggles = new KeyBindingWithModifier("key.bettercontrols.reset_all_toggles");
 	public final KeyBindingWithModifier keyOpenMenu = new KeyBindingWithModifier("key.bettercontrols.open_menu");
 	
-	BetterControlsConfig(){}
+	BetterControlsConfig() {}
 	
-	private BetterControlsConfig setPath(final Path path){
+	private BetterControlsConfig setPath(final Path path) {
 		this.path = path;
 		return this;
 	}
 	
-	public KeyBindingWithModifier[] getAllKeyBindings(){
-		return new KeyBindingWithModifier[]{
+	public KeyBindingWithModifier[] getAllKeyBindings() {
+		return new KeyBindingWithModifier[] {
 			keyToggleSprint,
 			keyToggleSneak,
 			keyToggleFlight,
@@ -56,7 +56,7 @@ public final class BetterControlsConfig{
 		};
 	}
 	
-	public void save(){
+	public void save() {
 		ConfigSerializer.serialize(path, this);
 	}
 }

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

@@ -21,14 +21,14 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 
-final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig>{
+final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig> {
 	private static final Logger logger = LogManager.getLogger();
 	private static final Gson gson = new GsonBuilder().registerTypeAdapter(BetterControlsConfig.class, new ConfigSerializer()).setPrettyPrinting().create();
 	
-	private ConfigSerializer(){}
+	private ConfigSerializer() {}
 	
 	@Override
-	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context){
+	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context) {
 		final JsonObject obj = new JsonObject();
 		
 		Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
@@ -62,11 +62,11 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	}
 	
 	@Override
-	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException{
+	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
 		final BetterControlsConfig cfg = new BetterControlsConfig();
 		final JsonObject obj = json.getAsJsonObject();
 		
-		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()){
+		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()) {
 			cfg.sprintMode = SprintMode.TAP_TO_TOGGLE;
 		}
 		
@@ -100,19 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config){
-		try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
+	static void serialize(final Path path, final BetterControlsConfig config) {
+		try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
-		}catch(final IOException e){
+		} catch (final IOException e) {
 			logger.error("Error saving BetterControls configuration file!", e);
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path){
-		try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
+	static BetterControlsConfig deserialize(final Path path) {
+		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
-		}catch(final FileNotFoundException | NoSuchFileException ignored){
-		}catch(final IOException e){
+		} catch (final FileNotFoundException | NoSuchFileException ignored) {
+		} catch (final IOException e) {
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		

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

@@ -4,42 +4,42 @@ import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.util.Key;
 import com.google.gson.JsonObject;
 
-final class Json{
-	private Json(){}
+final class Json {
+	private Json() {}
 	
-	static void setFloat(final JsonObject obj, final String key, final float value){
+	static void setFloat(final JsonObject obj, final String key, final float value) {
 		obj.addProperty(key, Float.valueOf(value));
 	}
 	
-	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue){
+	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue) {
 		final float value = obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
 		return Math.max(minValue, Math.min(maxValue, value));
 	}
 	
-	static void setBool(final JsonObject obj, final String key, final boolean value){
+	static void setBool(final JsonObject obj, final String key, final boolean value) {
 		obj.addProperty(key, Boolean.valueOf(value));
 	}
 	
-	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue){
+	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue) {
 		return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
 	}
 	
-	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value){
+	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
 		obj.addProperty(key, value.name());
 	}
 	
-	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass){
-		if (!obj.has(key)){
+	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
+		if (!obj.has(key)) {
 			return defaultValue;
 		}
 		
 		final T[] constants = enumClass.getEnumConstants();
 		
-		if (constants != null){
+		if (constants != null) {
 			final String value = obj.get(key).getAsString();
 			
-			for(final T constant : constants){
-				if (constant.name().equalsIgnoreCase(value)){
+			for (final T constant : constants) {
+				if (constant.name().equalsIgnoreCase(value)) {
 					return constant;
 				}
 			}
@@ -51,20 +51,20 @@ final class Json{
 	private static final String KEY_SUFFIX = ".Key";
 	private static final String MOD_SUFFIX = ".Mod";
 	
-	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
+	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
 		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
 		
-		if (keyBinding.getModifier() != null){
+		if (keyBinding.getModifier() != null) {
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
 		}
 	}
 	
-	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
-		if (obj.has(key + KEY_SUFFIX)){
+	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());
 		}
 		
-		if (obj.has(key + MOD_SUFFIX)){
+		if (obj.has(key + MOD_SUFFIX)) {
 			keyBinding.setModifier(ModifierKey.getById(obj.get(key + MOD_SUFFIX).getAsInt()));
 		}
 	}

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

@@ -15,9 +15,9 @@ import chylex.bettercontrols.util.LiteralText;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.screen.options.GameOptionsScreen;
+import net.minecraft.client.gui.screen.option.GameOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.math.MatrixStack;
 import org.lwjgl.glfw.GLFW;
 import java.util.ArrayList;
@@ -32,7 +32,7 @@ import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
 import static chylex.bettercontrols.util.LiteralText.text;
 import static chylex.bettercontrols.util.Statics.OPTIONS;
 
-public class BetterControlsScreen extends GameOptionsScreen{
+public class BetterControlsScreen extends GameOptionsScreen {
 	public static final LiteralText TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
@@ -48,7 +48,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<Element> elements){
+	private int generateSprintingOptions(int y, final List<Element> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@@ -72,7 +72,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<Element> elements){
+	private int generateSneakingOptions(int y, final List<Element> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@@ -87,7 +87,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<Element> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@@ -172,7 +172,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<Element> elements){
+	private int generateMiscellaneousOptions(int y, final List<Element> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@@ -202,7 +202,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<Element> elements, final LiteralText text, final KeyBindingWithModifier binding){
+	private void generateKeyBindingWithModifierOption(final int y, final List<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, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
@@ -213,7 +213,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<Element> elements, final LiteralText text) {
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -223,12 +223,12 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(final Screen parentScreen){
+	public BetterControlsScreen(final Screen parentScreen) {
 		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
-	public void init(){
+	public void init() {
 		allKeyBindings.clear();
 		
 		final List<Element> elements = new ArrayList<>();
@@ -246,25 +246,25 @@ 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;
 		
-		addButton(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, ScreenTexts.DONE, btn -> client.openScreen(parent)));
-		addChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addDrawableChild(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, ScreenTexts.DONE, btn -> client.openScreen(parent)));
+		addSelectableChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
-	public void removed(){
+	public void removed() {
 		BetterControlsMod.config.save();
 	}
 	
 	@Override
-	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+	public void render(final MatrixStack 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);
 		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
-	private void startEditingKeyBinding(final KeyBindingWidget widget){
-		if (editingKeyBinding != null){
+	private void startEditingKeyBinding(final KeyBindingWidget widget) {
+		if (editingKeyBinding != null) {
 			editingKeyBinding.stopEditing();
 		}
 		
@@ -272,40 +272,40 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	}
 	
 	@Override
-	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
-		if (editingKeyBinding != null){
+	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
+		if (editingKeyBinding != null) {
 			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else{
+		else {
 			return super.mouseClicked(mouseX, mouseY, button);
 		}
 	}
 	
 	@Override
-	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
-		if (editingKeyBinding != null){
-			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
+	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);
 			}
-			else{
+			else {
 				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else{
+		else {
 			return super.keyPressed(keyCode, scanCode, modifiers);
 		}
 	}
 	
-	private void onKeyBindingEditingFinished(){
+	private void onKeyBindingEditingFinished() {
 		editingKeyBinding = null;
 		KeyBinding.updateKeysByCode();
 		
-		for(final KeyBindingWidget widget : allKeyBindings){
+		for (final KeyBindingWidget widget : allKeyBindings) {
 			widget.updateKeyBindingText();
 		}
 	}

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

@@ -2,7 +2,8 @@ package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import java.util.ArrayList;
@@ -13,102 +14,107 @@ 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 ElementListWidget<Entry> {
 	public static final int ROW_WIDTH = 408;
 	public static final int ROW_PADDING = 2;
 	
 	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
 	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
 	
-	public static int col2(final int column){
+	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col4(final int column){
+	public static int col4(final int column) {
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(final Element element){
-		if (element instanceof Widget){
+	private static Offset getElementOffset(final Element element) {
+		if (element instanceof Widget) {
 			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractButtonWidget){
-			return new Offset(((AbstractButtonWidget)element).x, ((AbstractButtonWidget)element).y);
+		else if (element instanceof ClickableWidget) {
+			return new Offset(((ClickableWidget)element).x, ((ClickableWidget)element).y);
 		}
-		else{
+		else {
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface Widget extends Element, Drawable{
+	public interface Widget extends Element, Drawable {
 		int getX();
 		int getY();
 		void setX(int x);
 		void setY(int y);
 	}
 	
-	private static final class Offset{
+	private static final class Offset {
 		public final int x;
 		public final int y;
 		
-		private Offset(final int x, final int y){
+		private Offset(final int x, final int y) {
 			this.x = x;
 			this.y = y;
 		}
 	}
 	
-	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<Element> widgets, final int innerHeight) {
 		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	public int getRowLeft(){
+	public int getRowLeft() {
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
-	public int getRowWidth(){
+	public int getRowWidth() {
 		return ROW_WIDTH;
 	}
 	
 	@Override
-	protected int getScrollbarPositionX(){
+	protected int getScrollbarPositionX() {
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	protected static final class Entry extends ElementListWidget.Entry<Entry>{
+	protected static final class Entry extends ElementListWidget.Entry<Entry> {
 		private final List<Element> elements;
+		private final List<Selectable> selectables;
 		private final Map<Element, Offset> offsets;
 		
-		public Entry(final List<Element> elements){
+		public Entry(final List<Element> elements) {
 			this.elements = new ArrayList<>(elements);
+			this.selectables = elements.stream().filter(e -> e instanceof Selectable).map(e -> (Selectable)e).toList();
 			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
 		@Override
-		public List<? extends Element> children(){
+		public List<? extends Element> children() {
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public void render(final MatrixStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta){
-			for(final Element element : elements){
+		public List<? extends Selectable> method_37025() {
+			return Collections.unmodifiableList(selectables);
+		}
+		
+		@Override
+		public void render(final MatrixStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
+			for (final Element element : elements) {
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractButtonWidget){
-					final AbstractButtonWidget button = (AbstractButtonWidget)element;
+				if (element instanceof final ClickableWidget button) {
 					button.x = x + offset.x;
 					button.y = y + offset.y;
 				}
-				else if (element instanceof Widget){
-					final Widget widget = (Widget)element;
+				else if (element instanceof final Widget widget) {
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Drawable){
-					((Drawable)element).render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof final Drawable drawable) {
+					drawable.render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,62 +1,64 @@
 package chylex.bettercontrols.gui;
+import chylex.bettercontrols.mixin.AccessCyclingButtonWidgetFields;
+import chylex.bettercontrols.mixin.AccessOptionFields;
 import chylex.bettercontrols.mixin.AccessScreenButtons;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.ParentElement;
-import net.minecraft.client.gui.screen.options.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
+import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.OptionButtonWidget;
-import net.minecraft.client.options.Option;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.CyclingButtonWidget;
+import net.minecraft.client.option.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 final class ScreenPatcher {
+	private ScreenPatcher() {}
 	
-	public static void onControlsScreenOpened(final ControlsOptionsScreen screen){
+	public static void onControlsScreenOpened(final ControlsOptionsScreen screen) {
 		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
-		
 		final List<? extends Element> children = screen.children();
-		final List<AbstractButtonWidget> buttons = accessor.getButtons();
 		
-		final AbstractButtonWidget autoJump = buttons
-			.stream()
-			.filter(it -> it instanceof OptionButtonWidget && ((OptionButtonWidget)it).getOption() == Option.AUTO_JUMP)
-			.findAny()
-			.orElse(null);
+		final ClickableWidget autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
 		
-		if (autoJump != null){
-			children.remove(autoJump);
-			buttons.remove(autoJump);
-			
-			accessor.callAddButton(new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.copy().append("..."), btn -> {
+		if (autoJump != null) {
+			final ButtonWidget widget = new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.copy().append("..."), btn -> {
 				MINECRAFT.openScreen(new BetterControlsScreen(screen));
-			}));
+			});
+			
+			accessor.callRemove(autoJump);
+			accessor.getChildren().add(widget);
+			accessor.getSelectables().add(widget);
+			accessor.getDrawables().add(widget);
 		}
 	}
 	
-	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen){
+	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
 		walkChildren(screen.children(), it -> {
-			if (it instanceof OptionButtonWidget){
-				final OptionButtonWidget button = (OptionButtonWidget)it;
-				final Option option = button.getOption();
-				
-				if (option == Option.SPRINT_TOGGLED || option == Option.SNEAK_TOGGLED){
-					button.active = false;
-				}
-			}
+			getOptionButton(it, Option.SPRINT_TOGGLED).ifPresent(button -> button.active = false);
+			getOptionButton(it, Option.SNEAK_TOGGLED).ifPresent(button -> button.active = false);
 		});
 	}
 	
-	private static void walkChildren(final List<? extends Element> elements, final Consumer<Element> callback){
-		for(final Element element : elements){
+	private static void walkChildren(final List<? extends Element> elements, final Consumer<Element> callback) {
+		for (final Element element : elements) {
 			callback.accept(element);
 			
-			if (element instanceof ParentElement){
+			if (element instanceof ParentElement) {
 				walkChildren(((ParentElement)element).children(), callback);
 			}
 		}
 	}
+	
+	private static Optional<CyclingButtonWidget<?>> getOptionButton(final Element element, final Option option) {
+		if (element instanceof CyclingButtonWidget<?> && ((AccessOptionFields)option).getKey().equals(((AccessCyclingButtonWidgetFields)element).getOptionText())) {
+			return Optional.of((CyclingButtonWidget<?>)element);
+		}
+		else {
+			return Optional.empty();
+		}
+	}
 }

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

@@ -3,22 +3,22 @@ import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
 
-public final class BooleanValueWidget extends ButtonWidget{
+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){
+	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 -> {});
 		this.value = currentValue;
 		this.onChanged = onChanged;
 	}
 	
-	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged){
+	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged) {
 		this(x, y, width, 20, currentValue, onChanged);
 	}
 	
 	@Override
-	public void onPress(){
+	public void onPress() {
 		super.onPress();
 		value = !value;
 		setMessage(value ? ScreenTexts.ON : ScreenTexts.OFF);

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

@@ -3,27 +3,27 @@ import net.minecraft.client.gui.widget.ButtonWidget;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class CycleButtonWidget<T> extends ButtonWidget{
+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){
+	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 -> {});
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+	public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		this(x, y, width, 20, options, selectedValue, onChanged);
 	}
 	
 	@Override
-	public void onPress(){
+	public void onPress() {
 		int nextIndex = options.indexOf(Option.find(options, selectedValue)) + 1;
 		
-		if (nextIndex >= options.size()){
+		if (nextIndex >= options.size()) {
 			nextIndex = 0;
 		}
 		

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

@@ -4,36 +4,36 @@ import net.minecraft.util.math.MathHelper;
 import java.util.List;
 import java.util.function.Consumer;
 
-public final class DiscreteValueSliderWidget<T> extends SliderWidget{
+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){
+	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));
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		this(x, y, width, 20, options, selectedValue, onChanged);
 	}
 	
-	public Option<T> getSelectedOption(){
+	public Option<T> getSelectedOption() {
 		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
 	}
 	
 	@Override
-	protected void updateMessage(){
+	protected void updateMessage() {
 		setMessage(getSelectedOption().getText());
 	}
 	
 	@Override
-	protected void applyValue(){
+	protected void applyValue() {
 		final T newSelectedValue = getSelectedOption().getValue();
 		
-		if (selectedValue != newSelectedValue){
+		if (selectedValue != newSelectedValue) {
 			selectedValue = newSelectedValue;
 			onChanged.accept(newSelectedValue);
 		}

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

@@ -1,8 +1,8 @@
 package chylex.bettercontrols.gui.elements;
 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.gui.widget.ClickableWidget;
+import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.MutableText;
@@ -14,16 +14,16 @@ 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 ButtonWidget {
 	private final KeyBinding binding;
 	private final Text bindingName;
 	
-	private final List<AbstractButtonWidget> linkedButtons = new ArrayList<>(1);
+	private final List<ClickableWidget> 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 KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted) {
 		super(x, y, width, height, LiteralText.EMPTY, btn -> {});
 		this.binding = binding;
 		this.bindingName = new TranslatableText(binding.getTranslationKey());
@@ -31,60 +31,60 @@ public final class KeyBindingWidget extends ButtonWidget{
 		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 KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted) {
 		this(x, y, width, 20, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButtonWidget button){
+	public void linkButtonToBoundState(final ClickableWidget button) {
 		linkedButtons.add(button);
 		button.active = !Key.isUnbound(binding);
 	}
 	
 	@Override
-	protected MutableText getNarrationMessage(){
+	protected MutableText getNarrationMessage() {
 		return Key.isUnbound(binding) ? new TranslatableText("narrator.controls.unbound", bindingName) : new TranslatableText("narrator.controls.bound", bindingName, super.getNarrationMessage());
 	}
 	
 	@Override
-	public void onPress(){
+	public void onPress() {
 		isEditing = true;
 		onEditingStarted.accept(this);
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputUtil.Key key){
+	public void bindAndStopEditing(final InputUtil.Key key) {
 		Key.bind(binding, key);
 		stopEditing();
 		
-		for(final AbstractButtonWidget button : linkedButtons){
+		for (final ClickableWidget button : linkedButtons) {
 			button.active = !Key.isUnbound(binding);
 		}
 	}
 	
-	public void stopEditing(){
+	public void stopEditing() {
 		isEditing = false;
 		updateKeyBindingText();
 	}
 	
-	public void updateKeyBindingText(){
+	public void updateKeyBindingText() {
 		boolean hasConflict = false;
 		
-		if (!Key.isUnbound(binding)){
-			for(final KeyBinding other : OPTIONS.keysAll){
-				if (binding != other && binding.equals(other)){
+		if (!Key.isUnbound(binding)) {
+			for (final KeyBinding other : OPTIONS.keysAll) {
+				if (binding != other && binding.equals(other)) {
 					hasConflict = true;
 					break;
 				}
 			}
 		}
 		
-		if (isEditing){
+		if (isEditing) {
 			setMessage((new LiteralText("> ")).append(Key.getBoundKeyText(binding).copy().formatted(Formatting.YELLOW)).append(" <").formatted(Formatting.YELLOW));
 		}
-		else if (hasConflict){
+		else if (hasConflict) {
 			setMessage(Key.getBoundKeyText(binding).copy().formatted(Formatting.RED));
 		}
-		else{
+		else {
 			setMessage(Key.isUnbound(binding) ? Text.of("(No Binding)") : Key.getBoundKeyText(binding));
 		}
 	}

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

@@ -3,24 +3,24 @@ import chylex.bettercontrols.util.LiteralText;
 import java.util.List;
 import java.util.Objects;
 
-public final class Option<T>{
+public final class Option<T> {
 	private final T value;
 	private final LiteralText text;
 	
-	public Option(final T value, final LiteralText text){
+	public Option(final T value, final LiteralText text) {
 		this.value = value;
 		this.text = text;
 	}
 	
-	public T getValue(){
+	public T getValue() {
 		return value;
 	}
 	
-	public LiteralText getText(){
+	public LiteralText getText() {
 		return text;
 	}
 	
-	public static <T> Option<T> find(final List<Option<T>> options, final T value){
+	public static <T> Option<T> find(final List<Option<T>> options, final T value) {
 		return options.stream().filter(it -> Objects.equals(it.value, value)).findFirst().orElseGet(() -> options.get(0));
 	}
 }

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

@@ -8,7 +8,7 @@ import net.minecraft.text.OrderedText;
 import java.util.List;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class TextWidget extends DrawableHelper implements Widget{
+public final class TextWidget extends DrawableHelper implements Widget {
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
@@ -19,7 +19,7 @@ public final class TextWidget extends DrawableHelper implements Widget{
 	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 LiteralText text, final int align) {
 		this.x = x;
 		this.y = y;
 		this.width = width;
@@ -28,36 +28,36 @@ 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 LiteralText 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 LiteralText text) {
 		this(x, y, width, 20, text, LEFT);
 	}
 	
 	@Override
-	public int getX(){
+	public int getX() {
 		return x;
 	}
 	
 	@Override
-	public int getY(){
+	public int getY() {
 		return y;
 	}
 	
 	@Override
-	public void setX(final int x){
+	public void setX(final int x) {
 		this.x = x;
 	}
 	
 	@Override
-	public void setY(final int y){
+	public void setY(final int y) {
 		this.y = y;
 	}
 	
 	@Override
-	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta) {
 		final TextRenderer textRenderer = MINECRAFT.textRenderer;
 		final List<OrderedText> lines = textRenderer.wrapLines(text, width);
 		final int lineHeight = textRenderer.fontHeight + 1;
@@ -65,7 +65,7 @@ public final class TextWidget extends DrawableHelper implements Widget{
 		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getWidth).max().orElse(0) / 2) : x;
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
-		for(int i = 0; i < lines.size(); i++){
+		for (int i = 0; i < lines.size(); i++) {
 			final OrderedText line = lines.get(i);
 			textRenderer.drawWithShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}

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

@@ -1,40 +1,40 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil.Type;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import org.jetbrains.annotations.Nullable;
 
-public class KeyBindingWithModifier extends KeyBinding{
+public class KeyBindingWithModifier extends KeyBinding {
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Text text){
+	public static boolean checkCategoryMatches(final Text text) {
 		return text instanceof TranslatableText && CATEGORY.equals(((TranslatableText)text).getKey());
 	}
 	
 	@Nullable
 	private ModifierKey modifier = null;
 	
-	public KeyBindingWithModifier(final String translationKey){
+	public KeyBindingWithModifier(final String translationKey) {
 		super(translationKey, Type.KEYSYM, -1, CATEGORY);
 	}
 	
-	public void setModifier(@Nullable final ModifierKey modifier){
+	public void setModifier(@Nullable final ModifierKey modifier) {
 		this.modifier = modifier;
 	}
 	
 	@Nullable
-	public ModifierKey getModifier(){
+	public ModifierKey getModifier() {
 		return modifier;
 	}
 	
 	@Override
-	public boolean isPressed(){
+	public boolean isPressed() {
 		return super.isPressed() && (modifier == null || modifier.isPressed());
 	}
 	
 	@Override
-	public boolean wasPressed(){
+	public boolean wasPressed() {
 		return super.wasPressed() && (modifier == null || modifier.isPressed());
 	}
 }

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

@@ -1,42 +1,42 @@
 package chylex.bettercontrols.input;
 import net.minecraft.client.gui.screen.Screen;
 
-public enum ModifierKey{
-	CONTROL(0){
+public enum ModifierKey {
+	CONTROL(0) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasControlDown();
 		}
 	},
 	
-	SHIFT(1){
+	SHIFT(1) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasShiftDown();
 		}
 	},
 	
-	ALT(2){
+	ALT(2) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasAltDown();
 		}
 	};
 	
 	public final int id;
 	
-	ModifierKey(final int id){
+	ModifierKey(final int id) {
 		this.id = id;
 	}
 	
 	public abstract boolean isPressed();
 	
-	public static ModifierKey getById(final int id){
-		switch(id){
-			case 0: return CONTROL;
-			case 1: return SHIFT;
-			case 2: return ALT;
-			default: return null;
-		}
+	public static ModifierKey getById(final int id) {
+		return switch (id) {
+			case 0 -> CONTROL;
+			case 1 -> SHIFT;
+			case 2 -> ALT;
+			default -> null;
+		};
 	}
 }

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

@@ -1,6 +1,6 @@
 package chylex.bettercontrols.input;
 
-public enum SprintMode{
+public enum SprintMode {
 	TAP_TO_START,
 	TAP_TO_TOGGLE,
 	HOLD

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

@@ -1,8 +1,8 @@
 package chylex.bettercontrols.input;
 import chylex.bettercontrols.util.Key;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 
-public class ToggleTracker{
+public class ToggleTracker {
 	protected final KeyBinding bindingToggle;
 	protected final KeyBinding bindingReset;
 	
@@ -12,7 +12,7 @@ public class ToggleTracker{
 	private boolean hasToggledWhileHoldingReset;
 	private boolean skipNextToggle;
 	
-	public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset){
+	public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset) {
 		this.bindingToggle = bindingToggle;
 		this.bindingReset = bindingReset;
 	}
@@ -41,15 +41,15 @@ public class ToggleTracker{
 	 *   +CTRL, +G, -CTRL, +CTRL, +G, +G  -->  toggled on
 	 */
 	
-	public boolean tick(){
+	public boolean tick() {
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (Key.isPressed(bindingToggle)){
-			if (!waitForRelease){
-				if (skipNextToggle){
+		if (Key.isPressed(bindingToggle)) {
+			if (!waitForRelease) {
+				if (skipNextToggle) {
 					skipNextToggle = false;
 				}
-				else{
+				else {
 					isToggled = !isToggled;
 				}
 				
@@ -57,32 +57,32 @@ public class ToggleTracker{
 				hasToggledWhileHoldingReset = isHoldingReset;
 			}
 		}
-		else{
+		else {
 			waitForRelease = false;
 		}
 		
-		if (isToggled){
-			if (hasToggledWhileHoldingReset && !isHoldingReset){
+		if (isToggled) {
+			if (hasToggledWhileHoldingReset && !isHoldingReset) {
 				hasToggledWhileHoldingReset = false;
 			}
-			else if (!hasToggledWhileHoldingReset && isHoldingReset){
+			else if (!hasToggledWhileHoldingReset && isHoldingReset) {
 				isToggled = false;
 				skipNextToggle = true;
 			}
 		}
 		
-		if (skipNextToggle && !isHoldingReset){
+		if (skipNextToggle && !isHoldingReset) {
 			skipNextToggle = false;
 		}
 		
 		return isToggled;
 	}
 	
-	protected boolean isResetKeyPressed(){
+	protected boolean isResetKeyPressed() {
 		return Key.isPressed(bindingReset);
 	}
 	
-	public void reset(){
+	public void reset() {
 		isToggled = false;
 		waitForRelease = false;
 	}

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.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import java.util.HashSet;
 import java.util.Set;
 
-public final class ToggleTrackerForStickyKey extends ToggleTracker{
+public final class ToggleTrackerForStickyKey extends ToggleTracker {
 	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
 	
-	public static boolean isOverrideEnabled(final KeyBinding binding){
+	public static boolean isOverrideEnabled(final KeyBinding binding) {
 		return enabledOverrides.contains(binding);
 	}
 	
 	private final BooleanConsumer setToggleState;
 	
-	public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding 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);
@@ -22,14 +22,14 @@ public final class ToggleTrackerForStickyKey extends ToggleTracker{
 	}
 	
 	@Override
-	public boolean tick(){
+	public boolean tick() {
 		final boolean isToggled = super.tick();
 		setToggleState.accept(isToggled);
 		return isToggled;
 	}
 	
 	@Override
-	protected boolean isResetKeyPressed(){
+	protected boolean isResetKeyPressed() {
 		return ((AccessKeyBindingFields)bindingReset).isPressedField();
 	}
 }

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

@@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Camera.class)
-public interface AccessCameraFields{
+public interface AccessCameraFields {
 	@Accessor
 	Entity getFocusedEntity();
 	

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

@@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ClientPlayerEntity.class)
-public interface AccessClientPlayerFields{
+public interface AccessClientPlayerFields {
 	@Accessor
 	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.options.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(CategoryEntry.class)
-public interface AccessControlsListCategory{
+public interface AccessControlsListCategory {
 	@Accessor
 	Text getText();
 }

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

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

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

@@ -0,0 +1,12 @@
+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

@@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(GameRenderer.class)
-public interface AccessGameRendererFields{
+public interface AccessGameRendererFields {
 	@Accessor
 	void setMovementFovMultiplier(float value);
 }

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

@@ -1,13 +1,13 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.Map;
 
 @Mixin(KeyBinding.class)
-public interface AccessKeyBindingFields{
+public interface AccessKeyBindingFields {
 	@Accessor
-	static Map<String, Integer> getCategoryOrderMap(){
+	static Map<String, Integer> getCategoryOrderMap() {
 		throw new AssertionError();
 	}
 	

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

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

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

@@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PlayerEntity.class)
-public interface AccessPlayerFields{
+public interface AccessPlayerFields {
 	@Accessor("abilityResyncCountdown")
 	void setTicksLeftToDoubleTapFlight(int value);
 }

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

@@ -1,16 +1,24 @@
 package chylex.bettercontrols.mixin;
+import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.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{
+public interface AccessScreenButtons {
 	@Accessor
-	List<AbstractButtonWidget> getButtons();
+	List<Element> getChildren();
+	
+	@Accessor
+	List<Selectable> getSelectables();
+	
+	@Accessor
+	List<Drawable> getDrawables();
 	
 	@Invoker
-	<T extends AbstractButtonWidget> T callAddButton(T button);
+	void callRemove(Element child);
 }

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

@@ -1,12 +1,12 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.options.StickyKeyBinding;
+import net.minecraft.client.option.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(StickyKeyBinding.class)
-public interface AccessStickyKeyBindingStateGetter{
+public interface AccessStickyKeyBindingStateGetter {
 	@Accessor
 	BooleanSupplier getToggleGetter();
 	

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

@@ -10,13 +10,13 @@ import static chylex.bettercontrols.util.Statics.MINECRAFT;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(KeyboardInput.class)
-public abstract class HookClientPlayerInputTick{
+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))
-	private void afterInputTick(final CallbackInfo info){
+	private void afterInputTick(final CallbackInfo info) {
 		final KeyboardInput input = (KeyboardInput)(Object)this;
 		final ClientPlayerEntity player = MINECRAFT.player;
 		
-		if (player != null){
+		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
 		}
 	}

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

@@ -11,25 +11,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(ClientPlayerEntity.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
-	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){
+public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity {
+	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile) {
 		super(world, profile);
 	}
 	
 	@Inject(method = "tickMovement()V", at = @At("HEAD"))
-	private void atHead(final CallbackInfo info){
+	private void atHead(final CallbackInfo info) {
 		final ClientPlayerEntity player = (ClientPlayerEntity)(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))
-	private void afterInputTick(final CallbackInfo info){
+	private void afterInputTick(final CallbackInfo info) {
 		final ClientPlayerEntity player = (ClientPlayerEntity)(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))
-	private void afterSuperCall(final CallbackInfo info){
+	private void afterSuperCall(final CallbackInfo info) {
 		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).afterSuperCall(player);
 	}

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

@@ -2,11 +2,11 @@ package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 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.screen.option.ControlsListWidget;
+import net.minecraft.client.gui.screen.option.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screen.option.ControlsListWidget.Entry;
+import net.minecraft.client.gui.screen.option.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,19 +15,19 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ControlsListWidget.class)
-public abstract class HookControlsListWidget extends ElementListWidget<Entry>{
-	public HookControlsListWidget(final MinecraftClient client, final int width, final int height, final int top, final int bottom, final int itemHeight){
+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 ControlsOptionsScreen parent, final MinecraftClient 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).getText())) {
 				return true;
 			}
 			
-			if (it instanceof KeyBindingEntry && 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.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.KeyBinding;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameOptions.class)
-public abstract class HookLoadGameOptions{
+public abstract class HookLoadGameOptions {
 	private boolean hasLoaded = false;
 	
 	@Mutable
@@ -22,8 +22,8 @@ public abstract class HookLoadGameOptions{
 	public KeyBinding[] keysAll;
 	
 	@Inject(method = "load()V", at = @At("HEAD"))
-	private void load(final CallbackInfo info){
-		if (hasLoaded){
+	private void load(final CallbackInfo info) {
+		if (hasLoaded) {
 			return;
 		}
 		

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

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

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

@@ -9,8 +9,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
 
 @Mixin(PlayerEntity.class)
-public abstract class HookPlayerFlightSpeed extends LivingEntity{
-	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world){
+public abstract class HookPlayerFlightSpeed extends LivingEntity {
+	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world) {
 		super(type, world);
 	}
 	
@@ -19,7 +19,7 @@ public abstract class HookPlayerFlightSpeed extends LivingEntity{
 		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 PlayerEntity 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.options.KeyBinding;
-import net.minecraft.client.options.StickyKeyBinding;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.option.StickyKeyBinding;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -11,25 +11,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.function.BooleanSupplier;
 
 @Mixin(StickyKeyBinding.class)
-public abstract class HookStickyKeyBindingState extends KeyBinding{
+public abstract class HookStickyKeyBindingState extends KeyBinding {
 	@Shadow
 	@Final
 	private BooleanSupplier toggleGetter;
 	
-	public HookStickyKeyBindingState(final String translationKey, final int code, final String category){
+	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)
-	public void setPressed(final boolean pressed, final CallbackInfo info){
-		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
+	public void setPressed(final boolean pressed, final CallbackInfo info) {
+		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
 			((AccessKeyBindingFields)this).setPressedField(pressed);
 			info.cancel();
 		}
 	}
 	
 	@Override
-	public boolean isPressed(){
+	public boolean isPressed() {
 		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
 	}
 }

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

@@ -3,64 +3,64 @@ import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import net.minecraft.client.network.ClientPlayerEntity;
 
-final class FlightHelper{
-	private FlightHelper(){}
+final class FlightHelper {
+	private FlightHelper() {}
 	
 	private static final float BASE_FLIGHT_SPEED = 0.05F;
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
-	private static BetterControlsConfig cfg(){
+	private static BetterControlsConfig cfg() {
 		return BetterControlsMod.config;
 	}
 	
-	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
-		return player.abilities.flying && (player.isCreative() || player.isSpectator());
+	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player) {
+		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
 	}
 	
-	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.flying;
+	static boolean shouldFlyOnGround(final ClientPlayerEntity player) {
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
 	}
 	
-	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){
-		if (player.isCreative()){
-			if (boost){
+	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost) {
+		if (player.isCreative()) {
+			if (boost) {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
-			if (boost){
+		else if (player.isSpectator()) {
+			if (boost) {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
 			}
 		}
-		else{
+		else {
 			return 0F;
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
-		if (player.isCreative()){
-			if (isSprinting){
+	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting) {
+		if (player.isCreative()) {
+			if (isSprinting) {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
-			if (isSprinting){
+		else if (player.isSpectator()) {
+			if (isSprinting) {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
 			}
-			else{
+			else {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
 			}
 		}
-		else{
+		else {
 			return 0F;
 		}
 	}

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

@@ -23,24 +23,24 @@ import static chylex.bettercontrols.util.Statics.KEY_SPRINT;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;
 import static chylex.bettercontrols.util.Statics.OPTIONS;
 
-public final class PlayerTicker{
+public final class PlayerTicker {
 	private static PlayerTicker ticker = new PlayerTicker(null);
 	
-	public static PlayerTicker get(final ClientPlayerEntity player){
-		if (ticker.ref.get() != player){
+	public static PlayerTicker get(final ClientPlayerEntity player) {
+		if (ticker.ref.get() != player) {
 			ticker = new PlayerTicker(player);
 		}
 		
 		return ticker;
 	}
 	
-	private static BetterControlsConfig cfg(){
+	private static BetterControlsConfig cfg() {
 		return BetterControlsMod.config;
 	}
 	
 	private final WeakReference<ClientPlayerEntity> ref;
 	
-	private PlayerTicker(final ClientPlayerEntity player){
+	private PlayerTicker(final ClientPlayerEntity player) {
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
@@ -63,27 +63,27 @@ public final class PlayerTicker{
 	private boolean holdingSneakWhileTouchingGround = false;
 	private int temporaryFlyOnGroundTimer = 0;
 	
-	private void setup(){
+	private void setup() {
 		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
 		BooleanSupplier getter = sprint.getToggleGetter();
 		
-		if (getter instanceof SprintPressGetter){
+		if (getter instanceof SprintPressGetter) {
 			getter = ((SprintPressGetter)getter).getWrapped();
 		}
 		
 		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final ClientPlayerEntity player){
-		if (FlightHelper.shouldFlyOnGround(player)){
+	public void atHead(final ClientPlayerEntity player) {
+		if (FlightHelper.shouldFlyOnGround(player)) {
 			player.setOnGround(false);
 		}
 		
-		if (!cfg().doubleTapForwardToSprint){
+		if (!cfg().doubleTapForwardToSprint) {
 			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
-		if (!cfg().doubleTapJumpToToggleFlight){
+		if (!cfg().doubleTapJumpToToggleFlight) {
 			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
 		}
 		
@@ -91,51 +91,51 @@ public final class PlayerTicker{
 		final boolean wasSprintToggled = OPTIONS.sprintToggled;
 		final boolean isSprintToggled = toggleSprint.tick();
 		
-		if (temporarySprintTimer > 0){
+		if (temporarySprintTimer > 0) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
+			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)) {
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
-			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
+			else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (isSprintToggled){
+		if (isSprintToggled) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 		}
-		else if (wasSprintToggled){
+		else if (wasSprintToggled) {
 			stopSprintingAfterReleasingSprintKey = true;
 			waitingForSprintKeyRelease = true;
 		}
-		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
-			if (Key.isPressed(KEY_SPRINT)){
-				if (!waitingForSprintKeyRelease){
+		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
+			if (Key.isPressed(KEY_SPRINT)) {
+				if (!waitingForSprintKeyRelease) {
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
 				}
 			}
-			else{
-				if (player.isSprinting() && !waitingForSprintKeyRelease){
+			else {
+				if (player.isSprinting() && !waitingForSprintKeyRelease) {
 					stopSprintingAfterReleasingSprintKey = false;
 				}
 				
 				waitingForSprintKeyRelease = false;
 			}
 		}
-		else if (sprintMode == SprintMode.HOLD){
-			if (Key.isPressed(KEY_SPRINT)){
+		else if (sprintMode == SprintMode.HOLD) {
+			if (Key.isPressed(KEY_SPRINT)) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
+		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -144,51 +144,51 @@ public final class PlayerTicker{
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final KeyboardInput input){
-		if (MINECRAFT.currentScreen == null){
+	public void afterInputAssignsPressingForward(final KeyboardInput input) {
+		if (MINECRAFT.currentScreen == null) {
 			input.pressingForward |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(final ClientPlayerEntity player){
+	public void afterInputTick(final ClientPlayerEntity player) {
 		final Input input = player.input;
 		
-		if (MINECRAFT.currentScreen == null && !player.abilities.flying){
+		if (MINECRAFT.currentScreen == null && !player.getAbilities().flying) {
 			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
+		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
 			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.abilities.setFlySpeed(flightSpeed);
+			if (flightSpeed > 0F) {
+				player.getAbilities().setFlySpeed(flightSpeed);
 			}
 			
-			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()){
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
 				int direction = 0;
 				
-				if (input.sneaking){
+				if (input.sneaking) {
 					--direction;
 				}
 				
-				if (input.jumping){
+				if (input.jumping) {
 					++direction;
 				}
 				
-				if (direction != 0){
+				if (direction != 0) {
 					player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
 		
-		if (cfg().resumeSprintingAfterHittingObstacle){
-			if (wasHittingObstacle != player.horizontalCollision){
-				if (!wasHittingObstacle){
+		if (cfg().resumeSprintingAfterHittingObstacle) {
+			if (wasHittingObstacle != player.horizontalCollision) {
+				if (!wasHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
 				}
-				else if (wasSprintingBeforeHittingObstacle){
+				else if (wasSprintingBeforeHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = false;
 					temporarySprintTimer = 10;
 				}
@@ -197,109 +197,109 @@ public final class PlayerTicker{
 				wasHittingObstacle = player.horizontalCollision;
 			}
 		}
-		else{
+		else {
 			wasHittingObstacle = player.horizontalCollision;
 			wasSprintingBeforeHittingObstacle = false;
 		}
 		
-		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
+		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)) {
 			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
 		}
 	}
 	
-	public void afterSuperCall(final ClientPlayerEntity player){
-		if (FlightHelper.shouldFlyOnGround(player)){
+	public void afterSuperCall(final ClientPlayerEntity player) {
+		if (FlightHelper.shouldFlyOnGround(player)) {
 			final boolean isSneaking = player.isSneaking();
 			final boolean isOnGround = player.isOnGround();
 			
-			if (!isSneaking){
+			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;
 			}
-			else if (!isOnGround){
+			else if (!isOnGround) {
 				wasSneakingBeforeTouchingGround = true;
 			}
 			
-			if (!isOnGround){
+			if (!isOnGround) {
 				holdingSneakWhileTouchingGround = false;
 			}
-			else{
+			else {
 				boolean cancelLanding = true;
 				
-				if (!wasSneakingBeforeTouchingGround){
-					if (isSneaking){
+				if (!wasSneakingBeforeTouchingGround) {
+					if (isSneaking) {
 						holdingSneakWhileTouchingGround = true;
 					}
-					else if (holdingSneakWhileTouchingGround){
-						player.abilities.flying = false;
+					else if (holdingSneakWhileTouchingGround) {
+						player.getAbilities().flying = false;
 						player.sendAbilitiesUpdate();
 						cancelLanding = false;
 					}
 				}
 				
-				if (cancelLanding){
+				if (cancelLanding) {
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			wasSneakingBeforeTouchingGround = false;
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
 			final Input input = player.input;
 			
-			if (input.movementForward == 0F && input.movementSideways == 0F){
+			if (input.movementForward == 0F && input.movementSideways == 0F) {
 				player.setVelocity(player.getVelocity().multiply(0.0, 1.0, 0.0));
 			}
 			
-			if (!input.jumping && !input.sneaking){
+			if (!input.jumping && !input.sneaking) {
 				player.setVelocity(player.getVelocity().multiply(1.0, 0.0, 1.0));
 			}
 		}
 		
-		if (player.isCreative()){
-			if (Key.wasPressed(cfg().keyToggleFlight)){
-				final boolean isFlying = !player.abilities.flying;
+		if (player.isCreative()) {
+			if (Key.wasPressed(cfg().keyToggleFlight)) {
+				final boolean isFlying = !player.getAbilities().flying;
 				
-				player.abilities.flying = isFlying;
+				player.getAbilities().flying = isFlying;
 				player.sendAbilitiesUpdate();
 				
-				if (isFlying){
+				if (isFlying) {
 					temporaryFlyOnGroundTimer = 10;
 				}
 			}
 			
-			if (temporaryFlyOnGroundTimer > 0){
-				if (player.isSneaking()){
+			if (temporaryFlyOnGroundTimer > 0) {
+				if (player.isSneaking()) {
 					temporaryFlyOnGroundTimer = 0;
 				}
-				else{
+				else {
 					--temporaryFlyOnGroundTimer;
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!cfg().sneakingMovesCameraSmoothly){
+		if (!cfg().sneakingMovesCameraSmoothly) {
 			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getCamera();
 			
-			if (camera.getFocusedEntity() == player){
+			if (camera.getFocusedEntity() == player) {
 				camera.setCameraY(player.getStandingEyeHeight());
 			}
 		}
 		
-		if (Key.wasPressed(cfg().keyResetAllToggles)){
+		if (Key.wasPressed(cfg().keyResetAllToggles)) {
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (Key.isPressed(cfg().keyOpenMenu)){
+		if (Key.isPressed(cfg().keyOpenMenu)) {
 			MINECRAFT.openScreen(new BetterControlsScreen(null));
 		}
 	}

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

@@ -1,21 +1,21 @@
 package chylex.bettercontrols.player;
 import java.util.function.BooleanSupplier;
 
-final class SprintPressGetter implements BooleanSupplier{
+final class SprintPressGetter implements BooleanSupplier {
 	private final BooleanSupplier wrapped;
 	private final BooleanSupplier or;
 	
-	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or){
+	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or) {
 		this.wrapped = wrapped;
 		this.or = or;
 	}
 	
-	public BooleanSupplier getWrapped(){
+	public BooleanSupplier getWrapped() {
 		return wrapped;
 	}
 	
 	@Override
-	public boolean getAsBoolean(){
+	public boolean getAsBoolean() {
 		return wrapped.getAsBoolean() || or.getAsBoolean();
 	}
 }

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

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

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

@@ -1,10 +1,10 @@
 package chylex.bettercontrols.util;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.KeyBinding;
 
-public final class Statics{
-	private Statics(){}
+public final class Statics {
+	private Statics() {}
 	
 	public static final MinecraftClient MINECRAFT = MinecraftClient.getInstance();
 	public static final GameOptions OPTIONS = MINECRAFT.options;

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

@@ -3,6 +3,6 @@ import net.minecraft.client.gui.screen.Screen;
 
 @SuppressWarnings("unused")
 @FunctionalInterface
-public interface ConfigScreenFactory<S extends Screen>{
+public interface ConfigScreenFactory<S extends Screen> {
 	S create(Screen var1);
 }

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

@@ -3,12 +3,12 @@ import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 
 @SuppressWarnings("unused")
-public interface ModMenuApi{
-	default ConfigScreenFactory<?> getModConfigScreenFactory(){
+public interface ModMenuApi {
+	default ConfigScreenFactory<?> getModConfigScreenFactory() {
 		return ignore -> null;
 	}
 	
-	default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories(){
+	default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
 		return ImmutableMap.of();
 	}
 }

src/main/resources/bettercontrols.mixins.json

@@ -2,14 +2,16 @@
   "required": true,
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
     "AccessControlsListCategory",
     "AccessControlsListKeyBinding",
+    "AccessCyclingButtonWidgetFields",
     "AccessGameRendererFields",
     "AccessKeyBindingFields",
+    "AccessOptionFields",
     "AccessPlayerFields",
     "AccessScreenButtons",
     "AccessStickyKeyBindingStateGetter",

src/main/resources/fabric.mod.json

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