Moved task out of controller

src/client/java/skybot/SkybotClient.java

@@ -14,8 +14,8 @@ import org.lwjgl.glfw.GLFW;
 
 import skybot.commands.CommandManager;
 import skybot.controller.Controller;
-import skybot.controller.task.TaskQueue;
 import skybot.farmers.Farmer;
+import skybot.task.TaskQueue;
 import skybot.utilities.ChatMenu;
 
 public class SkybotClient implements ClientModInitializer {

src/client/java/skybot/farmers/CarrotFarmer.java

@@ -1,11 +1,11 @@
 package skybot.farmers;
 
 import skybot.controller.Controller;
-import skybot.controller.task.HoldKeyTask;
+import skybot.task.HoldKeyTask;
-import skybot.controller.task.PressButtonTask;
+import skybot.task.PressButtonTask;
-import skybot.controller.task.ReleaseButtonTask;
+import skybot.task.ReleaseButtonTask;
-import skybot.controller.task.RunCommandTask;
+import skybot.task.RunCommandTask;
-import skybot.controller.task.TaskQueue;
+import skybot.task.TaskQueue;
 
 public class CarrotFarmer implements Farmer {
 

src/client/java/skybot/farmers/Farmer.java

@@ -1,6 +1,6 @@
 package skybot.farmers;
 
-import skybot.controller.task.TaskQueue;
+import skybot.task.TaskQueue;
 
 public interface Farmer {
   void enqueue(TaskQueue queue);

src/client/java/skybot/farmers/PotatoFarmer.java

@@ -1,11 +1,11 @@
 package skybot.farmers;
 
 import skybot.controller.Controller;
-import skybot.controller.task.HoldKeyTask;
+import skybot.task.HoldKeyTask;
-import skybot.controller.task.PressButtonTask;
+import skybot.task.PressButtonTask;
-import skybot.controller.task.ReleaseButtonTask;
+import skybot.task.ReleaseButtonTask;
-import skybot.controller.task.RunCommandTask;
+import skybot.task.RunCommandTask;
-import skybot.controller.task.TaskQueue;
+import skybot.task.TaskQueue;
 
 public class PotatoFarmer implements Farmer {
 

src/client/java/skybot/farmers/TestFarmer.java

@@ -2,9 +2,9 @@ package skybot.farmers;
 
 import net.minecraft.client.util.InputUtil;
 import skybot.controller.Controller;
-import skybot.controller.task.ClickButtonTask;
+import skybot.task.ClickButtonTask;
-import skybot.controller.task.PauseTask;
+import skybot.task.PauseTask;
-import skybot.controller.task.TaskQueue;
+import skybot.task.TaskQueue;
 
 public class TestFarmer implements Farmer {
 

src/client/java/skybot/task/ClickButtonTask.java

@@ -1,9 +1,12 @@
-package skybot.controller.task;
+package skybot.task;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Consumer;
 
-/** Clicks a button (press then release) held for a log-normally distributed duration. */
+/**
+ * Clicks a button (press then release) held for a log-normally distributed
+ * duration.
+ */
 public class ClickButtonTask implements Task {
 	private final Consumer<Boolean> setter;
 	private long endTime;

src/client/java/skybot/task/HoldKeyTask.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 import java.util.function.Consumer;
 

src/client/java/skybot/task/PauseTask.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 /**
  * Does nothing for a fixed duration; leaves whatever keys were already released

src/client/java/skybot/task/PressButtonTask.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 import java.util.function.Consumer;
 

src/client/java/skybot/task/ReleaseButtonTask.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 import java.util.function.Consumer;
 

src/client/java/skybot/task/RunCommandTask.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 import net.minecraft.client.MinecraftClient;
 

src/client/java/skybot/task/Task.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 public interface Task {
 	/** Called once, the tick this task becomes active. */
@@ -10,7 +10,10 @@ public interface Task {
 
 	boolean isDone();
 
-	/** Called once, right after isDone() first returns true, before the next task starts. */
+	/**
+	 * Called once, right after isDone() first returns true, before the next task
+	 * starts.
+	 */
 	default void stop() {
 	}
 

src/client/java/skybot/task/TaskQueue.java

@@ -1,4 +1,4 @@
-package skybot.controller.task;
+package skybot.task;
 
 import java.util.ArrayDeque;
 import java.util.Deque;