More mod compatibility & Add missing contributor names

- Fix diagonal movement speed (PR #113, thanks @dogtopus, closes #42)
- Toggle Sprint and Toggle Sneak can now be enabled separately just for controllers (closes #102)
- Added button binding profile support (closes #107)
- Fix button binding tooltips intersecting with chat on large GUI scales (closes #106)
- Add assets for non-licensed (numbered) PlayStation controllers (closes #110)
- Fix reacharound outline color
- Fix pixel error in legacy icons (closes #84)
- Fix creative flight being slow with Bedrockify installed (just disables the "disableFlyingMomentum" option on launch)

README.md

@@ -1,29 +1,29 @@
+<div align="center">
+<img src=https://github.com/TeamMidnightDust/MidnightControls/blob/1.19/src/main/resources/assets/midnightcontrols/icon.png>
+
 # MidnightControls
 
-<!-- modrinth_exclude.start -->
-![Java 16](https://img.shields.io/badge/language-Java%2017-9B599A.svg?style=flat-square) <!-- modrinth_exclude.end -->
-[![GitHub license](https://img.shields.io/github/license/TeamMidnightDust/MidnightControls?style=flat-square)](https://raw.githubusercontent.com/TeamMidnightDust/MidnightControls/master/LICENSE)
-![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square)
-[![Mod loader: Quilt/Fabric]][quilt] <!-- modrinth_exclude.start -->
-[![Version](https://img.shields.io/github/v/tag/TeamMidnightDust/MidnightControls?label=version&style=flat-square)](https://github.com/TeamMidnightDust/MidnightControls/releases)
-[![CurseForge](http://cf.way2muchnoise.eu/title/621768.svg)](https://www.curseforge.com/minecraft/mc-mods/midnightcontrols)
-<!-- modrinth_exclude.end -->
+[![CurseForge](https://cf.way2muchnoise.eu/full_midnightcontrols_downloads%20on%20CurseForge.svg?badge_style=round)](https://www.curseforge.com/minecraft/mc-mods/midnightcontrols)
+[![Modrinth]](https://modrinth.com/mod/midnightcontrols)
+[![Version](https://img.shields.io/github/v/tag/TeamMidnightDust/MidnightControls?label=version&style=round)](https://github.com/TeamMidnightDust/MidnightControls/releases)
+![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=round)
+[![Mod loader: Quilt/Fabric]][Quilt]
+[![Java 17](https://img.shields.io/badge/language-Java%2017-9B599A.svg?style=round)](https://www.oracle.com/java/technologies/downloads/#java17)
+[![GitHub license](https://img.shields.io/github/license/TeamMidnightDust/MidnightControls?style=round)](LICENSE)
 
 A Fabric Minecraft mod which adds better controls, reach-around and controller support.  
 Forked from [LambdaControls](https://github.com/LambdAurora/LambdaControls) by the amazing [LambdAurora](https://github.com/LambdAurora), which was sadly discontinued.
 
+</div>
+
 ## What's this mod?
 
-This mod adds better controls, reach-around features, etc.
+MidnightControls is a mod which provides controller and touchscreen support in Minecraft: Java Edition.<br />It also includes some Bedrock Edition parity and reach-around features!
 
-Haven't you dreamed to travel in your modded Minecraft world with your controller? Yes? Then this mod is made for you!
-
-This mod also adds controller support.
-
-## ✅ Features:
+## Features:
 
 - Controller support
-- Touchscreen support (very experimental and buggy).
+- Touchscreen support
 - Keyboard controls to look around.
 - Toggleable on screen button indicator (like in Bedrock Edition).
 - Vertical reach-around.
@@ -32,29 +32,38 @@ This mod also adds controller support.
    - Front block placing (be careful with this one)
 - New controls settings!
 - Many options in config to change to your liking.
-- Many controllers supported and in a simply way your own controller mappings.
+- Many controllers supported and in a simple way your own controller mappings.
 - An easy API for developers to add their own button bindings.
 
 ## 🎮 Supported Controllers:
 
-- Dualshock controllers
-- Dualsense controllers
+- DualShock controllers
+- DualSense controllers
 - Xbox controllers
 - Switch Pro controllers
-- Joycons
+- Joy-Cons
 - Steam controller and Steam Deck (WIP)
 - And many more!
 
 ## Screenshots
 
-![controller_controls](images/controller_controls.png)
-![controller_options](images/controller_options.png)
+![Controller_Controls](images/controller_controls.png)
+![Controller_Options](images/controller_options.png)
 
-<!-- modrinth_exclude.start -->
 ## Build
 
-Just do `./gradlew build` and everything should build just fine!
-<!-- modrinth_exclude.end -->
+Clone the repo with:
+```
+git clone https://github.com/TeamMidnightDust/MidnightControls
+```
+Enter the folder created and run:
+```
+./gradlew build
+```
+After this is done, everything should be built just fine!
+
+[Quilt]: https://quiltmc.org
 
-[quilt]: https://quiltmc.org
 [Mod loader: Quilt/Fabric]: https://img.shields.io/badge/modloader-Quilt%2FFabric-blueviolet?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAADGAAAAxgGwdJvFAAAFU0lEQVR4nO1bwW7bOBCdCHtP+wUNxIvhS7yA7kkPOjf9AKPam4/OF2zzB96bblXhH0jPPkS5G1jnIvgib/IFtX/ALoYZemmKtEWRRe3aDzAsURbJGQ6HM4/02Wq1gmNGcNTSnxQA8IdakDK4AOCfJpj3SpiI98r2rAMAbxrWNWFFOMeL1nCJdXQa1gPTbpCbnm34ABIeBThv2hgAfOyVcF+2ZwkAfHGo54kVIRe6NVxiny4d6vpn2g36ugfqFLhwFB6kkUoc67k0XLv0qYKj9wEnBXiqZwEAf/ZKOOuV8BkLWBFesyI8A4C/LOt6AoC39C7HtBvg9Vt65hUnC/BUDzrOf1MGq5S9WkDZnuVle7ZqsBKgw/tO73K0hku8/u64EmhxsoA96MMvxdEroBIKO+CWoshnqqJPYTAGRJ8sql3QO3Op7D19D3z7AV8KeAGArFf+32lWhDwnKNuzuaUCclaE93KBiOU9hMQV+FLAOxz9lPHRR0VkZXs2oBDUNon5ULZnKOgcYwl4FTwna/K+CtRRwIK+dTnCCwkP9I0fkXmh4FcN+6UKqqtHblvtb+18po4TvKaPilsS8qVuYx5havsbJXS1I0ZVAXP1B5jfyzm+hAnN+We1XPluioX03kJtY9oNtG1T+b1aburDxhRAQVMGHw3z9k65F41nktmjUnjjrAj7ZXv27ECIyEKgBd7saBuka7lsPu0GA1MjR0+KVpwgMTlrMkN4YoztlZ/2camTvD0QjcWZF6KxMgcLyKbdAN+HKOb1y6PYH49gEsUwUKw1G48gi2KQZcApkYxH1eldUQBxeKbkRfXEQjDZ21+h2bMiHJDwH2wk1rSX0XWueHZd2yCZ/oVSnilTaA3VAiqjRRahQ0JBjuov3ijfPqAua0kUg67tmyjWCmvsS504wGQRnywjPJ8wtY3xw3827fjMBXziUalL3DcNrIzYRwXcTbvBZ7lgPHoNxKKYky1/+2xsHxXQbw2X/EIoggQHyjC9Yh8VcC6NshDc66jLOHpC5KSAPejDL8U+KuArboTQZgjHeARn+MFnvhvbRyfYaQ2XfNkTVFgUr/mIxlvkJuyjAjCae6BrYQUPW37vhDpT4MnAsCyIgbHBnYbcADJt7/t+deBCiSWsCG8sOv5IgU2FnJh2g+RnBDl1oCpgogqEx1TEURUFokx+tpCYnEzzjg1kh+fq/Ix9OXpG6OjjgI1VIGWcOMhlXh4PPdAz1VTe90rIU8Z/L9JUnALXSK4SjSUzOY+Y1ekyOlzjaamTvf3X8cjunBH1v6OeVtsG1QI66qYEVkoVmyA/O5fYmIHjgSsrskUavAc6q1BLeXXiANMZu0HKwGav7opGv+LticZqHOToLBeZrJRxC97qjOsowCTgZYO9OlNa25haMwgvsFMJPp3gLW1ji8b6dO89fhfYIbzAl23T4adtjyNvD6/mbbs9Xgs1hRcwWoIvCxDb47nQNm5aRDHvoPGcblNYCi+gtQSfU+AdLYfioLXYtHA9eruBhsILVJRwUIGQo/ACG0o4GAV4El5grQSffMA3SqbEnBdb1zeunfYsvAB3jL4UwE92KauA2NnNbLerNKhEqJ6Q+FIAOjpcATAVzjFHoC3qC9OurCW0W9s+6vXpAy4p0hPkSUL3ziNHiY3tqfNdQN4jORgnSEGMLyU8Udbq1QIEdEyRF3hSwlp4vKkwQimrHDuxAR6S4tleFIPzERnhSFXQEtbkD1kbwiMOlhJroISK8IiDpcQsp4NWeMRBc4I1lWAUHnHwpOgOJWwVHvFbsMIGJewUHvFb7QuQYxR/ttgIzbUAgB9KOM3uc+PN7QAAAABJRU5ErkJggg==
+
+[Modrinth]: https://img.shields.io/modrinth/dt/bXX9h73M?logoColor=white&logo=data:image/svg%2bxml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNTEyIDUxNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTUwMy4xNiAzMjMuNTZDNTE0LjU1IDI4MS40NyA1MTUuMzIgMjM1LjkxIDUwMy4yIDE5MC43NkM0NjYuNTcgNTQuMjI5OSAzMjYuMDQgLTI2LjgwMDEgMTg5LjMzIDkuNzc5OTFDODMuODEwMSAzOC4wMTk5IDExLjM4OTkgMTI4LjA3IDAuNjg5OTQxIDIzMC40N0g0My45OUM1NC4yOSAxNDcuMzMgMTEzLjc0IDc0LjcyOTggMTk5Ljc1IDUxLjcwOThDMzA2LjA1IDIzLjI1OTggNDE1LjEzIDgwLjY2OTkgNDUzLjE3IDE4MS4zOEw0MTEuMDMgMTkyLjY1QzM5MS42NCAxNDUuOCAzNTIuNTcgMTExLjQ1IDMwNi4zIDk2LjgxOThMMjk4LjU2IDE0MC42NkMzMzUuMDkgMTU0LjEzIDM2NC43MiAxODQuNSAzNzUuNTYgMjI0LjkxQzM5MS4zNiAyODMuOCAzNjEuOTQgMzQ0LjE0IDMwOC41NiAzNjkuMTdMMzIwLjA5IDQxMi4xNkMzOTAuMjUgMzgzLjIxIDQzMi40IDMxMC4zIDQyMi40MyAyMzUuMTRMNDY0LjQxIDIyMy45MUM0NjguOTEgMjUyLjYyIDQ2Ny4zNSAyODEuMTYgNDYwLjU1IDMwOC4wN0w1MDMuMTYgMzIzLjU2WiIgZmlsbD0iIzMwYjI3YiIvPgogIDxwYXRoIGQ9Ik0zMjEuOTkgNTA0LjIyQzE4NS4yNyA1NDAuOCA0NC43NTAxIDQ1OS43NyA4LjExMDExIDMyMy4yNEMzLjg0MDExIDMwNy4zMSAxLjE3IDI5MS4zMyAwIDI3NS40Nkg0My4yN0M0NC4zNiAyODcuMzcgNDYuNDY5OSAyOTkuMzUgNDkuNjc5OSAzMTEuMjlDNTMuMDM5OSAzMjMuOCA1Ny40NSAzMzUuNzUgNjIuNzkgMzQ3LjA3TDEwMS4zOCAzMjMuOTJDOTguMTI5OSAzMTYuNDIgOTUuMzkgMzA4LjYgOTMuMjEgMzAwLjQ3QzY5LjE3IDIxMC44NyAxMjIuNDEgMTE4Ljc3IDIxMi4xMyA5NC43NjAxQzIyOS4xMyA5MC4yMTAxIDI0Ni4yMyA4OC40NDAxIDI2Mi45MyA4OS4xNTAxTDI1NS4xOSAxMzNDMjQ0LjczIDEzMy4wNSAyMzQuMTEgMTM0LjQyIDIyMy41MyAxMzcuMjVDMTU3LjMxIDE1NC45OCAxMTguMDEgMjIyLjk1IDEzNS43NSAyODkuMDlDMTM2Ljg1IDI5My4xNiAxMzguMTMgMjk3LjEzIDEzOS41OSAzMDAuOTlMMTg4Ljk0IDI3MS4zOEwxNzQuMDcgMjMxLjk1TDIyMC42NyAxODQuMDhMMjc5LjU3IDE3MS4zOUwyOTYuNjIgMTkyLjM4TDI2OS40NyAyMTkuODhMMjQ1Ljc5IDIyNy4zM0wyMjguODcgMjQ0LjcyTDIzNy4xNiAyNjcuNzlDMjM3LjE2IDI2Ny43OSAyNTMuOTUgMjg1LjYzIDI1My45OCAyODUuNjRMMjc3LjcgMjc5LjMzTDI5NC41OCAyNjAuNzlMMzMxLjQ0IDI0OS4xMkwzNDIuNDIgMjczLjgyTDMwNC4zOSAzMjAuNDVMMjQwLjY2IDM0MC42M0wyMTIuMDggMzA4LjgxTDE2Mi4yNiAzMzguN0MxODcuOCAzNjcuNzggMjI2LjIgMzgzLjkzIDI2Ni4wMSAzODAuNTZMMjc3LjU0IDQyMy41NUMyMTguMTMgNDMxLjQxIDE2MC4xIDQwNi44MiAxMjQuMDUgMzYxLjY0TDg1LjYzOTkgMzg0LjY4QzEzNi4yNSA0NTEuMTcgMjIzLjg0IDQ4NC4xMSAzMDkuNjEgNDYxLjE2QzM3MS4zNSA0NDQuNjQgNDE5LjQgNDAyLjU2IDQ0NS40MiAzNDkuMzhMNDg4LjA2IDM2NC44OEM0NTcuMTcgNDMxLjE2IDM5OC4yMiA0ODMuODIgMzIxLjk5IDUwNC4yMloiIGZpbGw9IiMzMGIyN2IiLz4KPC9zdmc+

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'fabric-loom' version '0.12-SNAPSHOT'
     id 'java-library'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
@@ -68,11 +68,12 @@ repositories {
         url 'https://maven.gegy.dev'
     }
     maven {
-        name 'CottonMC'
-        url 'https://server.bbkr.space/artifactory/libs-snapshot'
+        name = "CottonMC"
+        url = "https://server.bbkr.space/artifactory/libs-release"
     }
     maven { url "https://maven.terraformersmc.com/releases/" }
     maven { url 'https://maven.kosmx.dev' }
+    maven { url 'https://maven.isxander.dev/releases' }
     maven { url 'https://maven.shedaniel.me/' }
     maven { url 'https://jitpack.io' }
     maven { url "https://api.modrinth.com/maven" }
@@ -109,17 +110,26 @@ dependencies {
     // modImplementation("maven.modrinth:ok-zoomer:${project.ok_zoomer_version}")
     // modImplementation "io.github.ennuil:LibZoomer:${project.libzoomer_version}"
 
+    modImplementation "io.github.cottonmc:LibGui:${project.libgui_version}"
     modImplementation "org.quiltmc:quilt-json5:1.0.0"
-    //modImplementation "maven.modrinth:sodium:${project.sodium_version}"
-    //modImplementation("maven.modrinth:emi:${project.emi_version}")
+    modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
+    modImplementation("maven.modrinth:emi:${project.emi_version}")
     modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
     modImplementation "io.github.kosmx:bendy-lib:${project.bendylib_version}"
+    modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
+    modImplementation "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
+    modImplementation "maven.modrinth:bedrockify:${project.bedrockify_version}"
+    // Required for Inventory Tabs
+    modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 
     modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
     include "maven.modrinth:midnightlib:${project.midnightlib_version}"
 
     shadow 'com.electronwill.night-config:core:3.6.3'
     shadow 'com.electronwill.night-config:toml:3.6.3'
+    apply plugin: 'java-library'
 }
 loom {
     accessWidenerPath = file("src/main/resources/midnightcontrols.accesswidener")

gradle.properties

@@ -3,26 +3,31 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.19
-yarn_mappings=1.19+build.1
-loader_version=0.14.7
+minecraft_version=1.19.2
+yarn_mappings=1.19.2+build.9
+loader_version=0.14.9
 
 # Mod Properties
-mod_version = 1.1.0
+mod_version = 1.7.1
 maven_group = eu.midnightdust
 archives_base_name = midnightcontrols
 modrinth_id=bXX9h73M
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.55.2+1.19
-sodium_version=mc1.19-0.4.1
+fabric_version=0.60.0+1.19.2
+sodium_version=mc1.19.2-0.4.4
 spruceui_version=4.0.0+1.19
-midnightlib_version=0.5.2
-modmenu_version=4.0.0
+midnightlib_version=0.6.1
+modmenu_version=4.0.6
 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
-emi_version=0.1.1+1.18.2
+emi_version=0.4.0+1.19
+libgui_version=6.0.0+1.19
+inventorytabs_version=inventorytabs-0.9.beta-1.19.x
+clothconfig_version=7.0.72
+yacl_version=0.1.2
+bedrockify_version=1.5+mc1.19.1-2
 
 # Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions.
 # ok_zoomer_version=5.0.0-beta.3+1.17.1

src/main/java/eu/midnightdust/midnightcontrols/ControlsMode.java

@@ -24,7 +24,8 @@ import java.util.Optional;
  */
 public enum ControlsMode implements Nameable {
     DEFAULT,
-    CONTROLLER;
+    CONTROLLER,
+    TOUCHSCREEN;
 
     /**
      * Returns the next controls mode available.

src/main/java/eu/midnightdust/midnightcontrols/MidnightControls.java

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols;
 
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.event.PlayerChangeControlsModeCallback;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.api.ModInitializer;
@@ -16,7 +17,6 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -37,14 +37,14 @@ public class MidnightControls implements ModInitializer {
     public static final Identifier CONTROLS_MODE_CHANNEL = new Identifier(MidnightControlsConstants.CONTROLS_MODE_CHANNEL.toString());
     public static final Identifier FEATURE_CHANNEL = new Identifier(MidnightControlsConstants.FEATURE_CHANNEL.toString());
     public static final Identifier HELLO_CHANNEL = new Identifier(MidnightControlsConstants.HELLO_CHANNEL.toString());
-
-    public static final Text NOT_BOUND_TEXT = Text.translatable("midnightcontrols.not_bound");
+    public static boolean isExtrasLoaded;
 
     public final Logger logger = LogManager.getLogger("MidnightControls");
 
     @Override
     public void onInitialize() {
         INSTANCE = this;
+        isExtrasLoaded = FabricLoader.getInstance().isModLoaded("midnightcontrols-extra");
         this.log("Initializing MidnightControls...");
 
         ServerPlayNetworking.registerGlobalReceiver(HELLO_CHANNEL, (server, player, handler, buf, responseSender) -> {

src/main/java/eu/midnightdust/midnightcontrols/MidnightControlsFeature.java

@@ -61,7 +61,7 @@ public class MidnightControlsFeature implements Nameable {
      * @return {@code true} if this feature is allowed, else {@code false}
      */
     public boolean isAllowed() {
-        return this.allowed;
+        return MidnightControls.isExtrasLoaded && this.allowed;
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/ControllerType.java

@@ -24,15 +24,16 @@ import java.util.Optional;
  * @since 1.0.0
  */
 public enum ControllerType implements Nameable {
-    DEFAULT(0, Text.of("Default")),
-    DUALSHOCK(1, Text.of("Dualshock")),
-    DUALSENSE(2, Text.of("Dualsense")),
-    SWITCH(3, Text.of("Switch")),
-    XBOX_360(4, Text.of("Xbox 360")),
-    XBOX(5, Text.of("Xbox")),
-    STEAM_DECK(6, Text.of("Steam Deck")),
-    STEAM_CONTROLLER(7, Text.of("Steam Controller")),
-    OUYA(8, Text.of("Ouya"));
+    DEFAULT(0),
+    DUALSHOCK(1),
+    DUALSENSE(2),
+    SWITCH(3),
+    XBOX_360(4),
+    XBOX(5),
+    STEAM_DECK(6),
+    STEAM_CONTROLLER(7),
+    OUYA(8),
+    NUMBERED(9);
 
     private final int id;
     private final Text text;

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java

@@ -15,12 +15,17 @@ import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
+import eu.midnightdust.midnightcontrols.client.compat.VoxelMapCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsHud;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
-import eu.midnightdust.midnightcontrols.client.ring.KeyBindingRingAction;
+import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
+import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingRegistryImplAccessor;
+import eu.midnightdust.midnightcontrols.client.ring.ButtonBindingRingAction;
 import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
 import dev.lambdaurora.spruceui.hud.HudManager;
 import net.fabricmc.api.ClientModInitializer;
@@ -42,6 +47,8 @@ import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * Represents the midnightcontrols client mod.
@@ -51,6 +58,8 @@ import java.io.File;
  * @since 1.1.0
  */
 public class MidnightControlsClient extends MidnightControls implements ClientModInitializer {
+    public static boolean lateInitDone = false;
+    public static boolean voxelmapInitDone = false;
     private static MidnightControlsClient INSTANCE;
     public static final KeyBinding BINDING_LOOK_UP = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_up"),
             InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.movement");
@@ -60,8 +69,8 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
             InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.movement");
     public static final KeyBinding BINDING_LOOK_LEFT = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_left"),
             InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement");
-    /*public static final KeyBinding           BINDING_RING       = InputManager.makeKeyBinding(new Identifier(midnightcontrolsConstants.NAMESPACE, "ring"),
-            InputUtil.Type.MOUSE, GLFW.GLFW_MOUSE_BUTTON_5, "key.categories.misc");*/
+    public static final KeyBinding BINDING_RING = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "ring"),
+            InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(), "key.categories.misc");
     public static final Identifier CONTROLLER_BUTTONS = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_buttons.png");
     public static final Identifier CONTROLLER_EXPANDED = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_expanded.png");
     public static final Identifier CONTROLLER_AXIS = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_axis.png");
@@ -80,13 +89,12 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
         KeyBindingHelper.registerKeyBinding(BINDING_LOOK_RIGHT);
         KeyBindingHelper.registerKeyBinding(BINDING_LOOK_DOWN);
         KeyBindingHelper.registerKeyBinding(BINDING_LOOK_LEFT);
-        //KeyBindingHelper.registerKeyBinding(BINDING_RING);
+        KeyBindingHelper.registerKeyBinding(BINDING_RING);
 
-        this.ring.registerAction("keybinding", KeyBindingRingAction.FACTORY);
+        this.ring.registerAction("buttonbinding", ButtonBindingRingAction.FACTORY);
 
-        ClientPlayNetworking.registerGlobalReceiver(CONTROLS_MODE_CHANNEL, (client, handler, buf, responseSender) -> {
-            responseSender.sendPacket(CONTROLS_MODE_CHANNEL, this.makeControlsModeBuffer(MidnightControlsConfig.controlsMode));
-        });
+        ClientPlayNetworking.registerGlobalReceiver(CONTROLS_MODE_CHANNEL, (client, handler, buf, responseSender) ->
+                responseSender.sendPacket(CONTROLS_MODE_CHANNEL, this.makeControlsModeBuffer(MidnightControlsConfig.controlsMode)));
         ClientPlayNetworking.registerGlobalReceiver(FEATURE_CHANNEL, (client, handler, buf, responseSender) -> {
             int features = buf.readVarInt();
             for (int i = 0; i < features; i++) {
@@ -102,23 +110,32 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
         ClientPlayConnectionEvents.DISCONNECT.register(this::onLeave);
 
         ClientTickEvents.START_CLIENT_TICK.register(this.reacharound::tick);
-        ClientTickEvents.END_CLIENT_TICK.register(this::onTick);
+        ClientTickEvents.START_CLIENT_TICK.register(this::onTick);
 
         OpenScreenCallback.EVENT.register((client, screen) -> {
-//            if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) {
-//                screen = new TouchscreenOverlay(this);
-//                screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
-//                client.skipGameRender = false;
-//                client.currentScreen = screen;
-//            } else if (screen != null) {
+            if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) {
+                screen = new TouchscreenOverlay(this);
+                screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
+                client.skipGameRender = false;
+                client.currentScreen = screen;
+            } else if (screen != null) {
                 this.input.onScreenOpen(client, client.getWindow().getWidth(), client.getWindow().getHeight());
-            //}
+            }
         });
 
         HudManager.register(this.hud = new MidnightControlsHud(this));
         FabricLoader.getInstance().getModContainer("midnightcontrols").ifPresent(modContainer -> {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","bedrock"), modContainer, ResourcePackActivationType.NORMAL);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","legacy"), modContainer, ResourcePackActivationType.NORMAL);
         });
+        int delay = 0; // delay for 0 sec.
+        int period = 1; // repeat every 0.001 sec. (100 times a second)
+        Timer timer = new Timer();
+        timer.scheduleAtFixedRate(new TimerTask() {
+            public void run() {
+                input.updateCamera(MinecraftClient.getInstance());
+            }
+        }, delay, period);
     }
 
     /**
@@ -144,6 +161,41 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
 
         MidnightControlsCompat.init(this);
     }
+    ButtonCategory category;
+    /**
+     * This method is called to initialize keybindings
+     */
+    public void initKeybindings() {
+        if (!voxelmapInitDone && FabricLoader.getInstance().isModLoaded("voxelmap") && KeyBindingIDAccessor.getKEYS_BY_ID().containsKey("key.minimap.toggleingamewaypoints")) {
+            this.log("Adding VoxelMap compatibility...");
+            new VoxelMapCompat().handle(this);
+            InputManager.loadButtonBindings();
+            voxelmapInitDone = true;
+        }
+        if (lateInitDone) return;
+        if (KeyBindingRegistryImplAccessor.getModdedKeyBindings() == null || KeyBindingRegistryImplAccessor.getModdedKeyBindings().isEmpty()) return;
+        for (int i = 0; i < KeyBindingRegistryImplAccessor.getModdedKeyBindings().size(); ++i) {
+            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getModdedKeyBindings().get(i);
+            if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
+                category = null;
+                InputManager.streamCategories().forEach(buttonCategory -> {
+                    if (buttonCategory.getIdentifier().equals(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory())))
+                        category = buttonCategory;
+                });
+                if (category == null) {
+                    category = new ButtonCategory(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory()));
+                    InputManager.registerCategory(category);
+                }
+                ButtonBinding buttonBinding = new ButtonBinding.Builder(keyBinding.getTranslationKey()).category(category).linkKeybind(keyBinding).register();
+                if (MidnightControlsConfig.debug) {
+                    logger.info(keyBinding.getTranslationKey());
+                    logger.info(buttonBinding);
+                }
+            }
+        }
+        InputManager.loadButtonBindings();
+        lateInitDone = true;
+    }
 
     /**
      * This method is called every Minecraft tick.
@@ -151,17 +203,25 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
      * @param client the client instance
      */
     public void onTick(@NotNull MinecraftClient client) {
+        this.initKeybindings();
         this.input.tick(client);
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput))
             this.input.tickController(client);
 
-        /*if (BINDING_RING.wasPressed()) {
-            client.openScreen(new RingScreen());
-        }*/
+        if (BINDING_RING.wasPressed()) {
+            ring.loadFromUnbound();
+            client.setScreen(new RingScreen());
+        }
+        if (client.world != null && MidnightControlsConfig.enableHints && !MidnightControlsConfig.autoSwitchMode && MidnightControlsConfig.controlsMode == ControlsMode.DEFAULT && MidnightControlsConfig.getController().isGamepad()) {
+            client.getToastManager().add(SystemToast.create(client, SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("midnightcontrols.controller.tutorial.title"),
+                    Text.translatable("midnightcontrols.controller.tutorial.description", Text.translatable("options.title"), Text.translatable("controls.title"),
+                            Text.translatable("midnightcontrols.menu.title.controller"))));
+            MidnightControlsConfig.enableHints = false;
+            MidnightControlsConfig.save();
+        }
     }
-
     public void onRender(MinecraftClient client) {
-        this.input.onRender(client.getTickDelta(), client);
+        //this.input.onRender(client);
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java

@@ -9,12 +9,16 @@
 
 package eu.midnightdust.midnightcontrols.client;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ChatScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -22,48 +26,66 @@ import org.lwjgl.glfw.GLFW;
 import java.util.*;
 import java.util.regex.Pattern;
 
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_X;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y;
+import static org.lwjgl.glfw.GLFW.*;
 
 /**
  * Represents MidnightControls configuration.
  */
 public class MidnightControlsConfig extends MidnightConfig {
+    public static boolean isEditing = false;
+    @Hidden @Entry public static int configVersion = 1;
     // General
-    @Entry public static ControlsMode controlsMode = ControlsMode.DEFAULT;
-    @Entry public static boolean autoSwitchMode = true;
-    @Entry public static boolean debug = false;
+    @Entry(name = "midnightcontrols.menu.controls_mode") public static ControlsMode controlsMode = ControlsMode.DEFAULT;
+    @Entry(name = "midnightcontrols.menu.auto_switch_mode") public static boolean autoSwitchMode = true;
+    @Entry(name = "Debug") public static boolean debug = false;
     // HUD
-    @Entry public static boolean hudEnable = true;
-    @Entry public static HudSide hudSide = HudSide.LEFT;
+    @Entry(name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
+    @Entry(name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
     // Gameplay
-    @Entry public static boolean analogMovement = true;
-    @Entry public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
-    @Entry public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
-    @Entry public static boolean horizontalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry public static boolean shouldRenderReacharoundOutline = true;
-    @Entry public static int[] reacharoundOutlineColor = new int[]{255, 255, 255, 102};
-    // Controller
-    @Entry public static ControllerType controllerType = ControllerType.DEFAULT;
-    @Entry public static double rightDeadZone = 0.25;
-    @Entry public static double leftDeadZone = 0.25;
-    @Entry public static boolean invertRightYAxis = false;
-    @Entry public static boolean invertRightXAxis = false;
-    @Entry public static double DEFAULT_MAX_VALUE = 1;
-    @Entry public static double rotationSpeed = 40.0;
-    @Entry public static double mouseSpeed = 25.0;
-    @Entry public static boolean unfocusedInput = false;
-    @Entry public static boolean virtualMouse = false;
-    @Entry public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
-    @Entry public static Object controllerID = 0;
-    @Entry public static Object secondControllerID = -1;
-    @Entry public static List<String> mouseScreens = List.of("me.jellysquid.mods.sodium.client.gui","net.coderbot.iris.gui","net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375", "net.minecraft.class_457", "net.minecraft.class_408", "me.flashyreese.mods.reeses_sodium_options.client.gui");
-    @Entry public static Map<String, String> BINDINGS = Map.of();
+    @Entry(name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
+    @Entry(name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
+    @Entry(name = "midnightcontrols.menu.controller_toggle_sneak") public static boolean controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
+    @Entry(name = "midnightcontrols.menu.controller_toggle_sprint") public static boolean controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
+    @Entry(name = "midnightcontrols.menu.fast_block_placing") public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(name = "midnightcontrols.menu.fly_drifting") public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
+    @Entry(name = "midnightcontrols.menu.fly_drifting_vertical") public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
+    @Entry(name = "midnightcontrols.menu.reacharound.horizontal") public static boolean horizontalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(name = "midnightcontrols.menu.reacharound.vertical") public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
+    @Entry(name = "Reacharound Outline Color (WIP)", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
+    @Entry(name = "Reacharound Outline Alpha", min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
+    @Entry(name = "midnightcontrols.menu.right_dead_zone") public static double rightDeadZone = 0.25;
+    @Entry(name = "midnightcontrols.menu.left_dead_zone") public static double leftDeadZone = 0.25;
+    @Entry(name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
+    @Entry(name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false;
+    @Entry(name = "midnightcontrols.menu.rotation_speed") public static double rotationSpeed = 40.0; //used for x-axis, name kept for compatability
+    @Entry(name = "midnightcontrols.menu.y_axis_rotation_speed") public static double yAxisRotationSpeed = rotationSpeed;
+    @Entry(name = "midnightcontrols.menu.mouse_speed") public static double mouseSpeed = 25.0;
+    @Entry(name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
+    @Entry(name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
+    @Entry(name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
+    @Entry(name = "Controller ID") public static Object controllerID = 0;
+    @Entry(name = "2nd Controller ID") public static Object secondControllerID = -1;
+    @Entry(name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
+    @Entry(name = "Mouse screens") public static List<String> mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui",
+            "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375",
+            "net.minecraft.class_457", "net.minecraft.class_408", "net.minecraft.class_3872", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen",
+            "hardcorequesting.client.interfaces.GuiQuestBook", "hardcorequesting.client.interfaces.GuiReward", "hardcorequesting.client.interfaces.EditTrackerScreen",
+            "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
+    @Entry(name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
+    @Entry(name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
+    @Entry(name = "Keybindings") public static Map<String, String> BINDING = new HashMap<>();
 
     private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
-    @Entry public static double[] maxAnalogValues = new double[]{DEFAULT_MAX_VALUE, DEFAULT_MAX_VALUE, DEFAULT_MAX_VALUE, DEFAULT_MAX_VALUE};
+    @Entry(name = "Max analog values") public static double[] maxAnalogValues = new double[]{1, 1, 1, 1};
+    @Entry(name = "Trigger button fix") public static boolean triggerFix = true;
+    @Entry(name = "Enable Hints") public static boolean enableHints = true;
+    @Entry(name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+    @Entry(name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();
+    @Entry(name = "Ignored Unbound Keys") public static List<String> ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
+    @Entry @Hidden public static Map<String, Map<String, String>> controllerBindingProfiles = new HashMap<>();
+    private static Map<String, String> currentBindingProfile = new HashMap<>();
+    private static Controller prevController;
 
     /**
      * Loads the configuration
@@ -73,7 +95,6 @@ public class MidnightControlsConfig extends MidnightConfig {
         MidnightControlsClient.get().log("Configuration loaded.");
         // Controller controls.
         InputManager.loadButtonBindings();
-        //this.mod.ring.load(this.config);
     }
 
     /**
@@ -84,6 +105,15 @@ public class MidnightControlsConfig extends MidnightConfig {
         MidnightControlsClient.get().log("Configuration saved.");
         MidnightControlsFeature.refreshEnabled();
     }
+    public static void updateBindingsForController(Controller controller) {
+        if (controller.isConnected() && controller.isGamepad() && controllerBindingProfiles.containsKey(controller.getGuid()))
+            currentBindingProfile = controllerBindingProfiles.get(controller.getGuid());
+        else currentBindingProfile = Maps.newHashMap(BINDING);
+        InputManager.loadButtonBindings();
+    }
+    public static Map<String, String> getBindingsForController() {
+        return currentBindingProfile;
+    }
     /**
      * Gets the used controller.
      *
@@ -91,12 +121,25 @@ public class MidnightControlsConfig extends MidnightConfig {
      */
     public static Controller getController() {
         var raw = MidnightControlsConfig.controllerID;
+        Controller controller = Controller.byId(GLFW.GLFW_JOYSTICK_1);
         if (raw instanceof Number) {
-            return Controller.byId(((Number) raw).intValue());
+            controller = Controller.byId(((Number) raw).intValue());
         } else if (raw instanceof String) {
-            return Controller.byGuid((String) raw).orElse(Controller.byId(GLFW.GLFW_JOYSTICK_1));
+            controller = Controller.byGuid((String) raw).orElse(Controller.byId(GLFW.GLFW_JOYSTICK_1));
         }
-        return Controller.byId(GLFW.GLFW_JOYSTICK_1);
+        if ((!controller.isConnected() || !controller.isGamepad()) && MidnightControlsConfig.autoSwitchMode && !isEditing) {
+            for (int i = 0; i < GLFW.GLFW_JOYSTICK_LAST; ++i) {
+                Controller gamepad = Controller.byId(i);
+                if (gamepad.isConnected() && gamepad.isGamepad()) {
+                    controller = gamepad;
+                    i = GLFW_JOYSTICK_LAST;
+                }
+            }
+        }
+        if (controller.isConnected() && controller.isGamepad() && MidnightControlsConfig.autoSwitchMode && !isEditing) MidnightControlsConfig.controlsMode = ControlsMode.CONTROLLER;
+        if (prevController != controller) updateBindingsForController(controller);
+        prevController = controller;
+        return controller;
     }
 
     /**
@@ -154,7 +197,7 @@ public class MidnightControlsConfig extends MidnightConfig {
 
     public static double getAxisMaxValue(int axis) {
         if (axis >= MidnightControlsConfig.maxAnalogValues.length)
-            return DEFAULT_MAX_VALUE;
+            return 1;
         return MidnightControlsConfig.maxAnalogValues[axis];
     }
 
@@ -170,7 +213,7 @@ public class MidnightControlsConfig extends MidnightConfig {
      */
     public static void loadButtonBinding(@NotNull ButtonBinding button) {
         button.setButton(button.getDefaultButton());
-        var code = MidnightControlsConfig.BINDINGS.getOrDefault("controller.controls." + button.getName(), button.getButtonCode());
+        var code = getBindingsForController().getOrDefault("controller.controls." + button.getName(), button.getButtonCode());
 
         var matcher = BUTTON_BINDING_PATTERN.matcher(code);
 
@@ -194,14 +237,14 @@ public class MidnightControlsConfig extends MidnightConfig {
             button.setButton(buttons);
         } catch (Exception e) {
             MidnightControlsClient.get().warn("Malformed config value \"" + code + "\" for binding \"" + button.getName() + "\".");
-            MidnightControlsConfig.BINDINGS.put("controller.controls." + button.getName(), button.getButtonCode());
+            setButtonBinding(button, button.getButton());
         }
     }
 
     private static boolean checkValidity(@NotNull ButtonBinding binding, @NotNull String input, String group) {
         if (group == null) {
             MidnightControlsClient.get().warn("Malformed config value \"" + input + "\" for binding \"" + binding.getName() + "\".");
-            MidnightControlsConfig.BINDINGS.put("controller.controls." + binding.getName(), binding.getButtonCode());
+            setButtonBinding(binding, binding.getButton());
             return false;
         }
         return true;
@@ -215,7 +258,9 @@ public class MidnightControlsConfig extends MidnightConfig {
      */
     public static void setButtonBinding(@NotNull ButtonBinding binding, int[] button) {
         binding.setButton(button);
-        MidnightControlsConfig.BINDINGS.put("controller.controls." + binding.getName(), binding.getButtonCode());
+        getBindingsForController().put("controller.controls." + binding.getName(), binding.getButtonCode());
+        if (controllerBindingProfiles.containsKey(getController().getGuid())) controllerBindingProfiles.get(getController().getGuid()).put("controller.controls." + binding.getName(), binding.getButtonCode());
+        else BINDING.put("controller.controls." + binding.getName(), binding.getButtonCode());
     }
 
     public static boolean isBackButton(int btn, boolean isBtn, int state) {
@@ -251,4 +296,64 @@ public class MidnightControlsConfig extends MidnightConfig {
     public static boolean isMovementAxis(int axis) {
         return axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X;
     }
+
+    public static void reset() {
+        controlsMode = ControlsMode.DEFAULT;
+        autoSwitchMode = true;
+        debug = false;
+        hudEnable = true;
+        hudSide = HudSide.LEFT;
+        analogMovement = true;
+        doubleTapToSprint = true;
+        controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
+        controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
+        fastBlockPlacing = false;
+        flyDrifting = true;
+        verticalFlyDrifting = true;
+        horizontalReacharound = false;
+        verticalReacharound = false;
+        shouldRenderReacharoundOutline = true;
+        reacharoundOutlineColorHex = "#ffffff";
+        reacharoundOutlineColorAlpha = 102;
+        rightDeadZone = 0.25;
+        leftDeadZone = 0.25;
+        invertRightYAxis = false;
+        invertRightXAxis = false;
+        rotationSpeed = 40.0;
+        yAxisRotationSpeed = rotationSpeed;
+        mouseSpeed = 25.0;
+        unfocusedInput = false;
+        virtualMouse = false;
+        virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
+        controllerID = 0;
+        secondControllerID = -1;
+        controllerType = ControllerType.DEFAULT;
+        mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui", "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375", "net.minecraft.class_457", "net.minecraft.class_408", "net.minecraft.class_3872", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen", "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
+        BINDING = new HashMap<>();
+        maxAnalogValues = new double[]{1, 1, 1, 1};
+        triggerFix = true;
+        enableHints = true;
+        shortcutInControls = true;
+        ringBindings = new ArrayList<>();
+        ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
+        controllerBindingProfiles = new HashMap<>();
+    }
+
+    /**
+     * Gets the controller type from the controller's identifier.
+     *
+     * @return the controller name matches a type, else empty
+     */
+    public static @NotNull ControllerType matchControllerToType() {
+        String controller = getController().getName().toLowerCase();
+        if (controller.contains("xbox 360")) return ControllerType.XBOX_360;
+        else if (controller.contains("xbox") || controller.contains("afterglow")) return ControllerType.XBOX;
+        else if (controller.contains("steam deck")) return ControllerType.STEAM_DECK;
+        else if (controller.contains("steam")) return ControllerType.STEAM_CONTROLLER;
+        else if (controller.contains("dualsense")) return ControllerType.DUALSENSE;
+        else if (controller.contains("dualshock") || controller.contains("ps4")  || controller.contains("sony")) return ControllerType.DUALSHOCK;
+        else if (controller.contains("switch") || controller.contains("joy-con")  || controller.contains("wii") || controller.contains("nintendo")) return ControllerType.SWITCH;
+        else if (controller.contains("ouya")) return ControllerType.OUYA;
+        else return ControllerType.DEFAULT;
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java

@@ -10,15 +10,21 @@
 package eu.midnightdust.midnightcontrols.client;
 
 import com.google.common.collect.ImmutableSet;
+import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
+import eu.midnightdust.midnightcontrols.MidnightControls;
+import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
+import eu.midnightdust.midnightcontrols.client.compat.LibGuiCompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
+import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
 import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidget;
-import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.EntryListWidgetAccessor;
+import eu.midnightdust.midnightcontrols.client.mixin.*;
+import eu.midnightdust.midnightcontrols.client.ring.RingPage;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 import dev.lambdaurora.spruceui.navigation.NavigationDirection;
@@ -27,7 +33,7 @@ import dev.lambdaurora.spruceui.widget.AbstractSprucePressableButtonWidget;
 import dev.lambdaurora.spruceui.widget.SpruceElement;
 import dev.lambdaurora.spruceui.widget.SpruceLabelWidget;
 import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget;
-import net.fabricmc.fabric.impl.item.group.CreativeGuiExtensions;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.ParentElement;
@@ -37,16 +43,16 @@ import net.minecraft.client.gui.screen.advancement.AdvancementTab;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.gui.screen.ingame.MerchantScreen;
+import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
-import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.widget.*;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.screen.slot.Slot;
-import net.minecraft.screen.slot.SlotActionType;
-import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.math.MathHelper;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
@@ -70,6 +76,7 @@ public class MidnightInput {
     // Cooldowns
     public int actionGuiCooldown = 0;
     public boolean ignoreNextARelease = false;
+    public boolean ignoreNextXRelease = false;
     private double targetYaw = 0.0;
     private double targetPitch = 0.0;
     private float prevXAxis = 0.f;
@@ -79,6 +86,7 @@ public class MidnightInput {
     private float mouseSpeedX = 0.f;
     private float mouseSpeedY = 0.f;
     public int inventoryInteractionCooldown = 0;
+    public int screenCloseCooldown = 0;
 
     private ControllerControlsWidget controlsInput = null;
 
@@ -119,10 +127,13 @@ public class MidnightInput {
         // Decreases the cooldown for GUI actions.
         if (this.actionGuiCooldown > 0)
             --this.actionGuiCooldown;
+        if (this.screenCloseCooldown > 0)
+            --this.screenCloseCooldown;
 
         InputManager.updateStates();
 
         var controller = MidnightControlsConfig.getController();
+
         if (controller.isConnected()) {
             var state = controller.getState();
             this.fetchButtonInput(client, state, false);
@@ -135,10 +146,7 @@ public class MidnightInput {
                     this.fetchAxeInput(client, state, true);
                 });
 
-        boolean allowInput = true;
-
-        if (this.controlsInput != null && this.controlsInput.focusedBinding != null)
-            allowInput = false;
+        boolean allowInput = this.controlsInput == null || this.controlsInput.focusedBinding == null;
 
         if (allowInput)
             InputManager.updateBindings(client);
@@ -171,11 +179,11 @@ public class MidnightInput {
     }
 
     /**
-     * This method is called when Minecraft renders.
+     * This method is called to update the camera
      *
      * @param client the client instance
      */
-    public void onRender(float tickDelta, @NotNull MinecraftClient client) {
+    public void updateCamera(@NotNull MinecraftClient client) {
         if (!(client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay))
             return;
 
@@ -184,16 +192,29 @@ public class MidnightInput {
             return;
 
         if (this.targetYaw != 0.f || this.targetPitch != 0.f) {
-            float rotationYaw = (float) (player.prevYaw + (this.targetYaw / 0.10) * tickDelta);
-            float rotationPitch = (float) (player.prevPitch + (this.targetPitch / 0.10) * tickDelta);
+            float rotationYaw = (float) (client.player.prevYaw + (this.targetYaw * 0.175));
+            float rotationPitch = (float) (client.player.prevPitch + (this.targetPitch * 0.175));
+            client.player.prevYaw = rotationYaw;
+            client.player.prevPitch = MathHelper.clamp(rotationPitch, -90.f, 90.f);
             client.player.setYaw(rotationYaw);
             client.player.setPitch(MathHelper.clamp(rotationPitch, -90.f, 90.f));
-            if (client.player.isRiding()) {
+            if (client.player.isRiding() && client.player.getVehicle() != null) {
                 client.player.getVehicle().onPassengerLookAround(client.player);
             }
             client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
+            MidnightControlsCompat.HANDLERS.forEach(handler -> handler.handleCamera(client, targetYaw, targetPitch));
+            this.onRender(client);
         }
     }
+    /**
+     * This method is deprecated and will be removed in future versions
+     * It is just kept, because the current version of 'Do a Barrel Roll' mixins into this method
+     *
+     * @param client the client instance
+     */
+    @Deprecated
+    public void onRender(@NotNull MinecraftClient client) {
+    }
 
     /**
      * This method is called when a Screen is opened.
@@ -257,11 +278,34 @@ public class MidnightInput {
                 value *= -1.0F;
 
             int state = value > MidnightControlsConfig.rightDeadZone ? 1 : (value < -MidnightControlsConfig.rightDeadZone ? 2 : 0);
-            this.handleAxe(client, axis, value, absValue, state);
+            if (!(client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)))) this.handleAxe(client, axis, value, absValue, state);
+        }
+        if (client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen))) {
+            float x = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X)) > MidnightControlsConfig.leftDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X) : 0;
+            float y = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y)) > MidnightControlsConfig.leftDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y) : 0;
+            if (x == 0 && y == 0) {
+                x = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X)) > MidnightControlsConfig.rightDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X) : 0;
+                y = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y)) > MidnightControlsConfig.rightDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y) : 0;
+            }
+            int index = -1;
+            if (x < 0) {
+                if (y < 0) index = 0;
+                if (y == 0) index = 3;
+                if (y > 0) index = 5;
+            } else if (x == 0) {
+                if (y < 0) index = 1;
+                if (y > 0) index = 6;
+            } else if (x > 0) {
+                if (y < 0) index = 2;
+                if (y == 0) index = 4;
+                if (y > 0) index = 7;
+            }
+            if (client.currentScreen instanceof RingScreen && index > -1) RingPage.selected = index;
+            if (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)) EmotecraftCompat.handleEmoteSelector(index);
         }
     }
 
-    private void handleButton(@NotNull MinecraftClient client, int button, int action, boolean state) {
+    public void handleButton(@NotNull MinecraftClient client, int button, int action, boolean state) {
         if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
             if (action == 0 && !this.controlsInput.currentButtons.contains(button)) {
                 this.controlsInput.currentButtons.add(button);
@@ -276,12 +320,33 @@ public class MidnightInput {
             return;
         }
 
-        if (action == 0 || action == 2) {
-            if (client.currentScreen != null && isScreenInteractive(client.currentScreen)
+        if (client.currentScreen != null && (action == 0 || action == 2) && button == GLFW_GAMEPAD_BUTTON_Y &&
+                MidnightControlsConfig.arrowScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
+            pressKeyboardKey(client, GLFW.GLFW_KEY_ENTER);
+            this.screenCloseCooldown = 5;
+        }
+        else if (action == 0 || action == 2) {
+            if (client.currentScreen != null
                     && (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN
                     || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_LEFT || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT)) {
                 if (this.actionGuiCooldown == 0) {
-                    if (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP) {
+                    if (MidnightControlsConfig.arrowScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
+                        switch (button) {
+                            case GLFW_GAMEPAD_BUTTON_DPAD_UP -> pressKeyboardKey(client, GLFW.GLFW_KEY_UP);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> pressKeyboardKey(client, GLFW.GLFW_KEY_DOWN);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> pressKeyboardKey(client, GLFW.GLFW_KEY_LEFT);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> pressKeyboardKey(client, GLFW.GLFW_KEY_RIGHT);
+                        }
+                    }
+                    else if (MidnightControlsConfig.wasdScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
+                        switch (button) {
+                            case GLFW_GAMEPAD_BUTTON_DPAD_UP -> pressKeyboardKey(client, GLFW.GLFW_KEY_W);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> pressKeyboardKey(client, GLFW.GLFW_KEY_S);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> pressKeyboardKey(client, GLFW.GLFW_KEY_A);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> pressKeyboardKey(client, GLFW.GLFW_KEY_D);
+                        }
+                    }
+                    else if (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP) {
                         this.changeFocus(client.currentScreen, NavigationDirection.UP);
                     } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN) {
                         this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
@@ -301,105 +366,70 @@ public class MidnightInput {
                             return;
                         }
                     }
-                }
-            }
-
-            if (this.handleInventory(client, button)) {
-                this.ignoreNextARelease = true;
-                return;
-            }
-
-            if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
-                if (client.currentScreen != null && client.currentScreen.getClass() != TitleScreen.class) {
-                    if (!MidnightControlsCompat.handleMenuBack(client, client.currentScreen))
-                        if (!this.tryGoBack(client.currentScreen))
-                            client.currentScreen.close();
-                    return;
+                    else if (FabricLoader.getInstance().isModLoaded("libgui")) LibGuiCompat.handlePress(client.currentScreen);
                 }
             }
         }
 
         if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
                 && this.actionGuiCooldown == 0) {
-            if (client.currentScreen instanceof CreativeInventoryScreen creativeScreen && ((HandledScreenAccessor) creativeScreen).midnightcontrols$getSlotAt(
+            if (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
                     client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth(),
                     client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()) != null) return;
             if (!this.ignoreNextARelease) {
                 double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
                 double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
                 if (action == 0) {
-                    Screen.wrapScreenError(() -> client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1),
+                    Screen.wrapScreenError(() -> {
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(false);
+                        client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                            },
                             "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
                 } else if (action == 1) {
-                    Screen.wrapScreenError(() -> client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1),
+                    Screen.wrapScreenError(() -> {
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(false);
+                        client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                            },
                             "mouseReleased event handler", client.currentScreen.getClass().getCanonicalName());
+                } else if (action == 2) {
+                    Screen.wrapScreenError(() -> {
+                        client.currentScreen.setDragging(true);
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(true);
+                        ((MouseAccessor) client.mouse).midnightcontrols$onCursorPos(client.getWindow().getHandle(), client.mouse.getX(), client.mouse.getY());
+                        client.currentScreen.setDragging(false);
+                            },
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
                 }
-                this.actionGuiCooldown = 5;
+                this.screenCloseCooldown = 5;
             } else {
                 this.ignoreNextARelease = false;
             }
         }
+        else if (button == GLFW.GLFW_GAMEPAD_BUTTON_X && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
+                && this.actionGuiCooldown == 0) {
+            if (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
+                    client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth(),
+                    client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()) != null) return;
+            if (!this.ignoreNextXRelease) {
+                double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
+                double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
+                if (action == 0) {
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2),
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
+                } else if (action == 1) {
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2),
+                            "mouseReleased event handler", client.currentScreen.getClass().getCanonicalName());
+                }
+                this.screenCloseCooldown = 5;
+            } else {
+                this.ignoreNextXRelease = false;
+            }
+        }
+    }
+    public void pressKeyboardKey(MinecraftClient client, int key) {
+        client.keyboard.onKey(client.getWindow().getHandle(), key, 0, 1, 0);
     }
     /**
-     * Handles inventory interaction.
-     *
-     * @param client the client instance
-     * @param button the button pressed
-     * @return {@code true} if an inventory interaction was done
-     */
-    private boolean handleInventory(@NotNull MinecraftClient client, int button) {
-//        if (!(client.currentScreen instanceof HandledScreen screen))
-//            return false;
-//
-//        if (client.interactionManager == null || client.player == null)
-//            return false;
-//
-//        if (this.inventoryInteractionCooldown > 0)
-//            return true;
-//
-//        if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
-//            client.player.closeHandledScreen();
-//            return true;
-//        }
-//
-//        double x = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
-//        double y = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
-//
-//        var accessor = (HandledScreenAccessor) screen;
-//        Slot slot = ((HandledScreenAccessor) client.currentScreen).midnightcontrols$getSlotAt(x, y);
-//
-//        int slotId;
-//        if (slot == null) {
-//            if (client.player.currentScreenHandler.getCursorStack().isEmpty())
-//                return false;
-//            slotId = accessor.midnightcontrols$isClickOutsideBounds(x, y, accessor.getX(), accessor.getY(), GLFW_MOUSE_BUTTON_1) ? -999 : -1;
-//        } else {
-//            slotId = slot.id;
-//        }
-//
-//        var actionType = SlotActionType.PICKUP;
-//        int clickData = GLFW.GLFW_MOUSE_BUTTON_1;
-//        switch (button) {
-//            case GLFW_GAMEPAD_BUTTON_A:
-//                if (screen instanceof CreativeInventoryScreen)
-//                    if (((CreativeInventoryScreenAccessor) screen).midnightcontrols$isCreativeInventorySlot(slot))
-//                        actionType = SlotActionType.CLONE;
-//                if (slot != null && MidnightControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot)))
-//                    actionType = SlotActionType.CLONE;
-//                break;
-//            case GLFW.GLFW_GAMEPAD_BUTTON_X:
-//                clickData = GLFW_MOUSE_BUTTON_2;
-//                break;
-//            case GLFW.GLFW_GAMEPAD_BUTTON_Y:
-//                actionType = SlotActionType.QUICK_MOVE;
-//                break;
-//            default:
-//                return false;
-//        }
-//
-//        accessor.midnightcontrols$onMouseClick(slot, slotId, clickData, actionType);
-        return false;
-    }
 
     /**
      * Tries to go back.
@@ -409,13 +439,16 @@ public class MidnightInput {
      */
     public boolean tryGoBack(@NotNull Screen screen) {
         var set = ImmutableSet.of("gui.back", "gui.done", "gui.cancel", "gui.toTitle", "gui.toMenu");
+
         return screen.children().stream().filter(element -> element instanceof PressableWidget)
                 .map(element -> (PressableWidget) element)
                 .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
                 .anyMatch(element -> {
-                    if (set.stream().anyMatch(key -> element.getMessage().getContent().toString().equals(key))) {
-                        element.onPress();
-                        return true;
+                    if (element.getMessage().getContent() instanceof TranslatableTextContent translatableText) {
+                        if (set.stream().anyMatch(key -> translatableText.getKey().equals(key))) {
+                            element.onPress();
+                            return true;
+                        }
                     }
                     return false;
                 });
@@ -429,11 +462,24 @@ public class MidnightInput {
     private void handleAxe(@NotNull MinecraftClient client, int axis, float value, float absValue, int state) {
         int asButtonState = value > .5f ? 1 : (value < -.5f ? 2 : 0);
 
+
         if (axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER || axis == GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
                 || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER)
-                || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER))
-            if (asButtonState == 2)
+                || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER)) {
+            if (asButtonState == 2) {
                 asButtonState = 0;
+            }
+            else {
+                // Fixes Triggers not working correctly on some controllers
+                if (MidnightControlsConfig.triggerFix) {
+                    value = 1.0f;
+                    absValue = 1.0f;
+                    state = 1;
+                    asButtonState = 1;
+                }
+                if (MidnightControlsConfig.debug) System.out.println(axis + " "+ value + " " + absValue + " " + state);
+            }
+        }
 
         {
             boolean currentPlusState = asButtonState == 1;
@@ -502,6 +548,22 @@ public class MidnightInput {
                 }
                 return;
             }
+        } else if (client.currentScreen instanceof MerchantScreen merchantScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                // @TODO allow rebinding to left stick
+                if (absValue >= deadZone) {
+                    merchantScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+                return;
+            }
+        } else if (client.currentScreen instanceof StonecutterScreen stonecutterScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                // @TODO allow rebinding to left stick
+                if (absValue >= deadZone) {
+                    stonecutterScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+                return;
+            }
         } else if (client.currentScreen instanceof AdvancementsScreen advancementsScreen) {
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X || axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 var accessor = (AdvancementsScreenAccessor) advancementsScreen;
@@ -513,13 +575,26 @@ public class MidnightInput {
             }
         } else if (client.currentScreen != null) {
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && absValue >= deadZone) {
-                client.currentScreen.children().stream().filter(element -> element instanceof EntryListWidget)
+                float finalValue = value;
+                if (client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget)
+                        .map(element -> (SpruceEntryListWidget<?>) element)
+                        .filter(AbstractSpruceWidget::isFocusedOrHovered)
+                        .noneMatch(element -> {
+                            element.mouseScrolled(0.0, 0.0, -finalValue);
+                            return true;
+                        })
+                        &&
+                        client.currentScreen.children().stream().filter(element -> element instanceof EntryListWidget)
                         .map(element -> (EntryListWidget<?>) element)
                         .filter(element -> element.getType().isFocused())
-                        .anyMatch(element -> {
-                            element.mouseScrolled(0.0, 0.0, -value);
+                        .noneMatch(element -> {
+                            element.mouseScrolled(0.0, 0.0, -finalValue);
                             return true;
-                        });
+                        }))
+                {
+                    client.currentScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+
                 return;
             }
         }
@@ -591,7 +666,7 @@ public class MidnightInput {
         }
     }
 
-    private boolean handleAButton(@NotNull Screen screen, @NotNull Element focused) {
+    public boolean handleAButton(@NotNull Screen screen, @NotNull Element focused) {
         if (focused instanceof PressableWidget widget) {
             widget.playDownSound(MinecraftClient.getInstance().getSoundManager());
             widget.onPress();
@@ -654,7 +729,7 @@ public class MidnightInput {
             this.actionGuiCooldown = 2; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
             return false;
         } else if (element instanceof AlwaysSelectedEntryListWidget) {
-            ((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.UP : EntryListWidget.MoveDirection.DOWN);
+            ((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.DOWN : EntryListWidget.MoveDirection.UP);
             return false;
         } else if (element instanceof ParentElement entryList) {
             var focused = entryList.getFocused();
@@ -679,9 +754,9 @@ public class MidnightInput {
             double powValue = Math.pow(value, 2.0);
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 if (state == 2) {
-                    this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
+                    this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
                 } else if (state == 1) {
-                    this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
+                    this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
                 }
             }
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
@@ -695,22 +770,91 @@ public class MidnightInput {
     }
 
     private boolean changeFocus(@NotNull Screen screen, NavigationDirection direction) {
-        if (screen instanceof SpruceScreen spruceScreen) {
-            if (spruceScreen.onNavigation(direction, false)) {
-                this.actionGuiCooldown = 5;
+        if (!isScreenInteractive(screen) && !screen.getClass().getCanonicalName().contains("me.jellysquid.mods.sodium.client.gui")) return false;
+        try {
+            if (screen instanceof SpruceScreen spruceScreen) {
+                if (spruceScreen.onNavigation(direction, false)) {
+                    this.actionGuiCooldown = 5;
+                }
+                return false;
             }
-            return false;
-        }
-        if (!screen.changeFocus(direction.isLookingForward())) {
-            if (screen.changeFocus(direction.isLookingForward())) {
+            if (FabricLoader.getInstance().isModLoaded("sodium"))
+                SodiumCompat.handleInput(screen, direction.isLookingForward());
+            // This still needs some work
+//            ScreenAccessor accessor = (ScreenAccessor) screen;
+//            if (accessor.getSelected() != null && accessor.getSelected() instanceof ClickableWidget selected && accessor.getSelectables() != null) {
+//                //System.out.println(direction);
+//                if (accessor.getSelectables().size() >= 2) {
+//                    //System.out.println(direction + " 2");
+//                    int xDifference = Integer.MAX_VALUE;
+//                    int yDifference = Integer.MAX_VALUE;
+//                    ClickableWidget newWidget = null;
+//                    for (int i = 0; i < accessor.getSelectables().size(); ++i) {
+//                        if (accessor.getSelectables().get(i) instanceof ClickableWidget candidate) {
+//                            if (!(candidate.x == selected.x && candidate.y == selected.y)) {
+//                                int canXDifference = Math.abs(candidate.x - selected.x);
+//                                int canYDifference = Math.abs(candidate.y - selected.y);
+//                                if (direction.isHorizontal()) {
+//                                    if (direction.isLookingForward()) {
+//                                        if (candidate.x >= selected.x && canYDifference <= yDifference && canXDifference <= xDifference) {
+//                                            System.out.println(direction + " forward horizontal " + candidate);
+//                                            newWidget = candidate;
+//                                            xDifference = canXDifference;
+//                                            yDifference = canYDifference;
+//                                        }
+//                                    } else {
+//                                        if (candidate.x <= selected.x && canYDifference <= yDifference && canXDifference >= xDifference) {
+//                                            System.out.println(direction + " backward horizontal " + candidate);
+//                                            newWidget = candidate;
+//                                            xDifference = canXDifference;
+//                                            yDifference = canYDifference;
+//                                        }
+//                                    }
+//                                } else {
+//                                    if (direction.isLookingForward()) {
+//                                        if (candidate.y >= selected.y && canYDifference <= yDifference && canXDifference <= xDifference) {
+//                                            System.out.println(direction + " forward vertical " + candidate);
+//                                            newWidget = candidate;
+//                                            xDifference = canXDifference;
+//                                            yDifference = canYDifference;
+//                                        }
+//                                    } else {
+//                                        if (candidate.y <= selected.y && canYDifference >= yDifference && canXDifference <= xDifference) {
+//                                            System.out.println(direction + " backward vertical " + candidate);
+//                                            newWidget = candidate;
+//                                            xDifference = canXDifference;
+//                                            yDifference = canYDifference;
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                    if (newWidget != null)  {
+//                        //selected.changeFocus(true);
+//                        ((ClickableWidgetAccessor) selected).setFocused(false);
+//                        ((ClickableWidgetAccessor) newWidget).setFocused(true);
+//                        screen.setFocused(newWidget);
+//                        screen.changeFocus(false);
+//                        screen.changeFocus(true);
+//                        this.actionGuiCooldown = 5;
+//                        return true;
+//                    }
+//
+//                }
+//            }
+            if (!screen.changeFocus(direction.isLookingForward())) {
+                if (screen.changeFocus(direction.isLookingForward())) {
+                    this.actionGuiCooldown = 5;
+                    return false;
+                }
+                return true;
+            } else {
                 this.actionGuiCooldown = 5;
                 return false;
             }
-            return true;
-        } else {
-            this.actionGuiCooldown = 5;
-            return false;
-        }
+        } catch (Exception exception) {MidnightControls.get().warn("Unknown exception encountered while trying to change focus: "+exception);}
+        return false;
     }
 
     public static boolean isScreenInteractive(@NotNull Screen screen) {

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightReacharound.java

@@ -144,7 +144,7 @@ public class MidnightReacharound {
                 return null;
             }
 
-            return new BlockHitResult(client.crosshairTarget.getPos(), direction, blockPos, false);
+            return new BlockHitResult(new Vec3d(blockPos.getX(),blockPos.getY(),blockPos.getZ()), direction, blockPos, false);
         }
         return null;
     }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/BedrockifyCompat.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2022 Motschen <motschen@midnightdust.eu>
+ *
+ * This file is part of midnightcontrols.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import me.juancarloscp52.bedrockify.client.BedrockifyClient;
+import me.juancarloscp52.bedrockify.client.BedrockifyClientSettings;
+import net.minecraft.client.gui.screen.Screen;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * Represents HQM compatibility handler.
+ *
+ * @author Motschen
+ * @version 1.7.0
+ * @since 1.7.0
+ */
+public class BedrockifyCompat implements CompatHandler {
+
+    @Override
+    public void handle(@NotNull MidnightControlsClient mod) {
+        BedrockifyClient.getInstance().settings.disableFlyingMomentum = false;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/CompatHandler.java

@@ -33,6 +33,13 @@ public interface CompatHandler {
      */
     void handle(@NotNull MidnightControlsClient mod);
 
+    /**
+     * Handles custom camera updates
+     *
+     * @param client the Minecraft client instance
+     */
+    default void handleCamera(@NotNull MinecraftClient client, double targetYaw, double targetPitch) {};
+
     /**
      * Returns whether the mouse is required on the specified screen.
      *

src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java

@@ -0,0 +1,48 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import dev.emi.emi.EmiConfig;
+import dev.emi.emi.screen.EmiScreen;
+import dev.emi.emi.screen.EmiScreenManager;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import org.aperlambda.lambdacommon.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
+
+public class EMICompat implements CompatHandler {
+    public static boolean handleTabs(boolean direction) {
+        if (isEMIEnabled() && MidnightControlsClient.get().input.actionGuiCooldown == 0 && EmiScreenManager.searchLeft != null && EmiScreenManager.searchRight != null) {
+            if (direction) EmiScreenManager.searchRight.onPress();
+            else EmiScreenManager.searchLeft.onPress();
+            MidnightControlsClient.get().input.actionGuiCooldown = 5;
+            return true;
+        }
+        return false;
+    }
+    @Override
+    public void handle(@NotNull MidnightControlsClient mod) {
+        ButtonCategory category = new ButtonCategory(new Identifier("midnightcontrols","category.emi"));
+        InputManager.registerCategory(category);
+        new ButtonBinding.Builder("emi_page_left")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
+                .category(category)
+                .action((client,action,value,buttonState)->handleTabs(false)).cooldown()
+                .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen<?> || client.currentScreen instanceof EmiScreen))
+                .register();
+        new ButtonBinding.Builder("emi_page_right")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))
+                .category(category)
+                .action((client,action,value,buttonState)->handleTabs(true)).cooldown()
+                .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen<?> || client.currentScreen instanceof EmiScreen))
+                .register();
+    }
+    public static boolean isEMIEnabled() {
+        return EmiConfig.enabled;
+    }
+    public static boolean isSearchBarCentered() {
+        return EmiConfig.centerSearchBar;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/EmotecraftCompat.java

@@ -1,49 +1,29 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
 package eu.midnightdust.midnightcontrols.client.compat;
 
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
-import io.github.kosmx.emotes.main.network.ClientEmotePlay;
-import org.jetbrains.annotations.NotNull;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 
-/**
- * Represents a compatibility handler for Emotecraft.
- *
- * @author Motschen
- * @version 1.4.3
- * @since 1.0.0
- */
-public class EmotecraftCompat implements CompatHandler {
-    @Override
-    public void handle(@NotNull MidnightControlsClient mod) {
-        new ButtonBinding.Builder("key.emotecraft.fastchoose")
-                .buttons(16)
-                .onlyInGame()
-                .cooldown(true)
-                .category(ButtonBinding.MISC_CATEGORY)
-                .action((client, button, value, action) -> {
-                    client.setScreen(new FastChosseScreen(null));
-                    return true;
-                })
-                .register();
-        new ButtonBinding.Builder("key.emotecraft.stop")
-                .buttons(17)
-                .onlyInGame()
-                .cooldown(true)
-                .category(ButtonBinding.MISC_CATEGORY)
-                .action((client, button, value, action) -> {
-                    ClientEmotePlay.clientStopLocalEmote();
-                    return true;
-                })
-                .register();
+public class EmotecraftCompat {
+    public static boolean isEmotecraftScreen(Screen screen) {
+        return screen instanceof FastChosseScreen;
+    }
+    public static void handleEmoteSelector(int index) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client.currentScreen instanceof FastChosseScreen) {
+            int x = client.getWindow().getWidth() / 2;
+            int y = client.getWindow().getHeight() / 2;
+            if (index == 0) InputManager.queueMousePosition(x-200, y-200);
+            if (index == 1) InputManager.queueMousePosition(x, y-200);
+            if (index == 2) InputManager.queueMousePosition(x+200, y-200);
+            if (index == 3) InputManager.queueMousePosition(x-200, y);
+            if (index == 4) InputManager.queueMousePosition(x+200, y);
+            if (index == 5) InputManager.queueMousePosition(x-200, y+200);
+            if (index == 6) InputManager.queueMousePosition(x, y+200);
+            if (index == 7) InputManager.queueMousePosition(x+200, y+200);
+
+            InputManager.INPUT_MANAGER.updateMousePosition(client);
+        }
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/InventoryTabsCompat.java

@@ -0,0 +1,33 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import com.kqp.inventorytabs.tabs.TabManager;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+
+public class InventoryTabsCompat {
+
+    public static void handleInventoryTabs(Screen screen, boolean next) {
+        if (screen instanceof HandledScreen<?> && !(screen instanceof CreativeInventoryScreen)) {
+            TabManager tabManager = TabManager.getInstance();
+            int tabIndex = tabManager.tabs.indexOf(tabManager.currentTab);
+            if (next) {
+                if (tabIndex < tabManager.tabs.size() - 1) tabManager.onTabClick(tabManager.tabs.get(tabIndex + 1));
+                else tabManager.onTabClick(tabManager.tabs.get(0));
+            } else {
+                if (tabIndex > 0) tabManager.onTabClick(tabManager.tabs.get(tabIndex - 1));
+                else tabManager.onTabClick(tabManager.tabs.get(tabManager.tabs.size() - 1));
+            }
+        }
+    }
+    public static void handleInventoryPage(Screen screen, boolean next) {
+        if (screen instanceof HandledScreen<?> && !(screen instanceof CreativeInventoryScreen)) {
+            TabManager tabManager = TabManager.getInstance();
+            if (next) {
+                if (tabManager.canGoForwardAPage()) tabManager.setCurrentPage(tabManager.currentPage + 1);
+            } else {
+                if (tabManager.canGoBackAPage()) tabManager.setCurrentPage(tabManager.currentPage - 1);
+            }
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/LibGuiCompat.java

@@ -0,0 +1,25 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import io.github.cottonmc.cotton.gui.impl.client.CottonScreenImpl;
+import io.github.cottonmc.cotton.gui.widget.WButton;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.sound.SoundEvents;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("UnstableApiUsage")
+public class LibGuiCompat {
+    public static boolean handlePress(@NotNull Screen screen) {
+        if (screen instanceof CottonScreenImpl cottonScreen) {
+            if (cottonScreen.getDescription() != null && cottonScreen.getDescription().getFocus() != null) {
+                if (cottonScreen.getDescription().getFocus() instanceof WButton button && button.getOnClick() != null) {
+                    button.getOnClick().run();
+                    MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_BUTTON_CLICK, 1.0F));
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java

@@ -45,17 +45,17 @@ public class MidnightControlsCompat {
             mod.log("Adding Ok Zoomer compatibility...");
             HANDLERS.add(new OkZoomerCompat());
         }
-        /*if (isReiPresent()) {
-            mod.log("Adding REI compatiblity...");
-            HANDLERS.add(new ReiCompat());
-        }*/
+        if (isEMIPresent()) {
+            mod.log("Adding EMI compatibility...");
+            HANDLERS.add(new EMICompat());
+        }
         if (FabricLoader.getInstance().isModLoaded("hardcorequesting") && LambdaReflection.doesClassExist(HQMCompat.GUI_BASE_CLASS_PATH)) {
             mod.log("Adding HQM compatibility...");
             HANDLERS.add(new HQMCompat());
         }
-        if (FabricLoader.getInstance().isModLoaded("emotecraft")) {
-            mod.log("Adding Emotecraft compatibility...");
-            HANDLERS.add(new EmotecraftCompat());
+        if (FabricLoader.getInstance().isModLoaded("bedrockify")) {
+            mod.log("Adding Bedrockify compatibility...");
+            HANDLERS.add(new BedrockifyCompat());
         }
         HANDLERS.forEach(handler -> handler.handle(mod));
         InputManager.loadButtonBindings();
@@ -163,4 +163,28 @@ public class MidnightControlsCompat {
     public static boolean isReiPresent() {
         return FabricLoader.getInstance().isModLoaded("roughlyenoughitems");
     }
+    /**
+     * Returns whether EMI is present.
+     *
+     * @return true if EMI is present, else false
+     */
+    public static boolean isEMIPresent() {
+        return FabricLoader.getInstance().isModLoaded("emi");
+    }
+    /**
+     * Returns whether InventoryTabs is present.
+     *
+     * @return true if InventoryTabs is present, else false
+     */
+    public static boolean isInventoryTabsPresent() {
+        return FabricLoader.getInstance().isModLoaded("inventorytabs");
+    }
+    /**
+     * Returns whether Emotecraft is present.
+     *
+     * @return true if Emotecraft is present, else false
+     */
+    public static boolean isEmotecraftPresent() {
+        return FabricLoader.getInstance().isModLoaded("emotecraft");
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsMixinPlugin.java

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
+import net.fabricmc.loader.api.FabricLoader;
 import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
@@ -29,10 +30,7 @@ public class MidnightControlsMixinPlugin implements IMixinConfigPlugin {
     private final HashMap<String, Boolean> conditionalMixins = new HashMap<>();
 
     public MidnightControlsMixinPlugin() {
-        this.putConditionalMixin("EntryListWidgetAccessor", MidnightControlsCompat.isReiPresent());
-        this.putConditionalMixin("EntryWidgetAccessor", MidnightControlsCompat.isReiPresent());
-        this.putConditionalMixin("RecipeViewingScreenAccessor", MidnightControlsCompat.isReiPresent());
-        this.putConditionalMixin("VillagerRecipeViewingScreenAccessor", MidnightControlsCompat.isReiPresent());
+        this.putConditionalMixin("SodiumOptionsGUIAccessor", FabricLoader.getInstance().isModLoaded("sodium"));
     }
 
     private void putConditionalMixin(@NotNull String path, boolean condition) {

src/main/java/eu/midnightdust/midnightcontrols/client/compat/ReiCompat.java

@@ -1,355 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat;
-
-import eu.midnightdust.midnightcontrols.client.ButtonState;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.compat.mixin.EntryListWidgetAccessor;
-import eu.midnightdust.midnightcontrols.client.compat.mixin.EntryWidgetAccessor;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.controller.InputHandlers;
-import eu.midnightdust.midnightcontrols.client.controller.PressAction;
-import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
-import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
-import net.minecraft.client.MinecraftClient;
-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.ButtonWidget;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.Pair;
-import org.aperlambda.lambdacommon.utils.LambdaReflection;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Optional;
-
-import static eu.midnightdust.midnightcontrols.client.compat.CompatHandler.SlotPos.INVALID_SLOT;
-import static org.lwjgl.glfw.GLFW.*;
-
-/**
- * Represents a compatibility handler for REI.
- *
- * @author LambdAurora
- * @version 1.7.0
- * @since 1.2.0
- */
-public class ReiCompat implements CompatHandler {
-    private static EntryListWidget ENTRY_LIST_WIDGET;
-
-    @Override
-    public void handle(@NotNull MidnightControlsClient mod) {
-        /*ButtonBinding.builder(new Identifier("rei", "category_back"))
-                .buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
-                .filter((client, binding) -> isViewingScreen(client.currentScreen))
-                .action(handleTab(false))
-                .cooldown(true)
-                .register();
-        ButtonBinding.builder(new Identifier("rei", "category_next"))
-                .buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
-                .filter((client, binding) -> isViewingScreen(client.currentScreen))
-                .action(handleTab(true))
-                .cooldown(true)
-                .register();
-
-        ButtonBinding.builder(new Identifier("rei", "page_back"))
-                .buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, false))
-                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
-                .action(handlePage(false))
-                .cooldown(true)
-                .register();
-        ButtonBinding.builder(new Identifier("rei", "page_next"))
-                .buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, true))
-                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
-                .action(handlePage(true))
-                .cooldown(true)
-                .register();
-
-        ButtonBinding.builder(new Identifier("rei", "recipe_back"))
-                .buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP)
-                .filter((client, binding) -> isViewingScreen(client.currentScreen))
-                .action(handleRecipe(false))
-                .cooldown(true)
-                .register();
-        ButtonBinding.builder(new Identifier("rei", "recipe_next"))
-                .buttons(GLFW_GAMEPAD_BUTTON_DPAD_DOWN)
-                .filter((client, binding) -> isViewingScreen(client.currentScreen))
-                .action(handleRecipe(true))
-                .cooldown(true)
-                .register();
-
-        // For some reasons this is broken.
-        ButtonBinding.builder(new Identifier("rei", "show_usage"))
-                .buttons(GLFW_GAMEPAD_BUTTON_RIGHT_THUMB)
-                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
-                .action(handleShowRecipeUsage(true))
-                .cooldown(true)
-                .register();
-
-        ButtonBinding.builder(new Identifier("rei", "show_recipe"))
-                .buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB)
-                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
-                .action(handleShowRecipeUsage(false))
-                .cooldown(true)
-                .register();
-         */
-    }
-    /*
-
-    @Override
-    public boolean requireMouseOnScreen(Screen screen) {
-        return isViewingScreen(screen);
-    }
-
-    @Override
-    public @Nullable CompatHandler.SlotPos getSlotAt(@NotNull Screen screen, int mouseX, int mouseY) {
-
-        ScreenOverlayImpl overlay = ScreenOverlayImpl.getInstance();
-        if (overlay.isInside(mouseX, mouseY)) {
-            EntryListWidget widget = getEntryListWidget();
-            if (widget == null)
-                return null;
-
-            return this.getSlotAt(widget, mouseX, mouseY, false);
-        } else if (isViewingScreen(screen)) {
-            for (Element element : screen.children()) {
-                var slot = this.getSlotAt(element, mouseX, mouseY, true);
-                if (slot != null)
-                    return slot;
-            }
-        }
-        return null;
-    }
-
-    private @Nullable CompatHandler.SlotPos getSlotAt(@NotNull Element element, int mouseX, int mouseY, boolean allowEmpty) {
-        if (element instanceof EntryWidget) {
-            EntryWidget entry = (EntryWidget) element;
-            if (entry.containsMouse(mouseX, mouseY)) {
-                if (!allowEmpty && entry.getEntries().isEmpty())
-                    return INVALID_SLOT;
-                return new SlotPos(entry.getBounds().getX() + 1, entry.getBounds().getY() + 1);
-            }
-        } else if (element instanceof EntryListWidget) {
-            List<EntryListEntryWidget> entries = ((EntryListWidgetAccessor) element).getEntries();
-            for (EntryListEntryWidget entry : entries) {
-                var slot = this.getSlotAt(entry, mouseX, mouseY, allowEmpty);
-                if (slot != null && slot != INVALID_SLOT)
-                    return slot;
-            }
-        } else if (!(element instanceof ButtonWidget) && element instanceof WidgetWithBounds widgetWithBounds) {
-            for (var child : widgetWithBounds.children()) {
-                var slot = this.getSlotAt(child, mouseX, mouseY, allowEmpty);
-                if (slot != null && slot != INVALID_SLOT)
-                    return slot;
-            }
-        }
-        return null;
-    }
-
-    private static boolean isViewingScreen(Screen screen) {
-        return screen instanceof DefaultDisplayViewingScreen || screen instanceof CompositeDisplayViewingScreen;
-    }
-
-    @Override
-    public boolean handleMenuBack(@NotNull MinecraftClient client, @NotNull Screen screen) {
-        if (!isViewingScreen(screen))
-            return false;
-
-        MinecraftClient.getInstance().setScreen(REIRuntimeImpl.getInstance().getPreviousContainerScreen());
-        REIRuntimeImpl.getInstance().getLastOverlay().init();
-        return true;
-    }
-
-    private static EntryListWidget getEntryListWidget() {
-        if (ENTRY_LIST_WIDGET == null) {
-            ENTRY_LIST_WIDGET = LambdaReflection.getFirstFieldOfType(ContainerScreenOverlay.class, EntryListWidget.class)
-                    .map(field -> (EntryListWidget) LambdaReflection.getFieldValue(null, field))
-                    .orElse(null);
-        }
-        return ENTRY_LIST_WIDGET;
-    }
-
-    private static @Nullable AbstractEntryStack getCurrentStack(@NotNull MinecraftClient client) {
-        double x = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
-        double y = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
-
-        if (isViewingScreen(client.currentScreen)) {
-            for (Element element : client.currentScreen.children()) {
-                EntryStack stack = getCurrentStack(element, x, y);
-                if (stack != null)
-                    return stack;
-            }
-        }
-
-        Optional<ContainerScreenOverlay> overlay = REIRuntimeImpl.getInstance().getOverlay(false,false);
-        if (!overlay.isPresent())
-            return RecipeHelper.getInstance().getScreenFocusedStack(client.currentScreen);
-        EntryListWidget widget = getEntryListWidget();
-        if (widget == null)
-            return ScreenOverlayImpl.getInstance().getInstance().getOverlayMenu()..getScreenFocusedStack(client.currentScreen);
-
-        return getCurrentStack(widget, x, y);
-    }
-
-    private static @Nullable EntryStack getCurrentStack(@NotNull Element element, double mouseX, double mouseY) {
-        if (element instanceof EntryWidget) {
-            EntryWidget entry = (EntryWidget) element;
-            if (entry.containsMouse(mouseX, mouseY))
-                return ((EntryWidgetAccessor) entry).lambdacontrols_getCurrentEntry();
-        } else if (element instanceof EntryListWidget) {
-            List<EntryListEntryWidget> entries = ((EntryListWidgetAccessor) element).getEntries();
-            for (EntryListEntryWidget entry : entries) {
-                if (entry.containsMouse(mouseX, mouseY)) {
-                    return ((EntryWidgetAccessor) entry).lambdacontrols_getCurrentEntry();
-                }
-            }
-        } else if (!(element instanceof ButtonWidget) && element instanceof WidgetWithBounds) {
-            for (Element child : ((WidgetWithBounds) element).children()) {
-                EntryStack stack = getCurrentStack(child, mouseX, mouseY);
-                if (stack != null)
-                    return stack;
-            }
-        }
-        return null;
-    }
-
-    private static PressAction handleShowRecipeUsage(boolean usage) {
-        return (client, button, value, action) -> {
-            if (action.isUnpressed())
-                return false;
-
-            EntryStack stack = RecipeHelper.getInstance().getScreenFocusedStack(client.currentScreen);
-            if (stack == null) {
-                stack = getCurrentStack(client);
-            }
-
-            if (stack != null && !stack.isEmpty()) {
-                stack = stack.copy();
-                if (usage) {
-                    return ClientHelper.getInstance().openView(ClientHelper.ViewSearchBuilder.builder().addUsagesFor(stack).setInputNotice(stack).fillPreferredOpenedCategory());
-                } else {
-                    return ClientHelper.getInstance().openView(ClientHelper.ViewSearchBuilder.builder().addRecipesFor(stack).setOutputNotice(stack).fillPreferredOpenedCategory());
-                }
-            }
-
-            return false;
-        };
-    }
-
-    private static PressAction handlePage(boolean next) {
-        return (client, button, value, action) -> {
-            if (action == ButtonState.RELEASE)
-                return false;
-
-            Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
-            if (!overlay.isPresent())
-                return false;
-
-            EntryListWidget widget = getEntryListWidget();
-            if (widget == null)
-                return false;
-
-            if (next)
-                widget.nextPage();
-            else
-                widget.previousPage();
-            widget.updateEntriesPosition();
-
-            return true;
-        };
-    }
-
-    /**
-     * Returns the handler for category tabs buttons.
-     *
-     * @param next True if the action is to switch to the next tab.
-     * @return The handler.
-     */
-    /*
-    private static PressAction handleTab(boolean next) {
-        return (client, button, value, action) -> {
-            if (action != ButtonState.RELEASE)
-                return false;
-
-            if (client.currentScreen instanceof RecipeViewingScreen) {
-                RecipeViewingScreenAccessor screen = (RecipeViewingScreenAccessor) client.currentScreen;
-                if (next)
-                    screen.getCategoryNext().onClick();
-                else
-                    screen.getCategoryBack().onClick();
-                return true;
-            } else if (client.currentScreen instanceof VillagerRecipeViewingScreen) {
-                VillagerRecipeViewingScreenAccessor screen = (VillagerRecipeViewingScreenAccessor) client.currentScreen;
-                List<RecipeCategory<?>> categories = screen.getCategories();
-                int currentTab = screen.getSelectedCategoryIndex();
-                screen.setSelectedCategoryIndex(getNextIndex(currentTab, categories.size(), next));
-                screen.setSelectedRecipeIndex(0);
-                screen.lambdacontrols_init();
-                return true;
-            }
-            return false;
-        };
-    }
-
-    private static PressAction handleRecipe(boolean next) {
-        return (client, button, value, action) -> {
-            if (action.isUnpressed())
-                return false;
-
-            if (client.currentScreen instanceof RecipeViewingScreen) {
-                RecipeViewingScreenAccessor screen = (RecipeViewingScreenAccessor) client.currentScreen;
-                if (next)
-                    screen.getRecipeNext().onClick();
-                else
-                    screen.getRecipeBack().onClick();
-                return true;
-            } else if (client.currentScreen instanceof VillagerRecipeViewingScreen) {
-                VillagerRecipeViewingScreenAccessor screen = (VillagerRecipeViewingScreenAccessor) client.currentScreen;
-                List<RecipeCategory<?>> categories = screen.getCategories();
-                int currentTab = screen.getSelectedCategoryIndex();
-                List<RecipeDisplay> recipes = screen.getCategoryMap().get(categories.get(currentTab));
-
-                if (recipes.size() == 0)
-                    return true;
-
-                int currentRecipe = screen.getSelectedRecipeIndex();
-                int nextRecipe = getNextIndex(currentRecipe, recipes.size(), next);
-
-                if (nextRecipe == 0) {
-                    screen.getScrolling().scrollTo(0.0, true);
-                } else if (nextRecipe == recipes.size() - 1) {
-                    screen.getScrolling().scrollTo(screen.getScrolling().getMaxScroll(), true);
-                } else {
-                    double scrollAmount = screen.getScrolling().getMaxScroll() / (float) recipes.size();
-                    screen.getScrolling().offset(next ? scrollAmount : -scrollAmount, true);
-                }
-
-                screen.setSelectedRecipeIndex(nextRecipe);
-                screen.lambdacontrols_init();
-
-                return true;
-            }
-
-            return false;
-        };
-    }
-
-    private static int getNextIndex(int currentIndex, int size, boolean next) {
-        int nextIndex = currentIndex + (next ? 1 : -1);
-        if (nextIndex < 0)
-            nextIndex = size - 1;
-        else if (nextIndex >= size)
-            nextIndex = 0;
-        return nextIndex;
-    }
-     */
-}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/SodiumCompat.java

@@ -0,0 +1,43 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.MidnightControls;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.compat.mixin.SodiumOptionsGUIAccessor;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
+import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+
+public class SodiumCompat {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static void handleInput(Screen screen, boolean direction) {
+        if (screen instanceof SodiumOptionsGUI optionsGUI) {
+            SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;
+            final int max = accessor.getControls().size()-1;
+
+            var option = accessor.getControls().stream().filter(ControlElement::isHovered).findFirst().orElse(accessor.getControls().get(0));
+            int i = accessor.getControls().indexOf(option);
+            i = (direction ? ((max > i) ? ++i : 0) : (i > 0 ? --i : max));
+
+            var dimensions = accessor.getControls().get(i).getDimensions();
+            int x = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterX());
+            int y = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterY());
+            InputManager.queueMousePosition(x,y);
+            InputManager.INPUT_MANAGER.updateMousePosition(client);
+            MidnightControlsClient.get().input.actionGuiCooldown = 5;
+            if (MidnightControlsConfig.debug) MidnightControls.get().log(i+" "+accessor.getControls().size()+" | " + dimensions.getCenterX() + " " + dimensions.getCenterY());
+        }
+    }
+    public static void handleTabs(Screen screen, boolean direction) {
+        if (screen instanceof SodiumOptionsGUI optionsGUI) {
+            SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;
+            final int max = accessor.getPages().size()-1;
+            int i = accessor.getPages().indexOf(accessor.getCurrentPage());
+            i = (direction ? ((max > i) ? ++i : 0) : (i > 0 ? --i : max));
+            if (MidnightControlsConfig.debug) MidnightControls.get().log(""+i);
+            optionsGUI.setPage(accessor.getPages().get(i));
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/VoxelMapCompat.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2022 Motschen <motschen@midnightdust.eu>
+ *
+ * This file is part of MidnightControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
+import net.minecraft.client.option.KeyBinding;
+import org.aperlambda.lambdacommon.Identifier;
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
+
+/**
+ * Represents a compatibility handler for VoxelMap.
+ *
+ * @author Motschen
+ * @version 1.8.0
+ * @since 1.8.0
+ */
+public class VoxelMapCompat implements CompatHandler {
+
+    private final KeyBinding voxelMapZoomKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.zoom", null);
+    private final KeyBinding voxelmapFullscreenKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.togglefullscreen", null);
+    private final KeyBinding voxelmapMenuKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.voxelmapmenu", null);;
+    private final KeyBinding voxelmapWaypointMenuKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.waypointmenu", null);;
+    private final KeyBinding voxelmapWaypointKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.waypointhotkey", null);
+    private final KeyBinding voxelmapMobToggleKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.togglemobs", null);
+    private final KeyBinding voxelmapWaypointToggleKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.toggleingamewaypoints", null);
+    private static final ButtonCategory VOXELMAP_CATEGORY = InputManager.registerCategory(new Identifier("minecraft","controls.minimap.title"));
+
+
+    @Override
+    public void handle(@NotNull MidnightControlsClient mod) {
+        if (MidnightControlsConfig.debug && KeyBindingIDAccessor.getKEYS_BY_ID() != null) KeyBindingIDAccessor.getKEYS_BY_ID().forEach((a, b) -> System.out.println(a + " - " + b));
+        new ButtonBinding.Builder("key.minimap.zoom")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_X)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelMapZoomKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.togglefullscreen")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_Y)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapFullscreenKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.voxelmapmenu")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_START)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapMenuKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.waypointmenu")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_GUIDE)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapWaypointMenuKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.waypointhotkey")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_BACK)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapWaypointKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.togglemobs")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_A)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapMobToggleKey)
+                .register();
+        new ButtonBinding.Builder("key.minimap.toggleingamewaypoints")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_B)
+                .onlyInGame()
+                .cooldown(true)
+                .category(VOXELMAP_CATEGORY)
+                .linkKeybind(voxelmapWaypointToggleKey)
+                .register();
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/EntryListWidgetAccessor.java

@@ -1,30 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat.mixin;
-
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-
-/**
- * Represents an accessor to REI's EntryListWidget.
- *
- * @author LambdAurora
- * @version 1.5.0
- * @since 1.5.0
- */
-@Mixin(value = EntryListWidget.class, remap = false)
-public interface EntryListWidgetAccessor {
-    @Accessor(value = "children")
-    List<Element> getEntries();
-}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/EntryWidgetAccessor.java

@@ -1,23 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat.mixin;
-
-/**
- * Represents an accessor to REI's EntryWidget.
- *
- * @author LambdAurora
- * @version 1.5.0
- * @since 1.5.0
- */
-//@Mixin(value = EntryWidget.class, remap = false)
-public interface EntryWidgetAccessor {
-    /*@Invoker("getCurrentEntry")
-    EntryStack midnightcontrols_getCurrentEntry();*/
-}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/RecipeViewingScreenAccessor.java

@@ -1,32 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat.mixin;
-
-/**
- * Represents an accessor to REI's RecipeViewingScreen.
- *
- * @author LambdAurora
- * @version 1.7.0
- * @since 1.2.0
- */
-//@Mixin(value = DefaultDisplayViewingScreen.class, remap = false)
-public interface RecipeViewingScreenAccessor {
-    /*@Accessor("categoryBack")
-    Button getCategoryBack();
-
-    @Accessor("categoryNext")
-    Button getCategoryNext();
-
-    @Accessor("recipeBack")
-    Button getRecipeBack();
-
-    @Accessor("recipeNext")
-    Button getRecipeNext();*/
-}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/SodiumOptionsGUIAccessor.java

@@ -0,0 +1,19 @@
+package eu.midnightdust.midnightcontrols.client.compat.mixin;
+
+import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
+import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
+import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(value = SodiumOptionsGUI.class, remap = false)
+public interface SodiumOptionsGUIAccessor {
+    @Accessor
+    List<ControlElement<?>> getControls();
+    @Accessor
+    List<OptionPage> getPages();
+    @Accessor
+    OptionPage getCurrentPage();
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat.mixin;
-
-/**
- * Represents an accessor to REI's VillagerRecipeViewingScreen.
- *
- * @author LambdAurora
- * @version 1.7.0
- * @since 1.2.0
- */
-//@Mixin(CompositeDisplayViewingScreen.class)
-public interface VillagerRecipeViewingScreenAccessor {
-    /*@Accessor(value = "categoryMap", remap = false)
-    Map<DisplayCategory<?>, List<Display>> getCategoryMap();
-
-    @Accessor(value = "categories", remap = false)
-    List<DisplayCategory<?>> getCategories();
-
-    @Accessor(value = "selectedCategoryIndex", remap = false)
-    int getSelectedCategoryIndex();
-
-    @Accessor(value = "selectedCategoryIndex", remap = false)
-    void setSelectedCategoryIndex(int selectedCategoryIndex);
-
-    @Accessor(value = "selectedRecipeIndex", remap = false)
-    int getSelectedRecipeIndex();
-
-    @Accessor(value = "selectedRecipeIndex", remap = false)
-    void setSelectedRecipeIndex(int selectedRecipeIndex);
-
-    @Accessor(value = "scrolling", remap = false)
-    ScrollingContainer getScrolling();
-
-    @Invoker("init")
-    void midnightcontrols_init();*/
-}

src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java

@@ -10,9 +10,12 @@
 package eu.midnightdust.midnightcontrols.client.controller;
 
 import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.aperlambda.lambdacommon.utils.function.PairPredicate;
@@ -43,6 +46,15 @@ public class ButtonBinding {
     public static final ButtonBinding BACK = new Builder("back").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, false))
             .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding CHAT = new Builder("chat").buttons(GLFW_GAMEPAD_BUTTON_DPAD_RIGHT).onlyInGame().cooldown().register();
+    public static final ButtonBinding CONTROLS_RING = new Builder("controls_ring").buttons(GLFW_GAMEPAD_BUTTON_GUIDE).onlyInGame().cooldown()
+            .action((client, button1, value, action) -> {
+                if (action.isPressed()) {
+                    MidnightControlsClient.get().ring.loadFromUnbound();
+                    client.setScreen(new RingScreen());
+                }
+                if (action.isUnpressed() && client.currentScreen != null) client.currentScreen.close();
+                return true;
+            }).register();
     public static final ButtonBinding DROP_ITEM = new Builder("drop_item").buttons(GLFW_GAMEPAD_BUTTON_B).onlyInGame().cooldown().register();
     public static final ButtonBinding FORWARD = new Builder("forward").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, true))
             .action(MovementHandler.HANDLER).onlyInGame().register();
@@ -51,6 +63,8 @@ public class ButtonBinding {
     public static final ButtonBinding HOTBAR_RIGHT = new Builder("hotbar_right").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
             .action(InputHandlers.handleHotbar(true)).onlyInGame().cooldown().register();
     public static final ButtonBinding INVENTORY = new Builder("inventory").buttons(GLFW_GAMEPAD_BUTTON_Y).onlyInGame().cooldown().register();
+    public static final ButtonBinding EXIT = new Builder("exit").buttons(GLFW_GAMEPAD_BUTTON_B).filter((client, buttonBinding) -> client.currentScreen != null && buttonBinding.cooldown == 0 && INVENTORY.cooldown == 0)
+            .action(InputHandlers.handleExit()).cooldown().register();
     public static final ButtonBinding JUMP = new Builder("jump").buttons(GLFW_GAMEPAD_BUTTON_A).onlyInGame().register();
     public static final ButtonBinding LEFT = new Builder("left").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, false))
             .action(MovementHandler.HANDLER).onlyInGame().register();
@@ -61,6 +75,9 @@ public class ButtonBinding {
             .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding SCREENSHOT = new Builder("screenshot").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_A)
             .action(InputHandlers::handleScreenshot).cooldown().register();
+
+    public static final ButtonBinding DEBUG_SCREEN = new Builder("debug_screen").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_B)
+            .action((client,binding,value,action) -> {if (action == ButtonState.PRESS) client.options.debugEnabled = !client.options.debugEnabled; return true;}).cooldown().register();
     public static final ButtonBinding SLOT_DOWN = new Builder("slot_down").buttons(GLFW_GAMEPAD_BUTTON_DPAD_DOWN)
             .action(InputHandlers.handleInventorySlotPad(1)).onlyInInventory().cooldown().register();
     public static final ButtonBinding SLOT_LEFT = new Builder("slot_left").buttons(GLFW_GAMEPAD_BUTTON_DPAD_LEFT)
@@ -69,26 +86,26 @@ public class ButtonBinding {
             .action(InputHandlers.handleInventorySlotPad(2)).onlyInInventory().cooldown().register();
     public static final ButtonBinding SLOT_UP = new Builder("slot_up").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP)
             .action(InputHandlers.handleInventorySlotPad(0)).onlyInInventory().cooldown().register();
-    public static final ButtonBinding SMOOTH_CAMERA = new Builder("toggle_smooth_camera").onlyInGame().cooldown().register();
     public static final ButtonBinding SNEAK = new Builder("sneak").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_THUMB)
             .actions(InputHandlers::handleToggleSneak).onlyInGame().cooldown().register();
-    public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB).onlyInGame().register();
+    public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB)
+            .actions(InputHandlers::handleToggleSprint).onlyInGame().register();
     public static final ButtonBinding SWAP_HANDS = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).onlyInGame().cooldown().register();
     public static final ButtonBinding TAB_LEFT = new Builder("tab_back").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
-            .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown().register();
+            .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
     public static final ButtonBinding TAB_RIGHT = new Builder("tab_next").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
-            .action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown().register();
+            .action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
     public static final ButtonBinding PAGE_LEFT = new Builder("page_back").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
-            .action(InputHandlers.handlePage(false)).filter(InputHandlers::inInventory).cooldown().register();
+            .action(InputHandlers.handlePage(false)).filter(InputHandlers::inInventory).cooldown(30).register();
     public static final ButtonBinding PAGE_RIGHT = new Builder("page_next").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))
-            .action(InputHandlers.handlePage(true)).filter(InputHandlers::inInventory).cooldown().register();
+            .action(InputHandlers.handlePage(true)).filter(InputHandlers::inInventory).cooldown(30).register();
     public static final ButtonBinding TAKE = new Builder("take").buttons(GLFW_GAMEPAD_BUTTON_X)
             .action(InputHandlers.handleActions()).filter(InputHandlers::inInventory).cooldown().register();
     public static final ButtonBinding TAKE_ALL = new Builder("take_all").buttons(GLFW_GAMEPAD_BUTTON_A)
             .action(InputHandlers.handleActions()).filter(InputHandlers::inInventory).cooldown().register();
     public static final ButtonBinding QUICK_MOVE = new Builder("quick_move").buttons(GLFW_GAMEPAD_BUTTON_Y)
             .action(InputHandlers.handleActions()).filter(InputHandlers::inInventory).cooldown().register();
-    public static final ButtonBinding TOGGLE_PERSPECTIVE = new Builder("toggle_perspective").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_Y).cooldown().register();
+    public static final ButtonBinding TOGGLE_PERSPECTIVE = new Builder("toggle_perspective").filter(InputHandlers::inGame).buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_Y).cooldown().register();
     public static final ButtonBinding USE = new Builder("use").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)).register();
 
     private int[] button;
@@ -99,6 +116,7 @@ public class ButtonBinding {
     protected PairPredicate<MinecraftClient, ButtonBinding> filter;
     private final List<PressAction> actions = new ArrayList<>(Collections.singletonList(PressAction.DEFAULT_ACTION));
     private boolean hasCooldown;
+    private int cooldownLength = 5;
     private int cooldown = 0;
     boolean pressed = false;
 
@@ -110,10 +128,22 @@ public class ButtonBinding {
         this.actions.addAll(actions);
         this.hasCooldown = hasCooldown;
     }
+    public ButtonBinding(String key, int[] defaultButton, List<PressAction> actions, PairPredicate<MinecraftClient, ButtonBinding> filter, boolean hasCooldown, int cooldownLength) {
+        this.setButton(this.defaultButton = defaultButton);
+        this.key = key;
+        this.text = Text.translatable(this.key);
+        this.filter = filter;
+        this.actions.addAll(actions);
+        this.hasCooldown = hasCooldown;
+        this.cooldownLength = cooldownLength;
+    }
 
     public ButtonBinding(String key, int[] defaultButton, boolean hasCooldown) {
         this(key, defaultButton, Collections.emptyList(), Predicates.pairAlwaysTrue(), hasCooldown);
     }
+    public ButtonBinding(String key, int[] defaultButton, boolean hasCooldown, int cooldownLength) {
+        this(key, defaultButton, Collections.emptyList(), Predicates.pairAlwaysTrue(), hasCooldown, cooldownLength);
+    }
 
     /**
      * Returns the button bound.
@@ -230,7 +260,7 @@ public class ButtonBinding {
         if (state == ButtonState.REPEAT && this.hasCooldown && this.cooldown != 0)
             return;
         if (this.hasCooldown && state.isPressed()) {
-            this.cooldown = 5;
+            this.cooldown = cooldownLength;
         }
         for (int i = this.actions.size() - 1; i >= 0; i--) {
             if (this.actions.get(i).press(client, this, value, state))
@@ -248,7 +278,7 @@ public class ButtonBinding {
      * @return the translation key
      */
     public @NotNull String getTranslationKey() {
-        return "midnightcontrols.action." + this.getName();
+        return I18n.hasTranslation("midnightcontrols.action." + this.getName()) ? "midnightcontrols.action." + this.getName() : this.getName();
     }
 
     public @NotNull Text getText() {
@@ -316,7 +346,6 @@ public class ButtonBinding {
         PLAYER_LIST.mcKeyBinding = options.playerListKey;
         RIGHT.mcKeyBinding = options.rightKey;
         SCREENSHOT.mcKeyBinding = options.screenshotKey;
-        SMOOTH_CAMERA.mcKeyBinding = options.smoothCameraKey;
         SNEAK.mcKeyBinding = options.sneakKey;
         SPRINT.mcKeyBinding = options.sprintKey;
         SWAP_HANDS.mcKeyBinding = options.swapHandsKey;
@@ -381,23 +410,33 @@ public class ButtonBinding {
                 ButtonBinding.USE
         ));
         INVENTORY_CATEGORY = InputManager.registerDefaultCategory("key.categories.inventory", category -> category.registerAllBindings(
+                ButtonBinding.EXIT,
                 ButtonBinding.DROP_ITEM,
                 ButtonBinding.HOTBAR_LEFT,
                 ButtonBinding.HOTBAR_RIGHT,
                 ButtonBinding.INVENTORY,
                 ButtonBinding.SWAP_HANDS,
+                ButtonBinding.TAB_LEFT,
+                ButtonBinding.TAB_RIGHT,
                 ButtonBinding.PAGE_LEFT,
                 ButtonBinding.PAGE_RIGHT,
                 ButtonBinding.TAKE,
                 ButtonBinding.TAKE_ALL,
-                ButtonBinding.QUICK_MOVE
+                ButtonBinding.QUICK_MOVE,
+                ButtonBinding.SLOT_UP,
+                ButtonBinding.SLOT_DOWN,
+                ButtonBinding.SLOT_LEFT,
+                ButtonBinding.SLOT_RIGHT
         ));
         MULTIPLAYER_CATEGORY = InputManager.registerDefaultCategory("key.categories.multiplayer",
                 category -> category.registerAllBindings(ButtonBinding.CHAT, ButtonBinding.PLAYER_LIST));
         MISC_CATEGORY = InputManager.registerDefaultCategory("key.categories.misc", category -> category.registerAllBindings(
                 ButtonBinding.SCREENSHOT,
+                ButtonBinding.TOGGLE_PERSPECTIVE,
+                ButtonBinding.PAUSE_GAME,
                 //SMOOTH_CAMERA,
-                ButtonBinding.TOGGLE_PERSPECTIVE
+                ButtonBinding.DEBUG_SCREEN,
+                ButtonBinding.CONTROLS_RING
         ));
     }
 
@@ -426,6 +465,7 @@ public class ButtonBinding {
         private final List<PressAction> actions = new ArrayList<>();
         private PairPredicate<MinecraftClient, ButtonBinding> filter = Predicates.pairAlwaysTrue();
         private boolean cooldown = false;
+        private int cooldownLength = 5;
         private ButtonCategory category = null;
         private KeyBinding mcBinding = null;
 
@@ -440,7 +480,7 @@ public class ButtonBinding {
         }
 
         public Builder(@NotNull Identifier identifier) {
-            this(identifier.getNamespace() + "." + identifier.getNamespace());
+            this(identifier.getNamespace() + "." + identifier.getPath());
         }
 
         /**
@@ -528,6 +568,17 @@ public class ButtonBinding {
             this.cooldown = cooldown;
             return this;
         }
+        /**
+         * Sets the cooldown enabled with a custom duration for {@link ButtonBinding}.
+         *
+         * @param cooldownLength duration of {@link ButtonBinding} cooldown
+         * @return the builder instance
+         */
+        public Builder cooldown(int cooldownLength) {
+            this.cooldownLength = cooldownLength;
+            this.cooldown = true;
+            return this;
+        }
 
         /**
          * Puts a cooldown on the {@link ButtonBinding}.
@@ -567,7 +618,7 @@ public class ButtonBinding {
          * @return the built {@link ButtonBinding}
          */
         public ButtonBinding build() {
-            var binding = new ButtonBinding(this.key, this.buttons, this.actions, this.filter, this.cooldown);
+            var binding = new ButtonBinding(this.key, this.buttons, this.actions, this.filter, this.cooldown, this.cooldownLength);
             if (this.category != null)
                 this.category.registerBinding(binding);
             if (this.mcBinding != null)

src/main/java/eu/midnightdust/midnightcontrols/client/controller/Controller.java

@@ -13,6 +13,7 @@ import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Nameable;
@@ -136,7 +137,7 @@ public record Controller(int id) implements Nameable {
             }
         }
 
-        buffer.flip(); // Force Java 8 >.<
+        if (buffer != null) buffer.flip(); // Force Java 8 >.<
         return buffer;
     }
 
@@ -149,7 +150,6 @@ public record Controller(int id) implements Nameable {
             File databaseFile = new File("config/gamecontrollerdatabase.txt");
             try {
                 BufferedInputStream in = new BufferedInputStream(new URL("https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt").openStream());
-
                 BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(databaseFile));
                 byte[] dataBuffer = new byte[1024];
                 int bytesRead;
@@ -159,11 +159,11 @@ public record Controller(int id) implements Nameable {
                 out.close();
             } catch (Exception ignored) {/* Just continue when internet connection is not available */}
             var database = ioResourceToBuffer(databaseFile.getPath(), 1024);
-            GLFW.glfwUpdateGamepadMappings(database);
+            if (database != null) GLFW.glfwUpdateGamepadMappings(database);
             if (!MidnightControlsClient.MAPPINGS_FILE.exists())
                 return;
             var buffer = ioResourceToBuffer(MidnightControlsClient.MAPPINGS_FILE.getPath(), 1024);
-            GLFW.glfwUpdateGamepadMappings(buffer);
+            if (buffer != null) GLFW.glfwUpdateGamepadMappings(buffer);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -178,6 +178,7 @@ public record Controller(int id) implements Nameable {
                 if (client != null) {
                     client.getToastManager().add(SystemToast.create(client, SystemToast.Type.TUTORIAL_HINT,
                             Text.translatable("midnightcontrols.controller.mappings.error"), Text.literal(string)));
+                    MidnightControls.get().log(I18n.translate("midnightcontrols.controller.mappings.error")+string);
                 }
             }
         } catch (Throwable e) {

src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java

@@ -11,23 +11,32 @@ package eu.midnightdust.midnightcontrols.client.controller;
 
 import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
+import eu.midnightdust.midnightcontrols.client.compat.InventoryTabsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
+import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.RecipeBookWidgetAccessor;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
-import net.fabricmc.fabric.impl.item.group.CreativeGuiExtensions;
+import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.Framebuffer;
+import net.minecraft.client.gui.hud.SpectatorHud;
+import net.minecraft.client.gui.hud.spectator.SpectatorMenu;
+import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.client.gui.screen.ingame.*;
+import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
+import net.minecraft.client.gui.widget.PressableWidget;
+import net.minecraft.client.input.Input;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.util.math.MathHelper;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
@@ -56,15 +65,27 @@ public class InputHandlers {
             if (action == ButtonState.RELEASE)
                 return false;
 
-            // When ingame
+            // When in-game
             if (client.currentScreen == null && client.player != null) {
-                if (next)
-                    client.player.getInventory().selectedSlot = client.player.getInventory().selectedSlot == 8 ? 0 : client.player.getInventory().selectedSlot + 1;
-                else
-                    client.player.getInventory().selectedSlot = client.player.getInventory().selectedSlot == 0 ? 8 : client.player.getInventory().selectedSlot - 1;
+                if (!client.player.isSpectator()) {
+                    if (next)
+                        client.player.getInventory().scrollInHotbar(-1.0);
+                    else
+                        client.player.getInventory().scrollInHotbar(1.0);
+                }
+                else {
+                    if (client.inGameHud.getSpectatorHud().isOpen()) {
+                        client.inGameHud.getSpectatorHud().cycleSlot(next ? -1 : 1);
+                    } else {
+                        float g = MathHelper.clamp(client.player.getAbilities().getFlySpeed() + (next ? 1 : -1) * 0.005F, 0.0F, 0.2F);
+                        client.player.getAbilities().setFlySpeed(g);
+                    }
+                }
                 return true;
+            } else if (client.currentScreen instanceof RingScreen) {
+                MidnightControlsClient.get().ring.cyclePage(next);
             } else if (client.currentScreen instanceof CreativeInventoryScreenAccessor inventory) {
-                int currentTab = inventory.getSelectedTab();
+                int currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
                 int nextTab = currentTab + (next ? 1 : -1);
                 if (nextTab < 0)
                     nextTab = ItemGroup.GROUPS.length - 1;
@@ -72,24 +93,30 @@ public class InputHandlers {
                     nextTab = 0;
                 inventory.midnightcontrols$setSelectedTab(ItemGroup.GROUPS[nextTab]);
                 return true;
-            } else if (client.currentScreen instanceof InventoryScreen inventoryScreen) {
-                var recipeBook = (RecipeBookWidgetAccessor) inventoryScreen.getRecipeBookWidget();
-                var tabs = recipeBook.getTabButtons();
-                var currentTab = recipeBook.getCurrentTab();
-                if (currentTab == null)
+            } else if (client.currentScreen instanceof InventoryScreen || client.currentScreen instanceof CraftingScreen || client.currentScreen instanceof AbstractFurnaceScreen<?>) {
+                RecipeBookWidget recipeBook;
+                if (client.currentScreen instanceof InventoryScreen inventoryScreen) recipeBook = inventoryScreen.getRecipeBookWidget();
+                else if (client.currentScreen instanceof CraftingScreen craftingScreen) recipeBook = craftingScreen.getRecipeBookWidget();
+                else recipeBook = ((AbstractFurnaceScreen<?>)client.currentScreen).getRecipeBookWidget();
+                var recipeBookAccessor = (RecipeBookWidgetAccessor) recipeBook;
+                var tabs = recipeBookAccessor.getTabButtons();
+                var currentTab = recipeBookAccessor.getCurrentTab();
+                if (currentTab == null || !recipeBook.isOpen()) {
+                    if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryTabs(client.currentScreen, next);
                     return false;
+                }
                 int nextTab = tabs.indexOf(currentTab) + (next ? 1 : -1);
                 if (nextTab < 0)
                     nextTab = tabs.size() - 1;
                 else if (nextTab >= tabs.size())
                     nextTab = 0;
                 currentTab.setToggled(false);
-                recipeBook.setCurrentTab(currentTab = tabs.get(nextTab));
+                recipeBookAccessor.setCurrentTab(currentTab = tabs.get(nextTab));
                 currentTab.setToggled(true);
-                recipeBook.midnightcontrols$refreshResults(true);
+                recipeBookAccessor.midnightcontrols$refreshResults(true);
                 return true;
             } else if (client.currentScreen instanceof AdvancementsScreenAccessor screen) {
-                var tabs = screen.getTabs().values().stream().distinct().collect(Collectors.toList());
+                var tabs = screen.getTabs().values().stream().distinct().toList();
                 var tab = screen.getSelectedTab();
                 if (tab == null)
                     return false;
@@ -105,7 +132,10 @@ public class InputHandlers {
                     }
                 }
                 return true;
+            } else {
+                if (FabricLoader.getInstance().isModLoaded("sodium")) SodiumCompat.handleTabs(client.currentScreen, next);
             }
+            if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryTabs(client.currentScreen, next);
             return false;
         };
     }
@@ -115,12 +145,42 @@ public class InputHandlers {
                 var screen = (HandledScreenAccessor) client.currentScreen;
                 try {
                     if (next) {
-                        ((CreativeGuiExtensions) screen).fabric_nextPage();
+                        return client.currentScreen.children().stream().filter(element -> element instanceof PressableWidget)
+                                .map(element -> (PressableWidget) element)
+                                .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
+                                .anyMatch(element -> {
+                                    if (element.getMessage().getString().equals(">")) {
+                                        element.onPress();
+                                        return true;
+                                    }
+                                    return false;
+                                });
                     } else {
-                        ((CreativeGuiExtensions) screen).fabric_previousPage();
+                        return client.currentScreen.children().stream().filter(element -> element instanceof PressableWidget)
+                                .map(element -> (PressableWidget) element)
+                                .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
+                                .anyMatch(element -> {
+                                    if (element.getMessage().getString().equals("<")) {
+                                        element.onPress();
+                                        return true;
+                                    }
+                                    return false;
+                                });
                     }
                 } catch (Exception ignored) {}
             }
+            if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryPage(client.currentScreen, next);
+            return false;
+        };
+    }
+    public static PressAction handleExit() {
+        return (client, button, value, action) -> {
+            if (client.currentScreen != null && client.currentScreen.getClass() != TitleScreen.class) {
+                if (!MidnightControlsCompat.handleMenuBack(client, client.currentScreen))
+                    if (!MidnightControlsClient.get().input.tryGoBack(client.currentScreen))
+                        client.currentScreen.close();
+                return true;
+            }
             return false;
         };
     }
@@ -140,29 +200,34 @@ public class InputHandlers {
 
             int slotId;
             if (slot == null) {
-                if (client.player.currentScreenHandler.getCursorStack().isEmpty())
+                if (button.getName().equals("take_all")) {
+                    ((MouseAccessor) client.mouse).setLeftButtonClicked(true);
                     return false;
+                }
                 slotId = accessor.midnightcontrols$isClickOutsideBounds(x, y, accessor.getX(), accessor.getY(), GLFW_MOUSE_BUTTON_1) ? -999 : -1;
             } else {
                 slotId = slot.id;
             }
             var actionType = SlotActionType.PICKUP;
             int clickData = GLFW.GLFW_MOUSE_BUTTON_1;
+
             MidnightControlsClient.get().input.inventoryInteractionCooldown = 5;
             switch (button.getName()) {
-            case "take_all":
-                if (accessor instanceof CreativeInventoryScreen)
-                    if (((CreativeInventoryScreenAccessor) accessor).midnightcontrols$isCreativeInventorySlot(slot))
+            case "take_all": {
+                if (screen instanceof CreativeInventoryScreen) {
+                    if (slot != null && (((CreativeInventoryScreenAccessor) accessor).midnightcontrols$isCreativeInventorySlot(slot) || MidnightControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot))))
                         actionType = SlotActionType.CLONE;
-                if (slot != null && MidnightControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot)))
-                    actionType = SlotActionType.CLONE;
+                }
                 break;
-            case "take":
+            }
+            case "take": {
                 clickData = GLFW_MOUSE_BUTTON_2;
                 break;
-            case "quick_move":
+            }
+            case "quick_move": {
                 actionType = SlotActionType.QUICK_MOVE;
                 break;
+            }
             default:
                 return false;
             }
@@ -174,7 +239,7 @@ public class InputHandlers {
     public static boolean handlePauseGame(@NotNull MinecraftClient client, @NotNull ButtonBinding binding, float value, @NotNull ButtonState action) {
         if (action == ButtonState.PRESS) {
             // If in game, then pause the game.
-            if (client.currentScreen == null)
+            if (client.currentScreen == null || client.currentScreen instanceof RingScreen)
                 client.openPauseMenu(false);
             else if (client.currentScreen instanceof HandledScreen && client.player != null) // If the current screen is a container then close it.
                 client.player.closeHandledScreen();
@@ -204,9 +269,28 @@ public class InputHandlers {
             boolean sneakToggled = client.options.getSneakToggled().getValue();
             if (client.player.getAbilities().flying && sneakToggled)
                 client.options.getSneakToggled().setValue(false);
+            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
+                client.options.getSneakToggled().setValue(!sneakToggled);
             binding.setPressed(button.pressed);
             if (client.player.getAbilities().flying && sneakToggled)
                 client.options.getSneakToggled().setValue(true);
+            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
+                client.options.getSneakToggled().setValue(sneakToggled);
+        });
+        return true;
+    }
+    public static boolean handleToggleSprint(@NotNull MinecraftClient client, @NotNull ButtonBinding button, float value, @NotNull ButtonState action) {
+        button.asKeyBinding().ifPresent(binding -> {
+            boolean sprintToggled = client.options.getSprintToggled().getValue();
+            if (client.player.getAbilities().flying && sprintToggled)
+                client.options.getSprintToggled().setValue(false);
+            else if (MidnightControlsConfig.controllerToggleSneak != sprintToggled)
+                client.options.getSprintToggled().setValue(!sprintToggled);
+            binding.setPressed(button.pressed);
+            if (client.player.getAbilities().flying && sprintToggled)
+                client.options.getSprintToggled().setValue(true);
+            else if (MidnightControlsConfig.controllerToggleSneak != sprintToggled)
+                client.options.getSprintToggled().setValue(sprintToggled);
         });
         return true;
     }
@@ -297,7 +381,7 @@ public class InputHandlers {
      * @return true if the client is in game, else false
      */
     public static boolean inGame(@NotNull MinecraftClient client, @NotNull ButtonBinding binding) {
-        return client.currentScreen == null;
+        return (client.currentScreen == null && MidnightControlsClient.get().input.screenCloseCooldown <= 0) || client.currentScreen instanceof RingScreen;
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputManager.java

@@ -17,6 +17,7 @@ import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.util.math.MathHelper;
 import org.aperlambda.lambdacommon.Identifier;
@@ -42,15 +43,19 @@ public class InputManager {
     private static final List<ButtonCategory> CATEGORIES = new ArrayList<>();
     public static final Int2ObjectMap<ButtonState> STATES = new Int2ObjectOpenHashMap<>();
     public static final Int2FloatMap BUTTON_VALUES = new Int2FloatOpenHashMap();
-    private int prevTargetMouseX = 0;
-    private int prevTargetMouseY = 0;
-    private int targetMouseX = 0;
-    private int targetMouseY = 0;
+    public int prevTargetMouseX = 0;
+    public int prevTargetMouseY = 0;
+    public int targetMouseX = 0;
+    public int targetMouseY = 0;
 
     protected InputManager() {
     }
 
     public void tick(@NotNull MinecraftClient client) {
+        if (MidnightControlsConfig.autoSwitchMode && !MidnightControlsConfig.isEditing && MidnightControlsConfig.controlsMode != ControlsMode.TOUCHSCREEN)
+            if (MidnightControlsConfig.getController().isConnected() && MidnightControlsConfig.getController().isGamepad())
+                 MidnightControlsConfig.controlsMode = ControlsMode.CONTROLLER;
+            else MidnightControlsConfig.controlsMode = ControlsMode.DEFAULT;
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) {
             this.controllerTick(client);
         }
@@ -124,6 +129,29 @@ public class InputManager {
     public static boolean hasBinding(@NotNull Identifier identifier) {
         return hasBinding(identifier.getNamespace() + "." + identifier.getName());
     }
+    private static ButtonBinding tempBinding;
+    /**
+     * Returns the binding matching the given string.
+     *
+     * @param name the name of the binding to get
+     * @return true if the binding is registered, else false
+     */
+    public static ButtonBinding getBinding(@NotNull String name) {
+        if (BINDINGS.parallelStream().map(ButtonBinding::getName).anyMatch(binding -> binding.equalsIgnoreCase(name)))
+            BINDINGS.forEach(binding -> {
+                if (binding.getName().equalsIgnoreCase(name)) InputManager.tempBinding = binding;
+            });
+        return tempBinding;
+    }
+    private static List<ButtonBinding> unboundBindings;
+    public static List<ButtonBinding> getUnboundBindings() {
+        unboundBindings = new ArrayList<>();
+        BINDINGS.forEach(binding -> {
+            if (binding.isNotBound() && !MidnightControlsConfig.ignoredUnboundKeys.contains(binding.getTranslationKey())) unboundBindings.add(binding);
+        });
+        unboundBindings.sort(Comparator.comparing(s -> I18n.translate(s.getTranslationKey())));
+        return unboundBindings;
+    }
 
     /**
      * Registers a button binding.

src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java

@@ -13,7 +13,17 @@ import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.tutorial.MovementTutorialStepHandler;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.enchantment.SoulSpeedEnchantment;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.scanner.SimpleNbtScanner;
+import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -30,6 +40,7 @@ public final class MovementHandler implements PressAction {
     private boolean pressingBack = false;
     private boolean pressingLeft = false;
     private boolean pressingRight = false;
+    private float slowdownFactor = 1.f;
     private float movementForward = 0.f;
     private float movementSideways = 0.f;
 
@@ -42,14 +53,22 @@ public final class MovementHandler implements PressAction {
      * @param player The client player.
      */
     public void applyMovement(@NotNull ClientPlayerEntity player) {
+        double movementR, movementTheta;
+
         if (!this.shouldOverrideMovement)
             return;
         player.input.pressingForward = this.pressingForward;
         player.input.pressingBack = this.pressingBack;
         player.input.pressingLeft = this.pressingLeft;
         player.input.pressingRight = this.pressingRight;
-        player.input.movementForward = this.movementForward;
-        player.input.movementSideways = this.movementSideways;
+
+        // Do an implicit square here
+        movementR = this.slowdownFactor * (Math.pow(this.movementSideways, 2) + Math.pow(this.movementForward, 2));
+        movementR = MathHelper.clamp(movementR, 0.f, 1.f);
+        movementTheta = Math.atan2(this.movementForward, this.movementSideways);
+        player.input.movementForward = (float) (movementR * Math.sin(movementTheta));
+        player.input.movementSideways = (float) (movementR * Math.cos(movementTheta));
+
         this.shouldOverrideMovement = false;
     }
 
@@ -69,28 +88,26 @@ public final class MovementHandler implements PressAction {
 
         this.shouldOverrideMovement = direction != 0;
 
-        if (MidnightControlsConfig.analogMovement) {
-            value = (float) Math.pow(value, 2);
-        } else value = 1.f;
+        if (!MidnightControlsConfig.analogMovement) {
+            value = 1.f;
+        }
+
+        this.slowdownFactor = client.player.shouldSlowDown() ? (MathHelper.clamp(
+            0.3F + EnchantmentHelper.getSwiftSneakSpeedBoost(client.player),
+            0.0F,
+            1.0F
+        )) : 1.f;
 
         if (button == ButtonBinding.FORWARD || button == ButtonBinding.BACK) {
             // Handle forward movement.
             this.pressingForward = direction > 0;
             this.pressingBack = direction < 0;
             this.movementForward = direction * value;
-
-            // Slowing down if sneaking.
-            if (client.player.input.sneaking)
-                this.movementForward *= 0.3D;
         } else {
             // Handle sideways movement.
             this.pressingLeft = direction > 0;
             this.pressingRight = direction < 0;
             this.movementSideways = direction * value;
-
-            // Slowing down if sneaking.
-            if (client.player.input.sneaking)
-                this.movementSideways *= 0.3D;
         }
 
         return this.shouldOverrideMovement;

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java

@@ -14,7 +14,6 @@ import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.HudSide;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.MidnightInput;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import dev.lambdaurora.spruceui.hud.Hud;
@@ -47,12 +46,14 @@ public class MidnightControlsHud extends Hud {
     private int inventoryButtonWidth = 0;
     private int swapHandsWidth = 0;
     private int swapHandsButtonWidth = 0;
+    private boolean showSwapHandsAction = false;
     private int useWidth = 0;
     private int useButtonWidth = 0;
     private BlockHitResult placeHitResult;
     private String attackAction = "";
     private String placeAction = "";
     private int ticksDisplayedCrosshair = 0;
+    private static boolean isCrammed = false;
 
     public MidnightControlsHud(@NotNull MidnightControlsClient mod) {
         super(new Identifier(MidnightControlsConstants.NAMESPACE, "hud/button_indicator"));
@@ -73,17 +74,22 @@ public class MidnightControlsHud extends Hud {
         this.useButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.USE);
     }
 
+
     /**
-     * Renders the midnightcontrols' HUD.
+     * Renders the MidnightControls HUD.
      */
     @Override
     public void render(MatrixStack matrices, float tickDelta) {
+        if (this.client == null) return;
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
+            isCrammed = client.getWindow().getScaledWidth() < 520;
             int y = bottom(2);
+            matrices.push();
             this.renderFirstIcons(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
             this.renderSecondIcons(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
             this.renderFirstSection(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
             this.renderSecondSection(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            matrices.pop();
         }
 
         if (this.mod.reacharound.isLastReacharoundVertical()) {
@@ -103,22 +109,29 @@ public class MidnightControlsHud extends Hud {
     public void renderFirstIcons(MatrixStack matrices, int x, int y) {
         int offset = 2 + this.inventoryWidth + this.inventoryButtonWidth + 4;
         int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.inventoryButtonWidth;
-        this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true);
-        this.drawButton(matrices, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
+        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true);
+        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawButton(matrices, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
         offset = 2 + this.swapHandsWidth + this.dropItemButtonWidth + 4;
         if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) {
             currentX += -offset;
         } else {
             currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.dropItemButtonWidth;
-            y -= 24;
+            y -= 20;
         }
-        this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
     }
 
     public void renderSecondIcons(MatrixStack matrices, int x, int y) {
         int offset;
         int currentX = x;
-        if (!this.placeAction.isEmpty()) {
+        if (isCrammed && showSwapHandsAction && !this.client.options.getShowSubtitles().getValue() && !ButtonBinding.SWAP_HANDS.isNotBound()) {
+            if (MidnightControlsConfig.hudSide == HudSide.LEFT)
+                currentX -= this.useButtonWidth;
+            this.drawButton(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+            currentX = x;
+            y -= 20;
+        }
+        if (!this.placeAction.isEmpty() && (!ButtonBinding.USE.isNotBound()) ) {
             if (MidnightControlsConfig.hudSide == HudSide.LEFT)
                 currentX -= this.useButtonWidth;
             this.drawButton(matrices, currentX, y, ButtonBinding.USE, true);
@@ -127,34 +140,42 @@ public class MidnightControlsHud extends Hud {
                 currentX -= offset;
             } else {
                 currentX = x;
-                y -= 24;
+                y -= 20;
             }
         }
 
         if (MidnightControlsConfig.hudSide == HudSide.LEFT)
             currentX -= this.attackButtonWidth;
 
-        this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
+        if (!ButtonBinding.ATTACK.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
     }
 
     public void renderFirstSection(MatrixStack matrices, int x, int y) {
         int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth;
-        this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true);
+        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true);
         currentX += MidnightControlsConfig.hudSide == HudSide.LEFT ? this.inventoryWidth + 4 + this.swapHandsButtonWidth + 2
                 : -this.swapHandsWidth - 2 - this.swapHandsButtonWidth - 4;
-        this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
         if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) {
             currentX += -this.dropItemWidth - 2 - this.dropItemButtonWidth - 4;
         } else {
-            y -= 24;
+            y -= 20;
             currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.dropItemButtonWidth + 2 : x - this.dropItemButtonWidth - 2 - this.dropItemWidth;
         }
-        this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
     }
 
     public void renderSecondSection(MatrixStack matrices, int x, int y) {
         int currentX = x;
 
+        if (isCrammed && showSwapHandsAction && !this.client.options.getShowSubtitles().getValue() && !ButtonBinding.SWAP_HANDS.isNotBound()) {
+            currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.swapHandsButtonWidth + 2 : -this.swapHandsButtonWidth - 2 - this.swapHandsWidth;
+
+            this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+
+            currentX = x;
+            y -= 20;
+        }
         if (!this.placeAction.isEmpty()) {
             currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.useButtonWidth + 2 : -this.useButtonWidth - 2 - this.useWidth;
 
@@ -164,13 +185,13 @@ public class MidnightControlsHud extends Hud {
                 currentX -= 4;
             } else {
                 currentX = x;
-                y -= 24;
+                y -= 20;
             }
         }
 
         currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.attackButtonWidth + 2 : -this.attackButtonWidth - 2 - this.attackWidth;
 
-        this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0);
+        if (!ButtonBinding.ATTACK.isNotBound()) this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0);
     }
 
     @Override
@@ -231,6 +252,7 @@ public class MidnightControlsHud extends Hud {
                 placeAction = customUseAction;
 
             this.placeAction = placeAction;
+            this.showSwapHandsAction = !this.client.player.getMainHandStack().isEmpty() || !this.client.player.getOffHandStack().isEmpty();
 
             // Cache the "Use" tip width.
             if (this.placeAction.isEmpty())
@@ -246,7 +268,7 @@ public class MidnightControlsHud extends Hud {
     }
 
     private int bottom(int y) {
-        return this.client.getWindow().getScaledHeight() - y - MidnightControlsRenderer.ICON_SIZE;
+        return (this.client.getWindow().getScaledHeight() - y - MidnightControlsRenderer.ICON_SIZE);
     }
 
     private int width(@NotNull ButtonBinding binding) {

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java

@@ -10,6 +10,8 @@
 package eu.midnightdust.midnightcontrols.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import eu.midnightdust.midnightcontrols.MidnightControls;
+import eu.midnightdust.midnightcontrols.client.ControllerType;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
@@ -106,7 +108,7 @@ public class MidnightControlsRenderer {
             second = true;
         }
 
-        int controllerType = MidnightControlsConfig.controllerType.getId();
+        int controllerType = MidnightControlsConfig.controllerType == ControllerType.DEFAULT ? MidnightControlsConfig.matchControllerToType().getId() : MidnightControlsConfig.controllerType.getId();
         boolean axis = false;
         int buttonOffset = button * 15;
         switch (button) {

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java

@@ -55,12 +55,16 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption inputModeOption;
     private final SpruceOption autoSwitchModeOption;
     private final SpruceOption rotationSpeedOption;
+    private final SpruceOption yAxisRotationSpeedOption;
     private final SpruceOption mouseSpeedOption;
     private final SpruceOption virtualMouseOption;
     private final SpruceOption resetOption;
     // Gameplay options
     private final SpruceOption analogMovementOption;
+    private final SpruceOption doubleTapToSprintOption;
     private final SpruceOption autoJumpOption;
+    private final SpruceOption controllerToggleSneakOption;
+    private final SpruceOption controllerToggleSprintOption;
     private final SpruceOption fastBlockPlacingOption;
     private final SpruceOption frontBlockPlacingOption;
     private final SpruceOption verticalReacharoundOption;
@@ -114,6 +118,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption unfocusedInputOption;
     private final SpruceOption invertsRightXAxis;
     private final SpruceOption invertsRightYAxis;
+    private final SpruceOption toggleControllerProfileOption;
     private final SpruceOption rightDeadZoneOption;
     private final SpruceOption leftDeadZoneOption;
     private final SpruceOption[] maxAnalogValueOptions = new SpruceOption[]{
@@ -152,6 +157,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
 
     public MidnightControlsSettingsScreen(Screen parent, boolean hideControls) {
         super(Text.translatable("midnightcontrols.title.settings"));
+        MidnightControlsConfig.isEditing = true;
         this.parent = parent;
         // General options
         this.inputModeOption = new SpruceCyclingOption("midnightcontrols.menu.controls_mode",
@@ -160,7 +166,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                     MidnightControlsConfig.controlsMode = next;
                     MidnightControlsConfig.save();
 
-                    if (this.client.player != null) {
+                    if (this.client != null && this.client.player != null) {
                         ClientPlayNetworking.getSender().sendPacket(MidnightControls.CONTROLS_MODE_CHANNEL, this.mod.makeControlsModeBuffer(next));
                     }
                 }, option -> option.getDisplayText(Text.translatable(MidnightControlsConfig.controlsMode.getTranslationKey())),
@@ -171,13 +177,16 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 () -> MidnightControlsConfig.rotationSpeed,
                 value -> MidnightControlsConfig.rotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
                 Text.translatable("midnightcontrols.tooltip.rotation_speed"));
+        this.yAxisRotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.y_axis_rotation_speed", 0.0, 100.0, .5f,
+                () -> MidnightControlsConfig.yAxisRotationSpeed,
+                value -> MidnightControlsConfig.yAxisRotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
+                Text.translatable("midnightcontrols.tooltip.y_axis_rotation_speed"));
         this.mouseSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.mouse_speed", 0.0, 150.0, .5f,
                 () -> MidnightControlsConfig.mouseSpeed,
                 value -> MidnightControlsConfig.mouseSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
                 Text.translatable("midnightcontrols.tooltip.mouse_speed"));
         this.resetOption = SpruceSimpleActionOption.reset(btn -> {
-            // TODO
-            MidnightControlsConfig.init("midnightcontrols", MidnightControlsConfig.class);
+            MidnightControlsConfig.reset();
             var client = MinecraftClient.getInstance();
             this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
         });
@@ -185,10 +194,19 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
                 () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
                 Text.translatable("midnightcontrols.tooltip.analog_movement"));
+        this.doubleTapToSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.double_tap_to_sprint",
+                () -> MidnightControlsConfig.doubleTapToSprint, value -> MidnightControlsConfig.doubleTapToSprint = value,
+                Text.translatable("midnightcontrols.tooltip.double_tap_to_sprint"));
         this.autoJumpOption = new SpruceToggleBooleanOption("options.autoJump",
                 () -> this.client.options.getAutoJump().getValue(),
                 newValue -> this.client.options.getAutoJump().setValue(newValue),
                 null);
+        this.controllerToggleSneakOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sneak",
+                () -> MidnightControlsConfig.controllerToggleSneak, value -> MidnightControlsConfig.controllerToggleSneak = value,
+                null);
+        this.controllerToggleSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sprint",
+                () -> MidnightControlsConfig.controllerToggleSprint, value -> MidnightControlsConfig.controllerToggleSprint = value,
+                null);
         this.fastBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fast_block_placing", () -> MidnightControlsConfig.fastBlockPlacing,
                 value -> MidnightControlsConfig.fastBlockPlacing = value, Text.translatable("midnightcontrols.tooltip.fast_block_placing"));
         this.frontBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.horizontal", () -> MidnightControlsConfig.horizontalReacharound,
@@ -215,6 +233,16 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 option -> option.getDisplayText(MidnightControlsConfig.hudSide.getTranslatedText()),
                 Text.translatable("midnightcontrols.tooltip.hud_side"));
         // Controller options
+        this.toggleControllerProfileOption = new SpruceToggleBooleanOption("midnightcontrols.menu.separate_controller_profile", () -> MidnightControlsConfig.controllerBindingProfiles.containsKey(MidnightControlsConfig.getController().getGuid()), value -> {
+            if (value) {
+                MidnightControlsConfig.controllerBindingProfiles.put(MidnightControlsConfig.getController().getGuid(), MidnightControlsConfig.getBindingsForController());
+                MidnightControlsConfig.updateBindingsForController(MidnightControlsConfig.getController());
+            } else {
+                MidnightControlsConfig.controllerBindingProfiles.remove(MidnightControlsConfig.getController().getGuid());
+                MidnightControlsConfig.updateBindingsForController(MidnightControlsConfig.getController());
+            }
+
+        }, Text.translatable(""));
         this.rightDeadZoneOption = new SpruceDoubleOption("midnightcontrols.menu.right_dead_zone", 0.05, 1.0, .05f,
                 () -> MidnightControlsConfig.rightDeadZone,
                 value -> MidnightControlsConfig.rightDeadZone = value, option -> {
@@ -239,12 +267,14 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
 
     @Override
     public void removed() {
+        MidnightControlsConfig.isEditing = false;
         MidnightControlsConfig.save();
         super.removed();
     }
 
     @Override
     public void close() {
+        MidnightControlsConfig.isEditing = false;
         MidnightControlsConfig.save();
         super.close();
     }
@@ -292,9 +322,11 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
 
     public SpruceOptionListWidget buildGeneralTab(int width, int height) {
         var list = new SpruceOptionListWidget(Position.origin(), width, height);
+        list.setBackground(new MidnightControlsBackground(130));
         list.addSingleOptionEntry(this.inputModeOption);
         list.addSingleOptionEntry(this.autoSwitchModeOption);
         list.addSingleOptionEntry(this.rotationSpeedOption);
+        list.addSingleOptionEntry(this.yAxisRotationSpeedOption);
         list.addSingleOptionEntry(this.mouseSpeedOption);
         list.addSingleOptionEntry(this.virtualMouseOption);
         return list;
@@ -302,18 +334,23 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
 
     public SpruceOptionListWidget buildGameplayTab(int width, int height) {
         var list = new SpruceOptionListWidget(Position.origin(), width, height);
+        list.setBackground(new MidnightControlsBackground(130));
         list.addSingleOptionEntry(this.analogMovementOption);
-        list.addSingleOptionEntry(this.fastBlockPlacingOption);
-        list.addSingleOptionEntry(this.frontBlockPlacingOption);
-        list.addSingleOptionEntry(this.verticalReacharoundOption);
-        list.addSingleOptionEntry(this.flyDriftingOption);
-        list.addSingleOptionEntry(this.flyVerticalDriftingOption);
+        list.addSingleOptionEntry(this.doubleTapToSprintOption);
+        list.addSingleOptionEntry(this.controllerToggleSneakOption);
+        list.addSingleOptionEntry(this.controllerToggleSprintOption);
+        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.fastBlockPlacingOption);
+        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.frontBlockPlacingOption);
+        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.verticalReacharoundOption);
+        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.flyDriftingOption);
+        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.flyVerticalDriftingOption);
         list.addSingleOptionEntry(this.autoJumpOption);
         return list;
     }
 
     public SpruceOptionListWidget buildVisualTab(int width, int height) {
         var list = new SpruceOptionListWidget(Position.origin(), width, height);
+        list.setBackground(new MidnightControlsBackground(130));
         list.addSingleOptionEntry(this.controllerTypeOption);
         list.addSingleOptionEntry(this.virtualMouseSkinOption);
         list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
@@ -352,8 +389,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         labels.addChild(aboutMappings3);
 
         var list = new SpruceOptionListWidget(Position.origin(), width, listHeight);
+        list.setBackground(new MidnightControlsBackground(130));
         list.addSingleOptionEntry(this.controllerOption);
         list.addSingleOptionEntry(this.secondControllerOption);
+        list.addSingleOptionEntry(this.toggleControllerProfileOption);
         list.addSingleOptionEntry(this.unfocusedInputOption);
         list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
         list.addSingleOptionEntry(this.rightDeadZoneOption);
@@ -377,6 +416,11 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     }
 
     public static class MidnightControlsBackground implements Background {
+        private int transparency = 160;
+        public MidnightControlsBackground() {}
+        public MidnightControlsBackground(int transparency) {
+            this.transparency = transparency;
+        }
         @Override
         public void render(MatrixStack matrixStack, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
             fill(matrixStack, widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), MidnightColorUtil.hex2Rgb("#000000"));
@@ -388,7 +432,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
             float r = (float)(color.getRed()) / 255.0F;
             float g = (float)(color.getGreen()) / 255.0F;
             float b = (float)(color.getBlue()) / 255.0F;
-            float t = (float)(160) / 255.0F;
+            float t = (float)(transparency) / 255.0F;
             BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
             RenderSystem.enableBlend();
             RenderSystem.disableTexture();

src/main/java/eu/midnightdust/midnightcontrols/client/gui/RingScreen.java

@@ -10,8 +10,11 @@
 package eu.midnightdust.midnightcontrols.client.gui;
 
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
+import eu.midnightdust.midnightcontrols.client.ring.RingButtonMode;
 import eu.midnightdust.midnightcontrols.client.ring.RingPage;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
@@ -30,6 +33,15 @@ public class RingScreen extends Screen {
         this.mod = MidnightControlsClient.get();
     }
 
+    @Override
+    protected void init() {
+        super.init();
+        if (mod.ring.getMaxPages() > 1) {
+            this.addDrawableChild(new ButtonWidget(5, 5, 20, 20, Text.of("◀"), button -> this.mod.ring.cyclePage(false)));
+            this.addDrawableChild(new ButtonWidget(width - 25, 5, 20, 20, Text.of("▶"), button -> this.mod.ring.cyclePage(true)));
+        }
+    }
+
     @Override
     public boolean shouldPause() {
         return false;
@@ -40,16 +52,39 @@ public class RingScreen extends Screen {
         super.render(matrices, mouseX, mouseY, delta);
 
         RingPage page = this.mod.ring.getCurrentPage();
-
         page.render(matrices, this.textRenderer, this.width, this.height, mouseX, mouseY, delta);
     }
 
+    @Override
+    public void close() {
+        super.close();
+        assert client != null;
+        client.currentScreen = null;
+        RingPage page = this.mod.ring.getCurrentPage();
+        if (RingPage.selected >= 0 && page.actions[RingPage.selected] != null)
+            page.actions[RingPage.selected].activate(RingButtonMode.PRESS);
+        RingPage.selected = -1;
+        this.removed();
+    }
+    @Override
+    public boolean changeFocus(boolean lookForwards) {
+        if (lookForwards) {
+            if (RingPage.selected < 7) ++RingPage.selected;
+            else RingPage.selected = -1;
+        }
+        else  {
+            if (RingPage.selected > -1) --RingPage.selected;
+            else RingPage.selected = 7;
+        }
+        return true;
+    }
+
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        /*if (midnightcontrolsClient.BINDING_RING.matchesMouse(button)) {
-            this.onClose();
+        if (mod.ring.getCurrentPage().onClick(width, height, (int) mouseX, (int) mouseY)) {
+            this.close();
             return true;
-        }*/
+        }
         return false;
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/TouchscreenOverlay.java

@@ -9,18 +9,18 @@
 
 package eu.midnightdust.midnightcontrols.client.gui;
 
-import dev.lambdaurora.spruceui.widget.SpruceTexturedButtonWidget;
+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import eu.midnightdust.midnightcontrols.client.HudSide;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.gui.widget.SilentTexturedButtonWidget;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TexturedButtonWidget;
-import net.minecraft.client.option.KeyBinding;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.text.Text;
 import net.minecraft.util.Arm;
@@ -37,265 +37,259 @@ import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y;
  * Represents the touchscreen overlay
  */
 public class TouchscreenOverlay extends Screen {
-    public static final Identifier                 WIDGETS_LOCATION     = new Identifier("midnightcontrols", "textures/gui/widgets.png");
-    private             MidnightControlsClient       mod;
-    private             SpruceTexturedButtonWidget jumpButton;
-    private             SpruceTexturedButtonWidget flyButton;
-    private             SpruceTexturedButtonWidget flyUpButton;
-    private             SpruceTexturedButtonWidget flyDownButton;
-    private             int                        flyButtonEnableTicks = 0;
-    private             int                        forwardButtonTick    = 0;
-    private             SpruceTexturedButtonWidget forwardLeftButton;
-    private             SpruceTexturedButtonWidget forwardRightButton;
-    private             SpruceTexturedButtonWidget startSneakButton;
-    private             SpruceTexturedButtonWidget endSneakButton;
+    public static final Identifier WIDGETS_LOCATION = new Identifier("midnightcontrols", "textures/gui/widgets.png");
+    private MidnightControlsClient mod;
+    private SilentTexturedButtonWidget jumpButton;
+    private SilentTexturedButtonWidget flyButton;
+    private SilentTexturedButtonWidget flyUpButton;
+    private SilentTexturedButtonWidget flyDownButton;
+    private int flyButtonEnableTicks = 0;
+    private int forwardButtonTick = 0;
+    private SilentTexturedButtonWidget forwardLeftButton;
+    private SilentTexturedButtonWidget forwardRightButton;
+    private SilentTexturedButtonWidget startSneakButton;
+    private SilentTexturedButtonWidget endSneakButton;
 
-    public TouchscreenOverlay(@NotNull MidnightControlsClient mod)
-    {
+    public TouchscreenOverlay(@NotNull MidnightControlsClient mod) {
         super(Text.literal("Touchscreen overlay"));
         this.mod = mod;
         this.passEvents = true;
     }
 
-//    @Override
-//    public boolean shouldPause()
-//    {
-//        return false;
-//    }
-//
-//    @Override
-//    public boolean keyPressed(int keyCode, int scanCode, int modifiers)
-//    {
-//        super.keyPressed(keyCode,scanCode,modifiers);
-//        //return false;
-//        return true;
-//    }
-//
-//    private void pauseGame(boolean bl)
-//    {
-//        if (this.client == null)
-//            return;
-//        boolean bl2 = this.client.isIntegratedServerRunning() && !this.client.getServer().isRemote();
-//        if (bl2) {
-//            this.client.setScreen(new GameMenuScreen(!bl));
-//            this.client.getSoundManager().pauseAll();
-//        } else {
-//            this.client.setScreen(new GameMenuScreen(true));
-//        }
-//    }
-//
-//    /**
-//     * Updates the forward button ticks cooldown.
-//     *
-//     * @param state The button state.
-//     *
-//     */
-//    private void updateForwardButtonsState(boolean state)
-//    {
-//        if (state)
-//            this.forwardButtonTick = -1;
-//        else
-//            this.forwardButtonTick = 20;
-//    }
-//
-//    /**
-//     * Updates the jump buttons.
-//     */
-//    private void updateJumpButtons()
-//    {
-//        if (this.client == null)
-//            return;
-//        if (!this.client.interactionManager.isFlyingLocked()) {
-//            boolean oldStateFly = this.flyButton.visible;
-//            this.jumpButton.visible = false;
-//            this.flyButton.visible = true;
-//            this.flyUpButton.visible = true;
-//            this.flyDownButton.visible = true;
-//            if (oldStateFly != this.flyButton.visible) {
-//                this.flyButtonEnableTicks = 5;
-//                this.handleJump(null, false);
-//            } else if (this.flyButtonEnableTicks > 0)
-//                this.flyButtonEnableTicks--;
-//        } else {
-//            this.jumpButton.visible = true;
-//            this.flyButton.visible = false;
-//            this.flyUpButton.visible = false;
-//            this.flyDownButton.visible = false;
-//        }
-//    }
-//
-//    /**
-//     * Handles the jump button.
-//     *
-//     * @param btn   The pressed button.
-//     * @param state The state of the jump button.
-//     */
-//    private void handleJump(ButtonWidget btn, boolean state)
-//    {
-//        ((KeyBindingAccessor) this.client.options.keyJump).midnightcontrols$handlePressState(state);
-//    }
-//
-//    @Override
-//    public void tick()
-//    {
-//        if (this.forwardButtonTick > 0) {
-//            this.forwardButtonTick--;
-//        } else if (this.forwardButtonTick == 0) {
-//            if (this.forwardLeftButton.visible)
-//                this.forwardLeftButton.visible = false;
-//            if (this.forwardRightButton.visible)
-//                this.forwardRightButton.visible = false;
-//        }
-//        this.updateJumpButtons();
-//    }
-//
-//    @Override
-//    protected void init()
-//    {
-//        super.init();
-//        int scaledWidth = this.client.getWindow().getScaledWidth();
-//        int scaledHeight = this.client.getWindow().getScaledHeight();
-//        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2 - 20, 0, 20, 20, 0, 106, 20, ButtonWidget.WIDGETS_LOCATION, 256, 256,
-//                btn -> this.client.setScreen(new ChatScreen("")), LiteralText.EMPTY));
-//        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2, 0, 20, 20, 0, 0, 20, WIDGETS_LOCATION, 256, 256,
-//                btn -> this.pauseGame(false)));
-//        // Inventory buttons.
-//        int inventoryButtonX = scaledWidth / 2;
-//        int inventoryButtonY = scaledHeight - 16 - 5;
-//        if (this.client.options.mainArm == Arm.LEFT) {
-//            inventoryButtonX = inventoryButtonX - 91 - 24;
-//        } else {
-//            inventoryButtonX = inventoryButtonX + 91 + 4;
-//        }
-//        this.addDrawableChild(new TexturedButtonWidget(inventoryButtonX, inventoryButtonY, 20, 20, 20, 0, 20, WIDGETS_LOCATION, 256, 256,
-//                btn -> {
-//                    if (this.client.interactionManager.hasRidingInventory()) {
-//                        this.client.player.openRidingInventory();
-//                    } else {
-//                        this.client.getTutorialManager().onInventoryOpened();
-//                        this.client.openScreen(new InventoryScreen(this.client.player));
-//                    }
-//                }));
-//        int jumpButtonX, swapHandsX, sneakButtonX;
-//        int sneakButtonY = scaledHeight - 10 - 40 - 5;
-//        if (MidnightControlsConfig.hudSide == HudSide.LEFT) {
-//            jumpButtonX = scaledWidth - 20 - 20;
-//            swapHandsX = jumpButtonX - 5 - 40;
-//            sneakButtonX = 10 + 20 + 5;
-//        } else {
-//            jumpButtonX = 20;
-//            swapHandsX = jumpButtonX + 5 + 40;
-//            sneakButtonX = scaledWidth - 10 - 40 - 5;
-//        }
-//        // Swap items hand.
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(swapHandsX, sneakButtonY, 20, 20, 0, 160, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    if (state) {
-//                        if (!this.client.player.isSpectator()) {
-//                            this.client.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
-//                        }
-//                    }
-//                }));
-//        // Drop
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(swapHandsX, sneakButtonY + 5 + 20, 20, 20, 20, 160, 20, WIDGETS_LOCATION,
-//                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyDrop).midnightcontrols$handlePressState(state)));
-//        // Jump keys
-//        this.addDrawableChild(this.jumpButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY, 20, 20, 0, 40, 20, WIDGETS_LOCATION,
-//                this::handleJump));
-//        this.addDrawableChild(this.flyButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY, 20, 20, 20, 40, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    if (this.flyButtonEnableTicks == 0) this.client..abilities.flying = false;
-//                }));
-//        this.addDrawableChild(this.flyUpButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY - 5 - 20, 20, 20, 40, 40, 20, WIDGETS_LOCATION,
-//                this::handleJump));
-//        this.addDrawableChild(this.flyDownButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY + 20 + 5, 20, 20, 60, 40, 20, WIDGETS_LOCATION,
-//                (btn, state) -> ((KeyBindingAccessor) this.client.options.keySneak).midnightcontrols$handlePressState(state)));
-//        this.updateJumpButtons();
-//        // Movements keys
-//        this.addDrawableChild((this.startSneakButton = new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY, 20, 20, 0, 120, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    if (state) {
-//                        ((KeyBindingAccessor) this.client.options.keySneak).midnightcontrols$handlePressState(true);
-//                        this.startSneakButton.setVisible(false);
-//                        this.endSneakButton.setVisible(true);
-//                    }
-//                })));
-//        this.addDrawableChild((this.endSneakButton = new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY, 20, 20, 20, 120, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    if (state) {
-//                        ((KeyBindingAccessor) this.client.options.keySneak).midnightcontrols$handlePressState(false);
-//                        this.endSneakButton.setVisible(false);
-//                        this.startSneakButton.setVisible(true);
-//                    }
-//                })));
-//        this.endSneakButton.setVisible(false);
-//        this.addDrawableChild(this.forwardLeftButton = new SpruceTexturedButtonWidget(sneakButtonX - 20 - 5, sneakButtonY - 5 - 20, 20, 20, 80, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    ((KeyBindingAccessor) this.client.options.keyForward).midnightcontrols$handlePressState(state);
-//                    ((KeyBindingAccessor) this.client.options.keyLeft).midnightcontrols$handlePressState(state);
-//                    this.updateForwardButtonsState(state);
-//                }));
-//        this.forwardLeftButton.setVisible(false);
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY - 5 - 20, 20, 20, 0, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    ((KeyBindingAccessor) this.client.options.keyForward).midnightcontrols$handlePressState(state);
-//                    this.updateForwardButtonsState(state);
-//                    this.forwardLeftButton.setVisible(true);
-//                    this.forwardRightButton.setVisible(true);
-//                }));
-//        this.addDrawableChild(this.forwardRightButton = new SpruceTexturedButtonWidget(sneakButtonX + 20 + 5, sneakButtonY - 5 - 20, 20, 20, 100, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> {
-//                    ((KeyBindingAccessor) this.client.options.keyForward).midnightcontrols$handlePressState(state);
-//                    ((KeyBindingAccessor) this.client.options.keyRight).midnightcontrols$handlePressState(state);
-//                    this.updateForwardButtonsState(state);
-//                }));
-//        this.forwardRightButton.setVisible(true);
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(sneakButtonX + 20 + 5, sneakButtonY, 20, 20, 20, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyRight).midnightcontrols$handlePressState(state)));
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY + 20 + 5, 20, 20, 40, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyBack).midnightcontrols$handlePressState(state)));
-//        this.addDrawableChild(new SpruceTexturedButtonWidget(sneakButtonX - 20 - 5, sneakButtonY, 20, 20, 60, 80, 20, WIDGETS_LOCATION,
-//                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyLeft).midnightcontrols$handlePressState(state)));
-//
-//        this.children().forEach(button -> {
-//            if (button instanceof SpruceTexturedButtonWidget) {
-//                ((SpruceTexturedButtonWidget) button).setSilent(true);
-//            }
-//        });
-//    }
-//
-//    @Override
-//    public boolean mouseClicked(double mouseX, double mouseY, int button)
-//    {
-//        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null) {
-//            int centerX = this.width / 2;
-//            if (mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
-//                for (int slot = 0; slot < 9; ++slot) {
-//                    int slotX = centerX - 90 + slot * 20 + 2;
-//                    if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
-//                        this.client.player.getInventory().selectedSlot = slot;
-//                        return true;
-//                    }
-//                }
-//            }
-//        }
-//        return super.mouseClicked(mouseX, mouseY, button);
-//    }
-//
-//    @Override
-//    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY)
-//    {
-//        if (button == GLFW.GLFW_MOUSE_BUTTON_1 && this.client != null) {
-//            if (deltaY > 0.01)
-//                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 2);
-//            else if (deltaY < 0.01)
-//                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 1);
-//
-//            if (deltaX > 0.01)
-//                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 2);
-//            else if (deltaX < 0.01)
-//                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 1);
-//        }
-//        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
-//    }
+    @Override
+    public boolean shouldPause()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        super.keyPressed(keyCode,scanCode,modifiers);
+        //return false;
+        return true;
+    }
+
+    private void pauseGame(boolean bl) {
+        if (this.client == null)
+            return;
+        boolean bl2 = this.client.isIntegratedServerRunning() && !this.client.getServer().isRemote();
+        if (bl2) {
+            this.client.setScreen(new GameMenuScreen(!bl));
+            this.client.getSoundManager().pauseAll();
+        } else {
+            this.client.setScreen(new GameMenuScreen(true));
+        }
+    }
+
+    /**
+     * Updates the forward button ticks cooldown.
+     *
+     * @param state The button state.
+     *
+     */
+    private void updateForwardButtonsState(boolean state) {
+        if (state)
+            this.forwardButtonTick = -1;
+        else
+            this.forwardButtonTick = 20;
+    }
+
+    /**
+     * Updates the jump buttons.
+     */
+    private void updateJumpButtons() {
+        if (this.client == null)
+            return;
+        if (!this.client.interactionManager.isFlyingLocked()) {
+            boolean oldStateFly = this.flyButton.isVisible();
+            this.jumpButton.setVisible(false);
+            this.flyButton.setVisible(true);
+            this.flyUpButton.setVisible(true);
+            this.flyDownButton.setVisible(true);
+            if (oldStateFly != this.flyButton.isVisible()) {
+                this.flyButtonEnableTicks = 5;
+                this.setJump(false);
+            } else if (this.flyButtonEnableTicks > 0)
+                this.flyButtonEnableTicks--;
+        } else {
+            this.jumpButton.setVisible(true);
+            this.flyButton.setVisible(false);
+            this.flyUpButton.setVisible(false);
+            this.flyDownButton.setVisible(false);
+        }
+    }
+
+    /**
+     * Handles the jump button.
+     *
+     * @param btn   The pressed button.
+     */
+    private void handleJump(SpruceButtonWidget btn) {
+        ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(btn.isActive());
+    }
+    /**
+     * Handles the jump button.
+     *
+     * @param state   The state.
+     */
+    private void setJump(boolean state) {
+        ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(state);
+    }
+
+    @Override
+    public void tick() {
+        if (this.forwardButtonTick > 0) {
+            this.forwardButtonTick--;
+        } else if (this.forwardButtonTick == 0) {
+            if (this.forwardLeftButton.isVisible())
+                this.forwardLeftButton.setVisible(false);
+            if (this.forwardRightButton.isVisible())
+                this.forwardRightButton.setVisible(false);
+        }
+        this.updateJumpButtons();
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        int scaledWidth = this.client.getWindow().getScaledWidth();
+        int scaledHeight = this.client.getWindow().getScaledHeight();
+        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2 - 20, 0, 20, 20, 0, 106, 20, new Identifier("textures/gui/widgets.png"), 256, 256,
+                btn -> this.client.setScreen(new ChatScreen("")), Text.empty()));
+        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2, 0, 20, 20, 0, 0, 20, WIDGETS_LOCATION, 256, 256,
+                btn -> this.pauseGame(false)));
+        // Inventory buttons.
+        int inventoryButtonX = scaledWidth / 2;
+        int inventoryButtonY = scaledHeight - 16 - 5;
+        if (this.client.options.getMainArm().getValue() == Arm.LEFT) {
+            inventoryButtonX = inventoryButtonX - 91 - 24;
+        } else {
+            inventoryButtonX = inventoryButtonX + 91 + 4;
+        }
+        this.addDrawableChild(new TexturedButtonWidget(inventoryButtonX, inventoryButtonY, 20, 20, 20, 0, 20, WIDGETS_LOCATION, 256, 256,
+                btn -> {
+                    if (this.client.interactionManager.hasRidingInventory()) {
+                        this.client.player.openRidingInventory();
+                    } else {
+                        this.client.getTutorialManager().onInventoryOpened();
+                        this.client.setScreen(new InventoryScreen(this.client.player));
+                    }
+                }));
+        int jumpButtonX, swapHandsX, sneakButtonX;
+        int sneakButtonY = scaledHeight - 10 - 40 - 5;
+        if (MidnightControlsConfig.hudSide == HudSide.LEFT) {
+            jumpButtonX = scaledWidth - 20 - 20;
+            swapHandsX = jumpButtonX - 5 - 40;
+            sneakButtonX = 10 + 20 + 5;
+        } else {
+            jumpButtonX = 20;
+            swapHandsX = jumpButtonX + 5 + 40;
+            sneakButtonX = scaledWidth - 10 - 40 - 5;
+        }
+        // Swap items hand.
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY), 20, 20, Text.empty(),
+                button -> {
+                    if (button.isActive()) {
+                        if (!this.client.player.isSpectator()) {
+                            this.client.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
+                        }
+                    }
+                },0, 160, 20, WIDGETS_LOCATION));
+        // Drop
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY + 5 + 20), 20, 20, Text.empty(), btn ->
+                ((KeyBindingAccessor) this.client.options.dropKey).midnightcontrols$handlePressState(btn.isActive()), 0, 160, 20, WIDGETS_LOCATION));
+        // Jump keys
+        this.addDrawableChild(this.jumpButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY), 20, 20, Text.empty(), this::handleJump, 0, 40, 20, WIDGETS_LOCATION));
+        this.addDrawableChild(this.flyButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY), 20, 20, Text.empty(),btn -> {
+                    if (this.flyButtonEnableTicks == 0) this.client.player.getAbilities().flying = false;
+                }, 20, 40, 20, WIDGETS_LOCATION)
+        );
+        this.addDrawableChild(this.flyUpButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY - 5 - 20), 20, 20,Text.empty(),
+                this::handleJump, 40, 40, 20, WIDGETS_LOCATION
+        ));
+        this.addDrawableChild(this.flyDownButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
+                btn -> ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(btn.isActive()), 60, 40, 20, WIDGETS_LOCATION
+        ));
+        this.updateJumpButtons();
+        // Movements keys
+        this.addDrawableChild((this.startSneakButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY), 20, 20, Text.empty(), btn -> {
+                    if (btn.isActive()) {
+                        ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(true);
+                        this.startSneakButton.setVisible(false);
+                        this.endSneakButton.setVisible(true);
+                    }
+                }, 0, 120, 20, WIDGETS_LOCATION))
+        );
+        this.addDrawableChild((this.endSneakButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY), 20, 20, Text.empty(), btn -> {
+            if (btn.isActive()) {
+                ((KeyBindingAccessor) this.client.options.sneakKey).midnightcontrols$handlePressState(false);
+                this.endSneakButton.setVisible(false);
+                this.startSneakButton.setVisible(true);
+            }
+        }, 20, 120, 20, WIDGETS_LOCATION)));
+        this.endSneakButton.setVisible(false);
+        this.addDrawableChild(this.forwardLeftButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
+            ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive());
+            this.updateForwardButtonsState(btn.isActive());
+        }, 80, 80, 20, WIDGETS_LOCATION
+        ));
+        this.forwardLeftButton.setVisible(false);
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
+            this.updateForwardButtonsState(btn.isActive());
+            this.forwardLeftButton.setVisible(true);
+            this.forwardRightButton.setVisible(true);
+        }, 0, 80, 20, WIDGETS_LOCATION
+        ));
+        this.addDrawableChild(this.forwardRightButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
+            ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
+            ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isActive());
+            this.updateForwardButtonsState(btn.isActive());
+        }, 100, 80, 20, WIDGETS_LOCATION
+        ));
+        this.forwardRightButton.setVisible(true);
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY), 20, 20, Text.empty(),
+                btn -> ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isActive()), 20, 80, 20, WIDGETS_LOCATION
+        ));
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
+                btn -> ((KeyBindingAccessor) this.client.options.backKey).midnightcontrols$handlePressState(btn.isActive()), 40, 80, 20, WIDGETS_LOCATION
+        ));
+        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY), 20, 20, Text.empty(),
+                btn -> ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive()), 60, 80, 20, WIDGETS_LOCATION
+        ));
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null) {
+            int centerX = this.width / 2;
+            if (mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
+                for (int slot = 0; slot < 9; ++slot) {
+                    int slotX = centerX - 90 + slot * 20 + 2;
+                    if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
+                        this.client.player.getInventory().selectedSlot = slot;
+                        return true;
+                    }
+                }
+            }
+        }
+        return super.mouseClicked(mouseX, mouseY, button);
+    }
+
+    @Override
+    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+        if (button == GLFW.GLFW_MOUSE_BUTTON_1 && this.client != null) {
+            if (deltaY > 0.01)
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 2);
+            else if (deltaY < 0.01)
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 1);
+
+            if (deltaX > 0.01)
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 2);
+            else if (deltaX < 0.01)
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 1);
+        }
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerControlsWidget.java

@@ -17,6 +17,7 @@ import dev.lambdaurora.spruceui.Position;
 import dev.lambdaurora.spruceui.SpruceTexts;
 import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
+import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
@@ -49,6 +50,7 @@ public class ControllerControlsWidget extends SpruceContainerWidget {
                 Text.translatable("midnightcontrols.menu.keyboard_controls"),
                 btn -> this.client.setScreen(new ControlsOptionsScreen(null, this.client.options))));
         this.bindingsListWidget = new ControlsListWidget(Position.of(this, 0, 43), this.width, this.height - 43 - 35, this);
+        this.bindingsListWidget.setBackground(new MidnightControlsSettingsScreen.MidnightControlsBackground(130));
         this.addChild(this.bindingsListWidget);
         this.addChild(this.resetButton = new SpruceButtonWidget(Position.of(this, this.width / 2 - 155, this.height - 29), 150, 20,
                 SpruceTexts.CONTROLS_RESET_ALL,

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/SilentTexturedButtonWidget.java

@@ -0,0 +1,26 @@
+package eu.midnightdust.midnightcontrols.client.gui.widget;
+
+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceTexturedButtonWidget;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+public class SilentTexturedButtonWidget extends SpruceTexturedButtonWidget {
+    public SilentTexturedButtonWidget(Position position, int width, int height, Text message, PressAction action, int u, int v, int hoveredVOffset, Identifier texture) {
+        super(position, width, height, message, action, u, v, hoveredVOffset, texture);
+    }
+
+    public SilentTexturedButtonWidget(Position position, int width, int height, Text message, boolean showMessage, PressAction action, int u, int v, int hoveredVOffset, Identifier texture) {
+        super(position, width, height, message, showMessage, action, u, v, hoveredVOffset, texture);
+    }
+
+    public SilentTexturedButtonWidget(Position position, int width, int height, Text message, PressAction action, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight) {
+        super(position, width, height, message, action, u, v, hoveredVOffset, texture, textureWidth, textureHeight);
+    }
+
+    public SilentTexturedButtonWidget(Position position, int width, int height, Text message, boolean showMessage, PressAction action, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight) {
+        super(position, width, height, message, showMessage, action, u, v, hoveredVOffset, texture, textureWidth, textureHeight);
+    }
+    @Override
+    public void playDownSound() {}
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClickableWidgetAccessor.java

@@ -17,4 +17,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface ClickableWidgetAccessor {
     @Accessor("height")
     int getHeight();
+    @Accessor("focused")
+    void setFocused(boolean value);
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java

@@ -10,6 +10,7 @@
 package eu.midnightdust.midnightcontrols.client.mixin;
 
 import com.mojang.authlib.GameProfile;
+import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.MovementHandler;
@@ -27,6 +28,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 /**
@@ -53,10 +55,13 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     @Shadow
     protected abstract boolean isCamera();
 
+    @Shadow protected int ticksLeftToDoubleTapSprint;
+
 
     @Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
     public void onMove(MovementType type, Vec3d movement, CallbackInfo ci) {
-        var mod = MidnightControlsClient.get();
+        if (!MidnightControlsConfig.doubleTapToSprint) ticksLeftToDoubleTapSprint = 0;
+        if (!MidnightControls.isExtrasLoaded) return;
         if (type == MovementType.SELF) {
             if (this.getAbilities().flying && (!MidnightControlsConfig.flyDrifting || !MidnightControlsConfig.verticalFlyDrifting)) {
                 if (!this.hasMovementInput()) {
@@ -79,7 +84,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
     public void onTickMovement(CallbackInfo ci) {
         if (this.getAbilities().flying && this.isCamera()) {
-            if (MidnightControlsConfig.verticalFlyDrifting)
+            if (MidnightControlsConfig.verticalFlyDrifting || !MidnightControls.isExtrasLoaded)
                 return;
             int moving = 0;
             if (this.input.sneaking) {

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java

@@ -9,14 +9,18 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
+import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -26,16 +30,27 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(ControlsOptionsScreen.class)
 public abstract class ControlsOptionsScreenMixin extends GameOptionsScreen {
+    @Unique private final boolean showAlternativeButton = FabricLoader.getInstance().isModLoaded("crawl");
     public ControlsOptionsScreenMixin(Screen parent, GameOptions gameOptions, Text text) {
         super(parent, gameOptions, text);
     }
+    @Inject(method = "init", at = @At(value = "INVOKE", ordinal = 1, shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/option/ControlsOptionsScreen;addDrawableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;"))
+    private void addAlternativeControllerButton(CallbackInfo ci) {
+        if (showAlternativeButton) {
+            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20,0,0,20, new Identifier("midnightcontrols", "textures/gui/midnightcontrols_button.png"), 32, 64, (button) -> {
+                this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
+            }, Text.translatable("midnightcontrols.menu.title.controller")));
+        }
+    }
     @Inject(method = "init", at = @At(value = "INVOKE", ordinal = 4, shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/option/ControlsOptionsScreen;addDrawableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;"))
     private void addControllerButton(CallbackInfo ci) {
-        int i = this.width / 2 - 155;
-        int j = i + 160;
-        int k = this.height / 6 - 12 + 48;;
-        this.addDrawableChild(new ButtonWidget(j, k, 150, 20, Text.translatable("midnightcontrols.menu.title.controller").append("..."), (button) -> {
-            this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
-        }));
+        if (!showAlternativeButton) {
+            int i = this.width / 2 - 155;
+            int j = i + 160;
+            int k = this.height / 6 - 12 + 48;
+            this.addDrawableChild(new ButtonWidget(j, k, 150, 20, Text.translatable("midnightcontrols.menu.title.controller").append("..."), (button) -> {
+                this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
+            }));
+        }
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java

@@ -29,7 +29,9 @@ public interface CreativeInventoryScreenAccessor {
      * @return the selected tab index
      */
     @Accessor("selectedTab")
-    int getSelectedTab();
+    static int getSelectedTab() {
+        return 0;
+    }
 
     /**
      * Sets the selected tab.

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java

@@ -27,7 +27,7 @@ public class GameRendererMixin {
     @Final
     private MinecraftClient client;
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Mouse;getX()D"))
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Mouse;getX()D", shift = At.Shift.BEFORE))
     private void onRender(float tickDelta, long startTime, boolean fullRender, CallbackInfo ci) {
         if (this.client.currentScreen != null && MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER)
             MidnightControlsClient.get().input.onPreRenderScreen(this.client, this.client.currentScreen);

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java

@@ -12,7 +12,9 @@ package eu.midnightdust.midnightcontrols.client.mixin;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
+import eu.midnightdust.midnightcontrols.client.compat.EMICompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
@@ -20,9 +22,11 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
@@ -34,7 +38,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(HandledScreen.class)
 public abstract class HandledScreenMixin implements HandledScreenAccessor {
-
     @Accessor("x")
     public abstract int getX();
 
@@ -53,18 +56,27 @@ public abstract class HandledScreenMixin implements HandledScreenAccessor {
 
     @Inject(method = "render", at = @At("RETURN"))
     public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) {
+        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.hudEnable) {
             var client = MinecraftClient.getInstance();
+            matrices.push();
             int x = 2, y = client.getWindow().getScaledHeight() - 2 - MidnightControlsRenderer.ICON_SIZE;
-
-            x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "midnightcontrols.action.pickup_all", true, client) + 2;
-            x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "midnightcontrols.action.exit", true, client) + 2;
+            if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled()) {
+                x += 42;
+            }
+            if (!ButtonBinding.TAKE_ALL.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE_ALL,true, client) + 2;
+            if (!ButtonBinding.EXIT.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.EXIT, true, client) + 2;
             if (MidnightControlsCompat.isReiPresent()) {
                 x = 2;
                 y -= 24;
             }
-            x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "midnightcontrols.action.pickup", true, client) + 2;
-            MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "midnightcontrols.action.quick_move", true, client);
+            if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled() && EMICompat.isSearchBarCentered()) {
+                x = client.getWindow().getScaledWidth() - 55 - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.pickup"))
+                        - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.quick_move"))
+                        - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.TAKE) - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.QUICK_MOVE);
+            }
+            if (!ButtonBinding.TAKE.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE, true, client);
+            if (!ButtonBinding.QUICK_MOVE.isNotBound()) MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.QUICK_MOVE, true, client);
+            matrices.pop();
         }
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingIDAccessor.java

@@ -0,0 +1,14 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.minecraft.client.option.KeyBinding;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(KeyBinding.class)
+public interface KeyBindingIDAccessor {
+    @Accessor @Final
+    static Map<String, KeyBinding> getKEYS_BY_ID() {return null;};
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingMixin.java

@@ -28,7 +28,7 @@ public class KeyBindingMixin implements KeyBindingAccessor {
         if (!this.pressed)
             this.pressed = true;
         ++this.timesPressed;
-        return oldPressed != this.pressed;
+        return !oldPressed;
     }
 
     @Override

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
+import net.minecraft.client.option.KeyBinding;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(value = KeyBindingRegistryImpl.class, remap = false)
+public interface KeyBindingRegistryImplAccessor {
+    @Accessor @Final
+    static List<KeyBinding> getModdedKeyBindings() {
+        return null;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java

@@ -54,10 +54,6 @@ public abstract class MinecraftClientMixin {
     @Nullable
     public ClientPlayerInteractionManager interactionManager;
 
-    @Shadow
-    @Nullable
-    public ClientWorld world;
-
     @Shadow
     @Final
     public GameRenderer gameRenderer;
@@ -104,21 +100,19 @@ public abstract class MinecraftClientMixin {
             this.midnightcontrols$lastTargetSide = side;
         }
         // Removed front placing sprinting as way too cheaty.
-        /*else if (this.player.isSprinting()) {
-            hitResult = midnightcontrolsClient.get().reacharound.getLastReacharoundResult();
-            if (hitResult != null) {
-                if (cooldown > 0)
-                    this.itemUseCooldown = 0;
-            }
-        }*/
+//        else if (this.player.isSprinting()) {
+//            hitResult = MidnightControlsClient.get().reacharound.getLastReacharoundResult();
+//            if (hitResult != null) {
+//                if (cooldown > 0)
+//                    this.itemUseCooldown = 0;
+//            }
+//        }
         this.midnightcontrols$lastPos = this.player.getPos();
     }
-
     @Inject(method = "render", at = @At("HEAD"))
-    private void onRender(boolean fullRender, CallbackInfo ci) {
+    private void onRender(CallbackInfo ci) {
         MidnightControlsClient.get().onRender((MinecraftClient) (Object) (this));
     }
-
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V", shift = At.Shift.AFTER))
     private void renderVirtualCursor(boolean fullRender, CallbackInfo ci) {
         MidnightControlsRenderer.renderVirtualCursor(new MatrixStack(), (MinecraftClient) (Object) this);

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java

@@ -20,6 +20,7 @@ import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -35,6 +36,9 @@ public abstract class MouseMixin implements MouseAccessor {
     @Final
     private MinecraftClient client;
 
+    @Accessor
+    public abstract void setLeftButtonClicked(boolean value);
+
     @Invoker("onCursorPos")
     public abstract void midnightcontrols$onCursorPos(long window, double x, double y);
 

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenAccessor.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.screen.Screen;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(Screen.class)
+public interface ScreenAccessor {
+    @Accessor
+    List<Selectable> getSelectables();
+    @Accessor @Nullable
+    Selectable getSelected();
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
+import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.block.ShapeContext;
@@ -30,6 +31,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.awt.*;
+
 /**
  * Represents a mixin to WorldRenderer.
  * <p>
@@ -49,7 +52,7 @@ public abstract class WorldRendererMixin {
     private BufferBuilderStorage bufferBuilders;
 
     @Shadow
-    private static void drawShapeOutline(MatrixStack matrixStack, VertexConsumer vertexConsumer, VoxelShape voxelShape, double d, double e, double f, float g, float h, float i, float j) {
+    private static void drawCuboidShapeOutline(MatrixStack matrices, VertexConsumer vertexConsumer, VoxelShape shape, double offsetX, double offsetY, double offsetZ, float red, float green, float blue, float alpha) {
     }
 
     @Inject(
@@ -69,7 +72,7 @@ public abstract class WorldRendererMixin {
         if (result == null)
             return;
         var blockPos = result.getBlockPos();
-        if (this.world.getWorldBorder().contains(blockPos)) {
+        if (this.world.getWorldBorder().contains(blockPos) && this.client.player != null) {
             var stack = this.client.player.getStackInHand(Hand.MAIN_HAND);
             if (stack == null || !(stack.getItem() instanceof BlockItem))
                 return;
@@ -86,12 +89,14 @@ public abstract class WorldRendererMixin {
             var pos = camera.getPos();
 
             var outlineShape = placementState.getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
-            int[] color = MidnightControlsConfig.reacharoundOutlineColor;
-
+            Color rgb = MidnightColorUtil.hex2Rgb(MidnightControlsConfig.reacharoundOutlineColorHex);
+            if (MidnightControlsConfig.reacharoundOutlineColorHex.isEmpty()) rgb = MidnightColorUtil.radialRainbow(1,1);
+            matrices.push();
             var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
-            drawShapeOutline(matrices, vertexConsumer, outlineShape,
+            drawCuboidShapeOutline(matrices, vertexConsumer, outlineShape,
                     (double) blockPos.getX() - pos.getX(), (double) blockPos.getY() - pos.getY(), (double) blockPos.getZ() - pos.getZ(),
-                    color[0] / 255.f, color[1] / 255.f, color[2] / 255.f, color[3] / 255.f);
+                    rgb.getRed() / 255.f, rgb.getGreen() / 255.f, rgb.getBlue() / 255.f, MidnightControlsConfig.reacharoundOutlineColorAlpha / 255.f);
+            matrices.pop();
         }
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/ring/ButtonBindingRingAction.java

@@ -10,23 +10,29 @@
 package eu.midnightdust.midnightcontrols.client.ring;
 
 import com.electronwill.nightconfig.core.Config;
+import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.option.StickyKeyBinding;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.function.Supplier;
 
-public class KeyBindingRingAction extends RingAction {
+public class ButtonBindingRingAction extends RingAction {
     public static final Factory FACTORY = new Factory();
-    public final KeyBinding binding;
+    public final ButtonBinding binding;
 
-    public KeyBindingRingAction(@NotNull Config config, @NotNull KeyBinding binding) {
-        super(config);
+    public ButtonBindingRingAction(@NotNull ButtonBinding binding) {
+        super();
         this.binding = binding;
     }
 
@@ -37,19 +43,19 @@ public class KeyBindingRingAction extends RingAction {
 
     @Override
     public void onAction(@NotNull RingButtonMode mode) {
-        KeyBindingAccessor accessor = (KeyBindingAccessor) this.binding;
-        switch (mode) {
-            case PRESS, HOLD -> accessor.midnightcontrols$handlePressState(this.activated);
-            case TOGGLE -> {
-                accessor.midnightcontrols$handlePressState(!this.binding.isPressed());
-                this.activated = !this.binding.isPressed();
-            }
+        binding.handle(MinecraftClient.getInstance(), 1.0f, ButtonState.PRESS);
+        if (binding.asKeyBinding().isPresent()) {
+            binding.asKeyBinding().get().setPressed(true);
+            ((KeyBindingAccessor)binding.asKeyBinding().get()).midnightcontrols$press();
         }
     }
 
     @Override
     public void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
-        drawCenteredText(matrices, textRenderer, Text.translatable(this.getName()), x + 25, y + 25 - textRenderer.fontHeight / 2, 0xffffff);
+        List<OrderedText> lines = textRenderer.wrapLines(Text.translatable(this.getName()), MidnightRing.ELEMENT_SIZE);
+        for (int i = 0; i < lines.size(); ++i) {
+            drawCenteredTextWithShadow(matrices, textRenderer, lines.get(i), x + MidnightRing.ELEMENT_SIZE / 2, y + MidnightRing.ELEMENT_SIZE / 2 - textRenderer.fontHeight / 2 * (lines.size()-1) - textRenderer.fontHeight / 2 + textRenderer.fontHeight * i, 0xffffff);
+        }
     }
 
     protected static class Factory implements RingAction.Factory {

src/main/java/eu/midnightdust/midnightcontrols/client/ring/DummyRingAction.java

@@ -1,36 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.ring;
-
-import com.electronwill.nightconfig.core.Config;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import org.jetbrains.annotations.NotNull;
-
-public class DummyRingAction extends RingAction {
-    public DummyRingAction(@NotNull Config config) {
-        super(config);
-    }
-
-    @Override
-    public @NotNull String getName() {
-        return "dummy";
-    }
-
-    @Override
-    public void onAction(@NotNull RingButtonMode mode) {
-
-    }
-
-    @Override
-    public void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
-        drawCenteredText(matrices, textRenderer, this.getName(), x + 25, y + 25 - textRenderer.fontHeight / 2, 0xffffff);
-    }
-}

src/main/java/eu/midnightdust/midnightcontrols/client/ring/MidnightRing.java

@@ -9,10 +9,12 @@
 
 package eu.midnightdust.midnightcontrols.client.ring;
 
-import com.electronwill.nightconfig.core.Config;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -28,7 +30,7 @@ import java.util.Map;
  * @since 1.4.0
  */
 public final class MidnightRing {
-    public static final int ELEMENT_SIZE = 50;
+    public static final int ELEMENT_SIZE = 75;
 
     private final Map<String, RingAction.Factory> actionFactories = new Object2ObjectOpenHashMap<>();
     private final List<RingPage> pages = new ArrayList<>(Collections.singletonList(RingPage.DEFAULT));
@@ -41,7 +43,7 @@ public final class MidnightRing {
 
     public void registerAction(@NotNull String name, @NotNull RingAction.Factory factory) {
         if (this.actionFactories.containsKey(name)) {
-            this.mod.warn("Tried to register twice a ring action: \"" + name + "\".");
+            this.mod.warn("Tried to register a ring action twice: \"" + name + "\".");
             return;
         }
         this.actionFactories.put(name, factory);
@@ -50,17 +52,54 @@ public final class MidnightRing {
     /**
      * Loads the ring from configuration.
      */
-    public void load() {
-//        List<Config> configPages = MidnightControlsConfig.ringPages;
-//        if (configPages != null) {
-//            this.pages.clear();
-//            for (var configPage : configPages) {
-//                RingPage.parseRingPage(configPage).ifPresent(this.pages::add);
-//            }
-//        }
-//        if (this.pages.isEmpty()) {
-//            this.pages.add(RingPage.DEFAULT);
-//        }
+    public void loadFromConfig() {
+        List<String> configBindings = MidnightControlsConfig.ringBindings;
+        if (configBindings != null) {
+            this.pages.clear();
+            int bindingIndex = 0;
+            for (int i = 0; i < MathHelper.ceil(configBindings.size() / 8f); ++i) {
+                this.pages.add(new RingPage(i+1 + " / " + MathHelper.ceil(configBindings.size() / 8f)));
+            }
+
+            for (String binding : configBindings) {
+                ButtonBinding buttonBinding = InputManager.getBinding(binding);
+                if (buttonBinding != null) {
+                    RingPage page = this.pages.get(MathHelper.fastFloor(bindingIndex / 8f));
+                    page.actions[bindingIndex - 8 * (MathHelper.fastFloor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
+                    ++bindingIndex;
+                }
+            }
+        }
+        if (this.pages.isEmpty()) {
+            this.pages.add(RingPage.DEFAULT);
+        }
+    }
+    /**
+     * Loads the ring from all unbound keys.
+     */
+    public void loadFromUnbound() {
+        List<ButtonBinding> unboundBindings = InputManager.getUnboundBindings();
+        if (unboundBindings != null) {
+            this.pages.clear();
+            int bindingIndex = 0;
+            for (int i = 0; i < MathHelper.ceil(unboundBindings.size() / 8f); ++i) {
+                this.pages.add(new RingPage(i+1 + " / " + MathHelper.ceil(unboundBindings.size() / 8f)));
+            }
+
+            for (ButtonBinding buttonBinding : unboundBindings) {
+                if (buttonBinding != null) {
+                    RingPage page = this.pages.get(MathHelper.fastFloor(bindingIndex / 8f));
+                    page.actions[bindingIndex - 8 * (MathHelper.fastFloor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
+                    ++bindingIndex;
+                }
+            }
+        }
+        if (this.pages.isEmpty()) {
+            this.pages.add(RingPage.DEFAULT);
+        }
+    }
+    public int getMaxPages() {
+        return this.pages.size();
     }
 
     public @NotNull RingPage getCurrentPage() {
@@ -70,4 +109,13 @@ public final class MidnightRing {
             this.currentPage = 0;
         return this.pages.get(this.currentPage);
     }
+    public void cyclePage(boolean forwards) {
+        if (forwards) {
+            if (currentPage < pages.size()-1) ++currentPage;
+            else currentPage = 0;
+        } else {
+            if (currentPage > 0) --currentPage;
+            else currentPage = pages.size();
+        }
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/ring/RingAction.java

@@ -29,11 +29,9 @@ import java.util.function.Supplier;
  * @since 1.4.0
  */
 public abstract class RingAction extends DrawableHelper implements Nameable {
-    protected Config config;
     protected boolean activated = false;
 
-    public RingAction(@NotNull Config config) {
-        this.config = config;
+    public RingAction() {
     }
 
     /**
@@ -62,8 +60,8 @@ public abstract class RingAction extends DrawableHelper implements Nameable {
 
     public abstract void onAction(@NotNull RingButtonMode mode);
 
-    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
-        fill(matrices, x, y, x + MidnightRing.ELEMENT_SIZE, y + MidnightRing.ELEMENT_SIZE, hovered ? 0xbb777777 : 0xbb000000);
+    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered, int index) {
+        fill(matrices, x, y, x + MidnightRing.ELEMENT_SIZE, y + MidnightRing.ELEMENT_SIZE, hovered || RingPage.selected == index ? 0xbb777777 : 0xbb000000);
         drawIcon(matrices, textRenderer, x, y, hovered);
     }
 

src/main/java/eu/midnightdust/midnightcontrols/client/ring/RingPage.java

@@ -10,11 +10,17 @@
 package eu.midnightdust.midnightcontrols.client.ring;
 
 import com.electronwill.nightconfig.core.Config;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,7 +35,8 @@ public class RingPage extends DrawableHelper {
     public static final RingPage DEFAULT = new RingPage("Default");
 
     public final String name;
-    private RingAction[] actions = new RingAction[8];
+    public static int selected = -1;
+    public RingAction[] actions = new RingAction[8];
 
     public RingPage(@NotNull String name) {
         this.name = name;
@@ -51,6 +58,7 @@ public class RingPage extends DrawableHelper {
     public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int width, int height, int mouseX, int mouseY, float tickDelta) {
         int centerX = width / 2;
         int centerY = height / 2;
+        if (MidnightControlsClient.get().ring.getMaxPages() > 1) drawCenteredText(matrices, textRenderer, name, centerX, 5, 0xffffff);
 
         int offset = MidnightRing.ELEMENT_SIZE + (MidnightRing.ELEMENT_SIZE / 2) + 5;
 
@@ -59,47 +67,74 @@ public class RingPage extends DrawableHelper {
         for (int i = 0; i < 3; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
-            x += 55;
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+            x += MidnightRing.ELEMENT_SIZE + 5;
         }
-        y += 55;
+        y += MidnightRing.ELEMENT_SIZE + 5;
         x = centerX - offset;
         for (int i = 3; i < 5; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
-            x += 55 * 2;
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+            x += (MidnightRing.ELEMENT_SIZE + 5) * 2;
         }
-        y += 55;
+        y += MidnightRing.ELEMENT_SIZE + 5;
         x = centerX - offset;
         for (int i = 5; i < 8; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
-            x += 55;
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+            x += MidnightRing.ELEMENT_SIZE + 5;
         }
     }
 
     private static boolean isHovered(int x, int y, int mouseX, int mouseY) {
-        return mouseX >= x && mouseY >= y && mouseX <= x + MidnightRing.ELEMENT_SIZE && mouseY <= y + MidnightRing.ELEMENT_SIZE;
+        return mouseX >= x && mouseY >= y && mouseX <= x + MidnightRing.ELEMENT_SIZE && mouseY <= y + MidnightRing.ELEMENT_SIZE && selected < 0;
     }
-
     /**
-     * Tries to parse a ring page configuration.
+     * Renders the ring page.
      *
-     * @param config the configuration
-     * @return an optional ring page
+     * @param width the screen width
+     * @param height the screen height
+     * @param mouseX the mouse X-coordinate
+     * @param mouseY the mouse Y-coordinate
      */
-    public static @NotNull Optional<RingPage> parseRingPage(@NotNull Config config) {
-        String name = config.get("name");
-        if (name == null)
-            return Optional.empty();
+    public boolean onClick(int width, int height, int mouseX, int mouseY) {
+        int centerX = width / 2;
+        int centerY = height / 2;
 
-        var page = new RingPage(name);
+        int offset = MidnightRing.ELEMENT_SIZE + (MidnightRing.ELEMENT_SIZE / 2) + 5;
 
-        List<Config> actionConfigs = config.get("actions");
-
-
-        return Optional.of(page);
+        int y = centerY - offset;
+        int x = centerX - offset;
+        for (int i = 0; i < 3; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += MidnightRing.ELEMENT_SIZE + 5;
+        }
+        y += MidnightRing.ELEMENT_SIZE + 5;
+        x = centerX - offset;
+        for (int i = 3; i < 5; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += (MidnightRing.ELEMENT_SIZE + 5) * 2;
+        }
+        y += MidnightRing.ELEMENT_SIZE + 5;
+        x = centerX - offset;
+        for (int i = 5; i < 8; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += MidnightRing.ELEMENT_SIZE + 5;
+        }
+        return false;
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/util/MouseAccessor.java

@@ -14,4 +14,5 @@ package eu.midnightdust.midnightcontrols.client.util;
  */
 public interface MouseAccessor {
     void midnightcontrols$onCursorPos(long window, double x, double y);
+    void setLeftButtonClicked(boolean value);
 }

src/main/resources/assets/midnightcontrols/lang/de_de.json

@@ -4,10 +4,11 @@
   "key.midnightcontrols.look_left": "Nach links schauen",
   "key.midnightcontrols.look_right": "Nach rechts schauen",
   "key.midnightcontrols.look_up": "Nach oben schauen",
-  "key.midnightcontrols.ring": "Zeige Steuerungsring",
+  "key.midnightcontrols.ring": "Öffne Ring mit ungebundenen Aktionen",
   "midnightcontrols.action.attack": "Angreifen",
   "midnightcontrols.action.back": "Zurück",
   "midnightcontrols.action.chat": "Chat öffnen",
+  "midnightcontrols.action.controls_ring": "Öffne Ring mit ungebundenen Aktionen",
   "midnightcontrols.action.drop_item": "Item droppen",
   "midnightcontrols.action.exit": "Schließen",
   "midnightcontrols.action.forward": "Vorwärts",
@@ -40,8 +41,6 @@
   "midnightcontrols.action.zoom_in": "Zoom erhöhen",
   "midnightcontrols.action.zoom_out": "Zoom verringern",
   "midnightcontrols.action.zoom_reset": "Zoom zurücksetzen",
-  "midnightcontrols.action.key.emotecraft.fastchoose": "Emote Schnellauswahl",
-  "midnightcontrols.action.key.emotecraft.stop": "Emote stoppen",
   "midnightcontrols.button.left_bumper": "Linke Schultertaste",
   "midnightcontrols.button.right_bumper": "Rechte Schultertaste",
   "midnightcontrols.button.back": "Zurück",
@@ -68,6 +67,8 @@
   "midnightcontrols.axis.right_x-": "Rechts X-",
   "midnightcontrols.axis.right_y-": "Rechts Y-",
   "midnightcontrols.button.unknown": "Unbekannt (%d)",
+  "midnightcontrols.controller.tutorial.title": "Spiele Minecraft mit Controller!",
+  "midnightcontrols.controller.tutorial.description": "Gehe zu %s -> %s -> %s",
   "midnightcontrols.controller.connected": "Controller %d verbunden.",
   "midnightcontrols.controller.disconnected": "Controller %d getrennt.",
   "midnightcontrols.controller.mappings.1": "Um die Controller-Mappings anzupassen, benutze %s",
@@ -76,22 +77,19 @@
   "midnightcontrols.controller.mappings.error.write": "Fehler beim Schreiben der Controller Mappings.",
   "midnightcontrols.controller.mappings.updated": "Mappings aktualisiert!",
   "midnightcontrols.controller_type.default": "Standard",
-  "midnightcontrols.controller_type.dualshock": "DualShock",
-  "midnightcontrols.controller_type.switch": "Switch",
-  "midnightcontrols.controller_type.xbox": "Xbox",
-  "midnightcontrols.controller_type.steam": "Steam",
-  "midnightcontrols.controller_type.ouya": "OUYA",
+  "midnightcontrols.controller_type.numbered": "Nummerierter Controller",
   "midnightcontrols.controls_mode.default": "Tastatur/Maus",
   "midnightcontrols.controls_mode.controller": "Controller",
-  "midnightcontrols.controls_mode.touchscreen": "Touchscreen",
-  "midnightcontrols.hud_side.left": "links",
-  "midnightcontrols.hud_side.right": "rechts",
+  "midnightcontrols.controls_mode.touchscreen": "Touchscreen (In Arbeit)",
+  "midnightcontrols.hud_side.left": "Links",
+  "midnightcontrols.hud_side.right": "Rechts",
   "midnightcontrols.menu.analog_movement": "Analoge Bewegung",
   "midnightcontrols.menu.auto_switch_mode": "Automatischer Wechsel",
   "midnightcontrols.menu.controller": "Controller",
   "midnightcontrols.menu.controller2": "Zweiter Controller",
   "midnightcontrols.menu.controller_type": "Controller-Typ",
   "midnightcontrols.menu.controls_mode": "Modus",
+  "midnightcontrols.menu.double_tap_to_sprint": "Doppel-Tipp zum Sprinten",
   "midnightcontrols.menu.fast_block_placing": "Schnelles Bauen",
   "midnightcontrols.menu.fly_drifting": "Flug-Drifting",
   "midnightcontrols.menu.fly_drifting_vertical": "Vertikales Flug-Drifting",
@@ -100,7 +98,7 @@
   "midnightcontrols.menu.invert_right_x_axis": "X rechts umkehren",
   "midnightcontrols.menu.invert_right_y_axis": "Y rechts umkehren",
   "midnightcontrols.menu.keyboard_controls": "Tastatureinstellungen...",
-  "midnightcontrols.menu.left_dead_zone": "Linke tote Zone",
+  "midnightcontrols.menu.left_dead_zone": "Tote Zone des linken Sticks",
   "midnightcontrols.menu.mappings.open_input_str": "Öffne den Controller-Mapping Editor",
   "midnightcontrols.menu.max_left_x_value": "Maximalwert Linke X-Achse",
   "midnightcontrols.menu.max_left_y_value": "Maximalwert Linke Y-Achse",
@@ -110,13 +108,15 @@
   "midnightcontrols.menu.reacharound.horizontal": "Vorderes Blockplatzieren",
   "midnightcontrols.menu.reacharound.vertical": "Vertikales Umgreifen",
   "midnightcontrols.menu.reload_controller_mappings": "Controller-Mappings neuladen",
-  "midnightcontrols.menu.right_dead_zone": "Rechte tote Zone",
-  "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit",
+  "midnightcontrols.menu.right_dead_zone": "Tote Zone des rechten Sticks",
+  "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit (X-Achse)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Rotationsgeschwindigkeit (Y-Achse)",
+  "midnightcontrols.menu.separate_controller_profile": "Separates Controller-Profil",
   "midnightcontrols.menu.separator.controller": "Controller",
   "midnightcontrols.menu.separator.general": "Generell",
   "midnightcontrols.menu.title": "MidnightControls - Einstellungen",
   "midnightcontrols.menu.title.controller": "Controlleroptionen",
-  "midnightcontrols.menu.title.controller_controls": "Controller Steuerung",
+  "midnightcontrols.menu.title.controller_controls": "Controller Aktionen",
   "midnightcontrols.menu.title.gameplay": "Gameplay Optionen",
   "midnightcontrols.menu.title.general": "Generelle Optionen",
   "midnightcontrols.menu.title.hud": "HUD Optionen",
@@ -147,7 +147,8 @@
   "midnightcontrols.tooltip.reacharound.vertical": "Aktiviert vertikales Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Lädt die Controller-Mappings neu.",
   "midnightcontrols.tooltip.right_dead_zone": "Die tote Zone für den rechten Analogstick.",
-  "midnightcontrols.tooltip.rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus.",
+  "midnightcontrols.tooltip.rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (X-Achse)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (Y-Achse)",
   "midnightcontrols.tooltip.unfocused_input": "Erlaube Controllereingabe auch wenn das Fenster nicht fokussiert ist.",
   "midnightcontrols.tooltip.virtual_mouse": "Aktiviere die virtuelle Maus.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Standard Hell",

src/main/resources/assets/midnightcontrols/lang/en_us.json

@@ -1,15 +1,36 @@
 {
   "midnightcontrols.midnightconfig.title": "MidnightControls Advanced Config",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Default Light",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Default Dark",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Second Light",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Second Dark",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Default",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
+  "midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Switch/Wii Controller",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Xbox One/Series Controller",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Xbox 360 Controller",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Steam Controller",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
+  "midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "OUYA Controller",
+  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Numbered Controller",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Keyboard/Mouse",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Controller",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (WIP)",
+  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Left",
+  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Right",
   "key.midnightcontrols.look_down": "Look down",
   "key.midnightcontrols.look_left": "Look left",
   "key.midnightcontrols.look_right": "Look right",
   "key.midnightcontrols.look_up": "Look up",
-  "key.midnightcontrols.ring": "Show controls ring",
+  "key.midnightcontrols.ring": "Open Unbound Keybind Ring",
   "midnightcontrols.action.attack": "Attack",
   "midnightcontrols.action.back": "Back",
   "midnightcontrols.action.chat": "Open Chat",
+  "midnightcontrols.action.controls_ring": "Open Unbound Keybind Ring",
+  "midnightcontrols.action.debug_screen": "Open Debug HUD (F3)",
   "midnightcontrols.action.drop_item": "Drop Item",
-  "midnightcontrols.action.exit": "Exit",
+  "midnightcontrols.action.exit": "Exit Screen",
   "midnightcontrols.action.forward": "Forward",
   "midnightcontrols.action.hit": "Hit",
   "midnightcontrols.action.hotbar_left": "Hotbar left",
@@ -26,6 +47,10 @@
   "midnightcontrols.action.quick_move": "Quick move",
   "midnightcontrols.action.right": "Right",
   "midnightcontrols.action.screenshot": "Take Screenshot",
+  "midnightcontrols.action.slot_up": "Move Slot up",
+  "midnightcontrols.action.slot_down": "Move Slot down",
+  "midnightcontrols.action.slot_left": "Move Slot left",
+  "midnightcontrols.action.slot_right": "Move Slot right",
   "midnightcontrols.action.sneak": "Sneak",
   "midnightcontrols.action.sprint": "Sprint",
   "midnightcontrols.action.swap_hands": "Swap Hands",
@@ -33,6 +58,8 @@
   "midnightcontrols.action.toggle_smooth_camera": "Toggle Cinematic Camera",
   "midnightcontrols.action.page_back": "Previous Page",
   "midnightcontrols.action.page_next": "Next Page",
+  "midnightcontrols.action.tab_back": "Previous Tab",
+  "midnightcontrols.action.tab_next": "Next Tab",
   "midnightcontrols.action.take": "Take Item",
   "midnightcontrols.action.take_all": "Take Stack",
   "midnightcontrols.action.use": "Use",
@@ -40,8 +67,9 @@
   "midnightcontrols.action.zoom_in": "Increase Zoom",
   "midnightcontrols.action.zoom_out": "Decrease Zoom",
   "midnightcontrols.action.zoom_reset": "Reset Zoom",
-  "midnightcontrols.action.key.emotecraft.fastchoose": "Fast Choose Emote",
-  "midnightcontrols.action.key.emotecraft.stop": "Stop Emote",
+  "midnightcontrols.action.emi_page_left": "Previous Page",
+  "midnightcontrols.action.emi_page_right": "Next Page",
+  "midnightcontrols.category.emi": "EMI",
   "midnightcontrols.button.a": "A",
   "midnightcontrols.button.b": "B",
   "midnightcontrols.button.x": "X",
@@ -72,6 +100,8 @@
   "midnightcontrols.axis.right_x-": "Right X-",
   "midnightcontrols.axis.right_y-": "Right Y-",
   "midnightcontrols.button.unknown": "Unknown (%d)",
+  "midnightcontrols.controller.tutorial.title": "Play the game with a Controller!",
+  "midnightcontrols.controller.tutorial.description": "Go to %s -> %s -> %s",
   "midnightcontrols.controller.connected": "Controller %d connected.",
   "midnightcontrols.controller.disconnected": "Controller %d disconnected.",
   "midnightcontrols.controller.mappings.1": "To configure the controller mappings, please use %s",
@@ -79,23 +109,30 @@
   "midnightcontrols.controller.mappings.error": "Error while loading mappings.",
   "midnightcontrols.controller.mappings.error.write": "Error while writing mappings to file.",
   "midnightcontrols.controller.mappings.updated": "Updated mappings!",
-  "midnightcontrols.controller_type.default": "default",
+  "midnightcontrols.controller_type.default": "Default",
   "midnightcontrols.controller_type.dualshock": "DualShock",
-  "midnightcontrols.controller_type.switch": "Switch",
-  "midnightcontrols.controller_type.xbox": "Xbox",
-  "midnightcontrols.controller_type.steam": "Steam",
-  "midnightcontrols.controller_type.ouya": "OUYA",
+  "midnightcontrols.controller_type.dualsense": "DualSense",
+  "midnightcontrols.controller_type.switch": "Switch/Wii Controller",
+  "midnightcontrols.controller_type.xbox": "Xbox One/Series Controller",
+  "midnightcontrols.controller_type.xbox_360": "Xbox 360 Controller",
+  "midnightcontrols.controller_type.steam_controller": "Steam Controller",
+  "midnightcontrols.controller_type.steam_deck": "Steam Deck",
+  "midnightcontrols.controller_type.ouya": "OUYA Controller",
+  "midnightcontrols.controller_type.numbered": "Numbered Controller",
   "midnightcontrols.controls_mode.default": "Keyboard/Mouse",
   "midnightcontrols.controls_mode.controller": "Controller",
-  "midnightcontrols.controls_mode.touchscreen": "Touchscreen",
-  "midnightcontrols.hud_side.left": "left",
-  "midnightcontrols.hud_side.right": "right",
+  "midnightcontrols.controls_mode.touchscreen": "Touchscreen (WIP)",
+  "midnightcontrols.hud_side.left": "Left",
+  "midnightcontrols.hud_side.right": "Right",
   "midnightcontrols.menu.analog_movement": "Analog Movement",
   "midnightcontrols.menu.auto_switch_mode": "Auto Switch Mode",
   "midnightcontrols.menu.controller": "Controller",
   "midnightcontrols.menu.controller2": "Second Controller",
+  "midnightcontrols.menu.controller_toggle_sneak": "Toggle Sneak on Controller",
+  "midnightcontrols.menu.controller_toggle_sprint": "Toggle Sprint on Controller",
   "midnightcontrols.menu.controller_type": "Controller Type",
   "midnightcontrols.menu.controls_mode": "Mode",
+  "midnightcontrols.menu.double_tap_to_sprint": "Double-Tap to Sprint",
   "midnightcontrols.menu.fast_block_placing": "Fast Block Placing",
   "midnightcontrols.menu.fly_drifting": "Fly Drifting",
   "midnightcontrols.menu.fly_drifting_vertical": "Vertical Fly Drifting",
@@ -104,7 +141,7 @@
   "midnightcontrols.menu.invert_right_x_axis": "Invert Right X",
   "midnightcontrols.menu.invert_right_y_axis": "Invert Right Y",
   "midnightcontrols.menu.keyboard_controls": "Keyboard Controls...",
-  "midnightcontrols.menu.left_dead_zone": "Left Dead Zone",
+  "midnightcontrols.menu.left_dead_zone": "Left Stick Dead Zone",
   "midnightcontrols.menu.mappings.open_input_str": "Open Mappings File Editor",
   "midnightcontrols.menu.max_left_x_value": "Left X Axis Max Value",
   "midnightcontrols.menu.max_left_y_value": "Left Y Axis Max Value",
@@ -114,13 +151,15 @@
   "midnightcontrols.menu.reacharound.horizontal": "Front Block Placing",
   "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound",
   "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings",
-  "midnightcontrols.menu.right_dead_zone": "Right Dead Zone",
-  "midnightcontrols.menu.rotation_speed": "Rotation Speed",
+  "midnightcontrols.menu.right_dead_zone": "Right Stick Dead Zone",
+  "midnightcontrols.menu.rotation_speed": "X Axis Rotation Speed",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Y Axis Rotation Speed",
+  "midnightcontrols.menu.separate_controller_profile": "Separate Controller Profile",
   "midnightcontrols.menu.separator.controller": "Controller",
   "midnightcontrols.menu.separator.general": "General",
   "midnightcontrols.menu.title": "MidnightControls - Settings",
   "midnightcontrols.menu.title.controller": "Controller Options",
-  "midnightcontrols.menu.title.controller_controls": "Controller Controls",
+  "midnightcontrols.menu.title.controller_controls": "Controller Bindings",
   "midnightcontrols.menu.title.gameplay": "Gameplay Options",
   "midnightcontrols.menu.title.general": "General Options",
   "midnightcontrols.menu.title.hud": "HUD Options",
@@ -131,17 +170,18 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Virtual Mouse Skin",
   "midnightcontrols.narrator.unbound": "Unbound %s",
   "midnightcontrols.not_bound": "Not bound",
-  "midnightcontrols.tooltip.analog_movement": "Enables analog movement when possible.",
-  "midnightcontrols.tooltip.auto_switch_mode": "If the controls mode should be switched to Controller automatically if one is connected.",
-  "midnightcontrols.tooltip.controller2": "Second controller to use, which allows Joy-Cons support for example.",
-  "midnightcontrols.tooltip.controller_type": "The controller type to display the correct buttons.",
+  "midnightcontrols.tooltip.analog_movement": "When possible, enables analog movement.",
+  "midnightcontrols.tooltip.auto_switch_mode": "Whether the controls mode should be switched to Controller automatically if one is connected.",
+  "midnightcontrols.tooltip.controller2": "Second controller to use, which allows (for example) Joy-Cons support.",
+  "midnightcontrols.tooltip.controller_type": "The controller type you're using (needed to display the correct buttons)",
   "midnightcontrols.tooltip.controls_mode": "The controls mode.",
+  "midnightcontrols.tooltip.double_tap_to_sprint": "Toggles whether the Walk Forwards key makes the player sprint when double-tapped quickly",
   "midnightcontrols.tooltip.fast_block_placing": "While flying in creative mode, enables fast block placing depending on your speed. §cOn some servers this might be considered as cheating.",
   "midnightcontrols.tooltip.fly_drifting": "While flying, enables Vanilla drifting/inertia.",
   "midnightcontrols.tooltip.fly_drifting_vertical": "While flying, enables Vanilla vertical drifting/intertia.",
   "midnightcontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
   "midnightcontrols.tooltip.hud_side": "The position of the HUD.",
-  "midnightcontrols.tooltip.left_dead_zone": "The dead zone for the controller's left analogue stick.",
+  "midnightcontrols.tooltip.left_dead_zone": "The dead zone for the controller's left analog stick.",
   "midnightcontrols.tooltip.max_left_x_value": "Changes what the mod considers the highest value for the left X axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.tooltip.max_left_y_value": "Changes what the mod considers the highest value for the left Y axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.tooltip.max_right_x_value": "Changes what the mod considers the highest value for the right X axis. Useful if your axis does not use the full range and seems slow.",
@@ -150,13 +190,14 @@
   "midnightcontrols.tooltip.reacharound.horizontal": "Enables front block placing, §cmight be considered cheating on some servers§r.",
   "midnightcontrols.tooltip.reacharound.vertical": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.",
-  "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analogue stick.",
-  "midnightcontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.",
-  "midnightcontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused.",
-  "midnightcontrols.tooltip.virtual_mouse": "Enable the virtual mouse which is handful in the case of a splitscreen.",
+  "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analog stick.",
+  "midnightcontrols.tooltip.rotation_speed": "The camera's X Axis rotation speed in controller mode.",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "The camera's Y Axis rotation speed in controller mode.",
+  "midnightcontrols.tooltip.unfocused_input": "Allows controller input when the window is not focused.",
+  "midnightcontrols.tooltip.virtual_mouse": "Enables the virtual mouse, which is useful during splitscreen.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Default Light",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Default Dark",
   "midnightcontrols.virtual_mouse.skin.second_light": "Second Light",
   "midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark",
   "modmenu.descriptionTranslation.midnightcontrols": "Adds controller support and enhanced controls overall.\nForked from LambdaControls, which sadly got discontinued."
-}
+}

src/main/resources/assets/midnightcontrols/lang/es_mx.json

@@ -104,7 +104,8 @@
   "midnightcontrols.menu.reacharound.vertical": "Alcance vertical",
   "midnightcontrols.menu.reload_controller_mappings": "Recargar asignaciones de controlador",
   "midnightcontrols.menu.right_dead_zone": "Zona muerta derecha",
-  "midnightcontrols.menu.rotation_speed": "Velocidad de rotación",
+  "midnightcontrols.menu.rotation_speed": "Velocidad de rotación (eje X)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Velocidad de rotación (eje Y)",
   "midnightcontrols.menu.separator.controller": "Controlador",
   "midnightcontrols.menu.separator.general": "General",
   "midnightcontrols.menu.title": "midnightcontrols - Configuraciones",
@@ -140,7 +141,8 @@
   "midnightcontrols.tooltip.reacharound.vertical": "Habilita el alcance vertical, §cpodría considerarse trampa en algunos servidores§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Vuelve a cargar el archivo de asignaciones del controlador.",
   "midnightcontrols.tooltip.right_dead_zone": "La zona muerta de la palanca analógica derecha del controlador.",
-  "midnightcontrols.tooltip.rotation_speed": "La velocidad de rotación de la cámara en modo controlador.",
+  "midnightcontrols.tooltip.rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje X)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje Y)",
   "midnightcontrols.tooltip.unfocused_input": "Habilita entrada del controlador cuando la ventana no está enfocada.",
   "midnightcontrols.tooltip.virtual_mouse": "Habilite el ratón virtual que es útil en el caso de una pantalla dividida.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Ligera por defecto",

src/main/resources/assets/midnightcontrols/lang/et_ee.json

@@ -0,0 +1,132 @@
+{
+    "midnightcontrols.midnightconfig.title": "MidnightControls täpsem seadistus",
+    "key.midnightcontrols.look_down": "Vaata alla",
+    "key.midnightcontrols.look_left": "Vaata vasakule",
+    "key.midnightcontrols.look_right": "Vaata paremale",
+    "key.midnightcontrols.look_up": "Vaata üles",
+    "key.midnightcontrols.ring": "Kuva juhtnupuringi",
+    "midnightcontrols.action.attack": "Ründa",
+    "midnightcontrols.action.back": "Tagasi",
+    "midnightcontrols.action.chat": "Ava vestlus",
+    "midnightcontrols.action.drop_item": "Viska ese",
+    "midnightcontrols.action.exit": "Välju",
+    "midnightcontrols.action.forward": "Edasi",
+    "midnightcontrols.action.hit": "Löö",
+    "midnightcontrols.action.hotbar_left": "Plokiriba vasakule",
+    "midnightcontrols.action.hotbar_right": "Plokiriba paremale",
+    "midnightcontrols.action.inventory": "Seljakott",
+    "midnightcontrols.action.jump": "Hüppa",
+    "midnightcontrols.action.left": "Vasakule",
+    "midnightcontrols.action.pause_game": "Mäng pausile",
+    "midnightcontrols.action.pick_block": "Vali plokk",
+    "midnightcontrols.action.pickup": "Korja üles",
+    "midnightcontrols.action.pickup_all": "Korja kõik üles",
+    "midnightcontrols.action.place": "Aseta",
+    "midnightcontrols.action.player_list": "Mängijate loend",
+    "midnightcontrols.action.quick_move": "Kiirliigutus",
+    "midnightcontrols.action.right": "Paremale",
+    "midnightcontrols.action.screenshot": "Loo kuvatõmmis",
+    "midnightcontrols.action.sneak": "Hiili",
+    "midnightcontrols.action.sprint": "Jookse",
+    "midnightcontrols.action.swap_hands": "Vaheta käsi",
+    "midnightcontrols.action.toggle_perspective": "Lülita perspektiivi",
+    "midnightcontrols.action.toggle_smooth_camera": "Lülita kinemaatilist kaamerat",
+    "midnightcontrols.action.page_back": "Eelmine leht",
+    "midnightcontrols.action.page_next": "Järgmine leht",
+    "midnightcontrols.action.take": "Võta ese",
+    "midnightcontrols.action.take_all": "Võta kuhi",
+    "midnightcontrols.action.use": "Kasuta",
+    "midnightcontrols.action.zoom": "Suumi",
+    "midnightcontrols.action.zoom_in": "Suurenda suumi",
+    "midnightcontrols.action.zoom_out": "Vähenda suumi",
+    "midnightcontrols.action.zoom_reset": "Lähtesta suum",
+    "midnightcontrols.action.key.emotecraft.fastchoose": "Vali kiirelt liigutus",
+    "midnightcontrols.action.key.emotecraft.stop": "Peata liigutus",
+
+    "midnightcontrols.button.left_bumper": "Vasak külgnupp",
+    "midnightcontrols.button.right_bumper": "Parem külgnupp",
+
+    "midnightcontrols.button.left_thumb": "Vasak pöidlanupp",
+    "midnightcontrols.button.right_thumb": "Parem pöidlanupp",
+    "midnightcontrols.button.dpad_up": "DPAD üles",
+    "midnightcontrols.button.dpad_right": "DPAD paremale",
+    "midnightcontrols.button.dpad_down": "DPAD alla",
+    "midnightcontrols.button.dpad_left": "DPAD vasakule",
+
+    "midnightcontrols.axis.left_x+": "Vasak X+",
+    "midnightcontrols.axis.left_y+": "Vasak Y+",
+    "midnightcontrols.axis.right_x+": "Parem X+",
+    "midnightcontrols.axis.right_y+": "Parem Y+",
+    "midnightcontrols.axis.left_trigger": "Vasak käiviti",
+    "midnightcontrols.axis.right_trigger": "Parem käiviti",
+    "midnightcontrols.axis.left_x-": "Vasak X-",
+    "midnightcontrols.axis.left_y-": "Vasak Y-",
+    "midnightcontrols.axis.right_x-": "Parem X-",
+    "midnightcontrols.axis.right_y-": "Parem Y-",
+    "midnightcontrols.button.unknown": "Teadmata (%d)",
+    "midnightcontrols.controller.tutorial.title": "Mängi mängu oma juhtpuldiga!",
+    "midnightcontrols.controller.tutorial.description": "Mine %s -> %s -> %s",
+    "midnightcontrols.controller.connected": "Mängupult %d ühendatud.",
+    "midnightcontrols.controller.disconnected": "Mängupult %d lahti ühendatud.",
+    "midnightcontrols.controller.mappings.1": "Mängupuldi vastenduste seadistamiseks palun kasuta %s",
+    "midnightcontrols.controller.mappings.3": "ning aseta vastendus vastenduste failiredaktorisse.",
+    "midnightcontrols.controller.mappings.error": "Vastenduste laadimisel esines viga.",
+    "midnightcontrols.controller.mappings.error.write": "Vastenduste faili kirjutamisel esines viga.",
+    "midnightcontrols.controller.mappings.updated": "Vastendused uuendatud!",
+    "midnightcontrols.controller_type.default": "vaikimisi",
+
+    "midnightcontrols.controls_mode.default": "klaviatuur/hiir",
+    "midnightcontrols.controls_mode.controller": "mängupult",
+    "midnightcontrols.controls_mode.touchscreen": "puuteekraan (arenduses)",
+    "midnightcontrols.hud_side.left": "vasak",
+    "midnightcontrols.hud_side.right": "parem",
+    "midnightcontrols.menu.analog_movement": "Analoogliikumine",
+    "midnightcontrols.menu.auto_switch_mode": "Vaheta režiimi automaatselt",
+    "midnightcontrols.menu.controller": "Mängupult",
+    "midnightcontrols.menu.controller2": "Teine mängupult",
+    "midnightcontrols.menu.controller_type": "Mängupuldi tüüp",
+    "midnightcontrols.menu.controls_mode": "Režiim",
+    "midnightcontrols.menu.double_tap_to_sprint": "Jooksmiseks topeltkoputa",
+    "midnightcontrols.menu.fast_block_placing": "Kiire plokiasetus",
+    "midnightcontrols.menu.fly_drifting": "Lennutriivimine",
+    "midnightcontrols.menu.fly_drifting_vertical": "Vertikaalne lennutriivimine",
+    "midnightcontrols.menu.hud_enable": "Nähtav liides",
+    "midnightcontrols.menu.hud_side": "Liidese pool",
+    "midnightcontrols.menu.invert_right_x_axis": "Pööratud parem X",
+    "midnightcontrols.menu.invert_right_y_axis": "Pööratud parem Y",
+    "midnightcontrols.menu.keyboard_controls": "Klaviatuuri juhtnupud...",
+    "midnightcontrols.menu.left_dead_zone": "Vasak surnud tsoon",
+    "midnightcontrols.menu.mappings.open_input_str": "Ava vastenduste failiredaktor",
+    "midnightcontrols.menu.max_left_x_value": "Vasaku X-telje maks. väärtus",
+    "midnightcontrols.menu.max_left_y_value": "Vasaku Y-telje maks. väärtus",
+    "midnightcontrols.menu.max_right_x_value": "Parema X-telje maks. väärtus",
+    "midnightcontrols.menu.max_right_y_value": "Parema Y-telje maks. väärtus",
+    "midnightcontrols.menu.mouse_speed": "Hiire kiirus",
+    "midnightcontrols.menu.reacharound.horizontal": "Ploki etteasetus",
+    "midnightcontrols.menu.reacharound.vertical": "Vertikaalne ümberasetus",
+    "midnightcontrols.menu.reload_controller_mappings": "Laadi mängupuldi vastendused uuesti",
+    "midnightcontrols.menu.right_dead_zone": "Parem surnud tsoon",
+    "midnightcontrols.menu.rotation_speed": "X-telje pöördekiirus",
+    "midnightcontrols.menu.y_axis_rotation_speed": "Y-telje pöördekiirus",
+    "midnightcontrols.menu.separator.controller": "Mängupult",
+    "midnightcontrols.menu.separator.general": "Üldine",
+    "midnightcontrols.menu.title": "MidnightControls - seaded",
+    "midnightcontrols.menu.title.controller": "Mängupuldi valikud",
+    "midnightcontrols.menu.title.controller_controls": "Mängupuldi juhtnupud",
+    "midnightcontrols.menu.title.gameplay": "Mängukogemuse valikud",
+    "midnightcontrols.menu.title.general": "Üldised valikud",
+    "midnightcontrols.menu.title.hud": "Liidese valikud",
+    "midnightcontrols.menu.title.mappings.string": "Vastenduste failiredaktor",
+    "midnightcontrols.menu.title.visual": "Välimuse valikud",
+    "midnightcontrols.menu.unfocused_input": "Fookustamata sisend",
+    "midnightcontrols.menu.virtual_mouse": "Virtuaalne hiir",
+    "midnightcontrols.menu.virtual_mouse.skin": "Virtuaalse hiire välimus",
+    "midnightcontrols.narrator.unbound": "Määramata %s",
+    "midnightcontrols.not_bound": "määramata",
+
+    "midnightcontrols.virtual_mouse.skin.default_light": "vaikimisi hele",
+    "midnightcontrols.virtual_mouse.skin.default_dark": "vaikimisi tume",
+    "midnightcontrols.virtual_mouse.skin.second_light": "teine hele",
+    "midnightcontrols.virtual_mouse.skin.second_dark": "teine tume",
+    "modmenu.descriptionTranslation.midnightcontrols": "Lisab mängupuldi toe ning täiendab juhtnuppe üldiselt.\nFork loodud LambdaControls-ist, mille toetamine kahjuks lõpetati."
+  }

src/main/resources/assets/midnightcontrols/lang/fr_ca.json

@@ -104,7 +104,8 @@
   "midnightcontrols.menu.reacharound.vertical": "Placement vertical",
   "midnightcontrols.menu.reload_controller_mappings": "Recharger les manettes",
   "midnightcontrols.menu.right_dead_zone": "Zone morte axe droit",
-  "midnightcontrols.menu.rotation_speed": "Vitesse de rotation",
+  "midnightcontrols.menu.rotation_speed": "Vitesse de rotation (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Vitesse de rotation (Y)",
   "midnightcontrols.menu.separator.general": "Général",
   "midnightcontrols.menu.separator.controller": "Manette",
   "midnightcontrols.menu.title": "midnightcontrols - Paramètres",
@@ -140,7 +141,8 @@
   "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
   "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.",
-  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)",
   "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
   "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
   "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair",

src/main/resources/assets/midnightcontrols/lang/fr_fr.json

@@ -104,7 +104,8 @@
   "midnightcontrols.menu.reacharound.vertical": "Placement vertical",
   "midnightcontrols.menu.reload_controller_mappings": "Recharger les manettes",
   "midnightcontrols.menu.right_dead_zone": "Zone morte axe droit",
-  "midnightcontrols.menu.rotation_speed": "Vitesse de rotation",
+  "midnightcontrols.menu.rotation_speed": "Vitesse de rotation (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Vitesse de rotation (Y)",
   "midnightcontrols.menu.separator.general": "Général",
   "midnightcontrols.menu.separator.controller": "Manette",
   "midnightcontrols.menu.title": "midnightcontrols - Paramètres",
@@ -140,7 +141,8 @@
   "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
   "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.",
-  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)",
   "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
   "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
   "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair",

src/main/resources/assets/midnightcontrols/lang/ko_kr.json

@@ -0,0 +1,158 @@
+{
+  "midnightcontrols.midnightconfig.title": "MidnightControls 고급 설정",
+  "key.midnightcontrols.look_down": "아래쪽 보기",
+  "key.midnightcontrols.look_left": "왼쪽 보기",
+  "key.midnightcontrols.look_right": "오른쪽 보기",
+  "key.midnightcontrols.look_up": "위쪽 보기",
+  "key.midnightcontrols.ring": "컨트롤 링 표시",
+  "midnightcontrols.action.attack": "공격",
+  "midnightcontrols.action.back": "뒤로",
+  "midnightcontrols.action.chat": "채팅 열기",
+  "midnightcontrols.action.drop_item": "아이템 버리기",
+  "midnightcontrols.action.exit": "종료",
+  "midnightcontrols.action.forward": "앞으로",
+  "midnightcontrols.action.hit": "때리기",
+  "midnightcontrols.action.hotbar_left": "단축 바 왼쪽",
+  "midnightcontrols.action.hotbar_right": "단축 바 오른쪽",
+  "midnightcontrols.action.inventory": "보관함",
+  "midnightcontrols.action.jump": "점프",
+  "midnightcontrols.action.left": "왼쪽",
+  "midnightcontrols.action.pause_game": "게임 일시 중지",
+  "midnightcontrols.action.pick_block": "블록 집기",
+  "midnightcontrols.action.pickup": "집기",
+  "midnightcontrols.action.pickup_all": "모두 집기",
+  "midnightcontrols.action.place": "놓기",
+  "midnightcontrols.action.player_list": "플레이어 목록",
+  "midnightcontrols.action.quick_move": "빠른 이동",
+  "midnightcontrols.action.right": "오른쪽",
+  "midnightcontrols.action.screenshot": "스크린샷 찍기",
+  "midnightcontrols.action.sneak": "은신",
+  "midnightcontrols.action.sprint": "달리기",
+  "midnightcontrols.action.swap_hands": "손 전환",
+  "midnightcontrols.action.toggle_perspective": "시점 토글",
+  "midnightcontrols.action.toggle_smooth_camera": "시네마틱 카메라 토글",
+  "midnightcontrols.action.use": "사용",
+  "midnightcontrols.action.zoom": "확대/축소",
+  "midnightcontrols.action.zoom_in": "확대",
+  "midnightcontrols.action.zoom_out": "축소",
+  "midnightcontrols.action.zoom_reset": "확대/축소 초기화",
+  "midnightcontrols.action.key.emotecraft.fastchoose": "이모트 빠른 선택",
+  "midnightcontrols.action.key.emotecraft.stop": "이모트 중지",
+  "midnightcontrols.button.a": "A",
+  "midnightcontrols.button.b": "B",
+  "midnightcontrols.button.x": "X",
+  "midnightcontrols.button.y": "Y",
+  "midnightcontrols.button.left_bumper": "왼쪽 범퍼",
+  "midnightcontrols.button.right_bumper": "오른쪽 범퍼",
+  "midnightcontrols.button.back": "뒤로",
+  "midnightcontrols.button.start": "시작",
+  "midnightcontrols.button.guide": "가이드",
+  "midnightcontrols.button.left_thumb": "왼쪽 엄지",
+  "midnightcontrols.button.right_thumb": "오른쪽 엄지",
+  "midnightcontrols.button.dpad_up": "DPAD 위",
+  "midnightcontrols.button.dpad_right": "DPAD 오른쪽",
+  "midnightcontrols.button.dpad_down": "DPAD 아래",
+  "midnightcontrols.button.dpad_left": "DPAD 왼쪽",
+  "midnightcontrols.button.l4": "L4",
+  "midnightcontrols.button.l5": "L5",
+  "midnightcontrols.button.r4": "R4",
+  "midnightcontrols.button.r5": "L5",
+  "midnightcontrols.axis.left_x+": "왼쪽 X+",
+  "midnightcontrols.axis.left_y+": "왼쪽 Y+",
+  "midnightcontrols.axis.right_x+": "오른쪽 X+",
+  "midnightcontrols.axis.right_y+": "오른쪽 Y+",
+  "midnightcontrols.axis.left_trigger": "왼쪽 트리거",
+  "midnightcontrols.axis.right_trigger": "오른쪽 트리거",
+  "midnightcontrols.axis.left_x-": "왼쪽 X-",
+  "midnightcontrols.axis.left_y-": "왼쪽 Y-",
+  "midnightcontrols.axis.right_x-": "오른쪽 X-",
+  "midnightcontrols.axis.right_y-": "오른쪽 Y-",
+  "midnightcontrols.button.unknown": "알 수 없음 (%d)",
+  "midnightcontrols.controller.connected": "컨트롤러 %d 연결됨.",
+  "midnightcontrols.controller.disconnected": "컨트롤러 %d 연결 끊김.",
+  "midnightcontrols.controller.mappings.1": "컨트롤러 매핑을 설정하려면, %s을 사용하세요",
+  "midnightcontrols.controller.mappings.3": "그리고 매핑 파일 편집기에 매핑을 붙여 넣으세요.",
+  "midnightcontrols.controller.mappings.error": "매핑을 불러오던 중 오류.",
+  "midnightcontrols.controller.mappings.error.write": "파일에 매핑 작성 중 오류.",
+  "midnightcontrols.controller.mappings.updated": "매핑 업데이트됨!",
+  "midnightcontrols.controller_type.default": "기본",
+  "midnightcontrols.controller_type.dualshock": "듀얼쇼크",
+  "midnightcontrols.controller_type.switch": "스위치",
+  "midnightcontrols.controller_type.xbox": "엑스박스",
+  "midnightcontrols.controller_type.steam": "스팀",
+  "midnightcontrols.controller_type.ouya": "우야",
+  "midnightcontrols.controls_mode.default": "키보드/마우스",
+  "midnightcontrols.controls_mode.controller": "컨트롤러",
+  "midnightcontrols.controls_mode.touchscreen": "터치스크린",
+  "midnightcontrols.hud_side.left": "왼쪽",
+  "midnightcontrols.hud_side.right": "오른쪽",
+  "midnightcontrols.menu.analog_movement": "아날로그 움직임",
+  "midnightcontrols.menu.auto_switch_mode": "자동 전환 모드",
+  "midnightcontrols.menu.controller": "컨트롤러",
+  "midnightcontrols.menu.controller2": "보조 컨트롤러",
+  "midnightcontrols.menu.controller_type": "컨트롤러 종류",
+  "midnightcontrols.menu.controls_mode": "모드",
+  "midnightcontrols.menu.fast_block_placing": "빠른 블록 배치",
+  "midnightcontrols.menu.fly_drifting": "비행 관성",
+  "midnightcontrols.menu.fly_drifting_vertical": "비행 수직 관성",
+  "midnightcontrols.menu.hud_enable": "HUD 사용",
+  "midnightcontrols.menu.hud_side": "HUD 측면",
+  "midnightcontrols.menu.invert_right_x_axis": "오른쪽 X 반전",
+  "midnightcontrols.menu.invert_right_y_axis": "오른쪽 Y 반전",
+  "midnightcontrols.menu.keyboard_controls": "키보드 컨트롤...",
+  "midnightcontrols.menu.left_dead_zone": "왼쪽 데드 존",
+  "midnightcontrols.menu.mappings.open_input_str": "매핑 파일 편집기 열기",
+  "midnightcontrols.menu.max_left_x_value": "왼쪽 X 축 최댓값",
+  "midnightcontrols.menu.max_left_y_value": "왼쪽 Y 축 최댓값",
+  "midnightcontrols.menu.max_right_x_value": "오른쪽 X 축 최댓값",
+  "midnightcontrols.menu.max_right_y_value": "오른쪽 Y 축 최댓값",
+  "midnightcontrols.menu.mouse_speed": "마우스 속도",
+  "midnightcontrols.menu.reacharound.horizontal": "블록 전면 배치",
+  "midnightcontrols.menu.reacharound.vertical": "블록 수직 배치",
+  "midnightcontrols.menu.reload_controller_mappings": "컨트롤러 매핑 다시 불러오기",
+  "midnightcontrols.menu.right_dead_zone": "오른쪽 데드 존",
+  "midnightcontrols.menu.rotation_speed": "회전 속도",
+  "midnightcontrols.menu.separator.controller": "컨트롤러",
+  "midnightcontrols.menu.separator.general": "일반",
+  "midnightcontrols.menu.title": "MidnightControls - 설정",
+  "midnightcontrols.menu.title.controller": "컨트롤러 옵션",
+  "midnightcontrols.menu.title.controller_controls": "컨트롤러 제어",
+  "midnightcontrols.menu.title.gameplay": "게임플레이 옵션",
+  "midnightcontrols.menu.title.general": "일반 옵션",
+  "midnightcontrols.menu.title.hud": "HUD 옵션",
+  "midnightcontrols.menu.title.mappings.string": "매핑 파일 편집기",
+  "midnightcontrols.menu.title.visual": "외형 옵션",
+  "midnightcontrols.menu.unfocused_input": "언포커스 인풋",
+  "midnightcontrols.menu.virtual_mouse": "가상 마우스",
+  "midnightcontrols.menu.virtual_mouse.skin": "가상 마우스 스킨",
+  "midnightcontrols.narrator.unbound": "%s 해제됨",
+  "midnightcontrols.not_bound": "바인딩되지 않음",
+  "midnightcontrols.tooltip.analog_movement": "가능한 경우 아날로그 움직임을 사용합니다.",
+  "midnightcontrols.tooltip.auto_switch_mode": "컨트롤러가 연결되면 자동으로 컨트롤 모드가 컨트롤러로 전환됩니다.",
+  "midnightcontrols.tooltip.controller2": "보조 컨트롤러를 사용하려면 Joy-Cons 지원을 허용하세요.",
+  "midnightcontrols.tooltip.controller_type": "올바른 버튼을 표시할 컨트롤러 종류입니다.",
+  "midnightcontrols.tooltip.controls_mode": "컨트롤 모드.",
+  "midnightcontrols.tooltip.fast_block_placing": "크리에이티브 모드에서 비행하는 동안 사용자 속도에 따른 빠른 블록 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다.",
+  "midnightcontrols.tooltip.fly_drifting": "비행하는 동안 바닐라처럼 관성을 적용합니다.",
+  "midnightcontrols.tooltip.fly_drifting_vertical": "비행하는 동안 바닐라처럼 수직 관성을 적용합니다.",
+  "midnightcontrols.tooltip.hud_enable": "화면 컨트롤러 버튼 표시기 토글",
+  "midnightcontrols.tooltip.hud_side": "HUD 위치.",
+  "midnightcontrols.tooltip.left_dead_zone": "컨트롤러 왼쪽 아날로그 스틱 데드 존.",
+  "midnightcontrols.tooltip.max_left_x_value": "모드가 인식하는 왼쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.tooltip.max_left_y_value": "모드가 인식하는 왼쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.tooltip.max_right_x_value": "모드가 인식하는 오른쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.tooltip.max_right_y_value": "모드가 인식하는 오른쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.tooltip.mouse_speed": "컨트롤러의 에뮬레이트된 마우스 속도.",
+  "midnightcontrols.tooltip.reacharound.horizontal": "블록 전면 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
+  "midnightcontrols.tooltip.reacharound.vertical": "블록 수직 배치를 사용합니다. 블록 아래에 다른 블록을 배치할 수 있습니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
+  "midnightcontrols.tooltip.reload_controller_mappings": "컨트롤러 매핑 파일을 다시 불러옵니다.",
+  "midnightcontrols.tooltip.right_dead_zone": "컨트롤러 오른쪽 아날로그 스틱 데드 존",
+  "midnightcontrols.tooltip.rotation_speed": "컨트롤러 모드에서 적용되는 카메라 회전 속도.",
+  "midnightcontrols.tooltip.unfocused_input": "창이 활성화된 상태가 아니여도 컨트롤러 입력 허용.",
+  "midnightcontrols.tooltip.virtual_mouse": "분할 화면에선 도움 되는 가상 마우스를 사용합니다.",
+  "midnightcontrols.virtual_mouse.skin.default_light": "기본 라이트",
+  "midnightcontrols.virtual_mouse.skin.default_dark": "기본 다크",
+  "midnightcontrols.virtual_mouse.skin.second_light": "두 번째 라이트",
+  "midnightcontrols.virtual_mouse.skin.second_dark": "두 번째 다크",
+  "modmenu.descriptionTranslation.midnightcontrols": "컨트롤러 제어 및 전반적인 향상된 제어 기능을 추가합니다.\n안타깝게도 업데이트가 끊긴 LambdaControls의 Fork 버전입니다."
+}

src/main/resources/assets/midnightcontrols/lang/ru_ru.json

@@ -0,0 +1,177 @@
+{
+  "midnightcontrols.midnightconfig.title": "Расширенная Конфигурация MidnightControls",
+  "key.midnightcontrols.look_down": "Смотреть Вниз",
+  "key.midnightcontrols.look_left": "Смотреть Налево",
+  "key.midnightcontrols.look_right": "Смотреть Направо",
+  "key.midnightcontrols.look_up": "Смотрeть Вверх",
+  "key.midnightcontrols.ring": "Показать Кольцо Управления",
+  "midnightcontrols.action.attack": "Атаковать",
+  "midnightcontrols.action.back": "Назад",
+  "midnightcontrols.action.chat": "Открыть Чат",
+  "midnightcontrols.action.debug_screen": "Открыть Отладку (F3)",
+  "midnightcontrols.action.drop_item": "Выбросить Предмет",
+  "midnightcontrols.action.exit": "Выйти",
+  "midnightcontrols.action.forward": "Вперед",
+  "midnightcontrols.action.hit": "Ударить",
+  "midnightcontrols.action.hotbar_left": "Панель Быстрого Доступа Налево",
+  "midnightcontrols.action.hotbar_right": "Панель Быстрого Доступа Направо",
+  "midnightcontrols.action.inventory": "Инвентарь",
+  "midnightcontrols.action.jump": "Прыжок",
+  "midnightcontrols.action.left": "Налево",
+  "midnightcontrols.action.pause_game": "Приостановить игру",
+  "midnightcontrols.action.pick_block": "Выбор Блока",
+  "midnightcontrols.action.pickup": "Взять Половину",
+  "midnightcontrols.action.pickup_all": "Взять Всё",
+  "midnightcontrols.action.place": "Поставить",
+  "midnightcontrols.action.player_list": "Лист Игроков",
+  "midnightcontrols.action.quick_move": "Переложить",
+  "midnightcontrols.action.right": "Направо",
+  "midnightcontrols.action.screenshot": "Сделать Скриншот",
+  "midnightcontrols.action.slot_up": "Двинуть На Слот Вверх",
+  "midnightcontrols.action.slot_down": "Двинуть На Слот Вниз",
+  "midnightcontrols.action.slot_left": "Двинуть На Слот Влево",
+  "midnightcontrols.action.slot_right": "Двинуть На Слот Вправо",
+  "midnightcontrols.action.sneak": "Красться",
+  "midnightcontrols.action.sprint": "Бег",
+  "midnightcontrols.action.swap_hands": "Поменять Руку",
+  "midnightcontrols.action.toggle_perspective": "Переключить Перспективу",
+  "midnightcontrols.action.toggle_smooth_camera": "Переключить Кинематографическую Камеру",
+  "midnightcontrols.action.page_back": "Предыдущая Страница",
+  "midnightcontrols.action.page_next": "Следующая Страница",
+  "midnightcontrols.action.tab_back": "Предыдущая Секция",
+  "midnightcontrols.action.tab_next": "Следующая Секция",
+  "midnightcontrols.action.take": "Взять Предмет",
+  "midnightcontrols.action.take_all": "Взять Стак",
+  "midnightcontrols.action.use": "Использовать",
+  "midnightcontrols.action.zoom": "Приблизить",
+  "midnightcontrols.action.zoom_in": "Увеличить Масштаб",
+  "midnightcontrols.action.zoom_out": "Уменьшить Масштаб",
+  "midnightcontrols.action.zoom_reset": "Сбросить Масштаб",
+  "midnightcontrols.action.emi_page_left": "Предыдущая Страница",
+  "midnightcontrols.action.emi_page_right": "Следующая Страница",
+  "midnightcontrols.category.emi": "ЕМИ",
+  "midnightcontrols.button.a": "A",
+  "midnightcontrols.button.b": "B",
+  "midnightcontrols.button.x": "X",
+  "midnightcontrols.button.y": "Y",
+  "midnightcontrols.button.left_bumper": "Левый Бампер",
+  "midnightcontrols.button.right_bumper": "Правый Бампер",
+  "midnightcontrols.button.back": "Назад",
+  "midnightcontrols.button.start": "Старт",
+  "midnightcontrols.button.guide": "Гайд Кнопка",
+  "midnightcontrols.button.left_thumb": "Левый Стик",
+  "midnightcontrols.button.right_thumb": "Правый Стик",
+  "midnightcontrols.button.dpad_up": "Крестовина Вверх",
+  "midnightcontrols.button.dpad_right": "Крестовина Вправо",
+  "midnightcontrols.button.dpad_down": "Крестовина Вниз",
+  "midnightcontrols.button.dpad_left": "Крестовина Влево",
+  "midnightcontrols.button.l4": "L4",
+  "midnightcontrols.button.l5": "L5",
+  "midnightcontrols.button.r4": "R4",
+  "midnightcontrols.button.r5": "L5",
+  "midnightcontrols.axis.left_x+": "Левый Стик X+",
+  "midnightcontrols.axis.left_y+": "Левый Стик Y+",
+  "midnightcontrols.axis.right_x+": "Правый Стик X+",
+  "midnightcontrols.axis.right_y+": "Правый Стик Y+",
+  "midnightcontrols.axis.left_trigger": "Левый Триггер",
+  "midnightcontrols.axis.right_trigger": "Правый Триггер",
+  "midnightcontrols.axis.left_x-": "Левый Стик X-",
+  "midnightcontrols.axis.left_y-": "Левый Стик Y-",
+  "midnightcontrols.axis.right_x-": "Правый Стик X-",
+  "midnightcontrols.axis.right_y-": "Правый Стик Y-",
+  "midnightcontrols.button.unknown": "Неизвестный (%d)",
+  "midnightcontrols.controller.connected": "Контроллер %d Был Присоединен.",
+  "midnightcontrols.controller.disconnected": "Контроллер %d Был Отключён.",
+  "midnightcontrols.controller.mappings.1": "Чтобы настроить раскладку контроллера, используйте %s",
+  "midnightcontrols.controller.mappings.3": "и вставте ваш итог в редактор файлов раскладок.",
+  "midnightcontrols.controller.mappings.error": "Ошибка при загрузке раскладки.",
+  "midnightcontrols.controller.mappings.error.write": "Ошибка при записи раскладки в файл.",
+  "midnightcontrols.controller.mappings.updated": "Раскладка обновлена!",
+  "midnightcontrols.controller_type.default": "По стандарту",
+  "midnightcontrols.controller_type.dualshock": "DualShock",
+  "midnightcontrols.controller_type.dualsense": "DualSense",
+  "midnightcontrols.controller_type.switch": "Switch",
+  "midnightcontrols.controller_type.xbox": "Xbox",
+  "midnightcontrols.controller_type.xbox_360": "Xbox 360",
+  "midnightcontrols.controller_type.steam_controller": "Steam Controller",
+  "midnightcontrols.controller_type.steam_deck": "Steam Deck",
+  "midnightcontrols.controller_type.ouya": "OUYA",
+  "midnightcontrols.controls_mode.default": "Клавиатура/Мышь",
+  "midnightcontrols.controls_mode.controller": "Контроллер",
+  "midnightcontrols.controls_mode.touchscreen": "Сенсорный Экран (Разраб.)",
+  "midnightcontrols.hud_side.left": "Больше Налево",
+  "midnightcontrols.hud_side.right": "Больше Направо",
+  "midnightcontrols.menu.analog_movement": "Аналоговое Движение",
+  "midnightcontrols.menu.auto_switch_mode": "Автоматическое Переключение",
+  "midnightcontrols.menu.controller": "Контроллер",
+  "midnightcontrols.menu.controller2": "Дополнительный Контроллер",
+  "midnightcontrols.menu.controller_type": "Тип контроллера",
+  "midnightcontrols.menu.controls_mode": "Тип",
+  "midnightcontrols.menu.double_tap_to_sprint": "Дважды Отвести Левый Стик, Чтобы Начать Бежать",
+  "midnightcontrols.menu.fast_block_placing": "Быстрая Поставка Блоков",
+  "midnightcontrols.menu.fly_drifting": "Инерция При Полёте",
+  "midnightcontrols.menu.fly_drifting_vertical": "Вертикальная Инерция При Полёте",
+  "midnightcontrols.menu.hud_enable": "Включить Иконоки Контроллера",
+  "midnightcontrols.menu.hud_side": "Расположение Интерфейса",
+  "midnightcontrols.menu.invert_right_x_axis": "Инвертировать Правый X",
+  "midnightcontrols.menu.invert_right_y_axis": "Инвертировать Правый Y",
+  "midnightcontrols.menu.keyboard_controls": "Клавиатурная Настройка...",
+  "midnightcontrols.menu.left_dead_zone": "Мертвая Зона Левого Стика",
+  "midnightcontrols.menu.mappings.open_input_str": "Открыть Редактор Файлов Раскладок",
+  "midnightcontrols.menu.max_left_x_value": "Максимальное Значение Ось Левого X",
+  "midnightcontrols.menu.max_left_y_value": "Максимальное Значение Ось Левого Y",
+  "midnightcontrols.menu.max_right_x_value": "Максимальное Значение Ось Правого X",
+  "midnightcontrols.menu.max_right_y_value": "Максимальное Значение Ось Правого Y",
+  "midnightcontrols.menu.mouse_speed": "Скорость Курсора",
+  "midnightcontrols.menu.reacharound.horizontal": "Размещение Переднего Блока",
+  "midnightcontrols.menu.reacharound.vertical": "Вертикальный Охват",
+  "midnightcontrols.menu.reload_controller_mappings": "Перезагрузить Раскладку Контроллера",
+  "midnightcontrols.menu.right_dead_zone": "Мертвая Зона Правого Стика",
+  "midnightcontrols.menu.rotation_speed": "Скорость Вращения По Оси X",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Скорость Вращения По Оси Y",
+  "midnightcontrols.menu.separator.controller": "Контроллер",
+  "midnightcontrols.menu.separator.general": "Общие",
+  "midnightcontrols.menu.title": "MidnightControls - Настройки",
+  "midnightcontrols.menu.title.controller": "Настройки Контроллера",
+  "midnightcontrols.menu.title.controller_controls": "Управление Контроллером",
+  "midnightcontrols.menu.title.gameplay": "Во Время Игры Настройки",
+  "midnightcontrols.menu.title.general": "Общие Настройки",
+  "midnightcontrols.menu.title.hud": "Настройка Интерфейса",
+  "midnightcontrols.menu.title.mappings.string": "Редактор Файлов Раскладок",
+  "midnightcontrols.menu.title.visual": "Настройка Внешнего Вида",
+  "midnightcontrols.menu.unfocused_input": "Несфокусированный Ввод",
+  "midnightcontrols.menu.virtual_mouse": "Виртуальныя Мышка",
+  "midnightcontrols.menu.virtual_mouse.skin": "Дизайн Виртуальной Мышки",
+  "midnightcontrols.narrator.unbound": "Освобождённый %s",
+  "midnightcontrols.not_bound": "Не Назначанно",
+  "midnightcontrols.tooltip.analog_movement": "Включает аналоговое движение, когда это возможно.",
+  "midnightcontrols.tooltip.auto_switch_mode": "Автоматическое переключение на новый, только подключенный контроллер.",
+  "midnightcontrols.tooltip.controller2": "Дополнительный контроллер, например для Джой-конов.",
+  "midnightcontrols.tooltip.controller_type": "Тип контроллера, чтобы правильно сопоставить иконки кнопок.",
+  "midnightcontrols.tooltip.controls_mode": "Тип контроля над игрой.",
+  "midnightcontrols.tooltip.double_tap_to_sprint": "При двойном перемещением на левый стик, персонаж начинает бежать.",
+  "midnightcontrols.tooltip.fast_block_placing": "Во время полета в творческом режиме позволяет быстро размещать блоки в зависимости от вашей скорости. §cНа некоторых серверах это может расцениваться как читерство.§r",
+  "midnightcontrols.tooltip.fly_drifting": "Во время полета включает ванильную инерцию.",
+  "midnightcontrols.tooltip.fly_drifting_vertical": "Во время полета включает ванильную вертикальную инерцию.",
+  "midnightcontrols.tooltip.hud_enable": "Переключает видение иконок кнопок контроллера на экране.",
+  "midnightcontrols.tooltip.hud_side": "Расположение интерфейса в определённую сторону.",
+  "midnightcontrols.tooltip.left_dead_zone": "Мертвая зона для левого аналогового стика контроллера.",
+  "midnightcontrols.tooltip.max_left_x_value": "Изменяет то, что мод в итоге считает максимальным значением для левой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.tooltip.max_left_y_value": "Изменяет то, что мод в итоге считает максимальным значением для левой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.tooltip.max_right_x_value": "Изменяет то, что мод в итоге считает максимальным значением для правой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.tooltip.max_right_y_value": "Изменяет то, что мод в итоге считает максимальным значением для правой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.tooltip.mouse_speed": "Скорость мыши, эмулируемая контроллером.",
+  "midnightcontrols.tooltip.reacharound.horizontal": "Позволяет размещать передний блок перед собой. §cМожет рассматриваться как читерство на некоторых серверах§r.",
+  "midnightcontrols.tooltip.reacharound.vertical": "Обеспечивает вертикальный охват. §cМожет рассматриваться как мошенничество на некоторых серверах§r.",
+  "midnightcontrols.tooltip.reload_controller_mappings": "Перезагружает файл раскладки контроллеров.",
+  "midnightcontrols.tooltip.right_dead_zone": "Мертвая зона для правого аналогового стика контроллера.",
+  "midnightcontrols.tooltip.rotation_speed": "Скорость вращения камеры по оси X в режиме контроллера.",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "Скорость вращения камеры по оси Y в режиме контроллера.",
+  "midnightcontrols.tooltip.unfocused_input": "Разрешить ввод с контроллера, даже если игра на сфокусирована.",
+  "midnightcontrols.tooltip.virtual_mouse": "Включить виртуальную мышь, очень полезно при игре двоём на одном компьютере.",
+  "midnightcontrols.virtual_mouse.skin.default_light": "Обычный Светлый",
+  "midnightcontrols.virtual_mouse.skin.default_dark": "Обычный Тёмный",
+  "midnightcontrols.virtual_mouse.skin.second_light": "Дополнительный Светлый",
+  "midnightcontrols.virtual_mouse.skin.second_dark": "Дополнительный Тёмный",
+  "modmenu.descriptionTranslation.midnightcontrols": "Добавление поддержки контроллера и улучшенние элементов управления в целом.\nРазветвлен от LambdaControls, поддержка которого, к сожалению, прекращена.."
+}

src/main/resources/assets/midnightcontrols/lang/tr_tr.json

@@ -98,7 +98,8 @@
   "midnightcontrols.menu.reacharound.horizontal": "Alt Öne Blok Koyma",
   "midnightcontrols.menu.reacharound.vertical": "En Alta Blok Koyma",
   "midnightcontrols.menu.reload_controller_mappings": "Oyun Kolu Eşleştirmelerini Yenile",
-  "midnightcontrols.menu.rotation_speed": "Dönme Hızı",
+  "midnightcontrols.menu.rotation_speed": "Dönme Hızı (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Dönme Hızı (Y)",
   "midnightcontrols.menu.title": "midnightcontrols - Ayarlar",
   "midnightcontrols.menu.title.controller": "Oyun Kolu Seçenekleri",
   "midnightcontrols.menu.title.controller_controls": "Oyun Kolu Kontrolleri",
@@ -124,7 +125,8 @@
   "midnightcontrols.tooltip.reacharound.horizontal": "Hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
   "midnightcontrols.tooltip.reacharound.vertical": "En alta blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
   "midnightcontrols.tooltip.reload_controller_mappings": "Oyun kolu için eşleştirme dosyasını yeniler.",
-  "midnightcontrols.tooltip.rotation_speed": "Oyun kolu modunda olan kamera dönme hızı",
+  "midnightcontrols.tooltip.rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (X)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (Y)",
   "midnightcontrols.tooltip.unfocused_input": "Oyun penceresinde değilken oyun kolu girişine izine verir.",
   "midnightcontrols.tooltip.virtual_mouse": "Sanal fareyi etkinleştirir. Çift ekran oynanılacağı zaman işe yarar.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Varsayılan Aydınlık Tema",

src/main/resources/assets/midnightcontrols/lang/zh_cn.json

@@ -104,7 +104,8 @@
   "midnightcontrols.menu.reacharound.vertical": "垂直方向方块放置辅助",
   "midnightcontrols.menu.reload_controller_mappings": "重新加载手柄按键映射",
   "midnightcontrols.menu.right_dead_zone": "右摇杆死区",
-  "midnightcontrols.menu.rotation_speed": "镜头旋转速度",
+  "midnightcontrols.menu.rotation_speed": "镜头旋转速度 (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed": "镜头旋转速度 (Y)",
   "midnightcontrols.menu.separator.controller": "手柄",
   "midnightcontrols.menu.separator.general": "通用",
   "midnightcontrols.menu.title": "midnightcontrols — 设置",
@@ -140,7 +141,8 @@
   "midnightcontrols.tooltip.reacharound.vertical": "启用垂直方向方块放置辅助，可在脚下方块的下方放置方块。\n§c在部分服务器可能会被认定为作弊。",
   "midnightcontrols.tooltip.reload_controller_mappings": "重新加载手柄的按键映射文件。",
   "midnightcontrols.tooltip.right_dead_zone": "右摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。",
-  "midnightcontrols.tooltip.rotation_speed": "手柄操作模式下的镜头旋转速度。",
+  "midnightcontrols.tooltip.rotation_speed": "手柄操作模式下的镜头旋转速度。(X)",
+  "midnightcontrols.tooltip.y_axis_rotation_speed": "手柄操作模式下的镜头旋转速度。(Y)",
   "midnightcontrols.tooltip.unfocused_input": "即使游戏窗口处于非活动状态，也允许手柄进行按键输入。",
   "midnightcontrols.tooltip.virtual_mouse": "启用虚拟鼠标，在分屏的情况下很有用。",
   "midnightcontrols.virtual_mouse.skin.default_light": "默认样式（白色）",

src/main/resources/fabric.mod.json

@@ -11,12 +11,20 @@
   "contributors": [
     "akemin-dayo",
     "DioEgizio",
-    "Ivanoks",
-    "FlashyReese",
-    "Hambaka",
-    "joaoh1",
+    "dogtopus",
+    "egeesin",
     "EnnuiL",
-    "egeesin"
+    "FlashyReese",
+    "gyular",
+    "Hambaka",
+    "Ivanoks",
+    "joaoh1",
+    "KiskaUWU",
+    "Madis0",
+    "RaptaG",
+    "ronniedude",
+    "spudpiggy",
+    "TrueHorse"
   ],
   "contact": {
     "homepage": "https://modrinth.com/mod/midnightcontrols",
@@ -53,7 +61,7 @@
     "modmenu": ">=1.12.2"
   },
   "suggests": {
-    "quilt_loader": "*"
+    "kontrolo": "*"
   },
   "breaks": {
     "lambdacontrols": "*",

src/main/resources/midnightcontrols.mixins.json

@@ -16,7 +16,10 @@
     "MinecraftClientMixin",
     "MouseMixin",
     "RecipeBookWidgetAccessor",
-    "WorldRendererMixin"
+    "WorldRendererMixin",
+    "KeyBindingRegistryImplAccessor",
+    "KeyBindingIDAccessor",
+    "ScreenAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/midnightcontrols_compat.mixins.json

@@ -4,6 +4,7 @@
   "plugin": "eu.midnightdust.midnightcontrols.client.compat.MidnightControlsMixinPlugin",
   "compatibilityLevel": "JAVA_16",
   "client": [
+    "SodiumOptionsGUIAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/resourcepacks/bedrock/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 8,
-    "description": "Makes the controller buttons look like from Bedrock Edition"
+    "pack_format": 9,
+    "description": "Makes controller tooltips use similar icons to Bedrock Edition"
   }
 }

src/main/resources/resourcepacks/legacy/CREDITS

@@ -0,0 +1,4 @@
+Some of the textures in this Resourcepack are directly taken from the Console Edition assets and are therefore © Mojang Studios.
+Credits go to Ivanoks for redrawing the Console Generic, Dualshock, DualSense, Switch, Xbox 360 and XBox One controller icons in 15x15,
+Motschen for creating the assets for the other controllers
+and LambdAurora for the original assets, part of which are also included.

src/main/resources/resourcepacks/legacy/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "Makes controller icons look similar to Legacy Console Edit."
+  }
+}