🔖 LambdaControls v1.3.2: Fix things, add vertical reacharound and internal API.

.gitignore

@@ -1,11 +1,13 @@
 #
 # LambdAurora's ignore file
 #
-# v0.12
+# v0.13
 
 # JetBrains
 .idea/
 *.iml
+*.ipr
+*.iws
 ## Intellij IDEA
 out/
 ## CLion

README.md

@@ -5,7 +5,7 @@
 ![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square)
 ![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==)
 ![Version](https://img.shields.io/github/v/tag/LambdAurora/LambdaControls?label=version&style=flat-square)
-[![CurseForge](https://cf.way2muchnoise.eu/title/354231.svg)](https://www.curseforge.com/minecraft/mc-mods/lambdacontrols)
+[![CurseForge](http://cf.way2muchnoise.eu/title/354231.svg)](https://www.curseforge.com/minecraft/mc-mods/lambdacontrols)
 
 A Fabric Minecraft mod which adds better controls like controller support.
 
@@ -21,12 +21,14 @@ This mod adds a controller support (and an experimental touchscreen support).
  - Touchscreen support (very experimental and buggy).
  - Keyboard controls to look around.
  - Toggleable on screen button indicator (like in Bedrock Edition).
+ - Vertical reacharound.
  - Many Bedrock Edition features:
    - Toggleable fly drifting
    - Front block placing (be careful with this one)
  - New controls settings!
  - Many options in config to change to your liking.
  - Many controllers supported and in a simply way your own controller mappings.
+ - An easy API for developers to add their own button bindings.
 
 ## 🎮 Supported Controllers:
 

build.gradle

@@ -27,6 +27,20 @@ allprojects {
 		classifier = "sources"
 		from sourceSets.main.allSource
 	}
+
+	publishing {
+		repositories {
+			mavenLocal()
+			maven {
+				name = "GithubPackages"
+				url = uri("https://maven.pkg.github.com/LambdAurora/LambdaControls")
+				credentials {
+					username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+					password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+				}
+			}
+		}
+	}
 }
 
 /*

core/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'java-library'
+    id 'maven-publish'
 }
 
 archivesBaseName = project.archives_base_name + "-core"
@@ -15,3 +16,17 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            // add all the jars that should be included when publishing to maven
+            artifact(jar) {
+                builtBy jar
+            }
+            artifact(sourcesJar) {
+                builtBy sourcesJar
+            }
+        }
+    }
+}

core/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsFeature.java

@@ -21,13 +21,15 @@ import java.util.Optional;
  * Represents a feature.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.1.0
  */
 public class LambdaControlsFeature implements Nameable
 {
-    private static final List<LambdaControlsFeature> FEATURES            = new ArrayList<>();
-    public static final  LambdaControlsFeature       FRONT_BLOCK_PLACING = new LambdaControlsFeature("front_block_placing", true, false);
+    private static final List<LambdaControlsFeature> FEATURES             = new ArrayList<>();
+    public static final  LambdaControlsFeature       FAST_BLOCK_PLACING   = new LambdaControlsFeature("fast_block_placing", true, true);
+    public static final  LambdaControlsFeature       FRONT_BLOCK_PLACING  = new LambdaControlsFeature("front_block_placing", true, false);
+    public static final  LambdaControlsFeature       VERTICAL_REACHAROUND = new LambdaControlsFeature("vertical_reacharound", true, false);
 
     private final String  key;
     private final boolean defaultAllowed;
@@ -154,6 +156,8 @@ public class LambdaControlsFeature implements Nameable
     }
 
     static {
+        FEATURES.add(FAST_BLOCK_PLACING);
         FEATURES.add(FRONT_BLOCK_PLACING);
+        FEATURES.add(VERTICAL_REACHAROUND);
     }
 }

fabric/build.gradle

@@ -1,9 +1,10 @@
 plugins {
-    id 'fabric-loom' version '0.2.6-SNAPSHOT'
+    id 'fabric-loom' version '0.4-SNAPSHOT'
     id 'java-library'
     id 'maven-publish'
 }
 
+version = "${project.mod_version}+${project.minecraft_version}"
 archivesBaseName = project.archives_base_name + "-fabric"
 
 minecraft {
@@ -42,12 +43,13 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modCompile "io.github.prospector:modmenu:1.8.5+build.23"
+    modCompile "io.github.prospector:modmenu:${project.modmenu_version}"
     modCompile "com.github.lambdaurora:spruceui:${project.spruceui_version}"
     include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
 
     // Compatibility mods
-    modCompile "io.github.joaoh1:okzoomer:2.1.0-beta.2"
+    modCompile "io.github.joaoh1:okzoomer:4.0.0-alpha.3.1.16.pre5"
+    modCompile "me.shedaniel:RoughlyEnoughItems:4.5.5"
 
     api project(":core")
     shadow project(":core")
@@ -90,4 +92,20 @@ jar {
     }
 }
 
+// configure the maven publication
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            // add all the jars that should be included when publishing to maven
+            artifact(remapJar) {
+                builtBy remapJar
+            }
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
+            }
+        }
+    }
+}
+
 build.dependsOn(":core:build")
+publish.dependsOn(":core:publish")

fabric/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java

@@ -15,8 +15,9 @@ import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.PacketByteBuf;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -28,7 +29,7 @@ import java.util.Optional;
  * Represents the LambdaControls mod.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.0.0
  */
 public class LambdaControls implements ModInitializer
@@ -38,6 +39,8 @@ public class LambdaControls implements ModInitializer
     public static final Identifier     FEATURE_CHANNEL       = new Identifier(LambdaControlsConstants.FEATURE_CHANNEL.toString());
     public static final Identifier     HELLO_CHANNEL         = new Identifier(LambdaControlsConstants.HELLO_CHANNEL.toString());
 
+    public static final TranslatableText NOT_BOUND_TEXT = new TranslatableText("lambdacontrols.not_bound");
+
     public final Logger logger = LogManager.getLogger("LambdaControls");
 
     @Override

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsClient.java

@@ -9,7 +9,6 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import me.lambdaurora.lambdacontrols.ControlsMode;
 import me.lambdaurora.lambdacontrols.LambdaControls;
 import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
@@ -17,25 +16,22 @@ import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
 import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.lambdacontrols.client.controller.Controller;
+import me.lambdaurora.lambdacontrols.client.controller.InputManager;
 import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsHud;
 import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay;
 import me.lambdaurora.spruceui.event.OpenScreenCallback;
 import me.lambdaurora.spruceui.hud.HudManager;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
