Entity fixes

Author: laz1444

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

@@ -24,6 +24,7 @@
 #endregion
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Numerics;
 using System.Security.Cryptography;
@@ -33,9 +34,12 @@
 using MiNET.Net;
 using MiNET.Utils;
 using MiNET.Utils.Cryptography;
+using MiNET.Utils.Metadata;
 using MiNET.Utils.Vectors;
+using Newtonsoft.Json;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Security;
+using static MiNET.Entities.Entity;
 
 namespace MiNET.Client
 {
@@ -286,6 +290,9 @@ public virtual void HandleMcpeHurtArmor(McpeHurtArmor message)
 
 		public virtual void HandleMcpeSetEntityData(McpeSetEntityData message)
 		{
+			//Log.Warn(JsonConvert.SerializeObject(message, Formatting.Indented));
+
+			
 			/*if (message.metadata[0] == null) { return; }
 			MetadataLong metadataLong = message.metadata[0] as MetadataLong;
 			byte[] bytes = BitConverter.GetBytes(metadataLong.Value);

src/MiNET/MiNET/Entities/Agent.cs

@@ -1,4 +1,4 @@
-#region LICENSE
+#region LICENSE
 
 // The contents of this file are subject to the Common Public Attribution
 // License Version 1.0. (the "License"); you may not use this file except in
@@ -44,10 +44,10 @@ public Agent(Level level) : base(EntityType.Agent, level)
 		public override MetadataDictionary GetMetadata()
 		{
 			MetadataDictionary metadata = base.GetMetadata();
-			metadata[0] = new MetadataLong(549755846656); // 1000000000000000000000001000000000000000; AlwaysShowName
+			metadata[(int) MetadataFlags.EntityFlags] = new MetadataLong(549755846656); // 1000000000000000000000001000000000000000; AlwaysShowName
 			if (Owner != null)
 			{
-				metadata[5] = new MetadataLong(Owner.EntityId);
+				metadata[(int) MetadataFlags.Owner] = new MetadataLong(Owner.EntityId);
 			}
 			return metadata;
 		}

src/MiNET/MiNET/Entities/Camera.cs

@@ -52,7 +52,7 @@ public Camera(Level level) : base(EntityType.Camera, level)
 		public override MetadataDictionary GetMetadata()
 		{
 			var metadata = base.GetMetadata();
-			metadata[40] = new MetadataString(InteractionLabel);
+			metadata[(int) MetadataFlags.NpcData] = new MetadataString(InteractionLabel);
 			return metadata;
 		}
 

src/MiNET/MiNET/Entities/Entity.cs

@@ -74,8 +74,6 @@ public class Entity
 		public bool IsOutOfWater => !IsInWater;
 		public int PotionColor { get; set; }
 		public int Variant { get; set; }
-		public int EatingHaystack { get; set; }
-
 		public long Age { get; set; }
 		public double Scale { get; set; } = 1.0;
 		public virtual double Height { get; set; } = 1;
@@ -115,44 +113,143 @@ public Entity(int entityTypeId, Level level) : this((EntityType) entityTypeId, l
 		public enum MetadataFlags
 		{
 			EntityFlags = 0,
+			StructuralInt = 1,
 			Variant = 2,
 			Color = 3,
-			HideNameTag = 3,
 			NameTag = 4,
 			Owner = 5,
+			Target = 6,
 			AvailableAir = 7,
 			PotionColor = 8,
+			Unknown = 9,
+			Unknown2 = 10,
+			Hurt = 11,
+			HurtDirection = 12,
+			RowTimeLeft = 13,
+			RowTimeRight = 14,
 			ExperienceValue = 15,
-			EatingHaystack = 16,
-			FireworksType = 16,
-			MaybeAge = 24,
+			TileRuntimeId = 16,
+			Offset = 17,
+			CustomDisplay = 18,
+			Swell = 19,
+			OldSwel = 20,
+			SwellDirection = 21,
+			ChargeAmount = 22,
+			CarryBlockRumtimeId = 23,
+			EntityAge = 24,
+			UsingItem = 25,
 			PlayerFlags = 26,
+			PlayerIndex = 27,
 			BedPosition = 28,
-			Scale = 38, //todo still exist?
+			XPower = 29,
+			YPower = 30,
+			ZPower = 31,
+			AuxPower = 32,
+			FishX = 33,
+			FishY = 34,
+			FishAngle = 35,
+			AuxValueData = 36,
+			LeashHolder = 37,
+			Scale = 38,
+			HasNpc = 39,
+			NpcData = 40,
+			Actions = 41,
 			MaxAir = 42,
 			Markings = 43,
-			CollisionBoxWidth = 53, //todo still exist?
-			CollisionBoxHeight = 54, //todo still exist?
-
+			ContainerType = 44,
+			ContainerSize = 45,
+			ContainerStrenght = 46,
+			BlockTarget = 47,
+			InvulnerableTicks = 48,
+			TargetA = 49,
+			TargetB = 50,
+			TargetC = 51,
+			AerialAttack = 52,
+			CollisionBoxWidth = 53,
+			CollisionBoxHeight = 54,
 			DataFuseLength = 55,
-
 			RiderSeatPosition = 56,
 			RiderRotationLocked = 57,
 			RiderMaxRotation = 58,
 			RiderMinRotation = 59,
+			RiderRotationOffset = 60,
+			DataRadius = 61,
+			DataWaiting = 62,
+			DataParticle = 63,
+			PeekId = 64,
+			AttachFace = 65,
+			Attached = 66,
+			AttachPos = 67,
+			TradeTarget = 68,
+			Career = 69,
+			HasCommandBlock = 70,
+			CommandName = 71,
+			LastCommandOutput = 72,
+			TrackCommandOutput = 73,
+			Unknown5 = 74,
+			Strenght = 75,
+			MaxStrenght = 76,
+			DataCastingColor = 77,
+			DataLifetimeTicks = 78,
+			PoseIndex = 79,
+			DataTickOffset = 80,
 			AlwaysShowNameTag = 81,
-
-			EntityFlags2 = 91, // same treatment as 0 flags, perhaps
-
-			ButtonText = 99,
+			Color2Index = 82,
+			AuthorName = 83,
+			Score = 84,
+			BalloonAnchor = 86,
+			BubbleTime = 87,
+			Agent = 88,
+			SittingAmount = 89,
+			SittingAmountPrevious = 90,
+			EatingCounter = 91,
+			Unknown6 = 92,
+			LayingAmount = 93,
+			LayingAmountPrevious = 94,
+			DataDuration = 95,
+			DataSpawnTime = 96,
+			DataChangeRate = 97,
+			DataChangeOnPickup = 98,
+			DataPickupCount = 99,
+			InteractTect = 100,
+			TradeTier = 101,
+			MaxTradeTier = 102,
+			TradeExperience = 103,
+			SkinIn = 104,
+			SpawningFrames = 105,
+			CommandBockTickDelay = 106,
+			CommandBlockOnFirstTick = 107,
+			AmbientSoundInterval = 108,
+			AmbientSoundIntervalRange = 109,
+			AmbientSoundEventName = 110,
+			FallDamageMultiplier = 111,
+			NameRawText = 112,
+			CanRideTarget = 113,
+			LowCuredDiscount = 114,
+			HighCuredDiscount = 115,
+			NearbyCuredDiscount = 116,
+			NearbyCuredDiscountTime = 117,
+			Hitbox = 118,
+			IsBuoyant = 119,
+			FreezingEffectStrenght = 120,
+			BuoyancyData = 121,
+			GoatHornCount = 122,
+			BaseRuntimeId = 123,
+			MovementSoundDistanceOffset = 124,
+			HeartbeatSoundDistanceOffset = 125,
+			HeartbeatSoundEvent = 126,
+			LastDeathPosition = 127,
+			LastDeathDimension = 128,
+			HasDied = 129,
+			CollisionBox = 130,
+			VisibleMobEffects = 131,
+			Count = 132,
 		}
 
 		public virtual MetadataDictionary GetMetadata()
 		{
 			MetadataDictionary metadata = new MetadataDictionary();
 			metadata[(int) MetadataFlags.EntityFlags] = new MetadataLong(GetDataValue());
-			metadata[1] = new MetadataInt(1);
-			metadata[(int) MetadataFlags.HideNameTag] = new MetadataByte(!HideNameTag);
 			metadata[(int) MetadataFlags.NameTag] = new MetadataString(NameTag ?? string.Empty);
 			metadata[(int) MetadataFlags.AvailableAir] = new MetadataShort(HealthManager.Air);
 			metadata[(int) MetadataFlags.PotionColor] = new MetadataInt(PotionColor);
@@ -302,7 +399,6 @@ private static string FlagsToString(long input)
 		public bool IsBaby { get; set; }
 		public bool IsConverting { get; set; }
 		public bool IsCritical { get; set; }
-		public bool IsShowName => !HideNameTag;
 		public bool IsAlwaysShowName { get; set; }
 		public bool IsNoAi => NoAi;
 		public bool HaveAi => !NoAi;
@@ -453,7 +549,6 @@ public enum DataFlags
 			Timer2 = 116,
 			Timer3 = 117,
 			BodyRotationBlocked = 118,
-			Count = 119
 		}
 
 		protected virtual BitArray GetFlags()
@@ -473,7 +568,7 @@ protected virtual BitArray GetFlags()
 			bits[(int) DataFlags.Baby] = IsBaby;
 			bits[(int) DataFlags.Converting] = IsConverting;
 			bits[(int) DataFlags.Critcal] = IsCritical;
-			bits[(int) DataFlags.ShowName] = IsShowName;
+			bits[(int) DataFlags.ShowName] = !HideNameTag;
 			bits[(int) DataFlags.AlwaysShowName] = IsAlwaysShowName;
 			bits[(int) DataFlags.NoAi] = IsNoAi;
 			bits[(int) DataFlags.Silent] = IsSilent;

src/MiNET/MiNET/Entities/Hostile/Dragon.cs

@@ -1,4 +1,4 @@
-#region LICENSE
+#region LICENSE
 
 // The contents of this file are subject to the Common Public Attribution
 // License Version 1.0. (the "License"); you may not use this file except in
@@ -47,46 +47,7 @@ public Dragon(Level level) : base(EntityType.Dragon, level)
 
 		public override MetadataDictionary GetMetadata()
 		{
-			Log.Warn("Metadata");
-			MetadataDictionary metadata = new MetadataDictionary();
-			//metadata[38] = new MetadataLong(0);
-			//metadata[39] = new MetadataFloat(1f);
-			//metadata[44] = new MetadataShort(300);
-
-			//MetadataDictionary metadata = new MetadataDictionary();
-			metadata[0] = new MetadataLong(8388608); // 100000000000000000000000; Sitting
-			metadata[1] = new MetadataInt(1);
-			metadata[2] = new MetadataInt(0);
-			metadata[3] = new MetadataByte(0);
-			metadata[4] = new MetadataString("");
-			metadata[5] = new MetadataLong(-1);
-			metadata[7] = new MetadataShort(300);
-			metadata[8] = new MetadataInt(0);
-			metadata[9] = new MetadataByte(0);
-			metadata[10] = new MetadataByte(0);
-			metadata[22] = new MetadataByte(0);
-			metadata[38] = new MetadataLong(0);
-			metadata[39] = new MetadataFloat(1f);
-			metadata[43] = new MetadataShort(300);
-			metadata[44] = new MetadataInt(0);
-			metadata[45] = new MetadataByte(0);
-			metadata[46] = new MetadataInt(0);
-			metadata[47] = new MetadataInt(0);
-			metadata[54] = new MetadataFloat(13f);
-			metadata[55] = new MetadataFloat(4f);
-			metadata[58] = new MetadataByte(0);
-			metadata[59] = new MetadataFloat(0f);
-			metadata[60] = new MetadataFloat(0f);
-			metadata[70] = new MetadataByte(0);
-			metadata[71] = new MetadataString("");
-			metadata[72] = new MetadataString("");
-			metadata[73] = new MetadataByte(1);
-			metadata[74] = new MetadataByte(0);
-			metadata[75] = new MetadataInt(0);
-			metadata[76] = new MetadataInt(0);
-			metadata[77] = new MetadataInt(0);
-			metadata[78] = new MetadataInt(-1);
-
+			MetadataDictionary metadata = base.GetMetadata();
 			return metadata;
 		}
 	}

src/MiNET/MiNET/Entities/Hostile/ElderGuardian.cs

@@ -1,4 +1,4 @@
-#region LICENSE
+#region LICENSE
 
 // The contents of this file are subject to the Common Public Attribution
 // License Version 1.0. (the "License"); you may not use this file except in
@@ -40,44 +40,9 @@ public ElderGuardian(Level level) : base(EntityType.ElderGuardian, level)
 			Height = 1.9;
 			IsElder = true;
 		}
-
-		// Metadata: 
-		//[0] long 7 536870912, 
-		//[1] int 2 1, 
-		//[2] int 2 0, 
-		//[3] byte 0 0, 
-		//[4] string 4 , 
-		//[5] long 7 1, 
-		//[6] long 7 0, 
-		//[7] short 1 300, 
-		//[8] int 2 0, 
-		//[9] byte 0 0, 
-		//[38] long 7 0, 
-		//[39] float 3 1, 
-		//[44] short 1 300, 
-		//[45] int 2 0, 
-		//[46] byte 0 0, 
-		//[47] int 2 0, 
-		//[53] float 3 1,99, 
-		//[54] float 3 1,99, 
-		//[56] vector3 8 <0� 0� 0>, 
-		//[57] byte 0 0, 
-		//[58] float 3 0, 
-		//[59] float 3 0
-
 		public override MetadataDictionary GetMetadata()
 		{
 			MetadataDictionary metadata = base.GetMetadata();
-			//MetadataDictionary metadata = new MetadataDictionary();
-			metadata[0] = new MetadataLong(GetDataValue());
-			metadata[39] = new MetadataFloat(1.0f);
-			metadata[44] = new MetadataShort(300);
-			metadata[53] = new MetadataFloat(1.99f);
-			metadata[54] = new MetadataFloat(1.99f);
-			metadata[57] = new MetadataByte(0);
-			metadata[58] = new MetadataFloat(0);
-			metadata[59] = new MetadataFloat(0);
-
 			return metadata;
 		}
 	}