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.11 (1.20.80)
+        release_name: MiNET-CobwebSMP 1.13.0.12 (1.21.0)
         body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/BedrockTraceHandler.cs

@@ -64,8 +64,29 @@ public override void HandleMcpeUpdateSoftEnum(McpeUpdateSoftEnum message)
 
 		public override void HandleMcpeDisconnect(McpeDisconnect message)
 		{
-			Log.InfoFormat("Disconnect {1}: {0}", message.message, Client.Username);
-
+			Log.Warn("[Disconnect Screen] ");
+			switch (message.message.ToString())
+			{
+				case "disconnectionScreen.notAuthenticated":
+					Log.Warn("You need to authenticate to Xbox Live services to join this server.");
+					break;
+				case "disconnectionScreen.invalidSkin":
+					Log.Warn("Invalid skin.");
+					break;
+				case "disconnectionScreen.serverFull":
+				case "disconnectionScreen.serverFull.title":
+					Log.Warn("Server is full.");
+					break;
+				case "disconnectionScreen.resourcePack":
+					Log.Warn("Resource pack error.");
+					break;
+				case "disconnectionScreen.badPacket":
+					Log.Warn("Client sent invalid packet.");
+					break;
+				default:
+					Log.Warn($"Server requested disconnect with message {message.message.ToString()}");
+					break;
+			}
 			base.HandleMcpeDisconnect(message);
 		}
 
@@ -184,6 +205,12 @@ public override void HandleMcpeInventoryContent(McpeInventoryContent message)
 
 		public override void HandleMcpeCreativeContent(McpeCreativeContent message)
 		{
+			Log.Warn($"[McpeCreativeContent] Received {message.input.Count} creative items");
+			foreach (var item in message.input)
+			{
+				//Log.Warn($"Got item: {item.Name} ({item.Id} : {item.Metadata})");
+			}
+			Log.Warn($"[McpeCreativeContent] Done reading {message.input.Count} creative items\n");
 		}
 
 		public override void HandleMcpeAddItemEntity(McpeAddItemEntity message)
@@ -208,19 +235,6 @@ public override void HandleMcpeStartGame(McpeStartGame message)
 			Client.SpawnPoint = message.spawn;
 			Client.CurrentLocation = new PlayerLocation(Client.SpawnPoint, message.rotation.X, message.rotation.X, message.rotation.Y);
 
-			Log.Warn($"Got position from startgame packet: {Client.CurrentLocation}");
-
-			var settings = new JsonSerializerSettings
-			{
-				PreserveReferencesHandling = PreserveReferencesHandling.Arrays,
-				TypeNameHandling = TypeNameHandling.Auto,
-				Formatting = Formatting.Indented,
-				DefaultValueHandling = DefaultValueHandling.Include
-			};
-
-			var fileNameItemstates = "newResources/itemstates.json";
-			File.WriteAllText(fileNameItemstates, JsonConvert.SerializeObject(message.itemstates, settings));
-
 			LogGamerules(message.levelSettings.gamerules);
 
 			Client.LevelInfo.LevelName = "Default";
@@ -591,9 +605,11 @@ public override void HandleMcpeLevelChunk(McpeLevelChunk message)
 				Client.Chunks.GetOrAdd(new ChunkCoordinates(message.chunkX, message.chunkZ), coordinates =>
 				{
 					Log.Debug($"Chunk X={message.chunkX}, Z={message.chunkZ}, size={message.chunkData.Length}, Count={Client.Chunks.Count}");
-
-					ChunkColumn chunk = null;
-					try
+					if (BlockstateGenerator.running == false){ Console.WriteLine($"[McpeLevelChunk] Got chunk | X: {message.chunkX,-4} | Z: {message.chunkZ,-4} |"); ; }
+						//broken, chunkData have weird values. Expected header something like: 09 01 02 08
+						//Log.Debug($"{Packet.HexDump(message.Bytes)}");
+						ChunkColumn chunk = null;
+					/*try
 					{
 						chunk = ClientUtils.DecodeChunkColumn((int) message.subChunkCount, message.chunkData);
 						if (chunk != null)
@@ -611,7 +627,7 @@ public override void HandleMcpeLevelChunk(McpeLevelChunk message)
 					catch (Exception e)
 					{
 						Log.Error("Reading chunk", e);
-					}
+					}*/
 
 					return chunk;
 				});
