bump

Venomalia · Dec 13, 2023 · 01a924a · 01a924a
1 parent 775db05
commit 01a924a
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -46,26 +46,24 @@ List of all [commands](https://github.com/Venomalia/DolphinTextureExtraction-too
 
 ## Credits
 
+- [AuroraLib.Compression](https://github.com/Venomalia/AuroraLib.Compression) used as Compression library.
+
 - [ImageSharp](https://github.com/SixLabors/ImageSharp) used as graphics API.
 
 - [Hack.io](https://github.com/SuperHackio/Hack.io) to read RARC, U8, YAZ, YAY, BTI, TPL, TEX1, BMD and BDL Format
 
-- [Puyo Tools](https://github.com/nickworonekin/puyotools) Code reference for ONE GVMH, GBIX, GCIX, GVRT, Format and to read PRS, CNX, Lz00, lz01 Lz10, Lz11 Compressing.
+- [Puyo Tools](https://github.com/nickworonekin/puyotools) Code reference for ONE GVMH, GBIX, GCIX, GVRT, Format.
 
 - [HashDepot](https://github.com/ssg/HashDepot) used for xxHash generation
 
 - [Ironcompress](https://github.com/aloneguid/ironcompress) used for LZO, LZ4 and Zstandard.
 
 - [SevenZip](https://github.com/adoconnection/SevenZipExtractor) to read formats supported by 7Zip
 
-- [SharpZipLib](https://github.com/icsharpcode/SharpZipLib) to read ZLib Compressing
-
 - [AFSLib](https://github.com/MaikelChan/AFSLib) to read AFS archive format
 
 - [cpk-tools](https://github.com/ConnorKrammer/cpk-tools) to read CRIWARE's CPK archive format
 
-- [CLZ-Compression](https://github.com/sukharah/CLZ-Compression) Code reference for CLZ Compressing
-
 - [Switch-Toolbox](https://github.com/KillzXGaming/Switch-Toolbox/blob/12dfbaadafb1ebcd2e07d239361039a8d05df3f7/File_Format_Library/FileFormats/NLG/MarioStrikers/StrikersRLT.cs) Code reference for PTLG Format
 
 - [Rune Factory Frontier Tools](https://github.com/master801/Rune-Factory-Frontier-Tools) Code reference for NLCM Archives

diff --git a/TextureExtraction tool/DolphinTextureExtraction tool.csproj b/TextureExtraction tool/DolphinTextureExtraction tool.csproj
@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <IncludeSymbols>False</IncludeSymbols>
-    <Version>1.7.16.$([System.DateTime]::Now.ToString(`MMdd`))</Version>
+    <Version>1.7.26.$([System.DateTime]::Now.ToString(`MMdd`))</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -36,11 +36,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Costura.Fody" Version="5.7.0">
+    <PackageReference Include="Costura.Fody" Version="5.8.0-alpha0098">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/lib/AuroraLip/AuroraLib.csproj b/lib/AuroraLip/AuroraLib.csproj
@@ -24,11 +24,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AuroraLib.Compression" Version="1.0.3" />
+    <PackageReference Include="AuroraLib.Compression" Version="1.0.4" />
     <PackageReference Include="IronCompress" Version="1.5.1" />
-    <PackageReference Include="RenderWareNET" Version="0.6.0" />
+    <PackageReference Include="RenderWareNET" Version="0.6.1" />
     <PackageReference Include="SevenZipExtractor" Version="1.0.17" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs b/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs
@@ -1,6 +1,7 @@
 using AuroraLib.Texture.PixelFormats;
 using System.Numerics;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture.BlockFormats
 {
@@ -159,7 +160,7 @@ private static void GetDominantColors(Span<Rgba32> pixels, out RGB565 color0, ou
         /// <param name="pixel">The RGBA color value of the pixel.</param>
         /// <param name="colors">The span of colors to compare against.</param>
         /// <returns>The index of the closest color in the set of colors.</returns>
-        private static int GetColorIndex(in Rgba32 pixel, Span<Rgba32> colors)
+        private static int GetColorIndex(Rgba32 pixel, Span<Rgba32> colors)
         {
             float minDistance = float.MaxValue;
             int colorIndex = 0;

diff --git a/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs b/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs
@@ -1,5 +1,6 @@
 using AuroraLib.Texture.PixelFormats;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture.BlockFormats
 {

diff --git a/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs b/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs
@@ -1,4 +1,6 @@
-namespace AuroraLib.Texture.BlockFormats
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace AuroraLib.Texture.BlockFormats
 {
     /// <summary>
     /// Represents a block of RGBA32 pixels. Each block has a size of 4x4 pixels.

diff --git a/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs b/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs
@@ -1,6 +1,7 @@
 using AuroraLib.Core.Text;
 using AuroraLib.Texture.Interfaces;
 using System.Text.RegularExpressions;
+using SixLabors.ImageSharp;
 
 namespace AuroraLib.Texture
 {

diff --git a/lib/AuroraLip/Texture/Formats/LFXT.cs b/lib/AuroraLip/Texture/Formats/LFXT.cs
@@ -2,6 +2,7 @@
 using AuroraLib.Core.Interfaces;
 using AuroraLib.Texture.BlockFormats;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture.Formats
 {

diff --git a/lib/AuroraLip/Texture/Formats/PIL.cs b/lib/AuroraLip/Texture/Formats/PIL.cs
@@ -1,6 +1,7 @@
 using AuroraLib.Common;
 using AuroraLib.Texture.PixelFormats;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture.Formats
 {

diff --git a/lib/AuroraLip/Texture/Formats/PIM.cs b/lib/AuroraLip/Texture/Formats/PIM.cs
@@ -1,6 +1,7 @@
 using AuroraLib.Common;
 using AuroraLib.Texture.PixelFormats;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture
 {

diff --git a/lib/AuroraLip/Texture/Formats/TGA.cs b/lib/AuroraLip/Texture/Formats/TGA.cs
@@ -1,8 +1,9 @@
 using AuroraLib.Common;
 using AuroraLib.Texture.PixelFormats;
-using RenderWareNET.Plugins;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Tga;
+using SixLabors.ImageSharp.PixelFormats;
 using System.Runtime.InteropServices;
 
 namespace AuroraLib.Texture.Formats
@@ -14,7 +15,7 @@ public class TGA : JUTTexture, IFileAccess
 
         public bool CanWrite => false;
 
-        public static readonly string[] Extensions = new string[]{ ".tga", ".vda", ".icb", ".vst" };
+        public static readonly string[] Extensions = new string[] { ".tga", ".vda", ".icb", ".vst" };
 
         public bool IsMatch(Stream stream, ReadOnlySpan<char> extension = default)
         {

diff --git a/lib/AuroraLip/Texture/IBlock{TPixel}.cs b/lib/AuroraLip/Texture/IBlock{TPixel}.cs
@@ -1,7 +1,8 @@
 using AuroraLib.Core.Buffers;
-using SixLabors.ImageSharp.Advanced;
 using System.Numerics;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp;
 
 namespace AuroraLib.Texture
 {

diff --git a/lib/AuroraLip/Texture/ImageEX.cs b/lib/AuroraLip/Texture/ImageEX.cs
@@ -1,8 +1,11 @@
 using AuroraLib.Common;
 using AuroraLib.Texture.BlockFormats;
 using AuroraLib.Texture.PixelFormats;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using System.Drawing;
 using System.Numerics;

diff --git a/lib/AuroraLip/Texture/PixelFormats/I16.cs b/lib/AuroraLip/Texture/PixelFormats/I16.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 namespace AuroraLib.Texture.PixelFormats

diff --git a/lib/AuroraLip/Texture/PixelFormats/I8.cs b/lib/AuroraLip/Texture/PixelFormats/I8.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 namespace AuroraLib.Texture.PixelFormats

diff --git a/lib/AuroraLip/Texture/PixelFormats/IA4.cs b/lib/AuroraLip/Texture/PixelFormats/IA4.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/lib/AuroraLip/Texture/PixelFormats/IA8.cs b/lib/AuroraLip/Texture/PixelFormats/IA8.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/lib/AuroraLip/Texture/PixelFormats/RGB565.cs b/lib/AuroraLip/Texture/PixelFormats/RGB565.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 namespace AuroraLib.Texture.PixelFormats

diff --git a/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs b/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 
 namespace AuroraLib.Texture.PixelFormats

diff --git a/lib/AuroraLip/Texture/TexEntry.cs b/lib/AuroraLip/Texture/TexEntry.cs
@@ -4,6 +4,8 @@
 using AuroraLib.Texture.Interfaces;
 using AuroraLib.Texture.PixelFormats;
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace AuroraLib.Texture
 {