anna
/
NominaOcculta
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: update for 6.0

This commit is contained in:
Anna 2022-01-05 15:09:50 -05:00
parent 6cc58bcf4e
commit 24e09bbf5a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NominaOcculta/GameFunctions.cs
View File

@ -2,6 +2,7 @@
using System.Runtime.InteropServices;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Hooking;
using FFXIVClientStructs.FFXIV.Client.System.Framework;
namespace NominaOcculta {
internal class GameFunctions : IDisposable {
@ -9,7 +10,7 @@ namespace NominaOcculta {
internal const string GenerateName = "E8 ?? ?? ?? ?? 48 8D 8B ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 85 C0 74 1B 48 8D 8B ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8B 8B ?? ?? ?? ?? 48 8B D0 E8 ?? ?? ?? ?? 48 8B CB 48 8B 7C 24";
internal const string Utf8StringCtor = "E8 ?? ?? ?? ?? 44 2B F7";
internal const string Utf8StringDtor = "80 79 21 00 75 12";
internal const string AtkTextNodeSetText = "E8 ?? ?? ?? ?? 49 8B FC";
internal const string AtkTextNodeSetText = "E8 ?? ?? ?? ?? 8D 4E 32";
internal const string LoadExd = "40 53 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 41 0F B6 D9";
}
@ -100,7 +101,7 @@ namespace NominaOcculta {
}
public unsafe void LoadSheet(string name) {
var ui = this.Plugin.Common.Functions.GetUiModule();
var ui = (IntPtr) Framework.Instance()->GetUiModule();
var getExcelModulePtr = *(*(IntPtr**) ui + 5);
var getExcelModule = Marshal.GetDelegateForFunctionPointer<GetExcelModuleDelegate>(getExcelModulePtr);
var excelModule = getExcelModule(ui);

8
NominaOcculta/NominaOcculta.csproj
View File

@ -23,6 +23,10 @@
<HintPath>$(Dalamud)\Dalamud.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="FFXIVClientStructs">
<HintPath>$(Dalamud)\FFXIVClientStructs.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="ImGui.NET">
<HintPath>$(Dalamud)\ImGui.NET.dll</HintPath>
<Private>false</Private>
@ -39,8 +43,8 @@
<ItemGroup>
<PackageReference Include="DalamudLinter" Version="1.0.3"/>
<PackageReference Include="DalamudPackager" Version="2.1.4"/>
<PackageReference Include="XivCommon" Version="3.1.0"/>
<PackageReference Include="DalamudPackager" Version="2.1.5"/>
<PackageReference Include="XivCommon" Version="4.0.0-alpha.2"/>
</ItemGroup>
</Project>