From 3cde87ab86b701eebe905490a618a6d302f88e5a Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 24 Oct 2022 03:36:06 +0100 Subject: [PATCH] OnClientInputEventHandler: - Fixed passing the wrong value into checking if the screen is allowed for each monitored key. --- .../events/OnClientInputEventHandler.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java b/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java index 62a6688..34b5135 100755 --- a/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java +++ b/src/main/java/dev/micle/loginprotection/events/OnClientInputEventHandler.java @@ -91,170 +91,170 @@ public class OnClientInputEventHandler { // Check if the key is monitored, save it's state, update last input tick and notify server if not allowed if (key == GLFW.GLFW_KEY_ESCAPE) { isPausePressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.PAUSE.toString())) { updateAndNotify(); } } else if (key == GLFW.GLFW_KEY_F3) { isDebugPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.DEBUG.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyFullscreen.getKey().getValue()) { isFullscreenPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.FULLSCREEN.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyTogglePerspective.getKey().getValue()) { isTogglePerspectivePressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.PERSPECTIVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySmoothCamera.getKey().getValue()) { isSmoothCameraPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SMOOTH_CAMERA.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyScreenshot.getKey().getValue()) { isScreenshotPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SCREENSHOT.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySpectatorOutlines.getKey().getValue()) { isSpectatorOutlinesPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SPECTATOR_OUTLINES.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyAdvancements.getKey().getValue()) { isAdvancementsPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.ADVANCEMENTS.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyPlayerList.getKey().getValue()) { isPlayerListPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.PLAYER_LIST.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyChat.getKey().getValue()) { isChatPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.CHAT.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyCommand.getKey().getValue()) { isChatCommandPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.CHAT.toString())) { updateAndNotify(); } } else if (key == GLFW.GLFW_KEY_ENTER) { isChatEnterPressed = isPressed; // Todo: possibly set isChatPressed and isChatCommandPressed here - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.CHAT.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySocialInteractions.getKey().getValue()) { isSocialInteractionsPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SOCIAL_INTERACTIONS.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyLoadHotbarActivator.getKey().getValue()) { isLoadHotbarActivatorPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.LOAD_HOTBAR_ACTIVATOR.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySaveHotbarActivator.getKey().getValue()) { isSaveHotbarActivatorPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SAVE_HOTBAR_ACTIVATOR.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySwapOffhand.getKey().getValue()) { isSwapOffhandPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SWAP_ITEM.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyInventory.getKey().getValue()) { isInventoryPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.INVENTORY.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyDrop.getKey().getValue()) { isDropItemPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.DROP_ITEM.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyUse.getKey().getValue()) { isUseItemPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.USE_ITEM.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyPickItem.getKey().getValue()) { isPickBlockPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.PICK_BLOCK.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyAttack.getKey().getValue()) { isAttackPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.ATTACK.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyUp.getKey().getValue()) { isMoveUpPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.MOVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyRight.getKey().getValue()) { isMoveRightPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.MOVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyDown.getKey().getValue()) { isMoveDownPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.MOVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyLeft.getKey().getValue()) { isMoveLeftPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.MOVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keySprint.getKey().getValue()) { isMoveSprintPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.MOVE.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyShift.getKey().getValue()) { isSneakPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.SNEAK.toString())) { updateAndNotify(); } } else if (key == keyBinds.keyJump.getKey().getValue()) { isJumpPressed = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.JUMP.toString())) { updateAndNotify(); } @@ -262,7 +262,7 @@ public class OnClientInputEventHandler { for (int i = 0; i < isHotBarPressed.length; i++) { if (key == keyBinds.keyHotbarSlots[i].getKey().getValue()) { isHotBarPressed[i] = isPressed; - if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, isPressed) && + if (!checkIfScreenIsAllowed(allowedKeys, minecraft.screen, !isPressed) && !allowedKeys.contains(Config.Server.KEYS.HOTBAR.toString())) { updateAndNotify(); }