made it possible to grab mouses after their connection type is updated

Author: SubAt0m1c

build.gradle.kts

@@ -67,8 +67,7 @@ dependencies {
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
     forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-
+    shadowImpl("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     shadowImpl(kotlin("stdlib-jdk8"))
 }
 

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.subat0m1c.rawinput
 mcVersion = 1.8.9
 modid = rawinput
-version = 1.0.1
+version = 1.0.2

src/main/kotlin/com/github/subat0m1c/rawinput/RawInput.kt

@@ -9,16 +9,29 @@ import net.minecraft.util.ChatComponentText
 object RawInput {
     var mouse: Mouse? = null
 
+    /**
+     * Controllers are only grabbed once on launch, so we need to force a reset in the event of mouse connections changing during runtime.
+     * using reflection for this is really slow i think but i dont wanna make a mixin for this garbage
+     */
+    fun resetControllers() = runCatching {
+        ControllerEnvironment::class.java.getDeclaredField("defaultEnvironment").apply {
+            isAccessible = true
+            set(null, Class.forName("net.java.games.input.DefaultControllerEnvironment").getDeclaredConstructor().apply {
+                isAccessible = true
+            }.newInstance())
+        }
+    }
+
     fun findMouse() {
-        for (controller in ControllerEnvironment.getDefaultEnvironment().controllers) {
+        ControllerEnvironment.getDefaultEnvironment().controllers.forEach { controller ->
             if (controller.type == Controller.Type.MOUSE) {
                 controller.poll()
                 val mouseController = controller as Mouse
                 if (mouseController.x.pollData != 0f || mouseController.y.pollData != 0f) {
                     mouse = mouseController
                     mc.thePlayer?.addChatMessage(ChatComponentText("Mouse found: ${mouseController.name}"))
                         ?: println("Mouse found: ${mouseController.name}")
-                    break
+                    return
                 }
             }
         }

src/main/kotlin/com/github/subat0m1c/rawinput/commands/ConfigCommand.kt

@@ -13,7 +13,7 @@ class ConfigCommand : CommandBase() {
 
     override fun processCommand(sender: ICommandSender?, args: Array<out String>?) {
         if (args == null || args.isEmpty()) {
-            sender?.addChatMessage(ChatComponentText("Usage: /rawconfig <maxchange|view> <int?>")) // waittime|
+            sender?.addChatMessage(ChatComponentText("Usage: /rawconfig <maxchange|view> <int?>"))
             return
         }
 

src/main/kotlin/com/github/subat0m1c/rawinput/commands/RescanCommand.kt

@@ -23,6 +23,10 @@ class RescanCommand : CommandBase() {
             }
         }
         sender?.addChatMessage(ChatComponentText("Rescanning input devices...") as IChatComponent)
+        RawInput.resetControllers().onFailure {
+            sender?.addChatMessage(ChatComponentText("Failed to reset default controllers. If you changed the mouse connection, you may need to restart the game"))
+            it.printStackTrace()
+        }
         RawInput.mouse = null
     }
 

src/main/kotlin/com/github/subat0m1c/rawinput/config/Config.kt

@@ -35,12 +35,6 @@ class Config <T : Any> (val name: String, private val Json: JsonManager<T>) {
             { Json: JsonElement -> Json.asInt },
             { value: Int -> JsonPrimitive(value) }
         )
-
-        fun floatSetting(default: Float) = JsonManager(
-            default,
-            { Json: JsonElement -> Json.asFloat },
-            { value: Float -> JsonPrimitive(value) }
-        )
     }
 }