updated methods + removed mixins

Author: SubAt0m1c

build.gradle.kts

@@ -26,13 +26,7 @@ java {
 // Minecraft configuration:
 loom {
     log4jConfigs.from(file("log4j2.xml"))
-    launchConfigs {
-        "client" {
-            // If you don't want mixins, remove these lines
-            property("mixin.debug", "true")
-            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
-        }
-    }
+    launchConfigs { "client" {} }
     runConfigs {
         "client" {
             if (SystemUtils.IS_OS_MAC_OSX) {
@@ -44,16 +38,6 @@ loom {
     }
     forge {
         pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
-        // If you don't want mixins, remove this lines
-        mixinConfig("mixins.$modid.json")
-	    if (transformerFile.exists()) {
-			println("Installing access transformer")
-		    accessTransformer(transformerFile)
-	    }
-    }
-    // If you don't want mixins, remove these lines
-    mixin {
-        defaultRefmapName.set("mixins.$modid.refmap.json")
     }
 }
 
@@ -86,12 +70,6 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
 
     shadowImpl(kotlin("stdlib-jdk8"))
-
-    // If you don't want mixins, remove these lines
-    shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
-        isTransitive = false
-    }
-    annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
 }
 
 // Tasks:
@@ -105,12 +83,6 @@ tasks.withType(org.gradle.jvm.tasks.Jar::class) {
     manifest.attributes.run {
         this["FMLCorePluginContainsFMLMod"] = "true"
         this["ForceLoadAsMod"] = "true"
-
-        // If you don't want mixins, remove these lines
-        this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
-        this["MixinConfigs"] = "mixins.$modid.json"
-	    if (transformerFile.exists())
-			this["FMLAT"] = "${modid}_at.cfg"
     }
 }
 

gradle.properties

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

src/main/java/com/github/subat0m1c/rawinput/init/AutoDiscoveryMixinPlugin.java

@@ -1,67 +1,25 @@
 package com.github.subat0m1c.rawinput
 
 import com.github.subat0m1c.rawinput.RawInputMain.Companion.mc
-import com.github.subat0m1c.rawinput.RawInputMain.Companion.scope
-import com.github.subat0m1c.rawinput.commands.ConfigCommand.Companion.waitTime
-import com.github.subat0m1c.rawinput.commands.ToggleCommand.Companion.enabled
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
 import net.java.games.input.Controller
 import net.java.games.input.ControllerEnvironment
 import net.java.games.input.Mouse
 import net.minecraft.util.ChatComponentText
-import net.minecraft.util.IChatComponent
 
 object RawInput {
-    var rawInputJob: Job? = null
-
-    var dx = 0
-    var dy = 0
-    var controllers: Array<Controller>? = null
     var mouse: Mouse? = null
 
-    fun closeRawInput(message: String) {
-        rawInputJob?.cancel(message)
-        rawInputJob = null
-    }
-
-    fun relaunchRawInput(message: String) {
-        rawInputJob?.cancel(message)
-        controllers = ControllerEnvironment.getDefaultEnvironment().controllers
-        rawInputJob = launchRawInput()
-    }
-
-    @JvmStatic
-    fun guiClosed() {
-        dx = 0
-        dy = 0
-    }
-
-    private fun launchRawInput() = scope.launch {
-        controllers?.let { controllers ->
-            while (enabled) {
-                if (mouse == null) {
-                    for (controller in controllers) {
-                        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
-                            }
-                        }
-                    }
+    fun findMouse() {
+        for (controller in ControllerEnvironment.getDefaultEnvironment().controllers) {
+            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
                 }
-
-                mouse?.let { mouse ->
-                    mouse.poll()
-                    dx += mouse.x.pollData.toInt()
-                    dy += mouse.y.pollData.toInt()
-                }
-
-                Thread.sleep(0, waitTime)
             }
         }
     }

src/main/java/com/github/subat0m1c/rawinput/mixin/MixinGuiClose.java

@@ -1,30 +1,28 @@
 package com.github.subat0m1c.rawinput
 
-import com.github.subat0m1c.rawinput.RawInput.relaunchRawInput
 import com.github.subat0m1c.rawinput.commands.ConfigCommand
 import com.github.subat0m1c.rawinput.commands.RescanCommand
 import com.github.subat0m1c.rawinput.commands.ToggleCommand
 import com.github.subat0m1c.rawinput.commands.ToggleCommand.Companion.enabled
 import com.github.subat0m1c.rawinput.config.ConfigManager
 import kotlinx.coroutines.*
 import net.minecraft.client.Minecraft
+import net.minecraft.util.ChatComponentText
 import net.minecraftforge.client.ClientCommandHandler
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
 
 @Mod(modid = "rawinput", useMetadata = true)
 class RawInputMain {
+
     @Mod.EventHandler
     fun init(event: FMLInitializationEvent) {
         MinecraftForge.EVENT_BUS.register(this)
         setOf(ToggleCommand(), RescanCommand(), ConfigCommand()).forEach { ClientCommandHandler.instance.registerCommand(it) }
         ConfigManager.awaitLoad()
 
-        if (enabled) {
-            mc.mouseHelper = RawMouseHelper()
-            relaunchRawInput("Initial rawinput launch")
-        }
+        if (enabled) mc.mouseHelper = RawMouseHelper()
     }
 
     companion object {