diff --git a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java index 5ba0498..e255b87 100644 --- a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java +++ b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/controller/InputManager.java @@ -38,15 +38,15 @@ import java.util.stream.Stream; */ public class InputManager { - public static final InputManager INPUT_MANAGER = new InputManager(); - private static final List BINDINGS = new ArrayList<>(); - private static final List CATEGORIES = new ArrayList<>(); - public static final Map STATES = new HashMap<>(); - public static final Map BUTTON_VALUES = new HashMap<>(); - private int prevTargetMouseX = 0; - private int prevTargetMouseY = 0; - private int targetMouseX = 0; - private int targetMouseY = 0; + public static final InputManager INPUT_MANAGER = new InputManager(); + private static final List BINDINGS = new ArrayList<>(); + private static final List CATEGORIES = new ArrayList<>(); + public static final Map STATES = new HashMap<>(); + public static final Map BUTTON_VALUES = new HashMap<>(); + private int prevTargetMouseX = 0; + private int prevTargetMouseY = 0; + private int targetMouseX = 0; + private int targetMouseY = 0; protected InputManager() { @@ -345,6 +345,11 @@ public class InputManager else state = ButtonState.NONE; } + + if (state == ButtonState.RELEASE && !binding.pressed) { + state = ButtonState.NONE; + } + binding.pressed = state.isPressed(); binding.update(); if (binding.pressed) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 22c6945..d91a04f 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ ], "depends": { "fabricloader": ">=0.8.0", - "fabric": "*", + "fabric": ">=0.4.0", "minecraft": ">=1.16", "spruceui": ">=1.5.2" }, diff --git a/gradle.properties b/gradle.properties index e387f69..372e244 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,12 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.9.0+build.204 # Mod Properties - mod_version = 1.4.1 + mod_version = 1.4.2 maven_group = me.lambdaurora.lambdacontrols archives_base_name = lambdacontrols # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api fabric_version=0.15.0+build.379-1.16.1 - spruceui_version=1.5.9 + spruceui_version=1.5.11 modmenu_version=1.12.2+build.17 diff --git a/spigot/build.gradle b/spigot/build.gradle index ea9a61e..a2ca0b0 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -21,6 +21,8 @@ dependencies { } api 'org.spigotmc:spigot-api:1.15.1-R0.1-SNAPSHOT' api 'io.netty:netty-all:4.1.28.Final' + implementation "com.electronwill.night-config:core:3.5.3" + implementation "com.electronwill.night-config:toml:3.5.3" } processResources {