fix Linux support (move back to ImageSharp)

to update delete:
System.Drawing.Common.dll
add:
SixLabors.ImageSharp.dll
SixLabors.ImageSharp.Drawing.dll

Author: laz1444

src/MiNET/MiNET.Console/a.bat

@@ -3,7 +3,6 @@
 		"configProperties": {
 			"System.GC.Server": true,
 			"System.GC.Concurrent": true,
-			"System.Drawing.EnableUnixSupport": true
 		}
 	}
 }

src/MiNET/MiNET.Console/runtimeconfig.template.json

@@ -23,22 +23,33 @@
 
 #endregion
 
-using System.Drawing;
-using System.Drawing.Imaging;
 using MiNET.Net;
 using MiNET.Utils;
+using SixLabors.Fonts;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using RectangleF = System.Drawing.RectangleF;
 
 namespace MiNET.Entities.ImageProviders
 {
 	public class TextMapImageProvider : IMapImageProvider
 	{
+		private static FontCollection _fontCollection;
 		private static Font _font = null;
-		
+
 		static TextMapImageProvider()
 		{
-			_font = new Font("Arial", 9);
+			_fontCollection = new FontCollection();
+			_fontCollection.AddSystemFonts();
+
+			if (_fontCollection.TryGet("Arial", out var family))
+			{
+				_font = family.CreateFont(9);
+			}
 		}
-		
+
 		public string Text { get; set; }
 
 		public TextMapImageProvider(string text = "")
@@ -78,39 +89,30 @@ public virtual McpeWrapper GetBatch(MapInfo mapInfo, bool forced)
 
 		private static byte[] DrawText(MapInfo map, string text)
 		{
-			using (var bitmap = new Bitmap(map.Col, map.Row))
-			{
-				using (Graphics graphics = Graphics.FromImage(bitmap))
-				{
-					graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
-					graphics.DrawString(text, _font, Brushes.AntiqueWhite, new PointF(0, 0));
-				}
-
-				Rectangle rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
-				BitmapData bmpData = bitmap.LockBits(rect, ImageLockMode.ReadOnly, bitmap.PixelFormat);
-
-				int bytesPerPixel = Bitmap.GetPixelFormatSize(bitmap.PixelFormat) / 8;
-				int byteCount = bmpData.Stride * bitmap.Height;
-				byte[] bytes = new byte[byteCount];
+			var bitmap = new Image<Rgba32>(map.Col, map.Row);
+			var rectf = new RectangleF(0, 0, map.Col, map.Row);
 
-				System.Runtime.InteropServices.Marshal.Copy(bmpData.Scan0, bytes, 0, byteCount);
+			bitmap.Mutate(
+				x =>
+				{
+					x.DrawText(text, _font, SixLabors.ImageSharp.Color.AntiqueWhite, new PointF(0, 0));
+				});
 
-				bitmap.UnlockBits(bmpData);
+			byte[] bytes = new byte[bitmap.Height * bitmap.Width * 4];
 
-				for (int i = 0; i < bytes.Length; i += bytesPerPixel)
+			int i = 0;
+			for (int y = 0; y < bitmap.Height; y++)
+			{
+				for (int x = 0; x < bitmap.Width; x++)
 				{
-					byte b = bytes[i];
-					byte g = bytes[i + 1];
-					byte r = bytes[i + 2];
-					byte a = bytes[i + 3];
-					bytes[i] = r;
-					bytes[i + 1] = g;
-					bytes[i + 2] = b;
-					bytes[i + 3] = a;
+					var color = bitmap[x, y];
+					bytes[i++] = color.R;
+					bytes[i++] = color.G;
+					bytes[i++] = color.B;
+					bytes[i++] = 0xff;
 				}
-
-				return bytes;
 			}
+			return bytes;
 		}
 	}
 }

src/MiNET/MiNET/Entities/ImageProviders/TextMapImageProvider.cs

@@ -41,7 +41,8 @@
     <PackageReference Include="MiNET.LevelDB" Version="1.0.49" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>

src/MiNET/MiNET/MiNET.csproj

@@ -25,11 +25,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace MiNET.Utils.Skins
 {
@@ -87,7 +87,7 @@ public SkinResourcePatch SkinResourcePatch
 		public string GeometryName { get; set; }
 		public string GeometryData { get; set; }
 		public string GeometryDataVersion { get; set; }
-		
+
 		public string ArmSize { get; set; }
 
 		public string SkinColor { get; set; }
@@ -103,11 +103,12 @@ public SkinResourcePatch SkinResourcePatch
 
 		public static byte[] GetTextureFromFile(string filename)
 		{
-			Bitmap bitmap = new Bitmap(filename);
+			var bitmap = Image.Load<Rgba32>(filename);// new Image<Rgba32>(filename);
 
 			var size = bitmap.Height * bitmap.Width * 4;
 
-			if (size != 0x2000 && size != 0x4000 && size != 0x10000) return null;
+			if (size != 0x2000 && size != 0x4000 && size != 0x10000)
+				return null;
 
 			byte[] bytes = new byte[size];
 
@@ -116,7 +117,7 @@ public static byte[] GetTextureFromFile(string filename)
 			{
 				for (int x = 0; x < bitmap.Width; x++)
 				{
-					var color = bitmap.GetPixel(x, y);
+					var color = bitmap[x, y];
 					bytes[i++] = color.R;
 					bytes[i++] = color.G;
 					bytes[i++] = color.B;
@@ -134,15 +135,7 @@ public static void SaveTextureToFile(string filename, byte[] bytes)
 			int width = size == 0x10000 ? 128 : 64;
 			var height = size == 0x2000 ? 32 : (size == 0x4000 ? 64 : 128);
 
-			var bitmap = new Bitmap(width, height);
-
-			BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, bitmap.PixelFormat);
-
-			int bytesPerPixel = Bitmap.GetPixelFormatSize(bitmap.PixelFormat) / 8;
-			int byteCount = bmpData.Stride * bitmap.Height;
-			byte[] rgbValues = new byte[byteCount];
-
-			System.Runtime.InteropServices.Marshal.Copy(bmpData.Scan0, rgbValues, 0, byteCount);
+			var bitmap = new Image<Rgba32>(width, height);
 
 			int i = 0;
 			for (int y = 0; y < bitmap.Height; y++)
@@ -154,19 +147,10 @@ public static void SaveTextureToFile(string filename, byte[] bytes)
 					byte b = bytes[i++];
 					byte a = bytes[i++];
 
-					int index = y * bmpData.Stride + x * bytesPerPixel;
-
-					rgbValues[index] = r;
-					rgbValues[index + 1] = g;
-					rgbValues[index + 2] = b;
-					if (bytesPerPixel == 4) { rgbValues[index + 3] = a; }
+					bitmap[x, y] = new Rgba32(r, g, b, a);
 				}
 			}
 
-			System.Runtime.InteropServices.Marshal.Copy(rgbValues, 0, bmpData.Scan0, byteCount);
-
-			bitmap.UnlockBits(bmpData);
-
 			bitmap.Save(filename);
 		}
 
@@ -190,7 +174,7 @@ public static string ToJson(GeometryModel geometryModel)
 			settings.MissingMemberHandling = MissingMemberHandling.Error;
 			//settings.Formatting = Formatting.Indented;
 			settings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-			settings.Converters.Add(new StringEnumConverter {NamingStrategy = new CamelCaseNamingStrategy()});
+			settings.Converters.Add(new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy() });
 
 			return JsonConvert.SerializeObject(geometryModel, settings);
 		}