-import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
-import net.fabricmc.fabric.api.event.client.ClientTickCallback;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
-import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
@@ -43,24 +39,26 @@ import org.lwjgl.glfw.GLFW;
  * Represents the LambdaControls client mod.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.1.0
  */
 public class LambdaControlsClient extends LambdaControls implements ClientModInitializer
 {
     private static      LambdaControlsClient INSTANCE;
-    public static final FabricKeyBinding     BINDING_LOOK_UP    = FabricKeyBinding.Builder.create(new Identifier(LambdaControlsConstants.NAMESPACE, "look_up"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.movement").build();
-    public static final FabricKeyBinding     BINDING_LOOK_RIGHT = FabricKeyBinding.Builder.create(new Identifier(LambdaControlsConstants.NAMESPACE, "look_right"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, "key.categories.movement").build();
-    public static final FabricKeyBinding     BINDING_LOOK_DOWN  = FabricKeyBinding.Builder.create(new Identifier(LambdaControlsConstants.NAMESPACE, "look_down"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.movement").build();
-    public static final FabricKeyBinding     BINDING_LOOK_LEFT  = FabricKeyBinding.Builder.create(new Identifier(LambdaControlsConstants.NAMESPACE, "look_left"),
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement").build();
+    public static final KeyBinding           BINDING_LOOK_UP    = InputManager.makeKeyBinding(new Identifier(LambdaControlsConstants.NAMESPACE, "look_up"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.movement");
+    public static final KeyBinding           BINDING_LOOK_RIGHT = InputManager.makeKeyBinding(new Identifier(LambdaControlsConstants.NAMESPACE, "look_right"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, "key.categories.movement");
+    public static final KeyBinding           BINDING_LOOK_DOWN  = InputManager.makeKeyBinding(new Identifier(LambdaControlsConstants.NAMESPACE, "look_down"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.movement");
+    public static final KeyBinding           BINDING_LOOK_LEFT  = InputManager.makeKeyBinding(new Identifier(LambdaControlsConstants.NAMESPACE, "look_left"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement");
     public static final Identifier           CONTROLLER_BUTTONS = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_buttons.png");
     public static final Identifier           CONTROLLER_AXIS    = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_axis.png");
+    public static final Identifier           CURSOR_TEXTURE     = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/cursor.png");
     public final        LambdaControlsConfig config             = new LambdaControlsConfig(this);
     public final        LambdaInput          input              = new LambdaInput(this);
+    public final        LambdaReacharound    reacharound        = new LambdaReacharound();
     private             LambdaControlsHud    hud;
     private             ControlsMode         previousControlsMode;
 
@@ -68,10 +66,10 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
     public void onInitializeClient()
     {
         INSTANCE = this;
-        KeyBindingRegistry.INSTANCE.register(BINDING_LOOK_UP);
-        KeyBindingRegistry.INSTANCE.register(BINDING_LOOK_RIGHT);
-        KeyBindingRegistry.INSTANCE.register(BINDING_LOOK_DOWN);
-        KeyBindingRegistry.INSTANCE.register(BINDING_LOOK_LEFT);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_UP);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_RIGHT);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_DOWN);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_LEFT);
 
         ClientSidePacketRegistry.INSTANCE.register(CONTROLS_MODE_CHANNEL, (context, attachedData) -> context.getTaskQueue()
                 .execute(() -> ClientSidePacketRegistry.INSTANCE.sendToServer(CONTROLS_MODE_CHANNEL, this.makeControlsModeBuffer(this.config.getControlsMode()))));
@@ -81,7 +79,8 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
             LambdaControlsFeature.fromName(name).ifPresent(feature -> context.getTaskQueue().execute(() -> feature.setAllowed(allowed)));
         });
 
-        ClientTickCallback.EVENT.register(this::onTick);
+        ClientTickEvents.START_CLIENT_TICK.register(this.reacharound::tick);
+        ClientTickEvents.END_CLIENT_TICK.register(this::onTick);
 
         OpenScreenCallback.EVENT.register((client, screen) -> {
             if (screen == null && this.config.getControlsMode() == ControlsMode.TOUCHSCREEN) {
@@ -136,7 +135,7 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
 
     public void onRender(MinecraftClient client)
     {
-        this.input.onRender(client);
+        this.input.onRender(client.getTickDelta(), client);
     }
 
     /**
@@ -186,141 +185,4 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
     {
         return INSTANCE;
     }
-
-    public static Pair<Integer, Integer> drawButton(int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client)
-    {
-        return drawButton(x, y, button.getButton(), client);
-    }
-
-    public static Pair<Integer, Integer> drawButton(int x, int y, int[] buttons, @NotNull MinecraftClient client)
-    {
-        int height = 0;
-        int length = 0;
-        int currentX = x;
-        for (int i = 0; i < buttons.length; i++) {
-            int btn = buttons[i];
-            Pair<Integer, Integer> size = drawButton(currentX, y, btn, client);
-            if (size.key > height)
-                height = size.key;
-            length += size.key;
-            if (i + 1 < buttons.length) {
-                length += 2;
-                currentX = x + length;
-            }
-        }
-        return Pair.of(length, height);
-    }
-
-    @SuppressWarnings("deprecated")
-    public static Pair<Integer, Integer> drawButton(int x, int y, int button, @NotNull MinecraftClient client)
-    {
-        boolean second = false;
-        if (button == -1)
-            return Pair.of(0, 0);
-        else if (button >= 500) {
-            button -= 1000;
-            second = true;
-        }
-
-        int controllerType = get().config.getControllerType().getId();
-        boolean axis = false;
-        int buttonOffset = button * 15;
-        switch (button) {
-            case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
-                buttonOffset = 7 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
-                buttonOffset = 8 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_BACK:
-                buttonOffset = 4 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_START:
-                buttonOffset = 6 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_GUIDE:
-                buttonOffset = 5 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
-                buttonOffset = 15 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
-                buttonOffset = 16 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
-                buttonOffset = 0;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
-                buttonOffset = 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
-                buttonOffset = 2 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
-                buttonOffset = 3 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
-                buttonOffset = 4 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
-                buttonOffset = 5 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
-                buttonOffset = 6 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
-                buttonOffset = 7 * 18;
-                axis = true;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 100:
-            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 200:
-                buttonOffset = 9 * 15;
-                break;
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 100:
-            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 200:
-                buttonOffset = 10 * 15;
-                break;
-        }
-
-        client.getTextureManager().bindTexture(axis ? LambdaControlsClient.CONTROLLER_AXIS : LambdaControlsClient.CONTROLLER_BUTTONS);
-        GlStateManager.disableDepthTest();
-
-        GlStateManager.color4f(1.0F, second ? 0.0F : 1.0F, 1.0F, 1.0F);
-        DrawableHelper.blit(x, y, (float) buttonOffset, (float) (controllerType * (axis ? 18 : 15)), axis ? 18 : 15, axis ? 18 : 15, 256, 256);
-        GlStateManager.enableDepthTest();
-
-        return axis ? Pair.of(18, 18) : Pair.of(15, 15);
-    }
-
-    public static int drawButtonTip(int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client)
-    {
-        return drawButtonTip(x, y, button.getButton(), button.getTranslationKey(), display, client);
-    }
-
-    public static int drawButtonTip(int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client)
-    {
-        if (display) {
-            int buttonWidth = drawButton(x, y, button, client).key;
-
-            String translatedAction = I18n.translate(action);
-            int textY = (15 - client.textRenderer.fontHeight) / 2;
-            client.textRenderer.drawWithShadow(translatedAction, (float) (x + buttonWidth + 5), (float) (y + textY), 14737632);
-
-            return getButtonTipWidth(translatedAction, client.textRenderer);
-        }
-
-        return -10;
-    }
-
-    private static int getButtonTipWidth(@NotNull String action, @NotNull TextRenderer textRenderer)
-    {
-        return 15 + 5 + textRenderer.getStringWidth(action);
-    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java

@@ -34,36 +34,47 @@ import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y;
 public class LambdaControlsConfig
 {
     // General
-    private static final ControlsMode   DEFAULT_CONTROLS_MODE         = ControlsMode.DEFAULT;
-    private static final boolean        DEFAULT_AUTO_SWITCH_MODE      = false;
+    private static final ControlsMode     DEFAULT_CONTROLS_MODE             = ControlsMode.DEFAULT;
+    private static final boolean          DEFAULT_AUTO_SWITCH_MODE          = false;
     // HUD
-    private static final boolean        DEFAULT_HUD_ENABLE            = true;
-    private static final HudSide        DEFAULT_HUD_SIDE              = HudSide.LEFT;
+    private static final boolean          DEFAULT_HUD_ENABLE                = true;
+    private static final HudSide          DEFAULT_HUD_SIDE                  = HudSide.LEFT;
     // Gameplay
-    private static final boolean        DEFAULT_FRONT_BLOCK_PLACING   = false;
-    private static final boolean        DEFAULT_FLY_DRIFTING          = false;
-    private static final boolean        DEFAULT_FLY_VERTICAL_DRIFTING = true;
+    private static final boolean          DEFAULT_FAST_BLOCK_INTERACTION    = true;
+    private static final boolean          DEFAULT_FLY_DRIFTING              = false;
+    private static final boolean          DEFAULT_FLY_VERTICAL_DRIFTING     = true;
+    private static final boolean          DEFAULT_FRONT_BLOCK_PLACING       = false;
+    private static final boolean          DEFAULT_VERTICAL_REACHAROUND      = false;
+    private static final boolean          DEFAULT_REACHAROUND_OUTLINE       = true;
+    private static final int[]            DEFAULT_REACHAROUND_OUTLINE_COLOR = new int[]{255, 255, 255, 102};
     // Controller
-    private static final ControllerType DEFAULT_CONTROLLER_TYPE       = ControllerType.DEFAULT;
-    private static final double         DEFAULT_DEAD_ZONE             = 0.25;
-    private static final double         DEFAULT_ROTATION_SPEED        = 40.0;
-    private static final double         DEFAULT_MOUSE_SPEED           = 25.0;
-    private static final boolean        DEFAULT_UNFOCUSED_INPUT       = false;
+    private static final ControllerType   DEFAULT_CONTROLLER_TYPE           = ControllerType.DEFAULT;
+    private static final double           DEFAULT_DEAD_ZONE                 = 0.25;
+    private static final double           DEFAULT_ROTATION_SPEED            = 40.0;
+    private static final double           DEFAULT_MOUSE_SPEED               = 25.0;
+    private static final boolean          DEFAULT_UNFOCUSED_INPUT           = false;
+    private static final boolean          DEFAULT_VIRTUAL_MOUSE             = false;
+    private static final VirtualMouseSkin DEFAULT_VIRTUAL_MOUSE_SKIN        = VirtualMouseSkin.DEFAULT_LIGHT;
 
     private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
 
     protected final FileConfig           config = FileConfig.builder("config/lambdacontrols.toml").concurrent().defaultResource("/config.toml").build();
     private final   LambdaControlsClient mod;
     private         ControlsMode         controlsMode;
-    private         ControllerType       controllerType;
-    // HUD settings.
-    private         boolean              hudEnable;
-    private         HudSide              hudSide;
+    private         ControllerType controllerType;
+    // Gameplay.
+    private         boolean shouldRenderReacharoundOutline;
+    private         int[]   reacharoundOutlineColor;
     // Controller settings
-    private         double               deadZone;
+    private         double  deadZone;
     private         double               rotationSpeed;
     private         double               mouseSpeed;
     private         boolean              unfocusedInput;
+    private         boolean              virtualMouse;
+    private         VirtualMouseSkin     virtualMouseSkin;
+    // HUD settings.
+    private         boolean              hudEnable;
+    private         HudSide              hudSide;
 
     public LambdaControlsConfig(@NotNull LambdaControlsClient mod)
     {
@@ -83,13 +94,19 @@ public class LambdaControlsConfig
         this.hudEnable = this.config.getOrElse("hud.enable", DEFAULT_HUD_ENABLE);
         this.hudSide = HudSide.byId(this.config.getOrElse("hud.side", DEFAULT_HUD_SIDE.getName())).orElse(DEFAULT_HUD_SIDE);
         // Gameplay
-        LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.front_block_placing", DEFAULT_FRONT_BLOCK_PLACING));
+        LambdaControlsFeature.FAST_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.fast_block_placing", DEFAULT_FAST_BLOCK_INTERACTION));
+        LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.reacharound.horizontal", DEFAULT_FRONT_BLOCK_PLACING));
+        LambdaControlsFeature.VERTICAL_REACHAROUND.setEnabled(this.config.getOrElse("gameplay.reacharound.vertical", DEFAULT_VERTICAL_REACHAROUND));
+        this.shouldRenderReacharoundOutline = this.config.getOrElse("gameplay.reacharound.outline", DEFAULT_REACHAROUND_OUTLINE);
+        this.reacharoundOutlineColor = this.config.getOptional("gameplay.reacharound.outline_color").map(hex -> parseColor((String) hex)).orElse(DEFAULT_REACHAROUND_OUTLINE_COLOR);
         // Controller settings.
         this.controllerType = ControllerType.byId(this.config.getOrElse("controller.type", DEFAULT_CONTROLLER_TYPE.getName())).orElse(DEFAULT_CONTROLLER_TYPE);
         this.deadZone = this.config.getOrElse("controller.dead_zone", DEFAULT_DEAD_ZONE);
         this.rotationSpeed = this.config.getOrElse("controller.rotation_speed", DEFAULT_ROTATION_SPEED);
         this.mouseSpeed = this.config.getOrElse("controller.mouse_speed", DEFAULT_MOUSE_SPEED);
         this.unfocusedInput = this.config.getOrElse("controller.unfocused_input", DEFAULT_UNFOCUSED_INPUT);
+        this.virtualMouse = this.config.getOrElse("controller.virtual_mouse", DEFAULT_VIRTUAL_MOUSE);
+        this.virtualMouseSkin = VirtualMouseSkin.byId(this.config.getOrElse("controller.virtual_mouse_skin", DEFAULT_VIRTUAL_MOUSE_SKIN.getName())).orElse(DEFAULT_VIRTUAL_MOUSE_SKIN);
         // Controller controls.
         InputManager.loadButtonBindings(this);
     }
@@ -103,6 +120,7 @@ public class LambdaControlsConfig
         this.config.set("controller.rotation_speed", this.rotationSpeed);
         this.config.set("controller.mouse_speed", this.mouseSpeed);
         this.config.set("controller.unfocused_input", this.unfocusedInput);
+        this.config.set("controller.virtual_mouse", this.virtualMouse);
         this.config.save();
         this.mod.log("Configuration saved.");
     }
@@ -117,6 +135,33 @@ public class LambdaControlsConfig
                 this.config.set(path, String.valueOf(raw));
             }
         });
+
+        if (this.config.contains("gameplay.front_block_placing.enabled")) {
+            this.setFrontBlockPlacing(this.config.getOrElse("gameplay.front_block_placing.enabled", DEFAULT_FRONT_BLOCK_PLACING));
+            this.config.remove("gameplay.front_block_placing.enabled");
+        }
+
+        if (this.config.contains("gameplay.front_block_placing.outline")) {
+            this.setRenderReacharoundOutline(this.config.getOrElse("gameplay.front_block_placing.outline", DEFAULT_REACHAROUND_OUTLINE));
+            this.config.remove("gameplay.front_block_placing.outline");
+        }
+
+        if (this.config.contains("gameplay.front_block_placing.outline_color")) {
+            this.config.getOptional("gameplay.front_block_placing.outline_color").ifPresent(color -> this.config.set("gameplay.reacharound.outline_color", color));
+            this.config.remove("gameplay.front_block_placing.outline_color");
+        }
+
+        this.renamed("controller.controls.tab_left", "controller.controls.tab_back");
+        this.renamed("controller.controls.tab_right", "controller.controls.tab_next");
+    }
+
+    private void renamed(String oldPath, String newPath)
+    {
+        if (!this.config.contains(oldPath))
+            return;
+        Object raw = this.config.getRaw(oldPath);
+        this.config.remove(oldPath);
+        this.config.set(newPath, raw);
     }
 
     /**
@@ -127,19 +172,24 @@ public class LambdaControlsConfig
         // General
         this.setControlsMode(DEFAULT_CONTROLS_MODE);
         this.setAutoSwitchMode(DEFAULT_AUTO_SWITCH_MODE);
-        // HUD
-        this.setHudEnabled(DEFAULT_HUD_ENABLE);
-        this.setHudSide(DEFAULT_HUD_SIDE);
         // Gameplay
-        this.setFrontBlockPlacing(DEFAULT_FRONT_BLOCK_PLACING);
+        this.setFastBlockPlacing(DEFAULT_FAST_BLOCK_INTERACTION);
         this.setFlyDrifting(DEFAULT_FLY_DRIFTING);
         this.setFlyVerticalDrifting(DEFAULT_FLY_VERTICAL_DRIFTING);
+        this.setFrontBlockPlacing(DEFAULT_FRONT_BLOCK_PLACING);
+        this.setVerticalReacharound(DEFAULT_VERTICAL_REACHAROUND);
+        this.setRenderReacharoundOutline(DEFAULT_REACHAROUND_OUTLINE);
         // Controller
         this.setControllerType(DEFAULT_CONTROLLER_TYPE);
         this.setDeadZone(DEFAULT_DEAD_ZONE);
         this.setRotationSpeed(DEFAULT_ROTATION_SPEED);
         this.setMouseSpeed(DEFAULT_MOUSE_SPEED);
         this.setUnfocusedInput(DEFAULT_UNFOCUSED_INPUT);
+        this.setVirtualMouse(DEFAULT_VIRTUAL_MOUSE);
+        this.setVirtualMouseSkin(DEFAULT_VIRTUAL_MOUSE_SKIN);
+        // HUD
+        this.setHudEnabled(DEFAULT_HUD_ENABLE);
+        this.setHudSide(DEFAULT_HUD_SIDE);
 
         // Collect prevents concurrent modification.
         InputManager.streamBindings().collect(Collectors.toList()).forEach(binding -> this.setButtonBinding(binding, binding.getDefaultButton()));
@@ -237,24 +287,24 @@ public class LambdaControlsConfig
      */
 
     /**
-     * Returns whether front block placing is enabled or not.
+     * Gets whether fast block placing is enabled or not.
      *
-     * @return True if front block placing is enabled, else false.
+     * @return True if fast block placing is enabled, else false.
      */
-    public boolean hasFrontBlockPlacing()
+    public boolean hasFastBlockPlacing()
     {
-        return LambdaControlsFeature.FRONT_BLOCK_PLACING.isEnabled();
+        return LambdaControlsFeature.FAST_BLOCK_PLACING.isEnabled();
     }
 
     /**
-     * Sets whether front block placing is enabled or not.
+     * Sets whether fast block placing is enabled or not.
      *
-     * @param enable True if front block placing is enabled, else false.
+     * @param enable True if fast block placing is enabled, else false.
      */
-    public void setFrontBlockPlacing(boolean enable)
+    public void setFastBlockPlacing(boolean enable)
     {
-        LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(enable);
-        this.config.set("gameplay.front_block_placing", enable);
+        LambdaControlsFeature.FAST_BLOCK_PLACING.setEnabled(enable);
+        this.config.set("gameplay.fast_block_placing", enable);
     }
 
     /**
@@ -297,6 +347,80 @@ public class LambdaControlsConfig
         this.config.set("gameplay.fly.vertical_drifting", flyDrifting);
     }
 
+    /**
+     * Returns whether front block placing is enabled or not.
+     *
+     * @return True if front block placing is enabled, else false.
+     */
+    public boolean hasFrontBlockPlacing()
+    {
+        return LambdaControlsFeature.FRONT_BLOCK_PLACING.isEnabled();
+    }
+
+    /**
+     * Sets whether front block placing is enabled or not.
+     *
+     * @param enable True if front block placing is enabled, else false.
+     */
+    public void setFrontBlockPlacing(boolean enable)
+    {
+        LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(enable);
+        this.config.set("gameplay.reacharound.horizontal", enable);
+    }
+
+    /**
+     * Returns whether vertical reacharound is enabled or not.
+     *
+     * @return True if vertical reacharound is enabled, else false.
+     */
+    public boolean hasVerticalReacharound()
+    {
+        return LambdaControlsFeature.VERTICAL_REACHAROUND.isEnabled();
+    }
+
+    /**
+     * Sets whether vertical reacharound is enabled or not.
+     *
+     * @param enable True if vertical reacharound is enabled, else false.
+     */
+    public void setVerticalReacharound(boolean enable)
+    {
+        LambdaControlsFeature.VERTICAL_REACHAROUND.setEnabled(enable);
+        this.config.set("gameplay.reacharound.vertical", enable);
+    }
+
+    /**
+     * Returns whether front block placing outline is enabled or not.
+     *
+     * @return True if front block placing outline is enabled, else false.
+     */
+    public boolean shouldRenderReacharoundOutline()
+    {
+        return this.shouldRenderReacharoundOutline;
+    }
+
+    /**
+     * Sets whether front block placing outline is enabled or not.
+     *
+     * @param render True if front block placing outline is enabled, else false.
+     */
+    public void setRenderReacharoundOutline(boolean render)
+    {
+        this.config.set("gameplay.reacharound.outline", this.shouldRenderReacharoundOutline = render);
+    }
+
+    /**
+     * Returns the front block placing outline color as an integer array.
+     * <p>
+     * The integer array has 4 elements: red, green, blue and alpha.
+     *
+     * @return The color as a RGBA integer array.
+     */
+    public int[] getReacharoundOutlineColor()
+    {
+        return this.reacharoundOutlineColor;
+    }
+
     /*
             Controller settings
      */
@@ -496,6 +620,47 @@ public class LambdaControlsConfig
         this.unfocusedInput = unfocusedInput;
     }
 
+    /**
+     * Returns whether the mouse is virtual or not.
+     *
+     * @return True if the mouse is virtual, else false.
+     */
+    public boolean hasVirtualMouse()
+    {
+        return this.virtualMouse;
+    }
+
+    /**
+     * Sets whether the mouse is virtual or not.
+     *
+     * @param virtualMouse True if the mouse is virtual, else false.
+     */
+    public void setVirtualMouse(boolean virtualMouse)
+    {
+        this.virtualMouse = virtualMouse;
+    }
+
+    /**
+     * Gets the virtual mouse skin.
+     *
+     * @return The virtual mouse skin.
+     */
+    public VirtualMouseSkin getVirtualMouseSkin()
+    {
+        return this.virtualMouseSkin;
+    }
+
+    /**
+     * Sets the virtual mouse skin.
+     *
+     * @param skin The virtual mouse skin.
+     */
+    public void setVirtualMouseSkin(VirtualMouseSkin skin)
+    {
+        this.virtualMouseSkin = skin;
+        this.config.set("controller.virtual_mouse_skin", skin.getName());
+    }
+
     /**
      * Gets the right X axis sign.
      *
@@ -612,4 +777,32 @@ public class LambdaControlsConfig
     {
         return axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X;
     }
+
+    /**
+     * Parses a color from a hexadecimal color string.
+     *
+     * @param hex The hexadecimal color.
+     * @return The color instance, null if invalid.
+     */
+    private static int[] parseColor(String hex)
+    {
+        hex = hex.replace("#", "");
+        switch (hex.length()) {
+            case 6:
+                return new int[]{
+                        Integer.valueOf(hex.substring(0, 2), 16),
+                        Integer.valueOf(hex.substring(2, 4), 16),
+                        Integer.valueOf(hex.substring(4, 6), 16),
+                        255
+                };
+            case 8:
+                return new int[]{
+                        Integer.valueOf(hex.substring(0, 2), 16),
+                        Integer.valueOf(hex.substring(2, 4), 16),
+                        Integer.valueOf(hex.substring(4, 6), 16),
+                        Integer.valueOf(hex.substring(6, 8), 16)
+                };
+        }
+        return null;
+    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java

@@ -9,32 +9,23 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
 import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
 import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-
-import java.util.function.Function;
 
 /**
  * Represents the API implementation of ModMenu for LambdaControls.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.1.0
  */
 public class LambdaControlsModMenu implements ModMenuApi
 {
     @Override
-    public String getModId()
+    public ConfigScreenFactory<?> getModConfigScreenFactory()
     {
-        return LambdaControlsConstants.NAMESPACE;
-    }
-
-    @Override
-    public Function<Screen, ? extends Screen> getConfigScreenFactory()
-    {
-        return screen -> new LambdaControlsSettingsScreen(screen, MinecraftClient.getInstance().options, false);
+        return parent -> new LambdaControlsSettingsScreen(parent, false);
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaInput.java

@@ -9,30 +9,36 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
+import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.lambdacontrols.client.controller.Controller;
 import me.lambdaurora.lambdacontrols.client.controller.InputManager;
 import me.lambdaurora.lambdacontrols.client.gui.ControllerControlsScreen;
 import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay;
+import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.mixin.EntryListWidgetAccessor;
-import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
+import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor;
+import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
 import me.lambdaurora.spruceui.SpruceLabelWidget;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.ParentElement;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.advancement.AdvancementTab;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
-import net.minecraft.client.gui.screen.ingame.ContainerScreen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
 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.AbstractPressableButtonWidget;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
+import net.minecraft.client.gui.widget.EntryListWidget;
 import net.minecraft.client.gui.widget.SliderWidget;
-import net.minecraft.container.Slot;
-import net.minecraft.container.SlotActionType;
+import net.minecraft.entity.player.PlayerEntity;
+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;
@@ -55,27 +61,24 @@ import static org.lwjgl.glfw.GLFW.*;
  * Represents the LambdaControls' input handler.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.0.0
  */
 public class LambdaInput
 {
-    private static final Map<Integer, Integer> BUTTON_COOLDOWNS  = new HashMap<>();
+    private static final Map<Integer, Integer> BUTTON_COOLDOWNS   = new HashMap<>();
     private final        LambdaControlsConfig  config;
     // Cooldowns
-    private              int                   actionGuiCooldown = 0;
-    private              int                   ignoreNextA       = 0;
-    // Sneak state.
-    private              double                prevTargetYaw     = 0.0;
-    private              double                prevTargetPitch   = 0.0;
-    private              double                targetYaw         = 0.0;
-    private              double                targetPitch       = 0.0;
-    private              float                 prevXAxis         = 0.F;
-    private              float                 prevYAxis         = 0.F;
-    private              int                   targetMouseX      = 0;
-    private              int                   targetMouseY      = 0;
-    private              float                 mouseSpeedX       = 0.F;
-    private              float                 mouseSpeedY       = 0.F;
+    private              int                   actionGuiCooldown  = 0;
+    private              boolean               ignoreNextARelease = false;
+    private              double                targetYaw          = 0.0;
+    private              double                targetPitch        = 0.0;
+    private              float                 prevXAxis          = 0.F;
+    private              float                 prevYAxis          = 0.F;
+    private              int                   targetMouseX       = 0;
+    private              int                   targetMouseY       = 0;
+    private              float                 mouseSpeedX        = 0.F;
+    private              float                 mouseSpeedY        = 0.F;
 
     public LambdaInput(@NotNull LambdaControlsClient mod)
     {
@@ -89,8 +92,8 @@ public class LambdaInput
      */
     public void onTick(@NotNull MinecraftClient client)
     {
-        this.prevTargetYaw = this.targetYaw;
-        this.prevTargetPitch = this.targetPitch;
+        this.targetYaw = 0.F;
+        this.targetPitch = 0.F;
 
         // Handles the key bindings.
         if (LambdaControlsClient.BINDING_LOOK_UP.isPressed()) {
@@ -142,9 +145,6 @@ public class LambdaInput
         if (allowInput)
             InputManager.updateBindings(client);
 
-        if (this.ignoreNextA > 0)
-            this.ignoreNextA--;
-
         if (client.currentScreen instanceof ControllerControlsScreen && InputManager.STATES.entrySet().parallelStream().map(Map.Entry::getValue).allMatch(ButtonState::isUnpressed)) {
             ControllerControlsScreen screen = (ControllerControlsScreen) client.currentScreen;
             if (screen.focusedBinding != null && !screen.waiting) {
@@ -175,20 +175,24 @@ public class LambdaInput
      *
      * @param client The client instance.
      */
-    public void onRender(@NotNull MinecraftClient client)
+    public void onRender(float tickDelta, @NotNull MinecraftClient client)
     {
-        if ((client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay) &&
-                (this.prevTargetYaw != this.targetYaw || this.prevTargetPitch != this.targetPitch)) {
-            float deltaYaw = (float) ((this.targetYaw - client.player.prevYaw) * client.getTickDelta());
-            float deltaPitch = (float) ((this.targetPitch - client.player.prevPitch) * client.getTickDelta());
-            float rotationYaw = client.player.prevYaw + deltaYaw;
-            float rotationPitch = client.player.prevPitch + deltaPitch;
+        if (!(client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay))
+            return;
+
+        PlayerEntity player = client.player;
+        if (player == null)
+            return;
+
+        if (this.targetYaw != 0F || this.targetPitch != 0F) {
+            float rotationYaw = (float) (player.prevYaw + (this.targetYaw / 0.10) * tickDelta);
+            float rotationPitch = (float) (player.prevPitch + (this.targetPitch / 0.10) * tickDelta);
             client.player.yaw = rotationYaw;
             client.player.pitch = MathHelper.clamp(rotationPitch, -90.F, 90.F);
             if (client.player.isRiding()) {
                 client.player.getVehicle().copyPositionAndRotation(client.player);
             }
-            client.getTutorialManager().onUpdateMouse(deltaPitch, deltaYaw);
+            client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
         }
     }
 
@@ -204,6 +208,9 @@ public class LambdaInput
         if (client.currentScreen == null) {
             this.mouseSpeedX = this.mouseSpeedY = 0.0F;
             INPUT_MANAGER.resetMousePosition(windowWidth, windowHeight);
+        } else if (isScreenInteractive(client.currentScreen) && this.config.hasVirtualMouse()) {
+            ((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), 0, 0);
+            INPUT_MANAGER.resetMouseTarget(client);
         }
     }
 
@@ -300,49 +307,96 @@ public class LambdaInput
                 }
             }
 
-            if (client.currentScreen instanceof ContainerScreen && client.interactionManager != null && client.player != null) {
-                double x = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
-                double y = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
-                Slot slot = ((ContainerScreenAccessor) client.currentScreen).lambdacontrols_getSlotAt(x, y);
-                SlotActionType slotAction = SlotActionType.PICKUP;
-                if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && slot != null) {
-                    if (client.currentScreen instanceof CreativeInventoryScreen) {
-                        if (((CreativeInventoryScreenAccessor) client.currentScreen).lambdacontrols_isCreativeInventorySlot(slot))
-                            slotAction = SlotActionType.CLONE;
-                    }
-                    client.interactionManager.clickSlot(((ContainerScreen) client.currentScreen).getContainer().syncId, slot.id, GLFW.GLFW_MOUSE_BUTTON_1, slotAction, client.player);
-                    this.actionGuiCooldown = 5;
-                    return;
-                } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
-                    client.player.closeContainer();
-                    return;
-                } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_X && slot != null) {
-                    client.interactionManager.clickSlot(((ContainerScreen) client.currentScreen).getContainer().syncId, slot.id, GLFW.GLFW_MOUSE_BUTTON_2, SlotActionType.PICKUP, client.player);
-                    return;
-                } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_Y && slot != null) {
-                    client.interactionManager.clickSlot(((ContainerScreen) client.currentScreen).getContainer().syncId, slot.id, GLFW.GLFW_MOUSE_BUTTON_1, SlotActionType.QUICK_MOVE, client.player);
-                    return;
-                }
-            } else if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
+            if (this.handleInventory(client, button)) {
+                this.ignoreNextARelease = true;
+                return;
+            }
+
+            if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
                 if (client.currentScreen != null) {
-                    client.currentScreen.onClose();
+                    if (!LambdaControlsCompat.handleMenuBack(client, client.currentScreen))
+                        client.currentScreen.onClose();
                     return;
                 }
             }
         }
 
-        if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null && !isScreenInteractive(client.currentScreen) && this.actionGuiCooldown == 0 && this.ignoreNextA == 0) {
-            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) {
-                client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
-            } else if (action == 1) {
-                client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+        if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null && !isScreenInteractive(client.currentScreen) && this.actionGuiCooldown == 0) {
+            if (!this.ignoreNextARelease) {
+                double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
+                double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
+                if (action == 0) {
+                    client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                } else if (action == 1) {
+                    client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                }
+                this.actionGuiCooldown = 5;
+            } else {
+                this.ignoreNextARelease = false;
             }
-            this.actionGuiCooldown = 5;
         }
     }
 
+    /**
+     * Handles inventory interaction.
+     *
+     * @param client The client instance.
+     * @param button The button pressed.
+     * @return True if an inventory interaction was done.
+     */
+    private boolean handleInventory(@NotNull MinecraftClient client, int button)
+    {
+        if (!(client.currentScreen instanceof HandledScreen))
+            return false;
+
+        if (client.interactionManager == null || client.player == null)
+            return false;
+
+        if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
+            client.player.closeHandledScreen();
+            return true;
+        }
+
+        double x = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
+        double y = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
+
+        HandledScreen screen = (HandledScreen) client.currentScreen;
+        HandledScreenAccessor accessor = (HandledScreenAccessor) screen;
+        Slot slot = ((HandledScreenAccessor) client.currentScreen).lambdacontrols_getSlotAt(x, y);
+
+        int slotId;
+        if (slot == null) {
+            if (client.player.inventory.getCursorStack().isEmpty())
+                return false;
+            slotId = accessor.lambdacontrols_isClickOutsideBounds(x, y, accessor.getX(), accessor.getY(), GLFW_MOUSE_BUTTON_1) ? -999 : -1;
+        } else {
+            slotId = slot.id;
+        }
+
+        SlotActionType actionType = SlotActionType.PICKUP;
+        int clickData = GLFW.GLFW_MOUSE_BUTTON_1;
+        switch (button) {
+            case GLFW_GAMEPAD_BUTTON_A:
+                if (screen instanceof CreativeInventoryScreen)
+                    if (((CreativeInventoryScreenAccessor) screen).lambdacontrols_isCreativeInventorySlot(slot))
+                        actionType = SlotActionType.CLONE;
+                if (slot != null && LambdaControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot)))
+                    actionType = SlotActionType.CLONE;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_X:
+                clickData = GLFW_MOUSE_BUTTON_2;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_Y:
+                actionType = SlotActionType.QUICK_MOVE;
+                break;
+            default:
+                return false;
+        }
+
+        accessor.lambdacontrols_onMouseClick(slot, slotId, clickData, actionType);
+        return true;
+    }
+
     private void handleAxe(@NotNull MinecraftClient client, int axis, float value, float absValue, int state)
     {
         int asButtonState = value > 0.5F ? 1 : (value < -0.5F ? 2 : 0);
@@ -381,6 +435,8 @@ public class LambdaInput
             }
         }
 
+        double deadZone = this.config.getDeadZone();
+
         if (client.currentScreen instanceof ControllerControlsScreen) {
             ControllerControlsScreen screen = (ControllerControlsScreen) client.currentScreen;
             if (screen.focusedBinding != null) {
@@ -397,11 +453,30 @@ public class LambdaInput
                 }
                 return;
             }
+        } else if (client.currentScreen instanceof CreativeInventoryScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                CreativeInventoryScreen screen = (CreativeInventoryScreen) client.currentScreen;
+                CreativeInventoryScreenAccessor accessor = (CreativeInventoryScreenAccessor) screen;
+                if (accessor.lambdacontrols_hasScrollbar() && absValue >= deadZone) {
+                    screen.mouseScrolled(0.0, 0.0, -value);
+                }
+                return;
+            }
+        } else if (client.currentScreen instanceof AdvancementsScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X || axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                AdvancementsScreen screen = (AdvancementsScreen) client.currentScreen;
+                AdvancementsScreenAccessor accessor = (AdvancementsScreenAccessor) screen;
+                if (absValue >= deadZone) {
+                    AdvancementTab tab = accessor.getSelectedTab();
+                    tab.move(axis == GLFW_GAMEPAD_AXIS_RIGHT_X ? -value * 5.0 : 0.0, axis == GLFW_GAMEPAD_AXIS_RIGHT_Y ? -value * 5.0 : 0.0);
+                }
+                return;
+            }
         }
 
-        double deadZone = this.config.getDeadZone();
         if (client.currentScreen == null) {
             // Handles the look direction.
+            absValue -= this.config.getDeadZone();
             this.handleLook(client, axis, (float) (absValue / (1.0 - this.config.getDeadZone())), state);
         } else {
             boolean allowMouseControl = true;
@@ -520,7 +595,7 @@ public class LambdaInput
             this.actionGuiCooldown = 2; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
             return false;
         } else if (element instanceof AlwaysSelectedEntryListWidget) {
-            ((EntryListWidgetAccessor) element).lambdacontrols_moveSelection(right ? 1 : -1);
+            ((EntryListWidgetAccessor) element).lambdacontrols_moveSelection(right ? EntryListWidget.class_5403.field_25661 : EntryListWidget.class_5403.field_25662);
             return false;
         } else if (element instanceof ParentElement) {
             ParentElement entryList = (ParentElement) element;
@@ -535,7 +610,7 @@ public class LambdaInput
     /**
      * Handles the look direction input.
      *
-     * @param client The client isntance.
+     * @param client The client instance.
      * @param axis   The axis to change.
      * @param value  The value of the look.
      * @param state  The state.
@@ -544,21 +619,19 @@ public class LambdaInput
     {
         // Handles the look direction.
         if (client.player != null) {
-            double powValue = Math.pow(value, 4.0);
+            double powValue = Math.pow(value, 2.0);
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 if (state == 2) {
-                    this.targetPitch = client.player.pitch - this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
-                    this.targetPitch = MathHelper.clamp(this.targetPitch, -90.0D, 90.0D);
+                    this.targetPitch = -this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
                 } else if (state == 1) {
-                    this.targetPitch = client.player.pitch + this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
-                    this.targetPitch = MathHelper.clamp(this.targetPitch, -90.0D, 90.0D);
+                    this.targetPitch = this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
                 }
             }
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
                 if (state == 2) {
-                    this.targetYaw = client.player.yaw - this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
+                    this.targetYaw = -this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
                 } else if (state == 1) {
-                    this.targetYaw = client.player.yaw + this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
+                    this.targetYaw = this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
                 }
             }
         }
@@ -578,28 +651,28 @@ public class LambdaInput
         }
     }
 
-    private static boolean isScreenInteractive(@NotNull Screen screen)
+    public static boolean isScreenInteractive(@NotNull Screen screen)
     {
-        return !(screen instanceof AdvancementsScreen || screen instanceof ContainerScreen);
+        return !(screen instanceof AdvancementsScreen || screen instanceof HandledScreen || LambdaControlsCompat.requireMouseOnScreen(screen));
     }
 
     // Inspired from https://github.com/MrCrayfish/Controllable/blob/1.14.X/src/main/java/com/mrcrayfish/controllable/client/ControllerInput.java#L686.
     private void moveMouseToClosestSlot(@NotNull MinecraftClient client, @Nullable Screen screen)
     {
         // Makes the mouse attracted to slots. This helps with selecting items when using a controller.
-        if (screen instanceof ContainerScreen) {
-            ContainerScreen inventoryScreen = (ContainerScreen) screen;
-            ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventoryScreen;
-            int guiLeft = accessor.lambdacontrols_getX();
-            int guiTop = accessor.lambdacontrols_getY();
+        if (screen instanceof HandledScreen) {
+            HandledScreen inventoryScreen = (HandledScreen) screen;
+            HandledScreenAccessor accessor = (HandledScreenAccessor) inventoryScreen;
+            int guiLeft = accessor.getX();
+            int guiTop = accessor.getY();
             int mouseX = (int) (targetMouseX * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth());
             int mouseY = (int) (targetMouseY * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight());
 
             // Finds the closest slot in the GUI within 14 pixels.
-            Optional<Pair<Slot, Double>> closestSlot = inventoryScreen.getContainer().slots.parallelStream()
+            Optional<Pair<Slot, Double>> closestSlot = inventoryScreen.getScreenHandler().slots.parallelStream()
                     .map(slot -> {
-                        int x = guiLeft + slot.xPosition + 8;
-                        int y = guiTop + slot.yPosition + 8;
+                        int x = guiLeft + slot.x + 8;
+                        int y = guiTop + slot.y + 8;
 
                         // Distance between the slot and the cursor.
                         double distance = Math.sqrt(Math.pow(x - mouseX, 2) + Math.pow(y - mouseY, 2));
@@ -610,8 +683,8 @@ public class LambdaInput
             if (closestSlot.isPresent()) {
                 Slot slot = closestSlot.get().key;
                 if (slot.hasStack() || !client.player.inventory.getMainHandStack().isEmpty()) {
-                    int slotCenterXScaled = guiLeft + slot.xPosition + 8;
-                    int slotCenterYScaled = guiTop + slot.yPosition + 8;
+                    int slotCenterXScaled = guiLeft + slot.x + 8;
+                    int slotCenterYScaled = guiTop + slot.y + 8;
                     int slotCenterX = (int) (slotCenterXScaled / ((double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth()));
                     int slotCenterY = (int) (slotCenterYScaled / ((double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()));
                     double deltaX = slotCenterX - targetMouseX;

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/LambdaReacharound.java

@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client;
+
+import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FluidBlock;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RayTraceContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents the reacharound API of LambdaControls.
+ *
+ * @version 1.3.2
+ * @since 1.3.2
+ */
+public class LambdaReacharound
+{
+    private BlockHitResult lastReacharoundResult   = null;
+    private boolean        lastReacharoundVertical = false;
+
+    public void tick(@NotNull MinecraftClient client)
+    {
+        this.lastReacharoundResult = this.tryVerticalReachAround(client);
+        if (this.lastReacharoundResult == null) {
+            this.lastReacharoundResult = this.tryFrontPlace(client);
+            this.lastReacharoundVertical = false;
+        } else this.lastReacharoundVertical = true;
+    }
+
+    /**
+     * Returns the last reach around result.
+     *
+     * @return The last reach around result.
+     */
+    public @Nullable BlockHitResult getLastReacharoundResult()
+    {
+        return this.lastReacharoundResult;
+    }
+
+    /**
+     * Returns whether the last reach around is vertical.
+     *
+     * @return True if the reach around is vertical.
+     */
+    public boolean isLastReacharoundVertical()
+    {
+        return this.lastReacharoundVertical;
+    }
+
+    /**
+     * Returns whether reacharound is available or not.
+     *
+     * @return True if reacharound is available, else false.
+     */
+    public boolean isReacharoundAvailable()
+    {
+        return LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable() || LambdaControlsFeature.VERTICAL_REACHAROUND.isAvailable();
+    }
+
+    private float getPlayerRange(@NotNull MinecraftClient client)
+    {
+        return client.interactionManager != null ? client.interactionManager.getReachDistance() : 0.f;
+    }
+
+    /**
+     * Returns a nullable block hit result if vertical reacharound is possible.
+     *
+     * @param client The client instance.
+     * @return A block hit result if vertical reacharound is possible, else null.
+     */
+    public @Nullable BlockHitResult tryVerticalReachAround(@NotNull MinecraftClient client)
+    {
+        if (!LambdaControlsFeature.VERTICAL_REACHAROUND.isAvailable())
+            return null;
+        if (client.player == null || client.world == null || client.crosshairTarget == null || client.crosshairTarget.getType() != HitResult.Type.MISS
+                || !client.player.isOnGround() || client.player.pitch < 80.0F
+                || client.player.isRiding())
+            return null;
+
+        Vec3d pos = client.player.getCameraPosVec(1.0F);
+        Vec3d rotationVec = client.player.getRotationVec(1.0F);
+        float range = getPlayerRange(client);
+        Vec3d rayVec = pos.add(rotationVec.x * range, rotationVec.y * range, rotationVec.z * range).add(0, 0.75, 0);
+        BlockHitResult result = client.world.rayTrace(new RayTraceContext(pos, rayVec, RayTraceContext.ShapeType.OUTLINE, RayTraceContext.FluidHandling.NONE, client.player));
+
+        if (result.getType() == HitResult.Type.BLOCK) {
+            BlockPos blockPos = result.getBlockPos().down();
+            BlockState state = client.world.getBlockState(blockPos);
+
+            if (client.player.getBlockPos().getY() - blockPos.getY() > 1 && (client.world.isAir(blockPos) || state.getMaterial().isReplaceable())) {
+                return new BlockHitResult(result.getPos(), Direction.DOWN, blockPos, false);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a nullable block hit result if front placing is possible.
+     *
+     * @param client The client instance.
+     * @return A block hit result if front placing is possible.
+     */
+    public @Nullable BlockHitResult tryFrontPlace(@NotNull MinecraftClient client)
+    {
+        if (!LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable())
+            return null;
+        if (client.player != null && client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.MISS && client.player.isOnGround() && client.player.pitch > 35.0F) {
+            if (client.player.isRiding())
+                return null;
+            BlockPos playerPos = client.player.getBlockPos().down();
+            BlockPos targetPos = new BlockPos(client.crosshairTarget.getPos()).subtract(playerPos);
+            BlockPos vector = new BlockPos(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
+            BlockPos blockPos = playerPos.add(vector);
+
+            Direction direction = client.player.getHorizontalFacing();
+
+            BlockState state = client.world.getBlockState(blockPos);
+            if (!state.isAir())
+                return null;
+            BlockState adjacentBlockState = client.world.getBlockState(blockPos.offset(direction.getOpposite()));
+            if (adjacentBlockState.isAir() || adjacentBlockState.getBlock() instanceof FluidBlock || (vector.getX() == 0 && vector.getZ() == 0)) {
+                return null;
+            }
+
+            return new BlockHitResult(client.crosshairTarget.getPos(), direction, blockPos, false);
+        }
+        return null;
+    }
+
+    public static @NotNull BlockHitResult withSideForReacharound(@NotNull BlockHitResult result, @Nullable ItemStack stack)
+    {
+        if (stack == null || stack.isEmpty() || !(stack.getItem() instanceof BlockItem))
+            return result;
+        return withSideForReacharound(result, Block.getBlockFromItem(stack.getItem()));
+    }
+
+    public static @NotNull BlockHitResult withSideForReacharound(@NotNull BlockHitResult result, @NotNull Block block)
+    {
+        if (block instanceof SlabBlock)
+            result = result.withSide(Direction.DOWN);
+        return result;
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client;
+
+import net.minecraft.client.resource.language.I18n;
+import org.aperlambda.lambdacommon.utils.Nameable;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Represents the virtual mouse skins.
+ *
+ * @version 1.2.0
+ * @since 1.2.0
+ */
+public enum VirtualMouseSkin implements Nameable
+{
+    DEFAULT_LIGHT("default_light"),
+    DEFAULT_DARK("default_dark"),
+    SECOND_LIGHT("second_light"),
+    SECOND_DARK("second_dark");
+
+    private String name;
+
+    VirtualMouseSkin(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the next virtual mouse skin available.
+     *
+     * @return The next available virtual mouse skin.
+     */
+    public VirtualMouseSkin next()
+    {
+        VirtualMouseSkin[] v = values();
+        if (v.length == this.ordinal() + 1)
+            return v[0];
+        return v[this.ordinal() + 1];
+    }
+
+    /**
+     * Gets the translated name of this controller type.
+     *
+     * @return The translated name of this controller type.
+     */
+    public String getTranslatedName()
+    {
+        return I18n.translate("lambdacontrols.virtual_mouse.skin." + this.getName());
+    }
+
+    @Override
+    public @NotNull String getName()
+    {
+        return this.name;
+    }
+
+    /**
+     * Gets the controller type from its identifier.
+     *
+     * @param id The identifier of the controller type.
+     * @return The controller type if found, else empty.
+     */
+    public static Optional<VirtualMouseSkin> byId(@NotNull String id)
+    {
+        return Arrays.stream(values()).filter(mode -> mode.getName().equalsIgnoreCase(id)).findFirst();
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/CompatHandler.java

@@ -10,13 +10,20 @@
 package me.lambdaurora.lambdacontrols.client.compat;
 
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.util.hit.BlockHitResult;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents a compatibility handler for a mod.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.1.0
  */
 public interface CompatHandler
@@ -27,4 +34,63 @@ public interface CompatHandler
      * @param mod This mod instance.
      */
     void handle(@NotNull LambdaControlsClient mod);
+
+    /**
+     * Returns whether the mouse is required on the specified screen.
+     *
+     * @param screen The screen.
+     * @return True if the mouse is required on the specified screen, else false.
+     */
+    default boolean requireMouseOnScreen(Screen screen)
+    {
+        return false;
+    }
+
+    /**
+     * Returns whether the current slot is a creative slot or not.
+     *
+     * @param screen The screen.
+     * @param slot   The slot to check.
+     * @return True if the slot is a creative slot, else false.
+     */
+    default boolean isCreativeSlot(@NotNull HandledScreen screen, @NotNull Slot slot)
+    {
+        return false;
+    }
+
+    /**
+     * Returns a custom translation key to make custom attack action strings on the HUD.
+     *
+     * @param client      The client instance.
+     * @param placeResult The last place block result.
+     * @return Null if untouched, else a translation key.
+     */
+    default String getAttackActionAt(@NotNull MinecraftClient client, @Nullable BlockHitResult placeResult)
+    {
+        return null;
+    }
+
+    /**
+     * Returns a custom translation key to make custom use action strings on the HUD.
+     *
+     * @param client      The client instance.
+     * @param placeResult The last place block result.
+     * @return Null if untouched, else a translation key.
+     */
+    default String getUseActionAt(@NotNull MinecraftClient client, @Nullable BlockHitResult placeResult)
+    {
+        return null;
+    }
+
+    /**
+     * Handles the menu back button.
+     *
+     * @param client The client instance.
+     * @param screen The screen.
+     * @return True if the handle was fired and succeed, else false.
+     */
+    default boolean handleMenuBack(@NotNull MinecraftClient client, @NotNull Screen screen)
+    {
+        return false;
+    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/HQMCompat.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.compat;
+
+import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import net.minecraft.client.gui.screen.Screen;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * Represents HQM compatibility handler.
+ *
+ * This is bad.
+ *
+ * @author LambdAurora
+ * @version 1.3.2
+ * @since 1.3.2
+ */
+public class HQMCompat implements CompatHandler
+{
+    public static final String GUI_BASE_CLASS_PATH = "hardcorequesting.client.interfaces.GuiBase";
+    private Optional<Class<?>> guiBaseClass;
+
+    @Override
+    public void handle(@NotNull LambdaControlsClient mod)
+    {
+        this.guiBaseClass = LambdaReflection.getClass(GUI_BASE_CLASS_PATH);
+    }
+
+    @Override
+    public boolean requireMouseOnScreen(Screen screen)
+    {
+        return this.guiBaseClass.map(clazz -> clazz.isInstance(screen)).orElse(false);
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java

@@ -12,18 +12,29 @@ package me.lambdaurora.lambdacontrols.client.compat;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.InputManager;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.util.hit.BlockHitResult;
 import org.aperlambda.lambdacommon.utils.LambdaReflection;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * Represents a compatibility handler.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.1.0
  */
 public class LambdaControlsCompat
 {
+    private static final List<CompatHandler> HANDLERS = new ArrayList<>();
+
     /**
      * Initializes compatibility with other mods if needed.
      *
@@ -33,8 +44,109 @@ public class LambdaControlsCompat
     {
         if (FabricLoader.getInstance().isModLoaded("okzoomer") && LambdaReflection.doesClassExist(OkZoomerCompat.OKZOOMER_CLASS_PATH)) {
             mod.log("Adding okzoomer compatibility...");
-            new OkZoomerCompat().handle(mod);
+            HANDLERS.add(new OkZoomerCompat());
         }
+        if (isReiPresent()) {
+            mod.log("Adding REI compatiblity...");
+            HANDLERS.add(new ReiCompat());
+        }
+        if (FabricLoader.getInstance().isModLoaded("hardcorequesting") && LambdaReflection.doesClassExist(HQMCompat.GUI_BASE_CLASS_PATH)) {
+            mod.log("Adding HQM compatibility...");
+            HANDLERS.add(new HQMCompat());
+        }
+        HANDLERS.forEach(handler -> handler.handle(mod));
         InputManager.loadButtonBindings(mod.config);
     }
+
+    /**
+     * Registers a new compatibility handler.
+     *
+     * @param handler The compatibility handler to register.
+     */
+    public static void registerCompatHandler(@NotNull CompatHandler handler)
+    {
+        HANDLERS.add(handler);
+    }
+
+    /**
+     * Streams through compatibility handlers.
+     *
+     * @return A stream of compatibility handlers.
+     */
+    public static Stream<CompatHandler> streamCompatHandlers()
+    {
+        return HANDLERS.stream();
+    }
+
+    /**
+     * Returns whether the mouse is required on the specified screen.
+     *
+     * @param screen The screen.
+     * @return True if the mouse is requried on the specified screen, else false.
+     */
+    public static boolean requireMouseOnScreen(Screen screen)
+    {
+        return HANDLERS.stream().anyMatch(handler -> handler.requireMouseOnScreen(screen));
+    }
+
+    /**
+     * Returns a custom translation key to make custom attack action strings on the HUD.
+     *
+     * @param client      The client instance.
+     * @param placeResult The last place block result.
+     * @return Null if untouched, else a translation key.
+     */
+    public static String getAttackActionAt(@NotNull MinecraftClient client, @Nullable BlockHitResult placeResult)
+    {
+        for (CompatHandler handler : HANDLERS) {
+            String action = handler.getAttackActionAt(client, placeResult);
+            if (action != null) {
+                return action;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns a custom translation key to make custom use action strings on the HUD.
+     *
+     * @param client      The client instance.
+     * @param placeResult The last place block result.
+     * @return Null if untouched, else a translation key.
+     */
+    public static String getUseActionAt(@NotNull MinecraftClient client, @Nullable BlockHitResult placeResult)
+    {
+        for (CompatHandler handler : HANDLERS) {
+            String action = handler.getUseActionAt(client, placeResult);
+            if (action != null) {
+                return action;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Handles the menu back button.
+     *
+     * @param client The client instance.
+     * @param screen The screen.
+     * @return True if the handle was fired and succeed, else false.
+     */
+    public static boolean handleMenuBack(@NotNull MinecraftClient client, @NotNull Screen screen) {
+        for (CompatHandler handler : HANDLERS) {
+            if (handler.handleMenuBack(client, screen))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether Roughly Enough Items is present.
+     *
+     * @return True if Roughly Enough Items is present, else false.
+     */
+    public static boolean isReiPresent()
+    {
+        return FabricLoader.getInstance().isModLoaded("roughlyenoughitems");
+    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.compat;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * This plugin is only present for the conditional mixins.
+ *
+ * @author LambdAurora
+ * @version 1.2.0
+ * @since 1.2.0
+ */
+public class LambdaControlsMixinPlugin implements IMixinConfigPlugin
+{
+    private final HashMap<String, Boolean> conditionalMixins = new HashMap<>();
+
+    public LambdaControlsMixinPlugin()
+    {
+        this.conditionalMixins.put("me.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor", LambdaControlsCompat.isReiPresent());
+        this.conditionalMixins.put("me.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor", LambdaControlsCompat.isReiPresent());
+    }
+
+    @Override
+    public void onLoad(String mixinPackage)
+    {
+    }
+
+    @Override
+    public String getRefMapperConfig()
+    {
+        return null;
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName)
+    {
+        return this.conditionalMixins.getOrDefault(mixinClassName, Boolean.TRUE);
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets)
+    {
+    }
+
+    @Override
+    public List<String> getMixins()
+    {
+        return null;
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo)
+    {
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo)
+    {
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java

@@ -9,7 +9,7 @@
 
 package me.lambdaurora.lambdacontrols.client.compat;
 
-import io.github.joaoh1.okzoomer.OkZoomer;
+import io.github.joaoh1.okzoomer.client.OkZoomerClientMod;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import org.jetbrains.annotations.NotNull;
@@ -19,12 +19,12 @@ import org.lwjgl.glfw.GLFW;
  * Represents a compatibility handler for OkZoomer.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.1.0
  */
 public class OkZoomerCompat implements CompatHandler
 {
-    public static final String OKZOOMER_CLASS_PATH = "io.github.joaoh1.okzoomer.OkZoomer";
+    public static final String OKZOOMER_CLASS_PATH = "io.github.joaoh1.okzoomer.client.OkZoomerClientMod";
 
     @Override
     public void handle(@NotNull LambdaControlsClient mod)
@@ -34,7 +34,7 @@ public class OkZoomerCompat implements CompatHandler
                 .onlyInGame()
                 .cooldown(true)
                 .category(ButtonBinding.MISC_CATEGORY)
-                .linkKeybind(OkZoomer.zoomKeyBinding)
+                .linkKeybind(OkZoomerClientMod.zoomKeyBinding)
                 .register();
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/ReiCompat.java

@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.compat;
+
+import me.lambdaurora.lambdacontrols.client.ButtonState;
+import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor;
+import me.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor;
+import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
+import me.lambdaurora.lambdacontrols.client.controller.InputHandlers;
+import me.lambdaurora.lambdacontrols.client.controller.InputManager;
+import me.lambdaurora.lambdacontrols.client.controller.PressAction;
+import me.shedaniel.rei.api.REIHelper;
+import me.shedaniel.rei.api.RecipeCategory;
+import me.shedaniel.rei.gui.ContainerScreenOverlay;
+import me.shedaniel.rei.gui.RecipeViewingScreen;
+import me.shedaniel.rei.gui.VillagerRecipeViewingScreen;
+import me.shedaniel.rei.gui.widget.EntryListWidget;
+import me.shedaniel.rei.impl.ScreenHelper;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.util.Identifier;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.lwjgl.glfw.GLFW.*;
+
+/**
+ * Represents a compatibility handler for REI.
+ *
+ * @author LambdAurora
+ * @version 1.3.2
+ * @since 1.2.0
+ */
+public class ReiCompat implements CompatHandler
+{
+    private static EntryListWidget ENTRY_LIST_WIDGET;
+
+    @Override
+    public void handle(@NotNull LambdaControlsClient mod)
+    {
+        InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "category_back"))
+                .buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
+                .filter((client, binding) -> isViewingScreen(client.currentScreen))
+                .action(handleTab(false))
+                .cooldown(true)
+                .build());
+        InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "category_next"))
+                .buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
+                .filter((client, binding) -> isViewingScreen(client.currentScreen))
+                .action(handleTab(true))
+                .cooldown(true)
+                .build());
+
+        InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "page_back"))
+                .buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, false))
+                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
+                .action(handlePage(false))
+                .cooldown(true)
+                .build());
+        InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "page_next"))
+                .buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, true))
+                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
+                .action(handlePage(true))
+                .cooldown(true)
+                .build());
+
+        // For some reasons this is broken.
+        InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "show_usage"))
+                .buttons(GLFW_GAMEPAD_BUTTON_RIGHT_THUMB)
+                .filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
+                .action((client, button, action) -> {
+                    if (action != ButtonState.RELEASE)
+                        return false;
+                    Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
+                    if (!overlay.isPresent())
+                        return false;
+                    double mouseX = client.mouse.getX();
+                    double mouseY = client.mouse.getY();
+                    EntryListWidget widget = getEntryListWidget();
+                    if (widget == null)
+                        return false;
+                    return widget.mouseClicked(mouseX, mouseY, GLFW_MOUSE_BUTTON_2);
+                })
+                .cooldown(true)
+                .build());
+    }
+
+    @Override
+    public boolean requireMouseOnScreen(Screen screen)
+    {
+        return isViewingScreen(screen);
+    }
+
+    private static boolean isViewingScreen(Screen screen)
+    {
+        return screen instanceof RecipeViewingScreen || screen instanceof VillagerRecipeViewingScreen;
+    }
+
+    @Override
+    public boolean handleMenuBack(@NotNull MinecraftClient client, @NotNull Screen screen)
+    {
+        if (!isViewingScreen(screen))
+            return false;
+
+        MinecraftClient.getInstance().openScreen(REIHelper.getInstance().getPreviousContainerScreen());
+        ScreenHelper.getLastOverlay().init();
+        return true;
+    }
+
+    private static EntryListWidget getEntryListWidget()
+    {
+        if (ENTRY_LIST_WIDGET == null) {
+            ENTRY_LIST_WIDGET = LambdaReflection.getFirstFieldOfType(ContainerScreenOverlay.class, EntryListWidget.class)
+                    .map(field -> (EntryListWidget) LambdaReflection.getFieldValue(null, field))
+                    .orElse(null);
+        }
+        return ENTRY_LIST_WIDGET;
+    }
+
+    private static PressAction handlePage(boolean next)
+    {
+        return (client, button, action) -> {
+            if (action == ButtonState.RELEASE)
+                return false;
+
+            Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
+            if (!overlay.isPresent())
+                return false;
+
+            EntryListWidget widget = getEntryListWidget();
+            if (widget == null)
+                return false;
+
+            if (next)
+                widget.nextPage();
+            else
+                widget.previousPage();
+            widget.updateEntriesPosition();
+
+            return true;
+        };
+    }
+
+    /**
+     * Returns the handler for category tabs buttons.
+     *
+     * @param next True if the action is to switch to the next tab.
+     * @return The handler.
+     */
+    private static PressAction handleTab(boolean next)
+    {
+        return (client, button, action) -> {
+            if (action != ButtonState.RELEASE)
+                return false;
+
+            if (client.currentScreen instanceof RecipeViewingScreen) {
+                RecipeViewingScreenAccessor screen = (RecipeViewingScreenAccessor) client.currentScreen;
+                if (next)
+                    screen.getCategoryNext().onClick();
+                else
+                    screen.getCategoryBack().onClick();
+                return true;
+            } else if (client.currentScreen instanceof VillagerRecipeViewingScreen) {
+                VillagerRecipeViewingScreenAccessor screen = (VillagerRecipeViewingScreenAccessor) client.currentScreen;
+                List<RecipeCategory<?>> categories = screen.getCategories();
+                int currentTab = screen.getSelectedCategoryIndex();
+                int nextTab = currentTab + (next ? 1 : -1);
+                if (nextTab < 0)
+                    nextTab = categories.size() - 1;
+                else if (nextTab >= categories.size())
+                    nextTab = 0;
+                screen.setSelectedCategoryIndex(nextTab);
+                screen.lambdacontrols_init();
+                return true;
+            }
+            return false;
+        };
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.compat.mixin;
+
+import me.shedaniel.rei.api.widgets.Button;
+import me.shedaniel.rei.gui.RecipeViewingScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+/**
+ * Represents an accessor to REI's RecipeViewingScreen.
+ *
+ * @author LambdAurora
+ * @version 1.3.0
+ * @since 1.2.0
+ */
+@Mixin(RecipeViewingScreen.class)
+public interface RecipeViewingScreenAccessor
+{
+    @Accessor("categoryBack")
+    Button getCategoryBack();
+
+    @Accessor("categoryNext")
+    Button getCategoryNext();
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.compat.mixin;
+
+import me.shedaniel.rei.api.RecipeCategory;
+import me.shedaniel.rei.gui.VillagerRecipeViewingScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import java.util.List;
+
+/**
+ * Represents an accessor to REI's VillagerRecipeViewingScreen.
+ *
+ * @author LambdAurora
+ * @version 1.2.0
+ * @since 1.2.0
+ */
+@Mixin(VillagerRecipeViewingScreen.class)
+public interface VillagerRecipeViewingScreenAccessor
+{
+    @Accessor("categories")
+    List<RecipeCategory<?>> getCategories();
+
+    @Accessor("selectedCategoryIndex")
+    int getSelectedCategoryIndex();
+
+    @Accessor("selectedCategoryIndex")
+    void setSelectedCategoryIndex(int selectedCategoryIndex);
+
+    @Invoker("init")
+    void lambdacontrols_init();
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java

@@ -14,6 +14,8 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import org.aperlambda.lambdacommon.Identifier;
 import org.aperlambda.lambdacommon.utils.Nameable;
 import org.aperlambda.lambdacommon.utils.function.PairPredicate;
@@ -31,7 +33,7 @@ import static org.lwjgl.glfw.GLFW.*;
  * Represents a button binding.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.0.0
  */
 public class ButtonBinding implements Nameable
@@ -73,9 +75,9 @@ public class ButtonBinding implements Nameable
             .actions(PressAction.DEFAULT_ACTION, InputHandlers::handleToggleSneak).onlyInGame().cooldown(true).register();
     public static final ButtonBinding SPRINT             = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB).register();
     public static final ButtonBinding SWAP_HANDS         = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).cooldown(true).register();
-    public static final ButtonBinding TAB_LEFT           = new Builder("tab_left").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
+    public static final ButtonBinding TAB_LEFT           = new Builder("tab_back").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
             .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
-    public static final ButtonBinding TAB_RIGHT          = new Builder("tab_right").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
+    public static final ButtonBinding TAB_RIGHT          = new Builder("tab_next").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
             .action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
     public static final ButtonBinding TOGGLE_PERSPECTIVE = new Builder("toggle_perspective").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_Y).cooldown(true).register();
     public static final ButtonBinding USE                = new Builder("use").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)).register();
@@ -320,64 +322,63 @@ public class ButtonBinding implements Nameable
      * @param button The button.
      * @return The localized name of the button.
      */
-    public static @NotNull
-    String getLocalizedButtonName(int button)
+    public static @NotNull Text getLocalizedButtonName(int button)
     {
         switch (button % 500) {
             case -1:
-                return I18n.translate("key.keyboard.unknown");
+                return new TranslatableText("key.keyboard.unknown");
             case GLFW_GAMEPAD_BUTTON_A:
-                return I18n.translate("lambdacontrols.button.a");
+                return new TranslatableText("lambdacontrols.button.a");
             case GLFW_GAMEPAD_BUTTON_B:
-                return I18n.translate("lambdacontrols.button.b");
+                return new TranslatableText("lambdacontrols.button.b");
             case GLFW_GAMEPAD_BUTTON_X:
-                return I18n.translate("lambdacontrols.button.x");
+                return new TranslatableText("lambdacontrols.button.x");
             case GLFW_GAMEPAD_BUTTON_Y:
-                return I18n.translate("lambdacontrols.button.y");
+                return new TranslatableText("lambdacontrols.button.y");
             case GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
-                return I18n.translate("lambdacontrols.button.left_bumper");
+                return new TranslatableText("lambdacontrols.button.left_bumper");
             case GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
-                return I18n.translate("lambdacontrols.button.right_bumper");
+                return new TranslatableText("lambdacontrols.button.right_bumper");
             case GLFW_GAMEPAD_BUTTON_BACK:
-                return I18n.translate("lambdacontrols.button.back");
+                return new TranslatableText("lambdacontrols.button.back");
             case GLFW_GAMEPAD_BUTTON_START:
-                return I18n.translate("lambdacontrols.button.start");
+                return new TranslatableText("lambdacontrols.button.start");
             case GLFW_GAMEPAD_BUTTON_GUIDE:
-                return I18n.translate("lambdacontrols.button.guide");
+                return new TranslatableText("lambdacontrols.button.guide");
             case GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
-                return I18n.translate("lambdacontrols.button.left_thumb");
+                return new TranslatableText("lambdacontrols.button.left_thumb");
             case GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
-                return I18n.translate("lambdacontrols.button.right_thumb");
+                return new TranslatableText("lambdacontrols.button.right_thumb");
             case GLFW_GAMEPAD_BUTTON_DPAD_UP:
-                return I18n.translate("lambdacontrols.button.dpad_up");
+                return new TranslatableText("lambdacontrols.button.dpad_up");
             case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT:
-                return I18n.translate("lambdacontrols.button.dpad_right");
+                return new TranslatableText("lambdacontrols.button.dpad_right");
             case GLFW_GAMEPAD_BUTTON_DPAD_DOWN:
-                return I18n.translate("lambdacontrols.button.dpad_down");
+                return new TranslatableText("lambdacontrols.button.dpad_down");
             case GLFW_GAMEPAD_BUTTON_DPAD_LEFT:
-                return I18n.translate("lambdacontrols.button.dpad_left");
+                return new TranslatableText("lambdacontrols.button.dpad_left");
             case 100:
-                return I18n.translate("lambdacontrols.axis.left_x+");
+                return new TranslatableText("lambdacontrols.axis.left_x+");
             case 101:
-                return I18n.translate("lambdacontrols.axis.left_y+");
+                return new TranslatableText("lambdacontrols.axis.left_y+");
             case 102:
-                return I18n.translate("lambdacontrols.axis.right_x+");
+                return new TranslatableText("lambdacontrols.axis.right_x+");
             case 103:
-                return I18n.translate("lambdacontrols.axis.right_y+");
+                return new TranslatableText("lambdacontrols.axis.right_y+");
             case 104:
-                return I18n.translate("lambdacontrols.axis.left_trigger");
+                return new TranslatableText("lambdacontrols.axis.left_trigger");
             case 105:
-                return I18n.translate("lambdacontrols.axis.right_trigger");
+                return new TranslatableText("lambdacontrols.axis.right_trigger");
             case 200:
-                return I18n.translate("lambdacontrols.axis.left_x-");
+                return new TranslatableText("lambdacontrols.axis.left_x-");
             case 201:
-                return I18n.translate("lambdacontrols.axis.left_y-");
+                return new TranslatableText("lambdacontrols.axis.left_y-");
             case 202:
-                return I18n.translate("lambdacontrols.axis.right_x-");
+                return new TranslatableText("lambdacontrols.axis.right_x-");
             case 203:
-                return I18n.translate("lambdacontrols.axis.right_y-");
+                return new TranslatableText("lambdacontrols.axis.right_y-");
             default:
-                return I18n.translate("lambdacontrols.button.unknown", button);
+                return new TranslatableText("lambdacontrols.button.unknown", button);
         }
     }
 

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputHandlers.java

@@ -12,16 +12,19 @@ package me.lambdaurora.lambdacontrols.client.controller;
 import me.lambdaurora.lambdacontrols.client.ButtonState;
 import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
-import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
+import me.lambdaurora.lambdacontrols.client.mixin.RecipeBookWidgetAccessor;
+import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.advancement.AdvancementTab;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
-import net.minecraft.client.gui.screen.ingame.ContainerScreen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget;
 import net.minecraft.client.util.ScreenshotUtils;
-import net.minecraft.container.Slot;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.screen.slot.Slot;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
 
@@ -35,7 +38,7 @@ import java.util.stream.Collectors;
  * Represents some input handlers.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.1.0
  */
 public class InputHandlers
@@ -44,7 +47,7 @@ public class InputHandlers
     {
     }
 
-    public static PressAction handleHotbar(boolean right)
+    public static PressAction handleHotbar(boolean next)
     {
         return (client, button, action) -> {
             if (action == ButtonState.RELEASE)
@@ -52,33 +55,46 @@ public class InputHandlers
 
             // When ingame
             if (client.currentScreen == null && client.player != null) {
-                if (right)
+                if (next)
                     client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 8 ? 0 : client.player.inventory.selectedSlot + 1;
                 else
                     client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 0 ? 8 : client.player.inventory.selectedSlot - 1;
                 return true;
             } else if (client.currentScreen instanceof CreativeInventoryScreen) {
                 CreativeInventoryScreenAccessor inventory = (CreativeInventoryScreenAccessor) client.currentScreen;
-                int currentSelectedTab = inventory.lambdacontrols_getSelectedTab();
-                int nextTab = currentSelectedTab + (right ? 1 : -1);
+                int currentTab = inventory.getSelectedTab();
+                int nextTab = currentTab + (next ? 1 : -1);
                 if (nextTab < 0)
                     nextTab = ItemGroup.GROUPS.length - 1;
                 else if (nextTab >= ItemGroup.GROUPS.length)
                     nextTab = 0;
                 inventory.lambdacontrols_setSelectedTab(ItemGroup.GROUPS[nextTab]);
                 return true;
+            } else if (client.currentScreen instanceof InventoryScreen) {
+                RecipeBookWidgetAccessor recipeBook = (RecipeBookWidgetAccessor) ((InventoryScreen) client.currentScreen).getRecipeBookWidget();
+                List<RecipeGroupButtonWidget> tabs = recipeBook.getTabButtons();
+                RecipeGroupButtonWidget currentTab = recipeBook.getCurrentTab();
+                int nextTab = tabs.indexOf(currentTab) + (next ? 1 : -1);
+                if (nextTab < 0)
+                    nextTab = tabs.size() - 1;
+                else if (nextTab >= tabs.size())
+                    nextTab = 0;
+                currentTab.setToggled(false);
+                recipeBook.setCurrentTab(currentTab = tabs.get(nextTab));
+                currentTab.setToggled(true);
+                recipeBook.lambdacontrols_refreshResults(true);
             } else if (client.currentScreen instanceof AdvancementsScreen) {
                 AdvancementsScreenAccessor screen = (AdvancementsScreenAccessor) client.currentScreen;
-                List<AdvancementTab> tabs = screen.lambdacontrols_getTabs().values().stream().distinct().collect(Collectors.toList());
-                AdvancementTab tab = screen.lambdacontrols_getSelectedTab();
+                List<AdvancementTab> tabs = screen.getTabs().values().stream().distinct().collect(Collectors.toList());
+                AdvancementTab tab = screen.getSelectedTab();
                 for (int i = 0; i < tabs.size(); i++) {
                     if (tabs.get(i).equals(tab)) {
-                        int nextTab = i + (right ? 1 : -1);
+                        int nextTab = i + (next ? 1 : -1);
                         if (nextTab < 0)
                             nextTab = tabs.size() - 1;
                         else if (nextTab >= tabs.size())
                             nextTab = 0;
-                        screen.lambdacontrols_getAdvancementManager().selectTab(tabs.get(nextTab).getRoot(), true);
+                        screen.getAdvancementManager().selectTab(tabs.get(nextTab).getRoot(), true);
                         break;
                     }
                 }
@@ -93,8 +109,8 @@ public class InputHandlers
             // If in game, then pause the game.
             if (client.currentScreen == null)
                 client.openPauseMenu(false);
-            else if (client.currentScreen instanceof ContainerScreen && client.player != null) // If the current screen is a container then close it.
-                client.player.closeContainer();
+            else if (client.currentScreen instanceof HandledScreen && client.player != null) // If the current screen is a container then close it.
+                client.player.closeHandledScreen();
             else // Else just close the current screen.
                 client.currentScreen.onClose();
         }
@@ -129,13 +145,13 @@ public class InputHandlers
     public static PressAction handleInventorySlotPad(int direction)
     {
         return (client, binding, action) -> {
-            if (!(client.currentScreen instanceof ContainerScreen && action != ButtonState.RELEASE))
+            if (!(client.currentScreen instanceof HandledScreen && action != ButtonState.RELEASE))
                 return false;
 
-            ContainerScreen inventory = (ContainerScreen) client.currentScreen;
-            ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventory;
-            int guiLeft = accessor.lambdacontrols_getX();
-            int guiTop = accessor.lambdacontrols_getY();
+            HandledScreen inventory = (HandledScreen) client.currentScreen;
+            HandledScreenAccessor accessor = (HandledScreenAccessor) inventory;
+            int guiLeft = accessor.getX();
+            int guiTop = accessor.getY();
             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();
 
@@ -143,17 +159,17 @@ public class InputHandlers
             Slot mouseSlot = accessor.lambdacontrols_getSlotAt(mouseX, mouseY);
 
             // Finds the closest slot in the GUI within 14 pixels.
-            Optional<Slot> closestSlot = inventory.getContainer().slots.parallelStream()
+            Optional<Slot> closestSlot = inventory.getScreenHandler().slots.parallelStream()
                     .filter(Predicate.isEqual(mouseSlot).negate())
                     .map(slot -> {
-                        int posX = guiLeft + slot.xPosition + 8;
-                        int posY = guiTop + slot.yPosition + 8;
+                        int posX = guiLeft + slot.x + 8;
+                        int posY = guiTop + slot.y + 8;
 
                         int otherPosX = (int) mouseX;
                         int otherPosY = (int) mouseY;
                         if (mouseSlot != null) {
-                            otherPosX = guiLeft + mouseSlot.xPosition + 8;
-                            otherPosY = guiTop + mouseSlot.yPosition + 8;
+                            otherPosX = guiLeft + mouseSlot.x + 8;
+                            otherPosY = guiTop + mouseSlot.y + 8;
                         }
 
                         // Distance between the slot and the cursor.
@@ -161,13 +177,13 @@ public class InputHandlers
                         return Pair.of(slot, distance);
                     }).filter(entry -> {
                         Slot slot = entry.key;
-                        int posX = guiLeft + slot.xPosition + 8;
-                        int posY = guiTop + slot.yPosition + 8;
+                        int posX = guiLeft + slot.x + 8;
+                        int posY = guiTop + slot.y + 8;
                         int otherPosX = (int) mouseX;
                         int otherPosY = (int) mouseY;
                         if (mouseSlot != null) {
-                            otherPosX = guiLeft + mouseSlot.xPosition + 8;
-                            otherPosY = guiTop + mouseSlot.yPosition + 8;
+                            otherPosX = guiLeft + mouseSlot.x + 8;
+                            otherPosY = guiTop + mouseSlot.y + 8;
                         }
                         if (direction == 0)
                             return posY < otherPosY;
@@ -185,8 +201,8 @@ public class InputHandlers
 
             if (closestSlot.isPresent()) {
                 Slot slot = closestSlot.get();
-                int x = guiLeft + slot.xPosition + 8;
-                int y = guiTop + slot.yPosition + 8;
+                int x = guiLeft + slot.x + 8;
+                int y = guiTop + slot.y + 8;
                 InputManager.queueMousePosition(x * (double) client.getWindow().getWidth() / (double) client.getWindow().getScaledWidth(),
                         y * (double) client.getWindow().getHeight() / (double) client.getWindow().getScaledHeight());
                 return true;
@@ -228,7 +244,7 @@ public class InputHandlers
      */
     public static boolean inInventory(@NotNull MinecraftClient client, @NotNull ButtonBinding binding)
     {
-        return client.currentScreen instanceof ContainerScreen;
+        return client.currentScreen instanceof HandledScreen;
     }
 
     /**

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java

@@ -15,6 +15,8 @@ import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsConfig;
 import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.util.math.MathHelper;
 import org.aperlambda.lambdacommon.Identifier;
 import org.aperlambda.lambdacommon.utils.function.PairPredicate;
@@ -30,7 +32,7 @@ import java.util.stream.Stream;
  * Represents an input manager for controllers.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.0
  * @since 1.1.0
  */
 public class InputManager
@@ -72,7 +74,8 @@ public class InputManager
         if (this.prevTargetMouseX != this.targetMouseX || this.prevTargetMouseY != this.targetMouseY) {
             double mouseX = this.prevTargetMouseX + (this.targetMouseX - this.prevTargetMouseX) * client.getTickDelta() + 0.5;
             double mouseY = this.prevTargetMouseY + (this.targetMouseY - this.prevTargetMouseY) * client.getTickDelta() + 0.5;
-            GLFW.glfwSetCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
+            if (!LambdaControlsClient.get().config.hasVirtualMouse())
+                GLFW.glfwSetCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
             ((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
         }
     }
@@ -357,4 +360,34 @@ public class InputManager
     {
         return CATEGORIES.stream();
     }
+
+    /**
+     * Returns a new key binding instance.
+     * @param id The identifier of the key binding.
+     * @param type The type.
+     * @param code The code.
+     * @param category The category of the key binding.
+     * @return The key binding.
+     *
+     * @see #makeKeyBinding(Identifier, InputUtil.Type, int, String)
+     */
+    public static @NotNull KeyBinding makeKeyBinding(@NotNull net.minecraft.util.Identifier id, InputUtil.Type type, int code, @NotNull String category)
+    {
+        return makeKeyBinding(new Identifier(id.getNamespace(), id.getPath()), type, code, category);
+    }
+
+    /**
+     * Returns a new key binding instance.
+     * @param id The identifier of the key binding.
+     * @param type The type.
+     * @param code The code.
+     * @param category The category of the key binding.
+     * @return The key binding.
+     *
+     * @see #makeKeyBinding(net.minecraft.util.Identifier, InputUtil.Type, int, String)
+     */
+    public static @NotNull KeyBinding makeKeyBinding(@NotNull Identifier id, InputUtil.Type type, int code, @NotNull String category)
+    {
+        return new KeyBinding(String.format("key.%s.%s", id.getNamespace(), id.getName()), type, code, category);
+    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ControllerButtonWidget.java

@@ -9,11 +9,13 @@
 
 package me.lambdaurora.lambdacontrols.client.gui;
 
-import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.LambdaControls;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.spruceui.AbstractIconButtonWidget;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,25 +36,25 @@ public class ControllerButtonWidget extends AbstractIconButtonWidget
     public void update()
     {
         int length = binding.getButton().length;
-        this.setMessage(this.binding.isNotBound() ? I18n.translate("lambdacontrols.not_bound") :
-                (length > 0 ? ButtonBinding.getLocalizedButtonName(binding.getButton()[0]) : "<>"));
+        this.setMessage(this.binding.isNotBound() ? LambdaControls.NOT_BOUND_TEXT :
+                (length > 0 ? ButtonBinding.getLocalizedButtonName(binding.getButton()[0]) : new LiteralText("<>")));
     }
 
     @Override
-    public String getMessage()
+    public Text getMessage()
     {
         if (this.binding.getButton().length > 1)
-            return "";
+            return LiteralText.EMPTY;
         return super.getMessage();
     }
 
     @Override
-    protected int renderIcon(int mouseX, int mouseY, float delta, int x, int y)
+    protected int renderIcon(MatrixStack matrices, int mouseX, int mouseY, float delta, int x, int y)
     {
         if (this.binding.getButton().length > 1) {
             x += (this.width / 2 - this.iconWidth / 2) - 4;
         }
-        Pair<Integer, Integer> size = LambdaControlsClient.drawButton(x, y, this.binding, MinecraftClient.getInstance());
+        Pair<Integer, Integer> size = LambdaControlsRenderer.drawButton(matrices, x, y, this.binding, MinecraftClient.getInstance());
         this.iconWidth = size.key;
         return size.value;
     }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ControllerControlsScreen.java

@@ -16,7 +16,7 @@ import me.lambdaurora.spruceui.SpruceButtonWidget;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.TranslatableText;
 import org.aperlambda.lambdacommon.utils.function.Predicates;
 import org.jetbrains.annotations.NotNull;
@@ -56,26 +56,30 @@ public class ControllerControlsScreen extends Screen
     @Override
     protected void init()
     {
-        this.addButton(new SpruceButtonWidget(this.width / 2 - 155, 18, this.hideSettings ? 310 : 150, 20, I18n.translate("lambdacontrols.menu.keyboard_controls"),
-                btn -> this.minecraft.openScreen(new ControlsOptionsScreen(this, this.minecraft.options))));
+        this.addButton(new SpruceButtonWidget(this.width / 2 - 155, 18, this.hideSettings ? 310 : 150, 20,
+                new TranslatableText("lambdacontrols.menu.keyboard_controls"),
+                btn -> this.client.openScreen(new ControlsOptionsScreen(this, this.client.options))));
         if (!this.hideSettings)
-            this.addButton(new SpruceButtonWidget(this.width / 2 - 155 + 160, 18, 150, 20, I18n.translate("menu.options"),
-                    btn -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, this.minecraft.options, true))));
-        this.bindingsListWidget = new ControlsListWidget(this, this.minecraft);
+            this.addButton(new SpruceButtonWidget(this.width / 2 - 155 + 160, 18, 150, 20,
+                    new TranslatableText("menu.options"),
+                    btn -> this.client.openScreen(new LambdaControlsSettingsScreen(this, true))));
+        this.bindingsListWidget = new ControlsListWidget(this, this.client);
         this.children.add(this.bindingsListWidget);
-        this.resetButton = this.addButton(new ButtonWidget(this.width / 2 - 155, this.height - 29, 150, 20, I18n.translate("controls.resetAll"),
+        this.resetButton = this.addButton(new ButtonWidget(this.width / 2 - 155, this.height - 29, 150, 20,
+                new TranslatableText("controls.resetAll"),
                 btn -> InputManager.streamBindings().forEach(binding -> this.mod.config.setButtonBinding(binding, binding.getDefaultButton()))));
-        this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, 20, I18n.translate("gui.done"),
-                btn -> this.minecraft.openScreen(this.parent)));
+        this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, 20,
+                new TranslatableText("gui.done"),
+                btn -> this.client.openScreen(this.parent)));
     }
 
     @Override
-    public void render(int mouseX, int mouseY, float delta)
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta)
     {
-        this.renderBackground();
-        this.bindingsListWidget.render(mouseX, mouseY, delta);
-        this.drawCenteredString(this.font, this.title.asFormattedString(), this.width / 2, 8, 16777215);
+        this.renderBackground(matrices);
+        this.bindingsListWidget.render(matrices, mouseX, mouseY, delta);
+        this.drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 8, 16777215);
         this.resetButton.active = InputManager.streamBindings().anyMatch(Predicates.not(ButtonBinding::isDefault));
-        super.render(mouseX, mouseY, delta);
+        super.render(matrices, mouseX, mouseY, delta);
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ControlsListWidget.java

@@ -20,6 +20,10 @@ import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 
@@ -48,7 +52,7 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
                     this.addEntry(new CategoryEntry(category));
 
                     category.getBindings().forEach(binding -> {
-                        int i = client.textRenderer.getStringWidth(I18n.translate(binding.getTranslationKey()));
+                        int i = client.textRenderer.getWidth(I18n.translate(binding.getTranslationKey()));
                         if (i > this.field_2733) {
                             this.field_2733 = i;
                         }
@@ -59,9 +63,9 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
     }
 
     @Override
-    protected int getScrollbarPosition()
+    protected int getScrollbarPositionX()
     {
-        return super.getScrollbarPosition() + 15;
+        return super.getScrollbarPositionX() + 15;
     }
 
     @Override
@@ -88,28 +92,28 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
                 gui.waiting = true;
             })
             {
-                protected String getNarrationMessage()
+                protected MutableText getNarrationMessage()
                 {
-                    return binding.isNotBound() ? I18n.translate("narrator.controls.unbound", bindingName) : I18n.translate("narrator.controls.bound", bindingName, super.getNarrationMessage());
+                    return binding.isNotBound() ? new TranslatableText("narrator.controls.unbound", bindingName) : new TranslatableText("narrator.controls.bound", bindingName, super.getNarrationMessage());
                 }
             };
-            this.resetButton = new ButtonWidget(0, 0, 50, 20, I18n.translate("controls.reset"),
+            this.resetButton = new ButtonWidget(0, 0, 50, 20, new TranslatableText("controls.reset"),
                     btn -> gui.mod.config.setButtonBinding(binding, binding.getDefaultButton()))
             {
-                protected String getNarrationMessage()
+                protected MutableText getNarrationMessage()
                 {
-                    return I18n.translate("narrator.controls.reset", bindingName);
+                    return new TranslatableText("narrator.controls.reset", bindingName);
                 }
             };
-            this.unboundButton = new ButtonWidget(0, 0, 50, 20, I18n.translate("lambdacontrols.menu.unbound"),
+            this.unboundButton = new ButtonWidget(0, 0, 50, 20, new TranslatableText("lambdacontrols.menu.unbound"),
                     btn -> {
                         gui.mod.config.setButtonBinding(binding, UNBOUND);
                         gui.focusedBinding = null;
                     })
             {
-                protected String getNarrationMessage()
+                protected MutableText getNarrationMessage()
                 {
-                    return I18n.translate("lambdacontrols.narrator.unbound", bindingName);
+                    return new TranslatableText("lambdacontrols.narrator.unbound", bindingName);
                 }
             };
         }
@@ -121,34 +125,38 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
         }
 
         @Override
-        public void render(int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovering, float delta)
+        public void render(MatrixStack matrices, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovering, float delta)
         {
             boolean focused = gui.focusedBinding == this.binding;
-            TextRenderer textRenderer = ControlsListWidget.this.minecraft.textRenderer;
+            TextRenderer textRenderer = ControlsListWidget.this.client.textRenderer;
             String bindingName = this.bindingName;
             float var10002 = (float) (x + 70 - ControlsListWidget.this.field_2733);
             int var10003 = y + height / 2;
-            textRenderer.draw(bindingName, var10002, (float) (var10003 - 9 / 2), 16777215);
+            textRenderer.draw(matrices, bindingName, var10002, (float) (var10003 - 9 / 2), 16777215);
             this.resetButton.x = this.unboundButton.x = x + 190;
             this.resetButton.y = this.unboundButton.y = y;
             this.resetButton.active = !this.binding.isDefault();
             if (focused)
-                this.unboundButton.render(mouseX, mouseY, delta);
+                this.unboundButton.render(matrices, mouseX, mouseY, delta);
             else
-                this.resetButton.render(mouseX, mouseY, delta);
+                this.resetButton.render(matrices, mouseX, mouseY, delta);
             this.editButton.x = x + 75;
             this.editButton.y = y;
             this.editButton.update();
 
             if (focused) {
-                this.editButton.setMessage(Formatting.WHITE + "> " + Formatting.YELLOW + this.editButton.getMessage() + Formatting.WHITE + " <");
+                MutableText text = new LiteralText("> ").formatted(Formatting.WHITE);
+                text.append(this.editButton.getMessage().copy().formatted(Formatting.YELLOW));
+                this.editButton.setMessage(text.append(new LiteralText(" <").formatted(Formatting.WHITE)));
             } else if (!this.binding.isNotBound() && InputManager.hasDuplicatedBindings(this.binding)) {
-                this.editButton.setMessage(Formatting.RED + this.editButton.getMessage());
+                MutableText text = this.editButton.getMessage().copy();
+                this.editButton.setMessage(text.formatted(Formatting.RED));
             } else if (this.binding.isNotBound()) {
-                this.editButton.setMessage(Formatting.GOLD + this.editButton.getMessage());
+                MutableText text = this.editButton.getMessage().copy();
+                this.editButton.setMessage(text.formatted(Formatting.GOLD));
             }
 
-            this.editButton.render(mouseX, mouseY, delta);
+            this.editButton.render(matrices, mouseX, mouseY, delta);
         }
 
         public boolean mouseClicked(double mouseX, double mouseY, int button)
@@ -175,13 +183,13 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
         public CategoryEntry(@NotNull ButtonCategory category)
         {
             this.name = category.getTranslatedName();
-            this.nameWidth = ControlsListWidget.this.minecraft.textRenderer.getStringWidth(this.name);
+            this.nameWidth = ControlsListWidget.this.client.textRenderer.getWidth(this.name);
         }
 
         @Override
-        public void render(int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovering, float delta)
+        public void render(MatrixStack matrices, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovering, float delta)
         {
-            ControlsListWidget.this.minecraft.textRenderer.draw(this.name, (float) (ControlsListWidget.this.minecraft.currentScreen.width / 2 - this.nameWidth / 2),
+            ControlsListWidget.this.client.textRenderer.draw(matrices, this.name, (float) (ControlsListWidget.this.client.currentScreen.width / 2 - this.nameWidth / 2),
                     (float) ((y + height) - 9 - 1), 16777215);
         }
 

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java

@@ -13,26 +13,46 @@ import me.lambdaurora.lambdacontrols.ControlsMode;
 import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
 import me.lambdaurora.lambdacontrols.client.HudSide;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.spruceui.hud.Hud;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.Window;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents the LambdaControls HUD.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.3.2
  * @since 1.0.0
  */
 public class LambdaControlsHud extends Hud
 {
     private final LambdaControlsClient mod;
     private       MinecraftClient      client;
-    private       int                  widthBottom = 0;
-    private       int                  widthTop    = 0;
+    private       int                  attackWidth             = 0;
+    private       int                  attackButtonWidth       = 0;
+    private       int                  dropItemWidth           = 0;
+    private       int                  dropItemButtonWidth     = 0;
+    private       int                  inventoryWidth          = 0;
+    private       int                  inventoryButtonWidth    = 0;
+    private       int                  swapHandsWidth          = 0;
+    private       int                  swapHandsButtonWidth    = 0;
+    private       int                  useWidth                = 0;
+    private       int                  useButtonWidth          = 0;
+    private       BlockHitResult       placeHitResult;
+    private       String               attackAction            = "";
+    private       String               placeAction             = "";
+    private       int                  ticksDisplayedCrosshair = 0;
 
     public LambdaControlsHud(@NotNull LambdaControlsClient mod)
     {
@@ -45,37 +65,229 @@ public class LambdaControlsHud extends Hud
     {
         super.init(client, screenWidth, screenHeight);
         this.client = client;
+        this.inventoryWidth = this.width(ButtonBinding.INVENTORY);
+        this.inventoryButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.INVENTORY);
+        this.swapHandsWidth = this.width(ButtonBinding.SWAP_HANDS);
+        this.swapHandsButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.SWAP_HANDS);
+        this.dropItemWidth = this.width(ButtonBinding.DROP_ITEM);
+        this.dropItemButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.DROP_ITEM);
+        this.attackButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.ATTACK);
+        this.useButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.USE);
     }
 
     /**
      * Renders the LambdaControls' HUD.
      */
-    public void render(float tickDelta)
+    @Override
+    public void render(MatrixStack matrices, float tickDelta)
     {
         if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
-            int x = this.mod.config.getHudSide() == HudSide.LEFT ? 10 : client.getWindow().getScaledWidth() - 10 - this.widthBottom, y = bottom(10);
-            x += (this.widthBottom = this.drawButtonTip(x, y, ButtonBinding.INVENTORY, true) + 10);
-            this.widthBottom += this.drawButtonTip(x, y, ButtonBinding.SWAP_HANDS, true);
-            x = this.mod.config.getHudSide() == HudSide.LEFT ? 10 : client.getWindow().getScaledWidth() - 10 - this.widthTop;
-            x += (this.widthTop = this.drawButtonTip(x, (y -= 20), ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()) + 10);
-            this.widthTop += this.drawButtonTip(x, y, ButtonBinding.ATTACK.getButton(),
-                    this.client.crosshairTarget.getType() == HitResult.Type.BLOCK ? "lambdacontrols.action.hit" : ButtonBinding.ATTACK.getTranslationKey(),
-                    this.client.crosshairTarget.getType() != HitResult.Type.MISS);
+            int y = bottom(2);
+            this.renderFirstIcons(matrices, this.mod.config.getHudSide() == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderSecondIcons(matrices, this.mod.config.getHudSide() == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderFirstSection(matrices, this.mod.config.getHudSide() == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderSecondSection(matrices, this.mod.config.getHudSide() == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
         }
+
+        if (this.mod.reacharound.isLastReacharoundVertical()) {
+            // Render crosshair indicator.
+            Window window = this.client.getWindow();
+            String text = "[  ]";
+
+            float scale = Math.min(5, this.ticksDisplayedCrosshair + tickDelta) / 5F;
+            scale *= scale;
+            int opacity = ((int) (255 * scale)) << 24;
+
+            this.client.textRenderer.draw(matrices, text, window.getScaledWidth() / 2.f - this.client.textRenderer.getWidth(text) / 2.f,
+                    window.getScaledHeight() / 2.f - 4, 0xCCCCCC | opacity);
+        }
+    }
+
+    public void renderFirstIcons(MatrixStack matrices, int x, int y)
+    {
+        int offset = 2 + this.inventoryWidth + this.inventoryButtonWidth + 4;
+        int currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x : x - this.inventoryButtonWidth;
+        this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true);
+        this.drawButton(matrices, currentX += (this.mod.config.getHudSide() == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
+        offset = 2 + this.swapHandsWidth + this.dropItemButtonWidth + 4;
+        if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.RIGHT) {
+            currentX += -offset;
+        } else {
+            currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x : x - this.dropItemButtonWidth;
+            y -= 24;
+        }
+        this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+    }
+
+    public void renderSecondIcons(MatrixStack matrices, int x, int y)
+    {
+        int offset;
+        int currentX = x;
+        if (!this.placeAction.isEmpty()) {
+            if (this.mod.config.getHudSide() == HudSide.LEFT)
+                currentX -= this.useButtonWidth;
+            this.drawButton(matrices, currentX, y, ButtonBinding.USE, true);
+            offset = 2 + this.useWidth + 4;
+            if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.LEFT) {
+                currentX -= offset;
+            } else {
+                currentX = x;
+                y -= 24;
+            }
+        }
+
+        if (this.mod.config.getHudSide() == HudSide.LEFT)
+            currentX -= this.attackButtonWidth;
+
+        this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
+    }
+
+    public void renderFirstSection(MatrixStack matrices, int x, int y)
+    {
+        int currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth;
+        this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true);
+        currentX += this.mod.config.getHudSide() == HudSide.LEFT ? this.inventoryWidth + 4 + this.swapHandsButtonWidth + 2
+                : -this.swapHandsWidth - 2 - this.swapHandsButtonWidth - 4;
+        this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+        if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.RIGHT) {
+            currentX += -this.dropItemWidth - 2 - this.dropItemButtonWidth - 4;
+        } else {
+            y -= 24;
+            currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x + this.dropItemButtonWidth + 2 : x - this.dropItemButtonWidth - 2 - this.dropItemWidth;
+        }
+        this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+    }
+
+    public void renderSecondSection(MatrixStack matrices, int x, int y)
+    {
+        int currentX = x;
+
+        if (!this.placeAction.isEmpty()) {
+            currentX += this.mod.config.getHudSide() == HudSide.RIGHT ? this.useButtonWidth + 2 : -this.useButtonWidth - 2 - this.useWidth;
+
+            this.drawTip(matrices, currentX, y, this.placeAction, true);
+
+            if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.LEFT) {
+                currentX -= 4;
+            } else {
+                currentX = x;
+                y -= 24;
+            }
+        }
+
+        currentX += this.mod.config.getHudSide() == HudSide.RIGHT ? this.attackButtonWidth + 2 : -this.attackButtonWidth - 2 - this.attackWidth;
+
+        this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0);
+    }
+
+    @Override
+    public void tick()
+    {
+        super.tick();
+        if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER) {
+            if (this.client.crosshairTarget == null)
+                return;
+
+            String placeAction;
+
+            // Update "Use" tip status.
+            if (this.client.crosshairTarget.getType() == HitResult.Type.MISS) {
+                this.placeHitResult = this.mod.reacharound.getLastReacharoundResult();
+                this.attackAction = "";
+                this.attackWidth = 0;
+            } else {
+                if (this.client.crosshairTarget.getType() == HitResult.Type.BLOCK)
+                    this.placeHitResult = (BlockHitResult) this.client.crosshairTarget;
+                else
+                    this.placeHitResult = null;
+
+                this.attackAction = this.client.crosshairTarget.getType() == HitResult.Type.BLOCK ? "lambdacontrols.action.hit" : ButtonBinding.ATTACK.getTranslationKey();
+                this.attackWidth = this.width(attackAction);
+            }
+
+            if (this.mod.reacharound.isLastReacharoundVertical()) {
+                if (this.ticksDisplayedCrosshair < 5)
+                    this.ticksDisplayedCrosshair++;
+            } else {
+                this.ticksDisplayedCrosshair = 0;
+            }
+
+            String customAttackAction = LambdaControlsCompat.getAttackActionAt(this.client, this.placeHitResult);
+            if (customAttackAction != null) {
+                this.attackAction = customAttackAction;
+                this.attackWidth = this.width(customAttackAction);
+            }
+
+            ItemStack stack = null;
+            if (this.client.player != null) {
+                stack = this.client.player.getMainHandStack();
+                if (stack == null || stack.isEmpty())
+                    stack = this.client.player.getOffHandStack();
+            }
+            if (stack == null || stack.isEmpty()) {
+                placeAction = "";
+            } else {
+                if (this.placeHitResult != null && stack.getItem() instanceof BlockItem) {
+                    placeAction = "lambdacontrols.action.place";
+                } else {
+                    placeAction = ButtonBinding.USE.getTranslationKey();
+                }
+            }
+
+            String customUseAction = LambdaControlsCompat.getUseActionAt(this.client, this.placeHitResult);
+            if (customUseAction != null)
+                placeAction = customUseAction;
+
+            this.placeAction = placeAction;
+
+            // Cache the "Use" tip width.
+            if (this.placeAction.isEmpty())
+                this.useWidth = 0;
+            else
+                this.useWidth = this.width(this.placeAction);
+        }
+    }
+
+    @Override
+    public boolean hasTicks()
+    {
+        return true;
     }
 
     private int bottom(int y)
     {
-        return this.client.getWindow().getScaledHeight() - y - 15;
+        return this.client.getWindow().getScaledHeight() - y - LambdaControlsRenderer.ICON_SIZE;
     }
 
-    private int drawButtonTip(int x, int y, @NotNull ButtonBinding button, boolean display)
+    private int width(@NotNull ButtonBinding binding)
     {
-        return LambdaControlsClient.drawButtonTip(x, y, button, display, this.client);
+        return this.width(binding.getTranslationKey());
     }
 
-    private int drawButtonTip(int x, int y, int[] button, @NotNull String action, boolean display)
+    private int width(@Nullable String text)
     {
-        return LambdaControlsClient.drawButtonTip(x, y, button, action, display, this.client);
+        if (text == null || text.isEmpty())
+            return 0;
+        return this.client.textRenderer.getWidth(I18n.translate(text));
+    }
+
+    private void drawButton(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display)
+    {
+        if (display)
+            LambdaControlsRenderer.drawButton(matrices, x, y, button, this.client);
+    }
+
+    private void drawTip(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display)
+    {
+        this.drawTip(matrices, x, y, button.getTranslationKey(), display);
+    }
+
+    private void drawTip(MatrixStack matrices, int x, int y, @NotNull String action, boolean display)
+    {
+        if (!display)
+            return;
+        String translatedAction = I18n.translate(action);
+        int textY = (LambdaControlsRenderer.ICON_SIZE / 2 - this.client.textRenderer.fontHeight / 2) + 1;
+        this.client.textRenderer.draw(matrices, translatedAction, (float) x, (float) (y + textY), 14737632);
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java

@@ -0,0 +1,281 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.LambdaInput;
+import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
+import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.slot.Slot;
+import org.aperlambda.lambdacommon.utils.Pair;
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
+
+/**
+ * Represents the LambdaControls renderer.
+ *
+ * @author LambdAurora
+ * @version 1.3.2
+ * @since 1.2.0
+ */
+public class LambdaControlsRenderer
+{
+    public static final  int ICON_SIZE   = 20;
+    private static final int BUTTON_SIZE = 15;
+    private static final int AXIS_SIZE   = 18;
+
+    public static int getButtonSize(int button)
+    {
+        switch (button) {
+            case -1:
+                return 0;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
+                return AXIS_SIZE;
+            default:
+                return BUTTON_SIZE;
+        }
+    }
+
+    /**
+     * Gets the binding icon width.
+     *
+     * @param binding The binding.
+     * @return The width.
+     */
+    public static int getBindingIconWidth(@NotNull ButtonBinding binding)
+    {
+        return getBindingIconWidth(binding.getButton());
+    }
+
+    /**
+     * Gets the binding icon width.
+     *
+     * @param buttons The buttons.
+     * @return The width.
+     */
+    public static int getBindingIconWidth(int[] buttons)
+    {
+        int width = 0;
+        for (int i = 0; i < buttons.length; i++) {
+            width += ICON_SIZE;
+            if (i + 1 < buttons.length) {
+                width += 2;
+            }
+        }
+        return width;
+    }
+
+    public static Pair<Integer, Integer> drawButton(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client)
+    {
+        return drawButton(matrices, x, y, button.getButton(), client);
+    }
+
+    public static Pair<Integer, Integer> drawButton(MatrixStack matrices, int x, int y, int[] buttons, @NotNull MinecraftClient client)
+    {
+        int height = 0;
+        int length = 0;
+        int currentX = x;
+        for (int i = 0; i < buttons.length; i++) {
+            int btn = buttons[i];
+            int size = drawButton(matrices, currentX, y, btn, client);
+            if (size > height)
+                height = size;
+            length += size;
+            if (i + 1 < buttons.length) {
+                length += 2;
+                currentX = x + length;
+            }
+        }
+        return Pair.of(length, height);
+    }
+
+    @SuppressWarnings("deprecated")
+    public static int drawButton(MatrixStack matrices, int x, int y, int button, @NotNull MinecraftClient client)
+    {
+        boolean second = false;
+        if (button == -1)
+            return 0;
+        else if (button >= 500) {
+            button -= 1000;
+            second = true;
+        }
+
+        int controllerType = LambdaControlsClient.get().config.getControllerType().getId();
+        boolean axis = false;
+        int buttonOffset = button * 15;
+        switch (button) {
+            case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
+                buttonOffset = 7 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
+                buttonOffset = 8 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_BACK:
+                buttonOffset = 4 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_START:
+                buttonOffset = 6 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_GUIDE:
+                buttonOffset = 5 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
+                buttonOffset = 15 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
+                buttonOffset = 16 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
+                buttonOffset = 0;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
+                buttonOffset = 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
+                buttonOffset = 2 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
+                buttonOffset = 3 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
+                buttonOffset = 4 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
+                buttonOffset = 5 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
+                buttonOffset = 6 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
+                buttonOffset = 7 * 18;
+                axis = true;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 200:
+                buttonOffset = 9 * 15;
+                break;
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 100:
+            case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 200:
+                buttonOffset = 10 * 15;
+                break;
+        }
+
+        client.getTextureManager().bindTexture(axis ? LambdaControlsClient.CONTROLLER_AXIS : LambdaControlsClient.CONTROLLER_BUTTONS);
+        RenderSystem.disableDepthTest();
+
+        int assetSize = axis ? AXIS_SIZE : BUTTON_SIZE;
+
+        RenderSystem.color4f(1.0F, second ? 0.0F : 1.0F, 1.0F, 1.0F);
+        DrawableHelper.drawTexture(matrices, x + (ICON_SIZE / 2 - assetSize / 2), y + (ICON_SIZE / 2 - assetSize / 2),
+                (float) buttonOffset, (float) (controllerType * (axis ? AXIS_SIZE : BUTTON_SIZE)),
+                assetSize, assetSize,
+                256, 256);
+        RenderSystem.enableDepthTest();
+
+        return ICON_SIZE;
+    }
+
+    public static int drawButtonTip(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client)
+    {
+        return drawButtonTip(matrices, x, y, button.getButton(), button.getTranslationKey(), display, client);
+    }
+
+    public static int drawButtonTip(MatrixStack matrices, int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client)
+    {
+        if (display) {
+            int buttonWidth = drawButton(matrices, x, y, button, client).key;
+
+            String translatedAction = I18n.translate(action);
+            int textY = (LambdaControlsRenderer.ICON_SIZE / 2 - client.textRenderer.fontHeight / 2) + 1;
+
+            return client.textRenderer.drawWithShadow(matrices, translatedAction, (float) (x + buttonWidth + 2), (float) (y + textY), 14737632);
+        }
+
+        return -10;
+    }
+
+    private static int getButtonTipWidth(@NotNull String action, @NotNull TextRenderer textRenderer)
+    {
+        return 15 + 5 + textRenderer.getWidth(action);
+    }
+
+    public static void renderVirtualCursor(@NotNull MatrixStack matrices, @NotNull MinecraftClient client)
+    {
+        if (!LambdaControlsClient.get().config.hasVirtualMouse() || (client.currentScreen == null || LambdaInput.isScreenInteractive(client.currentScreen)))
+            return;
+
+        int mouseX = (int) (client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth());
+        int mouseY = (int) (client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight());
+
+        boolean hoverSlot = false;
+
+        if (client.currentScreen instanceof HandledScreen) {
+            HandledScreenAccessor inventoryScreen = (HandledScreenAccessor) client.currentScreen;
+            int guiLeft = inventoryScreen.getX();
+            int guiTop = inventoryScreen.getY();
+
+            Slot slot = inventoryScreen.lambdacontrols_getSlotAt(mouseX, mouseY);
+
+            if (slot != null) {
+                mouseX = guiLeft + slot.x;
+                mouseY = guiTop + slot.y;
+                hoverSlot = true;
+            }
+        }
+
+        if (!hoverSlot) {
+            mouseX -= 8;
+            mouseY -= 8;
+        }
+
+        drawCursor(matrices, mouseX, mouseY, hoverSlot, client);
+    }
+
+    /**
+     * Draws the virtual cursor.
+     *
+     * @param matrices  The matrix stack.
+     * @param x         X coordinate.
+     * @param y         Y coordinate.
+     * @param hoverSlot True if hovering a slot, else false.
+     * @param client    The client instance.
+     */
+    public static void drawCursor(@NotNull MatrixStack matrices, int x, int y, boolean hoverSlot, @NotNull MinecraftClient client)
+    {
+        client.getTextureManager().bindTexture(LambdaControlsClient.CURSOR_TEXTURE);
+
+        RenderSystem.disableDepthTest();
+
+        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        DrawableHelper.drawTexture(matrices, x, y, hoverSlot ? 16.F : 0.F, LambdaControlsClient.get().config.getVirtualMouseSkin().ordinal() * 16.F, 16, 16, 32, 64);
+        RenderSystem.enableDepthTest();
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java

@@ -23,13 +23,14 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonListWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.options.Option;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
-import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -37,7 +38,7 @@ import org.lwjgl.glfw.GLFW;
  */
 public class LambdaControlsSettingsScreen extends Screen
 {
-    public static final String               GAMEPAD_TOOL_URL          = "http://generalarcade.com/gamepadtool/";
+    public static final String               GAMEPAD_TOOL_URL          = "https://generalarcade.com/gamepadtool/";
     final               LambdaControlsClient mod;
     private final       Screen               parent;
     private final       boolean              hideControls;
@@ -47,7 +48,10 @@ public class LambdaControlsSettingsScreen extends Screen
     private final       Option               mouseSpeedOption;
     private final       Option               resetOption;
     // Gameplay options
+    private final       Option               autoJumpOption;
+    private final       Option               fastBlockPlacingOption;
     private final       Option               frontBlockPlacingOption;
+    private final       Option               verticalReacharoundOption;
     private final       Option               flyDriftingOption;
     private final       Option               flyVerticalDriftingOption;
     // Controller options
@@ -58,14 +62,18 @@ public class LambdaControlsSettingsScreen extends Screen
     private final       Option               invertsRightXAxis;
     private final       Option               invertsRightYAxis;
     private final       Option               unfocusedInputOption;
+    private final       Option               virtualMouseOption;
+    private final       Option               virtualMouseSkinOption;
     // Hud options
     private final       Option               hudEnableOption;
     private final       Option               hudSideOption;
-    private final       String               controllerMappingsUrlText = I18n.translate("lambdacontrols.controller.mappings.2", Formatting.GOLD.toString(), GAMEPAD_TOOL_URL, Formatting.RESET.toString());
+    private final       MutableText          controllerMappingsUrlText = new LiteralText("(")
+            .append(new LiteralText(GAMEPAD_TOOL_URL).formatted(Formatting.GOLD))
+            .append("),");
     private             ButtonListWidget     list;
     private             SpruceLabelWidget    gamepadToolUrlLabel;
 
-    public LambdaControlsSettingsScreen(Screen parent, @NotNull GameOptions options, boolean hideControls)
+    public LambdaControlsSettingsScreen(Screen parent, boolean hideControls)
     {
         super(new TranslatableText("lambdacontrols.title.settings"));
         this.mod = LambdaControlsClient.get();
@@ -74,19 +82,19 @@ public class LambdaControlsSettingsScreen extends Screen
         // General options
         this.autoSwitchModeOption = new SpruceBooleanOption("lambdacontrols.menu.auto_switch_mode", this.mod.config::hasAutoSwitchMode,
                 this.mod.config::setAutoSwitchMode, new TranslatableText("lambdacontrols.tooltip.auto_switch_mode"), true);
-        this.rotationSpeedOption = new SpruceDoubleOption("lambdacontrols.menu.rotation_speed", 0.0, 150.0, 0.5F, this.mod.config::getRotationSpeed,
+        this.rotationSpeedOption = new SpruceDoubleOption("lambdacontrols.menu.rotation_speed", 0.0, 100.0, 0.5F, this.mod.config::getRotationSpeed,
                 newValue -> {
                     synchronized (this.mod.config) {
                         this.mod.config.setRotationSpeed(newValue);
                     }
-                }, option -> option.getDisplayPrefix() + option.get(),
+                }, option -> option.getDisplayPrefix().append(String.valueOf(option.get())),
                 new TranslatableText("lambdacontrols.tooltip.rotation_speed"));
         this.mouseSpeedOption = new SpruceDoubleOption("lambdacontrols.menu.mouse_speed", 0.0, 150.0, 0.5F, this.mod.config::getMouseSpeed,
                 newValue -> {
                     synchronized (this.mod.config) {
                         this.mod.config.setMouseSpeed(newValue);
                     }
-                }, option -> option.getDisplayPrefix() + option.get(),
+                }, option -> option.getDisplayPrefix().append(String.valueOf(option.get())),
                 new TranslatableText("lambdacontrols.tooltip.mouse_speed"));
         this.resetOption = new SpruceResetOption(btn -> {
             this.mod.config.reset();
@@ -94,8 +102,13 @@ public class LambdaControlsSettingsScreen extends Screen
             this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
         });
         // Gameplay options
-        this.frontBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.front_block_placing", this.mod.config::hasFrontBlockPlacing,
-                this.mod.config::setFrontBlockPlacing, new TranslatableText("lambdacontrols.tooltip.front_block_placing"), true);
+        this.autoJumpOption = SpruceBooleanOption.fromVanilla("options.autoJump", Option.AUTO_JUMP, null, true);
+        this.fastBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.fast_block_placing", this.mod.config::hasFastBlockPlacing,
+                this.mod.config::setFastBlockPlacing, new TranslatableText("lambdacontrols.tooltip.fast_block_placing"), true);
+        this.frontBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.reacharound.horizontal", this.mod.config::hasFrontBlockPlacing,
+                this.mod.config::setFrontBlockPlacing, new TranslatableText("lambdacontrols.tooltip.reacharound.horizontal"), true);
+        this.verticalReacharoundOption = new SpruceBooleanOption("lambdacontrols.menu.reacharound.vertical", this.mod.config::hasVerticalReacharound,
+                this.mod.config::setVerticalReacharound, new TranslatableText("lambdacontrols.tooltip.reacharound.vertical"), true);
         this.flyDriftingOption = new SpruceBooleanOption("lambdacontrols.menu.fly_drifting", this.mod.config::hasFlyDrifting,
                 this.mod.config::setFlyDrifting, new TranslatableText("lambdacontrols.tooltip.fly_drifting"), true);
         this.flyVerticalDriftingOption = new SpruceBooleanOption("lambdacontrols.menu.fly_drifting_vertical", this.mod.config::hasFlyVerticalDrifting,
@@ -110,11 +123,11 @@ public class LambdaControlsSettingsScreen extends Screen
         }, option -> {
             String controllerName = this.mod.config.getController().getName();
             if (!this.mod.config.getController().isConnected())
-                return option.getDisplayPrefix() + Formatting.RED + controllerName;
+                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.RED));
             else if (!this.mod.config.getController().isGamepad())
-                return option.getDisplayPrefix() + Formatting.GOLD + controllerName;
+                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.GOLD));
             else
-                return option.getDisplayPrefix() + controllerName;
+                return option.getDisplayPrefix().append(controllerName);
         }, null);
         this.secondControllerOption = new SpruceCyclingOption("lambdacontrols.menu.controller2",
                 amount -> {
@@ -126,16 +139,16 @@ public class LambdaControlsSettingsScreen extends Screen
                 }, option -> this.mod.config.getSecondController().map(controller -> {
             String controllerName = controller.getName();
             if (!controller.isConnected())
-                return option.getDisplayPrefix() + Formatting.RED + controllerName;
+                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.RED));
             else if (!controller.isGamepad())
-                return option.getDisplayPrefix() + Formatting.GOLD + controllerName;
+                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.GOLD));
             else
-                return option.getDisplayPrefix() + controllerName;
-        }).orElse(option.getDisplayPrefix() + Formatting.RED + I18n.translate("options.off")),
+                return option.getDisplayPrefix().append(controllerName);
+        }).orElse(option.getDisplayPrefix().append(new TranslatableText("options.off").formatted(Formatting.RED))),
                 new TranslatableText("lambdacontrols.tooltip.controller2"));
         this.controllerTypeOption = new SpruceCyclingOption("lambdacontrols.menu.controller_type",
                 amount -> this.mod.config.setControllerType(this.mod.config.getControllerType().next()),
-                option -> option.getDisplayPrefix() + this.mod.config.getControllerType().getTranslatedName(),
+                option -> option.getDisplayPrefix().append(this.mod.config.getControllerType().getTranslatedName()),
                 new TranslatableText("lambdacontrols.tooltip.controller_type"));
         this.deadZoneOption = new SpruceDoubleOption("lambdacontrols.menu.dead_zone", 0.05, 1.0, 0.05F, this.mod.config::getDeadZone,
                 newValue -> {
@@ -144,7 +157,7 @@ public class LambdaControlsSettingsScreen extends Screen
                     }
                 }, option -> {
             String value = String.valueOf(option.get());
-            return option.getDisplayPrefix() + value.substring(0, Math.min(value.length(), 5));
+            return option.getDisplayPrefix().append(value.substring(0, Math.min(value.length(), 5)));
         }, new TranslatableText("lambdacontrols.tooltip.dead_zone"));
         this.invertsRightXAxis = new SpruceBooleanOption("lambdacontrols.menu.invert_right_x_axis", this.mod.config::doesInvertRightXAxis,
                 newValue -> {
@@ -160,12 +173,18 @@ public class LambdaControlsSettingsScreen extends Screen
                 }, null, true);
         this.unfocusedInputOption = new SpruceBooleanOption("lambdacontrols.menu.unfocused_input", this.mod.config::hasUnfocusedInput,
                 this.mod.config::setUnfocusedInput, new TranslatableText("lambdacontrols.tooltip.unfocused_input"), true);
