From 431aae4f620dad3074edc8a86c702654872e6a0b Mon Sep 17 00:00:00 2001 From: Caleb Burke Date: Sat, 4 Jul 2026 05:46:58 -0700 Subject: [PATCH] Moved task out of controller --- src/client/java/skybot/SkybotClient.java | 2 +- src/client/java/skybot/farmers/CarrotFarmer.java | 10 +++++----- src/client/java/skybot/farmers/Farmer.java | 2 +- src/client/java/skybot/farmers/PotatoFarmer.java | 10 +++++----- src/client/java/skybot/farmers/TestFarmer.java | 6 +++--- .../skybot/{controller => }/task/ClickButtonTask.java | 7 +++++-- .../java/skybot/{controller => }/task/HoldKeyTask.java | 2 +- .../java/skybot/{controller => }/task/PauseTask.java | 2 +- .../skybot/{controller => }/task/PressButtonTask.java | 2 +- .../{controller => }/task/ReleaseButtonTask.java | 2 +- .../skybot/{controller => }/task/RunCommandTask.java | 2 +- src/client/java/skybot/{controller => }/task/Task.java | 7 +++++-- .../java/skybot/{controller => }/task/TaskQueue.java | 2 +- 13 files changed, 31 insertions(+), 25 deletions(-) rename src/client/java/skybot/{controller => }/task/ClickButtonTask.java (90%) rename src/client/java/skybot/{controller => }/task/HoldKeyTask.java (95%) rename src/client/java/skybot/{controller => }/task/PauseTask.java (94%) rename src/client/java/skybot/{controller => }/task/PressButtonTask.java (93%) rename src/client/java/skybot/{controller => }/task/ReleaseButtonTask.java (93%) rename src/client/java/skybot/{controller => }/task/RunCommandTask.java (95%) rename src/client/java/skybot/{controller => }/task/Task.java (74%) rename src/client/java/skybot/{controller => }/task/TaskQueue.java (98%) diff --git a/src/client/java/skybot/SkybotClient.java b/src/client/java/skybot/SkybotClient.java index 3d3a0d8..bfaa736 100644 --- a/src/client/java/skybot/SkybotClient.java +++ b/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 { diff --git a/src/client/java/skybot/farmers/CarrotFarmer.java b/src/client/java/skybot/farmers/CarrotFarmer.java index 4bd5bed..96d533d 100644 --- a/src/client/java/skybot/farmers/CarrotFarmer.java +++ b/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.controller.task.PressButtonTask; -import skybot.controller.task.ReleaseButtonTask; -import skybot.controller.task.RunCommandTask; -import skybot.controller.task.TaskQueue; +import skybot.task.HoldKeyTask; +import skybot.task.PressButtonTask; +import skybot.task.ReleaseButtonTask; +import skybot.task.RunCommandTask; +import skybot.task.TaskQueue; public class CarrotFarmer implements Farmer { diff --git a/src/client/java/skybot/farmers/Farmer.java b/src/client/java/skybot/farmers/Farmer.java index 1f4865a..3b910bc 100644 --- a/src/client/java/skybot/farmers/Farmer.java +++ b/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); diff --git a/src/client/java/skybot/farmers/PotatoFarmer.java b/src/client/java/skybot/farmers/PotatoFarmer.java index 35f83d9..cacc220 100644 --- a/src/client/java/skybot/farmers/PotatoFarmer.java +++ b/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.controller.task.PressButtonTask; -import skybot.controller.task.ReleaseButtonTask; -import skybot.controller.task.RunCommandTask; -import skybot.controller.task.TaskQueue; +import skybot.task.HoldKeyTask; +import skybot.task.PressButtonTask; +import skybot.task.ReleaseButtonTask; +import skybot.task.RunCommandTask; +import skybot.task.TaskQueue; public class PotatoFarmer implements Farmer { diff --git a/src/client/java/skybot/farmers/TestFarmer.java b/src/client/java/skybot/farmers/TestFarmer.java index bd14e2e..e1c71fb 100644 --- a/src/client/java/skybot/farmers/TestFarmer.java +++ b/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.controller.task.PauseTask; -import skybot.controller.task.TaskQueue; +import skybot.task.ClickButtonTask; +import skybot.task.PauseTask; +import skybot.task.TaskQueue; public class TestFarmer implements Farmer { diff --git a/src/client/java/skybot/controller/task/ClickButtonTask.java b/src/client/java/skybot/task/ClickButtonTask.java similarity index 90% rename from src/client/java/skybot/controller/task/ClickButtonTask.java rename to src/client/java/skybot/task/ClickButtonTask.java index 902d769..05b30a9 100644 --- a/src/client/java/skybot/controller/task/ClickButtonTask.java +++ b/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 setter; private long endTime; diff --git a/src/client/java/skybot/controller/task/HoldKeyTask.java b/src/client/java/skybot/task/HoldKeyTask.java similarity index 95% rename from src/client/java/skybot/controller/task/HoldKeyTask.java rename to src/client/java/skybot/task/HoldKeyTask.java index 906eb65..a7d2fc0 100644 --- a/src/client/java/skybot/controller/task/HoldKeyTask.java +++ b/src/client/java/skybot/task/HoldKeyTask.java @@ -1,4 +1,4 @@ -package skybot.controller.task; +package skybot.task; import java.util.function.Consumer; diff --git a/src/client/java/skybot/controller/task/PauseTask.java b/src/client/java/skybot/task/PauseTask.java similarity index 94% rename from src/client/java/skybot/controller/task/PauseTask.java rename to src/client/java/skybot/task/PauseTask.java index 19e16ee..aa2179b 100644 --- a/src/client/java/skybot/controller/task/PauseTask.java +++ b/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 diff --git a/src/client/java/skybot/controller/task/PressButtonTask.java b/src/client/java/skybot/task/PressButtonTask.java similarity index 93% rename from src/client/java/skybot/controller/task/PressButtonTask.java rename to src/client/java/skybot/task/PressButtonTask.java index 3c30756..fba4790 100644 --- a/src/client/java/skybot/controller/task/PressButtonTask.java +++ b/src/client/java/skybot/task/PressButtonTask.java @@ -1,4 +1,4 @@ -package skybot.controller.task; +package skybot.task; import java.util.function.Consumer; diff --git a/src/client/java/skybot/controller/task/ReleaseButtonTask.java b/src/client/java/skybot/task/ReleaseButtonTask.java similarity index 93% rename from src/client/java/skybot/controller/task/ReleaseButtonTask.java rename to src/client/java/skybot/task/ReleaseButtonTask.java index 1b2d0c6..65c1998 100644 --- a/src/client/java/skybot/controller/task/ReleaseButtonTask.java +++ b/src/client/java/skybot/task/ReleaseButtonTask.java @@ -1,4 +1,4 @@ -package skybot.controller.task; +package skybot.task; import java.util.function.Consumer; diff --git a/src/client/java/skybot/controller/task/RunCommandTask.java b/src/client/java/skybot/task/RunCommandTask.java similarity index 95% rename from src/client/java/skybot/controller/task/RunCommandTask.java rename to src/client/java/skybot/task/RunCommandTask.java index e3bd9c4..6f3e3f4 100644 --- a/src/client/java/skybot/controller/task/RunCommandTask.java +++ b/src/client/java/skybot/task/RunCommandTask.java @@ -1,4 +1,4 @@ -package skybot.controller.task; +package skybot.task; import net.minecraft.client.MinecraftClient; diff --git a/src/client/java/skybot/controller/task/Task.java b/src/client/java/skybot/task/Task.java similarity index 74% rename from src/client/java/skybot/controller/task/Task.java rename to src/client/java/skybot/task/Task.java index adbe660..fe3179c 100644 --- a/src/client/java/skybot/controller/task/Task.java +++ b/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() { } diff --git a/src/client/java/skybot/controller/task/TaskQueue.java b/src/client/java/skybot/task/TaskQueue.java similarity index 98% rename from src/client/java/skybot/controller/task/TaskQueue.java rename to src/client/java/skybot/task/TaskQueue.java index 561185b..3ae2728 100644 --- a/src/client/java/skybot/controller/task/TaskQueue.java +++ b/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;