Re-format of namespace, update lang version & SDK and improve US852 IFF models

PangLib.DAT/DATFile.cs

@@ -3,144 +3,143 @@
 using System.IO;
 using System.Text;
 
-namespace PangLib.DAT
+namespace PangLib.DAT;
+
+/// <summary>
+/// Main DAT file class
+/// </summary>
+public class DATFile
 {
+ public List<string> Entries = new List<string>();
+
+ private Encoding FileEncoding;
+
  /// <summary>
- /// Main DAT file class
+ /// Parses the data from the DAT file
  /// </summary>
- public class DATFile
+ /// <param name="data">Stream containing DAT file data</param>
+ private void Parse(Stream data)
  {
- public List<string> Entries = new List<string>();
-
- private Encoding FileEncoding;
-
- /// <summary>
- /// Parses the data from the DAT file
- /// </summary>
- /// <param name="data">Stream containing DAT file data</param>
- private void Parse(Stream data)
+ using (BinaryReader reader = new BinaryReader(data, FileEncoding))
  {
- using (BinaryReader reader = new BinaryReader(data, FileEncoding))
- {
- List<char> stringChars = new List<char>();
+ List<char> stringChars = new List<char>();
 
- while (reader.BaseStream.Position < reader.BaseStream.Length)
+ while (reader.BaseStream.Position < reader.BaseStream.Length)
+ {
+ if (reader.PeekChar() != 0x00)
+ {
+ stringChars.Add(reader.ReadChar());
+ }
+ else
  {
- if (reader.PeekChar() != 0x00)
- {
- stringChars.Add(reader.ReadChar());
- }
- else
- {
- char[] chars = stringChars.ToArray();
- byte[] bytes = FileEncoding.GetBytes(chars);
-
- Entries.Add(FileEncoding.GetString(bytes));
-
- reader.BaseStream.Seek(1L, SeekOrigin.Current);
- stringChars = new List<char>();
- }
+ char[] chars = stringChars.ToArray();
+ byte[] bytes = FileEncoding.GetBytes(chars);
+
+ Entries.Add(FileEncoding.GetString(bytes));
+
+ reader.BaseStream.Seek(1L, SeekOrigin.Current);
+ stringChars = new List<char>();
  }
  }
  }
+ }
 
- /// <summary>
- /// Tries to get the file encoding based on
- /// the naming scheme of the files
- ///
- /// Falls back on UTF-8 as default
- /// </summary>
- /// <param name="filePath">File name of the DAT file</param>
- /// <returns>Encoding of the DAT file</returns>
- private Encoding GetEncodingFromFileName(string filePath)
+ /// <summary>
+ /// Tries to get the file encoding based on
+ /// the naming scheme of the files
+ ///
+ /// Falls back on UTF-8 as default
+ /// </summary>
+ /// <param name="filePath">File name of the DAT file</param>
+ /// <returns>Encoding of the DAT file</returns>
+ private Encoding GetEncodingFromFileName(string filePath)
+ {
+ if (filePath == null)
  {
- if (filePath == null)
- {
- throw new InvalidOperationException("No file path given to get encoding from, use SetEncoding() method!");
- }
-
- string fileName = Path.GetFileNameWithoutExtension(filePath).ToLower();
-
- Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+ throw new InvalidOperationException("No file path given to get encoding from, use SetEncoding() method!");
+ }
 
-  Encoding targetEncoding;
+ string fileName = Path.GetFileNameWithoutExtension(filePath).ToLower();
 
- switch (fileName)
- {
- case "korea":
- targetEncoding = Encoding.GetEncoding(51949);
- break;
- case "japan":
- targetEncoding = Encoding.GetEncoding(932);
- break;
- case "english":
- targetEncoding = Encoding.ASCII;
- break;
- case "thailand":
- targetEncoding = Encoding.GetEncoding(874);
- break;
- case "indonesia":
- targetEncoding = Encoding.GetEncoding(65001);
- break;
- case "brasil":
- case "spanish":
- case "german":
- case "french":
- targetEncoding = Encoding.GetEncoding(1252);
- break;
- default:
- targetEncoding = Encoding.GetEncoding(65001);
- break;
- }
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
- return targetEncoding;
- }
+ Encoding targetEncoding;
 
- /// <summary>
- /// Sets the encoding to be used by the DATFile instance
- /// </summary>
- /// <param name="encoding">Encoding to set</param>
- public void SetEncoding(Encoding encoding)
+ switch (fileName)
  {
- FileEncoding = encoding;
+ case "korea":
+ targetEncoding = Encoding.GetEncoding(51949);
+ break;
+ case "japan":
+ targetEncoding = Encoding.GetEncoding(932);
+ break;
+ case "english":
+ targetEncoding = Encoding.ASCII;
+ break;
+ case "thailand":
+ targetEncoding = Encoding.GetEncoding(874);
+ break;
+ case "indonesia":
+ targetEncoding = Encoding.GetEncoding(65001);
+ break;
+ case "brasil":
+ case "spanish":
+ case "german":
+ case "french":
+ targetEncoding = Encoding.GetEncoding(1252);
+ break;
+ default:
+ targetEncoding = Encoding.GetEncoding(65001);
+ break;
  }
+
+ return targetEncoding;
+ }
+
+ /// <summary>
+ /// Sets the encoding to be used by the DATFile instance
+ /// </summary>
+ /// <param name="encoding">Encoding to set</param>
+ public void SetEncoding(Encoding encoding)
+ {
+ FileEncoding = encoding;
+ }
 
-  /// <summary>
-  /// Returns the encoding used by the DATFile instance
-  /// </summary>
-  public Encoding GetEncoding()
-  {
-  return FileEncoding;
-  }
+ /// <summary>
+ /// Returns the encoding used by the DATFile instance
+ /// </summary>
+ public Encoding GetEncoding()
+ {
+ return FileEncoding;
+ }
 
-  /// <summary>
-  /// Load a DAT file into a DATFile instance
-  /// </summary>
-  /// <param name="filePath">File path to load the DAT file from</param>
-  public static DATFile Load(string filePath)
-  {
-  DATFile DAT = new DATFile();
+ /// <summary>
+ /// Load a DAT file into a DATFile instance
+ /// </summary>
+ /// <param name="filePath">File path to load the DAT file from</param>
+ public static DATFile Load(string filePath)
+ {
+ DATFile DAT = new DATFile();
 
-  DAT.SetEncoding(DAT.GetEncodingFromFileName(filePath));
-  DAT.Parse(File.Open(filePath, FileMode.Open));
+ DAT.SetEncoding(DAT.GetEncodingFromFileName(filePath));
+ DAT.Parse(File.Open(filePath, FileMode.Open));
 
-  return DAT;
-  }
+ return DAT;
+ }
 
- /// <summary>
- /// Save a DATFile instance to a file
- /// </summary>
- /// <param name="filePath">File path to save the DAT file to</param>
- public void Save(string filePath)
+ /// <summary>
+ /// Save a DATFile instance to a file
+ /// </summary>
+ /// <param name="filePath">File path to save the DAT file to</param>
+ public void Save(string filePath)
+ {
+ using (BinaryWriter writer = new BinaryWriter(File.Open(filePath, FileMode.Create, FileAccess.Write), FileEncoding))
  {
- using (BinaryWriter writer = new BinaryWriter(File.Open(filePath, FileMode.Create, FileAccess.Write), FileEncoding))
+ foreach (string entry in Entries)
  {
- foreach (string entry in Entries)
- {
- writer.Write(entry.ToCharArray());
- writer.Write((byte)0);
- }
+ writer.Write(entry.ToCharArray());
+ writer.Write((byte)0);
  }
  }
  }
-}
+}

PangLib.DAT/PangLib.DAT.csproj

@@ -13,6 +13,8 @@
  <PackageIconUrl>https://raw.githubusercontent.com/pangyatools/PangLib/master/.github/Images/pang.png</PackageIconUrl>
 
  <TargetFramework>netstandard2.0</TargetFramework>
+
+ <LangVersion>12</LangVersion>
  </PropertyGroup>
 
  <ItemGroup>