From 3ab07737faf81bdd38cae7f3c2c22aaaf3f8972e Mon Sep 17 00:00:00 2001
From: Loporrit <141286461+loporrit@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:00:15 +0000
Subject: [PATCH] Dalamud API11

---
 MareSynchronos/MareSynchronos.csproj          |  2 +-
 MareSynchronos/PlayerData/Pairs/Pair.cs       |  1 -
 MareSynchronos/Services/DalamudUtilService.cs | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index ab3ff3b..5c0cad5 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DalamudPackager" Version="2.1.13" />
+    <PackageReference Include="DalamudPackager" Version="11.0.0" />
     <PackageReference Include="Downloader" Version="3.0.6" />
     <PackageReference Include="K4os.Compression.LZ4.Legacy" Version="1.3.6" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />
diff --git a/MareSynchronos/PlayerData/Pairs/Pair.cs b/MareSynchronos/PlayerData/Pairs/Pair.cs
index 7a09411..f24cd60 100644
--- a/MareSynchronos/PlayerData/Pairs/Pair.cs
+++ b/MareSynchronos/PlayerData/Pairs/Pair.cs
@@ -1,6 +1,5 @@
 using Dalamud.Game.Gui.ContextMenu;
 using Dalamud.Game.Text.SeStringHandling;
-using Lumina.Excel.GeneratedSheets2;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
 using MareSynchronos.API.Data.Enum;
diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs
index 4485c0b..0039fc2 100644
--- a/MareSynchronos/Services/DalamudUtilService.cs
+++ b/MareSynchronos/Services/DalamudUtilService.cs
@@ -66,8 +66,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         _performanceCollector = performanceCollector;
         WorldData = new(() =>
         {
-            return gameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.World>(Dalamud.Game.ClientLanguage.English)!
-                .Where(w => !w.Name.RawData.IsEmpty && w.DataCenter.Row != 0 && (w.IsPublic || char.IsUpper((char)w.Name.RawData[0])))
+            return gameData.GetExcelSheet<Lumina.Excel.Sheets.World>(Dalamud.Game.ClientLanguage.English)!
+                .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());
         });
         mediator.Subscribe<TargetPairMessage>(this, async (msg) =>
@@ -222,13 +222,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public uint GetHomeWorldId()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer!.HomeWorld.Id;
+        return _clientState.LocalPlayer!.HomeWorld.RowId;
     }
 
     public uint GetWorldId()
     {
         EnsureIsOnFramework();
-        return _clientState.LocalPlayer!.CurrentWorld.Id;
+        return _clientState.LocalPlayer!.CurrentWorld.RowId;
     }
 
     public async Task<uint> GetWorldIdAsync()
@@ -304,7 +304,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         _framework.Update += LoporritSync.Plugin.Self.OnFrameworkUpdate;
         if (IsLoggedIn)
         {
-            _classJobId = _clientState.LocalPlayer!.ClassJob.Id;
+            _classJobId = _clientState.LocalPlayer!.ClassJob.RowId;
         }
 
         return Task.CompletedTask;