This commit is contained in:
BruceChen 2022-09-06 16:10:34 +08:00
parent c50477a712
commit 3dac1f41d1
3 changed files with 22 additions and 12 deletions

View file

@ -25,18 +25,26 @@ namespace MinecraftClient.Commands
Location current = handler.GetCurrentLocation(); Location current = handler.GetCurrentLocation();
Tuple<int, int>? markedChunkPos = ParseChunkPos(args); Tuple<int, int>? markedChunkPos = ParseChunkPos(args);
(int markChunkX, int markChunkZ) = (markedChunkPos == null) ? new(current.ChunkX, current.ChunkZ) : markedChunkPos; (int markChunkX, int markChunkZ) = markedChunkPos ?? (new(current.ChunkX, current.ChunkZ));
StringBuilder sb = new(); StringBuilder sb = new();
sb.Append("Current position");
sb.Append(current.ToString());
sb.Append(", chunk: ");
sb.Append(String.Format("({0}, {1})", current.ChunkX, current.ChunkZ));
sb.Append(".\n");
sb.Append(getChunkLoadingStatus(handler.GetWorld())); sb.Append(getChunkLoadingStatus(handler.GetWorld()));
sb.Append('\n'); sb.Append('\n');
sb.Append(String.Format("Current location{0}, chunk: ({1}, {2}).\n", current, current.ChunkX, current.ChunkZ));
if (markedChunkPos != null)
{
sb.Append("Marked location: ");
if (args.Length == 1 + 3)
sb.Append(String.Format("X:{0:0.00} Y:{1:0.00} Z:{2:0.00}, ", double.Parse(args[1]), double.Parse(args[2]), double.Parse(args[3])));
sb.Append(String.Format("chunk: ({0}, {1}).\n", markChunkX, markChunkZ));
}
if (markedChunkPos != null &&
(markChunkX < current.ChunkX - 16 || markChunkX > current.ChunkX + 16 || markChunkZ < current.ChunkZ - 16 || markChunkZ > current.ChunkZ + 16))
sb.Append("§x§0Since the marked block is outside the graph, it will not be displayed!§r\n");
int startX = current.ChunkX - 16; int startX = current.ChunkX - 16;
int startZ = current.ChunkZ - 16; int startZ = current.ChunkZ - 16;
for (int dz = 0; dz < 32; dz++) for (int dz = 0; dz < 32; dz++)
@ -44,8 +52,10 @@ namespace MinecraftClient.Commands
for (int dx = 0; dx < 32; ++dx) for (int dx = 0; dx < 32; ++dx)
{ {
ChunkColumn? chunkColumn = world[startX + dx, startZ + dz]; ChunkColumn? chunkColumn = world[startX + dx, startZ + dz];
if ((dz == 16 && dx == 16) || (startZ + dz == markChunkZ && startX + dx == markChunkX)) if (dz == 16 && dx == 16)
sb.Append("§w"); // Player Location: background red sb.Append("§z"); // Player Location: background gray
else if (startZ + dz == markChunkZ && startX + dx == markChunkX)
sb.Append("§w"); // Marked chunk: background red
if (chunkColumn == null) if (chunkColumn == null)
sb.Append("🔳"); // empty sb.Append("🔳"); // empty
@ -60,7 +70,7 @@ namespace MinecraftClient.Commands
sb.Append('\n'); sb.Append('\n');
} }
sb.Append("Player or marked chunk:§w §r, NotReceived:🔳, Loading:🟨, Loaded:🟩"); sb.Append("Player:§z §r, MarkedChunk:§w §r, NotReceived:🔳, Loading:🟨, Loaded:🟩");
return sb.ToString(); return sb.ToString();
} }
else if (args[0] == "setloading") // Debug only! else if (args[0] == "setloading") // Debug only!

View file

@ -76,7 +76,7 @@ namespace MinecraftClient.Commands
ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal); ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal);
if (chunkColumn == null || chunkColumn.FullyLoaded == false) if (chunkColumn == null || chunkColumn.FullyLoaded == false)
return Translations.Get("cmd.move.chunk_not_loaded"); return Translations.Get("cmd.move.chunk_not_loaded", goal.X, goal.Y, goal.Z);
if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction)) if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction))
{ {
@ -99,7 +99,7 @@ namespace MinecraftClient.Commands
ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal); ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal);
if (chunkColumn == null || chunkColumn.FullyLoaded == false) if (chunkColumn == null || chunkColumn.FullyLoaded == false)
return Translations.Get("cmd.move.chunk_not_loaded"); return Translations.Get("cmd.move.chunk_not_loaded", x, y, z);
if (takeRisk || Movement.PlayerFitsHere(handler.GetWorld(), goal)) if (takeRisk || Movement.PlayerFitsHere(handler.GetWorld(), goal))
{ {

View file

@ -337,7 +337,7 @@ cmd.move.suggestforce=Failed to compute a safe path to {0}. Try -f parameter to
cmd.move.gravity.enabled=Gravity is enabled. cmd.move.gravity.enabled=Gravity is enabled.
cmd.move.gravity.disabled=Gravity is disabled. cmd.move.gravity.disabled=Gravity is disabled.
cmd.move.chunk_loading_status=Chunk loading status: {0:P} - {1} out of {2} load completed. cmd.move.chunk_loading_status=Chunk loading status: {0:P} - {1} out of {2} load completed.
cmd.move.chunk_not_loaded=The chunk where the target location resides has not yet been loaded. cmd.move.chunk_not_loaded=The chunk where the target location resides has not yet been loaded.\nYou can use "/chunk status {0:0.0} {1:0.0} {2:0.0}" to check the chunk loading status.
# Reco # Reco
cmd.reco.desc=restart and reconnect to the server. cmd.reco.desc=restart and reconnect to the server.