+        this.virtualMouseOption = new SpruceBooleanOption("lambdacontrols.menu.virtual_mouse", this.mod.config::hasVirtualMouse,
+                this.mod.config::setVirtualMouse, new TranslatableText("lambdacontrols.tooltip.virtual_mouse"), true);
+        this.virtualMouseSkinOption = new SpruceCyclingOption("lambdacontrols.menu.virtual_mouse.skin",
+                amount -> this.mod.config.setVirtualMouseSkin(this.mod.config.getVirtualMouseSkin().next()),
+                option -> option.getDisplayPrefix().append(this.mod.config.getVirtualMouseSkin().getTranslatedName()),
+                null);
         // HUD options
         this.hudEnableOption = new SpruceBooleanOption("lambdacontrols.menu.hud_enable", this.mod.config::isHudEnabled,
                 this.mod::setHudEnabled, new TranslatableText("lambdacontrols.tooltip.hud_enable"), true);
         this.hudSideOption = new SpruceCyclingOption("lambdacontrols.menu.hud_side",
                 amount -> this.mod.config.setHudSide(this.mod.config.getHudSide().next()),
-                option -> option.getDisplayPrefix() + this.mod.config.getHudSide().getTranslatedName(),
+                option -> option.getDisplayPrefix().append(this.mod.config.getHudSide().getTranslatedName()),
                 new TranslatableText("lambdacontrols.tooltip.hud_side"));
     }
 
