From 39aeecad1a0c2f709c319c1bc3962159dfd71cc4 Mon Sep 17 00:00:00 2001 From: Caleb Burke Date: Sat, 4 Jul 2026 05:41:33 -0700 Subject: [PATCH] CarrotFarmer simplification --- .../skybot/controller/task/TaskQueue.java | 6 +++++ .../java/skybot/farmers/CarrotFarmer.java | 26 ++++++------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/client/java/skybot/controller/task/TaskQueue.java b/src/client/java/skybot/controller/task/TaskQueue.java index 4aae58f..561185b 100644 --- a/src/client/java/skybot/controller/task/TaskQueue.java +++ b/src/client/java/skybot/controller/task/TaskQueue.java @@ -27,6 +27,12 @@ public class TaskQueue { return this; } + public TaskQueue add(Task task, long delayMs) { + pending.add(new PauseTask(delayMs)); + pending.add(task); + return this; + } + public void tick() { if (current != null && current.isDone()) { current.stop(); diff --git a/src/client/java/skybot/farmers/CarrotFarmer.java b/src/client/java/skybot/farmers/CarrotFarmer.java index 92562af..4bd5bed 100644 --- a/src/client/java/skybot/farmers/CarrotFarmer.java +++ b/src/client/java/skybot/farmers/CarrotFarmer.java @@ -1,12 +1,10 @@ package skybot.farmers; -import net.minecraft.client.util.InputUtil; import skybot.controller.Controller; -import skybot.controller.task.ClickButtonTask; import skybot.controller.task.HoldKeyTask; -import skybot.controller.task.PauseTask; import skybot.controller.task.PressButtonTask; import skybot.controller.task.ReleaseButtonTask; +import skybot.controller.task.RunCommandTask; import skybot.controller.task.TaskQueue; public class CarrotFarmer implements Farmer { @@ -15,40 +13,32 @@ public class CarrotFarmer implements Farmer { public void enqueue(TaskQueue queue) { queue.clear(); - queue.add(new PauseTask(1998)); - queue.add(new ClickButtonTask(Controller.key(InputUtil.GLFW_KEY_KP_7))); + queue.add(new RunCommandTask("warp garden"), 1998); int EPOCHS = 2; for (int i = 0; i < EPOCHS; i++) { - queue.add(new PauseTask(2021)); - - queue.add(new PressButtonTask(Controller::setLeftClick)); + queue.add(new PressButtonTask(Controller::setLeftClick), 2021); queue.add(new HoldKeyTask(Controller::setLeft, 119555)); queue.add(new ReleaseButtonTask(Controller::setLeftClick)); - queue.add(new PauseTask(2015)); - queue.add(new PressButtonTask(Controller::setLeftClick)); + queue.add(new PressButtonTask(Controller::setLeftClick), 2015); queue.add(new HoldKeyTask(Controller::setRight, 119402)); queue.add(new ReleaseButtonTask(Controller::setLeftClick)); - queue.add(new PauseTask(1998)); - queue.add(new PressButtonTask(Controller::setLeftClick)); + queue.add(new PressButtonTask(Controller::setLeftClick), 1998); queue.add(new HoldKeyTask(Controller::setLeft, 119223)); queue.add(new ReleaseButtonTask(Controller::setLeftClick)); - queue.add(new PauseTask(2203)); - queue.add(new PressButtonTask(Controller::setLeftClick)); + queue.add(new PressButtonTask(Controller::setLeftClick), 2203); queue.add(new HoldKeyTask(Controller::setRight, 119198)); queue.add(new ReleaseButtonTask(Controller::setLeftClick)); - queue.add(new PauseTask(1998)); - queue.add(new PressButtonTask(Controller::setLeftClick)); + queue.add(new PressButtonTask(Controller::setLeftClick), 1998); queue.add(new HoldKeyTask(Controller::setLeft, 120155)); queue.add(new ReleaseButtonTask(Controller::setLeftClick)); - queue.add(new PauseTask(2126)); - queue.add(new ClickButtonTask(Controller.key(InputUtil.GLFW_KEY_KP_7))); + queue.add(new RunCommandTask("warp garden"), 2126); } } }