helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge some upgrades from AsyncMCC branch

Browse source
This commit is contained in:
BruceChen 2023-01-14 21:32:19 +08:00
parent 1298654693
commit b4d7d64cdd
2 changed files with 59 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

76
MinecraftClient/ChatBots/Map.cs
View file

@ -344,10 +344,8 @@ namespace MinecraftClient.ChatBots
private static void RenderInConsole(McMap map) private static void RenderInConsole(McMap map)
{ {
StringBuilder sb = new(); StringBuilder sb = new();
int consoleWidth = Math.Max(Console.BufferWidth, Settings.Config.Main.Advanced.MinTerminalWidth) / 2; int consoleWidth = Math.Max(Console.BufferWidth, Settings.Config.Main.Advanced.MinTerminalWidth) / 2;
int consoleHeight = Math.Max(Console.BufferHeight, Settings.Config.Main.Advanced.MinTerminalHeight) - 1; int consoleHeight = Math.Max(Console.BufferHeight, Settings.Config.Main.Advanced.MinTerminalHeight) - 1;
int scaleX = (map.Width + consoleWidth - 1) / consoleWidth; int scaleX = (map.Width + consoleWidth - 1) / consoleWidth;
int scaleY = (map.Height + consoleHeight - 1) / consoleHeight; int scaleY = (map.Height + consoleHeight - 1) / consoleHeight;
int scale = Math.Max(scaleX, scaleY); int scale = Math.Max(scaleX, scaleY);
@ -356,11 +354,12 @@ namespace MinecraftClient.ChatBots
for (int base_y = 0; base_y < map.Height; base_y += scale) for (int base_y = 0; base_y < map.Height; base_y += scale)
{ {
int last_R = -1, last_G = -1, last_B = -1; string lastFg = string.Empty, lagtBg = string.Empty;
for (int base_x = 0; base_x < map.Width; base_x += scale) for (int base_x = 0; base_x < map.Width; base_x += scale)
{ {
int RL = 0, GL = 0, BL = 0, RR = 0, GR = 0, BR = 0; int RUL = 0, GUL = 0, BUL = 0, RUR = 0, GUR = 0, BUR = 0;
double mid_dx = (double)(scale - 1) / 2; int RDL = 0, GDL = 0, BDL = 0, RDR = 0, GDR = 0, BDR = 0;
double mid = (double)(scale - 1) / 2;
for (int dy = 0; dy < scale; ++dy) for (int dy = 0; dy < scale; ++dy)
{ {
for (int dx = 0; dx < scale; ++dx) for (int dx = 0; dx < scale; ++dx)
@ -368,40 +367,57 @@ namespace MinecraftClient.ChatBots
int x = Math.Min(base_x + dx, map.Width - 1); int x = Math.Min(base_x + dx, map.Width - 1);
int y = Math.Min(base_y + dy, map.Height - 1); int y = Math.Min(base_y + dy, map.Height - 1);
ColorRGBA color = MapColors.ColorByteToRGBA(map.Colors![x + y * map.Width]); ColorRGBA color = MapColors.ColorByteToRGBA(map.Colors![x + y * map.Width]);
if (dx <= mid_dx) if (dx <= mid)
{ {
RL += color.R; GL += color.G; BL += color.B; if (dy <= mid)
{
RUL += color.R; GUL += color.G; BUL += color.B;
}
if (dy >= mid)
{
RDL += color.R; GDL += color.G; BDL += color.B;
}
} }
if (dx >= mid_dx) if (dx >= mid)
{ {
RR += color.R; GR += color.G; BR += color.B; if (dy <= mid)
{
RUR += color.R; GUR += color.G; BUR += color.B;
}
if (dy >= mid)
{
RDR += color.R; GDR += color.G; BDR += color.B;
}
} }
} }
} }
int pixel_cnt = ((scale + 1) / 2) * scale; int pixel_cnt = ((scale + 1) / 2) * ((scale + 1) / 2);
RL = (int)Math.Round((double)RL / pixel_cnt); RDL = (int)Math.Round((double)RDL / pixel_cnt);
GL = (int)Math.Round((double)GL / pixel_cnt); GDL = (int)Math.Round((double)GDL / pixel_cnt);
BL = (int)Math.Round((double)BL / pixel_cnt); BDL = (int)Math.Round((double)BDL / pixel_cnt);
RR = (int)Math.Round((double)RR / pixel_cnt); RDR = (int)Math.Round((double)RDR / pixel_cnt);
GR = (int)Math.Round((double)GR / pixel_cnt); GDR = (int)Math.Round((double)GDR / pixel_cnt);
BR = (int)Math.Round((double)BR / pixel_cnt); BDR = (int)Math.Round((double)BDR / pixel_cnt);
if (RL == last_R && GL == last_G && BL == last_B) RUL = (int)Math.Round((double)RUL / pixel_cnt);
sb.Append(' '); GUL = (int)Math.Round((double)GUL / pixel_cnt);
else BUL = (int)Math.Round((double)BUL / pixel_cnt);
{ RUR = (int)Math.Round((double)RUR / pixel_cnt);
sb.Append(ColorHelper.GetColorEscapeCode((byte)RL, (byte)GL, (byte)BL, false)).Append(' '); GUR = (int)Math.Round((double)GUR / pixel_cnt);
last_R = RL; last_G = GL; last_B = BL; BUR = (int)Math.Round((double)BUR / pixel_cnt);
}
if (RR == last_R && GR == last_G && BR == last_B) string colorCode = ColorHelper.GetColorEscapeCode((byte)RUL, (byte)GUL, (byte)BUL, true);
sb.Append(' '); if (lastFg != colorCode) { sb.Append(colorCode); lastFg = colorCode; }
else colorCode = ColorHelper.GetColorEscapeCode((byte)RDL, (byte)GDL, (byte)BDL, false);
{ if (lagtBg != colorCode) { sb.Append(colorCode); lagtBg = colorCode; }
sb.Append(ColorHelper.GetColorEscapeCode((byte)RR, (byte)GR, (byte)BR, false)).Append(' '); sb.Append('▀');
last_R = RR; last_G = GR; last_B = BR;
} colorCode = ColorHelper.GetColorEscapeCode((byte)RUR, (byte)GUR, (byte)BUR, true);
if (lastFg != colorCode) { sb.Append(colorCode); lastFg = colorCode; }
colorCode = ColorHelper.GetColorEscapeCode((byte)RDR, (byte)GDR, (byte)BDR, false);
if (lagtBg != colorCode) { sb.Append(colorCode); lagtBg = colorCode; }
sb.Append('▀');
} }
if (base_y >= map.Height - scale) if (base_y >= map.Height - scale)
sb.Append(ColorHelper.GetResetEscapeCode()); sb.Append(ColorHelper.GetResetEscapeCode());

20
MinecraftClient/CommandHandler/ArgumentType/InventoryActionArgumentType.cs
View file

@ -21,14 +21,20 @@ namespace MinecraftClient.CommandHandler.ArgumentType
public override WindowActionType Parse(IStringReader reader) public override WindowActionType Parse(IStringReader reader)
{ {
reader.SkipWhitespace(); reader.SkipWhitespace();
string inputStr = reader.ReadString(); string inputStr = reader.ReadString().ToLower();
foreach (var action in SupportActions) return inputStr switch
{ {
string actionStr = action.ToString(); "left" => WindowActionType.LeftClick,
if (string.Compare(inputStr, actionStr, true) == 0) "leftclick" => WindowActionType.LeftClick,
return action; "right" => WindowActionType.RightClick,
} "rightclick" => WindowActionType.RightClick,
throw CommandSyntaxException.BuiltInExceptions.LiteralIncorrect().CreateWithContext(reader, inputStr); "mid" => WindowActionType.MiddleClick,
"middle" => WindowActionType.MiddleClick,
"middleclick" => WindowActionType.MiddleClick,
"shift" => WindowActionType.ShiftClick,
"shiftclick" => WindowActionType.ShiftClick,
_ => throw CommandSyntaxException.BuiltInExceptions.LiteralIncorrect().CreateWithContext(reader, inputStr)
};
} }
public override Task<Suggestions> ListSuggestions<TSource>(CommandContext<TSource> context, SuggestionsBuilder builder) public override Task<Suggestions> ListSuggestions<TSource>(CommandContext<TSource> context, SuggestionsBuilder builder)