一回だけKeyのactionが実行される

yuuki1293 · Sep 15, 2022 · 979ac73 · 979ac73
1 parent ca2b170
commit 979ac73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/scala/staticallytyped/kagawaassist/KagawaAssistKeyMapping.scala b/src/main/scala/staticallytyped/kagawaassist/KagawaAssistKeyMapping.scala
@@ -1,7 +1,9 @@
 package staticallytyped.kagawaassist
 
+import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.KeyMapping
+import net.minecraftforge.client.settings.{IKeyConflictContext, KeyModifier}
 
-class KagawaAssistKeyMapping(name: String, key: Int, val f: Unit => _)(implicit category: String)
-  extends KeyMapping(name, key, category){
+class KagawaAssistKeyMapping(description: String, keyConflictContext: IKeyConflictContext, keyModifier: KeyModifier, keyCode: InputConstants.Key, val f: Unit => _)(implicit category: String)
+  extends KeyMapping(description, keyConflictContext, keyModifier, keyCode, category){
 }
diff --git a/src/main/scala/staticallytyped/kagawaassist/KeyBind.scala b/src/main/scala/staticallytyped/kagawaassist/KeyBind.scala
@@ -1,7 +1,9 @@
 package staticallytyped.kagawaassist
 
+import com.mojang.blaze3d.platform.InputConstants
 import com.mojang.blaze3d.platform.InputConstants._
 import net.minecraftforge.client.event.{InputEvent, RegisterKeyMappingsEvent}
+import net.minecraftforge.client.settings.{KeyConflictContext, KeyModifier}
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.fml.common.Mod
 import staticallytyped.kagawaassist.coordinate.{CopyCoordinate, SendCoordinate}
@@ -16,14 +18,15 @@ object KeyBind {
   )
 
   def newKeyMap(name: String, key: Int, f: Unit => _)(implicit category: String): KagawaAssistKeyMapping = {
-    new KagawaAssistKeyMapping(name, key, f)(category)
+    new KagawaAssistKeyMapping(name, KeyConflictContext.IN_GAME, KeyModifier.NONE, InputConstants.Type.KEYSYM.getOrCreate(key), f)(category)
   }
 
   @SubscribeEvent
   def onKeyInput(event: InputEvent.Key): Unit = {
     keyMappings.foreach(keyMapping => {
-      if (event.getKey == keyMapping.getKey.getValue)
-        keyMapping.f()
+      if (keyMapping.consumeClick()) {
+        keyMapping.f(())
+      }
     })
   }