@@ -185,7 +204,7 @@ public class LambdaControlsSettingsScreen extends Screen
 
     private int getTextHeight()
     {
-        return (5 + this.font.fontHeight) * 3 + 5;
+        return (5 + this.textRenderer.fontHeight) * 3 + 5;
     }
 
     @Override
@@ -194,36 +213,37 @@ public class LambdaControlsSettingsScreen extends Screen
         super.init();
         int buttonHeight = 20;
         SpruceButtonWidget controlsModeBtn = new SpruceButtonWidget(this.width / 2 - 155, 18, this.hideControls ? 310 : 150, buttonHeight,
-                I18n.translate("lambdacontrols.menu.controls_mode") + ": " + I18n.translate(this.mod.config.getControlsMode().getTranslationKey()),
+                new TranslatableText("lambdacontrols.menu.controls_mode").append(": ").append(new TranslatableText(this.mod.config.getControlsMode().getTranslationKey())),
                 btn -> {
                     ControlsMode next = this.mod.config.getControlsMode().next();
-                    btn.setMessage(I18n.translate("lambdacontrols.menu.controls_mode") + ": " + I18n.translate(next.getTranslationKey()));
+                    btn.setMessage(new TranslatableText("lambdacontrols.menu.controls_mode").append(": ").append(new TranslatableText(next.getTranslationKey())));
                     this.mod.config.setControlsMode(next);
                     this.mod.config.save();
 
-                    if (this.minecraft.player != null) {
+                    if (this.client.player != null) {
                         ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.CONTROLS_MODE_CHANNEL, this.mod.makeControlsModeBuffer(next));
                     }
                 });
         controlsModeBtn.setTooltip(new TranslatableText("lambdacontrols.tooltip.controls_mode"));
         this.addButton(controlsModeBtn);
         if (!this.hideControls)
