Merge pull request #21 from CobwebSMP/resource-packs

Resource packs

Author: laz1444

.gitignore

@@ -193,6 +193,7 @@ FakesAssemblies/
 src/MiNET/MiNET.Console/dist
 src/MiNET/MiNET.Console/Worlds
 src/MiNET/MiNET.Console/Plugins
+src/MiNET/MiNET.Console/ResourcePacks
 src/MiNET/MiNET.Console/start.bat
 src/MiNET/MiNET.Console/server.conf
 

src/MiNET/MiNET.Console/server.conf

@@ -83,6 +83,9 @@ Save.Enabled=true
 #Enable Redstone functions? true - yes. false - no.
 RedstoneEnabled=true
 
+#Force accepte resource packs to join the server. true - yes. false - no.
+ForceResourcePacks=false
+
 # ======================================= ADVANCED =======================================
 # Change this only on purpose. Don't touch if you are not sure.
 
@@ -110,6 +113,9 @@ WorldDirectory=Worlds
 #Where is plugins located?
 PluginDirectory=Plugins
 
+#Where is resource packs located?
+ResourceDirectory=ResourcePacks
+
 
 # ======================================= END =======================================
 # There is nothing. Just stuff for development

src/MiNET/MiNET/Player.cs

@@ -32,7 +32,9 @@
 using System.Linq;
 using System.Net;
 using System.Numerics;
+using System.Reflection;
 using System.Threading;
+using System.Security.Cryptography;
 using fNbt;
 using log4net;
 using MiNET.Blocks;
@@ -52,6 +54,7 @@
 using MiNET.Utils.Vectors;
 using MiNET.Worlds;
 using Newtonsoft.Json;
+using System.IO.Compression;
 
 namespace MiNET
 {
@@ -106,6 +109,8 @@ public class Player : Entity, IMcpeMessageHandler
 
 		public DamageCalculator DamageCalculator { get; set; } = new DamageCalculator();
 
+		public TexturePackInfos PlayerPackData { get; set; }
+		public Dictionary<string, string> PlayerPackMap = new Dictionary<string, string>();
 
 		public Player(MiNetServer server, IPEndPoint endPoint) : base(EntityType.None, null)
 		{
@@ -171,15 +176,25 @@ public virtual void HandleMcpeResourcePackChunkRequest(McpeResourcePackChunkRequ
 			string result = JsonConvert.SerializeObject(message, jsonSerializerSettings);
 			Log.Debug($"{message.GetType().Name}\n{result}");
 
-			var content = File.ReadAllBytes(@"D:\Temp\ResourcePackChunkData_8f760cf7-2ca4-44ab-ab60-9be2469b9777.zip");
+			var content = File.ReadAllBytes(PlayerPackMap[message.packageId]);
+
 			McpeResourcePackChunkData chunkData = McpeResourcePackChunkData.CreateObject();
-			chunkData.packageId = "5abdb963-4f3f-4d97-8482-88e2049ab149";
-			chunkData.chunkIndex = 0; // Package index ?
-			chunkData.progress = 0; // Long, maybe timestamp?
-			chunkData.payload = content;
+			chunkData.packageId = message.packageId;
+			chunkData.chunkIndex = message.chunkIndex;
+			chunkData.progress = 16384 * message.chunkIndex;
+			chunkData.payload = GetChunk(content, (int)chunkData.chunkIndex, 16384);
 			SendPacket(chunkData);
 		}
 
+		public static byte[] GetChunk(byte[] content, int chunkIndex, int chunkSize)
+		{
+			int start = chunkIndex * chunkSize;
+			int length = Math.Min(chunkSize, content.Length - start);
+			byte[] chunk = new byte[length];
+			Array.Copy(content, start, chunk, 0, length);
+			return chunk;
+		}
+
 		public virtual void HandleMcpePurchaseReceipt(McpePurchaseReceipt message)
 		{
 		}
@@ -297,21 +312,32 @@ public virtual void HandleMcpeSetLocalPlayerAsInitialized(McpeSetLocalPlayerAsIn
 			OnLocalPlayerIsInitialized(new PlayerEventArgs(this));
 		}
 
-		private bool _serverHaveResources = false;
+		private bool _serverHaveResources = true;
 
 		public virtual void HandleMcpeResourcePackClientResponse(McpeResourcePackClientResponse message)
 		{
 			if (Log.IsDebugEnabled) Log.Debug($"Handled packet 0x{message.Id:X2}\n{Packet.HexDump(message.Bytes)}");
 
 			if (message.responseStatus == 2)
 			{
-				McpeResourcePackDataInfo dataInfo = McpeResourcePackDataInfo.CreateObject();
-				dataInfo.packageId = "5abdb963-4f3f-4d97-8482-88e2049ab149";
-				dataInfo.maxChunkSize = 1048576;
-				dataInfo.chunkCount = 1;
-				dataInfo.compressedPackageSize = 359901; // Lenght of data
-				dataInfo.hash = new byte[] {57, 38, 13, 50, 39, 63, 88, 63, 59, 27, 63, 63, 63, 63, 6, 63, 54, 7, 84, 63, 47, 91, 63, 120, 63, 120, 42, 5, 104, 2, 63, 18};
-				SendPacket(dataInfo);
+				foreach (string packid in message.resourcepackids)
+				{
+					var uuid = packid.Substring(0, Math.Min(packid.Length, 36));
+					var content = File.ReadAllBytes(PlayerPackMap[uuid]);
+
+					SHA256 sha256 = SHA256.Create();
+					byte[] packHash = sha256.ComputeHash(content);
+
+					McpeResourcePackDataInfo dataInfo = McpeResourcePackDataInfo.CreateObject();
+					dataInfo.packageId = uuid;
+					dataInfo.maxChunkSize = 16384;
+					dataInfo.chunkCount = (uint) Math.Ceiling((double) content.Count() / 16384);
+					dataInfo.compressedPackageSize = (ulong) content.Count();
+					dataInfo.hash = packHash;
+					dataInfo.isPremium = false;
+					dataInfo.packType = 6;
+					SendPacket(dataInfo);
+				}
 				return;
 			}
 			else if (message.responseStatus == 3)
@@ -332,6 +358,8 @@ public virtual void HandleMcpeResourcePackClientResponse(McpeResourcePackClientR
 				{
 					MiNetServer.FastThreadPool.QueueUserWorkItem(() => { Start(null); });
 				}
+				PlayerPackData.Clear();
+				PlayerPackMap.Clear();
 				return;
 			}
 		}
@@ -341,18 +369,45 @@ public virtual void SendResourcePacksInfo()
 			McpeResourcePacksInfo packInfo = McpeResourcePacksInfo.CreateObject();
 			if (_serverHaveResources)
 			{
-				packInfo.mustAccept = false;
-				packInfo.behahaviorpackinfos = new ResourcePackInfos
+				var packInfos = new TexturePackInfos();
+				var directory = Config.GetProperty("ResourceDirectory", Path.GetDirectoryName(new Uri(Assembly.GetEntryAssembly().Location).LocalPath));
+				packInfo.mustAccept = Config.GetProperty("ForceResourcePacks", false);
+
+				foreach (var zipPack in Directory.GetFiles(directory, "*.zip"))
 				{
-					new ResourcePackInfo()
+					var archive = ZipFile.OpenRead(zipPack);
+					var packDir = archive.Entries[0].FullName.Substring(0, archive.Entries[0].FullName.IndexOf('/'));
+
+					if (packDir == null)
 					{
-						UUID = "5abdb963-4f3f-4d97-8482-88e2049ab149",
-						Version = "0.0.1",
-						Size = 359901
-					},
-				};
-			}
+						Log.Error($"Invalid resource pack {zipPack}. Wrong folder structure");
+						continue;
+					}
+
+					var entry = archive.GetEntry($"{packDir}/manifest.json");
 
+					if (entry == null)
+					{
+						Log.Error($"Invalid resource pack {packDir}. Unable to locate manifest.json");
+						continue;
+					}
+
+					using (var stream = entry.Open())
+					using (var reader = new StreamReader(stream))
+					{
+						string jsonContent = reader.ReadToEnd();
+						manifestStructure obj = JsonConvert.DeserializeObject<manifestStructure>(jsonContent);
+						packInfos.Add(new TexturePackInfo { 
+							UUID = obj.Header.Uuid, 
+							Version = $"{obj.Header.Version[0]}.{obj.Header.Version[1]}.{obj.Header.Version[2]}", 
+							Size = (ulong) File.ReadAllBytes(zipPack).Count(),
+						});
+						PlayerPackMap.Add(obj.Header.Uuid, zipPack);
+					}
+				}
+				PlayerPackData = packInfos;
+				packInfo.texturepacks = packInfos;
+			}
 			SendPacket(packInfo);
 		}
 
