fix

Author: USS-Shenzhou

gradle.properties

@@ -30,7 +30,7 @@ mod_name=Channel
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=GNU GPL 3.0
 # The mod version. See https://semver.org/
-mod_version=26.1.2-22+beta
+mod_version=26.1.2-23+beta
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/cn/ussshenzhou/channel/input/ModKeyMappingRegistry.java

@@ -7,14 +7,12 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.AbstractTextAreaWidget;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.MultilineTextField;
 import net.minecraft.resources.Identifier;
 import net.minecraft.util.Util;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.InputEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.settings.KeyConflictContext;
@@ -52,39 +50,31 @@ public static void onKeyInput(InputEvent.Key event) {
     }
 
     @SubscribeEvent
-    public static void mute(InputEvent.Key event) {
+    public static void switchMute(InputEvent.Key event) {
         var screen = Minecraft.getInstance().screen;
         if (screen != null) {
             return;
         }
-        var cfg = ChannelClientConfig.get();
-        if (event.getKey() == PTT.getKey().getValue() && modifierMatch(event.getModifiers(), PTT.getKeyModifier().codes())) {
-            if (event.getAction() == InputConstants.PRESS || event.getAction() == InputConstants.REPEAT) {
-                switch (cfg.trigger) {
-                    case PUSH_TO_TALK -> ChannelClientConfig.write(c -> c.onAir = true);
-                    case SWITCH -> {
-                        if (Util.getMillis() - lastSwitch >= 100) {
-                            ChannelClientConfig.write(c -> c.onAir = !c.onAir);
-                            lastSwitch = Util.getMillis();
-                        }
-                    }
-                    default -> {
-                    }
-                }
-            } else {
-                if (cfg.trigger == Trigger.PUSH_TO_TALK) {
-                    ChannelClientConfig.write(c -> c.onAir = false);
-                }
+        if (ChannelClientConfig.get().trigger != Trigger.SWITCH) {
+            return;
+        }
+        if (PTT.consumeClick()) {
+            if (Util.getMillis() - lastSwitch >= 100) {
+                ChannelClientConfig.write(c -> c.onAir = !c.onAir);
+                lastSwitch = Util.getMillis();
             }
         }
     }
 
-    public static boolean modifierMatch(int combined, InputConstants.Key[] modifiers) {
-        for (var m : modifiers) {
-            if (combined == m.getValue()) {
-                return true;
-            }
+    @SubscribeEvent
+    public static void pushMute(ClientTickEvent.Pre event) {
+        var cfg = ChannelClientConfig.get();
+        if (cfg.trigger != Trigger.PUSH_TO_TALK) {
+            return;
+        }
+        boolean toWrite = PTT.isDown();
+        if (toWrite != cfg.onAir) {
+            ChannelClientConfig.write(c -> c.onAir = toWrite);
         }
-        return combined == 0;
     }
 }