Use EMI version for 1.20.1

Backport fixes to 1.20.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: 'Bug: TITLE HERE'
+title: ''
 labels: bug
 assignees: ''
 
@@ -21,17 +21,15 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
-If applicable, add screenshots or videos to help explain your problem.
+If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. Windows / Linux / MacOS]
+ - OS: [e.g. Linux]
- - Minecraft [e.g. 1.20.4]
+ - Minecraft [e.g. 1.14.4]
- - Modloader [e.g. Fabric Loader 0.15.6]
+ - Fabric [e.g. fabric 0.7.2+build.174]
- - Fabric/Quilt Libraries [e.g. Fabric Api 0.96.1+1.20.4]
+ - Mods [e.g. aurora_keystrokes v1.0.0, modmenu v1.7.15]
- - Mods [e.g. Puzzle v1.6.1, LilTaterReloaded v1.1.15]
  - Version [e.g. 1.0.0]
- - Remove this line if you actually completed it
+ - Branch [e.g. dev]
 
 **Additional context**
 Add any other context about the problem here.
-In case of a crash, please provide the crash log.

.github/ISSUE_TEMPLATE/controller_support.md

@@ -1,40 +0,0 @@
----
-name: Controller support
-about: Report a problem related to a specific controller
-title: 'Controller Issues: CONTROLLER NAME HERE'
-labels: controller
-assignees: ''
-
----
-
-**Describe the current state**
-A clear and concise description of current state of support for the controller and the issues.
-
-**To Reproduce**
-If needed, specify steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots or videos to help explain your problem.
-
-**Desktop (please complete the following information):**
- - Have you checked #263 for your controller? [e.g. Yes/No]
- - Connection method [e.g. Wired / Bluetooth]
-
- - OS: [e.g. Windows / Linux / MacOS]
- - Minecraft [e.g. 1.20.4]
- - Modloader [e.g. Fabric Loader 0.15.6]
- - Fabric/Quilt Libraries [e.g. Fabric Api 0.96.1+1.20.4]
- - Mods [e.g. Puzzle v1.6.1, LilTaterReloaded v1.1.15]
- - Version [e.g. 1.0.0]
- - Remove this line if you actually completed it
-
-**Additional context**
-Add any other context about the problem here.
-In case of a crash, please provide the crash log.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: 'Feature: TITLE HERE'
+title: ''
 labels: enhancement
 assignees: ''
 
@@ -17,4 +17,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots/videos about the feature request here.
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/mod_support.md

@@ -1,20 +0,0 @@
----
-name: Mod Support
-about: Compatibility improvements with a specific mod (not for crashes)
-title: 'Mod Support: MOD NAME HERE'
-labels: mod compatibility
-assignees: ''
-
----
-
-**Is your compatibility request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I've always wanted to [...]
-
-**Describe the way of compatibility you'd imagine**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative mods or workarounds you've considered.
-
-**Additional context**
-Add any other context or screenshots/videos about the compatibility request here.

.github/workflows/build.yml

@@ -1,29 +0,0 @@
-name: Build with Gradle
-
-on: [ push, pull_request ]
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 21
-          check-latest: true
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Upload artifacts to GitHub
-        uses: actions/upload-artifact@v4
-        with:
-          name: MidnightControls-Artifacts
-          path: |
-            fabric/build/libs/
-            neoforge/build/libs/

.github/workflows/gradlebuild.yml