@@ -363,15 +418,13 @@ public virtual void SendResourcePackStack()
 
 			if (_serverHaveResources)
 			{
-				packStack.mustAccept = false;
-				packStack.resourcepackidversions = new ResourcePackIdVersions
+				packStack.mustAccept = Config.GetProperty("ForceResourcePacks", false);
+				var packVersions = new ResourcePackIdVersions();
+				foreach (var packData in PlayerPackData)
 				{
-					new PackIdVersion()
-					{
-						Id = "5abdb963-4f3f-4d97-8482-88e2049ab149",
-						Version = "0.0.1"
-					},
-				};
+					packVersions.Add(new PackIdVersion { Id = packData.UUID, Version = packData.Version });
+				}
+				packStack.resourcepackidversions = packVersions;
 			}
 
 			SendPacket(packStack);

src/MiNET/MiNET/Utils/ResourcePacks.cs

@@ -108,4 +108,27 @@ public enum ResourcePackType : byte
 		Skins = 7,
 		WorldTemplate = 8
 	}
+
+	public class Header
+	{
+		public string Description { get; set; }
+		public string Name { get; set; }
+		public string Uuid { get; set; }
+		public List<int> Version { get; set; }
+		public List<int> MinEngineVersion { get; set; }
+	}
+
+	public class Module
+	{
+		public string Type { get; set; }
+		public string Uuid { get; set; }
+		public List<int> Version { get; set; }
+	}
+
+	public class manifestStructure
+	{
+		public int FormatVersion { get; set; }
+		public Header Header { get; set; }
+		public List<Module> Modules { get; set; }
+	}
 }

src/MiNET/MiNET/Worlds/LevelDbProvider.cs

@@ -78,6 +78,7 @@ public void Initialize()
 		{
 			BasePath ??= Config.GetProperty("WorldDirectory", "Worlds").Trim();
 			var pluginDir = Config.GetProperty("PluginDirectory", "Plugins").Trim();
+			var resourceDir = Config.GetProperty("ResourceDirectory", "ResourcePacks").Trim();
 
 			var directory = new DirectoryInfo(Path.Combine(BasePath, "db"));
 
@@ -109,6 +110,10 @@ public void Initialize()
 				{
 					Directory.CreateDirectory(pluginDir);
 				}
+				if (!Directory.Exists(resourceDir))
+				{
+					Directory.CreateDirectory(resourceDir);
+				}
 				SaveLevelInfo(LevelInfo);
 			}