diff --git a/AutoRetainerAPI b/AutoRetainerAPI
index a63c8e7..069cf98 160000
--- a/AutoRetainerAPI
+++ b/AutoRetainerAPI
@@ -1 +1 @@
-Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
+Subproject commit 069cf988b5da8657bc13ade73bfcbc2675601023
diff --git a/ECommons b/ECommons
index 11fd2f0..974a0ef 160000
--- a/ECommons
+++ b/ECommons
@@ -1 +1 @@
-Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a
+Subproject commit 974a0ef35536b7f0a10a278539f7136d6966baa3
diff --git a/Influx.sln.DotSettings b/Influx.sln.DotSettings
index df0680d..5e26270 100644
--- a/Influx.sln.DotSettings
+++ b/Influx.sln.DotSettings
@@ -1,3 +1,5 @@
+ ExplicitlyExcluded
+ ExplicitlyExcluded
True
True
\ No newline at end of file
diff --git a/Influx/Influx.csproj b/Influx/Influx.csproj
index 3ded112..57297fe 100644
--- a/Influx/Influx.csproj
+++ b/Influx/Influx.csproj
@@ -1,6 +1,6 @@
-
+
- 1.3
+ 2.0
dist
diff --git a/Influx/Influx/InfluxStatisticsClient.cs b/Influx/Influx/InfluxStatisticsClient.cs
index af22a01..7e770c7 100644
--- a/Influx/Influx/InfluxStatisticsClient.cs
+++ b/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()!.Where(x => x.RowId > 0)
+ _classJobToArrayIndex = dataManager.GetExcelSheet().Where(x => x.RowId > 0)
.ToDictionary(x => (byte)x.RowId, x => (byte)x.ExpArrayIndex);
- _classJobNames = dataManager.GetExcelSheet()!.Where(x => x.RowId > 0)
+ _classJobNames = dataManager.GetExcelSheet().Where(x => x.RowId > 0)
.ToDictionary(x => (byte)x.RowId, x => x.Abbreviation.ToString());
- _expToJobs = dataManager.GetExcelSheet()!.Where(x => x.RowId > 0 && !string.IsNullOrEmpty(x.Name))
+ _expToJobs = dataManager.GetExcelSheet().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- ()!
+ _prices = dataManager.GetExcelSheet
- ()
.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()!
+ _worldNames = dataManager.GetExcelSheet()
.Where(x => x.RowId > 0 && x.IsPublic)
.ToDictionary(x => x.RowId, x => x.Name.ToString())
.AsReadOnly();
diff --git a/Influx/LocalStatistics/FcStatsCalculator.cs b/Influx/LocalStatistics/FcStatsCalculator.cs
index 85225d6..6bb2247 100644
--- a/Influx/LocalStatistics/FcStatsCalculator.cs
+++ b/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();
diff --git a/Influx/LocalStatistics/LocalStatsCalculator.cs b/Influx/LocalStatistics/LocalStatsCalculator.cs
index 191596a..7d2eb88 100644
--- a/Influx/LocalStatistics/LocalStatsCalculator.cs
+++ b/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 msq = new();
- foreach (var quest in dataManager.GetExcelSheet()!.Where(x => x.JournalGenre.Row is >= 1 and <= 13))
+ foreach (var quest in dataManager.GetExcelSheet().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(),
- Genre = quest.JournalGenre.Row,
+ PreviousQuestIds = previousQuests,
+ Genre = quest.JournalGenre.RowId,
});
}
diff --git a/Influx/Windows/ConfigurationWindow.cs b/Influx/Windows/ConfigurationWindow.cs
index d98e0a7..97cac3f 100644
--- a/Influx/Windows/ConfigurationWindow.cs
+++ b/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 =
diff --git a/Influx/packages.lock.json b/Influx/packages.lock.json
index 714dab6..057370c 100644
--- a/Influx/packages.lock.json
+++ b/Influx/packages.lock.json
@@ -4,9 +4,9 @@
"net8.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
- "requested": "[2.1.13, )",
- "resolved": "2.1.13",
- "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+ "requested": "[11.0.0, )",
+ "resolved": "11.0.0",
+ "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, )"
}
}
}
diff --git a/LLib b/LLib
index 8d947be..e4bbc05 160000
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc
+Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c