Slight adjustments required for build and version bump

Shojy · Aug 7, 2024 · 224b648 · 224b648
1 parent 1b76759
commit 224b648
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/Shojy.FF7.Elena/Inventory/InventoryItem.cs b/Shojy.FF7.Elena/Inventory/InventoryItem.cs
@@ -31,7 +31,7 @@ public void ParseData(byte[] data)
             var converter = new BitArray(indexBits);
             var indexBytes = new byte[2];
             converter.CopyTo(indexBytes, 0);
-            Item = BitConverter.ToUInt16(indexBytes);
+            Item = BitConverter.ToUInt16(indexBytes, 0);
 
             converter = new BitArray(amountBits);
             var amountBytes = new byte[1];

diff --git a/Shojy.FF7.Elena/Inventory/InventoryMateria.cs b/Shojy.FF7.Elena/Inventory/InventoryMateria.cs
@@ -17,7 +17,7 @@ public void ParseData(byte[] data)
 
             var ap = new byte[4];
             Array.Copy(data, 1, ap, 0, 3);
-            CurrentAP = BitConverter.ToInt32(ap);
+            CurrentAP = BitConverter.ToInt32(ap, 0);
         }
     }
 }
diff --git a/Shojy.FF7.Elena/Sections/InitialData.cs b/Shojy.FF7.Elena/Sections/InitialData.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection.PortableExecutable;
 using System.Text;
 using System.Threading.Tasks;
 using Shojy.FF7.Elena.Inventory;

diff --git a/Shojy.FF7.Elena/Sections/MateriaData.cs b/Shojy.FF7.Elena/Sections/MateriaData.cs
@@ -65,7 +65,7 @@ private static Materia ParseData(byte[] data)
 
             var temp = new byte[4];
             Array.Copy(data, 0x9, temp, 0, 3);
-            materia.Status = (Statuses)BitConverter.ToUInt32(temp);
+            materia.Status = (Statuses)BitConverter.ToUInt32(temp, 0);
 
             materia.Element = (MateriaElements)data[0xC];
             materia.MateriaTypeByte = data[0xD];

diff --git a/Shojy.FF7.Elena/Shojy.FF7.Elena.csproj b/Shojy.FF7.Elena/Shojy.FF7.Elena.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0;netstandard2.0;netstandard2.1;</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Description>A kernel reading utility for Final Fantasy VII</Description>
     <PackageLicenseExpression></PackageLicenseExpression>
@@ -10,23 +10,28 @@
     <PackageProjectUrl>https://github.com/Shojy/Elena</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Shojy/Elena</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <Version>0.4.0-pre</Version>
+    <Version>0.6.0-pre</Version>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageTags>FF7, Kernel.bin, kernel2.bin, Final Fantasy</PackageTags>
-    <Authors>Joshua Moon (Shojy)</Authors>
+    <Authors>Joshua Moon (Shojy), petfriendamy</Authors>
     <Company />
     <Product>Elena</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.6.24327.6" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
 </Project>