From 61ac5bb3d16106918d62b18018ed3aa7e4aa08b5 Mon Sep 17 00:00:00 2001 From: ORelio Date: Wed, 29 Jul 2020 21:35:00 +0200 Subject: [PATCH] Small fixes for (#1149) --- MinecraftClient/Mapping/EntityType.cs | 26 +++++++++---------- .../Mapping/EntityTypeExtensions.cs | 6 ++--- .../Protocol/Handlers/DataTypes.cs | 4 +-- .../Protocol/Handlers/Protocol18.cs | 18 ++++++------- .../Handlers/Protocol18PacketTypes.cs | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/MinecraftClient/Mapping/EntityType.cs b/MinecraftClient/Mapping/EntityType.cs index d9064bfb..4afc9416 100644 --- a/MinecraftClient/Mapping/EntityType.cs +++ b/MinecraftClient/Mapping/EntityType.cs @@ -1,16 +1,16 @@ namespace MinecraftClient.Mapping { - /// - /// Represents Minecraft Entity Types - /// - /// - /// Generated from registries.json using EntityPaletteGenerator.cs. - /// Typical steps to handle new entity IDs for newer Minecraft versions: - /// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators) - /// 2. Generate temporary EntityTypeXXX.cs and EntityPaletteXXX.cs using EntityPaletteGenerator.cs - /// 3. Perform a diff with existing versions, add missing entries in EntityType.cs and EntityTypeExtensions.cs - /// 4. If existing entity IDs were not randomized by Mojang, simply add missing entries to the latest existing EntityPaletteXXX.cs - /// 5. If existing entity IDs were randomized, add a new palette as EntityPaletteXXX.cs into the codebase (worst case) + /// + /// Represents Minecraft Entity Types + /// + /// + /// Generated from registries.json using EntityPaletteGenerator.cs. + /// Typical steps to handle new entity IDs for newer Minecraft versions: + /// 1. Generate registries.json using data reporting on Vanilla Minecraft (https://wiki.vg/Data_Generators) + /// 2. Generate temporary EntityTypeXXX.cs and EntityPaletteXXX.cs using EntityPaletteGenerator.cs + /// 3. Perform a diff with existing versions, add missing entries in EntityType.cs and EntityTypeExtensions.cs + /// 4. If existing entity IDs were not randomized by Mojang, simply add missing entries to the latest existing EntityPaletteXXX.cs + /// 5. If existing entity IDs were randomized, add a new palette as EntityPaletteXXX.cs into the codebase (worst case) /// public enum EntityType { @@ -42,6 +42,7 @@ namespace MinecraftClient.Mapping EyeOfEnder, FallingBlock, FireworkRocket, + FishingBobber, Fox, Ghast, Giant, @@ -100,6 +101,7 @@ namespace MinecraftClient.Mapping Egg, EnderPearl, ExperienceBottle, + Player, Potion, Trident, TraderLlama, @@ -119,7 +121,5 @@ namespace MinecraftClient.Mapping ZombieHorse, ZombieVillager, ZombiePigman, - Player, - FishingBobber, } } diff --git a/MinecraftClient/Mapping/EntityTypeExtensions.cs b/MinecraftClient/Mapping/EntityTypeExtensions.cs index 4d1e85a5..a29f5e0a 100644 --- a/MinecraftClient/Mapping/EntityTypeExtensions.cs +++ b/MinecraftClient/Mapping/EntityTypeExtensions.cs @@ -22,12 +22,12 @@ namespace MinecraftClient.Mapping case EntityType.Evoker: case EntityType.Ghast: case EntityType.Guardian: - case EntityType.Hoglin: + case EntityType.Hoglin: case EntityType.Husk: case EntityType.MagmaCube: case EntityType.Phantom: case EntityType.Piglin: - case EntityType.Pillager: + case EntityType.Pillager: case EntityType.Ravager: case EntityType.Shulker: case EntityType.Silverfish: @@ -39,7 +39,7 @@ namespace MinecraftClient.Mapping case EntityType.Vindicator: case EntityType.Witch: case EntityType.WitherSkeleton: - case EntityType.Zoglin: + case EntityType.Zoglin: case EntityType.Zombie: case EntityType.ZombieVillager: return true; diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs index 6aed193e..8f7ee837 100644 --- a/MinecraftClient/Protocol/Handlers/DataTypes.cs +++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs @@ -671,12 +671,12 @@ namespace MinecraftClient.Protocol.Handlers return bytes.ToArray(); } - /// + /// /// Build an boolean for sending over the network /// /// Boolean to encode /// Byte array for this boolean - public byte[] GetVarBool(bool paramBool) + public byte[] GetBool(bool paramBool) { List bytes = new List(); bytes.Add((byte)Convert.ToByte(paramBool)); diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index 1343e088..024aa2a1 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -106,11 +106,11 @@ namespace MinecraftClient.Protocol.Handlers { if (protocolversion > MC1161Version && handler.GetEntityHandlingEnabled()) throw new NotImplementedException("Please update entity types handling for this Minecraft version. See EntityType.cs"); - if (protocolversion < MC115Version) - entityPalette = new EntityPalette114(); - if (protocolversion > MC115Version) + if (protocolversion >= MC116Version) entityPalette = new EntityPalette116(); - else entityPalette = new EntityPalette115(); + else if (protocolversion >= MC115Version) + entityPalette = new EntityPalette115(); + else entityPalette = new EntityPalette114(); } else entityPalette = new EntityPalette113(); } @@ -1439,11 +1439,11 @@ namespace MinecraftClient.Protocol.Handlers fields.AddRange(dataTypes.GetVarInt(EntityID)); fields.AddRange(dataTypes.GetVarInt(type)); - // Is player Sneaking (Only 1.16 and above) - // Currently hardcoded to false - // TODO: Update to reflect the real player state - if (protocolversion >= MC116Version) - fields.AddRange(dataTypes.GetVarBool(false)); + // Is player Sneaking (Only 1.16 and above) + // Currently hardcoded to false + // TODO: Update to reflect the real player state + if (protocolversion >= MC116Version) + fields.AddRange(dataTypes.GetBool(false)); SendPacket(PacketOutgoingType.InteractEntity, fields); return true; diff --git a/MinecraftClient/Protocol/Handlers/Protocol18PacketTypes.cs b/MinecraftClient/Protocol/Handlers/Protocol18PacketTypes.cs index a5b43e22..9e1d0bea 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18PacketTypes.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18PacketTypes.cs @@ -385,7 +385,7 @@ namespace MinecraftClient.Protocol.Handlers case 0x29: return PacketIncomingType.EntityPositionAndRotation; case 0x58: return PacketIncomingType.EntityProperties; case 0x56: return PacketIncomingType.EntityTeleport; - case 0x46: return PacketIncomingType.EntityVelocity; // This is maybe entity moving, not sure + case 0x46: return PacketIncomingType.EntityVelocity; case 0x47: return PacketIncomingType.EntityEquipment; case 0x59: return PacketIncomingType.EntityEffect; case 0x4E: return PacketIncomingType.TimeUpdate;