[F] 擦屁股

Author: clansty

AquaMai.Mods/Fix/MaimollerFix.cs

@@ -17,7 +17,7 @@ namespace AquaMai.Mods.Fix;
 [EnableIf(nameof(shouldEnable))]
 public class MaimollerFix
 {
-    private static readonly Assembly shit = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(it => it.GetName().Name == "ADXHIDIOMod");
+    public static readonly Assembly shit = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(it => it.GetName().Name == "ADXHIDIOMod");
     private static bool shouldEnable = shit != null;
 
     public static void OnBeforePatch()

AquaMai.Mods/GameSystem/AdxHidInput.cs

@@ -9,6 +9,7 @@
 using AquaMai.Config.Types;
 using AquaMai.Core.Attributes;
 using AquaMai.Core.Helpers;
+using AquaMai.Mods.Fix;
 using AquaMai.Mods.Tweaks;
 using HarmonyLib;
 using HidLibrary;
@@ -102,14 +103,26 @@ private static bool NeedsButtonInput(int p)
         }
     }
 
+    [ConfigEntry("热插拔支持")]
+    private static readonly bool hotPlugSupport = true;
+
+    private static bool RealHotPlugSupport => hotPlugSupport && MaimollerFix.shit == null;
+
     private static void HidInputThread(int p)
     {
         while (true)
         {
-            while (!IsDeviceAvailable(p))
+            if (RealHotPlugSupport)
             {
-                Thread.Sleep(500);
-                TryConnectDevice(p);
+                while (!IsDeviceAvailable(p))
+                {
+                    Thread.Sleep(500);
+                    TryConnectDevice(p);
+                }
+            }
+            else
+            {
+                if (!IsDeviceAvailable(p)) return;
             }
 
             if (!NeedsButtonInput(p))
@@ -128,6 +141,7 @@ private static void HidInputThread(int p)
                 if (report.Status != HidDeviceData.ReadStatus.Success)
                 {
                     DisconnectDevice(p);
+                    if (!RealHotPlugSupport) return;
                     continue;
                 }
 
@@ -146,6 +160,7 @@ private static void HidInputThread(int p)
             catch
             {
                 DisconnectDevice(p);
+                if (!RealHotPlugSupport) return;
             }
         }
     }
@@ -214,6 +229,8 @@ public static void OnBeforeEnableCheck()
         for (int i = 0; i < 2; i++)
         {
             if (hidThreadRunning[i]) continue;
+            if (!RealHotPlugSupport && adxController[i] == null) continue;
+            if (!RealHotPlugSupport && !NeedsButtonInput(i)) continue;
 
             keyEnabled = true;
             hidThreadRunning[i] = true;