Add Unity project and enable netstandard2.1 support

AngeloTadeucci · AngeloTadeucci · commit ce945878350d · 2025-12-17T02:52:58.000-03:00
Introduces Maple2.File.Unity project targeting netstandard2.1 with global usings and references to IO and Flat projects. Updates Maple2.File.IO and Maple2.File.Flat to support both net8.0 and netstandard2.1, adds compatibility shims for missing APIs, and updates code to use these shims conditionally. Also refactors array initializations for compatibility.
diff --git a/Maple2.File.Flat/Maple2.File.Flat.csproj b/Maple2.File.Flat/Maple2.File.Flat.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
         <LangVersion>12</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/Maple2.File.IO/IsExternalInit.cs b/Maple2.File.IO/IsExternalInit.cs
@@ -0,0 +1,6 @@
+// ReSharper disable once CheckNamespace
+namespace System.Runtime.CompilerServices;
+
+#if NETSTANDARD2_1
+internal static class IsExternalInit { }
+#endif
diff --git a/Maple2.File.IO/Maple2.File.IO.csproj b/Maple2.File.IO/Maple2.File.IO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
         <LangVersion>12</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Maple2.File.IO/NetStandardExtensions.cs b/Maple2.File.IO/NetStandardExtensions.cs
@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Numerics;
+
+namespace Maple2.File.IO;
+
+#if NETSTANDARD2_1
+public static class NetStandardExtensions {
+    // EnsureCapacity for netstandard2.1 (added in .NET 5)
+    public static void EnsureCapacityCompat<T>(this List<T> list, int capacity) {
+        if (list.Capacity < capacity) {
+            list.Capacity = capacity;
+        }
+    }
+
+    // Matrix4x4 indexer for netstandard2.1
+    public static float GetElement(this Matrix4x4 matrix, int row, int column) {
+        return column switch {
+            0 => row switch {
+                0 => matrix.M11,
+                1 => matrix.M21,
+                2 => matrix.M31,
+                3 => matrix.M41,
+                _ => 0f
+            },
+            1 => row switch {
+                0 => matrix.M12,
+                1 => matrix.M22,
+                2 => matrix.M32,
+                3 => matrix.M42,
+                _ => 0f
+            },
+            2 => row switch {
+                0 => matrix.M13,
+                1 => matrix.M23,
+                2 => matrix.M33,
+                3 => matrix.M43,
+                _ => 0f
+            },
+            3 => row switch {
+                0 => matrix.M14,
+                1 => matrix.M24,
+                2 => matrix.M34,
+                3 => matrix.M44,
+                _ => 0f
+            },
+            _ => 0f
+        };
+    }
+
+    public static Matrix4x4 SetMatrixElement(Matrix4x4 matrix, int row, int column, float value) {
+        if (column == 0 && row == 0) matrix.M11 = value;
+        else if (column == 0 && row == 1) matrix.M21 = value;
+        else if (column == 0 && row == 2) matrix.M31 = value;
+        else if (column == 0 && row == 3) matrix.M41 = value;
+        else if (column == 1 && row == 0) matrix.M12 = value;
+        else if (column == 1 && row == 1) matrix.M22 = value;
+        else if (column == 1 && row == 2) matrix.M32 = value;
+        else if (column == 1 && row == 3) matrix.M42 = value;
+        else if (column == 2 && row == 0) matrix.M13 = value;
+        else if (column == 2 && row == 1) matrix.M23 = value;
+        else if (column == 2 && row == 2) matrix.M33 = value;
+        else if (column == 2 && row == 3) matrix.M43 = value;
+        else if (column == 3 && row == 0) matrix.M14 = value;
+        else if (column == 3 && row == 1) matrix.M24 = value;
+        else if (column == 3 && row == 2) matrix.M34 = value;
+        else if (column == 3 && row == 3) matrix.M44 = value;
+        return matrix;
+    }
+}
+#endif
diff --git a/Maple2.File.IO/Nif/Endian.cs b/Maple2.File.IO/Nif/Endian.cs
@@ -65,7 +65,12 @@ public Matrix4x4 ReadAdjustedMatrix4x3() {
 
         for (int column = 0; column < 3; ++column) {
             for (int row = 0; row < 3; ++row) {
+#if NETSTANDARD2_1
+                float value = ReadAdjustedFloat32();
+                matrix = NetStandardExtensions.SetMatrixElement(matrix, row, column, value);
+#else
                 matrix[row, column] = ReadAdjustedFloat32();
+#endif
             }
         }
 
diff --git a/Maple2.File.IO/Nif/NiPhysXActorDesc.cs b/Maple2.File.IO/Nif/NiPhysXActorDesc.cs
@@ -32,7 +32,11 @@ public override void Parse(NifDocument document) {
         int numPoses = document.Reader.ReadAdjustedInt32();
 
         Poses = new List<Matrix4x4>();
+#if NETSTANDARD2_1
+        Poses.EnsureCapacityCompat(numPoses);
+#else
         Poses.EnsureCapacity(numPoses);
+#endif
 
         for (int i = 0; i < numPoses; ++i) {
             Poses.Add(document.Reader.ReadAdjustedMatrix4x3());
diff --git a/Maple2.File.IO/Nif/NiPhysXPropDesc.cs b/Maple2.File.IO/Nif/NiPhysXPropDesc.cs
@@ -40,14 +40,22 @@ public override void Parse(NifDocument document) {
 
         uint numStates = document.Reader.ReadAdjustedUInt32();
 
+#if NETSTANDARD2_1
+        StateNames.EnsureCapacityCompat((int) numStates);
+#else
         StateNames.EnsureCapacity((int) numStates);
+#endif
 
         for (uint i = 0; i < numStates; i++) {
             State state = new State();
 
             int numStrings = document.Reader.ReadAdjustedInt32();
 
+#if NETSTANDARD2_1
+            state.EnsureCapacityCompat((int) numStrings);
+#else
             state.EnsureCapacity((int) numStrings);
+#endif
 
             for (int j = 0; j < numStrings; j++) {
                 string key = document.ReadString();
diff --git a/Maple2.File.IO/Nif/NifDocument.cs b/Maple2.File.IO/Nif/NifDocument.cs
@@ -83,7 +83,11 @@ public List<T> ReadBlockRefList<T>() {
 
         int count = Reader.ReadAdjustedInt32();
 
+#if NETSTANDARD2_1
+        blocks.EnsureCapacityCompat(count);
+#else
         blocks.EnsureCapacity(count);
+#endif
 
         for (int i = 0; i < count; ++i) {
             T? block = ReadBlockRef<T>();
diff --git a/Maple2.File.IO/Nif/PhysXMesh.cs b/Maple2.File.IO/Nif/PhysXMesh.cs
@@ -92,8 +92,13 @@ private NxsMeshType ParseConvexMesh(EndianReader reader) {
         uint unk8 = reader.ReadAdjustedUInt32();
         uint unk9 = reader.ReadAdjustedUInt32();
 
+#if NETSTANDARD2_1
+        Vertices.EnsureCapacityCompat(vertexCount);
+        Faces.EnsureCapacityCompat(faceCount);
+#else
         Vertices.EnsureCapacity(vertexCount);
         Faces.EnsureCapacity(faceCount);
+#endif
 
         for (int i = 0; i < vertexCount; ++i) {
             Vertices.Add(reader.ReadAdjustedVector3());
@@ -149,8 +154,13 @@ private NxsMeshType ParseTriangleMesh(EndianReader reader) {
         int vertexCount = reader.ReadAdjustedInt32();
         int faceCount = reader.ReadAdjustedInt32();
 
+#if NETSTANDARD2_1
+        Vertices.EnsureCapacityCompat(vertexCount);
+        Faces.EnsureCapacityCompat(faceCount);
+#else
         Vertices.EnsureCapacity(vertexCount);
         Faces.EnsureCapacity(faceCount);
+#endif
 
         for (int i = 0; i < vertexCount; ++i) {
             Vertices.Add(reader.ReadAdjustedVector3());
diff --git a/Maple2.File.Parser/MapXBlock/Generator/PresetGenerator.cs b/Maple2.File.Parser/MapXBlock/Generator/PresetGenerator.cs
@@ -69,11 +69,7 @@ public string GenerateClass(string @namespace, FlatType type, Type parent) {
         builder.Replace("\t", "    ");
 
         var imports = new StringBuilder();
-        string[] replaces = [
-            "System.Collections.Generic",
-            "System.Drawing",
-            "System.Numerics",
-        ];
+        string[] replaces = new[] { "System.Collections.Generic", "System.Drawing", "System.Numerics" };
         foreach (string replace in replaces) {
             int before = builder.Length;
             builder.Replace($"{replace}.", "");
diff --git a/Maple2.File.Parser/MapXBlock/RuntimeClassLookup.cs b/Maple2.File.Parser/MapXBlock/RuntimeClassLookup.cs
@@ -71,15 +71,15 @@ public override Type GetClass(string modelName) {
             mixinType.Name[1..], // Remove "I" prefix from interface
             TypeAttributes.Class | TypeAttributes.Public,
             typeof(object),
-            [mixinType]
+            new[] { mixinType }
         );
 
         var backingFields = new List<(FlatProperty, FieldInfo)>();
-        (string, string)[] baseProps = [
+        (string, string)[] baseProps = new[] {
             ("ModelName", modelName),
             ("EntityId", string.Empty),
-            ("EntityName", string.Empty),
-        ];
+            ("EntityName", string.Empty)
+        };
         foreach ((string name, string value) in baseProps) {
             var property = new FlatProperty {
                 Name = name,
diff --git a/Maple2.File.Parser/Tools/ILEmitter.cs b/Maple2.File.Parser/Tools/ILEmitter.cs
@@ -34,21 +34,21 @@ public static void EmitValue(this ILGenerator il, object value) {
             il.Emit(OpCodes.Ldstr, stringValue);
         } else if (value is Vector3 vector3Value) {
             ConstructorInfo constructor =
-                typeof(Vector3).GetConstructor([typeof(float), typeof(float), typeof(float)]);
+                typeof(Vector3).GetConstructor(new[] { typeof(float), typeof(float), typeof(float) });
 
             il.Emit(OpCodes.Ldc_R4, vector3Value.X);
             il.Emit(OpCodes.Ldc_R4, vector3Value.Y);
             il.Emit(OpCodes.Ldc_R4, vector3Value.Z);
             il.Emit(OpCodes.Newobj, constructor);
         } else if (value is Vector2 vector2Value) {
-            ConstructorInfo constructor = typeof(Vector2).GetConstructor([typeof(float), typeof(float)]);
+            ConstructorInfo constructor = typeof(Vector2).GetConstructor(new[] { typeof(float), typeof(float) });
 
             il.Emit(OpCodes.Ldc_R4, vector2Value.X);
             il.Emit(OpCodes.Ldc_R4, vector2Value.Y);
             il.Emit(OpCodes.Newobj, constructor);
         } else if (value is Color colorValue) {
             MethodInfo method =
-                typeof(Color).GetMethod("FromArgb", [typeof(int), typeof(int), typeof(int), typeof(int)]);
+                typeof(Color).GetMethod("FromArgb", new[] { typeof(int), typeof(int), typeof(int), typeof(int) });
 
             il.Emit(OpCodes.Ldc_I4, (int) colorValue.A);
             il.Emit(OpCodes.Ldc_I4, (int) colorValue.R);
diff --git a/Maple2.File.Unity/GlobalUsings.cs b/Maple2.File.Unity/GlobalUsings.cs
@@ -0,0 +1,10 @@
+global using System;
+global using System.Collections;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.IO;
+global using System.Numerics;
+global using System.Xml;
+global using System.Xml.Serialization;
+global using System.Reflection;
+global using System.Reflection.Emit;
diff --git a/Maple2.File.Unity/Maple2.File.Unity.csproj b/Maple2.File.Unity/Maple2.File.Unity.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <PackageId>Maple2.File.Unity</PackageId>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <LangVersion>10</LangVersion>
+        <Title>MapleStory2 File Parser for Unity</Title>
+        <Authors>Tadeucci</Authors>
+        <Description>Lightweight MapleStory2 m2d XBlock Parser for Unity</Description>
+        <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
+        <RepositoryUrl>https://github.com/AngeloTadeucci/Maple2.File</RepositoryUrl>
+        <PackageVersion>1.0.0</PackageVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <!-- Reference IO project -->
+    <ItemGroup>
+      <ProjectReference Include="..\Maple2.File.IO\Maple2.File.IO.csproj" />
+      <ProjectReference Include="..\Maple2.File.Flat\Maple2.File.Flat.csproj" />
+    </ItemGroup>
+
+    <!-- Include only XBlock-related files from Parser -->
+    <ItemGroup>
+        <!-- Flat types -->
+        <Compile Include="..\Maple2.File.Parser\Flat\*.cs" Link="Flat\%(Filename)%(Extension)" />
+
+        <!-- MapXBlock -->
+        <Compile Include="..\Maple2.File.Parser\MapXBlock\*.cs" Link="MapXBlock\%(Filename)%(Extension)" />
+        <Compile Include="..\Maple2.File.Parser\MapXBlock\Generator\*.cs" Link="MapXBlock\Generator\%(Filename)%(Extension)" />
+
+        <!-- Tools (needed by Flat and MapXBlock) -->
+        <Compile Include="..\Maple2.File.Parser\Tools\HierarchyMap.cs" Link="Tools\HierarchyMap.cs" />
+        <Compile Include="..\Maple2.File.Parser\Tools\ILEmitter.cs" Link="Tools\ILEmitter.cs" />
+    </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,12 @@ public Matrix4x4 ReadAdjustedMatrix4x3() {`
`65`	`65`
`66`	`66`	`for (int column = 0; column < 3; ++column) {`
`67`	`67`	`for (int row = 0; row < 3; ++row) {`
	`68`	`+#if NETSTANDARD2_1`
	`69`	`+ float value = ReadAdjustedFloat32();`
	`70`	`+ matrix = NetStandardExtensions.SetMatrixElement(matrix, row, column, value);`
	`71`	`+#else`
`68`	`72`	`matrix[row, column] = ReadAdjustedFloat32();`
	`73`	`+#endif`
`69`	`74`	`}`
`70`	`75`	`}`
`71`	`76`