ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: lumina 2.1.1 incompatibilities

Browse source
This commit is contained in:
goat 2020-07-10 22:33:07 +02:00
parent 611679d38a
commit e271f76b69
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Data/DataManager.cs
View file

@ -124,7 +124,7 @@ namespace Dalamud.Data
/// </summary> /// </summary>
/// <typeparam name="T">The excel sheet type to get.</typeparam> /// <typeparam name="T">The excel sheet type to get.</typeparam>
/// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns> /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
public ExcelSheet<T> GetExcelSheet<T>() where T : IExcelRow public ExcelSheet<T> GetExcelSheet<T>() where T : class, IExcelRow
{ {
return this.Excel.GetSheet<T>(); return this.Excel.GetSheet<T>();
} }
@ -135,7 +135,7 @@ namespace Dalamud.Data
/// <param name="language">Language of the sheet to get.</param> /// <param name="language">Language of the sheet to get.</param>
/// <typeparam name="T">The excel sheet type to get.</typeparam> /// <typeparam name="T">The excel sheet type to get.</typeparam>
/// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns> /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage language) where T : IExcelRow { public ExcelSheet<T> GetExcelSheet<T>(ClientLanguage language) where T : class, IExcelRow {
var lang = language switch { var lang = language switch {
ClientLanguage.Japanese => Language.Japanese, ClientLanguage.Japanese => Language.Japanese,
ClientLanguage.English => Language.English, ClientLanguage.English => Language.English,

3
Dalamud/Data/TransientSheet/Completion.cs
View file

@ -1,3 +1,4 @@
using Lumina.Data;
using Lumina.Excel; using Lumina.Excel;
namespace Dalamud.Data.TransientSheet namespace Dalamud.Data.TransientSheet
@ -27,7 +28,7 @@ namespace Dalamud.Data.TransientSheet
public uint RowId { get; set; } public uint RowId { get; set; }
public uint SubRowId { get; set; } public uint SubRowId { get; set; }
public void PopulateData( RowParser parser, Lumina.Lumina lumina ) public void PopulateData( RowParser parser, Lumina.Lumina lumina, Language language )
{ {
RowId = parser.Row; RowId = parser.Row;
SubRowId = parser.SubRow; SubRowId = parser.SubRow;

3
Dalamud/Data/TransientSheet/PetMirage.cs
View file

@ -1,4 +1,5 @@
using Lumina.Excel; using Lumina.Excel;
using Lumina.Data;
namespace Dalamud.Data.TransientSheet namespace Dalamud.Data.TransientSheet
{ {
@ -201,7 +202,7 @@ namespace Dalamud.Data.TransientSheet
public uint RowId { get; set; } public uint RowId { get; set; }
public uint SubRowId { get; set; } public uint SubRowId { get; set; }
public void PopulateData( RowParser parser, Lumina.Lumina lumina ) public void PopulateData( RowParser parser, Lumina.Lumina lumina, Language language )
{ {
RowId = parser.Row; RowId = parser.Row;
SubRowId = parser.SubRow; SubRowId = parser.SubRow;