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

Trim

Browse source
This commit is contained in:
BruceChen 2022-08-30 20:05:53 +08:00
parent aceccaf5b5
commit 3d13eb51e6
4 changed files with 24 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

30
MinecraftClient/Program.cs
View file

@ -52,21 +52,6 @@ namespace MinecraftClient
/// </summary> /// </summary>
static void Main(string[] args) static void Main(string[] args)
{ {
//Setup ConsoleIO
ConsoleIO.LogPrefix = "§8[MCC] ";
if (args.Length >= 1 && args[args.Length - 1] == "BasicIO" || args.Length >= 1 && args[args.Length - 1] == "BasicIO-NoColor")
{
if (args.Length >= 1 && args[args.Length - 1] == "BasicIO-NoColor")
{
ConsoleIO.BasicIO_NoColor = true;
}
ConsoleIO.BasicIO = true;
args = args.Where(o => !Object.ReferenceEquals(o, args[args.Length - 1])).ToArray();
}
if (!ConsoleIO.BasicIO)
ConsoleInteractive.ConsoleWriter.Init();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
//Take advantage of Windows 10 / Mac / Linux UTF-8 console //Take advantage of Windows 10 / Mac / Linux UTF-8 console
@ -86,6 +71,21 @@ namespace MinecraftClient
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
}); });
//Setup ConsoleIO
ConsoleIO.LogPrefix = "§8[MCC] ";
if (args.Length >= 1 && args[args.Length - 1] == "BasicIO" || args.Length >= 1 && args[args.Length - 1] == "BasicIO-NoColor")
{
if (args.Length >= 1 && args[args.Length - 1] == "BasicIO-NoColor")
{
ConsoleIO.BasicIO_NoColor = true;
}
ConsoleIO.BasicIO = true;
args = args.Where(o => !Object.ReferenceEquals(o, args[args.Length - 1])).ToArray();
}
if (!ConsoleIO.BasicIO)
ConsoleInteractive.ConsoleWriter.Init();
ConsoleIO.WriteLine($"Minecraft Console Client v{Version} - for MC {MCLowestVersion} to {MCHighestVersion} - Github.com/MCCTeam"); ConsoleIO.WriteLine($"Minecraft Console Client v{Version} - for MC {MCLowestVersion} to {MCHighestVersion} - Github.com/MCCTeam");
//Build information to facilitate processing of bug reports //Build information to facilitate processing of bug reports

2
MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs
View file

@ -87,7 +87,7 @@ namespace MinecraftClient.Protocol.Handlers
//// Block IDs are packed in the array of 64-bits integers //// Block IDs are packed in the array of 64-bits integers
dataTypes.SkipNextVarInt(cache); // Entry length dataTypes.SkipNextVarInt(cache); // Entry length
Span<byte> entryDataByte = stackalloc byte[8]; Span<byte> entryDataByte = stackalloc byte[8];
Span<long> entryDataLong = MemoryMarshal.Cast<byte, long>(entryDataByte); Span<long> entryDataLong = MemoryMarshal.Cast<byte, long>(entryDataByte); // Faster than MemoryMarshal.Read<long>
Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ];
int startOffset = 64; // Read the first data immediately int startOffset = 64; // Read the first data immediately

2
MinecraftClient/Protocol/Session/SessionToken.cs
View file

@ -97,7 +97,5 @@ namespace MinecraftClient.Protocol.Session
return session; return session;
} }
} }
} }

28
MinecraftClient/Settings.cs
View file

@ -263,39 +263,27 @@ namespace MinecraftClient
try try
{ {
string[] Lines = File.ReadAllLines(file); string[] Lines = File.ReadAllLines(file);
ConcurrentDictionary<int, Section> sectionInfo = new();
Parallel.For(0, Lines.Length, idx =>
{
string line = Lines[idx].Split('#')[0].Trim();
if (line.Length > 2 && line[0] == '[' && line[^1] == ']')
sectionInfo[idx] = GetSection(line[1..^1]);
});
Section section = Section.Default; Section section = Section.Default;
for (int idx = 0; idx < Lines.Length; ++idx) foreach (string lineRAW in Lines)
{ {
if (sectionInfo.ContainsKey(idx)) string line = lineRAW.Split('#')[0].Trim();
{
section = sectionInfo[idx];
continue;
}
Parallel.Invoke(() =>
{
string line = Lines[idx].Split('#')[0].Trim();
if (line.Length > 1) if (line.Length > 1)
{
if (line.Length > 2 && line[0] == '[' && line[^1] == ']')
section = GetSection(line[1..^1]);
else
{ {
string argName = line.Split('=')[0]; string argName = line.Split('=')[0];
if (section == Section.Main && argName == "password") if (section == Section.Main && argName == "password")
line = Lines[idx].Trim(); //Do not strip # in passwords line = lineRAW.Trim(); //Do not strip # in passwords
if (line.Length > (argName.Length + 1)) if (line.Length > (argName.Length + 1))
{ {
string argValue = line[(argName.Length + 1)..]; string argValue = line[(argName.Length + 1)..];
LoadSingleSetting(section, argName, argValue); LoadSingleSetting(section, argName, argValue);
} }
} }
}); }
} }
} }
catch (IOException) { } catch (IOException) { }