diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/CoordsCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/CoordsCommand.java index 7e833634c..ada792b6f 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/CoordsCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/CoordsCommand.java @@ -89,7 +89,7 @@ public class CoordsCommand extends Command { } else { sendChatMessage("List of logged stashes:"); } - String stashRegex = "(\\(.*chests, .* shulkers\\))"; + String stashRegex = "(\\(.* chests, .* shulkers, .* droppers, .* dispensers\\))"; Objects.requireNonNull(coords).forEach(coord -> { if (stashes) { if (coord.name.matches(stashRegex)) { @@ -122,7 +122,7 @@ public class CoordsCommand extends Command { } } private String format(CoordinateInfo coord, String searchterm) { - String message = " " + coord.name + " (" + coord.xyz.x + " " + coord.xyz.y + " " + coord.xyz.z + ")"; + String message = " [" + coord.id + "] " + coord.name + " (" + coord.xyz.x + " " + coord.xyz.y + " " + coord.xyz.z + ")"; return message.replaceAll(searchterm, "&7" + searchterm + "&f"); } private void confirm(String name, Coordinate xyz) { diff --git a/src/main/java/me/zeroeightsix/kami/util/CoordinateInfo.java b/src/main/java/me/zeroeightsix/kami/util/CoordinateInfo.java index 47528ea1d..def52c389 100644 --- a/src/main/java/me/zeroeightsix/kami/util/CoordinateInfo.java +++ b/src/main/java/me/zeroeightsix/kami/util/CoordinateInfo.java @@ -16,17 +16,21 @@ public class CoordinateInfo { public String time; @SerializedName("date") public String date; + @SerializedName("id") + public int id; public CoordinateInfo(int x, int y, int z, String nameSet, String timeSet) { xyz = new Coordinate(x, y, z); name = nameSet; time = timeSet; + id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).size(); } public CoordinateInfo(Coordinate pos, String nameSet, String timeSet) { xyz = pos; name = nameSet; time = timeSet; + id = CoordUtil.readCoords(CoordUtil.coordsLogFilename).size(); } public Coordinate getPos() {