Merge branch 'master' into release

Author: laz1444

.github/workflows/dotnet.yml

@@ -38,5 +38,5 @@ jobs:
         file: src/MiNET/MiNET.Console/minet.zip
         asset_name: MiNET.zip
         tag: ${{ github.ref }}
-        release_name: MiNET-CobwebSMP 1.13.0.16 (1.21.20)
+        release_name: MiNET-CobwebSMP 1.13.0.17 (1.21.30)
         body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/BedrockTraceHandler.cs

@@ -103,12 +103,6 @@ public override void HandleMcpeResourcePacksInfo(McpeResourcePacksInfo message)
 				sb.AppendLine($"ID={info.UUID}, Version={info.Version}, Unknown={info.Size}");
 			}
 
-			sb.AppendLine("Behavior packs:");
-			foreach (ResourcePackInfo info in message.behahaviorpackinfos)
-			{
-				sb.AppendLine($"ID={info.UUID}, Version={info.Version}");
-			}
-
 			Log.Debug(sb.ToString());
 
 			base.HandleMcpeResourcePacksInfo(message);
@@ -183,9 +177,9 @@ public override void HandleMcpePlayerHotbar(McpePlayerHotbar message)
 
 		public override void HandleMcpeInventoryContent(McpeInventoryContent message)
 		{
-			CallPacketHandlers(message);
+			Log.Error($"Set container content on Window ID: 0x{message.inventoryId:x2}, Count: {message.input.Count}, ContainerName: {message.ContainerName.ContainerId} - {message.ContainerName.DynamicId}, dynamicSlotSize: {message.dynamicSlotSize}");
 
-			Log.Debug($"Set container content on Window ID: 0x{message.inventoryId:x2}, Count: {message.input.Count}");
+			CallPacketHandlers(message);
 
 			if (Client.IsEmulator) return;
 
@@ -214,11 +208,11 @@ public override void HandleMcpeCreativeContent(McpeCreativeContent message)
 				//Log.Warn($"Got item: {item.Name} ({item.Id} : {item.Metadata})");
 				if (item.ExtraData == null)
 				{
-					writer.WriteLine($"new Item({item.Id}, {item.Metadata}),");
+					writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ RuntimeId = {item.RuntimeId},");
 				}
 				else
 				{
-					writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ ExtraData = {item.ExtraData}}},");
+					writer.WriteLine($"new Item({item.Id}, {item.Metadata}){{ RuntimeId = {item.RuntimeId}, ExtraData = {item.ExtraData}}},");
 				}
 			}
 			Log.Warn($"[McpeCreativeContent] Done reading {message.input.Count} creative items\n");

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

@@ -114,11 +114,11 @@ public virtual void HandleMcpeResourcePacksInfo(McpeResourcePacksInfo message)
 			//response.responseStatus = 3;
 			//SendPackage(response);
 
-			if (message.behahaviorpackinfos.Count != 0)
+			if (message.texturepacks.Count != 0)
 			{
 				var resourcePackIds = new ResourcePackIds();
 
-				foreach (ResourcePackInfo packInfo in message.behahaviorpackinfos)
+				foreach (ResourcePackInfo packInfo in message.texturepacks)
 				{
 					resourcePackIds.Add(packInfo.UUID);
 				}
@@ -269,7 +269,7 @@ public virtual void HandleMcpeInventoryTransaction(McpeInventoryTransaction mess
 
 		public virtual void HandleMcpeMobEquipment(McpeMobEquipment message)
 		{
-			/*Log.Warn($"Entity with {message.runtimeEntityId} is holding {message.item.Name}");*/
+			Log.Warn($"Entity with {message.runtimeEntityId} is holding {message.item.Name}");
 		}
 
 		public virtual void HandleMcpeMobArmorEquipment(McpeMobArmorEquipment message)
@@ -286,6 +286,8 @@ 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);