thisway command + fixed fromDirection for you + fixed double/float argparsers

This commit is contained in:
Logan Darklock 2019-08-30 22:27:30 -07:00
parent 172ce3a054
commit c938983ff5
No known key found for this signature in database
GPG Key ID: B8C37CEDE1AC60EA
4 changed files with 68 additions and 4 deletions

View File

@ -93,7 +93,7 @@ public class GoalXZ implements Goal {
float theta = (float) Math.toRadians(yaw); float theta = (float) Math.toRadians(yaw);
double x = origin.x - MathHelper.sin(theta) * distance; double x = origin.x - MathHelper.sin(theta) * distance;
double z = origin.z + MathHelper.cos(theta) * distance; double z = origin.z + MathHelper.cos(theta) * distance;
return new GoalXZ((int) x, (int) z); return new GoalXZ(MathHelper.floor(x), MathHelper.floor(z));
} }
public int getX() { public int getX() {

View File

@ -50,7 +50,7 @@ public class DefaultArgParsers {
public Float parseArg(CommandArgument arg) throws RuntimeException { public Float parseArg(CommandArgument arg) throws RuntimeException {
String value = arg.value; String value = arg.value;
if (!value.matches("^[+-]?\\d+(?:\\.\\d+)$")) { if (!value.matches("^([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)|)$")) {
throw new RuntimeException("failed float format check"); throw new RuntimeException("failed float format check");
} }
@ -69,7 +69,7 @@ public class DefaultArgParsers {
public Double parseArg(CommandArgument arg) throws RuntimeException { public Double parseArg(CommandArgument arg) throws RuntimeException {
String value = arg.value; String value = arg.value;
if (!value.matches("^[+-]?\\d+(?:\\.\\d+)$")) { if (!value.matches("^([+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)|)$")) {
throw new RuntimeException("failed double format check"); throw new RuntimeException("failed double format check");
} }

View File

@ -60,6 +60,7 @@ public class DefaultCommands {
new BlacklistCommand(), new BlacklistCommand(),
new FindCommand(), new FindCommand(),
new MineCommand(), new MineCommand(),
new ClickCommand() new ClickCommand(),
new ThisWayCommand()
)); ));
} }

View File

@ -0,0 +1,63 @@
/*
* This file is part of Baritone.
*
* Baritone is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Baritone is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.defaults;
import baritone.api.Settings;
import baritone.api.pathing.goals.GoalXZ;
import baritone.api.utils.command.Command;
import baritone.api.utils.command.helpers.arguments.ArgConsumer;
import java.util.List;
import java.util.stream.Stream;
import static java.util.Arrays.asList;
public class ThisWayCommand extends Command {
public ThisWayCommand() {
super(asList("thisway", "forward"), "Travel in your current direction");
}
@Override
protected void executed(String label, ArgConsumer args, Settings settings) {
args.requireExactly(1);
GoalXZ goal = GoalXZ.fromDirection(
ctx.playerFeetAsVec(),
ctx.player().rotationYawHead,
args.getAs(Double.class)
);
baritone.getCustomGoalProcess().setGoal(goal);
logDirect(String.format("Goal: %s", goal));
}
@Override
protected Stream<String> tabCompleted(String label, ArgConsumer args, Settings settings) {
return Stream.empty();
}
@Override
public List<String> getLongDesc() {
return asList(
"Creates a GoalXZ some amount of blocks in the direction you're currently looking",
"",
"Usage:",
"> thisway <distance> - makes a GoalXZ distance blocks in front of you"
);
}
}