Bump version

Fix EMI compat
Fix virtual mouse
2025-12-13 23:25:10 +01:00 · 2024-02-14 10:48:28 +01:00 · 2024-02-14 10:47:52 +01:00 · 2024-02-14 10:36:27 +01:00 · 2024-02-03 10:38:54 +01:00 · 2024-02-03 10:21:37 +01:00
40 changed files with 454 additions and 472 deletions
--- a/README.md
+++ b/README.md
@@ -62,6 +62,14 @@ Enter the folder created and run:
 ```
 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?  
+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

 [Mod loader: Quilt/Fabric]: https://img.shields.io/badge/modloader-Quilt%2FFabric-blueviolet?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAADGAAAAxgGwdJvFAAAFU0lEQVR4nO1bwW7bOBCdCHtP+wUNxIvhS7yA7kkPOjf9AKPam4/OF2zzB96bblXhH0jPPkS5G1jnIvgib/IFtX/ALoYZemmKtEWRRe3aDzAsURbJGQ6HM4/02Wq1gmNGcNTSnxQA8IdakDK4AOCfJpj3SpiI98r2rAMAbxrWNWFFOMeL1nCJdXQa1gPTbpCbnm34ABIeBThv2hgAfOyVcF+2ZwkAfHGo54kVIRe6NVxiny4d6vpn2g36ugfqFLhwFB6kkUoc67k0XLv0qYKj9wEnBXiqZwEAf/ZKOOuV8BkLWBFesyI8A4C/LOt6AoC39C7HtBvg9Vt65hUnC/BUDzrOf1MGq5S9WkDZnuVle7ZqsBKgw/tO73K0hku8/u64EmhxsoA96MMvxdEroBIKO+CWoshnqqJPYTAGRJ8sql3QO3Op7D19D3z7AV8KeAGArFf+32lWhDwnKNuzuaUCclaE93KBiOU9hMQV+FLAOxz9lPHRR0VkZXs2oBDUNon5ULZnKOgcYwl4FTwna/K+CtRRwIK+dTnCCwkP9I0fkXmh4FcN+6UKqqtHblvtb+18po4TvKaPilsS8qVuYx5havsbJXS1I0ZVAXP1B5jfyzm+hAnN+We1XPluioX03kJtY9oNtG1T+b1aburDxhRAQVMGHw3z9k65F41nktmjUnjjrAj7ZXv27ECIyEKgBd7saBuka7lsPu0GA1MjR0+KVpwgMTlrMkN4YoztlZ/2camTvD0QjcWZF6KxMgcLyKbdAN+HKOb1y6PYH49gEsUwUKw1G48gi2KQZcApkYxH1eldUQBxeKbkRfXEQjDZ21+h2bMiHJDwH2wk1rSX0XWueHZd2yCZ/oVSnilTaA3VAiqjRRahQ0JBjuov3ijfPqAua0kUg67tmyjWCmvsS504wGQRnywjPJ8wtY3xw3827fjMBXziUalL3DcNrIzYRwXcTbvBZ7lgPHoNxKKYky1/+2xsHxXQbw2X/EIoggQHyjC9Yh8VcC6NshDc66jLOHpC5KSAPejDL8U+KuArboTQZgjHeARn+MFnvhvbRyfYaQ2XfNkTVFgUr/mIxlvkJuyjAjCae6BrYQUPW37vhDpT4MnAsCyIgbHBnYbcADJt7/t+deBCiSWsCG8sOv5IgU2FnJh2g+RnBDl1oCpgogqEx1TEURUFokx+tpCYnEzzjg1kh+fq/Ix9OXpG6OjjgI1VIGWcOMhlXh4PPdAz1VTe90rIU8Z/L9JUnALXSK4SjSUzOY+Y1ekyOlzjaamTvf3X8cjunBH1v6OeVtsG1QI66qYEVkoVmyA/O5fYmIHjgSsrskUavAc6q1BLeXXiANMZu0HKwGav7opGv+LticZqHOToLBeZrJRxC97qjOsowCTgZYO9OlNa25haMwgvsFMJPp3gLW1ji8b6dO89fhfYIbzAl23T4adtjyNvD6/mbbs9Xgs1hRcwWoIvCxDb47nQNm5aRDHvoPGcblNYCi+gtQSfU+AdLYfioLXYtHA9eruBhsILVJRwUIGQo/ACG0o4GAV4El5grQSffMA3SqbEnBdb1zeunfYsvAB3jL4UwE92KauA2NnNbLerNKhEqJ6Q+FIAOjpcATAVzjFHoC3qC9OurCW0W9s+6vXpAy4p0hPkSUL3ziNHiY3tqfNdQN4jORgnSEGMLyU8Udbq1QIEdEyRF3hSwlp4vKkwQimrHDuxAR6S4tleFIPzERnhSFXQEtbkD1kbwiMOlhJroISK8IiDpcQsp4NWeMRBc4I1lWAUHnHwpOgOJWwVHvFbsMIGJewUHvFb7QuQYxR/ttgIzbUAgB9KOM3uc+PN7QAAAABJRU5ErkJggg==
--- a/build.gradle
+++ b/build.gradle
@@ -3,25 +3,14 @@ plugins {
    id 'java-library'
    id 'maven-publish'
    id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'com.modrinth.minotaur' version '1.2.+'
+    id 'com.modrinth.minotaur' version '2.+'
+    id 'net.darkhax.curseforgegradle' version '1.+'
 }

-import com.google.gson.GsonBuilder
-import com.google.gson.JsonObject
-import com.modrinth.minotaur.TaskModrinthUpload
-import com.modrinth.minotaur.request.VersionType
-import com.modrinth.minotaur.responses.ResponseError
-import org.apache.http.client.config.CookieSpecs
-import org.apache.http.client.config.RequestConfig
-import org.apache.http.client.entity.EntityBuilder
-import org.apache.http.client.methods.HttpPatch
-import org.apache.http.entity.ContentType
-import org.apache.http.impl.client.HttpClientBuilder
-import org.apache.http.util.EntityUtils
+import net.darkhax.curseforgegradle.TaskPublishCurseForge

 group = project.maven_group
 version = "${project.mod_version}+${getMCVersionString()}"
-archivesBaseName = project.archives_base_name

 // This field defines the Java version your mod target.
 def targetJavaVersion = 17
@@ -32,7 +21,7 @@ boolean isMCVersionNonRelease() {
 }

 String getMCVersionString() {
-    if (isMCVersionNonRelease() || project.minecraft_version == "1.20.2") {
+    if (isMCVersionNonRelease() || project.minecraft_version == "1.20.4") {
        return project.minecraft_version
    }
    def version = project.minecraft_version.split('\\.')
@@ -159,115 +148,39 @@ processResources {
        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) {

-task publishModrinth(type: TaskModrinthUpload) {
-    dependsOn(build)
-    onlyIf {
-        System.getenv('MODRINTH_TOKEN')
-    }
+    // 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")

-    token = System.getenv('MODRINTH_TOKEN')
-    projectId = project.modrinth_id
-    versionNumber = version
-    versionName = "midnightcontrols ${project.mod_version} (${getMCVersionString()})"
-    addGameVersion((String) project.minecraft_version)
-    addLoader('fabric')
-    versionType = isMCVersionNonRelease() ? VersionType.BETA : VersionType.RELEASE
-
-    // Changelog fetching
-    def changelogText = file('CHANGELOG.md').text
-    def regexVersion = ((String) project.mod_version).replaceAll('\\.', /\\./).replaceAll('\\+', '\\+')
-    def changelogRegex = ~"###? ${regexVersion}\\n\\n(( *- .+\\n)+)"
-    def matcher = changelogText =~ changelogRegex
-
-    if (matcher.find()) {
-        changelog = matcher.group(1)
-
-        def changelogLines = changelogText.split('\n')
-        def linkRefRegex = ~'^\\[([A-z0-9 _\\-/+.]+)]: '
-        for (int i = changelogLines.length - 1; i > 0; i--) {
-            def line = changelogLines[i]
-            if ((line =~ linkRefRegex).find())
-                changelog += '\n' + line
-            else break
-        }
-    }
-
-    // Readme
-    doFirst {
-        final def client = HttpClientBuilder.create().setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.IGNORE_COOKIES).build()).build()
-        final def patch = new HttpPatch((String) (apiURL + '/v1/mod/' + projectId))
-        patch.addHeader("Authorization", token)
-
-        var json = new JsonObject()
-        json.addProperty("body", parseReadme())
-        patch.setEntity(EntityBuilder.create()
-                .setText(json.toString())
-                .setContentType(ContentType.APPLICATION_JSON)
-                .build())
-
-        final def response = client.execute(patch)
-        final int status = response.getStatusLine().getStatusCode()
-
-        final def gson = new GsonBuilder().create()
-        if (status == 200) {
-            project.getLogger().lifecycle("Successfully updated readme to ${projectId}.")
-        } else {
-            errorInfo = gson.fromJson(EntityUtils.toString(response.getEntity()), ResponseError.class)
-            project.getLogger().error("Upload failed! Status: ${status} Error: ${errorInfo.getError()} Reason: ${errorInfo.getDescription()}")
-            throw new GradleException("Upload failed! Status: ${status} Reason: ${errorInfo.getDescription()}")
-        }
-    }
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
-
-            pom {
-                name = 'midnightcontrols'
-                description = 'Adds better controls, and controller support.'
-            }
-
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-
-                configurations.shadow.allDependencies.each {
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-
-                    dependencyNode.appendNode('groupId', it.group)
-                    dependencyNode.appendNode('artifactId', it.name)
-                    dependencyNode.appendNode('version', it.version)
-                    dependencyNode.appendNode('scope', 'compile')
-                }
-            }
-        }
-    }
-
-    repositories {
-        mavenLocal()
-        maven {
-            name 'GithubPackages'
-            url uri('https://maven.pkg.github.com/LambdAurora/midnightcontrols')
-            credentials {
-                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
-                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
-            }
-        }
-        def midnightcontrolsMaven = System.getenv('midnightcontrols_MAVEN')
-        if (midnightcontrolsMaven) {
-            maven {
-                name 'midnightcontrolsMaven'
-                url uri(midnightcontrolsMaven)
-                credentials {
-                    username = project.findProperty('gpr.user') ?: System.getenv('MAVEN_USERNAME')
-                    password = project.findProperty('gpr.key') ?: System.getenv('MAVEN_PASSWORD')
-                }
-            }
-        }
-    }
+    // 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"
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,26 +3,28 @@ org.gradle.jvmargs=-Xmx1G

 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.1
-loader_version=0.14.22
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3

 # Mod Properties
-mod_version = 1.9.0
+mod_version = 1.9.4
 maven_group = eu.midnightdust
 archives_base_name = midnightcontrols
 modrinth_id = bXX9h73M
+curseforge_id = 621768
+changelog = See changes at: https://github.com/TeamMidnightDust/MidnightControls/commits/

 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.89.2+1.20.2
+fabric_version=0.91.3+1.20.4
 sodium_version=mc1.19.2-0.4.4
-spruceui_version=5.0.3+1.20.2
-midnightlib_version=1.5.0-fabric
+spruceui_version=5.0.3+1.20.4
+midnightlib_version=1.5.3-fabric
 modmenu_version=7.0.0
 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
-emi_version=0.5.0+1.19.3
+emi_version=1.1.1+1.20.4+fabric
 libgui_version=6.0.0+1.19
 inventorytabs_version=inventorytabs-0.9.beta-1.19.x
 clothconfig_version=7.0.72
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/41
+++ b/41
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/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/.
@@ -80,13 +80,11 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+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
@@ -133,22 +131,29 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
+fi

 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * 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.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java
@@ -27,6 +27,7 @@ import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
 import eu.midnightdust.midnightcontrols.client.ring.ButtonBindingRingAction;
 import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
 import dev.lambdaurora.spruceui.hud.HudManager;
+import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
 import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -159,16 +160,16 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
            GLFW.glfwSetJoystickCallback((jid, event) -> {
                if (event == GLFW.GLFW_CONNECTED) {
                    var controller = Controller.byId(jid);
-                    client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.connected", jid),
+                    client.getToastManager().add(new SystemToast(SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("midnightcontrols.controller.connected", jid),
                            Text.literal(controller.getName())));
                } else if (event == GLFW.GLFW_DISCONNECTED) {
-                    client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.disconnected", jid),
+                    client.getToastManager().add(new SystemToast(SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("midnightcontrols.controller.disconnected", jid),
                            null));
                }

                this.switchControlsMode();
            });
-        } catch (Exception e) {e.printStackTrace();}
+        } catch (Exception e) {e.fillInStackTrace();}

        MidnightControlsCompat.init(this);
    }
@@ -229,6 +230,7 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
            MidnightControlsConfig.save();
        }
        RainbowColor.tick();
+        TouchInput.tick();
    }

    /**
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
@@ -18,8 +18,12 @@ 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.CameraMode;
+import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
+import eu.midnightdust.midnightcontrols.client.enums.HudSide;
+import eu.midnightdust.midnightcontrols.client.enums.VirtualMouseSkin;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
-import eu.midnightdust.midnightcontrols.client.touch.TouchMode;
+import eu.midnightdust.midnightcontrols.client.enums.TouchMode;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
@@ -36,79 +40,87 @@ import static org.lwjgl.glfw.GLFW.*;
 * Represents MidnightControls configuration.
 */
 public class MidnightControlsConfig extends MidnightConfig {
+    public static final String CONTROLLER = "controller";
+    public static final String TOUCH = "touch";
+    public static final String GAMEPLAY = "gameplay";
+    public static final String SCREENS = "screens";
+    public static final String VISUAL = "visual";
+    public static final String MISC = "misc";
    public static boolean isEditing = false;
    @Hidden @Entry public static int configVersion = 2;
    // 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;
+    @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
-    @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 = "screens", name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
+    @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 = SCREENS, name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
    // Gameplay
-    @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();
-    @Entry(category = "gameplay", name = "midnightcontrols.menu.fast_block_placing") public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry(category = "gameplay", name = "midnightcontrols.menu.fly_drifting") public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
-    @Entry(category = "gameplay", name = "midnightcontrols.menu.fly_drifting_vertical") public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
-    @Entry(category = "gameplay", name = "midnightcontrols.menu.reacharound.horizontal") public static boolean horizontalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry(category = "gameplay", name = "midnightcontrols.menu.reacharound.vertical") public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
-    @Entry(category = "visual", name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
-    @Entry(category = "visual", name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
-    @Entry(category = "visual", name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
-    @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 = "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",
+    @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();
+    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fast_block_placing") public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fly_drifting") public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
+    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.fly_drifting_vertical") public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
+    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.reacharound.horizontal") public static boolean horizontalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(category = GAMEPLAY, name = "midnightcontrols.menu.reacharound.vertical") public static boolean verticalReacharound = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
+    @Entry(category = VISUAL, name = "Reacharound Outline") public static boolean shouldRenderReacharoundOutline = true;
+    @Entry(category = VISUAL, name = "Reacharound Outline Color", isColor = true) public static String reacharoundOutlineColorHex = "#ffffff";
+    @Entry(category = VISUAL, name = "Reacharound Outline Alpha", isSlider = true, min = 0, max = 255) public static int reacharoundOutlineColorAlpha = 102;
+    @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;
+    @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");
-    @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 = "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;
-    @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;
-    @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(category = SCREENS, name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
+    @Entry(category = SCREENS, name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
+    @Entry(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 = "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;
+    @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;
+    @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+)\\+?");
    @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 = maxAnalogValues[0];
-    @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 = maxAnalogValues[2];
-    @Entry(category = "controller", name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = maxAnalogValues[3];
-    @Entry(category = "controller", name = "Trigger button fix") public static boolean triggerFix = false;
-    @Entry(category = "controller", 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",
+    @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 = maxAnalogValues[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 = maxAnalogValues[3];
+    @Entry(category = CONTROLLER, name = "Trigger button fix") public static boolean triggerFix = true;
+    @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 = "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(category = GAMEPLAY, name = "Enable Hints") public static boolean enableHints = true;
+    @Entry(category = SCREENS, name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
+    @Entry(category = MISC, name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();
+    @Entry(category = MISC, name = "Ignored Unbound Keys") public static List<String> ignoredUnboundKeys = Lists.newArrayList("inventorytabs.key.next_tab");
    @Entry @Hidden public static Map<String, Map<String, String>> controllerBindingProfiles = new HashMap<>();
    private static Map<String, String> currentBindingProfile = new HashMap<>();
    private static Controller prevController;
@@ -392,4 +404,7 @@ public class MidnightControlsConfig extends MidnightConfig {
        else if (controller.contains("ouya")) return ControllerType.OUYA;
        else return ControllerType.DEFAULT;
    }
+    public static boolean doMixedInput() {
+        return touchInControllerMode && controlsMode == ControlsMode.CONTROLLER;
+    }
 }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java
@@ -17,6 +17,7 @@ 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;
@@ -24,13 +25,13 @@ 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 eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 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;
@@ -149,8 +150,13 @@ public class MidnightInput {
        if (allowInput)
            InputManager.updateBindings(client);

-        if (this.controlsInput != null
-                && InputManager.STATES.int2ObjectEntrySet().parallelStream().map(Map.Entry::getValue).allMatch(ButtonState::isUnpressed)) {
+        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++)
@@ -490,6 +496,7 @@ public class MidnightInput {
        {
            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;
@@ -786,6 +793,28 @@ public class MidnightInput {
     * @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;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java
@@ -1,13 +1,12 @@
 package eu.midnightdust.midnightcontrols.client.compat;

+import dev.emi.emi.api.EmiApi;
 import dev.emi.emi.config.EmiConfig;
-import dev.emi.emi.screen.EmiScreen;
 import dev.emi.emi.screen.EmiScreenManager;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import org.aperlambda.lambdacommon.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
@@ -30,13 +29,13 @@ public class EMICompat implements CompatHandler {
                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
                .category(category)
                .action((client,action,value,buttonState)->handleTabs(false)).cooldown()
-                .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen<?> || client.currentScreen instanceof EmiScreen))
+                .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)->handleTabs(true)).cooldown()
-                .filter(((client, buttonBinding) -> client.currentScreen instanceof HandledScreen<?> || client.currentScreen instanceof EmiScreen))
+                .filter(((client, buttonBinding) -> EmiApi.getHandledScreen() != null))
                .register();
    }
    public static boolean isEMIEnabled() {
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
@@ -9,12 +9,10 @@

 package eu.midnightdust.midnightcontrols.client.controller;

-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.hud.DebugHud;
-import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.resource.language.I18n;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/Controller.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/Controller.java
@@ -180,7 +180,7 @@ public record Controller(int id) implements Nameable {
                var string = l == 0L ? "" : MemoryUtil.memUTF8(l);
                var client = MinecraftClient.getInstance();
                if (client != null) {
-                    client.getToastManager().add(SystemToast.create(client, SystemToast.Type.TUTORIAL_HINT,
+                    client.getToastManager().add(SystemToast.create(client, SystemToast.Type.PERIODIC_NOTIFICATION,
                            Text.translatable("midnightcontrols.controller.mappings.error"), Text.literal(string)));
                    MidnightControls.get().log(I18n.translate("midnightcontrols.controller.mappings.error")+string);
                }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
@@ -11,7 +11,7 @@ package eu.midnightdust.midnightcontrols.client.controller;

 import com.google.common.collect.Lists;
 import eu.midnightdust.lib.util.PlatformFunctions;
-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
@@ -21,12 +21,8 @@ import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
 import eu.midnightdust.midnightcontrols.client.compat.YACLCompat;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
-import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.RecipeBookWidgetAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.TabNavigationWidgetAccessor;
+import eu.midnightdust.midnightcontrols.client.mixin.*;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
-import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 import net.fabricmc.fabric.impl.client.itemgroup.CreativeGuiExtensions;
 import net.fabricmc.fabric.impl.client.itemgroup.FabricCreativeGuiComponents;
 import net.fabricmc.fabric.impl.itemgroup.FabricItemGroup;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputManager.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputManager.java
@@ -10,9 +10,9 @@
 package eu.midnightdust.midnightcontrols.client.controller;

 import eu.midnightdust.midnightcontrols.ControlsMode;
-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
+import eu.midnightdust.midnightcontrols.client.mixin.MouseAccessor;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.client.MinecraftClient;
@@ -27,7 +27,6 @@ import org.lwjgl.glfw.GLFW;

 import java.util.*;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;

 /**
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java
@@ -9,21 +9,12 @@

 package eu.midnightdust.midnightcontrols.client.controller;

-import eu.midnightdust.midnightcontrols.client.ButtonState;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.util.MathUtil;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.tutorial.MovementTutorialStepHandler;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.enchantment.Enchantments;
-import net.minecraft.enchantment.SoulSpeedEnchantment;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.nbt.NbtList;
-import net.minecraft.nbt.scanner.SimpleNbtScanner;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;

--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/PressAction.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/PressAction.java
@@ -9,7 +9,7 @@

 package eu.midnightdust.midnightcontrols.client.controller;

-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.StickyKeyBinding;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/ButtonState.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/ButtonState.java
@@ -7,7 +7,7 @@
 * see the LICENSE file.
 */

-package eu.midnightdust.midnightcontrols.client;
+package eu.midnightdust.midnightcontrols.client.enums;

 /**
 * Represents a button state.
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/CameraMode.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/CameraMode.java
@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.enums;
+
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.NotNull;
+
+public enum CameraMode {
+    FLAT, ADAPTIVE;
+    public Text getTranslatedText() {
+        return Text.translatable("midnightcontrols.midnightconfig.enum."+this.getClass().getSimpleName()+"."+this.name());
+    }
+    public @NotNull CameraMode next() {
+        var v = values();
+        if (v.length == this.ordinal() + 1)
+            return v[0];
+        return v[this.ordinal() + 1];
+    }
+}
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/ControllerType.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/ControllerType.java
@@ -7,7 +7,7 @@
 * see the LICENSE file.
 */

-package eu.midnightdust.midnightcontrols.client;
+package eu.midnightdust.midnightcontrols.client.enums;

 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Nameable;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/HudSide.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/HudSide.java
@@ -7,7 +7,7 @@
 * see the LICENSE file.
 */

-package eu.midnightdust.midnightcontrols.client;
+package eu.midnightdust.midnightcontrols.client.enums;

 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Nameable;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/TouchMode.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/TouchMode.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.midnightcontrols.client.touch;
+package eu.midnightdust.midnightcontrols.client.enums;

 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/enums/VirtualMouseSkin.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/enums/VirtualMouseSkin.java
@@ -7,7 +7,7 @@
 * see the LICENSE file.
 */

-package eu.midnightdust.midnightcontrols.client;
+package eu.midnightdust.midnightcontrols.client.enums;

 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Nameable;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MappingsStringInputWidget.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MappingsStringInputWidget.java
@@ -63,7 +63,7 @@ public class MappingsStringInputWidget extends SpruceContainerWidget {
                fw.close();
            } catch (IOException e) {
                if (this.client != null)
-                    this.client.getToastManager().add(SystemToast.create(this.client, SystemToast.Type.TUTORIAL_HINT,
+                    this.client.getToastManager().add(SystemToast.create(this.client, SystemToast.Type.PERIODIC_NOTIFICATION,
                            Text.translatable("midnightcontrols.controller.mappings.error.write"), Text.empty()));
                e.printStackTrace();
            }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java
@@ -11,7 +11,7 @@ package eu.midnightdust.midnightcontrols.client.gui;

 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import eu.midnightdust.midnightcontrols.client.HudSide;
+import eu.midnightdust.midnightcontrols.client.enums.HudSide;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java
@@ -10,7 +10,7 @@
 package eu.midnightdust.midnightcontrols.client.gui;

 import com.mojang.blaze3d.systems.RenderSystem;
-import eu.midnightdust.midnightcontrols.client.ControllerType;
+import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
@@ -125,6 +125,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
    private final SpruceOption unfocusedInputOption;
    private final SpruceOption invertsRightXAxis;
    private final SpruceOption invertsRightYAxis;
+    private final SpruceOption cameraModeOption;
    private final SpruceOption toggleControllerProfileOption;
    private final SpruceOption rightDeadZoneOption;
    private final SpruceOption leftDeadZoneOption;
@@ -144,6 +145,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        );
    }
    // Touch options
+    private final SpruceOption touchWithControllerOption;
    private final SpruceOption touchSpeedOption;
    private final SpruceOption touchBreakDelayOption;
    private final SpruceOption invertTouchOption;
@@ -268,6 +270,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
            }

        }, Text.translatable(""));
+        this.cameraModeOption = new SpruceCyclingOption("midnightcontrols.menu.camera_mode",
+                amount -> MidnightControlsConfig.cameraMode = MidnightControlsConfig.cameraMode.next(),
+                option -> option.getDisplayText(MidnightControlsConfig.cameraMode.getTranslatedText()),
+                Text.translatable("midnightcontrols.menu.camera_mode.tooltip"));
        this.rightDeadZoneOption = new SpruceDoubleOption("midnightcontrols.menu.right_dead_zone", 0.05, 1.0, .05f,
                () -> MidnightControlsConfig.rightDeadZone,
                value -> MidnightControlsConfig.rightDeadZone = value, option -> {
@@ -295,6 +301,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                amount -> MidnightControlsConfig.touchMode = MidnightControlsConfig.touchMode.next(),
                option -> option.getDisplayText(MidnightControlsConfig.touchMode.getTranslatedText()),
                Text.translatable("midnightcontrols.menu.touch_mode.tooltip"));
+        this.touchWithControllerOption = new SpruceToggleBooleanOption("midnightcontrols.menu.touch_with_controller", () -> MidnightControlsConfig.touchInControllerMode,
+                value -> MidnightControlsConfig.touchInControllerMode = value, Text.translatable("midnightcontrols.menu.touch_with_controller.tooltip"));
        this.touchSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.touch_speed", 0.0, 150.0, .5f,
                () -> MidnightControlsConfig.touchSpeed,
                value -> MidnightControlsConfig.touchSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
@@ -447,6 +455,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        list.addSingleOptionEntry(this.secondControllerOption);
        list.addSingleOptionEntry(this.toggleControllerProfileOption);
        list.addSingleOptionEntry(this.unfocusedInputOption);
+        list.addSingleOptionEntry(this.cameraModeOption);
        list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
        list.addSingleOptionEntry(this.rightDeadZoneOption);
        list.addSingleOptionEntry(this.leftDeadZoneOption);
@@ -462,6 +471,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        var list = new SpruceOptionListWidget(Position.origin(), width, height);
        list.setBackground(new MidnightControlsBackground(130));
        list.addSingleOptionEntry(this.touchSpeedOption);
+        list.addSingleOptionEntry(this.touchWithControllerOption);
        list.addSingleOptionEntry(this.invertTouchOption);
        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
        list.addSingleOptionEntry(this.touchModeOption);
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/ReloadControllerMappingsOption.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/ReloadControllerMappingsOption.java
@@ -33,7 +33,7 @@ public class ReloadControllerMappingsOption {
            Controller.updateMappings();
            if (client.currentScreen instanceof MidnightControlsSettingsScreen)
                client.currentScreen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
-            client.getToastManager().add(SystemToast.create(client, SystemToast.Type.TUTORIAL_HINT,
+            client.getToastManager().add(SystemToast.create(client, SystemToast.Type.PERIODIC_NOTIFICATION,
                    Text.translatable("midnightcontrols.controller.mappings.updated"), Text.empty()));
        }, Text.translatable("midnightcontrols.tooltip.reload_controller_mappings"));
    }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/TouchscreenOverlay.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/TouchscreenOverlay.java
@@ -13,8 +13,8 @@ import dev.lambdaurora.spruceui.Position;
 import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
-import eu.midnightdust.midnightcontrols.client.ButtonState;
-import eu.midnightdust.midnightcontrols.client.HudSide;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.HudSide;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
@@ -24,7 +24,6 @@ import eu.midnightdust.midnightcontrols.client.touch.gui.ItemUseButtonWidget;
 import eu.midnightdust.midnightcontrols.client.touch.gui.SilentTexturedButtonWidget;
 import eu.midnightdust.midnightcontrols.client.touch.TouchUtils;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
-import net.minecraft.block.BlockState;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
@@ -37,9 +36,6 @@ import net.minecraft.item.*;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.text.Text;
 import net.minecraft.util.*;
-import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.jetbrains.annotations.NotNull;
@@ -75,8 +71,6 @@ public class TouchscreenOverlay extends Screen {
    private SilentTexturedButtonWidget endSneakButton;
    private int flyButtonEnableTicks = 0;
    private int forwardButtonTick = 0;
-    public long clickStartTime;
-    public HitResult firstHitResult = null;
    public static TouchscreenOverlay instance;

    public TouchscreenOverlay(@NotNull MidnightControlsClient mod) {
@@ -303,7 +297,7 @@ public class TouchscreenOverlay extends Screen {
            if (binding == null) continue;
            boolean hasTexture = client.getGuiAtlasManager().getSprite(new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName)) != missingSprite;
            if (MidnightControlsConfig.debug) System.out.println(left +" "+new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName)+" "+ hasTexture);
-            var button = TextIconButtonWidget.builder(Text.translatable("binding.getTranslationKey()"), b -> binding.handle(client, 1, ButtonState.PRESS), hasTexture)
+            var button = TextIconButtonWidget.builder(Text.translatable(binding.getTranslationKey()), b -> binding.handle(client, 1, ButtonState.PRESS), hasTexture)
                    .texture(hasTexture ? new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName) : emptySprite, 20, 20).dimension(20, 20).build();
            button.setPosition(left ? (3+(i*23)) : this.width-(23+(i*23)), 3);
            button.setAlpha(MidnightControlsConfig.touchTransparency / 100f);
@@ -316,7 +310,8 @@ public class TouchscreenOverlay extends Screen {
        this.swapHandsButton.setAlpha(transparency);
        this.jumpButton.setAlpha(transparency);
        this.flyButton.setAlpha(transparency);
-        this.flyUpButton.setAlpha(transparency);this.useButton.setAlpha(Math.min(transparency+0.1f, 1.0f));
+        this.flyUpButton.setAlpha(transparency);
+        this.useButton.setAlpha(Math.min(transparency+0.1f, 1.0f));
        this.flyDownButton.setAlpha(transparency);
        this.startSneakButton.setAlpha(transparency);
        this.endSneakButton.setAlpha(transparency);
@@ -346,104 +341,6 @@ public class TouchscreenOverlay extends Screen {
        }
        this.useButton.setVisible(client.player.getMainHandStack() != null && (client.player.getMainHandStack().getUseAction() != UseAction.NONE || client.player.getMainHandStack().getItem() instanceof ArmorItem) && !TouchUtils.hasInWorldUseAction(client.player.getMainHandStack()));
        this.updateJumpButtons();
-
-        double scaleFactor = client.getWindow().getScaleFactor();
-        if (clickStartTime > 0 && System.currentTimeMillis() - clickStartTime >= MidnightControlsConfig.touchBreakDelay) this.mouseHeldDown(client.mouse.getX() / scaleFactor, client.mouse.getY() / scaleFactor);
-        else client.interactionManager.cancelBlockBreaking();
-    }
-
-    @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        int centerX = this.width / 2;
-        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null && mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
-            for (int slot = 0; slot < 9; ++slot) {
-                int slotX = centerX - 90 + slot * 20 + 2;
-                if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
-                    this.client.player.getInventory().selectedSlot = slot;
-                    return true;
-                }
-            }
-        } else {
-            clickStartTime = System.currentTimeMillis();
-            boolean bl = super.mouseClicked(mouseX, mouseY, button);
-            if (!bl) firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
-            return bl;
-        }
-        return super.mouseClicked(mouseX, mouseY, button);
-    }
-
-    @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        firstHitResult = null;
-        if (!super.mouseReleased(mouseX, mouseY, button) && System.currentTimeMillis() - clickStartTime < 200) {
-            assert client != null;
-            assert client.player != null;
-            assert client.world != null;
-            assert client.interactionManager != null;
-            clickStartTime = -1;
-
-            if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
-                client.interactionManager.stopUsingItem(client.player);
-                return true;
-            }
-            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
-            if (result == null) return false;
-
-
-            if (result instanceof BlockHitResult blockHit) {
-                BlockPos blockPos = blockHit.getBlockPos().offset(blockHit.getSide());
-                BlockState state = client.world.getBlockState(blockPos);
-
-                if (client.world.isAir(blockPos) || state.isReplaceable()) {
-                    ItemStack stackInHand = client.player.getMainHandStack();
-                    int previousStackCount = stackInHand.getCount();
-                    var interaction = client.interactionManager.interactBlock(client.player, client.player.getActiveHand(), blockHit);
-                    if (interaction.isAccepted()) {
-                        if (interaction.shouldSwingHand()) {
-                            client.player.swingHand(client.player.preferredHand);
-                            if (!stackInHand.isEmpty() && (stackInHand.getCount() != previousStackCount || client.interactionManager.hasCreativeInventory())) {
-                                client.gameRenderer.firstPersonRenderer.resetEquipProgress(client.player.preferredHand);
-                            }
-                        }
-                        return true;
-                    }
-                }
-            }
-            if (result instanceof EntityHitResult entityHit) {
-                client.interactionManager.attackEntity(client.player, entityHit.getEntity());
-                client.player.swingHand(Hand.MAIN_HAND);
-            }
-        }
-        clickStartTime = -1;
-        return false;
-    }
-    public void mouseHeldDown(double mouseX, double mouseY) {
-        assert client != null;
-        assert client.player != null;
-        assert client.interactionManager != null;
-        if (!isDragging()) {
-            if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
-                client.interactionManager.interactItem(client.player, client.player.getActiveHand());
-                return;
-            }
-            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
-            if (result == null || firstHitResult == null) return;
-
-            if (result instanceof BlockHitResult blockHit && firstHitResult instanceof BlockHitResult firstBlock && blockHit.getBlockPos().equals(firstBlock.getBlockPos())) {
-                if (MidnightControlsConfig.debug) System.out.println(blockHit.getBlockPos().toString());
-                if (client.interactionManager.updateBlockBreakingProgress(blockHit.getBlockPos(), blockHit.getSide())) {
-                    client.particleManager.addBlockBreakingParticles(blockHit.getBlockPos(), blockHit.getSide());
-                    client.player.swingHand(Hand.MAIN_HAND);
-                } else client.interactionManager.cancelBlockBreaking();
-                firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
-            }
-            else if (result instanceof EntityHitResult entityHit && firstHitResult instanceof EntityHitResult firstEntity && entityHit.getEntity().getUuid().compareTo(firstEntity.getEntity().getUuid()) == 0) {
-                if (client.interactionManager.interactEntity(client.player, entityHit.getEntity(), client.player.getActiveHand()) == ActionResult.SUCCESS) {
-                    client.player.swingHand(Hand.MAIN_HAND);
-                }
-                firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
-            }
-        }
    }

    @Override
@@ -460,23 +357,12 @@ public class TouchscreenOverlay extends Screen {
            if (deltaX > 0.01)
                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs((deltaX / 3.0)*MidnightControlsConfig.touchSpeed/100), 2);
            else this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs((deltaX / 3.0)*MidnightControlsConfig.touchSpeed/100), 1);
-
-            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
-            if (result != null && firstHitResult != null) {
-                if (result instanceof BlockHitResult blockHit && firstHitResult instanceof BlockHitResult firstBlock && !blockHit.getBlockPos().equals(firstBlock.getBlockPos())) {
-                    firstHitResult = null;
-                } else if (result instanceof EntityHitResult entityHit && firstHitResult instanceof EntityHitResult firstEntity && entityHit.getEntity().getUuid().compareTo(firstEntity.getEntity().getUuid()) != 0) {
-                    firstHitResult = null;
-                }
-            }
        }
        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
    }
    @Override
    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        //client.currentScreen = null;
        KeyBinding.onKeyPressed(InputUtil.fromKeyCode(keyCode, scanCode));
-
        super.keyPressed(keyCode,scanCode,modifiers);
        return true;
    }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java
@@ -39,24 +39,15 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@Mixin(MinecraftClient.class)
 public abstract class MinecraftClientMixin {
-    @Shadow
-    @Nullable
-    public HitResult crosshairTarget;
+    @Shadow @Nullable public HitResult crosshairTarget;

-    @Shadow
-    @Nullable
-    public ClientPlayerEntity player;
+    @Shadow @Nullable public ClientPlayerEntity player;

-    @Shadow
-    @Nullable
-    public ClientPlayerInteractionManager interactionManager;
+    @Shadow @Nullable public ClientPlayerInteractionManager interactionManager;

-    @Shadow
-    @Final
-    public GameRenderer gameRenderer;
+    @Shadow @Final public GameRenderer gameRenderer;

-    @Shadow
-    private int itemUseCooldown;
+    @Shadow private int itemUseCooldown;

    @Shadow public abstract BufferBuilderStorage getBufferBuilders();

--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseAccessor.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseAccessor.java
@@ -0,0 +1,15 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.minecraft.client.Mouse;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(Mouse.class)
+public interface MouseAccessor {
+    @Invoker("onCursorPos")
+    void midnightcontrols$onCursorPos(long window, double x, double y);
+    @Accessor
+    void setLeftButtonClicked(boolean value);
+
+}
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java
@@ -12,102 +12,103 @@ package eu.midnightdust.midnightcontrols.client.mixin;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
+import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
+import eu.midnightdust.midnightcontrols.client.touch.TouchUtils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
-import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.GlfwUtil;
 import net.minecraft.client.util.SmoothUtil;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import eu.midnightdust.midnightcontrols.client.mouse.EyeTrackerHandler;

-import static org.lwjgl.glfw.GLFW.GLFW_CURSOR;
-import static org.lwjgl.glfw.GLFW.GLFW_CURSOR_HIDDEN;
+import static eu.midnightdust.midnightcontrols.client.MidnightControlsConfig.doMixedInput;
+import static org.lwjgl.glfw.GLFW.*;

 /**
 * Adds extra access to the mouse.
 */
@Mixin(Mouse.class)
 public abstract class MouseMixin implements MouseAccessor {
-    @Shadow
-    @Final
-    private MinecraftClient client;
+    @Shadow @Final private MinecraftClient client;

-    @Shadow
-    private double y;
+    @Shadow private double y;

-    @Shadow
-    private double cursorDeltaX;
+    @Shadow private double cursorDeltaX;

-    @Shadow
-    private double cursorDeltaY;
+    @Shadow private double cursorDeltaY;

-    @Shadow
-    private double x;
+    @Shadow private double x;

-    @Shadow
-    private boolean cursorLocked;
+    @Shadow private boolean cursorLocked;

-    @Shadow
-    private boolean hasResolutionChanged;
+    @Shadow private boolean hasResolutionChanged;

-    @Shadow
-    private double lastMouseUpdateTime;
+    @Shadow private double lastMouseUpdateTime;

-    @Shadow
-    @Final
-    private SmoothUtil cursorXSmoother;
+    @Shadow @Final private SmoothUtil cursorXSmoother;

-    @Shadow
-    @Final
-    private SmoothUtil cursorYSmoother;
+    @Shadow @Final private SmoothUtil cursorYSmoother;

    @Shadow private boolean leftButtonClicked;

-    @Accessor
-    public abstract void setLeftButtonClicked(boolean value);
-
-    @Invoker("onCursorPos")
-    public abstract void midnightcontrols$onCursorPos(long window, double x, double y);
-
-    @Inject(method = "onMouseButton", at = @At(value = "TAIL"))
-    private void onMouseBackButton(long window, int button, int action, int mods, CallbackInfo ci) {
-        if (action == 1 && button == GLFW.GLFW_MOUSE_BUTTON_4 && MinecraftClient.getInstance().currentScreen != null) {
-            if (MidnightControlsClient.get().input.tryGoBack(MinecraftClient.getInstance().currentScreen)) {
-                action = 0;
+    @Inject(method = "onMouseButton", at = @At(value = "HEAD"), cancellable = true)
+    private void midnightcontrols$onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) {
+        if (window != this.client.getWindow().getHandle()) return;
+        if (action == 1 && button == GLFW.GLFW_MOUSE_BUTTON_4 && client.currentScreen != null) {
+            MidnightControlsClient.get().input.tryGoBack(client.currentScreen);
        }
+        else if ((client.currentScreen == null && doMixedInput() || client.currentScreen instanceof TouchscreenOverlay) && client.player != null && button == GLFW_MOUSE_BUTTON_1) {
+            double mouseX = x / client.getWindow().getScaleFactor();
+            double mouseY = y / client.getWindow().getScaleFactor();
+            int centerX = client.getWindow().getScaledWidth() / 2;
+            if (action == 1 && mouseY >= (double) (client.getWindow().getScaledHeight() - 22) && mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
+                for (int slot = 0; slot < 9; ++slot) {
+                    int slotX = centerX - 90 + slot * 20 + 2;
+                    if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
+                        client.player.getInventory().selectedSlot = slot;
+                        ci.cancel();
+                        return;
+                    }
+                }
+            }
+            if (action == 1) {
+                TouchInput.clickStartTime = System.currentTimeMillis();
+                boolean bl = false;
+                if (client.currentScreen instanceof TouchscreenOverlay overlay) bl = overlay.mouseClicked(mouseX, mouseY, button);
+                if (!bl) TouchInput.firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+                if (client.currentScreen == null) ci.cancel();
+            }
+            else if (TouchInput.mouseReleased(mouseX, mouseY, button)) ci.cancel();
        }
    }

    @Inject(method = "isCursorLocked", at = @At("HEAD"), cancellable = true)
-    private void isCursorLocked(CallbackInfoReturnable<Boolean> ci) {
+    private void midnightcontrols$isCursorLocked(CallbackInfoReturnable<Boolean> ci) {
        if (this.client.currentScreen == null) {
            if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse) {
-                //ci.setReturnValue(true);
+                ci.setReturnValue(true);
                ci.cancel();
            }
        }
    }

    @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
-    private void onCursorLocked(CallbackInfo ci) {
-        if ((MidnightControlsConfig.eyeTrackerAsMouse && client.isWindowFocused() && !this.cursorLocked)
-                || MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN
-                || (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse))
+    private void midnightcontrols$onCursorLocked(CallbackInfo ci) {
+        if ((MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse) ||
+                MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN || doMixedInput())
            ci.cancel();
    }

    @Inject(method = "updateMouse", at = @At("HEAD"), cancellable = true)
-    private void updateMouse(CallbackInfo ci) {
+    private void midnightcontrols$updateMouse(CallbackInfo ci) {
        if (MidnightControlsConfig.eyeTrackerAsMouse && cursorLocked && client.isWindowFocused()) {
            // Eye Tracking is only for the camera controlling cursor, we need the normal cursor everywhere else.
            if (!client.options.smoothCameraEnabled) {
@@ -121,17 +122,16 @@ public abstract class MouseMixin implements MouseAccessor {
            cursorDeltaY = 0.0;
            ci.cancel();
        }
+        if (doMixedInput() && client.isWindowFocused()) {
+            ci.cancel();
+        }
    }

-    @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
-    private void lockCursor(CallbackInfo ci) {
-        if (MidnightControlsConfig.eyeTrackerAsMouse && client.isWindowFocused() && !this.cursorLocked) {
-            if (!MinecraftClient.IS_SYSTEM_MAC) {
-                KeyBinding.updatePressedStates();
-            }
+    @Inject(method = "lockCursor", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/InputUtil;setCursorParameters(JIDD)V",shift = At.Shift.BEFORE), cancellable = true)
+    private void midnightcontrols$lockCursor(CallbackInfo ci) {
+        if ((doMixedInput() || MidnightControlsConfig.eyeTrackerAsMouse)) {
            //In eye tracking mode, we cannot have the cursor locked to the center.
            GLFW.glfwSetInputMode(client.getWindow().getHandle(), GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
-            cursorLocked = true; //The game uses this flag for other gameplay checks
            client.setScreen(null);
            hasResolutionChanged = true;
            ci.cancel();
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenMixin.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenMixin.java
@@ -2,7 +2,7 @@ package eu.midnightdust.midnightcontrols.client.mixin;

 import dev.lambdaurora.spruceui.Position;
 import eu.midnightdust.midnightcontrols.ControlsMode;
-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.InputHandlers;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java
@@ -13,8 +13,8 @@ import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
-import eu.midnightdust.midnightcontrols.client.touch.TouchMode;
+import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
+import eu.midnightdust.midnightcontrols.client.enums.TouchMode;
 import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.client.MinecraftClient;
@@ -80,16 +80,17 @@ public abstract class WorldRendererMixin {
    )
    private void onOutlineRender(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer,
                                 LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) {
-        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS && TouchscreenOverlay.instance != null) {
+        if (((MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.touchInControllerMode) || MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN)
+                && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
            this.renderFingerOutline(matrices, camera);
        }
        this.renderReacharoundOutline(matrices, camera);
    }
    @Unique
    private void renderFingerOutline(MatrixStack matrices, Camera camera) {
-        if (TouchscreenOverlay.instance.firstHitResult == null || TouchscreenOverlay.instance.firstHitResult.getType() != HitResult.Type.BLOCK)
+        if (TouchInput.firstHitResult == null || TouchInput.firstHitResult.getType() != HitResult.Type.BLOCK)
            return;
-        BlockHitResult result = (BlockHitResult) TouchscreenOverlay.instance.firstHitResult;
+        BlockHitResult result = (BlockHitResult) TouchInput.firstHitResult;
        var blockPos = result.getBlockPos();
        if (this.world.getWorldBorder().contains(blockPos) && this.client.player != null) {
            var outlineShape = this.world.getBlockState(blockPos).getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/ring/ButtonBindingRingAction.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/ring/ButtonBindingRingAction.java
@@ -10,16 +10,13 @@
 package eu.midnightdust.midnightcontrols.client.ring;

 import com.electronwill.nightconfig.core.Config;
-import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.option.StickyKeyBinding;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchInput.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchInput.java
@@ -0,0 +1,104 @@
+package eu.midnightdust.midnightcontrols.client.touch;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+
+import static eu.midnightdust.midnightcontrols.client.MidnightControlsConfig.doMixedInput;
+
+public class TouchInput {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static long clickStartTime;
+    public static HitResult firstHitResult = null;
+    public static void tick() {
+        if ((client.currentScreen == null && doMixedInput()) || client.currentScreen instanceof TouchscreenOverlay) {
+            double scaleFactor = client.getWindow().getScaleFactor();
+            if (clickStartTime > 0 && System.currentTimeMillis() - clickStartTime >= MidnightControlsConfig.touchBreakDelay) {
+                mouseHeldDown(client.mouse.getX() / scaleFactor, client.mouse.getY() / scaleFactor);
+            }
+        }
+    }
+    public static void mouseHeldDown(double mouseX, double mouseY) {
+        assert client != null;
+        assert client.player != null;
+        assert client.interactionManager != null;
+
+        if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
+            client.interactionManager.interactItem(client.player, client.player.getActiveHand());
+            return;
+        }
+        HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
+        if (result == null || firstHitResult == null) {
+            client.interactionManager.cancelBlockBreaking();
+            return;
+        }
+
+        if (result instanceof BlockHitResult blockHit && firstHitResult instanceof BlockHitResult firstBlock && blockHit.getBlockPos().equals(firstBlock.getBlockPos())) {
+            if (MidnightControlsConfig.debug) System.out.println(blockHit.getBlockPos().toString());
+            if (client.interactionManager.updateBlockBreakingProgress(blockHit.getBlockPos(), blockHit.getSide())) {
+                client.particleManager.addBlockBreakingParticles(blockHit.getBlockPos(), blockHit.getSide());
+                client.player.swingHand(Hand.MAIN_HAND);
+            } else client.interactionManager.cancelBlockBreaking();
+            firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+        }
+        else if (result instanceof EntityHitResult entityHit && firstHitResult instanceof EntityHitResult firstEntity && entityHit.getEntity().getUuid().compareTo(firstEntity.getEntity().getUuid()) == 0) {
+            if (client.interactionManager.interactEntity(client.player, entityHit.getEntity(), client.player.getActiveHand()) == ActionResult.SUCCESS) {
+                client.player.swingHand(Hand.MAIN_HAND);
+            }
+            firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+        }
+    }
+    public static boolean mouseReleased(double mouseX, double mouseY, int button) {
+        firstHitResult = null;
+        if (client.interactionManager != null) client.interactionManager.cancelBlockBreaking();
+        if ((client.currentScreen == null || !client.currentScreen.mouseReleased(mouseX, mouseY, button)) && System.currentTimeMillis() - clickStartTime < MidnightControlsConfig.touchBreakDelay) {
+            assert client.player != null;
+            assert client.world != null;
+            assert client.interactionManager != null;
+            clickStartTime = -1;
+
+            if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
+                client.interactionManager.stopUsingItem(client.player);
+                return true;
+            }
+            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
+            if (result == null) return false;
+
+
+            if (result instanceof BlockHitResult blockHit) {
+                BlockPos blockPos = blockHit.getBlockPos().offset(blockHit.getSide());
+                BlockState state = client.world.getBlockState(blockPos);
+
+                if (client.world.isAir(blockPos) || state.isReplaceable()) {
+                    ItemStack stackInHand = client.player.getMainHandStack();
+                    int previousStackCount = stackInHand.getCount();
+                    var interaction = client.interactionManager.interactBlock(client.player, client.player.getActiveHand(), blockHit);
+                    if (interaction.isAccepted()) {
+                        if (interaction.shouldSwingHand()) {
+                            client.player.swingHand(client.player.preferredHand);
+                            if (!stackInHand.isEmpty() && (stackInHand.getCount() != previousStackCount || client.interactionManager.hasCreativeInventory())) {
+                                client.gameRenderer.firstPersonRenderer.resetEquipProgress(client.player.preferredHand);
+                            }
+                        }
+                        return true;
+                    }
+                }
+            }
+            if (result instanceof EntityHitResult entityHit) {
+                client.interactionManager.attackEntity(client.player, entityHit.getEntity());
+                client.player.swingHand(Hand.MAIN_HAND);
+                return true;
+            }
+        }
+        clickStartTime = -1;
+        return false;
+    }
+}
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java
@@ -1,6 +1,8 @@
 package eu.midnightdust.midnightcontrols.client.touch;

+import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.enums.TouchMode;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.projectile.ProjectileUtil;
@@ -24,7 +26,7 @@ public class TouchUtils {
    public static final Matrix4f lastProjMat = new Matrix4f();
    public static final Matrix4f lastModMat = new Matrix4f();
    public static HitResult getTargettedObject(double mouseX, double mouseY) {
-        if (MidnightControlsConfig.touchMode == TouchMode.CROSSHAIR) {
+        if (MidnightControlsConfig.touchMode == TouchMode.CROSSHAIR || PlatformFunctions.isModLoaded("vulkanmod")) {
            return client.crosshairTarget;
        }
        Vec3d near = screenSpaceToWorldSpace(mouseX, mouseY, 0);
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/util/MouseAccessor.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/util/MouseAccessor.java
@@ -1,18 +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.util;
-
-/**
- * Represents mouse's extra access.
- */
-public interface MouseAccessor {
-    void midnightcontrols$onCursorPos(long window, double x, double y);
-    void setLeftButtonClicked(boolean value);
-}
--- a/src/main/resources/assets/midnightcontrols/lang/en_us.json
+++ b/src/main/resources/assets/midnightcontrols/lang/en_us.json
@@ -16,11 +16,13 @@
  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Numbered Controller",
  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Keyboard/Mouse",
  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Controller",
-  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (WIP)",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (Beta)",
  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Left",
  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Right",
  "midnightcontrols.midnightconfig.enum.TouchMode.CROSSHAIR": "At Crosshair",
  "midnightcontrols.midnightconfig.enum.TouchMode.FINGER_POS": "Finger Position",
+  "midnightcontrols.midnightconfig.enum.CameraMode.FLAT": "Flat",
+  "midnightcontrols.midnightconfig.enum.CameraMode.ADAPTIVE": "Adaptive",
  "key.midnightcontrols.look_down": "Look down",
  "key.midnightcontrols.look_left": "Look left",
  "key.midnightcontrols.look_right": "Look right",
@@ -126,13 +128,14 @@
  "midnightcontrols.controller_type.numbered": "Numbered Controller",
  "midnightcontrols.controls_mode.default": "Keyboard/Mouse",
  "midnightcontrols.controls_mode.controller": "Controller",
-  "midnightcontrols.controls_mode.touchscreen": "Touchscreen (WIP)",
+  "midnightcontrols.controls_mode.touchscreen": "Touchscreen (Beta)",
  "midnightcontrols.hud_side.left": "Left",
  "midnightcontrols.hud_side.right": "Right",
  "midnightcontrols.menu.analog_movement": "Analog Movement",
  "midnightcontrols.menu.analog_movement.tooltip": "When possible, enables analog movement.",
  "midnightcontrols.menu.auto_switch_mode": "Auto Switch Mode",
  "midnightcontrols.menu.auto_switch_mode.tooltip": "Whether the controls mode should be switched to Controller automatically if one is connected.",
+  "midnightcontrols.menu.camera_mode": "Camera Mode",
  "midnightcontrols.menu.controller": "Controller",
  "midnightcontrols.menu.controller2": "Second Controller",
  "midnightcontrols.menu.controller2.tooltip": "Second controller to use, which allows (for example) Joy-Cons support.",
@@ -207,6 +210,7 @@
  "midnightcontrols.menu.invert_touch": "Invert Touch Direction",
  "midnightcontrols.menu.touch_mode": "Touch Interaction Mode",
  "midnightcontrols.menu.touch_transparency": "Touch HUD Transparency",
+  "midnightcontrols.menu.touch_with_controller": "Touch in Controller mode",
  "midnightcontrols.menu.unfocused_input": "Unfocused Input",
  "midnightcontrols.menu.unfocused_input.tooltip": "Allows controller input when the window is not focused.",
  "midnightcontrols.menu.virtual_mouse": "Virtual Mouse",
--- a/src/main/resources/midnightcontrols.mixins.json
+++ b/src/main/resources/midnightcontrols.mixins.json
@@ -14,6 +14,7 @@
    "InputUtilMixin",
    "MinecraftClientMixin",
    "MouseMixin",
+    "MouseAccessor",
    "ChatScreenMixin",
    "RecipeBookWidgetAccessor",
    "WorldRendererMixin",
Author	SHA1	Message	Date
Martin Prokoph	8e05b658c2	Bump version	2024-02-14 10:48:28 +01:00
Martin Prokoph	cba8a4e1d4	Fix EMI compat	2024-02-14 10:47:52 +01:00
Martin Prokoph	dd0795bc56	Fix virtual mouse	2024-02-14 10:36:27 +01:00
Martin Prokoph	566c26ac17	Bump version	2024-02-03 10:38:54 +01:00
Martin Prokoph	e203e26c3f	Fix #255 , #257 and likely #258	2024-02-03 10:21:37 +01:00
Martin Prokoph	797d1463a6	Update README.md Add FAQ regarding orange controller names	2023-12-31 11:11:24 +01:00
Martin Prokoph	3e665a14fd	MidnightControls 1.9.2 - Fix #251	2023-12-31 11:00:14 +01:00
Martin Prokoph	2b143c6bf1	Add automatic uploading to gradle script	2023-12-29 12:18:14 +01:00
Martin Prokoph	ab317f3d31	Touch-related fixes	2023-12-28 10:30:43 +01:00
Martin Prokoph	2c11a23914	Add new settings to options screen	2023-12-23 23:15:39 +01:00
Martin Prokoph	6df3e4454b	Mixed input & Fix multiple issues - Update to 1.20.4 - Touch can now be used in controller mode (especially nice on Steam Deck) - Added option to choose between camera modes (Flat vs. Adaptive, addresses #232) - Fixed broken button binding (#235)	2023-12-23 23:01:49 +01:00