From a60b398b0c59fb97b1499087a7237ca6c3a6fdb6 Mon Sep 17 00:00:00 2001
From: Leijurv <leijurv@gmail.com>
Date: Thu, 2 Aug 2018 09:20:35 -0400
Subject: [PATCH] getOrDefault instead of custom hashmap

---
 .../java/baritone/bot/InputOverrideHandler.java |  9 ++++-----
 src/main/java/baritone/bot/pathing/IPath.java   |  4 ++++
 .../bot/pathing/action/ActionState.java         | 10 +++++++---
 .../java/baritone/bot/utils/DefaultHashMap.java | 17 -----------------
 4 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/java/baritone/bot/utils/DefaultHashMap.java

diff --git a/src/main/java/baritone/bot/InputOverrideHandler.java b/src/main/java/baritone/bot/InputOverrideHandler.java
index 746aa39d..5c95c8ea 100755
--- a/src/main/java/baritone/bot/InputOverrideHandler.java
+++ b/src/main/java/baritone/bot/InputOverrideHandler.java
@@ -1,6 +1,5 @@
 package baritone.bot;
 
-import baritone.bot.utils.DefaultHashMap;
 import baritone.bot.utils.Helper;
 import net.minecraft.client.settings.KeyBinding;
 import org.lwjgl.input.Keyboard;
@@ -23,12 +22,12 @@ public final class InputOverrideHandler implements Helper {
     /**
      * Maps keybinds to whether or not we are forcing their state down.
      */
-    private final Map<KeyBinding, Boolean> inputForceStateMap = new DefaultHashMap<>(false);
+    private final Map<KeyBinding, Boolean> inputForceStateMap = new HashMap<>();
 
     /**
      * Maps keycodes to whether or not we are forcing their state down.
      */
-    private final Map<Integer, Boolean> keyCodeForceStateMap = new DefaultHashMap<>(false);
+    private final Map<Integer, Boolean> keyCodeForceStateMap = new HashMap<>();
 
     /**
      * Returns whether or not we are forcing down the specified {@link KeyBinding}.
@@ -37,7 +36,7 @@ public final class InputOverrideHandler implements Helper {
      * @return Whether or not it is being forced down
      */
     public final boolean isInputForcedDown(KeyBinding key) {
-        return inputForceStateMap.get(key);
+        return inputForceStateMap.getOrDefault(key, false);
     }
 
     /**
@@ -56,7 +55,7 @@ public final class InputOverrideHandler implements Helper {
      * @return Whether or not the specified key is down or overridden.
      */
     public boolean isKeyDown(int keyCode) {
-        return Keyboard.isKeyDown(keyCode) || keyCodeForceStateMap.get(keyCode);
+        return Keyboard.isKeyDown(keyCode) || keyCodeForceStateMap.getOrDefault(keyCode, false);
     }
 
     /**
diff --git a/src/main/java/baritone/bot/pathing/IPath.java b/src/main/java/baritone/bot/pathing/IPath.java
index f97869dd..1ff15de5 100644
--- a/src/main/java/baritone/bot/pathing/IPath.java
+++ b/src/main/java/baritone/bot/pathing/IPath.java
@@ -6,6 +6,10 @@ import java.util.Collection;
 import java.util.List;
 
 public interface IPath {
+    /**
+     *
+     */
+    List<BlockPos> movements();
 
     /**
      * All positions along the way.
diff --git a/src/main/java/baritone/bot/pathing/action/ActionState.java b/src/main/java/baritone/bot/pathing/action/ActionState.java
index 207770cd..266d1179 100644
--- a/src/main/java/baritone/bot/pathing/action/ActionState.java
+++ b/src/main/java/baritone/bot/pathing/action/ActionState.java
@@ -1,17 +1,17 @@
 package baritone.bot.pathing.action;
 
 import baritone.bot.InputOverrideHandler.Input;
-import baritone.bot.utils.DefaultHashMap;
 import net.minecraft.util.Tuple;
 import net.minecraft.util.math.BlockPos;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public class ActionState {
 
     protected ActionStatus status;
     public ActionGoal goal;
-    protected final Map<Input, Boolean> inputState = new DefaultHashMap<>(false);
+    protected final Map<Input, Boolean> inputState = new HashMap<>();
 
     public ActionState setStatus(ActionStatus status) {
         this.status = status;
@@ -53,10 +53,14 @@ public class ActionState {
     }
 
     public ActionState setInput(Input input, boolean forced) {
-        this.inputState.put(input, forced);
+        inputState.put(input, forced);
         return this;
     }
 
+    public boolean getInput(Input input) {
+        return inputState.getOrDefault(input, false);
+    }
+
     public enum ActionStatus {
         WAITING, RUNNING, SUCCESS, UNREACHABLE, FAILED;
     }
diff --git a/src/main/java/baritone/bot/utils/DefaultHashMap.java b/src/main/java/baritone/bot/utils/DefaultHashMap.java
deleted file mode 100644
index f5cdb3ef..00000000
--- a/src/main/java/baritone/bot/utils/DefaultHashMap.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package baritone.bot.utils;
-
-import java.util.HashMap;
-
-public class DefaultHashMap<K, V> extends HashMap<K, V> {
-
-    protected V defaultValue;
-
-    public DefaultHashMap(V defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    @Override
-    public V get(Object k) {
-        return containsKey(k) ? super.get(k) : defaultValue;
-    }
-}
\ No newline at end of file