@@ -649,19 +665,12 @@ private static void LogGamerules(GameRules rules)
 
 		public override void HandleMcpeAvailableCommands(McpeAvailableCommands message)
 		{
-			//{
-			//	dynamic json = JObject.Parse(message.commands);
-
-			//	//if (Log.IsDebugEnabled) Log.Debug($"Command JSON:\n{json}");
-			//	string fileName = Path.GetTempPath() + "AvailableCommands_" + Guid.NewGuid() + ".json";
-			//	Log.Info($"Writing commands to filename: {fileName}");
-			//	File.WriteAllText(fileName, message.commands);
-			//}
-			//{
-			//	dynamic json = JObject.Parse(message.unknown);
-
-			//	//if (Log.IsDebugEnabled) Log.Debug($"Command (unknown) JSON:\n{json}");
-			//}
+			Log.Warn($"[McpeAvailableCommands] Received {message.CommandList.Count} commnands");
+			foreach (var command in message.CommandList)
+			{
+				//Log.Warn($"Got command: {command.Name} - {command.Versions[0].Description}");
+			}
+			Log.Warn($"[McpeAvailableCommands] Done reading {message.CommandList.Count} commnands\n");
 		}
 
 		public override void HandleMcpeResourcePackChunkData(McpeResourcePackChunkData message)

src/MiNET/MiNET.Client/BlockstateGenerator.cs

@@ -15,6 +15,7 @@ public class BlockstateGenerator
 		public static List<Schema> Schemas = new List<Schema>();
 		public static Dictionary<int, Schema> blockPosition = new Dictionary<int, Schema>();
 		public static bool customMode = false;
+		public static bool running = false;
 		public static int customId = 0;
 		public static int customData = 0;
 
@@ -48,6 +49,8 @@ public static void preInit()
 		public static void init()
 		{
 			BlockPalette = new BlockPalette();
+			running = true;
+			Log.Warn("[McpeLevelChunk] Chunk reading disabled by BlockstateGenerator\n");
 		}
 
 		public static void createContainer(string name, uint blockRuntime, int id, int data, List<schemaStates> states)
@@ -88,6 +91,8 @@ public static void write()
 			{
 				Log.Warn($"Completed successfully. All blockstates exported to 'newResources/blockstates.json'");
 			}
+			running = false;
+			Log.Warn("[McpeLevelChunk] Chunk reading enabled by BlockstateGenerator\n");
 		}
 
 		private static List<IBlockState> createState(string name, string value, string type)

src/MiNET/MiNET.Client/ClientUtils.cs

