From 9642950b548bb741d38a5180728001a0c89f8e4f Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Tue, 30 Oct 2018 20:30:44 -0500
Subject: [PATCH] oppa

---
 src/main/java/tenor/{ => game}/ActuallyCraftTask.java    | 5 ++++-
 src/main/java/tenor/{ => game}/AquireCraftingItems.java  | 4 +++-
 src/main/java/tenor/{ => game}/AquireItemTask.java       | 9 +++------
 src/main/java/tenor/{ => game}/CraftingTask.java         | 6 +++++-
 .../java/tenor/{ => game}/GetToCraftingTableTask.java    | 5 ++++-
 src/main/java/tenor/{ => game}/MineTask.java             | 5 ++++-
 6 files changed, 23 insertions(+), 11 deletions(-)
 rename src/main/java/tenor/{ => game}/ActuallyCraftTask.java (92%)
 rename src/main/java/tenor/{ => game}/AquireCraftingItems.java (98%)
 rename src/main/java/tenor/{ => game}/AquireItemTask.java (94%)
 rename src/main/java/tenor/{ => game}/CraftingTask.java (93%)
 rename src/main/java/tenor/{ => game}/GetToCraftingTableTask.java (91%)
 rename src/main/java/tenor/{ => game}/MineTask.java (91%)

diff --git a/src/main/java/tenor/ActuallyCraftTask.java b/src/main/java/tenor/game/ActuallyCraftTask.java
similarity index 92%
rename from src/main/java/tenor/ActuallyCraftTask.java
rename to src/main/java/tenor/game/ActuallyCraftTask.java
index 5815f95a..e26799f8 100644
--- a/src/main/java/tenor/ActuallyCraftTask.java
+++ b/src/main/java/tenor/game/ActuallyCraftTask.java
@@ -15,7 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
+
+import tenor.ISingularChildTaskRelationship;
+import tenor.SingularTaskLeaf;
 
 public class ActuallyCraftTask extends SingularTaskLeaf {
 
diff --git a/src/main/java/tenor/AquireCraftingItems.java b/src/main/java/tenor/game/AquireCraftingItems.java
similarity index 98%
rename from src/main/java/tenor/AquireCraftingItems.java
rename to src/main/java/tenor/game/AquireCraftingItems.java
index 036633f1..aae9f619 100644
--- a/src/main/java/tenor/AquireCraftingItems.java
+++ b/src/main/java/tenor/game/AquireCraftingItems.java
@@ -15,7 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
+
+import tenor.*;
 
 public class AquireCraftingItems extends QuantizedTaskNode implements IClaimProvider {
 
diff --git a/src/main/java/tenor/AquireItemTask.java b/src/main/java/tenor/game/AquireItemTask.java
similarity index 94%
rename from src/main/java/tenor/AquireItemTask.java
rename to src/main/java/tenor/game/AquireItemTask.java
index dcb00b51..8c64bf1d 100644
--- a/src/main/java/tenor/AquireItemTask.java
+++ b/src/main/java/tenor/game/AquireItemTask.java
@@ -15,7 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
+
+import tenor.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -56,11 +58,6 @@ public class AquireItemTask extends QuantizedTaskNode implements IClaimProvider,
         return x -> ScarceParentPriorityAllocator.priorityAllocation(x, parentTasks()).totalPriority;
     }
 
-    @Override
-    public IQuantityRelationship cost() {
-        return IQuantizedDependentCostCalculator.super.cost(); // oppa
-    }
-
     @Override
     public double priorityAllocatedTo(IQuantizedParentTaskRelationship child, int quantity) {
         // how much of our priority would go to this child if it could provide us with quantity of the item we need
diff --git a/src/main/java/tenor/CraftingTask.java b/src/main/java/tenor/game/CraftingTask.java
similarity index 93%
rename from src/main/java/tenor/CraftingTask.java
rename to src/main/java/tenor/game/CraftingTask.java
index 702230f1..fc0b6b9a 100644
--- a/src/main/java/tenor/CraftingTask.java
+++ b/src/main/java/tenor/game/CraftingTask.java
@@ -15,9 +15,13 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
 
 import net.minecraft.util.Tuple;
+import tenor.DependencyType;
+import tenor.IQuantityRelationship;
+import tenor.IQuantizedParentTaskRelationship;
+import tenor.QuantizedTaskNode;
 
 import java.util.List;
 
diff --git a/src/main/java/tenor/GetToCraftingTableTask.java b/src/main/java/tenor/game/GetToCraftingTableTask.java
similarity index 91%
rename from src/main/java/tenor/GetToCraftingTableTask.java
rename to src/main/java/tenor/game/GetToCraftingTableTask.java
index 204353f2..c826077c 100644
--- a/src/main/java/tenor/GetToCraftingTableTask.java
+++ b/src/main/java/tenor/game/GetToCraftingTableTask.java
@@ -15,7 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
+
+import tenor.ISingularChildTaskRelationship;
+import tenor.SingularTaskLeaf;
 
 public class GetToCraftingTableTask extends SingularTaskLeaf {
     public static final GetToCraftingTableTask INSTANCE = new GetToCraftingTableTask(); // ? idk
diff --git a/src/main/java/tenor/MineTask.java b/src/main/java/tenor/game/MineTask.java
similarity index 91%
rename from src/main/java/tenor/MineTask.java
rename to src/main/java/tenor/game/MineTask.java
index d8b9e2ba..9c549749 100644
--- a/src/main/java/tenor/MineTask.java
+++ b/src/main/java/tenor/game/MineTask.java
@@ -15,7 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package tenor;
+package tenor.game;
+
+import tenor.IQuantityRelationship;
+import tenor.QuantizedTaskLeaf;
 
 public class MineTask extends QuantizedTaskLeaf {
     @Override