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.8 (1.20.70)
+        release_name: MiNET-CobwebSMP 1.13.0.9 (1.20.70)
         body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

@@ -260,6 +260,7 @@ public virtual void HandleMcpeEntityEvent(McpeEntityEvent message)
 
 		public virtual void HandleMcpeMobEffect(McpeMobEffect message)
 		{
+			Log.Warn($"I got effect: {message.runtimeEntityId} / {message.eventId} / {message.effectId} / {message.amplifier} / {message.particles} / {message.duration} / {message.tick}");
 		}
 
 		public virtual void HandleMcpeUpdateAttributes(McpeUpdateAttributes message)

src/MiNET/MiNET.Console/minet.zip

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>MiNET-CobwebSMP</PackageId>
-    <Version>1.13.0.8</Version>
+    <Version>1.13.0.9</Version>
     <Authors>gurun</Authors>
     <Company>Niclas Olofsson</Company>
     <Description>MiNET - a Minecraft PocketEdition Server</Description>

src/MiNET/MiNET/MiNET.csproj

@@ -41,7 +41,6 @@
 using MiNET.Utils.Metadata;
 using MiNET.Utils.Vectors;
 using MiNET.Utils.Nbt;
-using MiNET.Net;
 
 namespace MiNET.Net
 {
@@ -2217,6 +2216,7 @@ public partial class McpeResourcePacksInfo : Packet<McpeResourcePacksInfo>
 		public bool forceServerPacks; // = null;
 		public ResourcePackInfos behahaviorpackinfos; // = null;
 		public TexturePackInfos texturepacks; // = null;
+		public uint cndUrls; // = null;
 
 		public McpeResourcePacksInfo()
 		{
@@ -2236,7 +2236,7 @@ protected override void EncodePacket()
 			Write(forceServerPacks);
 			Write(behahaviorpackinfos);
 			Write(texturepacks);
-			WriteUnsignedVarInt(0);
+			WriteUnsignedVarInt(cndUrls);
 
 			AfterEncode();
 		}
@@ -2256,6 +2256,7 @@ protected override void DecodePacket()
 			forceServerPacks = ReadBool();
 			behahaviorpackinfos = ReadResourcePackInfos();
 			texturepacks = ReadTexturePackInfos();
+			cndUrls = ReadUnsignedVarInt();
 
 			AfterDecode();
 		}
@@ -2273,6 +2274,7 @@ protected override void ResetPacket()
 			forceServerPacks=default(bool);
 			behahaviorpackinfos=default(ResourcePackInfos);
 			texturepacks=default(TexturePackInfos);
+			cndUrls= default(uint);
 		}
 
 	}
@@ -3655,7 +3657,7 @@ protected override void EncodePacket()
 			WriteSignedVarInt(amplifier);
 			Write(particles);
 			WriteSignedVarInt(duration);
-			WriteUnsignedVarLong(20);
+			Write(tick);
 
 			AfterEncode();
 		}
@@ -3675,7 +3677,7 @@ protected override void DecodePacket()
 			amplifier = ReadSignedVarInt();
 			particles = ReadBool();
 			duration = ReadSignedVarInt();
-			tick = ReadUnsignedVarLong();
+			tick = ReadLong();
 
 			AfterDecode();
 		}
@@ -4361,7 +4363,7 @@ protected override void EncodePacket()
 
 			WriteUnsignedVarLong(runtimeEntityId);
 			Write(velocity);
-			WriteUnsignedVarLong(20);
+			WriteUnsignedVarLong(tick);
 
 			AfterEncode();
 		}
@@ -8869,6 +8871,8 @@ protected override void ResetPacket()
 	public partial class McpeLevelEventGeneric : Packet<McpeLevelEventGeneric>
 	{
 
+		public int eventId; // = null;
+		public Nbt eventData; // = null;
 
 		public McpeLevelEventGeneric()
 		{
@@ -8882,6 +8886,8 @@ protected override void EncodePacket()
 
 			BeforeEncode();
 
+			WriteSignedVarInt(eventId);
+			Write(eventData);
 
 			AfterEncode();
 		}
@@ -8895,6 +8901,8 @@ protected override void DecodePacket()
 
 			BeforeDecode();
 
+			eventId = ReadSignedVarInt();
+			eventData = ReadNbt();
 
 			AfterDecode();
 		}
@@ -8906,6 +8914,8 @@ protected override void ResetPacket()
 		{
 			base.ResetPacket();
 
+			eventId = default(int);
+			eventData = default(Nbt);
 		}
 
 	}

src/MiNET/MiNET/Net/MCPE Protocol.cs

@@ -3227,8 +3227,13 @@ public virtual void HandleMcpeBlockPickRequest(McpeBlockPickRequest message)
 			}
 
 			Block block = Level.GetBlock(message.x, message.y, message.z);
-			Log.Debug($"Picked block {block.Name} from blockstate {block.GetRuntimeId()}. Expected block to be in slot {message.selectedSlot}");
-			Item item = block.GetItem();
+			Log.Debug($"Picked block {block.Id}:{block.Metadata} from blockstate {block.GetRuntimeId()}. Expected block to be in slot {message.selectedSlot}");
+			var id = block.Id;
+			if (id > 255)
+			{
+				id = -(id - 255);
+			}
+			Item item = ItemFactory.GetItem((short) id, block.Metadata, 1);
 			if (item is ItemBlock blockItem)
 			{
 				Log.Debug($"Have BlockItem with block state {blockItem.Block.GetRuntimeId()}");

src/MiNET/MiNET/Player.cs

@@ -253,6 +253,25 @@ private bool FirstEmptySlot(Item item, bool update, int si)
 
 		public bool AddItem(Item item, bool update)
 		{
+			for (int si = 0; si < Slots.Count; si++)
+			{
+				Item existingItem = Slots[si];
+
+				if (item.Id == existingItem.Id && item.Metadata == existingItem.Metadata)
+				{
+					int remainingCount = 64 - existingItem.Count;
+
+					if (remainingCount > 0)
+					{
+						int itemsToAdd = Math.Min(remainingCount, item.Count);
+						Slots[si].Count += (byte) itemsToAdd;
+						item.Count -= (byte) itemsToAdd;
+						if (update) SendSetSlot(si);
+						if (item.Count == 0) return true;
+					}
+				}
+			}
+
 			for (int si = 0; si < Slots.Count; si++)
 			{
 				Item existingItem = Slots[si];