update to .NET 8

Author: laz1444

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       working-directory: src/MiNET/MiNET.Console
       run: dotnet restore
@@ -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.10 (1.20.80)
+        release_name: MiNET-CobwebSMP 1.13.0.11 (1.20.80)
         body: ${{ github.event.head_commit.message }}

src/MiNET/MiNET.Client/MiNET.Client.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <StartupObject></StartupObject>

src/MiNET/MiNET.Console/MiNET.Console.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>full</DebugType>

src/MiNET/MiNET/MiNET.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>MiNET-CobwebSMP</PackageId>
-    <Version>1.13.0.10</Version>
+    <Version>1.13.0.11</Version>
     <Authors>gurun</Authors>
     <Company>Niclas Olofsson</Company>
     <Description>MiNET - a Minecraft PocketEdition Server</Description>
@@ -17,7 +17,7 @@
     <LangVersion>latest</LangVersion>
     <NoWarn>1701;1702;1701;CA1416</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>

src/MiNET/MiNET/Net/Items/ItemTranslator.cs

@@ -214,13 +214,13 @@ public bool TryGetName(string input, out string output)
 		}
 	}
 
-	public class metaToName<metaId, name> :
-		Dictionary<metaId, name>
+	public class metaToName<metaId, metaName> :
+		Dictionary<metaId, metaName>
 	{
 	}
 
-	public class metaToName<map, meta, name> :
-		Dictionary<map, metaToName<meta, name>>
+	public class metaToName<metaMap, metaId, metaName> :
+		Dictionary<metaMap, metaToName<metaId, metaName>>
 	{
 	}
 

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

@@ -30,14 +30,11 @@
 using System;
 using System.Net;
 using System.Numerics;
-using System.Threading;
 using MiNET.Utils; 
 using MiNET.Utils.Skins;
 using MiNET.Items;
 using MiNET.Crafting;
 using MiNET.Net.RakNet;
-using little = MiNET.Utils.Int24; // friendly name
-using LongString = System.String;
 using MiNET.Utils.Metadata;
 using MiNET.Utils.Vectors;
 using MiNET.Utils.Nbt;

src/MiNET/MiNET/Net/Packet.cs

@@ -3412,7 +3412,7 @@ public pixelList ReadPixelList()
 			var listSize = ReadInt();
 			for (int i = 0; i < listSize; i++)
 			{
-				mapData.mapData.Add(new pixels { pixel = ReadUnsignedVarInt(), index = ReadShort()});
+				mapData.mapData.Add(new pixelsData { pixel = ReadUnsignedVarInt(), index = ReadShort()});
 			}
 			return mapData;
 		}

src/MiNET/MiNET/Plugins/Commands/VanillaCommands.cs

@@ -708,17 +708,17 @@ public string Weather(Player commander, WeatherManager.weatherTypes weather)
 
 		[Command(Name = "fog", Description = "Change level fog settings")]
 		[Authorize(Permission = 4)]
-		public void fog(Player commander, mode action, string fogID)
+		public void fog(Player commander, fogMode action, string fogID)
 		{
-			if (action == mode.push)
+			if (action == fogMode.push)
 			{
 				McpePlayerFog msg = McpePlayerFog.CreateObject();
 				msg.fogstack = new fogStack(fogID);
 				commander.Level.RelayBroadcast(msg);
 				commander.Level.fog = fogID;
 				commander.SendMessage("Fog setting was added successfully");
 			}
-			else if(action == mode.remove)
+			else if(action == fogMode.remove)
 			{
 				McpePlayerFog msg = McpePlayerFog.CreateObject();
 				msg.fogstack = new fogStack("minecraft:fog_default");
@@ -728,7 +728,7 @@ public void fog(Player commander, mode action, string fogID)
 			}
 		}
 
-		public enum mode
+		public enum fogMode
 		{
 			remove, push
 		}

src/MiNET/MiNET/Utils/Cryptography/CryptoUtils.cs

@@ -75,7 +75,7 @@ public static byte[] ToDerEncoded([NotNull] this ECDiffieHellmanPublicKey key)
 		{
 			byte[] asn = new byte[24] {0x30, 0x76, 0x30, 0x10, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x5, 0x2b, 0x81, 0x4, 0x0, 0x22, 0x3, 0x62, 0x0, 0x4};
 
-			return asn.Concat(key.ToByteArray().Skip(8)).ToArray();
+			return asn.Concat(key.ExportSubjectPublicKeyInfo().Skip(8)).ToArray();
 		}
 
 		//public static ECDiffieHellmanPublicKey FromDerEncoded(byte[] keyBytes)

src/MiNET/MiNET/Utils/pixelList.cs

@@ -4,9 +4,9 @@ namespace MiNET.Utils
 {
 	public class pixelList
 	{
-		public List<pixels> mapData = new List<pixels>();
+		public List<pixelsData> mapData = new List<pixelsData>();
 	}
-	public class pixels
+	public class pixelsData
 	{
 		public uint pixel;
 		public short index;