From 79f4f3595642ad764f9880e7280fe1811adf280c Mon Sep 17 00:00:00 2001
From: Pd233 <minecraftpd233@163.com>
Date: Thu, 9 May 2024 21:32:40 +0800
Subject: [PATCH] refactor: Native type names

---
 src/AABB.cs                                | 2 +-
 src/BlockPos.cs                            | 2 +-
 src/ChunkBlockPos.cs                       | 4 ++--
 src/ChunkPos.cs                            | 2 +-
 src/Enum/MinecraftPacketIds.cs             | 2 +-
 src/Hosihikari.Minecraft.Foundation.csproj | 4 +++-
 src/Mce/Color.cs                           | 2 +-
 src/Mce/UUID.cs                            | 2 +-
 src/SubChunkPos.cs                         | 2 +-
 src/Vec2.cs                                | 2 +-
 src/Vec3.cs                                | 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/AABB.cs b/src/AABB.cs
index 3ff754b..2f643e6 100644
--- a/src/AABB.cs
+++ b/src/AABB.cs
@@ -3,7 +3,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class AABB")]
 [StructLayout(LayoutKind.Sequential)]
 public unsafe struct AABB
 {
diff --git a/src/BlockPos.cs b/src/BlockPos.cs
index 2339af8..bb71c06 100644
--- a/src/BlockPos.cs
+++ b/src/BlockPos.cs
@@ -4,7 +4,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName ="class BlockPos")]
 [StructLayout(LayoutKind.Sequential)]
 public unsafe struct BlockPos(int x, int y, int z)
 {
diff --git a/src/ChunkBlockPos.cs b/src/ChunkBlockPos.cs
index 28c1b03..c14fa2e 100644
--- a/src/ChunkBlockPos.cs
+++ b/src/ChunkBlockPos.cs
@@ -3,7 +3,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class ChunkLocalHeight")]
 [StructLayout(LayoutKind.Sequential)]
 public struct ChunkLocalHeight(short v)
 {
@@ -21,7 +21,7 @@ public static implicit operator ChunkLocalHeight(short v)
     }
 }
 
-[PredefinedType]
+[PredefinedType(TypeName = "class ChunkBlockPos")]
 [StructLayout(LayoutKind.Sequential)]
 public struct ChunkBlockPos(byte x, short y, byte z)
 {
diff --git a/src/ChunkPos.cs b/src/ChunkPos.cs
index 70ddaaf..9ed3cf7 100644
--- a/src/ChunkPos.cs
+++ b/src/ChunkPos.cs
@@ -3,7 +3,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class ChunkPos")]
 [StructLayout(LayoutKind.Sequential)]
 public struct ChunkPos(int ix, int iz)
 {
diff --git a/src/Enum/MinecraftPacketIds.cs b/src/Enum/MinecraftPacketIds.cs
index 6db7c14..da011de 100644
--- a/src/Enum/MinecraftPacketIds.cs
+++ b/src/Enum/MinecraftPacketIds.cs
@@ -2,7 +2,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "enum class MinecraftPacketIds")]
 public enum MinecraftPacketIds
 {
     KeepAlive = 0x0,
diff --git a/src/Hosihikari.Minecraft.Foundation.csproj b/src/Hosihikari.Minecraft.Foundation.csproj
index ee4baa2..12ec135 100644
--- a/src/Hosihikari.Minecraft.Foundation.csproj
+++ b/src/Hosihikari.Minecraft.Foundation.csproj
@@ -9,7 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Hosihikari.NativeInterop" Version="1.0.8"/>
+      <Reference Include="Hosihikari.NativeInterop">
+        <HintPath>..\..\NativeInterop\src\bin\Release\net8.0\Hosihikari.NativeInterop.dll</HintPath>
+      </Reference>
     </ItemGroup>
 
 </Project>
diff --git a/src/Mce/Color.cs b/src/Mce/Color.cs
index 0bf1226..c1dd652 100644
--- a/src/Mce/Color.cs
+++ b/src/Mce/Color.cs
@@ -4,7 +4,7 @@
 namespace Hosihikari.Minecraft.Mce;
 
 [StructLayout(LayoutKind.Sequential)]
-[PredefinedType(NativeTypeName = "Color", NativeTypeNamespace = "mce")]
+[PredefinedType(TypeName = "class mce::Color")]
 public struct Color(float r, float g, float b, float a)
 {
     public float R = r;
diff --git a/src/Mce/UUID.cs b/src/Mce/UUID.cs
index 43445ec..a328d80 100644
--- a/src/Mce/UUID.cs
+++ b/src/Mce/UUID.cs
@@ -4,7 +4,7 @@
 namespace Hosihikari.Minecraft.Mce;
 
 [StructLayout(LayoutKind.Sequential)]
-[PredefinedType(NativeTypeName = "UUID", NativeTypeNamespace = "mce")]
+[PredefinedType(TypeName = "class mce::UUID")]
 public struct UUID(ulong a, ulong b)
 {
     public ulong A = a;
diff --git a/src/SubChunkPos.cs b/src/SubChunkPos.cs
index 3038250..cb23a2a 100644
--- a/src/SubChunkPos.cs
+++ b/src/SubChunkPos.cs
@@ -3,7 +3,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class SubChunkPos")]
 [StructLayout(LayoutKind.Sequential)]
 public struct SubChunkPos(int x, int y, int z)
 {
diff --git a/src/Vec2.cs b/src/Vec2.cs
index f3cf1f6..10d06af 100644
--- a/src/Vec2.cs
+++ b/src/Vec2.cs
@@ -4,7 +4,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class Vec2")]
 [StructLayout(LayoutKind.Sequential)]
 public struct Vec2(float x, float y)
 {
diff --git a/src/Vec3.cs b/src/Vec3.cs
index fa69157..bf3b87a 100644
--- a/src/Vec3.cs
+++ b/src/Vec3.cs
@@ -4,7 +4,7 @@
 
 namespace Hosihikari.Minecraft;
 
-[PredefinedType]
+[PredefinedType(TypeName = "class Vec3")]
 [StructLayout(LayoutKind.Sequential)]
 public struct Vec3(float x, float y, float z)
 {