diff --git a/src/launch/java/baritone/launch/mixins/MixinGameSettings.java b/src/launch/java/baritone/launch/mixins/MixinGameSettings.java
deleted file mode 100644
index f5bae8ef..00000000
--- a/src/launch/java/baritone/launch/mixins/MixinGameSettings.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.settings.GameSettings;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-/**
- * @author Brady
- * @since 8/1/2018 12:28 AM
- */
-@Mixin(GameSettings.class)
-public class MixinGameSettings {
-
- @Redirect(
- method = "isKeyDown",
- at = @At(
- value = "INVOKE",
- target = "org/lwjgl/input/Keyboard.isKeyDown(I)Z",
- remap = false
- )
- )
- private static boolean isKeyDown(int keyCode) {
- return Baritone.INSTANCE.getInputOverrideHandler().isKeyDown(keyCode);
- }
-}
diff --git a/src/launch/java/baritone/launch/mixins/MixinGuiContainer.java b/src/launch/java/baritone/launch/mixins/MixinGuiContainer.java
deleted file mode 100644
index c2c62d76..00000000
--- a/src/launch/java/baritone/launch/mixins/MixinGuiContainer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-/**
- * @author Brady
- * @since 7/31/2018 10:47 PM
- */
-@Mixin(GuiContainer.class)
-public class MixinGuiContainer {
-
- @Redirect(
- method = {
- "mouseClicked",
- "mouseReleased"
- },
- at = @At(
- value = "INVOKE",
- target = "org/lwjgl/input/Keyboard.isKeyDown(I)Z",
- remap = false
- )
- )
- private boolean isKeyDown(int keyCode) {
- return Baritone.INSTANCE.getInputOverrideHandler().isKeyDown(keyCode);
- }
-}
diff --git a/src/launch/java/baritone/launch/mixins/MixinGuiScreen.java b/src/launch/java/baritone/launch/mixins/MixinGuiScreen.java
deleted file mode 100644
index 11a3e7f4..00000000
--- a/src/launch/java/baritone/launch/mixins/MixinGuiScreen.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.gui.GuiScreen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-/**
- * @author Brady
- * @since 7/31/2018 10:38 PM
- */
-@Mixin(GuiScreen.class)
-public class MixinGuiScreen {
-
- @Redirect(
- method = {
- "isCtrlKeyDown",
- "isShiftKeyDown",
- "isAltKeyDown"
- },
- at = @At(
- value = "INVOKE",
- target = "org/lwjgl/input/Keyboard.isKeyDown(I)Z",
- remap = false
- )
- )
- private static boolean isKeyDown(int keyCode) {
- return Baritone.INSTANCE.getInputOverrideHandler().isKeyDown(keyCode);
- }
-}
diff --git a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
index 6ea14221..2bcc54b9 100644
--- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
+++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java
@@ -85,18 +85,6 @@ public class MixinMinecraft {
));
}
- @Redirect(
- method = "runTickKeyboard",
- at = @At(
- value = "INVOKE",
- target = "org/lwjgl/input/Keyboard.isKeyDown(I)Z",
- remap = false
- )
- )
- private boolean Keyboard$isKeyDown(int keyCode) {
- return Baritone.INSTANCE.getInputOverrideHandler().isKeyDown(keyCode);
- }
-
@Inject(
method = "processKeyBinds",
at = @At("HEAD")
diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json
index 413bbbe7..9ea70330 100644
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -15,9 +15,6 @@
"MixinEntityLivingBase",
"MixinEntityPlayerSP",
"MixinEntityRenderer",
- "MixinGameSettings",
- "MixinGuiContainer",
- "MixinGuiScreen",
"MixinKeyBinding",
"MixinMinecraft",
"MixinNetHandlerPlayClient",
diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java
index 9860e2e1..8540bcd4 100755
--- a/src/main/java/baritone/utils/InputOverrideHandler.java
+++ b/src/main/java/baritone/utils/InputOverrideHandler.java
@@ -57,14 +57,8 @@ public final class InputOverrideHandler implements Helper {
*/
private final Map inputForceStateMap = new HashMap<>();
- /**
- * Maps keycodes to whether or not we are forcing their state down.
- */
- private final Map keyCodeForceStateMap = new HashMap<>();
-
public final void clearAllKeys() {
inputForceStateMap.clear();
- keyCodeForceStateMap.clear();
}
/**
@@ -87,25 +81,6 @@ public final class InputOverrideHandler implements Helper {
inputForceStateMap.put(input.getKeyBinding(), forced);
}
- /**
- * A redirection in multiple places of {@link Keyboard#isKeyDown}.
- *
- * @return Whether or not the specified key is down or overridden.
- */
- public boolean isKeyDown(int keyCode) {
- return Keyboard.isKeyDown(keyCode) || keyCodeForceStateMap.getOrDefault(keyCode, false);
- }
-
- /**
- * Sets whether or not the specified key code is being forced down.
- *
- * @param keyCode The key code
- * @param forced Whether or not the state is being forced
- */
- public final void setKeyForceState(int keyCode, boolean forced) {
- keyCodeForceStateMap.put(keyCode, forced);
- }
-
/**
* An {@link Enum} representing the possible inputs that we may want to force.
*/