@@ -0,0 +1,23 @@
+name: Gradle Build
+
+on: [ push, pull_request ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 16
+        uses: actions/setup-java@v1
+        with:
+          java-version: 16
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: ./build/libs/

.github/workflows/gradlepublish.yml

@@ -1,26 +1,30 @@
-name: Publish to Modrinth
+name: Gradle Package
 
 on:
-  release:
+  push:
-    types:
+    tags:
-      - published
+      - '*'
 
 jobs:
-  publish:
+  build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v4
+      - name: Set up JDK 16
+        uses: actions/setup-java@v1
         with:
-          persist-credentials: false
+          java-version: 16
-      - name: Set up Gradle
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        uses: gradle/actions/setup-gradle@v4
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
-      - name: Set up JDK 21
+
-        uses: actions/setup-java@v4
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - uses: actions/upload-artifact@v2
         with:
-          distribution: 'temurin'
+          name: Artifacts
-          java-version: 21
+          path: ./build/libs/
-          check-latest: true
+
       # The USERNAME and PASSWORD need to correspond to the credentials environment variables used in
       # the publishing section of your build.gradle
       - name: Publish to GitHub Packages and other Mavens
@@ -34,7 +38,3 @@ jobs:
           midnightcontrols_MAVEN: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      - name: Publish to Modrinth
-        env:
-          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew publishModrinth

.github/workflows/modrinth_update.yml

@@ -0,0 +1,23 @@
+name: Gradle Build
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 16
+        uses: actions/setup-java@v1
+        with:
+          java-version: 16
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Build with Gradle
+        env:
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+        run: ./gradlew publishModrinth

README.md

@@ -8,7 +8,7 @@
 [![Version](https://img.shields.io/github/v/tag/TeamMidnightDust/MidnightControls?label=version&style=round)](https://github.com/TeamMidnightDust/MidnightControls/releases)
 ![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=round)
 [![Mod loader: Quilt/Fabric]][Quilt]
-[![Java 21](https://img.shields.io/badge/language-Java%2021-9B599A.svg?style=round)](https://www.oracle.com/java/technologies/downloads/#java21)
+[![Java 17](https://img.shields.io/badge/language-Java%2017-9B599A.svg?style=round)](https://www.oracle.com/java/technologies/downloads/#java17)
 [![GitHub license](https://img.shields.io/github/license/TeamMidnightDust/MidnightControls?style=round)](LICENSE)
 
 A Fabric Minecraft mod which adds better controls, reach-around and controller support.  
@@ -64,7 +64,11 @@ After this is done, everything should be built just fine!
 
 ## FAQ:
 ### The controller does not work, and it's name appears in orange, what can I do?  
-Create a custom mapping as pointed out in the [wiki](https://midnightdust.eu/wiki/midnightcontrols/)
+Orange controller names indicate a missing controller mapping.  
+Download [GamepadTool](https://generalarcade.com/gamepadtool/), create and copy a mapping, go to MidnightControls' Mappings File Editor and paste the string.  
+Alternatively, you can use [AntiMicroX](https://github.com/AntiMicroX/antimicroX) to create the mappings, in case the Gamepad Tool is not working for you.  
+If that works, you might as well consider submitting the mapping by opening a PR in this repo: https://github.com/gabomdq/SDL_GameControllerDB  
+That will make sure other people using the same controller as you don't have to use gamepad-tool anymore. 
 
 [Quilt]: https://quiltmc.org
 

build.gradle

@@ -1,88 +1,186 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id 'fabric-loom' version '1.1-SNAPSHOT'
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id 'java-library'
-    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+    id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.modrinth.minotaur' version '2.+'
+    id 'net.darkhax.curseforgegradle' version '1.+'
 }
 
-architectury {
+import net.darkhax.curseforgegradle.TaskPublishCurseForge
-    minecraft = rootProject.minecraft_version
+
+group = project.maven_group
+version = "${project.mod_version}+${getMCVersionString()}"
+
+// This field defines the Java version your mod target.
+def targetJavaVersion = 17
+
+boolean isMCVersionNonRelease() {
+    return project.minecraft_version.matches('^\\d\\dw\\d\\d[a-z]$')
+            || project.minecraft_version.matches('\\d+\\.\\d+-(pre|rc)(\\d+)')
 }
 
+String getMCVersionString() {
+    if (isMCVersionNonRelease() || project.minecraft_version == "1.20.4") {
+        return project.minecraft_version
+    }
+    def version = project.minecraft_version.split('\\.')
+    return version[0] + '.' + version[1]
+}
+
+boolean pingUrl(String address) {
+    try {
+        def conn = (HttpURLConnection) new URL(address).openConnection()
+        int responseCode = conn.getResponseCode()
+        return (200 <= responseCode && responseCode <= 399)
+    } catch (IOException ignored) {
+        return false
+    }
+}
+
+String parseReadme() {
+    def excludeRegex = /(?m)<!-- modrinth_exclude\.start -->(.|\n)*?<!-- modrinth_exclude\.end -->/
+    def linkRegex = /!\[([A-z_ ]+)]\((images\/[A-z.\/_]+)\)/
+
+    def readme = (String) file('README.md').text
+    readme = readme.replaceAll(excludeRegex, '')
+    return readme
+}
+
+
 repositories {
+    mavenLocal()
+    mavenCentral()
+    maven { url 'https://aperlambda.github.io/maven' }
     maven {
-        url = "https://api.modrinth.com/maven"
+        name 'Gegy'
+        url 'https://maven.gegy.dev'
     }
-    flatDir {
+    maven {
-        dirs("localMaven")
+        name = "CottonMC"
+        url = "https://server.bbkr.space/artifactory/libs-release"
     }
+    maven { url "https://maven.terraformersmc.com/releases/" }
+    maven { url 'https://maven.kosmx.dev' }
+    maven { url 'https://maven.isxander.dev/releases' }
+    maven { url 'https://maven.shedaniel.me/' }
+    maven { url 'https://jitpack.io' }
+    maven { url "https://api.modrinth.com/maven" }
+    maven { url 'https://maven.quiltmc.org/repository/release'}
 }
 
-subprojects {
+configurations {
-    apply plugin: "dev.architectury.loom"
+    shadow
-    repositories {
+    api.extendsFrom shadow
-        maven {
-            url = "https://api.modrinth.com/maven"
-        }
-        maven { url 'https://jitpack.io' }
-        flatDir {
-            dirs("../localMaven")
-        }
-    }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        //mappings loom.officialMojangMappings()
-        // The following line declares the yarn mappings you may select this one as well.
-        mappings loom.layered {
-            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
-        }
-    }
 }
 
+dependencies {
+    //to change the versions see the gradle.properties file
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-allprojects {
+    // Fabric API. This is technically optional, but you probably want it anyway.
-    apply plugin: "java"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
 
-    archivesBaseName = rootProject.archives_base_name
+    modImplementation ("dev.lambdaurora:spruceui:${project.spruceui_version}") {
-    version = rootProject.mod_version
+        exclude(group: "net.fabricmc.fabric-api")
-    group = rootProject.maven_group
-
-    repositories {
-        maven { url 'https://aperlambda.github.io/maven' }
     }
-    dependencies {
+    include "dev.lambdaurora:spruceui:${project.spruceui_version}"
-        implementation('org.aperlambda:lambdajcommon:1.8.1') {
+    api('org.aperlambda:lambdajcommon:1.8.1') {
-            exclude group: 'com.google.code.gson'
+        exclude group: 'com.google.code.gson'
-            exclude group: 'com.google.guava'
+        exclude group: 'com.google.guava'
-        }
+    }
+    include 'org.aperlambda:lambdajcommon:1.8.1'
+
+    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
     }
 
-    tasks.withType(JavaCompile) {
+    // Compatibility mods
-        options.encoding = "UTF-8"
+
-        options.release = 21
+    // Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions.
-    }
+    // modImplementation("maven.modrinth:ok-zoomer:${project.ok_zoomer_version}")
-    ext {
+    // modImplementation "io.github.ennuil:LibZoomer:${project.libzoomer_version}"
-        releaseChangelog = {
+
-            def changes = new StringBuilder()
+    modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}"
-            changes << "## MidnightControls v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/TeamMidnightDust/MidnightControls/commits/)"
+    modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
-            def proc = "git log --max-count=1 --pretty=format:%s".execute()
+    modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
-            proc.in.eachLine { line ->
+    modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
-                def processedLine = line.toString()
+    modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
-                if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
+    modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
-                    changes << "\n- ${processedLine.capitalize()}"
+    modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-                }
+    modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
-            }
+    modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}"
-            proc.waitFor()
+    // Required for Inventory Tabs
-            return changes.toString()
+    modCompileOnlyApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
-        }
+        exclude(group: "net.fabricmc.fabric-api")
     }
 
-    java {
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-        withSourcesJar()
+    include "maven.modrinth:midnightlib:${project.midnightlib_version}"
+
+    shadow 'com.electronwill.night-config:core:3.6.3'
+    shadow 'com.electronwill.night-config:toml:3.6.3'
+    apply plugin: 'java-library'
+}
+loom {
+    accessWidenerPath = file("src/main/resources/midnightcontrols.accesswidener")
+}
+
+java {
+    sourceCompatibility = JavaVersion.toVersion(targetJavaVersion)
+    targetCompatibility = JavaVersion.toVersion(targetJavaVersion)
+
+    withSourcesJar()
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.encoding = 'UTF-8'
+
+    it.options.release.set(targetJavaVersion)
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('fabric.mod.json') {
+        expand 'version': project.version
     }
 }
+modrinth {
+    token = System.getenv("MODRINTH_TOKEN") // Remember to have the MODRINTH_TOKEN environment variable set or else this will fail - just make sure it stays private!
+    projectId = project.archives_base_name // This can be the project ID or the slug. Either will work!
+    versionNumber = project.version // You don't need to set this manually. Will fail if Modrinth has this version already
+    versionName = "MidnightControls " + project.mod_version + " - " + project.minecraft_version
+    versionType = isMCVersionNonRelease() ? "beta" : "release" // Can also be `beta` or `alpha`
+    uploadFile = remapJar // With Loom, this MUST be set to `remapJar` instead of `jar`!
+    gameVersions = [(String) project.minecraft_version] // Must be an array, even with only one version
+    loaders = ["fabric","quilt"] // Must also be an array - no need to specify this if you're using Loom or ForgeGradle
+    dependencies { // A special DSL for creating dependencies
+        // scope.type
+        // The scope can be `required`, `optional`, `incompatible`, or `embedded`
+        // The type can either be `project` or `version`
+        required.project "midnightlib" // Creates a new required dependency on MidnightLib
+    }
+    changelog = project.changelog
+}
+tasks.register('publishCurseForge', TaskPublishCurseForge) {
+
+    // This token is used to authenticate with CurseForge. It should be handled
+    // with the same level of care and security as your actual password. You 
+    // should never share your token with an untrusted source or publish it
+    // publicly to GitHub or embed it within a project. The best practice is to
+    // store this token in an environment variable or a build secret.
+    apiToken = System.getenv("CURSEFORGE_TOKEN")
+
+    // Tells CurseForgeGradle to publish the output of the jar task. This will
+    // return a UploadArtifact object that can be used to further configure the
+    // file. 
+    def mainFile = upload(project.curseforge_id, remapJar)
+    mainFile.changelog = project.changelog
+    mainFile.displayName = "MidnightControls " + project.mod_version + " - " + project.minecraft_version
+    mainFile.addModLoader("Fabric", "Quilt")
+    mainFile.addRequirement("midnightlib")
+    mainFile.releaseType = "release"
+}

common/build.gradle

@@ -1,65 +0,0 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-loom {
-    accessWidenerPath = file("src/main/resources/midnightcontrols.accesswidener")
-}
-repositories {
-    maven {
-        name 'Gegy'
-        url 'https://maven.gegy.dev'
-    }
-    maven {
-        name = "CottonMC"
-        url = "https://server.bbkr.space/artifactory/libs-release"
-    }
-    maven { url "https://maven.terraformersmc.com/releases/" }
-    maven { url 'https://maven.kosmx.dev' }
-    maven { url 'https://maven.isxander.dev/releases' }
-    maven { url 'https://maven.shedaniel.me/' }
-    maven { url 'https://jitpack.io' }
-    maven { url "https://api.modrinth.com/maven" }
-    maven { url 'https://maven.quiltmc.org/repository/release'}
-}
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Using the Fabric version of midnightlib here to create a common config and get useful utilities
-    // Just make sure NOT to use classes from the .fabric classpath
-    modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
-    modCompileOnlyApi "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric"
-    modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-
-    // Compatibility mods
-    modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}"
-    modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
-    modImplementation "maven.modrinth:sodium:${project.sodium_version}-fabric"
-    modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
-    modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
-    modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
-    modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-    modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
-    modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}"
-    // Required for Inventory Tabs
-    modCompileOnlyApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

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

@@ -1,54 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols;
-
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.util.Identifier;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Represents the MidnightControls mod.
- *
- * @author LambdAurora & Motschen
- * @version 1.8.0
- * @since 1.0.0
- */
-public class MidnightControls {
-    public static boolean isExtrasLoaded;
-
-    public static final Logger logger = LogManager.getLogger("MidnightControls");
-
-    public static void init() {
-        isExtrasLoaded = PlatformFunctions.isModLoaded("midnightcontrols-extra");
-        log("Initializing MidnightControls...");
-    }
-    public static Identifier id(String path) {
-        return Identifier.of(MidnightControlsConstants.NAMESPACE, path);
-    }
-
-    /**
-     * Prints a message to the terminal.
-     *
-     * @param info the message to print
-     */
-    public static void log(String info) {
-        logger.info("[MidnightControls] {}", info);
-    }
-
-    /**
-     * Prints a warning to the terminal.
-     *
-     * @param warning the warning to print
-     */
-    public static void warn(String warning) {
-        logger.warn("[MidnightControls] {}", warning);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsReloadListener.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.midnightcontrols.client;
-
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.SynchronousResourceReloader;
-
-public class MidnightControlsReloadListener implements SynchronousResourceReloader {
-    public static final MidnightControlsReloadListener INSTANCE = new MidnightControlsReloadListener();
-
-    private MidnightControlsReloadListener() {}
-
-    @Override
-    public void reload(ResourceManager manager) {
-        manager.findResources("keyboard_layouts", path -> path.toString().startsWith("midnightcontrols") && path.toString().endsWith(".json")).forEach(KeyboardLayoutManager::loadLayout);
-    }
-}

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

@@ -1,819 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client;
-
-import com.google.common.collect.ImmutableSet;
-import eu.midnightdust.lib.util.PlatformFunctions;
-import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
-import eu.midnightdust.midnightcontrols.client.compat.LibGuiCompat;
-import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
-import eu.midnightdust.midnightcontrols.client.compat.YACLCompat;
-import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.MouseAccessor;
-import eu.midnightdust.midnightcontrols.client.util.InventoryUtil;
-import eu.midnightdust.midnightcontrols.client.util.storage.AxisStorage;
-import eu.midnightdust.midnightcontrols.client.util.storage.ButtonStorage;
-import net.minecraft.client.gui.screen.option.KeybindsScreen;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.client.gui.widget.SliderWidget;
-import net.minecraft.entity.vehicle.BoatEntity;
-import org.thinkingstudio.obsidianui.widget.AbstractSpruceWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceEntryListWidget;
-import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.controller.Controller;
-import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.enums.CameraMode;
-import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
-import eu.midnightdust.midnightcontrols.client.touch.gui.TouchscreenOverlay;
-import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidget;
-import eu.midnightdust.midnightcontrols.client.ring.RingPage;
-import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.util.MathUtil;
-import org.thinkingstudio.obsidianui.navigation.NavigationDirection;
-import org.thinkingstudio.obsidianui.screen.SpruceScreen;
-import org.thinkingstudio.obsidianui.widget.AbstractSprucePressableButtonWidget;
-import org.thinkingstudio.obsidianui.widget.SpruceElement;
-import org.thinkingstudio.obsidianui.widget.SpruceLabelWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceParentWidget;
-import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
-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.CreativeInventoryScreen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.gui.screen.ingame.MerchantScreen;
-import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
-import net.minecraft.client.gui.screen.world.WorldListWidget;
-import net.minecraft.text.TranslatableTextContent;
-import net.minecraft.util.math.MathHelper;
-import org.jetbrains.annotations.NotNull;
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.glfw.GLFWGamepadState;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-import static org.lwjgl.glfw.GLFW.*;
-
-/**
- * Represents the midnightcontrols' input handler.
- *
- * @author Motschen, LambdAurora
- * @version 1.10.0
- * @since 1.0.0
- */
-public class MidnightInput {
-    public static final Map<Integer, Integer> BUTTON_COOLDOWNS = new HashMap<>();
-    // Cooldowns
-    public int actionGuiCooldown = 0;
-    public int joystickCooldown = 0;
-    public boolean ignoreNextARelease = false;
-    public boolean ignoreNextXRelease = false;
-    private double targetYaw = 0.0;
-    private double targetPitch = 0.0;
-    private float prevXAxis = 0.f;
-    private float prevYAxis = 0.f;
-    public float mouseSpeedX = 0.f;
-    public float mouseSpeedY = 0.f;
-    public int inventoryInteractionCooldown = 0;
-    public int screenCloseCooldown = 0;
-
-    private ControllerControlsWidget controlsInput = null;
-
-    public MidnightInput() {}
-
-    /**
-     * This method is called every Minecraft tick.
-     */
-    public void tick() {
-        this.targetYaw = 0.F;
-        this.targetPitch = 0.F;
-
-        // Handles the key bindings.
-        if (MidnightControlsClient.BINDING_LOOK_UP.isPressed()) {
-            this.handleFlatLook(AxisStorage.of(GLFW_GAMEPAD_AXIS_RIGHT_Y, -0.8F, 0d));
-        } else if (MidnightControlsClient.BINDING_LOOK_DOWN.isPressed()) {
-            this.handleFlatLook(AxisStorage.of(GLFW_GAMEPAD_AXIS_RIGHT_Y, 0.8F, 0d));
-        }
-        if (MidnightControlsClient.BINDING_LOOK_LEFT.isPressed()) {
-            this.handleFlatLook(AxisStorage.of(GLFW_GAMEPAD_AXIS_RIGHT_X, -0.8F, 0d));
-        } else if (MidnightControlsClient.BINDING_LOOK_RIGHT.isPressed()) {
-            this.handleFlatLook(AxisStorage.of(GLFW_GAMEPAD_AXIS_RIGHT_X, 0.8F, 0d));
-        }
-
-        InputManager.INPUT_MANAGER.tick();
-    }
-
-    /**
-     * This method is called every Minecraft tick for controller input update.
-     */
-    public void tickController() {
-        BUTTON_COOLDOWNS.entrySet().stream().filter(entry -> entry.getValue() > 0)
-                .forEach(entry -> BUTTON_COOLDOWNS.put(entry.getKey(), entry.getValue() - 1));
-        // Decreases the cooldown for GUI actions.
-        if (this.actionGuiCooldown > 0)
-            --this.actionGuiCooldown;
-        if (this.screenCloseCooldown > 0)
-            --this.screenCloseCooldown;
-        if (this.joystickCooldown > 0)
-            --this.joystickCooldown;
-
-        InputManager.updateStates();
-
-        var controller = MidnightControlsConfig.getController();
-
-        if (controller.isConnected()) {
-            var state = controller.getState();
-            this.fetchButtonInput(state, false);
-            this.fetchTriggerInput(state, false);
-            this.fetchJoystickInput(state, false, false);
-        }
-        MidnightControlsConfig.getSecondController().filter(Controller::isConnected)
-                .ifPresent(joycon -> {
-                    var state = joycon.getState();
-                    this.fetchButtonInput(state, true);
-                    this.fetchTriggerInput(state, true);
-                    this.fetchJoystickInput(state, true, false);
-                });
-
-        boolean allowInput = this.controlsInput == null || this.controlsInput.focusedBinding == null;
-
-        if (allowInput)
-            InputManager.updateBindings();
-
-        if (this.controlsInput != null) {
-            InputManager.STATES.forEach((num, button) -> {
-                if (button.isPressed()) System.out.println(num);
-            });
-        }
-        if (this.controlsInput != null && InputManager.STATES.int2ObjectEntrySet().parallelStream().map(Map.Entry::getValue).allMatch(ButtonState::isUnpressed)) {
-            if (MidnightControlsConfig.debug) MidnightControls.log("Starting MidnightInput Button Edit");
-            if (this.controlsInput.focusedBinding != null && !this.controlsInput.waiting) {
-                int[] buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
-                this.controlsInput.finishBindingEdit(buttons);
-                this.controlsInput = null;
-            }
-        }
-
-        if (this.inventoryInteractionCooldown > 0)
-            this.inventoryInteractionCooldown--;
-    }
-    /**
-     * This method is called 1000 times a second for smooth camera input
-     */
-    public void tickCameraStick() {
-        var controller = MidnightControlsConfig.getController();
-
-        if (controller.isConnected()) {
-            this.fetchJoystickInput(controller.getState(), false, true);
-        }
-        MidnightControlsConfig.getSecondController().filter(Controller::isConnected)
-                .ifPresent(joycon -> this.fetchJoystickInput(joycon.getState(), true, true));
-    }
-
-    /**
-     * This method is called before the screen is rendered.
-     *
-     * @param screen the screen to render
-     */
-    public void onPreRenderScreen(@NotNull Screen screen) {
-        if (!isScreenInteractive(screen)) {
-            InputManager.INPUT_MANAGER.updateMousePosition(client);
-        }
-    }
-
-    /**
-     * This method is called to update the camera
-     */
-    public void updateCamera() {
-        if (!(client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay))
-            return;
-
-        var player = client.player;
-        if (player == null)
-            return;
-
-        if (this.targetYaw != 0.f || this.targetPitch != 0.f) {
-            float rotationYaw = (float) (client.player.lastYaw + (this.targetYaw * 0.175));
-            float rotationPitch = (float) (client.player.lastPitch + (this.targetPitch * 0.175));
-            client.player.lastYaw = rotationYaw;
-            client.player.lastPitch = MathHelper.clamp(rotationPitch, -90.f, 90.f);
-            client.player.setYaw(rotationYaw);
-            client.player.setPitch(MathHelper.clamp(rotationPitch, -90.f, 90.f));
-            if (client.player.isRiding() && client.player.getVehicle() != null) {
-                client.player.getVehicle().onPassengerLookAround(client.player);
-            }
-            client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
-        }
-    }
-
-    /**
-     * This method is called when a Screen is opened.
-     *
-     * @param windowWidth the window width
-     * @param windowHeight the window height
-     */
-    public void onScreenOpen(int windowWidth, int windowHeight) {
-        if (client.currentScreen == null) {
-            this.mouseSpeedX = this.mouseSpeedY = 0.0F;
-            InputManager.INPUT_MANAGER.resetMousePosition(windowWidth, windowHeight);
-        } else if (isScreenInteractive(client.currentScreen) && MidnightControlsConfig.virtualMouse) {
-            ((MouseAccessor) client.mouse).midnightcontrols$onCursorPos(client.getWindow().getHandle(), 0, 0);
-            InputManager.INPUT_MANAGER.resetMouseTarget(client);
-        }
-        this.inventoryInteractionCooldown = 5;
-    }
-
-    public void beginControlsInput(ControllerControlsWidget widget) {
-        this.controlsInput = widget;
-        if (widget != null) {
-            this.controlsInput.currentButtons.clear();
-            this.controlsInput.waiting = true;
-        }
-    }
-
-    private void fetchButtonInput(@NotNull GLFWGamepadState gamepadState, boolean leftJoycon) {
-        var buffer = gamepadState.buttons();
-        for (int i = 0; i < buffer.limit(); i++) {
-            int btn = leftJoycon ? ButtonBinding.controller2Button(i) : i;
-            boolean pressed = buffer.get() == (byte) 1;
-            var state = ButtonState.NONE;
-            var previousState = InputManager.STATES.getOrDefault(btn, ButtonState.NONE);
-
-            if (pressed != previousState.isPressed()) {
-                state = pressed ? ButtonState.PRESS : ButtonState.RELEASE;
-                this.handleButton(ButtonStorage.of(btn, state));
-                if (pressed)
-                    BUTTON_COOLDOWNS.put(btn, 5);
-            } else if (pressed) {
-                state = ButtonState.REPEAT;
-                if (BUTTON_COOLDOWNS.getOrDefault(btn, 0) == 0) {
-                    BUTTON_COOLDOWNS.put(btn, 5);
-                    this.handleButton(ButtonStorage.of(btn, state));
-                }
-            }
-
-            InputManager.STATES.put(btn, state);
-        }
-    }
-    final MathUtil.PolarUtil polarUtil = new MathUtil.PolarUtil();
-
-    private void fetchJoystickInput(@NotNull GLFWGamepadState gamepadState, boolean leftJoycon, boolean cameraTick) {
-        var buffer = gamepadState.axes();
-
-        polarUtil.calculate(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X), buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y), 1, MidnightControlsConfig.leftDeadZone);
-        float leftX = polarUtil.polarX;
-        float leftY = polarUtil.polarY;
-        polarUtil.calculate(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X), buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y), 1, MidnightControlsConfig.rightDeadZone);
-        float rightX = polarUtil.polarX;
-        float rightY = polarUtil.polarY;
-
-        boolean isRadialMenu = client.currentScreen instanceof RingScreen || (PlatformFunctions.isModLoaded("emotecraft") && EmotecraftCompat.isEmotecraftScreen(client.currentScreen));
-
-        if (!isRadialMenu) {
-            for (int i = cameraTick ? GLFW_GAMEPAD_AXIS_RIGHT_X : 0; i < (cameraTick ? GLFW_GAMEPAD_AXIS_LEFT_TRIGGER : GLFW_GAMEPAD_AXIS_RIGHT_X); i++) {
-                int axis = leftJoycon ? ButtonBinding.controller2Button(i) : i;
-                float value = buffer.get(i);
-
-                switch (i) {
-                    case GLFW_GAMEPAD_AXIS_LEFT_X -> {
-                        if (MidnightControlsConfig.analogMovement) value = leftX;
-                    }
-                    case GLFW_GAMEPAD_AXIS_LEFT_Y -> {
-                        if (MidnightControlsConfig.analogMovement) value = leftY;
-                    }
-                    case GLFW_GAMEPAD_AXIS_RIGHT_X -> value = rightX;
-                    case GLFW_GAMEPAD_AXIS_RIGHT_Y -> value = rightY;
-                }
-
-                if (i == GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y)
-                    value *= -1.0F;
-
-                this.handleJoystickAxis(AxisStorage.of(axis, value));
-            }
-        }
-        else {
-            boolean leftStickActive = leftX != 0 || leftY != 0;
-            handleRadialMenu(leftStickActive ? leftX : rightX, leftStickActive ? leftY : rightY);
-        }
-    }
-
-    private void fetchTriggerInput(@NotNull GLFWGamepadState gamepadState, boolean leftJoycon) {
-        var buffer = gamepadState.axes();
-
-        for (int i = GLFW_GAMEPAD_AXIS_LEFT_TRIGGER; i <= GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER; i++) {
-            int axis = leftJoycon ? ButtonBinding.controller2Button(i) : i;
-            float value = buffer.get(i);
-
-            this.handleTriggerAxis(AxisStorage.of(axis, value, MidnightControlsConfig.triggerDeadZone));
-        }
-    }
-
-    public void handleButton(ButtonStorage storage) {
-        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
-            if (storage.state == ButtonState.PRESS && !this.controlsInput.currentButtons.contains(storage.button)) {
-                this.controlsInput.currentButtons.add(storage.button);
-
-                var buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
-                this.controlsInput.focusedBinding.setButton(buttons);
-
-                this.controlsInput.waiting = false;
-            }
-            return;
-        }
-
-        if (client.currentScreen != null && storage.state.isPressed() && storage.button == GLFW_GAMEPAD_BUTTON_Y &&
-                MidnightControlsConfig.arrowScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
-            pressKeyboardKey(client, GLFW.GLFW_KEY_ENTER);
-            this.screenCloseCooldown = 5;
-        }
-        else if (storage.state.isPressed()) {
-            if (client.currentScreen != null && storage.isDpad() && this.actionGuiCooldown == 0) {
-                switch (storage.button) {
-                    case GLFW_GAMEPAD_BUTTON_DPAD_UP -> this.changeFocus(client.currentScreen, NavigationDirection.UP);
-                    case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
-                    case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> this.handleLeftRight(client.currentScreen, false);
-                    case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> this.handleLeftRight(client.currentScreen, true);
-                }
-                if (MidnightControlsConfig.wasdScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
-                    switch (storage.button) {
-                        case GLFW_GAMEPAD_BUTTON_DPAD_UP -> pressKeyboardKey(client, GLFW.GLFW_KEY_W);
-                        case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> pressKeyboardKey(client, GLFW.GLFW_KEY_S);
-                        case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> pressKeyboardKey(client, GLFW.GLFW_KEY_A);
-                        case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> pressKeyboardKey(client, GLFW.GLFW_KEY_D);
-                    }
-                }
-                return;
-            }
-        }
-        else {
-            if (storage.button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null) {
-                if (this.actionGuiCooldown == 0) {
-                    var focused = client.currentScreen.getFocused();
-                    if (focused != null && isScreenInteractive(client.currentScreen)) {
-                        if (this.handleAButton(client.currentScreen, focused)) {
-                            this.actionGuiCooldown = 5; // Set the cooldown to 5 ticks to avoid unintended button presses.
-                            return;
-                        }
-                    }
-                    else if (PlatformFunctions.isModLoaded("libgui")) LibGuiCompat.handlePress(client.currentScreen);
-                }
-            }
-        }
-
-        if (storage.button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
-                && this.actionGuiCooldown == 0) {
-            if (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
-                    client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth(),
-                    client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()) != null) return;
-            if (!this.ignoreNextARelease && client.currentScreen != null) {
-                var accessor = (MouseAccessor) client.mouse;
-                accessor.midnightcontrols$onCursorPos(client.getWindow().getHandle(), client.mouse.getX(), client.mouse.getY());
-                switch (storage.state) {
-                    // Button pressed
-                    case PRESS -> accessor.midnightcontrols$onMouseButton(client.getWindow().getHandle(), GLFW_MOUSE_BUTTON_LEFT, 1, 0);
-                    case RELEASE -> { // Button released
-                        accessor.midnightcontrols$onMouseButton(client.getWindow().getHandle(), GLFW_MOUSE_BUTTON_LEFT, 0, 0);
-                        client.currentScreen.setDragging(false);
-                    }
-                    case REPEAT -> client.currentScreen.setDragging(true); // Button held down / dragging
-                }
-                this.screenCloseCooldown = 5;
-            } else {
-                this.ignoreNextARelease = false;
-            }
-        }
-        else if (storage.button == GLFW.GLFW_GAMEPAD_BUTTON_X && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
-                && this.actionGuiCooldown == 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 (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
-                    mouseX, mouseY) != null) return;
-            if (!this.ignoreNextXRelease && client.currentScreen != null) {
-                if (storage.state == ButtonState.PRESS) client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2);
-                else if (storage.state == ButtonState.RELEASE) client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2);
-                this.screenCloseCooldown = 5;
-            } else {
-                this.ignoreNextXRelease = false;
-            }
-        }
-    }
-    private void handleTriggerAxis(AxisStorage storage) {
-        storage.setupButtonStates();
-    }
-
-    private void handleJoystickAxis(AxisStorage storage) {
-        storage.setupButtonStates();
-
-        this.handleJoystickMovement(storage);
-
-        if (this.handleScreenScrolling(client.currentScreen, storage)) return;
-
-        storage.absValue = (float) MathHelper.clamp(storage.absValue / MidnightControlsConfig.getAxisMaxValue(storage.axis), 0.f, 1.f);
-        if (client.currentScreen == null) {
-            // Handles the look direction.
-            this.handleLook(storage);
-        } else {
-            boolean allowMouseControl = true;
-
-            if (this.actionGuiCooldown == 0 && MidnightControlsConfig.isMovementAxis(storage.axis) && isScreenInteractive(client.currentScreen)) {
-                if (MidnightControlsConfig.isForwardButton(storage.axis, false, storage.buttonState)) {
-                    allowMouseControl = this.changeFocus(client.currentScreen, NavigationDirection.UP);
-                } else if (MidnightControlsConfig.isBackButton(storage.axis, false, storage.buttonState)) {
-                    allowMouseControl = this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
-                } else if (MidnightControlsConfig.isLeftButton(storage.axis, false, storage.buttonState)) {
-                    allowMouseControl = this.handleLeftRight(client.currentScreen, false);
-                } else if (MidnightControlsConfig.isRightButton(storage.axis, false, storage.buttonState)) {
-                    allowMouseControl = this.handleLeftRight(client.currentScreen, true);
-                }
-            }
-
-            float movementX = 0.f;
-            float movementY = 0.f;
-
-            if (MidnightControlsConfig.isBackButton(storage.axis, false, (storage.value > 0 ? ButtonState.PRESS : ButtonState.RELEASE))) {
-                movementY = storage.absValue;
-            } else if (MidnightControlsConfig.isForwardButton(storage.axis, false, (storage.value > 0 ? ButtonState.PRESS : ButtonState.RELEASE))) {
-                movementY = -storage.absValue;
-            } else if (MidnightControlsConfig.isLeftButton(storage.axis, false, (storage.value > 0 ? ButtonState.PRESS : ButtonState.RELEASE))) {
-                movementX = -storage.absValue;
-            } else if (MidnightControlsConfig.isRightButton(storage.axis, false, (storage.value > 0 ? ButtonState.PRESS : ButtonState.RELEASE))) {
-                movementX = storage.absValue;
-            }
-
-            if (client.currentScreen != null && allowMouseControl) {
-                boolean moving = movementY != 0 || movementX != 0;
-                if (moving) {
-                /*
-                    Updates the target mouse position when the initial movement stick movement is detected.
-                    It prevents the cursor to jump to the old target mouse position if the user moves the cursor with the mouse.
-                 */
-                    if (Math.abs(prevXAxis) < storage.deadZone && Math.abs(prevYAxis) < storage.deadZone) {
-                        InputManager.INPUT_MANAGER.resetMouseTarget(client);
-                    }
-
-                    this.mouseSpeedX = movementX;
-                    this.mouseSpeedY = movementY;
-                } else {
-                    this.mouseSpeedX = 0.f;
-                    this.mouseSpeedY = 0.f;
-                }
-
-                if (Math.abs(this.mouseSpeedX) >= .05f || Math.abs(this.mouseSpeedY) >= .05f) {
-                    InputManager.queueMoveMousePosition(
-                            this.mouseSpeedX * MidnightControlsConfig.mouseSpeed,
-                            this.mouseSpeedY * MidnightControlsConfig.mouseSpeed
-                    );
-                }
-
-                InventoryUtil.moveMouseToClosestSlot(client.currentScreen);
-            }
-
-            this.prevXAxis = movementX;
-            this.prevYAxis = movementY;
-        }
-    }
-
-    private void handleJoystickMovement(AxisStorage storage) {
-        float axisValue = storage.absValue;
-        if (!MidnightControlsConfig.analogMovement || (client.player != null && client.player.getVehicle() instanceof BoatEntity)) {
-            axisValue = (float) (storage.absValue - storage.deadZone);
-            axisValue /= (float) (1.0 - storage.deadZone);
-            axisValue *= (float) storage.deadZone;
-        }
-        axisValue = (float) Math.min(axisValue / MidnightControlsConfig.getAxisMaxValue(storage.axis), 1);
-        if (AxisStorage.isLeftAxis(storage.axis)) MidnightControlsCompat.handleMovement(storage, axisValue);
-        InputManager.BUTTON_VALUES.put(storage.getButtonId(true), storage.polarity == AxisStorage.Polarity.PLUS ? axisValue : 0.f);
-        InputManager.BUTTON_VALUES.put(storage.getButtonId(false), storage.polarity == AxisStorage.Polarity.MINUS ? axisValue : 0.f);
-        storage.absValue = axisValue;
-    }
-
-    private boolean handleScreenScrolling(Screen screen, AxisStorage storage) {
-        if (screen == null) return false;
-        // @TODO allow rebinding to left stick
-        int preferredAxis = true ? GLFW_GAMEPAD_AXIS_RIGHT_Y : GLFW_GAMEPAD_AXIS_LEFT_Y;
-
-        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
-            if (storage.buttonState != ButtonState.NONE && !this.controlsInput.currentButtons.contains(storage.getButtonId(storage.buttonState == ButtonState.PRESS))) {
-
-                this.controlsInput.currentButtons.add(storage.getButtonId(storage.buttonState == ButtonState.PRESS));
-
-                int[] buttons = new int[this.controlsInput.currentButtons.size()];
-                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
-                    buttons[i] = this.controlsInput.currentButtons.get(i);
-                this.controlsInput.focusedBinding.setButton(buttons);
-
-                this.controlsInput.waiting = false;
-            }
-            return true;
-        } else if (storage.absValue >= storage.deadZone) {
-            if (screen instanceof CreativeInventoryScreen creativeInventoryScreen) {
-                if (storage.axis == preferredAxis) {
-                    var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen;
-                    if (accessor.midnightcontrols$hasScrollbar() && storage.absValue >= storage.deadZone) {
-                        creativeInventoryScreen.mouseScrolled(0.0, 0.0, 0, -(storage.value * 0.0175f));
-                    }
-                    return true;
-                }
-            } else if (screen instanceof AdvancementsScreen advancementsScreen) {
-                if (storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_X || storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
-                    var accessor = (AdvancementsScreenAccessor) advancementsScreen;
-                    AdvancementTab tab = accessor.getSelectedTab();
-                    tab.move(storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_X ? -storage.value * 1.0 : 0.0, storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_Y ? -storage.value * 5.0 : 0.0);
-                    return true;
-                }
-            } else if (screen != null) {
-                if (storage.axis == preferredAxis && !handleListWidgetScrolling(screen.children(), storage.value)) {
-                    try {
-                        screen.mouseScrolled(0.0, 0.0, 0, -(storage.value * 0.0175f));
-                    } catch (NullPointerException ignored) {}
-                } else if (isScreenInteractive(screen)) {
-                    if (joystickCooldown == 0) {
-                        switch (storage.axis) {
-                            case GLFW_GAMEPAD_AXIS_LEFT_Y -> {
-                                this.changeFocus(screen, storage.value > 0 ? NavigationDirection.UP : NavigationDirection.DOWN);
-                                joystickCooldown = 4;
-                            }
-                            case GLFW_GAMEPAD_AXIS_LEFT_X -> {
-                                this.handleLeftRight(screen, storage.value > 0);
-                                joystickCooldown = 4;
-                            }
-                        }
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    public void handleRadialMenu(float x, float y) {
-        int index = -1;
-        float border = 0.3f;
-        if (x < -border) {
-            index = 3;
-            if (y < -border) index = 0;
-            else if (y > border) index = 5;
-        } else if (x > border) {
-            index = 4;
-            if (y < -border) index = 2;
-            else if (y > border) index = 7;
-        } else {
-            if (y < -border) index = 1;
-            else if (y > border) index = 6;
-        }
-        if (client.currentScreen instanceof RingScreen && index > -1) RingPage.selected = index;
-        if (PlatformFunctions.isModLoaded("emotecraft") && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)) EmotecraftCompat.handleEmoteSelector(index);
-    }
-
-    public boolean handleListWidgetScrolling(List<? extends Element> children, float value) {
-        return children.stream().filter(element -> element instanceof SpruceEntryListWidget)
-                .map(element -> (SpruceEntryListWidget<?>) element)
-                .filter(AbstractSpruceWidget::isFocusedOrHovered)
-                .anyMatch(element -> {
-                    element.mouseScrolled(0.0, 0.0, 0, -value);
-                    return true;
-                }) ||
-                children.stream().filter(element -> element instanceof EntryListWidget)
-                    .map(element -> (EntryListWidget<?>) element)
-                    .filter(element -> element.getType().isFocused())
-                    .anyMatch(element -> {
-                        element.mouseScrolled(0.0, 0.0, 0, -value);
-                        return true;
-                    });
-    }
-
-    public boolean handleAButton(@NotNull Screen screen, @NotNull Element focused) {
-        if (focused instanceof PressableWidget widget) {
-            widget.playDownSound(MinecraftClient.getInstance().getSoundManager());
-            widget.onPress();
-            return true;
-        } else if (focused instanceof AbstractSprucePressableButtonWidget widget) {
-            widget.playDownSound();
-            widget.onPress();
-            return true;
-        } else if (focused instanceof SpruceLabelWidget labelWidget) {
-            labelWidget.onPress();
-            return true;
-        } else if (focused instanceof WorldListWidget list) {
-            list.getSelectedAsOptional().ifPresent(WorldListWidget.WorldEntry::play);
-            return true;
-        } else if (focused instanceof MultiplayerServerListWidget list) {
-            var entry = list.getSelectedOrNull();
-            if (entry instanceof MultiplayerServerListWidget.LanServerEntry || entry instanceof MultiplayerServerListWidget.ServerEntry) {
-                ((MultiplayerScreen) screen).select(entry);
-                ((MultiplayerScreen) screen).connect();
-            }
-        } else if (focused instanceof SpruceParentWidget) {
-            var childFocused = ((SpruceParentWidget<?>) focused).getFocused();
-            if (childFocused != null)
-                return this.handleAButton(screen, childFocused);
-        } else if (focused instanceof ParentElement widget) {
-            var childFocused = widget.getFocused();
-            if (childFocused != null)
-                return this.handleAButton(screen, childFocused);
-        } else if (PlatformFunctions.isModLoaded("yet-another-config-lib") && YACLCompat.handleAButton(screen, focused)) {
-            return true;
-        }
-        else pressKeyboardKey(screen, GLFW_KEY_ENTER);
-        return false;
-    }
-
-    /**
-     * Handles the left and right buttons.
-     *
-     * @param screen the current screen
-     * @param right true if the right button is pressed, else false
-     */
-    private boolean handleLeftRight(@NotNull Screen screen, boolean right) {
-        if (screen instanceof SpruceScreen spruceScreen) {
-            spruceScreen.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
-            this.actionGuiCooldown = 5;
-            return false;
-        }
-        if (PlatformFunctions.isModLoaded("yet-another-config-lib") && YACLCompat.handleLeftRight(screen, right)) {
-            this.actionGuiCooldown = 5;
-            return false;
-        }
-        var focused = screen.getFocused();
-        if (focused != null)
-            if (this.handleRightLeftElement(focused, right))
-                return this.changeFocus(screen, right ? NavigationDirection.RIGHT : NavigationDirection.LEFT);
-        return true;
-    }
-
-    private boolean handleRightLeftElement(@NotNull Element element, boolean right) {
-        switch (element) {
-            case SpruceElement spruceElement -> {
-                if (spruceElement.requiresCursor())
-                    return true;
-                return !spruceElement.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
-            }
-            case SliderWidget slider -> {
-                if (slider.active) {
-                    slider.keyPressed(right ? 262 : 263, 0, 0);
-                    this.actionGuiCooldown = 2; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
-                    return true;
-                }
-            }
-//            case AlwaysSelectedEntryListWidget<?> alwaysSelectedEntryListWidget -> {
-//                //TODO ((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.DOWN : EntryListWidget.MoveDirection.UP);
-//                return false;
-//            }
-            case ParentElement entryList -> {
-                var focused = entryList.getFocused();
-                if (focused == null)
-                    return true;
-                return this.handleRightLeftElement(focused, right);
-            }
-            default -> {
-            }
-        }
-        return true;
-    }
-    private double prevX = 0;
-    private double prevY = 0;
-    private double xValue;
-    private AxisStorage.Polarity xPolarity;
-
-    /**
-     * Handles the look direction input.
-     *
-     * @param storage the state of the provided axis
-     */
-    public void handleLook(AxisStorage storage) {
-        if (client.player == null || !(storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_Y || storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_X)) return;
-        // Handles the look direction.
-        if (MidnightControlsConfig.cameraMode == CameraMode.FLAT) handleFlatLook(storage);
-        else handleAdaptiveLook(storage);
-        MidnightControlsCompat.handleCamera(this.targetYaw, this.targetPitch);
-    }
-    private void handleFlatLook(AxisStorage storage) {
-        if (storage.polarity != AxisStorage.Polarity.ZERO) {
-            double rotation = Math.pow(storage.value, 2.0) * 0.11D * storage.polarity.multiplier;
-
-            if (storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) this.targetPitch = rotation * MidnightControlsConfig.getRightYAxisSign() * MidnightControlsConfig.yAxisRotationSpeed / 2;
-            else this.targetYaw = rotation * MidnightControlsConfig.getRightXAxisSign() * MidnightControlsConfig.rotationSpeed / 2;
-        }
-    }
-    private void handleAdaptiveLook(AxisStorage storage) {
-        if (storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
-            xValue = storage.value;
-            xPolarity = storage.polarity;
-        }
-        else {
-            double yStep = (MidnightControlsConfig.yAxisRotationSpeed / 50) * 0.6000000238418579 + 0.20000000298023224;
-            double xStep = (MidnightControlsConfig.rotationSpeed / 50) * 0.6000000238418579 + 0.20000000298023224;
-            float yValue = storage.value;
-            AxisStorage.Polarity yPolarity = storage.polarity;
-
-            double cursorDeltaX = 2 * xValue - this.prevX;
-            double cursorDeltaY = 2 * yValue - this.prevY;
-            boolean slowdown = client.options.getPerspective().isFirstPerson() && Objects.requireNonNull(client.player).isUsingSpyglass();
-            double x = cursorDeltaX * xStep * (slowdown ? xStep : 1);
-            double y = cursorDeltaY * yStep * (slowdown ? yStep : 1);
-
-            double powXValue = Math.pow(x, 2.0);
-            double powYValue = Math.pow(y, 2.0);
-
-            if (xPolarity != AxisStorage.Polarity.ZERO) {
-                double sign = MidnightControlsConfig.getRightXAxisSign() * MidnightControlsConfig.rotationSpeed;
-                this.targetYaw = sign * powXValue * 0.11D * xPolarity.multiplier;
-            }
-            if (yPolarity != AxisStorage.Polarity.ZERO) {
-                double sign = MidnightControlsConfig.getRightYAxisSign() * MidnightControlsConfig.yAxisRotationSpeed;
-                this.targetPitch = sign * powYValue * 0.11D * yPolarity.multiplier;
-            }
-
-            this.prevY = yValue;
-            this.prevX = xValue;
-        }
-    }
-    public void handleTouchscreenLook(AxisStorage storage) {
-        if (storage.polarity != AxisStorage.Polarity.ZERO) {
-            double rotation = storage.value * 0.11D * MidnightControlsConfig.touchSpeed/5;
-
-            if (storage.axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) this.targetPitch = rotation;
-            else this.targetYaw = rotation;
-        }
-    }
-
-    private boolean changeFocus(@NotNull Screen screen, NavigationDirection direction) {
-        if (!isScreenInteractive(screen) && !screen.getClass().getCanonicalName().contains("me.jellysquid.mods.sodium.client.gui")) return false;
-        try {
-            if (screen instanceof SpruceScreen spruceScreen) {
-                if (spruceScreen.onNavigation(direction, false)) {
-                    this.actionGuiCooldown = 5;
-                }
-                return true;
-            }
-            switch (direction) {
-                case UP -> pressKeyboardKey(screen, GLFW.GLFW_KEY_UP);
-                case DOWN -> pressKeyboardKey(screen, GLFW.GLFW_KEY_DOWN);
-                case LEFT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_LEFT);
-                case RIGHT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_RIGHT);
-            }
-            this.actionGuiCooldown = 5;
-            return true;
-        } catch (Exception exception) {MidnightControls.warn("Unknown exception encountered while trying to change focus: "+exception);}
-        return false;
-    }
-
-    /**
-     * Tries to go back.
-     *
-     * @param screen the current screen
-     * @return true if successful, else false
-     */
-    public boolean tryGoBack(@NotNull Screen screen) {
-        var set = ImmutableSet.of("gui.back", "gui.done", "gui.cancel", "gui.toTitle", "gui.toMenu");
-        if (screen instanceof KeybindsScreen) return false;
-
-        return screen.children().stream().filter(element -> element instanceof PressableWidget)
-                .map(element -> (PressableWidget) element)
-                .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
-                .anyMatch(element -> {
-                    if (element.getMessage().getContent() instanceof TranslatableTextContent translatableText) {
-                        if (set.stream().anyMatch(key -> translatableText.getKey().equals(key))) {
-                            element.onPress();
-                            return true;
-                        }
-                    }
-                    return false;
-                });
-    }
-
-    public static boolean isScreenInteractive(@NotNull Screen screen) {
-        return !(screen instanceof HandledScreen || MidnightControlsConfig.joystickAsMouse || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
-                || (screen instanceof SpruceScreen && ((SpruceScreen) screen).requiresCursor())
-                || MidnightControlsCompat.requireMouseOnScreen(screen));
-    }
-
-    public void pressKeyboardKey(MinecraftClient client, int key) {
-        client.keyboard.onKey(client.getWindow().getHandle(), key, 0, 1, 0);
-    }
-    public void pressKeyboardKey(Screen screen, int key) {
-        screen.keyPressed(key, 0, 1);
-    }
-}

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

@@ -1,51 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.compat;
-
-import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.mixin.MouseAccessor;
-import io.github.kosmx.emotes.arch.screen.ingame.FastMenuScreen;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import org.joml.Vector2i;
-import org.lwjgl.glfw.GLFW;
-
-public class EmotecraftCompat {
-    private static final MinecraftClient client = MinecraftClient.getInstance();
-
-    public static void openEmotecraftScreen(Screen parent) {
-        client.setScreen(new FastMenuScreen(parent));
-    }
-    public static boolean isEmotecraftScreen(Screen screen) {
-        return screen instanceof FastMenuScreen;
-    }
-
-    static int prevIndex = -1;
-    public static void handleEmoteSelector(int index) {
-        try {
-            if (client.currentScreen instanceof FastMenuScreen) {
-                boolean stickReleased = index == -1 && prevIndex != -1;
-                var pos = calcMousePos(stickReleased ? prevIndex : index);
-                InputManager.queueMousePosition(pos.x, pos.y);
-                InputManager.INPUT_MANAGER.updateMousePosition(client);
-
-                if (stickReleased) {
-                    ((MouseAccessor) client.mouse).midnightcontrols$onMouseButton(client.getWindow().getHandle(), GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_PRESS, 0);
-                    prevIndex = -1;
-                }
-                else prevIndex = index;
-            } else prevIndex = -1;
-        } catch (Exception ignored) {}
-    }
-    public static Vector2i calcMousePos(int index) {
-        int x = client.getWindow().getWidth() / 2;
-        int y = client.getWindow().getHeight() / 2;
-        switch (index) {
-            case 0, 3, 5 -> x -= 275;
-            case 2, 4, 7 -> x += 275;
-        }
-        switch (index) {
-            case 0, 1, 2 -> y -= 275;
-            case 5, 6, 7 -> y += 275;
-        }
-        return new Vector2i(x, y);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/render/UnalignedTexturedQuadGuiElementRenderState.java

@@ -1,32 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.gui.render;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.ScreenRect;
-import net.minecraft.client.gui.render.state.SimpleGuiElementRenderState;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.texture.TextureSetup;
-import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix3x2f;
-
-@Environment(EnvType.CLIENT)
-public record UnalignedTexturedQuadGuiElementRenderState(RenderPipeline pipeline, TextureSetup textureSetup, Matrix3x2f pose, float x1, float y1, float x2, float y2, float u1, float u2, float v1, float v2, int color, @Nullable ScreenRect scissorArea, @Nullable ScreenRect bounds) implements SimpleGuiElementRenderState {
-    public UnalignedTexturedQuadGuiElementRenderState(RenderPipeline pipeline, TextureSetup textureSetup, Matrix3x2f pose, float x1, float y1, float x2, float y2, float u1, float u2, float v1, float v2, int color, @Nullable ScreenRect scissorArea) {
-        this(pipeline, textureSetup, pose, x1, y1, x2, y2, u1, u2, v1, v2, color, scissorArea, createBounds(x1, y1, x2, y2, pose, scissorArea));
-    }
-
-    @Override
-    public void setupVertices(VertexConsumer vertices, float depth) {
-        vertices.vertex(pose(), x1(), y1(), depth).texture(u1(), v1()).color(color());
-        vertices.vertex(pose(), x1(), y2(), depth).texture(u1(), v2()).color(color());
-        vertices.vertex(pose(), x2(), y2(), depth).texture(u2(), v2()).color(color());
-        vertices.vertex(pose(), x2(), y1(), depth).texture(u2(), v1()).color(color());
-    }
-
-    @Nullable
-    private static ScreenRect createBounds(float x1, float y1, float x2, float y2, Matrix3x2f pose, @Nullable ScreenRect scissorArea) {
-        ScreenRect screenRect = (new ScreenRect((int) x1, (int) y1, (int) (x2 - x1), (int) (y2 - y1))).transformEachVertex(pose);
-        return scissorArea != null ? scissorArea.intersection(screenRect) : screenRect;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractBlockAccessor.java

@@ -1,14 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.WorldView;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(AbstractBlock.class)
-public interface AbstractBlockAccessor {
-    @Invoker("canPlaceAt")
-    boolean midnightcontrols$canPlaceAt(BlockState state, WorldView world, BlockPos pos);
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenMixin.java

@@ -1,34 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import eu.midnightdust.midnightcontrols.client.util.AbstractSignEditScreenAccessor;
-import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.block.entity.SignText;
-import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(AbstractSignEditScreen.class)
-public class AbstractSignEditScreenMixin implements AbstractSignEditScreenAccessor {
-    @Shadow @Final private String[] messages;
-    @Shadow private SignText text;
-    @Shadow @Final protected SignBlockEntity blockEntity;
-    @Shadow @Final private boolean front;
-
-    @Override
-    public String[] midnightcontrols$getMessages() {
-        return messages;
-    }
-
-    @Override
-    public void midnightcontrols$setMessage(int line, String text) {
-        this.messages[line] = text;
-        this.text = this.text.withMessage(line, Text.literal(text));
-    }
-
-    @Override
-    public void midnightcontrols$writeToBlockEntity() {
-        this.blockEntity.setText(this.text, this.front);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookEditScreenAccessor.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.screen.ingame.BookEditScreen;
-import net.minecraft.client.gui.widget.EditBoxWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(BookEditScreen.class)
-public interface BookEditScreenAccessor {
-    @Accessor("editBox")
-    EditBoxWidget midnightcontrols$getEditBox();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/BookSigningScreenAccessor.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(BookSigningScreen.class)
-public interface BookSigningScreenAccessor {
-    @Accessor("bookTitleTextField")
-    TextFieldWidget midnightcontrols$getBookTitleTextField();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/DrawContextAccessor.java

@@ -1,24 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.render.state.GuiRenderState;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(DrawContext.class)
-public interface DrawContextAccessor {
-    @Accessor("state")
-    GuiRenderState getState();
-
-    @Accessor("scissorStack")
-    DrawContext.ScissorStack getScissorStack();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameOptionsScreenMixin.java

@@ -1,68 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
-import net.minecraft.client.gui.screen.option.GameOptionsScreen;
-import net.minecraft.client.gui.widget.OptionListWidget;
-import net.minecraft.client.gui.widget.TextIconButtonWidget;
-import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-
-/**
- * Injects the new controls settings button.
- */
-@Mixin(GameOptionsScreen.class)
-public abstract class GameOptionsScreenMixin extends Screen {
-    @Shadow @Nullable protected OptionListWidget body;
-    @Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"),
-                    (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
-            .dimension(20,20).texture(id("icon/controller"), 20, 20).build();
-
-    protected GameOptionsScreenMixin(Text title) {
-        super(title);
-    }
-
-    @Inject(method = "initBody", at = @At("TAIL"))
-    public void midnightcontrols$addMCButton(CallbackInfo ci) {
-        if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
-            this.midnightcontrols$setButtonPos();
-            this.addSelectableChild(midnightcontrols$button);
-        }
-    }
-    @Inject(method = "init", at = @At("TAIL"))
-    public void midnightcontrols$drawMCButton(CallbackInfo ci) {
-        if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
-            this.addDrawableChild(midnightcontrols$button);
-        }
-    }
-
-    @Inject(method = "refreshWidgetPositions", at = @At("TAIL"))
-    public void midnightcontrols$onResize(CallbackInfo ci) {
-        this.midnightcontrols$setButtonPos();
-    }
-    @Unique
-    public void midnightcontrols$setButtonPos() {
-        if (body != null) {
-            midnightcontrols$button.setPosition(body.getWidth() / 2 + 158, body.getY() + 4);
-        }
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InputAccessor.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.input.Input;
-import net.minecraft.util.math.Vec2f;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Input.class)
-public interface InputAccessor {
-    @Accessor
-    void setMovementVector(Vec2f input);
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/RecipeBookScreenAccessor.java

@@ -1,21 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.screen.ingame.RecipeBookScreen;
-import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RecipeBookScreen.class)
-public interface RecipeBookScreenAccessor {
-    @Accessor("recipeBook")
-    RecipeBookWidget<?> getRecipeBook();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/AbstractSignEditScreenAccessor.java

@@ -1,14 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util;
-
-import org.spongepowered.asm.mixin.Unique;
-
-public interface AbstractSignEditScreenAccessor {
-    @Unique
-    String[] midnightcontrols$getMessages();
-
-    @Unique
-    void midnightcontrols$setMessage(int line, String text);
-
-    @Unique
-    void midnightcontrols$writeToBlockEntity();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/InventoryUtil.java

@@ -1,124 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util;
-
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.screen.slot.Slot;
-import org.aperlambda.lambdacommon.utils.Pair;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Comparator;
-import java.util.Optional;
-import java.util.function.Predicate;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.input;
-
-public class InventoryUtil {
-    // Finds the closest slot in the GUI within 14 pixels.
-    public static Optional<Slot> findClosestSlot(HandledScreen<?> inventory, int direction) {
-        var 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();
-        // Finds the hovered slot.
-        var mouseSlot = accessor.midnightcontrols$getSlotAt(mouseX, mouseY);
-        return inventory.getScreenHandler().slots.parallelStream()
-                .filter(Predicate.isEqual(mouseSlot).negate())
-                .map(slot -> {
-                    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.x + 8;
-                        otherPosY = guiTop + mouseSlot.y + 8;
-                    }
-
-                    // Distance between the slot and the cursor.
-                    double distance = Math.sqrt(Math.pow(posX - otherPosX, 2) + Math.pow(posY - otherPosY, 2));
-                    return Pair.of(slot, distance);
-                }).filter(entry -> {
-                    var slot = entry.key;
-                    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.x + 8;
-                        otherPosY = guiTop + mouseSlot.y + 8;
-                    }
-                    if (direction == 0)
-                        return posY < otherPosY;
-                    else if (direction == 1)
-                        return posY > otherPosY;
-                    else if (direction == 2)
-                        return posX > otherPosX;
-                    else if (direction == 3)
-                        return posX < otherPosX;
-                    else
-                        return false;
-                })
-                .min(Comparator.comparingDouble(p -> p.value))
-                .map(p -> p.key);
-    }
-
-    private static int targetMouseX = 0;
-    private static int targetMouseY = 0;
-
-    // Inspired from https://github.com/MrCrayfish/Controllable/blob/1.14.X/src/main/java/com/mrcrayfish/controllable/client/ControllerInput.java#L686.
-    public static void moveMouseToClosestSlot(@Nullable Screen screen) {
-        // Makes the mouse attracted to slots. This helps with selecting items when using a controller.
-        if (screen instanceof HandledScreen<?> inventoryScreen) {
-            var 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<net.minecraft.util.Pair<Slot, Double>> closestSlot = inventoryScreen.getScreenHandler().slots.parallelStream()
-                    .map(slot -> {
-                        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));
-                        return new net.minecraft.util.Pair<>(slot, distance);
-                    }).filter(entry -> entry.getRight() <= 14.0)
-                    .min(Comparator.comparingDouble(net.minecraft.util.Pair::getRight));
-
-            if (closestSlot.isPresent() && client.player != null) {
-                var slot = closestSlot.get().getLeft();
-                if (slot.hasStack() || !client.player.getInventory().getSelectedStack().isEmpty()) {
-                    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;
-                    double deltaY = slotCenterY - targetMouseY;
-
-                    if (mouseX != slotCenterXScaled || mouseY != slotCenterYScaled) {
-                        targetMouseX += (int) (deltaX * 0.75);
-                        targetMouseY += (int) (deltaY * 0.75);
-                    } else {
-                        input.mouseSpeedX *= 0.3F;
-                        input.mouseSpeedY *= 0.3F;
-                    }
-                    input.mouseSpeedX *= .75F;
-                    input.mouseSpeedY *= .75F;
-                } else {
-                    input.mouseSpeedX *= .1F;
-                    input.mouseSpeedY *= .1F;
-                }
-            } else {
-                input.mouseSpeedX *= .3F;
-                input.mouseSpeedY *= .3F;
-            }
-        } else {
-            input.mouseSpeedX = 0.F;
-            input.mouseSpeedY = 0.F;
-        }
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/RainbowColor.java

@@ -1,15 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util;
-
-import java.awt.*;
-
-public class RainbowColor {
-    public static float hue;
-    public static void tick() {
-        if (hue > 1) hue = 0f;
-        hue = hue + 0.01f;
-    }
-
-    public static Color radialRainbow(float saturation, float brightness) {
-        return Color.getHSBColor(hue, saturation, brightness);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/ToggleSneakSprintUtil.java

@@ -1,47 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-public class ToggleSneakSprintUtil {
-    public static boolean toggleSneak(ButtonBinding button) {
-        if (client.player == null) return false;
-        boolean isFlying = client.player.getAbilities().flying;
-        var option = client.options.getSneakToggled();
-
-        button.asKeyBinding().ifPresent(binding -> {
-            boolean sneakToggled = option.getValue();
-            if (isFlying && sneakToggled)
-                option.setValue(false);
-            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
-                option.setValue(!sneakToggled);
-            binding.setPressed(button.isPressed());
-            if (isFlying && sneakToggled)
-                option.setValue(true);
-            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
-                option.setValue(sneakToggled);
-        });
-        return true;
-    }
-    public static boolean toggleSprint(ButtonBinding button) {
-        if (client.player == null) return false;
-        boolean isFlying = client.player.getAbilities().flying;
-        var option = client.options.getSprintToggled();
-
-        button.asKeyBinding().ifPresent(binding -> {
-            boolean sprintToggled = option.getValue();
-            if (isFlying && sprintToggled)
-                option.setValue(false);
-            else if (MidnightControlsConfig.controllerToggleSprint != sprintToggled)
-                option.setValue(!sprintToggled);
-            binding.setPressed(button.isPressed());
-            if (client.player.getAbilities().flying && sprintToggled)
-                option.setValue(true);
-            else if (MidnightControlsConfig.controllerToggleSprint != sprintToggled)
-                option.setValue(sprintToggled);
-        });
-        return true;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/ItemGroupUtil.java

@@ -1,66 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform;
-
-import dev.architectury.injectables.annotations.ExpectPlatform;
-import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.item.ItemGroups;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class ItemGroupUtil {
-    @ExpectPlatform
-    public static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
-        throw new AssertionError();
-    }
-
-    public static boolean cyclePage(boolean next, CreativeInventoryScreen screen) {
-        try {
-            return screen.children().stream().filter(element -> element instanceof PressableWidget)
-                    .map(element -> (PressableWidget) element)
-                    .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
-                    .anyMatch(element -> {
-                        if (next && element.getMessage().getString().equals(">")) {
-                            element.onPress();
-                            return true;
-                        } else if (element.getMessage().getString().equals("<")) {
-                            element.onPress();
-                            return true;
-                        }
-                        return false;
-                    });
-        } catch (Exception ignored) {}
-        return false;
-    }
-
-    public static @NotNull ItemGroup cycleTab(boolean next, MinecraftClient client) {
-        ItemGroup currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
-        int currentColumn = currentTab.getColumn();
-        ItemGroup.Row currentRow = currentTab.getRow();
-        ItemGroup newTab = null;
-        List<ItemGroup> visibleTabs = ItemGroupUtil.getVisibleGroups((CreativeInventoryScreen) client.currentScreen);
-        for (ItemGroup tab : visibleTabs) {
-            if (tab.getRow().equals(currentRow) && ((newTab == null && ((next && tab.getColumn() > currentColumn) ||
-                    (!next && tab.getColumn() < currentColumn))) || (newTab != null && ((next && tab.getColumn() > currentColumn && tab.getColumn() < newTab.getColumn()) ||
-                    (!next && tab.getColumn() < currentColumn && tab.getColumn() > newTab.getColumn())))))
-                newTab = tab;
-        }
-        if (newTab == null)
-            for (ItemGroup tab : visibleTabs) {
-                if ((tab.getRow().compareTo(currentRow)) != 0 && ((next && newTab == null || next && newTab.getColumn() > tab.getColumn()) || (!next && newTab == null) || (!next && newTab.getColumn() < tab.getColumn())))
-                    newTab = tab;
-            }
-        if (newTab == null) {
-            for (ItemGroup tab : visibleTabs) {
-                if ((next && tab.getRow() == ItemGroup.Row.TOP && tab.getColumn() == 0) ||
-                        !next && tab.getRow() == ItemGroup.Row.BOTTOM && (newTab == null || tab.getColumn() > newTab.getColumn()))
-                    newTab = tab;
-            }
-        }
-        if (newTab == null || newTab.equals(currentTab)) newTab = ItemGroups.getDefaultTab();
-        return newTab;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/NetworkUtil.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform;
-
-import dev.architectury.injectables.annotations.ExpectPlatform;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.network.packet.Packet;
-
-public class NetworkUtil {
-    @ExpectPlatform
-    public static void sendPacketC2S(Packet<?> packet) {
-        throw new AssertionError();
-    }
-    @ExpectPlatform
-    public static void sendPayloadC2S(CustomPayload payload) {
-        throw new AssertionError();
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/storage/AxisStorage.java

@@ -1,120 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.storage;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
-import org.lwjgl.glfw.GLFW;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightInput.BUTTON_COOLDOWNS;
-import static eu.midnightdust.midnightcontrols.client.controller.InputManager.STATES;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_X;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER;
-
-public class AxisStorage {
-    public final int axis;
-    public float value, absValue;
-    public final double deadZone;
-    public final Polarity polarity;
-    public final boolean isTrigger;
-    public final ButtonState buttonState;
-
-    // Used for joysticks
-    public static AxisStorage of(int axis, float value) {
-        return new AxisStorage(axis, value, isLeftAxis(axis) ? MidnightControlsConfig.leftDeadZone : MidnightControlsConfig.rightDeadZone);
-    }
-    public static AxisStorage of(int axis, float value, double deadZone) {
-        return new AxisStorage(axis, value, deadZone);
-    }
-
-    private AxisStorage(int axis, float value, double deadZone) {
-        this.axis = axis;
-        this.deadZone = deadZone;
-
-        if (axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER || axis == GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
-                || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER) || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER)) {
-            this.isTrigger = true;
-            if (value < -.5f) {
-                value = 0f;
-            }
-            else {
-                // Fixes Triggers not working correctly on some controllers
-                if (MidnightControlsConfig.triggerFix) {
-                    value = 1.0f;
-                }
-            }
-        } else isTrigger = false;
-
-        this.value = value;
-        this.buttonState = value > .5f ? ButtonState.PRESS : (value < -.5f ? ButtonState.RELEASE : ButtonState.NONE);
-        this.absValue = Math.abs(value);
-        boolean currentPlusState = value > deadZone;
-        boolean currentMinusState = value < -deadZone;
-        if (isTrigger) currentMinusState = false;
-        else if (!MidnightControlsConfig.analogMovement && isLeftAxis(axis)) {
-            currentPlusState = buttonState == ButtonState.PRESS;
-            currentMinusState = buttonState == ButtonState.RELEASE;
-        }
-        this.polarity = currentPlusState ? AxisStorage.Polarity.PLUS : currentMinusState ? AxisStorage.Polarity.MINUS : AxisStorage.Polarity.ZERO;
-    }
-    /**
-     * Returns the specified axis as a button.
-     *
-     * @param positive true if the axis part is positive, else false
-     * @return the axis as a button
-     */
-    public int getButtonId(boolean positive) {
-        return ButtonBinding.axisAsButton(axis, positive);
-    }
-
-    public void setupButtonStates() {
-        var posButton = getButtonId(true);
-        var negButton = getButtonId(false);
-        var previousPlusState = STATES.getOrDefault(posButton, ButtonState.NONE);
-        var previousMinusState = STATES.getOrDefault(negButton, ButtonState.NONE);
-
-        if (polarity.isPositive() != previousPlusState.isPressed()) {
-            STATES.put(posButton, polarity.isPositive() ? ButtonState.PRESS : ButtonState.RELEASE);
-            if (polarity.isPositive())
-                BUTTON_COOLDOWNS.put(posButton, 5);
-        } else if (polarity.isPositive()) {
-            STATES.put(posButton, ButtonState.REPEAT);
-            if (BUTTON_COOLDOWNS.getOrDefault(posButton, 0) == 0) {
-                BUTTON_COOLDOWNS.put(posButton, 5);
-            }
-        }
-
-        if (polarity.isNegative() != previousMinusState.isPressed()) {
-            STATES.put(negButton, polarity.isNegative() ? ButtonState.PRESS : ButtonState.RELEASE);
-            if (polarity.isNegative())
-                BUTTON_COOLDOWNS.put(negButton, 5);
-        } else if (polarity.isNegative()) {
-            STATES.put(negButton, ButtonState.REPEAT);
-            if (BUTTON_COOLDOWNS.getOrDefault(negButton, 0) == 0) {
-                BUTTON_COOLDOWNS.put(negButton, 5);
-            }
-        }
-    }
-    public static boolean isLeftAxis(int axis) {
-        return axis == GLFW_GAMEPAD_AXIS_LEFT_X || axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER;
-    }
-    public static boolean isRightAxis(int axis) {
-        return !isLeftAxis(axis);
-    }
-
-    public enum Polarity {
-        MINUS(-1), ZERO(0), PLUS(1);
-
-        public final int multiplier;
-        Polarity(int multiplier) {
-            this.multiplier = multiplier;
-        }
-        public boolean isPositive() {
-            return this == PLUS;
-        }
-        public boolean isNegative() {
-            return this == MINUS;
-        }
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/util/storage/ButtonStorage.java

@@ -1,23 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.storage;
-
-import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
-
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_BUTTON_DPAD_LEFT;
-import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP;
-
-public class ButtonStorage {
-    public final int button;
-    public final ButtonState state;
-
-    public static ButtonStorage of(int button, ButtonState state) {
-        return new ButtonStorage(button, state);
-    }
-
-    private ButtonStorage(int button, ButtonState state) {
-        this.button = button;
-        this.state = state;
-    }
-    public boolean isDpad() {
-        return button >= GLFW_GAMEPAD_BUTTON_DPAD_UP && button <= GLFW_GAMEPAD_BUTTON_DPAD_LEFT;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/KeyboardLayout.java

@@ -1,102 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard;
-
-import com.google.gson.JsonObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class KeyboardLayout {
-
-    public static KeyboardLayout QWERTY = new KeyboardLayout("en_US:qwerty", createQwertyLetterLayout(), createSymbolLayout());
-
-    private final String id;
-    private final List<List<String>> letters;
-    private final List<List<String>> symbols;
-
-    private KeyboardLayout(String id, List<List<String>> letters, List<List<String>> symbols) {
-        this.id = id;
-        this.letters = letters;
-        this.symbols = symbols;
-    }
-
-    public static KeyboardLayout fromJson(JsonObject json) {
-        try {
-            return new KeyboardLayout(json.get("id").getAsString(), getFromJson(json, true), getFromJson(json, false));
-        } catch (Exception e) {
-            throw new RuntimeException("Error loading keyboard definition: %s".formatted(e));
-        }
-    }
-    private static List<List<String>> getFromJson(JsonObject json, boolean letters) {
-        String type = letters ? "letters" : "symbols";
-        List<List<String>> arr = new ArrayList<>();
-        if (json.has(type)) {
-            JsonObject lettersJson = json.get(type).getAsJsonObject();
-            for (int i = 0; ; i++) {
-                if (!lettersJson.has("row"+i)) break;
-                var rowJson = lettersJson.get("row%s".formatted(i)).getAsJsonArray();
-                List<String> row = new ArrayList<>();
-                for (int j = 0; j < rowJson.size(); j++) {
-                    row.add(rowJson.get(j).getAsString());
-                }
-                arr.add(row);
-            }
-            return arr;
-        }
-        else {
-            return letters ? createQwertyLetterLayout() : createSymbolLayout();
-        }
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getTranslationKey() {
-        String[] identifier = id.split(":");
-        if (identifier.length != 2) return "Invalid Keyboard ID: %s".formatted(id);
-        return "midnightcontrols.virtual_keyboard.layout.%s.%s".formatted(identifier[0], identifier[1]);
-    }
-
-    public List<List<String>> getLetters() {
-        return letters;
-    }
-
-    public List<List<String>> getSymbols() {
-        return symbols;
-    }
-
-    private static List<List<String>> createQwertyLetterLayout() {
-        List<List<String>> letters = new ArrayList<>();
-        letters.add(Arrays.asList(
-                "q", "w", "e", "r", "t",
-                "y", "u", "i", "o", "p"
-        ));
-        letters.add(Arrays.asList(
-                "a", "s", "d", "f", "g",
-                "h", "j", "k", "l"
-        ));
-        letters.add(Arrays.asList(
-                "z", "x", "c", "v",
-                "b", "n", "m"
-        ));
-        return letters;
-    }
-
-    private static List<List<String>> createSymbolLayout() {
-        List<List<String>> symbols = new ArrayList<>();
-        symbols.add(Arrays.asList(
-                "1", "2", "3", "4", "5",
-                "6", "7", "8", "9", "0"
-        ));
-        symbols.add(Arrays.asList(
-                "@", "#", "$", "%", "&",
-                "*", "-", "+", "(", ")"
-        ));
-        symbols.add(Arrays.asList(
-                "!", "\"", "'", ":", ";",
-                ",", ".", "?", "/"
-        ));
-        return symbols;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/KeyboardLayoutManager.java

@@ -1,36 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import net.minecraft.resource.Resource;
-import net.minecraft.util.Identifier;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class KeyboardLayoutManager {
-    private static final Map<String, KeyboardLayout> KEYBOARD_LAYOUTS = new HashMap<>();
-
-    public static void loadLayout(Identifier id, Resource resource) {
-        try {
-            JsonObject json = JsonParser.parseReader(resource.getReader()).getAsJsonObject();
-            KeyboardLayout layout = KeyboardLayout.fromJson(json);
-            KEYBOARD_LAYOUTS.put(layout.getId(), layout);
-            if (MidnightControlsConfig.debug) System.out.printf("Loaded keyboard layout: %s\n", layout.getId());
-        } catch (IOException e) { throw new RuntimeException(e); }
-    }
-    public static KeyboardLayout getById(String id) {
-        return KEYBOARD_LAYOUTS.get(id) == null ? KeyboardLayout.QWERTY : KEYBOARD_LAYOUTS.get(id);
-    }
-    public static KeyboardLayout getNext(KeyboardLayout current) {
-        KeyboardLayout[] layouts = KEYBOARD_LAYOUTS.values().toArray(KeyboardLayout[]::new);
-        int currentIndex = -1;
-        for (int i = 0; i < layouts.length; i++) {
-            if (layouts[i] == current) currentIndex = i;
-        }
-        currentIndex = currentIndex+1 >= layouts.length ? 0 : currentIndex + 1;
-        return layouts[currentIndex];
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/MouseClickInterceptor.java

@@ -1,38 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard;
-
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.AbstractScreenClickHandler;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.BookEditScreenClickHandler;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.DefaultScreenClickHandler;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler.SignEditScreenClickHandler;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.BookEditScreen;
-import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
-import net.minecraft.client.gui.screen.ingame.SignEditScreen;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class MouseClickInterceptor {
-
-    private final Map<Class<?>, AbstractScreenClickHandler<?>> clickHandlers;
-
-    public MouseClickInterceptor() {
-        this.clickHandlers = new HashMap<>();
-        this.clickHandlers.put(BookSigningScreen.class, new BookEditScreenClickHandler.Signing());
-        this.clickHandlers.put(BookEditScreen.class, new BookEditScreenClickHandler());
-        this.clickHandlers.put(SignEditScreen.class, new SignEditScreenClickHandler());
-        this.clickHandlers.put(Screen.class, new DefaultScreenClickHandler());
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Screen> void intercept(T screen, double mouseX, double mouseY) {
-        AbstractScreenClickHandler<T> handler = (AbstractScreenClickHandler<T>) clickHandlers.get(screen.getClass());
-
-        if (handler == null) {
-            handler = (AbstractScreenClickHandler<T>) clickHandlers.get(Screen.class);
-        }
-
-        handler.handle(screen, mouseX, mouseY);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/AbstractScreenClickHandler.java

@@ -1,7 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
-
-import net.minecraft.client.gui.screen.Screen;
-
-public abstract class AbstractScreenClickHandler<T extends Screen> {
-    public abstract void handle(T screen, double mouseX, double mouseY);
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/BookEditScreenClickHandler.java

@@ -1,47 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
-
-import eu.midnightdust.midnightcontrols.client.mixin.BookEditScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.BookSigningScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui.VirtualKeyboardScreen;
-import net.minecraft.client.gui.screen.ingame.BookEditScreen;
-import net.minecraft.client.gui.screen.ingame.BookSigningScreen;
-import net.minecraft.client.gui.widget.EditBoxWidget;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-public class BookEditScreenClickHandler extends AbstractScreenClickHandler<BookEditScreen> {
-    @Override
-    public void handle(BookEditScreen screen, double mouseX, double mouseY) {
-        // don't open the keyboard if a UI element was clicked
-        if(screen.hoveredElement(mouseX, mouseY).isPresent() && !(screen.hoveredElement(mouseX, mouseY).get() instanceof EditBoxWidget)) {
-            return;
-        }
-
-        var accessor = (BookEditScreenAccessor) screen;
-
-        VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getEditBox().getText(), (text) -> {
-            client.setScreen(screen);
-            accessor.midnightcontrols$getEditBox().setText(text);
-        }, true);
-
-        client.setScreen(virtualKeyboardScreen);
-    }
-    public static class Signing extends AbstractScreenClickHandler<BookSigningScreen> {
-        @Override
-        public void handle(BookSigningScreen screen, double mouseX, double mouseY) {
-            // don't open the keyboard if a UI element was clicked
-            if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
-                return;
-            }
-
-            var accessor = (BookSigningScreenAccessor) screen;
-
-            VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getBookTitleTextField().getText(), (text) -> {
-                client.setScreen(screen);
-                accessor.midnightcontrols$getBookTitleTextField().setText(text);
-            }, false);
-
-            client.setScreen(virtualKeyboardScreen);
-        }
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/DefaultScreenClickHandler.java

@@ -1,144 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
-
-import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui.VirtualKeyboardScreen;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.ParentElement;
-import net.minecraft.client.gui.screen.ChatScreen;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import org.lwjgl.glfw.GLFW;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-public class DefaultScreenClickHandler extends AbstractScreenClickHandler<Screen> {
-
-    private Screen parentScreen;
-    private List<Integer> textFieldElementPath;
-
-    @Override
-    public void handle(Screen screen, double mouseX, double mouseY) {
-        var textField = findClickedTextField(screen.children(), mouseX, mouseY);
-        if (textField == null) {
-            return;
-        }
-
-        this.parentScreen = screen;
-        this.textFieldElementPath = calculatePathToElement(screen, textField.asElement());
-
-        var virtualKeyboardScreen = new VirtualKeyboardScreen(textField.getText(), this::handleKeyboardClose, false);
-        client.setScreen(virtualKeyboardScreen);
-    }
-
-    private void handleKeyboardClose(String newText) {
-        if (this.parentScreen == null || this.textFieldElementPath == null) {
-            return;
-        }
-
-        client.setScreen(this.parentScreen);
-        TextFieldWrapper textField = findTextFieldByPath(this.parentScreen, this.textFieldElementPath);
-        if (textField == null) {
-            return;
-        }
-
-        textField.setText(newText);
-
-        switch (this.parentScreen) {
-            case CreativeInventoryScreen creativeInventoryScreen -> {
-                var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen;
-                accessor.midnightcontrols$search();
-            }
-            case ChatScreen chatScreen -> {
-                // send the chat message
-                chatScreen.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0);
-            }
-            default -> {
-            }
-        }
-    }
-
-
-    private TextFieldWrapper findClickedTextField(List<? extends Element> elements, double mouseX, double mouseY) {
-        for (Element element : elements) {
-            if (TextFieldWrapper.isValidTextField(element)) {
-                TextFieldWrapper textField = new TextFieldWrapper(element);
-                if (textField.isMouseOver(mouseX, mouseY) && textField.isFocused()) {
-                    return textField;
-                }
-            }
-
-            if (element instanceof ParentElement parentElement) {
-                TextFieldWrapper found = findClickedTextField(parentElement.children(), mouseX, mouseY);
-                if (found != null) {
-                    return found;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Calculates the path between a parent and a target in the UI hierarchy
-     */
-    protected List<Integer> calculatePathToElement(Element parent, Element target) {
-        if (!(parent instanceof ParentElement parentElement)) {
-            return null;
-        }
-
-        List<? extends Element> children = parentElement.children();
-
-        for (int i = 0; i < children.size(); i++) {
-            Element child = children.get(i);
-
-            if (child == target) {
-                return Collections.singletonList(i);
-            }
-
-            if (child instanceof ParentElement) {
-                List<Integer> subPath = calculatePathToElement(child, target);
-                if (subPath != null) {
-                    List<Integer> fullPath = new ArrayList<>(subPath.size() + 1);
-                    fullPath.add(i);
-                    fullPath.addAll(subPath);
-                    return fullPath;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    protected TextFieldWrapper findTextFieldByPath(Element parent, List<Integer> path) {
-        if (path == null || path.isEmpty()) {
-            return null;
-        }
-
-        if (!(parent instanceof ParentElement parentElement)) {
-            return null;
-        }
-
-        List<? extends Element> children = parentElement.children();
-        int index = path.get(0);
-
-        if (index < 0 || index >= children.size()) {
-            return null;
-        }
-
-        Element child = children.get(index);
-
-        if (path.size() == 1) {
-            return TextFieldWrapper.isValidTextField(child) ? new TextFieldWrapper(child) : null;
-        }
-
-        if (child instanceof ParentElement) {
-            return findTextFieldByPath(child, path.subList(1, path.size()));
-        }
-
-        return null;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/SignEditScreenClickHandler.java

@@ -1,36 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
-
-import eu.midnightdust.midnightcontrols.client.util.AbstractSignEditScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui.VirtualKeyboardScreen;
-import net.minecraft.client.gui.screen.ingame.SignEditScreen;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-public class SignEditScreenClickHandler extends AbstractScreenClickHandler<SignEditScreen>  {
-    @Override
-    public void handle(SignEditScreen screen, double mouseX, double mouseY) {
-        // don't open the keyboard if a UI element was clicked
-        if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
-            return;
-        }
-
-        var accessor = (AbstractSignEditScreenAccessor) screen;
-
-        StringBuilder linesToString = new StringBuilder();
-        String[] messages = accessor.midnightcontrols$getMessages();
-        for (int i = 0; i < Math.min(4, messages.length); i++) {
-            String line = messages[i];
-            linesToString.append(line);
-            if (!line.isEmpty() && i < 3) linesToString.append("\n");
-        }
-
-        VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(linesToString.toString(), (text) -> {
-            client.setScreen(screen);
-            String[] lines = text.split("\n");
-            for (int i = 0; i < 4; i++) accessor.midnightcontrols$setMessage(i, lines.length > i ? lines[i] : "");
-            accessor.midnightcontrols$writeToBlockEntity();
-        }, true);
-
-        client.setScreen(virtualKeyboardScreen);
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/TextFieldWrapper.java

@@ -1,77 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
-
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import org.thinkingstudio.obsidianui.widget.text.SpruceTextFieldWidget;
-
-public record TextFieldWrapper(Object textField) {
-
-    public TextFieldWrapper {
-        if (!isValidTextField(textField)) {
-            throw new IllegalArgumentException("Type " + textField.getClass() + " is not marked as a valid text field");
-        }
-    }
-
-    Element asElement() {
-        return (Element) textField;
-    }
-
-    String getText() {
-        switch (textField) {
-            case SpruceTextFieldWidget spruceTextField -> {
-                return spruceTextField.getText();
-            }
-            case TextFieldWidget vanillaTextField -> {
-                return vanillaTextField.getText();
-            }
-            default -> {
-                return null;
-            }
-        }
-    }
-
-    void setText(String text) {
-        switch (textField) {
-            case SpruceTextFieldWidget spruceTextField -> {
-                spruceTextField.setText(text);
-            }
-            case TextFieldWidget vanillaTextField -> {
-                vanillaTextField.setText(text);
-            }
-            default -> {
-            }
-        }
-    }
-
-    boolean isMouseOver(double mouseX, double mouseY) {
-        switch (textField) {
-            case SpruceTextFieldWidget spruceTextField -> {
-                return spruceTextField.isMouseOver(mouseX, mouseY);
-            }
-            case TextFieldWidget vanillaTextField -> {
-                return vanillaTextField.isMouseOver(mouseX, mouseY);
-            }
-            default -> {
-                return false;
-            }
-        }
-    }
-
-    boolean isFocused() {
-        switch (textField) {
-            case SpruceTextFieldWidget spruceTextField -> {
-                return spruceTextField.isFocused();
-            }
-            case TextFieldWidget vanillaTextField -> {
-                return vanillaTextField.isFocused();
-            }
-            default -> {
-                return false;
-            }
-        }
-    }
-
-    static boolean isValidTextField(Object textField) {
-        return textField instanceof TextFieldWidget || textField instanceof SpruceTextFieldWidget;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/gui/VirtualKeyboardScreen.java

@@ -1,296 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayout;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
-import org.thinkingstudio.obsidianui.Position;
-import org.thinkingstudio.obsidianui.SpruceTexts;
-import org.thinkingstudio.obsidianui.screen.SpruceScreen;
-import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
-import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
-import org.thinkingstudio.obsidianui.widget.text.SpruceTextAreaWidget;
-
-import java.util.List;
-
-public class VirtualKeyboardScreen extends SpruceScreen {
-
-    @FunctionalInterface
-    public interface CloseCallback {
-        void onClose(String text);
-    }
-
-    private static final int STANDARD_KEY_WIDTH = 20;
-    private static final int SPECIAL_KEY_WIDTH = (int) (STANDARD_KEY_WIDTH * 1.5);
-    private static final int KEY_HEIGHT = 20;
-    private static final int HORIZONTAL_SPACING = 2;
-    private static final int VERTICAL_SPACING = 4;
-    private static final int CONTAINER_PADDING = 10;
-
-    // Key symbols
-    private static final String BACKSPACE_SYMBOL = "\b";
-    private static final String NEWLINE_SYMBOL = "\n";
-    private static final String SPACE_SYMBOL = " ";
-
-    private final StringBuilder buffer;
-    private final CloseCallback closeCallback;
-    private final KeyboardLayout layout;
-    private final boolean newLineSupport;
-
-    private boolean capsMode;
-    private boolean symbolMode;
-    private SpruceTextAreaWidget bufferDisplayArea;
-    private SpruceContainerWidget keyboardContainer;
-
-    public VirtualKeyboardScreen(String initialText, CloseCallback closeCallback, boolean newLineSupport) {
-        super(Text.translatable("midnightcontrols.virtual_keyboard.screen"));
-        this.buffer = new StringBuilder(initialText);
-        this.closeCallback = closeCallback;
-        this.layout = KeyboardLayoutManager.getById(MidnightControlsConfig.keyboardLayout);
-        this.capsMode = false;
-        this.symbolMode = false;
-        this.newLineSupport = newLineSupport;
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-
-        this.bufferDisplayArea = createBufferDisplayArea();
-        this.addDrawableChild(this.bufferDisplayArea);
-
-        rebuildKeyboard();
-
-        int doneButtonY = this.keyboardContainer.getY() + this.keyboardContainer.getHeight() + VERTICAL_SPACING * 2;
-        this.addDrawableChild(
-                new SpruceButtonWidget(
-                        Position.of(this, this.width / 2 - 50, doneButtonY),
-                        100,
-                        20,
-                        SpruceTexts.GUI_DONE,
-                        btn -> this.close()
-                )
-        );
-    }
-
-    @Override
-    public boolean shouldPause() {
-        return false;
-    }
-
-    @Override
-    public void close() {
-        super.close();
-        if (this.closeCallback != null) {
-            this.closeCallback.onClose(this.buffer.toString());
-        }
-    }
-
-    private void rebuildKeyboard() {
-        if (this.keyboardContainer != null) {
-            this.remove(this.keyboardContainer);
-        }
-
-        var layoutKeys = getActiveKeyLayout();
-        var keyboardContainer = createKeyboardContainer(layoutKeys);
-
-        addLayoutRows(keyboardContainer, layoutKeys);
-        addFunctionKeys(keyboardContainer);
-        addBottomRow(keyboardContainer);
-
-        this.keyboardContainer = keyboardContainer;
-        this.addDrawableChild(this.keyboardContainer);
-    }
-
-    private SpruceContainerWidget createKeyboardContainer(List<List<String>> layoutKeys) {
-        int containerWidth = this.width;
-        int totalKeyboardHeight = calculateKeyboardHeight(layoutKeys);
-        int keyboardY = this.bufferDisplayArea.getY() + this.bufferDisplayArea.getHeight() + VERTICAL_SPACING * 2;
-
-        return new SpruceContainerWidget(
-                Position.of(0, keyboardY),
-                containerWidth,
-                totalKeyboardHeight
-        );
-    }
-
-    private SpruceTextAreaWidget createBufferDisplayArea() {
-        int lineCount = this.newLineSupport ? 4 : 1;
-        int bufferX = this.width / 2 - 100;
-        int bufferY = this.height / 4 - VERTICAL_SPACING * 5 - 5;
-        int bufferWidth = 200;
-        int desiredHeight = (this.textRenderer.fontHeight + 2) * lineCount + 6;
-
-        var bufferDisplay = new SpruceTextAreaWidget(
-                Position.of(bufferX, bufferY),
-                bufferWidth,
-                desiredHeight,
-                Text.literal("Buffer Display")
-        );
-        bufferDisplay.setText(this.buffer.toString());
-        bufferDisplay.setEditable(false);
-        bufferDisplay.setUneditableColor(0xFFFFFFFF);
-        bufferDisplay.setDisplayedLines(lineCount);
-        bufferDisplay.setCursorToEnd();
-
-        return bufferDisplay;
-    }
-
-    private int calculateKeyboardHeight(List<List<String>> keyRows) {
-        return keyRows.size() * (KEY_HEIGHT + VERTICAL_SPACING) +
-                (KEY_HEIGHT + VERTICAL_SPACING) + // space for bottom row
-                CONTAINER_PADDING * 2; // top and bottom padding
-    }
-
-    private void addLayoutRows(SpruceContainerWidget container, List<List<String>> keyLayoutRows) {
-        int currentY = CONTAINER_PADDING;
-
-        for (List<String> row : keyLayoutRows) {
-            int rowWidth = calculateRowWidth(row);
-            // center row
-            int currentX = (container.getWidth() - rowWidth) / 2;
-
-            for (String key : row) {
-                String displayText = (this.capsMode && !this.symbolMode) ? key.toUpperCase() : key;
-                container.addChild(
-                        new SpruceButtonWidget(
-                                Position.of(currentX, currentY),
-                                STANDARD_KEY_WIDTH,
-                                KEY_HEIGHT,
-                                Text.literal(displayText),
-                                btn -> handleKeyPress(displayText)
-                        )
-                );
-
-                currentX += STANDARD_KEY_WIDTH + HORIZONTAL_SPACING;
-            }
-
-            currentY += KEY_HEIGHT + VERTICAL_SPACING;
-        }
-    }
-
-    private int calculateRowWidth(List<String> row) {
-        int rowWidth = 0;
-        for (int i = 0; i < row.size(); i++) {
-            rowWidth += STANDARD_KEY_WIDTH;
-            // padding
-            if (i < row.size() - 1) {
-                rowWidth += HORIZONTAL_SPACING;
-            }
-        }
-        return rowWidth;
-    }
-
-    private void addFunctionKeys(SpruceContainerWidget container) {
-        List<String> firstRow = getActiveKeyLayout().getFirst();
-        int firstRowWidth = calculateRowWidth(firstRow);
-
-        // position backspace at the right of the first row
-        int backspaceWidth = (int) (STANDARD_KEY_WIDTH * 1.5);
-        int backspaceX = (container.getWidth() + firstRowWidth) / 2 + HORIZONTAL_SPACING;
-
-        container.addChild(
-                new SpruceButtonWidget(
-                        Position.of(backspaceX, CONTAINER_PADDING),
-                        backspaceWidth,
-                        KEY_HEIGHT,
-                        Text.literal("←"),
-                        btn -> handleKeyPress(BACKSPACE_SYMBOL)
-                )
-        );
-
-
-        if (this.newLineSupport) {
-            // position newline at the right of the second row
-            List<String> secondRow = getActiveKeyLayout().get(1);
-            int newlineWidth = (int) (STANDARD_KEY_WIDTH * 1.5);
-            int secondRowWidth = calculateRowWidth(secondRow);
-            int newlineX = (container.getWidth() + secondRowWidth) / 2 + HORIZONTAL_SPACING;
-            int newlineY = CONTAINER_PADDING + (KEY_HEIGHT + VERTICAL_SPACING);
-
-            container.addChild(
-                    new SpruceButtonWidget(
-                            Position.of(newlineX, newlineY),
-                            newlineWidth,
-                            KEY_HEIGHT,
-                            Text.literal("⏎"),
-                            btn -> handleKeyPress(NEWLINE_SYMBOL)
-                    )
-            );
-        }
-    }
-
-    private void addBottomRow(SpruceContainerWidget container) {
-        // calculate positions for bottom row
-        int rowY = CONTAINER_PADDING + getActiveKeyLayout().size() * (KEY_HEIGHT + VERTICAL_SPACING);
-
-        // space bar - wide key in the middle
-        double spaceWidthFactor = 5.0;
-        int spaceKeyWidth = (int) (STANDARD_KEY_WIDTH * spaceWidthFactor);
-        int spaceX = (container.getWidth() - spaceKeyWidth) / 2;
-
-        container.addChild(
-                new SpruceButtonWidget(
-                        Position.of(spaceX, rowY),
-                        spaceKeyWidth,
-                        KEY_HEIGHT,
-                        Text.translatable("midnightcontrols.virtual_keyboard.keyboard.space"),
-                        btn -> handleKeyPress(SPACE_SYMBOL)
-                )
-        );
-
-        // caps key - left of space
-        if (!this.symbolMode) {
-            int capsX = spaceX - SPECIAL_KEY_WIDTH - HORIZONTAL_SPACING * 2;
-            var capsModeButton = new SpruceButtonWidget(
-                    Position.of(capsX, rowY),
-                    SPECIAL_KEY_WIDTH,
-                    KEY_HEIGHT,
-                    Text.literal(this.capsMode ? "caps" : "CAPS"),
-                    btn -> toggleCapsMode());
-
-            container.addChild(capsModeButton);
-        }
-
-        // symbols key - right of space
-        int symbolsX = spaceX + spaceKeyWidth + HORIZONTAL_SPACING * 2;
-        var symbolModeButton = new SpruceButtonWidget(
-                Position.of(symbolsX, rowY),
-                SPECIAL_KEY_WIDTH,
-                KEY_HEIGHT,
-                Text.literal(this.symbolMode ? "ABC" : "123?!"),
-                btn -> toggleSymbolMode()
-        );
-        container.addChild(symbolModeButton);
-    }
-
-    private void handleKeyPress(String key) {
-        if (key.equals(BACKSPACE_SYMBOL)) {
-            if (!this.buffer.isEmpty()) {
-                this.buffer.deleteCharAt(buffer.length() - 1);
-            }
-        } else {
-            this.buffer.append(key);
-        }
-
-        if (this.bufferDisplayArea != null) {
-            this.bufferDisplayArea.setText(this.buffer.toString());
-            this.bufferDisplayArea.setCursorToEnd();
-        }
-    }
-
-    private List<List<String>> getActiveKeyLayout() {
-        return this.symbolMode ? this.layout.getSymbols() : this.layout.getLetters();
-    }
-
-    private void toggleCapsMode() {
-        this.capsMode = !this.capsMode;
-        rebuildKeyboard();
-    }
-
-    private void toggleSymbolMode() {
-        this.symbolMode = !this.symbolMode;
-        rebuildKeyboard();
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/packet/ControlsModePayload.java

@@ -1,27 +0,0 @@
-package eu.midnightdust.midnightcontrols.packet;
-
-import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.packet.CustomPayload;
-
-import java.util.Objects;
-
-public record ControlsModePayload(String controlsMode) implements CustomPayload {
-    public static final Id<ControlsModePayload> PACKET_ID = new Id<>(MidnightControlsConstants.CONTROLS_MODE_CHANNEL);
-    public static final PacketCodec<RegistryByteBuf, ControlsModePayload> codec = PacketCodec.of(ControlsModePayload::write, ControlsModePayload::read);
-
-    public static ControlsModePayload read(RegistryByteBuf buf) {
-        return new ControlsModePayload(buf.readString(32));
-    }
-
-    public void write(RegistryByteBuf buf) {
-        Objects.requireNonNull(controlsMode, "Controls mode cannot be null.");
-        buf.writeString(controlsMode, 32);
-    }
-
-    @Override
-    public Id<? extends CustomPayload> getId() {
-        return PACKET_ID;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/packet/FeaturePayload.java

@@ -1,43 +0,0 @@
-package eu.midnightdust.midnightcontrols.packet;
-
-import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.packet.CustomPayload;
-
-public record FeaturePayload(MidnightControlsFeature... features) implements CustomPayload {
-    public static final Id<FeaturePayload> PACKET_ID = new Id<>(MidnightControlsConstants.FEATURE_CHANNEL);
-    public static final PacketCodec<RegistryByteBuf, FeaturePayload> codec = PacketCodec.of(FeaturePayload::write, FeaturePayload::read);
-
-    public static FeaturePayload read(RegistryByteBuf buf) {
-        int featureLength = buf.readVarInt();
-        MidnightControlsFeature[] receivedFeatures = new MidnightControlsFeature[featureLength];
-        for (int i = 0; i < featureLength; i++) {
-            var name = buf.readString(64);
-            boolean allowed = buf.readBoolean();
-            var feature = MidnightControlsFeature.fromName(name);
-            if (feature.isPresent()) {
-                feature.get().setAllowed(allowed);
-                receivedFeatures[i] = feature.get();
-            }
-        }
-        return new FeaturePayload(receivedFeatures);
-    }
-
-    public void write(RegistryByteBuf buf) {
-        if (features.length == 0)
-            throw new IllegalArgumentException("At least one feature must be provided.");
-
-        buf.writeVarInt(features.length);
-        for (var feature : features) {
-            buf.writeString(feature.getName(), 64);
-            buf.writeBoolean(feature.isAllowed());
-        }
-    }
-
-    @Override
-    public Id<? extends CustomPayload> getId() {
-        return PACKET_ID;
-    }
-}

common/src/main/java/eu/midnightdust/midnightcontrols/packet/HelloPayload.java

@@ -1,24 +0,0 @@
-package eu.midnightdust.midnightcontrols.packet;
-
-import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.network.packet.CustomPayload;
-
-public record HelloPayload(String version, String controlsMode) implements CustomPayload {
-    public static final CustomPayload.Id<HelloPayload> PACKET_ID = new CustomPayload.Id<>(MidnightControlsConstants.HELLO_CHANNEL);
-    public static final PacketCodec<RegistryByteBuf, HelloPayload> codec = PacketCodec.of(HelloPayload::write, HelloPayload::read);
-
-    public static HelloPayload read(RegistryByteBuf buf) {
-        return new HelloPayload(buf.readString(32), buf.readString(32));
-    }
-
-    public void write(RegistryByteBuf buf) {
-        buf.writeString(version, 32).writeString(controlsMode, 32);
-    }
-
-    @Override
-    public Id<? extends CustomPayload> getId() {
-        return PACKET_ID;
-    }
-}

common/src/main/resources/architectury.midnightcontrols.json

@@ -1,3 +0,0 @@
-{
-  "accessWidener": "midnightcontrols.accesswidener"
-}

common/src/main/resources/assets/midnightcontrols/keyboard_layouts/de_quertz.json

@@ -1,14 +0,0 @@
-{
-  "id": "de_DE:qwertz",
-
-  "letters": {
-    "row0": ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü"],
-    "row1": ["a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä"],
-    "row2": ["y", "x", "c", "v", "b", "n", "m", "ß"]
-  },
-  "symbols": {
-    "row0": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"],
-    "row1": ["@", "#", "$", "%", "&", "*", "-", "+", "(", ")"],
-    "row2": ["!", "\"", "'", ":", ";", ",", ".", "?", "/"]
-  }
-}

common/src/main/resources/assets/midnightcontrols/keyboard_layouts/en_querty.json

@@ -1,14 +0,0 @@
-{
-  "id": "en_US:qwerty",
-
-  "letters": {
-    "row0": ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"],
-    "row1": ["a", "s", "d", "f", "g", "h", "j", "k", "l"],
-    "row2": ["z", "x", "c", "v", "b", "n", "m"]
-  },
-  "symbols": {
-    "row0": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"],
-    "row1": ["@", "#", "$", "%", "&", "*", "-", "+", "(", ")"],
-    "row2": ["!", "\"", "'", ":", ";", ",", ".", "?", "/"]
-  }
-}

common/src/main/resources/assets/midnightcontrols/lang/cs_cz.json

@@ -1,239 +0,0 @@
-{
-  "midnightcontrols.midnightconfig.title": "Pokročilá konfigurace MidnightControls",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Výchozí světlá",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Výchozí tmavá",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Druhá světlá",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Druhá tmavá",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Výchozí",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
-  "midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Switch/Wii ovladač",
-  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Xbox One/Series ovladač",
-  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Xbox 360 Controller",
-  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Steam Controller",
-  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
-  "midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "OUYA ovladač",
-  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Ovladač s číslicemi",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Klávesnice/Myš",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Ovladač",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Dotyk (Beta)",
-  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Levá",
-  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Pravá",
-  "midnightcontrols.midnightconfig.enum.TouchMode.CROSSHAIR": "Crosshair režim",
-  "midnightcontrols.midnightconfig.enum.TouchMode.FINGER_POS": "Pozice prstu",
-  "midnightcontrols.midnightconfig.enum.CameraMode.FLAT": "Plochá",
-  "midnightcontrols.midnightconfig.enum.CameraMode.ADAPTIVE": "Adaptivní",
-  "key.categories.midnightcontrols": "MidnightControls",
-  "key.midnightcontrols.look_down": "Podívat se dolů",
-  "key.midnightcontrols.look_left": "Podívat se doleva",
-  "key.midnightcontrols.look_right": "Podívat se doprava",
-  "key.midnightcontrols.look_up": "Podívat se nahoru",
-  "key.midnightcontrols.ring": "Otevřít ovládací kroužek",
-  "midnightcontrols.action.attack": "Útok",
-  "midnightcontrols.action.back": "Zpět",
-  "midnightcontrols.action.chat": "Otevřít chat",
-  "midnightcontrols.action.controls_ring": "Otevřít ovládací kroužek",
-  "midnightcontrols.action.debug_screen": "Otevřít debugovací HUD (F3)",
-  "midnightcontrols.action.drop_item": "Odhodit věc",
-  "midnightcontrols.action.drink": "Napít se",
-  "midnightcontrols.action.eat": "Najíst se",
-  "midnightcontrols.action.equip": "Vybavit se",
-  "midnightcontrols.action.exit": "Ukončit",
-  "midnightcontrols.action.forward": "Dopředu",
-  "midnightcontrols.action.hit": "Útok",
-  "midnightcontrols.action.hotbar_left": "Hotbar doleva",
-  "midnightcontrols.action.hotbar_right": "Hotbar doprava",
-  "midnightcontrols.action.inventory": "Inventář",
-  "midnightcontrols.action.jump": "Skok",
-  "midnightcontrols.action.left": "Doleva",
-  "midnightcontrols.action.pause_game": "Pozastavit hru",
-  "midnightcontrols.action.pick_block": "Vybrat blok",
-  "midnightcontrols.action.pickup": "Vzít",
-  "midnightcontrols.action.pickup_all": "Vzít vše",
-  "midnightcontrols.action.place": "Položit",
-  "midnightcontrols.action.player_list": "Seznam hráčů",
-  "midnightcontrols.action.quick_move": "Rychlý přesun",
-  "midnightcontrols.action.right": "Doprava",
-  "midnightcontrols.action.screenshot": "Vyfotit snímek obrazovky",
-  "midnightcontrols.action.slot_up": "Přesunout slot nahoru",
-  "midnightcontrols.action.slot_down": "Přesunout slot dolů",
-  "midnightcontrols.action.slot_left": "Přesunout slot doleva",
-  "midnightcontrols.action.slot_right": "Přesunout slot doprava",
-  "midnightcontrols.action.sneak": "Plížit se",
-  "midnightcontrols.action.sprint": "Sprintovat",
-  "midnightcontrols.action.swap_hands": "Vyměnit si ruce",
-  "midnightcontrols.action.toggle_perspective": "Změnit perspektivu",
-  "midnightcontrols.action.toggle_smooth_camera": "Nastavit kinematografickou kameru",
-  "midnightcontrols.action.page_back": "Předchozí stránka",
-  "midnightcontrols.action.page_next": "Následující stránka",
-  "midnightcontrols.action.tab_back": "Předchozí karta",
-  "midnightcontrols.action.tab_next": "Následující karta",
-  "midnightcontrols.action.take": "Vzít věc",
-  "midnightcontrols.action.take_all": "Vzít stack",
-  "midnightcontrols.action.use": "Použít",
-  "midnightcontrols.action.zoom": "Přiblížit",
-  "midnightcontrols.action.zoom_in": "Zvýšit přiblížení",
-  "midnightcontrols.action.zoom_out": "Snížit příblížení",
-  "midnightcontrols.action.zoom_reset": "Resetovat Přiblížení",
-  "midnightcontrols.action.emi_page_left": "Předchozí stránka",
-  "midnightcontrols.action.emi_page_right": "Následující stránka",
-  "midnightcontrols.category.emi": "EMI",
-  "midnightcontrols.button.a": "A",
-  "midnightcontrols.button.b": "B",
-  "midnightcontrols.button.x": "X",
-  "midnightcontrols.button.y": "Y",
-  "midnightcontrols.button.left_bumper": "Levý bumper",
-  "midnightcontrols.button.right_bumper": "Pravý bumper",
-  "midnightcontrols.button.back": "Zpět",
-  "midnightcontrols.button.start": "Start",
-  "midnightcontrols.button.guide": "Guide",
-  "midnightcontrols.button.left_thumb": "Levá páčka",
-  "midnightcontrols.button.right_thumb": "Pravá páčka",
-  "midnightcontrols.button.dpad_up": "DPAD nahoru",
-  "midnightcontrols.button.dpad_right": "DPAD doprava",
-  "midnightcontrols.button.dpad_down": "DPAD dolů",
-  "midnightcontrols.button.dpad_left": "DPAD doleva",
-  "midnightcontrols.button.l4": "L4",
-  "midnightcontrols.button.l5": "L5",
-  "midnightcontrols.button.r4": "R4",
-  "midnightcontrols.button.r5": "L5",
-  "midnightcontrols.axis.left_x+": "Levý X+",
-  "midnightcontrols.axis.left_y+": "Levý Y+",
-  "midnightcontrols.axis.right_x+": "Pravý X+",
-  "midnightcontrols.axis.right_y+": "Pravý Y+",
-  "midnightcontrols.axis.left_trigger": "Levý trigger",
-  "midnightcontrols.axis.right_trigger": "Pravý trigger",
-  "midnightcontrols.axis.left_x-": "Levý X-",
-  "midnightcontrols.axis.left_y-": "Levý Y-",
-  "midnightcontrols.axis.right_x-": "Pravý X-",
-  "midnightcontrols.axis.right_y-": "Pravý Y-",
-  "midnightcontrols.button.unknown": "Neznámý (%d)",
-  "midnightcontrols.controller.tutorial.title": "Hrajte hru s ovladačem!",
-  "midnightcontrols.controller.tutorial.description": "jděte do %s -> %s -> %s",
-  "midnightcontrols.controller.connected": "Ovladač %d připojen.",
-  "midnightcontrols.controller.disconnected": "Ovladač %d odpojen.",
-  "midnightcontrols.controller.mappings.1": "Chcete-li nakonfigurovat mapování ovladače, použijte %s",
-  "midnightcontrols.controller.mappings.3": "a vložte mapování do editoru souboru mapování.",
-  "midnightcontrols.controller.mappings.error": "Chyba při načítání mapování.",
-  "midnightcontrols.controller.mappings.error.write": "Chyba při zápisu mapování do souboru.",
-  "midnightcontrols.controller.mappings.updated": "Aktualizované mapování!",
-  "midnightcontrols.controller_type.default": "Výchozí",
-  "midnightcontrols.controller_type.dualshock": "DualShock",
-  "midnightcontrols.controller_type.dualsense": "DualSense",
-  "midnightcontrols.controller_type.switch": "Switch/Wii ovladač",
-  "midnightcontrols.controller_type.xbox": "Xbox One/Series ovladač",
-  "midnightcontrols.controller_type.xbox_360": "Xbox 360 ovladač",
-  "midnightcontrols.controller_type.steam_controller": "Steam ovladač",
-  "midnightcontrols.controller_type.steam_deck": "Steam Deck",
-  "midnightcontrols.controller_type.ouya": "OUYA ovladač",
-  "midnightcontrols.controller_type.numbered": "Ovladač s číslicemi",
-  "midnightcontrols.controls_mode.default": "Klávesnice/Myš",
-  "midnightcontrols.controls_mode.controller": "Ovladač",
-  "midnightcontrols.controls_mode.touchscreen": "Dotyk (Beta)",
-  "midnightcontrols.hud_side.LEFT": "Levý",
-  "midnightcontrols.hud_side.RIGHT": "Pravý",
-  "midnightcontrols.menu.analog_movement": "Analogový pohyb",
-  "midnightcontrols.menu.analog_movement.tooltip": "Pokud je to možné, umožňuje analogový pohyb.",
-  "midnightcontrols.menu.auto_switch_mode": "Režim automatického přepínání",
-  "midnightcontrols.menu.auto_switch_mode.tooltip": "Zda se má režim ovládání automaticky přepnout na ovladač, pokud je připojen.",
-  "midnightcontrols.menu.camera_mode": "Režim kamery",
-  "midnightcontrols.menu.controller": "Ovladač",
-  "midnightcontrols.menu.controller2": "Druhý ovladač",
-  "midnightcontrols.menu.controller2.tooltip": "Použije druhý ovladač, který umožňuje (například) podporu Joy-Conů.",
-  "midnightcontrols.menu.controller_toggle_sneak": "Přepnutí plížení na ovladači",
-  "midnightcontrols.menu.controller_toggle_sprint": "Přepnutí sprintování na ovladačí",
-  "midnightcontrols.menu.controller_type": "Typ ovladače",
-  "midnightcontrols.menu.controller_type.tooltip": "Typ používaného ovladače (potřebné pro zobrazení správných tlačítek).",
-  "midnightcontrols.menu.controls_mode": "Režim",
-  "midnightcontrols.menu.controls_mode.tooltip": "Režim ovládání.",
-  "midnightcontrols.menu.copy_controller_guid": "Zkopírovat GUID",
-  "midnightcontrols.menu.current_controller_guid": "GUID aktuálního ovladače: %s",
-  "midnightcontrols.menu.double_tap_to_sprint": "Dvojité klepnutí na sprintování",
-  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "Přepíná, zda klávesa chůze vpřed při dvojitém rychlém poklepání umožní hráči sprintovat.",
-  "midnightcontrols.menu.fast_block_placing": "Rychlé pokládání bloků",
-  "midnightcontrols.menu.fast_block_placing.tooltip": "Při letu v kreativním režimu umožňuje rychlé pokládání bloků v závislosti na vaší rychlosti. §cNa některých serverech to může být považováno za podvádění§r.",
-  "midnightcontrols.menu.fly_drifting": "Fly Drifting",
-  "midnightcontrols.menu.fly_drifting.tooltip": "Za letu umožňuje Vanilla driftování/setrvačnost.",
-  "midnightcontrols.menu.fly_drifting_vertical": "Vertikální Fly Drifting",
-  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Za letu umožňuje Vanilla vertikální driftování/setrvačnost.",
-  "midnightcontrols.menu.hud_enable": "Zapnout HUD",
-  "midnightcontrols.menu.hud_enable.tooltip": "Přepíná indikátor tlačítek ovladače na obrazovce.",
-  "midnightcontrols.menu.hud_side": "Strana HUD",
-  "midnightcontrols.menu.hud_side.tooltip": "Pozice HUD.",
-  "midnightcontrols.menu.invert_right_x_axis": "Invertovat pravý X",
-  "midnightcontrols.menu.invert_right_y_axis": "Invertovat pravý Y",
-  "midnightcontrols.menu.joystick_as_mouse": "Vždy použít levou páčku jako myš",
-  "midnightcontrols.menu.joystick_as_mouse.tooltip": "V každém menu se páčka chová jako myš.",
-  "midnightcontrols.menu.eye_tracker_as_mouse": "Použití eye trackeru jako myši"
-  "midnightcontrols.menu.eye_tracker_as_mouse.tooltip": "Nahraďte myš zařízením pro sledování očí (například Tobii 5).",
-  "midnightcontrols.menu.eye_tracker_deadzone": "Velikost mrtvé zóny eye trackeru",
-  "midnightcontrols.menu.eye_tracker_deadzone.tooltip": "Zastaví pohyb kamery při pohledu do blízkosti crosshair",
-  "midnightcontrols.menu.keyboard_controls": "Ovládání klávesnice...",
-  "midnightcontrols.menu.left_dead_zone": "Mrtvá zóna levé páčky",
-  "midnightcontrols.menu.left_dead_zone.tooltip": "Mrtvá zóna levé analogové páčky ovladače.",
-  "midnightcontrols.menu.mappings.open_input_str": "Otevřít editor souborů mapování",
-  "midnightcontrols.menu.max_left_x_value": "Maximální hodnota levé osy X",
-  "midnightcontrols.menu.max_left_x_value.tooltip": "Změní hodnotu, kterou mod považuje za nejvyšší pro levou osu X. Užitečné, pokud osa nevyužívá celý rozsah a zdá se pomalá.",
-  "midnightcontrols.menu.max_left_y_value": "Maximální hodnota levé osy Y",
-  "midnightcontrols.menu.max_left_y_value.tooltip": "Změní hodnotu, kterou mod považuje za nejvyšší pro levou osu Y. Užitečné, pokud osa nevyužívá celý rozsah a zdá se pomalá.",
-  "midnightcontrols.menu.max_right_x_value": "Maximální hodnota pravé osy X",
-  "midnightcontrols.menu.max_right_x_value.tooltip": "Změní hodnotu, kterou mod považuje za nejvyšší pro pravou osu X. Užitečné, pokud osa nevyužívá celý rozsah a zdá se pomalá.",
-  "midnightcontrols.menu.max_right_y_value": "Maximální hodnota pravé osy Y",
-  "midnightcontrols.menu.max_right_y_value.tooltip": "Změní hodnotu, kterou mod považuje za nejvyšší pro pravou osu Y. Užitečné, pokud osa nevyužívá celý rozsah a zdá se pomalá.",
-  "midnightcontrols.menu.mouse_speed": "Rychlost myši",
-  "midnightcontrols.menu.mouse_speed.tooltip": "Rychlost emulované myši ovladače.",
-  "midnightcontrols.menu.move_chat": "Přesunutí vstupního pole chatu nahoru",
-  "midnightcontrols.menu.move_chat.tooltip": "Přesune pole pro zadávání chatu nahoru, aby se lépe zadávalo na zařízeních s klávesnicí na obrazovce.",
-  "midnightcontrols.menu.multiple_mapping_tip": "(Tip: Můžete také vložit více mapování najednou.)",
-  "midnightcontrols.menu.reacharound.horizontal": "Pokládání předního bloku",
-  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Umožňuje umístění předního bloku, §ccož může být na některých serverech považováno za podvod.§r",
-  "midnightcontrols.menu.reacharound.vertical": "Vertikální dosah",
-  "midnightcontrols.menu.reacharound.vertical.tooltip": "Zapiná vertikální dosah, §ccož může být na některých serverech považováno za podvod.§r",
-  "midnightcontrols.menu.reload_controller_mappings": "Opětovné načíst mapování ovladače",
-  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Znovu načte soubor mapování ovladače.",
-  "midnightcontrols.menu.right_dead_zone": "Mrtvá zóna pravé páčky",
-  "midnightcontrols.menu.right_dead_zone.tooltip": "Mrtvá zóna pravé analogové páčky ovladače.",
-  "midnightcontrols.menu.rotation_speed": "Rychlost otáčení osy X",
-  "midnightcontrols.menu.rotation_speed.tooltip": "Rychlost otáčení osy X v režimu ovladače.",
-  "midnightcontrols.menu.y_axis_rotation_speed": "Rychlost otáčení osy Y",
-  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Rychlost otáčení osy Y v režimu ovladače.",
-  "midnightcontrols.menu.separate_controller_profile": "Samostatný profil ovladače",
-  "midnightcontrols.menu.separator.controller": "Ovladač",
-  "midnightcontrols.menu.separator.general": "Obecné",
-  "midnightcontrols.menu.title": "MidnightControls - Nastavení",
-  "midnightcontrols.menu.title.controller": "Nastavení ovladače",
-  "midnightcontrols.menu.title.controller_controls": "Vazby ovladače",
-  "midnightcontrols.menu.title.gameplay": "Herní možnosti",
-  "midnightcontrols.menu.title.general": "Obecné možnosti",
-  "midnightcontrols.menu.title.hud": "Možnosti HUD",
-  "midnightcontrols.menu.title.mappings.string": "Editor souborů mapování",
-  "midnightcontrols.menu.title.touch": "Možnosti dotyku",
-  "midnightcontrols.menu.title.visual": "Možnosti vzhledu",
-  "midnightcontrols.menu.touch_break_delay": "Zpoždění přerušení dotyku",
-  "midnightcontrols.menu.touch_speed": "Rychlost dotyku",
-  "midnightcontrols.menu.invert_touch": "Invertování směru dotyku",
-  "midnightcontrols.menu.touch_mode": "Režim dotykové interakce",
-  "midnightcontrols.menu.touch_transparency": "Průhlednost dotykového HUD",
-  "midnightcontrols.menu.touch_with_controller": "Dotyk v režimu ovladače",
-  "midnightcontrols.menu.unfocused_input": "Nezaostřený vstup",
-  "midnightcontrols.menu.unfocused_input.tooltip": "Umožňuje vstup do ovladače, když okno není zaostřené.",
-  "midnightcontrols.menu.virtual_mouse": "Virtuální myš",
-  "midnightcontrols.menu.virtual_mouse.tooltip": "Povoluje virtuální myš, která je užitečná při rozdělené obrazovce.",
-  "midnightcontrols.menu.virtual_mouse.skin": "Skin virtuální myši",
-  "midnightcontrols.menu.hide_cursor": "Skrytí normálního kurzoru myši",
-  "midnightcontrols.menu.hide_cursor.tooltip": "Skryje normální kurzor myši a ponechá viditelný pouze virtuální kurzor myši.",
-  "midnightcontrols.narrator.unbound": "Zrušení vazby na tlačítko %s",
-  "midnightcontrols.not_bound": "Není vázano",
-  "midnightcontrols.virtual_mouse.skin.default_light": "Výchozí světlá",
-  "midnightcontrols.virtual_mouse.skin.default_dark": "Výchozí tmavá",
-  "midnightcontrols.virtual_mouse.skin.second_light": "Druhá světlá",
-  "midnightcontrols.virtual_mouse.skin.second_dark": "Druhá tmavá",
-  "midnightcontrols.midnightconfig.category.controller": "Ovladač",
-  "midnightcontrols.midnightconfig.category.misc": "Různé",
-  "midnightcontrols.midnightconfig.category.screens": "Obrazovky",
-  "midnightcontrols.midnightconfig.category.gameplay": "Hra",
-  "midnightcontrols.midnightconfig.category.touch": "Dotyk",
-  "midnightcontrols.midnightconfig.category.visual": "Vizuál",
-  "modmenu.descriptionTranslation.midnightcontrols": "Přidává podporu ovladačů a celkově vylepšuje ovládání.\nPřevzato z LambdaControls, jehož vývoj byl ukončen."
-}
-

common/src/main/resources/assets/midnightcontrols/lang/pt_br.json

@@ -1,238 +0,0 @@
-{
-  "midnightcontrols.midnightconfig.title": "Configurações avançadas do MidnightControls",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Padrão claro",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Padrão escuro",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Segundo claro",
-  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Segundo escuro",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Padrão",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
-  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
-  "midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Controle de Switch/Wii",
-  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Controle de Xbox One/Series",
-  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Controle de Xbox 360",
-  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Controle da Steam",
-  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
-  "midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "Controle de OUYA",
-  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Controle númerado",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Teclado/Mouse",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Controle",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Tela sensível ao toque (Beta)",
-  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Esquerda",
-  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Direita",
-  "midnightcontrols.midnightconfig.enum.TouchMode.CROSSHAIR": "Na mira",
-  "midnightcontrols.midnightconfig.enum.TouchMode.FINGER_POS": "Posição do dedo",
-  "midnightcontrols.midnightconfig.enum.CameraMode.FLAT": "Plano",
-  "midnightcontrols.midnightconfig.enum.CameraMode.ADAPTIVE": "Adaptativo",
-  "key.categories.midnightcontrols": "MidnightControls",
-  "key.midnightcontrols.look_down": "Olhar para baixo",
-  "key.midnightcontrols.look_left": "Olhar para a esquerda",
-  "key.midnightcontrols.look_right": "Olhar para a direita",
-  "key.midnightcontrols.look_up": "Olhar para cima",
-  "key.midnightcontrols.ring": "Abrir anel de teclas não vinculadas",
-  "midnightcontrols.action.attack": "Atacar",
-  "midnightcontrols.action.back": "Voltar",
-  "midnightcontrols.action.chat": "Abrir bate-papo",
-  "midnightcontrols.action.controls_ring": "Abrir anel de teclas não vinculadas",
-  "midnightcontrols.action.debug_screen": "Abrir HUD de depuração (F3)",
-  "midnightcontrols.action.drop_item": "Soltar item",
-  "midnightcontrols.action.drink": "Beber",
-  "midnightcontrols.action.eat": "Comer",
-  "midnightcontrols.action.equip": "Equipar",
-  "midnightcontrols.action.exit": "Sair da tela",
-  "midnightcontrols.action.forward": "Para frente",
-  "midnightcontrols.action.hit": "Atacar",
-  "midnightcontrols.action.hotbar_left": "Move a barra rápida para esquerda",
-  "midnightcontrols.action.hotbar_right": "Move a barra rápida para direita",
-  "midnightcontrols.action.inventory": "Invetário",
-  "midnightcontrols.action.jump": "Pular",
-  "midnightcontrols.action.left": "Esquerda",
-  "midnightcontrols.action.pause_game": "Pausar",
-  "midnightcontrols.action.pick_block": "Pegar bloco",
-  "midnightcontrols.action.pickup": "Pegar",
-  "midnightcontrols.action.pickup_all": "Pegar todos",
-  "midnightcontrols.action.place": "Colocar",
-  "midnightcontrols.action.player_list": "Lista de jogadores",
-  "midnightcontrols.action.quick_move": "Mover rápido",
-  "midnightcontrols.action.right": "Direita",
-  "midnightcontrols.action.screenshot": "Tirar Screenshot",
-  "midnightcontrols.action.slot_up": "Mover Slot para cima",
-  "midnightcontrols.action.slot_down": "Mover Slot para baixo",
-  "midnightcontrols.action.slot_left": "Mover Slot para esquerda",
-  "midnightcontrols.action.slot_right": "Mover Slot para direita",
-  "midnightcontrols.action.sneak": "Esgueirar",
-  "midnightcontrols.action.sprint": "Correr",
-  "midnightcontrols.action.swap_hands": "Trocar de mãos",
-  "midnightcontrols.action.toggle_perspective": "Alternar perspectiva",
-  "midnightcontrols.action.toggle_smooth_camera": "Ativar câmera cinemática",
-  "midnightcontrols.action.page_back": "Página anterior",
-  "midnightcontrols.action.page_next": "Próxima página",
-  "midnightcontrols.action.tab_back": "Aba anterior",
-  "midnightcontrols.action.tab_next": "Próxima aba",
-  "midnightcontrols.action.take": "Pegar item",
-  "midnightcontrols.action.take_all": "Pegar pilha",
-  "midnightcontrols.action.use": "Usar",
-  "midnightcontrols.action.zoom": "Zoom",
-  "midnightcontrols.action.zoom_in": "Aumentar o Zoom",
-  "midnightcontrols.action.zoom_out": "Diminuir o Zoom",
-  "midnightcontrols.action.zoom_reset": "Resetar o Zoom",
-  "midnightcontrols.action.emi_page_left": "Página anterior",
-  "midnightcontrols.action.emi_page_right": "Próxima pickup",
-  "midnightcontrols.category.emi": "EMI",
-  "midnightcontrols.button.a": "A",
-  "midnightcontrols.button.b": "B",
-  "midnightcontrols.button.x": "X",
-  "midnightcontrols.button.y": "Y",
-  "midnightcontrols.button.left_bumper": "Botão L1",
-  "midnightcontrols.button.right_bumper": "Botão R1",
-  "midnightcontrols.button.back": "Voltar",
-  "midnightcontrols.button.start": "Começar",
-  "midnightcontrols.button.guide": "Guia",
-  "midnightcontrols.button.left_thumb": "Analógico esquerdo",
-  "midnightcontrols.button.right_thumb": "Analógico direito",
-  "midnightcontrols.button.dpad_up": "Botão direcional para cima",
-  "midnightcontrols.button.dpad_right": "Botão direcional para direita",
-  "midnightcontrols.button.dpad_down": "Botão direcional para baixo",
-  "midnightcontrols.button.dpad_left": "Botão direcional para esquerda",
-  "midnightcontrols.button.l4": "L4",
-  "midnightcontrols.button.l5": "L5",
-  "midnightcontrols.button.r4": "R4",
-  "midnightcontrols.button.r5": "L5",
-  "midnightcontrols.axis.left_x+": "Esquerda X+",
-  "midnightcontrols.axis.left_y+": "Esquerda Y+",
-  "midnightcontrols.axis.right_x+": "Direita X+",
-  "midnightcontrols.axis.right_y+": "Direita Y+",
-  "midnightcontrols.axis.left_trigger": "Gatilho da esquerda",
-  "midnightcontrols.axis.right_trigger": "Gatilho da direita",
-  "midnightcontrols.axis.left_x-": "Esquerda X-",
-  "midnightcontrols.axis.left_y-": "Esquerda Y-",
-  "midnightcontrols.axis.right_x-": "Direita X-",
-  "midnightcontrols.axis.right_y-": "Direita Y-",
-  "midnightcontrols.button.unknown": "Desconhecido (%d)",
-  "midnightcontrols.controller.tutorial.title": "Jogue o jogo com um controle!",
-  "midnightcontrols.controller.tutorial.description": "Vá para %s -> %s -> %s",
-  "midnightcontrols.controller.connected": "Controle %d conectado.",
-  "midnightcontrols.controller.disconnected": "Controle %d desconectado.",
-  "midnightcontrols.controller.mappings.1": "Para configurar o mapeamento do controle, por favor use %s",
-  "midnightcontrols.controller.mappings.3": "e cole o mapeamento no editor de arquivos do mapeamento.",
-  "midnightcontrols.controller.mappings.error": "Erro ao carregar mapeamentos.",
-  "midnightcontrols.controller.mappings.error.write": "Erro ao gravar mapeamentos no arquivo.",
-  "midnightcontrols.controller.mappings.updated": "Atualizando mapeamentos!",
-  "midnightcontrols.controller_type.default": "Padrão",
-  "midnightcontrols.controller_type.dualshock": "DualShock",
-  "midnightcontrols.controller_type.dualsense": "DualSense",
-  "midnightcontrols.controller_type.switch": "Controle de Switch/Wii",
-  "midnightcontrols.controller_type.xbox": "Controle de Xbox One/Series",
-  "midnightcontrols.controller_type.xbox_360": "Controle de Xbox 360",
-  "midnightcontrols.controller_type.steam_controller": "Controle da Steam",
-  "midnightcontrols.controller_type.steam_deck": "Steam Deck",
-  "midnightcontrols.controller_type.ouya": "Controle de OUYA",
-  "midnightcontrols.controller_type.numbered": "Controle númerado",
-  "midnightcontrols.controls_mode.default": "Teclado/Mouse",
-  "midnightcontrols.controls_mode.controller": "Controle",
-  "midnightcontrols.controls_mode.touchscreen": "Tela sensível ao toque (Beta)",
-  "midnightcontrols.hud_side.LEFT": "Esquerda",
-  "midnightcontrols.hud_side.RIGHT": "Direita",
-  "midnightcontrols.menu.analog_movement": "Movemento analógico",
-  "midnightcontrols.menu.analog_movement.tooltip": "Quando possível, ative o movemento analógico.",
-  "midnightcontrols.menu.auto_switch_mode": "Modo de troca automática",
-  "midnightcontrols.menu.auto_switch_mode.tooltip": "Se o modo de controle deve ser alterado automaticamente para o controle quando um for conectado.",
-  "midnightcontrols.menu.camera_mode": "Modo de câmera",
-  "midnightcontrols.menu.controller": "Controle",
-  "midnightcontrols.menu.controller2": "Segundo controle",
-  "midnightcontrols.menu.controller2.tooltip": "Segundo controle a ser usado, o que permite (por exemplo) o suporte a Joy-Cons.",
-  "midnightcontrols.menu.controller_toggle_sneak": "Alternar Esgueirar no Controle",
-  "midnightcontrols.menu.controller_toggle_sprint": "Alternar Correr no Controle",
-  "midnightcontrols.menu.controller_type": "Tipo de controle",
-  "midnightcontrols.menu.controller_type.tooltip": "O tipo de controle que você está usando (é preciso para mostrar os botões corretos)",
-  "midnightcontrols.menu.controls_mode": "Modo",
-  "midnightcontrols.menu.controls_mode.tooltip": "O modo de controle.",
-  "midnightcontrols.menu.copy_controller_guid": "Copiar o GUID",
-  "midnightcontrols.menu.current_controller_guid": "GUID do controle atual: %s",
-  "midnightcontrols.menu.double_tap_to_sprint": "Toque duplo para correr",
-  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "Alterna se a tecla Andar para Frente faz o jogador correr quando pressionada duas vezes rapidamente",
-  "midnightcontrols.menu.fast_block_placing": "Colocação Rápida de Blocos",
-  "midnightcontrols.menu.fast_block_placing.tooltip": "Enquanto voando no criativo, ativar a Colocação de Rápida de Blocos. §cEm alguns servidores isso pode ser considerado como trapaça.",
-  "midnightcontrols.menu.fly_drifting": "Derrapagem ao Voar",
-  "midnightcontrols.menu.fly_drifting.tooltip": "Enquanto voando, ativa a deparragem/inércia Vanilla.",
-  "midnightcontrols.menu.fly_drifting_vertical": "Derrapagem vertical ao Voar",
-  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Enquanto voando, ativa a deparragem/inércia vertical Vanilla.",
-  "midnightcontrols.menu.hud_enable": "Ativar HUD",
-  "midnightcontrols.menu.hud_enable.tooltip": "Alterna o indicador de botão do controle na tela.",
-  "midnightcontrols.menu.hud_side": "Lado do HUD",
-  "midnightcontrols.menu.hud_side.tooltip": "A posição do HUD.",
-  "midnightcontrols.menu.invert_right_x_axis": "Inverter X Direito",
-  "midnightcontrols.menu.invert_right_y_axis": "Inverter Y Direito",
-  "midnightcontrols.menu.joystick_as_mouse": "Sempre usar analógico esquerdo como mouse",
-  "midnightcontrols.menu.joystick_as_mouse.tooltip": "Fazer o analógico agir como um mouse em todos os menus.",
-  "midnightcontrols.menu.eye_tracker_as_mouse": "Usar o rastreador ocular como um mouse",
-  "midnightcontrols.menu.eye_tracker_as_mouse.tooltip": "Substituir o mouse com um dispositivo de rastreamento ocular, (por exemplo) o Tobii 5.",
-  "midnightcontrols.menu.eye_tracker_deadzone": "Tamanho da zona morta do rastreador ocular",
-  "midnightcontrols.menu.eye_tracker_deadzone.tooltip": "Parar o movimento da camera quando olhar perto da mira",
-  "midnightcontrols.menu.keyboard_controls": "Controles do teclado...",
-  "midnightcontrols.menu.left_dead_zone": "Zona morta do analógico esquerdo",
-  "midnightcontrols.menu.left_dead_zone.tooltip": "A zona morta para o analógico esquerdo do controle.",
-  "midnightcontrols.menu.mappings.open_input_str": "Abrir editor de arquivo de mapeamentos",
-  "midnightcontrols.menu.max_left_x_value": "Valor máximo do eixo X esquerdo",
-  "midnightcontrols.menu.max_left_x_value.tooltip": "Altera o valor máximo considerado pelo mod para o eixo X esquerdo. Útil se o seu eixo não usa toda a faixa e parece lento.",
-  "midnightcontrols.menu.max_left_y_value": "Valor máximo do eixo Y esquerdo",
-  "midnightcontrols.menu.max_left_y_value.tooltip": "Altera o valor máximo considerado pelo mod para o eixo Y esquerdo. Útil se o seu eixo não usa toda a faixa e parece lento.",
-  "midnightcontrols.menu.max_right_x_value": "Valor máximo do eixo X direito",
-  "midnightcontrols.menu.max_right_x_value.tooltip": "Altera o valor máximo considerado pelo mod para o eixo X direito. Útil se o seu eixo não usa toda a faixa e parece lento.",
-  "midnightcontrols.menu.max_right_y_value": "Valor máximo do eixo Y direito",
-  "midnightcontrols.menu.max_right_y_value.tooltip": "Altera o valor máximo considerado pelo mod para o eixo Y direito. Útil se o seu eixo não usa toda a faixa e parece lento.",
-  "midnightcontrols.menu.mouse_speed": "Velocidade do mouse",
-  "midnightcontrols.menu.mouse_speed.tooltip": "A velocidade do mouse emulado pelo controle",
-  "midnightcontrols.menu.move_chat": "Mover a caixa do chat para o topo",
-  "midnightcontrols.menu.move_chat.tooltip": "Move a caixa do chat para o topo, para uma melhor digitação em dispositivos com teclados na tela.",
-  "midnightcontrols.menu.multiple_mapping_tip": "(Dica: Você também pode inserir múltiplos mapeamentos ao mesmo tempo)",
-  "midnightcontrols.menu.reacharound.horizontal": "Colocação frontal de blocos",
-  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Ativa colocação frontal de blocos, §cEm alguns servidores isso pode ser considerado como trapaça.§r.",
-  "midnightcontrols.menu.reacharound.vertical": "Alcance vertical",
-  "midnightcontrols.menu.reacharound.vertical.tooltip": "Ativa alcance vertical, §c§cEm alguns servidores isso pode ser considerado como trapaça.§r.",
-  "midnightcontrols.menu.reload_controller_mappings": "Recarregar o mapeamento do controle",
-  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Recarrega o arquivo de mapeamentos do controle.",
-  "midnightcontrols.menu.right_dead_zone": "Zona morta do analógico direito",
-  "midnightcontrols.menu.right_dead_zone.tooltip": "A zona morta para o analógico direito do controle..",
-  "midnightcontrols.menu.rotation_speed": "Velocidade de rotação do eixo X",
-  "midnightcontrols.menu.rotation_speed.tooltip": "A velocidade de rotação do eixo X da câmera no modo controle.",
-  "midnightcontrols.menu.y_axis_rotation_speed": "Velocidade de rotação do eixo Y",
-  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "A velocidade de rotação do eixo Y da câmera no modo controle.",
-  "midnightcontrols.menu.separate_controller_profile": "Separar perfil do controle",
-  "midnightcontrols.menu.separator.controller": "Controle",
-  "midnightcontrols.menu.separator.general": "Geral",
-  "midnightcontrols.menu.title": "MidnightControls - Configurações",
-  "midnightcontrols.menu.title.controller": "Configurações do controle",
-  "midnightcontrols.menu.title.controller_controls": "Mapeamento de controle",
-  "midnightcontrols.menu.title.gameplay": "Configurações de jogabilidade",
-  "midnightcontrols.menu.title.general": "Configurações gerais",
-  "midnightcontrols.menu.title.hud": "Configurações de HUD",
-  "midnightcontrols.menu.title.mappings.string": "Editor de arquivo de mapeamentos",
-  "midnightcontrols.menu.title.touch": "Configurações de toque",
-  "midnightcontrols.menu.title.visual": "Configurações de aparência",
-  "midnightcontrols.menu.touch_break_delay": "Atrasado de destruição do toque",
-  "midnightcontrols.menu.touch_speed": "Velocidade do toque",
-  "midnightcontrols.menu.invert_touch": "Inverter direção do toque",
-  "midnightcontrols.menu.touch_mode": "Modo de interação de toque",
-  "midnightcontrols.menu.touch_transparency": "Transparência do HUD de toque",
-  "midnightcontrols.menu.touch_with_controller": "Toque no modo do controle",
-  "midnightcontrols.menu.unfocused_input": "Entrada desfocada",
-  "midnightcontrols.menu.unfocused_input.tooltip": "Permite entrada de sinais do controle quando a janela não está em foco.",
-  "midnightcontrols.menu.virtual_mouse": "Mouse virtual",
-  "midnightcontrols.menu.virtual_mouse.tooltip": "Ativa o mouse virtual, que é útil durante o modo tela dividida.",
-  "midnightcontrols.menu.virtual_mouse.skin": "Tema do mouse virtual",
-  "midnightcontrols.menu.hide_cursor": "Desativar cursor do mouse padrão",
-  "midnightcontrols.menu.hide_cursor.tooltip": "Esconde o cursor padrão do mouse, deixando apenas o mouse virtual visível.",
-  "midnightcontrols.narrator.unbound": "Desmapear %s",
-  "midnightcontrols.not_bound": "Não mapeado",
-  "midnightcontrols.virtual_mouse.skin.default_light": "Padrão claro",
-  "midnightcontrols.virtual_mouse.skin.default_dark": "Padrão escuro",
-  "midnightcontrols.virtual_mouse.skin.second_light": "Segundo claro",
-  "midnightcontrols.virtual_mouse.skin.second_dark": "Segundo escuro",
-  "midnightcontrols.midnightconfig.category.controller": "Controle",
-  "midnightcontrols.midnightconfig.category.misc": "Variados",
-  "midnightcontrols.midnightconfig.category.screens": "Telas",
-  "midnightcontrols.midnightconfig.category.gameplay": "Jogabilidade",
-  "midnightcontrols.midnightconfig.category.touch": "Toque",
-  "midnightcontrols.midnightconfig.category.visual": "Visual",
-  "modmenu.descriptionTranslation.midnightcontrols": "Adiciona suporte a controles e aprimora o controle no geral.\nDerivado do LambdaControls, que infelizmente foi descontinuado."
-}

common/src/main/resources/midnightcontrols.accesswidener

@@ -1,3 +0,0 @@
-accessWidener   v1  named
-
-accessible class net/minecraft/client/gui/DrawContext$ScissorStack

fabric/build.gradle

@@ -1,111 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-loom {
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-    archivesBaseName = rootProject.archives_base_name + "-fabric"
-}
-
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
-    modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric")
-    include 'org.aperlambda:lambdajcommon:1.8.1'
-    modCompileOnly "maven.modrinth:emi:${project.emi_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    archiveClassifier = "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "MidnightControls $project.version - Fabric $project.minecraft_version"
-        releaseType = "$project.release_type"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["fabric","quilt"]
-        mainPublication remapJar
-        relations {
-            depends {
-                curseforge = "fabric-api"
-                modrinth = "fabric-api"
-            }
-            includes {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-            includes {
-                curseforge = "obsidianui"
-                modrinth = "obsidianui"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$project.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

fabric/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/fabric/ItemGroupUtilImpl.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform.fabric;
-
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import net.minecraft.item.ItemGroup;
-
-import java.util.List;
-
-/**
- * Implementation of fabric methods for
- * @see eu.midnightdust.midnightcontrols.client.util.platform.ItemGroupUtil
- */
-public class ItemGroupUtilImpl {
-    public static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
-        return (screen.getItemGroupsOnPage(screen.getCurrentPage()));
-    }
-}

fabric/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/fabric/NetworkUtilImpl.java

@@ -1,25 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform.fabric;
-
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-/**
- * Implementation of fabric methods for
- * @see eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil
- */
-public class NetworkUtilImpl {
-    private static final ClientPlayNetworkHandler handler = client.getNetworkHandler();
-
-    public static void sendPacketC2S(Packet<?> packet) {
-        if (handler != null)
-            handler.sendPacket(packet);
-    }
-    public static void sendPayloadC2S(CustomPayload payload) {
-        if (handler != null && client.world != null)
-            handler.sendPacket(new CustomPayloadC2SPacket(payload));
-    }
-}

fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java

@@ -1,82 +0,0 @@
-package eu.midnightdust.midnightcontrols.fabric;
-
-import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;
-import eu.midnightdust.midnightcontrols.fabric.event.MouseClickListener;
-import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
-import eu.midnightdust.midnightcontrols.packet.FeaturePayload;
-import eu.midnightdust.midnightcontrols.packet.HelloPayload;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
-import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.ResourceType;
-import net.minecraft.util.Identifier;
-
-import java.util.Optional;
-
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_DOWN;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_LEFT;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_RIGHT;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_UP;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_RING;
-
-public class MidnightControlsClientFabric implements ClientModInitializer {
-    @Override
-    public void onInitializeClient() {
-        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_UP);
-        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_RIGHT);
-        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_DOWN);
-        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_LEFT);
-        KeyBindingHelper.registerKeyBinding(BINDING_RING);
-        ClientPlayNetworking.registerGlobalReceiver(ControlsModePayload.PACKET_ID, (payload, context) ->
-                context.responseSender().sendPacket(new ControlsModePayload(MidnightControlsConfig.controlsMode.getName())));
-        ClientPlayNetworking.registerGlobalReceiver(FeaturePayload.PACKET_ID, ((payload, context) -> {}));
-
-        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
-            var version = "";
-            Optional<ModContainer> container;
-            if ((container = FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE)).isPresent()) {
-                version = container.get().getMetadata().getVersion().getFriendlyString();
-            }
-            var controlsMode = MidnightControlsConfig.controlsMode.getName();
-            sender.sendPacket(new HelloPayload(version, controlsMode));
-            sender.sendPacket(new ControlsModePayload(controlsMode));
-        });
-        ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> MidnightControlsClient.onLeave());
-
-        ClientTickEvents.START_CLIENT_TICK.register(MidnightControlsClient::onTick);
-        ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
-            ScreenMouseEvents.allowMouseClick(screen).register(new MouseClickListener(screen));
-        });
-
-        FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE).ifPresent(modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(id("bedrock"), modContainer, ResourcePackActivationType.NORMAL);
-            ResourceManagerHelper.registerBuiltinResourcePack(id("legacy"), modContainer, ResourcePackActivationType.NORMAL);
-        });
-        MidnightControlsClient.initClient();
-
-        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-            @Override
-            public Identifier getFabricId() {
-                return id("keyboard_layouts");
-            }
-            @Override
-            public void reload(ResourceManager manager) {
-                MidnightControlsReloadListener.INSTANCE.reload(manager);
-            }
-        });
-    }
-}

fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsFabric.java

@@ -1,31 +0,0 @@
-package eu.midnightdust.midnightcontrols.fabric;
-
-import eu.midnightdust.midnightcontrols.ControlsMode;
-import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
-import eu.midnightdust.midnightcontrols.fabric.event.PlayerChangeControlsModeCallback;
-import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
-import eu.midnightdust.midnightcontrols.packet.FeaturePayload;
-import eu.midnightdust.midnightcontrols.packet.HelloPayload;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-
-public class MidnightControlsFabric implements ModInitializer {
-    @Override
-    public void onInitialize() {
-        MidnightControls.init();
-        PayloadTypeRegistry.playC2S().register(HelloPayload.PACKET_ID, HelloPayload.codec);
-        PayloadTypeRegistry.playC2S().register(ControlsModePayload.PACKET_ID, ControlsModePayload.codec);
-        PayloadTypeRegistry.playS2C().register(ControlsModePayload.PACKET_ID, ControlsModePayload.codec);
-        PayloadTypeRegistry.playS2C().register(FeaturePayload.PACKET_ID, FeaturePayload.codec);
-
-        ServerPlayNetworking.registerGlobalReceiver(HelloPayload.PACKET_ID, (payload, context) -> {
-            ControlsMode.byId(payload.controlsMode()).ifPresent(controlsMode -> PlayerChangeControlsModeCallback.EVENT.invoker().apply(context.player(), controlsMode));
-            context.responseSender().sendPacket(new FeaturePayload(MidnightControlsFeature.HORIZONTAL_REACHAROUND));
-        });
-        ServerPlayNetworking.registerGlobalReceiver(ControlsModePayload.PACKET_ID, (payload, context) -> {
-            ControlsMode.byId(payload.controlsMode()).ifPresent(controlsMode -> PlayerChangeControlsModeCallback.EVENT.invoker().apply(context.player(), controlsMode));
-        });
-    }
-}

fabric/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java

@@ -1,40 +0,0 @@
-package eu.midnightdust.midnightcontrols.fabric.event;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
-import net.minecraft.client.gui.screen.Screen;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.clickInterceptor;
-
-public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick {
-    private final Screen screen;
-
-    public MouseClickListener(Screen screen) {
-        this.screen = screen;
-    }
-
-    @Override
-    public boolean allowMouseClick(Screen screen, double mouseX, double mouseY, int button) {
-        if(MidnightControlsConfig.virtualKeyboard) {
-            clickInterceptor.intercept(screen, mouseX, mouseY);
-        }
-        return true;
-    }
-
-    // Add equals and hashCode to prevent duplicate registrations
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof MouseClickListener) {
-            return ((MouseClickListener) obj).screen == this.screen;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return screen.hashCode();
-    }
-
-
-
-
-}

gradle.properties

@@ -1,39 +1,36 @@
-# Makes things faster
+# Done to increase the memory available to gradle.
-org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx1G
-org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.21.6
+# Fabric Properties
-supported_versions=1.21.8
+# check these on https://fabricmc.net/use
-yarn_mappings=1.21.6+build.1
+minecraft_version=1.20.1
-enabled_platforms=fabric,neoforge
+yarn_mappings=1.20.1+build.10
+loader_version=0.15.6
 
-archives_base_name=midnightcontrols
+# Mod Properties
-mod_version=1.11.2
+mod_version = 1.9.4
-maven_group=eu.midnightdust
+maven_group = eu.midnightdust
-release_type=release
+archives_base_name = midnightcontrols
 modrinth_id = bXX9h73M
 curseforge_id = 621768
-# Configure the IDs here after creating the projects on the websites
+changelog = See changes at: https://github.com/TeamMidnightDust/MidnightControls/commits/
 
-midnightlib_version=1.7.5+1.21.6
+# Dependencies
-
+# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_loader_version=0.16.14
+fabric_version=0.91.0+1.20.1
-fabric_api_version=0.127.0+1.21.6
+sodium_version=mc1.19.2-0.4.4
-
+spruceui_version=5.0.0+1.20
-neoforge_version=21.6.0-beta
+midnightlib_version=1.4.1-fabric
-yarn_mappings_patch_neoforge_version = 1.21+build.4
+modmenu_version=7.0.0
-
+emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
-quilt_loader_version=0.19.0-beta.18
-quilt_fabric_api_version=7.0.1+0.83.0-1.20
-
-sodium_version=mc1.21-0.6.0-beta.1
-obsidianui_version=0.2.12+mc1.21.6
-modmenu_version=10.0.0-beta.1
-emotecraft_version=2.5.5+1.21.4-fabric
 bendylib_version=2.0.+
-emi_version=1.1.10+1.21+fabric
+emi_version=1.1.1+1.20.1+fabric
 libgui_version=6.0.0+1.19
 inventorytabs_version=inventorytabs-0.9.beta-1.19.x
 clothconfig_version=7.0.72
 yacl_version=2.2.0
 bedrockify_version=1.9+mc1.20
+
+# Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions.
+# ok_zoomer_version=5.0.0-beta.3+1.17.1
+# libzoomer_version=0.3.0+1.17.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -202,10 +200,10 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew.bat

@@ -1,94 +1,92 @@
-@rem
+@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015 the original author or authors.
-@rem
+@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
+@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 not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
+@rem You may obtain a copy of the License at
-@rem
+@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
+@rem
-@rem Unless required by applicable law or agreed to in writing, software
+@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 distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
+@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
+@rem limitations under the License.
-@rem
+@rem
-@rem SPDX-License-Identifier: Apache-2.0
+
-@rem
+@if "%DEBUG%"=="" @echo off
-
+@rem ##########################################################################
-@if "%DEBUG%"=="" @echo off
+@rem
-@rem ##########################################################################
+@rem  Gradle startup script for Windows
-@rem
+@rem
-@rem  Gradle startup script for Windows
+@rem ##########################################################################
-@rem
+
-@rem ##########################################################################
+@rem Set local scope for the variables with windows NT shell
-
+if "%OS%"=="Windows_NT" setlocal
-@rem Set local scope for the variables with windows NT shell
+
-if "%OS%"=="Windows_NT" setlocal
+set DIRNAME=%~dp0
-
+if "%DIRNAME%"=="" set DIRNAME=.
-set DIRNAME=%~dp0
+@rem This is normally unused
-if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
-@rem This is normally unused
+set APP_HOME=%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 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 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=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+@rem Find java.exe
-
+if defined JAVA_HOME goto findJavaFromJavaHome
-@rem Find java.exe
+
-if defined JAVA_HOME goto findJavaFromJavaHome
+set JAVA_EXE=java.exe
-
+%JAVA_EXE% -version >NUL 2>&1
-set JAVA_EXE=java.exe
+if %ERRORLEVEL% equ 0 goto execute
-%JAVA_EXE% -version >NUL 2>&1
+
-if %ERRORLEVEL% equ 0 goto execute
+echo.
-
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo. 1>&2
+echo location of your Java installation.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+
-echo location of your Java installation. 1>&2
+goto fail
-
+
-goto fail
+:findJavaFromJavaHome
-
+set JAVA_HOME=%JAVA_HOME:"=%
-:findJavaFromJavaHome
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-set JAVA_HOME=%JAVA_HOME:"=%
+
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+if exist "%JAVA_EXE%" goto execute
-
+
-if exist "%JAVA_EXE%" goto execute
+echo.
-
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo. 1>&2
+echo location of your Java installation.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+
-echo location of your Java installation. 1>&2
+goto fail
-
+
-goto fail
+:execute
-
+@rem Setup the command line
-:execute
+
-@rem Setup the command line
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
+
-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 %*
-@rem Execute Gradle
+
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+:end
-
+@rem End local scope for the variables with windows NT shell
-:end
+if %ERRORLEVEL% equ 0 goto mainEnd
-@rem End local scope for the variables with windows NT shell
+
-if %ERRORLEVEL% equ 0 goto mainEnd
+:fail
-
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-:fail
+rem the _cmd.exe /c_ return code!
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+set EXIT_CODE=%ERRORLEVEL%
-rem the _cmd.exe /c_ return code!
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
-set EXIT_CODE=%ERRORLEVEL%
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+exit /b %EXIT_CODE%
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+
-exit /b %EXIT_CODE%
+:mainEnd
-
+if "%OS%"=="Windows_NT" endlocal
-:mainEnd
+
-if "%OS%"=="Windows_NT" endlocal
+:omega
-
-:omega

neoforge/build.gradle

@@ -1,123 +0,0 @@
-plugins {
-    id 'com.github.johnrengelman.shadow'
-    id "me.shedaniel.unified-publishing"
-}
-
-repositories {
-    maven {
-        name = 'NeoForged'
-        url = 'https://maven.neoforged.net/releases'
-    }
-}
-
-
-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-configurations {
-    common {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentNeoForge.extendsFrom common
-
-    // Files in this configuration will be bundled into your mod using the Shadow plugin.
-    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
-    shadowBundle {
-        canBeResolved = true
-        canBeConsumed = false
-    }
-    archivesBaseName = rootProject.archives_base_name + "-neoforge"
-}
-
-dependencies {
-    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
-    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
-    modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-neoforge")
-    shadowBundle('org.aperlambda:lambdajcommon:1.8.1') {
-        exclude group: 'com.google.code.gson'
-        exclude group: 'com.google.guava'
-    }
-
-    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
-}
-
-processResources {
-    inputs.property 'version', project.version
-
-    filesMatching('META-INF/neoforge.mods.toml') {
-        expand version: project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.shadowBundle]
-    archiveClassifier = 'dev-shadow'
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-unifiedPublishing {
-    project {
-        displayName = "MidnightControls $project.version - NeoForge $project.minecraft_version"
-        releaseType = "$project.release_type"
-        changelog = releaseChangelog()
-        gameVersions = []
-        gameLoaders = ["neoforge"]
-        mainPublication remapJar
-        relations {
-            includes {
-                curseforge = "midnightlib"
-                modrinth = "midnightlib"
-            }
-            includes {
-                curseforge = "obsidianui"
-                modrinth = "obsidianui"
-            }
-        }
-
-        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-        if (CURSEFORGE_TOKEN != null) {
-            curseforge {
-                token = CURSEFORGE_TOKEN
-                id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-
-        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-        if (MODRINTH_TOKEN != null) {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = rootProject.modrinth_id
-                version = "$project.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
-            }
-        }
-    }
-}

neoforge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=neoforge

neoforge/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/neoforge/ItemGroupUtilImpl.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform.neoforge;
-
-import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
-import net.minecraft.item.ItemGroup;
-
-import java.util.List;
-
-/**
- * Implementation of neoforge methods for
- * @see eu.midnightdust.midnightcontrols.client.util.platform.ItemGroupUtil
- */
-public class ItemGroupUtilImpl {
-    public static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
-        return (screen.getCurrentPage().getVisibleTabs());
-    }
-}

neoforge/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/neoforge/NetworkUtilImpl.java

@@ -1,30 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.util.platform.neoforge;
-
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
-
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
-/**
- * Implementation of neoforge methods for
- * @see eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil
- */
-public class NetworkUtilImpl {
-    private static final ClientPlayNetworkHandler handler = client.getNetworkHandler();
-
-    public static void sendPacketC2S(Packet<?> packet) {
-        if (handler != null)
-            handler.send(packet);
-    }
-    public static void sendPayloadC2S(CustomPayload payload) {
-        if (handler != null && client.world != null) {
-            try {
-                handler.send(new CustomPayloadC2SPacket(payload));
-            } catch (Exception e) {
-                e.fillInStackTrace();
-            }
-        }
-    }
-}

neoforge/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsClientNeoforge.java

@@ -1,110 +0,0 @@
-package eu.midnightdust.midnightcontrols.neoforge;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;
-import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
-import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
-import eu.midnightdust.midnightcontrols.packet.HelloPayload;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.resource.DirectoryResourcePack;
-import net.minecraft.resource.ResourcePackInfo;
-import net.minecraft.resource.ResourcePackPosition;
-import net.minecraft.resource.ResourcePackProfile;
-import net.minecraft.resource.ResourcePackSource;
-import net.minecraft.resource.ResourceType;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.client.event.*;
-import net.neoforged.neoforge.event.AddPackFindersEvent;
-import net.neoforged.neoforgespi.locating.IModFile;
-
-import java.util.Optional;
-
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-import static eu.midnightdust.midnightcontrols.MidnightControlsConstants.NAMESPACE;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_DOWN;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_LEFT;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_RIGHT;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_LOOK_UP;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.BINDING_RING;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.clickInterceptor;
-
-
-@Mod(value = NAMESPACE, dist = Dist.CLIENT)
-public class MidnightControlsClientNeoforge {
-    public MidnightControlsClientNeoforge() {
-        MidnightControlsClient.initClient();
-    }
-
-    @EventBusSubscriber(modid = NAMESPACE, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-    public class ClientEvents {
-        @SubscribeEvent
-        public static void registerKeybinding(RegisterKeyMappingsEvent event) {
-            event.register(BINDING_RING);
-            event.register(BINDING_LOOK_UP);
-            event.register(BINDING_LOOK_DOWN);
-            event.register(BINDING_LOOK_LEFT);
-            event.register(BINDING_LOOK_RIGHT);
-        }
-        @SubscribeEvent
-        public static void addPackFinders(AddPackFindersEvent event) {
-            if (event.getPackType() == ResourceType.CLIENT_RESOURCES) {
-                registerResourcePack(event, id("bedrock"), false);
-                registerResourcePack(event, id("legacy"), false);
-            }
-        }
-        private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled) {
-            event.addRepositorySource(((profileAdder) -> {
-                IModFile file = ModList.get().getModFileById(id.getNamespace()).getFile();
-                try {
-                    ResourcePackProfile.PackFactory pack = new DirectoryResourcePack.DirectoryBackedFactory(file.findResource("resourcepacks/" + id.getPath()));
-                    ResourcePackInfo info = new ResourcePackInfo(id.toString(), Text.of(id.getNamespace()+"/"+id.getPath()), ResourcePackSource.BUILTIN, Optional.empty());
-                    ResourcePackProfile packProfile = ResourcePackProfile.create(info, pack, ResourceType.CLIENT_RESOURCES, new ResourcePackPosition(alwaysEnabled, ResourcePackProfile.InsertionPosition.TOP, false));
-                    if (packProfile != null) {
-                        profileAdder.accept(packProfile);
-                    }
-                } catch (NullPointerException e) {e.fillInStackTrace();}
-            }));
-        }
-        @SubscribeEvent
-        public static void onResourceReload(AddClientReloadListenersEvent event) {
-            event.addListener(id("keyboard-layouts"), MidnightControlsReloadListener.INSTANCE);
-        }
-    }
-
-    @EventBusSubscriber(modid = NAMESPACE, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
-    public class ClientGameEvents {
-        @SubscribeEvent
-        public static void sendPacketOnLogin(ClientPlayerNetworkEvent.LoggingIn event) {
-            var version = ModList.get().getModFileById(NAMESPACE).versionString();
-            var controlsMode = MidnightControlsConfig.controlsMode.getName();
-            NetworkUtil.sendPayloadC2S(new HelloPayload(version, controlsMode));
-            NetworkUtil.sendPayloadC2S(new ControlsModePayload(controlsMode));
-        }
-        @SubscribeEvent
-        public static void onDisconnect(ClientPlayerNetworkEvent.LoggingOut event) {
-            MidnightControlsClient.onLeave();
-        }
-        @SubscribeEvent
-        public static void startClientTick(ClientTickEvent.Pre event) {
-            MidnightControlsClient.onTick(client);
-        }
-        @SubscribeEvent
-        public static void onMouseButtonPressed(ScreenEvent.MouseButtonPressed.Pre event) {
-            if (MidnightControlsConfig.virtualKeyboard && !event.isCanceled()) {
-                Screen screen = event.getScreen();
-                double mouseX = event.getMouseX();
-                double mouseY = event.getMouseY();
-
-                clickInterceptor.intercept(screen, mouseX, mouseY);
-            }
-        }
-    }
-}

neoforge/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsNeoforge.java

@@ -1,42 +0,0 @@
-package eu.midnightdust.midnightcontrols.neoforge;
-
-import eu.midnightdust.midnightcontrols.ControlsMode;
-import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.neoforge.event.PlayerChangeControlsModeEvent;
-import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
-import eu.midnightdust.midnightcontrols.packet.FeaturePayload;
-import eu.midnightdust.midnightcontrols.packet.HelloPayload;
-import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
-import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
-import net.neoforged.neoforge.network.registration.PayloadRegistrar;
-
-import static eu.midnightdust.midnightcontrols.MidnightControlsConstants.NAMESPACE;
-
-@Mod(value = NAMESPACE)
-public class MidnightControlsNeoforge {
-    public MidnightControlsNeoforge() {
-        MidnightControls.init();
-    }
-    @EventBusSubscriber(modid = NAMESPACE, bus = EventBusSubscriber.Bus.MOD)
-    public class CommonEvents {
-        @SubscribeEvent
-        public static void registerPayloads(RegisterPayloadHandlersEvent event) {
-            PayloadRegistrar registrar = event.registrar("1").optional();
-            registrar.playToServer(HelloPayload.PACKET_ID, HelloPayload.codec, (payload, context) -> {
-                ControlsMode.byId(payload.controlsMode()).ifPresent(controlsMode -> new PlayerChangeControlsModeEvent(context.player(), controlsMode));
-                context.connection().send(new CustomPayloadS2CPacket(new FeaturePayload(MidnightControlsFeature.HORIZONTAL_REACHAROUND)));
-            });
-            registrar.playBidirectional(ControlsModePayload.PACKET_ID, ControlsModePayload.codec, (payload, context) -> {
-                if (context.flow().isServerbound()) ControlsMode.byId(payload.controlsMode()).ifPresent(controlsMode -> new PlayerChangeControlsModeEvent(context.player(), controlsMode));
-                else context.connection().send(new CustomPayloadC2SPacket(new ControlsModePayload(MidnightControlsConfig.controlsMode.getName())));
-            });
-            registrar.playToClient(FeaturePayload.PACKET_ID, FeaturePayload.codec, (payload, context) -> {});
-        }
-    }
-}

neoforge/src/main/java/eu/midnightdust/midnightcontrols/neoforge/event/PlayerChangeControlsModeEvent.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.midnightcontrols.neoforge.event;
-
-import eu.midnightdust.midnightcontrols.ControlsMode;
-import net.minecraft.entity.player.PlayerEntity;
-import net.neoforged.bus.api.Event;
-import net.neoforged.fml.event.IModBusEvent;
-
-public class PlayerChangeControlsModeEvent extends Event implements IModBusEvent {
-    public PlayerChangeControlsModeEvent(PlayerEntity player, ControlsMode controlsMode) {
-
-    }
-}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,39 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[2,)"
-#issueTrackerURL = ""
-license = "MIT License"
-
-[[mods]]
-modId = "midnightcontrols"
-version = "${version}"
-displayName = "MidnightControls"
-logoFile = "icon.png"
-authors = "Motschen, LambdAurora"
-contributors = "akemin-dayo, DioEgizio, dogtopus, egeesin, EnnuiL, FlashyReese, gyular, Hambaka, Ivanoks, joaoh1, KiskaUWU, Madis0, RaptaG, ronniedude, spudpiggy, TrueHorse"
-description = '''
-Adds controller support and enhanced controls overall.
-'''
-
-[[mixins]]
-config = "midnightcontrols.mixins.json"
-
-[[dependencies.midnightcontrols]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[21.0,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.midnightcontrols]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.21,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.midnightcontrols]]
-modId = "midnightlib"
-mandatory = true
-versionRange = "[1.0,)"
-ordering = "AFTER"
-side = "BOTH"

settings.gradle

@@ -1,15 +1,11 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.fabricmc.net/" }
+        maven {
-        maven { url "https://maven.architectury.dev/" }
+            name 'Fabric'
-        maven { url "https://maven.neoforged.net/releases" }
+            url 'https://maven.fabricmc.net/'
+        }
         gradlePluginPortal()
     }
 }
 
-include("common")
+rootProject.name = 'midnightcontrols'
-include("fabric")
-//include("quilt") // Native quilt support is disabled atm, as the Quilt libraries are currently in maintenance mode
-include("neoforge")
-
-rootProject.name = "midnightcontrols"

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

@@ -9,8 +9,8 @@
 
 package eu.midnightdust.midnightcontrols;
 
+import dev.lambdaurora.spruceui.util.Nameable;
 import org.jetbrains.annotations.NotNull;
-import org.thinkingstudio.obsidianui.util.Nameable;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -22,7 +22,7 @@ import java.util.Optional;
  * @version 1.7.0
  * @since 1.0.0
  */
-public enum ControlsMode {
+public enum ControlsMode implements Nameable {
     DEFAULT,
     CONTROLLER,
     TOUCHSCREEN;
@@ -49,6 +49,7 @@ public enum ControlsMode {
         return "midnightcontrols.controls_mode." + this.getName();
     }
 
+    @Override
     public @NotNull String getName() {
         return this.name().toLowerCase();
     }

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

@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of midnightcontrols.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.event.PlayerChangeControlsModeCallback;
+import io.netty.buffer.Unpooled;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.util.Identifier;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Represents the MidnightControls mod.
+ *
+ * @author LambdAurora & Motschen
+ * @version 1.8.0
+ * @since 1.0.0
+ */
+public class MidnightControls implements ModInitializer {
+    private static MidnightControls INSTANCE;
+    public static final Identifier CONTROLS_MODE_CHANNEL = new Identifier(MidnightControlsConstants.CONTROLS_MODE_CHANNEL.toString());
+    public static final Identifier FEATURE_CHANNEL = new Identifier(MidnightControlsConstants.FEATURE_CHANNEL.toString());
+    public static final Identifier HELLO_CHANNEL = new Identifier(MidnightControlsConstants.HELLO_CHANNEL.toString());
+    public static boolean isExtrasLoaded;
+
+    public final Logger logger = LogManager.getLogger("MidnightControls");
+
+    @Override
+    public void onInitialize() {
+        INSTANCE = this;
+        isExtrasLoaded = FabricLoader.getInstance().isModLoaded("midnightcontrols-extra");
+        this.log("Initializing MidnightControls...");
+
+        ServerPlayNetworking.registerGlobalReceiver(HELLO_CHANNEL, (server, player, handler, buf, responseSender) -> {
+            String version = buf.readString(32);
+            ControlsMode.byId(buf.readString(32))
+                    .ifPresent(controlsMode -> server
+                            .execute(() -> PlayerChangeControlsModeCallback.EVENT.invoker().apply(player, controlsMode)));
+            server.execute(() -> {
+                ServerPlayNetworking.send(player, FEATURE_CHANNEL, this.makeFeatureBuffer(MidnightControlsFeature.HORIZONTAL_REACHAROUND));
+            });
+        });
+        ServerPlayNetworking.registerGlobalReceiver(CONTROLS_MODE_CHANNEL,
+                (server, player, handler, buf, responseSender) -> ControlsMode.byId(buf.readString(32))
+                        .ifPresent(controlsMode -> server
+                                .execute(() -> PlayerChangeControlsModeCallback.EVENT.invoker().apply(player, controlsMode))));
+    }
+
+    /**
+     * Prints a message to the terminal.
+     *
+     * @param info the message to print
+     */
+    public void log(String info) {
+        this.logger.info("[MidnightControls] " + info);
+    }
+
+    /**
+     * Prints a warning to the terminal.
+     *
+     * @param warning the warning to print
+     */
+    public void warn(String warning) {
+        this.logger.info("[MidnightControls] " + warning);
+    }
+
+    /**
+     * Returns a packet byte buffer made for the midnightcontrols:controls_mode plugin message.
+     *
+     * @param controlsMode the controls mode to send
+     * @return the packet byte buffer
+     */
+    public PacketByteBuf makeControlsModeBuffer(@NotNull ControlsMode controlsMode) {
+        Objects.requireNonNull(controlsMode, "Controls mode cannot be null.");
+        return new PacketByteBuf(Unpooled.buffer()).writeString(controlsMode.getName(), 32);
+    }
+
+    /**
+     * Returns a packet byte buffer made for the midnightcontrols:feature plugin message.
+     *
+     * @param features the features data to send
+     * @return the packet byte buffer
+     */
+    public PacketByteBuf makeFeatureBuffer(MidnightControlsFeature... features) {
+        if (features.length == 0)
+            throw new IllegalArgumentException("At least one feature must be provided.");
+        var buffer = new PacketByteBuf(Unpooled.buffer());
+        buffer.writeVarInt(features.length);
+        for (var feature : features) {
+            buffer.writeString(feature.getName(), 64);
+            buffer.writeBoolean(feature.isAllowed());
+        }
+        return buffer;
+    }
+
+    public PacketByteBuf makeHello(@NotNull ControlsMode controlsMode) {
+        var version = "";
+        Optional<ModContainer> container;
+        if ((container = FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE)).isPresent()) {
+            version = container.get().getMetadata().getVersion().getFriendlyString();
+        }
+        return new PacketByteBuf(Unpooled.buffer()).writeString(version, 32).writeString(controlsMode.getName(), 32);
+    }
+
+    /**
+     * Gets the MidnightControls instance.
+     *
+     * @return the MidnightControls instance
+     */
+    public static MidnightControls get() {
+        return INSTANCE;
+    }
+}

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

@@ -12,8 +12,6 @@ package eu.midnightdust.midnightcontrols;
 
 import net.minecraft.util.Identifier;
 
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-
 /**
  * Represents the constants used by MidnightControls.
  *
@@ -23,7 +21,7 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id;
  */
 public class MidnightControlsConstants {
     public static final String NAMESPACE = "midnightcontrols";
-    public static final Identifier CONTROLS_MODE_CHANNEL = id("controls_mode");
+    public static final Identifier CONTROLS_MODE_CHANNEL = new Identifier(NAMESPACE, "controls_mode");
-    public static final Identifier FEATURE_CHANNEL = id("feature");
+    public static final Identifier FEATURE_CHANNEL = new Identifier(NAMESPACE, "feature");
-    public static final Identifier HELLO_CHANNEL = id("hello");
+    public static final Identifier HELLO_CHANNEL = new Identifier("lambdacontrols", "hello");
 }

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

@@ -9,7 +9,7 @@
 
 package eu.midnightdust.midnightcontrols;
 
-import org.thinkingstudio.obsidianui.util.Nameable;
+import dev.lambdaurora.spruceui.util.Nameable;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,7 +44,6 @@ public class MidnightControlsFeature implements Nameable {
         this.setEnabled(this.defaultEnabled = enabled);
     }
 
-    @Deprecated
     public MidnightControlsFeature(@NotNull String key) {
         this(key, false, false);
     }
@@ -52,7 +51,6 @@ public class MidnightControlsFeature implements Nameable {
     /**
      * Allows the feature.
      */
-    @Deprecated
     public void allow() {
         this.setAllowed(true);
     }

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

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client;
 
+import dev.lambdaurora.spruceui.event.OpenScreenCallback;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControls;
@@ -21,18 +22,22 @@ import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsHud;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
-import eu.midnightdust.midnightcontrols.client.touch.gui.TouchscreenOverlay;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
 import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
 import eu.midnightdust.midnightcontrols.client.ring.ButtonBindingRingAction;
 import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
-import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
+import dev.lambdaurora.spruceui.hud.HudManager;
-import eu.midnightdust.midnightcontrols.client.virtualkeyboard.MouseClickInterceptor;
-import net.minecraft.client.gui.screen.Screen;
-import org.thinkingstudio.obsidianui.hud.HudManager;
 import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
-import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
+import net.fabricmc.api.ClientModInitializer;
-import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.util.InputUtil;
@@ -45,72 +50,99 @@ import java.io.File;
 import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Represents the midnightcontrols client mod.
  *
- * @author Motschen, LambdAurora
+ * @author LambdAurora
- * @version 1.10.0
+ * @version 1.7.0
  * @since 1.1.0
  */
-public class MidnightControlsClient extends MidnightControls {
+public class MidnightControlsClient extends MidnightControls implements ClientModInitializer {
     public static boolean lateInitDone = false;
-    public static final KeyBinding BINDING_LOOK_UP = InputManager.makeKeyBinding(id("look_up"),
+    private static MidnightControlsClient INSTANCE;
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.midnightcontrols");
+    public static final KeyBinding BINDING_LOOK_UP = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_up"),
-    public static final KeyBinding BINDING_LOOK_RIGHT = InputManager.makeKeyBinding(id("look_right"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.movement");
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, "key.categories.midnightcontrols");
+    public static final KeyBinding BINDING_LOOK_RIGHT = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_right"),
-    public static final KeyBinding BINDING_LOOK_DOWN = InputManager.makeKeyBinding(id("look_down"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_6, "key.categories.movement");
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.midnightcontrols");
+    public static final KeyBinding BINDING_LOOK_DOWN = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_down"),
-    public static final KeyBinding BINDING_LOOK_LEFT = InputManager.makeKeyBinding(id("look_left"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_2, "key.categories.movement");
-            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.midnightcontrols");
+    public static final KeyBinding BINDING_LOOK_LEFT = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_left"),
-    public static final KeyBinding BINDING_RING = InputManager.makeKeyBinding(id("ring"),
+            InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement");
-            InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(), "key.categories.midnightcontrols");
+    public static final KeyBinding BINDING_RING = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "ring"),
-    public static final Identifier CONTROLLER_BUTTONS = id("textures/gui/controller_buttons.png");
+            InputUtil.Type.KEYSYM, InputUtil.UNKNOWN_KEY.getCode(), "key.categories.misc");
-    public static final Identifier CONTROLLER_EXPANDED = id("textures/gui/controller_expanded.png");
+    public static final Identifier CONTROLLER_BUTTONS = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_buttons.png");
-    public static final Identifier CONTROLLER_AXIS = id("textures/gui/controller_axis.png");
+    public static final Identifier CONTROLLER_EXPANDED = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_expanded.png");
-    public static final Identifier WAYLAND_CURSOR_TEXTURE_LIGHT = id("cursor/light/mouse_pointer");
+    public static final Identifier CONTROLLER_AXIS = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/controller_axis.png");
-    public static final Identifier WAYLAND_CURSOR_TEXTURE_DARK = id("cursor/dark/mouse_pointer");
+    public static final Identifier CURSOR_TEXTURE = new Identifier(MidnightControlsConstants.NAMESPACE, "textures/gui/cursor.png");
-    public static final File MAPPINGS_FILE = new File("config/gamecontrollercustommappings.txt");
+    public final static File MAPPINGS_FILE = new File("config/gamecontrollercustommappings.txt");
-    public static MinecraftClient client = MinecraftClient.getInstance();
+    public final MidnightInput input = new MidnightInput();
-    public static final MidnightInput input = new MidnightInput();
+    public final MidnightRing ring = new MidnightRing(this);
-    public static final MidnightRing ring = new MidnightRing();
+    public final MidnightReacharound reacharound = new MidnightReacharound();
-    public static final MidnightReacharound reacharound = new MidnightReacharound();
+    private MidnightControlsHud hud;
-    public static final MouseClickInterceptor clickInterceptor = new MouseClickInterceptor();
+    private ControlsMode previousControlsMode;
-    public static boolean isWayland;
-    private static MidnightControlsHud hud;
-    private static ControlsMode previousControlsMode;
 
-    public static void initClient() {
+    @Override
-        client = MinecraftClient.getInstance();
+    public void onInitializeClient() {
-        ring.registerAction("buttonbinding", ButtonBindingRingAction.FACTORY);
+        INSTANCE = this;
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_UP);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_RIGHT);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_DOWN);
+        KeyBindingHelper.registerKeyBinding(BINDING_LOOK_LEFT);
+        KeyBindingHelper.registerKeyBinding(BINDING_RING);
 
+        this.ring.registerAction("buttonbinding", ButtonBindingRingAction.FACTORY);
+
+        ClientPlayNetworking.registerGlobalReceiver(CONTROLS_MODE_CHANNEL, (client, handler, buf, responseSender) ->
+                responseSender.sendPacket(CONTROLS_MODE_CHANNEL, this.makeControlsModeBuffer(MidnightControlsConfig.controlsMode)));
+        ClientPlayNetworking.registerGlobalReceiver(FEATURE_CHANNEL, (client, handler, buf, responseSender) -> {
+            int features = buf.readVarInt();
+            for (int i = 0; i < features; i++) {
+                var name = buf.readString(64);
+                boolean allowed = buf.readBoolean();
+                MidnightControlsFeature.fromName(name).ifPresent(feature -> client.execute(() -> feature.setAllowed(allowed)));
+            }
+        });
+        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
+            sender.sendPacket(HELLO_CHANNEL, this.makeHello(MidnightControlsConfig.controlsMode));
+            sender.sendPacket(CONTROLS_MODE_CHANNEL, this.makeControlsModeBuffer(MidnightControlsConfig.controlsMode));
+        });
+        ClientPlayConnectionEvents.DISCONNECT.register(this::onLeave);
+
+        ClientTickEvents.START_CLIENT_TICK.register(this.reacharound::tick);
+        ClientTickEvents.START_CLIENT_TICK.register(this::onTick);
+
+        OpenScreenCallback.EVENT.register((client, screen) -> {
+            if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) {
+                screen = new TouchscreenOverlay(this);
+                screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
+                client.skipGameRender = false;
+                client.currentScreen = screen;
+            } else if (screen != null) {
+                this.input.onScreenOpen(client, client.getWindow().getWidth(), client.getWindow().getHeight());
+            }
+        });
+        final MinecraftClient client = MinecraftClient.getInstance();
         int delay = 0; // delay for 0 sec.
-        int period = 1; // repeat every 0.001 sec. (1000 times a second)
+        int period = 1; // repeat every 0.001 sec. (100 times a second)
         Timer timer = new Timer();
         timer.scheduleAtFixedRate(new TimerTask() {
             public void run() {
-                try {
+                input.updateCamera(client);
-                    if (lateInitDone && client.isRunning()) {
-                        if (MidnightControlsConfig.controlsMode != ControlsMode.DEFAULT && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
-                            if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) input.tickCameraStick();
-                            input.updateCamera();
-                        }
-                    }
-                } catch (Exception | Error e) {
-                    MidnightControls.logger.error("Exception encountered in camera loop: ",e);
-                }
             }
         }, delay, period);
 
-        HudManager.register(hud = new MidnightControlsHud());
+        HudManager.register(this.hud = new MidnightControlsHud(this));
-        isWayland = GLFW.glfwGetVersionString().contains("Wayland");
+        FabricLoader.getInstance().getModContainer("midnightcontrols").ifPresent(modContainer -> {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","bedrock"), modContainer, ResourcePackActivationType.NORMAL);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","legacy"), modContainer, ResourcePackActivationType.NORMAL);
+        });
     }
 
     /**
      * This method is called when Minecraft is initializing.
      */
-    public static void onMcInit(@NotNull MinecraftClient client) {
+    public void onMcInit(@NotNull MinecraftClient client) {
         ButtonBinding.init(client.options);
         MidnightControlsConfig.load();
         if (MidnightControlsConfig.configVersion < 2) {
@@ -119,9 +151,9 @@ public class MidnightControlsClient extends MidnightControls {
             MidnightControlsConfig.mouseScreens.remove("net.minecraft.class_5375");
             MidnightControlsConfig.mouseScreens.remove("net.minecraft.client.gui.screen.pack.PackScreen");
             MidnightControlsConfig.configVersion = 2;
-            MidnightControlsConfig.write(MidnightControlsConstants.NAMESPACE);
+            MidnightControlsConfig.write("midnightcontrols");
         }
-        hud.setVisible(MidnightControlsConfig.hudEnable);
+        this.hud.setVisible(MidnightControlsConfig.hudEnable);
         Controller.updateMappings();
         try {
             GLFW.glfwSetJoystickCallback((jid, event) -> {
@@ -134,16 +166,17 @@ public class MidnightControlsClient extends MidnightControls {
                             null));
                 }
 
-                switchControlsMode();
+                this.switchControlsMode();
             });
         } catch (Exception e) {e.fillInStackTrace();}
 
-        MidnightControlsCompat.init();
+        MidnightControlsCompat.init(this);
     }
+    ButtonCategory category;
     /**
      * This method is called to initialize keybindings
      */
-    public static void initKeybindings() {
+    public void initKeybindings() {
         if (lateInitDone) return;
         if (KeyBindingIDAccessor.getKEYS_BY_ID() == null || KeyBindingIDAccessor.getKEYS_BY_ID().isEmpty()) return;
         if (PlatformFunctions.isModLoaded("voxelmap") && !KeyBindingIDAccessor.getKEYS_BY_ID().containsKey("key.minimap.toggleingamewaypoints")) return;
@@ -151,20 +184,20 @@ public class MidnightControlsClient extends MidnightControls {
         for (int i = 0; i < KeyBindingIDAccessor.getKEYS_BY_ID().size(); ++i) {
             KeyBinding keyBinding = KeyBindingIDAccessor.getKEYS_BY_ID().entrySet().stream().toList().get(i).getValue();
             if (MidnightControlsConfig.excludedKeybindings.stream().noneMatch(excluded -> keyBinding.getTranslationKey().startsWith(excluded))) {
-                if (!keyBinding.getTranslationKey().contains(MidnightControlsConstants.NAMESPACE)) {
+                if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
-                    AtomicReference<ButtonCategory> category = new AtomicReference<>();
+                    category = null;
                     InputManager.streamCategories().forEach(buttonCategory -> {
-                        if (buttonCategory.getIdentifier().equals(validVanillaId(keyBinding.getCategory())))
+                        if (buttonCategory.getIdentifier().equals(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory())))
-                            category.set(buttonCategory);
+                            category = buttonCategory;
                     });
-                    if (category.get() == null) {
+                    if (category == null) {
-                        category.set(new ButtonCategory(validVanillaId(keyBinding.getCategory())));
+                        category = new ButtonCategory(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory()));
-                        InputManager.registerCategory(category.get());
+                        InputManager.registerCategory(category);
                     }
-                    ButtonBinding buttonBinding = new ButtonBinding.Builder(keyBinding.getTranslationKey()).category(category.get()).linkKeybind(keyBinding).register();
+                    ButtonBinding buttonBinding = new ButtonBinding.Builder(keyBinding.getTranslationKey()).category(category).linkKeybind(keyBinding).register();
                     if (MidnightControlsConfig.debug) {
-                        MidnightControls.log(keyBinding.getTranslationKey());
+                        logger.info(keyBinding.getTranslationKey());
-                        MidnightControls.log(String.valueOf(buttonBinding));
+                        logger.info(buttonBinding);
                     }
                 }
             }
@@ -172,26 +205,17 @@ public class MidnightControlsClient extends MidnightControls {
         InputManager.loadButtonBindings();
         lateInitDone = true;
     }
-    private static Identifier validVanillaId(String path) {
-        for(int i = 0; i < path.length(); ++i) {
-            if (!Identifier.isPathCharacterValid(path.charAt(i))) {
-                path = path.replace(path.charAt(i), '_');
-            }
-        }
-        return Identifier.ofVanilla(path);
-    }
 
     /**
      * This method is called every Minecraft tick.
      *
      * @param client the client instance
      */
-    public static void onTick(@NotNull MinecraftClient client) {
+    public void onTick(@NotNull MinecraftClient client) {
-        initKeybindings();
+        this.initKeybindings();
-        input.tick();
+        this.input.tick(client);
-        reacharound.tick();
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput))
-            input.tickController();
+            this.input.tickController(client);
 
         if (BINDING_RING.wasPressed()) {
             ring.loadFromUnbound();
@@ -204,48 +228,31 @@ public class MidnightControlsClient extends MidnightControls {
             MidnightControlsConfig.enableHints = false;
             MidnightControlsConfig.save();
         }
-        RainbowColor.tick();
         TouchInput.tick();
     }
 
-    /**
-     * Called when opening a screen.
-     */
-    public static void onScreenOpen(Screen screen) {
-        client = MinecraftClient.getInstance();
-        if (screen == null && MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN) {
-            screen = new TouchscreenOverlay();
-            screen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
-            client.skipGameRender = false;
-            client.currentScreen = screen;
-        } else if (screen != null) {
-            MidnightControlsClient.input.onScreenOpen(client.getWindow().getWidth(), client.getWindow().getHeight());
-        }
-    }
-
     /**
      * Called when leaving a server.
      */
-    public static void onLeave() {
+    public void onLeave(ClientPlayNetworkHandler handler, MinecraftClient client) {
         MidnightControlsFeature.resetAllAllowed();
     }
 
     /**
      * Switches the controls mode if the auto switch is enabled.
      */
-    public static void switchControlsMode() {
+    public void switchControlsMode() {
         if (MidnightControlsConfig.autoSwitchMode) {
             if (MidnightControlsConfig.getController().isGamepad()) {
-                previousControlsMode = MidnightControlsConfig.controlsMode;
+                this.previousControlsMode = MidnightControlsConfig.controlsMode;
                 MidnightControlsConfig.controlsMode = ControlsMode.CONTROLLER;
             } else {
-                if (previousControlsMode == null) {
+                if (this.previousControlsMode == null) {
-                    previousControlsMode = ControlsMode.DEFAULT;
+                    this.previousControlsMode = ControlsMode.DEFAULT;
                 }
 
-                MidnightControlsConfig.controlsMode = previousControlsMode;
+                MidnightControlsConfig.controlsMode = this.previousControlsMode;
             }
-            NetworkUtil.sendPayloadC2S(new ControlsModePayload(MidnightControlsConfig.controlsMode.getName()));
         }
     }
 
@@ -254,18 +261,16 @@ public class MidnightControlsClient extends MidnightControls {
      *
      * @param enabled true if the HUD is enabled, else false
      */
-    public static void setHudEnabled(boolean enabled) {
+    public void setHudEnabled(boolean enabled) {
         MidnightControlsConfig.hudEnable = enabled;
-        hud.setVisible(enabled);
+        this.hud.setVisible(enabled);
     }
 
-    private static final MidnightControlsClient INSTANCE = new MidnightControlsClient();
     /**
      * Gets the midnightcontrols client instance.
      *
      * @return the midnightcontrols client instance
      */
-    @Deprecated
     public static MidnightControlsClient get() {
         return INSTANCE;
     }

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

@@ -11,16 +11,13 @@ package eu.midnightdust.midnightcontrols.client;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.mojang.blaze3d.platform.GLX;
+import com.mojang.blaze3d.platform.GlDebugInfo;
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.midnightcontrols.ControlsMode;
-import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.enums.CameraMode;
 import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
 import eu.midnightdust.midnightcontrols.client.enums.HudSide;
@@ -52,108 +49,77 @@ public class MidnightControlsConfig extends MidnightConfig {
     public static boolean isEditing = false;
     @Hidden @Entry public static int configVersion = 2;
     // General
-    @Comment(category = CONTROLLER, centered = true, name="\uD83C\uDFAE General") public static Comment _general;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.controls_mode") public static ControlsMode controlsMode = ControlsMode.DEFAULT;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.auto_switch_mode") public static boolean autoSwitchMode = true;
+    @Entry(category = MISC, name = "Debug") public static boolean debug = false;
     // HUD
-    @Comment(category = VISUAL, centered = true, name="\uD83D\uDDB9 Hud") public static Comment _hud;
     @Entry(category = VISUAL, name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
     @Entry(category = VISUAL, name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
-    @Entry(category = VISUAL, name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
     // Gameplay
-    @Comment(category = GAMEPLAY, centered = true, name="\uD83D\uDECB Comfort") public static Comment _comfort;
-    @Entry(category = GAMEPLAY, name = "Enable Hints") public static boolean enableHints = true;
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.controller_toggle_sneak") public static boolean controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.controller_toggle_sprint") public static boolean controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
-
-    @Condition(requiredModId = "midnightcontrols-extra")
-    @Comment(category = GAMEPLAY, centered = true, name="✨ Extras") public static Comment _extras;
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fast_block_placing") public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fly_drifting") public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fly_drifting_vertical") public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.reacharound.horizontal") public static boolean horizontalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.reacharound.vertical") public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Condition(requiredModId = "midnightcontrols-extra")
-    @Comment(category = VISUAL, centered = true, name="⊽ Reacharound") public static Comment _reacharoundOutline;
-    @Condition(requiredModId = "midnightcontrols-extra")
     @Entry(category = VISUAL, name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
-    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
     @Entry(category = VISUAL, name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
-    @Condition(requiredModId = "midnightcontrols-extra", requiredOption = "shouldRenderReacharoundOutline")
     @Entry(category = VISUAL, name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDCF7 Camera Settings") public static Comment _cameraSettings;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.right_dead_zone", isSlider = true, min = 0.05, max = 1) public static double rightDeadZone = 0.25;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.25;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 35.0; //used for x-axis, name kept for compatibility
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.y_axis_rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double yAxisRotationSpeed = rotationSpeed;
     @Entry(category = CONTROLLER, name = "midnightcontrols.menu.camera_mode") public static CameraMode cameraMode = CameraMode.FLAT;
-    @Comment(category = SCREENS, centered = true, name="\uD83D\uDDB1 Mouse Behaviour") public static Comment _mouseBehaviour;
     @Entry(category = SCREENS, name = "midnightcontrols.menu.mouse_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double mouseSpeed = 25.0;
     @Entry(category = SCREENS, name = "midnightcontrols.menu.joystick_as_mouse") public static boolean joystickAsMouse = false;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.eye_tracker_as_mouse") public static boolean eyeTrackerAsMouse = false;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.eye_tracker_deadzone", isSlider = true, min = 0, max = 0.4) public static double eyeTrackerDeadzone = 0.05;
+    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
+    @Entry(category = SCREENS, name = "midnightcontrols.menu.hide_cursor") public static boolean hideNormalMouse = false;
+    @Entry(category = CONTROLLER, name = "Controller ID") @Hidden public static Object controllerID = 0;
+    @Entry(category = CONTROLLER, name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
+    @Entry(category = VISUAL, name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
     @Entry(category = SCREENS, name = "Mouse screens") public static List<String> mouseScreens = Lists.newArrayList("net.minecraft.client.gui.screen.advancement",
             "net.minecraft.class_457", "net.minecraft.class_408", "net.minecraft.class_3872", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen",
             "hardcorequesting.client.interfaces.GuiQuestBook", "hardcorequesting.client.interfaces.GuiReward", "hardcorequesting.client.interfaces.EditTrackerScreen",
             "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
     @Entry(category = SCREENS, name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
     @Entry(category = SCREENS, name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDC40 Eye Tracking") public static Comment _eyeTracker;
+    @Entry(category = TOUCH, name = "Screens with close button") public static List<String> closeButtonScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName(), AdvancementsScreen.class.getCanonicalName(), RingScreen.class.getCanonicalName());
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_as_mouse") public static boolean eyeTrackerAsMouse = false;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.eye_tracker_deadzone", isSlider = true, min = 0, max = 0.4) public static double eyeTrackerDeadzone = 0.05;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
-    @Comment(category = SCREENS, centered = true, name="\uD83D\uDC46 Virtual Mouse") public static Comment _virtualMouse;
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
-    @Condition(requiredOption = "virtualMouse", visibleButLocked = true)
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.hide_cursor") public static boolean hideNormalMouse = false;
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.virtual_keyboard") public static boolean virtualKeyboard = false;
-    @Entry(category = CONTROLLER, name = "Controller ID") @Hidden public static Object controllerID = 0;
-    @Entry(category = CONTROLLER, name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
-    @Comment(category = TOUCH, centered = true, name="\uD83E\uDE84 Behaviour") public static Comment _touchBehaviour;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_with_controller") public static boolean touchInControllerMode = false;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double touchSpeed = 50.0;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.invert_touch") public static boolean invertTouch = false;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_mode") public static TouchMode touchMode = TouchMode.CROSSHAIR;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_break_delay", isSlider = true, min = 50, max = 500) public static int touchBreakDelay = 120;
-    @Comment(category = TOUCH, centered = true, name="\uD83D\uDCA1 Visuals") public static Comment _visuals;
     @Entry(category = TOUCH, name = "midnightcontrols.menu.touch_transparency", isSlider = true, min = 0, max = 100) public static int touchTransparency = 75;
     @Entry(category = TOUCH, name = "Touch Outline Color", isColor = true) public static String touchOutlineColorHex = "#ffffff";
     @Entry(category = TOUCH, name = "Touch Outline Alpha", isSlider = true, min = 0, max = 255) public static int touchOutlineColorAlpha = 150;
-    @Comment(category = TOUCH, centered = true, name="\uD83E\uDDEA Advanced") public static Comment _advanced;
-    @Entry(category = TOUCH, name = "Screens with close button") public static List<String> closeButtonScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName(), AdvancementsScreen.class.getCanonicalName(), RingScreen.class.getCanonicalName());
     @Entry(category = TOUCH, name = "Left Touch button bindings") public static List<String> leftTouchBinds = Lists.newArrayList("debug_screen", "screenshot","toggle_perspective");
     @Entry(category = TOUCH, name = "Right Touch button bindings") public static List<String> rightTouchBinds = Lists.newArrayList("screenshot","toggle_perspective", "use");
 
     @Entry @Hidden public static Map<String, String> BINDING = new HashMap<>();
 
     private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
-    @Comment(category = CONTROLLER, centered = true, name="\uD83D\uDD79 Max Analog Stick Values") public static Comment _maxAnalogValues;
+    @Deprecated @Hidden @Entry public static double[] maxAnalogValues = new double[]{1, 1, 1, 1};
-    @Entry(category = CONTROLLER, name = "Max analog value: Left X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftX = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Left X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftX = maxAnalogValues[0];
-    @Entry(category = CONTROLLER, name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = maxAnalogValues[1];
-    @Entry(category = CONTROLLER, name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = maxAnalogValues[2];
-    @Entry(category = CONTROLLER, name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = 1;
+    @Entry(category = CONTROLLER, name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = maxAnalogValues[3];
-    @Comment(category = CONTROLLER, centered = true, name="☠ Dead Zones") public static Comment _deadZones;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.right_dead_zone", isSlider = true, min = 0.05, max = 1) public static double rightDeadZone = 0.25;
-    @Entry(category = CONTROLLER, name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.25;
-    @Entry(category = CONTROLLER, name = "Trigger Dead-Zone", isSlider = true, min = 0.05, max = 1) public static double triggerDeadZone = 0.1;
-    @Comment(category = CONTROLLER, centered = true, name="☆ Other Options") public static Comment _otherOptions;
     @Entry(category = CONTROLLER, name = "Trigger button fix") public static boolean triggerFix = true;
-    @Entry(category = CONTROLLER, name = "Excluded Controllers (Name Regex)") public static List<String> excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$");
-    @Comment(category = SCREENS, centered = true, name="\uD83D\uDD27 UI Modifications") public static Comment _uiMods;
-    @Entry(category = SCREENS, name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
-    @Entry(category = SCREENS, name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
-    @Entry(category = MISC, name = "midnightcontrols.menu.virtual_keyboard_layout") public static String keyboardLayout = "en_US:qwerty";
-    @Entry(category = MISC, name = "Debug") public static boolean debug = false;
     @Entry(category = MISC, name = "Excluded Keybindings") public static List<String> excludedKeybindings = Lists.newArrayList("key.forward", "key.left", "key.back", "key.right", "key.jump", "key.sneak", "key.sprint", "key.inventory",
             "key.swapOffhand", "key.drop", "key.use", "key.attack", "key.chat", "key.playerlist", "key.screenshot", "key.togglePerspective", "key.smoothCamera", "key.fullscreen", "key.saveToolbarActivator", "key.loadToolbarActivator",
             "key.pickItem", "key.hotbar.1", "key.hotbar.2", "key.hotbar.3", "key.hotbar.4", "key.hotbar.5", "key.hotbar.6", "key.hotbar.7", "key.hotbar.8", "key.hotbar.9");
-    @Entry(category = MISC, name = "Ring Bindings (WIP)") @Hidden public static List<String> ringBindings = new ArrayList<>();
+    @Entry(category = GAMEPLAY, name = "Enable Hints") public static boolean enableHints = true;
+    @Entry(category = SCREENS, name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+    @Entry(category = MISC, name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();
     @Entry(category = MISC, name = "Ignored Unbound Keys") public static List<String> ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
     @Entry @Hidden public static Map<String, Map<String, String>> controllerBindingProfiles = new HashMap<>();
     private static Map<String, String> currentBindingProfile = new HashMap<>();
@@ -163,8 +129,8 @@ public class MidnightControlsConfig extends MidnightConfig {
      * Loads the configuration
      */
     public static void load() {
-        MidnightControlsConfig.init(MidnightControlsConstants.NAMESPACE, MidnightControlsConfig.class);
+        MidnightControlsConfig.init("midnightcontrols", MidnightControlsConfig.class);
-        MidnightControls.log("Configuration loaded.");
+        MidnightControlsClient.get().log("Configuration loaded.");
         // Controller controls.
         InputManager.loadButtonBindings();
     }
@@ -173,8 +139,8 @@ public class MidnightControlsConfig extends MidnightConfig {
      * Saves the configuration.
      */
     public static void save() {
-        MidnightControlsConfig.write(MidnightControlsConstants.NAMESPACE);
+        MidnightControlsConfig.write("midnightcontrols");
-        MidnightControls.log("Configuration saved.");
+        MidnightControlsClient.get().log("Configuration saved.");
         MidnightControlsFeature.refreshEnabled();
     }
     public static void updateBindingsForController(Controller controller) {
@@ -221,7 +187,7 @@ public class MidnightControlsConfig extends MidnightConfig {
      */
     public static void setController(Controller controller) {
         MidnightControlsConfig.controllerID = controller.id();
-        MidnightControlsConfig.write(MidnightControlsConstants.NAMESPACE);
+        MidnightControlsConfig.write("midnightcontrols");
     }
 
     /**
@@ -309,20 +275,20 @@ public class MidnightControlsConfig extends MidnightConfig {
                 buttons[count - 1] = Integer.parseInt(current);
             }
             if (count == 0) {
-                MidnightControls.warn("Malformed config value \"" + code + "\" for binding \"" + button.getName() + "\".");
+                MidnightControlsClient.get().warn("Malformed config value \"" + code + "\" for binding \"" + button.getName() + "\".");
                 MidnightControlsConfig.setButtonBinding(button, new int[]{-1});
             }
 
             button.setButton(buttons);
         } catch (Exception e) {
-            MidnightControls.warn("Malformed config value \"" + code + "\" for binding \"" + button.getName() + "\".");
+            MidnightControlsClient.get().warn("Malformed config value \"" + code + "\" for binding \"" + button.getName() + "\".");
             setButtonBinding(button, button.getButton());
         }
     }
 
     private static boolean checkValidity(@NotNull ButtonBinding binding, @NotNull String input, String group) {
         if (group == null) {
-            MidnightControls.warn("Malformed config value \"" + input + "\" for binding \"" + binding.getName() + "\".");
+            MidnightControlsClient.get().warn("Malformed config value \"" + input + "\" for binding \"" + binding.getName() + "\".");
             setButtonBinding(binding, binding.getButton());
             return false;
         }
@@ -342,28 +308,28 @@ public class MidnightControlsConfig extends MidnightConfig {
         else BINDING.put("controller.controls." + binding.getName(), binding.getButtonCode());
     }
 
-    public static boolean isBackButton(int btn, boolean isBtn, ButtonState state) {
+    public static boolean isBackButton(int btn, boolean isBtn, int state) {
-        if (!isBtn && state == ButtonState.NONE)
+        if (!isBtn && state == 0)
             return false;
-        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, false) == ButtonBinding.axisAsButton(btn, state == ButtonState.PRESS);
+        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, false) == ButtonBinding.axisAsButton(btn, state == 1);
     }
 
-    public static boolean isForwardButton(int btn, boolean isBtn, ButtonState state) {
+    public static boolean isForwardButton(int btn, boolean isBtn, int state) {
-        if (!isBtn && state == ButtonState.NONE)
+        if (!isBtn && state == 0)
             return false;
-        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, true) == ButtonBinding.axisAsButton(btn, state == ButtonState.PRESS);
+        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_Y, true) == ButtonBinding.axisAsButton(btn, state == 1);
     }
 
-    public static boolean isLeftButton(int btn, boolean isBtn, ButtonState state) {
+    public static boolean isLeftButton(int btn, boolean isBtn, int state) {
-        if (!isBtn && state == ButtonState.NONE)
+        if (!isBtn && state == 0)
             return false;
-        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, false) == ButtonBinding.axisAsButton(btn, state == ButtonState.PRESS);
+        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, false) == ButtonBinding.axisAsButton(btn, state == 1);
     }
 
-    public static boolean isRightButton(int btn, boolean isBtn, ButtonState state) {
+    public static boolean isRightButton(int btn, boolean isBtn, int state) {
-        if (!isBtn && state == ButtonState.NONE)
+        if (!isBtn && state == 0)
             return false;
-        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, true) == ButtonBinding.axisAsButton(btn, state == ButtonState.PRESS);
+        return ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_X, true) == ButtonBinding.axisAsButton(btn, state == 1);
     }
 
     /**
@@ -398,13 +364,12 @@ public class MidnightControlsConfig extends MidnightConfig {
         leftDeadZone = 0.25;
         invertRightYAxis = false;
         invertRightXAxis = false;
-        rotationSpeed = 35.0;
+        rotationSpeed = 40.0;
         yAxisRotationSpeed = rotationSpeed;
         mouseSpeed = 25.0;
         unfocusedInput = false;
         virtualMouse = false;
         virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
-        virtualKeyboard = false;
         controllerID = 0;
         secondControllerID = -1;
         controllerType = ControllerType.DEFAULT;
@@ -431,7 +396,7 @@ public class MidnightControlsConfig extends MidnightConfig {
         String controller = getController().getName().toLowerCase();
         if (controller.contains("xbox 360")) return ControllerType.XBOX_360;
         else if (controller.contains("xbox") || controller.contains("afterglow")) return ControllerType.XBOX;
-        else if (controller.contains("steam") && GLX._getCpuInfo().contains("AMD Custom APU")) return ControllerType.STEAM_DECK;
+        else if (controller.contains("steam") && GlDebugInfo.getCpuInfo().contains("AMD Custom APU")) return ControllerType.STEAM_DECK;
         else if (controller.contains("steam")) return ControllerType.STEAM_CONTROLLER;
         else if (controller.contains("dualsense") || controller.contains("ps5")) return ControllerType.DUALSENSE;
         else if (controller.contains("dualshock") || controller.contains("ps4")  || controller.contains("sony")) return ControllerType.DUALSHOCK;

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

@@ -0,0 +1,935 @@
+/*
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of midnightcontrols.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols.client;
+
+import com.google.common.collect.ImmutableSet;
+import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
+import eu.midnightdust.midnightcontrols.MidnightControls;
+import eu.midnightdust.midnightcontrols.client.compat.*;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.Controller;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.enums.CameraMode;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
+import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidget;
+import eu.midnightdust.midnightcontrols.client.mixin.*;
+import eu.midnightdust.midnightcontrols.client.ring.RingPage;
+import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
+import eu.midnightdust.midnightcontrols.client.util.MathUtil;
+import dev.lambdaurora.spruceui.navigation.NavigationDirection;
+import dev.lambdaurora.spruceui.screen.SpruceScreen;
+import dev.lambdaurora.spruceui.widget.AbstractSprucePressableButtonWidget;
+import dev.lambdaurora.spruceui.widget.SpruceElement;
+import dev.lambdaurora.spruceui.widget.SpruceLabelWidget;
+import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
+import net.fabricmc.loader.api.FabricLoader;
+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.CreativeInventoryScreen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.gui.screen.ingame.MerchantScreen;
+import net.minecraft.client.gui.screen.ingame.StonecutterScreen;
+import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
+import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
+import net.minecraft.client.gui.screen.world.WorldListWidget;
+import net.minecraft.client.gui.widget.*;
+import net.minecraft.screen.slot.Slot;
+import net.minecraft.text.TranslatableTextContent;
+import net.minecraft.util.math.MathHelper;
+import org.aperlambda.lambdacommon.utils.Pair;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.glfw.GLFWGamepadState;
+
+import java.util.*;
+
+import static org.lwjgl.glfw.GLFW.*;
+
+/**
+ * Represents the midnightcontrols' input handler.
+ *
+ * @author LambdAurora
+ * @version 1.7.0
+ * @since 1.0.0
+ */
+public class MidnightInput {
+    private static final Map<Integer, Integer> BUTTON_COOLDOWNS = new HashMap<>();
+    // Cooldowns
+    public int actionGuiCooldown = 0;
+    public int joystickCooldown = 0;
+    public boolean ignoreNextARelease = false;
+    public boolean ignoreNextXRelease = false;
+    private double targetYaw = 0.0;
+    private double targetPitch = 0.0;
+    private float prevXAxis = 0.f;
+    private float prevYAxis = 0.f;
+    private int targetMouseX = 0;
+    private int targetMouseY = 0;
+    private float mouseSpeedX = 0.f;
+    private float mouseSpeedY = 0.f;
+    public int inventoryInteractionCooldown = 0;
+    public int screenCloseCooldown = 0;
+
+    private ControllerControlsWidget controlsInput = null;
+
+    public MidnightInput() {}
+
+    /**
+     * This method is called every Minecraft tick.
+     *
+     * @param client the client instance
+     */
+    public void tick(@NotNull MinecraftClient client) {
+        this.targetYaw = 0.F;
+        this.targetPitch = 0.F;
+
+        // Handles the key bindings.
+        if (MidnightControlsClient.BINDING_LOOK_UP.isPressed()) {
+            this.handleLook(client, GLFW_GAMEPAD_AXIS_RIGHT_Y, 0.8F, 2);
+        } else if (MidnightControlsClient.BINDING_LOOK_DOWN.isPressed()) {
+            this.handleLook(client, GLFW_GAMEPAD_AXIS_RIGHT_Y, 0.8F, 1);
+        }
+        if (MidnightControlsClient.BINDING_LOOK_LEFT.isPressed()) {
+            this.handleLook(client, GLFW_GAMEPAD_AXIS_RIGHT_X, 0.8F, 2);
+        } else if (MidnightControlsClient.BINDING_LOOK_RIGHT.isPressed()) {
+            this.handleLook(client, GLFW_GAMEPAD_AXIS_RIGHT_X, 0.8F, 1);
+        }
+
+        InputManager.INPUT_MANAGER.tick(client);
+    }
+
+    /**
+     * This method is called every Minecraft tick for controller input update.
+     *
+     * @param client the client instance
+     */
+    public void tickController(@NotNull MinecraftClient client) {
+        BUTTON_COOLDOWNS.entrySet().stream().filter(entry -> entry.getValue() > 0)
+                .forEach(entry -> BUTTON_COOLDOWNS.put(entry.getKey(), entry.getValue() - 1));
+        // Decreases the cooldown for GUI actions.
+        if (this.actionGuiCooldown > 0)
+            --this.actionGuiCooldown;
+        if (this.screenCloseCooldown > 0)
+            --this.screenCloseCooldown;
+        if (this.joystickCooldown > 0)
+            --this.joystickCooldown;
+
+        InputManager.updateStates();
+
+        var controller = MidnightControlsConfig.getController();
+
+        if (controller.isConnected()) {
+            var state = controller.getState();
+            this.fetchButtonInput(client, state, false);
+            this.fetchAxeInput(client, state, false);
+        }
+        MidnightControlsConfig.getSecondController().filter(Controller::isConnected)
+                .ifPresent(joycon -> {
+                    GLFWGamepadState state = joycon.getState();
+                    this.fetchButtonInput(client, state, true);
+                    this.fetchAxeInput(client, state, true);
+                });
+
+        boolean allowInput = this.controlsInput == null || this.controlsInput.focusedBinding == null;
+
+        if (allowInput)
+            InputManager.updateBindings(client);
+
+        if (this.controlsInput != null) {
+            InputManager.STATES.forEach((num, button) -> {
+                if (button.isPressed()) System.out.println(num);
+            });
+        }
+        if (this.controlsInput != null && InputManager.STATES.int2ObjectEntrySet().parallelStream().map(Map.Entry::getValue).allMatch(ButtonState::isUnpressed)) {
+            System.out.println("finished");
+            if (this.controlsInput.focusedBinding != null && !this.controlsInput.waiting) {
+                int[] buttons = new int[this.controlsInput.currentButtons.size()];
+                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
+                    buttons[i] = this.controlsInput.currentButtons.get(i);
+                this.controlsInput.finishBindingEdit(buttons);
+                this.controlsInput = null;
+            }
+        }
+
+        if (this.inventoryInteractionCooldown > 0)
+            this.inventoryInteractionCooldown--;
+    }
+
+    /**
+     * This method is called before the screen is rendered.
+     *
+     * @param client the client instance
+     * @param screen the screen to render
+     */
+    public void onPreRenderScreen(@NotNull MinecraftClient client, @NotNull Screen screen) {
+        if (!isScreenInteractive(screen)) {
+            InputManager.INPUT_MANAGER.updateMousePosition(client);
+        }
+    }
+
+    /**
+     * This method is called to update the camera
+     *
+     * @param client the client instance
+     */
+    public void updateCamera(@NotNull MinecraftClient client) {
+        if (!(client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay))
+            return;
+
+        var player = client.player;
+        if (player == null)
+            return;
+
+        if (this.targetYaw != 0.f || this.targetPitch != 0.f) {
+            float rotationYaw = (float) (client.player.prevYaw + (this.targetYaw * 0.175));
+            float rotationPitch = (float) (client.player.prevPitch + (this.targetPitch * 0.175));
+            client.player.prevYaw = rotationYaw;
+            client.player.prevPitch = MathHelper.clamp(rotationPitch, -90.f, 90.f);
+            client.player.setYaw(rotationYaw);
+            client.player.setPitch(MathHelper.clamp(rotationPitch, -90.f, 90.f));
+            if (client.player.isRiding() && client.player.getVehicle() != null) {
+                client.player.getVehicle().onPassengerLookAround(client.player);
+            }
+            client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
+            MidnightControlsCompat.HANDLERS.forEach(handler -> handler.handleCamera(client, targetYaw, targetPitch));
+        }
+    }
+
+    /**
+     * This method is called when a Screen is opened.
+     *
+     * @param client the client instance
+     * @param windowWidth the window width
+     * @param windowHeight the window height
+     */
+    public void onScreenOpen(@NotNull MinecraftClient client, int windowWidth, int windowHeight) {
+        if (client.currentScreen == null) {
+            this.mouseSpeedX = this.mouseSpeedY = 0.0F;
+            InputManager.INPUT_MANAGER.resetMousePosition(windowWidth, windowHeight);
+        } else if (isScreenInteractive(client.currentScreen) && MidnightControlsConfig.virtualMouse) {
+            ((MouseAccessor) client.mouse).midnightcontrols$onCursorPos(client.getWindow().getHandle(), 0, 0);
+            InputManager.INPUT_MANAGER.resetMouseTarget(client);
+        }
+        this.inventoryInteractionCooldown = 5;
+    }
+
+    public void beginControlsInput(ControllerControlsWidget widget) {
+        this.controlsInput = widget;
+        if (widget != null) {
+            this.controlsInput.currentButtons.clear();
+            this.controlsInput.waiting = true;
+        }
+    }
+
+    private void fetchButtonInput(@NotNull MinecraftClient client, @NotNull GLFWGamepadState gamepadState, boolean leftJoycon) {
+        var buffer = gamepadState.buttons();
+        for (int i = 0; i < buffer.limit(); i++) {
+            int btn = leftJoycon ? ButtonBinding.controller2Button(i) : i;
+            boolean btnState = buffer.get() == (byte) 1;
+            var state = ButtonState.NONE;
+            var previousState = InputManager.STATES.getOrDefault(btn, ButtonState.NONE);
+
+            if (btnState != previousState.isPressed()) {
+                state = btnState ? ButtonState.PRESS : ButtonState.RELEASE;
+                this.handleButton(client, btn, btnState ? 0 : 1, btnState);
+                if (btnState)
+                    BUTTON_COOLDOWNS.put(btn, 5);
+            } else if (btnState) {
+                state = ButtonState.REPEAT;
+                if (BUTTON_COOLDOWNS.getOrDefault(btn, 0) == 0) {
+                    BUTTON_COOLDOWNS.put(btn, 5);
+                    this.handleButton(client, btn, 2, true);
+                }
+            }
+
+            InputManager.STATES.put(btn, state);
+        }
+    }
+    MathUtil.PolarUtil polarLeft = new MathUtil.PolarUtil();
+    MathUtil.PolarUtil polarRight = new MathUtil.PolarUtil();
+
+    private void fetchAxeInput(@NotNull MinecraftClient client, @NotNull GLFWGamepadState gamepadState, boolean leftJoycon) {
+        var buffer = gamepadState.axes();
+
+        polarLeft.calculate(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X), buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y), 1, MidnightControlsConfig.leftDeadZone);
+        float leftX = polarLeft.polarX;
+        float leftY = polarLeft.polarY;
+        polarRight.calculate(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X), buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y), 1, MidnightControlsConfig.rightDeadZone);
+        float rightX = polarRight.polarX;
+        float rightY = polarRight.polarY;
+
+        for (int i = 0; i < buffer.limit(); i++) {
+            int axis = leftJoycon ? ButtonBinding.controller2Button(i) : i;
+            float value = buffer.get();
+
+            if (MidnightControlsConfig.analogMovement) {
+                switch (i) {
+                    case GLFW_GAMEPAD_AXIS_LEFT_X -> value = leftX;
+                    case GLFW_GAMEPAD_AXIS_LEFT_Y -> value = leftY;
+                }
+            }
+            switch (i) {
+                case GLFW_GAMEPAD_AXIS_RIGHT_X -> value = rightX;
+                case GLFW_GAMEPAD_AXIS_RIGHT_Y -> value = rightY;
+            }
+            float absValue = Math.abs(value);
+
+            if (i == GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y)
+                value *= -1.0F;
+
+            int state = value > MidnightControlsConfig.rightDeadZone ? 1 : (value < -MidnightControlsConfig.rightDeadZone ? 2 : 0);
+            if (!(client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)))) this.handleAxe(client, axis, value, absValue, state);
+        }
+        if (client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen))) {
+            float x = leftX;
+            float y = leftY;
+
+            if (x == 0 && y == 0) {
+                x = rightX;
+                y = rightY;
+            }
+            int index = -1;
+            float border = 0.3f;
+            if (x < -border) {
+                index = 3;
+                if (y < -border) index = 0;
+                else if (y > border) index = 5;
+            } else if (x > border) {
+                index = 4;
+                if (y < -border) index = 2;
+                else if (y > border) index = 7;
+            } else {
+                if (y < -border) index = 1;
+                else if (y > border) index = 6;
+            }
+            if (client.currentScreen instanceof RingScreen && index > -1) RingPage.selected = index;
+            if (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)) EmotecraftCompat.handleEmoteSelector(index);
+        }
+    }
+
+    public void handleButton(@NotNull MinecraftClient client, int button, int action, boolean state) {
+        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
+            if (action == 0 && !this.controlsInput.currentButtons.contains(button)) {
+                this.controlsInput.currentButtons.add(button);
+
+                var buttons = new int[this.controlsInput.currentButtons.size()];
+                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
+                    buttons[i] = this.controlsInput.currentButtons.get(i);
+                this.controlsInput.focusedBinding.setButton(buttons);
+
+                this.controlsInput.waiting = false;
+            }
+            return;
+        }
+
+        if (client.currentScreen != null && (action == 0 || action == 2) && button == GLFW_GAMEPAD_BUTTON_Y &&
+                MidnightControlsConfig.arrowScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
+            pressKeyboardKey(client, GLFW.GLFW_KEY_ENTER);
+            this.screenCloseCooldown = 5;
+        }
+        else if (action == 0 || action == 2) {
+            if (client.currentScreen != null
+                    && (button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN
+                    || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_LEFT || button == GLFW.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT)) {
+                if (this.actionGuiCooldown == 0) {
+                    switch (button) {
+                        case GLFW_GAMEPAD_BUTTON_DPAD_UP -> this.changeFocus(client.currentScreen, NavigationDirection.UP);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> this.handleLeftRight(client.currentScreen, false);
+                        case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> this.handleLeftRight(client.currentScreen, true);
+                    }
+                    if (MidnightControlsConfig.wasdScreens.contains(client.currentScreen.getClass().getCanonicalName())) {
+                        switch (button) {
+                            case GLFW_GAMEPAD_BUTTON_DPAD_UP -> pressKeyboardKey(client, GLFW.GLFW_KEY_W);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_DOWN -> pressKeyboardKey(client, GLFW.GLFW_KEY_S);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_LEFT -> pressKeyboardKey(client, GLFW.GLFW_KEY_A);
+                            case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT -> pressKeyboardKey(client, GLFW.GLFW_KEY_D);
+                        }
+                    }
+                }
+                return;
+            }
+        }
+
+        if (action == 1) {
+            if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null) {
+                if (this.actionGuiCooldown == 0) {
+                    var focused = client.currentScreen.getFocused();
+                    if (focused != null && isScreenInteractive(client.currentScreen)) {
+                        if (this.handleAButton(client.currentScreen, focused)) {
+                            this.actionGuiCooldown = 5; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
+                            return;
+                        }
+                    }
+                    else if (FabricLoader.getInstance().isModLoaded("libgui")) LibGuiCompat.handlePress(client.currentScreen);
+                }
+            }
+        }
+
+        if (button == GLFW.GLFW_GAMEPAD_BUTTON_A && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
+                && this.actionGuiCooldown == 0) {
+            if (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
+                    client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth(),
+                    client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()) != null) return;
+            if (!this.ignoreNextARelease) {
+                double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
+                double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
+                if (action == 0) {
+                    Screen.wrapScreenError(() -> {
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(false);
+                        client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                            },
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
+                } else if (action == 1) {
+                    Screen.wrapScreenError(() -> {
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(false);
+                        client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_1);
+                            },
+                            "mouseReleased event handler", client.currentScreen.getClass().getCanonicalName());
+                } else if (action == 2) {
+                    Screen.wrapScreenError(() -> {
+                        client.currentScreen.setDragging(true);
+                        ((MouseAccessor) client.mouse).setLeftButtonClicked(true);
+                        ((MouseAccessor) client.mouse).midnightcontrols$onCursorPos(client.getWindow().getHandle(), client.mouse.getX(), client.mouse.getY());
+                        client.currentScreen.setDragging(false);
+                            },
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
+                }
+                this.screenCloseCooldown = 5;
+            } else {
+                this.ignoreNextARelease = false;
+            }
+        }
+        else if (button == GLFW.GLFW_GAMEPAD_BUTTON_X && client.currentScreen != null && !isScreenInteractive(client.currentScreen)
+                && this.actionGuiCooldown == 0) {
+            if (client.currentScreen instanceof HandledScreen<?> handledScreen && ((HandledScreenAccessor) handledScreen).midnightcontrols$getSlotAt(
+                    client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth(),
+                    client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight()) != null) return;
+            if (!this.ignoreNextXRelease) {
+                double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
+                double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
+                if (action == 0) {
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseClicked(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2),
+                            "mouseClicked event handler", client.currentScreen.getClass().getCanonicalName());
+                } else if (action == 1) {
+                    Screen.wrapScreenError(() -> client.currentScreen.mouseReleased(mouseX, mouseY, GLFW.GLFW_MOUSE_BUTTON_2),
+                            "mouseReleased event handler", client.currentScreen.getClass().getCanonicalName());
+                }
+                this.screenCloseCooldown = 5;
+            } else {
+                this.ignoreNextXRelease = false;
+            }
+        }
+    }
+    public void pressKeyboardKey(MinecraftClient client, int key) {
+        client.keyboard.onKey(client.getWindow().getHandle(), key, 0, 1, 0);
+    }
+    public void pressKeyboardKey(Screen screen, int key) {
+        screen.keyPressed(key, 0, 1);
+    }
+    /**
+
+    /**
+     * Tries to go back.
+     *
+     * @param screen the current screen
+     * @return true if successful, else false
+     */
+    public boolean tryGoBack(@NotNull Screen screen) {
+        var set = ImmutableSet.of("gui.back", "gui.done", "gui.cancel", "gui.toTitle", "gui.toMenu");
+
+        return screen.children().stream().filter(element -> element instanceof PressableWidget)
+                .map(element -> (PressableWidget) element)
+                .filter(element -> element.getMessage() != null && element.getMessage().getContent() != null)
+                .anyMatch(element -> {
+                    if (element.getMessage().getContent() instanceof TranslatableTextContent translatableText) {
+                        if (set.stream().anyMatch(key -> translatableText.getKey().equals(key))) {
+                            element.onPress();
+                            return true;
+                        }
+                    }
+                    return false;
+                });
+    }
+
+    private double getDeadZoneValue(int axis) {
+        return (axis == GLFW_GAMEPAD_AXIS_LEFT_X || axis == GLFW_GAMEPAD_AXIS_LEFT_Y) ? MidnightControlsConfig.leftDeadZone
+                : MidnightControlsConfig.rightDeadZone;
+    }
+
+    private void handleAxe(@NotNull MinecraftClient client, int axis, float value, float absValue, int state) {
+        int asButtonState = value > .5f ? 1 : (value < -.5f ? 2 : 0);
+
+        if (axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER || axis == GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
+                || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER)
+                || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER)) {
+            if (asButtonState == 2) {
+                asButtonState = 0;
+            }
+            else {
+                // Fixes Triggers not working correctly on some controllers
+                if (MidnightControlsConfig.triggerFix) {
+                    value = 1.0f;
+                    absValue = 1.0f;
+                    state = 1;
+                    asButtonState = 1;
+                }
+                if (MidnightControlsConfig.debug) System.out.println(axis + " "+ value + " " + absValue + " " + state);
+            }
+        }
+
+        {
+            boolean currentPlusState = value > getDeadZoneValue(axis);
+            boolean currentMinusState = value < -getDeadZoneValue(axis);
+            if (axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER || axis == GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER) currentMinusState = false;
+            if (!MidnightControlsConfig.analogMovement && (axis == GLFW_GAMEPAD_AXIS_LEFT_X || axis == GLFW_GAMEPAD_AXIS_LEFT_Y)) {
+                currentPlusState = asButtonState == 1;
+                currentMinusState = asButtonState == 2;
+            }
+            var previousPlusState = InputManager.STATES.getOrDefault(ButtonBinding.axisAsButton(axis, true), ButtonState.NONE);
+            var previousMinusState = InputManager.STATES.getOrDefault(ButtonBinding.axisAsButton(axis, false), ButtonState.NONE);
+
+            if (currentPlusState != previousPlusState.isPressed()) {
+                InputManager.STATES.put(ButtonBinding.axisAsButton(axis, true), currentPlusState ? ButtonState.PRESS : ButtonState.RELEASE);
+                if (currentPlusState)
+                    BUTTON_COOLDOWNS.put(ButtonBinding.axisAsButton(axis, true), 5);
+            } else if (currentPlusState) {
+                InputManager.STATES.put(ButtonBinding.axisAsButton(axis, true), ButtonState.REPEAT);
+                if (BUTTON_COOLDOWNS.getOrDefault(ButtonBinding.axisAsButton(axis, true), 0) == 0) {
+                    BUTTON_COOLDOWNS.put(ButtonBinding.axisAsButton(axis, true), 5);
+                }
+            }
+
+            if (currentMinusState != previousMinusState.isPressed()) {
+                InputManager.STATES.put(ButtonBinding.axisAsButton(axis, false), currentMinusState ? ButtonState.PRESS : ButtonState.RELEASE);
+                if (currentMinusState)
+                    BUTTON_COOLDOWNS.put(ButtonBinding.axisAsButton(axis, false), 5);
+            } else if (currentMinusState) {
+                InputManager.STATES.put(ButtonBinding.axisAsButton(axis, false), ButtonState.REPEAT);
+                if (BUTTON_COOLDOWNS.getOrDefault(ButtonBinding.axisAsButton(axis, false), 0) == 0) {
+                    BUTTON_COOLDOWNS.put(ButtonBinding.axisAsButton(axis, false), 5);
+                }
+            }
+
+            float axisValue = absValue;
+            if (!MidnightControlsConfig.analogMovement) {
+                double deadZone = this.getDeadZoneValue(axis);
+                axisValue = (float) (absValue - deadZone);
+                axisValue /= (1.0 - deadZone);
+                axisValue *= deadZone;
+            }
+
+            axisValue = (float) Math.min(axisValue / MidnightControlsConfig.getAxisMaxValue(axis), 1);
+            if (currentPlusState)
+                InputManager.BUTTON_VALUES.put(ButtonBinding.axisAsButton(axis, true), axisValue);
+            else
+                InputManager.BUTTON_VALUES.put(ButtonBinding.axisAsButton(axis, true), 0.f);
+            if (currentMinusState)
+                InputManager.BUTTON_VALUES.put(ButtonBinding.axisAsButton(axis, false), axisValue);
+            else
+                InputManager.BUTTON_VALUES.put(ButtonBinding.axisAsButton(axis, false), 0.f);
+        }
+
+        double deadZone = this.getDeadZoneValue(axis);
+
+        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
+            if (asButtonState != 0 && !this.controlsInput.currentButtons.contains(ButtonBinding.axisAsButton(axis, asButtonState == 1))) {
+
+                this.controlsInput.currentButtons.add(ButtonBinding.axisAsButton(axis, asButtonState == 1));
+
+                int[] buttons = new int[this.controlsInput.currentButtons.size()];
+                for (int i = 0; i < this.controlsInput.currentButtons.size(); i++)
+                    buttons[i] = this.controlsInput.currentButtons.get(i);
+                this.controlsInput.focusedBinding.setButton(buttons);
+
+                this.controlsInput.waiting = false;
+            }
+            return;
+        } else if (client.currentScreen instanceof CreativeInventoryScreen creativeInventoryScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen;
+                // @TODO allow rebinding to left stick
+                if (accessor.midnightcontrols$hasScrollbar() && absValue >= deadZone) {
+                    creativeInventoryScreen.mouseScrolled(0.0, 0.0, -value);
+                }
+                return;
+            }
+        } else if (client.currentScreen instanceof MerchantScreen merchantScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                // @TODO allow rebinding to left stick
+                if (absValue >= deadZone) {
+                    merchantScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+                return;
+            }
+        } else if (client.currentScreen instanceof StonecutterScreen stonecutterScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                // @TODO allow rebinding to left stick
+                if (absValue >= deadZone) {
+                    stonecutterScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+                return;
+            }
+        } else if (client.currentScreen instanceof AdvancementsScreen advancementsScreen) {
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X || axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                var accessor = (AdvancementsScreenAccessor) advancementsScreen;
+                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;
+            }
+        } else if (client.currentScreen != null) {
+            float finalValue = value;
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && absValue >= deadZone && client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget)
+                        .map(element -> (SpruceEntryListWidget<?>) element)
+                        .filter(AbstractSpruceWidget::isFocusedOrHovered)
+                        .noneMatch(element -> {
+                            element.mouseScrolled(0.0, 0.0, -finalValue);
+                            return true;
+                        })
+                        &&
+                        client.currentScreen.children().stream().filter(element -> element instanceof EntryListWidget)
+                        .map(element -> (EntryListWidget<?>) element)
+                        .filter(element -> element.getType().isFocused())
+                        .noneMatch(element -> {
+                            element.mouseScrolled(0.0, 0.0, -finalValue);
+                            return true;
+                        }))
+                {
+                    client.currentScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                }
+            else if (isScreenInteractive(client.currentScreen) && absValue >= deadZone) {
+                if (value > 0 && joystickCooldown == 0) {
+                    switch (axis) {
+                        case GLFW_GAMEPAD_AXIS_LEFT_Y -> this.changeFocus(client.currentScreen, NavigationDirection.UP);
+                        case GLFW_GAMEPAD_AXIS_LEFT_X -> this.handleLeftRight(client.currentScreen, true);
+                    }
+                    if (axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X) joystickCooldown = 4;
+                } else if (value < 0 && joystickCooldown == 0) {
+                    switch (axis) {
+                        case GLFW_GAMEPAD_AXIS_LEFT_Y -> this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
+                        case GLFW_GAMEPAD_AXIS_LEFT_X -> this.handleLeftRight(client.currentScreen, false);
+                    }
+                    if (axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X) joystickCooldown = 4;
+                }
+                return;
+            }
+        }
+
+        absValue = (float) MathHelper.clamp(absValue / MidnightControlsConfig.getAxisMaxValue(axis), 0.f, 1.f);
+        if (client.currentScreen == null) {
+            // Handles the look direction.
+            this.handleLook(client, axis, absValue, state);
+        } else {
+            boolean allowMouseControl = true;
+
+            if (this.actionGuiCooldown == 0 && MidnightControlsConfig.isMovementAxis(axis) && isScreenInteractive(client.currentScreen)) {
+                if (MidnightControlsConfig.isForwardButton(axis, false, asButtonState)) {
+                    allowMouseControl = this.changeFocus(client.currentScreen, NavigationDirection.UP);
+                } else if (MidnightControlsConfig.isBackButton(axis, false, asButtonState)) {
+                    allowMouseControl = this.changeFocus(client.currentScreen, NavigationDirection.DOWN);
+                } else if (MidnightControlsConfig.isLeftButton(axis, false, asButtonState)) {
+                    allowMouseControl = this.handleLeftRight(client.currentScreen, false);
+                } else if (MidnightControlsConfig.isRightButton(axis, false, asButtonState)) {
+                    allowMouseControl = this.handleLeftRight(client.currentScreen, true);
+                }
+            }
+
+            float movementX = 0.f;
+            float movementY = 0.f;
+
+            if (MidnightControlsConfig.isBackButton(axis, false, (value > 0 ? 1 : 2))) {
+                movementY = absValue;
+            } else if (MidnightControlsConfig.isForwardButton(axis, false, (value > 0 ? 1 : 2))) {
+                movementY = -absValue;
+            } else if (MidnightControlsConfig.isLeftButton(axis, false, (value > 0 ? 1 : 2))) {
+                movementX = -absValue;
+            } else if (MidnightControlsConfig.isRightButton(axis, false, (value > 0 ? 1 : 2))) {
+                movementX = absValue;
+            }
+
+            if (client.currentScreen != null && allowMouseControl) {
+                boolean moving = movementY != 0 || movementX != 0;
+                if (moving) {
+                /*
+                    Updates the target mouse position when the initial movement stick movement is detected.
+                    It prevents the cursor to jump to the old target mouse position if the user moves the cursor with the mouse.
+                 */
+                    if (Math.abs(prevXAxis) < deadZone && Math.abs(prevYAxis) < deadZone) {
+                        InputManager.INPUT_MANAGER.resetMouseTarget(client);
+                    }
+
+                    this.mouseSpeedX = movementX;
+                    this.mouseSpeedY = movementY;
+                } else {
+                    this.mouseSpeedX = 0.f;
+                    this.mouseSpeedY = 0.f;
+                }
+
+                if (Math.abs(this.mouseSpeedX) >= .05f || Math.abs(this.mouseSpeedY) >= .05f) {
+                    InputManager.queueMoveMousePosition(
+                            this.mouseSpeedX * MidnightControlsConfig.mouseSpeed,
+                            this.mouseSpeedY * MidnightControlsConfig.mouseSpeed
+                    );
+                }
+
+                this.moveMouseToClosestSlot(client, client.currentScreen);
+            }
+
+            this.prevXAxis = movementX;
+            this.prevYAxis = movementY;
+        }
+    }
+
+    public boolean handleAButton(@NotNull Screen screen, @NotNull Element focused) {
+        if (focused instanceof PressableWidget widget) {
+            widget.playDownSound(MinecraftClient.getInstance().getSoundManager());
+            widget.onPress();
+            return true;
+        } else if (focused instanceof AbstractSprucePressableButtonWidget widget) {
+            widget.playDownSound();
+            widget.onPress();
+            return true;
+        } else if (focused instanceof SpruceLabelWidget labelWidget) {
+            labelWidget.onPress();
+            return true;
+        } else if (focused instanceof WorldListWidget list) {
+            list.getSelectedAsOptional().ifPresent(WorldListWidget.WorldEntry::play);
+            return true;
+        } else if (focused instanceof MultiplayerServerListWidget list) {
+            var entry = list.getSelectedOrNull();
+            if (entry instanceof MultiplayerServerListWidget.LanServerEntry || entry instanceof MultiplayerServerListWidget.ServerEntry) {
+                ((MultiplayerScreen) screen).select(entry);
+                ((MultiplayerScreen) screen).connect();
+            }
+        } else if (focused instanceof SpruceParentWidget) {
+            var childFocused = ((SpruceParentWidget<?>) focused).getFocused();
+            if (childFocused != null)
+                return this.handleAButton(screen, childFocused);
+        } else if (focused instanceof ParentElement widget) {
+            var childFocused = widget.getFocused();
+            if (childFocused != null)
+                return this.handleAButton(screen, childFocused);
+        } else if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleAButton(screen, focused)) {
+            return true;
+        }
+        else pressKeyboardKey(screen, GLFW_KEY_ENTER);
+        return false;
+    }
+
+    /**
+     * Handles the left and right buttons.
+     *
+     * @param screen the current screen
+     * @param right true if the right button is pressed, else false
+     */
+    private boolean handleLeftRight(@NotNull Screen screen, boolean right) {
+        if (screen instanceof SpruceScreen spruceScreen) {
+            spruceScreen.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
+            this.actionGuiCooldown = 5;
+            return false;
+        }
+        if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleLeftRight(screen, right)) {
+            this.actionGuiCooldown = 5;
+            return false;
+        }
+        var focused = screen.getFocused();
+        if (focused != null)
+            if (this.handleRightLeftElement(focused, right))
+                return this.changeFocus(screen, right ? NavigationDirection.RIGHT : NavigationDirection.LEFT);
+        return true;
+    }
+
+    private boolean handleRightLeftElement(@NotNull Element element, boolean right) {
+        if (element instanceof SpruceElement spruceElement) {
+            if (spruceElement.requiresCursor())
+                return true;
+            return !spruceElement.onNavigation(right ? NavigationDirection.RIGHT : NavigationDirection.LEFT, false);
+        }
+        if (element instanceof SliderWidget slider) {
+            if (slider.active) {
+                slider.keyPressed(right ? 262 : 263, 0, 0);
+                this.actionGuiCooldown = 2; // Prevent to press too quickly the focused element, so we have to skip 5 ticks.
+                return true;
+            }
+        } else if (element instanceof AlwaysSelectedEntryListWidget) {
+            //TODO((EntryListWidgetAccessor) element).midnightcontrols$moveSelection(right ? EntryListWidget.MoveDirection.DOWN : EntryListWidget.MoveDirection.UP);
+            return false;
+        } else if (element instanceof ParentElement entryList) {
+            var focused = entryList.getFocused();
+            if (focused == null)
+                return true;
+            return this.handleRightLeftElement(focused, right);
+        }
+        return true;
+    }
+    private double prevX = 0;
+    private double prevY = 0;
+    private double xValue;
+    private int xState;
+
+    /**
+     * Handles the look direction input.
+     *
+     * @param client the client instance
+     * @param axis the axis to change
+     * @param value the value of the look
+     * @param state the state
+     */
+    public void handleLook(@NotNull MinecraftClient client, int axis, float value, int state) {
+        if (client.player == null) return;
+        // Handles the look direction.
+        if (MidnightControlsConfig.cameraMode == CameraMode.FLAT) {
+            double powValue = Math.pow(value, 2.0);
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
+                if (state == 2) {
+                    this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
+                } else if (state == 1) {
+                    this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
+                }
+            }
+            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
+                if (state == 2) {
+                    this.targetYaw = -MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
+                } else if (state == 1) {
+                    this.targetYaw = MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
+                }
+            }
+            return;
+        }
+        // Code below runs for adaptive camera mode
+
+        // Handles the look direction.
+        if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
+            xValue = value;
+            xState = state;
+            return;
+        }
+        if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && client.player != null) {
+            double yStep = (MidnightControlsConfig.yAxisRotationSpeed / 100) * 0.6000000238418579 + 0.20000000298023224;
+            double xStep = (MidnightControlsConfig.rotationSpeed / 100) * 0.6000000238418579 + 0.20000000298023224;
+
+            double cursorDeltaX = 2 * xValue - this.prevX;
+            double cursorDeltaY = 2 * value - this.prevY;
+            boolean slowdown = client.options.getPerspective().isFirstPerson() && client.player.isUsingSpyglass();
+            double x = cursorDeltaX * xStep * (slowdown ? xStep : 1);
+            double y = cursorDeltaY * yStep * (slowdown ? yStep : 1);
+
+            double powXValue = Math.pow(x, 2.0);
+            double powYValue = Math.pow(y, 2.0);
+
+            if (state == 2) {
+                this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powYValue) * 0.11D;
+            } else if (state == 1) {
+                this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powYValue) * 0.11D;
+            }
+
+            if (xState == 2) {
+                this.targetYaw = -MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powXValue) * 0.11D;
+            } else if (xState == 1) {
+                this.targetYaw = MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powXValue) * 0.11D;
+            }
+
+            this.prevY = value;
+            this.prevX = xValue;
+        }
+    }
+
+    private boolean changeFocus(@NotNull Screen screen, NavigationDirection direction) {
+        if (!isScreenInteractive(screen) && !screen.getClass().getCanonicalName().contains("me.jellysquid.mods.sodium.client.gui")) return false;
+        try {
+            if (screen instanceof SpruceScreen spruceScreen) {
+                if (spruceScreen.onNavigation(direction, false)) {
+                    this.actionGuiCooldown = 5;
+                }
+                return false;
+            }
+            switch (direction) {
+                case UP -> pressKeyboardKey(screen, GLFW.GLFW_KEY_UP);
+                case DOWN -> pressKeyboardKey(screen, GLFW.GLFW_KEY_DOWN);
+                case LEFT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_LEFT);
+                case RIGHT -> pressKeyboardKey(screen, GLFW.GLFW_KEY_RIGHT);
+            }
+            this.actionGuiCooldown = 5;
+            return false;
+        } catch (Exception exception) {MidnightControls.get().warn("Unknown exception encountered while trying to change focus: "+exception);}
+        return false;
+    }
+
+    public static boolean isScreenInteractive(@NotNull Screen screen) {
+        return !(screen instanceof HandledScreen || MidnightControlsConfig.joystickAsMouse || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
+                || (screen instanceof SpruceScreen && ((SpruceScreen) screen).requiresCursor())
+                || MidnightControlsCompat.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 HandledScreen inventoryScreen) {
+            var 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.getScreenHandler().slots.parallelStream()
+                    .map(slot -> {
+                        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));
+                        return Pair.of(slot, distance);
+                    }).filter(entry -> entry.value <= 14.0)
+                    .min(Comparator.comparingDouble(p -> p.value));
+
+            if (closestSlot.isPresent()) {
+                var slot = closestSlot.get().key;
+                if (slot.hasStack() || !client.player.getInventory().getMainHandStack().isEmpty()) {
+                    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;
+                    double deltaY = slotCenterY - targetMouseY;
+
+                    if (mouseX != slotCenterXScaled || mouseY != slotCenterYScaled) {
+                        this.targetMouseX += deltaX * 0.75;
+                        this.targetMouseY += deltaY * 0.75;
+                    } else {
+                        this.mouseSpeedX *= 0.3F;
+                        this.mouseSpeedY *= 0.3F;
+                    }
+                    this.mouseSpeedX *= .75F;
+                    this.mouseSpeedY *= .75F;
+                } else {
+                    this.mouseSpeedX *= .1F;
+                    this.mouseSpeedY *= .1F;
+                }
+            } else {
+                this.mouseSpeedX *= .3F;
+                this.mouseSpeedY *= .3F;
+            }
+        } else {
+            this.mouseSpeedX = 0.F;
+            this.mouseSpeedY = 0.F;
+        }
+    }
+}

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

@@ -15,7 +15,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.hit.BlockHitResult;
@@ -28,8 +27,6 @@ import net.minecraft.world.RaycastContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
 /**
  * Represents the reach-around API of midnightcontrols.
  *
@@ -41,10 +38,10 @@ public class MidnightReacharound {
     private boolean lastReacharoundVertical = false;
     private boolean onSlab = false;
 
-    public void tick() {
+    public void tick(@NotNull MinecraftClient client) {
-        this.lastReacharoundResult = this.tryVerticalReachAround();
+        this.lastReacharoundResult = this.tryVerticalReachAround(client);
         if (this.lastReacharoundResult == null) {
-            this.lastReacharoundResult = this.tryHorizontalReachAround();
+            this.lastReacharoundResult = this.tryHorizontalReachAround(client);
             this.lastReacharoundVertical = false;
         } else this.lastReacharoundVertical = true;
     }
@@ -77,15 +74,16 @@ public class MidnightReacharound {
     }
 
     public static float getPlayerRange(@NotNull MinecraftClient client) {
-        return client.player != null ? Double.valueOf(client.player.getAttributeValue(EntityAttributes.BLOCK_INTERACTION_RANGE)).floatValue() : 0.f;
+        return client.interactionManager != null ? client.interactionManager.getReachDistance() : 0.f;
     }
 
     /**
      * Returns a nullable block hit result if vertical reach-around is possible.
      *
+     * @param client the client instance
      * @return a block hit result if vertical reach-around is possible, else {@code null}
      */
-    public @Nullable BlockHitResult tryVerticalReachAround() {
+    public @Nullable BlockHitResult tryVerticalReachAround(@NotNull MinecraftClient client) {
         if (!MidnightControlsFeature.VERTICAL_REACHAROUND.isAvailable())
             return null;
         if (client.player == null || client.world == null || client.crosshairTarget == null || client.crosshairTarget.getType() != HitResult.Type.MISS
@@ -114,13 +112,14 @@ public class MidnightReacharound {
     /**
      * Returns a nullable block hit result if horizontal reach-around is possible.
      *
+     * @param client the client instance
      * @return a block hit result if horizontal reach-around is possible
      */
-    public @Nullable BlockHitResult tryHorizontalReachAround() {
+    public @Nullable BlockHitResult tryHorizontalReachAround(@NotNull MinecraftClient client) {
         if (!MidnightControlsFeature.HORIZONTAL_REACHAROUND.isAvailable())
             return null;
 
-        if (client.world != null && client.player != null && client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.MISS
+        if (client.player != null && client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.MISS
                 && client.player.isOnGround() && client.player.getPitch(0.f) >= 35.f) {
             if (client.player.isRiding())
                 return null;

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

@@ -9,7 +9,14 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import me.juancarloscp52.bedrockify.client.BedrockifyClient;
+import me.juancarloscp52.bedrockify.client.BedrockifyClientSettings;
+import net.minecraft.client.gui.screen.Screen;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
 
 /**
  * Represents HQM compatibility handler.
@@ -21,7 +28,7 @@ import me.juancarloscp52.bedrockify.client.BedrockifyClient;
 public class BedrockifyCompat implements CompatHandler {
 
     @Override
-    public void handle() {
+    public void handle(@NotNull MidnightControlsClient mod) {
         BedrockifyClient.getInstance().settings.disableFlyingMomentum = false;
     }
 }

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

@@ -10,7 +10,6 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.util.storage.AxisStorage;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
@@ -27,20 +26,12 @@ import org.jetbrains.annotations.Nullable;
  * @since 1.1.0
  */
 public interface CompatHandler {
-    /**
-     * Handles compatibility of a mod.
-     */
-    default void handle() {
-        handle(MidnightControlsClient.get());
-    }
-
     /**
      * Handles compatibility of a mod.
      *
      * @param mod this mod instance
      */
-    @Deprecated
+    void handle(@NotNull MidnightControlsClient mod);
-    default void handle(@NotNull MidnightControlsClient mod) {}
 
     /**
      * Handles custom camera updates
@@ -49,32 +40,6 @@ public interface CompatHandler {
      */
     default void handleCamera(@NotNull MinecraftClient client, double targetYaw, double targetPitch) {};
 
-    /**
-     * Handles movement for players as well as vehicles
-     *
-     * @param storage the storage containing info about the current axis
-     * @param adjustedValue the value of the axis, adjusted for max values and non-analogue movement, recommended for player movement
-     */
-    default void handleMovement(@NotNull MinecraftClient client, AxisStorage storage, float adjustedValue) {}
-
-    /**
-     * Handles custom tab behavior
-     *
-     * @param forward whether the direction is forward or backward
-     */
-    default boolean handleTabs(Screen screen, boolean forward) {
-        return false;
-    };
-
-    /**
-     * Handles custom page behavior
-     *
-     * @param forward whether the direction is forward or backward
-     */
-    default boolean handlePages(Screen screen, boolean forward) {
-        return false;
-    };
-
     /**
      * Returns whether the mouse is required on the specified screen.
      *

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

@@ -7,35 +7,35 @@ import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import org.aperlambda.lambdacommon.Identifier;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
-import static eu.midnightdust.midnightcontrols.MidnightControls.id;
-
 public class EMICompat implements CompatHandler {
-    public static boolean handleEmiPages(boolean direction) {
+    public static boolean handleTabs(boolean direction) {
-        if (isEMIEnabled() && MidnightControlsClient.input.actionGuiCooldown == 0 && EmiScreenManager.getSearchPanel() != null && EmiScreenManager.getSearchPanel().pageLeft != null && EmiScreenManager.getSearchPanel().pageRight != null) {
+        if (isEMIEnabled() && MidnightControlsClient.get().input.actionGuiCooldown == 0 && EmiScreenManager.getSearchPanel() != null && EmiScreenManager.getSearchPanel().pageLeft != null && EmiScreenManager.getSearchPanel().pageRight != null) {
             if (direction) EmiScreenManager.getSearchPanel().pageRight.onPress();
             else EmiScreenManager.getSearchPanel().pageLeft.onPress();
-            MidnightControlsClient.input.actionGuiCooldown = 5;
+            MidnightControlsClient.get().input.actionGuiCooldown = 5;
             return true;
         }
         return false;
     }
     @Override
-    public void handle() {
+    public void handle(@NotNull MidnightControlsClient mod) {
-        ButtonCategory category = new ButtonCategory(id("category.emi"));
+        ButtonCategory category = new ButtonCategory(new Identifier("midnightcontrols","category.emi"));
         InputManager.registerCategory(category);
         new ButtonBinding.Builder("emi_page_left")
                 .buttons(GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
                 .category(category)
-                .action((client,action,value,buttonState)->handleEmiPages(false)).cooldown()
+                .action((client,action,value,buttonState)->handleTabs(false)).cooldown()
-                .filter(((buttonBinding) -> EmiApi.getHandledScreen() != null))
+                .filter(((client, buttonBinding) -> EmiApi.getHandledScreen() != null))
                 .register();
         new ButtonBinding.Builder("emi_page_right")
                 .buttons(GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))
                 .category(category)
-                .action((client,action,value,buttonState)->handleEmiPages(true)).cooldown()
+                .action((client,action,value,buttonState)->handleTabs(true)).cooldown()
-                .filter(((buttonBinding) -> EmiApi.getHandledScreen() != null))
+                .filter(((client, buttonBinding) -> EmiApi.getHandledScreen() != null))
                 .register();
     }
     public static boolean isEMIEnabled() {

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

@@ -0,0 +1,34 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import io.github.kosmx.emotes.arch.gui.EmoteMenuImpl;
+import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+
+public class EmotecraftCompat {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static void openEmotecraftScreen(Screen parent) {
+        client.setScreen(new EmoteMenuImpl(parent));
+    }
+    public static boolean isEmotecraftScreen(Screen screen) {
+        return screen instanceof FastChosseScreen;
+    }
+    public static void handleEmoteSelector(int index) {
+
+        if (client.currentScreen instanceof FastChosseScreen) {
+            int x = client.getWindow().getWidth() / 2;
+            int y = client.getWindow().getHeight() / 2;
+            if (index == 0) InputManager.queueMousePosition(x-200, y-200);
+            if (index == 1) InputManager.queueMousePosition(x, y-200);
+            if (index == 2) InputManager.queueMousePosition(x+200, y-200);
+            if (index == 3) InputManager.queueMousePosition(x-200, y);
+            if (index == 4) InputManager.queueMousePosition(x+200, y);
+            if (index == 5) InputManager.queueMousePosition(x-200, y+200);
+            if (index == 6) InputManager.queueMousePosition(x, y+200);
+            if (index == 7) InputManager.queueMousePosition(x+200, y+200);
+
+            InputManager.INPUT_MANAGER.updateMousePosition(client);
+        }
+    }
+}

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

@@ -9,8 +9,10 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import net.minecraft.client.gui.screen.Screen;
 import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
 
@@ -28,7 +30,7 @@ public class HQMCompat implements CompatHandler {
     private Optional<Class<?>> guiBaseClass;
 
     @Override
-    public void handle() {
+    public void handle(@NotNull MidnightControlsClient mod) {
         this.guiBaseClass = LambdaReflection.getClass(GUI_BASE_CLASS_PATH);
     }
 

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

@@ -5,39 +5,29 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 
-public class InventoryTabsCompat implements CompatHandler {
+public class InventoryTabsCompat {
-    @Override
+
-    public boolean handleTabs(Screen screen, boolean next) {
+    public static void handleInventoryTabs(Screen screen, boolean next) {
         if (screen instanceof HandledScreen<?> && !(screen instanceof CreativeInventoryScreen)) {
             TabManager tabManager = TabManager.getInstance();
             int tabIndex = tabManager.tabs.indexOf(tabManager.currentTab);
             if (next) {
                 if (tabIndex < tabManager.tabs.size() - 1) tabManager.onTabClick(tabManager.tabs.get(tabIndex + 1));
-                else tabManager.onTabClick(tabManager.tabs.getFirst());
+                else tabManager.onTabClick(tabManager.tabs.get(0));
             } else {
                 if (tabIndex > 0) tabManager.onTabClick(tabManager.tabs.get(tabIndex - 1));
-                else tabManager.onTabClick(tabManager.tabs.getLast());
+                else tabManager.onTabClick(tabManager.tabs.get(tabManager.tabs.size() - 1));
             }
-            return true;
         }
-        return false;
     }
-    @Override
+    public static void handleInventoryPage(Screen screen, boolean next) {
-    public boolean handlePages(Screen screen, boolean next) {
         if (screen instanceof HandledScreen<?> && !(screen instanceof CreativeInventoryScreen)) {
             TabManager tabManager = TabManager.getInstance();
             if (next) {
-                if (tabManager.canGoForwardAPage()) {
+                if (tabManager.canGoForwardAPage()) tabManager.setCurrentPage(tabManager.currentPage + 1);
-                    tabManager.setCurrentPage(tabManager.currentPage + 1);
-                    return true;
-                }
             } else {
-                if (tabManager.canGoBackAPage()) {
+                if (tabManager.canGoBackAPage()) tabManager.setCurrentPage(tabManager.currentPage - 1);
-                    tabManager.setCurrentPage(tabManager.currentPage - 1);
-                    return true;
-                }
             }
         }
-        return false;
     }
 }

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

@@ -9,9 +9,9 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
-import eu.midnightdust.lib.util.PlatformFunctions;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.util.storage.AxisStorage;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.hit.BlockHitResult;
@@ -23,49 +23,41 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
-import static eu.midnightdust.midnightcontrols.MidnightControls.log;
-import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
-
 /**
  * Represents a compatibility handler.
  *
- * @author LambdAurora, Motschen
+ * @author LambdAurora
- * @version 1.10.0
+ * @version 1.5.0
  * @since 1.1.0
  */
 public class MidnightControlsCompat {
-    @Deprecated // INTERNAL -> PLEASE USE streamCompatHandlers() INSTEAD
     public static final List<CompatHandler> HANDLERS = new ArrayList<>();
 
     /**
      * Initializes compatibility with other mods if needed.
+     *
+     * @param mod the mod instance
      */
-    public static void init() {
+    public static void init(@NotNull MidnightControlsClient mod) {
-        if (PlatformFunctions.isModLoaded("emi")) {
+        // "okzoomer" is the mod ID used by Fabric-compatible versions of Ok Zoomer. (5.0.0-beta.6 and below.)
-            log("Adding EMI compatibility...");
+        // "ok_zoomer" is the mod ID used by Quilt-exclusive versions of Ok Zoomer. (5.0.0-beta.7 and above.)
-            registerCompatHandler(new EMICompat());
+        if (FabricLoader.getInstance().isModLoaded("okzoomer") || FabricLoader.getInstance().isModLoaded("ok_zoomer")) {
+            mod.log("Adding Ok Zoomer compatibility...");
+            HANDLERS.add(new OkZoomerCompat());
         }
-        if (PlatformFunctions.isModLoaded("hardcorequesting") && LambdaReflection.doesClassExist(HQMCompat.GUI_BASE_CLASS_PATH)) {
+        if (isEMIPresent()) {
-            log("Adding HQM compatibility...");
+            mod.log("Adding EMI compatibility...");
-            registerCompatHandler(new HQMCompat());
+            HANDLERS.add(new EMICompat());
         }
-        if (PlatformFunctions.isModLoaded("bedrockify")) {
+        if (FabricLoader.getInstance().isModLoaded("hardcorequesting") && LambdaReflection.doesClassExist(HQMCompat.GUI_BASE_CLASS_PATH)) {
-            log("Adding Bedrockify compatibility...");
+            mod.log("Adding HQM compatibility...");
-            registerCompatHandler(new BedrockifyCompat());
+            HANDLERS.add(new HQMCompat());
         }
-        if (PlatformFunctions.isModLoaded("yet-another-config-lib")) {
+        if (FabricLoader.getInstance().isModLoaded("bedrockify")) {
-            log("Adding YACL compatibility...");
+            mod.log("Adding Bedrockify compatibility...");
-            registerCompatHandler(new YACLCompat());
+            HANDLERS.add(new BedrockifyCompat());
         }
-        if (PlatformFunctions.isModLoaded("sodium")) {
+        HANDLERS.forEach(handler -> handler.handle(mod));
-            log("Adding Sodium compatibility...");
-            registerCompatHandler(new SodiumCompat());
-        }
-        if (PlatformFunctions.isModLoaded("inventorytabs")) {
-            log("Adding Inventory Tabs compatibility...");
-            registerCompatHandler(new InventoryTabsCompat());
-        }
-        HANDLERS.forEach(CompatHandler::handle);
         InputManager.loadButtonBindings();
     }
 
@@ -94,25 +86,7 @@ public class MidnightControlsCompat {
      * @return true if the mouse is requried on the specified screen, else false
      */
     public static boolean requireMouseOnScreen(Screen screen) {
-        return streamCompatHandlers().anyMatch(handler -> handler.requireMouseOnScreen(screen));
+        return HANDLERS.stream().anyMatch(handler -> handler.requireMouseOnScreen(screen));
-    }
-    /**
-     * Handles custom tabs for modded screens
-     *
-     * @param screen the screen
-     * @return true if the handle was fired and succeed, else false
-     */
-    public static boolean handleTabs(Screen screen, boolean forward) {
-        return streamCompatHandlers().anyMatch(handler -> handler.handleTabs(screen, forward));
-    }
-    /**
-     * Handles custom pages for modded screens
-     *
-     * @param screen the screen
-     * @return true if the handle was fired and succeed, else false
-     */
-    public static boolean handlePages(Screen screen, boolean forward) {
-        return streamCompatHandlers().anyMatch(handler -> handler.handlePages(screen, forward));
     }
 
     /**
@@ -180,22 +154,37 @@ public class MidnightControlsCompat {
         }
         return false;
     }
+
     /**
-     * Handles the camera movement.
+     * Returns whether Roughly Enough Items is present.
      *
-     * @param targetYaw the target yaw
+     * @return true if Roughly Enough Items is present, else false
-     * @param targetPitch the target pitch
      */
-    public static void handleCamera(double targetYaw, double targetPitch) {
+    public static boolean isReiPresent() {
-        MidnightControlsCompat.HANDLERS.forEach(handler -> handler.handleCamera(client, targetYaw, targetPitch));
+        return FabricLoader.getInstance().isModLoaded("roughlyenoughitems");
     }
     /**
-     * Handles movement for players as well as vehicles
+     * Returns whether EMI is present.
      *
-     * @param storage       the storage containing info about the current axis
+     * @return true if EMI is present, else false
-     * @param adjustedValue the value of the axis, adjusted for max values and non-analogue movement, recommended for player movement
      */
-    public static void handleMovement(AxisStorage storage, float adjustedValue) {
+    public static boolean isEMIPresent() {
-        streamCompatHandlers().forEach(handler -> handler.handleMovement(client, storage, adjustedValue));
+        return FabricLoader.getInstance().isModLoaded("emi");
+    }
+    /**
+     * Returns whether InventoryTabs is present.
+     *
+     * @return true if InventoryTabs is present, else false
+     */
+    public static boolean isInventoryTabsPresent() {
+        return FabricLoader.getInstance().isModLoaded("inventorytabs");
+    }
+    /**
+     * Returns whether Emotecraft is present.
+     *
+     * @return true if Emotecraft is present, else false
+     */
+    public static boolean isEmotecraftPresent() {
+        return FabricLoader.getInstance().isModLoaded("emotecraft");
     }
 }

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

@@ -9,27 +9,36 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
-import eu.midnightdust.lib.util.PlatformFunctions;
+import net.fabricmc.loader.api.FabricLoader;
+import org.jetbrains.annotations.NotNull;
 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 & Motschen
+ * @author LambdAurora
- * @version 1.6.0
+ * @version 1.5.0
  * @since 1.2.0
  */
 public class MidnightControlsMixinPlugin implements IMixinConfigPlugin {
-    private String mixinPackage;
+    private final HashMap<String, Boolean> conditionalMixins = new HashMap<>();
+
+    public MidnightControlsMixinPlugin() {
+        //this.putConditionalMixin("SodiumOptionsGUIAccessor", FabricLoader.getInstance().isModLoaded("sodium"));
+    }
+
+    private void putConditionalMixin(@NotNull String path, boolean condition) {
+        this.conditionalMixins.put("eu.midnightdust.midnightcontrols.client.compat.mixin." + path, condition);
+    }
 
     @Override
     public void onLoad(String mixinPackage) {
-        this.mixinPackage = mixinPackage + ".";
     }
 
     @Override
@@ -39,13 +48,7 @@ public class MidnightControlsMixinPlugin implements IMixinConfigPlugin {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        final String mixinName = mixinClassName.substring(this.mixinPackage.length());
+        return this.conditionalMixins.getOrDefault(mixinClassName, Boolean.TRUE);
-        final String packageName = mixinName.substring(0, mixinName.lastIndexOf('.'));
-
-        if (packageName.startsWith("sodium") && !PlatformFunctions.isModLoaded("sodium"))
-            return false;
-
-        return true;
     }
 
     @Override

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

@@ -0,0 +1,195 @@
+/*
+ * Copyright © 2021-2022 Karen/あけみ <karen@akemi.ai>, LambdAurora <aurora42lambda@gmail.com>
+ *
+ * This file is part of MidnightControls.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import net.minecraft.client.option.KeyBinding;
+import org.jetbrains.annotations.NotNull;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.lwjgl.glfw.GLFW;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Represents a compatibility handler for Ok Zoomer.
+ *
+ * @author Karen/あけみ, LambdAurora
+ * @version 1.4.3
+ * @since 1.1.0
+ */
+public class OkZoomerCompat implements CompatHandler {
+    private boolean didAllReflectionCallsSucceed = false;
+
+    private KeyBinding okZoomerZoomKey;
+    private KeyBinding okZoomerIncreaseZoomKey;
+    private KeyBinding okZoomerDecreaseZoomKey;
+    private KeyBinding okZoomerResetZoomKey;
+
+    private Method okZoomerAreExtraKeyBindsEnabledMethod;
+
+    public OkZoomerCompat() {
+        // These strings represent the names of the classes, fields, and methods we use from the Ok Zoomer API
+        String okZoomerZoomKeybindsClassString;
+
+        String okZoomerZoomKeyFieldString;
+        String okZoomerIncreaseZoomKeyFieldString;
+        String okZoomerDecreaseZoomKeyFieldString;
+        String okZoomerResetZoomKeyFieldString;
+
+        String okZoomerAreExtraKeyBindsEnabledMethodNameString;
+
+        // These variables represent the actual objects that we reflect to
+        Class<?> okZoomerZoomKeybindsClass;
+
+        Field okZoomerZoomKeyField;
+        Field okZoomerIncreaseZoomKeyField;
+        Field okZoomerDecreaseZoomKeyField;
+        Field okZoomerResetZoomKeyField;
+
+        // First, we need to determine which version of the Ok Zoomer API we're dealing with here.
+        if (LambdaReflection.doesClassExist("io.github.ennuil.okzoomer.keybinds.ZoomKeybinds")) {
+            // https://github.com/EnnuiL/OkZoomer/blob/5.0.0-beta.3+1.17.1/src/main/java/io/github/ennuil/okzoomer/keybinds/ZoomKeybinds.java
+            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.3 or below detected!");
+
+            okZoomerZoomKeybindsClassString = "io.github.ennuil.okzoomer.keybinds.ZoomKeybinds";
+
+            okZoomerZoomKeyFieldString = "zoomKey";
+            okZoomerIncreaseZoomKeyFieldString = "increaseZoomKey";
+            okZoomerDecreaseZoomKeyFieldString = "decreaseZoomKey";
+            okZoomerResetZoomKeyFieldString = "resetZoomKey";
+
+            okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeybindsEnabled";
+        } else if (LambdaReflection.doesClassExist("io.github.ennuil.okzoomer.key_binds.ZoomKeyBinds")) {
+            // https://github.com/EnnuiL/OkZoomer/blob/5.0.0-beta.6+1.18.2/src/main/java/io/github/ennuil/okzoomer/key_binds/ZoomKeyBinds.java
+            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.6, 5.0.0-beta.5, or 5.0.0-beta.4 detected!");
+
+            okZoomerZoomKeybindsClassString = "io.github.ennuil.okzoomer.key_binds.ZoomKeyBinds";
+
+            okZoomerZoomKeyFieldString = "ZOOM_KEY";
+            okZoomerIncreaseZoomKeyFieldString = "INCREASE_ZOOM_KEY";
+            okZoomerDecreaseZoomKeyFieldString = "DECREASE_ZOOM_KEY";
+            okZoomerResetZoomKeyFieldString = "RESET_ZOOM_KEY";
+
+            okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeyBindsEnabled";
+        } else if (LambdaReflection.doesClassExist("io.github.ennuil.ok_zoomer.key_binds.ZoomKeyBinds")) {
+            // https://github.com/EnnuiL/OkZoomer/blob/5.0.0-beta.7+1.18.2/src/main/java/io/github/ennuil/ok_zoomer/key_binds/ZoomKeyBinds.java
+            MidnightControlsClient.get().log("Ok Zoomer version 5.0.0-beta.7 (Quilt) or above detected!");
+
+            okZoomerZoomKeybindsClassString = "io.github.ennuil.ok_zoomer.key_binds.ZoomKeyBinds";
+
+            okZoomerZoomKeyFieldString = "ZOOM_KEY";
+            okZoomerIncreaseZoomKeyFieldString = "INCREASE_ZOOM_KEY";
+            okZoomerDecreaseZoomKeyFieldString = "DECREASE_ZOOM_KEY";
+            okZoomerResetZoomKeyFieldString = "RESET_ZOOM_KEY";
+
+            okZoomerAreExtraKeyBindsEnabledMethodNameString = "areExtraKeyBindsEnabled";
+        } else {
+            // If all of the above checks fail, then the version of the Ok Zoomer API that the user is trying to use is too new.
+            MidnightControlsClient.get().warn("The version of Ok Zoomer that you are currently using is too new, and is not yet supported by MidnightControls!");
+            return;
+        }
+
+        // Reflect to the ZoomKeyBinds (>= 5.0.0-beta.4) / ZoomKeybinds (<= 5.0.0-beta.3) class.
+        try {
+            okZoomerZoomKeybindsClass = Class.forName(okZoomerZoomKeybindsClassString);
+        } catch (ClassNotFoundException exception) {
+            // This theoretically should never happen.
+            MidnightControlsClient.get().warn("MidnightControls failed to reflect to the Ok Zoomer keybinds class!");
+            exception.printStackTrace();
+            return;
+        }
+
+        // Reflect to all of the keybind fields.
+        try {
+            okZoomerZoomKeyField = okZoomerZoomKeybindsClass.getField(okZoomerZoomKeyFieldString);
+            okZoomerIncreaseZoomKeyField = okZoomerZoomKeybindsClass.getField(okZoomerIncreaseZoomKeyFieldString);
+            okZoomerDecreaseZoomKeyField = okZoomerZoomKeybindsClass.getField(okZoomerDecreaseZoomKeyFieldString);
+            okZoomerResetZoomKeyField = okZoomerZoomKeybindsClass.getField(okZoomerResetZoomKeyFieldString);
+        } catch (NoSuchFieldException exception) {
+            MidnightControlsClient.get().warn("MidnightControls failed to reflect to the Ok Zoomer keybind fields!");
+            exception.printStackTrace();
+            return;
+        }
+
+        // Initialise KeyBinding objects
+        try {
+            okZoomerZoomKey = (KeyBinding) okZoomerZoomKeyField.get(null);
+            okZoomerIncreaseZoomKey = (KeyBinding) okZoomerIncreaseZoomKeyField.get(null);
+            okZoomerDecreaseZoomKey = (KeyBinding) okZoomerDecreaseZoomKeyField.get(null);
+            okZoomerResetZoomKey = (KeyBinding) okZoomerResetZoomKeyField.get(null);
+        } catch (IllegalAccessException exception) {
+            MidnightControlsClient.get().warn("MidnightControls failed to reflect to the Ok Zoomer keybind objects!");
+            exception.printStackTrace();
+            return;
+        }
+
+        // Reflect to the areExtraKeyBindsEnabled (>= 5.0.0-beta.4) / areExtraKeybindsEnabled (<= 5.0.0-beta.3) method.
+        // TODO: Consider replacing this entirely with getExtraKeyBind (>= 5.0.0-beta.4) / getExtraKeybind (<= 5.0.0-beta.3) in the future.
+        try {
+            okZoomerAreExtraKeyBindsEnabledMethod = okZoomerZoomKeybindsClass.getDeclaredMethod(okZoomerAreExtraKeyBindsEnabledMethodNameString);
+        } catch (NoSuchMethodException exception) {
+            MidnightControlsClient.get().warn("MidnightControls failed to reflect to an Ok Zoomer method (areExtraKeyBindsEnabled / areExtraKeybindsEnabled)!");
+            exception.printStackTrace();
+            return;
+        }
+
+        didAllReflectionCallsSucceed = true;
+    }
+
+    @Override
+    public void handle(@NotNull MidnightControlsClient mod) {
+        if (didAllReflectionCallsSucceed) {
+            new ButtonBinding.Builder("zoom")
+                    .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW.GLFW_GAMEPAD_BUTTON_X)
+                    .onlyInGame()
+                    .cooldown(true)
+                    .category(ButtonBinding.MISC_CATEGORY)
+                    .linkKeybind(okZoomerZoomKey)
+                    .register();
+
+            boolean okZoomerAreExtraKeyBindsEnabled = false;
+            try {
+                okZoomerAreExtraKeyBindsEnabled = (boolean) okZoomerAreExtraKeyBindsEnabledMethod.invoke(null);
+            } catch (IllegalAccessException exception) {
+                MidnightControlsClient.get().warn("MidnightControls encountered an IllegalAccessException while attempting to invoke a reflected Ok Zoomer method (areExtraKeyBindsEnabled / areExtraKeybindsEnabled)!");
+                exception.printStackTrace();
+            } catch (InvocationTargetException exception) {
+                MidnightControlsClient.get().warn("MidnightControls encountered an InvocationTargetException while attempting to invoke a reflected Ok Zoomer method (areExtraKeyBindsEnabled / areExtraKeybindsEnabled)!");
+                exception.printStackTrace();
+            }
+
+            if (okZoomerAreExtraKeyBindsEnabled) {
+                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(okZoomerIncreaseZoomKey)
+                        .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(okZoomerDecreaseZoomKey)
+                        .register();
+                new ButtonBinding.Builder("zoom_reset")
+                        .onlyInGame()
+                        .cooldown(true)
+                        .category(ButtonBinding.MISC_CATEGORY)
+                        .linkKeybind(okZoomerResetZoomKey)
+                        .register();
+            }
+        }
+    }
+}