From 01ef9a89ca1a3a58ff3d4abb3541d87701fc4f00 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 24 Aug 2022 18:16:16 +0800 Subject: [PATCH 01/39] Bug fix: Cancel chunk load task when switching worlds --- MinecraftClient/Commands/Move.cs | 7 +- MinecraftClient/Mapping/ChunkColumn.cs | 2 +- MinecraftClient/Mapping/World.cs | 18 ++--- MinecraftClient/McClient.cs | 21 ++++++ .../Protocol/Handlers/Protocol18.cs | 43 ++++++++---- .../Protocol/Handlers/Protocol18Terrain.cs | 66 ++++++++++++++++--- .../Protocol/IMinecraftComHandler.cs | 1 + 7 files changed, 127 insertions(+), 31 deletions(-) diff --git a/MinecraftClient/Commands/Move.cs b/MinecraftClient/Commands/Move.cs index 6e9e7e2b..101b6845 100644 --- a/MinecraftClient/Commands/Move.cs +++ b/MinecraftClient/Commands/Move.cs @@ -71,6 +71,11 @@ namespace MinecraftClient.Commands case "get": return handler.GetCurrentLocation().ToString(); default: return Translations.Get("cmd.look.unknown", args[0]); } + + Location goal = Movement.Move(handler.GetCurrentLocation(), direction); + if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal)!.FullyLoaded == false) + return Translations.Get("cmd.move.chunk_not_loaded"); + if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction)) { if (handler.MoveTo(Movement.Move(handler.GetCurrentLocation(), direction), allowUnsafe: takeRisk)) @@ -88,7 +93,7 @@ namespace MinecraftClient.Commands int z = int.Parse(args[2]); Location goal = new Location(x, y, z); - if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal).FullyLoaded == false) + if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal)!.FullyLoaded == false) return Translations.Get("cmd.move.chunk_not_loaded"); Location current = handler.GetCurrentLocation(); diff --git a/MinecraftClient/Mapping/ChunkColumn.cs b/MinecraftClient/Mapping/ChunkColumn.cs index 5cbeda73..3c2272e3 100644 --- a/MinecraftClient/Mapping/ChunkColumn.cs +++ b/MinecraftClient/Mapping/ChunkColumn.cs @@ -73,7 +73,7 @@ namespace MinecraftClient.Mapping /// /// Location, a modulo will be applied /// The chunk, or null if not loaded - public Chunk GetChunk(Location location) + public Chunk? GetChunk(Location location) { try { diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index aee80a25..454d5a3b 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -36,9 +36,9 @@ namespace MinecraftClient.Mapping /// Read, set or unload the specified chunk column /// /// ChunkColumn X - /// ChunkColumn Y + /// ChunkColumn Z /// chunk at the given location - public ChunkColumn this[int chunkX, int chunkZ] + public ChunkColumn? this[int chunkX, int chunkZ] { get { @@ -114,7 +114,7 @@ namespace MinecraftClient.Mapping /// /// Location to retrieve chunk column /// The chunk column - public ChunkColumn GetChunkColumn(Location location) + public ChunkColumn? GetChunkColumn(Location location) { return this[location.ChunkX, location.ChunkZ]; } @@ -126,10 +126,10 @@ namespace MinecraftClient.Mapping /// Block at specified location or Air if the location is not loaded public Block GetBlock(Location location) { - ChunkColumn column = GetChunkColumn(location); + ChunkColumn? column = GetChunkColumn(location); if (column != null) { - Chunk chunk = column.GetChunk(location); + Chunk? chunk = column.GetChunk(location); if (chunk != null) return chunk.GetBlock(location); } @@ -188,10 +188,10 @@ namespace MinecraftClient.Mapping /// Block to set public void SetBlock(Location location, Block block) { - ChunkColumn column = this[location.ChunkX, location.ChunkZ]; - if (column != null) + ChunkColumn? column = this[location.ChunkX, location.ChunkZ]; + if (column != null && column.ColumnSize >= location.ChunkY) { - Chunk chunk = column[location.ChunkY]; + Chunk? chunk = column.GetChunk(location); if (chunk == null) column[location.ChunkY] = chunk = new Chunk(); chunk[location.ChunkBlockX, location.ChunkBlockY, location.ChunkBlockZ] = block; @@ -207,6 +207,8 @@ namespace MinecraftClient.Mapping try { chunks = new Dictionary>(); + chunkCnt = 0; + chunkLoadNotCompleted = 0; } finally { diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index abc001e8..bcfe8b6e 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -60,6 +60,7 @@ namespace MinecraftClient private float playerYaw; private float playerPitch; private double motionY; + private CancellationTokenSource chunkProcessCancelSource = new(); public enum MovementType { Sneak, Walk, Sprint} public int currentMovementSpeed = 4; private int sequenceId; // User for player block synchronization (Aka. digging, placing blocks, etc..) @@ -111,6 +112,7 @@ namespace MinecraftClient public int GetSequenceId() { return sequenceId; } public float GetPitch() { return playerPitch; } public World GetWorld() { return world; } + public CancellationToken GetChunkProcessCancelToken() { return chunkProcessCancelSource.Token; } public Double GetServerTPS() { return averageTPS; } public bool GetIsSupportPreviewsChat() { return isSupportPreviewsChat; } public float GetHealth() { return playerHealth; } @@ -475,7 +477,9 @@ namespace MinecraftClient /// public void OnConnectionLost(ChatBot.DisconnectReason reason, string message) { + chunkProcessCancelSource.Cancel(); world.Clear(); + chunkProcessCancelSource = new(); if (timeoutdetector != null) { @@ -768,6 +772,17 @@ namespace MinecraftClient InvokeOnMainThread(() => { task(); return true; }); } + /// + /// Clear all tasks + /// + public void ClearTasks() + { + lock (threadTasksLock) + { + threadTasks.Clear(); + } + } + /// /// Check if running on a different thread and InvokeOnMainThread is required /// @@ -892,7 +907,9 @@ namespace MinecraftClient terrainAndMovementsEnabled = false; terrainAndMovementsRequested = false; locationReceived = false; + chunkProcessCancelSource.Cancel(); world.Clear(); + chunkProcessCancelSource = new(); } return true; } @@ -1922,6 +1939,8 @@ namespace MinecraftClient /// public void OnRespawn() { + ClearTasks(); + if (terrainAndMovementsRequested) { terrainAndMovementsEnabled = true; @@ -1931,7 +1950,9 @@ namespace MinecraftClient if (terrainAndMovementsEnabled) { + chunkProcessCancelSource.Cancel(); world.Clear(); + chunkProcessCancelSource = new(); } entities.Clear(); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index ecb3dfed..5ba94832 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -533,6 +533,11 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.ChunkData: if (handler.GetTerrainEnabled()) { + CancellationToken cancellationToken = handler.GetChunkProcessCancelToken(); + + Interlocked.Increment(ref handler.GetWorld().chunkCnt); + Interlocked.Increment(ref handler.GetWorld().chunkLoadNotCompleted); + int chunkX = dataTypes.ReadNextInt(packetData); int chunkZ = dataTypes.ReadNextInt(packetData); if (protocolversion >= MC_1_17_Version) @@ -540,7 +545,7 @@ namespace MinecraftClient.Protocol.Handlers ulong[]? verticalStripBitmask = null; if (protocolversion == MC_1_17_Version || protocolversion == MC_1_17_1_Version) - verticalStripBitmask = dataTypes.ReadNextULongArray(packetData); // Bit Mask Le:ngth and Primary Bit Mask + verticalStripBitmask = dataTypes.ReadNextULongArray(packetData); // Bit Mask Length and Primary Bit Mask dataTypes.ReadNextNbt(packetData); // Heightmaps @@ -548,20 +553,20 @@ namespace MinecraftClient.Protocol.Handlers { int biomesLength = dataTypes.ReadNextVarInt(packetData); // Biomes length for (int i = 0; i < biomesLength; i++) - { dataTypes.SkipNextVarInt(packetData); // Biomes - } } int dataSize = dataTypes.ReadNextVarInt(packetData); // Size - Interlocked.Increment(ref handler.GetWorld().chunkCnt); - Interlocked.Increment(ref handler.GetWorld().chunkLoadNotCompleted); new Task(() => { - pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData); - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken); + if (loaded) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); }).Start(); + + // Block Entity data: ignored + // Light data: ignored } else { @@ -579,7 +584,9 @@ namespace MinecraftClient.Protocol.Handlers byte[] decompressed = ZlibUtils.Decompress(compressed); new Task(() => { - pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed)); + bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed), cancellationToken); + if (loaded) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); }).Start(); } else @@ -606,7 +613,9 @@ namespace MinecraftClient.Protocol.Handlers int dataSize = dataTypes.ReadNextVarInt(packetData); new Task(() => { - pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData); + bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData, cancellationToken); + if (loaded) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); }).Start(); } } @@ -825,6 +834,8 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.MapChunkBulk: if (protocolversion < MC_1_9_Version && handler.GetTerrainEnabled()) { + CancellationToken cancellationToken = handler.GetChunkProcessCancelToken(); + int chunkCount; bool hasSkyLight; Queue chunkData = packetData; @@ -861,8 +872,18 @@ namespace MinecraftClient.Protocol.Handlers } //Process chunk records - for (int chunkColumnNo = 0; chunkColumnNo < chunkCount; chunkColumnNo++) - pTerrain.ProcessChunkColumnData(chunkXs[chunkColumnNo], chunkZs[chunkColumnNo], chunkMasks[chunkColumnNo], addBitmaps[chunkColumnNo], hasSkyLight, true, currentDimension, chunkData); + new Task(() => + { + for (int chunkColumnNo = 0; chunkColumnNo < chunkCount; chunkColumnNo++) + { + if (cancellationToken.IsCancellationRequested) + break; + bool loaded = pTerrain.ProcessChunkColumnData(chunkXs[chunkColumnNo], chunkZs[chunkColumnNo], chunkMasks[chunkColumnNo], addBitmaps[chunkColumnNo], hasSkyLight, true, currentDimension, chunkData, cancellationToken); + if (loaded) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + } + }).Start(); + } break; case PacketTypesIn.UnloadChunk: diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 1ccabb2e..015a5538 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading; //using System.Linq; //using System.Text; using MinecraftClient.Mapping; @@ -32,7 +33,7 @@ namespace MinecraftClient.Protocol.Handlers /// /// Blocks will store in this chunk /// Cache for reading data - private Chunk ReadBlockStatesField(ref Chunk chunk, Queue cache) + private Chunk? ReadBlockStatesField(ref Chunk chunk, Queue cache) { // read Block states (Type: Paletted Container) byte bitsPerEntry = dataTypes.ReadNextByte(cache); @@ -144,8 +145,13 @@ namespace MinecraftClient.Protocol.Handlers /// Chunk Z location /// Chunk mask for reading data, store in bitset, used in 1.17 and 1.17.1 /// Cache for reading chunk data - public void ProcessChunkColumnData(int chunkX, int chunkZ, ulong[] verticalStripBitmask, Queue cache) + /// token to cancel the task + /// true if successfully loaded + public bool ProcessChunkColumnData(int chunkX, int chunkZ, ulong[]? verticalStripBitmask, Queue cache, CancellationToken cancellationToken) { + if (cancellationToken.IsCancellationRequested) + return false; + var world = handler.GetWorld(); int chunkColumnSize = (World.GetDimension().height + 15) / 16; // Round up @@ -156,12 +162,15 @@ namespace MinecraftClient.Protocol.Handlers // Unloading chunks is handled by a separate packet for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) { + if (cancellationToken.IsCancellationRequested) + return false; + // 1.18 and above always contains all chunk section in data // 1.17 and 1.17.1 need vertical strip bitmask to know if the chunk section is included if ((protocolversion >= Protocol18Handler.MC_1_18_1_Version) || (((protocolversion == Protocol18Handler.MC_1_17_Version) || (protocolversion == Protocol18Handler.MC_1_17_1_Version)) && - ((verticalStripBitmask[chunkY / 64] & (1UL << (chunkY % 64))) != 0))) + ((verticalStripBitmask![chunkY / 64] & (1UL << (chunkY % 64))) != 0))) { // Non-air block count inside chunk section, for lighting purposes int blockCnt = dataTypes.ReadNextShort(cache); @@ -170,12 +179,16 @@ namespace MinecraftClient.Protocol.Handlers Chunk chunk = new Chunk(); ReadBlockStatesField(ref chunk, cache); + // check before store chunk + if (cancellationToken.IsCancellationRequested) + return false; + //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { if (handler.GetWorld()[chunkX, chunkZ] == null) handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(chunkColumnSize); - handler.GetWorld()[chunkX, chunkZ][chunkY] = chunk; + handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; }); // Skip Read Biomes (Type: Paletted Container) - 1.18(1.18.1) and above @@ -205,7 +218,12 @@ namespace MinecraftClient.Protocol.Handlers // Don't worry about skipping remaining data since there is no useful data afterwards in 1.9 // (plus, it would require parsing the tile entity lists' NBT) } - handler.GetWorld()[chunkX, chunkZ].FullyLoaded = true; + handler.InvokeOnMainThread(() => + { + if (handler.GetWorld()[chunkX, chunkZ] != null) + handler.GetWorld()[chunkX, chunkZ]!.FullyLoaded = true; + }); + return true; } /// @@ -219,8 +237,13 @@ namespace MinecraftClient.Protocol.Handlers /// Are the chunk continuous /// Current dimension type (0 = overworld) /// Cache for reading chunk data - public void ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue cache) + /// token to cancel the task + /// true if successfully loaded + public bool ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue cache, CancellationToken cancellationToken) { + if (cancellationToken.IsCancellationRequested) + return false; + const int chunkColumnSize = 16; if (protocolversion >= Protocol18Handler.MC_1_9_Version) { @@ -228,6 +251,9 @@ namespace MinecraftClient.Protocol.Handlers // Unloading chunks is handled by a separate packet for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) { + if (cancellationToken.IsCancellationRequested) + return false; + if ((chunkMask & (1 << chunkY)) != 0) { // 1.14 and above Non-air block count inside chunk section, for lighting purposes @@ -343,12 +369,16 @@ namespace MinecraftClient.Protocol.Handlers } } + // check before store chunk + if (cancellationToken.IsCancellationRequested) + return false; + //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { if (handler.GetWorld()[chunkX, chunkZ] == null) handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ][chunkY] = chunk; + handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; }); //Pre-1.14 Lighting data @@ -384,6 +414,9 @@ namespace MinecraftClient.Protocol.Handlers //Load chunk data from the server for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) { + if (cancellationToken.IsCancellationRequested) + return false; + if ((chunkMask & (1 << chunkY)) != 0) { Chunk chunk = new Chunk(); @@ -395,12 +428,16 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) chunk[blockX, blockY, blockZ] = new Block(queue.Dequeue()); + // check before store chunk + if (cancellationToken.IsCancellationRequested) + return false; + //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { if (handler.GetWorld()[chunkX, chunkZ] == null) handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ][chunkY] = chunk; + handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; }); } } @@ -479,17 +516,26 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) chunk[blockX, blockY, blockZ] = new Block(blockTypes.Dequeue(), blockMeta.Dequeue()); + // check before store chunk + if (cancellationToken.IsCancellationRequested) + return false; + handler.InvokeOnMainThread(() => { if (handler.GetWorld()[chunkX, chunkZ] == null) handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ][chunkY] = chunk; + handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; }); } } } } - handler.GetWorld()[chunkX, chunkZ].FullyLoaded = true; + handler.InvokeOnMainThread(() => + { + if (handler.GetWorld()[chunkX, chunkZ] != null) + handler.GetWorld()[chunkX, chunkZ]!.FullyLoaded = true; + }); + return true; } } } diff --git a/MinecraftClient/Protocol/IMinecraftComHandler.cs b/MinecraftClient/Protocol/IMinecraftComHandler.cs index 96b4e4b7..60300976 100644 --- a/MinecraftClient/Protocol/IMinecraftComHandler.cs +++ b/MinecraftClient/Protocol/IMinecraftComHandler.cs @@ -29,6 +29,7 @@ namespace MinecraftClient.Protocol PlayerInfo? GetPlayerInfo(Guid uuid); Location GetCurrentLocation(); World GetWorld(); + public System.Threading.CancellationToken GetChunkProcessCancelToken(); bool GetIsSupportPreviewsChat(); bool GetTerrainEnabled(); bool SetTerrainEnabled(bool enabled); From 58eafdfd5c09f23f5b467fee58123f693d61bea7 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 01:34:07 +0800 Subject: [PATCH 02/39] Optimize cold start speed and block loading speed --- MinecraftClient/Mapping/Chunk.cs | 37 ++++------ MinecraftClient/Mapping/ChunkColumn.cs | 25 +------ MinecraftClient/Mapping/World.cs | 54 +++++++++++++- MinecraftClient/Program.cs | 10 ++- .../Protocol/Handlers/DataTypes.cs | 14 ++-- .../Protocol/Handlers/Protocol18.cs | 23 +++--- .../Protocol/Handlers/Protocol18Terrain.cs | 71 +++++++------------ MinecraftClient/Settings.cs | 40 +++++++---- 8 files changed, 147 insertions(+), 127 deletions(-) diff --git a/MinecraftClient/Mapping/Chunk.cs b/MinecraftClient/Mapping/Chunk.cs index 3ae88b73..0ee8c7ed 100644 --- a/MinecraftClient/Mapping/Chunk.cs +++ b/MinecraftClient/Mapping/Chunk.cs @@ -20,11 +20,6 @@ namespace MinecraftClient.Mapping /// private readonly Block[,,] blocks = new Block[SizeX, SizeY, SizeZ]; - /// - /// Lock for thread safety - /// - private readonly ReaderWriterLockSlim blockLock = new ReaderWriterLockSlim(); - /// /// Read, or set the specified block /// @@ -43,15 +38,7 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - blockLock.EnterReadLock(); - try - { - return blocks[blockX, blockY, blockZ]; - } - finally - { - blockLock.ExitReadLock(); - } + return blocks[blockX, blockY, blockZ]; } set { @@ -62,18 +49,22 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - blockLock.EnterWriteLock(); - try - { - blocks[blockX, blockY, blockZ] = value; - } - finally - { - blockLock.ExitWriteLock(); - } + blocks[blockX, blockY, blockZ] = value; } } + /// + /// Used when parsing chunks + /// + /// Block X + /// Block Y + /// Block Z + /// Block + public void SetWithoutCheck(int blockX, int blockY, int blockZ, Block block) + { + blocks[blockX, blockY, blockZ] = block; + } + /// /// Get block at the specified location /// diff --git a/MinecraftClient/Mapping/ChunkColumn.cs b/MinecraftClient/Mapping/ChunkColumn.cs index 3c2272e3..ca828712 100644 --- a/MinecraftClient/Mapping/ChunkColumn.cs +++ b/MinecraftClient/Mapping/ChunkColumn.cs @@ -20,11 +20,6 @@ namespace MinecraftClient.Mapping /// private readonly Chunk[] chunks; - /// - /// Lock for thread safety - /// - private readonly ReaderWriterLockSlim chunkLock = new ReaderWriterLockSlim(); - /// /// Create a new ChunkColumn /// @@ -44,27 +39,11 @@ namespace MinecraftClient.Mapping { get { - chunkLock.EnterReadLock(); - try - { - return chunks[chunkY]; - } - finally - { - chunkLock.ExitReadLock(); - } + return chunks[chunkY]; } set { - chunkLock.EnterWriteLock(); - try - { - chunks[chunkY] = value; - } - finally - { - chunkLock.ExitWriteLock(); - } + chunks[chunkY] = value; } } diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index 454d5a3b..5810d2cc 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -14,17 +14,17 @@ namespace MinecraftClient.Mapping /// /// The chunks contained into the Minecraft world /// - private Dictionary> chunks = new Dictionary>(); + private Dictionary> chunks = new(); /// /// The dimension info of the world /// - private static Dimension dimension = new Dimension(); + private static Dimension dimension = new(); /// /// Lock for thread safety /// - private readonly ReaderWriterLockSlim chunksLock = new ReaderWriterLockSlim(); + private readonly ReaderWriterLockSlim chunksLock = new(); /// /// Chunk data parsing progress @@ -109,6 +109,54 @@ namespace MinecraftClient.Mapping return dimension; } + /// + /// Set chunk column at the specified location + /// + /// ChunkColumn X + /// ChunkColumn Y + /// ChunkColumn Z + /// ChunkColumn size + /// Chunk data + /// Whether the ChunkColumn has been fully loaded + public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk chunk, bool loadCompleted) + { + ChunkColumn? chunkColumn = null; + + chunksLock.EnterUpgradeableReadLock(); + try + { + //Read a chunk + if (chunks.ContainsKey(chunkX)) + if (chunks[chunkX].ContainsKey(chunkZ)) + chunkColumn = chunks[chunkX][chunkZ]; + + if (chunkColumn == null) + { + chunkColumn = new ChunkColumn(chunkColumnSize); + chunksLock.EnterWriteLock(); + try + { + //Update a chunk column + if (!chunks.ContainsKey(chunkX)) + chunks[chunkX] = new Dictionary(); + chunks[chunkX][chunkZ] = chunkColumn; + } + finally + { + chunksLock.ExitWriteLock(); + } + } + } + finally + { + chunksLock.ExitUpgradeableReadLock(); + } + + chunkColumn[chunkY] = chunk; + if (loadCompleted) + chunkColumn.FullyLoaded = true; + } + /// /// Get chunk column at the specified location /// diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 334de9bc..e3b6aa63 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -16,6 +16,7 @@ using MinecraftClient.WinAPI; using MinecraftClient.Protocol.Keys; using System.Security.Cryptography; using System.Xml.Linq; +using System.Threading.Tasks; namespace MinecraftClient { @@ -84,9 +85,12 @@ namespace MinecraftClient //Take advantage of Windows 10 / Mac / Linux UTF-8 console if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // If we're on windows, check if our version is Win10 or greater. - if (WindowsVersion.WinMajorVersion >= 10) - Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; + Parallel.Invoke(() => + { + // If we're on windows, check if our version is Win10 or greater. + if (WindowsVersion.WinMajorVersion >= 10) + Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; + }); } else { diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 624924ab..2d9d7226 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -253,17 +253,15 @@ namespace MinecraftClient.Protocol.Handlers /// The integer public int ReadNextVarInt(Queue cache) { - string rawData = BitConverter.ToString(cache.ToArray()); int i = 0; int j = 0; - int k = 0; - while (true) + byte b; + do { - k = ReadNextByte(cache); - i |= (k & 0x7F) << j++ * 7; - if (j > 5) throw new OverflowException("VarInt too big " + rawData); - if ((k & 0x80) != 128) break; - } + b = cache.Dequeue(); + i |= (b & 127) << j++ * 7; + if (j > 5) throw new OverflowException("VarInt too big"); + } while ((b & 128) == 128); return i; } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 5ba94832..b3bd4ff0 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -558,12 +558,19 @@ namespace MinecraftClient.Protocol.Handlers int dataSize = dataTypes.ReadNextVarInt(packetData); // Size - new Task(() => + Parallel.Invoke(() => { bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken); if (loaded) + { Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }).Start(); + if (handler.GetWorld().chunkCnt == 464) + { + log.Info("Loaded 464 chunks, exit"); + System.Environment.Exit(0); + } + } + }); // Block Entity data: ignored // Light data: ignored @@ -582,12 +589,12 @@ namespace MinecraftClient.Protocol.Handlers int compressedDataSize = dataTypes.ReadNextInt(packetData); byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] decompressed = ZlibUtils.Decompress(compressed); - new Task(() => + Parallel.Invoke(() => { bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed), cancellationToken); if (loaded) Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }).Start(); + }); } else { @@ -611,12 +618,12 @@ namespace MinecraftClient.Protocol.Handlers else dataTypes.ReadData(1024 * 4, packetData); // Biomes - 1.15 and above } int dataSize = dataTypes.ReadNextVarInt(packetData); - new Task(() => + Parallel.Invoke(() => { bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData, cancellationToken); if (loaded) Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }).Start(); + }); } } } @@ -872,7 +879,7 @@ namespace MinecraftClient.Protocol.Handlers } //Process chunk records - new Task(() => + Parallel.Invoke(() => { for (int chunkColumnNo = 0; chunkColumnNo < chunkCount; chunkColumnNo++) { @@ -882,7 +889,7 @@ namespace MinecraftClient.Protocol.Handlers if (loaded) Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } - }).Start(); + }); } break; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 015a5538..06109f79 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Numerics; using System.Threading; //using System.Linq; //using System.Text; @@ -42,24 +43,19 @@ namespace MinecraftClient.Protocol.Handlers if (bitsPerEntry == 0 && protocolversion >= Protocol18Handler.MC_1_18_1_Version) { // Palettes: Single valued - 1.18(1.18.1) and above - ushort value = (ushort)dataTypes.ReadNextVarInt(cache); + ushort blockId = (ushort)dataTypes.ReadNextVarInt(cache); dataTypes.SkipNextVarInt(cache); // Data Array Length will be zero // Empty chunks will not be stored - if (new Block(value).Type == Material.Air) + if (new Block(blockId).Type == Material.Air) return null; for (int blockY = 0; blockY < Chunk.SizeY; blockY++) - { for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) - { for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - { - chunk[blockX, blockY, blockZ] = new Block(value); - } - } - } + chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockId)); + } else { @@ -129,7 +125,7 @@ namespace MinecraftClient.Protocol.Handlers } // We have our block, save the block into the chunk - chunk[blockX, blockY, blockZ] = new Block(blockId); + chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockId)); } } } @@ -152,7 +148,7 @@ namespace MinecraftClient.Protocol.Handlers if (cancellationToken.IsCancellationRequested) return false; - var world = handler.GetWorld(); + World world = handler.GetWorld(); int chunkColumnSize = (World.GetDimension().height + 15) / 16; // Round up @@ -167,10 +163,8 @@ namespace MinecraftClient.Protocol.Handlers // 1.18 and above always contains all chunk section in data // 1.17 and 1.17.1 need vertical strip bitmask to know if the chunk section is included - if ((protocolversion >= Protocol18Handler.MC_1_18_1_Version) || - (((protocolversion == Protocol18Handler.MC_1_17_Version) || - (protocolversion == Protocol18Handler.MC_1_17_1_Version)) && - ((verticalStripBitmask![chunkY / 64] & (1UL << (chunkY % 64))) != 0))) + if ((protocolversion >= Protocol18Handler.MC_1_18_1_Version) || + ((verticalStripBitmask![chunkY / 64] & (1UL << (chunkY % 64))) != 0)) { // Non-air block count inside chunk section, for lighting purposes int blockCnt = dataTypes.ReadNextShort(cache); @@ -186,9 +180,7 @@ namespace MinecraftClient.Protocol.Handlers //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { - if (handler.GetWorld()[chunkX, chunkZ] == null) - handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(chunkColumnSize); - handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == (chunkColumnSize - 1)); }); // Skip Read Biomes (Type: Paletted Container) - 1.18(1.18.1) and above @@ -218,11 +210,6 @@ namespace MinecraftClient.Protocol.Handlers // Don't worry about skipping remaining data since there is no useful data afterwards in 1.9 // (plus, it would require parsing the tile entity lists' NBT) } - handler.InvokeOnMainThread(() => - { - if (handler.GetWorld()[chunkX, chunkZ] != null) - handler.GetWorld()[chunkX, chunkZ]!.FullyLoaded = true; - }); return true; } @@ -244,12 +231,15 @@ namespace MinecraftClient.Protocol.Handlers if (cancellationToken.IsCancellationRequested) return false; + World world = handler.GetWorld(); + const int chunkColumnSize = 16; if (protocolversion >= Protocol18Handler.MC_1_9_Version) { // 1.9 and above chunk format // Unloading chunks is handled by a separate packet - for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) + int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); + for (int chunkY = 0; chunkY <= maxChunkY; chunkY++) { if (cancellationToken.IsCancellationRequested) return false; @@ -363,7 +353,7 @@ namespace MinecraftClient.Protocol.Handlers } // We have our block, save the block into the chunk - chunk[blockX, blockY, blockZ] = new Block(blockId); + chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockId)); } } } @@ -376,9 +366,7 @@ namespace MinecraftClient.Protocol.Handlers //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { - if (handler.GetWorld()[chunkX, chunkZ] == null) - handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); }); //Pre-1.14 Lighting data @@ -406,13 +394,14 @@ namespace MinecraftClient.Protocol.Handlers //Unload the entire chunk column handler.InvokeOnMainThread(() => { - handler.GetWorld()[chunkX, chunkZ] = null; + world[chunkX, chunkZ] = null; }); } else { //Load chunk data from the server - for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) + int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); + for (int chunkY = 0; chunkY <= maxChunkY; chunkY++) { if (cancellationToken.IsCancellationRequested) return false; @@ -426,7 +415,7 @@ namespace MinecraftClient.Protocol.Handlers for (int blockY = 0; blockY < Chunk.SizeY; blockY++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - chunk[blockX, blockY, blockZ] = new Block(queue.Dequeue()); + chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(queue.Dequeue())); // check before store chunk if (cancellationToken.IsCancellationRequested) @@ -435,9 +424,7 @@ namespace MinecraftClient.Protocol.Handlers //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { - if (handler.GetWorld()[chunkX, chunkZ] == null) - handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); }); } } @@ -469,7 +456,7 @@ namespace MinecraftClient.Protocol.Handlers //Unload the entire chunk column handler.InvokeOnMainThread(() => { - handler.GetWorld()[chunkX, chunkZ] = null; + world[chunkX, chunkZ] = null; }); } else @@ -505,7 +492,8 @@ namespace MinecraftClient.Protocol.Handlers dataTypes.ReadData(Chunk.SizeX * Chunk.SizeZ, cache); //Biomes //Load chunk data - for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) + int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); + for (int chunkY = 0; chunkY <= maxChunkY; chunkY++) { if ((chunkMask & (1 << chunkY)) != 0) { @@ -514,7 +502,7 @@ namespace MinecraftClient.Protocol.Handlers for (int blockY = 0; blockY < Chunk.SizeY; blockY++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - chunk[blockX, blockY, blockZ] = new Block(blockTypes.Dequeue(), blockMeta.Dequeue()); + chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockTypes.Dequeue(), blockMeta.Dequeue())); // check before store chunk if (cancellationToken.IsCancellationRequested) @@ -522,19 +510,12 @@ namespace MinecraftClient.Protocol.Handlers handler.InvokeOnMainThread(() => { - if (handler.GetWorld()[chunkX, chunkZ] == null) - handler.GetWorld()[chunkX, chunkZ] = new ChunkColumn(); - handler.GetWorld()[chunkX, chunkZ]![chunkY] = chunk; + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); }); } } } } - handler.InvokeOnMainThread(() => - { - if (handler.GetWorld()[chunkX, chunkZ] != null) - handler.GetWorld()[chunkX, chunkZ]!.FullyLoaded = true; - }); return true; } } diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index 6f0f6654..f0794927 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -7,6 +7,8 @@ using System.Text.RegularExpressions; using MinecraftClient.Protocol.Session; using MinecraftClient.Protocol; using MinecraftClient.Mapping; +using System.Threading.Tasks; +using System.Collections.Concurrent; namespace MinecraftClient { @@ -261,29 +263,39 @@ namespace MinecraftClient try { string[] Lines = File.ReadAllLines(file); - Section section = Section.Default; - foreach (string lineRAW in Lines) - { - string line = section == Section.Main && lineRAW.ToLower().Trim().StartsWith("password") - ? lineRAW.Trim() //Do not strip # in passwords - : lineRAW.Split('#')[0].Trim(); - if (line.Length > 0) + ConcurrentDictionary 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; + for (int idx = 0; idx < Lines.Length; ++idx) + { + if (sectionInfo.ContainsKey(idx)) { - if (line[0] == '[' && line[line.Length - 1] == ']') - { - section = GetSection(line.Substring(1, line.Length - 2).ToLower()); - } - else + section = sectionInfo[idx]; + continue; + } + + Parallel.Invoke(() => + { + string line = Lines[idx].Split('#')[0].Trim(); + if (line.Length > 1) { string argName = line.Split('=')[0]; + if (section == Section.Main && argName == "password") + line = Lines[idx].Trim(); //Do not strip # in passwords if (line.Length > (argName.Length + 1)) { - string argValue = line.Substring(argName.Length + 1); + string argValue = line[(argName.Length + 1)..]; LoadSingleSetting(section, argName, argValue); } } - } + }); } } catch (IOException) { } From b125b0f10a41fc5532cc981e5c89c53e581b30c9 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 02:04:36 +0800 Subject: [PATCH 03/39] Remove debug message --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index b3bd4ff0..0c79ecc9 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -562,14 +562,7 @@ namespace MinecraftClient.Protocol.Handlers { bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken); if (loaded) - { Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - if (handler.GetWorld().chunkCnt == 464) - { - log.Info("Loaded 464 chunks, exit"); - System.Environment.Exit(0); - } - } }); // Block Entity data: ignored From 64915c87cf313d8a833f05212f675f98557f47cb Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 02:21:36 +0800 Subject: [PATCH 04/39] Bug fix: Incorrect handling of Chunk.FullyLoaded in 1.17[.1] --- .../Protocol/Handlers/Protocol18Terrain.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 06109f79..da6fa533 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -158,6 +158,23 @@ namespace MinecraftClient.Protocol.Handlers // Unloading chunks is handled by a separate packet for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) { + int lastChunkY = 0; + if (protocolversion == Protocol18Handler.MC_1_17_Version || protocolversion == Protocol18Handler.MC_1_17_1_Version) + { + for (int i = verticalStripBitmask!.Length - 1; i >= 0; --i) + { + if (verticalStripBitmask![i] != 0) + { + lastChunkY = (sizeof(ulong) * 8 * i) + (sizeof(ulong) * 8 - 1 - BitOperations.LeadingZeroCount(verticalStripBitmask![i])); + break; + } + } + } + else + { + lastChunkY = chunkColumnSize - 1; + } + if (cancellationToken.IsCancellationRequested) return false; @@ -180,7 +197,7 @@ namespace MinecraftClient.Protocol.Handlers //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { - world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == (chunkColumnSize - 1)); + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == lastChunkY); }); // Skip Read Biomes (Type: Paletted Container) - 1.18(1.18.1) and above From 5f520e2cf461e5b8b824e0a9ca7e0ded19e8288c Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 10:40:55 +0800 Subject: [PATCH 05/39] Improve ReadBlockStatesField --- MinecraftClient/Mapping/ChunkColumn.cs | 6 ++-- MinecraftClient/Mapping/World.cs | 4 +-- .../Protocol/Handlers/Protocol18Terrain.cs | 32 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/MinecraftClient/Mapping/ChunkColumn.cs b/MinecraftClient/Mapping/ChunkColumn.cs index ca828712..5e40c954 100644 --- a/MinecraftClient/Mapping/ChunkColumn.cs +++ b/MinecraftClient/Mapping/ChunkColumn.cs @@ -18,7 +18,7 @@ namespace MinecraftClient.Mapping /// /// Blocks contained into the chunk /// - private readonly Chunk[] chunks; + private readonly Chunk?[] chunks; /// /// Create a new ChunkColumn @@ -26,7 +26,7 @@ namespace MinecraftClient.Mapping public ChunkColumn(int size = 16) { ColumnSize = size; - chunks = new Chunk[size]; + chunks = new Chunk?[size]; } /// @@ -35,7 +35,7 @@ namespace MinecraftClient.Mapping /// ChunkColumn X /// ChunkColumn Y /// chunk at the given location - public Chunk this[int chunkY] + public Chunk? this[int chunkY] { get { diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index 5810d2cc..f272ead8 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -118,10 +118,9 @@ namespace MinecraftClient.Mapping /// ChunkColumn size /// Chunk data /// Whether the ChunkColumn has been fully loaded - public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk chunk, bool loadCompleted) + public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk? chunk, bool loadCompleted) { ChunkColumn? chunkColumn = null; - chunksLock.EnterUpgradeableReadLock(); try { @@ -151,7 +150,6 @@ namespace MinecraftClient.Mapping { chunksLock.ExitUpgradeableReadLock(); } - chunkColumn[chunkY] = chunk; if (loadCompleted) chunkColumn.FullyLoaded = true; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index da6fa533..e1283daa 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Numerics; using System.Threading; +using System.Threading.Tasks; //using System.Linq; //using System.Text; using MinecraftClient.Mapping; @@ -32,9 +33,8 @@ namespace MinecraftClient.Protocol.Handlers /// /// Reading the "Block states" field: consists of 4096 entries, representing all the blocks in the chunk section. /// - /// Blocks will store in this chunk /// Cache for reading data - private Chunk? ReadBlockStatesField(ref Chunk chunk, Queue cache) + private Chunk? ReadBlockStatesField(Queue cache) { // read Block states (Type: Paletted Container) byte bitsPerEntry = dataTypes.ReadNextByte(cache); @@ -44,18 +44,20 @@ namespace MinecraftClient.Protocol.Handlers { // Palettes: Single valued - 1.18(1.18.1) and above ushort blockId = (ushort)dataTypes.ReadNextVarInt(cache); + Block block = new(blockId); dataTypes.SkipNextVarInt(cache); // Data Array Length will be zero // Empty chunks will not be stored - if (new Block(blockId).Type == Material.Air) + if (block.Type == Material.Air) return null; + Chunk chunk = new(); for (int blockY = 0; blockY < Chunk.SizeY; blockY++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockId)); - + chunk.SetWithoutCheck(blockX, blockY, blockZ, block); + return chunk; } else { @@ -79,6 +81,7 @@ namespace MinecraftClient.Protocol.Handlers // Block IDs are packed in the array of 64-bits integers ulong[] dataArray = dataTypes.ReadNextULongArray(cache); + Chunk chunk = new(); int longIndex = 0; int startOffset = 0 - bitsPerEntry; for (int blockY = 0; blockY < Chunk.SizeY; blockY++) @@ -87,10 +90,6 @@ namespace MinecraftClient.Protocol.Handlers { for (int blockX = 0; blockX < Chunk.SizeX; blockX++) { - // NOTICE: In the future a single ushort may not store the entire block id; - // the Block class may need to change if block state IDs go beyond 65535 - ushort blockId; - // Calculate location of next block ID inside the array of Longs startOffset += bitsPerEntry; @@ -105,8 +104,9 @@ namespace MinecraftClient.Protocol.Handlers longIndex++; } - // Extract Block ID - blockId = (ushort)((dataArray[longIndex] >> startOffset) & valueMask); + // NOTICE: In the future a single ushort may not store the entire block id; + // the Block class may need to change if block state IDs go beyond 65535 + ushort blockId = (ushort)((dataArray[longIndex] >> startOffset) & valueMask); // Map small IDs to actual larger block IDs if (usePalette) @@ -129,9 +129,8 @@ namespace MinecraftClient.Protocol.Handlers } } } + return chunk; } - - return chunk; } /// @@ -156,11 +155,13 @@ namespace MinecraftClient.Protocol.Handlers { // 1.17 and above chunk format // Unloading chunks is handled by a separate packet + for (int chunkY = 0; chunkY < chunkColumnSize; chunkY++) { - int lastChunkY = 0; + int lastChunkY; if (protocolversion == Protocol18Handler.MC_1_17_Version || protocolversion == Protocol18Handler.MC_1_17_1_Version) { + lastChunkY = 0; for (int i = verticalStripBitmask!.Length - 1; i >= 0; --i) { if (verticalStripBitmask![i] != 0) @@ -187,8 +188,7 @@ namespace MinecraftClient.Protocol.Handlers int blockCnt = dataTypes.ReadNextShort(cache); // Read Block states (Type: Paletted Container) - Chunk chunk = new Chunk(); - ReadBlockStatesField(ref chunk, cache); + Chunk? chunk = ReadBlockStatesField(cache); // check before store chunk if (cancellationToken.IsCancellationRequested) From ed8e97fd2dc94759621a55d7f7b43e4ead28c218 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 14:36:15 +0800 Subject: [PATCH 06/39] Bug fix: /move command went to the wrong location --- MinecraftClient/Commands/Move.cs | 12 ++++++---- MinecraftClient/Mapping/Location.cs | 23 +++++++++++++++++++ MinecraftClient/Mapping/Movement.cs | 3 ++- .../Protocol/ProfileKey/KeysCache.cs | 6 ++--- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/MinecraftClient/Commands/Move.cs b/MinecraftClient/Commands/Move.cs index 101b6845..c7a2c61c 100644 --- a/MinecraftClient/Commands/Move.cs +++ b/MinecraftClient/Commands/Move.cs @@ -73,12 +73,14 @@ namespace MinecraftClient.Commands } Location goal = Movement.Move(handler.GetCurrentLocation(), direction); - if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal)!.FullyLoaded == false) + + ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal); + if (chunkColumn == null || chunkColumn.FullyLoaded == false) return Translations.Get("cmd.move.chunk_not_loaded"); if (Movement.CanMove(handler.GetWorld(), handler.GetCurrentLocation(), direction)) { - if (handler.MoveTo(Movement.Move(handler.GetCurrentLocation(), direction), allowUnsafe: takeRisk)) + if (handler.MoveTo(goal, allowUnsafe: takeRisk)) return Translations.Get("cmd.move.moving", args[0]); else return takeRisk ? Translations.Get("cmd.move.dir_fail") : Translations.Get("cmd.move.suggestforce"); } @@ -93,12 +95,12 @@ namespace MinecraftClient.Commands int z = int.Parse(args[2]); Location goal = new Location(x, y, z); - if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal)!.FullyLoaded == false) + ChunkColumn? chunkColumn = handler.GetWorld().GetChunkColumn(goal); + if (chunkColumn == null || chunkColumn.FullyLoaded == false) return Translations.Get("cmd.move.chunk_not_loaded"); Location current = handler.GetCurrentLocation(); - Location currentCenter = new Location(Math.Floor(current.X) + 0.5, current.Y, Math.Floor(current.Z) + 0.5); - handler.MoveTo(currentCenter, allowDirectTeleport: true); + handler.MoveTo(current.ToCenter(), allowDirectTeleport: true); if (handler.MoveTo(goal, allowUnsafe: takeRisk)) return Translations.Get("cmd.move.walk", goal, current); diff --git a/MinecraftClient/Mapping/Location.cs b/MinecraftClient/Mapping/Location.cs index cf45c493..1e4523ea 100644 --- a/MinecraftClient/Mapping/Location.cs +++ b/MinecraftClient/Mapping/Location.cs @@ -61,6 +61,29 @@ namespace MinecraftClient.Mapping Z = chunkZ * Chunk.SizeZ + blockZ; } + /// + /// Round coordinates + /// + /// itself + public Location ToFloor() + { + this.X = Math.Floor(this.X); + this.Y = Math.Floor(this.Y); + this.Z = Math.Floor(this.Z); + return this; + } + + /// + /// Get the center coordinates + /// + /// itself + public Location ToCenter() + { + this.X = Math.Floor(this.X) + 0.5; + this.Z = Math.Floor(this.Z) + 0.5; + return this; + } + /// /// The X index of the corresponding chunk in the world /// diff --git a/MinecraftClient/Mapping/Movement.cs b/MinecraftClient/Mapping/Movement.cs index 8a2715c4..0853bbb2 100644 --- a/MinecraftClient/Mapping/Movement.cs +++ b/MinecraftClient/Mapping/Movement.cs @@ -168,7 +168,8 @@ namespace MinecraftClient.Mapping throw new ArgumentException("minOffset must be lower or equal to maxOffset", "minOffset"); // Round start coordinates for easier calculation - start = new Location(Math.Floor(start.X), Math.Floor(start.Y), Math.Floor(start.Z)); + start.ToFloor(); + goal.ToFloor(); // We always use distance squared so our limits must also be squared. minOffset *= minOffset; diff --git a/MinecraftClient/Protocol/ProfileKey/KeysCache.cs b/MinecraftClient/Protocol/ProfileKey/KeysCache.cs index 4fc42be1..0e492456 100644 --- a/MinecraftClient/Protocol/ProfileKey/KeysCache.cs +++ b/MinecraftClient/Protocol/ProfileKey/KeysCache.cs @@ -121,14 +121,14 @@ namespace MinecraftClient.Protocol.Keys { foreach (string line in FileMonitor.ReadAllLinesWithRetries(KeysCacheFilePlaintext)) { - if (!line.Trim().StartsWith("#")) + if (!line.TrimStart().StartsWith("#")) { int separatorIdx = line.IndexOf('='); if (separatorIdx >= 1 && line.Length > separatorIdx + 1) { - string login = line.Substring(0, separatorIdx); - string value = line.Substring(separatorIdx + 1); + string login = line[..separatorIdx]; + string value = line[(separatorIdx + 1)..]; try { PlayerKeyPair playerKeyPair = PlayerKeyPair.FromString(value); From a3971f909745d7482dc59b589a03913452f43ef6 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 25 Aug 2022 21:29:33 +0800 Subject: [PATCH 07/39] Update to BouncyCastle 1.9.0 --- .../Crypto/Streams/BouncyAes/AesFastEngine.cs | 260 ++++++++++++------ .../Streams/BouncyAes/CfbBlockCipher.cs | 3 + .../Crypto/Streams/BouncyAes/Check.cs | 4 +- .../Crypto/Streams/BouncyAes/CipherStream.cs | 24 +- .../Streams/BouncyAes/CryptoException.cs | 2 +- .../Streams/BouncyAes/DataLengthException.cs | 2 +- .../Crypto/Streams/BouncyAes/KeyParameter.cs | 2 +- .../BouncyAes/OutputLengthException.cs | 2 +- .../Crypto/Streams/BouncyAes/Pack.cs | 208 ++++++++++++-- 9 files changed, 392 insertions(+), 115 deletions(-) diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs b/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs index a1b54456..069ba31a 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs @@ -30,6 +30,11 @@ namespace Org.BouncyCastle.Crypto.Engines * This file contains the fast version with 8Kbytes of static tables for round precomputation *

*/ + /// + /// Unfortunately this class has a few side channel issues. + /// In an environment where encryption/decryption may be closely observed it should not be used. + /// + [Obsolete("Use AesEngine instead")] public class AesFastEngine : IBlockCipher { @@ -573,12 +578,22 @@ namespace Org.BouncyCastle.Crypto.Engines private const uint m1 = 0x80808080; private const uint m2 = 0x7f7f7f7f; private const uint m3 = 0x0000001b; + private const uint m4 = 0xC0C0C0C0; + private const uint m5 = 0x3f3f3f3f; private static uint FFmulX(uint x) { return ((x & m2) << 1) ^ (((x & m1) >> 7) * m3); } + private static uint FFmulX2(uint x) + { + uint t0 = (x & m5) << 2; + uint t1 = (x & m4); + t1 ^= (t1 >> 1); + return t0 ^ (t1 >> 2) ^ (t1 >> 5); + } + /* The following defines provide alternative definitions of FFmulX that might give improved performance if a fast 32-bit multiply is not available. @@ -591,12 +606,13 @@ namespace Org.BouncyCastle.Crypto.Engines private static uint Inv_Mcol(uint x) { - uint f2 = FFmulX(x); - uint f4 = FFmulX(f2); - uint f8 = FFmulX(f4); - uint f9 = x ^ f8; - - return f2 ^ f4 ^ f8 ^ Shift(f2 ^ f9, 8) ^ Shift(f4 ^ f9, 16) ^ Shift(f9, 24); + uint t0, t1; + t0 = x; + t1 = t0 ^ Shift(t0, 8); + t0 ^= FFmulX(t1); + t1 ^= FFmulX2(t0); + t0 ^= t1 ^ Shift(t1, 16); + return t0; } private static uint SubWord(uint x) @@ -613,16 +629,14 @@ namespace Org.BouncyCastle.Crypto.Engines * AES specified a fixed block size of 128 bits and key sizes 128/192/256 bits * This code is written assuming those are the only possible values */ - private uint[][] GenerateWorkingKey( - byte[] key, - bool forEncryption) + private uint[][] GenerateWorkingKey(byte[] key, bool forEncryption) { - int KC = key.Length / 4; // key length in words - - if (((KC != 4) && (KC != 6) && (KC != 8)) || ((KC * 4) != key.Length)) + int keyLen = key.Length; + if (keyLen < 16 || keyLen > 32 || (keyLen & 7) != 0) throw new ArgumentException("Key length not 128/192/256 bits."); - ROUNDS = KC + 6; // This is not always true for the generalized Rijndael that allows larger block sizes + int KC = keyLen >> 2; + this.ROUNDS = KC + 6; // This is not always true for the generalized Rijndael that allows larger block sizes uint[][] W = new uint[ROUNDS + 1][]; // 4 words in a block for (int i = 0; i <= ROUNDS; ++i) @@ -630,32 +644,109 @@ namespace Org.BouncyCastle.Crypto.Engines W[i] = new uint[4]; } - // - // copy the key into the round key array - // - - int t = 0; - for (int i = 0; i < key.Length; t++) + switch (KC) { - W[t >> 2][t & 3] = Pack.LE_To_UInt32(key, i); - i+=4; - } - - // - // while not enough round key material calculated - // calculate new values - // - int k = (ROUNDS + 1) << 2; - for (int i = KC; (i < k); i++) + case 4: { - uint temp = W[(i-1)>>2][(i-1)&3]; - if ((i % KC) == 0) { - temp = SubWord(Shift(temp, 8)) ^ rcon[(i / KC)-1]; - } else if ((KC > 6) && ((i % KC) == 4)) { - temp = SubWord(temp); + uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; + uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; + uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; + uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; + + for (int i = 1; i <= 10; ++i) + { + uint u = SubWord(Shift(t3, 8)) ^ rcon[i - 1]; + t0 ^= u; W[i][0] = t0; + t1 ^= t0; W[i][1] = t1; + t2 ^= t1; W[i][2] = t2; + t3 ^= t2; W[i][3] = t3; } - W[i>>2][i&3] = W[(i - KC)>>2][(i-KC)&3] ^ temp; + break; + } + case 6: + { + uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; + uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; + uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; + uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; + uint t4 = Pack.LE_To_UInt32(key, 16); W[1][0] = t4; + uint t5 = Pack.LE_To_UInt32(key, 20); W[1][1] = t5; + + uint rcon = 1; + uint u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; + t0 ^= u; W[1][2] = t0; + t1 ^= t0; W[1][3] = t1; + t2 ^= t1; W[2][0] = t2; + t3 ^= t2; W[2][1] = t3; + t4 ^= t3; W[2][2] = t4; + t5 ^= t4; W[2][3] = t5; + + for (int i = 3; i < 12; i += 3) + { + u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; + t0 ^= u; W[i ][0] = t0; + t1 ^= t0; W[i ][1] = t1; + t2 ^= t1; W[i ][2] = t2; + t3 ^= t2; W[i ][3] = t3; + t4 ^= t3; W[i + 1][0] = t4; + t5 ^= t4; W[i + 1][1] = t5; + u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; + t0 ^= u; W[i + 1][2] = t0; + t1 ^= t0; W[i + 1][3] = t1; + t2 ^= t1; W[i + 2][0] = t2; + t3 ^= t2; W[i + 2][1] = t3; + t4 ^= t3; W[i + 2][2] = t4; + t5 ^= t4; W[i + 2][3] = t5; + } + + u = SubWord(Shift(t5, 8)) ^ rcon; + t0 ^= u; W[12][0] = t0; + t1 ^= t0; W[12][1] = t1; + t2 ^= t1; W[12][2] = t2; + t3 ^= t2; W[12][3] = t3; + + break; + } + case 8: + { + uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; + uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; + uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; + uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; + uint t4 = Pack.LE_To_UInt32(key, 16); W[1][0] = t4; + uint t5 = Pack.LE_To_UInt32(key, 20); W[1][1] = t5; + uint t6 = Pack.LE_To_UInt32(key, 24); W[1][2] = t6; + uint t7 = Pack.LE_To_UInt32(key, 28); W[1][3] = t7; + + uint u, rcon = 1; + + for (int i = 2; i < 14; i += 2) + { + u = SubWord(Shift(t7, 8)) ^ rcon; rcon <<= 1; + t0 ^= u; W[i ][0] = t0; + t1 ^= t0; W[i ][1] = t1; + t2 ^= t1; W[i ][2] = t2; + t3 ^= t2; W[i ][3] = t3; + u = SubWord(t3); + t4 ^= u; W[i + 1][0] = t4; + t5 ^= t4; W[i + 1][1] = t5; + t6 ^= t5; W[i + 1][2] = t6; + t7 ^= t6; W[i + 1][3] = t7; + } + + u = SubWord(Shift(t7, 8)) ^ rcon; + t0 ^= u; W[14][0] = t0; + t1 ^= t0; W[14][1] = t1; + t2 ^= t1; W[14][2] = t2; + t3 ^= t2; W[14][3] = t3; + + break; + } + default: + { + throw new InvalidOperationException("Should never get here"); + } } if (!forEncryption) @@ -675,7 +766,6 @@ namespace Org.BouncyCastle.Crypto.Engines private int ROUNDS; private uint[][] WorkingKey; - private uint C0, C1, C2, C3; private bool forEncryption; private const int BLOCK_SIZE = 16; @@ -687,6 +777,11 @@ namespace Org.BouncyCastle.Crypto.Engines { } + internal static string GetTypeName(object obj) + { + return obj.GetType().FullName; + } + /** * initialise an AES cipher. * @@ -702,7 +797,8 @@ namespace Org.BouncyCastle.Crypto.Engines KeyParameter keyParameter = parameters as KeyParameter; if (keyParameter == null) - throw new ArgumentException("invalid parameter passed to AES init - " + parameters.GetType().Name); + throw new ArgumentException("invalid parameter passed to AES init - " + + GetTypeName(parameters)); WorkingKey = GenerateWorkingKey(keyParameter.GetKey(), forEncryption); @@ -724,11 +820,7 @@ namespace Org.BouncyCastle.Crypto.Engines return BLOCK_SIZE; } - public virtual int ProcessBlock( - byte[] input, - int inOff, - byte[] output, - int outOff) + public virtual int ProcessBlock(byte[] input, int inOff, byte[] output, int outOff) { if (WorkingKey == null) throw new InvalidOperationException("AES engine not initialised"); @@ -736,19 +828,15 @@ namespace Org.BouncyCastle.Crypto.Engines Check.DataLength(input, inOff, 16, "input buffer too short"); Check.OutputLength(output, outOff, 16, "output buffer too short"); - UnPackBlock(input, inOff); - if (forEncryption) { - EncryptBlock(WorkingKey); + EncryptBlock(input, inOff, output, outOff, WorkingKey); } else { - DecryptBlock(WorkingKey); + DecryptBlock(input, inOff, output, outOff, WorkingKey); } - PackBlock(output, outOff); - return BLOCK_SIZE; } @@ -756,34 +844,19 @@ namespace Org.BouncyCastle.Crypto.Engines { } - private void UnPackBlock( - byte[] bytes, - int off) + private void EncryptBlock(byte[] input, int inOff, byte[] output, int outOff, uint[][] KW) { - C0 = Pack.LE_To_UInt32(bytes, off); - C1 = Pack.LE_To_UInt32(bytes, off + 4); - C2 = Pack.LE_To_UInt32(bytes, off + 8); - C3 = Pack.LE_To_UInt32(bytes, off + 12); - } + uint C0 = Pack.LE_To_UInt32(input, inOff + 0); + uint C1 = Pack.LE_To_UInt32(input, inOff + 4); + uint C2 = Pack.LE_To_UInt32(input, inOff + 8); + uint C3 = Pack.LE_To_UInt32(input, inOff + 12); - private void PackBlock( - byte[] bytes, - int off) - { - Pack.UInt32_To_LE(C0, bytes, off); - Pack.UInt32_To_LE(C1, bytes, off + 4); - Pack.UInt32_To_LE(C2, bytes, off + 8); - Pack.UInt32_To_LE(C3, bytes, off + 12); - } - - private void EncryptBlock(uint[][] KW) - { uint[] kw = KW[0]; - uint t0 = this.C0 ^ kw[0]; - uint t1 = this.C1 ^ kw[1]; - uint t2 = this.C2 ^ kw[2]; + uint t0 = C0 ^ kw[0]; + uint t1 = C1 ^ kw[1]; + uint t2 = C2 ^ kw[2]; - uint r0, r1, r2, r3 = this.C3 ^ kw[3]; + uint r0, r1, r2, r3 = C3 ^ kw[3]; int r = 1; while (r < ROUNDS - 1) { @@ -808,20 +881,30 @@ namespace Org.BouncyCastle.Crypto.Engines // the final round's table is a simple function of S so we don't use a whole other four tables for it kw = KW[r]; - this.C0 = (uint)S[r0 & 255] ^ (((uint)S[(r1 >> 8) & 255]) << 8) ^ (((uint)S[(r2 >> 16) & 255]) << 16) ^ (((uint)S[r3 >> 24]) << 24) ^ kw[0]; - this.C1 = (uint)S[r1 & 255] ^ (((uint)S[(r2 >> 8) & 255]) << 8) ^ (((uint)S[(r3 >> 16) & 255]) << 16) ^ (((uint)S[r0 >> 24]) << 24) ^ kw[1]; - this.C2 = (uint)S[r2 & 255] ^ (((uint)S[(r3 >> 8) & 255]) << 8) ^ (((uint)S[(r0 >> 16) & 255]) << 16) ^ (((uint)S[r1 >> 24]) << 24) ^ kw[2]; - this.C3 = (uint)S[r3 & 255] ^ (((uint)S[(r0 >> 8) & 255]) << 8) ^ (((uint)S[(r1 >> 16) & 255]) << 16) ^ (((uint)S[r2 >> 24]) << 24) ^ kw[3]; + C0 = (uint)S[r0 & 255] ^ (((uint)S[(r1 >> 8) & 255]) << 8) ^ (((uint)S[(r2 >> 16) & 255]) << 16) ^ (((uint)S[r3 >> 24]) << 24) ^ kw[0]; + C1 = (uint)S[r1 & 255] ^ (((uint)S[(r2 >> 8) & 255]) << 8) ^ (((uint)S[(r3 >> 16) & 255]) << 16) ^ (((uint)S[r0 >> 24]) << 24) ^ kw[1]; + C2 = (uint)S[r2 & 255] ^ (((uint)S[(r3 >> 8) & 255]) << 8) ^ (((uint)S[(r0 >> 16) & 255]) << 16) ^ (((uint)S[r1 >> 24]) << 24) ^ kw[2]; + C3 = (uint)S[r3 & 255] ^ (((uint)S[(r0 >> 8) & 255]) << 8) ^ (((uint)S[(r1 >> 16) & 255]) << 16) ^ (((uint)S[r2 >> 24]) << 24) ^ kw[3]; + + Pack.UInt32_To_LE(C0, output, outOff + 0); + Pack.UInt32_To_LE(C1, output, outOff + 4); + Pack.UInt32_To_LE(C2, output, outOff + 8); + Pack.UInt32_To_LE(C3, output, outOff + 12); } - private void DecryptBlock(uint[][] KW) + private void DecryptBlock(byte[] input, int inOff, byte[] output, int outOff, uint[][] KW) { - uint[] kw = KW[ROUNDS]; - uint t0 = this.C0 ^ kw[0]; - uint t1 = this.C1 ^ kw[1]; - uint t2 = this.C2 ^ kw[2]; + uint C0 = Pack.LE_To_UInt32(input, inOff + 0); + uint C1 = Pack.LE_To_UInt32(input, inOff + 4); + uint C2 = Pack.LE_To_UInt32(input, inOff + 8); + uint C3 = Pack.LE_To_UInt32(input, inOff + 12); - uint r0, r1, r2, r3 = this.C3 ^ kw[3]; + uint[] kw = KW[ROUNDS]; + uint t0 = C0 ^ kw[0]; + uint t1 = C1 ^ kw[1]; + uint t2 = C2 ^ kw[2]; + + uint r0, r1, r2, r3 = C3 ^ kw[3]; int r = ROUNDS - 1; while (r > 1) { @@ -846,10 +929,15 @@ namespace Org.BouncyCastle.Crypto.Engines // the final round's table is a simple function of Si so we don't use a whole other four tables for it kw = KW[0]; - this.C0 = (uint)Si[r0 & 255] ^ (((uint)Si[(r3 >> 8) & 255]) << 8) ^ (((uint)Si[(r2 >> 16) & 255]) << 16) ^ (((uint)Si[r1 >> 24]) << 24) ^ kw[0]; - this.C1 = (uint)Si[r1 & 255] ^ (((uint)Si[(r0 >> 8) & 255]) << 8) ^ (((uint)Si[(r3 >> 16) & 255]) << 16) ^ (((uint)Si[r2 >> 24]) << 24) ^ kw[1]; - this.C2 = (uint)Si[r2 & 255] ^ (((uint)Si[(r1 >> 8) & 255]) << 8) ^ (((uint)Si[(r0 >> 16) & 255]) << 16) ^ (((uint)Si[r3 >> 24]) << 24) ^ kw[2]; - this.C3 = (uint)Si[r3 & 255] ^ (((uint)Si[(r2 >> 8) & 255]) << 8) ^ (((uint)Si[(r1 >> 16) & 255]) << 16) ^ (((uint)Si[r0 >> 24]) << 24) ^ kw[3]; + C0 = (uint)Si[r0 & 255] ^ (((uint)Si[(r3 >> 8) & 255]) << 8) ^ (((uint)Si[(r2 >> 16) & 255]) << 16) ^ (((uint)Si[r1 >> 24]) << 24) ^ kw[0]; + C1 = (uint)Si[r1 & 255] ^ (((uint)Si[(r0 >> 8) & 255]) << 8) ^ (((uint)Si[(r3 >> 16) & 255]) << 16) ^ (((uint)Si[r2 >> 24]) << 24) ^ kw[1]; + C2 = (uint)Si[r2 & 255] ^ (((uint)Si[(r1 >> 8) & 255]) << 8) ^ (((uint)Si[(r0 >> 16) & 255]) << 16) ^ (((uint)Si[r3 >> 24]) << 24) ^ kw[2]; + C3 = (uint)Si[r3 & 255] ^ (((uint)Si[(r2 >> 8) & 255]) << 8) ^ (((uint)Si[(r1 >> 16) & 255]) << 16) ^ (((uint)Si[r0 >> 24]) << 24) ^ kw[3]; + + Pack.UInt32_To_LE(C0, output, outOff + 0); + Pack.UInt32_To_LE(C1, output, outOff + 4); + Pack.UInt32_To_LE(C2, output, outOff + 8); + Pack.UInt32_To_LE(C3, output, outOff + 12); } } } diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs index 43371653..ed0be407 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs @@ -29,6 +29,9 @@ namespace Org.BouncyCastle.Crypto.Modes IBlockCipher cipher, int bitBlockSize) { + if (bitBlockSize < 8 || (bitBlockSize & 7) != 0) + throw new ArgumentException("CFB" + bitBlockSize + " not supported", "bitBlockSize"); + this.cipher = cipher; this.blockSize = bitBlockSize / 8; this.IV = new byte[cipher.GetBlockSize()]; diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs b/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs index 96a05c64..aacda144 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs @@ -12,13 +12,13 @@ namespace Org.BouncyCastle.Crypto internal static void DataLength(byte[] buf, int off, int len, string msg) { - if (off + len > buf.Length) + if (off > (buf.Length - len)) throw new DataLengthException(msg); } internal static void OutputLength(byte[] buf, int off, int len, string msg) { - if (off + len > buf.Length) + if (off > (buf.Length - len)) throw new OutputLengthException(msg); } } diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs index b6920854..058d7f73 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs @@ -2,8 +2,6 @@ using System; using System.Diagnostics; using System.IO; -using Org.BouncyCastle.Crypto; - namespace Org.BouncyCastle.Crypto.IO { public class CipherStream @@ -201,7 +199,23 @@ namespace Org.BouncyCastle.Crypto.IO set { throw new NotSupportedException(); } } - public override void Close() +#if PORTABLE + protected override void Dispose(bool disposing) + { + if (disposing) + { + if (outCipher != null) + { + byte[] data = outCipher.DoFinal(); + stream.Write(data, 0, data.Length); + stream.Flush(); + } + Platform.Dispose(stream); + } + base.Dispose(disposing); + } +#else + public override void Close() { if (outCipher != null) { @@ -210,9 +224,11 @@ namespace Org.BouncyCastle.Crypto.IO stream.Flush(); } stream.Close(); + base.Close(); } +#endif - public override void Flush() + public override void Flush() { // Note: outCipher.DoFinal is only called during Close() stream.Flush(); diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs index 67f0d86f..73d450be 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs @@ -2,7 +2,7 @@ using System; namespace Org.BouncyCastle.Crypto { -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT) +#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) [Serializable] #endif public class CryptoException diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs index e9efc0bd..447ff2a1 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Crypto * insufficient input. In general this exception will Get thrown rather * than an ArrayOutOfBounds exception. */ -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT) +#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) [Serializable] #endif public class DataLengthException diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs b/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs index 33dff96d..043adf27 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs @@ -27,7 +27,7 @@ namespace Org.BouncyCastle.Crypto.Parameters throw new ArgumentNullException("key"); if (keyOff < 0 || keyOff > key.Length) throw new ArgumentOutOfRangeException("keyOff"); - if (keyLen < 0 || (keyOff + keyLen) > key.Length) + if (keyLen < 0 || keyLen > (key.Length - keyOff)) throw new ArgumentOutOfRangeException("keyLen"); this.key = new byte[keyLen]; diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs index e1cf4492..437589f4 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs @@ -2,7 +2,7 @@ namespace Org.BouncyCastle.Crypto { -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT) +#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) [Serializable] #endif public class OutputLengthException diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs b/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs index 087cb7ce..8ba738d4 100644 --- a/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs +++ b/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs @@ -20,11 +20,41 @@ namespace Org.BouncyCastle.Crypto.Utilities bs[off + 1] = (byte)(n); } - internal static ushort BE_To_UInt16(byte[] bs) + internal static void UInt16_To_BE(ushort[] ns, byte[] bs, int off) { - uint n = (uint)bs[0] << 8 - | (uint)bs[1]; - return (ushort)n; + for (int i = 0; i < ns.Length; ++i) + { + UInt16_To_BE(ns[i], bs, off); + off += 2; + } + } + + internal static void UInt16_To_BE(ushort[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) + { + for (int i = 0; i < nsLen; ++i) + { + UInt16_To_BE(ns[nsOff + i], bs, bsOff); + bsOff += 2; + } + } + + internal static byte[] UInt16_To_BE(ushort n) + { + byte[] bs = new byte[2]; + UInt16_To_BE(n, bs, 0); + return bs; + } + + internal static byte[] UInt16_To_BE(ushort[] ns) + { + return UInt16_To_BE(ns, 0, ns.Length); + } + + internal static byte[] UInt16_To_BE(ushort[] ns, int nsOff, int nsLen) + { + byte[] bs = new byte[2 * nsLen]; + UInt16_To_BE(ns, nsOff, nsLen, bs, 0); + return bs; } internal static ushort BE_To_UInt16(byte[] bs, int off) @@ -34,11 +64,27 @@ namespace Org.BouncyCastle.Crypto.Utilities return (ushort)n; } - internal static byte[] UInt32_To_BE(uint n) + internal static void BE_To_UInt16(byte[] bs, int bsOff, ushort[] ns, int nsOff) { - byte[] bs = new byte[4]; - UInt32_To_BE(n, bs, 0); - return bs; + ns[nsOff] = BE_To_UInt16(bs, bsOff); + } + + internal static ushort[] BE_To_UInt16(byte[] bs) + { + return BE_To_UInt16(bs, 0, bs.Length); + } + + internal static ushort[] BE_To_UInt16(byte[] bs, int off, int len) + { + if ((len & 1) != 0) + throw new ArgumentException("must be a multiple of 2", "len"); + + ushort[] ns = new ushort[len / 2]; + for (int i = 0; i < len; i += 2) + { + BE_To_UInt16(bs, off + i, ns, i >> 1); + } + return ns; } internal static void UInt32_To_BE(uint n, byte[] bs) @@ -57,13 +103,6 @@ namespace Org.BouncyCastle.Crypto.Utilities bs[off + 3] = (byte)(n); } - internal static byte[] UInt32_To_BE(uint[] ns) - { - byte[] bs = new byte[4 * ns.Length]; - UInt32_To_BE(ns, bs, 0); - return bs; - } - internal static void UInt32_To_BE(uint[] ns, byte[] bs, int off) { for (int i = 0; i < ns.Length; ++i) @@ -73,6 +112,29 @@ namespace Org.BouncyCastle.Crypto.Utilities } } + internal static void UInt32_To_BE(uint[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) + { + for (int i = 0; i < nsLen; ++i) + { + UInt32_To_BE(ns[nsOff + i], bs, bsOff); + bsOff += 4; + } + } + + internal static byte[] UInt32_To_BE(uint n) + { + byte[] bs = new byte[4]; + UInt32_To_BE(n, bs, 0); + return bs; + } + + internal static byte[] UInt32_To_BE(uint[] ns) + { + byte[] bs = new byte[4 * ns.Length]; + UInt32_To_BE(ns, bs, 0); + return bs; + } + internal static uint BE_To_UInt32(byte[] bs) { return (uint)bs[0] << 24 @@ -98,6 +160,15 @@ namespace Org.BouncyCastle.Crypto.Utilities } } + internal static void BE_To_UInt32(byte[] bs, int bsOff, uint[] ns, int nsOff, int nsLen) + { + for (int i = 0; i < nsLen; ++i) + { + ns[nsOff + i] = BE_To_UInt32(bs, bsOff); + bsOff += 4; + } + } + internal static byte[] UInt64_To_BE(ulong n) { byte[] bs = new byte[8]; @@ -117,11 +188,29 @@ namespace Org.BouncyCastle.Crypto.Utilities UInt32_To_BE((uint)(n), bs, off + 4); } - internal static ulong BE_To_UInt64(byte[] bs) + internal static byte[] UInt64_To_BE(ulong[] ns) { - uint hi = BE_To_UInt32(bs); - uint lo = BE_To_UInt32(bs, 4); - return ((ulong)hi << 32) | (ulong)lo; + byte[] bs = new byte[8 * ns.Length]; + UInt64_To_BE(ns, bs, 0); + return bs; + } + + internal static void UInt64_To_BE(ulong[] ns, byte[] bs, int off) + { + for (int i = 0; i < ns.Length; ++i) + { + UInt64_To_BE(ns[i], bs, off); + off += 8; + } + } + + internal static void UInt64_To_BE(ulong[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) + { + for (int i = 0; i < nsLen; ++i) + { + UInt64_To_BE(ns[nsOff + i], bs, bsOff); + bsOff += 8; + } } internal static ulong BE_To_UInt64(byte[] bs, int off) @@ -131,6 +220,24 @@ namespace Org.BouncyCastle.Crypto.Utilities return ((ulong)hi << 32) | (ulong)lo; } + internal static void BE_To_UInt64(byte[] bs, int off, ulong[] ns) + { + for (int i = 0; i < ns.Length; ++i) + { + ns[i] = BE_To_UInt64(bs, off); + off += 8; + } + } + + internal static void BE_To_UInt64(byte[] bs, int bsOff, ulong[] ns, int nsOff, int nsLen) + { + for (int i = 0; i < nsLen; ++i) + { + ns[nsOff + i] = BE_To_UInt64(bs, bsOff); + bsOff += 8; + } + } + internal static void UInt16_To_LE(ushort n, byte[] bs) { bs[0] = (byte)(n); @@ -196,6 +303,15 @@ namespace Org.BouncyCastle.Crypto.Utilities } } + internal static void UInt32_To_LE(uint[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) + { + for (int i = 0; i < nsLen; ++i) + { + UInt32_To_LE(ns[nsOff + i], bs, bsOff); + bsOff += 4; + } + } + internal static uint LE_To_UInt32(byte[] bs) { return (uint)bs[0] @@ -230,6 +346,17 @@ namespace Org.BouncyCastle.Crypto.Utilities } } + internal static uint[] LE_To_UInt32(byte[] bs, int off, int count) + { + uint[] ns = new uint[count]; + for (int i = 0; i < ns.Length; ++i) + { + ns[i] = LE_To_UInt32(bs, off); + off += 4; + } + return ns; + } + internal static byte[] UInt64_To_LE(ulong n) { byte[] bs = new byte[8]; @@ -249,6 +376,31 @@ namespace Org.BouncyCastle.Crypto.Utilities UInt32_To_LE((uint)(n >> 32), bs, off + 4); } + internal static byte[] UInt64_To_LE(ulong[] ns) + { + byte[] bs = new byte[8 * ns.Length]; + UInt64_To_LE(ns, bs, 0); + return bs; + } + + internal static void UInt64_To_LE(ulong[] ns, byte[] bs, int off) + { + for (int i = 0; i < ns.Length; ++i) + { + UInt64_To_LE(ns[i], bs, off); + off += 8; + } + } + + internal static void UInt64_To_LE(ulong[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) + { + for (int i = 0; i < nsLen; ++i) + { + UInt64_To_LE(ns[nsOff + i], bs, bsOff); + bsOff += 8; + } + } + internal static ulong LE_To_UInt64(byte[] bs) { uint lo = LE_To_UInt32(bs); @@ -262,5 +414,23 @@ namespace Org.BouncyCastle.Crypto.Utilities uint hi = LE_To_UInt32(bs, off + 4); return ((ulong)hi << 32) | (ulong)lo; } + + internal static void LE_To_UInt64(byte[] bs, int off, ulong[] ns) + { + for (int i = 0; i < ns.Length; ++i) + { + ns[i] = LE_To_UInt64(bs, off); + off += 8; + } + } + + internal static void LE_To_UInt64(byte[] bs, int bsOff, ulong[] ns, int nsOff, int nsLen) + { + for (int i = 0; i < nsLen; ++i) + { + ns[nsOff + i] = LE_To_UInt64(bs, bsOff); + bsOff += 8; + } + } } } From 13d1a9856ab9d4a0e22a006043a67f832ade2c73 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sat, 27 Aug 2022 23:01:28 +0800 Subject: [PATCH 08/39] Rewrote AES stream & Perform "SessionCheck" in advance --- MinecraftClient/Crypto/CryptoHandler.cs | 6 +- .../Crypto/Streams/AesCfb8Stream.cs | 158 +++ .../Crypto/Streams/BouncyAes/AesFastEngine.cs | 943 ------------------ .../Streams/BouncyAes/BufferedBlockCipher.cs | 367 ------- .../Streams/BouncyAes/BufferedCipherBase.cs | 113 --- .../Streams/BouncyAes/CfbBlockCipher.cs | 227 ----- .../Crypto/Streams/BouncyAes/Check.cs | 25 - .../Crypto/Streams/BouncyAes/CipherStream.cs | 250 ----- .../Streams/BouncyAes/CryptoException.cs | 28 - .../Streams/BouncyAes/DataLengthException.cs | 42 - .../Crypto/Streams/BouncyAes/IBlockCipher.cs | 36 - .../Streams/BouncyAes/IBufferedCipher.cs | 44 - .../Streams/BouncyAes/ICipherParameters.cs | 11 - .../Crypto/Streams/BouncyAes/KeyParameter.cs | 43 - .../BouncyAes/OutputLengthException.cs | 28 - .../Crypto/Streams/BouncyAes/Pack.cs | 436 -------- .../Streams/BouncyAes/ParametersWithIV.cs | 43 - .../Crypto/Streams/MonoAesStream.cs | 108 -- MinecraftClient/McClient.cs | 21 +- MinecraftClient/Program.cs | 43 +- .../Protocol/Handlers/DataTypes.cs | 12 +- .../Protocol/Handlers/Protocol16.cs | 42 +- .../Protocol/Handlers/Protocol18.cs | 38 +- MinecraftClient/Protocol/IMinecraftCom.cs | 2 +- .../Protocol/ProfileKey/KeyUtils.cs | 2 +- .../Protocol/Session/SessionCache.cs | 2 +- .../Protocol/Session/SessionToken.cs | 41 +- .../Resources/config/MinecraftClient.ini | 2 +- 28 files changed, 306 insertions(+), 2807 deletions(-) create mode 100644 MinecraftClient/Crypto/Streams/AesCfb8Stream.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/BufferedBlockCipher.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/BufferedCipherBase.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/Check.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/IBlockCipher.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/IBufferedCipher.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/ICipherParameters.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs delete mode 100644 MinecraftClient/Crypto/Streams/BouncyAes/ParametersWithIV.cs delete mode 100644 MinecraftClient/Crypto/Streams/MonoAesStream.cs diff --git a/MinecraftClient/Crypto/CryptoHandler.cs b/MinecraftClient/Crypto/CryptoHandler.cs index 168ff9b7..e65f231b 100644 --- a/MinecraftClient/Crypto/CryptoHandler.cs +++ b/MinecraftClient/Crypto/CryptoHandler.cs @@ -11,8 +11,10 @@ namespace MinecraftClient.Crypto /// Methods for handling all the crypto stuff: RSA (Encryption Key Request), AES (Encrypted Stream), SHA-1 (Server Hash). /// - public class CryptoHandler + public static class CryptoHandler { + public static byte[]? ClientAESPrivateKey = null; + /// /// Get a cryptographic service for encrypting data using the server's RSA public key /// @@ -202,7 +204,7 @@ namespace MinecraftClient.Crypto public static IAesStream getAesStream(Stream underlyingStream, byte[] AesKey) { // return new Streams.RegularAesStream(underlyingStream, AesKey); - return new Streams.MonoAesStream(underlyingStream, AesKey); + return new Streams.AesCfb8Stream(underlyingStream, AesKey); } } } diff --git a/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs b/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs new file mode 100644 index 00000000..038a1c12 --- /dev/null +++ b/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Security.Cryptography; +using System.IO; +using System.Collections.Concurrent; + +namespace MinecraftClient.Crypto.Streams +{ + internal class AesCfb8Stream : Stream, IAesStream + { + public static readonly int blockSize = 16; + + private Aes aes; + + public System.IO.Stream BaseStream { get; set; } + + private bool inStreamEnded = false; + + private byte[] ReadStreamIV = new byte[16]; + private byte[] WriteStreamIV = new byte[16]; + + public AesCfb8Stream(System.IO.Stream stream, byte[] key) + { + BaseStream = stream; + + aes = GenerateAES(key); + + Array.Copy(key, ReadStreamIV, 16); + Array.Copy(key, WriteStreamIV, 16); + } + + public override bool CanRead + { + get { return true; } + } + + public override bool CanSeek + { + get { return false; } + } + + public override bool CanWrite + { + get { return true; } + } + + public override void Flush() + { + BaseStream.Flush(); + } + + public override long Length + { + get { throw new NotSupportedException(); } + } + + public override long Position + { + get + { + throw new NotSupportedException(); + } + set + { + throw new NotSupportedException(); + } + } + + public override int ReadByte() + { + byte[] temp = new byte[1]; + Read(temp, 0, 1); + return temp[0]; + } + + public override int Read(byte[] buffer, int outOffset, int required) + { + if (this.inStreamEnded) + return 0; + + byte[] inputBuf = new byte[blockSize + required]; + Array.Copy(ReadStreamIV, inputBuf, blockSize); + + for (int readed = 0, curRead; readed < required; readed += curRead) + { + curRead = BaseStream.Read(inputBuf, blockSize + readed, required - readed); + if (curRead == 0) + { + this.inStreamEnded = true; + return readed; + } + + OrderablePartitioner> rangePartitioner = (curRead <= 256) ? + Partitioner.Create(readed, readed + curRead, 32) : Partitioner.Create(readed, readed + curRead); + Parallel.ForEach(rangePartitioner, (range, loopState) => + { + Span blockOutput = stackalloc byte[blockSize]; + for (int idx = range.Item1; idx < range.Item2; idx++) + { + ReadOnlySpan blockInput = new(inputBuf, idx, blockSize); + aes.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + buffer[outOffset + idx] = (byte)(blockOutput[0] ^ inputBuf[idx + blockSize]); + } + }); + } + + Array.Copy(inputBuf, required, ReadStreamIV, 0, blockSize); + + return required; + } + + public override long Seek(long offset, System.IO.SeekOrigin origin) + { + throw new NotSupportedException(); + } + + public override void SetLength(long value) + { + throw new NotSupportedException(); + } + + public override void WriteByte(byte b) + { + Write(new byte[] { b }, 0, 1); + } + + public override void Write(byte[] input, int offset, int required) + { + byte[] outputBuf = new byte[blockSize + required]; + Array.Copy(WriteStreamIV, outputBuf, blockSize); + + Span blockOutput = stackalloc byte[blockSize]; + for (int wirtten = 0; wirtten < required; ++wirtten) + { + ReadOnlySpan blockInput = new(outputBuf, wirtten, blockSize); + aes.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + outputBuf[blockSize + wirtten] = (byte)(blockOutput[0] ^ input[offset + wirtten]); + } + BaseStream.WriteAsync(outputBuf, blockSize, required); + + Array.Copy(outputBuf, required, WriteStreamIV, 0, blockSize); + } + + private static Aes GenerateAES(byte[] key) + { + Aes aes = Aes.Create(); + aes.BlockSize = 128; + aes.KeySize = 128; + aes.Key = key; + aes.Mode = CipherMode.ECB; + aes.Padding = PaddingMode.None; + return aes; + } + } +} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs b/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs deleted file mode 100644 index 069ba31a..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/AesFastEngine.cs +++ /dev/null @@ -1,943 +0,0 @@ -using System; -using System.Diagnostics; - -using Org.BouncyCastle.Crypto.Parameters; -using Org.BouncyCastle.Crypto.Utilities; - -namespace Org.BouncyCastle.Crypto.Engines -{ - /** - * an implementation of the AES (Rijndael)), from FIPS-197. - *

- * For further details see: http://csrc.nist.gov/encryption/aes/. - * - * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at - * http://fp.gladman.plus.com/cryptography_technology/rijndael/ - * - * There are three levels of tradeoff of speed vs memory - * Because java has no preprocessor), they are written as three separate classes from which to choose - * - * The fastest uses 8Kbytes of static tables to precompute round calculations), 4 256 word tables for encryption - * and 4 for decryption. - * - * The middle performance version uses only one 256 word table for each), for a total of 2Kbytes), - * adding 12 rotate operations per round to compute the values contained in the other tables from - * the contents of the first - * - * The slowest version uses no static tables at all and computes the values in each round - *

- *

- * This file contains the fast version with 8Kbytes of static tables for round precomputation - *

- */ - /// - /// Unfortunately this class has a few side channel issues. - /// In an environment where encryption/decryption may be closely observed it should not be used. - /// - [Obsolete("Use AesEngine instead")] - public class AesFastEngine - : IBlockCipher - { - // The S box - private static readonly byte[] S = - { - 99, 124, 119, 123, 242, 107, 111, 197, - 48, 1, 103, 43, 254, 215, 171, 118, - 202, 130, 201, 125, 250, 89, 71, 240, - 173, 212, 162, 175, 156, 164, 114, 192, - 183, 253, 147, 38, 54, 63, 247, 204, - 52, 165, 229, 241, 113, 216, 49, 21, - 4, 199, 35, 195, 24, 150, 5, 154, - 7, 18, 128, 226, 235, 39, 178, 117, - 9, 131, 44, 26, 27, 110, 90, 160, - 82, 59, 214, 179, 41, 227, 47, 132, - 83, 209, 0, 237, 32, 252, 177, 91, - 106, 203, 190, 57, 74, 76, 88, 207, - 208, 239, 170, 251, 67, 77, 51, 133, - 69, 249, 2, 127, 80, 60, 159, 168, - 81, 163, 64, 143, 146, 157, 56, 245, - 188, 182, 218, 33, 16, 255, 243, 210, - 205, 12, 19, 236, 95, 151, 68, 23, - 196, 167, 126, 61, 100, 93, 25, 115, - 96, 129, 79, 220, 34, 42, 144, 136, - 70, 238, 184, 20, 222, 94, 11, 219, - 224, 50, 58, 10, 73, 6, 36, 92, - 194, 211, 172, 98, 145, 149, 228, 121, - 231, 200, 55, 109, 141, 213, 78, 169, - 108, 86, 244, 234, 101, 122, 174, 8, - 186, 120, 37, 46, 28, 166, 180, 198, - 232, 221, 116, 31, 75, 189, 139, 138, - 112, 62, 181, 102, 72, 3, 246, 14, - 97, 53, 87, 185, 134, 193, 29, 158, - 225, 248, 152, 17, 105, 217, 142, 148, - 155, 30, 135, 233, 206, 85, 40, 223, - 140, 161, 137, 13, 191, 230, 66, 104, - 65, 153, 45, 15, 176, 84, 187, 22, - }; - - // The inverse S-box - private static readonly byte[] Si = - { - 82, 9, 106, 213, 48, 54, 165, 56, - 191, 64, 163, 158, 129, 243, 215, 251, - 124, 227, 57, 130, 155, 47, 255, 135, - 52, 142, 67, 68, 196, 222, 233, 203, - 84, 123, 148, 50, 166, 194, 35, 61, - 238, 76, 149, 11, 66, 250, 195, 78, - 8, 46, 161, 102, 40, 217, 36, 178, - 118, 91, 162, 73, 109, 139, 209, 37, - 114, 248, 246, 100, 134, 104, 152, 22, - 212, 164, 92, 204, 93, 101, 182, 146, - 108, 112, 72, 80, 253, 237, 185, 218, - 94, 21, 70, 87, 167, 141, 157, 132, - 144, 216, 171, 0, 140, 188, 211, 10, - 247, 228, 88, 5, 184, 179, 69, 6, - 208, 44, 30, 143, 202, 63, 15, 2, - 193, 175, 189, 3, 1, 19, 138, 107, - 58, 145, 17, 65, 79, 103, 220, 234, - 151, 242, 207, 206, 240, 180, 230, 115, - 150, 172, 116, 34, 231, 173, 53, 133, - 226, 249, 55, 232, 28, 117, 223, 110, - 71, 241, 26, 113, 29, 41, 197, 137, - 111, 183, 98, 14, 170, 24, 190, 27, - 252, 86, 62, 75, 198, 210, 121, 32, - 154, 219, 192, 254, 120, 205, 90, 244, - 31, 221, 168, 51, 136, 7, 199, 49, - 177, 18, 16, 89, 39, 128, 236, 95, - 96, 81, 127, 169, 25, 181, 74, 13, - 45, 229, 122, 159, 147, 201, 156, 239, - 160, 224, 59, 77, 174, 42, 245, 176, - 200, 235, 187, 60, 131, 83, 153, 97, - 23, 43, 4, 126, 186, 119, 214, 38, - 225, 105, 20, 99, 85, 33, 12, 125, - }; - - // vector used in calculating key schedule (powers of x in GF(256)) - private static readonly byte[] rcon = - { - 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, - 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91 - }; - - // precomputation tables of calculations for rounds - private static readonly uint[] T0 = - { - 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 0x0df2f2ff, - 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 0x50303060, 0x03010102, - 0xa96767ce, 0x7d2b2b56, 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, - 0x9a7676ec, 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa, - 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 0xecadad41, - 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 0xbf9c9c23, 0xf7a4a453, - 0x967272e4, 0x5bc0c09b, 0xc2b7b775, 0x1cfdfde1, 0xae93933d, - 0x6a26264c, 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83, - 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 0x937171e2, - 0x73d8d8ab, 0x53313162, 0x3f15152a, 0x0c040408, 0x52c7c795, - 0x65232346, 0x5ec3c39d, 0x28181830, 0xa1969637, 0x0f05050a, - 0xb59a9a2f, 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df, - 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 0x1b090912, - 0x9e83831d, 0x742c2c58, 0x2e1a1a34, 0x2d1b1b36, 0xb26e6edc, - 0xee5a5ab4, 0xfba0a05b, 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, - 0xceb3b37d, 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413, - 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 0x60202040, - 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 0xbe6a6ad4, 0x46cbcb8d, - 0xd9bebe67, 0x4b393972, 0xde4a4a94, 0xd44c4c98, 0xe85858b0, - 0x4acfcf85, 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed, - 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 0xcf45458a, - 0x10f9f9e9, 0x06020204, 0x817f7ffe, 0xf05050a0, 0x443c3c78, - 0xba9f9f25, 0xe3a8a84b, 0xf35151a2, 0xfea3a35d, 0xc0404080, - 0x8a8f8f05, 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1, - 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 0x30101020, - 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 0x4ccdcd81, 0x140c0c18, - 0x35131326, 0x2fececc3, 0xe15f5fbe, 0xa2979735, 0xcc444488, - 0x3917172e, 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a, - 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 0xa06060c0, - 0x98818119, 0xd14f4f9e, 0x7fdcdca3, 0x66222244, 0x7e2a2a54, - 0xab90903b, 0x8388880b, 0xca46468c, 0x29eeeec7, 0xd3b8b86b, - 0x3c141428, 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad, - 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 0xdb494992, - 0x0a06060c, 0x6c242448, 0xe45c5cb8, 0x5dc2c29f, 0x6ed3d3bd, - 0xefacac43, 0xa66262c4, 0xa8919139, 0xa4959531, 0x37e4e4d3, - 0x8b7979f2, 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda, - 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 0xb46c6cd8, - 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 0xaf6565ca, 0x8e7a7af4, - 0xe9aeae47, 0x18080810, 0xd5baba6f, 0x887878f0, 0x6f25254a, - 0x722e2e5c, 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697, - 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 0xdd4b4b96, - 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 0x907070e0, 0x423e3e7c, - 0xc4b5b571, 0xaa6666cc, 0xd8484890, 0x05030306, 0x01f6f6f7, - 0x120e0e1c, 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969, - 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 0x38e1e1d9, - 0x13f8f8eb, 0xb398982b, 0x33111122, 0xbb6969d2, 0x70d9d9a9, - 0x898e8e07, 0xa7949433, 0xb69b9b2d, 0x221e1e3c, 0x92878715, - 0x20e9e9c9, 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5, - 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 0xdabfbf65, - 0x31e6e6d7, 0xc6424284, 0xb86868d0, 0xc3414182, 0xb0999929, - 0x772d2d5a, 0x110f0f1e, 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, - 0x3a16162c - }; - - private static readonly uint[] T1 = - { - 0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d, 0xf2f2ff0d, - 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154, 0x30306050, 0x01010203, - 0x6767cea9, 0x2b2b567d, 0xfefee719, 0xd7d7b562, 0xabab4de6, - 0x7676ec9a, 0xcaca8f45, 0x82821f9d, 0xc9c98940, 0x7d7dfa87, - 0xfafaef15, 0x5959b2eb, 0x47478ec9, 0xf0f0fb0b, 0xadad41ec, - 0xd4d4b367, 0xa2a25ffd, 0xafaf45ea, 0x9c9c23bf, 0xa4a453f7, - 0x7272e496, 0xc0c09b5b, 0xb7b775c2, 0xfdfde11c, 0x93933dae, - 0x26264c6a, 0x36366c5a, 0x3f3f7e41, 0xf7f7f502, 0xcccc834f, - 0x3434685c, 0xa5a551f4, 0xe5e5d134, 0xf1f1f908, 0x7171e293, - 0xd8d8ab73, 0x31316253, 0x15152a3f, 0x0404080c, 0xc7c79552, - 0x23234665, 0xc3c39d5e, 0x18183028, 0x969637a1, 0x05050a0f, - 0x9a9a2fb5, 0x07070e09, 0x12122436, 0x80801b9b, 0xe2e2df3d, - 0xebebcd26, 0x27274e69, 0xb2b27fcd, 0x7575ea9f, 0x0909121b, - 0x83831d9e, 0x2c2c5874, 0x1a1a342e, 0x1b1b362d, 0x6e6edcb2, - 0x5a5ab4ee, 0xa0a05bfb, 0x5252a4f6, 0x3b3b764d, 0xd6d6b761, - 0xb3b37dce, 0x2929527b, 0xe3e3dd3e, 0x2f2f5e71, 0x84841397, - 0x5353a6f5, 0xd1d1b968, 0x00000000, 0xededc12c, 0x20204060, - 0xfcfce31f, 0xb1b179c8, 0x5b5bb6ed, 0x6a6ad4be, 0xcbcb8d46, - 0xbebe67d9, 0x3939724b, 0x4a4a94de, 0x4c4c98d4, 0x5858b0e8, - 0xcfcf854a, 0xd0d0bb6b, 0xefefc52a, 0xaaaa4fe5, 0xfbfbed16, - 0x434386c5, 0x4d4d9ad7, 0x33336655, 0x85851194, 0x45458acf, - 0xf9f9e910, 0x02020406, 0x7f7ffe81, 0x5050a0f0, 0x3c3c7844, - 0x9f9f25ba, 0xa8a84be3, 0x5151a2f3, 0xa3a35dfe, 0x404080c0, - 0x8f8f058a, 0x92923fad, 0x9d9d21bc, 0x38387048, 0xf5f5f104, - 0xbcbc63df, 0xb6b677c1, 0xdadaaf75, 0x21214263, 0x10102030, - 0xffffe51a, 0xf3f3fd0e, 0xd2d2bf6d, 0xcdcd814c, 0x0c0c1814, - 0x13132635, 0xececc32f, 0x5f5fbee1, 0x979735a2, 0x444488cc, - 0x17172e39, 0xc4c49357, 0xa7a755f2, 0x7e7efc82, 0x3d3d7a47, - 0x6464c8ac, 0x5d5dbae7, 0x1919322b, 0x7373e695, 0x6060c0a0, - 0x81811998, 0x4f4f9ed1, 0xdcdca37f, 0x22224466, 0x2a2a547e, - 0x90903bab, 0x88880b83, 0x46468cca, 0xeeeec729, 0xb8b86bd3, - 0x1414283c, 0xdedea779, 0x5e5ebce2, 0x0b0b161d, 0xdbdbad76, - 0xe0e0db3b, 0x32326456, 0x3a3a744e, 0x0a0a141e, 0x494992db, - 0x06060c0a, 0x2424486c, 0x5c5cb8e4, 0xc2c29f5d, 0xd3d3bd6e, - 0xacac43ef, 0x6262c4a6, 0x919139a8, 0x959531a4, 0xe4e4d337, - 0x7979f28b, 0xe7e7d532, 0xc8c88b43, 0x37376e59, 0x6d6ddab7, - 0x8d8d018c, 0xd5d5b164, 0x4e4e9cd2, 0xa9a949e0, 0x6c6cd8b4, - 0x5656acfa, 0xf4f4f307, 0xeaeacf25, 0x6565caaf, 0x7a7af48e, - 0xaeae47e9, 0x08081018, 0xbaba6fd5, 0x7878f088, 0x25254a6f, - 0x2e2e5c72, 0x1c1c3824, 0xa6a657f1, 0xb4b473c7, 0xc6c69751, - 0xe8e8cb23, 0xdddda17c, 0x7474e89c, 0x1f1f3e21, 0x4b4b96dd, - 0xbdbd61dc, 0x8b8b0d86, 0x8a8a0f85, 0x7070e090, 0x3e3e7c42, - 0xb5b571c4, 0x6666ccaa, 0x484890d8, 0x03030605, 0xf6f6f701, - 0x0e0e1c12, 0x6161c2a3, 0x35356a5f, 0x5757aef9, 0xb9b969d0, - 0x86861791, 0xc1c19958, 0x1d1d3a27, 0x9e9e27b9, 0xe1e1d938, - 0xf8f8eb13, 0x98982bb3, 0x11112233, 0x6969d2bb, 0xd9d9a970, - 0x8e8e0789, 0x949433a7, 0x9b9b2db6, 0x1e1e3c22, 0x87871592, - 0xe9e9c920, 0xcece8749, 0x5555aaff, 0x28285078, 0xdfdfa57a, - 0x8c8c038f, 0xa1a159f8, 0x89890980, 0x0d0d1a17, 0xbfbf65da, - 0xe6e6d731, 0x424284c6, 0x6868d0b8, 0x414182c3, 0x999929b0, - 0x2d2d5a77, 0x0f0f1e11, 0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, - 0x16162c3a - }; - - private static readonly uint[] T2 = - { - 0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b, 0xf2ff0df2, - 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5, 0x30605030, 0x01020301, - 0x67cea967, 0x2b567d2b, 0xfee719fe, 0xd7b562d7, 0xab4de6ab, - 0x76ec9a76, 0xca8f45ca, 0x821f9d82, 0xc98940c9, 0x7dfa877d, - 0xfaef15fa, 0x59b2eb59, 0x478ec947, 0xf0fb0bf0, 0xad41ecad, - 0xd4b367d4, 0xa25ffda2, 0xaf45eaaf, 0x9c23bf9c, 0xa453f7a4, - 0x72e49672, 0xc09b5bc0, 0xb775c2b7, 0xfde11cfd, 0x933dae93, - 0x264c6a26, 0x366c5a36, 0x3f7e413f, 0xf7f502f7, 0xcc834fcc, - 0x34685c34, 0xa551f4a5, 0xe5d134e5, 0xf1f908f1, 0x71e29371, - 0xd8ab73d8, 0x31625331, 0x152a3f15, 0x04080c04, 0xc79552c7, - 0x23466523, 0xc39d5ec3, 0x18302818, 0x9637a196, 0x050a0f05, - 0x9a2fb59a, 0x070e0907, 0x12243612, 0x801b9b80, 0xe2df3de2, - 0xebcd26eb, 0x274e6927, 0xb27fcdb2, 0x75ea9f75, 0x09121b09, - 0x831d9e83, 0x2c58742c, 0x1a342e1a, 0x1b362d1b, 0x6edcb26e, - 0x5ab4ee5a, 0xa05bfba0, 0x52a4f652, 0x3b764d3b, 0xd6b761d6, - 0xb37dceb3, 0x29527b29, 0xe3dd3ee3, 0x2f5e712f, 0x84139784, - 0x53a6f553, 0xd1b968d1, 0x00000000, 0xedc12ced, 0x20406020, - 0xfce31ffc, 0xb179c8b1, 0x5bb6ed5b, 0x6ad4be6a, 0xcb8d46cb, - 0xbe67d9be, 0x39724b39, 0x4a94de4a, 0x4c98d44c, 0x58b0e858, - 0xcf854acf, 0xd0bb6bd0, 0xefc52aef, 0xaa4fe5aa, 0xfbed16fb, - 0x4386c543, 0x4d9ad74d, 0x33665533, 0x85119485, 0x458acf45, - 0xf9e910f9, 0x02040602, 0x7ffe817f, 0x50a0f050, 0x3c78443c, - 0x9f25ba9f, 0xa84be3a8, 0x51a2f351, 0xa35dfea3, 0x4080c040, - 0x8f058a8f, 0x923fad92, 0x9d21bc9d, 0x38704838, 0xf5f104f5, - 0xbc63dfbc, 0xb677c1b6, 0xdaaf75da, 0x21426321, 0x10203010, - 0xffe51aff, 0xf3fd0ef3, 0xd2bf6dd2, 0xcd814ccd, 0x0c18140c, - 0x13263513, 0xecc32fec, 0x5fbee15f, 0x9735a297, 0x4488cc44, - 0x172e3917, 0xc49357c4, 0xa755f2a7, 0x7efc827e, 0x3d7a473d, - 0x64c8ac64, 0x5dbae75d, 0x19322b19, 0x73e69573, 0x60c0a060, - 0x81199881, 0x4f9ed14f, 0xdca37fdc, 0x22446622, 0x2a547e2a, - 0x903bab90, 0x880b8388, 0x468cca46, 0xeec729ee, 0xb86bd3b8, - 0x14283c14, 0xdea779de, 0x5ebce25e, 0x0b161d0b, 0xdbad76db, - 0xe0db3be0, 0x32645632, 0x3a744e3a, 0x0a141e0a, 0x4992db49, - 0x060c0a06, 0x24486c24, 0x5cb8e45c, 0xc29f5dc2, 0xd3bd6ed3, - 0xac43efac, 0x62c4a662, 0x9139a891, 0x9531a495, 0xe4d337e4, - 0x79f28b79, 0xe7d532e7, 0xc88b43c8, 0x376e5937, 0x6ddab76d, - 0x8d018c8d, 0xd5b164d5, 0x4e9cd24e, 0xa949e0a9, 0x6cd8b46c, - 0x56acfa56, 0xf4f307f4, 0xeacf25ea, 0x65caaf65, 0x7af48e7a, - 0xae47e9ae, 0x08101808, 0xba6fd5ba, 0x78f08878, 0x254a6f25, - 0x2e5c722e, 0x1c38241c, 0xa657f1a6, 0xb473c7b4, 0xc69751c6, - 0xe8cb23e8, 0xdda17cdd, 0x74e89c74, 0x1f3e211f, 0x4b96dd4b, - 0xbd61dcbd, 0x8b0d868b, 0x8a0f858a, 0x70e09070, 0x3e7c423e, - 0xb571c4b5, 0x66ccaa66, 0x4890d848, 0x03060503, 0xf6f701f6, - 0x0e1c120e, 0x61c2a361, 0x356a5f35, 0x57aef957, 0xb969d0b9, - 0x86179186, 0xc19958c1, 0x1d3a271d, 0x9e27b99e, 0xe1d938e1, - 0xf8eb13f8, 0x982bb398, 0x11223311, 0x69d2bb69, 0xd9a970d9, - 0x8e07898e, 0x9433a794, 0x9b2db69b, 0x1e3c221e, 0x87159287, - 0xe9c920e9, 0xce8749ce, 0x55aaff55, 0x28507828, 0xdfa57adf, - 0x8c038f8c, 0xa159f8a1, 0x89098089, 0x0d1a170d, 0xbf65dabf, - 0xe6d731e6, 0x4284c642, 0x68d0b868, 0x4182c341, 0x9929b099, - 0x2d5a772d, 0x0f1e110f, 0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, - 0x162c3a16 - }; - - private static readonly uint[] T3 = - { - 0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b, 0xff0df2f2, - 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5, 0x60503030, 0x02030101, - 0xcea96767, 0x567d2b2b, 0xe719fefe, 0xb562d7d7, 0x4de6abab, - 0xec9a7676, 0x8f45caca, 0x1f9d8282, 0x8940c9c9, 0xfa877d7d, - 0xef15fafa, 0xb2eb5959, 0x8ec94747, 0xfb0bf0f0, 0x41ecadad, - 0xb367d4d4, 0x5ffda2a2, 0x45eaafaf, 0x23bf9c9c, 0x53f7a4a4, - 0xe4967272, 0x9b5bc0c0, 0x75c2b7b7, 0xe11cfdfd, 0x3dae9393, - 0x4c6a2626, 0x6c5a3636, 0x7e413f3f, 0xf502f7f7, 0x834fcccc, - 0x685c3434, 0x51f4a5a5, 0xd134e5e5, 0xf908f1f1, 0xe2937171, - 0xab73d8d8, 0x62533131, 0x2a3f1515, 0x080c0404, 0x9552c7c7, - 0x46652323, 0x9d5ec3c3, 0x30281818, 0x37a19696, 0x0a0f0505, - 0x2fb59a9a, 0x0e090707, 0x24361212, 0x1b9b8080, 0xdf3de2e2, - 0xcd26ebeb, 0x4e692727, 0x7fcdb2b2, 0xea9f7575, 0x121b0909, - 0x1d9e8383, 0x58742c2c, 0x342e1a1a, 0x362d1b1b, 0xdcb26e6e, - 0xb4ee5a5a, 0x5bfba0a0, 0xa4f65252, 0x764d3b3b, 0xb761d6d6, - 0x7dceb3b3, 0x527b2929, 0xdd3ee3e3, 0x5e712f2f, 0x13978484, - 0xa6f55353, 0xb968d1d1, 0x00000000, 0xc12ceded, 0x40602020, - 0xe31ffcfc, 0x79c8b1b1, 0xb6ed5b5b, 0xd4be6a6a, 0x8d46cbcb, - 0x67d9bebe, 0x724b3939, 0x94de4a4a, 0x98d44c4c, 0xb0e85858, - 0x854acfcf, 0xbb6bd0d0, 0xc52aefef, 0x4fe5aaaa, 0xed16fbfb, - 0x86c54343, 0x9ad74d4d, 0x66553333, 0x11948585, 0x8acf4545, - 0xe910f9f9, 0x04060202, 0xfe817f7f, 0xa0f05050, 0x78443c3c, - 0x25ba9f9f, 0x4be3a8a8, 0xa2f35151, 0x5dfea3a3, 0x80c04040, - 0x058a8f8f, 0x3fad9292, 0x21bc9d9d, 0x70483838, 0xf104f5f5, - 0x63dfbcbc, 0x77c1b6b6, 0xaf75dada, 0x42632121, 0x20301010, - 0xe51affff, 0xfd0ef3f3, 0xbf6dd2d2, 0x814ccdcd, 0x18140c0c, - 0x26351313, 0xc32fecec, 0xbee15f5f, 0x35a29797, 0x88cc4444, - 0x2e391717, 0x9357c4c4, 0x55f2a7a7, 0xfc827e7e, 0x7a473d3d, - 0xc8ac6464, 0xbae75d5d, 0x322b1919, 0xe6957373, 0xc0a06060, - 0x19988181, 0x9ed14f4f, 0xa37fdcdc, 0x44662222, 0x547e2a2a, - 0x3bab9090, 0x0b838888, 0x8cca4646, 0xc729eeee, 0x6bd3b8b8, - 0x283c1414, 0xa779dede, 0xbce25e5e, 0x161d0b0b, 0xad76dbdb, - 0xdb3be0e0, 0x64563232, 0x744e3a3a, 0x141e0a0a, 0x92db4949, - 0x0c0a0606, 0x486c2424, 0xb8e45c5c, 0x9f5dc2c2, 0xbd6ed3d3, - 0x43efacac, 0xc4a66262, 0x39a89191, 0x31a49595, 0xd337e4e4, - 0xf28b7979, 0xd532e7e7, 0x8b43c8c8, 0x6e593737, 0xdab76d6d, - 0x018c8d8d, 0xb164d5d5, 0x9cd24e4e, 0x49e0a9a9, 0xd8b46c6c, - 0xacfa5656, 0xf307f4f4, 0xcf25eaea, 0xcaaf6565, 0xf48e7a7a, - 0x47e9aeae, 0x10180808, 0x6fd5baba, 0xf0887878, 0x4a6f2525, - 0x5c722e2e, 0x38241c1c, 0x57f1a6a6, 0x73c7b4b4, 0x9751c6c6, - 0xcb23e8e8, 0xa17cdddd, 0xe89c7474, 0x3e211f1f, 0x96dd4b4b, - 0x61dcbdbd, 0x0d868b8b, 0x0f858a8a, 0xe0907070, 0x7c423e3e, - 0x71c4b5b5, 0xccaa6666, 0x90d84848, 0x06050303, 0xf701f6f6, - 0x1c120e0e, 0xc2a36161, 0x6a5f3535, 0xaef95757, 0x69d0b9b9, - 0x17918686, 0x9958c1c1, 0x3a271d1d, 0x27b99e9e, 0xd938e1e1, - 0xeb13f8f8, 0x2bb39898, 0x22331111, 0xd2bb6969, 0xa970d9d9, - 0x07898e8e, 0x33a79494, 0x2db69b9b, 0x3c221e1e, 0x15928787, - 0xc920e9e9, 0x8749cece, 0xaaff5555, 0x50782828, 0xa57adfdf, - 0x038f8c8c, 0x59f8a1a1, 0x09808989, 0x1a170d0d, 0x65dabfbf, - 0xd731e6e6, 0x84c64242, 0xd0b86868, 0x82c34141, 0x29b09999, - 0x5a772d2d, 0x1e110f0f, 0x7bcbb0b0, 0xa8fc5454, 0x6dd6bbbb, - 0x2c3a1616 - }; - - private static readonly uint[] Tinv0 = - { - 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, 0xcb6bab3b, - 0xf1459d1f, 0xab58faac, 0x9303e34b, 0x55fa3020, 0xf66d76ad, - 0x9176cc88, 0x254c02f5, 0xfcd7e54f, 0xd7cb2ac5, 0x80443526, - 0x8fa362b5, 0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d, - 0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b, 0xe75f8f03, - 0x959c9215, 0xeb7a6dbf, 0xda595295, 0x2d83bed4, 0xd3217458, - 0x2969e049, 0x44c8c98e, 0x6a89c275, 0x78798ef4, 0x6b3e5899, - 0xdd71b927, 0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d, - 0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362, 0xe07764b1, - 0x84ae6bbb, 0x1ca081fe, 0x942b08f9, 0x58684870, 0x19fd458f, - 0x876cde94, 0xb7f87b52, 0x23d373ab, 0xe2024b72, 0x578f1fe3, - 0x2aab5566, 0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3, - 0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed, 0x2b1ccf8a, - 0x92b479a7, 0xf0f207f3, 0xa1e2694e, 0xcdf4da65, 0xd5be0506, - 0x1f6234d1, 0x8afea6c4, 0x9d532e34, 0xa055f3a2, 0x32e18a05, - 0x75ebf6a4, 0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd, - 0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d, 0xb58d5491, - 0x055dc471, 0x6fd40604, 0xff155060, 0x24fb9819, 0x97e9bdd6, - 0xcc434089, 0x779ed967, 0xbd42e8b0, 0x888b8907, 0x385b19e7, - 0xdbeec879, 0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000, - 0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c, 0xfbff0efd, - 0x5638850f, 0x1ed5ae3d, 0x27392d36, 0x64d90f0a, 0x21a65c68, - 0xd1545b9b, 0x3a2e3624, 0xb1670a0c, 0x0fe75793, 0xd296eeb4, - 0x9e919b1b, 0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c, - 0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12, 0x0b0d090e, - 0xadc78bf2, 0xb9a8b62d, 0xc8a91e14, 0x8519f157, 0x4c0775af, - 0xbbdd99ee, 0xfd607fa3, 0x9f2601f7, 0xbcf5725c, 0xc53b6644, - 0x347efb5b, 0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8, - 0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684, 0x7d244a85, - 0xf83dbbd2, 0x1132f9ae, 0x6da129c7, 0x4b2f9e1d, 0xf330b2dc, - 0xec52860d, 0xd0e3c177, 0x6c16b32b, 0x99b970a9, 0xfa489411, - 0x2264e947, 0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322, - 0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498, 0xcf81f5a6, - 0x28de7aa5, 0x268eb7da, 0xa4bfad3f, 0xe49d3a2c, 0x0d927850, - 0x9bcc5f6a, 0x62467e54, 0xc2138df6, 0xe8b8d890, 0x5ef7392e, - 0xf5afc382, 0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf, - 0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb, 0x097826cd, - 0xf418596e, 0x01b79aec, 0xa89a4f83, 0x656e95e6, 0x7ee6ffaa, - 0x08cfbc21, 0xe6e815ef, 0xd99be7ba, 0xce366f4a, 0xd4099fea, - 0xd67cb029, 0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235, - 0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733, 0x4a9804f1, - 0xf7daec41, 0x0e50cd7f, 0x2ff69117, 0x8dd64d76, 0x4db0ef43, - 0x544daacc, 0xdf0496e4, 0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, - 0x7f516546, 0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb, - 0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d, 0x8c61d79a, - 0x7a0ca137, 0x8e14f859, 0x893c13eb, 0xee27a9ce, 0x35c961b7, - 0xede51ce1, 0x3cb1477a, 0x59dfd29c, 0x3f73f255, 0x79ce1418, - 0xbf37c773, 0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478, - 0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2, 0x72c31d16, - 0x0c25e2bc, 0x8b493c28, 0x41950dff, 0x7101a839, 0xdeb30c08, - 0x9ce4b4d8, 0x90c15664, 0x6184cb7b, 0x70b632d5, 0x745c6c48, - 0x4257b8d0 - }; - - private static readonly uint[] Tinv1 = - { - 0xa7f45150, 0x65417e53, 0xa4171ac3, 0x5e273a96, 0x6bab3bcb, - 0x459d1ff1, 0x58faacab, 0x03e34b93, 0xfa302055, 0x6d76adf6, - 0x76cc8891, 0x4c02f525, 0xd7e54ffc, 0xcb2ac5d7, 0x44352680, - 0xa362b58f, 0x5ab1de49, 0x1bba2567, 0x0eea4598, 0xc0fe5de1, - 0x752fc302, 0xf04c8112, 0x97468da3, 0xf9d36bc6, 0x5f8f03e7, - 0x9c921595, 0x7a6dbfeb, 0x595295da, 0x83bed42d, 0x217458d3, - 0x69e04929, 0xc8c98e44, 0x89c2756a, 0x798ef478, 0x3e58996b, - 0x71b927dd, 0x4fe1beb6, 0xad88f017, 0xac20c966, 0x3ace7db4, - 0x4adf6318, 0x311ae582, 0x33519760, 0x7f536245, 0x7764b1e0, - 0xae6bbb84, 0xa081fe1c, 0x2b08f994, 0x68487058, 0xfd458f19, - 0x6cde9487, 0xf87b52b7, 0xd373ab23, 0x024b72e2, 0x8f1fe357, - 0xab55662a, 0x28ebb207, 0xc2b52f03, 0x7bc5869a, 0x0837d3a5, - 0x872830f2, 0xa5bf23b2, 0x6a0302ba, 0x8216ed5c, 0x1ccf8a2b, - 0xb479a792, 0xf207f3f0, 0xe2694ea1, 0xf4da65cd, 0xbe0506d5, - 0x6234d11f, 0xfea6c48a, 0x532e349d, 0x55f3a2a0, 0xe18a0532, - 0xebf6a475, 0xec830b39, 0xef6040aa, 0x9f715e06, 0x106ebd51, - 0x8a213ef9, 0x06dd963d, 0x053eddae, 0xbde64d46, 0x8d5491b5, - 0x5dc47105, 0xd406046f, 0x155060ff, 0xfb981924, 0xe9bdd697, - 0x434089cc, 0x9ed96777, 0x42e8b0bd, 0x8b890788, 0x5b19e738, - 0xeec879db, 0x0a7ca147, 0x0f427ce9, 0x1e84f8c9, 0x00000000, - 0x86800983, 0xed2b3248, 0x70111eac, 0x725a6c4e, 0xff0efdfb, - 0x38850f56, 0xd5ae3d1e, 0x392d3627, 0xd90f0a64, 0xa65c6821, - 0x545b9bd1, 0x2e36243a, 0x670a0cb1, 0xe757930f, 0x96eeb4d2, - 0x919b1b9e, 0xc5c0804f, 0x20dc61a2, 0x4b775a69, 0x1a121c16, - 0xba93e20a, 0x2aa0c0e5, 0xe0223c43, 0x171b121d, 0x0d090e0b, - 0xc78bf2ad, 0xa8b62db9, 0xa91e14c8, 0x19f15785, 0x0775af4c, - 0xdd99eebb, 0x607fa3fd, 0x2601f79f, 0xf5725cbc, 0x3b6644c5, - 0x7efb5b34, 0x29438b76, 0xc623cbdc, 0xfcedb668, 0xf1e4b863, - 0xdc31d7ca, 0x85634210, 0x22971340, 0x11c68420, 0x244a857d, - 0x3dbbd2f8, 0x32f9ae11, 0xa129c76d, 0x2f9e1d4b, 0x30b2dcf3, - 0x52860dec, 0xe3c177d0, 0x16b32b6c, 0xb970a999, 0x489411fa, - 0x64e94722, 0x8cfca8c4, 0x3ff0a01a, 0x2c7d56d8, 0x903322ef, - 0x4e4987c7, 0xd138d9c1, 0xa2ca8cfe, 0x0bd49836, 0x81f5a6cf, - 0xde7aa528, 0x8eb7da26, 0xbfad3fa4, 0x9d3a2ce4, 0x9278500d, - 0xcc5f6a9b, 0x467e5462, 0x138df6c2, 0xb8d890e8, 0xf7392e5e, - 0xafc382f5, 0x805d9fbe, 0x93d0697c, 0x2dd56fa9, 0x1225cfb3, - 0x99acc83b, 0x7d1810a7, 0x639ce86e, 0xbb3bdb7b, 0x7826cd09, - 0x18596ef4, 0xb79aec01, 0x9a4f83a8, 0x6e95e665, 0xe6ffaa7e, - 0xcfbc2108, 0xe815efe6, 0x9be7bad9, 0x366f4ace, 0x099fead4, - 0x7cb029d6, 0xb2a431af, 0x233f2a31, 0x94a5c630, 0x66a235c0, - 0xbc4e7437, 0xca82fca6, 0xd090e0b0, 0xd8a73315, 0x9804f14a, - 0xdaec41f7, 0x50cd7f0e, 0xf691172f, 0xd64d768d, 0xb0ef434d, - 0x4daacc54, 0x0496e4df, 0xb5d19ee3, 0x886a4c1b, 0x1f2cc1b8, - 0x5165467f, 0xea5e9d04, 0x358c015d, 0x7487fa73, 0x410bfb2e, - 0x1d67b35a, 0xd2db9252, 0x5610e933, 0x47d66d13, 0x61d79a8c, - 0x0ca1377a, 0x14f8598e, 0x3c13eb89, 0x27a9ceee, 0xc961b735, - 0xe51ce1ed, 0xb1477a3c, 0xdfd29c59, 0x73f2553f, 0xce141879, - 0x37c773bf, 0xcdf753ea, 0xaafd5f5b, 0x6f3ddf14, 0xdb447886, - 0xf3afca81, 0xc468b93e, 0x3424382c, 0x40a3c25f, 0xc31d1672, - 0x25e2bc0c, 0x493c288b, 0x950dff41, 0x01a83971, 0xb30c08de, - 0xe4b4d89c, 0xc1566490, 0x84cb7b61, 0xb632d570, 0x5c6c4874, - 0x57b8d042 - }; - - private static readonly uint[] Tinv2 = - { - 0xf45150a7, 0x417e5365, 0x171ac3a4, 0x273a965e, 0xab3bcb6b, - 0x9d1ff145, 0xfaacab58, 0xe34b9303, 0x302055fa, 0x76adf66d, - 0xcc889176, 0x02f5254c, 0xe54ffcd7, 0x2ac5d7cb, 0x35268044, - 0x62b58fa3, 0xb1de495a, 0xba25671b, 0xea45980e, 0xfe5de1c0, - 0x2fc30275, 0x4c8112f0, 0x468da397, 0xd36bc6f9, 0x8f03e75f, - 0x9215959c, 0x6dbfeb7a, 0x5295da59, 0xbed42d83, 0x7458d321, - 0xe0492969, 0xc98e44c8, 0xc2756a89, 0x8ef47879, 0x58996b3e, - 0xb927dd71, 0xe1beb64f, 0x88f017ad, 0x20c966ac, 0xce7db43a, - 0xdf63184a, 0x1ae58231, 0x51976033, 0x5362457f, 0x64b1e077, - 0x6bbb84ae, 0x81fe1ca0, 0x08f9942b, 0x48705868, 0x458f19fd, - 0xde94876c, 0x7b52b7f8, 0x73ab23d3, 0x4b72e202, 0x1fe3578f, - 0x55662aab, 0xebb20728, 0xb52f03c2, 0xc5869a7b, 0x37d3a508, - 0x2830f287, 0xbf23b2a5, 0x0302ba6a, 0x16ed5c82, 0xcf8a2b1c, - 0x79a792b4, 0x07f3f0f2, 0x694ea1e2, 0xda65cdf4, 0x0506d5be, - 0x34d11f62, 0xa6c48afe, 0x2e349d53, 0xf3a2a055, 0x8a0532e1, - 0xf6a475eb, 0x830b39ec, 0x6040aaef, 0x715e069f, 0x6ebd5110, - 0x213ef98a, 0xdd963d06, 0x3eddae05, 0xe64d46bd, 0x5491b58d, - 0xc471055d, 0x06046fd4, 0x5060ff15, 0x981924fb, 0xbdd697e9, - 0x4089cc43, 0xd967779e, 0xe8b0bd42, 0x8907888b, 0x19e7385b, - 0xc879dbee, 0x7ca1470a, 0x427ce90f, 0x84f8c91e, 0x00000000, - 0x80098386, 0x2b3248ed, 0x111eac70, 0x5a6c4e72, 0x0efdfbff, - 0x850f5638, 0xae3d1ed5, 0x2d362739, 0x0f0a64d9, 0x5c6821a6, - 0x5b9bd154, 0x36243a2e, 0x0a0cb167, 0x57930fe7, 0xeeb4d296, - 0x9b1b9e91, 0xc0804fc5, 0xdc61a220, 0x775a694b, 0x121c161a, - 0x93e20aba, 0xa0c0e52a, 0x223c43e0, 0x1b121d17, 0x090e0b0d, - 0x8bf2adc7, 0xb62db9a8, 0x1e14c8a9, 0xf1578519, 0x75af4c07, - 0x99eebbdd, 0x7fa3fd60, 0x01f79f26, 0x725cbcf5, 0x6644c53b, - 0xfb5b347e, 0x438b7629, 0x23cbdcc6, 0xedb668fc, 0xe4b863f1, - 0x31d7cadc, 0x63421085, 0x97134022, 0xc6842011, 0x4a857d24, - 0xbbd2f83d, 0xf9ae1132, 0x29c76da1, 0x9e1d4b2f, 0xb2dcf330, - 0x860dec52, 0xc177d0e3, 0xb32b6c16, 0x70a999b9, 0x9411fa48, - 0xe9472264, 0xfca8c48c, 0xf0a01a3f, 0x7d56d82c, 0x3322ef90, - 0x4987c74e, 0x38d9c1d1, 0xca8cfea2, 0xd498360b, 0xf5a6cf81, - 0x7aa528de, 0xb7da268e, 0xad3fa4bf, 0x3a2ce49d, 0x78500d92, - 0x5f6a9bcc, 0x7e546246, 0x8df6c213, 0xd890e8b8, 0x392e5ef7, - 0xc382f5af, 0x5d9fbe80, 0xd0697c93, 0xd56fa92d, 0x25cfb312, - 0xacc83b99, 0x1810a77d, 0x9ce86e63, 0x3bdb7bbb, 0x26cd0978, - 0x596ef418, 0x9aec01b7, 0x4f83a89a, 0x95e6656e, 0xffaa7ee6, - 0xbc2108cf, 0x15efe6e8, 0xe7bad99b, 0x6f4ace36, 0x9fead409, - 0xb029d67c, 0xa431afb2, 0x3f2a3123, 0xa5c63094, 0xa235c066, - 0x4e7437bc, 0x82fca6ca, 0x90e0b0d0, 0xa73315d8, 0x04f14a98, - 0xec41f7da, 0xcd7f0e50, 0x91172ff6, 0x4d768dd6, 0xef434db0, - 0xaacc544d, 0x96e4df04, 0xd19ee3b5, 0x6a4c1b88, 0x2cc1b81f, - 0x65467f51, 0x5e9d04ea, 0x8c015d35, 0x87fa7374, 0x0bfb2e41, - 0x67b35a1d, 0xdb9252d2, 0x10e93356, 0xd66d1347, 0xd79a8c61, - 0xa1377a0c, 0xf8598e14, 0x13eb893c, 0xa9ceee27, 0x61b735c9, - 0x1ce1ede5, 0x477a3cb1, 0xd29c59df, 0xf2553f73, 0x141879ce, - 0xc773bf37, 0xf753eacd, 0xfd5f5baa, 0x3ddf146f, 0x447886db, - 0xafca81f3, 0x68b93ec4, 0x24382c34, 0xa3c25f40, 0x1d1672c3, - 0xe2bc0c25, 0x3c288b49, 0x0dff4195, 0xa8397101, 0x0c08deb3, - 0xb4d89ce4, 0x566490c1, 0xcb7b6184, 0x32d570b6, 0x6c48745c, - 0xb8d04257 - }; - - private static readonly uint[] Tinv3 = - { - 0x5150a7f4, 0x7e536541, 0x1ac3a417, 0x3a965e27, 0x3bcb6bab, - 0x1ff1459d, 0xacab58fa, 0x4b9303e3, 0x2055fa30, 0xadf66d76, - 0x889176cc, 0xf5254c02, 0x4ffcd7e5, 0xc5d7cb2a, 0x26804435, - 0xb58fa362, 0xde495ab1, 0x25671bba, 0x45980eea, 0x5de1c0fe, - 0xc302752f, 0x8112f04c, 0x8da39746, 0x6bc6f9d3, 0x03e75f8f, - 0x15959c92, 0xbfeb7a6d, 0x95da5952, 0xd42d83be, 0x58d32174, - 0x492969e0, 0x8e44c8c9, 0x756a89c2, 0xf478798e, 0x996b3e58, - 0x27dd71b9, 0xbeb64fe1, 0xf017ad88, 0xc966ac20, 0x7db43ace, - 0x63184adf, 0xe582311a, 0x97603351, 0x62457f53, 0xb1e07764, - 0xbb84ae6b, 0xfe1ca081, 0xf9942b08, 0x70586848, 0x8f19fd45, - 0x94876cde, 0x52b7f87b, 0xab23d373, 0x72e2024b, 0xe3578f1f, - 0x662aab55, 0xb20728eb, 0x2f03c2b5, 0x869a7bc5, 0xd3a50837, - 0x30f28728, 0x23b2a5bf, 0x02ba6a03, 0xed5c8216, 0x8a2b1ccf, - 0xa792b479, 0xf3f0f207, 0x4ea1e269, 0x65cdf4da, 0x06d5be05, - 0xd11f6234, 0xc48afea6, 0x349d532e, 0xa2a055f3, 0x0532e18a, - 0xa475ebf6, 0x0b39ec83, 0x40aaef60, 0x5e069f71, 0xbd51106e, - 0x3ef98a21, 0x963d06dd, 0xddae053e, 0x4d46bde6, 0x91b58d54, - 0x71055dc4, 0x046fd406, 0x60ff1550, 0x1924fb98, 0xd697e9bd, - 0x89cc4340, 0x67779ed9, 0xb0bd42e8, 0x07888b89, 0xe7385b19, - 0x79dbeec8, 0xa1470a7c, 0x7ce90f42, 0xf8c91e84, 0x00000000, - 0x09838680, 0x3248ed2b, 0x1eac7011, 0x6c4e725a, 0xfdfbff0e, - 0x0f563885, 0x3d1ed5ae, 0x3627392d, 0x0a64d90f, 0x6821a65c, - 0x9bd1545b, 0x243a2e36, 0x0cb1670a, 0x930fe757, 0xb4d296ee, - 0x1b9e919b, 0x804fc5c0, 0x61a220dc, 0x5a694b77, 0x1c161a12, - 0xe20aba93, 0xc0e52aa0, 0x3c43e022, 0x121d171b, 0x0e0b0d09, - 0xf2adc78b, 0x2db9a8b6, 0x14c8a91e, 0x578519f1, 0xaf4c0775, - 0xeebbdd99, 0xa3fd607f, 0xf79f2601, 0x5cbcf572, 0x44c53b66, - 0x5b347efb, 0x8b762943, 0xcbdcc623, 0xb668fced, 0xb863f1e4, - 0xd7cadc31, 0x42108563, 0x13402297, 0x842011c6, 0x857d244a, - 0xd2f83dbb, 0xae1132f9, 0xc76da129, 0x1d4b2f9e, 0xdcf330b2, - 0x0dec5286, 0x77d0e3c1, 0x2b6c16b3, 0xa999b970, 0x11fa4894, - 0x472264e9, 0xa8c48cfc, 0xa01a3ff0, 0x56d82c7d, 0x22ef9033, - 0x87c74e49, 0xd9c1d138, 0x8cfea2ca, 0x98360bd4, 0xa6cf81f5, - 0xa528de7a, 0xda268eb7, 0x3fa4bfad, 0x2ce49d3a, 0x500d9278, - 0x6a9bcc5f, 0x5462467e, 0xf6c2138d, 0x90e8b8d8, 0x2e5ef739, - 0x82f5afc3, 0x9fbe805d, 0x697c93d0, 0x6fa92dd5, 0xcfb31225, - 0xc83b99ac, 0x10a77d18, 0xe86e639c, 0xdb7bbb3b, 0xcd097826, - 0x6ef41859, 0xec01b79a, 0x83a89a4f, 0xe6656e95, 0xaa7ee6ff, - 0x2108cfbc, 0xefe6e815, 0xbad99be7, 0x4ace366f, 0xead4099f, - 0x29d67cb0, 0x31afb2a4, 0x2a31233f, 0xc63094a5, 0x35c066a2, - 0x7437bc4e, 0xfca6ca82, 0xe0b0d090, 0x3315d8a7, 0xf14a9804, - 0x41f7daec, 0x7f0e50cd, 0x172ff691, 0x768dd64d, 0x434db0ef, - 0xcc544daa, 0xe4df0496, 0x9ee3b5d1, 0x4c1b886a, 0xc1b81f2c, - 0x467f5165, 0x9d04ea5e, 0x015d358c, 0xfa737487, 0xfb2e410b, - 0xb35a1d67, 0x9252d2db, 0xe9335610, 0x6d1347d6, 0x9a8c61d7, - 0x377a0ca1, 0x598e14f8, 0xeb893c13, 0xceee27a9, 0xb735c961, - 0xe1ede51c, 0x7a3cb147, 0x9c59dfd2, 0x553f73f2, 0x1879ce14, - 0x73bf37c7, 0x53eacdf7, 0x5f5baafd, 0xdf146f3d, 0x7886db44, - 0xca81f3af, 0xb93ec468, 0x382c3424, 0xc25f40a3, 0x1672c31d, - 0xbc0c25e2, 0x288b493c, 0xff41950d, 0x397101a8, 0x08deb30c, - 0xd89ce4b4, 0x6490c156, 0x7b6184cb, 0xd570b632, 0x48745c6c, - 0xd04257b8 - }; - - private static uint Shift(uint r, int shift) - { - return (r >> shift) | (r << (32 - shift)); - } - - /* multiply four bytes in GF(2^8) by 'x' {02} in parallel */ - - private const uint m1 = 0x80808080; - private const uint m2 = 0x7f7f7f7f; - private const uint m3 = 0x0000001b; - private const uint m4 = 0xC0C0C0C0; - private const uint m5 = 0x3f3f3f3f; - - private static uint FFmulX(uint x) - { - return ((x & m2) << 1) ^ (((x & m1) >> 7) * m3); - } - - private static uint FFmulX2(uint x) - { - uint t0 = (x & m5) << 2; - uint t1 = (x & m4); - t1 ^= (t1 >> 1); - return t0 ^ (t1 >> 2) ^ (t1 >> 5); - } - - /* - The following defines provide alternative definitions of FFmulX that might - give improved performance if a fast 32-bit multiply is not available. - - private int FFmulX(int x) { int u = x & m1; u |= (u >> 1); return ((x & m2) << 1) ^ ((u >>> 3) | (u >>> 6)); } - private static final int m4 = 0x1b1b1b1b; - private int FFmulX(int x) { int u = x & m1; return ((x & m2) << 1) ^ ((u - (u >>> 7)) & m4); } - - */ - - private static uint Inv_Mcol(uint x) - { - uint t0, t1; - t0 = x; - t1 = t0 ^ Shift(t0, 8); - t0 ^= FFmulX(t1); - t1 ^= FFmulX2(t0); - t0 ^= t1 ^ Shift(t1, 16); - return t0; - } - - private static uint SubWord(uint x) - { - return (uint)S[x&255] - | (((uint)S[(x>>8)&255]) << 8) - | (((uint)S[(x>>16)&255]) << 16) - | (((uint)S[(x>>24)&255]) << 24); - } - - /** - * Calculate the necessary round keys - * The number of calculations depends on key size and block size - * AES specified a fixed block size of 128 bits and key sizes 128/192/256 bits - * This code is written assuming those are the only possible values - */ - private uint[][] GenerateWorkingKey(byte[] key, bool forEncryption) - { - int keyLen = key.Length; - if (keyLen < 16 || keyLen > 32 || (keyLen & 7) != 0) - throw new ArgumentException("Key length not 128/192/256 bits."); - - int KC = keyLen >> 2; - this.ROUNDS = KC + 6; // This is not always true for the generalized Rijndael that allows larger block sizes - - uint[][] W = new uint[ROUNDS + 1][]; // 4 words in a block - for (int i = 0; i <= ROUNDS; ++i) - { - W[i] = new uint[4]; - } - - switch (KC) - { - case 4: - { - uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; - uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; - uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; - uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; - - for (int i = 1; i <= 10; ++i) - { - uint u = SubWord(Shift(t3, 8)) ^ rcon[i - 1]; - t0 ^= u; W[i][0] = t0; - t1 ^= t0; W[i][1] = t1; - t2 ^= t1; W[i][2] = t2; - t3 ^= t2; W[i][3] = t3; - } - - break; - } - case 6: - { - uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; - uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; - uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; - uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; - uint t4 = Pack.LE_To_UInt32(key, 16); W[1][0] = t4; - uint t5 = Pack.LE_To_UInt32(key, 20); W[1][1] = t5; - - uint rcon = 1; - uint u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; - t0 ^= u; W[1][2] = t0; - t1 ^= t0; W[1][3] = t1; - t2 ^= t1; W[2][0] = t2; - t3 ^= t2; W[2][1] = t3; - t4 ^= t3; W[2][2] = t4; - t5 ^= t4; W[2][3] = t5; - - for (int i = 3; i < 12; i += 3) - { - u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; - t0 ^= u; W[i ][0] = t0; - t1 ^= t0; W[i ][1] = t1; - t2 ^= t1; W[i ][2] = t2; - t3 ^= t2; W[i ][3] = t3; - t4 ^= t3; W[i + 1][0] = t4; - t5 ^= t4; W[i + 1][1] = t5; - u = SubWord(Shift(t5, 8)) ^ rcon; rcon <<= 1; - t0 ^= u; W[i + 1][2] = t0; - t1 ^= t0; W[i + 1][3] = t1; - t2 ^= t1; W[i + 2][0] = t2; - t3 ^= t2; W[i + 2][1] = t3; - t4 ^= t3; W[i + 2][2] = t4; - t5 ^= t4; W[i + 2][3] = t5; - } - - u = SubWord(Shift(t5, 8)) ^ rcon; - t0 ^= u; W[12][0] = t0; - t1 ^= t0; W[12][1] = t1; - t2 ^= t1; W[12][2] = t2; - t3 ^= t2; W[12][3] = t3; - - break; - } - case 8: - { - uint t0 = Pack.LE_To_UInt32(key, 0); W[0][0] = t0; - uint t1 = Pack.LE_To_UInt32(key, 4); W[0][1] = t1; - uint t2 = Pack.LE_To_UInt32(key, 8); W[0][2] = t2; - uint t3 = Pack.LE_To_UInt32(key, 12); W[0][3] = t3; - uint t4 = Pack.LE_To_UInt32(key, 16); W[1][0] = t4; - uint t5 = Pack.LE_To_UInt32(key, 20); W[1][1] = t5; - uint t6 = Pack.LE_To_UInt32(key, 24); W[1][2] = t6; - uint t7 = Pack.LE_To_UInt32(key, 28); W[1][3] = t7; - - uint u, rcon = 1; - - for (int i = 2; i < 14; i += 2) - { - u = SubWord(Shift(t7, 8)) ^ rcon; rcon <<= 1; - t0 ^= u; W[i ][0] = t0; - t1 ^= t0; W[i ][1] = t1; - t2 ^= t1; W[i ][2] = t2; - t3 ^= t2; W[i ][3] = t3; - u = SubWord(t3); - t4 ^= u; W[i + 1][0] = t4; - t5 ^= t4; W[i + 1][1] = t5; - t6 ^= t5; W[i + 1][2] = t6; - t7 ^= t6; W[i + 1][3] = t7; - } - - u = SubWord(Shift(t7, 8)) ^ rcon; - t0 ^= u; W[14][0] = t0; - t1 ^= t0; W[14][1] = t1; - t2 ^= t1; W[14][2] = t2; - t3 ^= t2; W[14][3] = t3; - - break; - } - default: - { - throw new InvalidOperationException("Should never get here"); - } - } - - if (!forEncryption) - { - for (int j = 1; j < ROUNDS; j++) - { - uint[] w = W[j]; - for (int i = 0; i < 4; i++) - { - w[i] = Inv_Mcol(w[i]); - } - } - } - - return W; - } - - private int ROUNDS; - private uint[][] WorkingKey; - private bool forEncryption; - - private const int BLOCK_SIZE = 16; - - /** - * default constructor - 128 bit block size. - */ - public AesFastEngine() - { - } - - internal static string GetTypeName(object obj) - { - return obj.GetType().FullName; - } - - /** - * initialise an AES cipher. - * - * @param forEncryption whether or not we are for encryption. - * @param parameters the parameters required to set up the cipher. - * @exception ArgumentException if the parameters argument is - * inappropriate. - */ - public virtual void Init( - bool forEncryption, - ICipherParameters parameters) - { - KeyParameter keyParameter = parameters as KeyParameter; - - if (keyParameter == null) - throw new ArgumentException("invalid parameter passed to AES init - " - + GetTypeName(parameters)); - - WorkingKey = GenerateWorkingKey(keyParameter.GetKey(), forEncryption); - - this.forEncryption = forEncryption; - } - - public virtual string AlgorithmName - { - get { return "AES"; } - } - - public virtual bool IsPartialBlockOkay - { - get { return false; } - } - - public virtual int GetBlockSize() - { - return BLOCK_SIZE; - } - - public virtual int ProcessBlock(byte[] input, int inOff, byte[] output, int outOff) - { - if (WorkingKey == null) - throw new InvalidOperationException("AES engine not initialised"); - - Check.DataLength(input, inOff, 16, "input buffer too short"); - Check.OutputLength(output, outOff, 16, "output buffer too short"); - - if (forEncryption) - { - EncryptBlock(input, inOff, output, outOff, WorkingKey); - } - else - { - DecryptBlock(input, inOff, output, outOff, WorkingKey); - } - - return BLOCK_SIZE; - } - - public virtual void Reset() - { - } - - private void EncryptBlock(byte[] input, int inOff, byte[] output, int outOff, uint[][] KW) - { - uint C0 = Pack.LE_To_UInt32(input, inOff + 0); - uint C1 = Pack.LE_To_UInt32(input, inOff + 4); - uint C2 = Pack.LE_To_UInt32(input, inOff + 8); - uint C3 = Pack.LE_To_UInt32(input, inOff + 12); - - uint[] kw = KW[0]; - uint t0 = C0 ^ kw[0]; - uint t1 = C1 ^ kw[1]; - uint t2 = C2 ^ kw[2]; - - uint r0, r1, r2, r3 = C3 ^ kw[3]; - int r = 1; - while (r < ROUNDS - 1) - { - kw = KW[r++]; - r0 = T0[t0 & 255] ^ T1[(t1 >> 8) & 255] ^ T2[(t2 >> 16) & 255] ^ T3[r3 >> 24] ^ kw[0]; - r1 = T0[t1 & 255] ^ T1[(t2 >> 8) & 255] ^ T2[(r3 >> 16) & 255] ^ T3[t0 >> 24] ^ kw[1]; - r2 = T0[t2 & 255] ^ T1[(r3 >> 8) & 255] ^ T2[(t0 >> 16) & 255] ^ T3[t1 >> 24] ^ kw[2]; - r3 = T0[r3 & 255] ^ T1[(t0 >> 8) & 255] ^ T2[(t1 >> 16) & 255] ^ T3[t2 >> 24] ^ kw[3]; - kw = KW[r++]; - t0 = T0[r0 & 255] ^ T1[(r1 >> 8) & 255] ^ T2[(r2 >> 16) & 255] ^ T3[r3 >> 24] ^ kw[0]; - t1 = T0[r1 & 255] ^ T1[(r2 >> 8) & 255] ^ T2[(r3 >> 16) & 255] ^ T3[r0 >> 24] ^ kw[1]; - t2 = T0[r2 & 255] ^ T1[(r3 >> 8) & 255] ^ T2[(r0 >> 16) & 255] ^ T3[r1 >> 24] ^ kw[2]; - r3 = T0[r3 & 255] ^ T1[(r0 >> 8) & 255] ^ T2[(r1 >> 16) & 255] ^ T3[r2 >> 24] ^ kw[3]; - } - - kw = KW[r++]; - r0 = T0[t0 & 255] ^ T1[(t1 >> 8) & 255] ^ T2[(t2 >> 16) & 255] ^ T3[r3 >> 24] ^ kw[0]; - r1 = T0[t1 & 255] ^ T1[(t2 >> 8) & 255] ^ T2[(r3 >> 16) & 255] ^ T3[t0 >> 24] ^ kw[1]; - r2 = T0[t2 & 255] ^ T1[(r3 >> 8) & 255] ^ T2[(t0 >> 16) & 255] ^ T3[t1 >> 24] ^ kw[2]; - r3 = T0[r3 & 255] ^ T1[(t0 >> 8) & 255] ^ T2[(t1 >> 16) & 255] ^ T3[t2 >> 24] ^ kw[3]; - - // the final round's table is a simple function of S so we don't use a whole other four tables for it - - kw = KW[r]; - C0 = (uint)S[r0 & 255] ^ (((uint)S[(r1 >> 8) & 255]) << 8) ^ (((uint)S[(r2 >> 16) & 255]) << 16) ^ (((uint)S[r3 >> 24]) << 24) ^ kw[0]; - C1 = (uint)S[r1 & 255] ^ (((uint)S[(r2 >> 8) & 255]) << 8) ^ (((uint)S[(r3 >> 16) & 255]) << 16) ^ (((uint)S[r0 >> 24]) << 24) ^ kw[1]; - C2 = (uint)S[r2 & 255] ^ (((uint)S[(r3 >> 8) & 255]) << 8) ^ (((uint)S[(r0 >> 16) & 255]) << 16) ^ (((uint)S[r1 >> 24]) << 24) ^ kw[2]; - C3 = (uint)S[r3 & 255] ^ (((uint)S[(r0 >> 8) & 255]) << 8) ^ (((uint)S[(r1 >> 16) & 255]) << 16) ^ (((uint)S[r2 >> 24]) << 24) ^ kw[3]; - - Pack.UInt32_To_LE(C0, output, outOff + 0); - Pack.UInt32_To_LE(C1, output, outOff + 4); - Pack.UInt32_To_LE(C2, output, outOff + 8); - Pack.UInt32_To_LE(C3, output, outOff + 12); - } - - private void DecryptBlock(byte[] input, int inOff, byte[] output, int outOff, uint[][] KW) - { - uint C0 = Pack.LE_To_UInt32(input, inOff + 0); - uint C1 = Pack.LE_To_UInt32(input, inOff + 4); - uint C2 = Pack.LE_To_UInt32(input, inOff + 8); - uint C3 = Pack.LE_To_UInt32(input, inOff + 12); - - uint[] kw = KW[ROUNDS]; - uint t0 = C0 ^ kw[0]; - uint t1 = C1 ^ kw[1]; - uint t2 = C2 ^ kw[2]; - - uint r0, r1, r2, r3 = C3 ^ kw[3]; - int r = ROUNDS - 1; - while (r > 1) - { - kw = KW[r--]; - r0 = Tinv0[t0 & 255] ^ Tinv1[(r3 >> 8) & 255] ^ Tinv2[(t2 >> 16) & 255] ^ Tinv3[t1 >> 24] ^ kw[0]; - r1 = Tinv0[t1 & 255] ^ Tinv1[(t0 >> 8) & 255] ^ Tinv2[(r3 >> 16) & 255] ^ Tinv3[t2 >> 24] ^ kw[1]; - r2 = Tinv0[t2 & 255] ^ Tinv1[(t1 >> 8) & 255] ^ Tinv2[(t0 >> 16) & 255] ^ Tinv3[r3 >> 24] ^ kw[2]; - r3 = Tinv0[r3 & 255] ^ Tinv1[(t2 >> 8) & 255] ^ Tinv2[(t1 >> 16) & 255] ^ Tinv3[t0 >> 24] ^ kw[3]; - kw = KW[r--]; - t0 = Tinv0[r0 & 255] ^ Tinv1[(r3 >> 8) & 255] ^ Tinv2[(r2 >> 16) & 255] ^ Tinv3[r1 >> 24] ^ kw[0]; - t1 = Tinv0[r1 & 255] ^ Tinv1[(r0 >> 8) & 255] ^ Tinv2[(r3 >> 16) & 255] ^ Tinv3[r2 >> 24] ^ kw[1]; - t2 = Tinv0[r2 & 255] ^ Tinv1[(r1 >> 8) & 255] ^ Tinv2[(r0 >> 16) & 255] ^ Tinv3[r3 >> 24] ^ kw[2]; - r3 = Tinv0[r3 & 255] ^ Tinv1[(r2 >> 8) & 255] ^ Tinv2[(r1 >> 16) & 255] ^ Tinv3[r0 >> 24] ^ kw[3]; - } - - kw = KW[1]; - r0 = Tinv0[t0 & 255] ^ Tinv1[(r3 >> 8) & 255] ^ Tinv2[(t2 >> 16) & 255] ^ Tinv3[t1 >> 24] ^ kw[0]; - r1 = Tinv0[t1 & 255] ^ Tinv1[(t0 >> 8) & 255] ^ Tinv2[(r3 >> 16) & 255] ^ Tinv3[t2 >> 24] ^ kw[1]; - r2 = Tinv0[t2 & 255] ^ Tinv1[(t1 >> 8) & 255] ^ Tinv2[(t0 >> 16) & 255] ^ Tinv3[r3 >> 24] ^ kw[2]; - r3 = Tinv0[r3 & 255] ^ Tinv1[(t2 >> 8) & 255] ^ Tinv2[(t1 >> 16) & 255] ^ Tinv3[t0 >> 24] ^ kw[3]; - - // the final round's table is a simple function of Si so we don't use a whole other four tables for it - - kw = KW[0]; - C0 = (uint)Si[r0 & 255] ^ (((uint)Si[(r3 >> 8) & 255]) << 8) ^ (((uint)Si[(r2 >> 16) & 255]) << 16) ^ (((uint)Si[r1 >> 24]) << 24) ^ kw[0]; - C1 = (uint)Si[r1 & 255] ^ (((uint)Si[(r0 >> 8) & 255]) << 8) ^ (((uint)Si[(r3 >> 16) & 255]) << 16) ^ (((uint)Si[r2 >> 24]) << 24) ^ kw[1]; - C2 = (uint)Si[r2 & 255] ^ (((uint)Si[(r1 >> 8) & 255]) << 8) ^ (((uint)Si[(r0 >> 16) & 255]) << 16) ^ (((uint)Si[r3 >> 24]) << 24) ^ kw[2]; - C3 = (uint)Si[r3 & 255] ^ (((uint)Si[(r2 >> 8) & 255]) << 8) ^ (((uint)Si[(r1 >> 16) & 255]) << 16) ^ (((uint)Si[r0 >> 24]) << 24) ^ kw[3]; - - Pack.UInt32_To_LE(C0, output, outOff + 0); - Pack.UInt32_To_LE(C1, output, outOff + 4); - Pack.UInt32_To_LE(C2, output, outOff + 8); - Pack.UInt32_To_LE(C3, output, outOff + 12); - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/BufferedBlockCipher.cs b/MinecraftClient/Crypto/Streams/BouncyAes/BufferedBlockCipher.cs deleted file mode 100644 index 3dc21560..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/BufferedBlockCipher.cs +++ /dev/null @@ -1,367 +0,0 @@ -using System; -using System.Diagnostics; - -using Org.BouncyCastle.Crypto.Parameters; - -namespace Org.BouncyCastle.Crypto -{ - /** - * A wrapper class that allows block ciphers to be used to process data in - * a piecemeal fashion. The BufferedBlockCipher outputs a block only when the - * buffer is full and more data is being added, or on a doFinal. - *

- * Note: in the case where the underlying cipher is either a CFB cipher or an - * OFB one the last block may not be a multiple of the block size. - *

- */ - public class BufferedBlockCipher - : BufferedCipherBase - { - internal byte[] buf; - internal int bufOff; - internal bool forEncryption; - internal IBlockCipher cipher; - - /** - * constructor for subclasses - */ - protected BufferedBlockCipher() - { - } - - /** - * Create a buffered block cipher without padding. - * - * @param cipher the underlying block cipher this buffering object wraps. - * false otherwise. - */ - public BufferedBlockCipher( - IBlockCipher cipher) - { - if (cipher == null) - throw new ArgumentNullException("cipher"); - - this.cipher = cipher; - buf = new byte[cipher.GetBlockSize()]; - bufOff = 0; - } - - public override string AlgorithmName - { - get { return cipher.AlgorithmName; } - } - - /** - * initialise the cipher. - * - * @param forEncryption if true the cipher is initialised for - * encryption, if false for decryption. - * @param param the key and other data required by the cipher. - * @exception ArgumentException if the parameters argument is - * inappropriate. - */ - // Note: This doubles as the Init in the event that this cipher is being used as an IWrapper - public override void Init( - bool forEncryption, - ICipherParameters parameters) - { - this.forEncryption = forEncryption; - - //ParametersWithRandom pwr = parameters as ParametersWithRandom; - //if (pwr != null) - // parameters = pwr.Parameters; - - Reset(); - - cipher.Init(forEncryption, parameters); - } - - /** - * return the blocksize for the underlying cipher. - * - * @return the blocksize for the underlying cipher. - */ - public override int GetBlockSize() - { - return cipher.GetBlockSize(); - } - - /** - * return the size of the output buffer required for an update - * an input of len bytes. - * - * @param len the length of the input. - * @return the space required to accommodate a call to update - * with len bytes of input. - */ - public override int GetUpdateOutputSize( - int length) - { - int total = length + bufOff; - int leftOver = total % buf.Length; - return total - leftOver; - } - - /** - * return the size of the output buffer required for an update plus a - * doFinal with an input of len bytes. - * - * @param len the length of the input. - * @return the space required to accommodate a call to update and doFinal - * with len bytes of input. - */ - public override int GetOutputSize( - int length) - { - // Note: Can assume IsPartialBlockOkay is true for purposes of this calculation - return length + bufOff; - } - - /** - * process a single byte, producing an output block if necessary. - * - * @param in the input byte. - * @param out the space for any output that might be produced. - * @param outOff the offset from which the output will be copied. - * @return the number of output bytes copied to out. - * @exception DataLengthException if there isn't enough space in out. - * @exception InvalidOperationException if the cipher isn't initialised. - */ - public override int ProcessByte( - byte input, - byte[] output, - int outOff) - { - buf[bufOff++] = input; - - if (bufOff == buf.Length) - { - if ((outOff + buf.Length) > output.Length) - throw new DataLengthException("output buffer too short"); - - bufOff = 0; - return cipher.ProcessBlock(buf, 0, output, outOff); - } - - return 0; - } - - public override byte[] ProcessByte( - byte input) - { - int outLength = GetUpdateOutputSize(1); - - byte[] outBytes = outLength > 0 ? new byte[outLength] : null; - - int pos = ProcessByte(input, outBytes, 0); - - if (outLength > 0 && pos < outLength) - { - byte[] tmp = new byte[pos]; - Array.Copy(outBytes, 0, tmp, 0, pos); - outBytes = tmp; - } - - return outBytes; - } - - public override byte[] ProcessBytes( - byte[] input, - int inOff, - int length) - { - if (input == null) - throw new ArgumentNullException("input"); - if (length < 1) - return null; - - int outLength = GetUpdateOutputSize(length); - - byte[] outBytes = outLength > 0 ? new byte[outLength] : null; - - int pos = ProcessBytes(input, inOff, length, outBytes, 0); - - if (outLength > 0 && pos < outLength) - { - byte[] tmp = new byte[pos]; - Array.Copy(outBytes, 0, tmp, 0, pos); - outBytes = tmp; - } - - return outBytes; - } - - /** - * process an array of bytes, producing output if necessary. - * - * @param in the input byte array. - * @param inOff the offset at which the input data starts. - * @param len the number of bytes to be copied out of the input array. - * @param out the space for any output that might be produced. - * @param outOff the offset from which the output will be copied. - * @return the number of output bytes copied to out. - * @exception DataLengthException if there isn't enough space in out. - * @exception InvalidOperationException if the cipher isn't initialised. - */ - public override int ProcessBytes( - byte[] input, - int inOff, - int length, - byte[] output, - int outOff) - { - if (length < 1) - { - if (length < 0) - throw new ArgumentException("Can't have a negative input length!"); - - return 0; - } - - int blockSize = GetBlockSize(); - int outLength = GetUpdateOutputSize(length); - - if (outLength > 0) - { - Check.OutputLength(output, outOff, outLength, "output buffer too short"); - } - - int resultLen = 0; - int gapLen = buf.Length - bufOff; - if (length > gapLen) - { - Array.Copy(input, inOff, buf, bufOff, gapLen); - resultLen += cipher.ProcessBlock(buf, 0, output, outOff); - bufOff = 0; - length -= gapLen; - inOff += gapLen; - while (length > buf.Length) - { - resultLen += cipher.ProcessBlock(input, inOff, output, outOff + resultLen); - length -= blockSize; - inOff += blockSize; - } - } - Array.Copy(input, inOff, buf, bufOff, length); - bufOff += length; - if (bufOff == buf.Length) - { - resultLen += cipher.ProcessBlock(buf, 0, output, outOff + resultLen); - bufOff = 0; - } - return resultLen; - } - - public override byte[] DoFinal() - { - byte[] outBytes = EmptyBuffer; - - int length = GetOutputSize(0); - if (length > 0) - { - outBytes = new byte[length]; - - int pos = DoFinal(outBytes, 0); - if (pos < outBytes.Length) - { - byte[] tmp = new byte[pos]; - Array.Copy(outBytes, 0, tmp, 0, pos); - outBytes = tmp; - } - } - else - { - Reset(); - } - - return outBytes; - } - - public override byte[] DoFinal( - byte[] input, - int inOff, - int inLen) - { - if (input == null) - throw new ArgumentNullException("input"); - - int length = GetOutputSize(inLen); - - byte[] outBytes = EmptyBuffer; - - if (length > 0) - { - outBytes = new byte[length]; - - int pos = (inLen > 0) - ? ProcessBytes(input, inOff, inLen, outBytes, 0) - : 0; - - pos += DoFinal(outBytes, pos); - - if (pos < outBytes.Length) - { - byte[] tmp = new byte[pos]; - Array.Copy(outBytes, 0, tmp, 0, pos); - outBytes = tmp; - } - } - else - { - Reset(); - } - - return outBytes; - } - - /** - * Process the last block in the buffer. - * - * @param out the array the block currently being held is copied into. - * @param outOff the offset at which the copying starts. - * @return the number of output bytes copied to out. - * @exception DataLengthException if there is insufficient space in out for - * the output, or the input is not block size aligned and should be. - * @exception InvalidOperationException if the underlying cipher is not - * initialised. - * @exception InvalidCipherTextException if padding is expected and not found. - * @exception DataLengthException if the input is not block size - * aligned. - */ - public override int DoFinal( - byte[] output, - int outOff) - { - try - { - if (bufOff != 0) - { - Check.DataLength(!cipher.IsPartialBlockOkay, "data not block size aligned"); - Check.OutputLength(output, outOff, bufOff, "output buffer too short for DoFinal()"); - - // NB: Can't copy directly, or we may write too much output - cipher.ProcessBlock(buf, 0, buf, 0); - Array.Copy(buf, 0, output, outOff, bufOff); - } - - return bufOff; - } - finally - { - Reset(); - } - } - - /** - * Reset the buffer and cipher. After resetting the object is in the same - * state as it was after the last init (if there was one). - */ - public override void Reset() - { - Array.Clear(buf, 0, buf.Length); - bufOff = 0; - - cipher.Reset(); - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/BufferedCipherBase.cs b/MinecraftClient/Crypto/Streams/BouncyAes/BufferedCipherBase.cs deleted file mode 100644 index 9d861021..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/BufferedCipherBase.cs +++ /dev/null @@ -1,113 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - public abstract class BufferedCipherBase - : IBufferedCipher - { - protected static readonly byte[] EmptyBuffer = new byte[0]; - - public abstract string AlgorithmName { get; } - - public abstract void Init(bool forEncryption, ICipherParameters parameters); - - public abstract int GetBlockSize(); - - public abstract int GetOutputSize(int inputLen); - public abstract int GetUpdateOutputSize(int inputLen); - - public abstract byte[] ProcessByte(byte input); - - public virtual int ProcessByte( - byte input, - byte[] output, - int outOff) - { - byte[] outBytes = ProcessByte(input); - if (outBytes == null) - return 0; - if (outOff + outBytes.Length > output.Length) - throw new DataLengthException("output buffer too short"); - outBytes.CopyTo(output, outOff); - return outBytes.Length; - } - - public virtual byte[] ProcessBytes( - byte[] input) - { - return ProcessBytes(input, 0, input.Length); - } - - public abstract byte[] ProcessBytes(byte[] input, int inOff, int length); - - public virtual int ProcessBytes( - byte[] input, - byte[] output, - int outOff) - { - return ProcessBytes(input, 0, input.Length, output, outOff); - } - - public virtual int ProcessBytes( - byte[] input, - int inOff, - int length, - byte[] output, - int outOff) - { - byte[] outBytes = ProcessBytes(input, inOff, length); - if (outBytes == null) - return 0; - if (outOff + outBytes.Length > output.Length) - throw new DataLengthException("output buffer too short"); - outBytes.CopyTo(output, outOff); - return outBytes.Length; - } - - public abstract byte[] DoFinal(); - - public virtual byte[] DoFinal( - byte[] input) - { - return DoFinal(input, 0, input.Length); - } - - public abstract byte[] DoFinal( - byte[] input, - int inOff, - int length); - - public virtual int DoFinal( - byte[] output, - int outOff) - { - byte[] outBytes = DoFinal(); - if (outOff + outBytes.Length > output.Length) - throw new DataLengthException("output buffer too short"); - outBytes.CopyTo(output, outOff); - return outBytes.Length; - } - - public virtual int DoFinal( - byte[] input, - byte[] output, - int outOff) - { - return DoFinal(input, 0, input.Length, output, outOff); - } - - public virtual int DoFinal( - byte[] input, - int inOff, - int length, - byte[] output, - int outOff) - { - int len = ProcessBytes(input, inOff, length, output, outOff); - len += DoFinal(output, outOff + len); - return len; - } - - public abstract void Reset(); - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs deleted file mode 100644 index ed0be407..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CfbBlockCipher.cs +++ /dev/null @@ -1,227 +0,0 @@ -using System; - -using Org.BouncyCastle.Crypto.Parameters; - -namespace Org.BouncyCastle.Crypto.Modes -{ - /** - * implements a Cipher-FeedBack (CFB) mode on top of a simple cipher. - */ - public class CfbBlockCipher - : IBlockCipher - { - private byte[] IV; - private byte[] cfbV; - private byte[] cfbOutV; - private bool encrypting; - - private readonly int blockSize; - private readonly IBlockCipher cipher; - - /** - * Basic constructor. - * - * @param cipher the block cipher to be used as the basis of the - * feedback mode. - * @param blockSize the block size in bits (note: a multiple of 8) - */ - public CfbBlockCipher( - IBlockCipher cipher, - int bitBlockSize) - { - if (bitBlockSize < 8 || (bitBlockSize & 7) != 0) - throw new ArgumentException("CFB" + bitBlockSize + " not supported", "bitBlockSize"); - - this.cipher = cipher; - this.blockSize = bitBlockSize / 8; - this.IV = new byte[cipher.GetBlockSize()]; - this.cfbV = new byte[cipher.GetBlockSize()]; - this.cfbOutV = new byte[cipher.GetBlockSize()]; - } - /** - * return the underlying block cipher that we are wrapping. - * - * @return the underlying block cipher that we are wrapping. - */ - public IBlockCipher GetUnderlyingCipher() - { - return cipher; - } - /** - * Initialise the cipher and, possibly, the initialisation vector (IV). - * If an IV isn't passed as part of the parameter, the IV will be all zeros. - * An IV which is too short is handled in FIPS compliant fashion. - * - * @param forEncryption if true the cipher is initialised for - * encryption, if false for decryption. - * @param param the key and other data required by the cipher. - * @exception ArgumentException if the parameters argument is - * inappropriate. - */ - public void Init( - bool forEncryption, - ICipherParameters parameters) - { - this.encrypting = forEncryption; - if (parameters is ParametersWithIV) - { - ParametersWithIV ivParam = (ParametersWithIV) parameters; - byte[] iv = ivParam.GetIV(); - int diff = IV.Length - iv.Length; - Array.Copy(iv, 0, IV, diff, iv.Length); - Array.Clear(IV, 0, diff); - - parameters = ivParam.Parameters; - } - Reset(); - - // if it's null, key is to be reused. - if (parameters != null) - { - cipher.Init(true, parameters); - } - } - - /** - * return the algorithm name and mode. - * - * @return the name of the underlying algorithm followed by "/CFB" - * and the block size in bits. - */ - public string AlgorithmName - { - get { return cipher.AlgorithmName + "/CFB" + (blockSize * 8); } - } - - public bool IsPartialBlockOkay - { - get { return true; } - } - - /** - * return the block size we are operating at. - * - * @return the block size we are operating at (in bytes). - */ - public int GetBlockSize() - { - return blockSize; - } - - /** - * Process one block of input from the array in and write it to - * the out array. - * - * @param in the array containing the input data. - * @param inOff offset into the in array the data starts at. - * @param out the array the output data will be copied into. - * @param outOff the offset into the out array the output will start at. - * @exception DataLengthException if there isn't enough data in in, or - * space in out. - * @exception InvalidOperationException if the cipher isn't initialised. - * @return the number of bytes processed and produced. - */ - public int ProcessBlock( - byte[] input, - int inOff, - byte[] output, - int outOff) - { - return (encrypting) - ? EncryptBlock(input, inOff, output, outOff) - : DecryptBlock(input, inOff, output, outOff); - } - - /** - * Do the appropriate processing for CFB mode encryption. - * - * @param in the array containing the data to be encrypted. - * @param inOff offset into the in array the data starts at. - * @param out the array the encrypted data will be copied into. - * @param outOff the offset into the out array the output will start at. - * @exception DataLengthException if there isn't enough data in in, or - * space in out. - * @exception InvalidOperationException if the cipher isn't initialised. - * @return the number of bytes processed and produced. - */ - public int EncryptBlock( - byte[] input, - int inOff, - byte[] outBytes, - int outOff) - { - if ((inOff + blockSize) > input.Length) - { - throw new DataLengthException("input buffer too short"); - } - if ((outOff + blockSize) > outBytes.Length) - { - throw new DataLengthException("output buffer too short"); - } - cipher.ProcessBlock(cfbV, 0, cfbOutV, 0); - // - // XOR the cfbV with the plaintext producing the ciphertext - // - for (int i = 0; i < blockSize; i++) - { - outBytes[outOff + i] = (byte)(cfbOutV[i] ^ input[inOff + i]); - } - // - // change over the input block. - // - Array.Copy(cfbV, blockSize, cfbV, 0, cfbV.Length - blockSize); - Array.Copy(outBytes, outOff, cfbV, cfbV.Length - blockSize, blockSize); - return blockSize; - } - /** - * Do the appropriate processing for CFB mode decryption. - * - * @param in the array containing the data to be decrypted. - * @param inOff offset into the in array the data starts at. - * @param out the array the encrypted data will be copied into. - * @param outOff the offset into the out array the output will start at. - * @exception DataLengthException if there isn't enough data in in, or - * space in out. - * @exception InvalidOperationException if the cipher isn't initialised. - * @return the number of bytes processed and produced. - */ - public int DecryptBlock( - byte[] input, - int inOff, - byte[] outBytes, - int outOff) - { - if ((inOff + blockSize) > input.Length) - { - throw new DataLengthException("input buffer too short"); - } - if ((outOff + blockSize) > outBytes.Length) - { - throw new DataLengthException("output buffer too short"); - } - cipher.ProcessBlock(cfbV, 0, cfbOutV, 0); - // - // change over the input block. - // - Array.Copy(cfbV, blockSize, cfbV, 0, cfbV.Length - blockSize); - Array.Copy(input, inOff, cfbV, cfbV.Length - blockSize, blockSize); - // - // XOR the cfbV with the ciphertext producing the plaintext - // - for (int i = 0; i < blockSize; i++) - { - outBytes[outOff + i] = (byte)(cfbOutV[i] ^ input[inOff + i]); - } - return blockSize; - } - /** - * reset the chaining vector back to the IV and reset the underlying - * cipher. - */ - public void Reset() - { - Array.Copy(IV, 0, cfbV, 0, IV.Length); - cipher.Reset(); - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs b/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs deleted file mode 100644 index aacda144..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/Check.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - internal class Check - { - internal static void DataLength(bool condition, string msg) - { - if (condition) - throw new DataLengthException(msg); - } - - internal static void DataLength(byte[] buf, int off, int len, string msg) - { - if (off > (buf.Length - len)) - throw new DataLengthException(msg); - } - - internal static void OutputLength(byte[] buf, int off, int len, string msg) - { - if (off > (buf.Length - len)) - throw new OutputLengthException(msg); - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs deleted file mode 100644 index 058d7f73..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CipherStream.cs +++ /dev/null @@ -1,250 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; - -namespace Org.BouncyCastle.Crypto.IO -{ - public class CipherStream - : Stream - { - internal Stream stream; - internal IBufferedCipher inCipher, outCipher; - private byte[] mInBuf; - private int mInPos; - private bool inStreamEnded; - - public CipherStream( - Stream stream, - IBufferedCipher readCipher, - IBufferedCipher writeCipher) - { - this.stream = stream; - - if (readCipher != null) - { - this.inCipher = readCipher; - mInBuf = null; - } - - if (writeCipher != null) - { - this.outCipher = writeCipher; - } - } - - public IBufferedCipher ReadCipher - { - get { return inCipher; } - } - - public IBufferedCipher WriteCipher - { - get { return outCipher; } - } - - public override int ReadByte() - { - if (inCipher == null) - return stream.ReadByte(); - - if (mInBuf == null || mInPos >= mInBuf.Length) - { - if (!FillInBuf()) - return -1; - } - - return mInBuf[mInPos++]; - } - - public override int Read( - byte[] buffer, - int offset, - int count) - { - if (inCipher == null) - return stream.Read(buffer, offset, count); - - int num = 0; - while (num < count) - { - if (mInBuf == null || mInPos >= mInBuf.Length) - { - if (!FillInBuf()) - break; - } - - int numToCopy = System.Math.Min(count - num, mInBuf.Length - mInPos); - Array.Copy(mInBuf, mInPos, buffer, offset + num, numToCopy); - mInPos += numToCopy; - num += numToCopy; - } - - return num; - } - - private bool FillInBuf() - { - if (inStreamEnded) - return false; - - mInPos = 0; - - do - { - mInBuf = ReadAndProcessBlock(); - } - while (!inStreamEnded && mInBuf == null); - - return mInBuf != null; - } - - private byte[] ReadAndProcessBlock() - { - int blockSize = inCipher.GetBlockSize(); - int readSize = (blockSize == 0) ? 256 : blockSize; - - byte[] block = new byte[readSize]; - int numRead = 0; - do - { - int count = stream.Read(block, numRead, block.Length - numRead); - if (count < 1) - { - inStreamEnded = true; - break; - } - numRead += count; - } - while (numRead < block.Length); - - Debug.Assert(inStreamEnded || numRead == block.Length); - - byte[] bytes = inStreamEnded - ? inCipher.DoFinal(block, 0, numRead) - : inCipher.ProcessBytes(block); - - if (bytes != null && bytes.Length == 0) - { - bytes = null; - } - - return bytes; - } - - public override void Write( - byte[] buffer, - int offset, - int count) - { - Debug.Assert(buffer != null); - Debug.Assert(0 <= offset && offset <= buffer.Length); - Debug.Assert(count >= 0); - - int end = offset + count; - - Debug.Assert(0 <= end && end <= buffer.Length); - - if (outCipher == null) - { - stream.Write(buffer, offset, count); - return; - } - - byte[] data = outCipher.ProcessBytes(buffer, offset, count); - if (data != null) - { - stream.Write(data, 0, data.Length); - } - } - - public override void WriteByte( - byte b) - { - if (outCipher == null) - { - stream.WriteByte(b); - return; - } - - byte[] data = outCipher.ProcessByte(b); - if (data != null) - { - stream.Write(data, 0, data.Length); - } - } - - public override bool CanRead - { - get { return stream.CanRead && (inCipher != null); } - } - - public override bool CanWrite - { - get { return stream.CanWrite && (outCipher != null); } - } - - public override bool CanSeek - { - get { return false; } - } - - public sealed override long Length - { - get { throw new NotSupportedException(); } - } - - public sealed override long Position - { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } - } - -#if PORTABLE - protected override void Dispose(bool disposing) - { - if (disposing) - { - if (outCipher != null) - { - byte[] data = outCipher.DoFinal(); - stream.Write(data, 0, data.Length); - stream.Flush(); - } - Platform.Dispose(stream); - } - base.Dispose(disposing); - } -#else - public override void Close() - { - if (outCipher != null) - { - byte[] data = outCipher.DoFinal(); - stream.Write(data, 0, data.Length); - stream.Flush(); - } - stream.Close(); - base.Close(); - } -#endif - - public override void Flush() - { - // Note: outCipher.DoFinal is only called during Close() - stream.Flush(); - } - - public sealed override long Seek( - long offset, - SeekOrigin origin) - { - throw new NotSupportedException(); - } - - public sealed override void SetLength( - long length) - { - throw new NotSupportedException(); - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs deleted file mode 100644 index 73d450be..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/CryptoException.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) - [Serializable] -#endif - public class CryptoException - : Exception - { - public CryptoException() - { - } - - public CryptoException( - string message) - : base(message) - { - } - - public CryptoException( - string message, - Exception exception) - : base(message, exception) - { - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs deleted file mode 100644 index 447ff2a1..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/DataLengthException.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - /** - * this exception is thrown if a buffer that is meant to have output - * copied into it turns out to be too short, or if we've been given - * insufficient input. In general this exception will Get thrown rather - * than an ArrayOutOfBounds exception. - */ -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) - [Serializable] -#endif - public class DataLengthException - : CryptoException - { - /** - * base constructor. - */ - public DataLengthException() - { - } - - /** - * create a DataLengthException with the given message. - * - * @param message the message to be carried with the exception. - */ - public DataLengthException( - string message) - : base(message) - { - } - - public DataLengthException( - string message, - Exception exception) - : base(message, exception) - { - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/IBlockCipher.cs b/MinecraftClient/Crypto/Streams/BouncyAes/IBlockCipher.cs deleted file mode 100644 index a3ad6d6e..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/IBlockCipher.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - /// Base interface for a symmetric key block cipher. - public interface IBlockCipher - { - /// The name of the algorithm this cipher implements. - string AlgorithmName { get; } - - /// Initialise the cipher. - /// Initialise for encryption if true, for decryption if false. - /// The key or other data required by the cipher. - void Init(bool forEncryption, ICipherParameters parameters); - - /// The block size for this cipher, in bytes. - int GetBlockSize(); - - /// Indicates whether this cipher can handle partial blocks. - bool IsPartialBlockOkay { get; } - - /// Process a block. - /// The input buffer. - /// The offset into inBuf that the input block begins. - /// The output buffer. - /// The offset into outBuf to write the output block. - /// If input block is wrong size, or outBuf too small. - /// The number of bytes processed and produced. - int ProcessBlock(byte[] inBuf, int inOff, byte[] outBuf, int outOff); - - /// - /// Reset the cipher to the same state as it was after the last init (if there was one). - /// - void Reset(); - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/IBufferedCipher.cs b/MinecraftClient/Crypto/Streams/BouncyAes/IBufferedCipher.cs deleted file mode 100644 index 69dec959..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/IBufferedCipher.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - /// Block cipher engines are expected to conform to this interface. - public interface IBufferedCipher - { - /// The name of the algorithm this cipher implements. - string AlgorithmName { get; } - - /// Initialise the cipher. - /// If true the cipher is initialised for encryption, - /// if false for decryption. - /// The key and other data required by the cipher. - void Init(bool forEncryption, ICipherParameters parameters); - - int GetBlockSize(); - - int GetOutputSize(int inputLen); - - int GetUpdateOutputSize(int inputLen); - - byte[] ProcessByte(byte input); - int ProcessByte(byte input, byte[] output, int outOff); - - byte[] ProcessBytes(byte[] input); - byte[] ProcessBytes(byte[] input, int inOff, int length); - int ProcessBytes(byte[] input, byte[] output, int outOff); - int ProcessBytes(byte[] input, int inOff, int length, byte[] output, int outOff); - - byte[] DoFinal(); - byte[] DoFinal(byte[] input); - byte[] DoFinal(byte[] input, int inOff, int length); - int DoFinal(byte[] output, int outOff); - int DoFinal(byte[] input, byte[] output, int outOff); - int DoFinal(byte[] input, int inOff, int length, byte[] output, int outOff); - - /// - /// Reset the cipher. After resetting the cipher is in the same state - /// as it was after the last init (if there was one). - /// - void Reset(); - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/ICipherParameters.cs b/MinecraftClient/Crypto/Streams/BouncyAes/ICipherParameters.cs deleted file mode 100644 index fff0941c..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/ICipherParameters.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ - /** - * all parameter classes implement this. - */ - public interface ICipherParameters - { - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs b/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs deleted file mode 100644 index 043adf27..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/KeyParameter.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; - -using Org.BouncyCastle.Crypto; - -namespace Org.BouncyCastle.Crypto.Parameters -{ - public class KeyParameter - : ICipherParameters - { - private readonly byte[] key; - - public KeyParameter( - byte[] key) - { - if (key == null) - throw new ArgumentNullException("key"); - - this.key = (byte[]) key.Clone(); - } - - public KeyParameter( - byte[] key, - int keyOff, - int keyLen) - { - if (key == null) - throw new ArgumentNullException("key"); - if (keyOff < 0 || keyOff > key.Length) - throw new ArgumentOutOfRangeException("keyOff"); - if (keyLen < 0 || keyLen > (key.Length - keyOff)) - throw new ArgumentOutOfRangeException("keyLen"); - - this.key = new byte[keyLen]; - Array.Copy(key, keyOff, this.key, 0, keyLen); - } - - public byte[] GetKey() - { - return (byte[]) key.Clone(); - } - } - -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs b/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs deleted file mode 100644 index 437589f4..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/OutputLengthException.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto -{ -#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE) - [Serializable] -#endif - public class OutputLengthException - : DataLengthException - { - public OutputLengthException() - { - } - - public OutputLengthException( - string message) - : base(message) - { - } - - public OutputLengthException( - string message, - Exception exception) - : base(message, exception) - { - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs b/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs deleted file mode 100644 index 8ba738d4..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/Pack.cs +++ /dev/null @@ -1,436 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto.Utilities -{ - internal sealed class Pack - { - private Pack() - { - } - - internal static void UInt16_To_BE(ushort n, byte[] bs) - { - bs[0] = (byte)(n >> 8); - bs[1] = (byte)(n); - } - - internal static void UInt16_To_BE(ushort n, byte[] bs, int off) - { - bs[off] = (byte)(n >> 8); - bs[off + 1] = (byte)(n); - } - - internal static void UInt16_To_BE(ushort[] ns, byte[] bs, int off) - { - for (int i = 0; i < ns.Length; ++i) - { - UInt16_To_BE(ns[i], bs, off); - off += 2; - } - } - - internal static void UInt16_To_BE(ushort[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) - { - for (int i = 0; i < nsLen; ++i) - { - UInt16_To_BE(ns[nsOff + i], bs, bsOff); - bsOff += 2; - } - } - - internal static byte[] UInt16_To_BE(ushort n) - { - byte[] bs = new byte[2]; - UInt16_To_BE(n, bs, 0); - return bs; - } - - internal static byte[] UInt16_To_BE(ushort[] ns) - { - return UInt16_To_BE(ns, 0, ns.Length); - } - - internal static byte[] UInt16_To_BE(ushort[] ns, int nsOff, int nsLen) - { - byte[] bs = new byte[2 * nsLen]; - UInt16_To_BE(ns, nsOff, nsLen, bs, 0); - return bs; - } - - internal static ushort BE_To_UInt16(byte[] bs, int off) - { - uint n = (uint)bs[off] << 8 - | (uint)bs[off + 1]; - return (ushort)n; - } - - internal static void BE_To_UInt16(byte[] bs, int bsOff, ushort[] ns, int nsOff) - { - ns[nsOff] = BE_To_UInt16(bs, bsOff); - } - - internal static ushort[] BE_To_UInt16(byte[] bs) - { - return BE_To_UInt16(bs, 0, bs.Length); - } - - internal static ushort[] BE_To_UInt16(byte[] bs, int off, int len) - { - if ((len & 1) != 0) - throw new ArgumentException("must be a multiple of 2", "len"); - - ushort[] ns = new ushort[len / 2]; - for (int i = 0; i < len; i += 2) - { - BE_To_UInt16(bs, off + i, ns, i >> 1); - } - return ns; - } - - internal static void UInt32_To_BE(uint n, byte[] bs) - { - bs[0] = (byte)(n >> 24); - bs[1] = (byte)(n >> 16); - bs[2] = (byte)(n >> 8); - bs[3] = (byte)(n); - } - - internal static void UInt32_To_BE(uint n, byte[] bs, int off) - { - bs[off] = (byte)(n >> 24); - bs[off + 1] = (byte)(n >> 16); - bs[off + 2] = (byte)(n >> 8); - bs[off + 3] = (byte)(n); - } - - internal static void UInt32_To_BE(uint[] ns, byte[] bs, int off) - { - for (int i = 0; i < ns.Length; ++i) - { - UInt32_To_BE(ns[i], bs, off); - off += 4; - } - } - - internal static void UInt32_To_BE(uint[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) - { - for (int i = 0; i < nsLen; ++i) - { - UInt32_To_BE(ns[nsOff + i], bs, bsOff); - bsOff += 4; - } - } - - internal static byte[] UInt32_To_BE(uint n) - { - byte[] bs = new byte[4]; - UInt32_To_BE(n, bs, 0); - return bs; - } - - internal static byte[] UInt32_To_BE(uint[] ns) - { - byte[] bs = new byte[4 * ns.Length]; - UInt32_To_BE(ns, bs, 0); - return bs; - } - - internal static uint BE_To_UInt32(byte[] bs) - { - return (uint)bs[0] << 24 - | (uint)bs[1] << 16 - | (uint)bs[2] << 8 - | (uint)bs[3]; - } - - internal static uint BE_To_UInt32(byte[] bs, int off) - { - return (uint)bs[off] << 24 - | (uint)bs[off + 1] << 16 - | (uint)bs[off + 2] << 8 - | (uint)bs[off + 3]; - } - - internal static void BE_To_UInt32(byte[] bs, int off, uint[] ns) - { - for (int i = 0; i < ns.Length; ++i) - { - ns[i] = BE_To_UInt32(bs, off); - off += 4; - } - } - - internal static void BE_To_UInt32(byte[] bs, int bsOff, uint[] ns, int nsOff, int nsLen) - { - for (int i = 0; i < nsLen; ++i) - { - ns[nsOff + i] = BE_To_UInt32(bs, bsOff); - bsOff += 4; - } - } - - internal static byte[] UInt64_To_BE(ulong n) - { - byte[] bs = new byte[8]; - UInt64_To_BE(n, bs, 0); - return bs; - } - - internal static void UInt64_To_BE(ulong n, byte[] bs) - { - UInt32_To_BE((uint)(n >> 32), bs); - UInt32_To_BE((uint)(n), bs, 4); - } - - internal static void UInt64_To_BE(ulong n, byte[] bs, int off) - { - UInt32_To_BE((uint)(n >> 32), bs, off); - UInt32_To_BE((uint)(n), bs, off + 4); - } - - internal static byte[] UInt64_To_BE(ulong[] ns) - { - byte[] bs = new byte[8 * ns.Length]; - UInt64_To_BE(ns, bs, 0); - return bs; - } - - internal static void UInt64_To_BE(ulong[] ns, byte[] bs, int off) - { - for (int i = 0; i < ns.Length; ++i) - { - UInt64_To_BE(ns[i], bs, off); - off += 8; - } - } - - internal static void UInt64_To_BE(ulong[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) - { - for (int i = 0; i < nsLen; ++i) - { - UInt64_To_BE(ns[nsOff + i], bs, bsOff); - bsOff += 8; - } - } - - internal static ulong BE_To_UInt64(byte[] bs, int off) - { - uint hi = BE_To_UInt32(bs, off); - uint lo = BE_To_UInt32(bs, off + 4); - return ((ulong)hi << 32) | (ulong)lo; - } - - internal static void BE_To_UInt64(byte[] bs, int off, ulong[] ns) - { - for (int i = 0; i < ns.Length; ++i) - { - ns[i] = BE_To_UInt64(bs, off); - off += 8; - } - } - - internal static void BE_To_UInt64(byte[] bs, int bsOff, ulong[] ns, int nsOff, int nsLen) - { - for (int i = 0; i < nsLen; ++i) - { - ns[nsOff + i] = BE_To_UInt64(bs, bsOff); - bsOff += 8; - } - } - - internal static void UInt16_To_LE(ushort n, byte[] bs) - { - bs[0] = (byte)(n); - bs[1] = (byte)(n >> 8); - } - - internal static void UInt16_To_LE(ushort n, byte[] bs, int off) - { - bs[off] = (byte)(n); - bs[off + 1] = (byte)(n >> 8); - } - - internal static ushort LE_To_UInt16(byte[] bs) - { - uint n = (uint)bs[0] - | (uint)bs[1] << 8; - return (ushort)n; - } - - internal static ushort LE_To_UInt16(byte[] bs, int off) - { - uint n = (uint)bs[off] - | (uint)bs[off + 1] << 8; - return (ushort)n; - } - - internal static byte[] UInt32_To_LE(uint n) - { - byte[] bs = new byte[4]; - UInt32_To_LE(n, bs, 0); - return bs; - } - - internal static void UInt32_To_LE(uint n, byte[] bs) - { - bs[0] = (byte)(n); - bs[1] = (byte)(n >> 8); - bs[2] = (byte)(n >> 16); - bs[3] = (byte)(n >> 24); - } - - internal static void UInt32_To_LE(uint n, byte[] bs, int off) - { - bs[off] = (byte)(n); - bs[off + 1] = (byte)(n >> 8); - bs[off + 2] = (byte)(n >> 16); - bs[off + 3] = (byte)(n >> 24); - } - - internal static byte[] UInt32_To_LE(uint[] ns) - { - byte[] bs = new byte[4 * ns.Length]; - UInt32_To_LE(ns, bs, 0); - return bs; - } - - internal static void UInt32_To_LE(uint[] ns, byte[] bs, int off) - { - for (int i = 0; i < ns.Length; ++i) - { - UInt32_To_LE(ns[i], bs, off); - off += 4; - } - } - - internal static void UInt32_To_LE(uint[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) - { - for (int i = 0; i < nsLen; ++i) - { - UInt32_To_LE(ns[nsOff + i], bs, bsOff); - bsOff += 4; - } - } - - internal static uint LE_To_UInt32(byte[] bs) - { - return (uint)bs[0] - | (uint)bs[1] << 8 - | (uint)bs[2] << 16 - | (uint)bs[3] << 24; - } - - internal static uint LE_To_UInt32(byte[] bs, int off) - { - return (uint)bs[off] - | (uint)bs[off + 1] << 8 - | (uint)bs[off + 2] << 16 - | (uint)bs[off + 3] << 24; - } - - internal static void LE_To_UInt32(byte[] bs, int off, uint[] ns) - { - for (int i = 0; i < ns.Length; ++i) - { - ns[i] = LE_To_UInt32(bs, off); - off += 4; - } - } - - internal static void LE_To_UInt32(byte[] bs, int bOff, uint[] ns, int nOff, int count) - { - for (int i = 0; i < count; ++i) - { - ns[nOff + i] = LE_To_UInt32(bs, bOff); - bOff += 4; - } - } - - internal static uint[] LE_To_UInt32(byte[] bs, int off, int count) - { - uint[] ns = new uint[count]; - for (int i = 0; i < ns.Length; ++i) - { - ns[i] = LE_To_UInt32(bs, off); - off += 4; - } - return ns; - } - - internal static byte[] UInt64_To_LE(ulong n) - { - byte[] bs = new byte[8]; - UInt64_To_LE(n, bs, 0); - return bs; - } - - internal static void UInt64_To_LE(ulong n, byte[] bs) - { - UInt32_To_LE((uint)(n), bs); - UInt32_To_LE((uint)(n >> 32), bs, 4); - } - - internal static void UInt64_To_LE(ulong n, byte[] bs, int off) - { - UInt32_To_LE((uint)(n), bs, off); - UInt32_To_LE((uint)(n >> 32), bs, off + 4); - } - - internal static byte[] UInt64_To_LE(ulong[] ns) - { - byte[] bs = new byte[8 * ns.Length]; - UInt64_To_LE(ns, bs, 0); - return bs; - } - - internal static void UInt64_To_LE(ulong[] ns, byte[] bs, int off) - { - for (int i = 0; i < ns.Length; ++i) - { - UInt64_To_LE(ns[i], bs, off); - off += 8; - } - } - - internal static void UInt64_To_LE(ulong[] ns, int nsOff, int nsLen, byte[] bs, int bsOff) - { - for (int i = 0; i < nsLen; ++i) - { - UInt64_To_LE(ns[nsOff + i], bs, bsOff); - bsOff += 8; - } - } - - internal static ulong LE_To_UInt64(byte[] bs) - { - uint lo = LE_To_UInt32(bs); - uint hi = LE_To_UInt32(bs, 4); - return ((ulong)hi << 32) | (ulong)lo; - } - - internal static ulong LE_To_UInt64(byte[] bs, int off) - { - uint lo = LE_To_UInt32(bs, off); - uint hi = LE_To_UInt32(bs, off + 4); - return ((ulong)hi << 32) | (ulong)lo; - } - - internal static void LE_To_UInt64(byte[] bs, int off, ulong[] ns) - { - for (int i = 0; i < ns.Length; ++i) - { - ns[i] = LE_To_UInt64(bs, off); - off += 8; - } - } - - internal static void LE_To_UInt64(byte[] bs, int bsOff, ulong[] ns, int nsOff, int nsLen) - { - for (int i = 0; i < nsLen; ++i) - { - ns[nsOff + i] = LE_To_UInt64(bs, bsOff); - bsOff += 8; - } - } - } -} diff --git a/MinecraftClient/Crypto/Streams/BouncyAes/ParametersWithIV.cs b/MinecraftClient/Crypto/Streams/BouncyAes/ParametersWithIV.cs deleted file mode 100644 index 11a8b77a..00000000 --- a/MinecraftClient/Crypto/Streams/BouncyAes/ParametersWithIV.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; - -namespace Org.BouncyCastle.Crypto.Parameters -{ - public class ParametersWithIV - : ICipherParameters - { - private readonly ICipherParameters parameters; - private readonly byte[] iv; - - public ParametersWithIV( - ICipherParameters parameters, - byte[] iv) - : this(parameters, iv, 0, iv.Length) - { - } - - public ParametersWithIV( - ICipherParameters parameters, - byte[] iv, - int ivOff, - int ivLen) - { - // NOTE: 'parameters' may be null to imply key re-use - if (iv == null) - throw new ArgumentNullException("iv"); - - this.parameters = parameters; - this.iv = new byte[ivLen]; - Array.Copy(iv, ivOff, this.iv, 0, ivLen); - } - - public byte[] GetIV() - { - return (byte[]) iv.Clone(); - } - - public ICipherParameters Parameters - { - get { return parameters; } - } - } -} diff --git a/MinecraftClient/Crypto/Streams/MonoAesStream.cs b/MinecraftClient/Crypto/Streams/MonoAesStream.cs deleted file mode 100644 index 57d5598e..00000000 --- a/MinecraftClient/Crypto/Streams/MonoAesStream.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Security.Cryptography; -using System.IO; -using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Crypto.Parameters; -using Org.BouncyCastle.Crypto.Engines; -using Org.BouncyCastle.Crypto.Modes; -using Org.BouncyCastle.Crypto.IO; - -namespace MinecraftClient.Crypto.Streams -{ - /// - /// An encrypted stream using AES, used for encrypting network data on the fly using AES. - /// This is a mono-compatible adaptation which uses AES engine from the BouncyCastle project. - /// - - public class MonoAesStream : Stream, IAesStream - { - CipherStream cstream; - public MonoAesStream(System.IO.Stream stream, byte[] key) - { - BaseStream = stream; - BufferedBlockCipher enc = GenerateAES(key, true); - BufferedBlockCipher dec = GenerateAES(key, false); - cstream = new CipherStream(stream, dec, enc); - } - public System.IO.Stream BaseStream { get; set; } - - public override bool CanRead - { - get { return true; } - } - - public override bool CanSeek - { - get { return false; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override void Flush() - { - BaseStream.Flush(); - } - - public override long Length - { - get { throw new NotSupportedException(); } - } - - public override long Position - { - get - { - throw new NotSupportedException(); - } - set - { - throw new NotSupportedException(); - } - } - - public override int ReadByte() - { - byte[] temp = new byte[1]; - Read(temp, 0, 1); - return temp[0]; - } - - public override int Read(byte[] buffer, int offset, int count) - { - return cstream.Read(buffer, offset, count); - } - - public override long Seek(long offset, System.IO.SeekOrigin origin) - { - throw new NotSupportedException(); - } - - public override void SetLength(long value) - { - throw new NotSupportedException(); - } - - public override void WriteByte(byte b) - { - Write(new byte[] { b }, 0, 1); - } - - public override void Write(byte[] buffer, int offset, int count) - { - cstream.Write(buffer, offset, count); - } - - private BufferedBlockCipher GenerateAES(byte[] key, bool forEncryption) - { - BufferedBlockCipher cipher = new BufferedBlockCipher(new CfbBlockCipher(new AesFastEngine(), 8)); - cipher.Init(forEncryption, new ParametersWithIV(new KeyParameter(key), key)); - return cipher; - } - } -} diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index bcfe8b6e..f4852a65 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -14,6 +14,7 @@ using MinecraftClient.Mapping; using MinecraftClient.Inventory; using MinecraftClient.Logger; using MinecraftClient.Protocol.Keys; +using MinecraftClient.Protocol.Session; namespace MinecraftClient { @@ -71,7 +72,7 @@ namespace MinecraftClient private string username; private string uuid; private string sessionid; - private PlayerKeyPair playerKeyPair; + private PlayerKeyPair? playerKeyPair; private DateTime lastKeepAlive; private object lastKeepAliveLock = new(); private int respawnTicks = 0; @@ -143,9 +144,9 @@ namespace MinecraftClient /// The server IP /// The server port to use /// Minecraft protocol version to use - public McClient(string username, string uuid, string sessionID, PlayerKeyPair playerKeyPair, int protocolversion, ForgeInfo forgeInfo, string server_ip, ushort port) + public McClient(SessionToken session, PlayerKeyPair? playerKeyPair, int protocolversion, ForgeInfo forgeInfo, string server_ip, ushort port) { - StartClient(username, uuid, sessionID, playerKeyPair, server_ip, port, protocolversion, forgeInfo, false, ""); + StartClient(session, playerKeyPair, server_ip, port, protocolversion, forgeInfo, false, ""); } /// @@ -158,9 +159,9 @@ namespace MinecraftClient /// The server port to use /// Minecraft protocol version to use /// The text or command to send. - public McClient(string username, string uuid, string sessionID, PlayerKeyPair playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, string command) + public McClient(SessionToken session, PlayerKeyPair? playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, string command) { - StartClient(username, uuid, sessionID, playerKeyPair, server_ip, port, protocolversion, forgeInfo, true, command); + StartClient(session, playerKeyPair, server_ip, port, protocolversion, forgeInfo, true, command); } /// @@ -174,16 +175,16 @@ namespace MinecraftClient /// The player's UUID for online-mode authentication /// If set to true, the client will send a single command and then disconnect from the server /// The text or command to send. Will only be sent if singlecommand is set to true. - private void StartClient(string user, string uuid, string sessionID, PlayerKeyPair playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, bool singlecommand, string command) + private void StartClient(SessionToken session, PlayerKeyPair? playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, bool singlecommand, string command) { terrainAndMovementsEnabled = Settings.TerrainAndMovements; inventoryHandlingEnabled = Settings.InventoryHandling; entityHandlingEnabled = Settings.EntityHandling; bool retry = false; - this.sessionid = sessionID; - this.uuid = uuid; - this.username = user; + this.sessionid = session.ID; + this.uuid = session.PlayerID; + this.username = session.PlayerName; this.host = server_ip; this.port = port; this.protocolversion = protocolversion; @@ -244,7 +245,7 @@ namespace MinecraftClient try { - if (handler.Login(this.playerKeyPair)) + if (handler.Login(this.playerKeyPair, session)) { if (singlecommand) { diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index e3b6aa63..3dd50064 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -67,6 +67,22 @@ namespace MinecraftClient if (!ConsoleIO.BasicIO) ConsoleInteractive.ConsoleWriter.Init(); + Task.Factory.StartNew(() => + { + //Take advantage of Windows 10 / Mac / Linux UTF-8 console + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // If we're on windows, check if our version is Win10 or greater. + if (WindowsVersion.WinMajorVersion >= 10) + Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; + } + else + { + // Apply to all other operating systems. + Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; + } + }); + ConsoleIO.WriteLine($"Minecraft Console Client v{Version} - for MC {MCLowestVersion} to {MCHighestVersion} - Github.com/MCCTeam"); //Build information to facilitate processing of bug reports @@ -82,22 +98,6 @@ namespace MinecraftClient ConsoleIO.DebugReadInput(); } - //Take advantage of Windows 10 / Mac / Linux UTF-8 console - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Parallel.Invoke(() => - { - // If we're on windows, check if our version is Win10 or greater. - if (WindowsVersion.WinMajorVersion >= 10) - Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; - }); - } - else - { - // Apply to all other operating systems. - Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; - } - //Process ini configuration file if (args.Length >= 1 && System.IO.File.Exists(args[0]) && System.IO.Path.GetExtension(args[0]).ToLower() == ".ini") { @@ -326,9 +326,10 @@ namespace MinecraftClient } if (result == ProtocolHandler.LoginResult.Success && Settings.SessionCaching != CacheType.None) - { SessionCache.Store(Settings.Login.ToLower(), session); - } + + if (result == ProtocolHandler.LoginResult.Success) + session.SessionPreCheckTask = Task.Factory.StartNew(() => session.SessionPreCheck()); if (result == ProtocolHandler.LoginResult.Success) { @@ -354,7 +355,7 @@ namespace MinecraftClient if (playerKeyPair == null || playerKeyPair.NeedRefresh()) { Translations.WriteLineFormatted("mcc.fetching_key"); - playerKeyPair = KeyUtils.GetKeys(session.ID); + playerKeyPair = KeyUtils.GetNewProfileKeys(session.ID); if (Settings.ProfileKeyCaching != CacheType.None && playerKeyPair != null) { KeysCache.Store(Settings.Login.ToLower(), playerKeyPair); @@ -482,9 +483,9 @@ namespace MinecraftClient //Start the main TCP client if (Settings.SingleCommand != "") { - client = new McClient(session.PlayerName, session.PlayerID, session.ID, playerKeyPair, Settings.ServerIP, Settings.ServerPort, protocolversion, forgeInfo, Settings.SingleCommand); + client = new McClient(session, playerKeyPair, Settings.ServerIP, Settings.ServerPort, protocolversion, forgeInfo, Settings.SingleCommand); } - else client = new McClient(session.PlayerName, session.PlayerID, session.ID, playerKeyPair, protocolversion, forgeInfo, Settings.ServerIP, Settings.ServerPort); + else client = new McClient(session, playerKeyPair, protocolversion, forgeInfo, Settings.ServerIP, Settings.ServerPort); //Update console title if (Settings.ConsoleTitle != "") diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 2d9d7226..d0cdaa79 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -235,13 +235,13 @@ namespace MinecraftClient.Protocol.Handlers { int i = 0; int j = 0; - int k = 0; + byte b; while (true) { - k = socket.ReadDataRAW(1)[0]; - i |= (k & 0x7F) << j++ * 7; + b = socket.ReadDataRAW(1)[0]; + i |= (b & 0x7F) << j++ * 7; if (j > 5) throw new OverflowException("VarInt too big"); - if ((k & 0x80) != 128) break; + if ((b & 0x80) != 128) break; } return i; } @@ -259,9 +259,9 @@ namespace MinecraftClient.Protocol.Handlers do { b = cache.Dequeue(); - i |= (b & 127) << j++ * 7; + i |= (b & 0x7F) << j++ * 7; if (j > 5) throw new OverflowException("VarInt too big"); - } while ((b & 128) == 128); + } while ((b & 0x80) == 128); return i; } diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index f691a2be..89768131 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -10,6 +10,7 @@ using System.Security.Cryptography; using MinecraftClient.Mapping; using MinecraftClient.Inventory; using MinecraftClient.Protocol.Keys; +using MinecraftClient.Protocol.Session; namespace MinecraftClient.Protocol.Handlers { @@ -439,7 +440,7 @@ namespace MinecraftClient.Protocol.Handlers else c.Client.Send(buffer); } - private bool Handshake(string uuid, string username, string sessionID, string host, int port) + private bool Handshake(string uuid, string username, string sessionID, string host, int port, SessionToken session) { //array byte[] data = new byte[10 + (username.Length + host.Length) * 2]; @@ -493,7 +494,7 @@ namespace MinecraftClient.Protocol.Handlers else if (Settings.DebugMessages) ConsoleIO.WriteLineFormatted(Translations.Get("mcc.handshake", serverID)); - return StartEncryption(uuid, username, sessionID, token, serverID, PublicServerkey); + return StartEncryption(uuid, username, sessionID, token, serverID, PublicServerkey, session); } else { @@ -502,10 +503,10 @@ namespace MinecraftClient.Protocol.Handlers } } - private bool StartEncryption(string uuid, string username, string sessionID, byte[] token, string serverIDhash, byte[] serverKey) + private bool StartEncryption(string uuid, string username, string sessionID, byte[] token, string serverIDhash, byte[] serverPublicKey, SessionToken session) { - System.Security.Cryptography.RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverKey); - byte[] secretKey = CryptoHandler.GenerateAESPrivateKey(); + RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey); + byte[] secretKey = CryptoHandler.ClientAESPrivateKey ?? CryptoHandler.GenerateAESPrivateKey(); if (Settings.DebugMessages) Translations.WriteLineFormatted("debug.crypto"); @@ -513,13 +514,34 @@ namespace MinecraftClient.Protocol.Handlers if (serverIDhash != "-") { Translations.WriteLine("mcc.session"); - if (!ProtocolHandler.SessionCheck(uuid, sessionID, CryptoHandler.getServerHash(serverIDhash, serverKey, secretKey))) + string serverHash = CryptoHandler.getServerHash(serverIDhash, serverPublicKey, secretKey); + + bool needCheckSession = true; + if (session.ServerPublicKey != null && session.SessionPreCheckTask != null + && serverIDhash == session.ServerIDhash && Enumerable.SequenceEqual(serverPublicKey, session.ServerPublicKey)) { - handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, Translations.Get("mcc.session_fail")); - return false; + session.SessionPreCheckTask.Wait(); + if (session.SessionPreCheckTask.Result) // PreCheck Successed + needCheckSession = false; + } + + if (needCheckSession) + { + if (ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) + { + session.ServerIDhash = serverIDhash; + session.ServerPublicKey = serverPublicKey; + SessionCache.Store(Settings.Login.ToLower(), session); + } + else + { + handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, Translations.Get("mcc.session_fail")); + return false; + } } } + //Encrypt the data byte[] key_enc = RSAService.Encrypt(secretKey, false); byte[] token_enc = RSAService.Encrypt(token, false); @@ -557,9 +579,9 @@ namespace MinecraftClient.Protocol.Handlers } } - public bool Login(PlayerKeyPair playerKeyPair) + public bool Login(PlayerKeyPair? playerKeyPair, SessionToken session) { - if (Handshake(handler.GetUserUUID(), handler.GetUsername(), handler.GetSessionID(), handler.GetServerHost(), handler.GetServerPort())) + if (Handshake(handler.GetUserUUID(), handler.GetUsername(), handler.GetSessionID(), handler.GetServerHost(), handler.GetServerPort(), session)) { Send(new byte[] { 0xCD, 0 }); try diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 0c79ecc9..610e93f9 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -19,6 +19,7 @@ using MinecraftClient.Logger; using System.Threading.Tasks; using MinecraftClient.Protocol.Keys; using System.Text.RegularExpressions; +using MinecraftClient.Protocol.Session; namespace MinecraftClient.Protocol.Handlers { @@ -1534,7 +1535,7 @@ namespace MinecraftClient.Protocol.Handlers /// Do the Minecraft login. /// /// True if login successful - public bool Login(PlayerKeyPair? playerKeyPair) + public bool Login(PlayerKeyPair? playerKeyPair, SessionToken session) { byte[] protocol_version = dataTypes.GetVarInt(protocolversion); string server_address = pForge.GetServerAddress(handler.GetServerHost()); @@ -1574,7 +1575,7 @@ namespace MinecraftClient.Protocol.Handlers string serverID = dataTypes.ReadNextString(packetData); byte[] serverPublicKey = dataTypes.ReadNextByteArray(packetData); byte[] token = dataTypes.ReadNextByteArray(packetData); - return StartEncryption(handler.GetUserUUID(), handler.GetSessionID(), token, serverID, serverPublicKey, playerKeyPair); + return StartEncryption(handler.GetUserUUID(), handler.GetSessionID(), token, serverID, serverPublicKey, playerKeyPair, session); } else if (packetID == 0x02) //Login successful { @@ -1598,24 +1599,43 @@ namespace MinecraftClient.Protocol.Handlers /// Start network encryption. Automatically called by Login() if the server requests encryption. /// /// True if encryption was successful - private bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, byte[] serverPublicKey, PlayerKeyPair? playerKeyPair) + private bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, byte[] serverPublicKey, PlayerKeyPair? playerKeyPair, SessionToken session) { - System.Security.Cryptography.RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey); - byte[] secretKey = CryptoHandler.GenerateAESPrivateKey(); + RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey); + byte[] secretKey = CryptoHandler.ClientAESPrivateKey ?? CryptoHandler.GenerateAESPrivateKey(); log.Debug(Translations.Get("debug.crypto")); if (serverIDhash != "-") { log.Info(Translations.Get("mcc.session")); - if (!ProtocolHandler.SessionCheck(uuid, sessionID, CryptoHandler.getServerHash(serverIDhash, serverPublicKey, secretKey))) + string serverHash = CryptoHandler.getServerHash(serverIDhash, serverPublicKey, secretKey); + + bool needCheckSession = true; + if (session.ServerPublicKey != null && session.SessionPreCheckTask != null + && serverIDhash == session.ServerIDhash && Enumerable.SequenceEqual(serverPublicKey, session.ServerPublicKey)) { - handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, Translations.Get("mcc.session_fail")); - return false; + session.SessionPreCheckTask.Wait(); + if (session.SessionPreCheckTask.Result) // PreCheck Successed + needCheckSession = false; + } + + if (needCheckSession) + { + if (ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) + { + session.ServerIDhash = serverIDhash; + session.ServerPublicKey = serverPublicKey; + SessionCache.Store(Settings.Login.ToLower(), session); + } + else + { + handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, Translations.Get("mcc.session_fail")); + return false; + } } } - // Encryption Response packet List encryptionResponse = new(); encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret diff --git a/MinecraftClient/Protocol/IMinecraftCom.cs b/MinecraftClient/Protocol/IMinecraftCom.cs index a7c36b5b..5a713257 100644 --- a/MinecraftClient/Protocol/IMinecraftCom.cs +++ b/MinecraftClient/Protocol/IMinecraftCom.cs @@ -22,7 +22,7 @@ namespace MinecraftClient.Protocol /// Start the login procedure once connected to the server /// /// True if login was successful - bool Login(PlayerKeyPair playerKeyPair); + bool Login(PlayerKeyPair? playerKeyPair, Session.SessionToken session); /// /// Disconnect from the server diff --git a/MinecraftClient/Protocol/ProfileKey/KeyUtils.cs b/MinecraftClient/Protocol/ProfileKey/KeyUtils.cs index 95c8fd57..0265e19d 100644 --- a/MinecraftClient/Protocol/ProfileKey/KeyUtils.cs +++ b/MinecraftClient/Protocol/ProfileKey/KeyUtils.cs @@ -10,7 +10,7 @@ namespace MinecraftClient.Protocol.Keys { private static string certificates = "https://api.minecraftservices.com/player/certificates"; - public static PlayerKeyPair? GetKeys(string accessToken) + public static PlayerKeyPair? GetNewProfileKeys(string accessToken) { ProxiedWebRequest.Response? response = null; try diff --git a/MinecraftClient/Protocol/Session/SessionCache.cs b/MinecraftClient/Protocol/Session/SessionCache.cs index 888cb6ae..24743aae 100644 --- a/MinecraftClient/Protocol/Session/SessionCache.cs +++ b/MinecraftClient/Protocol/Session/SessionCache.cs @@ -252,7 +252,7 @@ namespace MinecraftClient.Protocol.Session List sessionCacheLines = new List(); sessionCacheLines.Add("# Generated by MCC v" + Program.Version + " - Keep it secret & Edit at own risk!"); - sessionCacheLines.Add("# Login=SessionID,PlayerName,UUID,ClientID"); + sessionCacheLines.Add("# Login=SessionID,PlayerName,UUID,ClientID,RefreshToken,ServerIDhash,ServerPublicKey"); foreach (KeyValuePair entry in sessions) sessionCacheLines.Add(entry.Key + '=' + entry.Value.ToString()); diff --git a/MinecraftClient/Protocol/Session/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs index 1df0cb44..c7fb780c 100644 --- a/MinecraftClient/Protocol/Session/SessionToken.cs +++ b/MinecraftClient/Protocol/Session/SessionToken.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.IO; +using System.Threading.Tasks; namespace MinecraftClient.Protocol.Session { @@ -15,6 +16,10 @@ namespace MinecraftClient.Protocol.Session public string PlayerID { get; set; } public string ClientID { get; set; } public string RefreshToken { get; set; } + public string ServerIDhash { get; set; } + public byte[]? ServerPublicKey { get; set; } + + public Task? SessionPreCheckTask = null; public SessionToken() { @@ -23,11 +28,26 @@ namespace MinecraftClient.Protocol.Session PlayerID = String.Empty; ClientID = String.Empty; RefreshToken = String.Empty; + ServerIDhash = String.Empty; + ServerPublicKey = null; + } + + public bool SessionPreCheck() + { + if (this.ID == string.Empty || this.PlayerID == String.Empty || this.ServerPublicKey == null) + return false; + if (Crypto.CryptoHandler.ClientAESPrivateKey == null) + Crypto.CryptoHandler.ClientAESPrivateKey = Crypto.CryptoHandler.GenerateAESPrivateKey(); + string serverHash = Crypto.CryptoHandler.getServerHash(ServerIDhash, ServerPublicKey, Crypto.CryptoHandler.ClientAESPrivateKey); + if (ProtocolHandler.SessionCheck(PlayerID, ID, serverHash)) + return true; + return false; } public override string ToString() { - return String.Join(",", ID, PlayerName, PlayerID, ClientID, RefreshToken); + return String.Join(",", ID, PlayerName, PlayerID, ClientID, RefreshToken, ServerIDhash, + (ServerPublicKey == null) ? String.Empty : Convert.ToBase64String(ServerPublicKey)); } public static SessionToken FromString(string tokenString) @@ -46,6 +66,23 @@ namespace MinecraftClient.Protocol.Session session.RefreshToken = fields[4]; else session.RefreshToken = String.Empty; + if (fields.Length > 5) + session.ServerIDhash = fields[5]; + else + session.ServerIDhash = String.Empty; + if (fields.Length > 6) + { + try + { + session.ServerPublicKey = Convert.FromBase64String(fields[6]); + } + catch + { + session.ServerPublicKey = null; + } + } + else + session.ServerPublicKey = null; Guid temp; if (!JwtRegex.IsMatch(session.ID)) @@ -60,5 +97,7 @@ namespace MinecraftClient.Protocol.Session return session; } + + } } diff --git a/MinecraftClient/Resources/config/MinecraftClient.ini b/MinecraftClient/Resources/config/MinecraftClient.ini index 2b93abf6..e5b6546e 100644 --- a/MinecraftClient/Resources/config/MinecraftClient.ini +++ b/MinecraftClient/Resources/config/MinecraftClient.ini @@ -45,7 +45,7 @@ exitonfailure=false # Disable pauses on error, for using MCC in n scriptcache=true # Cache compiled scripts for faster load on low-end devices timestamps=false # Prepend timestamps to chat messages autorespawn=false # Toggle auto respawn if client player was dead (make sure your spawn point is safe) -minecraftrealms=true # Enable support for joining Minecraft Realms worlds +minecraftrealms=false # Enable support for joining Minecraft Realms worlds moveheadwhilewalking=true # Enable head movement while walking to avoid anti-cheat triggers [Signature] From 842c968220757eadb686cf02d7e2c961dadf9132 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 10:50:52 +0800 Subject: [PATCH 09/39] Use AES-NI instruction set if possible --- MinecraftClient/Crypto/AesContext.cs | 97 +++++++++++++++++++ .../Crypto/Streams/AesCfb8Stream.cs | 23 ++++- 2 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 MinecraftClient/Crypto/AesContext.cs diff --git a/MinecraftClient/Crypto/AesContext.cs b/MinecraftClient/Crypto/AesContext.cs new file mode 100644 index 00000000..bbaab330 --- /dev/null +++ b/MinecraftClient/Crypto/AesContext.cs @@ -0,0 +1,97 @@ +using System; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Runtime.Intrinsics; +using System.Runtime.Intrinsics.X86; + +namespace MinecraftClient.Crypto +{ + // Using the AES-NI instruction set + // https://gist.github.com/Thealexbarney/9f75883786a9f3100408ff795fb95d85 + public class AesContext + { + private Vector128[] RoundKeys { get; } + + public byte[] Iv { get; } = new byte[0x10]; + + public AesContext(Span key) + { + RoundKeys = KeyExpansion(key); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public void EncryptEcb(ReadOnlySpan plaintext, Span destination) + { + Vector128[] keys = RoundKeys; + + ReadOnlySpan> blocks = MemoryMarshal.Cast>(plaintext); + Span> dest = MemoryMarshal.Cast>(destination); + + // Makes the JIT remove all the other range checks on keys + _ = keys[10]; + + for (int i = 0; i < blocks.Length; i++) + { + Vector128 b = blocks[i]; + + b = Sse2.Xor(b, keys[0]); + b = Aes.Encrypt(b, keys[1]); + b = Aes.Encrypt(b, keys[2]); + b = Aes.Encrypt(b, keys[3]); + b = Aes.Encrypt(b, keys[4]); + b = Aes.Encrypt(b, keys[5]); + b = Aes.Encrypt(b, keys[6]); + b = Aes.Encrypt(b, keys[7]); + b = Aes.Encrypt(b, keys[8]); + b = Aes.Encrypt(b, keys[9]); + b = Aes.EncryptLast(b, keys[10]); + + dest[i] = b; + } + } + + private static Vector128[] KeyExpansion(Span key) + { + var keys = new Vector128[20]; + + keys[0] = Unsafe.ReadUnaligned>(ref key[0]); + + MakeRoundKey(keys, 1, 0x01); + MakeRoundKey(keys, 2, 0x02); + MakeRoundKey(keys, 3, 0x04); + MakeRoundKey(keys, 4, 0x08); + MakeRoundKey(keys, 5, 0x10); + MakeRoundKey(keys, 6, 0x20); + MakeRoundKey(keys, 7, 0x40); + MakeRoundKey(keys, 8, 0x80); + MakeRoundKey(keys, 9, 0x1b); + MakeRoundKey(keys, 10, 0x36); + + for (int i = 1; i < 10; i++) + { + keys[10 + i] = Aes.InverseMixColumns(keys[i]); + } + + return keys; + } + + private static void MakeRoundKey(Vector128[] keys, int i, byte rcon) + { + Vector128 s = keys[i - 1]; + Vector128 t = keys[i - 1]; + + t = Aes.KeygenAssist(t, rcon); + t = Sse2.Shuffle(t.AsUInt32(), 0xFF).AsByte(); + + s = Sse2.Xor(s, Sse2.ShiftLeftLogical128BitLane(s, 4)); + s = Sse2.Xor(s, Sse2.ShiftLeftLogical128BitLane(s, 8)); + + keys[i] = Sse2.Xor(s, t); + } + + public void SetIv(Span iv) + { + iv.Slice(0, 0x10).CopyTo(Iv); + } + } +} \ No newline at end of file diff --git a/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs b/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs index 038a1c12..1b1a80a7 100644 --- a/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs +++ b/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Security.Cryptography; using System.IO; using System.Collections.Concurrent; +using System.Runtime.CompilerServices; namespace MinecraftClient.Crypto.Streams { @@ -13,7 +14,9 @@ namespace MinecraftClient.Crypto.Streams { public static readonly int blockSize = 16; - private Aes aes; + private readonly Aes? Aes = null; + + private readonly AesContext? FastAes = null; public System.IO.Stream BaseStream { get; set; } @@ -26,7 +29,10 @@ namespace MinecraftClient.Crypto.Streams { BaseStream = stream; - aes = GenerateAES(key); + if (System.Runtime.Intrinsics.X86.Sse2.IsSupported && System.Runtime.Intrinsics.X86.Aes.IsSupported) + FastAes = new AesContext(key); + else + Aes = GenerateAES(key); Array.Copy(key, ReadStreamIV, 16); Array.Copy(key, WriteStreamIV, 16); @@ -76,6 +82,7 @@ namespace MinecraftClient.Crypto.Streams return temp[0]; } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public override int Read(byte[] buffer, int outOffset, int required) { if (this.inStreamEnded) @@ -93,7 +100,7 @@ namespace MinecraftClient.Crypto.Streams return readed; } - OrderablePartitioner> rangePartitioner = (curRead <= 256) ? + OrderablePartitioner> rangePartitioner = (curRead <= 256) ? Partitioner.Create(readed, readed + curRead, 32) : Partitioner.Create(readed, readed + curRead); Parallel.ForEach(rangePartitioner, (range, loopState) => { @@ -101,7 +108,10 @@ namespace MinecraftClient.Crypto.Streams for (int idx = range.Item1; idx < range.Item2; idx++) { ReadOnlySpan blockInput = new(inputBuf, idx, blockSize); - aes.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + if (FastAes != null) + FastAes.EncryptEcb(blockInput, blockOutput); + else + Aes!.EncryptEcb(blockInput, blockOutput, PaddingMode.None); buffer[outOffset + idx] = (byte)(blockOutput[0] ^ inputBuf[idx + blockSize]); } }); @@ -136,7 +146,10 @@ namespace MinecraftClient.Crypto.Streams for (int wirtten = 0; wirtten < required; ++wirtten) { ReadOnlySpan blockInput = new(outputBuf, wirtten, blockSize); - aes.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + if (FastAes != null) + FastAes.EncryptEcb(blockInput, blockOutput); + else + Aes!.EncryptEcb(blockInput, blockOutput, PaddingMode.None); outputBuf[blockSize + wirtten] = (byte)(blockOutput[0] ^ input[offset + wirtten]); } BaseStream.WriteAsync(outputBuf, blockSize, required); From 4757c4be533586579088c2cb8095ff039c9ccae6 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 13:18:07 +0800 Subject: [PATCH 10/39] Trim --- .../Crypto/{Streams => }/AesCfb8Stream.cs | 115 ++++++++++++------ MinecraftClient/Crypto/AesContext.cs | 22 ++-- MinecraftClient/Crypto/CryptoHandler.cs | 13 -- MinecraftClient/Crypto/IAesStream.cs | 18 --- .../Crypto/Streams/RegularAesStream.cs | 106 ---------------- .../Protocol/Handlers/Protocol16.cs | 4 +- .../Protocol/Handlers/Protocol18Terrain.cs | 4 + .../Protocol/Handlers/SocketWrapper.cs | 4 +- 8 files changed, 97 insertions(+), 189 deletions(-) rename MinecraftClient/Crypto/{Streams => }/AesCfb8Stream.cs (54%) delete mode 100644 MinecraftClient/Crypto/IAesStream.cs delete mode 100644 MinecraftClient/Crypto/Streams/RegularAesStream.cs diff --git a/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs b/MinecraftClient/Crypto/AesCfb8Stream.cs similarity index 54% rename from MinecraftClient/Crypto/Streams/AesCfb8Stream.cs rename to MinecraftClient/Crypto/AesCfb8Stream.cs index 1b1a80a7..a08e4bc7 100644 --- a/MinecraftClient/Crypto/Streams/AesCfb8Stream.cs +++ b/MinecraftClient/Crypto/AesCfb8Stream.cs @@ -8,31 +8,37 @@ using System.IO; using System.Collections.Concurrent; using System.Runtime.CompilerServices; -namespace MinecraftClient.Crypto.Streams +namespace MinecraftClient.Crypto { - internal class AesCfb8Stream : Stream, IAesStream + public class AesCfb8Stream : Stream { public static readonly int blockSize = 16; private readonly Aes? Aes = null; - - private readonly AesContext? FastAes = null; - - public System.IO.Stream BaseStream { get; set; } + private readonly FastAes? FastAes = null; + + public Stream BaseStream { get; set; } private bool inStreamEnded = false; private byte[] ReadStreamIV = new byte[16]; private byte[] WriteStreamIV = new byte[16]; - public AesCfb8Stream(System.IO.Stream stream, byte[] key) + public AesCfb8Stream(Stream stream, byte[] key) { BaseStream = stream; - if (System.Runtime.Intrinsics.X86.Sse2.IsSupported && System.Runtime.Intrinsics.X86.Aes.IsSupported) - FastAes = new AesContext(key); + if (FastAes.IsSupport()) + FastAes = new FastAes(key); else - Aes = GenerateAES(key); + { + Aes = Aes.Create(); + Aes.BlockSize = 128; + Aes.KeySize = 128; + Aes.Key = key; + Aes.Mode = CipherMode.ECB; + Aes.Padding = PaddingMode.None; + } Array.Copy(key, ReadStreamIV, 16); Array.Copy(key, WriteStreamIV, 16); @@ -77,17 +83,37 @@ namespace MinecraftClient.Crypto.Streams public override int ReadByte() { - byte[] temp = new byte[1]; - Read(temp, 0, 1); - return temp[0]; + if (inStreamEnded) + return -1; + + int inputBuf = BaseStream.ReadByte(); + if (inputBuf == -1) + { + inStreamEnded = true; + return -1; + } + + Span blockOutput = stackalloc byte[blockSize]; + if (FastAes != null) + FastAes.EncryptEcb(ReadStreamIV, blockOutput); + else + Aes!.EncryptEcb(ReadStreamIV, blockOutput, PaddingMode.None); + + // Shift left + Array.Copy(ReadStreamIV, 1, ReadStreamIV, 0, blockSize - 1); + ReadStreamIV[blockSize - 1] = (byte)inputBuf; + + return (byte)(blockOutput[0] ^ inputBuf); } [MethodImpl(MethodImplOptions.AggressiveOptimization)] public override int Read(byte[] buffer, int outOffset, int required) { - if (this.inStreamEnded) + if (inStreamEnded) return 0; + Span blockOutput = FastAes != null ? stackalloc byte[blockSize] : null; + byte[] inputBuf = new byte[blockSize + required]; Array.Copy(ReadStreamIV, inputBuf, blockSize); @@ -96,25 +122,35 @@ namespace MinecraftClient.Crypto.Streams curRead = BaseStream.Read(inputBuf, blockSize + readed, required - readed); if (curRead == 0) { - this.inStreamEnded = true; + inStreamEnded = true; return readed; } - OrderablePartitioner> rangePartitioner = (curRead <= 256) ? - Partitioner.Create(readed, readed + curRead, 32) : Partitioner.Create(readed, readed + curRead); - Parallel.ForEach(rangePartitioner, (range, loopState) => + int processEnd = readed + curRead; + if (FastAes != null) { - Span blockOutput = stackalloc byte[blockSize]; - for (int idx = range.Item1; idx < range.Item2; idx++) + for (int idx = readed; idx < processEnd; idx++) { ReadOnlySpan blockInput = new(inputBuf, idx, blockSize); - if (FastAes != null) - FastAes.EncryptEcb(blockInput, blockOutput); - else - Aes!.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + FastAes.EncryptEcb(blockInput, blockOutput); buffer[outOffset + idx] = (byte)(blockOutput[0] ^ inputBuf[idx + blockSize]); } - }); + } + else + { + OrderablePartitioner> rangePartitioner = curRead <= 256 ? + Partitioner.Create(readed, processEnd, 32) : Partitioner.Create(readed, processEnd); + Parallel.ForEach(rangePartitioner, (range, loopState) => + { + Span blockOutput = stackalloc byte[blockSize]; + for (int idx = range.Item1; idx < range.Item2; idx++) + { + ReadOnlySpan blockInput = new(inputBuf, idx, blockSize); + Aes!.EncryptEcb(blockInput, blockOutput, PaddingMode.None); + buffer[outOffset + idx] = (byte)(blockOutput[0] ^ inputBuf[idx + blockSize]); + } + }); + } } Array.Copy(inputBuf, required, ReadStreamIV, 0, blockSize); @@ -122,7 +158,7 @@ namespace MinecraftClient.Crypto.Streams return required; } - public override long Seek(long offset, System.IO.SeekOrigin origin) + public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); } @@ -134,9 +170,23 @@ namespace MinecraftClient.Crypto.Streams public override void WriteByte(byte b) { - Write(new byte[] { b }, 0, 1); + Span blockOutput = stackalloc byte[blockSize]; + + if (FastAes != null) + FastAes.EncryptEcb(WriteStreamIV, blockOutput); + else + Aes!.EncryptEcb(WriteStreamIV, blockOutput, PaddingMode.None); + + byte outputBuf = (byte)(blockOutput[0] ^ b); + + BaseStream.WriteByte(outputBuf); + + // Shift left + Array.Copy(WriteStreamIV, 1, WriteStreamIV, 0, blockSize - 1); + WriteStreamIV[blockSize - 1] = outputBuf; } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public override void Write(byte[] input, int offset, int required) { byte[] outputBuf = new byte[blockSize + required]; @@ -156,16 +206,5 @@ namespace MinecraftClient.Crypto.Streams Array.Copy(outputBuf, required, WriteStreamIV, 0, blockSize); } - - private static Aes GenerateAES(byte[] key) - { - Aes aes = Aes.Create(); - aes.BlockSize = 128; - aes.KeySize = 128; - aes.Key = key; - aes.Mode = CipherMode.ECB; - aes.Padding = PaddingMode.None; - return aes; - } } } diff --git a/MinecraftClient/Crypto/AesContext.cs b/MinecraftClient/Crypto/AesContext.cs index bbaab330..fb6fd7bc 100644 --- a/MinecraftClient/Crypto/AesContext.cs +++ b/MinecraftClient/Crypto/AesContext.cs @@ -8,17 +8,24 @@ namespace MinecraftClient.Crypto { // Using the AES-NI instruction set // https://gist.github.com/Thealexbarney/9f75883786a9f3100408ff795fb95d85 - public class AesContext + public class FastAes { private Vector128[] RoundKeys { get; } - public byte[] Iv { get; } = new byte[0x10]; - - public AesContext(Span key) + public FastAes(Span key) { RoundKeys = KeyExpansion(key); } + /// + /// Detects if the required instruction set is supported + /// + /// Is it supported + public static bool IsSupport() + { + return Sse2.IsSupported && Aes.IsSupported; + } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void EncryptEcb(ReadOnlySpan plaintext, Span destination) { @@ -88,10 +95,5 @@ namespace MinecraftClient.Crypto keys[i] = Sse2.Xor(s, t); } - - public void SetIv(Span iv) - { - iv.Slice(0, 0x10).CopyTo(Iv); - } } -} \ No newline at end of file +} diff --git a/MinecraftClient/Crypto/CryptoHandler.cs b/MinecraftClient/Crypto/CryptoHandler.cs index e65f231b..5728835a 100644 --- a/MinecraftClient/Crypto/CryptoHandler.cs +++ b/MinecraftClient/Crypto/CryptoHandler.cs @@ -193,18 +193,5 @@ namespace MinecraftClient.Crypto } return p; } - - /// - /// Get a new AES-encrypted stream for wrapping a non-encrypted stream. - /// - /// Stream to encrypt - /// Key to use - /// Return an appropriate stream depending on the framework being used - - public static IAesStream getAesStream(Stream underlyingStream, byte[] AesKey) - { - // return new Streams.RegularAesStream(underlyingStream, AesKey); - return new Streams.AesCfb8Stream(underlyingStream, AesKey); - } } } diff --git a/MinecraftClient/Crypto/IAesStream.cs b/MinecraftClient/Crypto/IAesStream.cs deleted file mode 100644 index 23f4a83b..00000000 --- a/MinecraftClient/Crypto/IAesStream.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace MinecraftClient.Crypto -{ - /// - /// Interface for AES stream - /// Allows to use a different implementation depending on the framework being used. - /// - - public interface IAesStream - { - int Read(byte[] buffer, int offset, int count); - void Write(byte[] buffer, int offset, int count); - } -} diff --git a/MinecraftClient/Crypto/Streams/RegularAesStream.cs b/MinecraftClient/Crypto/Streams/RegularAesStream.cs deleted file mode 100644 index 1c825c3b..00000000 --- a/MinecraftClient/Crypto/Streams/RegularAesStream.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Security.Cryptography; -using System.IO; - -namespace MinecraftClient.Crypto.Streams -{ - /// - /// An encrypted stream using AES, used for encrypting network data on the fly using AES. - /// This is the regular AesStream class used with the regular .NET framework from Microsoft. - /// - - public class RegularAesStream : Stream, IAesStream - { - CryptoStream enc; - CryptoStream dec; - public RegularAesStream(Stream stream, byte[] key) - { - BaseStream = stream; - enc = new CryptoStream(stream, GenerateAES(key).CreateEncryptor(), CryptoStreamMode.Write); - dec = new CryptoStream(stream, GenerateAES(key).CreateDecryptor(), CryptoStreamMode.Read); - } - public System.IO.Stream BaseStream { get; set; } - - public override bool CanRead - { - get { return true; } - } - - public override bool CanSeek - { - get { return false; } - } - - public override bool CanWrite - { - get { return true; } - } - - public override void Flush() - { - BaseStream.Flush(); - } - - public override long Length - { - get { throw new NotSupportedException(); } - } - - public override long Position - { - get - { - throw new NotSupportedException(); - } - set - { - throw new NotSupportedException(); - } - } - - public override int ReadByte() - { - return dec.ReadByte(); - } - - public override int Read(byte[] buffer, int offset, int count) - { - return dec.Read(buffer, offset, count); - } - - public override long Seek(long offset, System.IO.SeekOrigin origin) - { - throw new NotSupportedException(); - } - - public override void SetLength(long value) - { - throw new NotSupportedException(); - } - - public override void WriteByte(byte b) - { - enc.WriteByte(b); - } - - public override void Write(byte[] buffer, int offset, int count) - { - enc.Write(buffer, offset, count); - } - - private static Aes GenerateAES(byte[] key) - { - Aes aes = Aes.Create(); - aes.Mode = CipherMode.CFB; - aes.Padding = PaddingMode.None; - aes.KeySize = 128; - aes.FeedbackSize = 8; - aes.Key = key; - aes.IV = key; - return aes; - } - } -} diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index 89768131..a819b3a1 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -26,7 +26,7 @@ namespace MinecraftClient.Protocol.Handlers private bool encrypted = false; private int protocolversion; private Tuple? netRead = null; - Crypto.IAesStream s; + Crypto.AesCfb8Stream s; TcpClient c; public Protocol16Handler(TcpClient Client, int ProtocolVersion, IMinecraftComHandler Handler) @@ -568,7 +568,7 @@ namespace MinecraftClient.Protocol.Handlers if (pid[0] == 0xFC) { readData(4); - s = CryptoHandler.getAesStream(c.GetStream(), secretKey); + s = new AesCfb8Stream(c.GetStream(), secretKey); encrypted = true; return true; } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index e1283daa..62459c0f 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Numerics; +using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; //using System.Linq; @@ -34,6 +35,7 @@ namespace MinecraftClient.Protocol.Handlers /// Reading the "Block states" field: consists of 4096 entries, representing all the blocks in the chunk section. /// /// Cache for reading data + [MethodImpl(MethodImplOptions.AggressiveOptimization)] private Chunk? ReadBlockStatesField(Queue cache) { // read Block states (Type: Paletted Container) @@ -142,6 +144,7 @@ namespace MinecraftClient.Protocol.Handlers /// Cache for reading chunk data /// token to cancel the task /// true if successfully loaded + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public bool ProcessChunkColumnData(int chunkX, int chunkZ, ulong[]? verticalStripBitmask, Queue cache, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) @@ -243,6 +246,7 @@ namespace MinecraftClient.Protocol.Handlers /// Cache for reading chunk data /// token to cancel the task /// true if successfully loaded + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public bool ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue cache, CancellationToken cancellationToken) { if (cancellationToken.IsCancellationRequested) diff --git a/MinecraftClient/Protocol/Handlers/SocketWrapper.cs b/MinecraftClient/Protocol/Handlers/SocketWrapper.cs index 0147ab5f..084b6cf0 100644 --- a/MinecraftClient/Protocol/Handlers/SocketWrapper.cs +++ b/MinecraftClient/Protocol/Handlers/SocketWrapper.cs @@ -10,7 +10,7 @@ namespace MinecraftClient.Protocol.Handlers class SocketWrapper { TcpClient c; - IAesStream s; + AesCfb8Stream s; bool encrypted = false; /// @@ -49,7 +49,7 @@ namespace MinecraftClient.Protocol.Handlers { if (encrypted) throw new InvalidOperationException("Stream is already encrypted!?"); - this.s = CryptoHandler.getAesStream(c.GetStream(), secretKey); + this.s = new AesCfb8Stream(c.GetStream(), secretKey); this.encrypted = true; } From d10ad138f1178cb22c104b251d232b8d0787e8db Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 14:57:44 +0800 Subject: [PATCH 11/39] Trim --- MinecraftClient/Crypto/AesCfb8Stream.cs | 4 +- MinecraftClient/Mapping/Block.cs | 2 + MinecraftClient/Mapping/Chunk.cs | 2 + MinecraftClient/Mapping/Location.cs | 2 + .../Protocol/Handlers/Compression/Inflate.cs | 7 ++ .../Protocol/Handlers/Compression/Zlib.cs | 2 + .../Handlers/Compression/ZlibBaseStream.cs | 5 +- .../Handlers/Compression/ZlibCodec.cs | 2 + .../Handlers/Compression/ZlibStream.cs | 3 + .../Protocol/Handlers/DataTypes.cs | 84 +++++++++++++------ .../Protocol/Handlers/Protocol18.cs | 27 +++--- .../Protocol/Handlers/Protocol18Forge.cs | 3 +- .../Protocol/Handlers/Protocol18Terrain.cs | 20 ++--- .../Protocol/Handlers/ZlibUtils.cs | 3 + 14 files changed, 110 insertions(+), 56 deletions(-) diff --git a/MinecraftClient/Crypto/AesCfb8Stream.cs b/MinecraftClient/Crypto/AesCfb8Stream.cs index a08e4bc7..b2e769cf 100644 --- a/MinecraftClient/Crypto/AesCfb8Stream.cs +++ b/MinecraftClient/Crypto/AesCfb8Stream.cs @@ -16,14 +16,14 @@ namespace MinecraftClient.Crypto private readonly Aes? Aes = null; private readonly FastAes? FastAes = null; - - public Stream BaseStream { get; set; } private bool inStreamEnded = false; private byte[] ReadStreamIV = new byte[16]; private byte[] WriteStreamIV = new byte[16]; + public Stream BaseStream { get; set; } + public AesCfb8Stream(Stream stream, byte[] key) { BaseStream = stream; diff --git a/MinecraftClient/Mapping/Block.cs b/MinecraftClient/Mapping/Block.cs index 0a9eb382..f7f1315b 100644 --- a/MinecraftClient/Mapping/Block.cs +++ b/MinecraftClient/Mapping/Block.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using MinecraftClient.Mapping.BlockPalettes; @@ -106,6 +107,7 @@ namespace MinecraftClient.Mapping /// Get a block of the specified type and metadata OR block state /// /// Type and metadata packed in the same value OR block state + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public Block(ushort typeAndMeta) { this.blockIdAndMeta = typeAndMeta; diff --git a/MinecraftClient/Mapping/Chunk.cs b/MinecraftClient/Mapping/Chunk.cs index 0ee8c7ed..aefd2656 100644 --- a/MinecraftClient/Mapping/Chunk.cs +++ b/MinecraftClient/Mapping/Chunk.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; @@ -60,6 +61,7 @@ namespace MinecraftClient.Mapping /// Block Y /// Block Z /// Block + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void SetWithoutCheck(int blockX, int blockY, int blockZ, Block block) { blocks[blockX, blockY, blockZ] = block; diff --git a/MinecraftClient/Mapping/Location.cs b/MinecraftClient/Mapping/Location.cs index 1e4523ea..02ee3c23 100644 --- a/MinecraftClient/Mapping/Location.cs +++ b/MinecraftClient/Mapping/Location.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; namespace MinecraftClient.Mapping @@ -54,6 +55,7 @@ namespace MinecraftClient.Mapping /// Location of the block into the chunk /// Location of the block into the world /// Location of the block into the chunk + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public Location(int chunkX, int chunkZ, int blockX, int blockY, int blockZ) { X = chunkX * Chunk.SizeX + blockX; diff --git a/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs b/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs index b0e07404..eaf0f909 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs @@ -63,6 +63,8 @@ using System; +using System.Runtime.CompilerServices; + namespace Ionic.Zlib { sealed class InflateBlocks @@ -140,6 +142,7 @@ namespace Ionic.Zlib } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Process(int r) { int t; // temporary storage @@ -673,6 +676,7 @@ namespace Ionic.Zlib } // copy as much as possible from the sliding window to the output area + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Flush(int r) { int nBytes; @@ -799,6 +803,7 @@ namespace Ionic.Zlib tree = null; } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Process(InflateBlocks blocks, int r) { int j; // temporary storage @@ -1160,6 +1165,7 @@ namespace Ionic.Zlib // (the maximum string length) and number of input bytes available // at least ten. The ten bytes are six bytes for the longest length/ // distance pair plus four bytes for overloading the bit buffer. + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int InflateFast(int bl, int bd, int[] tl, int tl_index, int[] td, int td_index, InflateBlocks s, ZlibCodec z) { @@ -1509,6 +1515,7 @@ namespace Ionic.Zlib } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Inflate(FlushType flush) { int b; diff --git a/MinecraftClient/Protocol/Handlers/Compression/Zlib.cs b/MinecraftClient/Protocol/Handlers/Compression/Zlib.cs index dcfe7252..8019be80 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/Zlib.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/Zlib.cs @@ -89,6 +89,7 @@ using System; +using System.Runtime.CompilerServices; using Interop=System.Runtime.InteropServices; namespace Ionic.Zlib @@ -491,6 +492,7 @@ namespace Ionic.Zlib /// adler = Adler.Adler32(adler, buffer, index, length); /// /// + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static uint Adler32(uint adler, byte[] buf, int index, int len) { if (buf == null) diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs index 700ab7ba..e4879481 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs @@ -26,6 +26,7 @@ using System; using System.IO; +using System.Runtime.CompilerServices; namespace Ionic.Zlib { @@ -170,6 +171,7 @@ namespace Ionic.Zlib + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private void finish() { if (_z == null) return; @@ -299,6 +301,7 @@ namespace Ionic.Zlib } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override void Close() { if (_stream == null) return; @@ -413,7 +416,7 @@ namespace Ionic.Zlib } - + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override System.Int32 Read(System.Byte[] buffer, System.Int32 offset, System.Int32 count) { // According to MS documentation, any implementation of the IO.Stream.Read function must: diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs index 76d1535a..97b5882c 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs @@ -65,6 +65,7 @@ using System; +using System.Runtime.CompilerServices; using Interop=System.Runtime.InteropServices; namespace Ionic.Zlib @@ -351,6 +352,7 @@ namespace Ionic.Zlib /// /// The flush to use when inflating. /// Z_OK if everything goes well. + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public int Inflate(FlushType flush) { if (istate == null) diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs index 88ddca9d..27cead91 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs @@ -27,6 +27,7 @@ using System; using System.IO; +using System.Runtime.CompilerServices; namespace Ionic.Zlib { @@ -409,6 +410,7 @@ namespace Ionic.Zlib /// /// indicates whether the Dispose method was invoked by user code. /// + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] protected override void Dispose(bool disposing) { try @@ -543,6 +545,7 @@ namespace Ionic.Zlib /// the number of bytes to read. /// /// the number of bytes read + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override int Read(byte[] buffer, int offset, int count) { if (_disposed) throw new ObjectDisposedException("ZlibStream"); diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index d0cdaa79..d1a90d94 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -8,6 +8,7 @@ using MinecraftClient.Crypto; using MinecraftClient.Inventory; using MinecraftClient.Mapping.EntityPalettes; using MinecraftClient.Inventory.ItemPalettes; +using System.Runtime.CompilerServices; namespace MinecraftClient.Protocol.Handlers { @@ -36,6 +37,7 @@ namespace MinecraftClient.Protocol.Handlers /// Amount of bytes to read /// Cache of bytes to read from /// The data read from the cache as an array + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public byte[] ReadData(int offset, Queue cache) { byte[] result = new byte[offset]; @@ -44,11 +46,24 @@ namespace MinecraftClient.Protocol.Handlers return result; } + /// + /// Remove some data from the cache + /// + /// Amount of bytes to drop + /// Cache of bytes to drop + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public void DropData(int offset, Queue cache) + { + while (offset-- > 0) + cache.Dequeue(); + } + /// /// Read a string from a cache of bytes and remove it from the cache /// /// Cache of bytes to read from /// The string + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public string ReadNextString(Queue cache) { int length = ReadNextVarInt(cache); @@ -63,6 +78,7 @@ namespace MinecraftClient.Protocol.Handlers /// Read a boolean from a cache of bytes and remove it from the cache /// /// The boolean value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public bool ReadNextBool(Queue cache) { return ReadNextByte(cache) != 0x00; @@ -72,55 +88,65 @@ namespace MinecraftClient.Protocol.Handlers /// Read a short integer from a cache of bytes and remove it from the cache /// /// The short integer value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public short ReadNextShort(Queue cache) { - byte[] rawValue = ReadData(2, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToInt16(rawValue, 0); + Span rawValue = stackalloc byte[2]; + for (int i = (2 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToInt16(rawValue); } /// /// Read an integer from a cache of bytes and remove it from the cache /// /// The integer value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public int ReadNextInt(Queue cache) { - byte[] rawValue = ReadData(4, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToInt32(rawValue, 0); + Span rawValue = stackalloc byte[4]; + for (int i = (4 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToInt32(rawValue); } /// /// Read a long integer from a cache of bytes and remove it from the cache /// /// The unsigned long integer value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public long ReadNextLong(Queue cache) { - byte[] rawValue = ReadData(8, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToInt64(rawValue, 0); + Span rawValue = stackalloc byte[8]; + for (int i = (8 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToInt64(rawValue); } /// /// Read an unsigned short integer from a cache of bytes and remove it from the cache /// /// The unsigned short integer value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public ushort ReadNextUShort(Queue cache) { - byte[] rawValue = ReadData(2, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToUInt16(rawValue, 0); + Span rawValue = stackalloc byte[2]; + for (int i = (2 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToUInt16(rawValue); } /// /// Read an unsigned long integer from a cache of bytes and remove it from the cache /// /// The unsigned long integer value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public ulong ReadNextULong(Queue cache) { - byte[] rawValue = ReadData(8, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToUInt64(rawValue, 0); + Span rawValue = stackalloc byte[8]; + for (int i = (8 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToUInt64(rawValue); } /// @@ -172,7 +198,9 @@ namespace MinecraftClient.Protocol.Handlers /// The uuid public Guid ReadNextUUID(Queue cache) { - byte[] javaUUID = ReadData(16, cache); + Span javaUUID = stackalloc byte[16]; + for (int i = 0; i < 16; ++i) + javaUUID[i] = cache.Dequeue(); Guid guid = new Guid(javaUUID); if (BitConverter.IsLittleEndian) guid = guid.ToLittleEndian(); @@ -184,6 +212,7 @@ namespace MinecraftClient.Protocol.Handlers /// /// Cache of bytes to read from /// The byte array + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public byte[] ReadNextByteArray(Queue cache) { int len = protocolversion >= Protocol18Handler.MC_1_8_Version @@ -196,6 +225,7 @@ namespace MinecraftClient.Protocol.Handlers /// Reads a length-prefixed array of unsigned long integers and removes it from the cache /// /// The unsigned long integer values + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public ulong[] ReadNextULongArray(Queue cache) { int len = ReadNextVarInt(cache); @@ -209,28 +239,33 @@ namespace MinecraftClient.Protocol.Handlers /// Read a double from a cache of bytes and remove it from the cache /// /// The double value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public double ReadNextDouble(Queue cache) { - byte[] rawValue = ReadData(8, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToDouble(rawValue, 0); + Span rawValue = stackalloc byte[8]; + for (int i = (8 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToDouble(rawValue); } /// /// Read a float from a cache of bytes and remove it from the cache /// /// The float value + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public float ReadNextFloat(Queue cache) { - byte[] rawValue = ReadData(4, cache); - Array.Reverse(rawValue); //Endianness - return BitConverter.ToSingle(rawValue, 0); + Span rawValue = stackalloc byte[4]; + for (int i = (4 - 1); i >= 0; --i) //Endianness + rawValue[i] = cache.Dequeue(); + return BitConverter.ToSingle(rawValue); } /// /// Read an integer from the network /// /// The integer + [MethodImpl(MethodImplOptions.AggressiveInlining)] public int ReadNextVarIntRAW(SocketWrapper socket) { int i = 0; @@ -251,6 +286,7 @@ namespace MinecraftClient.Protocol.Handlers /// /// Cache of bytes to read from /// The integer + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public int ReadNextVarInt(Queue cache) { int i = 0; @@ -269,13 +305,12 @@ namespace MinecraftClient.Protocol.Handlers /// Skip a VarInt from a cache of bytes with better performance /// /// Cache of bytes to read from + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void SkipNextVarInt(Queue cache) { while (true) - { if ((ReadNextByte(cache) & 0x80) != 128) break; - } } /// @@ -326,6 +361,7 @@ namespace MinecraftClient.Protocol.Handlers /// Read a single byte from a cache of bytes and remove it from the cache /// /// The byte that was read + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public byte ReadNextByte(Queue cache) { byte result = cache.Dequeue(); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 610e93f9..2d68fda1 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -218,9 +218,8 @@ namespace MinecraftClient.Protocol.Handlers while (socketWrapper.HasDataAvailable()) { int packetID = 0; - Queue packetData = new Queue(); - ReadNextPacket(ref packetID, packetData); - HandlePacket(packetID, new Queue(packetData)); + Queue packetData = ReadNextPacket(ref packetID); + HandlePacket(packetID, packetData); } } catch (System.IO.IOException) { return false; } @@ -235,14 +234,10 @@ namespace MinecraftClient.Protocol.Handlers /// /// will contain packet ID /// will contain raw packet Data - internal void ReadNextPacket(ref int packetID, Queue packetData) + internal Queue ReadNextPacket(ref int packetID) { - packetData.Clear(); int size = dataTypes.ReadNextVarIntRAW(socketWrapper); //Packet size - byte[] rawpacket = socketWrapper.ReadDataRAW(size); //Packet contents - - for (int i = 0; i < rawpacket.Length; i++) - packetData.Enqueue(rawpacket[i]); + Queue packetData = new(socketWrapper.ReadDataRAW(size)); //Packet contents //Handle packet decompression if (protocolversion >= MC_1_8_Version @@ -253,9 +248,7 @@ namespace MinecraftClient.Protocol.Handlers { byte[] toDecompress = packetData.ToArray(); byte[] uncompressed = ZlibUtils.Decompress(toDecompress, sizeUncompressed); - packetData.Clear(); - for (int i = 0; i < uncompressed.Length; i++) - packetData.Enqueue(uncompressed[i]); + packetData = new(uncompressed); } } @@ -266,6 +259,8 @@ namespace MinecraftClient.Protocol.Handlers List clone = packetData.ToList(); handler.OnNetworkPacket(packetID, clone, login_phase, true); } + + return packetData; } /// @@ -609,7 +604,7 @@ namespace MinecraftClient.Protocol.Handlers dataTypes.SkipNextVarInt(packetData); } } - else dataTypes.ReadData(1024 * 4, packetData); // Biomes - 1.15 and above + else dataTypes.DropData(1024 * 4, packetData); // Biomes - 1.15 and above } int dataSize = dataTypes.ReadNextVarInt(packetData); Parallel.Invoke(() => @@ -1561,10 +1556,9 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(0x00, fullLoginPacket); int packetID = -1; - Queue packetData = new Queue(); while (true) { - ReadNextPacket(ref packetID, packetData); + Queue packetData = ReadNextPacket(ref packetID); if (packetID == 0x00) //Login rejected { handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); @@ -1670,8 +1664,7 @@ namespace MinecraftClient.Protocol.Handlers while (true) { int packetID = -1; - Queue packetData = new Queue(); - ReadNextPacket(ref packetID, packetData); + Queue packetData = ReadNextPacket(ref packetID); if (packetID < 0 || loopPrevention-- < 0) // Failed to read packet or too many iterations (issue #1150) { handler.OnConnectionLost(ChatBot.DisconnectReason.ConnectionLost, Translations.Get("error.invalid_encrypt")); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs b/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs index beae95e7..bfa401a0 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs @@ -57,11 +57,10 @@ namespace MinecraftClient.Protocol.Handlers if (ForgeEnabled() && forgeInfo.Version == FMLVersion.FML) { int packetID = -1; - Queue packetData = new Queue(); while (fmlHandshakeState != FMLHandshakeClientState.DONE) { - protocol18.ReadNextPacket(ref packetID, packetData); + Queue packetData = protocol18.ReadNextPacket(ref packetID); if (packetID == 0x40) // Disconnect { diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 62459c0f..2db3b0e6 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -222,7 +222,7 @@ namespace MinecraftClient.Protocol.Handlers dataTypes.SkipNextVarInt(cache); // Palette } int dataArrayLength = dataTypes.ReadNextVarInt(cache); // Data Array Length - dataTypes.ReadData(dataArrayLength * 8, cache); // Data Array + dataTypes.DropData(dataArrayLength * 8, cache); // Data Array } } } @@ -394,12 +394,12 @@ namespace MinecraftClient.Protocol.Handlers if (protocolversion < Protocol18Handler.MC_1_14_Version) { //Skip block light - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); //Skip sky light if (currentDimension == 0) // Sky light is not sent in the nether or the end - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); } } } @@ -456,17 +456,17 @@ namespace MinecraftClient.Protocol.Handlers if ((chunkMask & (1 << chunkY)) != 0) { //Skip block light - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); //Skip sky light if (hasSkyLight) - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ) / 2, cache); } } //Skip biome metadata if (chunksContinuous) - dataTypes.ReadData(Chunk.SizeX * Chunk.SizeZ, cache); + dataTypes.DropData(Chunk.SizeX * Chunk.SizeZ, cache); } } else @@ -505,12 +505,12 @@ namespace MinecraftClient.Protocol.Handlers } //Skip data we don't need - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * sectionCount) / 2, cache); //Block light + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * sectionCount) / 2, cache); //Block light if (hasSkyLight) - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * sectionCount) / 2, cache); //Sky light - dataTypes.ReadData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * addDataSectionCount) / 2, cache); //BlockAdd + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * sectionCount) / 2, cache); //Sky light + dataTypes.DropData((Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ * addDataSectionCount) / 2, cache); //BlockAdd if (chunksContinuous) - dataTypes.ReadData(Chunk.SizeX * Chunk.SizeZ, cache); //Biomes + dataTypes.DropData(Chunk.SizeX * Chunk.SizeZ, cache); //Biomes //Load chunk data int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); diff --git a/MinecraftClient/Protocol/Handlers/ZlibUtils.cs b/MinecraftClient/Protocol/Handlers/ZlibUtils.cs index e281bd31..f4822f16 100644 --- a/MinecraftClient/Protocol/Handlers/ZlibUtils.cs +++ b/MinecraftClient/Protocol/Handlers/ZlibUtils.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using Ionic.Zlib; @@ -39,6 +40,7 @@ namespace MinecraftClient.Protocol.Handlers /// Data to decompress /// Size of the data once decompressed /// Decompressed data as a byte array + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static byte[] Decompress(byte[] to_decompress, int size_uncompressed) { ZlibStream stream = new ZlibStream(new System.IO.MemoryStream(to_decompress, false), CompressionMode.Decompress); @@ -53,6 +55,7 @@ namespace MinecraftClient.Protocol.Handlers /// /// Data to decompress /// Decompressed data as byte array + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static byte[] Decompress(byte[] to_decompress) { ZlibStream stream = new ZlibStream(new System.IO.MemoryStream(to_decompress, false), CompressionMode.Decompress); From dff3f23b0347c60c1f09c3e694674a7152baccc9 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 15:32:09 +0800 Subject: [PATCH 12/39] Bug fix: ResourcePackSend.hasPromptMessage --- MinecraftClient/Crypto/AesCfb8Stream.cs | 2 +- MinecraftClient/Crypto/{AesContext.cs => FastAes.cs} | 2 +- MinecraftClient/Protocol/Handlers/Protocol18.cs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename MinecraftClient/Crypto/{AesContext.cs => FastAes.cs} (98%) diff --git a/MinecraftClient/Crypto/AesCfb8Stream.cs b/MinecraftClient/Crypto/AesCfb8Stream.cs index b2e769cf..aac0443d 100644 --- a/MinecraftClient/Crypto/AesCfb8Stream.cs +++ b/MinecraftClient/Crypto/AesCfb8Stream.cs @@ -28,7 +28,7 @@ namespace MinecraftClient.Crypto { BaseStream = stream; - if (FastAes.IsSupport()) + if (FastAes.IsSupported()) FastAes = new FastAes(key); else { diff --git a/MinecraftClient/Crypto/AesContext.cs b/MinecraftClient/Crypto/FastAes.cs similarity index 98% rename from MinecraftClient/Crypto/AesContext.cs rename to MinecraftClient/Crypto/FastAes.cs index fb6fd7bc..41de7d54 100644 --- a/MinecraftClient/Crypto/AesContext.cs +++ b/MinecraftClient/Crypto/FastAes.cs @@ -21,7 +21,7 @@ namespace MinecraftClient.Crypto /// Detects if the required instruction set is supported /// /// Is it supported - public static bool IsSupport() + public static bool IsSupported() { return Sse2.IsSupported && Aes.IsSupported; } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 2d68fda1..3de1909e 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -1120,8 +1120,9 @@ namespace MinecraftClient.Protocol.Handlers { forced = dataTypes.ReadNextBool(packetData); string forcedMessage = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); - dataTypes.ReadNextBool(packetData); // Has Prompt Message (Boolean) - 1.17 and above - dataTypes.ReadNextString(packetData); // Prompt Message (Optional Chat) - 1.17 and above + bool hasPromptMessage = dataTypes.ReadNextBool(packetData); // Has Prompt Message (Boolean) - 1.17 and above + if (hasPromptMessage) + dataTypes.ReadNextString(packetData); // Prompt Message (Optional Chat) - 1.17 and above } // Some server plugins may send invalid resource packs to probe the client and we need to ignore them (issue #1056) if (!url.StartsWith("http") && hash.Length != 40) // Some server may have null hash value From 75e7b0e37d1a0743e04a51ab0e244bf8e27fe228 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 16:18:29 +0800 Subject: [PATCH 13/39] Fix issue #2119 --- MinecraftClient/MinecraftClient.csproj | 1 + MinecraftClient/Program.cs | 3 +++ MinecraftClient/Protocol/Handlers/DataTypes.cs | 10 ++++++++++ .../Protocol/Handlers/Protocol18.cs | 18 ++++++++++++------ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj index 4ea125d4..6641d0cf 100644 --- a/MinecraftClient/MinecraftClient.csproj +++ b/MinecraftClient/MinecraftClient.csproj @@ -36,6 +36,7 @@ + diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 3dd50064..434ee8d5 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -81,6 +81,9 @@ namespace MinecraftClient // Apply to all other operating systems. Console.OutputEncoding = Console.InputEncoding = Encoding.UTF8; } + + // Fix issue #2119 + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); }); ConsoleIO.WriteLine($"Minecraft Console Client v{Version} - for MC {MCLowestVersion} to {MCHighestVersion} - Github.com/MCCTeam"); diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index d1a90d94..0b908055 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -74,6 +74,16 @@ namespace MinecraftClient.Protocol.Handlers else return ""; } + /// + /// Skip a string from a cache of bytes and remove it from the cache + /// + /// Cache of bytes to read from + public void SkipNextString(Queue cache) + { + int length = ReadNextVarInt(cache); + DropData(length, cache); + } + /// /// Read a boolean from a cache of bytes and remove it from the cache /// diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 3de1909e..26cc8de7 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -361,7 +361,7 @@ namespace MinecraftClient.Protocol.Handlers else dataTypes.ReadNextByte(packetData); // Max Players - 1.16.1 and below if (protocolversion < MC_1_16_Version) - dataTypes.ReadNextString(packetData); // Level Type - 1.15 and below + dataTypes.SkipNextString(packetData); // Level Type - 1.15 and below if (protocolversion >= MC_1_14_Version) dataTypes.ReadNextVarInt(packetData); // View distance - 1.14 and above if (protocolversion >= MC_1_18_1_Version) @@ -380,7 +380,7 @@ namespace MinecraftClient.Protocol.Handlers bool hasDeathLocation = dataTypes.ReadNextBool(packetData); // Has death location if (hasDeathLocation) { - dataTypes.ReadNextString(packetData); // Death dimension name: Identifier + dataTypes.SkipNextString(packetData); // Death dimension name: Identifier dataTypes.ReadNextLocation(packetData); // Death location } } @@ -475,7 +475,7 @@ namespace MinecraftClient.Protocol.Handlers if (protocolversion >= MC_1_16_Version) dataTypes.ReadNextByte(packetData); // Previous Game mode - 1.16 and above if (protocolversion < MC_1_16_Version) - dataTypes.ReadNextString(packetData); // Level Type - 1.15 and below + dataTypes.SkipNextString(packetData); // Level Type - 1.15 and below if (protocolversion >= MC_1_16_Version) { dataTypes.ReadNextBool(packetData); // Is Debug - 1.16 and above @@ -962,7 +962,13 @@ namespace MinecraftClient.Protocol.Handlers break; case 0x03: //Update display name if (dataTypes.ReadNextBool(packetData)) - dataTypes.ReadNextString(packetData); + { + PlayerInfo? player = handler.GetPlayerInfo(uuid); + if (player != null) + player.DisplayName = dataTypes.ReadNextString(packetData); + else + dataTypes.SkipNextString(packetData); + } break; case 0x04: //Player Leave handler.OnPlayerLeave(uuid); @@ -1002,7 +1008,7 @@ namespace MinecraftClient.Protocol.Handlers { // Skip optional tooltip for each tab-complete result if (dataTypes.ReadNextBool(packetData)) - dataTypes.ReadNextString(packetData); + dataTypes.SkipNextString(packetData); } } @@ -1122,7 +1128,7 @@ namespace MinecraftClient.Protocol.Handlers string forcedMessage = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); bool hasPromptMessage = dataTypes.ReadNextBool(packetData); // Has Prompt Message (Boolean) - 1.17 and above if (hasPromptMessage) - dataTypes.ReadNextString(packetData); // Prompt Message (Optional Chat) - 1.17 and above + dataTypes.SkipNextString(packetData); // Prompt Message (Optional Chat) - 1.17 and above } // Some server plugins may send invalid resource packs to probe the client and we need to ignore them (issue #1056) if (!url.StartsWith("http") && hash.Length != 40) // Some server may have null hash value From 003c4c3ab891c27b94635f765fa7348b6c579c7b Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 28 Aug 2022 17:14:28 +0800 Subject: [PATCH 14/39] Fix issue #2094 --- MinecraftClient/Program.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index 434ee8d5..c5d6ffa9 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -311,8 +311,17 @@ namespace MinecraftClient // Try to refresh access token if (!string.IsNullOrWhiteSpace(session.RefreshToken)) { - result = ProtocolHandler.MicrosoftLoginRefresh(session.RefreshToken, out session); + try + { + result = ProtocolHandler.MicrosoftLoginRefresh(session.RefreshToken, out session); + } + catch (Exception ex) + { + ConsoleIO.WriteLine("Refresh access token fail: " + ex.Message); + result = ProtocolHandler.LoginResult.InvalidResponse; + } } + if (result != ProtocolHandler.LoginResult.Success && Settings.Password == "" && Settings.AccountType == ProtocolHandler.AccountType.Mojang) From 68b9c81c0ba6922dc75f329edd720afea393f29f Mon Sep 17 00:00:00 2001 From: BruceChen Date: Mon, 29 Aug 2022 23:39:03 +0800 Subject: [PATCH 15/39] Improve ReadBlockStatesField --- .../Protocol/Handlers/DataTypes.cs | 6 +++++ .../Protocol/Handlers/Protocol18.cs | 26 ++++++------------- .../Protocol/Handlers/Protocol18Terrain.cs | 18 ++++++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 0b908055..2ca27533 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -46,6 +46,12 @@ namespace MinecraftClient.Protocol.Handlers return result; } + public void ReadDataReverse(Queue cache, Span dest) + { + for (int i = (dest.Length - 1); i >= 0; --i) + dest[i] = cache.Dequeue(); + } + /// /// Remove some data from the cache /// diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 26cc8de7..914a0156 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -554,12 +554,8 @@ namespace MinecraftClient.Protocol.Handlers int dataSize = dataTypes.ReadNextVarInt(packetData); // Size - Parallel.Invoke(() => - { - bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken); - if (loaded) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }); + if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken)) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); // Block Entity data: ignored // Light data: ignored @@ -578,12 +574,9 @@ namespace MinecraftClient.Protocol.Handlers int compressedDataSize = dataTypes.ReadNextInt(packetData); byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] decompressed = ZlibUtils.Decompress(compressed); - Parallel.Invoke(() => - { - bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed), cancellationToken); - if (loaded) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }); + + if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed), cancellationToken)) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } else { @@ -607,12 +600,9 @@ namespace MinecraftClient.Protocol.Handlers else dataTypes.DropData(1024 * 4, packetData); // Biomes - 1.15 and above } int dataSize = dataTypes.ReadNextVarInt(packetData); - Parallel.Invoke(() => - { - bool loaded = pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData, cancellationToken); - if (loaded) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - }); + + if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData, cancellationToken)) + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } } } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 2db3b0e6..84e2fe93 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Numerics; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; //using System.Linq; @@ -69,6 +70,8 @@ namespace MinecraftClient.Protocol.Handlers // Indirect Mode: For block states with bits per entry <= 4, 4 bits are used to represent a block. if (bitsPerEntry < 4) bitsPerEntry = 4; + int entryPerLong = 64 / bitsPerEntry; // entryPerLong = sizeof(long) / bitsPerEntry + // Direct Mode: Bit mask covering bitsPerEntry bits // EG, if bitsPerEntry = 5, valueMask = 00011111 in binary uint valueMask = (uint)((1 << bitsPerEntry) - 1); @@ -76,15 +79,16 @@ namespace MinecraftClient.Protocol.Handlers int paletteLength = 0; // Assume zero when length is absent if (usePalette) paletteLength = dataTypes.ReadNextVarInt(cache); - int[] palette = new int[paletteLength]; + Span palette = paletteLength < 256 ? stackalloc uint[paletteLength] : new uint[paletteLength]; for (int i = 0; i < paletteLength; i++) - palette[i] = dataTypes.ReadNextVarInt(cache); + palette[i] = (uint)dataTypes.ReadNextVarInt(cache); - // Block IDs are packed in the array of 64-bits integers - ulong[] dataArray = dataTypes.ReadNextULongArray(cache); + //// Block IDs are packed in the array of 64-bits integers + dataTypes.SkipNextVarInt(cache); + Span entryDataByte = stackalloc byte[8]; + dataTypes.ReadDataReverse(cache, entryDataByte); // read long Chunk chunk = new(); - int longIndex = 0; int startOffset = 0 - bitsPerEntry; for (int blockY = 0; blockY < Chunk.SizeY; blockY++) { @@ -103,12 +107,12 @@ namespace MinecraftClient.Protocol.Handlers // When overlapping, move forward to the beginning of the next Long startOffset = 0; - longIndex++; + dataTypes.ReadDataReverse(cache, entryDataByte); // read long } // NOTICE: In the future a single ushort may not store the entire block id; // the Block class may need to change if block state IDs go beyond 65535 - ushort blockId = (ushort)((dataArray[longIndex] >> startOffset) & valueMask); + ushort blockId = (ushort)((MemoryMarshal.Read(entryDataByte) >> startOffset) & valueMask); // Map small IDs to actual larger block IDs if (usePalette) From cd45c64300b3c90554c6973d95019c2e0a2b63c1 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 10:41:27 +0800 Subject: [PATCH 16/39] Change chunk storage structure --- MinecraftClient/Mapping/Chunk.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MinecraftClient/Mapping/Chunk.cs b/MinecraftClient/Mapping/Chunk.cs index aefd2656..66039f43 100644 --- a/MinecraftClient/Mapping/Chunk.cs +++ b/MinecraftClient/Mapping/Chunk.cs @@ -39,7 +39,7 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - return blocks[blockX, blockY, blockZ]; + return blocks[blockY, blockZ, blockX]; } set { @@ -50,7 +50,7 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - blocks[blockX, blockY, blockZ] = value; + blocks[blockY, blockZ, blockX] = value; } } @@ -64,7 +64,7 @@ namespace MinecraftClient.Mapping [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void SetWithoutCheck(int blockX, int blockY, int blockZ, Block block) { - blocks[blockX, blockY, blockZ] = block; + blocks[blockY, blockZ, blockX] = block; } /// From e09016cea57cb8c56c6209bcc88f3b773063ada1 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 12:33:13 +0800 Subject: [PATCH 17/39] Improve ReadBlockStatesField --- MinecraftClient/Mapping/Chunk.cs | 18 ++++++++++++++---- MinecraftClient/Protocol/Handlers/DataTypes.cs | 6 ++++++ .../Protocol/Handlers/Protocol18Terrain.cs | 13 ++++++++----- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/MinecraftClient/Mapping/Chunk.cs b/MinecraftClient/Mapping/Chunk.cs index 66039f43..89991bfd 100644 --- a/MinecraftClient/Mapping/Chunk.cs +++ b/MinecraftClient/Mapping/Chunk.cs @@ -19,7 +19,17 @@ namespace MinecraftClient.Mapping /// /// Blocks contained into the chunk /// - private readonly Block[,,] blocks = new Block[SizeX, SizeY, SizeZ]; + private readonly Block[] blocks; + + public Chunk() + { + this.blocks = new Block[SizeY * SizeZ * SizeX]; + } + + public Chunk(Block[] blocks) + { + this.blocks = blocks; + } /// /// Read, or set the specified block @@ -39,7 +49,7 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - return blocks[blockY, blockZ, blockX]; + return blocks[(blockY << 8) | (blockZ << 4) | blockX]; } set { @@ -50,7 +60,7 @@ namespace MinecraftClient.Mapping if (blockZ < 0 || blockZ >= SizeZ) throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); - blocks[blockY, blockZ, blockX] = value; + blocks[(blockY << 8) | (blockZ << 4) | blockX] = value; } } @@ -64,7 +74,7 @@ namespace MinecraftClient.Mapping [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void SetWithoutCheck(int blockX, int blockY, int blockZ, Block block) { - blocks[blockY, blockZ, blockX] = block; + blocks[(blockY << 8) | (blockZ << 4) | blockX] = block; } /// diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 2ca27533..a352757c 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -46,6 +46,12 @@ namespace MinecraftClient.Protocol.Handlers return result; } + /// + /// Read some data from a cache of bytes and remove it from the cache + /// + /// Cache of bytes to read from + /// Storage results + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public void ReadDataReverse(Queue cache, Span dest) { for (int i = (dest.Length - 1); i >= 0; --i) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 84e2fe93..8685ecea 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -86,9 +86,10 @@ namespace MinecraftClient.Protocol.Handlers //// Block IDs are packed in the array of 64-bits integers dataTypes.SkipNextVarInt(cache); Span entryDataByte = stackalloc byte[8]; + Span entryDataLong = MemoryMarshal.Cast(entryDataByte); dataTypes.ReadDataReverse(cache, entryDataByte); // read long - Chunk chunk = new(); + Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; int startOffset = 0 - bitsPerEntry; for (int blockY = 0; blockY < Chunk.SizeY; blockY++) { @@ -112,7 +113,7 @@ namespace MinecraftClient.Protocol.Handlers // NOTICE: In the future a single ushort may not store the entire block id; // the Block class may need to change if block state IDs go beyond 65535 - ushort blockId = (ushort)((MemoryMarshal.Read(entryDataByte) >> startOffset) & valueMask); + uint blockId = (uint)(entryDataLong[0] >> startOffset) & valueMask; // Map small IDs to actual larger block IDs if (usePalette) @@ -127,15 +128,17 @@ namespace MinecraftClient.Protocol.Handlers blockNumber)); } - blockId = (ushort)palette[blockId]; + blockId = palette[(int)blockId]; } + Block block = new((ushort)blockId); + // We have our block, save the block into the chunk - chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockId)); + blocks[(blockY << 8) | (blockZ << 4) | blockX] = block; } } } - return chunk; + return new Chunk(blocks); } } From c941d086d94de8de6ae6da4348c9bde8b1b3b45a Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 14:04:27 +0800 Subject: [PATCH 18/39] Improve ReadBlockStatesField --- .../Protocol/Handlers/Protocol18Terrain.cs | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 8685ecea..cf4b932f 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -55,12 +55,13 @@ namespace MinecraftClient.Protocol.Handlers if (block.Type == Material.Air) return null; - Chunk chunk = new(); + // Warning: If you need to support modification of block data, you need to create 4096 objects here + Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; for (int blockY = 0; blockY < Chunk.SizeY; blockY++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - chunk.SetWithoutCheck(blockX, blockY, blockZ, block); - return chunk; + blocks[(blockY << 8) | (blockZ << 4) | blockX] = block; + return new Chunk(blocks); } else { @@ -84,13 +85,12 @@ namespace MinecraftClient.Protocol.Handlers palette[i] = (uint)dataTypes.ReadNextVarInt(cache); //// Block IDs are packed in the array of 64-bits integers - dataTypes.SkipNextVarInt(cache); + dataTypes.SkipNextVarInt(cache); // Entry length Span entryDataByte = stackalloc byte[8]; Span entryDataLong = MemoryMarshal.Cast(entryDataByte); - dataTypes.ReadDataReverse(cache, entryDataByte); // read long Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; - int startOffset = 0 - bitsPerEntry; + int startOffset = 64; // Read the first data immediately for (int blockY = 0; blockY < Chunk.SizeY; blockY++) { for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) @@ -98,21 +98,17 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) { // Calculate location of next block ID inside the array of Longs - startOffset += bitsPerEntry; - - if ((startOffset + bitsPerEntry) > 64) + if ((startOffset += bitsPerEntry) > (64 - bitsPerEntry)) { // In MC 1.16+, padding is applied to prevent overlapping between Longs: - // [ LONG INTEGER ][ LONG INTEGER ] - // [Block][Block][Block]XXXXX[Block][Block][Block]XXXXX + // [ LONG INTEGER ][ LONG INTEGER ] + // [Block][Block][Block]XXX[Block][Block][Block]XXX // When overlapping, move forward to the beginning of the next Long startOffset = 0; dataTypes.ReadDataReverse(cache, entryDataByte); // read long } - // NOTICE: In the future a single ushort may not store the entire block id; - // the Block class may need to change if block state IDs go beyond 65535 uint blockId = (uint)(entryDataLong[0] >> startOffset) & valueMask; // Map small IDs to actual larger block IDs @@ -131,6 +127,8 @@ namespace MinecraftClient.Protocol.Handlers blockId = palette[(int)blockId]; } + // NOTICE: In the future a single ushort may not store the entire block id; + // the Block class may need to change if block state IDs go beyond 65535 Block block = new((ushort)blockId); // We have our block, save the block into the chunk From 1a90b6d9428e11500ccf0f35665e588218bda7ea Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 17:37:46 +0800 Subject: [PATCH 19/39] Use separate threads for decryption and decompression --- MinecraftClient/Mapping/Location.cs | 2 +- .../Protocol/Handlers/Compression/Inflate.cs | 9 +-- .../Handlers/Compression/ZlibBaseStream.cs | 3 - .../Handlers/Compression/ZlibCodec.cs | 1 - .../Handlers/Compression/ZlibStream.cs | 4 +- .../Protocol/Handlers/Protocol18.cs | 59 +++++++++++++------ .../Protocol/Handlers/Protocol18Forge.cs | 4 +- .../Protocol/Handlers/ZlibUtils.cs | 2 - 8 files changed, 47 insertions(+), 37 deletions(-) diff --git a/MinecraftClient/Mapping/Location.cs b/MinecraftClient/Mapping/Location.cs index 02ee3c23..c5232330 100644 --- a/MinecraftClient/Mapping/Location.cs +++ b/MinecraftClient/Mapping/Location.cs @@ -55,7 +55,7 @@ namespace MinecraftClient.Mapping /// Location of the block into the chunk /// Location of the block into the world /// Location of the block into the chunk - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + [MethodImpl(MethodImplOptions.AggressiveInlining)] public Location(int chunkX, int chunkZ, int blockX, int blockY, int blockZ) { X = chunkX * Chunk.SizeX + blockX; diff --git a/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs b/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs index eaf0f909..f81e49fe 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/Inflate.cs @@ -141,8 +141,6 @@ namespace Ionic.Zlib return oldCheck; } - - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Process(int r) { int t; // temporary storage @@ -676,7 +674,6 @@ namespace Ionic.Zlib } // copy as much as possible from the sliding window to the output area - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Flush(int r) { int nBytes; @@ -803,7 +800,7 @@ namespace Ionic.Zlib tree = null; } - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + internal int Process(InflateBlocks blocks, int r) { int j; // temporary storage @@ -1165,8 +1162,7 @@ namespace Ionic.Zlib // (the maximum string length) and number of input bytes available // at least ten. The ten bytes are six bytes for the longest length/ // distance pair plus four bytes for overloading the bit buffer. - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] - + [MethodImpl(MethodImplOptions.AggressiveOptimization)] internal int InflateFast(int bl, int bd, int[] tl, int tl_index, int[] td, int td_index, InflateBlocks s, ZlibCodec z) { int t; // temporary pointer @@ -1515,7 +1511,6 @@ namespace Ionic.Zlib } - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] internal int Inflate(FlushType flush) { int b; diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs index e4879481..a02c46a8 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibBaseStream.cs @@ -171,7 +171,6 @@ namespace Ionic.Zlib - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private void finish() { if (_z == null) return; @@ -301,7 +300,6 @@ namespace Ionic.Zlib } - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override void Close() { if (_stream == null) return; @@ -416,7 +414,6 @@ namespace Ionic.Zlib } - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override System.Int32 Read(System.Byte[] buffer, System.Int32 offset, System.Int32 count) { // According to MS documentation, any implementation of the IO.Stream.Read function must: diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs index 97b5882c..e6b7299e 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibCodec.cs @@ -352,7 +352,6 @@ namespace Ionic.Zlib /// /// The flush to use when inflating. /// Z_OK if everything goes well. - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public int Inflate(FlushType flush) { if (istate == null) diff --git a/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs b/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs index 27cead91..fb1a85d9 100644 --- a/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs +++ b/MinecraftClient/Protocol/Handlers/Compression/ZlibStream.cs @@ -410,7 +410,6 @@ namespace Ionic.Zlib /// /// indicates whether the Dispose method was invoked by user code. /// - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] protected override void Dispose(bool disposing) { try @@ -545,10 +544,9 @@ namespace Ionic.Zlib /// the number of bytes to read. /// /// the number of bytes read - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public override int Read(byte[] buffer, int offset, int count) { - if (_disposed) throw new ObjectDisposedException("ZlibStream"); + if (_disposed) throw new ObjectDisposedException("ZlibStream"); return _baseStream.Read(buffer, offset, count); } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 914a0156..6f273df8 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using MinecraftClient.Protocol.Keys; using System.Text.RegularExpressions; using MinecraftClient.Protocol.Session; +using System.Collections.Concurrent; namespace MinecraftClient.Protocol.Handlers { @@ -65,6 +66,7 @@ namespace MinecraftClient.Protocol.Handlers private bool login_phase = true; private int protocolversion; private int currentDimension; + private readonly BlockingCollection>> packetQueue = new(); Protocol18Forge pForge; Protocol18Terrain pTerrain; @@ -211,30 +213,54 @@ namespace MinecraftClient.Protocol.Handlers private bool Update() { handler.OnUpdate(); - if (!socketWrapper.IsConnected()) + + if (packetQueue.IsAddingCompleted) return false; - try + + while (packetQueue.TryTake(out Tuple>? packetInfo)) { - while (socketWrapper.HasDataAvailable()) + (int packetID, Queue packetData) = packetInfo; + + HandlePacket(packetID, packetData); + + if (handler.GetNetworkPacketCaptureEnabled()) { - int packetID = 0; - Queue packetData = ReadNextPacket(ref packetID); - HandlePacket(packetID, packetData); + List clone = packetData.ToList(); + handler.OnNetworkPacket(packetID, clone, login_phase, true); } } - catch (System.IO.IOException) { return false; } - catch (SocketException) { return false; } - catch (NullReferenceException) { return false; } - catch (Ionic.Zlib.ZlibException) { return false; } + return true; } + /// + /// Read and decompress packets. + /// + internal void PacketReader() + { + while (socketWrapper.IsConnected()) + { + try + { + while (socketWrapper.HasDataAvailable()) + packetQueue.Add(ReadNextPacket()); + } + catch (System.IO.IOException) { break; } + catch (SocketException) { break; } + catch (NullReferenceException) { break; } + catch (Ionic.Zlib.ZlibException) { break; } + + Thread.Sleep(10); + } + packetQueue.CompleteAdding(); + } + /// /// Read the next packet from the network /// /// will contain packet ID /// will contain raw packet Data - internal Queue ReadNextPacket(ref int packetID) + internal Tuple> ReadNextPacket() { int size = dataTypes.ReadNextVarIntRAW(socketWrapper); //Packet size Queue packetData = new(socketWrapper.ReadDataRAW(size)); //Packet contents @@ -252,7 +278,7 @@ namespace MinecraftClient.Protocol.Handlers } } - packetID = dataTypes.ReadNextVarInt(packetData); //Packet ID + int packetID = dataTypes.ReadNextVarInt(packetData); //Packet ID if (handler.GetNetworkPacketCaptureEnabled()) { @@ -260,7 +286,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnNetworkPacket(packetID, clone, login_phase, true); } - return packetData; + return new(packetID, packetData); } /// @@ -1447,6 +1473,7 @@ namespace MinecraftClient.Protocol.Handlers /// private void StartUpdating() { + new Thread(new ThreadStart(PacketReader)).Start(); netRead = new Tuple(new Thread(new ParameterizedThreadStart(Updater)), new CancellationTokenSource()); netRead.Item1.Name = "ProtocolPacketHandler"; @@ -1552,10 +1579,9 @@ namespace MinecraftClient.Protocol.Handlers } SendPacket(0x00, fullLoginPacket); - int packetID = -1; while (true) { - Queue packetData = ReadNextPacket(ref packetID); + (int packetID, Queue packetData) = ReadNextPacket(); if (packetID == 0x00) //Login rejected { handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); @@ -1660,8 +1686,7 @@ namespace MinecraftClient.Protocol.Handlers int loopPrevention = UInt16.MaxValue; while (true) { - int packetID = -1; - Queue packetData = ReadNextPacket(ref packetID); + (int packetID, Queue packetData) = ReadNextPacket(); if (packetID < 0 || loopPrevention-- < 0) // Failed to read packet or too many iterations (issue #1150) { handler.OnConnectionLost(ChatBot.DisconnectReason.ConnectionLost, Translations.Get("error.invalid_encrypt")); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs b/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs index bfa401a0..f3aa5634 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Forge.cs @@ -56,11 +56,9 @@ namespace MinecraftClient.Protocol.Handlers { if (ForgeEnabled() && forgeInfo.Version == FMLVersion.FML) { - int packetID = -1; - while (fmlHandshakeState != FMLHandshakeClientState.DONE) { - Queue packetData = protocol18.ReadNextPacket(ref packetID); + (int packetID, Queue packetData) = protocol18.ReadNextPacket(); if (packetID == 0x40) // Disconnect { diff --git a/MinecraftClient/Protocol/Handlers/ZlibUtils.cs b/MinecraftClient/Protocol/Handlers/ZlibUtils.cs index f4822f16..e7936b50 100644 --- a/MinecraftClient/Protocol/Handlers/ZlibUtils.cs +++ b/MinecraftClient/Protocol/Handlers/ZlibUtils.cs @@ -40,7 +40,6 @@ namespace MinecraftClient.Protocol.Handlers /// Data to decompress /// Size of the data once decompressed /// Decompressed data as a byte array - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static byte[] Decompress(byte[] to_decompress, int size_uncompressed) { ZlibStream stream = new ZlibStream(new System.IO.MemoryStream(to_decompress, false), CompressionMode.Decompress); @@ -55,7 +54,6 @@ namespace MinecraftClient.Protocol.Handlers /// /// Data to decompress /// Decompressed data as byte array - [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] public static byte[] Decompress(byte[] to_decompress) { ZlibStream stream = new ZlibStream(new System.IO.MemoryStream(to_decompress, false), CompressionMode.Decompress); From a6b98de43fe48db35321969ccba12f6970efbb78 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 18:17:39 +0800 Subject: [PATCH 20/39] Fix not calling "handler.OnUpdate()" on time --- .../Protocol/Handlers/Protocol18.cs | 64 ++++++++----------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 6f273df8..6c269d42 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -172,27 +172,44 @@ namespace MinecraftClient.Protocol.Handlers /// private void Updater(object? o) { - if (((CancellationToken)o!).IsCancellationRequested) return; try { - - bool keepUpdating = true; - Stopwatch stopWatch = new Stopwatch(); - while (keepUpdating) + Stopwatch stopWatch = new(); + while (!packetQueue.IsAddingCompleted) { - ((CancellationToken)o!).ThrowIfCancellationRequested(); + handler.OnUpdate(); + stopWatch.Start(); - keepUpdating = Update(); + while (packetQueue.TryTake(out Tuple>? packetInfo)) + { + (int packetID, Queue packetData) = packetInfo; + + HandlePacket(packetID, packetData); + + if (handler.GetNetworkPacketCaptureEnabled()) + { + List clone = packetData.ToList(); + handler.OnNetworkPacket(packetID, clone, login_phase, true); + } + + stopWatch.Stop(); + if (stopWatch.Elapsed.Milliseconds >= 100) + { + stopWatch.Reset(); + handler.OnUpdate(); + } + stopWatch.Start(); + } stopWatch.Stop(); - int elapsed = stopWatch.Elapsed.Milliseconds; + + if (stopWatch.Elapsed.Milliseconds < 100) + Thread.Sleep(100 - stopWatch.Elapsed.Milliseconds); stopWatch.Reset(); - if (elapsed < 100) - Thread.Sleep(100 - elapsed); } } catch (System.IO.IOException) { } @@ -206,33 +223,6 @@ namespace MinecraftClient.Protocol.Handlers handler.OnConnectionLost(ChatBot.DisconnectReason.ConnectionLost, ""); } - /// - /// Read data from the network. Should be called on a separate thread. - /// - /// FALSE if an error occured, TRUE otherwise. - private bool Update() - { - handler.OnUpdate(); - - if (packetQueue.IsAddingCompleted) - return false; - - while (packetQueue.TryTake(out Tuple>? packetInfo)) - { - (int packetID, Queue packetData) = packetInfo; - - HandlePacket(packetID, packetData); - - if (handler.GetNetworkPacketCaptureEnabled()) - { - List clone = packetData.ToList(); - handler.OnNetworkPacket(packetID, clone, login_phase, true); - } - } - - return true; - } - /// /// Read and decompress packets. /// From e4c77b0fef3f3fbfa1b77064eea8e9264216a8a1 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 18:39:09 +0800 Subject: [PATCH 21/39] Bug fix: Call handler.OnNetworkPacket() repeatedly --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 6c269d42..4d652c6f 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -188,15 +188,8 @@ namespace MinecraftClient.Protocol.Handlers while (packetQueue.TryTake(out Tuple>? packetInfo)) { (int packetID, Queue packetData) = packetInfo; - HandlePacket(packetID, packetData); - if (handler.GetNetworkPacketCaptureEnabled()) - { - List clone = packetData.ToList(); - handler.OnNetworkPacket(packetID, clone, login_phase, true); - } - stopWatch.Stop(); if (stopWatch.Elapsed.Milliseconds >= 100) { From aceccaf5b5d9d60bcf2fc971aea0cfbb8262f689 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 19:09:07 +0800 Subject: [PATCH 22/39] No longer need to cancel chunk loading --- MinecraftClient/McClient.cs | 8 ---- .../Protocol/Handlers/Protocol18.cs | 30 +++++--------- .../Protocol/Handlers/Protocol18Terrain.cs | 39 +------------------ .../Protocol/IMinecraftComHandler.cs | 1 - 4 files changed, 12 insertions(+), 66 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index f4852a65..a133b206 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -61,7 +61,6 @@ namespace MinecraftClient private float playerYaw; private float playerPitch; private double motionY; - private CancellationTokenSource chunkProcessCancelSource = new(); public enum MovementType { Sneak, Walk, Sprint} public int currentMovementSpeed = 4; private int sequenceId; // User for player block synchronization (Aka. digging, placing blocks, etc..) @@ -113,7 +112,6 @@ namespace MinecraftClient public int GetSequenceId() { return sequenceId; } public float GetPitch() { return playerPitch; } public World GetWorld() { return world; } - public CancellationToken GetChunkProcessCancelToken() { return chunkProcessCancelSource.Token; } public Double GetServerTPS() { return averageTPS; } public bool GetIsSupportPreviewsChat() { return isSupportPreviewsChat; } public float GetHealth() { return playerHealth; } @@ -478,9 +476,7 @@ namespace MinecraftClient /// public void OnConnectionLost(ChatBot.DisconnectReason reason, string message) { - chunkProcessCancelSource.Cancel(); world.Clear(); - chunkProcessCancelSource = new(); if (timeoutdetector != null) { @@ -908,9 +904,7 @@ namespace MinecraftClient terrainAndMovementsEnabled = false; terrainAndMovementsRequested = false; locationReceived = false; - chunkProcessCancelSource.Cancel(); world.Clear(); - chunkProcessCancelSource = new(); } return true; } @@ -1951,9 +1945,7 @@ namespace MinecraftClient if (terrainAndMovementsEnabled) { - chunkProcessCancelSource.Cancel(); world.Clear(); - chunkProcessCancelSource = new(); } entities.Clear(); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 4d652c6f..38d89d50 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -538,8 +538,6 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.ChunkData: if (handler.GetTerrainEnabled()) { - CancellationToken cancellationToken = handler.GetChunkProcessCancelToken(); - Interlocked.Increment(ref handler.GetWorld().chunkCnt); Interlocked.Increment(ref handler.GetWorld().chunkLoadNotCompleted); @@ -563,8 +561,8 @@ namespace MinecraftClient.Protocol.Handlers int dataSize = dataTypes.ReadNextVarInt(packetData); // Size - if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData, cancellationToken)) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + pTerrain.ProcessChunkColumnData(chunkX, chunkZ, verticalStripBitmask, packetData); + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); // Block Entity data: ignored // Light data: ignored @@ -584,8 +582,8 @@ namespace MinecraftClient.Protocol.Handlers byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] decompressed = ZlibUtils.Decompress(compressed); - if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed), cancellationToken)) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed)); + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } else { @@ -610,8 +608,8 @@ namespace MinecraftClient.Protocol.Handlers } int dataSize = dataTypes.ReadNextVarInt(packetData); - if (pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData, cancellationToken)) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData); + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } } } @@ -829,8 +827,6 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.MapChunkBulk: if (protocolversion < MC_1_9_Version && handler.GetTerrainEnabled()) { - CancellationToken cancellationToken = handler.GetChunkProcessCancelToken(); - int chunkCount; bool hasSkyLight; Queue chunkData = packetData; @@ -867,17 +863,11 @@ namespace MinecraftClient.Protocol.Handlers } //Process chunk records - Parallel.Invoke(() => + for (int chunkColumnNo = 0; chunkColumnNo < chunkCount; chunkColumnNo++) { - for (int chunkColumnNo = 0; chunkColumnNo < chunkCount; chunkColumnNo++) - { - if (cancellationToken.IsCancellationRequested) - break; - bool loaded = pTerrain.ProcessChunkColumnData(chunkXs[chunkColumnNo], chunkZs[chunkColumnNo], chunkMasks[chunkColumnNo], addBitmaps[chunkColumnNo], hasSkyLight, true, currentDimension, chunkData, cancellationToken); - if (loaded) - Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); - } - }); + pTerrain.ProcessChunkColumnData(chunkXs[chunkColumnNo], chunkZs[chunkColumnNo], chunkMasks[chunkColumnNo], addBitmaps[chunkColumnNo], hasSkyLight, true, currentDimension, chunkData); + Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); + } } break; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index cf4b932f..b99ecf3c 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -148,13 +148,9 @@ namespace MinecraftClient.Protocol.Handlers /// Chunk mask for reading data, store in bitset, used in 1.17 and 1.17.1 /// Cache for reading chunk data /// token to cancel the task - /// true if successfully loaded [MethodImpl(MethodImplOptions.AggressiveOptimization)] - public bool ProcessChunkColumnData(int chunkX, int chunkZ, ulong[]? verticalStripBitmask, Queue cache, CancellationToken cancellationToken) + public void ProcessChunkColumnData(int chunkX, int chunkZ, ulong[]? verticalStripBitmask, Queue cache) { - if (cancellationToken.IsCancellationRequested) - return false; - World world = handler.GetWorld(); int chunkColumnSize = (World.GetDimension().height + 15) / 16; // Round up @@ -184,9 +180,6 @@ namespace MinecraftClient.Protocol.Handlers lastChunkY = chunkColumnSize - 1; } - if (cancellationToken.IsCancellationRequested) - return false; - // 1.18 and above always contains all chunk section in data // 1.17 and 1.17.1 need vertical strip bitmask to know if the chunk section is included if ((protocolversion >= Protocol18Handler.MC_1_18_1_Version) || @@ -198,10 +191,6 @@ namespace MinecraftClient.Protocol.Handlers // Read Block states (Type: Paletted Container) Chunk? chunk = ReadBlockStatesField(cache); - // check before store chunk - if (cancellationToken.IsCancellationRequested) - return false; - //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { @@ -235,7 +224,6 @@ namespace MinecraftClient.Protocol.Handlers // Don't worry about skipping remaining data since there is no useful data afterwards in 1.9 // (plus, it would require parsing the tile entity lists' NBT) } - return true; } /// @@ -250,13 +238,9 @@ namespace MinecraftClient.Protocol.Handlers /// Current dimension type (0 = overworld) /// Cache for reading chunk data /// token to cancel the task - /// true if successfully loaded [MethodImpl(MethodImplOptions.AggressiveOptimization)] - public bool ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue cache, CancellationToken cancellationToken) + public void ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue cache) { - if (cancellationToken.IsCancellationRequested) - return false; - World world = handler.GetWorld(); const int chunkColumnSize = 16; @@ -267,9 +251,6 @@ namespace MinecraftClient.Protocol.Handlers int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); for (int chunkY = 0; chunkY <= maxChunkY; chunkY++) { - if (cancellationToken.IsCancellationRequested) - return false; - if ((chunkMask & (1 << chunkY)) != 0) { // 1.14 and above Non-air block count inside chunk section, for lighting purposes @@ -385,10 +366,6 @@ namespace MinecraftClient.Protocol.Handlers } } - // check before store chunk - if (cancellationToken.IsCancellationRequested) - return false; - //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { @@ -429,9 +406,6 @@ namespace MinecraftClient.Protocol.Handlers int maxChunkY = sizeof(int) * 8 - 1 - BitOperations.LeadingZeroCount(chunkMask); for (int chunkY = 0; chunkY <= maxChunkY; chunkY++) { - if (cancellationToken.IsCancellationRequested) - return false; - if ((chunkMask & (1 << chunkY)) != 0) { Chunk chunk = new Chunk(); @@ -443,10 +417,6 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(queue.Dequeue())); - // check before store chunk - if (cancellationToken.IsCancellationRequested) - return false; - //We have our chunk, save the chunk into the world handler.InvokeOnMainThread(() => { @@ -530,10 +500,6 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockTypes.Dequeue(), blockMeta.Dequeue())); - // check before store chunk - if (cancellationToken.IsCancellationRequested) - return false; - handler.InvokeOnMainThread(() => { world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); @@ -542,7 +508,6 @@ namespace MinecraftClient.Protocol.Handlers } } } - return true; } } } diff --git a/MinecraftClient/Protocol/IMinecraftComHandler.cs b/MinecraftClient/Protocol/IMinecraftComHandler.cs index 60300976..96b4e4b7 100644 --- a/MinecraftClient/Protocol/IMinecraftComHandler.cs +++ b/MinecraftClient/Protocol/IMinecraftComHandler.cs @@ -29,7 +29,6 @@ namespace MinecraftClient.Protocol PlayerInfo? GetPlayerInfo(Guid uuid); Location GetCurrentLocation(); World GetWorld(); - public System.Threading.CancellationToken GetChunkProcessCancelToken(); bool GetIsSupportPreviewsChat(); bool GetTerrainEnabled(); bool SetTerrainEnabled(bool enabled); From 3d13eb51e6eaedf32d041e74b981b6fdaa828c83 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 20:05:53 +0800 Subject: [PATCH 23/39] Trim --- MinecraftClient/Program.cs | 30 +++++++++---------- .../Protocol/Handlers/Protocol18Terrain.cs | 2 +- .../Protocol/Session/SessionToken.cs | 2 -- MinecraftClient/Settings.cs | 28 +++++------------ 4 files changed, 24 insertions(+), 38 deletions(-) diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index c5d6ffa9..a4fa4570 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -52,21 +52,6 @@ namespace MinecraftClient /// 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(() => { //Take advantage of Windows 10 / Mac / Linux UTF-8 console @@ -86,6 +71,21 @@ namespace MinecraftClient 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"); //Build information to facilitate processing of bug reports diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index b99ecf3c..023f9946 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -87,7 +87,7 @@ namespace MinecraftClient.Protocol.Handlers //// Block IDs are packed in the array of 64-bits integers dataTypes.SkipNextVarInt(cache); // Entry length Span entryDataByte = stackalloc byte[8]; - Span entryDataLong = MemoryMarshal.Cast(entryDataByte); + Span entryDataLong = MemoryMarshal.Cast(entryDataByte); // Faster than MemoryMarshal.Read Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; int startOffset = 64; // Read the first data immediately diff --git a/MinecraftClient/Protocol/Session/SessionToken.cs b/MinecraftClient/Protocol/Session/SessionToken.cs index c7fb780c..37d7476e 100644 --- a/MinecraftClient/Protocol/Session/SessionToken.cs +++ b/MinecraftClient/Protocol/Session/SessionToken.cs @@ -97,7 +97,5 @@ namespace MinecraftClient.Protocol.Session return session; } - - } } diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index f0794927..f5cf5a7b 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -263,39 +263,27 @@ namespace MinecraftClient try { string[] Lines = File.ReadAllLines(file); - - ConcurrentDictionary 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; - for (int idx = 0; idx < Lines.Length; ++idx) + foreach (string lineRAW in Lines) { - if (sectionInfo.ContainsKey(idx)) - { - section = sectionInfo[idx]; - continue; - } + string line = lineRAW.Split('#')[0].Trim(); - Parallel.Invoke(() => + if (line.Length > 1) { - string line = Lines[idx].Split('#')[0].Trim(); - if (line.Length > 1) + if (line.Length > 2 && line[0] == '[' && line[^1] == ']') + section = GetSection(line[1..^1]); + else { string argName = line.Split('=')[0]; 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)) { string argValue = line[(argName.Length + 1)..]; LoadSingleSetting(section, argName, argValue); } } - }); + } } } catch (IOException) { } From c90ea0e92b6d8d1bc3e0a27b6fb09f7ae593d431 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Tue, 30 Aug 2022 22:50:05 +0800 Subject: [PATCH 24/39] Startup Optimization --- MinecraftClient/ChatBots/ChatLog.cs | 2 +- MinecraftClient/Program.cs | 28 ++-- MinecraftClient/Protocol/ChatParser.cs | 3 +- .../Protocol/ProfileKey/PlayerKeyPair.cs | 4 +- .../Protocol/Session/SessionCache.cs | 4 +- MinecraftClient/Settings.cs | 133 +++++++++++------- 6 files changed, 104 insertions(+), 70 deletions(-) diff --git a/MinecraftClient/ChatBots/ChatLog.cs b/MinecraftClient/ChatBots/ChatLog.cs index cabef836..1eaffb08 100644 --- a/MinecraftClient/ChatBots/ChatLog.cs +++ b/MinecraftClient/ChatBots/ChatLog.cs @@ -70,7 +70,7 @@ namespace MinecraftClient.ChatBots public static MessageFilter str2filter(string filtername) { - switch (filtername.ToLower()) + switch (Settings.ToLowerIfNeed(filtername)) { case "all": return MessageFilter.AllText; case "messages": return MessageFilter.AllMessages; diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index a4fa4570..fd624594 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -52,7 +52,7 @@ namespace MinecraftClient /// static void Main(string[] args) { - Task.Factory.StartNew(() => + new Thread(() => { //Take advantage of Windows 10 / Mac / Linux UTF-8 console if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -69,7 +69,10 @@ namespace MinecraftClient // Fix issue #2119 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - }); + + // "ToLower" require "CultureInfo" to be initialized on first run, which can take a lot of time. + // _ = "a".ToLower(); + }).Start(); //Setup ConsoleIO ConsoleIO.LogPrefix = "§8[MCC] "; @@ -102,7 +105,7 @@ namespace MinecraftClient } //Process ini configuration file - if (args.Length >= 1 && System.IO.File.Exists(args[0]) && System.IO.Path.GetExtension(args[0]).ToLower() == ".ini") + if (args.Length >= 1 && System.IO.File.Exists(args[0]) && Settings.ToLowerIfNeed(Path.GetExtension(args[0])) == ".ini") { Settings.LoadFile(args[0]); @@ -163,7 +166,7 @@ namespace MinecraftClient } } - if (string.IsNullOrEmpty(dataGenerator) || !(dataGenerator.ToLower().Equals("entity") || dataGenerator.ToLower().Equals("item") || dataGenerator.ToLower().Equals("block"))) + if (string.IsNullOrEmpty(dataGenerator) || !(Settings.ToLowerIfNeed(dataGenerator).Equals("entity") || Settings.ToLowerIfNeed(dataGenerator).Equals("item") || Settings.ToLowerIfNeed(dataGenerator).Equals("block"))) { Console.WriteLine(Translations.Get("error.generator.invalid")); Console.WriteLine(Translations.Get("error.usage") + " MinecraftClient.exe --data-generator= --data-path=\"\""); @@ -250,7 +253,7 @@ namespace MinecraftClient Settings.Login = ConsoleIO.ReadLine(); } if (Settings.Password == "" - && (Settings.SessionCaching == CacheType.None || !SessionCache.Contains(Settings.Login.ToLower())) + && (Settings.SessionCaching == CacheType.None || !SessionCache.Contains(Settings.ToLowerIfNeed(Settings.Login))) && !useBrowser) { RequestPassword(); @@ -291,6 +294,7 @@ namespace MinecraftClient ProtocolHandler.LoginResult result = ProtocolHandler.LoginResult.LoginRequired; + string loginLower = Settings.ToLowerIfNeed(Settings.Login); if (Settings.Password == "-") { Translations.WriteLineFormatted("mcc.offline"); @@ -301,9 +305,9 @@ namespace MinecraftClient else { // Validate cached session or login new session. - if (Settings.SessionCaching != CacheType.None && SessionCache.Contains(Settings.Login.ToLower())) + if (Settings.SessionCaching != CacheType.None && SessionCache.Contains(loginLower)) { - session = SessionCache.Get(Settings.Login.ToLower()); + session = SessionCache.Get(loginLower); result = ProtocolHandler.GetTokenValidation(session); if (result != ProtocolHandler.LoginResult.Success) { @@ -338,7 +342,7 @@ namespace MinecraftClient } if (result == ProtocolHandler.LoginResult.Success && Settings.SessionCaching != CacheType.None) - SessionCache.Store(Settings.Login.ToLower(), session); + SessionCache.Store(loginLower, session); if (result == ProtocolHandler.LoginResult.Success) session.SessionPreCheckTask = Task.Factory.StartNew(() => session.SessionPreCheck()); @@ -355,9 +359,9 @@ namespace MinecraftClient Translations.WriteLineFormatted(cacheKeyLoaded ? "debug.keys_cache_ok" : "debug.keys_cache_fail"); } - if (Settings.ProfileKeyCaching != CacheType.None && KeysCache.Contains(Settings.Login.ToLower())) + if (Settings.ProfileKeyCaching != CacheType.None && KeysCache.Contains(loginLower)) { - playerKeyPair = KeysCache.Get(Settings.Login.ToLower()); + playerKeyPair = KeysCache.Get(loginLower); if (playerKeyPair.NeedRefresh()) Translations.WriteLineFormatted("mcc.profile_key_invalid"); else @@ -370,7 +374,7 @@ namespace MinecraftClient playerKeyPair = KeyUtils.GetNewProfileKeys(session.ID); if (Settings.ProfileKeyCaching != CacheType.None && playerKeyPair != null) { - KeysCache.Store(Settings.Login.ToLower(), playerKeyPair); + KeysCache.Store(loginLower, playerKeyPair); } } } @@ -442,7 +446,7 @@ namespace MinecraftClient int protocolversion = 0; ForgeInfo? forgeInfo = null; - if (Settings.ServerVersion != "" && Settings.ServerVersion.ToLower() != "auto") + if (Settings.ServerVersion != "" && Settings.ToLowerIfNeed(Settings.ServerVersion) != "auto") { protocolversion = Protocol.ProtocolHandler.MCVer2ProtocolVersion(Settings.ServerVersion); diff --git a/MinecraftClient/Protocol/ChatParser.cs b/MinecraftClient/Protocol/ChatParser.cs index 57cee341..d5b8c76a 100644 --- a/MinecraftClient/Protocol/ChatParser.cs +++ b/MinecraftClient/Protocol/ChatParser.cs @@ -217,8 +217,7 @@ namespace MinecraftClient.Protocol //Load the external dictionnary of translation rules or display an error message if (System.IO.File.Exists(Language_File)) { - string[] translations = System.IO.File.ReadAllLines(Language_File); - foreach (string line in translations) + foreach (var line in File.ReadLines(Language_File)) { if (line.Length > 0) { diff --git a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs index 6f6bf824..17af3946 100644 --- a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs +++ b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs @@ -20,8 +20,8 @@ namespace MinecraftClient.Protocol.Keys { PublicKey = keyPublic; PrivateKey = keyPrivate; - ExpiresAt = DateTime.Parse(expiresAt).ToUniversalTime(); - RefreshedAfter = DateTime.Parse(refreshedAfter).ToUniversalTime(); + ExpiresAt = DateTime.ParseExact(expiresAt, "yyyy-MM-ddTHH:mm:ss.fffffffZ", System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + RefreshedAfter = DateTime.ParseExact(refreshedAfter, "yyyy-MM-ddTHH:mm:ss.fffffffZ", System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); } public bool NeedRefresh() diff --git a/MinecraftClient/Protocol/Session/SessionCache.cs b/MinecraftClient/Protocol/Session/SessionCache.cs index 24743aae..cb45c091 100644 --- a/MinecraftClient/Protocol/Session/SessionCache.cs +++ b/MinecraftClient/Protocol/Session/SessionCache.cs @@ -148,7 +148,7 @@ namespace MinecraftClient.Protocol.Session && sessionItem.ContainsKey("username") && sessionItem.ContainsKey("uuid")) { - string login = sessionItem["username"].StringValue.ToLower(); + string login = Settings.ToLowerIfNeed(sessionItem["username"].StringValue); try { SessionToken session = SessionToken.FromString(String.Join(",", @@ -214,7 +214,7 @@ namespace MinecraftClient.Protocol.Session { try { - string login = keyValue[0].ToLower(); + string login = Settings.ToLowerIfNeed(keyValue[0]); SessionToken session = SessionToken.FromString(keyValue[1]); if (Settings.DebugMessages) ConsoleIO.WriteLineFormatted(Translations.Get("cache.loaded", login, session.ID)); diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index f5cf5a7b..3a200b3d 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -9,6 +9,7 @@ using MinecraftClient.Protocol; using MinecraftClient.Mapping; using System.Threading.Tasks; using System.Collections.Concurrent; +using System.Runtime.CompilerServices; namespace MinecraftClient { @@ -257,17 +258,15 @@ namespace MinecraftClient /// File to load public static void LoadFile(string file) { - ConsoleIO.WriteLogLine("[Settings] Loading Settings from " + Path.GetFullPath(file)); + Task.Factory.StartNew(() => ConsoleIO.WriteLogLine("[Settings] Loading Settings from " + Path.GetFullPath(file))); if (File.Exists(file)) { try { - string[] Lines = File.ReadAllLines(file); Section section = Section.Default; - foreach (string lineRAW in Lines) + foreach (var lineRAW in File.ReadLines(file)) { string line = lineRAW.Split('#')[0].Trim(); - if (line.Length > 1) { if (line.Length > 2 && line[0] == '[' && line[^1] == ']') @@ -351,16 +350,16 @@ namespace MinecraftClient switch (section) { case Section.Main: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "login": Login = argValue; return true; case "password": Password = argValue; return true; case "type": AccountType = argValue == "mojang" ? ProtocolHandler.AccountType.Mojang : ProtocolHandler.AccountType.Microsoft; return true; - case "method": LoginMethod = argValue.ToLower() == "browser" - ? "browser" - : "mcc"; return true; + case "method": + argValue = ToLowerIfNeed(argValue); + LoginMethod = argValue == "browser" ? "browser" : "mcc"; return true; case "serverip": if (!SetServerIP(argValue)) ServerAliasTemp = argValue; return true; case "singlecommand": SingleCommand = argValue; return true; case "language": Language = argValue; return true; @@ -380,7 +379,7 @@ namespace MinecraftClient case "entityhandling": EntityHandling = str2bool(argValue); return true; case "enableentityhandling": EntityHandling = str2bool(argValue); return true; case "inventoryhandling": InventoryHandling = str2bool(argValue); return true; - case "privatemsgscmdname": PrivateMsgsCmdName = argValue.ToLower().Trim(); return true; + case "privatemsgscmdname": PrivateMsgsCmdName = ToLowerIfNeed(argValue).Trim(); return true; case "autorespawn": AutoRespawn = str2bool(argValue); return true; // Backward compatible so people can still enable debug with old config format case "debugmessages": DebugMessages = str2bool(argValue); return true; @@ -389,8 +388,9 @@ namespace MinecraftClient case "botowners": Bots_Owners.Clear(); - string[] names = argValue.ToLower().Split(','); - if (!argValue.Contains(",") && argValue.ToLower().EndsWith(".txt") && File.Exists(argValue)) + string lowerArgValue = ToLowerIfNeed(argValue); + string[] names = lowerArgValue.Split(','); + if (!argValue.Contains(",") && lowerArgValue.EndsWith(".txt") && File.Exists(argValue)) names = File.ReadAllLines(argValue); foreach (string name in names) if (!String.IsNullOrWhiteSpace(name)) @@ -398,7 +398,8 @@ namespace MinecraftClient return true; case "internalcmdchar": - switch (argValue.ToLower()) + argValue = ToLowerIfNeed(argValue); + switch (argValue) { case "none": internalCmdChar = ' '; break; case "slash": internalCmdChar = '/'; break; @@ -426,7 +427,7 @@ namespace MinecraftClient //Each line contains account data: 'Alias,Login,Password' string[] account_data = account_line.Split('#')[0].Trim().Split(','); if (account_data.Length == 3) - Accounts[account_data[0].ToLower()] + Accounts[ToLowerIfNeed(account_data[0])] = new KeyValuePair(account_data[1], account_data[2]); } @@ -446,7 +447,7 @@ namespace MinecraftClient { //Each line contains server data: 'Alias,Host:Port' string[] server_data = server_line.Split('#')[0].Trim().Split(','); - server_data[0] = server_data[0].ToLower(); + server_data[0] = ToLowerIfNeed(server_data[0]); if (server_data.Length == 2 && server_data[0] != "localhost" && !server_data[0].Contains('.') @@ -469,7 +470,7 @@ namespace MinecraftClient return true; case "brandinfo": - switch (argValue.Trim().ToLower()) + switch (ToLowerIfNeed(argValue.Trim())) { case "mcc": BrandInfo = MCCBrandInfo; break; case "vanilla": BrandInfo = "vanilla"; break; @@ -478,7 +479,7 @@ namespace MinecraftClient return true; case "resolvesrvrecords": - if (argValue.Trim().ToLower() == "fast") + if (ToLowerIfNeed(argValue.Trim()) == "fast") { ResolveSrvRecords = true; ResolveSrvRecordsShortTimeout = true; @@ -491,7 +492,7 @@ namespace MinecraftClient return true; case "mcforge": - if (argValue.ToLower() == "auto") + if (ToLowerIfNeed(argValue) == "auto") { ServerAutodetectForge = true; ServerForceForge = false; @@ -506,7 +507,7 @@ namespace MinecraftClient break; case Section.Signature: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "login_with_secure_profile": LoginWithSecureProfile = str2bool(argValue); return true; case "sign_chat": SignChat = str2bool(argValue); return true; @@ -521,7 +522,7 @@ namespace MinecraftClient break; case Section.Logging: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "debugmessages": DebugMessages = str2bool(argValue); return true; case "chatmessages": ChatMessages = str2bool(argValue); return true; @@ -531,7 +532,7 @@ namespace MinecraftClient case "chatfilter": ChatFilter = new Regex(argValue); return true; case "debugfilter": DebugFilter = new Regex(argValue); return true; case "filtermode": - if (argValue.ToLower().StartsWith("white")) + if (ToLowerIfNeed(argValue).StartsWith("white")) FilterMode = FilterModeEnum.Whitelist; else FilterMode = FilterModeEnum.Blacklist; @@ -544,7 +545,7 @@ namespace MinecraftClient break; case Section.Alerts: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": Alerts_Enabled = str2bool(argValue); return true; case "alertsfile": Alerts_MatchesFile = argValue; return true; @@ -554,7 +555,7 @@ namespace MinecraftClient break; case Section.AntiAFK: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AntiAFK_Enabled = str2bool(argValue); return true; case "delay": AntiAFK_Delay = str2int(argValue); return true; @@ -563,7 +564,7 @@ namespace MinecraftClient break; case Section.AutoRelog: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoRelog_Enabled = str2bool(argValue); return true; case "retries": AutoRelog_Retries = str2int(argValue); return true; @@ -587,7 +588,7 @@ namespace MinecraftClient break; case Section.ChatLog: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": ChatLog_Enabled = str2bool(argValue); return true; case "timestamps": ChatLog_DateTime = str2bool(argValue); return true; @@ -597,7 +598,7 @@ namespace MinecraftClient break; case Section.Hangman: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": Hangman_Enabled = str2bool(argValue); return true; case "english": Hangman_English = str2bool(argValue); return true; @@ -607,7 +608,7 @@ namespace MinecraftClient break; case Section.ScriptScheduler: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": ScriptScheduler_Enabled = str2bool(argValue); return true; case "tasksfile": ScriptScheduler_TasksFile = argValue; return true; @@ -615,7 +616,7 @@ namespace MinecraftClient break; case Section.RemoteControl: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": RemoteCtrl_Enabled = str2bool(argValue); return true; case "autotpaccept": RemoteCtrl_AutoTpaccept = str2bool(argValue); return true; @@ -624,7 +625,7 @@ namespace MinecraftClient break; case Section.ChatFormat: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "builtins": ChatFormat_Builtins = str2bool(argValue); return true; case "public": ChatFormat_Public = new Regex(argValue); return true; @@ -634,15 +635,15 @@ namespace MinecraftClient break; case Section.Proxy: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": ProxyEnabledLogin = ProxyEnabledIngame = str2bool(argValue); - if (argValue.Trim().ToLower() == "login") + if (ToLowerIfNeed(argValue.Trim()) == "login") ProxyEnabledLogin = true; return true; case "type": - argValue = argValue.ToLower(); + argValue = ToLowerIfNeed(argValue); if (argValue == "http") { proxyType = Proxy.ProxyHandler.Type.HTTP; } else if (argValue == "socks4") { proxyType = Proxy.ProxyHandler.Type.SOCKS4; } else if (argValue == "socks4a") { proxyType = Proxy.ProxyHandler.Type.SOCKS4a; } @@ -671,7 +672,7 @@ namespace MinecraftClient return true; case Section.AutoRespond: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoRespond_Enabled = str2bool(argValue); return true; case "matchesfile": AutoRespond_Matches = argValue; return true; @@ -679,13 +680,13 @@ namespace MinecraftClient break; case Section.AutoAttack: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoAttack_Enabled = str2bool(argValue); return true; - case "mode": AutoAttack_Mode = argValue.ToLower(); return true; - case "priority": AutoAttack_Priority = argValue.ToLower(); return true; + case "mode": AutoAttack_Mode = ToLowerIfNeed(argValue); return true; + case "priority": AutoAttack_Priority = ToLowerIfNeed(argValue); return true; case "cooldownseconds": - if (argValue.ToLower() == "auto") + if (ToLowerIfNeed(argValue) == "auto") { AutoAttack_OverrideAttackSpeed = false; } @@ -701,7 +702,7 @@ namespace MinecraftClient break; case Section.AutoFishing: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoFishing_Enabled = str2bool(argValue); return true; case "antidespawn": AutoFishing_Antidespawn = str2bool(argValue); return true; @@ -709,7 +710,7 @@ namespace MinecraftClient break; case Section.AutoEat: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoEat_Enabled = str2bool(argValue); return true; case "threshold": AutoEat_hungerThreshold = str2int(argValue); return true; @@ -717,7 +718,7 @@ namespace MinecraftClient break; case Section.AutoCraft: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoCraft_Enabled = str2bool(argValue); return true; case "configfile": AutoCraft_configFile = argValue; return true; @@ -725,7 +726,7 @@ namespace MinecraftClient break; case Section.AutoDrop: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": AutoDrop_Enabled = str2bool(argValue); return true; case "mode": AutoDrop_Mode = argValue; return true; @@ -734,12 +735,12 @@ namespace MinecraftClient break; case Section.MCSettings: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": MCSettings_Enabled = str2bool(argValue); return true; case "locale": MCSettings_Locale = argValue; return true; case "difficulty": - switch (argValue.ToLower()) + switch (ToLowerIfNeed(argValue)) { case "peaceful": MCSettings_Difficulty = 0; break; case "easy": MCSettings_Difficulty = 1; break; @@ -755,7 +756,7 @@ namespace MinecraftClient } else { - switch (argValue.ToLower()) + switch (ToLowerIfNeed(argValue)) { case "tiny": MCSettings_RenderDistance = 2; break; case "short": MCSettings_RenderDistance = 4; break; @@ -765,7 +766,7 @@ namespace MinecraftClient } return true; case "chatmode": - switch (argValue.ToLower()) + switch (ToLowerIfNeed(argValue)) { case "enabled": MCSettings_ChatMode = 0; break; case "commands": MCSettings_ChatMode = 1; break; @@ -781,7 +782,7 @@ namespace MinecraftClient case "skin_pants_right": MCSettings_Skin_Pants_Right = str2bool(argValue); return true; case "skin_hat": MCSettings_Skin_Hat = str2bool(argValue); return true; case "main_hand": - switch (argValue.ToLower()) + switch (ToLowerIfNeed(argValue)) { case "left": MCSettings_MainHand = 0; break; case "right": MCSettings_MainHand = 1; break; @@ -791,7 +792,7 @@ namespace MinecraftClient break; case Section.Mailer: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": Mailer_Enabled = str2bool(argValue); return true; case "database": Mailer_DatabaseFile = argValue; return true; @@ -804,7 +805,7 @@ namespace MinecraftClient break; case Section.ReplayMod: - switch (argName.ToLower()) + switch (ToLowerIfNeed(argName)) { case "enabled": ReplayMod_Enabled = str2bool(argValue); return true; case "backupinterval": ReplayMod_BackupInterval = str2int(argValue); return true; @@ -879,13 +880,43 @@ namespace MinecraftClient return str == "true" || str == "1"; } + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + public static string ToLowerIfNeed(string str) + { + const string lookupStringL = +"---------------------------------!-#$%&-()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[-]^_`abcdefghijklmnopqrstuvwxyz{|}~-"; + + bool needLower = false; + foreach (Char c in str) + { + if (Char.IsUpper(c)) + { + needLower = true; + break; + } + } + + if (needLower) + { + StringBuilder sb = new(str); + for (int i = 0; i < str.Length; ++i) + if (char.IsUpper(sb[i])) + sb[i] = lookupStringL[sb[i]]; + return sb.ToString(); + } + else + { + return str; + } + } + /// /// Load login/password using an account alias /// /// True if the account was found and loaded public static bool SetAccount(string accountAlias) { - accountAlias = accountAlias.ToLower(); + accountAlias = Settings.ToLowerIfNeed(accountAlias); if (Accounts.ContainsKey(accountAlias)) { Settings.Login = Accounts[accountAlias].Key; @@ -901,7 +932,7 @@ namespace MinecraftClient /// True if the server IP was valid and loaded, false otherwise public static bool SetServerIP(string server) { - server = server.ToLower(); + server = ToLowerIfNeed(server); string[] sip = server.Split(':'); string host = sip[0]; ushort port = 25565; @@ -946,7 +977,7 @@ namespace MinecraftClient { lock (AppVars) { - varName = new string(varName.TakeWhile(char.IsLetterOrDigit).ToArray()).ToLower(); + varName = Settings.ToLowerIfNeed(new string(varName.TakeWhile(char.IsLetterOrDigit).ToArray())); if (varName.Length > 0) { AppVars[varName] = varData; @@ -998,7 +1029,7 @@ namespace MinecraftClient if (varname_ok) { string varname = var_name.ToString(); - string varname_lower = varname.ToLower(); + string varname_lower = Settings.ToLowerIfNeed(varname); i = i + varname.Length + 1; switch (varname_lower) From 9089bb4cdb5091b825b0722f07f51bc5a9141209 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 18:00:00 +0800 Subject: [PATCH 25/39] Change how world is stored & Bug fix --- MinecraftClient/Mapping/World.cs | 102 +++--------------- MinecraftClient/McClient.cs | 6 +- .../Protocol/Handlers/Protocol18Terrain.cs | 5 +- .../Protocol/ProfileKey/PlayerKeyPair.cs | 6 +- 4 files changed, 21 insertions(+), 98 deletions(-) diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index f272ead8..7ce60efe 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text; @@ -13,19 +14,15 @@ namespace MinecraftClient.Mapping { /// /// The chunks contained into the Minecraft world + /// Tuple: Tuple /// - private Dictionary> chunks = new(); + private ConcurrentDictionary, ChunkColumn> chunks = new(); /// /// The dimension info of the world /// private static Dimension dimension = new(); - /// - /// Lock for thread safety - /// - private readonly ReaderWriterLockSlim chunksLock = new(); - /// /// Chunk data parsing progress /// @@ -42,50 +39,16 @@ namespace MinecraftClient.Mapping { get { - chunksLock.EnterReadLock(); - try - { - //Read a chunk - if (chunks.ContainsKey(chunkX)) - if (chunks[chunkX].ContainsKey(chunkZ)) - return chunks[chunkX][chunkZ]; - return null; - } - finally - { - chunksLock.ExitReadLock(); - } + chunks.TryGetValue(new(chunkX, chunkZ), out ChunkColumn? chunkColumn); + return chunkColumn; } set { - chunksLock.EnterWriteLock(); - try - { - if (value != null) - { - //Update a chunk column - if (!chunks.ContainsKey(chunkX)) - chunks[chunkX] = new Dictionary(); - chunks[chunkX][chunkZ] = value; - } - else - { - //Unload a chunk column - if (chunks.ContainsKey(chunkX)) - { - if (chunks[chunkX].ContainsKey(chunkZ)) - { - chunks[chunkX].Remove(chunkZ); - if (chunks[chunkX].Count == 0) - chunks.Remove(chunkX); - } - } - } - } - finally - { - chunksLock.ExitWriteLock(); - } + Tuple chunkCoord = new(chunkX, chunkZ); + if (value == null) + chunks.Remove(chunkCoord, out _); + else + chunks.AddOrUpdate(chunkCoord, value, (_, _) => value); } } @@ -120,36 +83,7 @@ namespace MinecraftClient.Mapping /// Whether the ChunkColumn has been fully loaded public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk? chunk, bool loadCompleted) { - ChunkColumn? chunkColumn = null; - chunksLock.EnterUpgradeableReadLock(); - try - { - //Read a chunk - if (chunks.ContainsKey(chunkX)) - if (chunks[chunkX].ContainsKey(chunkZ)) - chunkColumn = chunks[chunkX][chunkZ]; - - if (chunkColumn == null) - { - chunkColumn = new ChunkColumn(chunkColumnSize); - chunksLock.EnterWriteLock(); - try - { - //Update a chunk column - if (!chunks.ContainsKey(chunkX)) - chunks[chunkX] = new Dictionary(); - chunks[chunkX][chunkZ] = chunkColumn; - } - finally - { - chunksLock.ExitWriteLock(); - } - } - } - finally - { - chunksLock.ExitUpgradeableReadLock(); - } + ChunkColumn chunkColumn = chunks.GetOrAdd(new(chunkX, chunkZ), (_) => new(chunkColumnSize)); chunkColumn[chunkY] = chunk; if (loadCompleted) chunkColumn.FullyLoaded = true; @@ -249,17 +183,9 @@ namespace MinecraftClient.Mapping /// public void Clear() { - chunksLock.EnterWriteLock(); - try - { - chunks = new Dictionary>(); - chunkCnt = 0; - chunkLoadNotCompleted = 0; - } - finally - { - chunksLock.ExitWriteLock(); - } + chunks = new(); + chunkCnt = 0; + chunkLoadNotCompleted = 0; } /// diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index a133b206..4bdf6535 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -712,10 +712,10 @@ namespace MinecraftClient try { Command cmd = (Command)Activator.CreateInstance(type); - cmds[cmd.CmdName.ToLower()] = cmd; - cmd_names.Add(cmd.CmdName.ToLower()); + cmds[Settings.ToLowerIfNeed(cmd.CmdName)] = cmd; + cmd_names.Add(Settings.ToLowerIfNeed(cmd.CmdName)); foreach (string alias in cmd.getCMDAliases()) - cmds[alias.ToLower()] = cmd; + cmds[Settings.ToLowerIfNeed(alias)] = cmd; } catch (Exception e) { diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 023f9946..7357252c 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -71,14 +71,11 @@ namespace MinecraftClient.Protocol.Handlers // Indirect Mode: For block states with bits per entry <= 4, 4 bits are used to represent a block. if (bitsPerEntry < 4) bitsPerEntry = 4; - int entryPerLong = 64 / bitsPerEntry; // entryPerLong = sizeof(long) / bitsPerEntry - // Direct Mode: Bit mask covering bitsPerEntry bits // EG, if bitsPerEntry = 5, valueMask = 00011111 in binary uint valueMask = (uint)((1 << bitsPerEntry) - 1); - int paletteLength = 0; // Assume zero when length is absent - if (usePalette) paletteLength = dataTypes.ReadNextVarInt(cache); + int paletteLength = usePalette ? dataTypes.ReadNextVarInt(cache) : 0; // Assume zero when length is absent Span palette = paletteLength < 256 ? stackalloc uint[paletteLength] : new uint[paletteLength]; for (int i = 0; i < paletteLength; i++) diff --git a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs index 17af3946..5690c78f 100644 --- a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs +++ b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs @@ -14,14 +14,14 @@ namespace MinecraftClient.Protocol.Keys public DateTime RefreshedAfter; // Todo: add a timer - private const string DataTimeFormat = "O"; + private const string DataTimeFormat = "yyyy-MM-ddTHH:mm:ss.ffffffZ"; public PlayerKeyPair(PublicKey keyPublic, PrivateKey keyPrivate, string expiresAt, string refreshedAfter) { PublicKey = keyPublic; PrivateKey = keyPrivate; - ExpiresAt = DateTime.ParseExact(expiresAt, "yyyy-MM-ddTHH:mm:ss.fffffffZ", System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); - RefreshedAfter = DateTime.ParseExact(refreshedAfter, "yyyy-MM-ddTHH:mm:ss.fffffffZ", System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + ExpiresAt = DateTime.ParseExact(expiresAt, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + RefreshedAfter = DateTime.ParseExact(refreshedAfter, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); } public bool NeedRefresh() From 0a689e407ea38136403ccf1219d3224ef66c39f6 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 19:50:11 +0800 Subject: [PATCH 26/39] Trim --- MinecraftClient/Mapping/World.cs | 16 ++++++++++----- .../Protocol/Handlers/DataTypes.cs | 12 +++++------ .../Protocol/Handlers/Protocol18Terrain.cs | 20 ++++--------------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index 7ce60efe..c850fb90 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -46,7 +46,7 @@ namespace MinecraftClient.Mapping { Tuple chunkCoord = new(chunkX, chunkZ); if (value == null) - chunks.Remove(chunkCoord, out _); + chunks.TryRemove(chunkCoord, out _); else chunks.AddOrUpdate(chunkCoord, value, (_, _) => value); } @@ -83,10 +83,16 @@ namespace MinecraftClient.Mapping /// Whether the ChunkColumn has been fully loaded public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk? chunk, bool loadCompleted) { - ChunkColumn chunkColumn = chunks.GetOrAdd(new(chunkX, chunkZ), (_) => new(chunkColumnSize)); - chunkColumn[chunkY] = chunk; - if (loadCompleted) - chunkColumn.FullyLoaded = true; + Tuple chunkCoord = new(chunkX, chunkZ); + if (chunk == null) + chunks.TryRemove(chunkCoord, out _); + else + { + ChunkColumn chunkColumn = chunks.GetOrAdd(chunkCoord, (_) => new(chunkColumnSize)); + chunkColumn[chunkY] = chunk; + if (loadCompleted) + chunkColumn.FullyLoaded = true; + } } /// diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index a352757c..6d180a72 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -191,12 +191,12 @@ namespace MinecraftClient.Protocol.Handlers y = (int)((locEncoded >> 26) & 0xFFF); z = (int)(locEncoded << 38 >> 38); } - if (x >= 33554432) - x -= 67108864; - if (y >= 2048) - y -= 4096; - if (z >= 33554432) - z -= 67108864; + if (x >= 0x02000000) // 33,554,432 + x -= 0x04000000; // 67,108,864 + if (y >= 0x00000800) // 2048 + y -= 0x00001000; // 4096 + if (z >= 0x02000000) // 33,554,432 + z -= 0x04000000; // 67,108,864 return new Location(x, y, z); } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 7357252c..8ac04bb6 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -189,10 +189,7 @@ namespace MinecraftClient.Protocol.Handlers Chunk? chunk = ReadBlockStatesField(cache); //We have our chunk, save the chunk into the world - handler.InvokeOnMainThread(() => - { - world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == lastChunkY); - }); + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == lastChunkY); // Skip Read Biomes (Type: Paletted Container) - 1.18(1.18.1) and above if (protocolversion >= Protocol18Handler.MC_1_18_1_Version) @@ -364,10 +361,7 @@ namespace MinecraftClient.Protocol.Handlers } //We have our chunk, save the chunk into the world - handler.InvokeOnMainThread(() => - { - world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); - }); + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); //Pre-1.14 Lighting data if (protocolversion < Protocol18Handler.MC_1_14_Version) @@ -415,10 +409,7 @@ namespace MinecraftClient.Protocol.Handlers chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(queue.Dequeue())); //We have our chunk, save the chunk into the world - handler.InvokeOnMainThread(() => - { - world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); - }); + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); } } @@ -497,10 +488,7 @@ namespace MinecraftClient.Protocol.Handlers for (int blockX = 0; blockX < Chunk.SizeX; blockX++) chunk.SetWithoutCheck(blockX, blockY, blockZ, new Block(blockTypes.Dequeue(), blockMeta.Dequeue())); - handler.InvokeOnMainThread(() => - { - world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); - }); + world.StoreChunk(chunkX, chunkY, chunkZ, chunkColumnSize, chunk, chunkY == maxChunkY); } } } From c0be6a61c8e636728b2dcbe2e6cac5b33ea2b762 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 20:46:21 +0800 Subject: [PATCH 27/39] Trim --- MinecraftClient/McClient.cs | 48 ++++--------------- MinecraftClient/Program.cs | 9 ++-- .../Protocol/Handlers/DataTypes.cs | 4 +- .../Protocol/Handlers/Protocol18Terrain.cs | 12 ++--- 4 files changed, 20 insertions(+), 53 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 4bdf6535..00bd910a 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -112,7 +112,7 @@ namespace MinecraftClient public int GetSequenceId() { return sequenceId; } public float GetPitch() { return playerPitch; } public World GetWorld() { return world; } - public Double GetServerTPS() { return averageTPS; } + public double GetServerTPS() { return averageTPS; } public bool GetIsSupportPreviewsChat() { return isSupportPreviewsChat; } public float GetHealth() { return playerHealth; } public int GetSaturation() { return playerFoodSaturation; } @@ -133,47 +133,17 @@ namespace MinecraftClient public ILogger Log; - /// - /// Starts the main chat client - /// - /// The chosen username of a premium Minecraft Account - /// The player's UUID for online-mode authentication - /// A valid sessionID obtained after logging in - /// The server IP - /// The server port to use - /// Minecraft protocol version to use - public McClient(SessionToken session, PlayerKeyPair? playerKeyPair, int protocolversion, ForgeInfo forgeInfo, string server_ip, ushort port) - { - StartClient(session, playerKeyPair, server_ip, port, protocolversion, forgeInfo, false, ""); - } - - /// - /// Starts the main chat client in single command sending mode - /// - /// The chosen username of a premium Minecraft Account - /// The player's UUID for online-mode authentication - /// A valid sessionID obtained after logging in - /// The server IP - /// The server port to use - /// Minecraft protocol version to use - /// The text or command to send. - public McClient(SessionToken session, PlayerKeyPair? playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, string command) - { - StartClient(session, playerKeyPair, server_ip, port, protocolversion, forgeInfo, true, command); - } - /// /// Starts the main chat client, wich will login to the server using the MinecraftCom class. /// - /// The chosen username of a premium Minecraft Account - /// A valid sessionID obtained with MinecraftCom.GetLogin() + /// A valid session obtained with MinecraftCom.GetLogin() + /// Key for message signing /// The server IP /// The server port to use /// Minecraft protocol version to use - /// The player's UUID for online-mode authentication - /// If set to true, the client will send a single command and then disconnect from the server + /// ForgeInfo item stating that Forge is enabled /// The text or command to send. Will only be sent if singlecommand is set to true. - private void StartClient(SessionToken session, PlayerKeyPair? playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo forgeInfo, bool singlecommand, string command) + public McClient(SessionToken session, PlayerKeyPair? playerKeyPair, string server_ip, ushort port, int protocolversion, ForgeInfo? forgeInfo, string? command) { terrainAndMovementsEnabled = Settings.TerrainAndMovements; inventoryHandlingEnabled = Settings.InventoryHandling; @@ -197,7 +167,7 @@ namespace MinecraftClient Log.WarnEnabled = Settings.WarningMessages; Log.ErrorEnabled = Settings.ErrorMessages; - if (!singlecommand) + if (command == null) { /* Load commands from Commands namespace */ LoadCommands(); @@ -234,7 +204,7 @@ namespace MinecraftClient handler = Protocol.ProtocolHandler.GetProtocolHandler(client, protocolversion, forgeInfo, this); Log.Info(Translations.Get("mcc.version_supported")); - if (!singlecommand) + if (command == null) { timeoutdetector = new(new Thread(new ParameterizedThreadStart(TimeoutDetector)), new CancellationTokenSource()); timeoutdetector.Item1.Name = "MCC Connection timeout detector"; @@ -245,7 +215,7 @@ namespace MinecraftClient { if (handler.Login(this.playerKeyPair, session)) { - if (singlecommand) + if (command != null) { handler.SendChatMessage(command, playerKeyPair); Log.Info(Translations.Get("mcc.single_cmd", command)); @@ -301,7 +271,7 @@ namespace MinecraftClient ReconnectionAttemptsLeft--; Program.Restart(); } - else if (!singlecommand && Settings.interactiveMode) + else if (command == null && Settings.interactiveMode) { ConsoleInteractive.ConsoleReader.StopReadThread(); ConsoleInteractive.ConsoleReader.MessageReceived -= ConsoleReaderOnMessageReceived; diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs index fd624594..2860c05a 100644 --- a/MinecraftClient/Program.cs +++ b/MinecraftClient/Program.cs @@ -71,7 +71,7 @@ namespace MinecraftClient Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); // "ToLower" require "CultureInfo" to be initialized on first run, which can take a lot of time. - // _ = "a".ToLower(); + _ = "a".ToLower(); }).Start(); //Setup ConsoleIO @@ -497,11 +497,8 @@ namespace MinecraftClient try { //Start the main TCP client - if (Settings.SingleCommand != "") - { - client = new McClient(session, playerKeyPair, Settings.ServerIP, Settings.ServerPort, protocolversion, forgeInfo, Settings.SingleCommand); - } - else client = new McClient(session, playerKeyPair, protocolversion, forgeInfo, Settings.ServerIP, Settings.ServerPort); + string? command = String.IsNullOrEmpty(Settings.SingleCommand) ? null : Settings.SingleCommand; + client = new McClient(session, playerKeyPair, Settings.ServerIP, Settings.ServerPort, protocolversion, forgeInfo, command); //Update console title if (Settings.ConsoleTitle != "") diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 6d180a72..f562f287 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -193,8 +193,8 @@ namespace MinecraftClient.Protocol.Handlers } if (x >= 0x02000000) // 33,554,432 x -= 0x04000000; // 67,108,864 - if (y >= 0x00000800) // 2048 - y -= 0x00001000; // 4096 + if (y >= 0x00000800) // 2,048 + y -= 0x00001000; // 4,096 if (z >= 0x02000000) // 33,554,432 z -= 0x04000000; // 67,108,864 return new Location(x, y, z); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs index 8ac04bb6..151e4f70 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18Terrain.cs @@ -56,12 +56,12 @@ namespace MinecraftClient.Protocol.Handlers return null; // Warning: If you need to support modification of block data, you need to create 4096 objects here - Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; + Chunk chunk = new(); for (int blockY = 0; blockY < Chunk.SizeY; blockY++) for (int blockZ = 0; blockZ < Chunk.SizeZ; blockZ++) for (int blockX = 0; blockX < Chunk.SizeX; blockX++) - blocks[(blockY << 8) | (blockZ << 4) | blockX] = block; - return new Chunk(blocks); + chunk.SetWithoutCheck(blockX, blockY, blockZ, block); + return chunk; } else { @@ -86,7 +86,7 @@ namespace MinecraftClient.Protocol.Handlers Span entryDataByte = stackalloc byte[8]; Span entryDataLong = MemoryMarshal.Cast(entryDataByte); // Faster than MemoryMarshal.Read - Block[] blocks = new Block[Chunk.SizeX * Chunk.SizeY * Chunk.SizeZ]; + Chunk chunk = new(); int startOffset = 64; // Read the first data immediately for (int blockY = 0; blockY < Chunk.SizeY; blockY++) { @@ -129,11 +129,11 @@ namespace MinecraftClient.Protocol.Handlers Block block = new((ushort)blockId); // We have our block, save the block into the chunk - blocks[(blockY << 8) | (blockZ << 4) | blockX] = block; + chunk.SetWithoutCheck(blockX, blockY, blockZ, block); } } } - return new Chunk(blocks); + return chunk; } } From db64515b786850b833be7947b2798c75bb88f299 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 21:25:54 +0800 Subject: [PATCH 28/39] Fix issue #2144 --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 38d89d50..2036b75b 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -305,10 +305,13 @@ namespace MinecraftClient.Protocol.Handlers else switch (packetPalette.GetIncommingTypeById(packetID)) { case PacketTypesIn.KeepAlive: - //log.Info("KeepAlive"); SendPacket(PacketTypesOut.KeepAlive, packetData); handler.OnServerKeepAlive(); break; + case PacketTypesIn.Ping: + int ID = dataTypes.ReadNextInt(packetData); + SendPacket(PacketTypesOut.Pong, dataTypes.GetInt(ID)); + break; case PacketTypesIn.JoinGame: handler.OnGameJoined(); int playerEntityID = dataTypes.ReadNextInt(packetData); From 98dd645fb574d46daaf2d515c398a135ec4893c9 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 22:32:38 +0800 Subject: [PATCH 29/39] Bug fix: Can't reconnect after connection lost --- MinecraftClient/McClient.cs | 4 +- .../Protocol/Handlers/Protocol16.cs | 2 +- .../Protocol/Handlers/Protocol18.cs | 41 ++++++++++++------- MinecraftClient/Protocol/IMinecraftCom.cs | 2 +- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 00bd910a..5493739d 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -446,6 +446,8 @@ namespace MinecraftClient /// public void OnConnectionLost(ChatBot.DisconnectReason reason, string message) { + handler.Dispose(); + world.Clear(); if (timeoutdetector != null) @@ -761,7 +763,7 @@ namespace MinecraftClient int callingThreadId = Thread.CurrentThread.ManagedThreadId; if (handler != null) { - return handler.GetNetReadThreadId() != callingThreadId; + return handler.GetNetMainThreadId() != callingThreadId; } else { diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index a819b3a1..1d8dd59c 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -218,7 +218,7 @@ namespace MinecraftClient.Protocol.Handlers /// Get net read thread (main thread) ID /// /// Net read thread ID - public int GetNetReadThreadId() + public int GetNetMainThreadId() { return netRead != null ? netRead.Item1.ManagedThreadId : -1; } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 2036b75b..9389091f 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -76,7 +76,8 @@ namespace MinecraftClient.Protocol.Handlers PacketTypePalette packetPalette; SocketWrapper socketWrapper; DataTypes dataTypes; - Tuple? netRead = null; // main thread + Tuple? netMain = null; // main thread + Tuple? netReader = null; // reader thread ILogger log; RandomNumberGenerator randomGen; @@ -172,7 +173,9 @@ namespace MinecraftClient.Protocol.Handlers /// private void Updater(object? o) { - if (((CancellationToken)o!).IsCancellationRequested) + CancellationToken cancelToken = (CancellationToken)o!; + + if (cancelToken.IsCancellationRequested) return; try @@ -180,7 +183,7 @@ namespace MinecraftClient.Protocol.Handlers Stopwatch stopWatch = new(); while (!packetQueue.IsAddingCompleted) { - ((CancellationToken)o!).ThrowIfCancellationRequested(); + cancelToken.ThrowIfCancellationRequested(); handler.OnUpdate(); @@ -210,7 +213,7 @@ namespace MinecraftClient.Protocol.Handlers catch (ObjectDisposedException) { } catch (OperationCanceledException) { } - if (((CancellationToken)o!).IsCancellationRequested) + if (cancelToken.IsCancellationRequested) return; handler.OnConnectionLost(ChatBot.DisconnectReason.ConnectionLost, ""); @@ -219,13 +222,14 @@ namespace MinecraftClient.Protocol.Handlers /// /// Read and decompress packets. /// - internal void PacketReader() + internal void PacketReader(object? o) { - while (socketWrapper.IsConnected()) + CancellationToken cancelToken = (CancellationToken)o!; + while (socketWrapper.IsConnected() && !cancelToken.IsCancellationRequested) { try { - while (socketWrapper.HasDataAvailable()) + while (socketWrapper.HasDataAvailable() && !cancelToken.IsCancellationRequested) packetQueue.Add(ReadNextPacket()); } catch (System.IO.IOException) { break; } @@ -1449,20 +1453,24 @@ namespace MinecraftClient.Protocol.Handlers /// private void StartUpdating() { - new Thread(new ThreadStart(PacketReader)).Start(); + Thread threadUpdater = new Thread(new ParameterizedThreadStart(Updater)); + threadUpdater.Name = "ProtocolPacketHandler"; + netMain = new Tuple(threadUpdater, new CancellationTokenSource()); + threadUpdater.Start(netMain.Item2.Token); - netRead = new Tuple(new Thread(new ParameterizedThreadStart(Updater)), new CancellationTokenSource()); - netRead.Item1.Name = "ProtocolPacketHandler"; - netRead.Item1.Start(netRead.Item2.Token); + Thread threadReader = new Thread(new ParameterizedThreadStart(PacketReader)); + threadReader.Name = "ProtocolPacketReader"; + netReader = new Tuple(threadReader, new CancellationTokenSource()); + threadReader.Start(netReader.Item2.Token); } /// /// Get net read thread (main thread) ID /// /// Net read thread ID - public int GetNetReadThreadId() + public int GetNetMainThreadId() { - return netRead != null ? netRead.Item1.ManagedThreadId : -1; + return netMain != null ? netMain.Item1.ManagedThreadId : -1; } /// @@ -1472,9 +1480,12 @@ namespace MinecraftClient.Protocol.Handlers { try { - if (netRead != null) + if (netMain != null) { - netRead.Item2.Cancel(); + netMain.Item2.Cancel(); + } + if (netReader != null){ + netReader.Item2.Cancel(); socketWrapper.Disconnect(); } } diff --git a/MinecraftClient/Protocol/IMinecraftCom.cs b/MinecraftClient/Protocol/IMinecraftCom.cs index 5a713257..52bfcac7 100644 --- a/MinecraftClient/Protocol/IMinecraftCom.cs +++ b/MinecraftClient/Protocol/IMinecraftCom.cs @@ -252,6 +252,6 @@ namespace MinecraftClient.Protocol /// Get net read thread (main thread) ID /// /// Net read thread ID - int GetNetReadThreadId(); + int GetNetMainThreadId(); } } From a13af47b3ef313b752eb0ad8017a748806f17d4e Mon Sep 17 00:00:00 2001 From: BruceChen Date: Wed, 31 Aug 2022 22:52:05 +0800 Subject: [PATCH 30/39] Reduce the latency of sending messages --- MinecraftClient/McClient.cs | 31 ++++++++++++------- .../Protocol/Handlers/Protocol18.cs | 10 +++++- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 5493739d..586798ac 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -281,6 +281,20 @@ namespace MinecraftClient } } + /// + /// Retrieve messages from the queue and send. + /// Note: requires external locking. + /// + private void TrySendMessageToServer() + { + while (chatQueue.Count > 0 && nextMessageSendTime < DateTime.Now) + { + string text = chatQueue.Dequeue(); + handler.SendChatMessage(text, playerKeyPair); + nextMessageSendTime = DateTime.Now + Settings.messageCooldown; + } + } + /// /// Called ~10 times per second by the protocol handler /// @@ -295,22 +309,16 @@ namespace MinecraftClient } catch (Exception e) { - if (!(e is ThreadAbortException)) - { + if (e is not ThreadAbortException) Log.Warn("Update: Got error from " + bot.ToString() + ": " + e.ToString()); - } - else throw; //ThreadAbortException should not be caught + else + throw; //ThreadAbortException should not be caught } } lock (chatQueue) { - if (chatQueue.Count > 0 && nextMessageSendTime < DateTime.Now) - { - string text = chatQueue.Dequeue(); - handler.SendChatMessage(text, playerKeyPair); - nextMessageSendTime = DateTime.Now + Settings.messageCooldown; - } + TrySendMessageToServer(); } if (terrainAndMovementsEnabled && locationReceived) @@ -539,7 +547,7 @@ namespace MinecraftClient if (ConsoleIO.BasicIO && text.Length > 0 && text[0] == (char)0x00) { //Process a request from the GUI - string[] command = text.Substring(1).Split((char)0x00); + string[] command = text[1..].Split((char)0x00); switch (command[0].ToLower()) { case "autocomplete": @@ -1148,6 +1156,7 @@ namespace MinecraftClient } } else chatQueue.Enqueue(text); + TrySendMessageToServer(); } } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 9389091f..1d34bd94 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -229,14 +229,22 @@ namespace MinecraftClient.Protocol.Handlers { try { - while (socketWrapper.HasDataAvailable() && !cancelToken.IsCancellationRequested) + while (socketWrapper.HasDataAvailable()) + { packetQueue.Add(ReadNextPacket()); + + if (cancelToken.IsCancellationRequested) + break; + } } catch (System.IO.IOException) { break; } catch (SocketException) { break; } catch (NullReferenceException) { break; } catch (Ionic.Zlib.ZlibException) { break; } + if (cancelToken.IsCancellationRequested) + break; + Thread.Sleep(10); } packetQueue.CompleteAdding(); From b26949e483a289934a40f2a65aa34b53988351bb Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 1 Sep 2022 22:57:13 +0800 Subject: [PATCH 31/39] Fix issue #2111 --- MinecraftClient/ConsoleIO.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MinecraftClient/ConsoleIO.cs b/MinecraftClient/ConsoleIO.cs index d8f026c4..a3b0952b 100644 --- a/MinecraftClient/ConsoleIO.cs +++ b/MinecraftClient/ConsoleIO.cs @@ -163,7 +163,7 @@ namespace MinecraftClient { if (!acceptnewlines) text = text.Replace('\n', ' '); - WriteLineFormatted(LogPrefix + text); + WriteLineFormatted(LogPrefix + text, true); } #region Subfunctions From 290ec9cc799ae1250bb1d14e29946e34cdebf20d Mon Sep 17 00:00:00 2001 From: BruceChen Date: Thu, 1 Sep 2022 23:10:09 +0800 Subject: [PATCH 32/39] Bug fix --- MinecraftClient/ConsoleIO.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MinecraftClient/ConsoleIO.cs b/MinecraftClient/ConsoleIO.cs index a3b0952b..a1f06d1d 100644 --- a/MinecraftClient/ConsoleIO.cs +++ b/MinecraftClient/ConsoleIO.cs @@ -163,7 +163,7 @@ namespace MinecraftClient { if (!acceptnewlines) text = text.Replace('\n', ' '); - WriteLineFormatted(LogPrefix + text, true); + WriteLineFormatted(LogPrefix + text, acceptnewlines); } #region Subfunctions From 4538095d74003210c42ad682a21d6596cb93e4ff Mon Sep 17 00:00:00 2001 From: BruceChen Date: Fri, 2 Sep 2022 09:29:24 +0800 Subject: [PATCH 33/39] Reduce merge conflicts --- MinecraftClient/McClient.cs | 18 +- .../Protocol/Handlers/Protocol18.cs | 288 +++++++++--------- 2 files changed, 155 insertions(+), 151 deletions(-) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 586798ac..fccbe126 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -1131,17 +1131,19 @@ namespace MinecraftClient /// Text to send to the server public void SendText(string text) { + if (String.IsNullOrEmpty(text)) + return; + + int maxLength = handler.GetMaxChatMessageLength(); + lock (chatQueue) { - if (String.IsNullOrEmpty(text)) - return; - int maxLength = handler.GetMaxChatMessageLength(); if (text.Length > maxLength) //Message is too long? { if (text[0] == '/') { //Send the first 100/256 chars of the command - text = text.Substring(0, maxLength); + text = text[..maxLength]; chatQueue.Enqueue(text); } else @@ -1149,13 +1151,15 @@ namespace MinecraftClient //Split the message into several messages while (text.Length > maxLength) { - chatQueue.Enqueue(text.Substring(0, maxLength)); - text = text.Substring(maxLength, text.Length - maxLength); + chatQueue.Enqueue(text[..maxLength]); + text = text[maxLength..]; } chatQueue.Enqueue(text); } } - else chatQueue.Enqueue(text); + else + chatQueue.Enqueue(text); + TrySendMessageToServer(); } } diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 1d34bd94..81de68ff 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -64,7 +64,7 @@ namespace MinecraftClient.Protocol.Handlers private readonly List autocomplete_result = new List(); private readonly Dictionary window_actions = new Dictionary(); private bool login_phase = true; - private int protocolversion; + private int protocolVersion; private int currentDimension; private readonly BlockingCollection>> packetQueue = new(); @@ -87,7 +87,7 @@ namespace MinecraftClient.Protocol.Handlers ChatParser.InitTranslations(); this.socketWrapper = new SocketWrapper(Client); this.dataTypes = new DataTypes(protocolVersion); - this.protocolversion = protocolVersion; + this.protocolVersion = protocolVersion; this.handler = handler; this.pForge = new Protocol18Forge(forgeInfo, protocolVersion, dataTypes, this, handler); this.pTerrain = new Protocol18Terrain(protocolVersion, dataTypes, handler); @@ -95,26 +95,26 @@ namespace MinecraftClient.Protocol.Handlers this.log = handler.GetLogger(); this.randomGen = RandomNumberGenerator.Create(); - if (handler.GetTerrainEnabled() && protocolversion > MC_1_18_2_Version) + if (handler.GetTerrainEnabled() && protocolVersion > MC_1_18_2_Version) { log.Error(Translations.Get("extra.terrainandmovement_disabled")); handler.SetTerrainEnabled(false); } - if (handler.GetInventoryEnabled() && (protocolversion < MC_1_10_Version || protocolversion > MC_1_18_2_Version)) + if (handler.GetInventoryEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_18_2_Version)) { log.Error(Translations.Get("extra.inventory_disabled")); handler.SetInventoryEnabled(false); } - if (handler.GetEntityHandlingEnabled() && (protocolversion < MC_1_10_Version || protocolversion > MC_1_18_2_Version)) + if (handler.GetEntityHandlingEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_18_2_Version)) { log.Error(Translations.Get("extra.entity_disabled")); handler.SetEntityHandlingEnabled(false); } // Block palette - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { if (protocolVersion > MC_1_18_2_Version && handler.GetTerrainEnabled()) throw new NotImplementedException(Translations.Get("exception.palette.block")); @@ -132,18 +132,18 @@ namespace MinecraftClient.Protocol.Handlers else Block.Palette = new Palette112(); // Entity palette - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { - if (protocolversion > MC_1_18_2_Version && handler.GetEntityHandlingEnabled()) + if (protocolVersion > MC_1_18_2_Version && handler.GetEntityHandlingEnabled()) throw new NotImplementedException(Translations.Get("exception.palette.entity")); - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) entityPalette = new EntityPalette117(); - else if (protocolversion >= MC_1_16_2_Version) - if (protocolversion >= MC_1_16_2_Version) + else if (protocolVersion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) entityPalette = new EntityPalette1162(); - else if (protocolversion >= MC_1_16_Version) + else if (protocolVersion >= MC_1_16_Version) entityPalette = new EntityPalette1161(); - else if (protocolversion >= MC_1_15_Version) + else if (protocolVersion >= MC_1_15_Version) entityPalette = new EntityPalette115(); else if (protocolVersion >= MC_1_14_Version) entityPalette = new EntityPalette114(); @@ -152,16 +152,16 @@ namespace MinecraftClient.Protocol.Handlers else entityPalette = new EntityPalette112(); // Item palette - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) { - if (protocolversion > MC_1_18_2_Version && handler.GetInventoryEnabled()) + if (protocolVersion > MC_1_18_2_Version && handler.GetInventoryEnabled()) throw new NotImplementedException(Translations.Get("exception.palette.item")); - if (protocolversion >= MC_1_18_1_Version) + if (protocolVersion >= MC_1_18_1_Version) itemPalette = new ItemPalette118(); - else if (protocolversion >= MC_1_17_Version) + else if (protocolVersion >= MC_1_17_Version) itemPalette = new ItemPalette117(); - else if (protocolversion >= MC_1_16_2_Version) - if (protocolversion >= MC_1_16_2_Version) + else if (protocolVersion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) itemPalette = new ItemPalette1162(); else itemPalette = new ItemPalette1161(); } @@ -261,7 +261,7 @@ namespace MinecraftClient.Protocol.Handlers Queue packetData = new(socketWrapper.ReadDataRAW(size)); //Packet contents //Handle packet decompression - if (protocolversion >= MC_1_8_Version + if (protocolVersion >= MC_1_8_Version && compression_treshold > 0) { int sizeUncompressed = dataTypes.ReadNextVarInt(packetData); @@ -299,7 +299,7 @@ namespace MinecraftClient.Protocol.Handlers switch (packetID) //Packet IDs are different while logging in { case 0x03: - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) compression_treshold = dataTypes.ReadNextVarInt(packetData); break; case 0x04: @@ -329,12 +329,12 @@ namespace MinecraftClient.Protocol.Handlers int playerEntityID = dataTypes.ReadNextInt(packetData); handler.OnReceivePlayerEntityID(playerEntityID); - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) dataTypes.ReadNextBool(packetData); // Is hardcore - 1.16.2 and above handler.OnGamemodeUpdate(Guid.Empty, dataTypes.ReadNextByte(packetData)); - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { dataTypes.ReadNextByte(packetData); // Previous Gamemode - 1.16 and above int worldCount = dataTypes.ReadNextVarInt(packetData); // Dimension Count (World Count) - 1.16 and above @@ -351,55 +351,55 @@ namespace MinecraftClient.Protocol.Handlers // String identifier: 1.16 and 1.16.1 // varInt: [1.9.1 to 1.15.2] // byte: below 1.9.1 - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { dataTypes.ReadNextString(packetData); // Dimension Type: Identifier currentDimensionType = new Dictionary(); } - else if (protocolversion >= MC_1_16_2_Version) + else if (protocolVersion >= MC_1_16_2_Version) currentDimensionType = dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound else dataTypes.ReadNextString(packetData); this.currentDimension = 0; } - else if (protocolversion >= MC_1_9_1_Version) + else if (protocolVersion >= MC_1_9_1_Version) this.currentDimension = dataTypes.ReadNextInt(packetData); else this.currentDimension = (sbyte)dataTypes.ReadNextByte(packetData); - if (protocolversion < MC_1_14_Version) + if (protocolVersion < MC_1_14_Version) dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) currentDimensionName = dataTypes.ReadNextString(packetData); // Dimension Name (World Name) - 1.16 and above - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) World.SetDimension(currentDimensionName, currentDimensionType); - if (protocolversion >= MC_1_15_Version) + if (protocolVersion >= MC_1_15_Version) dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) dataTypes.ReadNextVarInt(packetData); // Max Players - 1.16.2 and above else dataTypes.ReadNextByte(packetData); // Max Players - 1.16.1 and below - if (protocolversion < MC_1_16_Version) + if (protocolVersion < MC_1_16_Version) dataTypes.SkipNextString(packetData); // Level Type - 1.15 and below - if (protocolversion >= MC_1_14_Version) + if (protocolVersion >= MC_1_14_Version) dataTypes.ReadNextVarInt(packetData); // View distance - 1.14 and above - if (protocolversion >= MC_1_18_1_Version) + if (protocolVersion >= MC_1_18_1_Version) dataTypes.ReadNextVarInt(packetData); // Simulation Distance - 1.18 and above - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) dataTypes.ReadNextBool(packetData); // Reduced debug info - 1.8 and above - if (protocolversion >= MC_1_15_Version) + if (protocolVersion >= MC_1_15_Version) dataTypes.ReadNextBool(packetData); // Enable respawn screen - 1.15 and above - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { dataTypes.ReadNextBool(packetData); // Is Debug - 1.16 and above dataTypes.ReadNextBool(packetData); // Is Flat - 1.16 and above } - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { bool hasDeathLocation = dataTypes.ReadNextBool(packetData); // Has death location if (hasDeathLocation) @@ -412,12 +412,12 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.ChatMessage: int messageType = 0; - if (protocolversion <= MC_1_18_2_Version) // 1.18 and bellow + if (protocolVersion <= MC_1_18_2_Version) // 1.18 and bellow { string message = dataTypes.ReadNextString(packetData); Guid senderUUID; - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { //Hide system messages or xp bar messages? messageType = dataTypes.ReadNextByte(packetData); @@ -425,7 +425,7 @@ namespace MinecraftClient.Protocol.Handlers || (messageType == 2 && !Settings.DisplayXPBarMessages)) break; - if (protocolversion >= MC_1_16_5_Version) + if (protocolVersion >= MC_1_16_5_Version) senderUUID = dataTypes.ReadNextUUID(packetData); else senderUUID = Guid.Empty; } @@ -467,14 +467,14 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.Respawn: string? dimensionNameInRespawn = null; Dictionary dimensionTypeInRespawn = null; - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { dataTypes.ReadNextString(packetData); // Dimension Type: Identifier dimensionTypeInRespawn = new Dictionary(); } - else if (protocolversion >= MC_1_16_2_Version) + else if (protocolVersion >= MC_1_16_2_Version) dimensionTypeInRespawn = dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound else dataTypes.ReadNextString(packetData); @@ -485,28 +485,28 @@ namespace MinecraftClient.Protocol.Handlers // 1.15 and below this.currentDimension = dataTypes.ReadNextInt(packetData); } - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) dimensionNameInRespawn = dataTypes.ReadNextString(packetData); // Dimension Name (World Name) - 1.16 and above - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) World.SetDimension(dimensionNameInRespawn, dimensionTypeInRespawn); - if (protocolversion < MC_1_14_Version) + if (protocolVersion < MC_1_14_Version) dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below - if (protocolversion >= MC_1_15_Version) + if (protocolVersion >= MC_1_15_Version) dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above dataTypes.ReadNextByte(packetData); // Gamemode - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) dataTypes.ReadNextByte(packetData); // Previous Game mode - 1.16 and above - if (protocolversion < MC_1_16_Version) + if (protocolVersion < MC_1_16_Version) dataTypes.SkipNextString(packetData); // Level Type - 1.15 and below - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { dataTypes.ReadNextBool(packetData); // Is Debug - 1.16 and above dataTypes.ReadNextBool(packetData); // Is Flat - 1.16 and above dataTypes.ReadNextBool(packetData); // Copy metadata - 1.16 and above } - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { bool hasDeathLocation = dataTypes.ReadNextBool(packetData); // Has death location if (hasDeathLocation) @@ -529,7 +529,7 @@ namespace MinecraftClient.Protocol.Handlers // entity handling require player pos for distance calculating if (handler.GetTerrainEnabled() || handler.GetEntityHandlingEnabled()) { - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { Location location = handler.GetCurrentLocation(); location.X = (locMask & 1 << 0) != 0 ? location.X + x : x; @@ -540,14 +540,14 @@ namespace MinecraftClient.Protocol.Handlers else handler.UpdateLocation(new Location(x, y, z), yaw, pitch); } - if (protocolversion >= MC_1_9_Version) + if (protocolVersion >= MC_1_9_Version) { int teleportID = dataTypes.ReadNextVarInt(packetData); // Teleport confirm packet SendPacket(PacketTypesOut.TeleportConfirm, dataTypes.GetVarInt(teleportID)); } - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) dataTypes.ReadNextBool(packetData); // Dismount Vehicle - 1.17 and above break; case PacketTypesIn.ChunkData: @@ -558,16 +558,16 @@ namespace MinecraftClient.Protocol.Handlers int chunkX = dataTypes.ReadNextInt(packetData); int chunkZ = dataTypes.ReadNextInt(packetData); - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) { ulong[]? verticalStripBitmask = null; - if (protocolversion == MC_1_17_Version || protocolversion == MC_1_17_1_Version) + if (protocolVersion == MC_1_17_Version || protocolVersion == MC_1_17_1_Version) verticalStripBitmask = dataTypes.ReadNextULongArray(packetData); // Bit Mask Length and Primary Bit Mask dataTypes.ReadNextNbt(packetData); // Heightmaps - if (protocolversion == MC_1_17_Version || protocolversion == MC_1_17_1_Version) + if (protocolVersion == MC_1_17_Version || protocolVersion == MC_1_17_1_Version) { int biomesLength = dataTypes.ReadNextVarInt(packetData); // Biomes length for (int i = 0; i < biomesLength; i++) @@ -585,12 +585,12 @@ namespace MinecraftClient.Protocol.Handlers else { bool chunksContinuous = dataTypes.ReadNextBool(packetData); - if (protocolversion >= MC_1_16_Version && protocolversion <= MC_1_16_1_Version) + if (protocolVersion >= MC_1_16_Version && protocolVersion <= MC_1_16_1_Version) dataTypes.ReadNextBool(packetData); // Ignore old data - 1.16 to 1.16.1 only - ushort chunkMask = protocolversion >= MC_1_9_Version + ushort chunkMask = protocolVersion >= MC_1_9_Version ? (ushort)dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextUShort(packetData); - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { ushort addBitmap = dataTypes.ReadNextUShort(packetData); int compressedDataSize = dataTypes.ReadNextInt(packetData); @@ -602,15 +602,15 @@ namespace MinecraftClient.Protocol.Handlers } else { - if (protocolversion >= MC_1_14_Version) + if (protocolVersion >= MC_1_14_Version) dataTypes.ReadNextNbt(packetData); // Heightmaps - 1.14 and above int biomesLength = 0; - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) if (chunksContinuous) biomesLength = dataTypes.ReadNextVarInt(packetData); // Biomes length - 1.16.2 and above - if (protocolversion >= MC_1_15_Version && chunksContinuous) + if (protocolVersion >= MC_1_15_Version && chunksContinuous) { - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) { for (int i = 0; i < biomesLength; i++) { @@ -632,13 +632,13 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.MapData: int mapid = dataTypes.ReadNextVarInt(packetData); byte scale = dataTypes.ReadNextByte(packetData); - bool trackingposition = protocolversion >= MC_1_17_Version ? false : dataTypes.ReadNextBool(packetData); + bool trackingposition = protocolVersion >= MC_1_17_Version ? false : dataTypes.ReadNextBool(packetData); bool locked = false; - if (protocolversion >= MC_1_14_Version) + if (protocolVersion >= MC_1_14_Version) { locked = dataTypes.ReadNextBool(packetData); } - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) { trackingposition = dataTypes.ReadNextBool(packetData); } @@ -646,7 +646,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnMapData(mapid, scale, trackingposition, locked, iconcount); break; case PacketTypesIn.TradeList: - if ((protocolversion >= MC_1_14_Version) && (handler.GetInventoryEnabled())) + if ((protocolVersion >= MC_1_14_Version) && (handler.GetInventoryEnabled())) { // MC 1.14 or greater int windowID = dataTypes.ReadNextVarInt(packetData); @@ -668,7 +668,7 @@ namespace MinecraftClient.Protocol.Handlers } break; case PacketTypesIn.Title: - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { int action2 = dataTypes.ReadNextVarInt(packetData); string titletext = String.Empty; @@ -678,7 +678,7 @@ namespace MinecraftClient.Protocol.Handlers int fadein = -1; int stay = -1; int fadeout = -1; - if (protocolversion >= MC_1_10_Version) + if (protocolVersion >= MC_1_10_Version) { if (action2 == 0) { @@ -727,7 +727,7 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.MultiBlockChange: if (handler.GetTerrainEnabled()) { - if (protocolversion >= MC_1_16_2_Version) + if (protocolVersion >= MC_1_16_2_Version) { long chunkSection = dataTypes.ReadNextLong(packetData); int sectionX = (int)(chunkSection >> 42); @@ -755,7 +755,7 @@ namespace MinecraftClient.Protocol.Handlers { int chunkX = dataTypes.ReadNextInt(packetData); int chunkZ = dataTypes.ReadNextInt(packetData); - int recordCount = protocolversion < MC_1_8_Version + int recordCount = protocolVersion < MC_1_8_Version ? (int)dataTypes.ReadNextShort(packetData) : dataTypes.ReadNextVarInt(packetData); @@ -765,7 +765,7 @@ namespace MinecraftClient.Protocol.Handlers ushort blockIdMeta; int blockY; - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { blockIdMeta = dataTypes.ReadNextUShort(packetData); blockY = (ushort)dataTypes.ReadNextByte(packetData); @@ -804,7 +804,7 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.BlockChange: if (handler.GetTerrainEnabled()) { - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { int blockX = dataTypes.ReadNextInt(packetData); int blockY = dataTypes.ReadNextByte(packetData); @@ -840,14 +840,14 @@ namespace MinecraftClient.Protocol.Handlers break; case PacketTypesIn.MapChunkBulk: - if (protocolversion < MC_1_9_Version && handler.GetTerrainEnabled()) + if (protocolVersion < MC_1_9_Version && handler.GetTerrainEnabled()) { int chunkCount; bool hasSkyLight; Queue chunkData = packetData; //Read global fields - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { chunkCount = dataTypes.ReadNextShort(packetData); int compressedDataSize = dataTypes.ReadNextInt(packetData); @@ -872,7 +872,7 @@ namespace MinecraftClient.Protocol.Handlers chunkXs[chunkColumnNo] = dataTypes.ReadNextInt(packetData); chunkZs[chunkColumnNo] = dataTypes.ReadNextInt(packetData); chunkMasks[chunkColumnNo] = dataTypes.ReadNextUShort(packetData); - addBitmaps[chunkColumnNo] = protocolversion < MC_1_8_Version + addBitmaps[chunkColumnNo] = protocolVersion < MC_1_8_Version ? dataTypes.ReadNextUShort(packetData) : (ushort)0; } @@ -887,7 +887,7 @@ namespace MinecraftClient.Protocol.Handlers } break; case PacketTypesIn.UnloadChunk: - if (protocolversion >= MC_1_9_Version && handler.GetTerrainEnabled()) + if (protocolVersion >= MC_1_9_Version && handler.GetTerrainEnabled()) { int chunkX = dataTypes.ReadNextInt(packetData); int chunkZ = dataTypes.ReadNextInt(packetData); @@ -902,7 +902,7 @@ namespace MinecraftClient.Protocol.Handlers } break; case PacketTypesIn.PlayerInfo: - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { int action = dataTypes.ReadNextVarInt(packetData); // Action Name int numberOfPlayers = dataTypes.ReadNextVarInt(packetData); // Number Of Players @@ -939,7 +939,7 @@ namespace MinecraftClient.Protocol.Handlers // 1.19 Additions long? keyExpiration = null; byte[]? publicKey = null, signature = null; - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { if (dataTypes.ReadNextBool(packetData)) // Has Sig Data (if true, red the following fields) { @@ -995,7 +995,7 @@ namespace MinecraftClient.Protocol.Handlers } break; case PacketTypesIn.TabComplete: - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { autocomplete_transaction_id = dataTypes.ReadNextVarInt(packetData); dataTypes.ReadNextVarInt(packetData); // Start of text to replace @@ -1008,7 +1008,7 @@ namespace MinecraftClient.Protocol.Handlers for (int i = 0; i < autocomplete_count; i++) { autocomplete_result.Add(dataTypes.ReadNextString(packetData)); - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { // Skip optional tooltip for each tab-complete result if (dataTypes.ReadNextBool(packetData)) @@ -1021,7 +1021,7 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.PluginMessage: String channel = dataTypes.ReadNextString(packetData); // Length is unneeded as the whole remaining packetData is the entire payload of the packet. - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) pForge.ReadNextVarShort(packetData); handler.OnPluginChannelMessage(channel, packetData.ToArray()); return pForge.HandlePluginMessage(channel, packetData, ref currentDimension); @@ -1029,13 +1029,13 @@ namespace MinecraftClient.Protocol.Handlers handler.OnConnectionLost(ChatBot.DisconnectReason.InGameKick, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); return false; case PacketTypesIn.SetCompression: - if (protocolversion >= MC_1_8_Version && protocolversion < MC_1_9_Version) + if (protocolVersion >= MC_1_8_Version && protocolVersion < MC_1_9_Version) compression_treshold = dataTypes.ReadNextVarInt(packetData); break; case PacketTypesIn.OpenWindow: if (handler.GetInventoryEnabled()) { - if (protocolversion < MC_1_14_Version) + if (protocolVersion < MC_1_14_Version) { // MC 1.13 or lower byte windowID = dataTypes.ReadNextByte(packetData); @@ -1072,7 +1072,7 @@ namespace MinecraftClient.Protocol.Handlers int stateId = -1; int elements = 0; - if (protocolversion >= MC_1_17_1_Version) + if (protocolVersion >= MC_1_17_1_Version) { // State ID and Elements as VarInt - 1.17.1 and above stateId = dataTypes.ReadNextVarInt(packetData); @@ -1092,7 +1092,7 @@ namespace MinecraftClient.Protocol.Handlers inventorySlots[slotId] = item; } - if (protocolversion >= MC_1_17_1_Version) // Carried Item - 1.17.1 and above + if (protocolVersion >= MC_1_17_1_Version) // Carried Item - 1.17.1 and above dataTypes.ReadNextItemSlot(packetData, itemPalette); handler.OnWindowItems(windowId, inventorySlots, stateId); @@ -1103,7 +1103,7 @@ namespace MinecraftClient.Protocol.Handlers { byte windowID = dataTypes.ReadNextByte(packetData); int stateId = -1; - if (protocolversion >= MC_1_17_1_Version) + if (protocolVersion >= MC_1_17_1_Version) stateId = dataTypes.ReadNextVarInt(packetData); // State ID - 1.17.1 and above short slotID = dataTypes.ReadNextShort(packetData); Item item = dataTypes.ReadNextItemSlot(packetData, itemPalette); @@ -1126,7 +1126,7 @@ namespace MinecraftClient.Protocol.Handlers string url = dataTypes.ReadNextString(packetData); string hash = dataTypes.ReadNextString(packetData); bool forced = true; // Assume forced for MC 1.16 and below - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) { forced = dataTypes.ReadNextBool(packetData); string forcedMessage = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); @@ -1139,7 +1139,7 @@ namespace MinecraftClient.Protocol.Handlers break; //Send back "accepted" and "successfully loaded" responses for plugins or server config making use of resource pack mandatory byte[] responseHeader = new byte[0]; - if (protocolversion < MC_1_10_Version) //MC 1.10 does not include resource pack hash in responses + if (protocolVersion < MC_1_10_Version) //MC 1.10 does not include resource pack hash in responses responseHeader = dataTypes.ConcatBytes(dataTypes.GetVarInt(hash.Length), Encoding.UTF8.GetBytes(hash)); SendPacket(PacketTypesOut.ResourcePackStatus, dataTypes.ConcatBytes(responseHeader, dataTypes.GetVarInt(3))); //Accepted pack SendPacket(PacketTypesOut.ResourcePackStatus, dataTypes.ConcatBytes(responseHeader, dataTypes.GetVarInt(0))); //Successfully loaded @@ -1155,7 +1155,7 @@ namespace MinecraftClient.Protocol.Handlers if (handler.GetEntityHandlingEnabled()) { int entityid = dataTypes.ReadNextVarInt(packetData); - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) { bool hasNext; do @@ -1216,7 +1216,7 @@ namespace MinecraftClient.Protocol.Handlers bool hasFactorData = false; Dictionary? factorCodec = null; - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { hasFactorData = dataTypes.ReadNextBool(packetData); factorCodec = dataTypes.ReadNextNbt(packetData); @@ -1230,7 +1230,7 @@ namespace MinecraftClient.Protocol.Handlers if (handler.GetEntityHandlingEnabled()) { int entityCount = 1; // 1.17.0 has only one entity per packet - if (protocolversion != MC_1_17_Version) + if (protocolVersion != MC_1_17_Version) entityCount = dataTypes.ReadNextVarInt(packetData); // All other versions have a "count" field int[] entityList = new int[entityCount]; for (int i = 0; i < entityCount; i++) @@ -1274,7 +1274,7 @@ namespace MinecraftClient.Protocol.Handlers if (handler.GetEntityHandlingEnabled()) { int EntityID = dataTypes.ReadNextVarInt(packetData); - int NumberOfProperties = protocolversion >= MC_1_17_Version ? dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextInt(packetData); + int NumberOfProperties = protocolVersion >= MC_1_17_Version ? dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextInt(packetData); Dictionary keys = new Dictionary(); for (int i = 0; i < NumberOfProperties; i++) { @@ -1313,11 +1313,11 @@ namespace MinecraftClient.Protocol.Handlers // See https://wiki.vg/Entity_metadata#Living_Entity int healthField = 7; // From 1.10 to 1.13.2 - if (protocolversion >= MC_1_14_Version) + if (protocolVersion >= MC_1_14_Version) healthField = 8; // 1.14 and above - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) healthField = 9; // 1.17 and above - if (protocolversion > MC_1_18_2_Version) + if (protocolVersion > MC_1_18_2_Version) throw new NotImplementedException(Translations.Get("exception.palette.healthfield")); if (metadata.ContainsKey(healthField) && metadata[healthField] != null && metadata[healthField].GetType() == typeof(float)) @@ -1361,7 +1361,7 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.UpdateHealth: float health = dataTypes.ReadNextFloat(packetData); int food; - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) food = dataTypes.ReadNextVarInt(packetData); else food = dataTypes.ReadNextShort(packetData); @@ -1376,12 +1376,12 @@ namespace MinecraftClient.Protocol.Handlers break; case PacketTypesIn.Explosion: Location explosionLocation; - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) explosionLocation = new(dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData)); else explosionLocation = new(dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData)); float explosionStrength = dataTypes.ReadNextFloat(packetData); - int explosionBlockCount = protocolversion >= MC_1_17_Version + int explosionBlockCount = protocolVersion >= MC_1_17_Version ? dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextInt(packetData); // Ignoring additional fields (records, pushback) @@ -1405,12 +1405,12 @@ namespace MinecraftClient.Protocol.Handlers break; case PacketTypesIn.UpdateScore: string entityname = dataTypes.ReadNextString(packetData); - int action3 = protocolversion >= MC_1_18_2_Version + int action3 = protocolVersion >= MC_1_18_2_Version ? dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextByte(packetData); string objectivename2 = string.Empty; int value = -1; - if (action3 != 1 || protocolversion >= MC_1_8_Version) + if (action3 != 1 || protocolVersion >= MC_1_8_Version) objectivename2 = dataTypes.ReadNextString(packetData); if (action3 != 1) value = dataTypes.ReadNextVarInt(packetData); @@ -1449,7 +1449,7 @@ namespace MinecraftClient.Protocol.Handlers Translations.Get("exception.packet_process", packetPalette.GetIncommingTypeById(packetID), packetID, - protocolversion, + protocolVersion, login_phase, innerException.GetType()), innerException); @@ -1551,7 +1551,7 @@ namespace MinecraftClient.Protocol.Handlers /// True if login successful public bool Login(PlayerKeyPair? playerKeyPair, SessionToken session) { - byte[] protocol_version = dataTypes.GetVarInt(protocolversion); + byte[] protocol_version = dataTypes.GetVarInt(protocolVersion); string server_address = pForge.GetServerAddress(handler.GetServerHost()); byte[] server_port = dataTypes.GetUShort((ushort)handler.GetServerPort()); byte[] next_state = dataTypes.GetVarInt(2); @@ -1560,7 +1560,7 @@ namespace MinecraftClient.Protocol.Handlers List fullLoginPacket = new List(); fullLoginPacket.AddRange(dataTypes.GetString(handler.GetUsername())); // Username - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { if (playerKeyPair == null) fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data @@ -1651,7 +1651,7 @@ namespace MinecraftClient.Protocol.Handlers // Encryption Response packet List encryptionResponse = new(); encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret - if (protocolversion >= Protocol18Handler.MC_1_19_Version) + if (protocolVersion >= Protocol18Handler.MC_1_19_Version) { if (playerKeyPair == null) { @@ -1675,7 +1675,7 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(0x01, encryptionResponse); //Start client-side encryption - socketWrapper.SwitchToEncrypted(secretKey); + socketWrapper.SwitchToEncrypted(secretKey); // pre switch //Process the next packet int loopPrevention = UInt16.MaxValue; @@ -1697,7 +1697,7 @@ namespace MinecraftClient.Protocol.Handlers Guid uuidReceived = dataTypes.ReadNextUUID(packetData); string userName = dataTypes.ReadNextString(packetData); Tuple[]? playerProperty = null; - if (protocolversion >= Protocol18Handler.MC_1_19_Version) + if (protocolVersion >= Protocol18Handler.MC_1_19_Version) { int count = dataTypes.ReadNextVarInt(packetData); // Number Of Properties playerProperty = new Tuple[count]; @@ -1752,9 +1752,9 @@ namespace MinecraftClient.Protocol.Handlers byte[] tabcomplete_packet = new byte[] { }; - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, transaction_id); tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, dataTypes.GetString(BehindCursor)); @@ -1763,7 +1763,7 @@ namespace MinecraftClient.Protocol.Handlers { tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, dataTypes.GetString(BehindCursor)); - if (protocolversion >= MC_1_9_Version) + if (protocolVersion >= MC_1_9_Version) { tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, assume_command); } @@ -1869,7 +1869,7 @@ namespace MinecraftClient.Protocol.Handlers /// Max length, in characters public int GetMaxChatMessageLength() { - return protocolversion > MC_1_10_Version + return protocolVersion > MC_1_10_Version ? 256 : 100; } @@ -1883,7 +1883,7 @@ namespace MinecraftClient.Protocol.Handlers /// Minecraft Protocol version number public int GetProtocolVersion() { - return protocolversion; + return protocolVersion; } @@ -2004,7 +2004,7 @@ namespace MinecraftClient.Protocol.Handlers return true; // Process Chat Command - 1.19 and above - if (protocolversion >= MC_1_19_Version && message.StartsWith('/')) + if (protocolVersion >= MC_1_19_Version && message.StartsWith('/')) return SendChatCommand(message[1..], playerKeyPair); try @@ -2014,7 +2014,7 @@ namespace MinecraftClient.Protocol.Handlers // Message: String (up to 256 chars) fields.AddRange(dataTypes.GetString(message)); - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) { // Timestamp: Instant(Long) DateTimeOffset timeNow = DateTimeOffset.UtcNow; @@ -2092,7 +2092,7 @@ namespace MinecraftClient.Protocol.Handlers return false; // Plugin channels were significantly changed between Minecraft 1.12 and 1.13 // https://wiki.vg/index.php?title=Pre-release_protocol&oldid=14132#Plugin_Channels - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { return SendPluginChannelPacket("minecraft:brand", dataTypes.GetString(brandInfo)); } @@ -2120,26 +2120,26 @@ namespace MinecraftClient.Protocol.Handlers List fields = new List(); fields.AddRange(dataTypes.GetString(language)); fields.Add(viewDistance); - fields.AddRange(protocolversion >= MC_1_9_Version + fields.AddRange(protocolVersion >= MC_1_9_Version ? dataTypes.GetVarInt(chatMode) : new byte[] { chatMode }); fields.Add(chatColors ? (byte)1 : (byte)0); - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { fields.Add(difficulty); fields.Add((byte)(skinParts & 0x1)); //show cape } else fields.Add(skinParts); - if (protocolversion >= MC_1_9_Version) + if (protocolVersion >= MC_1_9_Version) fields.AddRange(dataTypes.GetVarInt(mainHand)); - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) { - if (protocolversion >= MC_1_18_1_Version) + if (protocolVersion >= MC_1_18_1_Version) fields.Add(0); // 1.18 and above - Enable text filtering. (Always false) else fields.Add(1); // 1.17 and 1.17.1 - Disable text filtering. (Always true) } - if (protocolversion >= MC_1_18_1_Version) + if (protocolVersion >= MC_1_18_1_Version) fields.Add(1); // 1.18 and above - Allow server listings SendPacket(PacketTypesOut.ClientSettings, fields); } @@ -2175,7 +2175,7 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(packetType, dataTypes.ConcatBytes( dataTypes.GetDouble(location.X), dataTypes.GetDouble(location.Y), - protocolversion < MC_1_8_Version + protocolVersion < MC_1_8_Version ? dataTypes.GetDouble(location.Y + 1.62) : new byte[0], dataTypes.GetDouble(location.Z), @@ -2201,7 +2201,7 @@ namespace MinecraftClient.Protocol.Handlers { // In 1.7, length needs to be included. // In 1.8, it must not be. - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { byte[] length = BitConverter.GetBytes((short)data.Length); Array.Reverse(length); @@ -2256,7 +2256,7 @@ namespace MinecraftClient.Protocol.Handlers // Is player Sneaking (Only 1.16 and above) // Currently hardcoded to false // TODO: Update to reflect the real player state - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) fields.AddRange(dataTypes.GetBool(false)); SendPacket(PacketTypesOut.InteractEntity, fields); @@ -2282,7 +2282,7 @@ namespace MinecraftClient.Protocol.Handlers // Is player Sneaking (Only 1.16 and above) // Currently hardcoded to false // TODO: Update to reflect the real player state - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) fields.AddRange(dataTypes.GetBool(false)); SendPacket(PacketTypesOut.InteractEntity, fields); return true; @@ -2302,7 +2302,7 @@ namespace MinecraftClient.Protocol.Handlers // Is player Sneaking (Only 1.16 and above) // Currently hardcoded to false // TODO: Update to reflect the real player state - if (protocolversion >= MC_1_16_Version) + if (protocolVersion >= MC_1_16_Version) fields.AddRange(dataTypes.GetBool(false)); SendPacket(PacketTypesOut.InteractEntity, fields); return true; @@ -2318,7 +2318,7 @@ namespace MinecraftClient.Protocol.Handlers public bool SendUseItem(int hand, int sequenceId) { - if (protocolversion < MC_1_9_Version) + if (protocolVersion < MC_1_9_Version) return false; // Packet does not exist prior to MC 1.9 // According to https://wiki.vg/index.php?title=Protocol&oldid=5486#Player_Block_Placement // MC 1.7 does this using Player Block Placement with special values @@ -2327,7 +2327,7 @@ namespace MinecraftClient.Protocol.Handlers { List packet = new List(); packet.AddRange(dataTypes.GetVarInt(hand)); - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) packet.AddRange(dataTypes.GetVarInt(sequenceId)); SendPacket(PacketTypesOut.UseItem, packet); return true; @@ -2345,7 +2345,7 @@ namespace MinecraftClient.Protocol.Handlers packet.AddRange(dataTypes.GetVarInt(status)); packet.AddRange(dataTypes.GetLocation(location)); packet.AddRange(dataTypes.GetVarInt(dataTypes.GetBlockFace(face))); - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) packet.AddRange(dataTypes.GetVarInt(sequenceId)); SendPacket(PacketTypesOut.PlayerDigging, packet); return true; @@ -2357,7 +2357,7 @@ namespace MinecraftClient.Protocol.Handlers public bool SendPlayerBlockPlacement(int hand, Location location, Direction face, int sequenceId) { - if (protocolversion < MC_1_14_Version) + if (protocolVersion < MC_1_14_Version) return false; // NOT IMPLEMENTED for older MC versions try { @@ -2369,7 +2369,7 @@ namespace MinecraftClient.Protocol.Handlers packet.AddRange(dataTypes.GetFloat(0.5f)); // cursorY packet.AddRange(dataTypes.GetFloat(0.5f)); // cursorZ packet.Add(0); // insideBlock = false; - if (protocolversion >= MC_1_19_Version) + if (protocolVersion >= MC_1_19_Version) packet.AddRange(dataTypes.GetVarInt(sequenceId)); SendPacket(PacketTypesOut.PlayerBlockPlacement, packet); return true; @@ -2432,13 +2432,13 @@ namespace MinecraftClient.Protocol.Handlers packet.Add((byte)windowId); // Window ID // 1.18+ - if (protocolversion >= MC_1_18_1_Version) + if (protocolVersion >= MC_1_18_1_Version) { packet.AddRange(dataTypes.GetVarInt(stateId)); // State ID packet.AddRange(dataTypes.GetShort((short)slotId)); // Slot ID } // 1.17.1 - else if (protocolversion == MC_1_17_1_Version) + else if (protocolVersion == MC_1_17_1_Version) { packet.AddRange(dataTypes.GetShort((short)slotId)); // Slot ID packet.AddRange(dataTypes.GetVarInt(stateId)); // State ID @@ -2451,15 +2451,15 @@ namespace MinecraftClient.Protocol.Handlers packet.Add(button); // Button - if (protocolversion < MC_1_17_Version) + if (protocolVersion < MC_1_17_Version) packet.AddRange(dataTypes.GetShort(actionNumber)); - if (protocolversion >= MC_1_9_Version) + if (protocolVersion >= MC_1_9_Version) packet.AddRange(dataTypes.GetVarInt(mode)); // Mode else packet.Add(mode); // 1.17+ Array of changed slots - if (protocolversion >= MC_1_17_Version) + if (protocolVersion >= MC_1_17_Version) { packet.AddRange(dataTypes.GetVarInt(changedSlots.Count)); // Length of the array foreach (var slot in changedSlots) @@ -2502,12 +2502,12 @@ namespace MinecraftClient.Protocol.Handlers { List packet = new List(); - if (protocolversion < MC_1_8_Version) + if (protocolVersion < MC_1_8_Version) { packet.AddRange(dataTypes.GetInt(playerid)); packet.Add((byte)1); // Swing arm } - else if (protocolversion < MC_1_9_Version) + else if (protocolVersion < MC_1_9_Version) { // No fields in 1.8.X } @@ -2575,7 +2575,7 @@ namespace MinecraftClient.Protocol.Handlers public bool UpdateCommandBlock(Location location, string command, CommandBlockMode mode, CommandBlockFlags flags) { - if (protocolversion <= MC_1_13_Version) + if (protocolVersion <= MC_1_13_Version) { try { @@ -2613,7 +2613,7 @@ namespace MinecraftClient.Protocol.Handlers public bool SelectTrade(int selectedSlot) { // MC 1.13 or greater - if (protocolversion >= MC_1_13_Version) + if (protocolVersion >= MC_1_13_Version) { try { @@ -2632,7 +2632,7 @@ namespace MinecraftClient.Protocol.Handlers public bool SendSpectate(Guid UUID) { // MC 1.8 or greater - if (protocolversion >= MC_1_8_Version) + if (protocolVersion >= MC_1_8_Version) { try { From 0382e07d500507802ae7e7bc37e7ceab4d41e4b8 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Fri, 2 Sep 2022 21:02:25 +0800 Subject: [PATCH 34/39] Bug fix: Chunk deleted by mistake --- MinecraftClient/Mapping/World.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/MinecraftClient/Mapping/World.cs b/MinecraftClient/Mapping/World.cs index c850fb90..e29080dc 100644 --- a/MinecraftClient/Mapping/World.cs +++ b/MinecraftClient/Mapping/World.cs @@ -83,16 +83,10 @@ namespace MinecraftClient.Mapping /// Whether the ChunkColumn has been fully loaded public void StoreChunk(int chunkX, int chunkY, int chunkZ, int chunkColumnSize, Chunk? chunk, bool loadCompleted) { - Tuple chunkCoord = new(chunkX, chunkZ); - if (chunk == null) - chunks.TryRemove(chunkCoord, out _); - else - { - ChunkColumn chunkColumn = chunks.GetOrAdd(chunkCoord, (_) => new(chunkColumnSize)); - chunkColumn[chunkY] = chunk; - if (loadCompleted) - chunkColumn.FullyLoaded = true; - } + ChunkColumn chunkColumn = chunks.GetOrAdd(new(chunkX, chunkZ), (_) => new(chunkColumnSize)); + chunkColumn[chunkY] = chunk; + if (loadCompleted) + chunkColumn.FullyLoaded = true; } /// From 3b95cbcce05137a6b77b211de1446feb13b3cc15 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sat, 3 Sep 2022 02:06:16 +0800 Subject: [PATCH 35/39] Trim --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 9c94d099..57c49211 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -195,30 +195,25 @@ namespace MinecraftClient.Protocol.Handlers cancelToken.ThrowIfCancellationRequested(); handler.OnUpdate(); + stopWatch.Restart(); - stopWatch.Start(); while (packetQueue.TryTake(out Tuple>? packetInfo)) { (int packetID, Queue packetData) = packetInfo; HandlePacket(packetID, packetData); - stopWatch.Stop(); if (stopWatch.Elapsed.Milliseconds >= 100) { - stopWatch.Reset(); handler.OnUpdate(); + stopWatch.Restart(); } - stopWatch.Start(); } - stopWatch.Stop(); - if (stopWatch.Elapsed.Milliseconds < 100) - Thread.Sleep(100 - stopWatch.Elapsed.Milliseconds); - stopWatch.Reset(); + int sleepLength = 100 - stopWatch.Elapsed.Milliseconds; + if (sleepLength > 0) + Thread.Sleep(sleepLength); } } - catch (System.IO.IOException) { } - catch (SocketException) { } catch (ObjectDisposedException) { } catch (OperationCanceledException) { } From bcded404760e5fcfd219e494ec94897a28387fa0 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 4 Sep 2022 10:50:49 +0800 Subject: [PATCH 36/39] Bug fix --- MinecraftClient/Protocol/Handlers/Protocol16.cs | 2 +- MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol16.cs b/MinecraftClient/Protocol/Handlers/Protocol16.cs index 602b1b8d..b0ff6546 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol16.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol16.cs @@ -582,7 +582,7 @@ namespace MinecraftClient.Protocol.Handlers public bool Login(PlayerKeyPair? playerKeyPair, SessionToken session) { - if (Handshake(handler.GetUserUuidStr(), handler.GetUsername(), handler.GetSessionID(), handler.GetServerHost(), handler.GetServerPort())) + if (Handshake(handler.GetUserUuidStr(), handler.GetUsername(), handler.GetSessionID(), handler.GetServerHost(), handler.GetServerPort(), session)) { Send(new byte[] { 0xCD, 0 }); try diff --git a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs index 94921e6c..8f85e382 100644 --- a/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs +++ b/MinecraftClient/Protocol/ProfileKey/PlayerKeyPair.cs @@ -20,8 +20,16 @@ namespace MinecraftClient.Protocol.Keys { PublicKey = keyPublic; PrivateKey = keyPrivate; - ExpiresAt = DateTime.ParseExact(expiresAt, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); - RefreshedAfter = DateTime.ParseExact(refreshedAfter, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + try + { + ExpiresAt = DateTime.ParseExact(expiresAt, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + RefreshedAfter = DateTime.ParseExact(refreshedAfter, DataTimeFormat, System.Globalization.CultureInfo.InvariantCulture).ToUniversalTime(); + } + catch + { + ExpiresAt = DateTime.Parse(expiresAt).ToUniversalTime(); + RefreshedAfter = DateTime.Parse(refreshedAfter).ToUniversalTime(); + } } public bool NeedRefresh() From db17babe58987bc306ee49404d2b486b5fdeb17a Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 4 Sep 2022 17:34:12 +0800 Subject: [PATCH 37/39] Bug fix --- MinecraftClient/Mapping/Chunk.cs | 23 ++++++------------- MinecraftClient/Mapping/Movement.cs | 6 ++--- MinecraftClient/McClient.cs | 2 +- .../Protocol/Handlers/Protocol18.cs | 9 +++++--- MinecraftClient/Protocol/PlayerInfo.cs | 2 +- .../Protocol/ProfileKey/PublicKey.cs | 7 ++++-- 6 files changed, 23 insertions(+), 26 deletions(-) diff --git a/MinecraftClient/Mapping/Chunk.cs b/MinecraftClient/Mapping/Chunk.cs index 89991bfd..90ef604e 100644 --- a/MinecraftClient/Mapping/Chunk.cs +++ b/MinecraftClient/Mapping/Chunk.cs @@ -19,17 +19,8 @@ namespace MinecraftClient.Mapping /// /// Blocks contained into the chunk /// - private readonly Block[] blocks; + private readonly Block[] blocks = new Block[SizeY * SizeZ * SizeX]; - public Chunk() - { - this.blocks = new Block[SizeY * SizeZ * SizeX]; - } - - public Chunk(Block[] blocks) - { - this.blocks = blocks; - } /// /// Read, or set the specified block @@ -43,22 +34,22 @@ namespace MinecraftClient.Mapping get { if (blockX < 0 || blockX >= SizeX) - throw new ArgumentOutOfRangeException("blockX", "Must be between 0 and " + (SizeX - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockX), "Must be between 0 and " + (SizeX - 1) + " (inclusive)"); if (blockY < 0 || blockY >= SizeY) - throw new ArgumentOutOfRangeException("blockY", "Must be between 0 and " + (SizeY - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockY), "Must be between 0 and " + (SizeY - 1) + " (inclusive)"); if (blockZ < 0 || blockZ >= SizeZ) - throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockZ), "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); return blocks[(blockY << 8) | (blockZ << 4) | blockX]; } set { if (blockX < 0 || blockX >= SizeX) - throw new ArgumentOutOfRangeException("blockX", "Must be between 0 and " + (SizeX - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockX), "Must be between 0 and " + (SizeX - 1) + " (inclusive)"); if (blockY < 0 || blockY >= SizeY) - throw new ArgumentOutOfRangeException("blockY", "Must be between 0 and " + (SizeY - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockY), "Must be between 0 and " + (SizeY - 1) + " (inclusive)"); if (blockZ < 0 || blockZ >= SizeZ) - throw new ArgumentOutOfRangeException("blockZ", "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); + throw new ArgumentOutOfRangeException(nameof(blockZ), "Must be between 0 and " + (SizeZ - 1) + " (inclusive)"); blocks[(blockY << 8) | (blockZ << 4) | blockX] = value; } diff --git a/MinecraftClient/Mapping/Movement.cs b/MinecraftClient/Mapping/Movement.cs index 0853bbb2..be573c9e 100644 --- a/MinecraftClient/Mapping/Movement.cs +++ b/MinecraftClient/Mapping/Movement.cs @@ -134,10 +134,10 @@ namespace MinecraftClient.Mapping /// How long to wait before stopping computation /// When location is unreachable, computation will reach timeout, then optionally fallback to a close location within maxOffset /// A list of locations, or null if calculation failed - public static Queue CalculatePath(World world, Location start, Location goal, bool allowUnsafe, int maxOffset, int minOffset, TimeSpan timeout) + public static Queue? CalculatePath(World world, Location start, Location goal, bool allowUnsafe, int maxOffset, int minOffset, TimeSpan timeout) { CancellationTokenSource cts = new CancellationTokenSource(); - Task> pathfindingTask = Task.Factory.StartNew(() => Movement.CalculatePath(world, start, goal, allowUnsafe, maxOffset, minOffset, cts.Token)); + Task?> pathfindingTask = Task.Factory.StartNew(() => Movement.CalculatePath(world, start, goal, allowUnsafe, maxOffset, minOffset, cts.Token)); pathfindingTask.Wait(timeout); if (!pathfindingTask.IsCompleted) { @@ -161,7 +161,7 @@ namespace MinecraftClient.Mapping /// Do not get closer of destination than specified distance /// Token for stopping computation after a certain time /// A list of locations, or null if calculation failed - public static Queue CalculatePath(World world, Location start, Location goal, bool allowUnsafe, int maxOffset, int minOffset, CancellationToken ct) + public static Queue? CalculatePath(World world, Location start, Location goal, bool allowUnsafe, int maxOffset, int minOffset, CancellationToken ct) { // This is a bad configuration if (minOffset > maxOffset) diff --git a/MinecraftClient/McClient.cs b/MinecraftClient/McClient.cs index 3d7cb684..a0bb0069 100644 --- a/MinecraftClient/McClient.cs +++ b/MinecraftClient/McClient.cs @@ -55,7 +55,7 @@ namespace MinecraftClient private bool locationReceived = false; private World world = new(); private Queue steps; - private Queue path; + private Queue? path; private Location location; private float? _yaw; // Used for calculation ONLY!!! Doesn't reflect the client yaw private float? _pitch; // Used for calculation ONLY!!! Doesn't reflect the client pitch diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 6b0b39af..8751ca5c 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -572,6 +572,7 @@ namespace MinecraftClient.Protocol.Handlers byte[] bodyDigest = dataTypes.ReadNextByteArray(packetData); bool verifyResult; + if (!isOnlineMode) verifyResult = false; else if (senderUUID == handler.GetUserUuid()) @@ -579,6 +580,7 @@ namespace MinecraftClient.Protocol.Handlers else { PlayerInfo? player = handler.GetPlayerInfo(senderUUID); + if (player == null || !player.IsMessageChainLegal()) verifyResult = false; else @@ -586,7 +588,7 @@ namespace MinecraftClient.Protocol.Handlers bool lastVerifyResult = player.IsMessageChainLegal(); verifyResult = player.VerifyMessageHead(ref precedingSignature, ref headerSignature, ref bodyDigest); if (lastVerifyResult && !verifyResult) - log.Warn("Player " + player.DisplayName + "'s message chain is broken!"); + log.Warn("Player " + player.Name + "'s message chain is broken!"); } } } @@ -1705,7 +1707,7 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_19_2_Version) fullLoginPacket.AddRange(dataTypes.GetArray(playerKeyPair.PublicKey.SignatureV2!)); // Public key signature received from Microsoft API else - fullLoginPacket.AddRange(dataTypes.GetArray(playerKeyPair.PublicKey.Signature!)); // Public key signature received from Microsoft API + fullLoginPacket.AddRange(dataTypes.GetArray(playerKeyPair.PublicKey.Signature!)); // Public key signature received from Microsoft API } } if (protocolVersion >= MC_1_19_2_Version) @@ -1769,7 +1771,6 @@ namespace MinecraftClient.Protocol.Handlers if (serverIDhash != "-") { log.Info(Translations.Get("mcc.session")); - string serverHash = CryptoHandler.getServerHash(serverIDhash, serverPublicKey, secretKey); bool needCheckSession = true; if (session.ServerPublicKey != null && session.SessionPreCheckTask != null @@ -1782,6 +1783,8 @@ namespace MinecraftClient.Protocol.Handlers if (needCheckSession) { + string serverHash = CryptoHandler.getServerHash(serverIDhash, serverPublicKey, secretKey); + if (ProtocolHandler.SessionCheck(uuid, sessionID, serverHash)) { session.ServerIDhash = serverIDhash; diff --git a/MinecraftClient/Protocol/PlayerInfo.cs b/MinecraftClient/Protocol/PlayerInfo.cs index aa482b89..73d96018 100644 --- a/MinecraftClient/Protocol/PlayerInfo.cs +++ b/MinecraftClient/Protocol/PlayerInfo.cs @@ -148,7 +148,7 @@ namespace MinecraftClient.Protocol if (this.precedingSignature != null && !this.precedingSignature.SequenceEqual(precedingSignature!)) return false; - bool res = PublicKey.VerifyHeader(ref bodyDigest, ref headerSignature); + bool res = PublicKey.VerifyHeader(Uuid, ref bodyDigest, ref headerSignature, ref precedingSignature); this.lastMessageVerified = res; this.precedingSignature = headerSignature; diff --git a/MinecraftClient/Protocol/ProfileKey/PublicKey.cs b/MinecraftClient/Protocol/ProfileKey/PublicKey.cs index 6bec8ae9..8ceb55e1 100644 --- a/MinecraftClient/Protocol/ProfileKey/PublicKey.cs +++ b/MinecraftClient/Protocol/ProfileKey/PublicKey.cs @@ -88,9 +88,12 @@ namespace MinecraftClient.Protocol.Keys /// Message body hash /// Message signature /// Is this message header vaild - public bool VerifyHeader(ref byte[] bodyDigest, ref byte[] signature) + public bool VerifyHeader(Guid uuid, ref byte[] bodyDigest, ref byte[] signature, ref byte[]? precedingSignature) { - return VerifyData(bodyDigest, signature); + + byte[] msgSignData = KeyUtils.GetSignatureData(precedingSignature, uuid, bodyDigest); + + return VerifyData(msgSignData, signature); } } From dfc310b3f2dec5b80893464f2d0ed8d92af4ccfe Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 4 Sep 2022 18:12:47 +0800 Subject: [PATCH 38/39] Fix for EntityEffect packet --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 8751ca5c..81b6c163 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -1339,7 +1339,9 @@ namespace MinecraftClient.Protocol.Handlers { int entityid = dataTypes.ReadNextVarInt(packetData); Inventory.Effects effect = Effects.Speed; - if (Enum.TryParse(dataTypes.ReadNextByte(packetData).ToString(), out effect)) + int effectId = protocolVersion >= MC_1_18_2_Version ? + dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextByte(packetData); + if (Enum.TryParse(effectId.ToString(), out effect)) { int amplifier = dataTypes.ReadNextByte(packetData); int duration = dataTypes.ReadNextVarInt(packetData); @@ -1351,7 +1353,8 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_19_Version) { hasFactorData = dataTypes.ReadNextBool(packetData); - factorCodec = dataTypes.ReadNextNbt(packetData); + if (hasFactorData) + factorCodec = dataTypes.ReadNextNbt(packetData); } handler.OnEntityEffect(entityid, effect, amplifier, duration, flags, hasFactorData, factorCodec); From 015d28ec946caba74c3559f6cd9c0912cebcfc45 Mon Sep 17 00:00:00 2001 From: BruceChen Date: Sun, 4 Sep 2022 20:44:38 +0800 Subject: [PATCH 39/39] Fix for LoginSuccess packet --- MinecraftClient/Protocol/Handlers/Protocol18.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 81b6c163..d05cf455 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -1848,7 +1848,11 @@ namespace MinecraftClient.Protocol.Handlers } else if (packetID == 0x02) //Login successful { - Guid uuidReceived = dataTypes.ReadNextUUID(packetData); + Guid uuidReceived; + if (protocolVersion >= Protocol18Handler.MC_1_16_Version) + uuidReceived = dataTypes.ReadNextUUID(packetData); + else + uuidReceived = Guid.Parse(dataTypes.ReadNextString(packetData)); string userName = dataTypes.ReadNextString(packetData); Tuple[]? playerProperty = null; if (protocolVersion >= Protocol18Handler.MC_1_19_Version)