-            this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, 18, 150, buttonHeight, I18n.translate("options.controls"),
+            this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, 18, 150, buttonHeight, new TranslatableText("options.controls"),
                     btn -> {
                         if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER)
-                            this.minecraft.openScreen(new ControllerControlsScreen(this, true));
+                            this.client.openScreen(new ControllerControlsScreen(this, true));
                         else
-                            this.minecraft.openScreen(new ControlsOptionsScreen(this, this.minecraft.options));
+                            this.client.openScreen(new ControlsOptionsScreen(this, this.client.options));
                     }));
 
-        this.list = new ButtonListWidget(this.minecraft, this.width, this.height, 43, this.height - 29 - this.getTextHeight(), 25);
+        this.list = new ButtonListWidget(this.client, this.width, this.height, 43, this.height - 29 - this.getTextHeight(), 25);
         // General options
         this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.general", true, null));
         this.list.addOptionEntry(this.rotationSpeedOption, this.mouseSpeedOption);
         this.list.addSingleOptionEntry(this.autoSwitchModeOption);
         // Gameplay options
         this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.gameplay", true, null));
-        this.list.addSingleOptionEntry(this.frontBlockPlacingOption);
+        this.list.addOptionEntry(this.autoJumpOption, this.fastBlockPlacingOption);
+        this.list.addOptionEntry(this.frontBlockPlacingOption, this.verticalReacharoundOption);
         this.list.addSingleOptionEntry(this.flyDriftingOption);
         this.list.addSingleOptionEntry(this.flyVerticalDriftingOption);
         // Controller options
