0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

this can be moved i think

Browse Source
This commit is contained in:
Leijurv 2018-11-05 20:05:47 -08:00
parent aac0d623fa
commit a182c22d36
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/baritone/event/GameEventHandler.java
View File

@ -24,10 +24,7 @@ import baritone.api.event.listener.IGameEventListener;
import baritone.cache.WorldProvider; import baritone.cache.WorldProvider;
import baritone.utils.BlockStateInterface; import baritone.utils.BlockStateInterface;
import baritone.utils.Helper; import baritone.utils.Helper;
import baritone.utils.InputOverrideHandler;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import org.lwjgl.input.Keyboard;
import java.util.ArrayList; import java.util.ArrayList;
@ -57,21 +54,6 @@ public final class GameEventHandler implements IGameEventListener, Helper {
@Override @Override
public final void onProcessKeyBinds() { public final void onProcessKeyBinds() {
InputOverrideHandler inputHandler = baritone.getInputOverrideHandler();
// Simulate the key being held down this tick
for (InputOverrideHandler.Input input : InputOverrideHandler.Input.values()) {
KeyBinding keyBinding = input.getKeyBinding();
if (inputHandler.isInputForcedDown(keyBinding) && !keyBinding.isKeyDown()) {
int keyCode = keyBinding.getKeyCode();
if (keyCode < Keyboard.KEYBOARD_SIZE) {
KeyBinding.onTick(keyCode < 0 ? keyCode + 100 : keyCode);
}
}
}
listeners.forEach(l -> l.onProcessKeyBinds()); listeners.forEach(l -> l.onProcessKeyBinds());
} }

17
src/main/java/baritone/utils/InputOverrideHandler.java
View File

@ -20,6 +20,7 @@ package baritone.utils;
import baritone.Baritone; import baritone.Baritone;
import baritone.behavior.Behavior; import baritone.behavior.Behavior;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.settings.KeyBinding;
import org.lwjgl.input.Keyboard;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -67,6 +68,22 @@ public final class InputOverrideHandler extends Behavior implements Helper {
inputForceStateMap.put(input.getKeyBinding(), forced); inputForceStateMap.put(input.getKeyBinding(), forced);
} }
@Override
public final void onProcessKeyBinds() {
// Simulate the key being held down this tick
for (InputOverrideHandler.Input input : Input.values()) {
KeyBinding keyBinding = input.getKeyBinding();
if (isInputForcedDown(keyBinding) && !keyBinding.isKeyDown()) {
int keyCode = keyBinding.getKeyCode();
if (keyCode < Keyboard.KEYBOARD_SIZE) {
KeyBinding.onTick(keyCode < 0 ? keyCode + 100 : keyCode);
}
}
}
}
/** /**
* An {@link Enum} representing the possible inputs that we may want to force. * An {@link Enum} representing the possible inputs that we may want to force.
*/ */