mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2025-10-14 21:22:49 +00:00
Merge master into brigadier-dev
This commit is contained in:
BruceChen
commit
f2f88ac009
197 changed files with 102227 additions and 3487 deletions
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "animation"; } }
|
||||
public override string CmdUsage { get { return "animation <mainhand|offhand>"; } }
|
||||
public override string CmdDesc { get { return "cmd.animation.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_animation_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -63,12 +63,12 @@ namespace MinecraftClient.Commands
|
|||
if (args[0] == "mainhand" || args[0] == "0")
|
||||
{
|
||||
handler.DoAnimation(0);
|
||||
return Translations.Get("general.done");
|
||||
return Translations.general_done;
|
||||
}
|
||||
else if (args[0] == "offhand" || args[0] == "1")
|
||||
{
|
||||
handler.DoAnimation(1);
|
||||
return Translations.Get("general.done");
|
||||
return Translations.general_done;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "bed"; } }
|
||||
public override string CmdUsage { get { return "bed leave|sleep <x> <y> <z>|sleep <radius>"; } }
|
||||
public override string CmdDesc { get { return "cmd.bed.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_bed_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -29,20 +29,20 @@ namespace MinecraftClient.Commands
|
|||
if (subcommand.Equals("leave") || subcommand.Equals("l"))
|
||||
{
|
||||
handler.SendEntityAction(Protocol.EntityActionType.LeaveBed);
|
||||
return Translations.TryGet("cmd.bed.leaving");
|
||||
return Translations.cmd_bed_leaving;
|
||||
}
|
||||
|
||||
if (subcommand.Equals("sleep") || subcommand.Equals("s"))
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return Translations.TryGet("error.terrain_not_enabled");
|
||||
return Translations.error_terrain_not_enabled;
|
||||
|
||||
if (args.Length == 2)
|
||||
{
|
||||
if (!int.TryParse(args[1], NumberStyles.Any, CultureInfo.CurrentCulture, out int radius))
|
||||
return CmdUsage;
|
||||
|
||||
handler.GetLogger().Info(Translations.TryGet("cmd.bed.searching", radius));
|
||||
handler.GetLogger().Info(string.Format(Translations.cmd_bed_searching, radius));
|
||||
|
||||
Location current = handler.GetCurrentLocation();
|
||||
Location bedLocation = current;
|
||||
|
|
@ -80,12 +80,12 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
|
||||
if (!found)
|
||||
return Translations.TryGet("cmd.bed.bed_not_found");
|
||||
return Translations.cmd_bed_bed_not_found;
|
||||
|
||||
handler.Log.Info(Translations.TryGet("cmd.bed.found_a_bed_at", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
handler.Log.Info(string.Format(Translations.cmd_bed_found_a_bed_at, bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), current, bedLocation))
|
||||
return Translations.Get("cmd.move.chunk_not_loaded", bedLocation.X, bedLocation.Y, bedLocation.Z);
|
||||
return string.Format(Translations.cmd_move_chunk_not_loaded, bedLocation.X, bedLocation.Y, bedLocation.Z);
|
||||
|
||||
if (handler.MoveTo(bedLocation))
|
||||
{
|
||||
|
|
@ -105,27 +105,27 @@ namespace MinecraftClient.Commands
|
|||
|
||||
if (!atTheLocation)
|
||||
{
|
||||
handler.Log.Info(Translations.TryGet("cmd.bed.failed_to_reach_in_time", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
handler.Log.Info(string.Format(Translations.cmd_bed_failed_to_reach_in_time, bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
return;
|
||||
}
|
||||
|
||||
handler.Log.Info(Translations.TryGet("cmd.bed.moving", bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
handler.Log.Info(string.Format(Translations.cmd_bed_moving, bedLocation.X, bedLocation.Y, bedLocation.Z));
|
||||
|
||||
bool res = handler.PlaceBlock(bedLocation, Direction.Down);
|
||||
|
||||
handler.Log.Info(Translations.TryGet(
|
||||
"cmd.bed.trying_to_use",
|
||||
handler.Log.Info(string.Format(
|
||||
Translations.cmd_bed_trying_to_use,
|
||||
bedLocation.X,
|
||||
bedLocation.Y,
|
||||
bedLocation.Z,
|
||||
Translations.TryGet(res ? "cmd.bed.in" : "cmd.bed.not_in")
|
||||
res ? Translations.cmd_bed_in : Translations.cmd_bed_not_in
|
||||
));
|
||||
});
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
return Translations.Get("cmd.bed.cant_reach_safely");
|
||||
return Translations.cmd_bed_cant_reach_safely;
|
||||
}
|
||||
|
||||
if (args.Length >= 3)
|
||||
|
|
@ -134,16 +134,16 @@ namespace MinecraftClient.Commands
|
|||
Location blockCenter = block.ToCenter();
|
||||
|
||||
if (!handler.GetWorld().GetBlock(block).Type.IsBed())
|
||||
return Translations.TryGet("cmd.bed.not_a_bed", blockCenter.X, blockCenter.Y, blockCenter.Z);
|
||||
return string.Format(Translations.cmd_bed_not_a_bed, blockCenter.X, blockCenter.Y, blockCenter.Z);
|
||||
|
||||
bool res = handler.PlaceBlock(block, Direction.Down);
|
||||
|
||||
return Translations.TryGet(
|
||||
"cmd.bed.trying_to_use",
|
||||
return string.Format(
|
||||
Translations.cmd_bed_trying_to_use,
|
||||
blockCenter.X,
|
||||
blockCenter.Y,
|
||||
blockCenter.Z,
|
||||
Translations.TryGet(res ? "cmd.bed.in" : "cmd.bed.not_in")
|
||||
res ? Translations.cmd_bed_in : Translations.cmd_bed_not_in
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "blockinfo"; } }
|
||||
public override string CmdUsage { get { return "blockinfo <x> <y> <z> [-s]"; } }
|
||||
public override string CmdDesc { get { return "cmd.blockinfo.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_blockinfo_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -18,7 +18,7 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return Translations.TryGet("error.terrain_not_enabled");
|
||||
return Translations.error_terrain_not_enabled;
|
||||
|
||||
string[] args = GetArgs(command);
|
||||
|
||||
|
|
@ -32,12 +32,12 @@ namespace MinecraftClient.Commands
|
|||
|
||||
Block block = handler.GetWorld().GetBlock(targetBlockLocation);
|
||||
|
||||
handler.Log.Info(Translations.TryGet("cmd.blockinfo.BlockType") + ": " + block.GetTypeString());
|
||||
handler.Log.Info($"{Translations.cmd_blockinfo_BlockType}: {block.GetTypeString()}");
|
||||
|
||||
if (reportSurrounding)
|
||||
{
|
||||
StringBuilder sb = new();
|
||||
sb.AppendLine(Translations.TryGet("cmd.blockinfo.BlocksAround") + ":");
|
||||
sb.AppendLine($"{Translations.cmd_blockinfo_BlocksAround}:");
|
||||
|
||||
Block blockXPositive = handler.GetWorld().GetBlock(new Location(targetBlockLocation.X + 1, targetBlockLocation.Y, targetBlockLocation.Z));
|
||||
Block blockXNegative = handler.GetWorld().GetBlock(new Location(targetBlockLocation.X - 1, targetBlockLocation.Y, targetBlockLocation.Z));
|
||||
|
|
@ -46,24 +46,18 @@ namespace MinecraftClient.Commands
|
|||
Block blockZPositive = handler.GetWorld().GetBlock(new Location(targetBlockLocation.X, targetBlockLocation.Y, targetBlockLocation.Z + 1));
|
||||
Block blockZNegative = handler.GetWorld().GetBlock(new Location(targetBlockLocation.X, targetBlockLocation.Y, targetBlockLocation.Z - 1));
|
||||
|
||||
sb.AppendLine("[X " + Translations.TryGet("cmd.blockinfo.Positive") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockXPositive.GetTypeString());
|
||||
sb.AppendLine("[X " + Translations.TryGet("cmd.blockinfo.Negative") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockXNegative.GetTypeString());
|
||||
sb.AppendLine($"[X {Translations.cmd_blockinfo_Positive}] {Translations.cmd_blockinfo_BlockType}: {blockXPositive.GetTypeString()}");
|
||||
sb.AppendLine($"[X {Translations.cmd_blockinfo_Negative}] {Translations.cmd_blockinfo_BlockType}: {blockXNegative.GetTypeString()}");
|
||||
|
||||
sb.AppendLine(" ");
|
||||
|
||||
sb.AppendLine("[Y " + Translations.TryGet("cmd.blockinfo.Positive") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockYPositive.GetTypeString());
|
||||
sb.AppendLine("[Y " + Translations.TryGet("cmd.blockinfo.Negative") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockYNegative.GetTypeString());
|
||||
sb.AppendLine($"[Y {Translations.cmd_blockinfo_Positive}] {Translations.cmd_blockinfo_BlockType}: {blockYPositive.GetTypeString()}");
|
||||
sb.AppendLine($"[Y {Translations.cmd_blockinfo_Negative}] {Translations.cmd_blockinfo_BlockType}: {blockYNegative.GetTypeString()}");
|
||||
|
||||
sb.AppendLine(" ");
|
||||
|
||||
sb.AppendLine("[Z " + Translations.TryGet("cmd.blockinfo.Positive") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockZPositive.GetTypeString());
|
||||
sb.AppendLine("[Z " + Translations.TryGet("cmd.blockinfo.Negative") + "] " +
|
||||
Translations.TryGet("cmd.blockinfo.BlockType") + ": " + blockZNegative.GetTypeString());
|
||||
sb.AppendLine($"[Z {Translations.cmd_blockinfo_Positive}] {Translations.cmd_blockinfo_BlockType}: {blockZPositive.GetTypeString()}");
|
||||
sb.AppendLine($"[Z {Translations.cmd_blockinfo_Negative}] {Translations.cmd_blockinfo_BlockType}: {blockZNegative.GetTypeString()}");
|
||||
|
||||
handler.Log.Info(sb.ToString());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "bots"; } }
|
||||
public override string CmdUsage { get { return "bots [list|unload <bot name|all>]"; } }
|
||||
public override string CmdDesc { get { return "cmd.bots.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_bots_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -30,7 +30,7 @@ namespace MinecraftClient.Commands
|
|||
int length = handler.GetLoadedChatBots().Count;
|
||||
|
||||
if (length == 0)
|
||||
return Translations.TryGet("cmd.bots.noloaded");
|
||||
return Translations.cmd_bots_noloaded;
|
||||
|
||||
for (int i = 0; i < length; i++)
|
||||
{
|
||||
|
|
@ -41,7 +41,7 @@ namespace MinecraftClient.Commands
|
|||
|
||||
}
|
||||
|
||||
return Translations.Get("cmd.bots.list") + ": " + sb.ToString();
|
||||
return Translations.cmd_bots_list + ": " + sb.ToString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -54,20 +54,20 @@ namespace MinecraftClient.Commands
|
|||
if (botName.ToLower().Equals("all", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
if (handler.GetLoadedChatBots().Count == 0)
|
||||
return Translations.TryGet("cmd.bots.noloaded");
|
||||
return Translations.cmd_bots_noloaded;
|
||||
|
||||
handler.UnloadAllBots();
|
||||
return Translations.TryGet("cmd.bots.unloaded_all");
|
||||
return Translations.cmd_bots_unloaded_all;
|
||||
}
|
||||
else
|
||||
{
|
||||
ChatBot? bot = handler.GetLoadedChatBots().Find(bot => bot.GetType().Name.ToLower() == botName.ToLower());
|
||||
|
||||
if (bot == null)
|
||||
return Translations.TryGet("cmd.bots.notfound", botName);
|
||||
return string.Format(Translations.cmd_bots_notfound, botName);
|
||||
|
||||
handler.BotUnLoad(bot);
|
||||
return Translations.TryGet("cmd.bots.unloaded", botName);
|
||||
return string.Format(Translations.cmd_bots_unloaded, botName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "changeslot"; } }
|
||||
public override string CmdUsage { get { return "changeslot <1-9>"; } }
|
||||
public override string CmdDesc { get { return "cmd.changeSlot.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_changeSlot_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -17,7 +17,7 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
if (!handler.GetInventoryEnabled())
|
||||
return Translations.Get("extra.inventory_required");
|
||||
return Translations.extra_inventory_required;
|
||||
|
||||
if (HasArg(command))
|
||||
{
|
||||
|
|
@ -28,17 +28,17 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
catch (FormatException)
|
||||
{
|
||||
return Translations.Get("cmd.changeSlot.nan");
|
||||
return Translations.cmd_changeSlot_nan;
|
||||
}
|
||||
if (slot >= 1 && slot <= 9)
|
||||
{
|
||||
if (handler.ChangeSlot(slot -= 1))
|
||||
{
|
||||
return Translations.Get("cmd.changeSlot.changed", (slot += 1));
|
||||
return string.Format(Translations.cmd_changeSlot_changed, (slot += 1));
|
||||
}
|
||||
else
|
||||
{
|
||||
return Translations.Get("cmd.changeSlot.fail");
|
||||
return Translations.cmd_changeSlot_fail;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "chunk"; } }
|
||||
public override string CmdUsage { get { return "chunk status [chunkX chunkZ|locationX locationY locationZ]"; } }
|
||||
public override string CmdDesc { get { return "cmd.chunk.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_chunk_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -37,16 +37,16 @@ namespace MinecraftClient.Commands
|
|||
sb.Append(World.GetChunkLoadingStatus(handler.GetWorld()));
|
||||
sb.Append('\n');
|
||||
|
||||
sb.AppendLine(Translations.Get("cmd.chunk.current", current, current.ChunkX, current.ChunkZ));
|
||||
sb.AppendLine(string.Format(Translations.cmd_chunk_current, current, current.ChunkX, current.ChunkZ));
|
||||
if (markedChunkPos != null)
|
||||
{
|
||||
sb.Append(Translations.Get("cmd.chunk.marked"));
|
||||
sb.Append(Translations.cmd_chunk_marked);
|
||||
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], NumberStyles.Any, CultureInfo.CurrentCulture),
|
||||
double.Parse(args[2], NumberStyles.Any, CultureInfo.CurrentCulture),
|
||||
double.Parse(args[3], NumberStyles.Any, CultureInfo.CurrentCulture)));
|
||||
sb.AppendLine(Translations.Get("cmd.chunk.chunk_pos", markChunkX, markChunkZ));;
|
||||
sb.AppendLine(string.Format(Translations.cmd_chunk_chunk_pos, markChunkX, markChunkZ));;
|
||||
}
|
||||
|
||||
int consoleHeight = Math.Max(Math.Max(Console.BufferHeight, Settings.Config.Main.Advanced.MinTerminalHeight) - 2, 25);
|
||||
|
|
@ -132,7 +132,7 @@ namespace MinecraftClient.Commands
|
|||
if (markedChunkPos != null &&
|
||||
(((Math.Max(bottomMost, markChunkZ) - Math.Min(topMost, markChunkZ) + 1) > consoleHeight) ||
|
||||
((Math.Max(rightMost, markChunkX) - Math.Min(leftMost, markChunkX) + 1) > consoleWidth)))
|
||||
sb.AppendLine(Translations.Get("cmd.chunk.outside"));
|
||||
sb.AppendLine(Translations.cmd_chunk_outside);
|
||||
else
|
||||
{
|
||||
topMost = Math.Min(topMost, markChunkZ);
|
||||
|
|
@ -170,7 +170,7 @@ namespace MinecraftClient.Commands
|
|||
sb.Append('\n');
|
||||
}
|
||||
|
||||
sb.AppendLine(Translations.Get("cmd.chunk.icon", "§z §r", "§w §r", chunkStatusStr[0], chunkStatusStr[1], chunkStatusStr[2]));
|
||||
sb.AppendLine(string.Format(Translations.cmd_chunk_icon, "§z §r", "§w §r", chunkStatusStr[0], chunkStatusStr[1], chunkStatusStr[2]));
|
||||
return sb.ToString();
|
||||
}
|
||||
else if (args[0] == "setloading") // For debugging
|
||||
|
|
@ -178,7 +178,7 @@ namespace MinecraftClient.Commands
|
|||
Tuple<int, int>? chunkPos = ParseChunkPos(args);
|
||||
if (chunkPos != null)
|
||||
{
|
||||
handler.Log.Info(Translations.Get("cmd.chunk.for_debug"));
|
||||
handler.Log.Info(Translations.cmd_chunk_for_debug);
|
||||
World world = handler.GetWorld();
|
||||
(int chunkX, int chunkZ) = chunkPos;
|
||||
ChunkColumn? chunkColumn = world[chunkX, chunkZ];
|
||||
|
|
@ -195,7 +195,7 @@ namespace MinecraftClient.Commands
|
|||
Tuple<int, int>? chunkPos = ParseChunkPos(args);
|
||||
if (chunkPos != null)
|
||||
{
|
||||
handler.Log.Info(Translations.Get("cmd.chunk.for_debug"));
|
||||
handler.Log.Info(Translations.cmd_chunk_for_debug);
|
||||
World world = handler.GetWorld();
|
||||
(int chunkX, int chunkZ) = chunkPos;
|
||||
ChunkColumn? chunkColumn = world[chunkX, chunkZ];
|
||||
|
|
@ -212,7 +212,7 @@ namespace MinecraftClient.Commands
|
|||
Tuple<int, int>? chunkPos = ParseChunkPos(args);
|
||||
if (chunkPos != null)
|
||||
{
|
||||
handler.Log.Info(Translations.Get("cmd.chunk.for_debug"));
|
||||
handler.Log.Info(Translations.cmd_chunk_for_debug);
|
||||
World world = handler.GetWorld();
|
||||
(int chunkX, int chunkZ) = chunkPos;
|
||||
world[chunkX, chunkZ] = null;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "connect"; } }
|
||||
public override string CmdUsage { get { return "connect <server> [account]"; } }
|
||||
public override string CmdDesc { get { return "cmd.connect.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_connect_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -22,7 +22,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
if (!Settings.Config.Main.Advanced.SetAccount(args[1]))
|
||||
{
|
||||
return Translations.Get("cmd.connect.unknown", args[1]);
|
||||
return string.Format(Translations.cmd_connect_unknown, args[1]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ namespace MinecraftClient.Commands
|
|||
Program.Restart();
|
||||
return "";
|
||||
}
|
||||
else return Translations.Get("cmd.connect.invalid_ip", args[0]);
|
||||
else return string.Format(Translations.cmd_connect_invalid_ip, args[0]);
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "debug"; } }
|
||||
public override string CmdUsage { get { return "debug [on|off]"; } }
|
||||
public override string CmdDesc { get { return "cmd.debug.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_debug_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -19,7 +19,10 @@ namespace MinecraftClient.Commands
|
|||
Settings.Config.Logging.DebugMessages = (GetArg(command).ToLower() == "on");
|
||||
else
|
||||
Settings.Config.Logging.DebugMessages = !Settings.Config.Logging.DebugMessages;
|
||||
return Translations.Get(Settings.Config.Logging.DebugMessages ? "cmd.debug.state_on" : "cmd.debug.state_off");
|
||||
if (Settings.Config.Logging.DebugMessages)
|
||||
return Translations.cmd_debug_state_on;
|
||||
else
|
||||
return Translations.cmd_debug_state_off;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "dig"; } }
|
||||
public override string CmdUsage { get { return "dig <x> <y> <z>"; } }
|
||||
public override string CmdDesc { get { return "cmd.dig.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_dig_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -18,20 +18,20 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return Translations.Get("extra.terrainandmovement_required");
|
||||
return Translations.extra_terrainandmovement_required;
|
||||
|
||||
string[] args = GetArgs(command);
|
||||
if (args.Length == 0)
|
||||
{
|
||||
(bool hasBlock, Location blockLoc, Block block) = RaycastHelper.RaycastBlock(handler, 4.5, false);
|
||||
if (!hasBlock)
|
||||
return Translations.Get("cmd.dig.too_far");
|
||||
return Translations.cmd_dig_too_far;
|
||||
else if (block.Type == Material.Air)
|
||||
return Translations.Get("cmd.dig.no_block");
|
||||
return Translations.cmd_dig_no_block;
|
||||
else if (handler.DigBlock(blockLoc, lookAtBlock: false))
|
||||
return Translations.Get("cmd.dig.dig", blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString());
|
||||
return string.Format(Translations.cmd_dig_dig, blockLoc.X, blockLoc.Y, blockLoc.Z, block.GetTypeString());
|
||||
else
|
||||
return Translations.Get("cmd.dig.fail");
|
||||
return Translations.cmd_dig_fail;
|
||||
}
|
||||
else if (args.Length == 3)
|
||||
{
|
||||
|
|
@ -40,17 +40,17 @@ namespace MinecraftClient.Commands
|
|||
Location current = handler.GetCurrentLocation();
|
||||
Location blockToBreak = Location.Parse(current.ToFloor(), args[0], args[1], args[2]);
|
||||
if (blockToBreak.DistanceSquared(current.EyesLocation()) > 25)
|
||||
return Translations.Get("cmd.dig.too_far");
|
||||
return Translations.cmd_dig_too_far;
|
||||
Block block = handler.GetWorld().GetBlock(blockToBreak);
|
||||
if (block.Type == Material.Air)
|
||||
return Translations.Get("cmd.dig.no_block");
|
||||
return Translations.cmd_dig_no_block;
|
||||
else if (handler.DigBlock(blockToBreak))
|
||||
{
|
||||
blockToBreak = blockToBreak.ToCenter();
|
||||
return Translations.Get("cmd.dig.dig", blockToBreak.X, blockToBreak.Y, blockToBreak.Z, block.GetTypeString());
|
||||
return string.Format(Translations.cmd_dig_dig, blockToBreak.X, blockToBreak.Y, blockToBreak.Z, block.GetTypeString());
|
||||
}
|
||||
else
|
||||
return Translations.Get("cmd.dig.fail");
|
||||
return Translations.cmd_dig_fail;
|
||||
}
|
||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,8 @@ namespace MinecraftClient.Commands
|
|||
class DropItem : Command
|
||||
{
|
||||
public override string CmdName { get { return "dropitem"; } }
|
||||
|
||||
public override string CmdDesc { get { return "cmd.dropItem.desc"; } }
|
||||
|
||||
public override string CmdUsage { get { return "/dropitem <itemtype>"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_dropItem_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -22,7 +20,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
if (!handler.GetInventoryEnabled())
|
||||
{
|
||||
return Translations.Get("extra.inventory_required");
|
||||
return Translations.extra_inventory_required;
|
||||
}
|
||||
if (HasArg(command))
|
||||
{
|
||||
|
|
@ -43,11 +41,11 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
handler.DoWindowAction(inventoryId, slot, WindowActionType.DropItemStack);
|
||||
}
|
||||
return Translations.Get("cmd.dropItem.dropped", itemType.ToString(), inventoryId);
|
||||
return string.Format(Translations.cmd_dropItem_dropped, itemType.ToString(), inventoryId);
|
||||
}
|
||||
else
|
||||
{
|
||||
return Translations.Get("cmd.dropItem.unknown_item", arg);
|
||||
return string.Format(Translations.cmd_dropItem_unknown_item, arg);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "enchant"; } }
|
||||
public override string CmdUsage { get { return "enchant <top|middle|bottom>"; } }
|
||||
public override string CmdDesc { get { return "cmd.enchant.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_enchant_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -18,7 +18,7 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
if (!handler.GetInventoryEnabled())
|
||||
return Translations.TryGet("error.inventoryhandling_not_enabled");
|
||||
return Translations.error_inventoryhandling_not_enabled;
|
||||
|
||||
if (HasArg(command))
|
||||
{
|
||||
|
|
@ -33,7 +33,7 @@ namespace MinecraftClient.Commands
|
|||
};
|
||||
|
||||
if (slotId == -1)
|
||||
return Translations.TryGet("cmd.enchant.invalid_slot");
|
||||
return Translations.cmd_enchant_invalid_slot;
|
||||
|
||||
Container? enchantingTable = null;
|
||||
|
||||
|
|
@ -47,28 +47,28 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
|
||||
if (enchantingTable == null)
|
||||
return Translations.TryGet("cmd.enchant.enchanting_table_not_opened");
|
||||
return Translations.cmd_enchant_enchanting_table_not_opened;
|
||||
|
||||
int[] emptySlots = enchantingTable.GetEmpytSlots();
|
||||
|
||||
if (emptySlots.Contains(0))
|
||||
return Translations.TryGet("cmd.enchant.enchanting_no_item");
|
||||
return Translations.cmd_enchant_enchanting_no_item;
|
||||
|
||||
if (emptySlots.Contains(1))
|
||||
return Translations.TryGet("cmd.enchant.enchanting_no_lapis");
|
||||
return Translations.cmd_enchant_enchanting_no_lapis;
|
||||
|
||||
Item lapisSlot = enchantingTable.Items[1];
|
||||
|
||||
if (lapisSlot.Type != ItemType.LapisLazuli)
|
||||
return Translations.TryGet("cmd.enchant.enchanting_no_lapis");
|
||||
return Translations.cmd_enchant_enchanting_no_lapis;
|
||||
|
||||
if (lapisSlot.Count < 3)
|
||||
return Translations.TryGet("cmd.enchant.enchanting_no_lapis");
|
||||
return Translations.cmd_enchant_enchanting_no_lapis;
|
||||
|
||||
EnchantmentData? enchantment = handler.GetLastEnchantments();
|
||||
|
||||
if (enchantment == null)
|
||||
return Translations.TryGet("cmd.enchant.no_enchantments");
|
||||
return Translations.cmd_enchant_no_enchantments;
|
||||
|
||||
short requiredLevel = slotId switch
|
||||
{
|
||||
|
|
@ -79,9 +79,9 @@ namespace MinecraftClient.Commands
|
|||
};
|
||||
|
||||
if (handler.GetLevel() < requiredLevel)
|
||||
return Translations.TryGet("cmd.enchant.no_levels", handler.GetLevel(), requiredLevel);
|
||||
return string.Format(Translations.cmd_enchant_no_levels, handler.GetLevel(), requiredLevel);
|
||||
|
||||
return handler.ClickContainerButton(enchantingTable.ID, slotId) ? Translations.TryGet("cmd.enchant.clicked") : Translations.TryGet("cmd.enchant.not_clicked");
|
||||
return handler.ClickContainerButton(enchantingTable.ID, slotId) ? Translations.cmd_enchant_clicked : Translations.cmd_enchant_not_clicked;
|
||||
}
|
||||
|
||||
return GetCmdDescTranslated();
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "entity"; } }
|
||||
public override string CmdUsage { get { return "entity <id|entitytype> <attack|use>"; } }
|
||||
public override string CmdDesc { get { return ""; } }
|
||||
public override string CmdDesc { get { return string.Empty; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -39,10 +39,10 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
case "attack":
|
||||
handler.InteractEntity(entityID, InteractType.Attack);
|
||||
return Translations.Get("cmd.entityCmd.attacked");
|
||||
return Translations.cmd_entityCmd_attacked;
|
||||
case "use":
|
||||
handler.InteractEntity(entityID, InteractType.Interact);
|
||||
return Translations.Get("cmd.entityCmd.used");
|
||||
return Translations.cmd_entityCmd_used;
|
||||
default:
|
||||
Entity entity = handler.GetEntities()[entityID];
|
||||
int id = entity.ID;
|
||||
|
|
@ -61,53 +61,53 @@ namespace MinecraftClient.Commands
|
|||
else if (health < 15)
|
||||
color = "§e"; // Yellow
|
||||
|
||||
string location = String.Format("X:{0}, Y:{1}, Z:{2}", Math.Round(entity.Location.X, 2), Math.Round(entity.Location.Y, 2), Math.Round(entity.Location.Z, 2));
|
||||
string location = $"X:{Math.Round(entity.Location.X, 2)}, Y:{Math.Round(entity.Location.Y, 2)}, Z:{Math.Round(entity.Location.Z, 2)}";
|
||||
StringBuilder done = new();
|
||||
done.Append(Translations.Replace("([cmd.entityCmd.entity]): {0}\n [MCC] Type: {1}", id, entity.GetTypeString()));
|
||||
if (!String.IsNullOrEmpty(nickname))
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.nickname]): {0}", nickname));
|
||||
else if (!String.IsNullOrEmpty(customname))
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.customname]): {0}§8", customname.Replace("&", "§")));
|
||||
done.Append($"{Translations.cmd_entityCmd_entity}: {id}\n [MCC] Type: {entity.GetTypeString()}");
|
||||
if (!string.IsNullOrEmpty(nickname))
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_nickname}: {nickname}");
|
||||
else if (!string.IsNullOrEmpty(customname))
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_customname}: {customname.Replace("&", "§")}§8");
|
||||
if (type == EntityType.Player)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.latency]): {0}", latency));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_latency}: {latency}");
|
||||
else if (type == EntityType.Item || type == EntityType.ItemFrame || type == Mapping.EntityType.EyeOfEnder || type == Mapping.EntityType.Egg || type == Mapping.EntityType.EnderPearl || type == Mapping.EntityType.Potion || type == Mapping.EntityType.Fireball || type == Mapping.EntityType.FireworkRocket)
|
||||
{
|
||||
string? displayName = item.DisplayName;
|
||||
if (String.IsNullOrEmpty(displayName))
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.item]): {0} x{1}", item.GetTypeString(), item.Count));
|
||||
if (string.IsNullOrEmpty(displayName))
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count}");
|
||||
else
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.item]): {0} x{1} - {2}§8", item.GetTypeString(), item.Count, displayName));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_item}: {item.GetTypeString()} x{item.Count} - {displayName}§8");
|
||||
}
|
||||
|
||||
if (entity.Equipment.Count >= 1 && entity.Equipment != null)
|
||||
{
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.equipment]):"));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_equipment}:");
|
||||
if (entity.Equipment.ContainsKey(0) && entity.Equipment[0] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.mainhand]): {0} x{1}", entity.Equipment[0].GetTypeString(), entity.Equipment[0].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_mainhand}: {entity.Equipment[0].GetTypeString()} x{entity.Equipment[0].Count}");
|
||||
if (entity.Equipment.ContainsKey(1) && entity.Equipment[1] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.offhand]): {0} x{1}", entity.Equipment[1].GetTypeString(), entity.Equipment[1].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_offhand}: {entity.Equipment[1].GetTypeString()} x{entity.Equipment[1].Count}");
|
||||
if (entity.Equipment.ContainsKey(5) && entity.Equipment[5] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.helmet]): {0} x{1}", entity.Equipment[5].GetTypeString(), entity.Equipment[5].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_helmet}: {entity.Equipment[5].GetTypeString()} x{entity.Equipment[5].Count}");
|
||||
if (entity.Equipment.ContainsKey(4) && entity.Equipment[4] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.chestplate]): {0} x{1}", entity.Equipment[4].GetTypeString(), entity.Equipment[4].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_chestplate}: {entity.Equipment[4].GetTypeString()} x{entity.Equipment[4].Count}");
|
||||
if (entity.Equipment.ContainsKey(3) && entity.Equipment[3] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.leggings]): {0} x{1}", entity.Equipment[3].GetTypeString(), entity.Equipment[3].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_leggings}: {entity.Equipment[3].GetTypeString()} x{entity.Equipment[3].Count}");
|
||||
if (entity.Equipment.ContainsKey(2) && entity.Equipment[2] != null)
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.boots]): {0} x{1}", entity.Equipment[2].GetTypeString(), entity.Equipment[2].Count));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_boots}: {entity.Equipment[2].GetTypeString()} x{entity.Equipment[2].Count}");
|
||||
}
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.pose]): {0}", pose));
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.health]): {0}", color + health + "§8"));
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.distance]): {0}", distance));
|
||||
done.Append(Translations.Replace("\n [MCC] ([cmd.entityCmd.location]): {0}", location));
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_pose}: {pose}");
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_health}: {color}{health}§8");
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_distance}: {distance}");
|
||||
done.Append($"\n [MCC] {Translations.cmd_entityCmd_location}: {location}");
|
||||
return done.ToString();
|
||||
}
|
||||
}
|
||||
else return Translations.Get("cmd.entityCmd.not_found");
|
||||
else return Translations.cmd_entityCmd_not_found;
|
||||
}
|
||||
else
|
||||
{
|
||||
EntityType interacttype = Enum.Parse<EntityType>(args[0]);
|
||||
string actionst = "cmd.entityCmd.attacked";
|
||||
string actionst = Translations.cmd_entityCmd_attacked;
|
||||
int actioncount = 0;
|
||||
foreach (var entity2 in handler.GetEntities())
|
||||
{
|
||||
|
|
@ -119,19 +119,19 @@ namespace MinecraftClient.Commands
|
|||
if (action == "attack")
|
||||
{
|
||||
handler.InteractEntity(entity2.Key, InteractType.Attack);
|
||||
actionst = "cmd.entityCmd.attacked";
|
||||
actionst = Translations.cmd_entityCmd_attacked;
|
||||
actioncount++;
|
||||
}
|
||||
else if (action == "use")
|
||||
{
|
||||
handler.InteractEntity(entity2.Key, InteractType.Interact);
|
||||
actionst = "cmd.entityCmd.used";
|
||||
actionst = Translations.cmd_entityCmd_used;
|
||||
actioncount++;
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
}
|
||||
}
|
||||
return actioncount + " " + Translations.Get(actionst);
|
||||
return actioncount + " " + actionst;
|
||||
}
|
||||
}
|
||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
||||
|
|
@ -140,7 +140,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
Dictionary<int, Entity> entities = handler.GetEntities();
|
||||
StringBuilder response = new();
|
||||
response.AppendLine(Translations.Get("cmd.entityCmd.entities"));
|
||||
response.AppendLine(Translations.cmd_entityCmd_entities);
|
||||
foreach (var entity2 in entities)
|
||||
{
|
||||
int id = entity2.Key;
|
||||
|
|
@ -151,22 +151,22 @@ namespace MinecraftClient.Commands
|
|||
EntityPose pose = entity2.Value.Pose;
|
||||
EntityType type = entity2.Value.Type;
|
||||
Item item = entity2.Value.Item;
|
||||
string location = String.Format("X:{0}, Y:{1}, Z:{2}", Math.Round(entity2.Value.Location.X, 2), Math.Round(entity2.Value.Location.Y, 2), Math.Round(entity2.Value.Location.Z, 2));
|
||||
string location = $"X:{Math.Round(entity2.Value.Location.X, 2)}, Y:{Math.Round(entity2.Value.Location.Y, 2)}, Z:{Math.Round(entity2.Value.Location.Z, 2)}";
|
||||
|
||||
if (type == EntityType.Item || type == EntityType.ItemFrame || type == EntityType.EyeOfEnder || type == EntityType.Egg || type == EntityType.EnderPearl || type == EntityType.Potion || type == EntityType.Fireball || type == EntityType.FireworkRocket)
|
||||
response.AppendLine(Translations.Replace(" #{0}: ([cmd.entityCmd.type]): {1}, ([cmd.entityCmd.item]): {2}, ([cmd.entityCmd.location]): {3}", id, entity2.Value.GetTypeString(), item.GetTypeString(), location));
|
||||
else if (type == EntityType.Player && !String.IsNullOrEmpty(nickname))
|
||||
response.AppendLine(Translations.Replace(" #{0}: ([cmd.entityCmd.type]): {1}, ([cmd.entityCmd.nickname]): §8{2}§8, ([cmd.entityCmd.latency]): {3}, ([cmd.entityCmd.health]): {4}, ([cmd.entityCmd.pose]): {5}, ([cmd.entityCmd.location]): {6}", id, entity2.Value.GetTypeString(), nickname, latency, health, pose, location));
|
||||
else if (type == EntityType.Player && !String.IsNullOrEmpty(customname))
|
||||
response.AppendLine(Translations.Replace(" #{0}: ([cmd.entityCmd.type]): {1}, ([cmd.entityCmd.customname]): §8{2}§8, ([cmd.entityCmd.latency]): {3}, ([cmd.entityCmd.health]): {4}, ([cmd.entityCmd.pose]): {5}, ([cmd.entityCmd.location]): {6}", id, entity2.Value.GetTypeString(), customname.Replace("&", "§"), latency, health, pose, location));
|
||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_item}: {item.GetTypeString()}, {Translations.cmd_entityCmd_location}: {location}");
|
||||
else if (type == EntityType.Player && !string.IsNullOrEmpty(nickname))
|
||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_nickname}: §8{nickname}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
||||
else if (type == EntityType.Player && !string.IsNullOrEmpty(customname))
|
||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_customname}: §8{customname.Replace("&", "§")}§8, {Translations.cmd_entityCmd_latency}: {latency}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_pose}: {pose}, {Translations.cmd_entityCmd_location}: {location}");
|
||||
else
|
||||
response.AppendLine(Translations.Replace(" #{0}: ([cmd.entityCmd.type]): {1}, ([cmd.entityCmd.health]): {2}, ([cmd.entityCmd.location]): {3}", id, entity2.Value.GetTypeString(), health, location));
|
||||
response.AppendLine($" #{id}: {Translations.cmd_entityCmd_type}: {entity2.Value.GetTypeString()}, {Translations.cmd_entityCmd_health}: {health}, {Translations.cmd_entityCmd_location}: {location}");
|
||||
}
|
||||
response.Append(GetCmdDescTranslated());
|
||||
return response.ToString();
|
||||
}
|
||||
}
|
||||
else return Translations.Get("extra.entity_required");
|
||||
else return Translations.extra_entity_required;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "execif"; } }
|
||||
public override string CmdUsage { get { return "execif <condition/expression> ---> <command>"; } }
|
||||
public override string CmdDesc { get { return "cmd.execif.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_execif_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -74,8 +74,9 @@ namespace MinecraftClient.Commands
|
|||
handler.PerformInternalCommand(resultCommand, ref output);
|
||||
|
||||
if (string.IsNullOrEmpty(output))
|
||||
handler.Log.Debug(Translations.TryGet("cmd.execif.executed_no_output", expressionText, resultCommand));
|
||||
else handler.Log.Debug(Translations.TryGet("cmd.execif.executed", expressionText, resultCommand, output));
|
||||
handler.Log.Debug(string.Format(Translations.cmd_execif_executed_no_output, expressionText, resultCommand));
|
||||
else
|
||||
handler.Log.Debug(string.Format(Translations.cmd_execif_executed, expressionText, resultCommand, output));
|
||||
|
||||
return "";
|
||||
}
|
||||
|
|
@ -84,8 +85,8 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
handler.Log.Error(Translations.TryGet("cmd.execif.error_occured", command));
|
||||
handler.Log.Error(Translations.TryGet("cmd.execif.error", e.Message));
|
||||
handler.Log.Error(string.Format(Translations.cmd_execif_error_occured, command));
|
||||
handler.Log.Error(string.Format(Translations.cmd_execif_error, e.Message));
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "execmulti"; } }
|
||||
public override string CmdUsage { get { return "execmulti <command 1> -> <command2> -> <command 3> -> ..."; } }
|
||||
public override string CmdDesc { get { return "cmd.execmulti.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_execmulti_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -22,7 +22,7 @@ namespace MinecraftClient.Commands
|
|||
string commandsString = GetArg(command);
|
||||
|
||||
if (commandsString.Contains("execmulti", StringComparison.OrdinalIgnoreCase) || commandsString.Contains("execif", StringComparison.OrdinalIgnoreCase))
|
||||
return Translations.TryGet("cmd.execmulti.prevent");
|
||||
return Translations.cmd_execmulti_prevent;
|
||||
|
||||
IEnumerable<string> commands = commandsString.Split("->", StringSplitOptions.TrimEntries)
|
||||
.ToList()
|
||||
|
|
@ -33,9 +33,9 @@ namespace MinecraftClient.Commands
|
|||
string? output = "";
|
||||
handler.PerformInternalCommand(cmd, ref output);
|
||||
|
||||
string log = Translations.TryGet(
|
||||
"cmd.execmulti.executed", cmd,
|
||||
string.IsNullOrEmpty(output) ? Translations.TryGet("cmd.execmulti.no_result") : Translations.TryGet("cmd.execmulti.result", output));
|
||||
string log = string.Format(
|
||||
Translations.cmd_execmulti_executed, cmd,
|
||||
string.IsNullOrEmpty(output) ? Translations.cmd_execmulti_no_result : string.Format(Translations.cmd_execmulti_result, output));
|
||||
|
||||
if (output != null && output.Contains("unknown command", StringComparison.OrdinalIgnoreCase))
|
||||
handler.Log.Error(log);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "exit"; } }
|
||||
public override string CmdUsage { get { return "exit"; } }
|
||||
public override string CmdDesc { get { return "cmd.exit.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_exit_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "health"; } }
|
||||
public override string CmdUsage { get { return "health"; } }
|
||||
public override string CmdDesc { get { return "cmd.health.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_health_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@ namespace MinecraftClient.Commands
|
|||
|
||||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
return Translations.Get("cmd.health.response", handler.GetHealth(), handler.GetSaturation(), handler.GetLevel(), handler.GetTotalExperience());
|
||||
return string.Format(Translations.cmd_health_response, handler.GetHealth(), handler.GetSaturation(), handler.GetLevel(), handler.GetTotalExperience());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "inventory"; } }
|
||||
public override string CmdUsage { get { return GetBasicUsage(); } }
|
||||
public override string CmdDesc { get { return "cmd.inventory.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_inventory_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -41,12 +41,12 @@ namespace MinecraftClient.Commands
|
|||
return GetCmdDescTranslated();
|
||||
|
||||
if (handler.DoCreativeGive(slot, itemType, count, null))
|
||||
return Translations.Get("cmd.inventory.creative_done", itemType, count, slot);
|
||||
return string.Format(Translations.cmd_inventory_creative_done, itemType, count, slot);
|
||||
else
|
||||
return Translations.Get("cmd.inventory.creative_fail");
|
||||
return Translations.cmd_inventory_creative_fail;
|
||||
}
|
||||
else
|
||||
return Translations.Get("cmd.inventory.need_creative");
|
||||
return Translations.cmd_inventory_need_creative;
|
||||
}
|
||||
else
|
||||
return GetCmdDescTranslated();
|
||||
|
|
@ -64,12 +64,12 @@ namespace MinecraftClient.Commands
|
|||
if (handler.GetGamemode() == 1)
|
||||
{
|
||||
if (handler.DoCreativeGive(slot, ItemType.Null, 0, null))
|
||||
return Translations.Get("cmd.inventory.creative_delete", slot);
|
||||
return string.Format(Translations.cmd_inventory_creative_delete, slot);
|
||||
else
|
||||
return Translations.Get("cmd.inventory.creative_fail");
|
||||
return Translations.cmd_inventory_creative_fail;
|
||||
}
|
||||
else
|
||||
return Translations.Get("cmd.inventory.need_creative");
|
||||
return Translations.cmd_inventory_need_creative;
|
||||
}
|
||||
else
|
||||
return GetCmdDescTranslated();
|
||||
|
|
@ -86,14 +86,14 @@ namespace MinecraftClient.Commands
|
|||
if (availableIds.Count > 0)
|
||||
inventoryId = availableIds.Max(); // use foreground container
|
||||
else
|
||||
return Translations.Get("cmd.inventory.container_not_found");
|
||||
return Translations.cmd_inventory_container_not_found;
|
||||
}
|
||||
else if (args[0].ToLower().StartsWith("inventories") || args[0].ToLower().StartsWith("i"))
|
||||
{
|
||||
Dictionary<int, Container> inventories = handler.GetInventories();
|
||||
List<int> availableIds = inventories.Keys.ToList();
|
||||
StringBuilder response = new();
|
||||
response.AppendLine(Translations.Get("cmd.inventory.inventories_available"));
|
||||
response.AppendLine(Translations.cmd_inventory_inventories_available);
|
||||
|
||||
foreach (int id in availableIds)
|
||||
response.AppendLine(String.Format(" #{0} - {1}§8", id, inventories[id].Title));
|
||||
|
|
@ -140,11 +140,11 @@ namespace MinecraftClient.Commands
|
|||
});
|
||||
|
||||
if (foundItems.Count == 0)
|
||||
return Translations.Get("cmd.inventory.no_found_items");
|
||||
return Translations.cmd_inventory_no_found_items;
|
||||
|
||||
StringBuilder response = new();
|
||||
|
||||
response.AppendLine(Translations.Get("cmd.inventory.found_items") + ":");
|
||||
response.AppendLine(Translations.cmd_inventory_found_items + ":");
|
||||
|
||||
foreach ((int invId, List<Item> itemsList) in new SortedDictionary<int, List<Item>>(foundItems))
|
||||
{
|
||||
|
|
@ -173,20 +173,20 @@ namespace MinecraftClient.Commands
|
|||
|
||||
Container? inventory = handler.GetInventory(inventoryId);
|
||||
if (inventory == null)
|
||||
return Translations.Get("cmd.inventory.not_exist", inventoryId);
|
||||
return string.Format(Translations.cmd_inventory_not_exist, inventoryId);
|
||||
|
||||
string action = args.Length > 1 ? args[1].ToLower() : "list";
|
||||
if (action == "close")
|
||||
{
|
||||
if (handler.CloseInventory(inventoryId))
|
||||
return Translations.Get("cmd.inventory.close", inventoryId);
|
||||
return string.Format(Translations.cmd_inventory_close, inventoryId);
|
||||
else
|
||||
return Translations.Get("cmd.inventory.close_fail", inventoryId);
|
||||
return string.Format(Translations.cmd_inventory_close_fail, inventoryId);
|
||||
}
|
||||
else if (action == "list")
|
||||
{
|
||||
StringBuilder response = new();
|
||||
response.Append(Translations.Get("cmd.inventory.inventory"));
|
||||
response.Append(Translations.cmd_inventory_inventory);
|
||||
response.AppendLine(String.Format(" #{0} - {1}§8", inventoryId, inventory.Title));
|
||||
|
||||
string? asciiArt = inventory.Type.GetAsciiArt();
|
||||
|
|
@ -204,7 +204,7 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
|
||||
if (inventoryId == 0)
|
||||
response.AppendLine(Translations.Get("cmd.inventory.hotbar", (handler.GetCurrentSlot() + 1)));
|
||||
response.AppendLine(string.Format(Translations.cmd_inventory_hotbar, (handler.GetCurrentSlot() + 1)));
|
||||
|
||||
response.Remove(response.Length - 1, 1); // Remove last '\n'
|
||||
return response.ToString();
|
||||
|
|
@ -215,18 +215,18 @@ namespace MinecraftClient.Commands
|
|||
return GetCmdDescTranslated();
|
||||
|
||||
WindowActionType actionType = WindowActionType.LeftClick;
|
||||
string keyName = "cmd.inventory.left";
|
||||
string keyName = Translations.cmd_inventory_left;
|
||||
if (args.Length >= 4)
|
||||
{
|
||||
string b = args[3];
|
||||
if (b.ToLower()[0] == 'r')
|
||||
(actionType, keyName) = (WindowActionType.RightClick, "cmd.inventory.right");
|
||||
(actionType, keyName) = (WindowActionType.RightClick, Translations.cmd_inventory_right);
|
||||
else if (b.ToLower()[0] == 'm')
|
||||
(actionType, keyName) = (WindowActionType.MiddleClick, "cmd.inventory.middle");
|
||||
(actionType, keyName) = (WindowActionType.MiddleClick, Translations.cmd_inventory_middle);
|
||||
}
|
||||
|
||||
handler.DoWindowAction(inventoryId, slot, actionType);
|
||||
return Translations.Get("cmd.inventory.clicking", Translations.Get(keyName), slot, inventoryId);
|
||||
return string.Format(Translations.cmd_inventory_clicking, keyName, slot, inventoryId);
|
||||
}
|
||||
else if (action == "shiftclick" && args.Length >= 3)
|
||||
{
|
||||
|
|
@ -234,9 +234,9 @@ namespace MinecraftClient.Commands
|
|||
return GetCmdDescTranslated();
|
||||
|
||||
if (!handler.DoWindowAction(inventoryId, slot, WindowActionType.ShiftClick))
|
||||
return Translations.Get("cmd.inventory.shiftclick_fail");
|
||||
return Translations.cmd_inventory_shiftclick_fail;
|
||||
|
||||
return Translations.Get("cmd.inventory.shiftclick", slot, inventoryId);
|
||||
return string.Format(Translations.cmd_inventory_shiftclick, slot, inventoryId);
|
||||
}
|
||||
else if (action == "drop" && args.Length >= 3)
|
||||
{
|
||||
|
|
@ -245,7 +245,7 @@ namespace MinecraftClient.Commands
|
|||
|
||||
// check item exist
|
||||
if (!inventory.Items.ContainsKey(slot))
|
||||
return Translations.Get("cmd.inventory.no_item", slot);
|
||||
return string.Format(Translations.cmd_inventory_no_item, slot);
|
||||
|
||||
WindowActionType actionType = WindowActionType.DropItem;
|
||||
if (args.Length >= 4 && args[3].ToLower() == "all")
|
||||
|
|
@ -254,9 +254,9 @@ namespace MinecraftClient.Commands
|
|||
if (handler.DoWindowAction(inventoryId, slot, actionType))
|
||||
{
|
||||
if (actionType == WindowActionType.DropItemStack)
|
||||
return Translations.Get("cmd.inventory.drop_stack", slot);
|
||||
return string.Format(Translations.cmd_inventory_drop_stack, slot);
|
||||
else
|
||||
return Translations.Get("cmd.inventory.drop", slot);
|
||||
return string.Format(Translations.cmd_inventory_drop, slot);
|
||||
}
|
||||
else
|
||||
return "Failed";
|
||||
|
|
@ -267,7 +267,7 @@ namespace MinecraftClient.Commands
|
|||
else
|
||||
{
|
||||
StringBuilder response = new();
|
||||
response.Append(Translations.Get("cmd.inventory.inventories")).Append(":\n");
|
||||
response.Append(Translations.cmd_inventory_inventories).Append(":\n");
|
||||
foreach ((int invId, Container inv) in handler.GetInventories())
|
||||
response.AppendLine(String.Format(" #{0}: {1}§8", invId, inv.Title));
|
||||
response.Append(CmdUsage);
|
||||
|
|
@ -275,42 +275,44 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
}
|
||||
else
|
||||
return Translations.Get("extra.inventory_required");
|
||||
return Translations.extra_inventory_required;
|
||||
}
|
||||
|
||||
#region Methods for commands help
|
||||
|
||||
private static string GetAvailableActions()
|
||||
{
|
||||
return Translations.Get("cmd.inventory.help.available") + ": list, close, click, drop, creativegive, creativedelete.";
|
||||
return Translations.cmd_inventory_help_available + ": list, close, click, drop, creativegive, creativedelete.";
|
||||
}
|
||||
|
||||
private static string GetBasicUsage()
|
||||
{
|
||||
return Translations.Get("cmd.inventory.help.basic") + ": /inventory <player|container|<id>> <action>.";
|
||||
return Translations.cmd_inventory_help_basic + ": /inventory <player|container|<id>> <action>.";
|
||||
}
|
||||
|
||||
private static string GetHelp()
|
||||
{
|
||||
return Translations.Get("cmd.inventory.help.help", GetAvailableActions());
|
||||
return string.Format(Translations.cmd_inventory_help_help, GetAvailableActions());
|
||||
}
|
||||
|
||||
private static string GetSubCommandHelp(string cmd)
|
||||
{
|
||||
string usageStr = ' ' + Translations.Get("cmd.inventory.help.usage") + ": ";
|
||||
string usageStr = ' ' + Translations.cmd_inventory_help_usage + ": ";
|
||||
return cmd switch
|
||||
{
|
||||
"list" => Translations.Get("cmd.inventory.help.list") + usageStr + "/inventory <player|container|<id>> list",
|
||||
"close" => Translations.Get("cmd.inventory.help.close") + usageStr + "/inventory <player|container|<id>> close",
|
||||
"click" => Translations.Get("cmd.inventory.help.click") + usageStr + "/inventory <player|container|<id>> click <slot> [left|right|middle]\nDefault is left click",
|
||||
"shiftclick" => Translations.Get("cmd.inventory.help.shiftclick") + usageStr + "/inventory <player|container|<id>> shiftclick <slot>",
|
||||
"drop" => Translations.Get("cmd.inventory.help.drop") + usageStr + "/inventory <player|container|<id>> drop <slot> [all]\nAll means drop full stack",
|
||||
"creativegive" => Translations.Get("cmd.inventory.help.creativegive") + usageStr + "/inventory creativegive <slot> <itemtype> <amount>",
|
||||
"creativedelete" => Translations.Get("cmd.inventory.help.creativedelete") + usageStr + "/inventory creativedelete <slot>",
|
||||
"inventories" => Translations.Get("cmd.inventory.help.inventories") + usageStr + "/inventory inventories",
|
||||
"search" => Translations.Get("cmd.inventory.help.search") + usageStr + "/inventory search <item type> [count]",
|
||||
"help" => GetHelp(),
|
||||
_ => Translations.Get("cmd.inventory.help.unknown") + GetAvailableActions(),
|
||||
#pragma warning disable format // @formatter:off
|
||||
"list" => Translations.cmd_inventory_help_list + usageStr + "/inventory <player|container|<id>> list",
|
||||
"close" => Translations.cmd_inventory_help_close + usageStr + "/inventory <player|container|<id>> close",
|
||||
"click" => Translations.cmd_inventory_help_click + usageStr + "/inventory <player|container|<id>> click <slot> [left|right|middle]\nDefault is left click",
|
||||
"shiftclick" => Translations.cmd_inventory_help_shiftclick + usageStr + "/inventory <player|container|<id>> shiftclick <slot>",
|
||||
"drop" => Translations.cmd_inventory_help_drop + usageStr + "/inventory <player|container|<id>> drop <slot> [all]\nAll means drop full stack",
|
||||
"creativegive" => Translations.cmd_inventory_help_creativegive + usageStr + "/inventory creativegive <slot> <itemtype> <amount>",
|
||||
"creativedelete" => Translations.cmd_inventory_help_creativedelete + usageStr + "/inventory creativedelete <slot>",
|
||||
"inventories" => Translations.cmd_inventory_help_inventories + usageStr + "/inventory inventories",
|
||||
"search" => Translations.cmd_inventory_help_search + usageStr + "/inventory search <item type> [count]",
|
||||
"help" => GetHelp(),
|
||||
_ => Translations.cmd_inventory_help_unknown + GetAvailableActions(),
|
||||
#pragma warning restore format // @formatter:on
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "list"; } }
|
||||
public override string CmdUsage { get { return "list"; } }
|
||||
public override string CmdDesc { get { return "cmd.list.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_list_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -16,7 +16,7 @@ namespace MinecraftClient.Commands
|
|||
|
||||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
return Translations.Get("cmd.list.players", String.Join(", ", handler.GetOnlinePlayers()));
|
||||
return string.Format(Translations.cmd_list_players, String.Join(", ", handler.GetOnlinePlayers()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "log"; } }
|
||||
public override string CmdUsage { get { return "log <text>"; } }
|
||||
public override string CmdDesc { get { return "cmd.log.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_log_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "look"; } }
|
||||
public override string CmdUsage { get { return "look <x y z|yaw pitch|up|down|east|west|north|south>"; } }
|
||||
public override string CmdDesc { get { return "cmd.look.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_look_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -26,11 +26,11 @@ namespace MinecraftClient.Commands
|
|||
const double maxDistance = 8.0;
|
||||
(bool hasBlock, Location target, Block block) = RaycastHelper.RaycastBlock(handler, maxDistance, false);
|
||||
if (!hasBlock)
|
||||
return Translations.Get("cmd.look.noinspection", maxDistance);
|
||||
return string.Format(Translations.cmd_look_noinspection, maxDistance);
|
||||
else
|
||||
{
|
||||
Location current = handler.GetCurrentLocation(), target_center = target.ToCenter();
|
||||
return Translations.Get("cmd.look.inspection", block.Type, target.X, target.Y, target.Z,
|
||||
return string.Format(Translations.cmd_look_inspection, block.Type, target.X, target.Y, target.Z,
|
||||
current.Distance(target_center), current.EyesLocation().Distance(target_center));
|
||||
}
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@ namespace MinecraftClient.Commands
|
|||
case "west": direction = Direction.West; break;
|
||||
case "north": direction = Direction.North; break;
|
||||
case "south": direction = Direction.South; break;
|
||||
default: return Translations.Get("cmd.look.unknown", dirStr);
|
||||
default: return string.Format(Translations.cmd_look_unknown, dirStr);
|
||||
}
|
||||
|
||||
handler.UpdateLocation(handler.GetCurrentLocation(), direction);
|
||||
|
|
@ -60,7 +60,7 @@ namespace MinecraftClient.Commands
|
|||
float pitch = float.Parse(args[1], NumberStyles.Any, CultureInfo.CurrentCulture);
|
||||
|
||||
handler.UpdateLocation(handler.GetCurrentLocation(), yaw, pitch);
|
||||
return Translations.Get("cmd.look.at", yaw.ToString("0.00"), pitch.ToString("0.00"));
|
||||
return string.Format(Translations.cmd_look_at, yaw.ToString("0.00"), pitch.ToString("0.00"));
|
||||
}
|
||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
||||
}
|
||||
|
|
@ -72,14 +72,14 @@ namespace MinecraftClient.Commands
|
|||
Location block = Location.Parse(current, args[0], args[1], args[2]);
|
||||
handler.UpdateLocation(current, block);
|
||||
|
||||
return Translations.Get("cmd.look.block", block);
|
||||
return string.Format(Translations.cmd_look_block, block);
|
||||
}
|
||||
catch (FormatException) { return CmdUsage; }
|
||||
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
}
|
||||
else return Translations.Get("extra.terrainandmovement_required");
|
||||
else return Translations.extra_terrainandmovement_required;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "move"; } }
|
||||
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 "walk or start walking. \"-f\": force unsafe movements like falling or touching fire"; } }
|
||||
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)
|
||||
{
|
||||
|
|
@ -40,20 +40,20 @@ namespace MinecraftClient.Commands
|
|||
if (args[0] == "on")
|
||||
{
|
||||
handler.SetTerrainEnabled(true);
|
||||
return Translations.Get("cmd.move.enable");
|
||||
return Translations.cmd_move_enable;
|
||||
}
|
||||
else if (args[0] == "off")
|
||||
{
|
||||
handler.SetTerrainEnabled(false);
|
||||
return Translations.Get("cmd.move.disable");
|
||||
return Translations.cmd_move_disable;
|
||||
}
|
||||
else if (args[0] == "gravity")
|
||||
{
|
||||
if (args.Count >= 2)
|
||||
Settings.InternalConfig.GravityEnabled = (args[1] == "on");
|
||||
if (Settings.InternalConfig.GravityEnabled)
|
||||
return Translations.Get("cmd.move.gravity.enabled");
|
||||
else return Translations.Get("cmd.move.gravity.disabled");
|
||||
return Translations.cmd_move_gravity_enabled;
|
||||
else return Translations.cmd_move_gravity_disabled;
|
||||
}
|
||||
else if (handler.GetTerrainEnabled())
|
||||
{
|
||||
|
|
@ -72,24 +72,24 @@ namespace MinecraftClient.Commands
|
|||
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 Translations.Get("cmd.move.walk", currentCenter, current);
|
||||
return string.Format(Translations.cmd_move_walk, currentCenter, current);
|
||||
case "get": return handler.GetCurrentLocation().ToString();
|
||||
default: return Translations.Get("cmd.look.unknown", args[0]);
|
||||
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 Translations.Get("cmd.move.chunk_not_loaded", goal.X, goal.Y, goal.Z);
|
||||
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 Translations.Get("cmd.move.moving", args[0]);
|
||||
return string.Format(Translations.cmd_move_moving, args[0]);
|
||||
else
|
||||
return takeRisk ? Translations.Get("cmd.move.dir_fail") : Translations.Get("cmd.move.suggestforce");
|
||||
return takeRisk ? Translations.cmd_move_dir_fail : Translations.cmd_move_suggestforce;
|
||||
}
|
||||
else return Translations.Get("cmd.move.dir_fail");
|
||||
else return Translations.cmd_move_dir_fail;
|
||||
}
|
||||
else if (args.Count == 3)
|
||||
{
|
||||
|
|
@ -99,24 +99,24 @@ namespace MinecraftClient.Commands
|
|||
Location goal = Location.Parse(current, args[0], args[1], args[2]);
|
||||
|
||||
if (!Movement.CheckChunkLoading(handler.GetWorld(), current, goal))
|
||||
return Translations.Get("cmd.move.chunk_not_loaded", goal.X, goal.Y, goal.Z);
|
||||
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 ? Translations.Get("cmd.move.fail", goal) : Translations.Get("cmd.move.suggestforce", goal);
|
||||
return Translations.Get("cmd.move.walk", goal, current);
|
||||
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 Translations.Get("cmd.move.suggestforce", goal);
|
||||
return string.Format(Translations.cmd_move_suggestforce, goal);
|
||||
}
|
||||
catch (FormatException) { return GetCmdDescTranslated(); }
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
}
|
||||
else return Translations.Get("extra.terrainandmovement_required");
|
||||
else return Translations.extra_terrainandmovement_required;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "reco"; } }
|
||||
public override string CmdUsage { get { return "reco [account]"; } }
|
||||
public override string CmdDesc { get { return "cmd.reco.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_reco_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -20,7 +20,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
if (!Settings.Config.Main.Advanced.SetAccount(args[0]))
|
||||
{
|
||||
return Translations.Get("cmd.connect.unknown", args[0]);
|
||||
return string.Format(Translations.cmd_connect_unknown, args[0]);
|
||||
}
|
||||
}
|
||||
Program.Restart();
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "reload"; } }
|
||||
public override string CmdUsage { get { return "reload"; } }
|
||||
public override string CmdDesc { get { return "cmd.reload.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_reload_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -15,14 +15,14 @@ namespace MinecraftClient.Commands
|
|||
|
||||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
handler.Log.Info(Translations.TryGet("cmd.reload.started"));
|
||||
handler.Log.Info(Translations.cmd_reload_started);
|
||||
handler.ReloadSettings();
|
||||
handler.Log.Warn(Translations.TryGet("cmd.reload.warning1"));
|
||||
handler.Log.Warn(Translations.TryGet("cmd.reload.warning2"));
|
||||
handler.Log.Warn(Translations.TryGet("cmd.reload.warning3"));
|
||||
handler.Log.Warn(Translations.TryGet("cmd.reload.warning4"));
|
||||
handler.Log.Warn(Translations.cmd_reload_warning1);
|
||||
handler.Log.Warn(Translations.cmd_reload_warning2);
|
||||
handler.Log.Warn(Translations.cmd_reload_warning3);
|
||||
handler.Log.Warn(Translations.cmd_reload_warning4);
|
||||
|
||||
return Translations.TryGet("cmd.reload.finished");
|
||||
return Translations.cmd_reload_finished;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "respawn"; } }
|
||||
public override string CmdUsage { get { return "respawn"; } }
|
||||
public override string CmdDesc { get { return "cmd.respawn.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_respawn_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -16,7 +16,7 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
handler.SendRespawnPacket();
|
||||
return Translations.Get("cmd.respawn.done");
|
||||
return Translations.cmd_respawn_done;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "script"; } }
|
||||
public override string CmdUsage { get { return "script <scriptname>"; } }
|
||||
public override string CmdDesc { get { return "cmd.script.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_script_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "send"; } }
|
||||
public override string CmdUsage { get { return "send <text>"; } }
|
||||
public override string CmdDesc { get { return "cmd.send.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_send_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "set"; } }
|
||||
public override string CmdUsage { get { return "set varname=value"; } }
|
||||
public override string CmdDesc { get { return "cmd.set.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_set_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -23,7 +23,7 @@ namespace MinecraftClient.Commands
|
|||
if (Settings.Config.AppVar.SetVar(temp[0], GetArg(command).Substring(temp[0].Length + 1)))
|
||||
return ""; //Success
|
||||
else
|
||||
return Translations.Get("cmd.set.format");
|
||||
return Translations.cmd_set_format;
|
||||
}
|
||||
else
|
||||
return GetCmdDescTranslated();
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ namespace MinecraftClient.Commands
|
|||
class SetRnd : Command
|
||||
{
|
||||
public override string CmdName { get { return "setrnd"; } }
|
||||
public override string CmdUsage { get { return Translations.Get("cmd.setrnd.format"); } }
|
||||
public override string CmdDesc { get { return "cmd.setrnd.desc"; } }
|
||||
public override string CmdUsage { get { return Translations.cmd_setrnd_format; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_setrnd_desc; } }
|
||||
private static readonly Random rand = new();
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
|
|
@ -37,7 +37,7 @@ namespace MinecraftClient.Commands
|
|||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return Translations.Get("cmd.setrndnum.format");
|
||||
return Translations.cmd_setrndnum_format;
|
||||
}
|
||||
|
||||
// switch the values if they were entered in the wrong way
|
||||
|
|
@ -49,7 +49,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
return string.Format("Set %{0}% to {1}.", args[0], Settings.Config.AppVar.GetVar(args[0])); //Success
|
||||
}
|
||||
else return Translations.Get("cmd.setrndnum.format");
|
||||
else return Translations.cmd_setrndnum_format;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -64,7 +64,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
return string.Format("Set %{0}% to {1}.", args[0], Settings.Config.AppVar.GetVar(args[0])); //Success
|
||||
}
|
||||
else return Translations.Get("cmd.setrndstr.format");
|
||||
else return Translations.cmd_setrndstr_format;
|
||||
}
|
||||
}
|
||||
else return GetCmdDescTranslated();
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
private bool sneaking = false;
|
||||
public override string CmdName { get { return "Sneak"; } }
|
||||
public override string CmdUsage { get { return "Sneak"; } }
|
||||
public override string CmdDesc { get { return "cmd.sneak.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_sneak_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -21,14 +21,14 @@ namespace MinecraftClient.Commands
|
|||
var result = handler.SendEntityAction(Protocol.EntityActionType.StopSneaking);
|
||||
if (result)
|
||||
sneaking = false;
|
||||
return Translations.Get(result ? "cmd.sneak.off" : "general.fail");
|
||||
return result ? Translations.cmd_sneak_off : Translations.general_fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
var result = handler.SendEntityAction(Protocol.EntityActionType.StartSneaking);
|
||||
if (result)
|
||||
sneaking = true;
|
||||
return Translations.Get(result ? "cmd.sneak.on" : "general.fail");
|
||||
return result ? Translations.cmd_sneak_on : Translations.general_fail;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "tps"; } }
|
||||
public override string CmdUsage { get { return "tps"; } }
|
||||
public override string CmdDesc { get { return "cmd.tps.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_tps_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -24,7 +24,7 @@ namespace MinecraftClient.Commands
|
|||
color = "§e"; // Yellow
|
||||
else
|
||||
color = "§a"; // Green
|
||||
return Translations.Get("cmd.tps.current") + ": " + color + tps;
|
||||
return Translations.cmd_tps_current + ": " + color + tps;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "useitem"; } }
|
||||
public override string CmdUsage { get { return "useitem"; } }
|
||||
public override string CmdDesc { get { return "cmd.useitem.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_useitem_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -18,9 +18,9 @@ namespace MinecraftClient.Commands
|
|||
if (handler.GetInventoryEnabled())
|
||||
{
|
||||
handler.UseItemOnHand();
|
||||
return Translations.Get("cmd.useitem.use");
|
||||
return Translations.cmd_useitem_use;
|
||||
}
|
||||
else return Translations.Get("extra.inventory_required");
|
||||
else return Translations.extra_inventory_required;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
|
|||
{
|
||||
public override string CmdName { get { return "useblock"; } }
|
||||
public override string CmdUsage { get { return "useblock <x> <y> <z>"; } }
|
||||
public override string CmdDesc { get { return "cmd.useblock.desc"; } }
|
||||
public override string CmdDesc { get { return Translations.cmd_useblock_desc; } }
|
||||
|
||||
public override void RegisterCommand(McClient handler, CommandDispatcher<CommandSource> dispatcher)
|
||||
{
|
||||
|
|
@ -17,7 +17,7 @@ namespace MinecraftClient.Commands
|
|||
public override string Run(McClient handler, string command, Dictionary<string, object>? localVars)
|
||||
{
|
||||
if (!handler.GetTerrainEnabled())
|
||||
return Translations.Get("extra.terrainandmovement_required");
|
||||
return Translations.extra_terrainandmovement_required;
|
||||
else if (HasArg(command))
|
||||
{
|
||||
string[] args = GetArgs(command);
|
||||
|
|
@ -26,7 +26,7 @@ namespace MinecraftClient.Commands
|
|||
Location block = Location.Parse(handler.GetCurrentLocation().ToFloor(), args[0], args[1], args[2]).ToFloor();
|
||||
Location blockCenter = block.ToCenter();
|
||||
bool res = handler.PlaceBlock(block, Direction.Down);
|
||||
return Translations.Get("cmd.useblock.use", blockCenter.X, blockCenter.Y, blockCenter.Z, res ? "succeeded" : "failed");
|
||||
return string.Format(Translations.cmd_useblock_use, blockCenter.X, blockCenter.Y, blockCenter.Z, res ? "succeeded" : "failed");
|
||||
}
|
||||
else
|
||||
return GetCmdDescTranslated();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue