mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Implement command completion suggestions.
This commit is contained in:
BruceChen
parent
5d2589b10f
commit
84cf749344
115 changed files with 4684 additions and 2695 deletions
|
|
@ -1,8 +1,9 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Brigadier.NET;
|
||||
using Brigadier.NET.Builder;
|
||||
using MinecraftClient.CommandHandler;
|
||||
using MinecraftClient.Mapping;
|
||||
using static MinecraftClient.CommandHandler.CmdResult;
|
||||
|
||||
namespace MinecraftClient.Commands
|
||||
{
|
||||
|
|
@ -12,111 +13,183 @@ namespace MinecraftClient.Commands
|
|||
public override string CmdUsage { get { return "move <on|off|get|up|down|east|west|north|south|center|x y z|gravity [on|off]> [-f]"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_move_desc + " \"-f\": " + Translations.cmd_move_desc_force; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CmdResult> dispatcher)
|
||||
{
|
||||
dispatcher.Register(l => l.Literal("help")
|
||||
.Then(l => l.Literal(CmdName)
|
||||
.Executes(r => GetUsage(r.Source, string.Empty))
|
||||
.Then(l => l.Literal("enable")
|
||||
.Executes(r => GetUsage(r.Source, "enable")))
|
||||
.Then(l => l.Literal("gravity")
|
||||
.Executes(r => GetUsage(r.Source, "gravity")))
|
||||
.Then(l => l.Literal("direction")
|
||||
.Executes(r => GetUsage(r.Source, "direction")))
|
||||
.Then(l => l.Literal("center")
|
||||
.Executes(r => GetUsage(r.Source, "center")))
|
||||
.Then(l => l.Literal("get")
|
||||
.Executes(r => GetUsage(r.Source, "get")))
|
||||
.Then(l => l.Literal("location")
|
||||
.Executes(r => GetUsage(r.Source, "location")))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => GetUsage(r.Source, "-f")))
|
||||
)
|
||||
);
|
||||
|
||||
dispatcher.Register(l => l.Literal(CmdName)
|
||||
.Then(l => l.Literal("on")
|
||||
.Executes(r => SetMovementEnable(r.Source, handler, enable: true)))
|
||||
.Then(l => l.Literal("off")
|
||||
.Executes(r => SetMovementEnable(r.Source, handler, enable: false)))
|
||||
.Then(l => l.Literal("gravity")
|
||||
.Executes(r => SetGravityEnable(r.Source, handler, enable: null))
|
||||
.Then(l => l.Literal("on")
|
||||
.Executes(r => SetGravityEnable(r.Source, handler, enable: true)))
|
||||
.Then(l => l.Literal("off")
|
||||
.Executes(r => SetGravityEnable(r.Source, handler, enable: false))))
|
||||
.Then(l => l.Literal("up")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.Up, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.Up, true))))
|
||||
.Then(l => l.Literal("down")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.Down, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.Down, true))))
|
||||
.Then(l => l.Literal("east")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.East, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.East, true))))
|
||||
.Then(l => l.Literal("west")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.West, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.West, true))))
|
||||
.Then(l => l.Literal("north")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.North, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.North, true))))
|
||||
.Then(l => l.Literal("south")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.South, false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveOnDirection(r.Source, handler, Direction.South, true))))
|
||||
.Then(l => l.Literal("center")
|
||||
.Executes(r => MoveToCenter(r.Source, handler)))
|
||||
.Then(l => l.Literal("get")
|
||||
.Executes(r => GetCurrentLocation(r.Source, handler)))
|
||||
.Then(l => l.Argument("location", MccArguments.Location())
|
||||
.Executes(r => MoveToLocation(r.Source, handler, MccArguments.GetLocation(r, "location"), false))
|
||||
.Then(l => l.Literal("-f")
|
||||
.Executes(r => MoveToLocation(r.Source, handler, MccArguments.GetLocation(r, "location"), true))))
|
||||
.Then(l => l.Literal("_help")
|
||||
.Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
|
||||
);
|
||||
}
|
||||
|
||||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
private int GetUsage(CmdResult r, string? cmd)
|
||||
{
|
||||
List<string> args = GetArgs(command.ToLower()).ToList();
|
||||
bool takeRisk = false;
|
||||
|
||||
if (args.Count < 1)
|
||||
return r.SetAndReturn(cmd switch
|
||||
{
|
||||
string desc = GetCmdDescTranslated();
|
||||
#pragma warning disable format // @formatter:off
|
||||
"enable" => GetCmdDescTranslated(),
|
||||
"gravity" => GetCmdDescTranslated(),
|
||||
"direction" => GetCmdDescTranslated(),
|
||||
"center" => GetCmdDescTranslated(),
|
||||
"get" => GetCmdDescTranslated(),
|
||||
"location" => GetCmdDescTranslated(),
|
||||
"-f" => GetCmdDescTranslated(),
|
||||
_ => GetCmdDescTranslated(),
|
||||
#pragma warning restore format // @formatter:on
|
||||
});
|
||||
}
|
||||
|
||||
if (handler.GetTerrainEnabled())
|
||||
handler.Log.Info(World.GetChunkLoadingStatus(handler.GetWorld()));
|
||||
|
||||
return desc;
|
||||
}
|
||||
|
||||
if (args.Contains("-f"))
|
||||
{
|
||||
takeRisk = true;
|
||||
args.Remove("-f");
|
||||
}
|
||||
|
||||
if (args[0] == "on")
|
||||
private int SetMovementEnable(CmdResult r, McClient handler, bool enable)
|
||||
{
|
||||
if (enable)
|
||||
{
|
||||
handler.SetTerrainEnabled(true);
|
||||
return Translations.cmd_move_enable;
|
||||
return r.SetAndReturn(CmdResult.Status.Done, Translations.cmd_move_enable);
|
||||
}
|
||||
else if (args[0] == "off")
|
||||
else
|
||||
{
|
||||
handler.SetTerrainEnabled(false);
|
||||
return Translations.cmd_move_disable;
|
||||
return r.SetAndReturn(CmdResult.Status.Done, Translations.cmd_move_disable);
|
||||
}
|
||||
else if (args[0] == "gravity")
|
||||
}
|
||||
|
||||
private int SetGravityEnable(CmdResult r, McClient handler, bool? enable)
|
||||
{
|
||||
if (enable.HasValue)
|
||||
Settings.InternalConfig.GravityEnabled = enable.Value;
|
||||
|
||||
if (Settings.InternalConfig.GravityEnabled)
|
||||
return r.SetAndReturn(CmdResult.Status.Done, Translations.cmd_move_gravity_enabled);
|
||||
else
|
||||
return r.SetAndReturn(CmdResult.Status.Done, Translations.cmd_move_gravity_disabled);
|
||||
}
|
||||
|
||||
private int GetCurrentLocation(CmdResult r, McClient handler)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return r.SetAndReturn(Status.FailNeedTerrain);
|
||||
|
||||
return r.SetAndReturn(Status.Done, handler.GetCurrentLocation().ToString());
|
||||
}
|
||||
|
||||
private int MoveToCenter(CmdResult r, McClient handler)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return r.SetAndReturn(Status.FailNeedTerrain);
|
||||
|
||||
Location current = handler.GetCurrentLocation();
|
||||
Location currentCenter = new(Math.Floor(current.X) + 0.5, current.Y, Math.Floor(current.Z) + 0.5);
|
||||
handler.MoveTo(currentCenter, allowDirectTeleport: true);
|
||||
return r.SetAndReturn(Status.Done, string.Format(Translations.cmd_move_walk, currentCenter, current));
|
||||
}
|
||||
|
||||
private int MoveOnDirection(CmdResult r, McClient handler, Direction direction, bool takeRisk)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return r.SetAndReturn(Status.FailNeedTerrain);
|
||||
|
||||
Location goal = Movement.Move(handler.GetCurrentLocation(), direction);
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), handler.GetCurrentLocation(), goal))
|
||||
return r.SetAndReturn(Status.FailChunkNotLoad, string.Format(Translations.cmd_move_chunk_not_loaded, goal.X, goal.Y, goal.Z));
|
||||
|
||||
if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction))
|
||||
{
|
||||
if (args.Count >= 2)
|
||||
Settings.InternalConfig.GravityEnabled = (args[1] == "on");
|
||||
if (Settings.InternalConfig.GravityEnabled)
|
||||
return Translations.cmd_move_gravity_enabled;
|
||||
else return Translations.cmd_move_gravity_disabled;
|
||||
if (handler.MoveTo(goal, allowUnsafe: takeRisk))
|
||||
return r.SetAndReturn(Status.Done, string.Format(Translations.cmd_move_moving, direction.ToString()));
|
||||
else
|
||||
return r.SetAndReturn(Status.Fail, takeRisk ? Translations.cmd_move_dir_fail : Translations.cmd_move_suggestforce);
|
||||
}
|
||||
else if (handler.GetTerrainEnabled())
|
||||
else
|
||||
{
|
||||
if (args.Count == 1)
|
||||
{
|
||||
Direction direction;
|
||||
switch (args[0])
|
||||
{
|
||||
case "up": direction = Direction.Up; break;
|
||||
case "down": direction = Direction.Down; break;
|
||||
case "east": direction = Direction.East; break;
|
||||
case "west": direction = Direction.West; break;
|
||||
case "north": direction = Direction.North; break;
|
||||
case "south": direction = Direction.South; break;
|
||||
case "center":
|
||||
Location current = handler.GetCurrentLocation();
|
||||
Location currentCenter = new(Math.Floor(current.X) + 0.5, current.Y, Math.Floor(current.Z) + 0.5);
|
||||
handler.MoveTo(currentCenter, allowDirectTeleport: true);
|
||||
return string.Format(Translations.cmd_move_walk, currentCenter, current);
|
||||
case "get": return handler.GetCurrentLocation().ToString();
|
||||
default: return string.Format(Translations.cmd_look_unknown, args[0]);
|
||||
}
|
||||
|
||||
Location goal = Movement.Move(handler.GetCurrentLocation(), direction);
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), handler.GetCurrentLocation(), goal))
|
||||
return string.Format(Translations.cmd_move_chunk_not_loaded, goal.X, goal.Y, goal.Z);
|
||||
|
||||
if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction))
|
||||
{
|
||||
if (handler.MoveTo(goal, allowUnsafe: takeRisk))
|
||||
return string.Format(Translations.cmd_move_moving, args[0]);
|
||||
else
|
||||
return takeRisk ? Translations.cmd_move_dir_fail : Translations.cmd_move_suggestforce;
|
||||
}
|
||||
else return Translations.cmd_move_dir_fail;
|
||||
}
|
||||
else if (args.Count == 3)
|
||||
{
|
||||
try
|
||||
{
|
||||
Location current = handler.GetCurrentLocation(), currentCenter = current.ToCenter();
|
||||
Location goal = Location.Parse(current, args[0], args[1], args[2]);
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), current, goal))
|
||||
return string.Format(Translations.cmd_move_chunk_not_loaded, goal.X, goal.Y, goal.Z);
|
||||
|
||||
if (takeRisk || Movement.PlayerFitsHere(handler.GetWorld(), goal))
|
||||
{
|
||||
if (current.ToFloor() == goal.ToFloor())
|
||||
handler.MoveTo(goal, allowDirectTeleport: true);
|
||||
else if (!handler.MoveTo(goal, allowUnsafe: takeRisk))
|
||||
return takeRisk ? string.Format(Translations.cmd_move_fail, goal) : string.Format(Translations.cmd_move_suggestforce, goal);
|
||||
return string.Format(Translations.cmd_move_walk, goal, current);
|
||||
}
|
||||
else
|
||||
return string.Format(Translations.cmd_move_suggestforce, goal);
|
||||
}
|
||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
return r.SetAndReturn(Status.Fail, Translations.cmd_move_dir_fail);
|
||||
}
|
||||
}
|
||||
|
||||
private int MoveToLocation(CmdResult r, McClient handler, Location goal, bool takeRisk)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return r.SetAndReturn(Status.FailNeedTerrain);
|
||||
|
||||
Location current = handler.GetCurrentLocation(), currentCenter = current.ToCenter();
|
||||
goal.ToAbsolute(current);
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), current, goal))
|
||||
return r.SetAndReturn(Status.FailChunkNotLoad, string.Format(Translations.cmd_move_chunk_not_loaded, goal.X, goal.Y, goal.Z));
|
||||
|
||||
if (takeRisk || Movement.PlayerFitsHere(handler.GetWorld(), goal))
|
||||
{
|
||||
if (current.ToFloor() == goal.ToFloor())
|
||||
handler.MoveTo(goal, allowDirectTeleport: true);
|
||||
else if (!handler.MoveTo(goal, allowUnsafe: takeRisk))
|
||||
return r.SetAndReturn(Status.Fail, takeRisk ? string.Format(Translations.cmd_move_fail, goal) : string.Format(Translations.cmd_move_suggestforce, goal));
|
||||
return r.SetAndReturn(Status.Done, string.Format(Translations.cmd_move_walk, goal, current));
|
||||
}
|
||||
else
|
||||
{
|
||||
return r.SetAndReturn(Status.Fail, string.Format(Translations.cmd_move_suggestforce, goal));
|
||||
}
|
||||
else return Translations.extra_terrainandmovement_required;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue