MidnightControls 1.8.0 - 1.19.4, New GUI handling, Better reacharound

- Port to 1.19.4
- Drastically improve GUI handling
  - Directions are now respected instead of acting like the Tab key (possible thanks to 1.19.4)
  - The new tabs can be navigated using the shoulder buttons
- Sodium and Iris now have way better controller navigation thanks to isXander's PRs to them
- Improved reacharound thanks to MonstoBusta
- Cleaner advanced options screen
- Better auto-detection of the Steam Deck

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
+    id 'fabric-loom' version '1.1-SNAPSHOT'
     id 'java-library'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
@@ -32,7 +32,7 @@ boolean isMCVersionNonRelease() {
 }
 
 String getMCVersionString() {
-    if (isMCVersionNonRelease()) {
+    if (isMCVersionNonRelease() || project.minecraft_version == "1.19.4") {
         return project.minecraft_version
     }
     def version = project.minecraft_version.split('\\.')
@@ -94,7 +94,9 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation ("dev.lambdaurora:spruceui:${project.spruceui_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
     include "dev.lambdaurora:spruceui:${project.spruceui_version}"
     api('org.aperlambda:lambdajcommon:1.8.1') {
         exclude group: 'com.google.code.gson'
@@ -102,7 +104,9 @@ dependencies {
     }
     include 'org.aperlambda:lambdajcommon:1.8.1'
 
-    modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 
     // Compatibility mods
 
@@ -110,17 +114,17 @@ 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}"
+    modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}"
-    modImplementation "org.quiltmc:quilt-json5:1.0.0"
+    modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
     modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
-    modImplementation("maven.modrinth:emi:${project.emi_version}")
+    modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
-    modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
+    modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
-    modImplementation "io.github.kosmx:bendy-lib:${project.bendylib_version}"
+    modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
-    modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
+    modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-    modImplementation "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
+    modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
-    modImplementation "maven.modrinth:bedrockify:${project.bedrockify_version}"
+    modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}"
     // Required for Inventory Tabs
-    modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
+    modCompileOnlyApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
         exclude(group: "net.fabricmc.fabric-api")
     }
 

gradle.properties

@@ -3,30 +3,30 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.19.2
+minecraft_version=1.19.4
-yarn_mappings=1.19.2+build.9
+yarn_mappings=1.19.4+build.1
-loader_version=0.14.9
+loader_version=0.14.17
 
 # Mod Properties
-mod_version = 1.7.0
+mod_version = 1.8.0
 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.60.0+1.19.2
+fabric_version=0.75.3+1.19.4
 sodium_version=mc1.19.2-0.4.4
-spruceui_version=4.0.0+1.19
+spruceui_version=4.2.0+1.19.4
-midnightlib_version=0.6.1
+midnightlib_version=1.2.1-fabric
-modmenu_version=4.0.6
+modmenu_version=5.0.1
 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
-emi_version=0.4.0+1.19
+emi_version=0.5.0+1.19.3
 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
+yacl_version=2.2.0
 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.

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

@@ -15,6 +15,7 @@ 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;
@@ -22,6 +23,7 @@ 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.mixin.KeyBindingIDAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingRegistryImplAccessor;
 import eu.midnightdust.midnightcontrols.client.ring.ButtonBindingRingAction;
 import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
@@ -57,6 +59,7 @@ import java.util.TimerTask;
  */
 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");
