t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dalamud API11

Browse Source
This commit is contained in:
Loporrit
2024-11-15 11:00:15 +00:00
parent 5815b5c2e5
commit 3ab07737fa
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -30,7 +30,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.13" /> <PackageReference Include="DalamudPackager" Version="11.0.0" />
<PackageReference Include="Downloader" Version="3.0.6" /> <PackageReference Include="Downloader" Version="3.0.6" />
<PackageReference Include="K4os.Compression.LZ4.Legacy" Version="1.3.6" /> <PackageReference Include="K4os.Compression.LZ4.Legacy" Version="1.3.6" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" /> <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />

1
MareSynchronos/PlayerData/Pairs/Pair.cs
View File

@@ -1,6 +1,5 @@
using Dalamud.Game.Gui.ContextMenu; using Dalamud.Game.Gui.ContextMenu;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Lumina.Excel.GeneratedSheets2;
using MareSynchronos.API.Data; using MareSynchronos.API.Data;
using MareSynchronos.API.Data.Comparer; using MareSynchronos.API.Data.Comparer;
using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Enum;

10
MareSynchronos/Services/DalamudUtilService.cs
View File

@@ -66,8 +66,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
_performanceCollector = performanceCollector; _performanceCollector = performanceCollector;
WorldData = new(() => WorldData = new(() =>
{ {
return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(Dalamud.Game.ClientLanguage.English)! return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(Dalamud.Game.ClientLanguage.English)!
.Where(w => !w.Name.RawData.IsEmpty && w.DataCenter.Row != 0 && (w.IsPublic || char.IsUpper((char)w.Name.RawData[0]))) .Where(w => w.Name.ByteLength > 0 && w.DataCenter.RowId != 0 && (w.IsPublic || char.IsUpper((char)w.Name.Data.Span[0])))
.ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString()); .ToDictionary(w => (ushort)w.RowId, w => w.Name.ToString());
}); });
mediator.Subscribe<TargetPairMessage>(this, async (msg) => mediator.Subscribe<TargetPairMessage>(this, async (msg) =>
@@ -222,13 +222,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
public uint GetHomeWorldId() public uint GetHomeWorldId()
{ {
EnsureIsOnFramework(); EnsureIsOnFramework();
return _clientState.LocalPlayer!.HomeWorld.Id; return _clientState.LocalPlayer!.HomeWorld.RowId;
} }
public uint GetWorldId() public uint GetWorldId()
{ {
EnsureIsOnFramework(); EnsureIsOnFramework();
return _clientState.LocalPlayer!.CurrentWorld.Id; return _clientState.LocalPlayer!.CurrentWorld.RowId;
} }
public async Task<uint> GetWorldIdAsync() public async Task<uint> GetWorldIdAsync()
@@ -304,7 +304,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
_framework.Update += LoporritSync.Plugin.Self.OnFrameworkUpdate; _framework.Update += LoporritSync.Plugin.Self.OnFrameworkUpdate;
if (IsLoggedIn) if (IsLoggedIn)
{ {
_classJobId = _clientState.LocalPlayer!.ClassJob.Id; _classJobId = _clientState.LocalPlayer!.ClassJob.RowId;
} }
return Task.CompletedTask; return Task.CompletedTask;