From 2e6397d30b5f7b7a7e81f274c2764ce8ee78bcdc Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Thu, 1 Apr 2021 00:04:01 +0200
Subject: [PATCH] deps: update Lumina & Lumina.Excel

---
 Dalamud/Dalamud.csproj      |  4 ++--
 Dalamud/Data/DataManager.cs | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index d33f3e29f..b64c698b7 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -40,8 +40,8 @@
     <ItemGroup>
         <PackageReference Include="CheapLoc" Version="1.1.3" />
         <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-        <PackageReference Include="Lumina" Version="2.5.1" />
-        <PackageReference Include="Lumina.Excel" Version="5.40.0" />
+        <PackageReference Include="Lumina" Version="2.6.0" />
+        <PackageReference Include="Lumina.Excel" Version="5.40.1" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
         <PackageReference Include="PropertyChanged.Fody" Version="2.6.1" />
         <PackageReference Include="Serilog" Version="2.6.0" />
diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 220c5af78..6ea358135 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -5,15 +5,13 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
+using Lumina;
 using Lumina.Data;
 using Lumina.Data.Files;
 using Lumina.Excel;
 using Newtonsoft.Json;
 using Serilog;
 
-using LuminaOptions = Lumina.LuminaOptions;
-using ParsedFilePath = Lumina.ParsedFilePath;
-
 namespace Dalamud.Data
 {
     /// <summary>
@@ -26,7 +24,7 @@ namespace Dalamud.Data
         /// <summary>
         /// A <see cref="Lumina"/> object which gives access to any excel/game data.
         /// </summary>
-        private Lumina.Lumina gameData;
+        private Lumina.GameData gameData;
 
         private ClientLanguage language;
 
@@ -107,7 +105,7 @@ namespace Dalamud.Data
                     },
                 };
 
-                this.gameData = new Lumina.Lumina(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "sqpack"), luminaOptions);
+                this.gameData = new GameData(Path.Combine(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName), "sqpack"), luminaOptions);
 
                 Log.Information("Lumina is ready: {0}", this.gameData.DataPath);
 
@@ -144,7 +142,7 @@ namespace Dalamud.Data
         /// </summary>
         /// <typeparam name="T">The excel sheet type to get.</typeparam>
         /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
-        public ExcelSheet<T> GetExcelSheet<T>() where T : class, IExcelRow
+        public ExcelSheet<T> GetExcelSheet<T>() where T : ExcelRow
         {
             return this.Excel.GetSheet<T>();
         }
@@ -155,7 +153,7 @@ namespace Dalamud.Data
         /// <param name="language">Language of the sheet to get.</param>
         /// <typeparam name="T">The excel sheet type to get.</typeparam>
         /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
-        public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage language) where T : class, IExcelRow
+        public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage language) where T : ExcelRow
         {
             var lang = language switch {
                 ClientLanguage.Japanese => Language.Japanese,
@@ -185,7 +183,7 @@ namespace Dalamud.Data
         /// <returns>The <see cref="FileResource"/> of the file.</returns>
         public T GetFile<T>(string path) where T : FileResource
         {
-            ParsedFilePath filePath = Lumina.Lumina.ParseFilePath(path);
+            ParsedFilePath filePath = GameData.ParseFilePath(path);
             if (filePath == null)
                 return default(T);
             Repository repository;