@@ -232,34 +252,35 @@ public class LambdaControlsSettingsScreen extends Screen
         this.list.addSingleOptionEntry(this.secondControllerOption);
         this.list.addOptionEntry(this.controllerTypeOption, this.deadZoneOption);
         this.list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
-        this.list.addSingleOptionEntry(this.unfocusedInputOption);
+        this.list.addOptionEntry(this.unfocusedInputOption, this.virtualMouseOption);
+        this.list.addSingleOptionEntry(this.virtualMouseSkinOption);
         this.list.addSingleOptionEntry(new ReloadControllerMappingsOption());
         // HUD options
         this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.hud", true, null));
         this.list.addOptionEntry(this.hudEnableOption, this.hudSideOption);
         this.children.add(this.list);
 
-        this.gamepadToolUrlLabel = new SpruceLabelWidget(this.width / 2, this.height - 29 - (5 + this.font.fontHeight) * 2, this.controllerMappingsUrlText, this.width,
+        this.gamepadToolUrlLabel = new SpruceLabelWidget(this.width / 2, this.height - 29 - (5 + this.textRenderer.fontHeight) * 2, this.controllerMappingsUrlText, this.width,
                 label -> Util.getOperatingSystem().open(GAMEPAD_TOOL_URL), true);
         this.gamepadToolUrlLabel.setTooltip(new TranslatableText("chat.link.open"));
         this.children.add(this.gamepadToolUrlLabel);
 
-        this.addButton(this.resetOption.createButton(this.minecraft.options, this.width / 2 - 155, this.height - 29, 150));
-        this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, buttonHeight, I18n.translate("gui.done"),
-                (buttonWidget) -> this.minecraft.openScreen(this.parent)));
+        this.addButton(this.resetOption.createButton(this.client.options, this.width / 2 - 155, this.height - 29, 150));
+        this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, buttonHeight, new TranslatableText("gui.done"),
+                (buttonWidget) -> this.client.openScreen(this.parent)));
     }
 
     @Override
-    public void render(int mouseX, int mouseY, float delta)
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta)
     {
-        this.renderBackground();
-        this.list.render(mouseX, mouseY, delta);
-        super.render(mouseX, mouseY, delta);
-        this.drawCenteredString(this.font, I18n.translate("lambdacontrols.menu.title"), this.width / 2, 8, 16777215);
-        this.drawCenteredString(this.font, I18n.translate("lambdacontrols.controller.mappings.1", Formatting.GREEN.toString(), Formatting.RESET.toString()), this.width / 2, this.height - 29 - (5 + this.font.fontHeight) * 3, 10526880);
-        this.gamepadToolUrlLabel.render(mouseX, mouseY, delta);
-        this.drawCenteredString(this.font, I18n.translate("lambdacontrols.controller.mappings.3", Formatting.GREEN.toString(), Formatting.RESET.toString()), this.width / 2, this.height - 29 - (5 + this.font.fontHeight), 10526880);
+        this.renderBackground(matrices);
+        this.list.render(matrices, mouseX, mouseY, delta);
+        super.render(matrices, mouseX, mouseY, delta);
+        this.drawCenteredString(matrices, this.textRenderer, I18n.translate("lambdacontrols.menu.title"), this.width / 2, 8, 16777215);
+        this.drawCenteredString(matrices, this.textRenderer, I18n.translate("lambdacontrols.controller.mappings.1", Formatting.GREEN.toString(), Formatting.RESET.toString()), this.width / 2, this.height - 29 - (5 + this.textRenderer.fontHeight) * 3, 10526880);
+        this.gamepadToolUrlLabel.render(matrices, mouseX, mouseY, delta);
+        this.drawCenteredString(matrices, this.textRenderer, I18n.translate("lambdacontrols.controller.mappings.3", Formatting.GREEN.toString(), Formatting.RESET.toString()), this.width / 2, this.height - 29 - (5 + this.textRenderer.fontHeight), 10526880);
 
-        Tooltip.renderAll();
+        Tooltip.renderAll(matrices);
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java

@@ -36,7 +36,7 @@ public class ReloadControllerMappingsOption extends Option implements Nameable
     @Override
     public AbstractButtonWidget createButton(GameOptions options, int x, int y, int width)
     {
-        SpruceButtonWidget button = new SpruceButtonWidget(x, y, width, 20, this.getName(), btn -> {
+        SpruceButtonWidget button = new SpruceButtonWidget(x, y, width, 20, new TranslatableText(KEY), btn -> {
             MinecraftClient client = MinecraftClient.getInstance();
             Controller.updateMappings();
             if (client.currentScreen != null)

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java

@@ -19,7 +19,7 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TexturedButtonWidget;
-import net.minecraft.server.network.packet.PlayerActionC2SPacket;
+import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Identifier;
@@ -70,14 +70,14 @@ public class TouchscreenOverlay extends Screen
 
     private void pauseGame(boolean bl)
     {
-        if (this.minecraft == null)
+        if (this.client == null)
             return;
-        boolean bl2 = this.minecraft.isIntegratedServerRunning() && !this.minecraft.getServer().isRemote();
+        boolean bl2 = this.client.isIntegratedServerRunning() && !this.client.getServer().isRemote();
         if (bl2) {
-            this.minecraft.openScreen(new GameMenuScreen(!bl));
-            this.minecraft.getSoundManager().pauseAll();
+            this.client.openScreen(new GameMenuScreen(!bl));
+            this.client.getSoundManager().pauseAll();
         } else {
-            this.minecraft.openScreen(new GameMenuScreen(true));
+            this.client.openScreen(new GameMenuScreen(true));
         }
     }
 
@@ -99,9 +99,9 @@ public class TouchscreenOverlay extends Screen
      */
     private void updateJumpButtons()
     {
-        if (this.minecraft == null)
+        if (this.client == null)
             return;
-        if (this.minecraft.player.abilities.allowFlying && this.minecraft.player.abilities.flying) {
+        if (this.client.player.abilities.allowFlying && this.client.player.abilities.flying) {
             boolean oldStateFly = this.flyButton.visible;
             this.jumpButton.visible = false;
             this.flyButton.visible = true;
@@ -128,7 +128,7 @@ public class TouchscreenOverlay extends Screen
      */
     private void handleJump(ButtonWidget btn, boolean state)
     {
-        ((KeyBindingAccessor) this.minecraft.options.keyJump).lambdacontrols_handlePressState(state);
+        ((KeyBindingAccessor) this.client.options.keyJump).lambdacontrols_handlePressState(state);
     }
 
     @Override
@@ -149,27 +149,27 @@ public class TouchscreenOverlay extends Screen
     protected void init()
     {
         super.init();
-        int scaledWidth = this.minecraft.getWindow().getScaledWidth();
-        int scaledHeight = this.minecraft.getWindow().getScaledHeight();
+        int scaledWidth = this.client.getWindow().getScaledWidth();
+        int scaledHeight = this.client.getWindow().getScaledHeight();
         this.addButton(new TexturedButtonWidget(scaledWidth / 2 - 20, 0, 20, 20, 0, 106, 20, ButtonWidget.WIDGETS_LOCATION, 256, 256,
-                btn -> this.minecraft.openScreen(new ChatScreen("")), ""));
+                btn -> this.client.openScreen(new ChatScreen("")), LiteralText.EMPTY));
         this.addButton(new TexturedButtonWidget(scaledWidth / 2, 0, 20, 20, 0, 0, 20, WIDGETS_LOCATION, 256, 256,
                 btn -> this.pauseGame(false)));
         // Inventory buttons.
         int inventoryButtonX = scaledWidth / 2;
         int inventoryButtonY = scaledHeight - 16 - 5;
-        if (this.minecraft.options.mainArm == Arm.LEFT) {
+        if (this.client.options.mainArm == Arm.LEFT) {
             inventoryButtonX = inventoryButtonX - 91 - 24;
         } else {
             inventoryButtonX = inventoryButtonX + 91 + 4;
         }
         this.addButton(new TexturedButtonWidget(inventoryButtonX, inventoryButtonY, 20, 20, 20, 0, 20, WIDGETS_LOCATION, 256, 256,
                 btn -> {
-                    if (this.minecraft.interactionManager.hasRidingInventory()) {
-                        this.minecraft.player.openRidingInventory();
+                    if (this.client.interactionManager.hasRidingInventory()) {
+                        this.client.player.openRidingInventory();
                     } else {
-                        this.minecraft.getTutorialManager().onInventoryOpened();
-                        this.minecraft.openScreen(new InventoryScreen(this.minecraft.player));
+                        this.client.getTutorialManager().onInventoryOpened();
+                        this.client.openScreen(new InventoryScreen(this.client.player));
                     }
                 }));
         int jumpButtonX, swapHandsX, sneakButtonX;
@@ -187,31 +187,31 @@ public class TouchscreenOverlay extends Screen
         this.addButton(new SpruceTexturedButtonWidget(swapHandsX, sneakButtonY, 20, 20, 0, 160, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
                     if (state) {
-                        if (!this.minecraft.player.isSpectator()) {
-                            this.minecraft.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_HELD_ITEMS, BlockPos.ORIGIN, Direction.DOWN));
+                        if (!this.client.player.isSpectator()) {
+                            this.client.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
                         }
                     }
                 }));
         // Drop
         this.addButton(new SpruceTexturedButtonWidget(swapHandsX, sneakButtonY + 5 + 20, 20, 20, 20, 160, 20, WIDGETS_LOCATION,
-                (btn, state) -> ((KeyBindingAccessor) this.minecraft.options.keyDrop).lambdacontrols_handlePressState(state)));
+                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyDrop).lambdacontrols_handlePressState(state)));
         // Jump keys
         this.addButton(this.jumpButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY, 20, 20, 0, 40, 20, WIDGETS_LOCATION,
                 this::handleJump));
         this.addButton(this.flyButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY, 20, 20, 20, 40, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
-                    if (this.flyButtonEnableTicks == 0) this.minecraft.player.abilities.flying = false;
+                    if (this.flyButtonEnableTicks == 0) this.client.player.abilities.flying = false;
                 }));
         this.addButton(this.flyUpButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY - 5 - 20, 20, 20, 40, 40, 20, WIDGETS_LOCATION,
                 this::handleJump));
         this.addButton(this.flyDownButton = new SpruceTexturedButtonWidget(jumpButtonX, sneakButtonY + 20 + 5, 20, 20, 60, 40, 20, WIDGETS_LOCATION,
-                (btn, state) -> ((KeyBindingAccessor) this.minecraft.options.keySneak).lambdacontrols_handlePressState(state)));
+                (btn, state) -> ((KeyBindingAccessor) this.client.options.keySneak).lambdacontrols_handlePressState(state)));
         this.updateJumpButtons();
         // Movements keys
         this.addButton((this.startSneakButton = new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY, 20, 20, 0, 120, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
                     if (state) {
-                        ((KeyBindingAccessor) this.minecraft.options.keySneak).lambdacontrols_handlePressState(true);
+                        ((KeyBindingAccessor) this.client.options.keySneak).lambdacontrols_handlePressState(true);
                         this.startSneakButton.visible = false;
                         this.endSneakButton.visible = true;
                     }
@@ -219,7 +219,7 @@ public class TouchscreenOverlay extends Screen
         this.addButton((this.endSneakButton = new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY, 20, 20, 20, 120, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
                     if (state) {
-                        ((KeyBindingAccessor) this.minecraft.options.keySneak).lambdacontrols_handlePressState(false);
+                        ((KeyBindingAccessor) this.client.options.keySneak).lambdacontrols_handlePressState(false);
                         this.endSneakButton.visible = false;
                         this.startSneakButton.visible = true;
                     }
@@ -227,49 +227,49 @@ public class TouchscreenOverlay extends Screen
         this.endSneakButton.visible = false;
         this.addButton(this.forwardLeftButton = new SpruceTexturedButtonWidget(sneakButtonX - 20 - 5, sneakButtonY - 5 - 20, 20, 20, 80, 80, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
-                    ((KeyBindingAccessor) this.minecraft.options.keyForward).lambdacontrols_handlePressState(state);
-                    ((KeyBindingAccessor) this.minecraft.options.keyLeft).lambdacontrols_handlePressState(state);
+                    ((KeyBindingAccessor) this.client.options.keyForward).lambdacontrols_handlePressState(state);
+                    ((KeyBindingAccessor) this.client.options.keyLeft).lambdacontrols_handlePressState(state);
                     this.updateForwardButtonsState(state);
                 }));
         this.forwardLeftButton.visible = false;
         this.addButton(new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY - 5 - 20, 20, 20, 0, 80, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
-                    ((KeyBindingAccessor) this.minecraft.options.keyForward).lambdacontrols_handlePressState(state);
+                    ((KeyBindingAccessor) this.client.options.keyForward).lambdacontrols_handlePressState(state);
                     this.updateForwardButtonsState(state);
                     this.forwardLeftButton.visible = true;
                     this.forwardRightButton.visible = true;
                 }));
         this.addButton(this.forwardRightButton = new SpruceTexturedButtonWidget(sneakButtonX + 20 + 5, sneakButtonY - 5 - 20, 20, 20, 100, 80, 20, WIDGETS_LOCATION,
                 (btn, state) -> {
-                    ((KeyBindingAccessor) this.minecraft.options.keyForward).lambdacontrols_handlePressState(state);
-                    ((KeyBindingAccessor) this.minecraft.options.keyRight).lambdacontrols_handlePressState(state);
+                    ((KeyBindingAccessor) this.client.options.keyForward).lambdacontrols_handlePressState(state);
+                    ((KeyBindingAccessor) this.client.options.keyRight).lambdacontrols_handlePressState(state);
                     this.updateForwardButtonsState(state);
                 }));
         this.forwardRightButton.visible = true;
         this.addButton(new SpruceTexturedButtonWidget(sneakButtonX + 20 + 5, sneakButtonY, 20, 20, 20, 80, 20, WIDGETS_LOCATION,
-                (btn, state) -> ((KeyBindingAccessor) this.minecraft.options.keyRight).lambdacontrols_handlePressState(state)));
+                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyRight).lambdacontrols_handlePressState(state)));
         this.addButton(new SpruceTexturedButtonWidget(sneakButtonX, sneakButtonY + 20 + 5, 20, 20, 40, 80, 20, WIDGETS_LOCATION,
-                (btn, state) -> ((KeyBindingAccessor) this.minecraft.options.keyBack).lambdacontrols_handlePressState(state)));
+                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyBack).lambdacontrols_handlePressState(state)));
         this.addButton(new SpruceTexturedButtonWidget(sneakButtonX - 20 - 5, sneakButtonY, 20, 20, 60, 80, 20, WIDGETS_LOCATION,
-                (btn, state) -> ((KeyBindingAccessor) this.minecraft.options.keyLeft).lambdacontrols_handlePressState(state)));
-    }
+                (btn, state) -> ((KeyBindingAccessor) this.client.options.keyLeft).lambdacontrols_handlePressState(state)));
 