@@ -82,8 +82,8 @@ public static ChunkColumn DecodeChunkColumn(int subChunkCount, byte[] buffer, Bl
 							int blocksPerWord = (int) Math.Floor(32f / bitsPerBlock);
 							int wordsPerChunk = (int) Math.Ceiling(4096f / blocksPerWord);
 							uint wordsPer = (uint) Math.Ceiling(4096f / blocksPerWord);
-							if (Log.IsTraceEnabled())
-								Log.Trace($"New section {chunkIndex}, " +
+
+							Log.Debug($"New section {chunkIndex}, " +
 										$"version={version}, " +
 										$"storageSize={storageSize}, " +
 										$"storageIndex={storageIndex}, " +
@@ -103,6 +103,7 @@ public static ChunkColumn DecodeChunkColumn(int subChunkCount, byte[] buffer, Bl
 									return null;
 
 								words[i] = (uint) ((byte) stream.ReadByte()) | (uint) ((byte) stream.ReadByte()) << 8 | (uint) ((byte) stream.ReadByte()) << 16 | (uint) ((byte) stream.ReadByte()) << 24;
+								Log.Debug($"bitsPerBlock {words[i]}");
 							}
 
 							var paletteCount = 1;
@@ -194,12 +195,12 @@ public static ChunkColumn DecodeChunkColumn(int subChunkCount, byte[] buffer, Bl
 					int borderBlock = (byte)VarInt.ReadSInt32(stream);
 					if (borderBlock != 0)
 					{
-						Log.Warn($"??? Got borderblock with value {borderBlock}.");
+						//Log.Warn($"??? Got borderblock with value {borderBlock}.");
 
 						int len = (int) (stream.Length - stream.Position);
 						var bytes = new byte[len];
 						stream.Read(bytes, 0, len);
-						Log.Warn($"Data to read for border blocks\n{Packet.HexDump(new ReadOnlyMemory<byte>(bytes))}");
+						//Log.Warn($"Data to read for border blocks\n{Packet.HexDump(new ReadOnlyMemory<byte>(bytes))}");
 
 						//byte[] buf = new byte[borderBlock];
 						//int len = stream.Read(buf, 0, borderBlock);

src/MiNET/MiNET.Client/ICommandExecutioner.cs

@@ -108,7 +108,7 @@ async void ExecuteBlockstates(BedrockTraceHandler caller)
 			SendCommand(client, $"/setblock 0 50 0 cobblestone"); //hack to place air
 			await Task.Delay(4000); //delay just to read this /|\
 			SetGameRules(caller);
-			SendCommand(client, $"/tp TheGrey 0 52 0");
+			SendCommand(client, $"/tp TheGrey 0 352 0");
 			await Task.Delay(500);
 
 			var x = 0;
@@ -138,7 +138,7 @@ async void ExecuteBlockstates(BedrockTraceHandler caller)
 					SendCommand(client, $"/setblock {posX} 50 {posZ} {block.Command}");
 					SendCommand(client, $"/setblock {posX} 50 {posZ} {block.Command}");  //TODO find out why sometimes at random time and random block are not placed
 					SendCommand(client, $"/setblock {posX} 50 {posZ} {block.Command}");
-					SendCommand(client, $"/tp TheGrey {x} 52 0");
+					SendCommand(client, $"/tp TheGrey {x} 352 0");
 					if (!BlockstateGenerator.blockPosition.ContainsKey(x)) { BlockstateGenerator.blockPosition.Add(x, block); }
 					x += 2;
 					tp++;
@@ -172,7 +172,6 @@ public void HandleMcpeUpdateBlock(BedrockTraceHandler caller, McpeUpdateBlock me
 				BlockstateGenerator.blockPosition.Remove(message.coordinates.X);
 				if (state.Name == "minecraft:barrier")
 				{
-
 					BlockstateGenerator.write();
 				}
 				if (state.Id == BlockstateGenerator.customId && state.Data == BlockstateGenerator.customData && BlockstateGenerator.customMode)
@@ -186,7 +185,7 @@ public void HandleMcpeUpdateSubChunkBlocksPacket(BedrockTraceHandler caller, Mcp
 		{
 			foreach (var block in message.layerZeroUpdates)
 			{
-				//Log.Error($"layer2 {block.BlockRuntimeId} {block.Coordinates.X} {block.Coordinates.Y} {block.Coordinates.Z}");
+				//Log.Error($"layer0 {block.BlockRuntimeId} {block.Coordinates.X} {block.Coordinates.Y} {block.Coordinates.Z}");
 				if (BlockstateGenerator.blockPosition.TryGetValue(block.Coordinates.X, out var state) && block.Coordinates.Y == 50 && block.Coordinates.Z == 0 && !BlockstateGenerator.BlockPalette.ContainsKey((int)block.BlockRuntimeId))
 				{
 					Log.Warn($"Got runtimeID for {state.Name} (id: {state.Id} data: {state.Data})");

src/MiNET/MiNET.Client/McpeClientMessageHandlerBase.cs

@@ -238,10 +238,6 @@ public virtual void HandleMcpeAddPainting(McpeAddPainting message)
 		{
 		}
 
-		public virtual void HandleMcpeTickSync(McpeTickSync message)
-		{
-		}
-
 		public virtual void HandleMcpeLevelSoundEventOld(McpeLevelSoundEventOld message)
 		{
 		}
@@ -738,7 +734,7 @@ public void HandleMcpeDimensionData(McpeDimensionData message)
 		/// <inheritdoc />
 		public void HandleMcpeUpdateAbilities(McpeUpdateAbilities message)
 		{
-			
+			Client.permissionLevel = (PermissionLevel) message.playerPermissions;
 		}
 
 		/// <inheritdoc />

src/MiNET/MiNET.Client/MiNetClient.cs

@@ -235,6 +235,8 @@ public void InitiateEncryption(byte[] serverKey, byte[] randomKeyToken)
 
 		public CommandPermission UserPermission { get; set; }
 
+		public PermissionLevel permissionLevel { get; set; }
+
 		public AutoResetEvent PlayerStatusChangedWaitHandle = new AutoResetEvent(false);
 
 		public bool HasSpawned { get; set; }

src/MiNET/MiNET.Client/README.md

@@ -8,8 +8,6 @@ Client used for debugging, tests and resource generation.
  1. Download official [Minecraft Bedrock Edition server software](https://www.minecraft.net/en-us/download/server/bedrock)
  2. Open `server.properties` and set `online-mode=false`
  3. Run official Minecraft Bedrock Edition server software and MiNET client.
- 4. When MiNET client say `... spawned` in official Minecraft Bedrock Edition server software console type `op thegrey` and `say blockstates`
-
-For better results it is recommended to load flat world file to official Minecraft Bedrock Edition server.
+ 4. When MiNET client say `... spawned`, in MiNET client console type `/blockstates`
 
 After couple of minutes you should see `Completed successfully. All blockstates exported to 'newResources/blockstates.json`