diff --git a/MinecraftClient/Mapping/EntityMetaDataType.cs b/MinecraftClient/Mapping/EntityMetaDataType.cs new file mode 100644 index 00000000..cb0fb85d --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetaDataType.cs @@ -0,0 +1,33 @@ +namespace MinecraftClient.Mapping; + +public enum EntityMetaDataType +{ + Byte, + VarInt, + VarLong, + Float, + String, + Chat, + OptionalChat, + Slot, + Boolean, + Rotation, + Position, + OptionalPosition, + Direction, + OptionalUuid, + BlockId, + OptionalBlockId, + Nbt, + Particle, + VillagerData, + OptionalVarInt, + Pose, + CatVariant, + FrogVariant, + OptionalGlobalPosition, + PaintingVariant, + SnifferState, + Vector3, + Quaternion +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalette.cs b/MinecraftClient/Mapping/EntityMetadataPalette.cs new file mode 100644 index 00000000..063ce383 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalette.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping; + +public abstract class EntityMetadataPalette +{ + public abstract Dictionary GetEntityMetadataMappingsList(); +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette111.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette111.cs new file mode 100644 index 00000000..0111205e --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette111.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette111 : EntityMetadataPalette +{ + // 1.11 : https://wiki.vg/index.php?title=Entity_metadata&oldid=8269 + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.Float }, + { 3, EntityMetaDataType.String }, + { 4, EntityMetaDataType.Chat }, + { 5, EntityMetaDataType.Slot }, + { 6, EntityMetaDataType.Boolean }, + { 7, EntityMetaDataType.Rotation }, + { 8, EntityMetaDataType.Position }, + { 9, EntityMetaDataType.OptionalPosition }, + { 10, EntityMetaDataType.Direction }, + { 11, EntityMetaDataType.OptionalUuid }, + { 12, EntityMetaDataType.OptionalBlockId } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette113.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette113.cs new file mode 100644 index 00000000..e7e98cf0 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette113.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette113 : EntityMetadataPalette +{ + // 1.13 : https://wiki.vg/index.php?title=Entity_metadata&oldid=14539 + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.Float }, + { 3, EntityMetaDataType.String }, + { 4, EntityMetaDataType.Chat }, + { 5, EntityMetaDataType.OptionalChat }, + { 6, EntityMetaDataType.Slot }, + { 7, EntityMetaDataType.Boolean }, + { 8, EntityMetaDataType.Rotation }, + { 9, EntityMetaDataType.Position }, + { 10, EntityMetaDataType.OptionalPosition }, + { 11, EntityMetaDataType.Direction }, + { 12, EntityMetaDataType.OptionalUuid }, + { 13, EntityMetaDataType.OptionalBlockId }, + { 14, EntityMetaDataType.Nbt }, + { 15, EntityMetaDataType.Particle } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette114.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette114.cs new file mode 100644 index 00000000..dd142a29 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette114.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette114 : EntityMetadataPalette +{ + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.Float }, + { 3, EntityMetaDataType.String }, + { 4, EntityMetaDataType.Chat }, + { 5, EntityMetaDataType.OptionalChat }, + { 6, EntityMetaDataType.Slot }, + { 7, EntityMetaDataType.Boolean }, + { 8, EntityMetaDataType.Rotation }, + { 9, EntityMetaDataType.Position }, + { 10, EntityMetaDataType.OptionalPosition }, + { 11, EntityMetaDataType.Direction }, + { 12, EntityMetaDataType.OptionalUuid }, + { 13, EntityMetaDataType.OptionalBlockId }, + { 14, EntityMetaDataType.Nbt }, + { 15, EntityMetaDataType.Particle }, + { 16, EntityMetaDataType.VillagerData }, + { 17, EntityMetaDataType.OptionalVarInt }, + { 18, EntityMetaDataType.Pose } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1191.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1191.cs new file mode 100644 index 00000000..13216fa0 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1191.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette1191 : EntityMetadataPalette +{ + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.Float }, + { 3, EntityMetaDataType.String }, + { 4, EntityMetaDataType.Chat }, + { 5, EntityMetaDataType.OptionalChat }, + { 6, EntityMetaDataType.Slot }, + { 7, EntityMetaDataType.Boolean }, + { 8, EntityMetaDataType.Rotation }, + { 9, EntityMetaDataType.Position }, + { 10, EntityMetaDataType.OptionalPosition }, + { 11, EntityMetaDataType.Direction }, + { 12, EntityMetaDataType.OptionalUuid }, + { 13, EntityMetaDataType.OptionalBlockId }, + { 14, EntityMetaDataType.Nbt }, + { 15, EntityMetaDataType.Particle }, + { 16, EntityMetaDataType.VillagerData }, + { 17, EntityMetaDataType.OptionalVarInt }, + { 18, EntityMetaDataType.Pose }, + { 19, EntityMetaDataType.CatVariant }, + { 20, EntityMetaDataType.FrogVariant }, + { 21, EntityMetaDataType.OptionalGlobalPosition }, + { 22, EntityMetaDataType.PaintingVariant } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1193.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1193.cs new file mode 100644 index 00000000..3c4a5451 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1193.cs @@ -0,0 +1,39 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette1193 : EntityMetadataPalette +{ + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.VarLong }, + { 3, EntityMetaDataType.Float }, + { 4, EntityMetaDataType.String }, + { 5, EntityMetaDataType.Chat }, + { 6, EntityMetaDataType.OptionalChat }, + { 7, EntityMetaDataType.Slot }, + { 8, EntityMetaDataType.Boolean }, + { 9, EntityMetaDataType.Rotation }, + { 10, EntityMetaDataType.Position }, + { 11, EntityMetaDataType.OptionalPosition }, + { 12, EntityMetaDataType.Direction }, + { 13, EntityMetaDataType.OptionalUuid }, + { 14, EntityMetaDataType.OptionalBlockId }, + { 15, EntityMetaDataType.Nbt }, + { 16, EntityMetaDataType.Particle }, + { 17, EntityMetaDataType.VillagerData }, + { 18, EntityMetaDataType.OptionalVarInt }, + { 19, EntityMetaDataType.Pose }, + { 20, EntityMetaDataType.CatVariant }, + { 21, EntityMetaDataType.FrogVariant }, + { 22, EntityMetaDataType.OptionalGlobalPosition }, + { 23, EntityMetaDataType.PaintingVariant } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1194.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1194.cs new file mode 100644 index 00000000..11e15fe4 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette1194.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette1194 : EntityMetadataPalette +{ + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.VarLong }, + { 3, EntityMetaDataType.Float }, + { 4, EntityMetaDataType.String }, + { 5, EntityMetaDataType.Chat }, + { 6, EntityMetaDataType.OptionalChat }, + { 7, EntityMetaDataType.Slot }, + { 8, EntityMetaDataType.Boolean }, + { 9, EntityMetaDataType.Rotation }, + { 10, EntityMetaDataType.Position }, + { 11, EntityMetaDataType.OptionalPosition }, + { 12, EntityMetaDataType.Direction }, + { 13, EntityMetaDataType.OptionalUuid }, + { 14, EntityMetaDataType.BlockId }, + { 15, EntityMetaDataType.OptionalBlockId }, + { 16, EntityMetaDataType.Nbt }, + { 17, EntityMetaDataType.Particle }, + { 18, EntityMetaDataType.VillagerData }, + { 19, EntityMetaDataType.OptionalVarInt }, + { 20, EntityMetaDataType.Pose }, + { 21, EntityMetaDataType.CatVariant }, + { 22, EntityMetaDataType.FrogVariant }, + { 23, EntityMetaDataType.OptionalGlobalPosition }, + { 24, EntityMetaDataType.PaintingVariant }, + { 25, EntityMetaDataType.SnifferState }, + { 26, EntityMetaDataType.Vector3 }, + { 27, EntityMetaDataType.Quaternion }, + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette19.cs b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette19.cs new file mode 100644 index 00000000..2f041c66 --- /dev/null +++ b/MinecraftClient/Mapping/EntityMetadataPalettes/EntityMetadataPalette19.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace MinecraftClient.Mapping.EntityMetadataPalettes; + +public class EntityMetadataPalette19 : EntityMetadataPalette +{ + // 1.8 : https://wiki.vg/index.php?title=Entity_metadata&oldid=6220 (Requires a different algorithm) + // 1.9 : https://wiki.vg/index.php?title=Entity_metadata&oldid=7416 + private readonly Dictionary entityMetadataMappings = new() + { + { 0, EntityMetaDataType.Byte }, + { 1, EntityMetaDataType.VarInt }, + { 2, EntityMetaDataType.Float }, + { 3, EntityMetaDataType.String }, + { 4, EntityMetaDataType.Chat }, + { 5, EntityMetaDataType.Slot }, + { 6, EntityMetaDataType.Boolean }, + { 7, EntityMetaDataType.Vector3 }, + { 8, EntityMetaDataType.Position }, + { 9, EntityMetaDataType.OptionalPosition }, + { 10, EntityMetaDataType.Direction }, + { 11, EntityMetaDataType.OptionalUuid }, + { 12, EntityMetaDataType.OptionalBlockId } + }; + + public override Dictionary GetEntityMetadataMappingsList() + { + return entityMetadataMappings; + } +} \ No newline at end of file diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 716312ec..84672875 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -188,6 +188,7 @@ namespace MinecraftClient.Protocol.Handlers y = (int)((locEncoded >> 26) & 0xFFF); z = (int)(locEncoded << 38 >> 38); } + if (x >= 0x02000000) // 33,554,432 x -= 0x04000000; // 67,108,864 if (y >= 0x00000800) // 2,048 @@ -309,6 +310,7 @@ namespace MinecraftClient.Protocol.Handlers if (j > 5) throw new OverflowException("VarInt too big"); if ((b & 0x80) != 128) break; } + return i; } @@ -329,6 +331,7 @@ namespace MinecraftClient.Protocol.Handlers i |= (b & 0x7F) << j++ * 7; if (j > 5) throw new OverflowException("VarInt too big"); } while ((b & 0x80) == 128); + return i; } @@ -360,6 +363,7 @@ namespace MinecraftClient.Protocol.Handlers low &= 0x7FFF; high = ReadNextByte(cache); } + return ((high & 0xFF) << 15) | low; } @@ -385,6 +389,7 @@ namespace MinecraftClient.Protocol.Handlers throw new OverflowException("VarLong is too big"); } } while ((read & 0x80) != 0); + return result; } @@ -487,7 +492,8 @@ namespace MinecraftClient.Protocol.Handlers short velocityY = ReadNextShort(cache); short velocityZ = ReadNextShort(cache); - return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch, metadata); + return new Entity(entityID, entityType, new Location(entityX, entityY, entityZ), entityYaw, entityPitch, + metadata); } /// @@ -504,6 +510,7 @@ namespace MinecraftClient.Protocol.Handlers cache.Dequeue(); return nbtData; } + if (cache.Peek() != 10) // TAG_Compound throw new System.IO.InvalidDataException("Failed to decode NBT: Does not start with TAG_Compound"); ReadNextByte(cache); // Tag type (TAG_Compound) @@ -582,6 +589,7 @@ namespace MinecraftClient.Protocol.Handlers } } + //TODO: Refactor this to use new Entity Metadata Palettes public Dictionary ReadNextMetadata(Queue cache, ItemPalette itemPalette) { Dictionary data = new(); @@ -603,90 +611,87 @@ namespace MinecraftClient.Protocol.Handlers if (type > 4) ++type; } - else if (protocolversion >= Protocol18Handler.MC_1_19_3_Version) - { - if (type == 2) - { - value = ReadNextVarLong(cache); - type = -1; - } - else if (type >= 3) - { - --type; - } - } - // This is backward compatible since new type is appended to the end - // Version upgrade note - // - Check type ID got shifted or not - // - Add new type if any - switch (type) + // Temporary + if (protocolversion >= Protocol18Handler.MC_1_19_3_Version) { - case -1: // already readed - break; - case 0: // byte - value = ReadNextByte(cache); - break; - case 1: // VarInt - value = ReadNextVarInt(cache); - break; - case 2: // Float - value = ReadNextFloat(cache); - break; - case 3: // String - value = ReadNextString(cache); - break; - case 4: // Chat - value = ReadNextString(cache); - break; - case 5: // Optional Chat - if (ReadNextBool(cache)) + switch (type) + { + case 0: // byte + value = ReadNextByte(cache); + break; + case 1: // VarInt + value = ReadNextVarInt(cache); + break; + case 2: // Long + value = ReadNextLong(cache); + break; + ; + case 3: // Float + value = ReadNextFloat(cache); + break; + case 4: // String value = ReadNextString(cache); - break; - case 6: // Slot - value = ReadNextItemSlot(cache, itemPalette); - break; - case 7: // Boolean - value = ReadNextBool(cache); - break; - case 8: // Rotation (3x floats) - value = new List - { - ReadNextFloat(cache), - ReadNextFloat(cache), - ReadNextFloat(cache) - }; - break; - case 9: // Position - value = ReadNextLocation(cache); - break; - case 10: // Optional Position - if (ReadNextBool(cache)) - { + break; + case 5: // Chat + value = ReadNextString(cache); + break; + case 6: // Optional Chat + if (ReadNextBool(cache)) + value = ReadNextString(cache); + break; + case 7: // Slot + value = ReadNextItemSlot(cache, itemPalette); + break; + case 8: // Boolean + value = ReadNextBool(cache); + break; + case 9: // Rotation (3x floats) + value = new List + { + ReadNextFloat(cache), + ReadNextFloat(cache), + ReadNextFloat(cache) + }; + break; + case 10: // Position value = ReadNextLocation(cache); - } - break; - case 11: // Direction (VarInt) - value = ReadNextVarInt(cache); - break; - case 12: // Optional UUID - if (ReadNextBool(cache)) - { - value = ReadNextUUID(cache); - } - break; - case 13: // Optional BlockID (VarInt) - value = ReadNextVarInt(cache); - break; - case 14: // NBT - value = ReadNextNbt(cache); - break; - case 15: // Particle - // Currecutly not handled. Reading data only - int ParticleID = ReadNextVarInt(cache); - // Need to check the exact version where the change occurred!!!!! - if (protocolversion >= Protocol18Handler.MC_1_19_3_Version) - { + break; + case 11: // Optional Position + if (ReadNextBool(cache)) + { + value = ReadNextLocation(cache); + } + + break; + case 12: // Direction (VarInt) + value = ReadNextVarInt(cache); + break; + case 13: // Optional UUID + if (ReadNextBool(cache)) + { + value = ReadNextUUID(cache); + } + + break; + case 14: // BlockID (VarInt) + value = ReadNextVarInt(cache); + break; + case 15: // Optional BlockID (VarInt) + value = ReadNextVarInt(cache); + break; + case 16: // NBT + value = ReadNextNbt(cache); + break; + case 17: // Particle + // Currently not handled. Reading data only + int ParticleID = ReadNextVarInt(cache); + // TODO: Go through wiki history and write for every version + // 1.19.3 - https://wiki.vg/index.php?title=Data_types&oldid=17986 + // 1.18 - https://wiki.vg/index.php?title=Data_types&oldid=17180 + // 1.17 - https://wiki.vg/index.php?title=Data_types&oldid=16740 + // 1.15 - https://wiki.vg/index.php?title=Data_types&oldid=15338 + // 1.13 - https://wiki.vg/index.php?title=Data_types&oldid=14271 switch (ParticleID) { case 2: @@ -710,13 +715,16 @@ namespace MinecraftClient.Protocol.Handlers ReadNextFloat(cache); ReadNextFloat(cache); break; - case 24: + case 25: ReadNextVarInt(cache); break; - case 35: + case 30: + ReadNextFloat(cache); + break; + case 39: ReadNextItemSlot(cache, itemPalette); break; - case 36: + case 40: string positionSourceType = ReadNextString(cache); if (positionSourceType == "minecraft:block") { @@ -727,12 +735,149 @@ namespace MinecraftClient.Protocol.Handlers ReadNextVarInt(cache); ReadNextFloat(cache); } + ReadNextVarInt(cache); break; } - } - else - { + + break; + case 18: // Villager Data (3x VarInt) + value = new List + { + ReadNextVarInt(cache), + ReadNextVarInt(cache), + ReadNextVarInt(cache) + }; + break; + case 19: // Optional VarInt + if (ReadNextBool(cache)) + { + value = ReadNextVarInt(cache); + } + + break; + case 20: // Pose + value = ReadNextVarInt(cache); + break; + case 21: // Cat Variant + value = ReadNextVarInt(cache); + break; + case 22: // Frog Varint + value = ReadNextVarInt(cache); + break; + case 23: // GlobalPos at 1.19.2+; Painting Variant at 1.19- + if (protocolversion <= Protocol18Handler.MC_1_19_Version) + { + value = ReadNextVarInt(cache); + } + else + { + // Dimension and blockPos, currently not in use + value = new Tuple(ReadNextString(cache), ReadNextLocation(cache)); + } + + break; + case 24: // Painting Variant + value = ReadNextVarInt(cache); + break; + case 25: // Sniffer state + value = ReadNextVarInt(cache); + break; + case 26: // Vector 3f + value = new List + { + ReadNextFloat(cache), + ReadNextFloat(cache), + ReadNextFloat(cache) + }; + break; + case 27: // Quaternion + value = new List + { + ReadNextFloat(cache), + ReadNextFloat(cache), + ReadNextFloat(cache), + ReadNextFloat(cache) + }; + break; + + default: + throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + type + + ". Is this up to date for new MC Version?"); + } + + data[key] = value; + key = ReadNextByte(cache); + } + else + { + // This is backward compatible since new type is appended to the end + // Version upgrade note + // - Check type ID got shifted or not + // - Add new type if any + switch (type) + { + case 0: // byte + value = ReadNextByte(cache); + break; + case 1: // VarInt + value = ReadNextVarInt(cache); + break; + case 2: // Float + value = ReadNextFloat(cache); + break; + case 3: // String + value = ReadNextString(cache); + break; + case 4: // Chat + value = ReadNextString(cache); + break; + case 5: // Optional Chat + if (ReadNextBool(cache)) + value = ReadNextString(cache); + break; + case 6: // Slot + value = ReadNextItemSlot(cache, itemPalette); + break; + case 7: // Boolean + value = ReadNextBool(cache); + break; + case 8: // Rotation (3x floats) + value = new List + { + ReadNextFloat(cache), + ReadNextFloat(cache), + ReadNextFloat(cache) + }; + break; + case 9: // Position + value = ReadNextLocation(cache); + break; + case 10: // Optional Position + if (ReadNextBool(cache)) + { + value = ReadNextLocation(cache); + } + + break; + case 11: // Direction (VarInt) + value = ReadNextVarInt(cache); + break; + case 12: // Optional UUID + if (ReadNextBool(cache)) + { + value = ReadNextUUID(cache); + } + + break; + case 13: // Optional BlockID (VarInt) + value = ReadNextVarInt(cache); + break; + case 14: // NBT + value = ReadNextNbt(cache); + break; + case 15: // Particle + int ParticleID = ReadNextVarInt(cache); switch (ParticleID) { case 3: @@ -751,49 +896,55 @@ namespace MinecraftClient.Protocol.Handlers ReadNextItemSlot(cache, itemPalette); break; } - } - break; - case 16: // Villager Data (3x VarInt) - value = new List - { - ReadNextVarInt(cache), - ReadNextVarInt(cache), - ReadNextVarInt(cache) - }; - break; - case 17: // Optional VarInt - if (ReadNextBool(cache)) - { + + break; + case 16: // Villager Data (3x VarInt) + value = new List + { + ReadNextVarInt(cache), + ReadNextVarInt(cache), + ReadNextVarInt(cache) + }; + break; + case 17: // Optional VarInt + if (ReadNextBool(cache)) + { + value = ReadNextVarInt(cache); + } + + break; + case 18: // Pose value = ReadNextVarInt(cache); - } - break; - case 18: // Pose - value = ReadNextVarInt(cache); - break; - case 19: // Cat Variant - value = ReadNextVarInt(cache); - break; - case 20: // Frog Varint - value = ReadNextVarInt(cache); - break; - case 21: // GlobalPos at 1.19.2+; Painting Variant at 1.19- - if (protocolversion <= Protocol18Handler.MC_1_19_Version) + break; + case 19: // Cat Variant value = ReadNextVarInt(cache); - else - { - // Dimension and blockPos, currently not in use - value = new Tuple(ReadNextString(cache), ReadNextLocation(cache)); - } - break; - case 22: // Painting Variant - value = ReadNextVarInt(cache); - break; - default: - throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + type + ". Is this up to date for new MC Version?"); + break; + case 20: // Frog Varint + value = ReadNextVarInt(cache); + break; + case 21: // GlobalPos at 1.19.2+; Painting Variant at 1.19- + if (protocolversion <= Protocol18Handler.MC_1_19_Version) + value = ReadNextVarInt(cache); + else + { + // Dimension and blockPos, currently not in use + value = new Tuple(ReadNextString(cache), ReadNextLocation(cache)); + } + + break; + case 22: // Painting Variant + value = ReadNextVarInt(cache); + break; + default: + throw new System.IO.InvalidDataException("Unknown Metadata Type ID " + type + + ". Is this up to date for new MC Version?"); + } + + data[key] = value; + key = ReadNextByte(cache); } - data[key] = value; - key = ReadNextByte(cache); } + return data; } @@ -823,7 +974,8 @@ namespace MinecraftClient.Protocol.Handlers int specialPrice = ReadNextInt(cache); float priceMultiplier = ReadNextFloat(cache); int demand = ReadNextInt(cache); - return new VillagerTrade(inputItem1, outputItem, inputItem2, tradeDisabled, numberOfTradeUses, maximumNumberOfTradeUses, xp, specialPrice, priceMultiplier, demand); + return new VillagerTrade(inputItem1, outputItem, inputItem2, tradeDisabled, numberOfTradeUses, + maximumNumberOfTradeUses, xp, specialPrice, priceMultiplier, demand); } /// @@ -956,11 +1108,13 @@ namespace MinecraftClient.Protocol.Handlers subsequentItemsBytes.AddRange(GetNbtField(item, out byte subsequentItemType)); if (subsequentItemType != firstItemType) throw new System.IO.InvalidDataException( - "GetNbt: Cannot encode object[] list with mixed types: " + firstItemTypeString + ", " + item.GetType().Name + " into NBT!"); + "GetNbt: Cannot encode object[] list with mixed types: " + firstItemTypeString + ", " + + item.GetType().Name + " into NBT!"); } // Build NBT list: type, length, item array - return ConcatBytes(new[] { firstItemType }, GetInt(arrayLengthTotal), firstItemBytes, subsequentItemsBytes.ToArray()); + return ConcatBytes(new[] { firstItemType }, GetInt(arrayLengthTotal), firstItemBytes, + subsequentItemsBytes.ToArray()); } else if (obj is Dictionary) { @@ -991,7 +1145,8 @@ namespace MinecraftClient.Protocol.Handlers } else { - throw new System.IO.InvalidDataException("GetNbt: Cannot encode data type " + obj.GetType().Name + " into NBT!"); + throw new System.IO.InvalidDataException("GetNbt: Cannot encode data type " + obj.GetType().Name + + " into NBT!"); } } @@ -1008,6 +1163,7 @@ namespace MinecraftClient.Protocol.Handlers bytes.Add((byte)(paramInt & 127 | 128)); paramInt = (int)(((uint)paramInt) >> 7); } + bytes.Add((byte)paramInt); return bytes.ToArray(); } @@ -1152,9 +1308,15 @@ namespace MinecraftClient.Protocol.Handlers byte[] locationBytes; if (protocolversion >= Protocol18Handler.MC_1_14_Version) { - locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | ((((ulong)location.Z) & 0x3FFFFFF) << 12) | (((ulong)location.Y) & 0xFFF)); + locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | + ((((ulong)location.Z) & 0x3FFFFFF) << 12) | + (((ulong)location.Y) & 0xFFF)); } - else locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | ((((ulong)location.Y) & 0xFFF) << 26) | (((ulong)location.Z) & 0x3FFFFFF)); + else + locationBytes = BitConverter.GetBytes(((((ulong)location.X) & 0x3FFFFFF) << 38) | + ((((ulong)location.Y) & 0xFFF) << 26) | + (((ulong)location.Z) & 0x3FFFFFF)); + Array.Reverse(locationBytes); //Endianness return locationBytes; } @@ -1193,6 +1355,7 @@ namespace MinecraftClient.Protocol.Handlers slotData.AddRange(GetNbt(item.NBT)); } } + return slotData.ToArray(); } @@ -1278,17 +1441,18 @@ namespace MinecraftClient.Protocol.Handlers public byte[] GetLastSeenMessageList(Message.LastSeenMessageList msgList, bool isOnlineMode) { if (!isOnlineMode) - return GetVarInt(0); // Message list size + return GetVarInt(0); // Message list size else { List fields = new(); - fields.AddRange(GetVarInt(msgList.entries.Length)); // Message list size + fields.AddRange(GetVarInt(msgList.entries.Length)); // Message list size foreach (Message.LastSeenMessageList.AcknowledgedMessage entry in msgList.entries) { - fields.AddRange(entry.profileId.ToBigEndianBytes()); // UUID - fields.AddRange(GetVarInt(entry.signature.Length)); // Signature length - fields.AddRange(entry.signature); // Signature data + fields.AddRange(entry.profileId.ToBigEndianBytes()); // UUID + fields.AddRange(GetVarInt(entry.signature.Length)); // Signature length + fields.AddRange(entry.signature); // Signature data } + return fields.ToArray(); } } @@ -1304,15 +1468,16 @@ namespace MinecraftClient.Protocol.Handlers List fields = new(); fields.AddRange(GetLastSeenMessageList(ack.lastSeen, isOnlineMode)); if (!isOnlineMode || ack.lastReceived == null) - fields.AddRange(GetBool(false)); // Has last received message + fields.AddRange(GetBool(false)); // Has last received message else { fields.AddRange(GetBool(true)); - fields.AddRange(ack.lastReceived.profileId.ToBigEndianBytes()); // Has last received message - fields.AddRange(GetVarInt(ack.lastReceived.signature.Length)); // Last received message signature length - fields.AddRange(ack.lastReceived.signature); // Last received message signature data + fields.AddRange(ack.lastReceived.profileId.ToBigEndianBytes()); // Has last received message + fields.AddRange(GetVarInt(ack.lastReceived.signature.Length)); // Last received message signature length + fields.AddRange(ack.lastReceived.signature); // Last received message signature data } + return fields.ToArray(); } } -} +} \ No newline at end of file diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index e8cb5292..8143ea61 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -95,7 +95,8 @@ namespace MinecraftClient.Protocol.Handlers readonly ILogger log; readonly RandomNumberGenerator randomGen; - public Protocol18Handler(TcpClient Client, int protocolVersion, IMinecraftComHandler handler, ForgeInfo? forgeInfo) + public Protocol18Handler(TcpClient Client, int protocolVersion, IMinecraftComHandler handler, + ForgeInfo? forgeInfo) { ConsoleIO.SetAutoCompleteEngine(this); ChatParser.InitTranslations(); @@ -116,12 +117,15 @@ namespace MinecraftClient.Protocol.Handlers handler.SetTerrainEnabled(false); } - if (handler.GetInventoryEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_4_Version)) + if (handler.GetInventoryEnabled() && + (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_4_Version)) { log.Error("§c" + Translations.extra_inventory_disabled); handler.SetInventoryEnabled(false); } - if (handler.GetEntityHandlingEnabled() && (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_3_Version)) + + if (handler.GetEntityHandlingEnabled() && + (protocolVersion < MC_1_10_Version || protocolVersion > MC_1_19_4_Version)) { log.Error("§c" + Translations.extra_entity_disabled); handler.SetEntityHandlingEnabled(false); @@ -201,25 +205,25 @@ namespace MinecraftClient.Protocol.Handlers if (this.protocolVersion >= MC_1_19_2_Version) ChatParser.ChatId2Type = new() { - { 0, ChatParser.MessageType.CHAT }, - { 1, ChatParser.MessageType.SAY_COMMAND }, - { 2, ChatParser.MessageType.MSG_COMMAND_INCOMING }, - { 3, ChatParser.MessageType.MSG_COMMAND_OUTGOING }, - { 4, ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING }, - { 5, ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING }, - { 6, ChatParser.MessageType.EMOTE_COMMAND }, + { 0, ChatParser.MessageType.CHAT }, + { 1, ChatParser.MessageType.SAY_COMMAND }, + { 2, ChatParser.MessageType.MSG_COMMAND_INCOMING }, + { 3, ChatParser.MessageType.MSG_COMMAND_OUTGOING }, + { 4, ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING }, + { 5, ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING }, + { 6, ChatParser.MessageType.EMOTE_COMMAND }, }; else if (this.protocolVersion == MC_1_19_Version) ChatParser.ChatId2Type = new() { - { 0, ChatParser.MessageType.CHAT }, - { 1, ChatParser.MessageType.RAW_MSG }, - { 2, ChatParser.MessageType.RAW_MSG }, - { 3, ChatParser.MessageType.SAY_COMMAND }, - { 4, ChatParser.MessageType.MSG_COMMAND_INCOMING }, - { 5, ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING }, - { 6, ChatParser.MessageType.EMOTE_COMMAND }, - { 7, ChatParser.MessageType.RAW_MSG }, + { 0, ChatParser.MessageType.CHAT }, + { 1, ChatParser.MessageType.RAW_MSG }, + { 2, ChatParser.MessageType.RAW_MSG }, + { 3, ChatParser.MessageType.SAY_COMMAND }, + { 4, ChatParser.MessageType.MSG_COMMAND_INCOMING }, + { 5, ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING }, + { 6, ChatParser.MessageType.EMOTE_COMMAND }, + { 7, ChatParser.MessageType.RAW_MSG }, }; } @@ -260,9 +264,15 @@ namespace MinecraftClient.Protocol.Handlers Thread.Sleep(sleepLength); } } - catch (ObjectDisposedException) { } - catch (OperationCanceledException) { } - catch (NullReferenceException) { } + catch (ObjectDisposedException) + { + } + catch (OperationCanceledException) + { + } + catch (NullReferenceException) + { + } if (cancelToken.IsCancellationRequested) return; @@ -288,16 +298,29 @@ namespace MinecraftClient.Protocol.Handlers break; } } - catch (System.IO.IOException) { break; } - catch (SocketException) { break; } - catch (NullReferenceException) { break; } - catch (Ionic.Zlib.ZlibException) { 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(); } @@ -365,7 +388,8 @@ namespace MinecraftClient.Protocol.Handlers } } // Regular in-game packets - else switch (packetPalette.GetIncommingTypeById(packetID)) + else + switch (packetPalette.GetIncommingTypeById(packetID)) { case PacketTypesIn.KeepAlive: SendPacket(PacketTypesOut.KeepAlive, packetData); @@ -375,34 +399,40 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.Pong, packetData); break; case PacketTypesIn.JoinGame: - { // Temporary fix - log.Debug("Receive JoinGame"); + { + // Temporary fix + log.Debug("Receive JoinGame"); - receiveDeclareCommands = receivePlayerInfo = false; + receiveDeclareCommands = receivePlayerInfo = false; - messageIndex = 0; - pendingAcknowledgments = 0; + messageIndex = 0; + pendingAcknowledgments = 0; - lastReceivedMessage = null; - lastSeenMessagesCollector = protocolVersion >= MC_1_19_3_Version ? new(20) : new(5); - } + lastReceivedMessage = null; + lastSeenMessagesCollector = protocolVersion >= MC_1_19_3_Version ? new(20) : new(5); + } handler.OnGameJoined(isOnlineMode); int playerEntityID = dataTypes.ReadNextInt(packetData); handler.OnReceivePlayerEntityID(playerEntityID); if (protocolVersion >= MC_1_16_2_Version) - dataTypes.ReadNextBool(packetData); // Is hardcore - 1.16.2 and above + dataTypes.ReadNextBool(packetData); // Is hardcore - 1.16.2 and above handler.OnGamemodeUpdate(Guid.Empty, dataTypes.ReadNextByte(packetData)); 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 + dataTypes.ReadNextByte(packetData); // Previous Gamemode - 1.16 and above + int worldCount = + dataTypes.ReadNextVarInt( + packetData); // Dimension Count (World Count) - 1.16 and above for (int i = 0; i < worldCount; i++) - dataTypes.ReadNextString(packetData); // Dimension Names (World Names) - 1.16 and above - var registryCodec = dataTypes.ReadNextNbt(packetData); // Registry Codec (Dimension Codec) - 1.16 and above + dataTypes.ReadNextString( + packetData); // Dimension Names (World Names) - 1.16 and above + var registryCodec = + dataTypes.ReadNextNbt( + packetData); // Registry Codec (Dimension Codec) - 1.16 and above if (protocolVersion >= MC_1_19_Version) ChatParser.ReadChatType(registryCodec); if (handler.GetTerrainEnabled()) @@ -420,9 +450,11 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_16_Version) { if (protocolVersion >= MC_1_19_Version) - dimensionTypeName = dataTypes.ReadNextString(packetData); // Dimension Type: Identifier + dimensionTypeName = + dataTypes.ReadNextString(packetData); // Dimension Type: Identifier else if (protocolVersion >= MC_1_16_2_Version) - dimensionType = dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound + dimensionType = + dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound else dataTypes.ReadNextString(packetData); currentDimension = 0; @@ -433,11 +465,13 @@ namespace MinecraftClient.Protocol.Handlers currentDimension = (sbyte)dataTypes.ReadNextByte(packetData); if (protocolVersion < MC_1_14_Version) - dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below + dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below if (protocolVersion >= MC_1_16_Version) { - string dimensionName = dataTypes.ReadNextString(packetData); // Dimension Name (World Name) - 1.16 and above + string dimensionName = + dataTypes.ReadNextString( + packetData); // Dimension Name (World Name) - 1.16 and above if (handler.GetTerrainEnabled()) { if (protocolVersion >= MC_1_16_2_Version && protocolVersion <= MC_1_18_2_Version) @@ -453,26 +487,27 @@ namespace MinecraftClient.Protocol.Handlers } if (protocolVersion >= MC_1_15_Version) - dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above + dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above if (protocolVersion >= MC_1_16_2_Version) - dataTypes.ReadNextVarInt(packetData); // Max Players - 1.16.2 and above + dataTypes.ReadNextVarInt(packetData); // Max Players - 1.16.2 and above else - dataTypes.ReadNextByte(packetData); // Max Players - 1.16.1 and below + dataTypes.ReadNextByte(packetData); // Max Players - 1.16.1 and below if (protocolVersion < MC_1_16_Version) - dataTypes.SkipNextString(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 + dataTypes.ReadNextVarInt(packetData); // View distance - 1.14 and above if (protocolVersion >= MC_1_18_1_Version) - dataTypes.ReadNextVarInt(packetData); // Simulation Distance - 1.18 and above + dataTypes.ReadNextVarInt(packetData); // Simulation Distance - 1.18 and above if (protocolVersion >= MC_1_8_Version) - dataTypes.ReadNextBool(packetData); // Reduced debug info - 1.8 and above + dataTypes.ReadNextBool(packetData); // Reduced debug info - 1.8 and above if (protocolVersion >= MC_1_15_Version) - dataTypes.ReadNextBool(packetData); // Enable respawn screen - 1.15 and above + dataTypes.ReadNextBool(packetData); // Enable respawn screen - 1.15 and above 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); // Is Debug - 1.16 and above + dataTypes.ReadNextBool(packetData); // Is Flat - 1.16 and above } + if (protocolVersion >= MC_1_19_Version) { bool hasDeathLocation = dataTypes.ReadNextBool(packetData); // Has death location @@ -488,21 +523,18 @@ namespace MinecraftClient.Protocol.Handlers return true; case PacketTypesIn.DamageEvent: dataTypes.SkipNextVarInt(packetData); - var sourceType = dataTypes.ReadNextVarInt(packetData); + dataTypes.SkipNextVarInt(packetData); + dataTypes.SkipNextVarInt(packetData); + dataTypes.SkipNextVarInt(packetData); - if (sourceType != 0) + if (dataTypes.ReadNextBool(packetData)) { - if(dataTypes.ReadNextBool(packetData)) - dataTypes.SkipNextVarInt(packetData); - - if(dataTypes.ReadNextBool(packetData)) - dataTypes.SkipNextVarInt(packetData); - - if(dataTypes.ReadNextBool(packetData)) - dataTypes.ReadNextLocation(packetData); + dataTypes.ReadNextDouble(packetData); + dataTypes.ReadNextDouble(packetData); + dataTypes.ReadNextDouble(packetData); } - - // TODO: Write a function to use this data + + // TODO: Write a function to use this data ? break; case PacketTypesIn.HurtAnimation: dataTypes.SkipNextVarInt(packetData); @@ -522,6 +554,7 @@ namespace MinecraftClient.Protocol.Handlers if (receivePlayerInfo) handler.SetCanSendMessage(true); } + break; case PacketTypesIn.ChatMessage: int messageType = 0; @@ -553,18 +586,21 @@ namespace MinecraftClient.Protocol.Handlers string signedChat = dataTypes.ReadNextString(packetData); bool hasUnsignedChatContent = dataTypes.ReadNextBool(packetData); - string? unsignedChatContent = hasUnsignedChatContent ? dataTypes.ReadNextString(packetData) : null; + string? unsignedChatContent = + hasUnsignedChatContent ? dataTypes.ReadNextString(packetData) : null; messageType = dataTypes.ReadNextVarInt(packetData); if ((messageType == 1 && !Config.Main.Advanced.ShowSystemMessages) - || (messageType == 2 && !Config.Main.Advanced.ShowXPBarMessages)) + || (messageType == 2 && !Config.Main.Advanced.ShowXPBarMessages)) break; Guid senderUUID = dataTypes.ReadNextUUID(packetData); string senderDisplayName = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); bool hasSenderTeamName = dataTypes.ReadNextBool(packetData); - string? senderTeamName = hasSenderTeamName ? ChatParser.ParseText(dataTypes.ReadNextString(packetData)) : null; + string? senderTeamName = hasSenderTeamName + ? ChatParser.ParseText(dataTypes.ReadNextString(packetData)) + : null; long timestamp = dataTypes.ReadNextLong(packetData); @@ -580,36 +616,46 @@ namespace MinecraftClient.Protocol.Handlers else { PlayerInfo? player = handler.GetPlayerInfo(senderUUID); - verifyResult = player != null && player.VerifyMessage(signedChat, timestamp, salt, ref messageSignature); + verifyResult = player != null && player.VerifyMessage(signedChat, timestamp, salt, + ref messageSignature); } - ChatMessage chat = new(signedChat, true, messageType, senderUUID, unsignedChatContent, senderDisplayName, senderTeamName, timestamp, messageSignature, verifyResult); + ChatMessage chat = new(signedChat, true, messageType, senderUUID, unsignedChatContent, + senderDisplayName, senderTeamName, timestamp, messageSignature, verifyResult); handler.OnTextReceived(chat); } else if (protocolVersion == MC_1_19_2_Version) { // 1.19.1 - 1.19.2 - byte[]? precedingSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData) : null; + byte[]? precedingSignature = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextByteArray(packetData) + : null; Guid senderUUID = dataTypes.ReadNextUUID(packetData); byte[] headerSignature = dataTypes.ReadNextByteArray(packetData); string signedChat = dataTypes.ReadNextString(packetData); - string? decorated = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; + string? decorated = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; long timestamp = dataTypes.ReadNextLong(packetData); long salt = dataTypes.ReadNextLong(packetData); int lastSeenMessageListLen = dataTypes.ReadNextVarInt(packetData); - LastSeenMessageList.AcknowledgedMessage[] lastSeenMessageList = new LastSeenMessageList.AcknowledgedMessage[lastSeenMessageListLen]; + LastSeenMessageList.AcknowledgedMessage[] lastSeenMessageList = + new LastSeenMessageList.AcknowledgedMessage[lastSeenMessageListLen]; for (int i = 0; i < lastSeenMessageListLen; ++i) { Guid user = dataTypes.ReadNextUUID(packetData); byte[] lastSignature = dataTypes.ReadNextByteArray(packetData); lastSeenMessageList[i] = new(user, lastSignature, true); } + LastSeenMessageList lastSeenMessages = new(lastSeenMessageList); - string? unsignedChatContent = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; + string? unsignedChatContent = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; MessageFilterType filterEnum = (MessageFilterType)dataTypes.ReadNextVarInt(packetData); if (filterEnum == MessageFilterType.PartiallyFiltered) @@ -617,20 +663,28 @@ namespace MinecraftClient.Protocol.Handlers int chatTypeId = dataTypes.ReadNextVarInt(packetData); string chatName = dataTypes.ReadNextString(packetData); - string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; + string? targetName = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; Dictionary chatInfo = Json.ParseJson(chatName).Properties; - string senderDisplayName = (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]).StringValue; + string senderDisplayName = + (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]) + .StringValue; string? senderTeamName = null; - ChatParser.MessageType messageTypeEnum = ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); + ChatParser.MessageType messageTypeEnum = + ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); if (targetName != null && - (messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING)) - senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0].Properties["text"].StringValue; + (messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || + messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING)) + senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0] + .Properties["text"].StringValue; if (string.IsNullOrWhiteSpace(senderDisplayName)) { PlayerInfo? player = handler.GetPlayerInfo(senderUUID); - if (player != null && (player.DisplayName != null || player.Name != null) && string.IsNullOrWhiteSpace(senderDisplayName)) + if (player != null && (player.DisplayName != null || player.Name != null) && + string.IsNullOrWhiteSpace(senderDisplayName)) { senderDisplayName = ChatParser.ParseText(player.DisplayName ?? player.Name); if (string.IsNullOrWhiteSpace(senderDisplayName)) @@ -653,13 +707,16 @@ namespace MinecraftClient.Protocol.Handlers else { bool lastVerifyResult = player.IsMessageChainLegal(); - verifyResult = player.VerifyMessage(signedChat, timestamp, salt, ref headerSignature, ref precedingSignature, lastSeenMessages); + verifyResult = player.VerifyMessage(signedChat, timestamp, salt, + ref headerSignature, ref precedingSignature, lastSeenMessages); if (lastVerifyResult && !verifyResult) - log.Warn(string.Format(Translations.chat_message_chain_broken, senderDisplayName)); + log.Warn(string.Format(Translations.chat_message_chain_broken, + senderDisplayName)); } } - ChatMessage chat = new(signedChat, false, chatTypeId, senderUUID, unsignedChatContent, senderDisplayName, senderTeamName, timestamp, headerSignature, verifyResult); + ChatMessage chat = new(signedChat, false, chatTypeId, senderUUID, unsignedChatContent, + senderDisplayName, senderTeamName, timestamp, headerSignature, verifyResult); if (isOnlineMode && !chat.LacksSender()) Acknowledge(chat); handler.OnTextReceived(chat); @@ -672,7 +729,9 @@ namespace MinecraftClient.Protocol.Handlers Guid senderUUID = dataTypes.ReadNextUUID(packetData); int index = dataTypes.ReadNextVarInt(packetData); // Signature is fixed size of 256 bytes - byte[]? messageSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData, 256) : null; + byte[]? messageSignature = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextByteArray(packetData, 256) + : null; // Body // net.minecraft.network.message.MessageBody.Serialized#write @@ -684,19 +743,23 @@ namespace MinecraftClient.Protocol.Handlers // net.minecraft.network.message.LastSeenMessageList.Indexed#write // net.minecraft.network.message.MessageSignatureData.Indexed#write int totalPreviousMessages = dataTypes.ReadNextVarInt(packetData); - Tuple[] previousMessageSignatures = new Tuple[totalPreviousMessages]; + Tuple[] previousMessageSignatures = + new Tuple[totalPreviousMessages]; for (int i = 0; i < totalPreviousMessages; i++) { // net.minecraft.network.message.MessageSignatureData.Indexed#fromBuf int messageId = dataTypes.ReadNextVarInt(packetData) - 1; if (messageId == -1) - previousMessageSignatures[i] = new Tuple(messageId, dataTypes.ReadNextByteArray(packetData, 256)); + previousMessageSignatures[i] = new Tuple(messageId, + dataTypes.ReadNextByteArray(packetData, 256)); else previousMessageSignatures[i] = new Tuple(messageId, null); } // Other - string? unsignedChatContent = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; + string? unsignedChatContent = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; MessageFilterType filterType = (MessageFilterType)dataTypes.ReadNextVarInt(packetData); @@ -707,21 +770,30 @@ namespace MinecraftClient.Protocol.Handlers // net.minecraft.network.message.MessageType.Serialized#write int chatTypeId = dataTypes.ReadNextVarInt(packetData); string chatName = dataTypes.ReadNextString(packetData); - string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; + string? targetName = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; - ChatParser.MessageType messageTypeEnum = ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); + ChatParser.MessageType messageTypeEnum = + ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); - Dictionary chatInfo = Json.ParseJson(targetName ?? chatName).Properties; - string senderDisplayName = (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]).StringValue; + Dictionary chatInfo = + Json.ParseJson(targetName ?? chatName).Properties; + string senderDisplayName = + (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]) + .StringValue; string? senderTeamName = null; if (targetName != null && - (messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING)) - senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0].Properties["text"].StringValue; + (messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || + messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING)) + senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0] + .Properties["text"].StringValue; if (string.IsNullOrWhiteSpace(senderDisplayName)) { PlayerInfo? player = handler.GetPlayerInfo(senderUUID); - if (player != null && (player.DisplayName != null || player.Name != null) && string.IsNullOrWhiteSpace(senderDisplayName)) + if (player != null && (player.DisplayName != null || player.Name != null) && + string.IsNullOrWhiteSpace(senderDisplayName)) { senderDisplayName = ChatParser.ParseText(player.DisplayName ?? player.Name); if (string.IsNullOrWhiteSpace(senderDisplayName)) @@ -746,20 +818,25 @@ namespace MinecraftClient.Protocol.Handlers else { verifyResult = false; - verifyResult = player.VerifyMessage(message, senderUUID, player.ChatUuid, index, timestamp, salt, ref messageSignature, previousMessageSignatures); + verifyResult = player.VerifyMessage(message, senderUUID, player.ChatUuid, + index, timestamp, salt, ref messageSignature, + previousMessageSignatures); } } } - ChatMessage chat = new(message, false, chatTypeId, senderUUID, unsignedChatContent, senderDisplayName, senderTeamName, timestamp, messageSignature, verifyResult); + ChatMessage chat = new(message, false, chatTypeId, senderUUID, unsignedChatContent, + senderDisplayName, senderTeamName, timestamp, messageSignature, verifyResult); lock (MessageSigningLock) Acknowledge(chat); handler.OnTextReceived(chat); } + break; case PacketTypesIn.HideMessage: byte[] hideMessageSignature = dataTypes.ReadNextByteArray(packetData); - ConsoleIO.WriteLine($"HideMessage was not processed! (SigLen={hideMessageSignature.Length})"); + ConsoleIO.WriteLine( + $"HideMessage was not processed! (SigLen={hideMessageSignature.Length})"); break; case PacketTypesIn.SystemChat: string systemMessage = dataTypes.ReadNextString(packetData); @@ -776,6 +853,7 @@ namespace MinecraftClient.Protocol.Handlers if (!Config.Main.Advanced.ShowSystemMessages) break; } + handler.OnTextReceived(new(systemMessage, null, true, -1, Guid.Empty, true)); } else @@ -785,13 +863,17 @@ namespace MinecraftClient.Protocol.Handlers break; handler.OnTextReceived(new(systemMessage, null, true, msgType, Guid.Empty, true)); } + break; case PacketTypesIn.ProfilelessChatMessage: string message_ = dataTypes.ReadNextString(packetData); int messageType_ = dataTypes.ReadNextVarInt(packetData); string messageName = dataTypes.ReadNextString(packetData); - string? targetName_ = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; - ChatMessage profilelessChat = new(message_, targetName_ ?? messageName, true, messageType_, Guid.Empty, true); + string? targetName_ = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextString(packetData) + : null; + ChatMessage profilelessChat = new(message_, targetName_ ?? messageName, true, messageType_, + Guid.Empty, true); profilelessChat.isSenderJson = true; handler.OnTextReceived(profilelessChat); break; @@ -825,7 +907,9 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.MessageHeader: // 1.19.2 only if (protocolVersion == MC_1_19_2_Version) { - byte[]? precedingSignature = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextByteArray(packetData) : null; + byte[]? precedingSignature = dataTypes.ReadNextBool(packetData) + ? dataTypes.ReadNextByteArray(packetData) + : null; Guid senderUUID = dataTypes.ReadNextUUID(packetData); byte[] headerSignature = dataTypes.ReadNextByteArray(packetData); byte[] bodyDigest = dataTypes.ReadNextByteArray(packetData); @@ -845,9 +929,11 @@ namespace MinecraftClient.Protocol.Handlers else { bool lastVerifyResult = player.IsMessageChainLegal(); - verifyResult = player.VerifyMessageHead(ref precedingSignature, ref headerSignature, ref bodyDigest); + verifyResult = player.VerifyMessageHead(ref precedingSignature, + ref headerSignature, ref bodyDigest); if (lastVerifyResult && !verifyResult) - log.Warn(string.Format(Translations.chat_message_chain_broken, player.Name)); + log.Warn(string.Format(Translations.chat_message_chain_broken, + player.Name)); } } } @@ -859,21 +945,26 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_16_Version) { if (protocolVersion >= MC_1_19_Version) - dimensionTypeNameRespawn = dataTypes.ReadNextString(packetData); // Dimension Type: Identifier + dimensionTypeNameRespawn = + dataTypes.ReadNextString(packetData); // Dimension Type: Identifier else if (protocolVersion >= MC_1_16_2_Version) - dimensionTypeRespawn = dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound + dimensionTypeRespawn = + dataTypes.ReadNextNbt(packetData); // Dimension Type: NBT Tag Compound else dataTypes.ReadNextString(packetData); currentDimension = 0; } else - { // 1.15 and below + { + // 1.15 and below currentDimension = dataTypes.ReadNextInt(packetData); } if (protocolVersion >= MC_1_16_Version) { - string dimensionName = dataTypes.ReadNextString(packetData); // Dimension Name (World Name) - 1.16 and above + string dimensionName = + dataTypes.ReadNextString( + packetData); // Dimension Name (World Name) - 1.16 and above if (handler.GetTerrainEnabled()) { if (protocolVersion >= MC_1_16_2_Version && protocolVersion <= MC_1_18_2_Version) @@ -889,81 +980,92 @@ namespace MinecraftClient.Protocol.Handlers } if (protocolVersion < MC_1_14_Version) - dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below + dataTypes.ReadNextByte(packetData); // Difficulty - 1.13 and below if (protocolVersion >= MC_1_15_Version) - dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above - dataTypes.ReadNextByte(packetData); // Gamemode + dataTypes.ReadNextLong(packetData); // Hashed world seed - 1.15 and above + dataTypes.ReadNextByte(packetData); // Gamemode if (protocolVersion >= MC_1_16_Version) - dataTypes.ReadNextByte(packetData); // Previous Game mode - 1.16 and above + dataTypes.ReadNextByte(packetData); // Previous Game mode - 1.16 and above if (protocolVersion < MC_1_16_Version) - dataTypes.SkipNextString(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 - dataTypes.ReadNextBool(packetData); // Is Flat - 1.16 and above - dataTypes.ReadNextBool(packetData); // Copy metadata - 1.16 and above + 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) { bool hasDeathLocation = dataTypes.ReadNextBool(packetData); // Has death location if (hasDeathLocation) { - dataTypes.ReadNextString(packetData); // Death dimension name: Identifier - dataTypes.ReadNextLocation(packetData); // Death location + dataTypes.ReadNextString(packetData); // Death dimension name: Identifier + dataTypes.ReadNextLocation(packetData); // Death location } } + handler.OnRespawn(); break; case PacketTypesIn.PlayerPositionAndLook: + { + // These always need to be read, since we need the field after them for teleport confirm + double x = dataTypes.ReadNextDouble(packetData); + double y = dataTypes.ReadNextDouble(packetData); + double z = dataTypes.ReadNextDouble(packetData); + Location location = new(x, y, z); + float yaw = dataTypes.ReadNextFloat(packetData); + float pitch = dataTypes.ReadNextFloat(packetData); + byte locMask = dataTypes.ReadNextByte(packetData); + + // entity handling require player pos for distance calculating + if (handler.GetTerrainEnabled() || handler.GetEntityHandlingEnabled()) { - // These always need to be read, since we need the field after them for teleport confirm - double x = dataTypes.ReadNextDouble(packetData); - double y = dataTypes.ReadNextDouble(packetData); - double z = dataTypes.ReadNextDouble(packetData); - Location location = new(x, y, z); - float yaw = dataTypes.ReadNextFloat(packetData); - float pitch = dataTypes.ReadNextFloat(packetData); - byte locMask = dataTypes.ReadNextByte(packetData); - - // 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 current = handler.GetCurrentLocation(); - location.X = (locMask & 1 << 0) != 0 ? current.X + x : x; - location.Y = (locMask & 1 << 1) != 0 ? current.Y + y : y; - location.Z = (locMask & 1 << 2) != 0 ? current.Z + z : z; - } + Location current = handler.GetCurrentLocation(); + location.X = (locMask & 1 << 0) != 0 ? current.X + x : x; + location.Y = (locMask & 1 << 1) != 0 ? current.Y + y : y; + location.Z = (locMask & 1 << 2) != 0 ? current.Z + z : z; } + } - if (protocolVersion >= MC_1_9_Version) + if (protocolVersion >= MC_1_9_Version) + { + int teleportID = dataTypes.ReadNextVarInt(packetData); + + if (teleportID < 0) { - int teleportID = dataTypes.ReadNextVarInt(packetData); - - if (teleportID < 0) { yaw = LastYaw; pitch = LastPitch; } - else { LastYaw = yaw; LastPitch = pitch; } - - handler.UpdateLocation(location, yaw, pitch); - - // Teleport confirm packet - SendPacket(PacketTypesOut.TeleportConfirm, DataTypes.GetVarInt(teleportID)); - if (Config.Main.Advanced.TemporaryFixBadpacket) - { - SendLocationUpdate(location, true, yaw, pitch, true); - if (teleportID == 1) - SendLocationUpdate(location, true, yaw, pitch, true); - } + yaw = LastYaw; + pitch = LastPitch; } else { - handler.UpdateLocation(location, yaw, pitch); - LastYaw = yaw; LastPitch = pitch; + LastYaw = yaw; + LastPitch = pitch; } - if (protocolVersion >= MC_1_17_Version && protocolVersion < MC_1_19_4_Version) - dataTypes.ReadNextBool(packetData); // Dismount Vehicle - 1.17 and abo + handler.UpdateLocation(location, yaw, pitch); + + // Teleport confirm packet + SendPacket(PacketTypesOut.TeleportConfirm, DataTypes.GetVarInt(teleportID)); + if (Config.Main.Advanced.TemporaryFixBadpacket) + { + SendLocationUpdate(location, true, yaw, pitch, true); + if (teleportID == 1) + SendLocationUpdate(location, true, yaw, pitch, true); + } } + else + { + handler.UpdateLocation(location, yaw, pitch); + LastYaw = yaw; + LastPitch = pitch; + } + + if (protocolVersion >= MC_1_17_Version && protocolVersion < MC_1_19_4_Version) + dataTypes.ReadNextBool(packetData); // Dismount Vehicle - 1.17 and abo + } break; case PacketTypesIn.ChunkData: if (handler.GetTerrainEnabled()) @@ -978,7 +1080,9 @@ 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 Length and Primary Bit Mask + verticalStripBitmask = + dataTypes.ReadNextULongArray( + packetData); // Bit Mask Length and Primary Bit Mask dataTypes.ReadNextNbt(packetData); // Heightmaps @@ -1012,17 +1116,21 @@ namespace MinecraftClient.Protocol.Handlers byte[] compressed = dataTypes.ReadData(compressedDataSize, packetData); byte[] decompressed = ZlibUtils.Decompress(compressed); - pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, currentDimension == 0, chunksContinuous, currentDimension, new Queue(decompressed)); + pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, addBitmap, + currentDimension == 0, chunksContinuous, currentDimension, + new Queue(decompressed)); Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } else { if (protocolVersion >= MC_1_14_Version) - dataTypes.ReadNextNbt(packetData); // Heightmaps - 1.14 and above + dataTypes.ReadNextNbt(packetData); // Heightmaps - 1.14 and above int biomesLength = 0; if (protocolVersion >= MC_1_16_2_Version) if (chunksContinuous) - biomesLength = dataTypes.ReadNextVarInt(packetData); // Biomes length - 1.16.2 and above + biomesLength = + dataTypes.ReadNextVarInt( + packetData); // Biomes length - 1.16.2 and above if (protocolVersion >= MC_1_15_Version && chunksContinuous) { if (protocolVersion >= MC_1_16_2_Version) @@ -1036,13 +1144,16 @@ namespace MinecraftClient.Protocol.Handlers } else dataTypes.DropData(1024 * 4, packetData); // Biomes - 1.15 and above } + int dataSize = dataTypes.ReadNextVarInt(packetData); - pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, chunksContinuous, currentDimension, packetData); + pTerrain.ProcessChunkColumnData(chunkX, chunkZ, chunkMask, 0, false, + chunksContinuous, currentDimension, packetData); Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } } } + break; case PacketTypesIn.MapData: if (protocolVersion < MC_1_8_Version) @@ -1123,7 +1234,8 @@ namespace MinecraftClient.Protocol.Handlers mapIcon.Direction = dataTypes.ReadNextByte(packetData); if (dataTypes.ReadNextBool(packetData)) // Has Display Name? - mapIcon.DisplayName = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); + mapIcon.DisplayName = + ChatParser.ParseText(dataTypes.ReadNextString(packetData)); } icons.Add(mapIcon); @@ -1144,7 +1256,8 @@ namespace MinecraftClient.Protocol.Handlers colors = dataTypes.ReadNextByteArray(packetData); } - handler.OnMapData(mapid, scale, trackingPosition, locked, icons, columnsUpdated, rowsUpdated, mapCoulmnX, mapRowZ, colors); + handler.OnMapData(mapid, scale, trackingPosition, locked, icons, columnsUpdated, + rowsUpdated, mapCoulmnX, mapRowZ, colors); break; case PacketTypesIn.TradeList: if ((protocolVersion >= MC_1_14_Version) && (handler.GetInventoryEnabled())) @@ -1158,6 +1271,7 @@ namespace MinecraftClient.Protocol.Handlers VillagerTrade trade = dataTypes.ReadNextTrade(packetData, itemPalette); trades.Add(trade); } + VillagerInfo villagerInfo = new() { Level = dataTypes.ReadNextVarInt(packetData), @@ -1167,6 +1281,7 @@ namespace MinecraftClient.Protocol.Handlers }; handler.OnTradeList(windowID, trades, villagerInfo); } + break; case PacketTypesIn.Title: if (protocolVersion >= MC_1_8_Version) @@ -1222,8 +1337,11 @@ namespace MinecraftClient.Protocol.Handlers fadeout = dataTypes.ReadNextInt(packetData); } } - handler.OnTitle(action2, titletext, subtitletext, actionbartext, fadein, stay, fadeout, json); + + handler.OnTitle(action2, titletext, subtitletext, actionbartext, fadein, stay, fadeout, + json); } + break; case PacketTypesIn.MultiBlockChange: if (handler.GetTerrainEnabled()) @@ -1290,6 +1408,7 @@ namespace MinecraftClient.Protocol.Handlers } } } + break; case PacketTypesIn.ServerData: string motd = "-"; @@ -1298,7 +1417,7 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion < MC_1_19_4_Version) { hasMotd = dataTypes.ReadNextBool(packetData); - + if (hasMotd) motd = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); } @@ -1341,6 +1460,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnBlockChange(location, block); } } + break; case PacketTypesIn.SetDisplayChatPreview: bool previewsChatSetting = dataTypes.ReadNextBool(packetData); @@ -1389,11 +1509,13 @@ 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); + pTerrain.ProcessChunkColumnData(chunkXs[chunkColumnNo], chunkZs[chunkColumnNo], + chunkMasks[chunkColumnNo], addBitmaps[chunkColumnNo], hasSkyLight, true, + currentDimension, chunkData); Interlocked.Decrement(ref handler.GetWorld().chunkLoadNotCompleted); } - } + break; case PacketTypesIn.UnloadChunk: if (protocolVersion >= MC_1_9_Version && handler.GetTerrainEnabled()) @@ -1409,6 +1531,7 @@ namespace MinecraftClient.Protocol.Handlers handler.GetWorld()[chunkX, chunkZ] = null; } + break; case PacketTypesIn.ChangeGameState: if (protocolVersion >= MC_1_15_2_Version) @@ -1418,6 +1541,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnGameEvent(reason, state); } + break; case PacketTypesIn.PlayerInfo: if (protocolVersion >= MC_1_19_3_Version) @@ -1440,6 +1564,7 @@ namespace MinecraftClient.Protocol.Handlers if (dataTypes.ReadNextBool(packetData)) dataTypes.SkipNextString(packetData); } + player = new(name, playerUuid); handler.OnPlayerJoin(player); } @@ -1466,13 +1591,14 @@ namespace MinecraftClient.Protocol.Handlers long publicKeyExpiryTime = dataTypes.ReadNextLong(packetData); byte[] encodedPublicKey = dataTypes.ReadNextByteArray(packetData); byte[] publicKeySignature = dataTypes.ReadNextByteArray(packetData); - player.SetPublicKey(chatUuid, publicKeyExpiryTime, encodedPublicKey, publicKeySignature); + player.SetPublicKey(chatUuid, publicKeyExpiryTime, encodedPublicKey, + publicKeySignature); if (playerUuid == handler.GetUserUuid()) { log.Debug("Receive ChatUuid = " + chatUuid); this.chatUuid = chatUuid; - } + } } else { @@ -1491,19 +1617,23 @@ namespace MinecraftClient.Protocol.Handlers handler.SetCanSendMessage(true); } } + if ((actionBitset & 1 << 2) > 0) // Actions bit 2: update gamemode { handler.OnGamemodeUpdate(playerUuid, dataTypes.ReadNextVarInt(packetData)); } + if ((actionBitset & (1 << 3)) > 0) // Actions bit 3: update listed { player.Listed = dataTypes.ReadNextBool(packetData); } + if ((actionBitset & (1 << 4)) > 0) // Actions bit 4: update latency { int latency = dataTypes.ReadNextVarInt(packetData); handler.OnLatencyUpdate(playerUuid, latency); //Update latency; } + if ((actionBitset & (1 << 5)) > 0) // Actions bit 5: update display name { if (dataTypes.ReadNextBool(packetData)) @@ -1515,66 +1645,78 @@ namespace MinecraftClient.Protocol.Handlers } else if (protocolVersion >= MC_1_8_Version) { - int action = dataTypes.ReadNextVarInt(packetData); // Action Name - int numberOfPlayers = dataTypes.ReadNextVarInt(packetData); // Number Of Players + int action = dataTypes.ReadNextVarInt(packetData); // Action Name + int numberOfPlayers = dataTypes.ReadNextVarInt(packetData); // Number Of Players for (int i = 0; i < numberOfPlayers; i++) { - Guid uuid = dataTypes.ReadNextUUID(packetData); // Player UUID + Guid uuid = dataTypes.ReadNextUUID(packetData); // Player UUID switch (action) { case 0x00: //Player Join (Add player since 1.19) - string name = dataTypes.ReadNextString(packetData); // Player name - int propNum = dataTypes.ReadNextVarInt(packetData); // Number of properties in the following array + string name = dataTypes.ReadNextString(packetData); // Player name + int propNum = + dataTypes.ReadNextVarInt( + packetData); // Number of properties in the following array // Property: Tuple[]? properties = useProperty ? - new Tuple[propNum] : null; + Tuple[]? properties = + useProperty ? new Tuple[propNum] : null; for (int p = 0; p < propNum; p++) { - string propertyName = dataTypes.ReadNextString(packetData); // Name: String (32767) - string val = dataTypes.ReadNextString(packetData); // Value: String (32767) + string propertyName = + dataTypes.ReadNextString(packetData); // Name: String (32767) + string val = + dataTypes.ReadNextString(packetData); // Value: String (32767) string? propertySignature = null; - if (dataTypes.ReadNextBool(packetData)) // Is Signed - propertySignature = dataTypes.ReadNextString(packetData); // Signature: String (32767) + if (dataTypes.ReadNextBool(packetData)) // Is Signed + propertySignature = + dataTypes.ReadNextString( + packetData); // Signature: String (32767) if (useProperty) properties![p] = new(propertyName, val, propertySignature); } #pragma warning restore CS0162 // Unreachable code detected - int gameMode = dataTypes.ReadNextVarInt(packetData); // Gamemode + int gameMode = dataTypes.ReadNextVarInt(packetData); // Gamemode handler.OnGamemodeUpdate(uuid, gameMode); - int ping = dataTypes.ReadNextVarInt(packetData); // Ping + int ping = dataTypes.ReadNextVarInt(packetData); // Ping string? displayName = null; - if (dataTypes.ReadNextBool(packetData)) // Has display name - displayName = dataTypes.ReadNextString(packetData); // Display name + if (dataTypes.ReadNextBool(packetData)) // Has display name + displayName = dataTypes.ReadNextString(packetData); // Display name // 1.19 Additions long? keyExpiration = null; byte[]? publicKey = null, signature = null; if (protocolVersion >= MC_1_19_Version) { - if (dataTypes.ReadNextBool(packetData)) // Has Sig Data (if true, red the following fields) + if (dataTypes.ReadNextBool( + packetData)) // Has Sig Data (if true, red the following fields) { - keyExpiration = dataTypes.ReadNextLong(packetData); // Timestamp + keyExpiration = dataTypes.ReadNextLong(packetData); // Timestamp - int publicKeyLength = dataTypes.ReadNextVarInt(packetData); // Public Key Length + int publicKeyLength = + dataTypes.ReadNextVarInt(packetData); // Public Key Length if (publicKeyLength > 0) - publicKey = dataTypes.ReadData(publicKeyLength, packetData); // Public key + publicKey = dataTypes.ReadData(publicKeyLength, + packetData); // Public key - int signatureLength = dataTypes.ReadNextVarInt(packetData); // Signature Length + int signatureLength = + dataTypes.ReadNextVarInt(packetData); // Signature Length if (signatureLength > 0) - signature = dataTypes.ReadData(signatureLength, packetData); // Public key + signature = dataTypes.ReadData(signatureLength, + packetData); // Public key } } - handler.OnPlayerJoin(new PlayerInfo(uuid, name, properties, gameMode, ping, displayName, keyExpiration, publicKey, signature)); + handler.OnPlayerJoin(new PlayerInfo(uuid, name, properties, gameMode, ping, + displayName, keyExpiration, publicKey, signature)); break; case 0x01: //Update gamemode handler.OnGamemodeUpdate(uuid, dataTypes.ReadNextVarInt(packetData)); @@ -1592,6 +1734,7 @@ namespace MinecraftClient.Protocol.Handlers else dataTypes.SkipNextString(packetData); } + break; case 0x04: //Player Leave handler.OnPlayerLeave(uuid); @@ -1607,11 +1750,13 @@ namespace MinecraftClient.Protocol.Handlers string name = dataTypes.ReadNextString(packetData); bool online = dataTypes.ReadNextBool(packetData); short ping = dataTypes.ReadNextShort(packetData); - Guid FakeUUID = new(MD5.Create().ComputeHash(Encoding.UTF8.GetBytes(name)).Take(16).ToArray()); + Guid FakeUUID = new(MD5.Create().ComputeHash(Encoding.UTF8.GetBytes(name)).Take(16) + .ToArray()); if (online) handler.OnPlayerJoin(new PlayerInfo(name, FakeUUID)); else handler.OnPlayerLeave(FakeUUID); } + break; case PacketTypesIn.PlayerRemove: int numberOfLeavePlayers = dataTypes.ReadNextVarInt(packetData); @@ -1620,6 +1765,7 @@ namespace MinecraftClient.Protocol.Handlers Guid playerUuid = dataTypes.ReadNextUUID(packetData); handler.OnPlayerLeave(playerUuid); } + break; case PacketTypesIn.TabComplete: int old_transaction_id = autocomplete_transaction_id; @@ -1643,6 +1789,7 @@ namespace MinecraftClient.Protocol.Handlers dataTypes.SkipNextString(packetData); } } + handler.OnAutoCompleteDone(old_transaction_id, autocomplete_result); break; case PacketTypesIn.PluginMessage: @@ -1653,7 +1800,8 @@ namespace MinecraftClient.Protocol.Handlers handler.OnPluginChannelMessage(channel, packetData.ToArray()); return pForge.HandlePluginMessage(channel, packetData, ref currentDimension); case PacketTypesIn.Disconnect: - handler.OnConnectionLost(ChatBot.DisconnectReason.InGameKick, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); + 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) @@ -1666,8 +1814,10 @@ namespace MinecraftClient.Protocol.Handlers { // MC 1.13 or lower byte windowID = dataTypes.ReadNextByte(packetData); - string type = dataTypes.ReadNextString(packetData).Replace("minecraft:", "").ToUpper(); - ContainerTypeOld inventoryType = (ContainerTypeOld)Enum.Parse(typeof(ContainerTypeOld), type); + string type = dataTypes.ReadNextString(packetData).Replace("minecraft:", "") + .ToUpper(); + ContainerTypeOld inventoryType = + (ContainerTypeOld)Enum.Parse(typeof(ContainerTypeOld), type); string title = dataTypes.ReadNextString(packetData); byte slots = dataTypes.ReadNextByte(packetData); Container inventory = new(windowID, inventoryType, ChatParser.ParseText(title)); @@ -1683,14 +1833,20 @@ namespace MinecraftClient.Protocol.Handlers handler.OnInventoryOpen(windowID, inventory); } } + break; case PacketTypesIn.CloseWindow: if (handler.GetInventoryEnabled()) { byte windowID = dataTypes.ReadNextByte(packetData); - lock (window_actions) { window_actions[windowID] = 0; } + lock (window_actions) + { + window_actions[windowID] = 0; + } + handler.OnInventoryClose(windowID); } + break; case PacketTypesIn.WindowItems: if (handler.GetInventoryEnabled()) @@ -1724,6 +1880,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnWindowItems(windowId, inventorySlots, stateId); } + break; case PacketTypesIn.WindowProperty: byte containerId = dataTypes.ReadNextByte(packetData); @@ -1743,6 +1900,7 @@ namespace MinecraftClient.Protocol.Handlers Item? item = dataTypes.ReadNextItemSlot(packetData, itemPalette); handler.OnSetSlot(windowID, slotID, item, stateId); } + break; case PacketTypesIn.WindowConfirmation: if (handler.GetInventoryEnabled()) @@ -1753,6 +1911,7 @@ namespace MinecraftClient.Protocol.Handlers if (!accepted) SendWindowConfirmation(windowID, actionID, true); } + break; case PacketTypesIn.ResourcePackSend: string url = dataTypes.ReadNextString(packetData); @@ -1761,19 +1920,26 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_17_Version) { forced = dataTypes.ReadNextBool(packetData); - bool hasPromptMessage = dataTypes.ReadNextBool(packetData); // Has Prompt Message (Boolean) - 1.17 and above + bool hasPromptMessage = + dataTypes.ReadNextBool(packetData); // Has Prompt Message (Boolean) - 1.17 and above if (hasPromptMessage) - dataTypes.SkipNextString(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 break; //Send back "accepted" and "successfully loaded" responses for plugins or server config making use of resource pack mandatory byte[] responseHeader = Array.Empty(); - 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 + 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 break; case PacketTypesIn.SpawnEntity: if (handler.GetEntityHandlingEnabled()) @@ -1781,6 +1947,7 @@ namespace MinecraftClient.Protocol.Handlers Entity entity = dataTypes.ReadNextEntity(packetData, entityPalette, false); handler.OnSpawnEntity(entity); } + break; case PacketTypesIn.EntityEquipment: if (handler.GetEntityHandlingEnabled()) @@ -1806,6 +1973,7 @@ namespace MinecraftClient.Protocol.Handlers handler.OnEntityEquipment(entityid, slot2, item); } } + break; case PacketTypesIn.SpawnLivingEntity: if (handler.GetEntityHandlingEnabled()) @@ -1816,6 +1984,7 @@ namespace MinecraftClient.Protocol.Handlers // we are simply ignoring leftover data in packet handler.OnSpawnEntity(entity); } + break; case PacketTypesIn.SpawnPlayer: if (handler.GetEntityHandlingEnabled()) @@ -1832,14 +2001,16 @@ namespace MinecraftClient.Protocol.Handlers handler.OnSpawnPlayer(EntityID, UUID, EntityLocation, Yaw, Pitch); } + break; case PacketTypesIn.EntityEffect: if (handler.GetEntityHandlingEnabled()) { int entityid = dataTypes.ReadNextVarInt(packetData); Inventory.Effects effect = Effects.Speed; - int effectId = protocolVersion >= MC_1_18_2_Version ? - dataTypes.ReadNextVarInt(packetData) : dataTypes.ReadNextByte(packetData); + 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); @@ -1856,23 +2027,28 @@ namespace MinecraftClient.Protocol.Handlers factorCodec = dataTypes.ReadNextNbt(packetData); } - handler.OnEntityEffect(entityid, effect, amplifier, duration, flags, hasFactorData, factorCodec); + handler.OnEntityEffect(entityid, effect, amplifier, duration, flags, hasFactorData, + factorCodec); } } + break; case PacketTypesIn.DestroyEntities: if (handler.GetEntityHandlingEnabled()) { int entityCount = 1; // 1.17.0 has only one entity per packet if (protocolVersion != MC_1_17_Version) - entityCount = dataTypes.ReadNextVarInt(packetData); // All other versions have a "count" field + entityCount = + dataTypes.ReadNextVarInt(packetData); // All other versions have a "count" field int[] entityList = new int[entityCount]; for (int i = 0; i < entityCount; i++) { entityList[i] = dataTypes.ReadNextVarInt(packetData); } + handler.OnDestroyEntities(entityList); } + break; case PacketTypesIn.EntityPosition: if (handler.GetEntityHandlingEnabled()) @@ -1887,6 +2063,7 @@ namespace MinecraftClient.Protocol.Handlers DeltaZ /= (128 * 32); handler.OnEntityPosition(EntityID, DeltaX, DeltaY, DeltaZ, OnGround); } + break; case PacketTypesIn.EntityPositionAndRotation: if (handler.GetEntityHandlingEnabled()) @@ -1903,12 +2080,15 @@ namespace MinecraftClient.Protocol.Handlers DeltaZ /= (128 * 32); handler.OnEntityPosition(EntityID, DeltaX, DeltaY, DeltaZ, OnGround); } + break; case PacketTypesIn.EntityProperties: 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(); for (int i = 0; i < NumberOfProperties; i++) { @@ -1926,18 +2106,27 @@ namespace MinecraftClient.Protocol.Handlers byte operation = dataTypes.ReadNextByte(packetData); switch (operation) { - case 0: op0.Add(amount); break; - case 1: op1.Add(amount); break; - case 2: op2.Add(amount + 1); break; + case 0: + op0.Add(amount); + break; + case 1: + op1.Add(amount); + break; + case 2: + op2.Add(amount + 1); + break; } } + if (op0.Count > 0) _value += op0.Sum(); if (op1.Count > 0) _value *= 1 + op1.Sum(); if (op2.Count > 0) _value *= op2.Aggregate((a, _x) => a * _x); keys.Add(_key, _value); } + handler.OnEntityProperties(EntityID, keys); } + break; case PacketTypesIn.EntityMetadata: if (handler.GetEntityHandlingEnabled()) @@ -1957,11 +2146,13 @@ namespace MinecraftClient.Protocol.Handlers else throw new NotImplementedException(Translations.exception_palette_healthfield); - if (metadata.TryGetValue(healthField, out object? healthObj) && healthObj != null && healthObj.GetType() == typeof(float)) + if (metadata.TryGetValue(healthField, out object? healthObj) && healthObj != null && + healthObj.GetType() == typeof(float)) handler.OnEntityHealth(EntityID, (float)healthObj); handler.OnEntityMetadata(EntityID, metadata); } + break; case PacketTypesIn.EntityStatus: if (handler.GetEntityHandlingEnabled()) @@ -1970,6 +2161,7 @@ namespace MinecraftClient.Protocol.Handlers byte status = dataTypes.ReadNextByte(packetData); handler.OnEntityStatus(entityId, status); } + break; case PacketTypesIn.TimeUpdate: long WorldAge = dataTypes.ReadNextLong(packetData); @@ -1988,6 +2180,7 @@ namespace MinecraftClient.Protocol.Handlers bool OnGround = dataTypes.ReadNextBool(packetData); handler.OnEntityTeleport(EntityID, X, Y, Z, OnGround); } + break; case PacketTypesIn.UpdateHealth: float health = dataTypes.ReadNextFloat(packetData); @@ -2009,9 +2202,11 @@ namespace MinecraftClient.Protocol.Handlers case PacketTypesIn.Explosion: Location explosionLocation; if (protocolVersion >= MC_1_19_3_Version) - explosionLocation = new(dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData)); + explosionLocation = new(dataTypes.ReadNextDouble(packetData), + dataTypes.ReadNextDouble(packetData), dataTypes.ReadNextDouble(packetData)); else - explosionLocation = new(dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData)); + explosionLocation = new(dataTypes.ReadNextFloat(packetData), + dataTypes.ReadNextFloat(packetData), dataTypes.ReadNextFloat(packetData)); float explosionStrength = dataTypes.ReadNextFloat(packetData); int explosionBlockCount = protocolVersion >= MC_1_17_Version @@ -2041,13 +2236,14 @@ namespace MinecraftClient.Protocol.Handlers objectivevalue = dataTypes.ReadNextString(packetData); type2 = dataTypes.ReadNextVarInt(packetData); } + handler.OnScoreboardObjective(objectivename, mode, objectivevalue, type2); break; case PacketTypesIn.UpdateScore: string entityname = dataTypes.ReadNextString(packetData); int action3 = protocolVersion >= MC_1_18_2_Version - ? dataTypes.ReadNextVarInt(packetData) - : dataTypes.ReadNextByte(packetData); + ? dataTypes.ReadNextVarInt(packetData) + : dataTypes.ReadNextByte(packetData); string objectivename2 = string.Empty; int value = -1; if (action3 != 1 || protocolVersion >= MC_1_8_Version) @@ -2067,6 +2263,7 @@ namespace MinecraftClient.Protocol.Handlers byte stage = dataTypes.ReadNextByte(packetData); handler.OnBlockBreakAnimation(playerId, blockLocation, stage); } + break; case PacketTypesIn.EntityAnimation: if (handler.GetEntityHandlingEnabled()) @@ -2075,10 +2272,12 @@ namespace MinecraftClient.Protocol.Handlers byte animation = dataTypes.ReadNextByte(packetData); handler.OnEntityAnimation(playerId2, animation); } + break; default: return false; //Ignored packet } + return true; //Packet processed } #if Release @@ -2096,9 +2295,18 @@ namespace MinecraftClient.Protocol.Handlers innerException); } #else - catch (SocketException) { throw; } - catch (ThreadAbortException) { throw; } - catch (ObjectDisposedException) { throw; } + catch (SocketException) + { + throw; + } + catch (ThreadAbortException) + { + throw; + } + catch (ObjectDisposedException) + { + throw; + } #endif } @@ -2142,13 +2350,16 @@ namespace MinecraftClient.Protocol.Handlers { netMain.Item2.Cancel(); } + if (netReader != null) { netReader.Item2.Cancel(); socketWrapper.Disconnect(); } } - catch { } + catch + { + } } /// @@ -2206,38 +2417,46 @@ namespace MinecraftClient.Protocol.Handlers string server_address = pForge.GetServerAddress(handler.GetServerHost()); byte[] server_port = dataTypes.GetUShort((ushort)handler.GetServerPort()); byte[] next_state = DataTypes.GetVarInt(2); - byte[] handshake_packet = dataTypes.ConcatBytes(protocol_version, dataTypes.GetString(server_address), server_port, next_state); + byte[] handshake_packet = dataTypes.ConcatBytes(protocol_version, dataTypes.GetString(server_address), + server_port, next_state); SendPacket(0x00, handshake_packet); List fullLoginPacket = new(); - fullLoginPacket.AddRange(dataTypes.GetString(handler.GetUsername())); // Username + fullLoginPacket.AddRange(dataTypes.GetString(handler.GetUsername())); // Username // 1.19 - 1.19.2 if (protocolVersion >= MC_1_19_Version && protocolVersion < MC_1_19_3_Version) { if (playerKeyPair == null) - fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data + fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data else { - fullLoginPacket.AddRange(dataTypes.GetBool(true)); // Has Sig Data - fullLoginPacket.AddRange(DataTypes.GetLong(playerKeyPair.GetExpirationMilliseconds())); // Expiration time - fullLoginPacket.AddRange(dataTypes.GetArray(playerKeyPair.PublicKey.Key)); // Public key received from Microsoft API + fullLoginPacket.AddRange(dataTypes.GetBool(true)); // Has Sig Data + fullLoginPacket.AddRange( + DataTypes.GetLong(playerKeyPair.GetExpirationMilliseconds())); // Expiration time + fullLoginPacket.AddRange( + dataTypes.GetArray(playerKeyPair.PublicKey.Key)); // Public key received from Microsoft API if (protocolVersion >= MC_1_19_2_Version) - fullLoginPacket.AddRange(dataTypes.GetArray(playerKeyPair.PublicKey.SignatureV2!)); // Public key signature received from Microsoft API + 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) { Guid uuid = handler.GetUserUuid(); if (uuid == Guid.Empty) - fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has UUID + fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has UUID else { - fullLoginPacket.AddRange(dataTypes.GetBool(true)); // Has UUID - fullLoginPacket.AddRange(DataTypes.GetUUID(uuid)); // UUID + fullLoginPacket.AddRange(dataTypes.GetBool(true)); // Has UUID + fullLoginPacket.AddRange(DataTypes.GetUUID(uuid)); // UUID } } @@ -2248,7 +2467,8 @@ namespace MinecraftClient.Protocol.Handlers (int packetID, Queue packetData) = ReadNextPacket(); if (packetID == 0x00) //Login rejected { - handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); + handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, + ChatParser.ParseText(dataTypes.ReadNextString(packetData))); return false; } else if (packetID == 0x01) //Encryption request @@ -2257,7 +2477,8 @@ namespace MinecraftClient.Protocol.Handlers string serverID = dataTypes.ReadNextString(packetData); byte[] serverPublicKey = dataTypes.ReadNextByteArray(packetData); byte[] token = dataTypes.ReadNextByteArray(packetData); - return StartEncryption(handler.GetUserUuidStr(), handler.GetSessionID(), token, serverID, serverPublicKey, playerKeyPair, session); + return StartEncryption(handler.GetUserUuidStr(), handler.GetSessionID(), token, serverID, + serverPublicKey, playerKeyPair, session); } else if (packetID == 0x02) //Login successful { @@ -2281,7 +2502,8 @@ 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, SessionToken session) + private bool StartEncryption(string uuid, string sessionID, byte[] token, string serverIDhash, + byte[] serverPublicKey, PlayerKeyPair? playerKeyPair, SessionToken session) { RSACryptoServiceProvider RSAService = CryptoHandler.DecodeRSAPublicKey(serverPublicKey)!; byte[] secretKey = CryptoHandler.ClientAESPrivateKey ?? CryptoHandler.GenerateAESPrivateKey(); @@ -2294,7 +2516,8 @@ namespace MinecraftClient.Protocol.Handlers bool needCheckSession = true; if (session.ServerPublicKey != null && session.SessionPreCheckTask != null - && serverIDhash == session.ServerIDhash && Enumerable.SequenceEqual(serverPublicKey, session.ServerPublicKey)) + && serverIDhash == session.ServerIDhash && + Enumerable.SequenceEqual(serverPublicKey, session.ServerPublicKey)) { session.SessionPreCheckTask.Wait(); if (session.SessionPreCheckTask.Result) // PreCheck Successed @@ -2321,14 +2544,14 @@ namespace MinecraftClient.Protocol.Handlers // Encryption Response packet List encryptionResponse = new(); - encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret + encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(secretKey, false))); // Shared Secret // 1.19 - 1.19.2 if (protocolVersion >= MC_1_19_Version && protocolVersion < MC_1_19_3_Version) { if (playerKeyPair == null) { - encryptionResponse.AddRange(dataTypes.GetBool(true)); // Has Verify Token + encryptionResponse.AddRange(dataTypes.GetBool(true)); // Has Verify Token encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token } else @@ -2336,14 +2559,14 @@ namespace MinecraftClient.Protocol.Handlers byte[] salt = GenerateSalt(); byte[] messageSignature = playerKeyPair.PrivateKey.SignData(dataTypes.ConcatBytes(token, salt)); - encryptionResponse.AddRange(dataTypes.GetBool(false)); // Has Verify Token - encryptionResponse.AddRange(salt); // Salt - encryptionResponse.AddRange(dataTypes.GetArray(messageSignature)); // Message Signature + encryptionResponse.AddRange(dataTypes.GetBool(false)); // Has Verify Token + encryptionResponse.AddRange(salt); // Salt + encryptionResponse.AddRange(dataTypes.GetArray(messageSignature)); // Message Signature } } else { - encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token + encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token } SendPacket(0x01, encryptionResponse); @@ -2358,12 +2581,14 @@ namespace MinecraftClient.Protocol.Handlers (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, "§8" + Translations.error_invalid_encrypt); + handler.OnConnectionLost(ChatBot.DisconnectReason.ConnectionLost, + "§8" + Translations.error_invalid_encrypt); return false; } else if (packetID == 0x00) //Login rejected { - handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, ChatParser.ParseText(dataTypes.ReadNextString(packetData))); + handler.OnConnectionLost(ChatBot.DisconnectReason.LoginRejected, + ChatParser.ParseText(dataTypes.ReadNextString(packetData))); return false; } else if (packetID == 0x02) //Login successful @@ -2388,6 +2613,7 @@ namespace MinecraftClient.Protocol.Handlers playerProperty[i] = new Tuple(name, value, signature); } } + handler.OnLoginSuccess(uuidReceived, userName, playerProperty); login_phase = false; @@ -2434,7 +2660,8 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion >= MC_1_13_Version) { tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, transaction_id); - tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, dataTypes.GetString(BehindCursor.Replace(' ', (char)0x00))); + tabcomplete_packet = dataTypes.ConcatBytes(tabcomplete_packet, + dataTypes.GetString(BehindCursor.Replace(' ', (char)0x00))); } else { @@ -2450,6 +2677,7 @@ namespace MinecraftClient.Protocol.Handlers { tabcomplete_packet = dataTypes.ConcatBytes(dataTypes.GetString(BehindCursor)); } + ConsoleIO.AutoCompleteDone = false; SendPacket(PacketTypesOut.TabComplete, tabcomplete_packet); return autocomplete_transaction_id; @@ -2470,9 +2698,11 @@ namespace MinecraftClient.Protocol.Handlers byte[] packet_id = DataTypes.GetVarInt(0); byte[] protocol_version = DataTypes.GetVarInt(-1); - byte[] server_port = BitConverter.GetBytes((ushort)port); Array.Reverse(server_port); + byte[] server_port = BitConverter.GetBytes((ushort)port); + Array.Reverse(server_port); byte[] next_state = DataTypes.GetVarInt(1); - byte[] packet = dataTypes.ConcatBytes(packet_id, protocol_version, dataTypes.GetString(host), server_port, next_state); + byte[] packet = dataTypes.ConcatBytes(packet_id, protocol_version, dataTypes.GetString(host), server_port, + next_state); byte[] tosend = dataTypes.ConcatBytes(DataTypes.GetVarInt(packet.Length), packet); socketWrapper.SendDataRAW(tosend); @@ -2501,7 +2731,8 @@ namespace MinecraftClient.Protocol.Handlers if (!String.IsNullOrEmpty(result) && result.StartsWith("{") && result.EndsWith("}")) { Json.JSONData jsonData = Json.ParseJson(result); - if (jsonData.Type == Json.JSONData.DataType.Object && jsonData.Properties.ContainsKey("version")) + if (jsonData.Type == Json.JSONData.DataType.Object && + jsonData.Properties.ContainsKey("version")) { Json.JSONData versionData = jsonData.Properties["version"]; @@ -2511,18 +2742,21 @@ namespace MinecraftClient.Protocol.Handlers //Retrieve protocol version number for handling this server if (versionData.Properties.ContainsKey("protocol")) - protocolVersion = int.Parse(versionData.Properties["protocol"].StringValue, NumberStyles.Any, CultureInfo.CurrentCulture); + protocolVersion = int.Parse(versionData.Properties["protocol"].StringValue, + NumberStyles.Any, CultureInfo.CurrentCulture); // Check for forge on the server. Protocol18Forge.ServerInfoCheckForge(jsonData, ref forgeInfo); - ConsoleIO.WriteLineFormatted("§8" + string.Format(Translations.mcc_server_protocol, version, protocolVersion + (forgeInfo != null ? Translations.mcc_with_forge : ""))); + ConsoleIO.WriteLineFormatted("§8" + string.Format(Translations.mcc_server_protocol, version, + protocolVersion + (forgeInfo != null ? Translations.mcc_with_forge : ""))); return true; } } } } + return false; } @@ -2558,15 +2792,25 @@ namespace MinecraftClient.Protocol.Handlers { try { - byte[] fields = dataTypes.GetAcknowledgment(acknowledgment, isOnlineMode && Config.Signature.LoginWithSecureProfile); + byte[] fields = dataTypes.GetAcknowledgment(acknowledgment, + isOnlineMode && Config.Signature.LoginWithSecureProfile); SendPacket(PacketTypesOut.MessageAcknowledgment, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -2584,15 +2828,25 @@ namespace MinecraftClient.Protocol.Handlers return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public LastSeenMessageList.Acknowledgment ConsumeAcknowledgment() { pendingAcknowledgments = 0; - return new LastSeenMessageList.Acknowledgment(lastSeenMessagesCollector.GetLastSeenMessages(), lastReceivedMessage); + return new LastSeenMessageList.Acknowledgment(lastSeenMessagesCollector.GetLastSeenMessages(), + lastReceivedMessage); } public void Acknowledge(ChatMessage message) @@ -2641,7 +2895,7 @@ namespace MinecraftClient.Protocol.Handlers try { - List>? needSigned = null; // List< Argument Name, Argument Value > + List>? needSigned = null; // List< Argument Name, Argument Value > if (playerKeyPair != null && isOnlineMode && protocolVersion >= MC_1_19_Version && Config.Signature.LoginWithSecureProfile && Config.Signature.SignMessageInCommand) needSigned = DeclareCommands.CollectSignArguments(command); @@ -2649,10 +2903,13 @@ namespace MinecraftClient.Protocol.Handlers lock (MessageSigningLock) { LastSeenMessageList.Acknowledgment? acknowledgment_1_19_2 = - (protocolVersion == MC_1_19_2_Version) ? ConsumeAcknowledgment() : null; + (protocolVersion == MC_1_19_2_Version) ? ConsumeAcknowledgment() : null; - (LastSeenMessageList.AcknowledgedMessage[] acknowledgment_1_19_3, byte[] bitset_1_19_3, int messageCount_1_19_3) = - (protocolVersion >= MC_1_19_3_Version) ? lastSeenMessagesCollector.Collect_1_19_3() : new(Array.Empty(), Array.Empty(), 0); + (LastSeenMessageList.AcknowledgedMessage[] acknowledgment_1_19_3, byte[] bitset_1_19_3, + int messageCount_1_19_3) = + (protocolVersion >= MC_1_19_3_Version) + ? lastSeenMessagesCollector.Collect_1_19_3() + : new(Array.Empty(), Array.Empty(), 0); List fields = new(); @@ -2665,31 +2922,33 @@ namespace MinecraftClient.Protocol.Handlers if (needSigned == null || needSigned!.Count == 0) { - fields.AddRange(DataTypes.GetLong(0)); // Salt: Long - fields.AddRange(DataTypes.GetVarInt(0)); // Signature Length: VarInt + fields.AddRange(DataTypes.GetLong(0)); // Salt: Long + fields.AddRange(DataTypes.GetVarInt(0)); // Signature Length: VarInt } else { Guid uuid = handler.GetUserUuid(); byte[] salt = GenerateSalt(); - fields.AddRange(salt); // Salt: Long - fields.AddRange(DataTypes.GetVarInt(needSigned.Count)); // Signature Length: VarInt + fields.AddRange(salt); // Salt: Long + fields.AddRange(DataTypes.GetVarInt(needSigned.Count)); // Signature Length: VarInt foreach ((string argName, string message) in needSigned) { - fields.AddRange(dataTypes.GetString(argName)); // Argument name: String + fields.AddRange(dataTypes.GetString(argName)); // Argument name: String byte[] sign; if (protocolVersion == MC_1_19_Version) sign = playerKeyPair!.PrivateKey.SignMessage(message, uuid, timeNow, ref salt); else if (protocolVersion == MC_1_19_2_Version) - sign = playerKeyPair!.PrivateKey.SignMessage(message, uuid, timeNow, ref salt, acknowledgment_1_19_2!.lastSeen); + sign = playerKeyPair!.PrivateKey.SignMessage(message, uuid, timeNow, ref salt, + acknowledgment_1_19_2!.lastSeen); else // protocolVersion >= MC_1_19_3_Version - sign = playerKeyPair!.PrivateKey.SignMessage(message, uuid, chatUuid, messageIndex++, timeNow, ref salt, acknowledgment_1_19_3); + sign = playerKeyPair!.PrivateKey.SignMessage(message, uuid, chatUuid, messageIndex++, + timeNow, ref salt, acknowledgment_1_19_3); if (protocolVersion <= MC_1_19_2_Version) - fields.AddRange(DataTypes.GetVarInt(sign.Length)); // Signature length: VarInt + fields.AddRange(DataTypes.GetVarInt(sign.Length)); // Signature length: VarInt - fields.AddRange(sign); // Signature: Byte Array + fields.AddRange(sign); // Signature: Byte Array } } @@ -2699,7 +2958,8 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion == MC_1_19_2_Version) { // Message Acknowledgment (1.19.2) - fields.AddRange(dataTypes.GetAcknowledgment(acknowledgment_1_19_2!, isOnlineMode && Config.Signature.LoginWithSecureProfile)); + fields.AddRange(dataTypes.GetAcknowledgment(acknowledgment_1_19_2!, + isOnlineMode && Config.Signature.LoginWithSecureProfile)); } else if (protocolVersion >= MC_1_19_3_Version) { @@ -2712,11 +2972,21 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.ChatCommand, fields); } + return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -2746,18 +3016,22 @@ namespace MinecraftClient.Protocol.Handlers lock (MessageSigningLock) { LastSeenMessageList.Acknowledgment? acknowledgment_1_19_2 = - (protocolVersion == MC_1_19_2_Version) ? ConsumeAcknowledgment() : null; + (protocolVersion == MC_1_19_2_Version) ? ConsumeAcknowledgment() : null; - (LastSeenMessageList.AcknowledgedMessage[] acknowledgment_1_19_3, byte[] bitset_1_19_3, int messageCount_1_19_3) = - (protocolVersion >= MC_1_19_3_Version) ? lastSeenMessagesCollector.Collect_1_19_3() : new(Array.Empty(), Array.Empty(), 0); + (LastSeenMessageList.AcknowledgedMessage[] acknowledgment_1_19_3, byte[] bitset_1_19_3, + int messageCount_1_19_3) = + (protocolVersion >= MC_1_19_3_Version) + ? lastSeenMessagesCollector.Collect_1_19_3() + : new(Array.Empty(), Array.Empty(), 0); // Timestamp: Instant(Long) DateTimeOffset timeNow = DateTimeOffset.UtcNow; fields.AddRange(DataTypes.GetLong(timeNow.ToUnixTimeMilliseconds())); - if (!isOnlineMode || playerKeyPair == null || !Config.Signature.LoginWithSecureProfile || !Config.Signature.SignChat) + if (!isOnlineMode || playerKeyPair == null || !Config.Signature.LoginWithSecureProfile || + !Config.Signature.SignChat) { - fields.AddRange(DataTypes.GetLong(0)); // Salt: Long + fields.AddRange(DataTypes.GetLong(0)); // Salt: Long if (protocolVersion < MC_1_19_3_Version) fields.AddRange(DataTypes.GetVarInt(0)); // Signature Length: VarInt (1.19 - 1.19.2) else @@ -2775,9 +3049,11 @@ namespace MinecraftClient.Protocol.Handlers if (protocolVersion == MC_1_19_Version) // 1.19.1 or lower sign = playerKeyPair.PrivateKey.SignMessage(message, playerUuid, timeNow, ref salt); else if (protocolVersion == MC_1_19_2_Version) // 1.19.2 - sign = playerKeyPair.PrivateKey.SignMessage(message, playerUuid, timeNow, ref salt, acknowledgment_1_19_2!.lastSeen); + sign = playerKeyPair.PrivateKey.SignMessage(message, playerUuid, timeNow, ref salt, + acknowledgment_1_19_2!.lastSeen); else // protocolVersion >= MC_1_19_3_Version - sign = playerKeyPair.PrivateKey.SignMessage(message, playerUuid, chatUuid, messageIndex++, timeNow, ref salt, acknowledgment_1_19_3); + sign = playerKeyPair.PrivateKey.SignMessage(message, playerUuid, chatUuid, + messageIndex++, timeNow, ref salt, acknowledgment_1_19_3); if (protocolVersion >= MC_1_19_3_Version) fields.AddRange(dataTypes.GetBool(true)); @@ -2800,16 +3076,27 @@ namespace MinecraftClient.Protocol.Handlers else if (protocolVersion == MC_1_19_2_Version) { // Message Acknowledgment - fields.AddRange(dataTypes.GetAcknowledgment(acknowledgment_1_19_2!, isOnlineMode && Config.Signature.LoginWithSecureProfile)); + fields.AddRange(dataTypes.GetAcknowledgment(acknowledgment_1_19_2!, + isOnlineMode && Config.Signature.LoginWithSecureProfile)); } } } + SendPacket(PacketTypesOut.ChatMessage, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendEntityAction(int PlayerEntityID, int ActionID) @@ -2823,9 +3110,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.EntityAction, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -2839,9 +3135,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.ClientStatus, new byte[] { 0 }); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -2876,7 +3181,8 @@ namespace MinecraftClient.Protocol.Handlers /// Show skin layers /// 1.9+ main hand /// True if client settings were successfully sent - public bool SendClientSettings(string language, byte viewDistance, byte difficulty, byte chatMode, bool chatColors, byte skinParts, byte mainHand) + public bool SendClientSettings(string language, byte viewDistance, byte difficulty, byte chatMode, + bool chatColors, byte skinParts, byte mainHand) { try { @@ -2896,6 +3202,7 @@ namespace MinecraftClient.Protocol.Handlers fields.Add((byte)(skinParts & 0x1)); //show cape } else fields.Add(skinParts); + if (protocolVersion >= MC_1_9_Version) fields.AddRange(DataTypes.GetVarInt(mainHand)); if (protocolVersion >= MC_1_17_Version) @@ -2905,13 +3212,23 @@ namespace MinecraftClient.Protocol.Handlers else fields.Add(1); // 1.17 and 1.17.1 - Disable text filtering. (Always true) } + if (protocolVersion >= MC_1_18_1_Version) fields.Add(1); // 1.18 and above - Allow server listings SendPacket(PacketTypesOut.ClientSettings, fields); } - catch (SocketException) { } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } + return false; } @@ -2929,7 +3246,8 @@ namespace MinecraftClient.Protocol.Handlers return SendLocationUpdate(location, onGround, yaw, pitch, true); } - public bool SendLocationUpdate(Location location, bool onGround, float? yaw = null, float? pitch = null, bool forceUpdate = false) + public bool SendLocationUpdate(Location location, bool onGround, float? yaw = null, float? pitch = null, + bool forceUpdate = false) { if (handler.GetTerrainEnabled()) { @@ -2938,22 +3256,27 @@ namespace MinecraftClient.Protocol.Handlers if (Config.Main.Advanced.TemporaryFixBadpacket) { - if (yaw.HasValue && pitch.HasValue && (forceUpdate || yaw.Value != LastYaw || pitch.Value != LastPitch)) + if (yaw.HasValue && pitch.HasValue && + (forceUpdate || yaw.Value != LastYaw || pitch.Value != LastPitch)) { - yawpitch = dataTypes.ConcatBytes(dataTypes.GetFloat(yaw.Value), dataTypes.GetFloat(pitch.Value)); + yawpitch = dataTypes.ConcatBytes(dataTypes.GetFloat(yaw.Value), + dataTypes.GetFloat(pitch.Value)); packetType = PacketTypesOut.PlayerPositionAndRotation; - LastYaw = yaw.Value; LastPitch = pitch.Value; + LastYaw = yaw.Value; + LastPitch = pitch.Value; } } else { if (yaw.HasValue && pitch.HasValue) { - yawpitch = dataTypes.ConcatBytes(dataTypes.GetFloat(yaw.Value), dataTypes.GetFloat(pitch.Value)); + yawpitch = dataTypes.ConcatBytes(dataTypes.GetFloat(yaw.Value), + dataTypes.GetFloat(pitch.Value)); packetType = PacketTypesOut.PlayerPositionAndRotation; - LastYaw = yaw.Value; LastPitch = pitch.Value; + LastYaw = yaw.Value; + LastPitch = pitch.Value; } } @@ -2970,9 +3293,18 @@ namespace MinecraftClient.Protocol.Handlers new byte[] { onGround ? (byte)1 : (byte)0 })); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } else return false; } @@ -2993,7 +3325,8 @@ namespace MinecraftClient.Protocol.Handlers byte[] length = BitConverter.GetBytes((short)data.Length); Array.Reverse(length); - SendPacket(PacketTypesOut.PluginMessage, dataTypes.ConcatBytes(dataTypes.GetString(channel), length, data)); + SendPacket(PacketTypesOut.PluginMessage, + dataTypes.ConcatBytes(dataTypes.GetString(channel), length, data)); } else { @@ -3002,9 +3335,18 @@ namespace MinecraftClient.Protocol.Handlers return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -3018,12 +3360,22 @@ namespace MinecraftClient.Protocol.Handlers { try { - SendPacket(0x02, dataTypes.ConcatBytes(DataTypes.GetVarInt(messageId), dataTypes.GetBool(understood), data)); + SendPacket(0x02, + dataTypes.ConcatBytes(DataTypes.GetVarInt(messageId), dataTypes.GetBool(understood), data)); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } /// @@ -3049,9 +3401,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.InteractEntity, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } // TODO: Interact at block location (e.g. chest minecart) @@ -3074,10 +3435,20 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.InteractEntity, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } + public bool SendInteractEntity(int EntityID, int type, int hand) { try @@ -3094,10 +3465,20 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.InteractEntity, fields); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } + public bool SendInteractEntity(int EntityID, int type, float X, float Y, float Z) { return false; @@ -3107,9 +3488,9 @@ namespace MinecraftClient.Protocol.Handlers { 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 - // TODO once Player Block Placement is implemented for older versions + // 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 + // TODO once Player Block Placement is implemented for older versions try { List packet = new(); @@ -3119,9 +3500,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.UseItem, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendPlayerDigging(int status, Location location, Direction face, int sequenceId) @@ -3137,9 +3527,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.PlayerDigging, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendPlayerBlockPlacement(int hand, Location location, Direction face, int sequenceId) @@ -3161,9 +3560,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.PlayerBlockPlacement, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendHeldItemChange(short slot) @@ -3175,12 +3583,22 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.HeldItemChange, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } - public bool SendWindowAction(int windowId, int slotId, WindowActionType action, Item? item, List> changedSlots, int stateId) + public bool SendWindowAction(int windowId, int slotId, WindowActionType action, Item? item, + List> changedSlots, int stateId) { try { @@ -3198,21 +3616,82 @@ namespace MinecraftClient.Protocol.Handlers switch (action) { - case WindowActionType.LeftClick: button = 0; break; - case WindowActionType.RightClick: button = 1; break; - case WindowActionType.MiddleClick: button = 2; mode = 3; break; - case WindowActionType.ShiftClick: button = 0; mode = 1; item = new Item(ItemType.Null, 0, null); break; - case WindowActionType.DropItem: button = 0; mode = 4; item = new Item(ItemType.Null, 0, null); break; - case WindowActionType.DropItemStack: button = 1; mode = 4; item = new Item(ItemType.Null, 0, null); break; - case WindowActionType.StartDragLeft: button = 0; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.StartDragRight: button = 4; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.StartDragMiddle: button = 8; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.EndDragLeft: button = 2; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.EndDragRight: button = 6; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.EndDragMiddle: button = 10; mode = 5; item = new Item(ItemType.Null, 0, null); slotId = -999; break; - case WindowActionType.AddDragLeft: button = 1; mode = 5; item = new Item(ItemType.Null, 0, null); break; - case WindowActionType.AddDragRight: button = 5; mode = 5; item = new Item(ItemType.Null, 0, null); break; - case WindowActionType.AddDragMiddle: button = 9; mode = 5; item = new Item(ItemType.Null, 0, null); break; + case WindowActionType.LeftClick: + button = 0; + break; + case WindowActionType.RightClick: + button = 1; + break; + case WindowActionType.MiddleClick: + button = 2; + mode = 3; + break; + case WindowActionType.ShiftClick: + button = 0; + mode = 1; + item = new Item(ItemType.Null, 0, null); + break; + case WindowActionType.DropItem: + button = 0; + mode = 4; + item = new Item(ItemType.Null, 0, null); + break; + case WindowActionType.DropItemStack: + button = 1; + mode = 4; + item = new Item(ItemType.Null, 0, null); + break; + case WindowActionType.StartDragLeft: + button = 0; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.StartDragRight: + button = 4; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.StartDragMiddle: + button = 8; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.EndDragLeft: + button = 2; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.EndDragRight: + button = 6; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.EndDragMiddle: + button = 10; + mode = 5; + item = new Item(ItemType.Null, 0, null); + slotId = -999; + break; + case WindowActionType.AddDragLeft: + button = 1; + mode = 5; + item = new Item(ItemType.Null, 0, null); + break; + case WindowActionType.AddDragRight: + button = 5; + mode = 5; + item = new Item(ItemType.Null, 0, null); + break; + case WindowActionType.AddDragMiddle: + button = 9; + mode = 5; + item = new Item(ItemType.Null, 0, null); + break; } List packet = new() @@ -3263,9 +3742,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.ClickWindow, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendCreativeInventoryAction(int slot, ItemType itemType, int count, Dictionary? nbt) @@ -3278,9 +3766,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.CreativeInventoryAction, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool ClickContainerButton(int windowId, int buttonId) @@ -3293,9 +3790,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.ClickWindowButton, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendAnimation(int animation, int playerid) @@ -3328,9 +3834,18 @@ namespace MinecraftClient.Protocol.Handlers return false; } } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendCloseWindow(int windowId) @@ -3342,12 +3857,22 @@ namespace MinecraftClient.Protocol.Handlers if (window_actions.ContainsKey(windowId)) window_actions[windowId] = 0; } + SendPacket(PacketTypesOut.CloseWindow, new[] { (byte)windowId }); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SendUpdateSign(Location sign, string line1, string line2, string line3, string line4) @@ -3372,12 +3897,22 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.UpdateSign, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } - public bool UpdateCommandBlock(Location location, string command, CommandBlockMode mode, CommandBlockFlags flags) + public bool UpdateCommandBlock(Location location, string command, CommandBlockMode mode, + CommandBlockFlags flags) { if (protocolVersion <= MC_1_13_Version) { @@ -3391,11 +3926,23 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.UpdateSign, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } + } + else + { + return false; } - else { return false; } } public bool SendWindowConfirmation(byte windowID, short actionID, bool accepted) @@ -3409,9 +3956,18 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.WindowConfirmation, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } } public bool SelectTrade(int selectedSlot) @@ -3426,11 +3982,23 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.SelectTrade, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } + } + else + { + return false; } - else { return false; } } public bool SendSpectate(Guid UUID) @@ -3445,11 +4013,23 @@ namespace MinecraftClient.Protocol.Handlers SendPacket(PacketTypesOut.Spectate, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } + } + else + { + return false; } - else { return false; } } public bool SendPlayerSession(PlayerKeyPair? playerKeyPair) @@ -3470,16 +4050,29 @@ namespace MinecraftClient.Protocol.Handlers packet.AddRange(DataTypes.GetVarInt(playerKeyPair.PublicKey.SignatureV2!.Length)); packet.AddRange(playerKeyPair.PublicKey.SignatureV2); - log.Debug($"SendPlayerSession MessageUUID = {chatUuid.ToString()}, len(PublicKey) = {playerKeyPair.PublicKey.Key.Length}, len(SignatureV2) = {playerKeyPair.PublicKey.SignatureV2!.Length}"); + log.Debug( + $"SendPlayerSession MessageUUID = {chatUuid.ToString()}, len(PublicKey) = {playerKeyPair.PublicKey.Key.Length}, len(SignatureV2) = {playerKeyPair.PublicKey.SignatureV2!.Length}"); SendPacket(PacketTypesOut.PlayerSession, packet); return true; } - catch (SocketException) { return false; } - catch (System.IO.IOException) { return false; } - catch (ObjectDisposedException) { return false; } + catch (SocketException) + { + return false; + } + catch (System.IO.IOException) + { + return false; + } + catch (ObjectDisposedException) + { + return false; + } + } + else + { + return false; } - else { return false; } } private byte[] GenerateSalt() @@ -3489,4 +4082,4 @@ namespace MinecraftClient.Protocol.Handlers return salt; } } -} +} \ No newline at end of file