-    @Override
-    public void render(int mouseX, int mouseY, float delta)
-    {
-        super.render(mouseX, mouseY, delta);
+        this.buttons.forEach(button -> {
+            if (button instanceof SpruceTexturedButtonWidget) {
+                ((SpruceTexturedButtonWidget) button).setSilent(true);
+            }
+        });
     }
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button)
     {
-        if (mouseY >= (double) (this.height - 22) && this.minecraft != null && this.minecraft.player != null) {
+        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null) {
             int centerX = this.width / 2;
             if (mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
                 for (int slot = 0; slot < 9; ++slot) {
                     int slotX = centerX - 90 + slot * 20 + 2;
                     if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
-                        this.minecraft.player.inventory.selectedSlot = slot;
+                        this.client.player.inventory.selectedSlot = slot;
                         return true;
                     }
                 }
@@ -281,16 +281,16 @@ public class TouchscreenOverlay extends Screen
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY)
     {
-        if (button == GLFW.GLFW_MOUSE_BUTTON_1 && this.minecraft != null) {
+        if (button == GLFW.GLFW_MOUSE_BUTTON_1 && this.client != null) {
             if (deltaY > 0.01)
-                this.mod.input.handleLook(this.minecraft, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 2);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 2);
             else if (deltaY < 0.01)
-                this.mod.input.handleLook(this.minecraft, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 1);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 1);
 
             if (deltaX > 0.01)
-                this.mod.input.handleLook(this.minecraft, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 2);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 2);
             else if (deltaX < 0.01)
-                this.mod.input.handleLook(this.minecraft, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 1);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 1);
         }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
     }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java

@@ -17,5 +17,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface AbstractButtonWidgetAccessor
 {
     @Accessor("height")
-    int lambdacontrols_getHeight();
+    int getHeight();
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java

@@ -25,11 +25,11 @@ import java.util.Map;
 public interface AdvancementsScreenAccessor
 {
     @Accessor("advancementHandler")
-    ClientAdvancementManager lambdacontrols_getAdvancementManager();
+    ClientAdvancementManager getAdvancementManager();
 
     @Accessor("tabs")
-    Map<Advancement, AdvancementTab> lambdacontrols_getTabs();
+    Map<Advancement, AdvancementTab> getTabs();
 
     @Accessor("selectedTab")
-    AdvancementTab lambdacontrols_getSelectedTab();
+    AdvancementTab getSelectedTab();
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayNetworkHandlerMixin.java

@@ -13,7 +13,7 @@ import me.lambdaurora.lambdacontrols.LambdaControls;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.packet.GameJoinS2CPacket;
+import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class ClientPlayNetworkHandlerMixin
 {
     @Inject(method = "onGameJoin", at = @At(value = "TAIL"))
-    private void lambdacontrols_onConnect(GameJoinS2CPacket packet, CallbackInfo ci)
+    private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci)
     {
         ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.HELLO_CHANNEL, LambdaControls.get().makeHello(LambdaControlsClient.get().config.getControlsMode()));
         ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.CONTROLS_MODE_CHANNEL,

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java

@@ -52,7 +52,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     }
 
     @Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
-    public void lambdacontrols_move(MovementType type, Vec3d movement, CallbackInfo ci)
+    public void onMove(MovementType type, Vec3d movement, CallbackInfo ci)
     {
         LambdaControlsClient mod = LambdaControlsClient.get();
         if (type == MovementType.SELF) {
@@ -70,7 +70,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     }
 
     @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
-    public void lambdacontrols_tickMovement(CallbackInfo ci)
+    public void onTickMovement(CallbackInfo ci)
     {
         if (this.abilities.flying && this.isCamera()) {
             if (LambdaControlsClient.get().config.hasFlyVerticalDrifting())

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ContainerScreenMixin.java

@@ -1,62 +0,0 @@
-/*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of LambdaControls.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package me.lambdaurora.lambdacontrols.client.mixin;
-
-import me.lambdaurora.lambdacontrols.ControlsMode;
-import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
-import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ingame.ContainerScreen;
-import net.minecraft.container.Slot;
-import org.lwjgl.glfw.GLFW;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * Represents the mixin for the class ContainerScreen.
- */
-@Mixin(ContainerScreen.class)
-public abstract class ContainerScreenMixin implements ContainerScreenAccessor
-{
-    protected int x;
-    protected int y;
-
-    @Override
-    public int lambdacontrols_getX()
-    {
-        return this.x;
-    }
-
-    @Override
-    public int lambdacontrols_getY()
-    {
-        return this.y;
-    }
-
-    @Invoker("getSlotAt")
-    public abstract Slot lambdacontrols_getSlotAt(double posX, double posY);
-
-    @Inject(method = "render", at = @At("RETURN"))
-    public void render(int mouseX, int mouseY, float delta, CallbackInfo ci)
-    {
-        if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
-            MinecraftClient client = MinecraftClient.getInstance();
-            int x = 10, y = client.getWindow().getScaledHeight() - 10 - 15;
-
-            x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "lambdacontrols.action.pickup_all", true, client) + 10;
-            x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "lambdacontrols.action.exit", true, client) + 10;
-            x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "lambdacontrols.action.pickup", true, client) + 10;
-            LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "lambdacontrols.action.quick_move", true, client);
-        }
-    }
-}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java

@@ -19,6 +19,7 @@ import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -35,12 +36,12 @@ public class ControlsOptionsScreenMixin extends GameOptionsScreen
     }
 
     @Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/options/ControlsOptionsScreen;addButton(Lnet/minecraft/client/gui/widget/AbstractButtonWidget;)Lnet/minecraft/client/gui/widget/AbstractButtonWidget;", ordinal = 1))
-    private AbstractButtonWidget on_init(ControlsOptionsScreen screen, AbstractButtonWidget btn)
+    private AbstractButtonWidget onInit(ControlsOptionsScreen screen, AbstractButtonWidget btn)
     {
         if (this.parent instanceof ControllerControlsScreen)
             return this.addButton(btn);
         else
-            return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).lambdacontrols_getHeight(), I18n.translate("menu.options"),
-                    b -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, this.gameOptions, true))));
+            return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).getHeight(), new TranslatableText("menu.options"),
+                    b -> this.client.openScreen(new LambdaControlsSettingsScreen(this, true))));
     }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java

@@ -10,8 +10,8 @@
 package me.lambdaurora.lambdacontrols.client.mixin;
 
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import net.minecraft.container.Slot;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -30,7 +30,7 @@ public interface CreativeInventoryScreenAccessor
      * @return The selected tab index.
      */
     @Accessor("selectedTab")
-    int lambdacontrols_getSelectedTab();
+    int getSelectedTab();
 
     /**
      * Sets the selected tab.
@@ -48,4 +48,12 @@ public interface CreativeInventoryScreenAccessor
      */
     @Invoker("isCreativeInventorySlot")
     boolean lambdacontrols_isCreativeInventorySlot(@Nullable Slot slot);
+
+    /**
+     * Returns whether the current tab has a scrollbar or not.
+     *
+     * @return True if the current tab has a scrollbar, else false.
+     */
+    @Invoker("hasScrollbar")
+    boolean lambdacontrols_hasScrollbar();
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java

@@ -17,5 +17,5 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 public interface EntryListWidgetAccessor
 {
     @Invoker("moveSelection")
-    void lambdacontrols_moveSelection(int amount);
+    void lambdacontrols_moveSelection(EntryListWidget.class_5403 direction);
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.mixin;
+
+import net.minecraft.client.options.GameOptions;
+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;
+
+/**
+ * Represents a mixin to GameOptions.
+ * <p>
+ * Sets the default of the Auto-Jump option to false.
+ */
+@Mixin(GameOptions.class)
+public class GameOptionsMixin
+{
+    @Shadow
+    public boolean autoJump;
+
+    @Inject(method = "load", at = @At("HEAD"))
+    public void onInit(CallbackInfo ci)
+    {
+        // Set default value of the Auto-Jump option to false.
+        this.autoJump = false;
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.mixin;
+
+import me.lambdaurora.lambdacontrols.ControlsMode;
+import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
+import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer;
+import me.lambdaurora.lambdacontrols.client.util.HandledScreenAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.screen.slot.SlotActionType;
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.glfw.GLFW;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Arrays;
+
+/**
+ * Represents the mixin for the class ContainerScreen.
+ */
+@Mixin(HandledScreen.class)
+public abstract class HandledScreenMixin implements HandledScreenAccessor
+{
+    @Accessor("x")
+    public abstract int getX();
+
+    @Accessor("y")
+    public abstract int getY();
+
+    @Invoker("getSlotAt")
+    public abstract Slot lambdacontrols_getSlotAt(double posX, double posY);
+
+    @Invoker("isClickOutsideBounds")
+    public abstract boolean lambdacontrols_isClickOutsideBounds(double mouseX, double mouseY, int x, int y, int button);
+
+    @Invoker("onMouseClick")
+    public abstract void lambdacontrols_onMouseClick(@Nullable Slot slot, int slotId, int clickData, SlotActionType actionType);
+
+    @Inject(method = "render", at = @At("RETURN"))
+    public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci)
+    {
+        if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
+            MinecraftClient client = MinecraftClient.getInstance();
+            int x = 2, y = client.getWindow().getScaledHeight() - 2 - LambdaControlsRenderer.ICON_SIZE;
+
+            x = LambdaControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "lambdacontrols.action.pickup_all", true, client) + 2;
+            x = LambdaControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "lambdacontrols.action.exit", true, client) + 2;
+            if (LambdaControlsCompat.isReiPresent()) {
+                x = 2;
+                y -= 24;
+            }
+            x = LambdaControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "lambdacontrols.action.pickup", true, client) + 2;
+            LambdaControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "lambdacontrols.action.quick_move", true, client);
+        }
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java

@@ -11,16 +11,12 @@ package me.lambdaurora.lambdacontrols.client.mixin;
 
 import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.options.KeyBinding;
-import net.minecraft.client.util.InputUtil;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(KeyBinding.class)
 public class KeyBindingMixin implements KeyBindingAccessor
 {
-    @Shadow
-    private InputUtil.KeyCode keyCode;
-
     @Shadow
     private int timesPressed;
 

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java

@@ -11,13 +11,14 @@ package me.lambdaurora.lambdacontrols.client.mixin;
 
 import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.FluidBlock;
+import me.lambdaurora.lambdacontrols.client.LambdaReacharound;
+import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
@@ -27,7 +28,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -60,43 +61,90 @@ public abstract class MinecraftClientMixin
     @Final
     public GameRenderer gameRenderer;
 
+    @Shadow
+    private int itemUseCooldown;
+
+    private BlockPos  lambdacontrols_lastTargetPos;
+    private Vec3d     lambdacontrols_lastPos;
+    private Direction lambdacontrols_lastTargetSide;
+
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void lambdacontrols_onInit(CallbackInfo ci)
+    private void onInit(CallbackInfo ci)
     {
         LambdaControlsClient.get().onMcInit((MinecraftClient) (Object) this);
     }
 
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onStartTick(CallbackInfo ci)
+    {
+        if (this.player == null)
+            return;
+
+        if (!LambdaControlsFeature.FAST_BLOCK_PLACING.isAvailable())
+            return;
+        if (this.lambdacontrols_lastPos == null)
+            this.lambdacontrols_lastPos = this.player.getPos();
+
+        int cooldown = this.itemUseCooldown;
+        BlockHitResult hitResult;
+        if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.BLOCK && this.player.abilities.flying) {
+            hitResult = (BlockHitResult) this.crosshairTarget;
+            BlockPos targetPos = hitResult.getBlockPos();
+            Direction side = hitResult.getSide();
+
+            boolean sidewaysBlockPlacing = this.lambdacontrols_lastTargetPos == null || !targetPos.equals(this.lambdacontrols_lastTargetPos.offset(this.lambdacontrols_lastTargetSide));
+            boolean backwardsBlockPlacing = this.player.input.movementForward < 0.0f && (this.lambdacontrols_lastTargetPos == null || targetPos.equals(this.lambdacontrols_lastTargetPos.offset(this.lambdacontrols_lastTargetSide)));
+
+            if (cooldown > 1
+                    && !targetPos.equals(this.lambdacontrols_lastTargetPos)
+                    && (sidewaysBlockPlacing || backwardsBlockPlacing)) {
+                this.itemUseCooldown = 1;
+            }
+
+            this.lambdacontrols_lastTargetPos = targetPos.toImmutable();
+            this.lambdacontrols_lastTargetSide = side;
+        }
+        // Removed front placing sprinting as way too cheaty.
+        /* else if (this.player.isSprinting()) {
+            hitResult = this.lambdacontrols_frontBlockPlaceResult;
+            if (hitResult != null) {
+                if (cooldown > 0)
+                    this.itemUseCooldown = 0;
+            }
+        } */
+        this.lambdacontrols_lastPos = this.player.getPos();
+    }
+
     @Inject(method = "render", at = @At("HEAD"))
