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

Replace List to Queue

Browse source
This commit is contained in:
eulertour0 2020-05-23 21:41:37 +09:00 • committed by ORelio
parent aaf6dca522
commit 06714423a3
4 changed files with 58 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

70
MinecraftClient/Protocol/Handlers/DataTypes.cs
View file

@ -34,10 +34,11 @@ namespace MinecraftClient.Protocol.Handlers
/// <param name="offset">Amount of bytes to read</param> /// <param name="offset">Amount of bytes to read</param>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The data read from the cache as an array</returns> /// <returns>The data read from the cache as an array</returns>
public byte[] ReadData(int offset, List<byte> cache) public byte[] ReadData(int offset, Queue<byte> cache)
{ {
byte[] result = cache.Take(offset).ToArray(); byte[] result = cache.Take(offset).ToArray();
cache.RemoveRange(0, offset); for (int i = 0; i < offset; i++)
cache.Dequeue();
return result; return result;
} }
@ -46,7 +47,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The string</returns> /// <returns>The string</returns>
public string ReadNextString(List<byte> cache) public string ReadNextString(Queue<byte> cache)
{ {
int length = ReadNextVarInt(cache); int length = ReadNextVarInt(cache);
if (length > 0) if (length > 0)
@ -60,7 +61,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a boolean from a cache of bytes and remove it from the cache /// Read a boolean from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The boolean value</returns> /// <returns>The boolean value</returns>
public bool ReadNextBool(List<byte> cache) public bool ReadNextBool(Queue<byte> cache)
{ {
return ReadNextByte(cache) != 0x00; return ReadNextByte(cache) != 0x00;
} }
@ -69,7 +70,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a short integer from a cache of bytes and remove it from the cache /// Read a short integer from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The short integer value</returns> /// <returns>The short integer value</returns>
public short ReadNextShort(List<byte> cache) public short ReadNextShort(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(2, cache); byte[] rawValue = ReadData(2, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -80,7 +81,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read an integer from a cache of bytes and remove it from the cache /// Read an integer from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The integer value</returns> /// <returns>The integer value</returns>
public int ReadNextInt(List<byte> cache) public int ReadNextInt(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(4, cache); byte[] rawValue = ReadData(4, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -91,7 +92,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a long integer from a cache of bytes and remove it from the cache /// Read a long integer from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The unsigned long integer value</returns> /// <returns>The unsigned long integer value</returns>
public long ReadNextLong(List<byte> cache) public long ReadNextLong(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(8, cache); byte[] rawValue = ReadData(8, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -102,7 +103,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read an unsigned short integer from a cache of bytes and remove it from the cache /// Read an unsigned short integer from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The unsigned short integer value</returns> /// <returns>The unsigned short integer value</returns>
public ushort ReadNextUShort(List<byte> cache) public ushort ReadNextUShort(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(2, cache); byte[] rawValue = ReadData(2, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -113,7 +114,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read an unsigned long integer from a cache of bytes and remove it from the cache /// Read an unsigned long integer from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The unsigned long integer value</returns> /// <returns>The unsigned long integer value</returns>
public ulong ReadNextULong(List<byte> cache) public ulong ReadNextULong(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(8, cache); byte[] rawValue = ReadData(8, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -124,7 +125,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a Location encoded as an ulong field and remove it from the cache /// Read a Location encoded as an ulong field and remove it from the cache
/// </summary> /// </summary>
/// <returns>The Location value</returns> /// <returns>The Location value</returns>
public Location ReadNextLocation(List<byte> cache) public Location ReadNextLocation(Queue<byte> cache)
{ {
ulong locEncoded = ReadNextULong(cache); ulong locEncoded = ReadNextULong(cache);
int x, y, z; int x, y, z;
@ -153,7 +154,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read several little endian unsigned short integers at once from a cache of bytes and remove them from the cache /// Read several little endian unsigned short integers at once from a cache of bytes and remove them from the cache
/// </summary> /// </summary>
/// <returns>The unsigned short integer value</returns> /// <returns>The unsigned short integer value</returns>
public ushort[] ReadNextUShortsLittleEndian(int amount, List<byte> cache) public ushort[] ReadNextUShortsLittleEndian(int amount, Queue<byte> cache)
{ {
byte[] rawValues = ReadData(2 * amount, cache); byte[] rawValues = ReadData(2 * amount, cache);
ushort[] result = new ushort[amount]; ushort[] result = new ushort[amount];
@ -167,7 +168,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The uuid</returns> /// <returns>The uuid</returns>
public Guid ReadNextUUID(List<byte> cache) public Guid ReadNextUUID(Queue<byte> cache)
{ {
byte[] javaUUID = ReadData(16, cache); byte[] javaUUID = ReadData(16, cache);
Guid guid; Guid guid;
@ -199,7 +200,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The byte array</returns> /// <returns>The byte array</returns>
public byte[] ReadNextByteArray(List<byte> cache) public byte[] ReadNextByteArray(Queue<byte> cache)
{ {
int len = protocolversion >= Protocol18Handler.MC18Version int len = protocolversion >= Protocol18Handler.MC18Version
? ReadNextVarInt(cache) ? ReadNextVarInt(cache)
@ -211,7 +212,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Reads a length-prefixed array of unsigned long integers and removes it from the cache /// Reads a length-prefixed array of unsigned long integers and removes it from the cache
/// </summary> /// </summary>
/// <returns>The unsigned long integer values</returns> /// <returns>The unsigned long integer values</returns>
public ulong[] ReadNextULongArray(List<byte> cache) public ulong[] ReadNextULongArray(Queue<byte> cache)
{ {
int len = ReadNextVarInt(cache); int len = ReadNextVarInt(cache);
ulong[] result = new ulong[len]; ulong[] result = new ulong[len];
@ -224,7 +225,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a double from a cache of bytes and remove it from the cache /// Read a double from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The double value</returns> /// <returns>The double value</returns>
public double ReadNextDouble(List<byte> cache) public double ReadNextDouble(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(8, cache); byte[] rawValue = ReadData(8, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -235,7 +236,7 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a float from a cache of bytes and remove it from the cache /// Read a float from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The float value</returns> /// <returns>The float value</returns>
public float ReadNextFloat(List<byte> cache) public float ReadNextFloat(Queue<byte> cache)
{ {
byte[] rawValue = ReadData(4, cache); byte[] rawValue = ReadData(4, cache);
Array.Reverse(rawValue); //Endianness Array.Reverse(rawValue); //Endianness
@ -266,7 +267,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The integer</returns> /// <returns>The integer</returns>
public int ReadNextVarInt(List<byte> cache) public int ReadNextVarInt(Queue<byte> cache)
{ {
string rawData = BitConverter.ToString(cache.ToArray()); string rawData = BitConverter.ToString(cache.ToArray());
int i = 0; int i = 0;
@ -289,7 +290,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="cache">Cache of bytes to read from</param> /// <param name="cache">Cache of bytes to read from</param>
/// <returns>The int</returns> /// <returns>The int</returns>
public int ReadNextVarShort(List<byte> cache) public int ReadNextVarShort(Queue<byte> cache)
{ {
ushort low = ReadNextUShort(cache); ushort low = ReadNextUShort(cache);
byte high = 0; byte high = 0;
@ -305,17 +306,16 @@ namespace MinecraftClient.Protocol.Handlers
/// Read a single byte from a cache of bytes and remove it from the cache /// Read a single byte from a cache of bytes and remove it from the cache
/// </summary> /// </summary>
/// <returns>The byte that was read</returns> /// <returns>The byte that was read</returns>
public byte ReadNextByte(List<byte> cache) public byte ReadNextByte(Queue<byte> cache)
{ {
byte result = cache[0]; byte result = cache.Dequeue();
cache.RemoveAt(0);
return result; return result;
} }
/// <summary> /// <summary>
/// Read an uncompressed Named Binary Tag blob and remove it from the cache /// Read an uncompressed Named Binary Tag blob and remove it from the cache
/// </summary> /// </summary>
public Dictionary<string, object> ReadNextNbt(List<byte> cache) public Dictionary<string, object> ReadNextNbt(Queue<byte> cache)
{ {
return ReadNextNbt(cache, true); return ReadNextNbt(cache, true);
} }
@ -325,7 +325,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="item">Item</param> /// <param name="item">Item</param>
/// <returns>The item that was read or NULL for an empty slot</returns> /// <returns>The item that was read or NULL for an empty slot</returns>
public Item ReadNextItemSlot(List<byte> cache) public Item ReadNextItemSlot(Queue<byte> cache)
{ {
List<byte> slotData = new List<byte>(); List<byte> slotData = new List<byte>();
if (protocolversion > Protocol18Handler.MC113Version) if (protocolversion > Protocol18Handler.MC113Version)
@ -357,15 +357,15 @@ namespace MinecraftClient.Protocol.Handlers
/// <summary> /// <summary>
/// Read an uncompressed Named Binary Tag blob and remove it from the cache (internal) /// Read an uncompressed Named Binary Tag blob and remove it from the cache (internal)
/// </summary> /// </summary>
private Dictionary<string, object> ReadNextNbt(List<byte> cache, bool root) private Dictionary<string, object> ReadNextNbt(Queue<byte> cache, bool root)
{ {
Dictionary<string, object> NbtData = new Dictionary<string, object>(); Dictionary<string, object> NbtData = new Dictionary<string, object>();
if (root) if (root)
{ {
if (cache[0] == 0) // TAG_End if (cache.Peek() == 0) // TAG_End
return NbtData; return NbtData;
if (cache[0] != 10) // TAG_Compound if (cache.Peek() != 10) // TAG_Compound
throw new System.IO.InvalidDataException("Failed to decode NBT: Does not start with TAG_Compound"); throw new System.IO.InvalidDataException("Failed to decode NBT: Does not start with TAG_Compound");
ReadNextByte(cache); // Tag type (TAG_Compound) ReadNextByte(cache); // Tag type (TAG_Compound)
@ -394,7 +394,7 @@ namespace MinecraftClient.Protocol.Handlers
/// <summary> /// <summary>
/// Read a single Named Binary Tag field of the specified type and remove it from the cache /// Read a single Named Binary Tag field of the specified type and remove it from the cache
/// </summary> /// </summary>
private object ReadNbtField(List<byte> cache, int fieldType) private object ReadNbtField(Queue<byte> cache, int fieldType)
{ {
switch (fieldType) switch (fieldType)
{ {
@ -424,11 +424,19 @@ namespace MinecraftClient.Protocol.Handlers
case 10: // TAG_Compound case 10: // TAG_Compound
return ReadNextNbt(cache, false); return ReadNextNbt(cache, false);
case 11: // TAG_Int_Array case 11: // TAG_Int_Array
cache.Insert(0, 3); // List type = TAG_Int listType = 3;
return ReadNbtField(cache, 9); // Read as TAG_List listLength = ReadNextInt(cache);
listItems = new object[listLength];
for (int i = 0; i < listLength; i++)
listItems[i] = ReadNbtField(cache, listType);
return listItems;
case 12: // TAG_Long_Array case 12: // TAG_Long_Array
cache.Insert(0, 4); // List type = TAG_Long listType = 4;
return ReadNbtField(cache, 9); // Read as TAG_List listLength = ReadNextInt(cache);
listItems = new object[listLength];
for (int i = 0; i < listLength; i++)
listItems[i] = ReadNbtField(cache, listType);
return listItems;
default: default:
throw new System.IO.InvalidDataException("Failed to decode NBT: Unknown field type " + fieldType); throw new System.IO.InvalidDataException("Failed to decode NBT: Unknown field type " + fieldType);
} }

27
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -130,9 +130,9 @@ namespace MinecraftClient.Protocol.Handlers
while (socketWrapper.HasDataAvailable()) while (socketWrapper.HasDataAvailable())
{ {
int packetID = 0; int packetID = 0;
List<byte> packetData = new List<byte>(); Queue<byte> packetData = new Queue<byte>();
ReadNextPacket(ref packetID, packetData); ReadNextPacket(ref packetID, packetData);
HandlePacket(packetID, new List<byte>(packetData)); HandlePacket(packetID, new Queue<byte>(packetData));
} }
} }
catch (System.IO.IOException) { return false; } catch (System.IO.IOException) { return false; }
@ -146,11 +146,13 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="packetID">will contain packet ID</param> /// <param name="packetID">will contain packet ID</param>
/// <param name="packetData">will contain raw packet Data</param> /// <param name="packetData">will contain raw packet Data</param>
internal void ReadNextPacket(ref int packetID, List<byte> packetData) internal void ReadNextPacket(ref int packetID, Queue<byte> packetData)
{ {
packetData.Clear(); packetData.Clear();
int size = dataTypes.ReadNextVarIntRAW(socketWrapper); //Packet size int size = dataTypes.ReadNextVarIntRAW(socketWrapper); //Packet size
packetData.AddRange(socketWrapper.ReadDataRAW(size)); //Packet contents byte[] rawpacket = socketWrapper.ReadDataRAW(size);//Packet contents
for (int i = 0; i < rawpacket.Length; i++)
packetData.Enqueue(rawpacket[i]);
//Handle packet decompression //Handle packet decompression
if (protocolversion >= MC18Version if (protocolversion >= MC18Version
@ -162,7 +164,8 @@ namespace MinecraftClient.Protocol.Handlers
byte[] toDecompress = packetData.ToArray(); byte[] toDecompress = packetData.ToArray();
byte[] uncompressed = ZlibUtils.Decompress(toDecompress, sizeUncompressed); byte[] uncompressed = ZlibUtils.Decompress(toDecompress, sizeUncompressed);
packetData.Clear(); packetData.Clear();
packetData.AddRange(uncompressed); for (int i = 0; i < uncompressed.Length; i++)
packetData.Enqueue(uncompressed[i]);
} }
} }
@ -175,7 +178,7 @@ namespace MinecraftClient.Protocol.Handlers
/// <param name="packetID">Packet ID</param> /// <param name="packetID">Packet ID</param>
/// <param name="packetData">Packet contents</param> /// <param name="packetData">Packet contents</param>
/// <returns>TRUE if the packet was processed, FALSE if ignored or unknown</returns> /// <returns>TRUE if the packet was processed, FALSE if ignored or unknown</returns>
internal bool HandlePacket(int packetID, List<byte> packetData) internal bool HandlePacket(int packetID, Queue<byte> packetData)
{ {
try try
{ {
@ -290,7 +293,7 @@ namespace MinecraftClient.Protocol.Handlers
int compressedDataSize = dataTypes.ReadNextInt(packetData); int compressedDataSize = dataTypes.ReadNextInt(packetData);
byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData);
byte[] decompressed = ZlibUtils.Decompress(compressed); byte[] decompressed = ZlibUtils.Decompress(compressed);
pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new List<byte>(decompressed)); pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue<byte>(decompressed));
} }
else else
{ {
@ -358,7 +361,7 @@ namespace MinecraftClient.Protocol.Handlers
{ {
int chunkCount; int chunkCount;
bool hasSkyLight; bool hasSkyLight;
List<byte> chunkData = packetData; Queue<byte> chunkData = packetData;
//Read global fields //Read global fields
if (protocolversion < MC18Version) if (protocolversion < MC18Version)
@ -368,7 +371,7 @@ namespace MinecraftClient.Protocol.Handlers
hasSkyLight = dataTypes.ReadNextBool(packetData); hasSkyLight = dataTypes.ReadNextBool(packetData);
byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData);
byte[] decompressed = ZlibUtils.Decompress(compressed); byte[] decompressed = ZlibUtils.Decompress(compressed);
chunkData = new List<byte>(decompressed); chunkData = new Queue<byte>(decompressed);
} }
else else
{ {
@ -841,7 +844,7 @@ namespace MinecraftClient.Protocol.Handlers
SendPacket(0x00, login_packet); SendPacket(0x00, login_packet);
int packetID = -1; int packetID = -1;
List<byte> packetData = new List<byte>(); Queue<byte> packetData = new Queue<byte>();
while (true) while (true)
{ {
ReadNextPacket(ref packetID, packetData); ReadNextPacket(ref packetID, packetData);
@ -909,7 +912,7 @@ namespace MinecraftClient.Protocol.Handlers
//Process the next packet //Process the next packet
int packetID = -1; int packetID = -1;
List<byte> packetData = new List<byte>(); Queue<byte> packetData = new Queue<byte>();
while (true) while (true)
{ {
ReadNextPacket(ref packetID, packetData); ReadNextPacket(ref packetID, packetData);
@ -1217,7 +1220,7 @@ namespace MinecraftClient.Protocol.Handlers
int packetLength = dataTypes.ReadNextVarIntRAW(socketWrapper); int packetLength = dataTypes.ReadNextVarIntRAW(socketWrapper);
if (packetLength > 0) //Read Response length if (packetLength > 0) //Read Response length
{ {
List<byte> packetData = new List<byte>(socketWrapper.ReadDataRAW(packetLength)); Queue<byte> packetData = new Queue<byte>(socketWrapper.ReadDataRAW(packetLength));
if (dataTypes.ReadNextVarInt(packetData) == 0x00) //Read Packet ID if (dataTypes.ReadNextVarInt(packetData) == 0x00) //Read Packet ID
{ {
string result = dataTypes.ReadNextString(packetData); //Get the Json data string result = dataTypes.ReadNextString(packetData); //Get the Json data

6
MinecraftClient/Protocol/Handlers/Protocol18Forge.cs
View file

@ -57,7 +57,7 @@ namespace MinecraftClient.Protocol.Handlers
if (ForgeEnabled()) if (ForgeEnabled())
{ {
int packetID = -1; int packetID = -1;
List<byte> packetData = new List<byte>(); Queue<byte> packetData = new Queue<byte>();
while (fmlHandshakeState != FMLHandshakeClientState.DONE) while (fmlHandshakeState != FMLHandshakeClientState.DONE)
{ {
@ -83,7 +83,7 @@ namespace MinecraftClient.Protocol.Handlers
/// </summary> /// </summary>
/// <param name="packetData">Packet data to read from</param> /// <param name="packetData">Packet data to read from</param>
/// <returns>Length from packet data</returns> /// <returns>Length from packet data</returns>
public int ReadNextVarShort(List<byte> packetData) public int ReadNextVarShort(Queue<byte> packetData)
{ {
if (ForgeEnabled()) if (ForgeEnabled())
{ {
@ -104,7 +104,7 @@ namespace MinecraftClient.Protocol.Handlers
/// <param name="packetData">Plugin message data</param> /// <param name="packetData">Plugin message data</param>
/// <param name="currentDimension">Current world dimension</param> /// <param name="currentDimension">Current world dimension</param>
/// <returns>TRUE if the plugin message was recognized and handled</returns> /// <returns>TRUE if the plugin message was recognized and handled</returns>
public bool HandlePluginMessage(string channel, List<byte> packetData, ref int currentDimension) public bool HandlePluginMessage(string channel, Queue<byte> packetData, ref int currentDimension)
{ {
if (ForgeEnabled() && fmlHandshakeState != FMLHandshakeClientState.DONE) if (ForgeEnabled() && fmlHandshakeState != FMLHandshakeClientState.DONE)
{ {

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

@ -38,7 +38,7 @@ namespace MinecraftClient.Protocol.Handlers
/// <param name="chunksContinuous">Are the chunk continuous</param> /// <param name="chunksContinuous">Are the chunk continuous</param>
/// <param name="currentDimension">Current dimension type (0 = overworld)</param> /// <param name="currentDimension">Current dimension type (0 = overworld)</param>
/// <param name="cache">Cache for reading chunk data</param> /// <param name="cache">Cache for reading chunk data</param>
public void ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, List<byte> cache) public void ProcessChunkColumnData(int chunkX, int chunkZ, ushort chunkMask, ushort chunkMask2, bool hasSkyLight, bool chunksContinuous, int currentDimension, Queue<byte> cache)
{ {
if (protocolversion >= Protocol18Handler.MC19Version) if (protocolversion >= Protocol18Handler.MC19Version)
{ {