Revert "한영키의 키 바인딩 설정 처리"

This reverts commit d712e7e.
sokcuri · Jul 18, 2020 · 4e4f98a · 4e4f98a
1 parent ea02b7c
commit 4e4f98a
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/main/java/kr/neko/sokcuri/naraechat/NaraeChat.java b/src/main/java/kr/neko/sokcuri/naraechat/NaraeChat.java
@@ -136,7 +136,7 @@ public static ByteBuffer ioResourceToByteBuffer(String resource, int bufferSize)
     }
 
     @SubscribeEvent
-    public void proxyHangulSpecificKey(GuiScreenEvent.KeyboardKeyPressedEvent.Pre event) {
+    public void onSpecialKeyPressed(GuiScreenEvent.KeyboardKeyPressedEvent.Pre event) {
 
         int keyCode = event.getKeyCode();
         int scanCode = event.getScanCode();
@@ -167,17 +167,19 @@ public void proxyHangulSpecificKey(GuiScreenEvent.KeyboardKeyPressedEvent.Pre ev
             }
 
             event.setCanceled(true);
-        }
 
-        // 키 바인딩 설정창일 때 우측 CONTROL이나 ALT가 단독으로만 동작하게 만들기
-        if (mc.currentScreen instanceof ControlsScreen) {
-            ControlsScreen controlsScreen = (ControlsScreen)mc.currentScreen;
-            if (keyCode == GLFW_KEY_RIGHT_CONTROL || keyCode == GLFW_KEY_RIGHT_ALT) {
-                controlsScreen.keyPressed(keyCode, scanCode, glfwModifier);
-                controlsScreen.buttonId = null;
-                event.setCanceled(true);
-                return;
+            int glfwModifier = 0;
+            if (KeyModifier.getActiveModifier() == KeyModifier.SHIFT) {
+                glfwModifier = GLFW_MOD_SHIFT;
+            } else if (KeyModifier.getActiveModifier() == KeyModifier.CONTROL) {
+                glfwModifier = GLFW_MOD_CONTROL;
+            } else if (KeyModifier.getActiveModifier() == KeyModifier.ALT) {
+                glfwModifier = GLFW_MOD_ALT;
             }
+
+            Minecraft mc = Minecraft.getInstance();
+            mc.currentScreen.keyPressed(keyCode, scanCode, glfwModifier);
+            mc.currentScreen.keyReleased(keyCode, scanCode, glfwModifier);
         }
 
         KeyModifier modifier = KeyModifier.getActiveModifier();