@@ -141,6 +144,14 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
     public void onMcInit(@NotNull MinecraftClient client) {
         ButtonBinding.init(client.options);
         MidnightControlsConfig.load();
+        if (MidnightControlsConfig.configVersion < 2) {
+            MidnightControlsConfig.mouseScreens.remove("me.jellysquid.mods.sodium.client.gui");
+            MidnightControlsConfig.mouseScreens.remove("net.coderbot.iris.gui");
+            MidnightControlsConfig.mouseScreens.remove("net.minecraft.class_5375");
+            MidnightControlsConfig.mouseScreens.remove("net.minecraft.client.gui.screen.pack.PackScreen");
+            MidnightControlsConfig.configVersion = 2;
+            MidnightControlsConfig.write("midnightcontrols");
+        }
         this.hud.setVisible(MidnightControlsConfig.hudEnable);
         Controller.updateMappings();
         GLFW.glfwSetJoystickCallback((jid, event) -> {
@@ -163,10 +174,16 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
      * 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;
+        if (KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS() == null || KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().isEmpty()) return;
-        for (int i = 0; i < KeyBindingRegistryImplAccessor.getModdedKeyBindings().size(); ++i) {
+        for (int i = 0; i < KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().size(); ++i) {
-            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getModdedKeyBindings().get(i);
+            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().get(i);
             if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
                 category = null;
                 InputManager.streamCategories().forEach(buttonCategory -> {

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

@@ -11,6 +11,7 @@ package eu.midnightdust.midnightcontrols.client;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.mojang.blaze3d.platform.GlDebugInfo;
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
@@ -18,6 +19,7 @@ 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;
@@ -32,54 +34,61 @@ import static org.lwjgl.glfw.GLFW.*;
  */
 public class MidnightControlsConfig extends MidnightConfig {
     public static boolean isEditing = false;
-    @Hidden @Entry public static int configVersion = 1;
+    @Hidden @Entry public static int configVersion = 2;
     // General
-    @Entry(name = "midnightcontrols.menu.controls_mode") public static ControlsMode controlsMode = ControlsMode.DEFAULT;
+    @Entry(category = "controller", name = "midnightcontrols.menu.controls_mode") public static ControlsMode controlsMode = ControlsMode.DEFAULT;
-    @Entry(name = "midnightcontrols.menu.auto_switch_mode") public static boolean autoSwitchMode = true;
+    @Entry(category = "controller", name = "midnightcontrols.menu.auto_switch_mode") public static boolean autoSwitchMode = true;
-    @Entry(name = "Debug") public static boolean debug = false;
+    @Entry(category = "misc", name = "Debug") public static boolean debug = false;
     // HUD
-    @Entry(name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
+    @Entry(category = "visual", name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
-    @Entry(name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
+    @Entry(category = "visual", name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
+    @Entry(category = "screens", name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
     // Gameplay
-    @Entry(name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
+    @Entry(category = "gameplay", name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
-    @Entry(name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
+    @Entry(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "gameplay", 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(category = "visual", name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
-    @Entry(name = "Reacharound Outline Color (WIP)", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
+    @Entry(category = "visual", name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
-    @Entry(name = "Reacharound Outline Alpha", min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
+    @Entry(category = "visual", name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
-    @Entry(name = "midnightcontrols.menu.right_dead_zone") public static double rightDeadZone = 0.25;
+    @Entry(category = "controller", name = "midnightcontrols.menu.right_dead_zone", isSlider = true, min = 0.05, max = 1) public static double rightDeadZone = 0.25;
-    @Entry(name = "midnightcontrols.menu.left_dead_zone") public static double leftDeadZone = 0.25;
+    @Entry(category = "controller", name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.25;
-    @Entry(name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
+    @Entry(category = "controller", 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(category = "controller", 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(category = "controller", name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 40.0; //used for x-axis, name kept for compatibility
-    @Entry(name = "midnightcontrols.menu.y_axis_rotation_speed") public static double yAxisRotationSpeed = rotationSpeed;
+    @Entry(category = "controller", name = "midnightcontrols.menu.y_axis_rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double yAxisRotationSpeed = rotationSpeed;
-    @Entry(name = "midnightcontrols.menu.mouse_speed") public static double mouseSpeed = 25.0;
+    @Entry(category = "screens", name = "midnightcontrols.menu.mouse_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double mouseSpeed = 25.0;
-    @Entry(name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
+    @Entry(category = "screens", name = "midnightcontrols.menu.joystick_as_mouse") public static boolean joystickAsMouse = false;
-    @Entry(name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
+    @Entry(category = "controller", name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
-    @Entry(name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
+    @Entry(category = "screens", name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
-    @Entry(name = "Controller ID") public static Object controllerID = 0;
+    @Entry(category = "screens", name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
-    @Entry(name = "2nd Controller ID") public static Object secondControllerID = -1;
+    @Entry(category = "controller", name = "Controller ID") @Hidden public static Object controllerID = 0;
-    @Entry(name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
+    @Entry(category = "controller", name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
-    @Entry(name = "Mouse screens") public static List<String> mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui",
+    @Entry(category = "visual", name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
-            "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375",
+    @Entry(category = "screens", name = "Mouse screens") public static List<String> mouseScreens = Lists.newArrayList("net.minecraft.client.gui.screen.advancement",
-            "net.minecraft.class_457", "net.minecraft.class_408", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen",
+            "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");
+            "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
-    @Entry(name = "Keybindings") public static Map<String, String> BINDING = new HashMap<>();
+    @Entry(category = "screens", name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
+    @Entry(category = "screens", name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
+    @Entry @Hidden public static Map<String, String> BINDING = new HashMap<>();
 
     private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
-    @Entry(name = "Max analog values") public static double[] maxAnalogValues = new double[]{1, 1, 1, 1};
+    @Deprecated @Hidden @Entry public static double[] maxAnalogValues = new double[]{1, 1, 1, 1};
-    @Entry(name = "Trigger button fix") public static boolean triggerFix = true;
+    @Entry(category = "controller", name = "Max analog value: Left X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftX = maxAnalogValues[0];
-    @Entry(name = "Enable Hints") public static boolean enableHints = true;
+    @Entry(category = "controller", name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = maxAnalogValues[1];
-    @Entry(name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+    @Entry(category = "controller", name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = maxAnalogValues[2];
-    @Entry(name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();
+    @Entry(category = "controller", name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = maxAnalogValues[3];
-    @Entry(name = "Ignored Unbound Keys") public static List<String> ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
+    @Entry(category = "controller", name = "Trigger button fix") public static boolean triggerFix = true;
+    @Entry(category = "gameplay", name = "Enable Hints") public static boolean enableHints = true;
+    @Entry(category = "screens", name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+    @Entry(category = "misc", name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();
+    @Entry(category = "misc", 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;
@@ -193,14 +202,21 @@ public class MidnightControlsConfig extends MidnightConfig {
     }
 
     public static double getAxisMaxValue(int axis) {
-        if (axis >= MidnightControlsConfig.maxAnalogValues.length)
+        return switch (axis) {
-            return 1;
+            case GLFW_GAMEPAD_AXIS_LEFT_X -> MidnightControlsConfig.maxAnalogValueLeftX;
-        return MidnightControlsConfig.maxAnalogValues[axis];
+            case GLFW_GAMEPAD_AXIS_LEFT_Y -> MidnightControlsConfig.maxAnalogValueLeftY;
+            case GLFW_GAMEPAD_AXIS_RIGHT_X -> MidnightControlsConfig.maxAnalogValueRightX;
+            default -> MidnightControlsConfig.maxAnalogValueRightY;
+        };
     }
 
     public static void setAxisMaxValue(int axis, double value) {
-        if (axis < MidnightControlsConfig.maxAnalogValues.length)
+        switch (axis) {
-            MidnightControlsConfig.maxAnalogValues[axis] = value;
+            case GLFW_GAMEPAD_AXIS_LEFT_X -> MidnightControlsConfig.maxAnalogValueLeftX = value;
+            case GLFW_GAMEPAD_AXIS_LEFT_Y -> MidnightControlsConfig.maxAnalogValueLeftY = value;
+            case GLFW_GAMEPAD_AXIS_RIGHT_X -> MidnightControlsConfig.maxAnalogValueRightX = value;
+            default -> MidnightControlsConfig.maxAnalogValueRightY = value;
+        };
     }
 
     /**
@@ -325,9 +341,12 @@ public class MidnightControlsConfig extends MidnightConfig {
         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", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen", "me.shedaniel.clothconfig2.gui.ClothConfigScreen");
+        mouseScreens = Lists.newArrayList("net.minecraft.client.gui.screen.advancement", "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};
+        maxAnalogValueLeftX = 1;
+        maxAnalogValueLeftY = 1;
+        maxAnalogValueRightX = 1;
+        maxAnalogValueRightY = 1;
         triggerFix = true;
         enableHints = true;
         shortcutInControls = true;
@@ -345,9 +364,9 @@ public class MidnightControlsConfig extends MidnightConfig {
         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") && GlDebugInfo.getCpuInfo().contains("AMD Custom APU")) 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("dualsense") || controller.contains("ps5")) 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;

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

@@ -13,10 +13,7 @@ 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.*;
-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;
@@ -49,6 +46,8 @@ 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.*;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.math.MathHelper;
@@ -73,7 +72,9 @@ public class MidnightInput {
     private static final Map<Integer, Integer> BUTTON_COOLDOWNS = new HashMap<>();
     // Cooldowns
     public int actionGuiCooldown = 0;
+    public int joystickCooldown = 0;
     public boolean ignoreNextARelease = false;
+    public boolean ignoreNextXRelease = false;
     private double targetYaw = 0.0;
     private double targetPitch = 0.0;
     private float prevXAxis = 0.f;
@@ -126,6 +127,8 @@ public class MidnightInput {
             --this.actionGuiCooldown;
         if (this.screenCloseCooldown > 0)
             --this.screenCloseCooldown;
+        if (this.joystickCooldown > 0)
+            --this.joystickCooldown;
 
         InputManager.updateStates();
 
@@ -317,16 +320,30 @@ public class MidnightInput {
             return;
         }
 
-        if (action == 0 || action == 2) {
+        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) {
+                    switch (button) {
-                        this.changeFocus(client.currentScreen, NavigationDirection.UP);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_UP -> this.changeFocus(client.currentScreen, NavigationDirection.UP);
-                    } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN) {
+                        case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
-                        this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> this.handleLeftRight(client.currentScreen, false);
-                    } else this.handleLeftRight(client.currentScreen, button != GLFW.GLFW_GAMEPAD_BUTTON_DPAD_LEFT);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> this.handleLeftRight(client.currentScreen, true);
+                    }
+                    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);
+                        }
+                    }
                 }
                 return;
             }
@@ -356,17 +373,57 @@ public class MidnightInput {
                 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.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);
+    }
+    public void pressKeyboardKey(Screen screen, int key) {
+        screen.keyPressed(key, 0, 1);
     }
     /**
 
@@ -513,9 +570,8 @@ public class MidnightInput {
                 return;
             }
         } else if (client.currentScreen != null) {
-            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && absValue >= deadZone) {
             float finalValue = value;
-                if (client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget)
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && absValue >= deadZone && client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget)
                         .map(element -> (SpruceEntryListWidget<?>) element)
                         .filter(AbstractSpruceWidget::isFocusedOrHovered)
                         .noneMatch(element -> {
@@ -533,7 +589,20 @@ public class MidnightInput {
                 {
                     client.currentScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
                 }
-
+            else if (absValue >= deadZone) {
+                if (value > 0 && joystickCooldown == 0) {
+                    switch (axis) {
+                        case GLFW_GAMEPAD_AXIS_LEFT_Y -> this.changeFocus(client.currentScreen, NavigationDirection.UP);
+                        case GLFW_GAMEPAD_AXIS_LEFT_X -> this.handleLeftRight(client.currentScreen, true);
+                    }
+                    if (axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X) joystickCooldown = 4;
+                } else if (value < 0 && joystickCooldown == 0) {
+                    switch (axis) {
+                        case GLFW_GAMEPAD_AXIS_LEFT_Y -> this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
+                        case GLFW_GAMEPAD_AXIS_LEFT_X -> this.handleLeftRight(client.currentScreen, false);
+                    }
+                    if (axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X) joystickCooldown = 4;
+                }
                 return;
             }
         }
@@ -634,7 +703,10 @@ public class MidnightInput {
             var childFocused = widget.getFocused();
             if (childFocused != null)
                 return this.handleAButton(screen, childFocused);
+        } else if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleAButton(screen, focused)) {
+            return true;
         }
+        else pressKeyboardKey(screen, GLFW_KEY_ENTER);
         return false;
     }
 
@@ -650,6 +722,10 @@ public class MidnightInput {
             this.actionGuiCooldown = 5;
             return false;
         }
+        if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleLeftRight(screen, right)) {
+            this.actionGuiCooldown = 5;
+            return false;
+        }
         var focused = screen.getFocused();
         if (focused != null)
             if (this.handleRightLeftElement(focused, right))
@@ -664,11 +740,13 @@ public class MidnightInput {
             return !spruceElement.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
         }
         if (element instanceof SliderWidget slider) {
+            if (slider.active) {
                 slider.keyPressed(right ? 262 : 263, 0, 0);
                 this.actionGuiCooldown = 2; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
-            return false;
+                return true;
+            }
         } else if (element instanceof AlwaysSelectedEntryListWidget) {
-            ((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.DOWN : EntryListWidget.MoveDirection.UP);
+            //TODO((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.DOWN : EntryListWidget.MoveDirection.UP);
             return false;
         } else if (element instanceof ParentElement entryList) {
             var focused = entryList.getFocused();
@@ -717,87 +795,20 @@ public class MidnightInput {
                 }
                 return false;
             }
-            if (FabricLoader.getInstance().isModLoaded("sodium"))
+            switch (direction) {
-                SodiumCompat.handleInput(screen, direction.isLookingForward());
+                case UP -> pressKeyboardKey(screen, GLFW.GLFW_KEY_UP);
-            // This still needs some work
+                case DOWN -> pressKeyboardKey(screen, GLFW.GLFW_KEY_DOWN);
-//            ScreenAccessor accessor = (ScreenAccessor) screen;
+                case LEFT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_LEFT);
-//            if (accessor.getSelected() != null && accessor.getSelected() instanceof ClickableWidget selected && accessor.getSelectables() != null) {
+                case RIGHT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_RIGHT);
-//                //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;
-            }
         } catch (Exception exception) {MidnightControls.get().warn("Unknown exception encountered while trying to change focus: "+exception);}
         return false;
     }
 
     public static boolean isScreenInteractive(@NotNull Screen screen) {
-        return !(screen instanceof HandledScreen || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
+        return !(screen instanceof HandledScreen || MidnightControlsConfig.joystickAsMouse || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
                 || (screen instanceof SpruceScreen && ((SpruceScreen) screen).requiresCursor())
                 || MidnightControlsCompat.requireMouseOnScreen(screen));
     }

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

@@ -120,31 +120,39 @@ public class MidnightReacharound {
             return null;
 
         if (client.player != null && client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.MISS
-                && client.player.isOnGround() && client.player.getPitch(0.f) > 35.f) {
+                && client.player.isOnGround() && client.player.getPitch(0.f) >= 35.f) {
             if (client.player.isRiding())
                 return null;
-            var playerPos = client.player.getBlockPos().down();
+            // Temporary pos, do not use
+            Vec3d playerPosi = client.player.getPos();
+
+            // Imitates var playerPos = client.player.getBlockPos().down();
+            Vec3d playerPos = new Vec3d(playerPosi.getX(), playerPosi.getY() - 1.0, playerPosi.getZ());
             if (client.player.getY() - playerPos.getY() - 1.0 >= 0.25) {
-                playerPos = playerPos.up();
+                // Imitates playerPos = playerPos.up();
+                playerPos = playerPosi;
                 this.onSlab = true;
             } else {
                 this.onSlab = false;
             }
-            var targetPos = new BlockPos(client.crosshairTarget.getPos()).subtract(playerPos);
+            var targetPos = new Vec3d(client.crosshairTarget.getPos().getX(), client.crosshairTarget.getPos().getY(), client.crosshairTarget.getPos().getZ()).subtract(playerPos);
-            var vector = new BlockPos.Mutable(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
+            var vector = new Vec3d(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
             var blockPos = playerPos.add(vector);
 
+            // Some functions still need BlockPos, so this is here to let that happen
+            var blockyPos = BlockPos.ofFloored(blockPos);
+
             var direction = client.player.getHorizontalFacing();
 
-            var state = client.world.getBlockState(blockPos);
+            var state = client.world.getBlockState(blockyPos);
             if (!state.isAir())
                 return null;
-            var adjacentBlockState = client.world.getBlockState(blockPos.offset(direction.getOpposite()));
+            var adjacentBlockState = client.world.getBlockState(blockyPos.offset(direction.getOpposite()));
             if (adjacentBlockState.isAir() || adjacentBlockState.getBlock() instanceof FluidBlock || (vector.getX() == 0 && vector.getZ() == 0)) {
                 return null;
             }
 
-            return new BlockHitResult(new Vec3d(blockPos.getX(),blockPos.getY(),blockPos.getZ()), direction, blockPos, false);
+            return new BlockHitResult(blockPos, direction, blockyPos, false);
         }
         return null;
     }

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

@@ -1,6 +1,6 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
-import dev.emi.emi.EmiConfig;
+import dev.emi.emi.config.EmiConfig;
 import dev.emi.emi.screen.EmiScreen;
 import dev.emi.emi.screen.EmiScreenManager;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
@@ -14,9 +14,9 @@ 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 (isEMIEnabled() && MidnightControlsClient.get().input.actionGuiCooldown == 0 && EmiScreenManager.getSearchPanel() != null && EmiScreenManager.getSearchPanel().pageLeft != null && EmiScreenManager.getSearchPanel().pageRight != null) {
-            if (direction) EmiScreenManager.searchRight.onPress();
+            if (direction) EmiScreenManager.getSearchPanel().pageRight.onPress();
-            else EmiScreenManager.searchLeft.onPress();
+            else EmiScreenManager.getSearchPanel().pageLeft.onPress();
             MidnightControlsClient.get().input.actionGuiCooldown = 5;
             return true;
         }

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

@@ -30,7 +30,7 @@ public class MidnightControlsMixinPlugin implements IMixinConfigPlugin {
     private final HashMap<String, Boolean> conditionalMixins = new HashMap<>();
 
     public MidnightControlsMixinPlugin() {
-        this.putConditionalMixin("SodiumOptionsGUIAccessor", FabricLoader.getInstance().isModLoaded("sodium"));
+        //this.putConditionalMixin("SodiumOptionsGUIAccessor", FabricLoader.getInstance().isModLoaded("sodium"));
     }
 
     private void putConditionalMixin(@NotNull String path, boolean condition) {

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/YACLCompat.java

@@ -0,0 +1,56 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import dev.isxander.yacl.gui.AbstractWidget;
+import dev.isxander.yacl.gui.OptionListWidget;
+import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl.gui.controllers.ControllerWidget;
+import dev.isxander.yacl.gui.controllers.slider.SliderControllerElement;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import org.lwjgl.glfw.GLFW;
+
+public class YACLCompat {
+    public static boolean handleAButton(Screen screen, Element element) {
+        if (element instanceof AbstractWidget abstractWidget) {
+            // imitate ender key press
+            return abstractWidget.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0);
+        }
+        return false;
+    }
+
+    public static boolean handleLeftRight(Screen screen, boolean direction) {
+        if (screen instanceof YACLScreen yaclScreen) {
+            SliderControllerElement focusedSlider = yaclScreen.optionList.children().stream()
+                    .filter(OptionListWidget.OptionEntry.class::isInstance)
+                    .map(entry -> ((OptionListWidget.OptionEntry) entry).widget)
+                    .filter(ControllerWidget.class::isInstance)
+                    .map(ControllerWidget.class::cast)
+                    .filter(SliderControllerElement.class::isInstance)
+                    .map(SliderControllerElement.class::cast)
+                    .filter(ControllerWidget::isHovered)
+                    .findFirst()
+                    .orElse(null);
+
+            if (focusedSlider == null)
+                return false;
+
+            focusedSlider.incrementValue(direction ? 1 : -1);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static boolean handleCategories(Screen screen, boolean direction) {
+        if (screen instanceof YACLScreen yaclScreen) {
+            int categoryIdx = yaclScreen.getCurrentCategoryIdx();
+            if (direction) categoryIdx++; else categoryIdx--;
+            if (categoryIdx < 0) categoryIdx = yaclScreen.config.categories().size() - 1;
+            if (categoryIdx >= yaclScreen.config.categories().size()) categoryIdx = 0;
+
+            yaclScreen.changeCategory(categoryIdx);
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -92,9 +92,9 @@ public class ButtonBinding {
             .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).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
+            .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null)).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).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
+            .action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null)).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(30).register();
     public static final ButtonBinding PAGE_RIGHT = new Builder("page_next").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))

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

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client.controller;
 
+import com.google.common.collect.Lists;
 import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
@@ -16,31 +17,41 @@ 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.compat.YACLCompat;
 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.mixin.TabNavigationWidgetAccessor;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
+import net.fabricmc.fabric.impl.client.itemgroup.CreativeGuiExtensions;
+import net.fabricmc.fabric.impl.client.itemgroup.FabricCreativeGuiComponents;
+import net.fabricmc.fabric.impl.itemgroup.FabricItemGroup;
+import net.fabricmc.fabric.impl.itemgroup.ItemGroupHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.*;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
+import net.minecraft.client.gui.tab.TabManager;
 import net.minecraft.client.gui.widget.PressableWidget;
+import net.minecraft.client.gui.widget.TabNavigationWidget;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 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;
 
 import java.util.Comparator;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static org.lwjgl.glfw.GLFW.*;
 import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_2;
@@ -52,32 +63,68 @@ import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_2;
  * @version 1.7.0
  * @since 1.1.0
  */
+@SuppressWarnings("UnstableApiUsage")
 public class InputHandlers {
     private InputHandlers() {
     }
+    private static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
+        return ItemGroupHelper.sortedGroups.stream()
+            .filter(itemGroup -> {
+                if (FabricCreativeGuiComponents.COMMON_GROUPS.contains(itemGroup)) return true;
+                return ((CreativeGuiExtensions)screen).fabric_currentPage() == ((FabricItemGroup)itemGroup).getPage() && itemGroup.shouldDisplay();
+            }).toList();
+    }
 
     public static PressAction handleHotbar(boolean next) {
         return (client, button, value, action) -> {
             if (action == ButtonState.RELEASE)
                 return false;
 
-            // When ingame
+            // When in-game
             if (client.currentScreen == null && client.player != null) {
+                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 = CreativeInventoryScreenAccessor.getSelectedTab();
+                ItemGroup currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
-                int nextTab = currentTab + (next ? 1 : -1);
+                int currentColumn = currentTab.getColumn();
-                if (nextTab < 0)
+                ItemGroup.Row currentRow = currentTab.getRow();
-                    nextTab = ItemGroup.GROUPS.length - 1;
+                ItemGroup newTab = null;
-                else if (nextTab >= ItemGroup.GROUPS.length)
+                List<ItemGroup> visibleTabs = getVisibleGroups((CreativeInventoryScreen) client.currentScreen);
-                    nextTab = 0;
+                for (ItemGroup tab : visibleTabs) {
-                inventory.midnightcontrols$setSelectedTab(ItemGroup.GROUPS[nextTab]);
+                    if (tab.getRow().equals(currentRow) && ((newTab == null && ((next && tab.getColumn() > currentColumn) ||
+                            (!next && tab.getColumn() < currentColumn))) || (newTab != null && ((next && tab.getColumn() > currentColumn && tab.getColumn() < newTab.getColumn()) ||
+                            (!next && tab.getColumn() < currentColumn && tab.getColumn() > newTab.getColumn())))))
+                        newTab = tab;
+                }
+                if (newTab == null)
+                    for (ItemGroup tab : visibleTabs) {
+                        if ((tab.getRow().compareTo(currentRow)) != 0 && ((next && newTab == null || next && newTab.getColumn() > tab.getColumn()) || (!next && newTab == null) || (!next && newTab.getColumn() < tab.getColumn())))
+                            newTab = tab;
+                    }
+                if (newTab == null) {
+                    for (ItemGroup tab : visibleTabs) {
+                        if ((next && tab.getRow() == ItemGroup.Row.TOP && tab.getColumn() == 0) ||
+                                !next && tab.getRow() == ItemGroup.Row.BOTTOM && (newTab == null || tab.getColumn() > newTab.getColumn()))
+                            newTab = tab;
+                    }
+                }
+                if (newTab == null || newTab.equals(currentTab)) newTab = ItemGroups.getDefaultTab();
+                inventory.midnightcontrols$setSelectedTab(newTab);
                 return true;
             } else if (client.currentScreen instanceof InventoryScreen || client.currentScreen instanceof CraftingScreen || client.currentScreen instanceof AbstractFurnaceScreen<?>) {
                 RecipeBookWidget recipeBook;
@@ -102,7 +149,7 @@ public class InputHandlers {
                 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;
@@ -118,8 +165,24 @@ public class InputHandlers {
                     }
                 }
                 return true;
+            } else if (client.currentScreen != null && client.currentScreen.children().stream().anyMatch(e -> e instanceof TabNavigationWidget)) {
+                return Lists.newCopyOnWriteArrayList(client.currentScreen.children()).stream().anyMatch(e -> {
+                    if (e instanceof TabNavigationWidget tabs) {
+                        TabNavigationWidgetAccessor accessor = (TabNavigationWidgetAccessor) tabs;
+                        int tabIndex = accessor.getTabs().indexOf(accessor.getTabManager().getCurrentTab());
+                        if (next ? tabIndex+1 < accessor.getTabs().size() : tabIndex > 0) {
+                            if (next) tabs.selectTab(tabIndex + 1, true);
+                            else tabs.selectTab(tabIndex - 1, true);
+                            return true;
+                        }
+                    }
+                    return false;
+                });
             } else {
-                if (FabricLoader.getInstance().isModLoaded("sodium")) SodiumCompat.handleTabs(client.currentScreen, next);
+                if (FabricLoader.getInstance().isModLoaded("sodium"))
+                    SodiumCompat.handleTabs(client.currentScreen, next);
+                if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleCategories(client.currentScreen, next))
+                    return true;
             }
             if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryTabs(client.currentScreen, next);
             return false;
@@ -128,34 +191,24 @@ public class InputHandlers {
     public static PressAction handlePage(boolean next) {
         return (client, button, value, action) -> {
             if (client.currentScreen instanceof CreativeInventoryScreen) {
-                var screen = (HandledScreenAccessor) client.currentScreen;
                 try {
-                    if (next) {
                     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(">")) {
+                                if (next && element.getMessage().getString().equals(">")) {
+                                    element.onPress();
+                                    return true;
+                                } else if (element.getMessage().getString().equals("<")) {
                                     element.onPress();
                                     return true;
                                 }
                                 return false;
                             });
-                    } else {
-                        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;
         };
     }
@@ -199,24 +252,22 @@ public class InputHandlers {
 
             MidnightControlsClient.get().input.inventoryInteractionCooldown = 5;
             switch (button.getName()) {
-            case "take_all": {
+                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;
                     }
-                break;
                 }
-            case "take": {
+                case "take" -> {
                     clickData = GLFW_MOUSE_BUTTON_2;
-                break;
                 }
-            case "quick_move": {
+                case "quick_move" -> {
                     actionType = SlotActionType.QUICK_MOVE;
-                break;
                 }
-            default:
+                default -> {
                     return false;
                 }
+            }
             accessor.midnightcontrols$onMouseClick(slot, slotId, clickData, actionType);
             return true;
         };

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

@@ -38,7 +38,7 @@ import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
-import net.minecraft.util.math.Matrix4f;
+import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
@@ -57,8 +57,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption rotationSpeedOption;
     private final SpruceOption yAxisRotationSpeedOption;
     private final SpruceOption mouseSpeedOption;
+    private final SpruceOption joystickAsMouseOption;
     private final SpruceOption virtualMouseOption;
     private final SpruceOption resetOption;
+    private final SpruceOption advancedConfigOption;
     // Gameplay options
     private final SpruceOption analogMovementOption;
     private final SpruceOption doubleTapToSprintOption;
@@ -75,6 +77,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption virtualMouseSkinOption;
     private final SpruceOption hudEnableOption;
     private final SpruceOption hudSideOption;
+    private final SpruceOption moveChatOption;
     // Controller options
     private final SpruceOption controllerOption =
             new SpruceCyclingOption("midnightcontrols.menu.controller",
@@ -184,12 +187,16 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         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"));
+                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
+        this.joystickAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.joystick_as_mouse",
+                () -> MidnightControlsConfig.joystickAsMouse, value -> MidnightControlsConfig.joystickAsMouse = value,
+                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
         this.resetOption = SpruceSimpleActionOption.reset(btn -> {
             MidnightControlsConfig.reset();
             var client = MinecraftClient.getInstance();
             this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
         });
+        this.advancedConfigOption = SpruceSimpleActionOption.of("midnightcontrols.midnightconfig.title", button -> client.setScreen(MidnightControlsConfig.getScreen(this, "midnightcontrols")));
         // Gameplay options
         this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
                 () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
@@ -232,6 +239,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 amount -> MidnightControlsConfig.hudSide = MidnightControlsConfig.hudSide.next(),
                 option -> option.getDisplayText(MidnightControlsConfig.hudSide.getTranslatedText()),
                 Text.translatable("midnightcontrols.tooltip.hud_side"));
+        this.moveChatOption = new SpruceToggleBooleanOption("midnightcontrols.menu.move_chat", () -> MidnightControlsConfig.moveChat,
+                value -> MidnightControlsConfig.moveChat = value, Text.translatable("midnightcontrols.tooltip.move_chat"));
         // Controller options
         this.toggleControllerProfileOption = new SpruceToggleBooleanOption("midnightcontrols.menu.separate_controller_profile", () -> MidnightControlsConfig.controllerBindingProfiles.containsKey(MidnightControlsConfig.getController().getGuid()), value -> {
             if (value) {
@@ -290,8 +299,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         this.buildTabs();
 
         this.addDrawableChild(this.resetOption.createWidget(Position.of(this.width / 2 - 155, this.height - 29), 150));
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, 20, SpruceTexts.GUI_DONE,
+        this.addDrawableChild(ButtonWidget.builder(SpruceTexts.GUI_DONE, btn -> this.client.setScreen(this.parent))
-                btn -> this.client.setScreen(this.parent)));
+                .dimensions(this.width / 2 - 155 + 160, this.height - 29, 150, 20).build());
     }
 
     public void buildTabs() {
@@ -329,6 +338,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         list.addSingleOptionEntry(this.yAxisRotationSpeedOption);
         list.addSingleOptionEntry(this.mouseSpeedOption);
         list.addSingleOptionEntry(this.virtualMouseOption);
+        list.addSingleOptionEntry(this.joystickAsMouseOption);
+        list.addSingleOptionEntry(this.advancedConfigOption);
         return list;
     }
 
@@ -356,6 +367,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
         list.addSingleOptionEntry(this.hudEnableOption);
         list.addSingleOptionEntry(this.hudSideOption);
+        list.addSingleOptionEntry(this.moveChatOption);
         return list;
     }
 
@@ -412,20 +424,20 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
 
     @Override
     public void renderTitle(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        drawCenteredText(matrices, this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 16777215);
+        drawCenteredTextWithShadow(matrices, this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 16777215);
     }
 
     public static class MidnightControlsBackground implements Background {
-        private int transparency = 160;
+        private static int transparency = 160;
         public MidnightControlsBackground() {}
         public MidnightControlsBackground(int transparency) {
-            this.transparency = transparency;
+            MidnightControlsBackground.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"));
         }
-        private void fill(MatrixStack matrixStack, int x2, int y2, int x1, int y1, Color color) {
+        private static void fill(MatrixStack matrixStack, int x2, int y2, int x1, int y1, Color color) {
             matrixStack.push();
 
             Matrix4f matrix = matrixStack.peek().getPositionMatrix();
@@ -435,16 +447,14 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
             float t = (float)(transparency) / 255.0F;
             BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
             RenderSystem.enableBlend();
-            RenderSystem.disableTexture();
             RenderSystem.defaultBlendFunc();
-            RenderSystem.setShader(GameRenderer::getPositionColorShader);
+            RenderSystem.setShader(GameRenderer::getPositionColorProgram);
             bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
             bufferBuilder.vertex(matrix, (float)x1, (float)y2, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x2, (float)y2, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x2, (float)y1, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x1, (float)y1, 0.0F).color(r, g, b, t).next();
-            BufferRenderer.drawWithShader(bufferBuilder.end());
+            BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
-            RenderSystem.enableTexture();
             RenderSystem.disableBlend();
             matrixStack.pop();
         }

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

@@ -10,7 +10,6 @@
 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;
@@ -37,8 +36,8 @@ public class RingScreen extends Screen {
     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(ButtonWidget.builder(Text.of("◀"), button -> this.mod.ring.cyclePage(false)).dimensions(5, 5, 20, 20).build());
-            this.addDrawableChild(new ButtonWidget(width - 25, 5, 20, 20, Text.of("▶"), button -> this.mod.ring.cyclePage(true)));
+            this.addDrawableChild(ButtonWidget.builder(Text.of("▶"), button -> this.mod.ring.cyclePage(true)).dimensions(width - 25, 5, 20, 20).build());
         }
     }
 
@@ -66,18 +65,18 @@ public class RingScreen extends Screen {
         RingPage.selected = -1;
         this.removed();
     }
-    @Override
+//    @Override
-    public boolean changeFocus(boolean lookForwards) {
+//    public boolean changeFocus(boolean lookForwards) {
-        if (lookForwards) {
+//        if (lookForwards) {
-            if (RingPage.selected < 7) ++RingPage.selected;
+//            if (RingPage.selected < 7) ++RingPage.selected;
-            else RingPage.selected = -1;
+//            else RingPage.selected = -1;
-        }
+//        }
-        else  {
+//        else  {
-            if (RingPage.selected > -1) --RingPage.selected;
+//            if (RingPage.selected > -1) --RingPage.selected;
-            else RingPage.selected = 7;
+//            else RingPage.selected = 7;
-        }
+//        }
-        return true;
+//        return true;
-    }
+//    }
 
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {

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

@@ -59,7 +59,7 @@ public class ControllerControlsWidget extends SpruceContainerWidget {
 
     @Override
     public void renderWidget(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        drawCenteredText(matrices, this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
+        drawCenteredTextWithShadow(matrices, this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
                 this.getX() + this.width / 2, this.getY() + 4, 16777215);
         this.resetButton.setActive(InputManager.streamBindings().anyMatch(Predicates.not(ButtonBinding::isDefault)));
         super.renderWidget(matrices, mouseX, mouseY, delta);

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

@@ -0,0 +1,35 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+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.callback.CallbackInfo;
+
+@Mixin(ChatScreen.class)
+public abstract class ChatScreenMixin extends Screen {
+    @Shadow protected TextFieldWidget chatField;
+
+    protected ChatScreenMixin(Text title) {
+        super(title);
+    }
+
+    @Inject(at = @At("TAIL"), method = "init")
+    private void midnightcontrols$moveInputField(CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) chatField.setY(4);
+    }
+    @Inject(method = "render", at = @At("HEAD"))
+    private void midnightcontrols$moveInputFieldBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) matrices.translate(0f, -this.height + 16, 0f);
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", shift = At.Shift.BEFORE))
+    private void midnightcontrols$dontMoveOtherStuff(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) matrices.translate(0f, this.height - 16, 0f);
+    }
+}

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

@@ -38,8 +38,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
     private boolean midnightcontrols$driftingPrevented = false;
 
-    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, @Nullable PlayerPublicKey publicKey) {
+    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
-        super(world, profile, publicKey);
+        super(world, profile);
     }
 
     @Shadow

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

@@ -11,16 +11,13 @@ 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;
@@ -30,27 +27,13 @@ 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) {
+    private void addControllerButton(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) {
-        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

@@ -11,6 +11,7 @@ package eu.midnightdust.midnightcontrols.client.mixin;
 
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,8 +30,8 @@ public interface CreativeInventoryScreenAccessor {
      * @return the selected tab index
      */
     @Accessor("selectedTab")
-    static int getSelectedTab() {
+    static ItemGroup getSelectedTab() {
-        return 0;
+        return ItemGroups.getDefaultTab();
     }
 
     /**

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

@@ -9,12 +9,13 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
+import net.minecraft.client.gui.navigation.NavigationDirection;
 import net.minecraft.client.gui.widget.EntryListWidget;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(EntryListWidget.class)
 public interface EntryListWidgetAccessor {
-    @Invoker("moveSelection")
+    //@Invoker("getNeighbouringEntry")
-    void midnightcontrols$moveSelection(EntryListWidget.MoveDirection direction);
+    //void midnightcontrols$getNeighbouringEntry(NavigationDirection direction);
 }

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/KeyBindingRegistryImplAccessor.java

@@ -10,8 +10,10 @@ import java.util.List;
 
 @Mixin(value = KeyBindingRegistryImpl.class, remap = false)
 public interface KeyBindingRegistryImplAccessor {
+
     @Accessor @Final
-    static List<KeyBinding> getModdedKeyBindings() {
+    static List<KeyBinding> getMODDED_KEY_BINDINGS() {
         return null;
     }
+
 }

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

@@ -0,0 +1,16 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.client.gui.tab.Tab;
+import net.minecraft.client.gui.tab.TabManager;
+import net.minecraft.client.gui.widget.TabNavigationWidget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(TabNavigationWidget.class)
+public interface TabNavigationWidgetAccessor {
+    @Accessor
+    TabManager getTabManager();
+    @Accessor
+    ImmutableList<Tab> getTabs();
+}

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

@@ -22,8 +22,8 @@ import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.shape.VoxelShape;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

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

@@ -64,8 +64,8 @@ public final class MidnightRing {
             for (String binding : configBindings) {
                 ButtonBinding buttonBinding = InputManager.getBinding(binding);
                 if (buttonBinding != null) {
-                    RingPage page = this.pages.get(MathHelper.fastFloor(bindingIndex / 8f));
+                    RingPage page = this.pages.get(MathHelper.floor(bindingIndex / 8f));
-                    page.actions[bindingIndex - 8 * (MathHelper.fastFloor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
+                    page.actions[bindingIndex - 8 * (MathHelper.floor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
                     ++bindingIndex;
                 }
             }
@@ -88,8 +88,8 @@ public final class MidnightRing {
 
             for (ButtonBinding buttonBinding : unboundBindings) {
                 if (buttonBinding != null) {
-                    RingPage page = this.pages.get(MathHelper.fastFloor(bindingIndex / 8f));
+                    RingPage page = this.pages.get(MathHelper.floor(bindingIndex / 8f));
-                    page.actions[bindingIndex - 8 * (MathHelper.fastFloor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
+                    page.actions[bindingIndex - 8 * (MathHelper.floor(bindingIndex / 8f))] = (new ButtonBindingRingAction(buttonBinding));
                     ++bindingIndex;
                 }
             }

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

@@ -58,7 +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);
+        if (MidnightControlsClient.get().ring.getMaxPages() > 1) drawCenteredTextWithShadow(matrices, textRenderer, name, centerX, 5, 0xffffff);
 
         int offset = MidnightRing.ELEMENT_SIZE + (MidnightRing.ELEMENT_SIZE / 2) + 5;
 

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

@@ -140,6 +140,7 @@
   "midnightcontrols.menu.hud_side": "HUD Side",
   "midnightcontrols.menu.invert_right_x_axis": "Invert Right X",
   "midnightcontrols.menu.invert_right_y_axis": "Invert Right Y",
+  "midnightcontrols.menu.joystick_as_mouse": "Always use left stick as mouse",
   "midnightcontrols.menu.keyboard_controls": "Keyboard Controls...",
   "midnightcontrols.menu.left_dead_zone": "Left Stick Dead Zone",
   "midnightcontrols.menu.mappings.open_input_str": "Open Mappings File Editor",
@@ -148,6 +149,7 @@
   "midnightcontrols.menu.max_right_x_value": "Right X Axis Max Value",
   "midnightcontrols.menu.max_right_y_value": "Right Y Axis Max Value",
   "midnightcontrols.menu.mouse_speed": "Mouse Speed",
+  "midnightcontrols.menu.move_chat": "Move chat input box to top",
   "midnightcontrols.menu.reacharound.horizontal": "Front Block Placing",
   "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound",
   "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings",
@@ -181,12 +183,14 @@
   "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.joystick_as_mouse": "Make the joystick behave like a mouse in every menu.",
   "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.",
   "midnightcontrols.tooltip.max_right_y_value": "Changes what the mod considers the highest value for the right Y axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
+  "midnightcontrols.tooltip.move_chat": "Moves the chat input field to the top, for better input on devices with on-screen keyboards.",
   "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.",
@@ -199,5 +203,10 @@
   "midnightcontrols.virtual_mouse.skin.default_dark": "Default Dark",
   "midnightcontrols.virtual_mouse.skin.second_light": "Second Light",
   "midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark",
+  "midnightcontrols.midnightconfig.category.controller": "Controller",
+  "midnightcontrols.midnightconfig.category.misc": "Miscellaneous",
+  "midnightcontrols.midnightconfig.category.screens": "Screens",
+  "midnightcontrols.midnightconfig.category.gameplay": "Gameplay",
+  "midnightcontrols.midnightconfig.category.visual": "Visual",
   "modmenu.descriptionTranslation.midnightcontrols": "Adds controller support and enhanced controls overall.\nForked from LambdaControls, which sadly got discontinued."
 }

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

@@ -0,0 +1,203 @@
+{
+	"midnightcontrols.midnightconfig.title": "Configurazione Avanzata MidnightControls",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Default Chiaro",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Default Scuro",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Chiaro Secondario",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Scuro secondario",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Default",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
+	"midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Controller Switch/Wii",
+	"midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Controller Xbox One/Series",
+	"midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Controller Xbox 360",
+	"midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Controller Steam",
+	"midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
+	"midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "Controller OUYA",
+	"midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Controller Numerato",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Tastiera/Mouse",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Controller",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (WIP)",
+	"midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Sinistra",
+	"midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Destra",
+	"key.midnightcontrols.look_down": "Guarda in basso",
+	"key.midnightcontrols.look_left": "Guarda a sinistra",
+	"key.midnightcontrols.look_right": "Guarda a destra",
+	"key.midnightcontrols.look_up": "Guarda sopra",
+	"key.midnightcontrols.ring": "Apri Tasti non impostati",
+	"midnightcontrols.action.attack": "Attacca",
+	"midnightcontrols.action.back": "Indietro",
+	"midnightcontrols.action.chat": "Apri Chat",
+	"midnightcontrols.action.controls_ring": "Apri Tasti non impostati",
+	"midnightcontrols.action.debug_screen": "Apri HUD di Debug (F3)",
+	"midnightcontrols.action.drop_item": "Rilascia oggetto",
+	"midnightcontrols.action.exit": "Esci",
+	"midnightcontrols.action.forward": "Avanti",
+	"midnightcontrols.action.hit": "Colpisci",
+	"midnightcontrols.action.hotbar_left": "Hotbar sinistra",
+	"midnightcontrols.action.hotbar_right": "Hotbar destra",
+	"midnightcontrols.action.inventory": "Inventario",
+	"midnightcontrols.action.jump": "Salta",
+	"midnightcontrols.action.left": "Sinistra",
+	"midnightcontrols.action.pause_game": "Pausa il gioco",
+	"midnightcontrols.action.pick_block": "Prendi Blocco",
+	"midnightcontrols.action.pickup": "Raccogli",
+	"midnightcontrols.action.pickup_all": "Raccogli Tutto",
+	"midnightcontrols.action.place": "Piazza",
+	"midnightcontrols.action.player_list": "Lista Giocatori",
+	"midnightcontrols.action.quick_move": "Muovi veloce",
+	"midnightcontrols.action.right": "Destra",
+	"midnightcontrols.action.screenshot": "Fai uno Screenshot",
+	"midnightcontrols.action.slot_up": "Muovi slot sopra",
+	"midnightcontrols.action.slot_down": "Muovi slot sotto",
+	"midnightcontrols.action.slot_left": "Muovi slot a sinistra",
+	"midnightcontrols.action.slot_right": "Muovi slot a destra",
+	"midnightcontrols.action.sneak": "Accovaccia",
+	"midnightcontrols.action.sprint": "Corri",
+	"midnightcontrols.action.swap_hands": "Scambia le mani",
+	"midnightcontrols.action.toggle_perspective": "Cambia la prospettiva",
+	"midnightcontrols.action.toggle_smooth_camera": "Cambia Camera Cinematica",
+	"midnightcontrols.action.page_back": "Pagina precedente",
+	"midnightcontrols.action.page_next": "Pagina Successica",
+	"midnightcontrols.action.tab_back": "Tab Precedente",
+	"midnightcontrols.action.tab_next": "Tab Successiva",
+	"midnightcontrols.action.take": "Prendi Item",
+	"midnightcontrols.action.take_all": "Prendi Stack",
+	"midnightcontrols.action.use": "Usa",
+	"midnightcontrols.action.zoom": "Zoom",
+	"midnightcontrols.action.zoom_in": "Aumenta Zoom",
+	"midnightcontrols.action.zoom_out": "Diminuisci Zoom",
+	"midnightcontrols.action.zoom_reset": "Resetta Zoom",
+	"midnightcontrols.action.emi_page_left": "Pagina Precedente",
+	"midnightcontrols.action.emi_page_right": "Pagina Successiva",
+	"midnightcontrols.category.emi": "EMI",
+	"midnightcontrols.button.a": "A",
+	"midnightcontrols.button.b": "B",
+	"midnightcontrols.button.x": "X",
+	"midnightcontrols.button.y": "Y",
+	"midnightcontrols.button.left_bumper": "Bumper Destro",
+	"midnightcontrols.button.right_bumper": "Bumper Sinistro",
+	"midnightcontrols.button.back": "Indietro",
+	"midnightcontrols.button.start": "Avvia",
+	"midnightcontrols.button.guide": "Guida",
+	"midnightcontrols.button.left_thumb": "Pollice Sinistro",
+	"midnightcontrols.button.right_thumb": "Pollice Destro",
+	"midnightcontrols.button.dpad_up": "DPAD Sopra",
+	"midnightcontrols.button.dpad_right": "DPAD Destra",
+	"midnightcontrols.button.dpad_down": "DPAD Sotto",
+	"midnightcontrols.button.dpad_left": "DPAD Sinistra",
+	"midnightcontrols.button.l4": "L4",
+	"midnightcontrols.button.l5": "L5",
+	"midnightcontrols.button.r4": "R4",
+	"midnightcontrols.button.r5": "L5",
+	"midnightcontrols.axis.left_x+": "Sinistra X+",
+	"midnightcontrols.axis.left_y+": "Sinistra Y+",
+	"midnightcontrols.axis.right_x+": "Destra X+",
+	"midnightcontrols.axis.right_y+": "Destra Y+",
+	"midnightcontrols.axis.left_trigger": "Trigger Sinistro",
+	"midnightcontrols.axis.right_trigger": "Trigger Destro",
+	"midnightcontrols.axis.left_x-": "Sinistra X-",
+	"midnightcontrols.axis.left_y-": "Sinistra Y-",
+	"midnightcontrols.axis.right_x-": "Destra X-",
+	"midnightcontrols.axis.right_y-": "Destra Y-",
+	"midnightcontrols.button.unknown": "Sconosciuto",
+	"midnightcontrols.controller.tutorial.title": "Gioca il gioco con un Controller!",
+	"midnightcontrols.controller.tutorial.description": "Vai a %s -> %s -> %s",
+	"midnightcontrols.controller.connected": "Controller %d connesso.",
+	"midnightcontrols.controller.disconnected": "Controller %d disconnesso",
+	"midnightcontrols.controller.mappings.1": "Per configurare le mappature dei controller, per favore usa %s",
+	"midnightcontrols.controller.mappings.3": "e incolla le mappature nel file editor.",
+	"midnightcontrols.controller.mappings.error": "Errore durante il caricamento delle mappature",
+	"midnightcontrols.controller.mappings.error.write": "Errore durante la scrittura delle mappature su file",
+	"midnightcontrols.controller.mappings.updated": "Aggiornate le mappature!",
+	"midnightcontrols.controller_type.default": "Default",
+	"midnightcontrols.controller_type.dualshock": "DualShock",
+	"midnightcontrols.controller_type.dualsense": "DualSense",
+	"midnightcontrols.controller_type.switch": "Controller Switch/Wii",
+	"midnightcontrols.controller_type.xbox": "Controller Xbox One/Series",
+	"midnightcontrols.controller_type.xbox_360": "Controller Xbox 360",
+	"midnightcontrols.controller_type.steam_controller": "Controller Steam",
+	"midnightcontrols.controller_type.steam_deck": "Steam Deck",
+	"midnightcontrols.controller_type.ouya": "Controller OUYA",
+	"midnightcontrols.controller_type.numbered": "Controller Numerato",
+	"midnightcontrols.controls_mode.default": "Tastiera/Mouse",
+	"midnightcontrols.controls_mode.controller": "Controller",
+	"midnightcontrols.controls_mode.touchscreen": "Touchscreen (WIP)",
+	"midnightcontrols.hud_side.left": "Left",
+	"midnightcontrols.hud_side.right": "Destra",
+	"midnightcontrols.menu.analog_movement": "Movimento Analogo",
+	"midnightcontrols.menu.auto_switch_mode": "Modalità Cambio Automatico",
+	"midnightcontrols.menu.controller": "Controller",
+	"midnightcontrols.menu.controller2": "Controller Secondario",
+	"midnightcontrols.menu.controller_toggle_sneak": "Attiva/Disattiva Accovacciamento su Controller",
+	"midnightcontrols.menu.controller_toggle_sprint": "Attiva/Disattiva Correre su Controller",
+	"midnightcontrols.menu.controller_type": "Tipo di Controller",
+	"midnightcontrols.menu.controls_mode": "Modalità",
+	"midnightcontrols.menu.double_tap_to_sprint": "Doppio Tap per Sprintare",
+	"midnightcontrols.menu.fast_block_placing": "Veloce Piazzamento di Blocchi",
+	"midnightcontrols.menu.fly_drifting": "Drift in Volo",
+	"midnightcontrols.menu.fly_drifting_vertical": "Drift in Volo Verticale",
+	"midnightcontrols.menu.hud_enable": "Attiva HUD",
+	"midnightcontrols.menu.hud_side": "Lato HUD",
+	"midnightcontrols.menu.invert_right_x_axis": "Inverti Destro X",
+	"midnightcontrols.menu.invert_right_y_axis": "Inverti Destro Y",
+	"midnightcontrols.menu.keyboard_controls": "Controlli da Tastiera...",
+	"midnightcontrols.menu.left_dead_zone": "Zona Morta dello Stick Sinistro",
+	"midnightcontrols.menu.mappings.open_input_str": "Apri il File Editor delle Mappature",
+	"midnightcontrols.menu.max_left_x_value": "Asse X Sinistro Massimo Valore",
+	"midnightcontrols.menu.max_left_y_value": "Asse Y Sinistro Massimo Valore",
+	"midnightcontrols.menu.max_right_x_value": "Asse Destro X Massimo Valore",
+	"midnightcontrols.menu.max_right_y_value": "Asse Destro Y Massimo Valore",
+	"midnightcontrols.menu.mouse_speed": "Velocità Mouse",
+	"midnightcontrols.menu.reacharound.horizontal": "Piazza blocchi Davanti",
+	"midnightcontrols.menu.reacharound.vertical": "Reach Verticale",
+	"midnightcontrols.menu.reload_controller_mappings": "Ricarica Mappature del Controller",
+	"midnightcontrols.menu.right_dead_zone": "Zona Morta Stick Destro",
+	"midnightcontrols.menu.rotation_speed": "Velocità di rotazione dell'Asse X",
+	"midnightcontrols.menu.y_axis_rotation_speed": "Velocità di rotazione dell'Asse Y",
+	"midnightcontrols.menu.separate_controller_profile": "Profilo Controller Separato",
+	"midnightcontrols.menu.separator.controller": "Controller",
+	"midnightcontrols.menu.separator.general": "Generale",
+	"midnightcontrols.menu.title": "MidnightControls - Impostazioni",
+	"midnightcontrols.menu.title.controller": "Opzioni Controller",
+	"midnightcontrols.menu.title.controller_controls": "Tasti Controller",
+	"midnightcontrols.menu.title.gameplay": "Opzioni del Gameplay",
+	"midnightcontrols.menu.title.general": "Impostazioni Generali",
+	"midnightcontrols.menu.title.hud": "Opzioni della HUD",
+	"midnightcontrols.menu.title.mappings.string": "Editor di file delle Mappature",
+	"midnightcontrols.menu.title.visual": "Aspetto",
+	"midnightcontrols.menu.unfocused_input": "Input non a fuoco",
+	"midnightcontrols.menu.virtual_mouse": "Mouse Virtuale",
+	"midnightcontrols.menu.virtual_mouse.skin": "Aspetto Mouse Virtuale",
+	"midnightcontrols.narrator.unbound": "Disimpostato %s",
+	"midnightcontrols.not_bound": "Non Impostato",
+	"midnightcontrols.tooltip.analog_movement": "Quando possibile, attiva movimento analogo.",
+	"midnightcontrols.tooltip.auto_switch_mode": "Quando la modalità controlli dovrebbe passare a Controller automaticamente se uno è connesso",
+	"midnightcontrols.tooltip.controller2": "Secondo controller da usare, che permette (per esempio) Supporto dei Joy-Cons.",
+	"midnightcontrols.tooltip.controller_type": "Il tipo di controller che stai usando (usato per mostrare i pulsanti corretti)",
+	"midnightcontrols.tooltip.controls_mode": "Modalita controlli.",
+	"midnightcontrols.tooltip.double_tap_to_sprint": "Attiva quando il tasto \"Cammina Avanti\" fa correre il giocatore con doppio tap velocemente",
+	"midnightcontrols.tooltip.fast_block_placing": "Quando si vola in creativa, attiva il movimento veloce dei blocchi in base alla tua velocità. §cSu alcuni server potrebbe essere considerato un cheat.§r",
+	"midnightcontrols.tooltip.fly_drifting": "Quando si vola, attiva L'inerzia del Vanilla",
+	"midnightcontrols.tooltip.fly_drifting_vertical": "Quando si vola, attiva l'inerzia verticale Vanilla",
+	"midnightcontrols.tooltip.hud_enable": "Attiva gli indicatori dei pulsanti dei controller sullo schermo.",
+	"midnightcontrols.tooltip.hud_side": "La posizione della HUD",
+	"midnightcontrols.tooltip.left_dead_zone": "La zona morta per lo stick sinistro del controller.",
+	"midnightcontrols.tooltip.max_left_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.tooltip.max_left_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.tooltip.max_right_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.tooltip.max_right_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.tooltip.mouse_speed": "La velocità del controller emulato.",
+	"midnightcontrols.tooltip.reacharound.horizontal": "Attiva il piazzare blocchi davanti, Potrebbe essere considerato un cheat su alcuni server.",
+	"midnightcontrols.tooltip.reacharound.vertical": "Attiva il reach verticale, potrebbe essere considerato cheating su alcuni server",
+	"midnightcontrols.tooltip.reload_controller_mappings": "Riavvia il file dlle mappature del controller",
+	"midnightcontrols.tooltip.right_dead_zone": "La zona morta per lo stick destro del controller",
+	"midnightcontrols.tooltip.rotation_speed": "L'asse X della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.tooltip.y_axis_rotation_speed": "L'asse Y della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.tooltip.unfocused_input": "Permette imput dei controller quando la finestra non è messa a fuoco",
+	"midnightcontrols.tooltip.virtual_mouse": "Attiva il mouse virtuale, che può essere utile nello schermo diviso.",
+	"midnightcontrols.virtual_mouse.skin.default_light": "Chiaro Default",
+	"midnightcontrols.virtual_mouse.skin.default_dark": "Scuro Default",
+	"midnightcontrols.virtual_mouse.skin.second_light": "Chiaro Secondario",
+	"midnightcontrols.virtual_mouse.skin.second_dark": "Scuro Secondario",
+	"modmenu.descriptionTranslation.midnightcontrols": "Aggiunge supporto e controlli migliorati in generale. \\nProveniente da LambdaControls, che è stato rimosso."
+}

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

@@ -0,0 +1,152 @@
+{
+  "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.button.a": "A",
+  "midnightcontrols.button.b": "B",
+  "midnightcontrols.button.x": "X",
+  "midnightcontrols.button.y": "Y",
+  "midnightcontrols.button.left_bumper": "LB 鍵",
+  "midnightcontrols.button.right_bumper": "RB 鍵",
+  "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.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": "並將按鍵映射文件放入此路徑：`%s.minecraft/config/gamecontrollerdb.txt%s`。",
+  "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.switch": "Switch",
+  "midnightcontrols.controller_type.xbox": "Xbox",
+  "midnightcontrols.controller_type.steam": "Steam",
+  "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.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": "鏡頭旋轉速度 (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": "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-Con 合為一個功能完全的手把。",
+  "midnightcontrols.tooltip.controller_type": "選擇手把類型，以顯示對應的按鍵圖標。",
+  "midnightcontrols.tooltip.controls_mode": "操作模式",
+  "midnightcontrols.tooltip.fast_block_placing": "在創造模式中處於飛行狀態時，可以根據你飛行的速度快速放置方塊。\n§c在部分服務器可能會被認定為作弊。",
+  "midnightcontrols.tooltip.fly_drifting": "處於飛行狀態時，啟用原版的水平方向飛行慣性（緩停滑行）。",
+  "midnightcontrols.tooltip.fly_drifting_vertical": "處於飛行狀態時，啟用原版的垂直方向飛行慣性（緩停滑行）。",
+  "midnightcontrols.tooltip.hud_enable": "顯示手把按鍵操作提示。",
+  "midnightcontrols.tooltip.hud_side": "HUD的位置位於畫面的哪一側。",
+  "midnightcontrols.tooltip.left_dead_zone": "左搖桿配置的死區。\n死區決定搖桿要偏離中心位置多遠才能讓搖桿的輸入有效。",
+  "midnightcontrols.tooltip.max_left_x_value": "更改左搖桿X軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，左右移動較為緩慢等問題，本項可能會有所幫助。",
+  "midnightcontrols.tooltip.max_left_y_value": "更改左搖桿Y軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，前後移動較為緩慢等問題，本項可能會有所幫助。",
+  "midnightcontrols.tooltip.max_right_x_value": "更改右搖桿X軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭左右旋轉較為緩慢等問題，本項可能會有所幫助。",
+  "midnightcontrols.tooltip.max_right_y_value": "更改右搖桿Y軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭上下旋轉較為緩慢等問題，本項可能會有所幫助。",
+  "midnightcontrols.tooltip.mouse_speed": "手把模擬的鼠標的移動速度。",
+  "midnightcontrols.tooltip.reacharound.horizontal": "啟用水平方向方塊放置輔助，可在腳下方塊的前方放置方塊。\n§c在部分服務器可能會被認定為作弊。",
+  "midnightcontrols.tooltip.reacharound.vertical": "啟用垂直方向方塊放置輔助，可在腳下方塊的下方放置方塊。\n§c在部分服務器可能會被認定為作弊。",
+  "midnightcontrols.tooltip.reload_controller_mappings": "重新加載手把的按鍵映射文件。",
+  "midnightcontrols.tooltip.right_dead_zone": "右搖桿配置的死區。\n死區決定搖桿要偏離中心位置多遠才能讓搖桿的輸入有效。",
+  "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": "額外樣式（黑色）"
+}

src/main/resources/fabric.mod.json

@@ -11,15 +11,20 @@
   "contributors": [
     "akemin-dayo",
     "DioEgizio",
-    "Ivanoks",
+    "dogtopus",
-    "KiskaUWU",
+    "egeesin",
-    "RaptaG",
-    "Madis0",
-    "FlashyReese",
-    "Hambaka",
-    "joaoh1",
     "EnnuiL",
-    "egeesin"
+    "FlashyReese",
+    "gyular",
+    "Hambaka",
+    "Ivanoks",
+    "joaoh1",
+    "KiskaUWU",
+    "Madis0",
+    "RaptaG",
+    "ronniedude",
+    "spudpiggy",
+    "TrueHorse"
   ],
   "contact": {
     "homepage": "https://modrinth.com/mod/midnightcontrols",
@@ -47,8 +52,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.11.3",
-    "fabric": ">=0.36.0",
+    "fabric": ">=0.71.0",
-    "minecraft": ">=1.17",
+    "minecraft": "~1.19.3",
     "spruceui": ">=3.2.0",
     "java": ">=17"
   },

src/main/resources/midnightcontrols.accesswidener

@@ -1,3 +1,3 @@
 accessWidener   v1  named
 
-accessible  class   net/minecraft/client/gui/widget/EntryListWidget$MoveDirection
+#accessible  class   net/minecraft/client/gui/widget/EntryListWidget$MoveDirection

src/main/resources/midnightcontrols.mixins.json

@@ -15,10 +15,13 @@
     "KeyBindingMixin",
     "MinecraftClientMixin",
     "MouseMixin",
+    "ChatScreenMixin",
     "RecipeBookWidgetAccessor",
     "WorldRendererMixin",
     "KeyBindingRegistryImplAccessor",
-    "ScreenAccessor"
+    "KeyBindingIDAccessor",
+    "ScreenAccessor",
+    "TabNavigationWidgetAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

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

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 9,
+    "pack_format": 13,
     "description": "Makes controller tooltips use similar icons to Bedrock Edition"
   }
 }

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

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