api11

Jukkales · Nov 19, 2024 · 466d540 · 466d540
1 parent 2976529
commit 466d540
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/AutoRetainerAPI b/AutoRetainerAPI
diff --git a/ECommons b/ECommons
diff --git a/HoardFarm/HoardFarm.csproj b/HoardFarm/HoardFarm.csproj
@@ -35,7 +35,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.12"/>
+        <PackageReference Include="DalamudPackager" Version="11.0.0"/>
         <Reference Include="FFXIVClientStructs">
             <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
             <Private>false</Private>

diff --git a/HoardFarm/HoardFarm.json b/HoardFarm/HoardFarm.json
@@ -5,7 +5,7 @@
     "Description": "Plugin to help farming DeepDungeon Hoards (...for you)",
     "InternalName": "HoardFarm",
     "ApplicableVersion": "any",
-    "DalamudApiLevel": 10,
+    "DalamudApiLevel": 11,
     "Tags": [
         "hoard",
         "farm",

diff --git a/HoardFarm/Service/HoardFarmService.cs b/HoardFarm/Service/HoardFarmService.cs
@@ -14,7 +14,7 @@
 using HoardFarm.Model;
 using HoardFarm.Tasks;
 using HoardFarm.Tasks.TaskGroups;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace HoardFarm.Service;
 
@@ -52,9 +52,9 @@ public HoardFarmService()
         updateTimer.Interval = 1000;
         updateTimer.Enabled = false;
 
-        hoardFoundMessage = DataManager.GetExcelSheet<LogMessage>()!.GetRow(7274)!.Text.ToDalamudString().ExtractText();
-        senseHoardMessage = DataManager.GetExcelSheet<LogMessage>()!.GetRow(7272)!.Text.ToDalamudString().ExtractText();
-        noHoardMessage = DataManager.GetExcelSheet<LogMessage>()!.GetRow(7273)!.Text.ToDalamudString().ExtractText();
+        hoardFoundMessage = DataManager.GetExcelSheet<LogMessage>().GetRow(7274).Text.ToDalamudString().ExtractText();
+        senseHoardMessage = DataManager.GetExcelSheet<LogMessage>().GetRow(7272).Text.ToDalamudString().ExtractText();
+        noHoardMessage = DataManager.GetExcelSheet<LogMessage>().GetRow(7273).Text.ToDalamudString().ExtractText();
 
         ClientState.TerritoryChanged += OnMapChange;
     }

diff --git a/HoardFarm/Service/RetainerService.cs b/HoardFarm/Service/RetainerService.cs
@@ -238,7 +238,7 @@ public bool CanRunRetainer()
     {
         return autoRetainerIcp.GetInventoryFreeSlotCount() > 4 && 
                Svc.ClientState.LocalPlayer != null && 
-               Svc.ClientState.LocalPlayer.HomeWorld.Id == Svc.ClientState.LocalPlayer.CurrentWorld.Id;
+               Svc.ClientState.LocalPlayer.HomeWorld.RowId == Svc.ClientState.LocalPlayer.CurrentWorld.RowId;
     }
 
 }
diff --git a/HoardFarm/Utils/Utils.cs b/HoardFarm/Utils/Utils.cs
@@ -12,7 +12,7 @@
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using HoardFarm.Model;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 
 namespace HoardFarm.Utils;
 
@@ -91,7 +91,7 @@ public static unsafe bool NotBusy()
 
     public static unsafe AtkUnitBase* FindSelectYesNo(uint rowId)
     {
-        var s = Svc.Data.GetExcelSheet<Addon>()!.GetRow(rowId)!.Text
+        var s = Svc.Data.GetExcelSheet<Addon>().GetRow(rowId).Text
                    .ToDalamudString().ExtractText();
         for (var i = 1; i < 100; i++)
             try

diff --git a/HoardFarm/packages.lock.json b/HoardFarm/packages.lock.json
@@ -4,19 +4,19 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
       },
       "autoretainerapi": {
         "type": "Project",
         "dependencies": {
-          "ECommons": "[2.2.0.1, )"
+          "ECommons": "[2.2.0.2, )"
         }
       },
       "ecommons": {
         "type": "Project"
       }
     }
   }
-}
+}
+1 −6		AutoRetainerAPI/ApiConsts.cs
+8 −7		AutoRetainerAPI/AutoRetainerApi.cs
+2 −8		AutoRetainerAPI/AutoRetainerApiInternal.cs
+2 −2		AutoRetainerAPI/Configuration/AdditionalRetainerData.cs
+0 −4		AutoRetainerAPI/Configuration/AdditionalVesselData.cs
+0 −4		AutoRetainerAPI/Configuration/FCData.cs
+1 −6		AutoRetainerAPI/Configuration/GCDeliveryType.cs
+0 −3		AutoRetainerAPI/Configuration/HouseDescriptor.cs
+0 −22		AutoRetainerAPI/Configuration/HouseEntrance.cs
+1 −7		AutoRetainerAPI/Configuration/HouseTeleportTarget.cs
+1 −6		AutoRetainerAPI/Configuration/MultiModeCommonConfiguration.cs
+1 −6		AutoRetainerAPI/Configuration/MultiModeType.cs
+6 −13		AutoRetainerAPI/Configuration/OfflineCharacterData.cs
+1 −3		AutoRetainerAPI/Configuration/OfflineRetainerData.cs
+1 −6		AutoRetainerAPI/Configuration/OfflineVesselData.cs
+1 −6		AutoRetainerAPI/Configuration/PlanCompleteBehavior.cs
+1 −5		AutoRetainerAPI/Configuration/PlannedVenture.cs
+0 −4		AutoRetainerAPI/Configuration/SubmarinePointPlan.cs
+0 −4		AutoRetainerAPI/Configuration/SubmarineUnlockPlan.cs
+10 −0		AutoRetainerAPI/Configuration/TeleportOptionsOverride.cs
+1 −6		AutoRetainerAPI/Configuration/UnavailableVentureDisplay.cs
+1 −6		AutoRetainerAPI/Configuration/UnlockMode.cs
+0 −3		AutoRetainerAPI/Configuration/VenturePlan.cs
+1 −6		AutoRetainerAPI/Configuration/VesselBehavior.cs
+1 −6		AutoRetainerAPI/Configuration/VesselTaskType.cs
+1 −6		AutoRetainerAPI/Configuration/WorkshopFailAction.cs
+1 −7		AutoRetainerAPI/Delegates.cs