LLib

@@ -1 +1 @@
-Subproject commit 2d214b133847130d3382c0baaff26b32332a8f2d
+Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42

Squadronista/DalamudPackager.targets

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <Target Name="PackagePluginDebug" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
         <DalamudPackager
                 ProjectDir="$(ProjectDir)"
                 OutputPath="$(OutputPath)"

Squadronista/Solver/SquadronMember.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.Sheets;
+using Lumina.Excel.GeneratedSheets;
 
 namespace Squadronista.Solver;
 
@@ -29,13 +29,13 @@ internal sealed class SquadronMember : IEquatable<SquadronMember>
     public SquadronMember InitializeFrom(IDataManager dataManager)
     {
         List<(byte, byte, byte)> growthAsList = new();
-        var growth = dataManager.GetExcelSheet<GcArmyMemberGrow>().Single(x => x.ClassJob.RowId == ClassJob);
-        foreach (GcArmyMemberGrow.MemberParamsStruct memberParams in growth.MemberParams)
+        var growth = dataManager.GetExcelSheet<GcArmyMemberGrow>()!.Single(x => x.ClassJob.Row == ClassJob);
+        for (int i = 0; i <= 59; ++i)
         {
-            growthAsList.Add((memberParams.Physical, memberParams.Mental, memberParams.Tactical));
+            growthAsList.Add((growth.Physical[i], growth.Mental[i], growth.Tactical[i]));
         }
 
-        growthAsList.Add((growth.Unknown1, growth.Unknown2, growth.Unknown3));
+        growthAsList.Add((growth.Unknown123, growth.Unknown184, growth.Unknown245));
         GrowthParams = growthAsList;
         return this;
     }

Squadronista/Squadronista.csproj

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

Squadronista/SquadronistaPlugin.cs

@@ -9,7 +9,7 @@ using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.UI;
-using Lumina.Excel.Sheets;
+using Lumina.Excel.GeneratedSheets;
 using Squadronista.Solver;
 using Squadronista.Windows;
 using Race = Squadronista.Solver.Race;
@@ -39,7 +39,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
         _dataManager = dataManager;
         _addonLifecycle = addonLifecycle;
 
-        _allMissions = dataManager.GetExcelSheet<GcArmyExpedition>()
+        _allMissions = dataManager.GetExcelSheet<GcArmyExpedition>()!
             .Where(x => x.RowId > 0)
             .Select(x => new SquadronMission
             {
@@ -49,12 +49,12 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
 
                 // 13 and 14 seems to be a duplicate
                 IsFlaggedMission = x.RowId is 7 or 14 or 15 or 34,
-                PossibleAttributes = Enumerable.Range(0, x.ExpeditionParams.Count)
+                PossibleAttributes = Enumerable.Range(0, x.RequiredPhysical.Length)
                     .Select(i => new Attributes
                     {
-                        PhysicalAbility = x.ExpeditionParams[i].RequiredPhysical,
-                        MentalAbility = x.ExpeditionParams[i].RequiredMental,
-                        TacticalAbility = x.ExpeditionParams[i].RequiredTactical,
+                        PhysicalAbility = x.RequiredPhysical[i],
+                        MentalAbility = x.RequiredMental[i],
+                        TacticalAbility = x.RequiredTactical[i],
                     })
                     .ToList()
                     .AsReadOnly(),
@@ -62,7 +62,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
             .ToList()
             .AsReadOnly();
 
-        Trainings = dataManager.GetExcelSheet<GcArmyTraining>()
+        Trainings = dataManager.GetExcelSheet<GcArmyTraining>()!
             .Where(x => x.RowId > 0 && x.RowId != 7)
             .Select(x => new Training
             {
@@ -123,7 +123,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
 
                 return new SquadronMember
                 {
-                    Name = _dataManager.GetExcelSheet<ENpcResident>().GetRow(member->ENpcResidentId)
+                    Name = _dataManager.GetExcelSheet<ENpcResident>()!.GetRow(member->ENpcResidentId)!
                         .Singular.ToString(),
                     Level = member->Level,
                     ClassJob = member->ClassJob,
@@ -196,8 +196,6 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
         SquadronState = null;
     }
 
-    private void ResetCharacterSpecificData(int type, int code) => ResetCharacterSpecificData();
-
     public void Dispose()
     {
         _mainWindow.Dispose();

Squadronista/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 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[11.0.0, )"
+          "DalamudPackager": "[2.1.13, )"
         }
       }
     }