RepoMirrors/kami-blue
1
0
Fork 1
mirror of https://github.com/kami-blue/client synced 2025-02-20 23:27:14 +00:00
Code Issues Releases Wiki Activity

Added goto and proper ID support for ;coord and close #869

Browse Source
This commit is contained in:
Dominika 2020-05-25 14:34:37 -04:00
parent 1feee2732d
commit f965af268e
No known key found for this signature in database
GPG Key ID: B4A5A6DCA70F861F
4 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/zeroeightsix/kami/command/commands/BaritoneCommand.kt
View File

@ -8,7 +8,7 @@ import me.zeroeightsix.kami.util.MessageSendHelper
/**
* @author dominikaaaa
*/
class BaritoneCommand : Command("baritone", ChunkBuilder().append("command", true, EnumParser(arrayOf("goto", "mine", "tunnel", "farm", "explore", "click", "build", "cancel", "help"))).build(), "b") {
class BaritoneCommand : Command("baritone", ChunkBuilder().append("command", true, EnumParser(arrayOf("goto", "mine", "tunnel", "farm", "explore", "click", "build", "cancel", "pause", "resume", "help"))).build(), "b") {
override fun call(args: Array<out String>?) {
val newArgs = arrayOfNulls<String>(args!!.size - 1) // returns Array<String?>

54
src/main/java/me/zeroeightsix/kami/command/commands/CoordsCommand.java
View File

@ -3,12 +3,15 @@ package me.zeroeightsix.kami.command.commands;
import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.command.syntax.ChunkBuilder;
import me.zeroeightsix.kami.command.syntax.parsers.EnumParser;
import me.zeroeightsix.kami.module.modules.movement.AutoWalk;
import me.zeroeightsix.kami.util.Coordinate;
import me.zeroeightsix.kami.util.CoordinateInfo;
import me.zeroeightsix.kami.util.MessageSendHelper;
import java.util.ArrayList;
import java.util.Objects;
import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER;
import static me.zeroeightsix.kami.util.CoordUtil.*;
import static me.zeroeightsix.kami.util.MessageSendHelper.sendChatMessage;
import static me.zeroeightsix.kami.util.MessageSendHelper.sendRawChatMessage;
@ -21,8 +24,8 @@ import static me.zeroeightsix.kami.util.MessageSendHelper.sendRawChatMessage;
public class CoordsCommand extends Command {
public CoordsCommand() {
super("coord", new ChunkBuilder()
.append("command", true, new EnumParser(new String[]{"add", "del", "list", "stashes", "help"}))
.append("name", false)
.append("command", true, new EnumParser(new String[]{"add", "del", "goto", "list", "stashes", "help"}))
.append("name|id", false)
.build(), "pos");
setDescription("Log the current coordinates.");
}
@ -50,20 +53,36 @@ public class CoordsCommand extends Command {
case "del":
if (args[1] != null) {
if (removeCoord(args[1], coordsLogFilename)) {
sendChatMessage("Removed coordinate with name " + args[1]);
sendChatMessage("Removed coordinate with ID " + args[1]);
} else {
sendChatMessage("No coordinate with name " + args[1]);
sendChatMessage("No coordinate with ID " + args[1]);
}
} else {
sendChatMessage("Please provide the name of a coordinate to remove.");
sendChatMessage("Please provide the ID of a coordinate to remove.");
}
break;
case "goto":
if (args[1] != null) {
Coordinate current = getCoord(args[1], coordsLogFilename);
if (current != null) {
if (MODULE_MANAGER.isModuleEnabled(AutoWalk.class)) {
MODULE_MANAGER.getModuleT(AutoWalk.class).disable();
}
MessageSendHelper.sendBaritoneCommand("goto", Integer.toString(current.x), Integer.toString(current.y), Integer.toString(current.z));
} else {
sendChatMessage("Couldn't find a coordinate with the ID " + args[1]);
}
} else {
sendChatMessage("Please provide the ID of a coordinate to go to.");
}
break;
case "help":
sendChatMessage("Coordinate logger help:");
sendRawChatMessage(" list &7[searchterm]&f - lists logged coordinates, optionally searches and filters the results");
sendChatMessage("Coordinate command help:");
sendRawChatMessage(" list &7<search>&f - lists logged coordinates, optionally searches and filters the results");
sendRawChatMessage(" stashes - lists logged stashes");
sendRawChatMessage(" add &7[name]&f - logs a coordinate with an optional name");
sendRawChatMessage(" del <name> - removes a coordinate with the specified name");
sendRawChatMessage(" add &7<name>&f - logs a coordinate with an optional name");
sendRawChatMessage(" del &7<id>&f - removes a coordinate with the specified ID");
sendRawChatMessage(" goto &7<id>&f - goes to a coordinate with the specified ID");
sendRawChatMessage(" help - displays this list");
break;
default:
@ -103,28 +122,31 @@ public class CoordsCommand extends Command {
});
}
}
private void searchCoords(String searchterm) {
private void searchCoords(String search) {
boolean hasfound = false;
boolean firstfind = true;
ArrayList<CoordinateInfo> coords = readCoords(coordsLogFilename);
for (CoordinateInfo coord : Objects.requireNonNull(coords)) {
if (coord.name.contains(searchterm)) {
if (coord.name.contains(search)) {
if (firstfind) {
sendChatMessage("Result of search for &7" + searchterm + "&f: ");
sendChatMessage("Result of search for &7" + search + "&f: ");
firstfind = false;
}
sendRawChatMessage(format(coord, searchterm));
sendRawChatMessage(format(coord, search));
hasfound = true;
}
}
if (!hasfound) {
sendChatMessage("No results for " + searchterm);
sendChatMessage("No results for " + search);
}
}
private String format(CoordinateInfo coord, String searchterm) {
private String format(CoordinateInfo coord, String search) {
String message = " [" + coord.id + "] " + coord.name + " (" + coord.xyz.x + " " + coord.xyz.y + " " + coord.xyz.z + ")";
return message.replaceAll(searchterm, "&7" + searchterm + "&f");
return message.replaceAll(search, "&7" + search + "&f");
}
private void confirm(String name, Coordinate xyz) {
sendChatMessage("Added coordinate " + xyz.x + " " + xyz.y + " " + xyz.z + " with name " + name + ".");
}

14
src/main/java/me/zeroeightsix/kami/util/CoordUtil.java
View File

@ -45,12 +45,12 @@ public class CoordUtil {
}
}
public static boolean removeCoord(String name, String filename) {
public static boolean removeCoord(String id, String filename) {
boolean removed = false;
try {
ArrayList<CoordinateInfo> coords = readCoords(filename);
for (CoordinateInfo coord : coords) {
if (coord.getName().equals(name)) {
if (coord.getID().equals(id)) {
coords.remove(coord);
removed = true;
break;
@ -66,6 +66,16 @@ public class CoordUtil {
return removed;
}
public static Coordinate getCoord(String id, String filename) {
ArrayList<CoordinateInfo> coords = readCoords(filename);
for (CoordinateInfo coord : coords) {
if (coord.getID().equals(id)) {
return coord.xyz;
}
}
return null;
}
private static CoordinateInfo formatter(Coordinate xyz, String locationName) {
String time = sdf.format(new Date());
return new CoordinateInfo(xyz, locationName, time);

8
src/main/java/me/zeroeightsix/kami/util/CoordinateInfo.java
View File

@ -23,14 +23,14 @@ public class CoordinateInfo {
xyz = new Coordinate(x, y, z);
name = nameSet;
time = timeSet;
id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).size();
id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).get(CoordUtil.readCoords(CoordUtil.coordsLogFilename).size() - 1).id + 1;
}
public CoordinateInfo(Coordinate pos, String nameSet, String timeSet) {
xyz = pos;
name = nameSet;
time = timeSet;
id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).size();
id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).get(CoordUtil.readCoords(CoordUtil.coordsLogFilename).size() - 1).id + 1;
}
public Coordinate getPos() {
@ -48,4 +48,8 @@ public class CoordinateInfo {
public String getDate() {
return date;
}
public String getID() {
return Integer.toString(id);
}
}