-    private void lambdacontrols_onRender(boolean fullRender, CallbackInfo ci)
+    private void onRender(boolean fullRender, CallbackInfo ci)
     {
         LambdaControlsClient.get().onRender((MinecraftClient) (Object) (this));
     }
 
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V", shift = At.Shift.AFTER))
+    private void renderVirtualCursor(boolean fullRender, CallbackInfo ci)
+    {
+        LambdaControlsRenderer.renderVirtualCursor(new MatrixStack(), (MinecraftClient) (Object) this);
+    }
+
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("RETURN"))
-    private void lambdacontrols_onLeave(@Nullable Screen screen, CallbackInfo ci)
+    private void onLeave(@Nullable Screen screen, CallbackInfo ci)
     {
         LambdaControlsClient.get().onLeave();
     }
 
     @Inject(method = "doItemUse()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true)
-    private void lambdacontrols_onItemUse(CallbackInfo ci, Hand[] hands, int handCount, int handIndex, Hand hand, ItemStack stackInHand)
+    private void onItemUse(CallbackInfo ci, Hand[] hands, int handCount, int handIndex, Hand hand, ItemStack stackInHand)
     {
-        if (!stackInHand.isEmpty() && this.player.pitch > 35.0F && LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable()) {
-            if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.MISS && this.player.onGround) {
+        if (!stackInHand.isEmpty() && this.player.pitch > 35.0F && LambdaControlsClient.get().reacharound.isReacharoundAvailable()) {
+            if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.MISS && this.player.isOnGround()) {
                 if (!stackInHand.isEmpty() && stackInHand.getItem() instanceof BlockItem) {
-                    BlockPos playerPos = this.player.getBlockPos().down();
-                    BlockPos targetPos = new BlockPos(this.crosshairTarget.getPos()).subtract(playerPos);
-                    BlockPos vector = new BlockPos(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
-                    BlockPos blockPos = playerPos.add(vector);
+                    BlockHitResult hitResult = LambdaControlsClient.get().reacharound.getLastReacharoundResult();
 
-                    Direction direction = player.getHorizontalFacing();
-
-                    BlockState adjacentBlockState = this.world.getBlockState(blockPos.offset(direction.getOpposite()));
-                    if (adjacentBlockState.isAir() || adjacentBlockState.getBlock() instanceof FluidBlock || (vector.getX() == 0 && vector.getZ() == 0)) {
+                    if (hitResult == null)
                         return;
-                    }
 
-                    BlockHitResult hitResult = new BlockHitResult(this.crosshairTarget.getPos(), direction.getOpposite(), blockPos, false);
+                    hitResult = LambdaReacharound.withSideForReacharound(hitResult, stackInHand);
 
                     int previousStackCount = stackInHand.getCount();
                     ActionResult result = this.interactionManager.interactBlock(this.player, this.world, hand, hitResult);

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java

@@ -11,13 +11,18 @@ package me.lambdaurora.lambdacontrols.client.mixin;
 
 import me.lambdaurora.lambdacontrols.ControlsMode;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.LambdaControlsConfig;
 import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
  * Adds extra access to the mouse.
@@ -26,21 +31,30 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MouseMixin implements MouseAccessor
 {
     @Shadow
-    protected abstract void onCursorPos(long window, double x, double y);
+    @Final
+    private MinecraftClient client;
 
-    @Shadow
-    protected abstract void onMouseButton(long window, int button, int action, int mods);
+    @Invoker("onCursorPos")
+    public abstract void lambdacontrols_onCursorPos(long window, double x, double y);
+
+    @Inject(method = "isCursorLocked", at = @At("HEAD"), cancellable = true)
+    private void isCursorLocked(CallbackInfoReturnable<Boolean> ci)
+    {
+        if (client.currentScreen == null) {
+            LambdaControlsConfig config = LambdaControlsClient.get().config;
+            if (config.getControlsMode() == ControlsMode.CONTROLLER && config.hasVirtualMouse()) {
+                ci.setReturnValue(true);
+                ci.cancel();
+            }
+        }
+    }
 
     @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
-    private void lambdacontrols_onMouseLocked(CallbackInfo ci)
+    private void onCursorLocked(CallbackInfo ci)
     {
-        if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.TOUCHSCREEN)
+        LambdaControlsConfig config = LambdaControlsClient.get().config;
+        if (config.getControlsMode() == ControlsMode.TOUCHSCREEN
+                || (config.getControlsMode() == ControlsMode.CONTROLLER && config.hasVirtualMouse()))
             ci.cancel();
     }
-
-    @Override
-    public void lambdacontrols_onCursorPos(long window, double x, double y)
-    {
-        this.onCursorPos(window, x, y);
-    }
 }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java

@@ -13,7 +13,7 @@ import me.lambdaurora.lambdacontrols.ControlsMode;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.gui.ControllerControlsScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.SettingsScreen;
+import net.minecraft.client.gui.screen.options.OptionsScreen;
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
@@ -24,20 +24,20 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 /**
  * Injects the new controls settings button.
  */
-@Mixin(SettingsScreen.class)
-public class SettingsScreenMixin extends Screen
+@Mixin(OptionsScreen.class)
+public class OptionsScreenMixin extends Screen
 {
-    protected SettingsScreenMixin(Text title)
+    protected OptionsScreenMixin(Text title)
     {
         super(title);
     }
 
-    @Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SettingsScreen;addButton(Lnet/minecraft/client/gui/widget/AbstractButtonWidget;)Lnet/minecraft/client/gui/widget/AbstractButtonWidget;", ordinal = 7))
-    private AbstractButtonWidget lambdacontrols_onInit(SettingsScreen screen, AbstractButtonWidget btn)
+    @Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/options/OptionsScreen;addButton(Lnet/minecraft/client/gui/widget/AbstractButtonWidget;)Lnet/minecraft/client/gui/widget/AbstractButtonWidget;", ordinal = 7))
+    private AbstractButtonWidget lambdacontrols_onInit(OptionsScreen screen, AbstractButtonWidget btn)
     {
         if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
-            return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).lambdacontrols_getHeight(), btn.getMessage(),
-                    b -> this.minecraft.openScreen(new ControllerControlsScreen(this, false))));
+            return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).getHeight(), btn.getMessage(),
+                    b -> this.client.openScreen(new ControllerControlsScreen(this, false))));
         } else {
             return this.addButton(btn);
         }

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.mixin;
+
+import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
+import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import java.util.List;
+
+@Mixin(RecipeBookWidget.class)
+public interface RecipeBookWidgetAccessor
+{
+    @Accessor("tabButtons")
+    List<RecipeGroupButtonWidget> getTabButtons();
+
+    @Accessor("currentTab")
+    RecipeGroupButtonWidget getCurrentTab();
+
+    @Accessor("currentTab")
+    void setCurrentTab(RecipeGroupButtonWidget currentTab);
+
+    @Invoker("refreshResults")
+    void lambdacontrols_refreshResults(boolean resetCurrentPage);
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.mixin;
+
+import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.LambdaReacharound;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.*;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemUsageContext;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Matrix4f;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.shape.VoxelShape;
+import org.spongepowered.asm.mixin.Final;
+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;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+/**
+ * Represents a mixin to WorldRenderer.
+ * <p>
+ * Handles the rendering of the block outline of the front block placing.
+ */
+@Mixin(WorldRenderer.class)
+public abstract class WorldRendererMixin
+{
+    @Shadow
+    @Final
+    private MinecraftClient client;
+
+    @Shadow
+    private ClientWorld world;
+
+    @Shadow
+    private static void drawShapeOutline(MatrixStack matrixStack, VertexConsumer vertexConsumer, VoxelShape voxelShape, double d, double e, double f, float g, float h, float i, float j)
+    {
+    }
+
+    @Inject(
+            method = "render",
+            at = @At(
+                    value = "FIELD",
+                    target = "Lnet/minecraft/client/MinecraftClient;crosshairTarget:Lnet/minecraft/util/hit/HitResult;",
+                    ordinal = 1,
+                    shift = At.Shift.AFTER
+            ),
+            locals = LocalCapture.CAPTURE_FAILEXCEPTION
+    )
+    private void onOutlineRender(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer,
+                                 LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci,
+                                 Profiler profiler, Vec3d cameraPos, double x, double y, double z, Matrix4f modelMatrix, boolean bl, Frustum frustum2, boolean bl3,
+                                 VertexConsumerProvider.Immediate immediate)
+    {
+        if (this.client.crosshairTarget == null || this.client.crosshairTarget.getType() != HitResult.Type.MISS || !LambdaControlsClient.get().config.shouldRenderReacharoundOutline())
+            return;
+        BlockHitResult result = LambdaControlsClient.get().reacharound.getLastReacharoundResult();
+        if (result == null)
+            return;
+        BlockPos blockPos = result.getBlockPos();
+        if (this.world.getWorldBorder().contains(blockPos)) {
+            ItemStack stack = this.client.player.getStackInHand(Hand.MAIN_HAND);
+            if (stack == null || !(stack.getItem() instanceof BlockItem))
+                return;
+            Block block = ((BlockItem) stack.getItem()).getBlock();
+            result = LambdaReacharound.withSideForReacharound(result, block);
+            ItemPlacementContext context = new ItemPlacementContext(new ItemUsageContext(this.client.player, Hand.MAIN_HAND, result));
+            VertexConsumer vertexConsumer = immediate.getBuffer(RenderLayer.getLines());
+            BlockState placementState = block.getPlacementState(context);
+            if (placementState == null)
+                return;
+            VoxelShape outlineShape = placementState.getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
+            int[] color = LambdaControlsClient.get().config.getReacharoundOutlineColor();
+            drawShapeOutline(matrices, vertexConsumer, outlineShape, (double) blockPos.getX() - x, (double) blockPos.getY() - y, (double) blockPos.getZ() - z, color[0] / 255.f, color[1] / 255.f, color[2] / 255.f, color[3] / 255.f);
+        }
+    }
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/ring/KeyBindingRing.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of LambdaControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package me.lambdaurora.lambdacontrols.client.ring;
+
+/**
+ * Represents a key binding ring.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public class KeyBindingRing
+{
+
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java

@@ -9,26 +9,28 @@
 
 package me.lambdaurora.lambdacontrols.client.util;
 
-import net.minecraft.container.Slot;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.screen.slot.SlotActionType;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents an accessor to AbstractContainerScreen.
  */
-public interface ContainerScreenAccessor
+public interface HandledScreenAccessor
 {
     /**
      * Gets the left coordinate of the GUI.
      *
      * @return The left coordinate of the GUI.
      */
-    int lambdacontrols_getX();
+    int getX();
 
     /**
      * Gets the top coordinate of the GUI.
      *
      * @return The top coordinate of the GUI.
      */
-    int lambdacontrols_getY();
+    int getY();
 
     /**
      * Gets the slot at position.
@@ -38,4 +40,16 @@ public interface ContainerScreenAccessor
      * @return The slot at the specified position.
      */
     Slot lambdacontrols_getSlotAt(double pos_x, double pos_y);
+
+    boolean lambdacontrols_isClickOutsideBounds(double mouseX, double mouseY, int x, int y, int button);
+
+    /**
+     * Handles a mouse click on the specified slot.
+     *
+     * @param slot       The slot instance.
+     * @param slotId     The slot id.
+     * @param clickData  The click data.
+     * @param actionType The action type.
+     */
+    void lambdacontrols_onMouseClick(@Nullable Slot slot, int slotId, int clickData, SlotActionType actionType);
 }

fabric/src/main/resources/assets/lambdacontrols/lang/en_us.json

@@ -19,6 +19,7 @@
   "lambdacontrols.action.pick_block": "Pick Block",
   "lambdacontrols.action.pickup": "Pickup",
   "lambdacontrols.action.pickup_all": "Pickup all",
+  "lambdacontrols.action.place": "Place",
   "lambdacontrols.action.player_list": "Player List",
   "lambdacontrols.action.quick_move": "Quick move",
   "lambdacontrols.action.right": "Right",
@@ -59,7 +60,6 @@
   "lambdacontrols.controller.connected": "Controller %d connected.",
   "lambdacontrols.controller.disconnected": "Controller %d disconnected.",
   "lambdacontrols.controller.mappings.1": "To configure the controller mappings, please use %sSDL2 Gamepad Tool%s",
-  "lambdacontrols.controller.mappings.2": "(%s%s%s),",
   "lambdacontrols.controller.mappings.3": "and put the mapping in `%s.minecraft/config/gamecontrollerdb.txt%s`.",
   "lambdacontrols.controller.mappings.updated": "Updated mappings!",
   "lambdacontrols.controller_type.default": "default",
@@ -79,15 +79,17 @@
   "lambdacontrols.menu.controller_type": "Controller Type",
   "lambdacontrols.menu.controls_mode": "Mode",
   "lambdacontrols.menu.dead_zone": "Dead Zone",
+  "lambdacontrols.menu.fast_block_placing": "Fast Block Placing",
   "lambdacontrols.menu.fly_drifting": "Fly Drifting",
   "lambdacontrols.menu.fly_drifting_vertical": "Vertical Fly Drifting",
-  "lambdacontrols.menu.front_block_placing": "Front Block Placing",
   "lambdacontrols.menu.hud_enable": "Enable HUD",
   "lambdacontrols.menu.hud_side": "HUD Side",
   "lambdacontrols.menu.invert_right_x_axis": "Invert Right X",
   "lambdacontrols.menu.invert_right_y_axis": "Invert Right Y",
   "lambdacontrols.menu.keyboard_controls": "Keyboard Controls...",
   "lambdacontrols.menu.mouse_speed": "Mouse Speed",
+  "lambdacontrols.menu.reacharound.horizontal": "Front Block Placing",
+  "lambdacontrols.menu.reacharound.vertical": "Vertical Reacharound",
   "lambdacontrols.menu.reload_controller_mappings": "Reload Controller Mappings",
   "lambdacontrols.menu.rotation_speed": "Rotation Speed",
   "lambdacontrols.menu.title": "LambdaControls - Settings",
@@ -98,6 +100,8 @@
   "lambdacontrols.menu.title.hud": "HUD Options",
   "lambdacontrols.menu.unbound": "Unbound",
   "lambdacontrols.menu.unfocused_input": "Unfocused Input",
+  "lambdacontrols.menu.virtual_mouse": "Virtual Mouse",
+  "lambdacontrols.menu.virtual_mouse.skin": "Virtual Mouse Skin",
   "lambdacontrols.narrator.unbound": "Unbound %s",
   "lambdacontrols.not_bound": "Not bound",
   "lambdacontrols.tooltip.auto_switch_mode": "If the controls mode should be switched to Controller automatically if one is connected.",
@@ -105,13 +109,20 @@
   "lambdacontrols.tooltip.controller_type": "The controller type to display the correct buttons.",
   "lambdacontrols.tooltip.controls_mode": "The controls mode.",
   "lambdacontrols.tooltip.dead_zone": "The dead zone for the controller's analogue sticks.",
-  "lambdacontrols.tooltip.fly_drifting": "While flying, enables drifting/inertia.",
-  "lambdacontrols.tooltip.fly_drifting_vertical": "While flying, enables vertical drifting/intertia.",
-  "lambdacontrols.tooltip.front_block_placing": "Enables front block placing, §cmight be considered cheating on some servers§r.",
+  "lambdacontrols.tooltip.fast_block_placing": "While flying in creative mode, enables fast block placing depending on your speed. §cOn some servers this might be considered as cheating.",
+  "lambdacontrols.tooltip.fly_drifting": "While flying, enables Vanilla drifting/inertia.",
+  "lambdacontrols.tooltip.fly_drifting_vertical": "While flying, enables Vanilla vertical drifting/intertia.",
   "lambdacontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
   "lambdacontrols.tooltip.hud_side": "The position of the HUD.",
   "lambdacontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
-  "lambdacontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.",
+  "lambdacontrols.tooltip.reacharound.horizontal": "Enables front block placing, §cmight be considered cheating on some servers§r.",
+  "lambdacontrols.tooltip.reacharound.vertical": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.",
   "lambdacontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.",
-  "lambdacontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused."
+  "lambdacontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.",
+  "lambdacontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused.",
+  "lambdacontrols.tooltip.virtual_mouse": "Enable the virtual mouse which is handful in the case of a splitscreen.",
+  "lambdacontrols.virtual_mouse.skin.default_light": "Default Light",
+  "lambdacontrols.virtual_mouse.skin.default_dark": "Default Dark",
+  "lambdacontrols.virtual_mouse.skin.second_light": "Second Light",
+  "lambdacontrols.virtual_mouse.skin.second_dark": "Second Dark"
 }

fabric/src/main/resources/assets/lambdacontrols/lang/fr_ca.json

@@ -19,6 +19,7 @@
   "lambdacontrols.action.pick_block": "Choisir le bloc",
   "lambdacontrols.action.pickup": "Prendre",
   "lambdacontrols.action.pickup_all": "Prendre tout",
+  "lambdacontrols.action.place": "Placer",
   "lambdacontrols.action.player_list": "Afficher la liste des joueurs",
   "lambdacontrols.action.quick_move": "Mouvement rapide",
   "lambdacontrols.action.right": "Aller à droite",
@@ -59,7 +60,6 @@
   "lambdacontrols.controller.connected": "Manette %d connecté.",
   "lambdacontrols.controller.disconnected": "Manette %d déconnecté.",
   "lambdacontrols.controller.mappings.1": "Pour configurer les correspondances de la manette, veuillez utiliser %sSDL2 Gamepad Tool%s",
-  "lambdacontrols.controller.mappings.2": "(%s%s%s),",
   "lambdacontrols.controller.mappings.3": "et mettez les correspondances dans le fichier `%s.minecraft/config/gamecontrollerdb.txt%s`.",
   "lambdacontrols.controller.mappings.updated": "Configuration des manettes mise à jour!",
   "lambdacontrols.controller_type.default": "default",
@@ -81,13 +81,14 @@
   "lambdacontrols.menu.dead_zone": "Zone morte",
   "lambdacontrols.menu.fly_drifting": "Inertie de vol",
   "lambdacontrols.menu.fly_drifting_vertical": "Inertie verticale de vol",
-  "lambdacontrols.menu.front_block_placing": "Placement avant de bloc",
   "lambdacontrols.menu.hud_enable": "Activer le HUD",
   "lambdacontrols.menu.hud_side": "Côté du HUD",
   "lambdacontrols.menu.invert_right_x_axis": "Inverser le stick droit (X)",
   "lambdacontrols.menu.invert_right_y_axis": "Inverser le stick droit (Y)",
   "lambdacontrols.menu.keyboard_controls": "Contrôles clavier...",
   "lambdacontrols.menu.mouse_speed": "Vitesse de la souris",
+  "lambdacontrols.menu.reacharound.horizontal": "Placement avant de bloc",
+  "lambdacontrols.menu.reacharound.vertical": "Placement vertical",
   "lambdacontrols.menu.reload_controller_mappings": "Recharge la configuration des manettes",
   "lambdacontrols.menu.rotation_speed": "Vitesse de rotation",
   "lambdacontrols.menu.title": "LambdaControls - Paramètres",
@@ -98,6 +99,8 @@
   "lambdacontrols.menu.title.hud": "Options du HUD",
   "lambdacontrols.menu.unbound": "Délier",
   "lambdacontrols.menu.unfocused_input": "Entrée en fond",
+  "lambdacontrols.menu.virtual_mouse": "Souris virtuelle",
+  "lambdacontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
   "lambdacontrols.narrator.unbound": "Délier %s",
   "lambdacontrols.not_bound": "Non défini",
   "lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
@@ -105,13 +108,20 @@
   "lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
   "lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
   "lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
-  "lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement.",
-  "lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical.",
-  "lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
+  "lambdacontrols.tooltip.fast_block_placing": "Active le placement rapide de blocs en vol.",
+  "lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
+  "lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
   "lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
   "lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
   "lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
-  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.reacharound.horizontal": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "lambdacontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
   "lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
-  "lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée."
+  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
+  "lambdacontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
+  "lambdacontrols.virtual_mouse.skin.default_light": "défaut clair",
+  "lambdacontrols.virtual_mouse.skin.default_dark": "défaut foncé",
+  "lambdacontrols.virtual_mouse.skin.second_light": "second clair",
+  "lambdacontrols.virtual_mouse.skin.second_dark": "second foncé"
 }

fabric/src/main/resources/assets/lambdacontrols/lang/fr_fr.json

@@ -19,6 +19,7 @@
   "lambdacontrols.action.pick_block": "Choisir le bloc",
   "lambdacontrols.action.pickup": "Prendre",
   "lambdacontrols.action.pickup_all": "Prendre tout",
+  "lambdacontrols.action.place": "Placer",
   "lambdacontrols.action.player_list": "Afficher la liste des joueurs",
   "lambdacontrols.action.quick_move": "Mouvement rapide",
   "lambdacontrols.action.right": "Aller à droite",
@@ -59,7 +60,6 @@
   "lambdacontrols.controller.connected": "Manette %d connecté.",
   "lambdacontrols.controller.disconnected": "Manette %d déconnecté.",
   "lambdacontrols.controller.mappings.1": "Pour configurer les correspondances de la manette, veuillez utiliser %sSDL2 Gamepad Tool%s",
-  "lambdacontrols.controller.mappings.2": "(%s%s%s),",
   "lambdacontrols.controller.mappings.3": "et mettez les correspondances dans le fichier `%s.minecraft/config/gamecontrollerdb.txt%s`.",
   "lambdacontrols.controller.mappings.updated": "Configuration des manettes mise à jour!",
   "lambdacontrols.controller_type.default": "default",
@@ -81,13 +81,14 @@
   "lambdacontrols.menu.dead_zone": "Zone morte",
   "lambdacontrols.menu.fly_drifting": "Inertie de vol",
   "lambdacontrols.menu.fly_drifting_vertical": "Inertie verticale de vol",
-  "lambdacontrols.menu.front_block_placing": "Placement avant de bloc",
   "lambdacontrols.menu.hud_enable": "Activer le HUD",
   "lambdacontrols.menu.hud_side": "Côté du HUD",
   "lambdacontrols.menu.invert_right_x_axis": "Inverser le stick droit (X)",
   "lambdacontrols.menu.invert_right_y_axis": "Inverser le stick droit (Y)",
   "lambdacontrols.menu.keyboard_controls": "Contrôles clavier...",
   "lambdacontrols.menu.mouse_speed": "Vitesse de la souris",
+  "lambdacontrols.menu.reacharound.horizontal": "Placement avant de bloc",
+  "lambdacontrols.menu.reacharound.vertical": "Placement vertical",
   "lambdacontrols.menu.reload_controller_mappings": "Recharge la configuration des manettes",
   "lambdacontrols.menu.rotation_speed": "Vitesse de rotation",
   "lambdacontrols.menu.title": "LambdaControls - Paramètres",
@@ -98,6 +99,8 @@
   "lambdacontrols.menu.title.hud": "Options du HUD",
   "lambdacontrols.menu.unbound": "Délier",
   "lambdacontrols.menu.unfocused_input": "Entrée en fond",
+  "lambdacontrols.menu.virtual_mouse": "Souris virtuelle",
+  "lambdacontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
   "lambdacontrols.narrator.unbound": "Délier %s",
   "lambdacontrols.not_bound": "Non défini",
   "lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
@@ -105,13 +108,20 @@
   "lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
   "lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
   "lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
-  "lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement.",
-  "lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical.",
-  "lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
+  "lambdacontrols.tooltip.fast_block_placing": "Active le placement rapide de blocs en vol.",
+  "lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
+  "lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
   "lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
   "lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
   "lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
-  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.reacharound.horizontal": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "lambdacontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
   "lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
-  "lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée."
+  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
+  "lambdacontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
+  "lambdacontrols.virtual_mouse.skin.default_light": "défaut clair",
+  "lambdacontrols.virtual_mouse.skin.default_dark": "défaut foncé",
+  "lambdacontrols.virtual_mouse.skin.second_light": "second clair",
+  "lambdacontrols.virtual_mouse.skin.second_dark": "second foncé"
 }

fabric/src/main/resources/config.toml

@@ -13,14 +13,23 @@ auto_switch_mode = false
 
 # Gameplay settings
 [gameplay]
-    # Enables front block placing like in Bedrock Edition.
-    front_block_placing = false
+    # Enables fast block placing like in Bedrock Edition.
+    fast_block_placing = true
     # Fly behaviors
     [gameplay.fly]
         # Enables fly drifting.
         drifting = false
         # Enables vertical fly drifting.
         vertical_drifting = true
+    [gameplay.reacharound]
+        # Enables front block placing like in Bedrock Edition.
+        horizontal = false
+        # Enables vertical reacharound.
+        vertical = false
+        # Enables front block placing outline.
+        outline = true
+        # The color in a hexadecimal format of the outline.
+        outline_color = "#ffffff66"
 
 # Controller settings
 [controller]
@@ -33,7 +42,7 @@ auto_switch_mode = false
     # Controller's dead zone.
     dead_zone = 0.20
     # Rotation speed for look directions.
-    rotation_speed = 40.0
+    rotation_speed = 10.0
     # Mouse speed in GUI.
     mouse_speed = 30.0
     # Inverts the right X axis.
@@ -42,6 +51,10 @@ auto_switch_mode = false
     invert_right_y_axis = false
     # Allow unfocused input.
     unfocused_input = false
+    # Virtual mouse.
+    virtual_mouse = false
+    # Virtual mouse skin
+    virtual_mouse_skin = "default_light"
     # Controller controls.
     [controller.controls]
         # Attack control.
@@ -88,10 +101,10 @@ auto_switch_mode = false
         sprint = "9"
         # Swap hands control.
         swap_hands = "2"
-        # Switch to left tab control.
-        tab_left = "4"
-        # Switch to right tab control.
-        tab_right = "5"
+        # Switch to back tab control.
+        tab_back = "4"
+        # Switch to next tab control.
+        tab_next = "5"
         # Toggle perspective control.
         toggle_perspective = "11+3"
         # Toggle smooth camera control.

fabric/src/main/resources/fabric.mod.json

@@ -27,22 +27,32 @@
     ]
   },
   "mixins": [
-    "lambdacontrols.mixins.json"
+    "lambdacontrols.mixins.json",
+    "lambdacontrols_compat.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.4.0",
+    "fabricloader": ">=0.8.0",
     "fabric": "*",
-    "minecraft": "1.15.x",
-    "spruceui": ">=1.3.4"
+    "minecraft": ">=1.16",
+    "spruceui": ">=1.5.2"
   },
   "recommends": {
-    "modmenu": ">=1.8.0+build.16",
-    "okzoomer": ">=1.0.4"
+    "modmenu": ">=1.12.2"
   },
   "suggests": {
-    "flamingo": "*"
+    "flamingo": "*",
+    "roughlyenoughitems": ">=4.5.5",
+    "okzoomer": ">=4.0.0"
+  },
+  "breaks": {
+    "modmenu": "<1.12.2",
+    "optifabric": "*"
   },
   "custom": {
-    "modmenu:clientsideOnly": true
+    "modmenu:clientsideOnly": true,
+    "modupdater": {
+      "strategy": "curseforge",
+      "projectID": 354231
+    }
   }
 }

fabric/src/main/resources/lambdacontrols.mixins.json

@@ -5,17 +5,20 @@
   "client": [
     "AbstractButtonWidgetAccessor",
     "AdvancementsScreenAccessor",
-    "ContainerScreenMixin",
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
     "ControlsOptionsScreenMixin",
     "CreativeInventoryScreenAccessor",
     "EntryListWidgetAccessor",
+    "GameOptionsMixin",
     "GameRendererMixin",
+    "HandledScreenMixin",
     "KeyBindingMixin",
     "MinecraftClientMixin",
     "MouseMixin",
-    "SettingsScreenMixin"
+    "OptionsScreenMixin",
+    "RecipeBookWidgetAccessor",
+    "WorldRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric/src/main/resources/lambdacontrols_compat.mixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "me.lambdaurora.lambdacontrols.client.compat.mixin",
+  "plugin": "me.lambdaurora.lambdacontrols.client.compat.LambdaControlsMixinPlugin",
+  "compatibilityLevel": "JAVA_8",
+  "client": [
+    "RecipeViewingScreenAccessor",
+    "VillagerRecipeViewingScreenAccessor"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15.2
-	yarn_mappings=1.15.2+build.9:v2
-	loader_version=0.7.6+build.180
+	minecraft_version=1.16.1
+	yarn_mappings=1.16.1+build.9:v2
+	loader_version=0.8.8+build.202
 
 # Mod Properties
-	mod_version = 1.1.0
-	maven_group = me.lambdaurora
+	mod_version = 1.3.2
+	maven_group = me.lambdaurora.lambdacontrols
 	archives_base_name = lambdacontrols
 
 # 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.4.29+build.290-1.15
-	spruceui_version=1.3.4
-
+	fabric_version=0.14.0+build.371-1.16
+	spruceui_version=1.5.2
+	modmenu_version=1.12.2+build.17