Rename debug PackagePlugin target

AutoRetainerAPI

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

ECommons

@@ -1 +1 @@
-Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a
+Subproject commit 974a0ef35536b7f0a10a278539f7136d6966baa3

Influx.sln.DotSettings

@@ -1,3 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=AutoRetainerAPI/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=ECommons/@EntryIndexedValue">ExplicitlyExcluded</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Allagan/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ceruleum/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Influx/DalamudPackager.targets

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

Influx/Influx.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Dalamud.NET.Sdk/10.0.0">
+<Project Sdk="Dalamud.NET.Sdk/11.0.0">
     <PropertyGroup>
-        <Version>1.3</Version>
+        <Version>2.0</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 

Influx/Influx/InfluxStatisticsClient.cs

@@ -10,7 +10,7 @@ using Influx.LocalStatistics;
 using InfluxDB.Client;
 using InfluxDB.Client.Api.Domain;
 using InfluxDB.Client.Writes;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany;
 
 namespace Influx.Influx;
@@ -37,24 +37,24 @@ internal sealed class InfluxStatisticsClient : IDisposable
         _pluginLog = pluginLog;
         UpdateClient();
 
-        _classJobToArrayIndex = dataManager.GetExcelSheet<ClassJob>()!.Where(x => x.RowId > 0)
+        _classJobToArrayIndex = dataManager.GetExcelSheet<ClassJob>().Where(x => x.RowId > 0)
             .ToDictionary(x => (byte)x.RowId, x => (byte)x.ExpArrayIndex);
-        _classJobNames = dataManager.GetExcelSheet<ClassJob>()!.Where(x => x.RowId > 0)
+        _classJobNames = dataManager.GetExcelSheet<ClassJob>().Where(x => x.RowId > 0)
             .ToDictionary(x => (byte)x.RowId, x => x.Abbreviation.ToString());
-        _expToJobs = dataManager.GetExcelSheet<ClassJob>()!.Where(x => x.RowId > 0 && !string.IsNullOrEmpty(x.Name))
+        _expToJobs = dataManager.GetExcelSheet<ClassJob>().Where(x => x.RowId > 0 && !string.IsNullOrEmpty(x.Name.ToString()))
             .Where(x => x.JobIndex > 0 || x.DohDolJobIndex >= 0)
             .Where(x => x.Abbreviation.ToString() != "SMN")
             .ToDictionary(x => x.ExpArrayIndex, x => new ClassJobDetail(x.Abbreviation.ToString(), x.DohDolJobIndex >= 0));
-        _prices = dataManager.GetExcelSheet<Item>()!
+        _prices = dataManager.GetExcelSheet<Item>()
             .AsEnumerable()
             .ToDictionary(x => x.RowId, x => new PriceInfo
             {
                 Name = x.Name.ToString(),
                 Normal = x.PriceLow,
-                UiCategory = x.ItemUICategory.Row,
+                UiCategory = x.ItemUICategory.RowId,
             })
             .AsReadOnly();
-        _worldNames = dataManager.GetExcelSheet<World>()!
+        _worldNames = dataManager.GetExcelSheet<World>()
             .Where(x => x.RowId > 0 && x.IsPublic)
             .ToDictionary(x => x.RowId, x => x.Name.ToString())
             .AsReadOnly();

Influx/LocalStatistics/FcStatsCalculator.cs

@@ -140,7 +140,7 @@ internal sealed class FcStatsCalculator : IDisposable
         }
     }
 
-    private void Logout()
+    private void Logout(int type, int code)
     {
         if (_status != null)
             _autoRetainerApi.FinishCharacterPostProcess();

Influx/LocalStatistics/LocalStatsCalculator.cs

@@ -10,7 +10,7 @@ using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Newtonsoft.Json;
 
 namespace Influx.LocalStatistics;
@@ -58,16 +58,16 @@ internal sealed class LocalStatsCalculator : IDisposable
         Task.Run(() =>
         {
             List<QuestInfo> msq = new();
-            foreach (var quest in dataManager.GetExcelSheet<Quest>()!.Where(x => x.JournalGenre.Row is >= 1 and <= 13))
+            foreach (var quest in dataManager.GetExcelSheet<Quest>().Where(x => x.JournalGenre.RowId is >= 1 and <= 14)) // 14 = Post-Dawntrail
             {
-                var previousQuests = quest.PreviousQuest?.Select(x => x.Row).Where(x => x != 0).ToList();
+                var previousQuests = quest.PreviousQuest.Select(x => x.RowId).Where(x => x != 0).ToList();
 
                 msq.Add(new QuestInfo
                 {
                     RowId = quest.RowId,
                     Name = quest.Name.ToString(),
-                    PreviousQuestIds = previousQuests ?? new(),
+                    PreviousQuestIds = previousQuests,
-                    Genre = quest.JournalGenre.Row,
+                    Genre = quest.JournalGenre.RowId,
                 });
             }
 

Influx/Windows/ConfigurationWindow.cs

@@ -103,11 +103,11 @@ internal sealed class ConfigurationWindow : Window
         if (!tabItem)
             return;
 
-        if (_clientState is { IsLoggedIn: true, LocalContentId: > 0, LocalPlayer.HomeWorld: not null })
+        if (_clientState is { IsLoggedIn: true, LocalContentId: > 0, LocalPlayer.HomeWorld.RowId: > 0 })
         {
-            string worldName = _clientState.LocalPlayer?.HomeWorld.GameData?.Name ?? "??";
+            string worldName = _clientState.LocalPlayer.HomeWorld.Value.Name.ToString();
             ImGui.TextWrapped(
-                $"Current Character: {_clientState.LocalPlayer?.Name} @ {worldName} ({_clientState.LocalContentId:X})");
+                $"Current Character: {_clientState.LocalPlayer.Name} @ {worldName} ({_clientState.LocalContentId:X})");
 
             ImGui.Indent(30);
             Configuration.CharacterInfo? includedCharacter =

Influx/packages.lock.json

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

LLib

@@ -1 +1 @@
-Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc
+Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c