ARControl/ARControl.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Dalamud.NET.Sdk/11.0.0">
+<Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <Version>6.0</Version>
+        <Version>5.8</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 

ARControl/AutoRetainerControlPlugin.Sync.cs

@@ -109,10 +109,9 @@ partial class AutoRetainerControlPlugin
                     save = true;
                 }
 
-                int displayOrder = offlineCharacterData.RetainerData.IndexOf(retainerData);
-                if (retainer.DisplayOrder != displayOrder)
+                if (retainer.DisplayOrder != retainerData.DisplayOrder)
                 {
-                    retainer.DisplayOrder = displayOrder;
+                    retainer.DisplayOrder = retainerData.DisplayOrder;
                     save = true;
                 }
 

ARControl/GameData/GameCache.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.Sheets;
+using Lumina.Excel.GeneratedSheets;
 
 namespace ARControl.GameData;
 
@@ -9,27 +9,27 @@ internal sealed class GameCache
 {
     public GameCache(IDataManager dataManager)
     {
-        Jobs = dataManager.GetExcelSheet<ClassJob>().ToDictionary(x => x.RowId, x => x.Abbreviation.ToString());
-        Ventures = dataManager.GetExcelSheet<RetainerTask>()
-            .Where(x => x.RowId > 0 && !x.IsRandom && x.Task.RowId != 0)
+        Jobs = dataManager.GetExcelSheet<ClassJob>()!.ToDictionary(x => x.RowId, x => x.Abbreviation.ToString());
+        Ventures = dataManager.GetExcelSheet<RetainerTask>()!
+            .Where(x => x.RowId > 0 && !x.IsRandom && x.Task != 0)
             .Select(x => new Venture(dataManager, x))
             .ToList()
             .AsReadOnly();
-        ItemsToGather = dataManager.GetExcelSheet<GatheringItem>()
-            .Where(x => x.RowId > 0 && x.RowId < 10_000 && x.Item.RowId != 0)
-            .Where(x => Ventures.Any(y => y.ItemId == x.Item.RowId))
-            .Select(x => new ItemToGather(x))
+        ItemsToGather = dataManager.GetExcelSheet<GatheringItem>()!
+            .Where(x => x.RowId > 0 && x.RowId < 10_000 && x.Item != 0 && x.Quest.Row == 0)
+            .Where(x => Ventures.Any(y => y.ItemId == x.Item))
+            .Select(x => new ItemToGather(dataManager, x))
             .OrderBy(x => x.Name)
             .ToList()
             .AsReadOnly();
-        FolkloreBooks = dataManager.GetExcelSheet<GatheringSubCategory>()
+        FolkloreBooks = dataManager.GetExcelSheet<GatheringSubCategory>()!
             .Where(x => x.RowId > 0)
-            .Where(x => x.Item.RowId != 0)
+            .Where(x => x.Item.Row != 0)
             .Select(x => new
             {
                 x.RowId,
-                ItemId = x.Item.RowId,
-                ItemName = x.Item.Value.Name.ToString()
+                ItemId = x.Item.Row,
+                ItemName = x.Item.Value!.Name.ToString()
             })
             .GroupBy(x => (x.ItemId, x.ItemName))
             .Select(x =>
@@ -41,23 +41,23 @@ internal sealed class GameCache
                 })
             .ToDictionary(x => x.ItemId, x => x);
 
-        var gatheringNodes = dataManager.GetExcelSheet<GatheringPointBase>()
-            .Where(x => x.RowId > 0 && x.GatheringType.RowId <= 3)
+        var gatheringNodes = dataManager.GetExcelSheet<GatheringPointBase>()!
+            .Where(x => x.RowId > 0 && x.GatheringType.Row <= 3)
             .Select(x =>
                 new
                 {
                     GatheringPointBaseId = x.RowId,
                     GatheringPoint =
-                        dataManager.GetExcelSheet<GatheringPoint>().Cast<GatheringPoint?>().FirstOrDefault(y =>
-                            y!.Value.GatheringPointBase.RowId == x.RowId),
-                    Items = x.Item.Where(y => y.RowId > 0).ToList()
+                        dataManager.GetExcelSheet<GatheringPoint>()!.FirstOrDefault(y =>
+                            y.GatheringPointBase.Row == x.RowId),
+                    Items = x.Item.Where(y => y > 0).ToList()
                 })
             .Where(x => x.GatheringPoint != null)
             .Select(x =>
                 new
                 {
                     x.GatheringPointBaseId,
-                    CategoryId = (ushort)x.GatheringPoint!.Value.GatheringSubCategory.RowId,
+                    CategoryId = (ushort)x.GatheringPoint!.GatheringSubCategory.Row,
                     x.Items,
                 })
             .ToList();
@@ -73,13 +73,13 @@ internal sealed class GameCache
                         new
                         {
                             x.CategoryId,
-                            ItemId = y.RowId
+                            ItemId = (uint)y
                         }))
             .GroupBy(x => x.CategoryId)
             .ToDictionary(x => x.Key, x => x.Select(y => y.ItemId).ToList());
         foreach (var book in FolkloreBooks.Values)
         {
-            book.TomeId = dataManager.GetExcelSheet<Item>().GetRow(book.ItemId).ItemAction.Value.Data[0];
+            book.TomeId = dataManager.GetExcelSheet<Item>()!.GetRow(book.ItemId)!.ItemAction.Value!.Data[0];
             foreach (var category in book.GatheringSubCategories)
             {
                 if (itemsWithTomes.TryGetValue(category, out var itemsInCategory))

ARControl/GameData/ItemToGather.cs

@@ -1,20 +1,19 @@
-using Lumina.Excel.Sheets;
+using Dalamud.Plugin.Services;
+using Lumina.Excel.GeneratedSheets;
 
 namespace ARControl.GameData;
 
 internal sealed class ItemToGather
 {
-    public ItemToGather(GatheringItem item)
+    public ItemToGather(IDataManager dataManager, GatheringItem item)
     {
         GatheredItemId = item.RowId;
-
-        var itemRef = item.Item.GetValueOrDefault<Item>()!.Value;
-        ItemId = itemRef.RowId;
-        Name = itemRef.Name.ToString();
+        ItemId = item.Item;
+        Name = dataManager.GetExcelSheet<Item>()!.GetRow((uint)item.Item)!.Name.ToString();
     }
 
 
     public uint GatheredItemId { get; }
-    public uint ItemId { get; }
+    public int ItemId { get; }
     public string Name { get; }
 }

ARControl/GameData/Venture.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.Sheets;
+using Lumina.Excel.GeneratedSheets;
 
 namespace ARControl.GameData;
 
@@ -9,14 +9,13 @@ internal sealed class Venture
     public Venture(IDataManager dataManager, RetainerTask retainerTask)
     {
         RowId = retainerTask.RowId;
-        Category = retainerTask.ClassJobCategory.Value;
+        Category = retainerTask.ClassJobCategory.Value!;
 
-        RetainerTaskNormal taskDetails =
-            dataManager.GetExcelSheet<RetainerTaskNormal>().GetRow(retainerTask.Task.RowId);
-        RetainerTaskParameter taskParameters = retainerTask.RetainerTaskParameter.Value;
-        ItemId = taskDetails.Item.RowId;
-        IconId = taskDetails.Item.Value.Icon;
-        Name = taskDetails.Item.Value.Name.ToString();
+        var taskDetails = dataManager.GetExcelSheet<RetainerTaskNormal>()!.GetRow(retainerTask.Task)!;
+        var taskParameters = retainerTask.RetainerTaskParameter.Value!;
+        ItemId = taskDetails.Item.Row;
+        IconId = taskDetails.Item.Value!.Icon;
+        Name = taskDetails.Item.Value!.Name.ToString();
         Level = retainerTask.RetainerLevel;
         ItemLevelCombat = retainerTask.RequiredItemLevel;
         RequiredGathering = retainerTask.RequiredGathering;

ARControl/Windows/Config/LockedItemsTab.cs

@@ -84,13 +84,6 @@ internal sealed class LockedItemsTab : ITab
             .ToList();
 
         if (checkPerCharacter)
-            DrawPerCharacter(charactersToCheck, itemsToCheck, onlyShowMissing);
-        else
-            DrawPerItem(charactersToCheck, itemsToCheck, onlyShowMissing);
-    }
-
-    private void DrawPerCharacter(List<CheckedCharacter> charactersToCheck, List<CheckedItem> itemsToCheck,
-        bool onlyShowMissing)
         {
             foreach (var ch in charactersToCheck.Where(x => x.ToCheck(onlyShowMissing).Count != 0))
             {
@@ -134,7 +127,7 @@ internal sealed class LockedItemsTab : ITab
                                 ImGui.Selectable(itemName);
                                 if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
                                 {
-                                uint classJob = _clientState.LocalPlayer!.ClassJob.RowId;
+                                    uint classJob = _clientState.LocalPlayer!.ClassJob.Id;
                                     if (classJob == 16)
                                         _commandManager.ProcessCommand($"/gathermin {item.GatheredItem.Name}");
                                     else if (classJob == 17)
@@ -158,9 +151,7 @@ internal sealed class LockedItemsTab : ITab
                 }
             }
         }
-
-    private void DrawPerItem(List<CheckedCharacter> charactersToCheck, List<CheckedItem> itemsToCheck,
-        bool onlyShowMissing)
+        else
         {
             foreach (var item in itemsToCheck.Where(x =>
                          charactersToCheck.Any(y => y.ToCheck(onlyShowMissing).ContainsKey(x.ItemId))))
@@ -190,8 +181,7 @@ internal sealed class LockedItemsTab : ITab
                             }
 
                             string characterName = ch.Character.ToString();
-                        if (folkloreBook != null &&
-                            !ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
+                            if (folkloreBook != null && !ch.Character.UnlockedFolkloreBooks.Contains(folkloreBook.ItemId))
                                 characterName += $" ({SeIconChar.Prohibited.ToIconString()} {folkloreBook.Name})";
 
                             ImGui.PushStyleColor(ImGuiCol.Text, color);
@@ -204,6 +194,7 @@ internal sealed class LockedItemsTab : ITab
                 }
             }
         }
+    }
 
     private sealed class CheckedCharacter
     {

ARControl/packages.lock.json

@@ -4,9 +4,9 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[11.0.0, )",
-        "resolved": "11.0.0",
-        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
@@ -79,7 +79,7 @@
       "autoretainerapi": {
         "type": "Project",
         "dependencies": {
-          "ECommons": "[2.2.0.2, )"
+          "ECommons": "[2.1.0.7, )"
         }
       },
       "ecommons": {
@@ -88,7 +88,7 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[11.0.0, )"
+          "DalamudPackager": "[2.1.13, )"
         }
       }
     }

AutoRetainerAPI

@@ -1 +1 @@
-Subproject commit 069cf988b5da8657bc13ade73bfcbc2675601023
+Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a

ECommons

@@ -1 +1 @@
-Subproject commit b99ba7a861300164b9b293b2bbbd510af0cda8a2
+Subproject commit 677e28c0696eb13351d90d13ff27adb667b2c862

LLib

@@ -1 +1 @@
-Subproject commit 4033a1c78aec5bc2a187268e8f2615779dcc2b72
+Subproject commit fa3d19dde18bfd00237e66ea1eb48a60caa01b8a