Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
Liza | f80b694d60 | |
Liza | 859cd4500e |
|
@ -65,10 +65,8 @@ internal sealed class AllaganToolsIpc : IDisposable
|
||||||
{
|
{
|
||||||
if (_dalamudReflector.TryGetDalamudPlugin("Allagan Tools", out var it, false, true))
|
if (_dalamudReflector.TryGetDalamudPlugin("Allagan Tools", out var it, false, true))
|
||||||
{
|
{
|
||||||
var pluginLoader = it.GetType()
|
var hostedPlugin = it.GetType().BaseType!;
|
||||||
.GetProperty("PluginLoader", BindingFlags.NonPublic | BindingFlags.Instance)!
|
var host = hostedPlugin.GetField("host", BindingFlags.NonPublic | BindingFlags.Instance)!.GetValue(it)!;
|
||||||
.GetValue(it)!;
|
|
||||||
var host = pluginLoader.GetType().GetProperty("Host")!.GetValue(pluginLoader)!;
|
|
||||||
var serviceProvider = host.GetType().GetProperty("Services")!.GetValue(host)!;
|
var serviceProvider = host.GetType().GetProperty("Services")!.GetValue(host)!;
|
||||||
var getServiceMethod = serviceProvider.GetType().GetMethod("GetService")!;
|
var getServiceMethod = serviceProvider.GetType().GetMethod("GetService")!;
|
||||||
object GetService(Type t) => getServiceMethod.Invoke(serviceProvider, [t])!;
|
object GetService(Type t) => getServiceMethod.Invoke(serviceProvider, [t])!;
|
||||||
|
@ -128,7 +126,7 @@ internal sealed class AllaganToolsIpc : IDisposable
|
||||||
|
|
||||||
public Dictionary<Character, Currencies> CountCurrencies()
|
public Dictionary<Character, Currencies> CountCurrencies()
|
||||||
{
|
{
|
||||||
_pluginLog.Debug($"{_characters.GetType()}, {_inventories.GetType()}");
|
_pluginLog.Verbose($"Updating characters with {_characters.GetType()} and {_inventories.GetType()}");
|
||||||
var characters = _characters.All.ToDictionary(x => x.CharacterId, x => x);
|
var characters = _characters.All.ToDictionary(x => x.CharacterId, x => x);
|
||||||
return _inventories.All
|
return _inventories.All
|
||||||
.Where(x => characters.ContainsKey(x.Value.CharacterId))
|
.Where(x => characters.ContainsKey(x.Value.CharacterId))
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
|
<Project Sdk="Dalamud.NET.Sdk/10.0.0">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.0</Version>
|
<Version>1.2</Version>
|
||||||
<OutputPath>dist</OutputPath>
|
<OutputPath>dist</OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
@ -162,9 +162,9 @@ internal sealed class FcStatsCalculator : IDisposable
|
||||||
{
|
{
|
||||||
var atkArrays = Framework.Instance()->GetUIModule()->GetRaptureAtkModule()->AtkModule
|
var atkArrays = Framework.Instance()->GetUIModule()->GetRaptureAtkModule()->AtkModule
|
||||||
.AtkArrayDataHolder;
|
.AtkArrayDataHolder;
|
||||||
if (atkArrays.NumberArrayCount > 50)
|
if (atkArrays.NumberArrayCount > 51)
|
||||||
{
|
{
|
||||||
var fcArrayData = atkArrays.GetNumberArrayData(50);
|
var fcArrayData = atkArrays.GetNumberArrayData(51);
|
||||||
FcStats fcStats = new FcStats
|
FcStats fcStats = new FcStats
|
||||||
{
|
{
|
||||||
ContentId = localContentId,
|
ContentId = localContentId,
|
||||||
|
|
2
LLib
2
LLib
|
@ -1 +1 @@
|
||||||
Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe
|
Subproject commit 8d947be6784804a7cab120d596dd54e88e548efc
|
Loading…
Reference in New Issue