From 7218a46211c6e1e7a44625e1d1b1b5c4d4d03273 Mon Sep 17 00:00:00 2001 From: millennIumAMbiguity <37588844+millennIumAMbiguity@users.noreply.github.com> Date: Mon, 2 Nov 2020 00:33:31 +0100 Subject: [PATCH] Added defaults and javadocs --- .../baritone/api/process/IFarmProcess.java | 20 +++++++++++++++++++ .../command/defaults/FarmCommand.java | 5 +---- .../java/baritone/process/FarmProcess.java | 6 +++++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/api/java/baritone/api/process/IFarmProcess.java b/src/api/java/baritone/api/process/IFarmProcess.java index c9295b76..224307af 100644 --- a/src/api/java/baritone/api/process/IFarmProcess.java +++ b/src/api/java/baritone/api/process/IFarmProcess.java @@ -21,5 +21,25 @@ import net.minecraft.util.math.BlockPos; public interface IFarmProcess extends IBaritoneProcess { + /** + * Begin to search for crops to farm with in specified aria + * from specified location. + * + * @param range The distance from center to farm from + * @param pos The center position to base the range from + */ void farm(int range, BlockPos pos); + + /** + * Begin to search for nearby crops to farm. + */ + default void farm() {farm(0, null);} + + /** + * Begin to search for crops to farm with in specified aria + * from the position the command was executed. + * + * @param range The distance to search for crops to farm + */ + default void farm(int range) {farm(range, null);} } diff --git a/src/main/java/baritone/command/defaults/FarmCommand.java b/src/main/java/baritone/command/defaults/FarmCommand.java index 37c6a78e..9f841acd 100644 --- a/src/main/java/baritone/command/defaults/FarmCommand.java +++ b/src/main/java/baritone/command/defaults/FarmCommand.java @@ -45,7 +45,7 @@ public class FarmCommand extends Command { public void execute(String label, IArgConsumer args) throws CommandException { args.requireMax(2); int range = 0; - BetterBlockPos origin; + BetterBlockPos origin = null; //range if (args.has(1)) { range = args.getAs(Integer.class); @@ -81,11 +81,8 @@ public class FarmCommand extends Command { } else { origin = waypoint.getLocation(); } - } else { - origin = baritone.getPlayerContext().playerFeet(); } - baritone.getFarmProcess().farm(range, origin); logDirect("Farming"); } diff --git a/src/main/java/baritone/process/FarmProcess.java b/src/main/java/baritone/process/FarmProcess.java index 599fa6df..a8806d2b 100644 --- a/src/main/java/baritone/process/FarmProcess.java +++ b/src/main/java/baritone/process/FarmProcess.java @@ -101,7 +101,11 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro @Override public void farm(int range, BlockPos pos) { - center = pos; + if (pos == null) { + center = baritone.getPlayerContext().playerFeet(); + } else { + center = pos; + } this.range = range; active = true; locations = null;