Compare commits

..

No commits in common. "master" and "v1.0" have entirely different histories.
master ... v1.0

4 changed files with 10 additions and 8 deletions

View File

@ -65,8 +65,10 @@ internal sealed class AllaganToolsIpc : IDisposable
{
if (_dalamudReflector.TryGetDalamudPlugin("Allagan Tools", out var it, false, true))
{
var hostedPlugin = it.GetType().BaseType!;
var host = hostedPlugin.GetField("host", BindingFlags.NonPublic | BindingFlags.Instance)!.GetValue(it)!;
var pluginLoader = it.GetType()
.GetProperty("PluginLoader", BindingFlags.NonPublic | BindingFlags.Instance)!
.GetValue(it)!;
var host = pluginLoader.GetType().GetProperty("Host")!.GetValue(pluginLoader)!;
var serviceProvider = host.GetType().GetProperty("Services")!.GetValue(host)!;
var getServiceMethod = serviceProvider.GetType().GetMethod("GetService")!;
object GetService(Type t) => getServiceMethod.Invoke(serviceProvider, [t])!;
@ -126,7 +128,7 @@ internal sealed class AllaganToolsIpc : IDisposable
public Dictionary<Character, Currencies> CountCurrencies()
{
_pluginLog.Verbose($"Updating characters with {_characters.GetType()} and {_inventories.GetType()}");
_pluginLog.Debug($"{_characters.GetType()}, {_inventories.GetType()}");
var characters = _characters.All.ToDictionary(x => x.CharacterId, x => x);
return _inventories.All
.Where(x => characters.ContainsKey(x.Value.CharacterId))

View File

@ -1,6 +1,6 @@
<Project Sdk="Dalamud.NET.Sdk/10.0.0">
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
<PropertyGroup>
<Version>1.2</Version>
<Version>1.0</Version>
<OutputPath>dist</OutputPath>
</PropertyGroup>

View File

@ -162,9 +162,9 @@ internal sealed class FcStatsCalculator : IDisposable
{
var atkArrays = Framework.Instance()->GetUIModule()->GetRaptureAtkModule()->AtkModule
.AtkArrayDataHolder;
if (atkArrays.NumberArrayCount > 51)
if (atkArrays.NumberArrayCount > 50)
{
var fcArrayData = atkArrays.GetNumberArrayData(51);
var fcArrayData = atkArrays.GetNumberArrayData(50);
FcStats fcStats = new FcStats
{
ContentId = localContentId,

2
LLib

@ -1 +1 @@
Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc
Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe