🔖 LambdaControls v1.4.0: Analog movements, 1.16.2 compat, better API, etc.

CHANGELOG.md

@@ -45,3 +45,47 @@ This update also has a backport 1.14.4 version ([#9](https://github.com/LambdAur
 - Added reset settings button.
 - HUD side affects button indicators now.
 - Added support for Advancements tabs.
+
+### v1.1.1
+
+## v1.2.0-1.3.0
+
+- Improved rotation algorithm ([#11](https://github.com/LambdAurora/LambdaControls/issues/11)).
+- Added virtual mouse.
+- Added outline on front block placing.
+- Added fast block placement ([#8](https://github.com/LambdAurora/LambdaControls/issues/8)).
+- Added [REI](https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items) compatibility.
+- Improved HUD.
+- Added recipe book control.
+- And more!
+- v1.3.0 specific: Updated to Minecraft 1.16.1
+
+### v1.3.1
+
+- Fixed broken inventory interactions ([#13](https://github.com/LambdAurora/LambdaControls/issues/13))
+- Fixed virtual mouse preventing continuous attack (thus making breaking blocks impossible).
+- Added support for [ModUpdater](https://gitea.thebrokenrail.com/TheBrokenRail/ModUpdater) hopefully.
+- Updated [SpruceUI](https://github.com/LambdAurora/SpruceUI) to 1.5.2.
+
+### v1.3.2
+
+- Added vertical reacharound.
+- Added more API for compatibility handlers.
+- Improved reacharound API.
+- Improved [REI](https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items) compatibility.
+
+## v1.4.0
+
+ - Added analog movements ([#10](https://github.com/LambdAurora/LambdaControls/issues/10)).
+ - Improved Ok Zoomer compability.
+ - Updated [SpruceUI](https://github.com/LambdAurora/SpruceUI) to 1.5.8 to ensure 1.16.2 compability.
+ - Internal changes:
+   - Added analog input value to button bindings.
+   - Replace lot of strings with Texts.
+   - Improved block outline rendering injection.
+   - Shadow library jars instead of Jar-in-Jar.
+ - Fixed crash in inventory ([#16](https://github.com/LambdAurora/LambdaControls/issues/16))
+ - WIP:
+   - Started to work on action ring.
+     - Will allow for better compability with other mods.
+     - Might be interesting for keyboard users too.

README.md

@@ -7,13 +7,15 @@
 ![Version](https://img.shields.io/github/v/tag/LambdAurora/LambdaControls?label=version&style=flat-square)
 [![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.
+A Fabric Minecraft mod which adds better controls, reach-around and controller support.
 
 ## What's this mod?
 
+This mod adds better controls, reach-around features, etc.
+
 Haven't you dreamed to travel in your modded Minecraft world with your controller? Yes? Then this mod is made for you!
 
-This mod adds a controller support (and an experimental touchscreen support).
+This mod also adds controller support.
 
 ## ✅ Features:
 
@@ -21,7 +23,7 @@ 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.
+ - Vertical reach-around.
  - Many Bedrock Edition features:
    - Toggleable fly drifting
    - Front block placing (be careful with this one)

build.gradle

@@ -20,14 +20,6 @@ allprojects {
 		options.encoding = "UTF-8"
 	}
 
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this task, sources will not be generated.
-	task sourcesJar(type: Jar, dependsOn: classes) {
-		classifier = "sources"
-		from sourceSets.main.allSource
-	}
-
 	publishing {
 		repositories {
 			mavenLocal()

core/build.gradle

@@ -15,6 +15,8 @@ dependencies {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
 }
 
 publishing {

fabric/build.gradle

@@ -1,3 +1,5 @@
+import net.fabricmc.loom.task.RemapJarTask
+
 plugins {
     id 'fabric-loom' version '0.4-SNAPSHOT'
     id 'java-library'
@@ -38,28 +40,27 @@ dependencies {
     //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}"
-    modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modCompile "io.github.prospector:modmenu:${project.modmenu_version}"
-    modCompile "com.github.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
+    modImplementation "com.github.lambdaurora:spruceui:${project.spruceui_version}"
     include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
 
     // Compatibility mods
-    modCompile "io.github.joaoh1:okzoomer:4.0.0-alpha.3.1.16.pre5"
-    modCompile "me.shedaniel:RoughlyEnoughItems:4.5.5"
+    modImplementation "io.github.joaoh1:okzoomer:4.0.0-alpha.4.1.16.1"
+    modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5"
 
     api project(":core")
     shadow project(":core")
-    include "org.jetbrains:annotations:17.0.0"
-    include("org.aperlambda:lambdajcommon:1.8.0")  {
+    shadow("org.aperlambda:lambdajcommon:1.8.0")  {
         exclude group: 'com.google.code.gson'
         exclude group: 'com.google.guava'
     }
-    include "com.electronwill.night-config:core:3.5.3"
-    include "com.electronwill.night-config:toml:3.5.3"
+    shadow "com.electronwill.night-config:core:3.5.3"
+    shadow "com.electronwill.night-config:toml:3.5.3"
 }
 
 processResources {
@@ -78,6 +79,8 @@ processResources {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
 }
 
 jar {
@@ -92,6 +95,26 @@ jar {
     }
 }
 
+task shadowJar(type: Jar) {
+    archiveClassifier.set("dev")
+
+    from sourceSets.main.output
+
+    from {
+        configurations.shadow.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
+}
+
+task shadowRemapJar(type: RemapJarTask) {
+    dependsOn shadowJar
+
+    input = file("${project.buildDir}/libs/$archivesBaseName-$version-dev.jar")
+    archiveName = "${archivesBaseName}-${version}.jar"
+    addNestedDependencies = true
+}
+
 // configure the maven publication
 publishing {
     publications {
@@ -107,5 +130,6 @@ publishing {
     }
 }
 
+shadowJar.dependsOn(":core:jar")
 build.dependsOn(":core:build")
 publish.dependsOn(":core:publish")

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

@@ -9,7 +9,8 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import org.aperlambda.lambdacommon.utils.Nameable;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,7 +21,7 @@ import java.util.Optional;
  * Represents a controller type.
  *
  * @author LambdAurora
- * @version 1.0.0
+ * @version 1.4.0
  * @since 1.0.0
  */
 public enum ControllerType implements Nameable
@@ -32,11 +33,13 @@ public enum ControllerType implements Nameable
     STEAM(4),
     OUYA(5);
 
-    private final int id;
+    private final int  id;
+    private final Text text;
 
     ControllerType(int id)
     {
         this.id = id;
+        this.text = new TranslatableText(this.getTranslationKey());
     }
 
     /**
@@ -54,7 +57,7 @@ public enum ControllerType implements Nameable
      *
      * @return The next available controller type.
      */
-    public ControllerType next()
+    public @NotNull ControllerType next()
     {
         ControllerType[] v = values();
         if (v.length == this.ordinal() + 1)
@@ -63,13 +66,23 @@ public enum ControllerType implements Nameable
     }
 
     /**
-     * Gets the translated name of this controller type.
+     * Returns the translation key of this controller type.
      *
-     * @return The translated name of this controller type.
+     * @return The translation key.
      */
-    public String getTranslatedName()
+    public @NotNull String getTranslationKey()
     {
-        return I18n.translate("lambdacontrols.controller_type." + this.getName());
+        return "lambdacontrols.controller_type." + this.getName();
+    }
+
+    /**
+     * Gets the translated text of this controller type.
+     *
+     * @return The translated text of this controller type.
+     */
+    public @NotNull Text getTranslatedText()
+    {
+        return this.text;
     }
 
     @Override
@@ -84,7 +97,7 @@ public enum ControllerType implements Nameable
      * @param id The identifier of the controller type.
      * @return The controller type if found, else empty.
      */
-    public static Optional<ControllerType> byId(@NotNull String id)
+    public static @NotNull Optional<ControllerType> byId(@NotNull String id)
     {
         return Arrays.stream(values()).filter(mode -> mode.getName().equalsIgnoreCase(id)).findFirst();
     }

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

@@ -10,6 +10,8 @@
 package me.lambdaurora.lambdacontrols.client;
 
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import org.aperlambda.lambdacommon.utils.Nameable;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,7 +22,7 @@ import java.util.Optional;
  * Represents the hud side which is the side where the movements buttons are.
  *
  * @author LambdAurora
- * @version 1.0.0
+ * @version 1.4.0
  * @since 1.0.0
  */
 public enum HudSide implements Nameable
@@ -28,12 +30,19 @@ public enum HudSide implements Nameable
     LEFT,
     RIGHT;
 
+    private final Text text;
+
+    HudSide()
+    {
+        this.text = new TranslatableText(this.getTranslationKey());
+    }
+
     /**
      * Returns the next side available.
      *
      * @return The next available side.
      */
-    public HudSide next()
+    public @NotNull HudSide next()
     {
         HudSide[] v = values();
         if (v.length == this.ordinal() + 1)
@@ -42,13 +51,23 @@ public enum HudSide implements Nameable
     }
 
     /**
-     * Gets the translated name of this hud side.
+     * Returns the translation key of this hud side.
      *
-     * @return The translated name of this hud side.
+     * @return The translation key of this hude side.
      */
-    public String getTranslatedName()
+    public @NotNull String getTranslationKey()
     {
-        return I18n.translate("lambdacontrols.hud_side." + this.getName());
+        return "lambdacontrols.hud_side." + this.getName();
+    }
+
+    /**
+     * Gets the translated text of this hud side.
+     *
+     * @return The translated text of this hud side.
+     */
+    public @NotNull Text getTranslatedText()
+    {
+        return this.text;
     }
 
     @Override
@@ -63,7 +82,7 @@ public enum HudSide implements Nameable
      * @param id The identifier of the hud side.
      * @return The hud side if found, else empty.
      */
-    public static Optional<HudSide> byId(@NotNull String id)
+    public static @NotNull Optional<HudSide> byId(@NotNull String id)
     {
         return Arrays.stream(values()).filter(mode -> mode.getName().equalsIgnoreCase(id)).findFirst();
     }

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

@@ -61,12 +61,12 @@ public class LambdaControlsConfig
     protected final FileConfig           config = FileConfig.builder("config/lambdacontrols.toml").concurrent().defaultResource("/config.toml").build();
     private final   LambdaControlsClient mod;
     private         ControlsMode         controlsMode;
-    private         ControllerType controllerType;
+    private         ControllerType       controllerType;
     // Gameplay.
-    private         boolean shouldRenderReacharoundOutline;
-    private         int[]   reacharoundOutlineColor;
+    private         boolean              shouldRenderReacharoundOutline;
+    private         int[]                reacharoundOutlineColor;
     // Controller settings
-    private         double  deadZone;
+    private         double               deadZone;
     private         double               rotationSpeed;
     private         double               mouseSpeed;
     private         boolean              unfocusedInput;

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

@@ -11,7 +11,6 @@ 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;
 
 /**

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

@@ -9,6 +9,7 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
+import com.google.common.collect.ImmutableSet;
 import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.lambdacontrols.client.controller.Controller;
@@ -31,6 +32,7 @@ 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.pack.ResourcePackScreen;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
 import net.minecraft.client.gui.widget.AbstractPressableButtonWidget;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
@@ -39,6 +41,7 @@ import net.minecraft.client.gui.widget.SliderWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.text.TranslatableText;
 import net.minecraft.util.math.MathHelper;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.jetbrains.annotations.NotNull;
@@ -61,24 +64,25 @@ import static org.lwjgl.glfw.GLFW.*;
  * Represents the LambdaControls' input handler.
  *
  * @author LambdAurora
- * @version 1.3.2
+ * @version 1.4.0
  * @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              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;
+    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;
+    private              int                   inventoryInteractionCooldown = 0;
 
     public LambdaInput(@NotNull LambdaControlsClient mod)
     {
@@ -155,6 +159,9 @@ public class LambdaInput
                 screen.focusedBinding = null;
             }
         }
+
+        if (this.inventoryInteractionCooldown > 0)
+            this.inventoryInteractionCooldown--;
     }
 
     /**
@@ -212,6 +219,7 @@ public class LambdaInput
             ((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), 0, 0);
             INPUT_MANAGER.resetMouseTarget(client);
         }
+        this.inventoryInteractionCooldown = 5;
     }
 
     private void fetchButtonInput(@NotNull MinecraftClient client, @NotNull GLFWGamepadState gamepadState, boolean leftJoycon)
@@ -315,7 +323,8 @@ public class LambdaInput
             if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
                 if (client.currentScreen != null) {
                     if (!LambdaControlsCompat.handleMenuBack(client, client.currentScreen))
-                        client.currentScreen.onClose();
+                        if (!this.tryGoBack(client.currentScreen))
+                            client.currentScreen.onClose();
                     return;
                 }
             }
@@ -326,9 +335,11 @@ public class LambdaInput
                 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);
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1),
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
                 } else if (action == 1) {
-                    client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1),
+                            "mouseReleased event handler", client.currentScreen.getClass().getCanonicalName());
                 }
                 this.actionGuiCooldown = 5;
             } else {
@@ -352,6 +363,9 @@ public class LambdaInput
         if (client.interactionManager == null || client.player == null)
             return false;
 
+        if (this.inventoryInteractionCooldown > 0)
+            return true;
+
         if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
             client.player.closeHandledScreen();
             return true;
@@ -397,6 +411,27 @@ public class LambdaInput
         return true;
     }
 
+    /**
+     * Tries to go back.
+     *
+     * @param screen The current screen.
+     * @return True if successful, else false.
+     */
+    public boolean tryGoBack(@NotNull Screen screen)
+    {
+        ImmutableSet<String> set = ImmutableSet.of("gui.back", "gui.done", "gui.cancel", "gui.toTitle", "gui.toMenu");
+        return screen.children().stream().filter(element -> element instanceof AbstractPressableButtonWidget)
+                .map(element -> (AbstractPressableButtonWidget) element)
+                .filter(element -> element.getMessage() instanceof TranslatableText)
+                .anyMatch(element -> {
+                    if (set.stream().anyMatch(key -> key.equals(((TranslatableText) element.getMessage()).getKey()))) {
+                        element.onPress();
+                        return true;
+                    }
+                    return false;
+                });
+    }
+
     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);
@@ -433,6 +468,17 @@ public class LambdaInput
                     BUTTON_COOLDOWNS.put(axisAsButton(axis, false), 5);
                 }
             }
+
+            float axisValue = absValue < this.config.getDeadZone() ? 0.f : (float) (absValue - this.config.getDeadZone());
+            axisValue /= (1.0 - this.config.getDeadZone());
+            if (currentPlusState)
+                InputManager.BUTTON_VALUES.put(axisAsButton(axis, true), axisValue);
+            else
+                InputManager.BUTTON_VALUES.put(axisAsButton(axis, true), 0.f);
+            if (currentMinusState)
+                InputManager.BUTTON_VALUES.put(axisAsButton(axis, false), axisValue);
+            else
+                InputManager.BUTTON_VALUES.put(axisAsButton(axis, false), 0.f);
         }
 
         double deadZone = this.config.getDeadZone();
@@ -457,6 +503,7 @@ public class LambdaInput
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 CreativeInventoryScreen screen = (CreativeInventoryScreen) client.currentScreen;
                 CreativeInventoryScreenAccessor accessor = (CreativeInventoryScreenAccessor) screen;
+                // @TODO allow rebinding to left stick
                 if (accessor.lambdacontrols_hasScrollbar() && absValue >= deadZone) {
                     screen.mouseScrolled(0.0, 0.0, -value);
                 }
@@ -595,7 +642,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 ? EntryListWidget.class_5403.field_25661 : EntryListWidget.class_5403.field_25662);
+            ((EntryListWidgetAccessor) element).lambdacontrols_moveSelection(right ? EntryListWidget.MoveDirection.UP : EntryListWidget.MoveDirection.DOWN);
             return false;
         } else if (element instanceof ParentElement) {
             ParentElement entryList = (ParentElement) element;
@@ -653,7 +700,7 @@ public class LambdaInput
 
     public static boolean isScreenInteractive(@NotNull Screen screen)
     {
-        return !(screen instanceof AdvancementsScreen || screen instanceof HandledScreen || LambdaControlsCompat.requireMouseOnScreen(screen));
+        return !(screen instanceof AdvancementsScreen || screen instanceof HandledScreen || screen instanceof ResourcePackScreen || LambdaControlsCompat.requireMouseOnScreen(screen));
     }
 
     // Inspired from https://github.com/MrCrayfish/Controllable/blob/1.14.X/src/main/java/com/mrcrayfish/controllable/client/ControllerInput.java#L686.

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

@@ -9,7 +9,8 @@
 
 package me.lambdaurora.lambdacontrols.client;
 
-import net.minecraft.client.resource.language.I18n;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import org.aperlambda.lambdacommon.utils.Nameable;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,7 +20,7 @@ import java.util.Optional;
 /**
  * Represents the virtual mouse skins.
  *
- * @version 1.2.0
+ * @version 1.4.0
  * @since 1.2.0
  */
 public enum VirtualMouseSkin implements Nameable
@@ -29,10 +30,13 @@ public enum VirtualMouseSkin implements Nameable
     SECOND_LIGHT("second_light"),
     SECOND_DARK("second_dark");
 
-    private String name;
+    private final String name;
+    private final Text   text;
 
-    VirtualMouseSkin(String name) {
+    VirtualMouseSkin(String name)
+    {
         this.name = name;
+        this.text = new TranslatableText(this.getTranslationKey());
     }
 
     /**
@@ -40,7 +44,7 @@ public enum VirtualMouseSkin implements Nameable
      *
      * @return The next available virtual mouse skin.
      */
-    public VirtualMouseSkin next()
+    public @NotNull VirtualMouseSkin next()
     {
         VirtualMouseSkin[] v = values();
         if (v.length == this.ordinal() + 1)
@@ -49,13 +53,23 @@ public enum VirtualMouseSkin implements Nameable
     }
 
     /**
-     * Gets the translated name of this controller type.
+     * Returns the translation key of this virtual mouse skin.
      *
-     * @return The translated name of this controller type.
+     * @return The virtual mouse skin's translation key.
      */
-    public String getTranslatedName()
+    public @NotNull String getTranslationKey()
     {
-        return I18n.translate("lambdacontrols.virtual_mouse.skin." + this.getName());
+        return "lambdacontrols.virtual_mouse.skin." + this.getName();
+    }
+
+    /**
+     * Gets the translated text of this virtual mouse skin.
+     *
+     * @return The translated text of this virtual mouse skin.
+     */
+    public @NotNull Text getTranslatedText()
+    {
+        return this.text;
     }
 
     @Override
@@ -65,12 +79,12 @@ public enum VirtualMouseSkin implements Nameable
     }
 
     /**
-     * Gets the controller type from its identifier.
+     * Gets the virtual mouse skin from its identifier.
      *
-     * @param id The identifier of the controller type.
-     * @return The controller type if found, else empty.
+     * @param id The identifier of the virtual mouse skin.
+     * @return The virtual mouse skin if found, else empty.
      */
-    public static Optional<VirtualMouseSkin> byId(@NotNull String id)
+    public static @NotNull 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

@@ -13,7 +13,6 @@ 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;

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

@@ -18,7 +18,7 @@ import java.util.Optional;
 
 /**
  * Represents HQM compatibility handler.
- *
+ * <p>
  * This is bad.
  *
  * @author LambdAurora
@@ -27,8 +27,8 @@ import java.util.Optional;
  */
 public class HQMCompat implements CompatHandler
 {
-    public static final String GUI_BASE_CLASS_PATH = "hardcorequesting.client.interfaces.GuiBase";
-    private Optional<Class<?>> guiBaseClass;
+    public static final String             GUI_BASE_CLASS_PATH = "hardcorequesting.client.interfaces.GuiBase";
+    private             Optional<Class<?>> guiBaseClass;
 
     @Override
     public void handle(@NotNull LambdaControlsClient mod)

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

@@ -14,7 +14,6 @@ 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;
@@ -42,7 +41,7 @@ public class LambdaControlsCompat
      */
     public static void init(@NotNull LambdaControlsClient mod)
     {
-        if (FabricLoader.getInstance().isModLoaded("okzoomer") && LambdaReflection.doesClassExist(OkZoomerCompat.OKZOOMER_CLASS_PATH)) {
+        if (FabricLoader.getInstance().isModLoaded("okzoomer")) {
             mod.log("Adding okzoomer compatibility...");
             HANDLERS.add(new OkZoomerCompat());
         }
@@ -132,7 +131,8 @@ public class LambdaControlsCompat
      * @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) {
+    public static boolean handleMenuBack(@NotNull MinecraftClient client, @NotNull Screen screen)
+    {
         for (CompatHandler handler : HANDLERS) {
             if (handler.handleMenuBack(client, screen))
                 return true;

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

@@ -10,8 +10,10 @@
 package me.lambdaurora.lambdacontrols.client.compat;
 
 import io.github.joaoh1.okzoomer.client.OkZoomerClientMod;
+import io.github.joaoh1.okzoomer.main.OkZoomerMod;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
+import org.aperlambda.lambdacommon.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
@@ -36,5 +38,26 @@ public class OkZoomerCompat implements CompatHandler
                 .category(ButtonBinding.MISC_CATEGORY)
                 .linkKeybind(OkZoomerClientMod.zoomKeyBinding)
                 .register();
+
+        new ButtonBinding.Builder("zoom.in")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))
+                .onlyInGame()
+                .cooldown(true)
+                .category(ButtonBinding.MISC_CATEGORY)
+                .linkKeybind(OkZoomerClientMod.increaseZoomKeyBinding)
+                .register();
+        new ButtonBinding.Builder("zoom.out")
+                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
+                .onlyInGame()
+                .cooldown(true)
+                .category(ButtonBinding.MISC_CATEGORY)
+                .linkKeybind(OkZoomerClientMod.decreaseZoomKeyBinding)
+                .register();
+        new ButtonBinding.Builder("zoom.reset")
+                .onlyInGame()
+                .cooldown(true)
+                .category(ButtonBinding.MISC_CATEGORY)
+                .linkKeybind(OkZoomerClientMod.resetZoomKeyBinding)
+                .register();
     }
 }

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

@@ -39,7 +39,7 @@ import static org.lwjgl.glfw.GLFW.*;
  * Represents a compatibility handler for REI.
  *
  * @author LambdAurora
- * @version 1.3.2
+ * @version 1.4.0
  * @since 1.2.0
  */
 public class ReiCompat implements CompatHandler
@@ -79,7 +79,7 @@ public class ReiCompat implements CompatHandler
         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) -> {
+                .action((client, button, value, action) -> {
                     if (action != ButtonState.RELEASE)
                         return false;
                     Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
@@ -130,7 +130,7 @@ public class ReiCompat implements CompatHandler
 
     private static PressAction handlePage(boolean next)
     {
-        return (client, button, action) -> {
+        return (client, button, value, action) -> {
             if (action == ButtonState.RELEASE)
                 return false;
 
@@ -160,7 +160,7 @@ public class ReiCompat implements CompatHandler
      */
     private static PressAction handleTab(boolean next)
     {
-        return (client, button, action) -> {
+        return (client, button, value, action) -> {
             if (action != ButtonState.RELEASE)
                 return false;
 

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

@@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
  * @version 1.3.0
  * @since 1.2.0
  */
-@Mixin(RecipeViewingScreen.class)
+@Mixin(value = RecipeViewingScreen.class, remap = false)
 public interface RecipeViewingScreenAccessor
 {
     @Accessor("categoryBack")

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

@@ -24,7 +24,7 @@ import java.util.List;
  * @version 1.2.0
  * @since 1.2.0
  */
-@Mixin(VillagerRecipeViewingScreen.class)
+@Mixin(value = VillagerRecipeViewingScreen.class, remap = false)
 public interface VillagerRecipeViewingScreenAccessor
 {
     @Accessor("categories")

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

@@ -13,7 +13,6 @@ import me.lambdaurora.lambdacontrols.client.ButtonState;
 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;
@@ -33,7 +32,7 @@ import static org.lwjgl.glfw.GLFW.*;
  * Represents a button binding.
  *
  * @author LambdAurora
- * @version 1.3.0
+ * @version 1.4.0
  * @since 1.0.0
  */
 public class ButtonBinding implements Nameable
@@ -45,21 +44,25 @@ public class ButtonBinding implements Nameable
     public static final ButtonCategory MISC_CATEGORY;
 
     public static final ButtonBinding ATTACK             = new Builder("attack").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true)).onlyInGame().register();
-    public static final ButtonBinding BACK               = new Builder("back").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, false)).onlyInGame().register();
+    public static final ButtonBinding BACK               = new Builder("back").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, false))
+            .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding CHAT               = new Builder("chat").buttons(GLFW_GAMEPAD_BUTTON_DPAD_RIGHT).onlyInGame().cooldown(true).register();
     public static final ButtonBinding DROP_ITEM          = new Builder("drop_item").buttons(GLFW_GAMEPAD_BUTTON_B).onlyInGame().cooldown(true).register();
-    public static final ButtonBinding FORWARD            = new Builder("forward").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, true)).onlyInGame().register();
+    public static final ButtonBinding FORWARD            = new Builder("forward").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, true))
+            .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding HOTBAR_LEFT        = new Builder("hotbar_left").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
             .action(InputHandlers.handleHotbar(false)).onlyInGame().cooldown(true).register();
     public static final ButtonBinding HOTBAR_RIGHT       = new Builder("hotbar_right").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
             .action(InputHandlers.handleHotbar(true)).onlyInGame().cooldown(true).register();
     public static final ButtonBinding INVENTORY          = new Builder("inventory").buttons(GLFW_GAMEPAD_BUTTON_Y).onlyInGame().cooldown(true).register();
     public static final ButtonBinding JUMP               = new Builder("jump").buttons(GLFW_GAMEPAD_BUTTON_A).onlyInGame().register();
-    public static final ButtonBinding LEFT               = new Builder("left").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, false)).onlyInGame().register();
+    public static final ButtonBinding LEFT               = new Builder("left").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, false))
+            .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding PAUSE_GAME         = new Builder("pause_game").buttons(GLFW_GAMEPAD_BUTTON_START).action(InputHandlers::handlePauseGame).cooldown(true).register();
     public static final ButtonBinding PICK_BLOCK         = new Builder("pick_block").buttons(GLFW_GAMEPAD_BUTTON_DPAD_LEFT).onlyInGame().cooldown(true).register();
     public static final ButtonBinding PLAYER_LIST        = new Builder("player_list").buttons(GLFW_GAMEPAD_BUTTON_BACK).onlyInGame().register();
-    public static final ButtonBinding RIGHT              = new Builder("right").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, true)).register();
+    public static final ButtonBinding RIGHT              = new Builder("right").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, true))
+            .action(MovementHandler.HANDLER).register();
     public static final ButtonBinding SCREENSHOT         = new Builder("screenshot").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_A)
             .action(InputHandlers::handleScreenshot).cooldown(true).register();
     public static final ButtonBinding SLOT_DOWN          = new Builder("slot_down").buttons(GLFW_GAMEPAD_BUTTON_DPAD_DOWN)
@@ -229,7 +232,7 @@ public class ButtonBinding implements Nameable
      * @param client The client instance.
      * @param state  The state.
      */
-    public void handle(@NotNull MinecraftClient client, @NotNull ButtonState state)
+    public void handle(@NotNull MinecraftClient client, float value, @NotNull ButtonState state)
     {
         if (state == ButtonState.REPEAT && this.hasCooldown && this.cooldown != 0)
             return;
@@ -238,7 +241,7 @@ public class ButtonBinding implements Nameable
 
         }
         for (int i = this.actions.size() - 1; i >= 0; i--) {
-            if (this.actions.get(i).press(client, this, state))
+            if (this.actions.get(i).press(client, this, value, state))
                 break;
         }
     }
@@ -254,8 +257,7 @@ public class ButtonBinding implements Nameable
      *
      * @return The translation key.
      */
-    public @NotNull
-    String getTranslationKey()
+    public @NotNull String getTranslationKey()
     {
         return "lambdacontrols.action." + this.getName();
     }
@@ -283,6 +285,18 @@ public class ButtonBinding implements Nameable
         return positive ? 100 + axis : 200 + axis;
     }
 
+    /**
+     * Returns whether the specified button is an axis or not.
+     *
+     * @param button The button.
+     * @return True if the button is an axis, else false.
+     */
+    public static boolean isAxis(int button)
+    {
+        button %= 500;
+        return button >= 100;
+    }
+
     /**
      * Returns the second Joycon's specified button code.
      *

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

@@ -10,6 +10,7 @@
 package me.lambdaurora.lambdacontrols.client.controller;
 
 import me.lambdaurora.lambdacontrols.client.ButtonState;
+import me.lambdaurora.lambdacontrols.client.LambdaInput;
 import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
 import me.lambdaurora.lambdacontrols.client.mixin.RecipeBookWidgetAccessor;
@@ -38,7 +39,7 @@ import java.util.stream.Collectors;
  * Represents some input handlers.
  *
  * @author LambdAurora
- * @version 1.3.0
+ * @version 1.4.0
  * @since 1.1.0
  */
 public class InputHandlers
@@ -49,7 +50,7 @@ public class InputHandlers
 
     public static PressAction handleHotbar(boolean next)
     {
-        return (client, button, action) -> {
+        return (client, button, value, action) -> {
             if (action == ButtonState.RELEASE)
                 return false;
 
@@ -74,6 +75,8 @@ public class InputHandlers
                 RecipeBookWidgetAccessor recipeBook = (RecipeBookWidgetAccessor) ((InventoryScreen) client.currentScreen).getRecipeBookWidget();
                 List<RecipeGroupButtonWidget> tabs = recipeBook.getTabButtons();
                 RecipeGroupButtonWidget currentTab = recipeBook.getCurrentTab();
+                if (currentTab == null)
+                    return false;
                 int nextTab = tabs.indexOf(currentTab) + (next ? 1 : -1);
                 if (nextTab < 0)
                     nextTab = tabs.size() - 1;
@@ -83,10 +86,13 @@ public class InputHandlers
                 recipeBook.setCurrentTab(currentTab = tabs.get(nextTab));
                 currentTab.setToggled(true);
                 recipeBook.lambdacontrols_refreshResults(true);
+                return true;
             } else if (client.currentScreen instanceof AdvancementsScreen) {
                 AdvancementsScreenAccessor screen = (AdvancementsScreenAccessor) client.currentScreen;
                 List<AdvancementTab> tabs = screen.getTabs().values().stream().distinct().collect(Collectors.toList());
                 AdvancementTab tab = screen.getSelectedTab();
+                if (tab == null)
+                    return false;
                 for (int i = 0; i < tabs.size(); i++) {
                     if (tabs.get(i).equals(tab)) {
                         int nextTab = i + (next ? 1 : -1);
@@ -98,12 +104,13 @@ public class InputHandlers
                         break;
                     }
                 }
+                return true;
             }
             return false;
         };
     }
 
-    public static boolean handlePauseGame(@NotNull MinecraftClient client, @NotNull ButtonBinding binding, @NotNull ButtonState action)
+    public static boolean handlePauseGame(@NotNull MinecraftClient client, @NotNull ButtonBinding binding, float value, @NotNull ButtonState action)
     {
         if (action == ButtonState.PRESS) {
             // If in game, then pause the game.
@@ -125,15 +132,15 @@ public class InputHandlers
      * @param action  The action done on the binding.
      * @return True if handled, else false.
      */
-    public static boolean handleScreenshot(@NotNull MinecraftClient client, @NotNull ButtonBinding binding, @NotNull ButtonState action)
+    public static boolean handleScreenshot(@NotNull MinecraftClient client, @NotNull ButtonBinding binding, float value, @NotNull ButtonState action)
     {
-        if (action == ButtonState.PRESS)
+        if (action == ButtonState.RELEASE)
             ScreenshotUtils.saveScreenshot(client.runDirectory, client.getWindow().getFramebufferWidth(), client.getWindow().getFramebufferHeight(), client.getFramebuffer(),
                     text -> client.execute(() -> client.inGameHud.getChatHud().addMessage(text)));
         return true;
     }
 
-    public static boolean handleToggleSneak(@NotNull MinecraftClient client, @NotNull ButtonBinding button, @NotNull ButtonState action)
+    public static boolean handleToggleSneak(@NotNull MinecraftClient client, @NotNull ButtonBinding button, float value, @NotNull ButtonState action)
     {
         if (client.player != null && !client.player.abilities.flying) {
             button.asKeyBinding().filter(binding -> action == ButtonState.PRESS).ifPresent(binding -> ((KeyBindingAccessor) binding).lambdacontrols_handlePressState(!binding.isPressed()));
@@ -144,7 +151,7 @@ public class InputHandlers
 
     public static PressAction handleInventorySlotPad(int direction)
     {
-        return (client, binding, action) -> {
+        return (client, binding, value, action) -> {
             if (!(client.currentScreen instanceof HandledScreen && action != ButtonState.RELEASE))
                 return false;
 
@@ -235,6 +242,20 @@ public class InputHandlers
         return client.currentScreen == null;
     }
 
+    /**
+     * Returns whether the client is in a non-interactive screen (which means require mouse input) or not.
+     *
+     * @param client  The client instance.
+     * @param binding The affected binding.
+     * @return True if the client is in a non-interactive screen, else false.
+     */
+    public static boolean inNonInteractiveScreens(@NotNull MinecraftClient client, @NotNull ButtonBinding binding)
+    {
+        if (client.currentScreen == null)
+            return false;
+        return !LambdaInput.isScreenInteractive(client.currentScreen);
+    }
+
     /**
      * Returns whether the client is in an inventory or not.
      *

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

@@ -19,6 +19,7 @@ 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.Pair;
 import org.aperlambda.lambdacommon.utils.function.PairPredicate;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
@@ -32,7 +33,7 @@ import java.util.stream.Stream;
  * Represents an input manager for controllers.
  *
  * @author LambdAurora
- * @version 1.3.0
+ * @version 1.4.0
  * @since 1.1.0
  */
 public class InputManager
@@ -41,6 +42,7 @@ public class InputManager
     private static final List<ButtonBinding>       BINDINGS         = new ArrayList<>();
     private static final List<ButtonCategory>      CATEGORIES       = new ArrayList<>();
     public static final  Map<Integer, ButtonState> STATES           = new HashMap<>();
+    public static final  Map<Integer, Float>       BUTTON_VALUES    = new HashMap<>();
     private              int                       prevTargetMouseX = 0;
     private              int                       prevTargetMouseY = 0;
     private              int                       targetMouseX     = 0;
@@ -244,6 +246,23 @@ public class InputManager
         return state;
     }
 
+    public static float getBindingValue(@NotNull ButtonBinding binding, @NotNull ButtonState state)
+    {
+        if (state.isUnpressed())
+            return 0.f;
+
+        float value = 0.f;
+        for (int btn : binding.getButton()) {
+            if (ButtonBinding.isAxis(btn)) {
+                value = BUTTON_VALUES.getOrDefault(btn, 1.f);
+                break;
+            } else {
+                value = 1.f;
+            }
+        }
+        return value;
+    }
+
     /**
      * Returns whether the button has duplicated bindings.
      *
@@ -317,7 +336,7 @@ public class InputManager
     public static void updateBindings(@NotNull MinecraftClient client)
     {
         List<Integer> skipButtons = new ArrayList<>();
-        Map<ButtonBinding, ButtonState> states = new HashMap<>();
+        Map<ButtonBinding, Pair<ButtonState, Float>> states = new HashMap<>();
         for (ButtonBinding binding : BINDINGS) {
             ButtonState state = binding.isAvailable(client) ? getBindingState(binding) : ButtonState.NONE;
             if (skipButtons.stream().anyMatch(btn -> containsButton(binding.getButton(), btn))) {
@@ -330,12 +349,15 @@ public class InputManager
             binding.update();
             if (binding.pressed)
                 Arrays.stream(binding.getButton()).forEach(skipButtons::add);
-            states.put(binding, state);
+
+            float value = getBindingValue(binding, state);
+
+            states.put(binding, Pair.of(state, value));
         }
 
         states.forEach((binding, state) -> {
-            if (state != ButtonState.NONE) {
-                binding.handle(client, state);
+            if (state.key != ButtonState.NONE) {
+                binding.handle(client, state.value, state.key);
             }
         });
     }
@@ -363,12 +385,12 @@ public class InputManager
 
     /**
      * Returns a new key binding instance.
-     * @param id The identifier of the key binding.
-     * @param type The type.
-     * @param code The code.
+     *
+     * @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)
@@ -378,12 +400,12 @@ public class InputManager
 
     /**
      * Returns a new key binding instance.
-     * @param id The identifier of the key binding.
-     * @param type The type.
-     * @param code The code.
+     *
+     * @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)

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/MovementHandler.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.controller;
+
+import me.lambdaurora.lambdacontrols.client.ButtonState;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents the movement handler.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public final class MovementHandler implements PressAction
+{
+    public static final MovementHandler HANDLER                = new MovementHandler();
+    private             boolean         shouldOverrideMovement = false;
+    private             boolean         pressingForward        = false;
+    private             boolean         pressingBack           = false;
+    private             boolean         pressingLeft           = false;
+    private             boolean         pressingRight          = false;
+    private             float           movementForward        = 0.f;
+    private             float           movementSideways       = 0.f;
+
+    private MovementHandler()
+    {
+    }
+
+    /**
+     * Applies movement input of this handler to the player's input.
+     *
+     * @param player The client player.
+     */
+    public void applyMovement(@NotNull ClientPlayerEntity player)
+    {
+        if (!this.shouldOverrideMovement)
+            return;
+        player.input.pressingForward = this.pressingForward;
+        player.input.pressingBack = this.pressingBack;
+        player.input.pressingLeft = this.pressingLeft;
+        player.input.pressingRight = this.pressingRight;
+        player.input.movementForward = this.movementForward;
+        player.input.movementSideways = this.movementSideways;
+        this.shouldOverrideMovement = false;
+    }
+
+    @Override
+    public boolean press(@NotNull MinecraftClient client, @NotNull ButtonBinding button, float value, @NotNull ButtonState action)
+    {
+        if (client.currentScreen != null || client.player == null)
+            return this.shouldOverrideMovement = false;
+
+        int direction = 0;
+        if (button == ButtonBinding.FORWARD || button == ButtonBinding.LEFT)
+            direction = 1;
+        else if (button == ButtonBinding.BACK || button == ButtonBinding.RIGHT)
+            direction = -1;
+
+        if (direction == 0)
+            return false;
+
+        this.shouldOverrideMovement = true;
+
+        value = (float) Math.pow(value, 2);
+
+        if (button == ButtonBinding.FORWARD || button == ButtonBinding.BACK) {
+            // Handle forward movement.
+            this.pressingForward = direction > 0;
+            this.pressingBack = direction < 0;
+            this.movementForward = direction * value;
+
+            // Slowing down if sneaking.
+            if (client.player.input.sneaking)
+                this.movementForward *= 0.3D;
+        } else {
+            // Handle sideways movement.
+            this.pressingLeft = direction > 0;
+            this.pressingRight = direction < 0;
+            this.movementSideways = direction * value;
+
+            // Slowing down if sneaking.
+            if (client.player.input.sneaking)
+                this.movementSideways *= 0.3D;
+        }
+
+        return true;
+    }
+}

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

@@ -18,13 +18,13 @@ import org.jetbrains.annotations.NotNull;
  * Represents a press action callback.
  *
  * @author LambdAurora
- * @version 1.1.0
+ * @version 1.4.0
  * @since 1.0.0
  */
 @FunctionalInterface
 public interface PressAction
 {
-    PressAction DEFAULT_ACTION = (client, button, action) -> {
+    PressAction DEFAULT_ACTION = (client, button, value, action) -> {
         if (action == ButtonState.REPEAT || client.currentScreen != null)
             return false;
         button.asKeyBinding().ifPresent(binding -> ((KeyBindingAccessor) binding).lambdacontrols_handlePressState(button.isButtonDown()));
@@ -37,5 +37,5 @@ public interface PressAction
      * @param client The client instance.
      * @param action The action done.
      */
-    boolean press(@NotNull MinecraftClient client, @NotNull ButtonBinding button, @NotNull ButtonState action);
+    boolean press(@NotNull MinecraftClient client, @NotNull ButtonBinding button, float value, @NotNull ButtonState action);
 }

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

@@ -13,6 +13,7 @@ import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.lambdacontrols.client.controller.InputManager;
 import me.lambdaurora.spruceui.SpruceButtonWidget;
+import me.lambdaurora.spruceui.SpruceTexts;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -61,7 +62,7 @@ public class ControllerControlsScreen extends Screen
                 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,
-                    new TranslatableText("menu.options"),
+                    SpruceTexts.MENU_OPTIONS,
                     btn -> this.client.openScreen(new LambdaControlsSettingsScreen(this, true))));
         this.bindingsListWidget = new ControlsListWidget(this, this.client);
         this.children.add(this.bindingsListWidget);
@@ -69,7 +70,7 @@ public class ControllerControlsScreen extends Screen
                 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,
-                new TranslatableText("gui.done"),
+                SpruceTexts.GUI_DONE,
                 btn -> this.client.openScreen(this.parent)));
     }
 

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

@@ -12,6 +12,7 @@ package me.lambdaurora.lambdacontrols.client.gui;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
 import me.lambdaurora.lambdacontrols.client.controller.ButtonCategory;
 import me.lambdaurora.lambdacontrols.client.controller.InputManager;
+import me.lambdaurora.spruceui.SpruceTexts;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -105,7 +106,7 @@ public class ControlsListWidget extends ElementListWidget<ControlsListWidget.Ent
                     return new TranslatableText("narrator.controls.reset", bindingName);
                 }
             };
-            this.unboundButton = new ButtonWidget(0, 0, 50, 20, new TranslatableText("lambdacontrols.menu.unbound"),
+            this.unboundButton = new ButtonWidget(0, 0, 50, 20, SpruceTexts.OPTIONS_GENERIC_UNBOUND,
                     btn -> {
                         gui.mod.config.setButtonBinding(binding, UNBOUND);
                         gui.focusedBinding = null;

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

@@ -15,6 +15,7 @@ import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
 import me.lambdaurora.lambdacontrols.client.controller.Controller;
 import me.lambdaurora.spruceui.SpruceButtonWidget;
 import me.lambdaurora.spruceui.SpruceLabelWidget;
+import me.lambdaurora.spruceui.SpruceTexts;
 import me.lambdaurora.spruceui.Tooltip;
 import me.lambdaurora.spruceui.option.*;
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
@@ -87,14 +88,14 @@ public class LambdaControlsSettingsScreen extends Screen
                     synchronized (this.mod.config) {
                         this.mod.config.setRotationSpeed(newValue);
                     }
-                }, option -> option.getDisplayPrefix().append(String.valueOf(option.get())),
+                }, option -> option.getDisplayText(new LiteralText(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().append(String.valueOf(option.get())),
+                }, option -> option.getDisplayText(new LiteralText(String.valueOf(option.get()))),
                 new TranslatableText("lambdacontrols.tooltip.mouse_speed"));
         this.resetOption = new SpruceResetOption(btn -> {
             this.mod.config.reset();
@@ -123,11 +124,11 @@ public class LambdaControlsSettingsScreen extends Screen
         }, option -> {
             String controllerName = this.mod.config.getController().getName();
             if (!this.mod.config.getController().isConnected())
-                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.RED));
+                return option.getDisplayText(new LiteralText(controllerName).formatted(Formatting.RED));
             else if (!this.mod.config.getController().isGamepad())
-                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.GOLD));
+                return option.getDisplayText(new LiteralText(controllerName).formatted(Formatting.GOLD));
             else
-                return option.getDisplayPrefix().append(controllerName);
+                return option.getDisplayText(new LiteralText(controllerName));
         }, null);
         this.secondControllerOption = new SpruceCyclingOption("lambdacontrols.menu.controller2",
                 amount -> {
@@ -139,16 +140,16 @@ public class LambdaControlsSettingsScreen extends Screen
                 }, option -> this.mod.config.getSecondController().map(controller -> {
             String controllerName = controller.getName();
             if (!controller.isConnected())
-                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.RED));
+                return option.getDisplayText(new LiteralText(controllerName).formatted(Formatting.RED));
             else if (!controller.isGamepad())
-                return option.getDisplayPrefix().append(new LiteralText(controllerName).formatted(Formatting.GOLD));
+                return option.getDisplayText(new LiteralText(controllerName).formatted(Formatting.GOLD));
             else
-                return option.getDisplayPrefix().append(controllerName);
-        }).orElse(option.getDisplayPrefix().append(new TranslatableText("options.off").formatted(Formatting.RED))),
+                return option.getDisplayText(new LiteralText(controllerName));
+        }).orElse(option.getDisplayText(SpruceTexts.OPTIONS_OFF.shallowCopy().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().append(this.mod.config.getControllerType().getTranslatedName()),
+                option -> option.getDisplayText(this.mod.config.getControllerType().getTranslatedText()),
                 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 -> {
@@ -157,7 +158,7 @@ public class LambdaControlsSettingsScreen extends Screen
                     }
                 }, option -> {
             String value = String.valueOf(option.get());
-            return option.getDisplayPrefix().append(value.substring(0, Math.min(value.length(), 5)));
+            return option.getDisplayText(new LiteralText(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 -> {
@@ -177,14 +178,14 @@ public class LambdaControlsSettingsScreen extends Screen
                 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()),
+                option -> option.getDisplayText(this.mod.config.getVirtualMouseSkin().getTranslatedText()),
                 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().append(this.mod.config.getHudSide().getTranslatedName()),
+                option -> option.getDisplayText(this.mod.config.getHudSide().getTranslatedText()),
                 new TranslatableText("lambdacontrols.tooltip.hud_side"));
     }
 
@@ -266,7 +267,7 @@ public class LambdaControlsSettingsScreen extends Screen
         this.children.add(this.gamepadToolUrlLabel);
 
         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"),
+        this.addButton(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, buttonHeight, SpruceTexts.GUI_DONE,
                 (buttonWidget) -> this.client.openScreen(this.parent)));
     }
 

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

@@ -11,6 +11,7 @@ package me.lambdaurora.lambdacontrols.client.mixin;
 
 import com.mojang.authlib.GameProfile;
 import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
+import me.lambdaurora.lambdacontrols.client.controller.MovementHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -69,6 +70,12 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
         }
     }
 
+    @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", shift = At.Shift.AFTER))
+    public void onInputUpdate(CallbackInfo ci)
+    {
+        MovementHandler.HANDLER.applyMovement((ClientPlayerEntity) (Object) this);
+    }
+
     @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
     public void onTickMovement(CallbackInfo ci)
     {

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

@@ -17,7 +17,6 @@ import net.minecraft.client.gui.screen.options.GameOptionsScreen;
 import net.minecraft.client.gui.widget.AbstractButtonWidget;
 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;

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(EntryListWidget.class_5403 direction);
+    void lambdacontrols_moveSelection(EntryListWidget.MoveDirection direction);
 }

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

@@ -22,15 +22,12 @@ 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.
  */

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

@@ -15,6 +15,7 @@ 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.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -37,10 +38,20 @@ public abstract class MouseMixin implements MouseAccessor
     @Invoker("onCursorPos")
     public abstract void lambdacontrols_onCursorPos(long window, double x, double y);
 
+    @Inject(method = "method_1605", at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/Screen;mouseReleased(DDI)Z"))
+    private void onMouseBackButton(boolean[] result, double mouseX, double mouseY, int button, CallbackInfo ci)
+    {
+        if (!result[0] && button == GLFW.GLFW_MOUSE_BUTTON_4 && this.client.currentScreen != null) {
+            if (LambdaControlsClient.get().input.tryGoBack(this.client.currentScreen)) {
+                result[0] = true;
+            }
+        }
+    }
+
     @Inject(method = "isCursorLocked", at = @At("HEAD"), cancellable = true)
     private void isCursorLocked(CallbackInfoReturnable<Boolean> ci)
     {
-        if (client.currentScreen == null) {
+        if (this.client.currentScreen == null) {
             LambdaControlsConfig config = LambdaControlsClient.get().config;
             if (config.getControlsMode() == ControlsMode.CONTROLLER && config.hasVirtualMouse()) {
                 ci.setReturnValue(true);

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

@@ -28,7 +28,6 @@ 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;
@@ -53,6 +52,10 @@ public abstract class WorldRendererMixin
     @Shadow
     private ClientWorld world;
 
+    @Shadow
+    @Final
+    private BufferBuilderStorage bufferBuilders;
+
     @Shadow
     private static void drawShapeOutline(MatrixStack matrixStack, VertexConsumer vertexConsumer, VoxelShape voxelShape, double d, double e, double f, float g, float h, float i, float j)
     {
@@ -65,13 +68,10 @@ public abstract class WorldRendererMixin
                     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)
+                                 LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci)
     {
         if (this.client.crosshairTarget == null || this.client.crosshairTarget.getType() != HitResult.Type.MISS || !LambdaControlsClient.get().config.shouldRenderReacharoundOutline())
             return;
@@ -83,16 +83,23 @@ public abstract class WorldRendererMixin
             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;
+            Vec3d pos = camera.getPos();
+
             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);
+
+            VertexConsumer vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
+            drawShapeOutline(matrices, vertexConsumer, outlineShape,
+                    (double) blockPos.getX() - pos.getX(), (double) blockPos.getY() - pos.getY(), (double) blockPos.getZ() - pos.getZ(),
+                    color[0] / 255.f, color[1] / 255.f, color[2] / 255.f, color[3] / 255.f);
         }
     }
 }

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

@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
+import net.minecraft.client.options.KeyBinding;
+import org.jetbrains.annotations.NotNull;
+
+public class KeyBindingRingAction extends RingAction
+{
+    public final KeyBinding binding;
+
+    public KeyBindingRingAction(@NotNull KeyBinding binding)
+    {
+        this.binding = binding;
+    }
+
+    @Override
+    public @NotNull String getName()
+    {
+        return this.binding.getTranslationKey();
+    }
+
+    @Override
+    public void onAction(@NotNull RingButtonMode mode)
+    {
+        KeyBindingAccessor accessor = (KeyBindingAccessor) this.binding;
+        switch (mode) {
+            case PRESS:
+            case HOLD:
+                accessor.lambdacontrols_handlePressState(this.activated);
+                break;
+            case TOGGLE:
+                accessor.lambdacontrols_handlePressState(!this.binding.isPressed());
+                this.activated = !this.binding.isPressed();
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Represents a key binding ring.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public class LambdaRing
+{
+    private final List<RingPage> pages       = new ArrayList<>(Collections.singletonList(new RingPage()));
+    private       int            currentPage = 0;
+
+    public LambdaRing()
+    {
+    }
+
+    public @NotNull RingPage getCurrentPage()
+    {
+        if (this.currentPage >= this.pages.size())
+            this.currentPage = this.pages.size() - 1;
+        else if (this.currentPage < 0)
+            this.currentPage = 0;
+        return this.pages.get(this.currentPage);
+    }
+}

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

@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import net.minecraft.text.TranslatableText;
+import org.aperlambda.lambdacommon.utils.Nameable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a ring action.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public abstract class RingAction implements Nameable
+{
+    protected boolean activated = false;
+
+    /**
+     * Gets the translated name of the ring action.
+     *
+     * @return The translated name.
+     */
+    public TranslatableText getTranslatedName()
+    {
+        return new TranslatableText(this.getName());
+    }
+
+    /**
+     * Returns whether the action is activated or not.
+     *
+     * @return True if the action is activated, else false.
+     */
+    public boolean isActivated()
+    {
+        return this.activated;
+    }
+
+    public void activate(@NotNull RingButtonMode mode)
+    {
+        this.activated = !this.activated;
+
+        this.onAction(mode);
+    }
+
+    public abstract void onAction(@NotNull RingButtonMode mode);
+}

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/ring/RingButtonMode.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.ring;
+
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.aperlambda.lambdacommon.utils.Nameable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents the mode of a ring button.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public enum RingButtonMode implements Nameable
+{
+    PRESS("press"),
+    HOLD("hold"),
+    TOGGLE("toggle");
+
+    private final String name;
+    private final Text   text;
+
+    RingButtonMode(@NotNull String name)
+    {
+        this.name = name;
+        this.text = new TranslatableText(this.getTranslationKey());
+    }
+
+    /**
+     * Returns the next ring button mode available.
+     *
+     * @return The next ring button mode.
+     */
+    public @NotNull RingButtonMode next()
+    {
+        RingButtonMode[] v = values();
+        if (v.length == this.ordinal() + 1)
+            return v[0];
+        return v[this.ordinal() + 1];
+    }
+
+    /**
+     * Returns the translation key of this ring button mode.
+     *
+     * @return The translation key of this ring button mode.
+     */
+    public @NotNull String getTranslationKey()
+    {
+        return "lambdacontrols.ring.button_mode." + this.getName();
+    }
+
+    /**
+     * Gets the translated name of this ring button mode.
+     *
+     * @return The translated name of this ring button mode.
+     */
+    public @NotNull Text getTranslatedText()
+    {
+        return this.text;
+    }
+
+    @Override
+    public @NotNull String getName()
+    {
+        return this.name;
+    }
+}

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

@@ -10,13 +10,15 @@
 package me.lambdaurora.lambdacontrols.client.ring;
 
 /**
- * Represents a key binding ring.
+ * Represents a ring page.
  *
  * @author LambdAurora
  * @version 1.4.0
  * @since 1.4.0
  */
-public class KeyBindingRing
+public class RingPage
 {
+    private RingAction[] actions = new RingAction[8];
+
 
 }

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

@@ -31,6 +31,9 @@
   "lambdacontrols.action.toggle_smooth_camera": "Toggle Cinematic Camera",
   "lambdacontrols.action.use": "Use",
   "lambdacontrols.action.zoom": "Zoom",
+  "lambdacontrols.action.zoom.in": "Increase Zoom",
+  "lambdacontrols.action.zoom.out": "Decrease Zoom",
+  "lambdacontrols.action.zoom.reset": "Reset Zoom",
   "lambdacontrols.button.a": "A",
   "lambdacontrols.button.b": "B",
   "lambdacontrols.button.x": "X",
@@ -98,7 +101,6 @@
   "lambdacontrols.menu.title.gameplay": "Gameplay Options",
   "lambdacontrols.menu.title.general": "General Options",
   "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",

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

@@ -97,7 +97,6 @@
   "lambdacontrols.menu.title.gameplay": "Options de Gameplay",
   "lambdacontrols.menu.title.general": "Options générales",
   "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",

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

@@ -97,7 +97,6 @@
   "lambdacontrols.menu.title.gameplay": "Options de Gameplay",
   "lambdacontrols.menu.title.general": "Options générales",
   "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",

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 	minecraft_version=1.16.1
-	yarn_mappings=1.16.1+build.9:v2
-	loader_version=0.8.8+build.202
+	yarn_mappings=1.16.1+build.21:v2
+	loader_version=0.9.0+build.204
 
 # Mod Properties
-	mod_version = 1.3.2
+	mod_version = 1.4.0
 	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.14.0+build.371-1.16
-	spruceui_version=1.5.2
+	fabric_version=0.15.0+build.379-1.16.1
+	spruceui_version=1.5.9
 	modmenu_version=1.12.2+build.17

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Oct 28 18:23:18 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,100 +1,104 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega