From 7ce3a1cde0187ebe3b92258c243d83a4f1933987 Mon Sep 17 00:00:00 2001 From: Caraxi Date: Mon, 8 Jun 2020 02:03:05 +0930 Subject: [PATCH 1/2] Add GetExcelSheet overload with ClientLanguage --- Dalamud/Data/DataManager.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs index 090a522c1..3c3636a72 100644 --- a/Dalamud/Data/DataManager.cs +++ b/Dalamud/Data/DataManager.cs @@ -115,6 +115,23 @@ namespace Dalamud.Data return this.Excel.GetSheet(); } + /// + /// Get an with the given Excel sheet row type with a specified language. + /// + /// Language of the sheet to get. + /// The excel sheet type to get. + /// The , giving access to game rows. + public ExcelSheet GetExcelSheet(ClientLanguage language) where T : IExcelRow { + Language lang = language switch { + ClientLanguage.Japanese => Language.Japanese, + ClientLanguage.English => Language.English, + ClientLanguage.German => Language.German, + ClientLanguage.French => Language.French, + _ => throw new ArgumentOutOfRangeException(nameof(this.language), "Unknown Language: " + this.language) + }; + return this.Excel.GetSheet(lang); + } + /// /// Get a with the given path. /// From cb4b2d1eb0b771cb2dc49a60acd1c64b4b253a5c Mon Sep 17 00:00:00 2001 From: Caraxi Date: Mon, 8 Jun 2020 02:05:00 +0930 Subject: [PATCH 2/2] Use var --- Dalamud/Data/DataManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs index 3c3636a72..35945f6e2 100644 --- a/Dalamud/Data/DataManager.cs +++ b/Dalamud/Data/DataManager.cs @@ -122,7 +122,7 @@ namespace Dalamud.Data /// The excel sheet type to get. /// The , giving access to game rows. public ExcelSheet GetExcelSheet(ClientLanguage language) where T : IExcelRow { - Language lang = language switch { + var lang = language switch { ClientLanguage.Japanese => Language.Japanese, ClientLanguage.English => Language.English, ClientLanguage.German => Language.German,