Skip to content

Commit d6aa6b8

Browse files
WorkingRobotWorkingRobot
authored
[API 13] Add Lumina.Excel as submodule (#2332)
* WIP on excel-submodule * Add Lumina.Excel to build * Fix sheet changes
1 parent ff36f08 commit d6aa6b8

File tree

8 files changed

+28
-9
lines changed

8 files changed

+28
-9
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
[submodule "lib/Hexa.NET.ImGui"]
2020
path = lib/Hexa.NET.ImGui
2121
url = https://github.com/goatcorp/Hexa.NET.ImGui.git
22+
[submodule "lib/Lumina.Excel"]
23+
path = lib/Lumina.Excel
24+
url = https://github.com/NotAdam/Lumina.Excel.git

‎Dalamud.CorePlugin/Dalamud.CorePlugin.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="Lumina" Version="$(LuminaVersion)" />
29-
<PackageReference Include="Lumina.Excel" Version="$(LuminaExcelVersion)" />
3029
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
3130
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
3231
<PrivateAssets>all</PrivateAssets>

‎Dalamud.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneImGuiTestbed", "i
7474
EndProject
7575
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGuiScene", "imgui\ImGuiScene\ImGuiScene.csproj", "{66753AC7-0029-4373-9CC4-7760B1F46141}"
7676
EndProject
77+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lumina", "Lumina", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
78+
EndProject
79+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lumina.Excel.Generator", "lib\Lumina.Excel\src\Lumina.Excel.Generator\Lumina.Excel.Generator.csproj", "{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D}"
80+
EndProject
81+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lumina.Excel", "lib\Lumina.Excel\src\Lumina.Excel\Lumina.Excel.csproj", "{88FB719B-EB41-73C5-8D25-C03E0C69904F}"
82+
EndProject
7783
Global
7884
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7985
Debug|Any CPU = Debug|Any CPU
@@ -168,6 +174,14 @@ Global
168174
{66753AC7-0029-4373-9CC4-7760B1F46141}.Debug|Any CPU.Build.0 = Debug|x64
169175
{66753AC7-0029-4373-9CC4-7760B1F46141}.Release|Any CPU.ActiveCfg = Release|x64
170176
{66753AC7-0029-4373-9CC4-7760B1F46141}.Release|Any CPU.Build.0 = Release|x64
177+
{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178+
{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
179+
{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
180+
{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D}.Release|Any CPU.Build.0 = Release|Any CPU
181+
{88FB719B-EB41-73C5-8D25-C03E0C69904F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182+
{88FB719B-EB41-73C5-8D25-C03E0C69904F}.Debug|Any CPU.Build.0 = Debug|Any CPU
183+
{88FB719B-EB41-73C5-8D25-C03E0C69904F}.Release|Any CPU.ActiveCfg = Release|Any CPU
184+
{88FB719B-EB41-73C5-8D25-C03E0C69904F}.Release|Any CPU.Build.0 = Release|Any CPU
171185
EndGlobalSection
172186
GlobalSection(SolutionProperties) = preSolution
173187
HideSolutionNode = FALSE
@@ -191,6 +205,9 @@ Global
191205
{9C70BD06-D52C-425E-9C14-5D66BC6046EF} = {A217B3DF-607A-4EFB-B107-3C4809348043}
192206
{4702A911-2513-478C-A434-2776393FDE77} = {A217B3DF-607A-4EFB-B107-3C4809348043}
193207
{66753AC7-0029-4373-9CC4-7760B1F46141} = {A217B3DF-607A-4EFB-B107-3C4809348043}
208+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {E15BDA6D-E881-4482-94BA-BE5527E917FF}
209+
{5A44DF0C-C9DA-940F-4D6B-4A11D13AEA3D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
210+
{88FB719B-EB41-73C5-8D25-C03E0C69904F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
194211
EndGlobalSection
195212
GlobalSection(ExtensibilityGlobals) = postSolution
196213
SolutionGuid = {79B65AC9-C940-410E-AB61-7EA7E12C7599}

‎Dalamud/Dalamud.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
<PackageReference Include="goatcorp.Reloaded.Assembler" Version="1.0.14-goatcorp3" />
6969
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
7070
<PackageReference Include="Lumina" Version="$(LuminaVersion)" />
71-
<PackageReference Include="Lumina.Excel" Version="$(LuminaExcelVersion)" />
7271
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.1.24081.5" />
7372
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
7473
<PrivateAssets>all</PrivateAssets>
@@ -109,6 +108,7 @@
109108
<ProjectReference Include="..\imgui\ImGuiScene\ImGuiScene.csproj" />
110109
<ProjectReference Include="..\lib\FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj" />
111110
<ProjectReference Include="..\lib\FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj" />
111+
<ProjectReference Include="..\lib\Lumina.Excel\src\Lumina.Excel\Lumina.Excel.csproj" />
112112
</ItemGroup>
113113

114114
<ItemGroup>

‎Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ internal SheetRedirectFlags Resolve(ref string sheetName, ref uint rowId, ref ui
221221
sheetName = nameof(LSheets.AkatsukiNoteString);
222222
colIndex = 0;
223223

224-
if (this.dataManager.Excel.GetSubrowSheet<LSheets.AkatsukiNote>().TryGetRow(rowId, out var row))
225-
rowId = (uint)row[0].Unknown2;
224+
if (this.dataManager.Excel.GetSubrowSheet<LSheets.AkatsukiNote>().TryGetSubrow(rowId, 0, out var row))
225+
rowId = row.ListName.RowId;
226226
break;
227227
}
228228
}

‎Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,10 +1065,10 @@ private unsafe void DrawExpression(MacroCode macroCode, uint? subType, uint? fix
10651065
break;
10661066

10671067
case LinkMacroPayloadType.AkatsukiNote when
1068-
dataManager.GetSubrowExcelSheet<AkatsukiNote>(this.language).TryGetRow(u32, out var akatsukiNoteRow) &&
1069-
dataManager.GetExcelSheet<AkatsukiNoteString>(this.language).TryGetRow((uint)akatsukiNoteRow[0].Unknown2, out var akatsukiNoteStringRow):
1068+
dataManager.GetSubrowExcelSheet<AkatsukiNote>(this.language).TryGetSubrow(u32, 0, out var akatsukiNoteRow) &&
1069+
akatsukiNoteRow.ListName.ValueNullable is { } akatsukiNoteStringRow:
10701070
ImGui.SameLine();
1071-
ImGui.Text(akatsukiNoteStringRow.Unknown0.ExtractText());
1071+
ImGui.Text(akatsukiNoteStringRow.Text.ExtractText());
10721072
break;
10731073
}
10741074
}

‎Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
<!-- Dependency versions -->
1212
<PropertyGroup Label="Dependency Versions">
13-
<LuminaVersion>5.7.0</LuminaVersion>
14-
<LuminaExcelVersion>7.2.2</LuminaExcelVersion>
13+
<LuminaVersion>6.3.0</LuminaVersion>
1514
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
1615
</PropertyGroup>
1716

‎lib/Lumina.Excel‎

Submodule Lumina.Excel added at d78895e

0 commit comments

Comments
 (0)