liza/KitchenSink
liza/KitchenSink
1
0
Fork 0
Code Issues Pull Requests Releases 10 Activity

API 11 (untested)

Browse Source
This commit is contained in:
Liza 2024-11-19 19:42:43 +01:00
parent fa4f8c2b2c
commit e615cdfcd9
Signed by: liza
GPG Key ID: 7199F8D727D55F67
8 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AutoRetainerAPI

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

2
ECommons

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

3
KitchenSink.sln.DotSettings Normal file
View File

@ -0,0 +1,3 @@
<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></wpf:ResourceDictionary>

11
KitchenSink/Commands/CharacterSwitch.cs
View File

@ -10,6 +10,7 @@ using Dalamud.Game.Text;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using Dalamud.Plugin.Ipc.Exceptions; using Dalamud.Plugin.Ipc.Exceptions;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.Input;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
namespace KitchenSink.Commands; namespace KitchenSink.Commands;
@ -55,13 +56,13 @@ internal sealed class CharacterSwitch : IDisposable
{ {
unsafe unsafe
{ {
uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.Id; uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.RowId;
uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.Id; uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.RowId;
if (homeWorldId == currentWorldId) if (homeWorldId == currentWorldId)
{ {
UIInputData* uiInputData = UIInputData.Instance(); UIInputData* uiInputData = UIInputData.Instance();
MouseButtonFlags mouseButtonFlags = MouseButtonFlags mouseButtonFlags =
uiInputData != null ? uiInputData->MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON; uiInputData != null ? uiInputData->CursorInputs.MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON;
var target = FindCharacter(mouseButtonFlags.HasFlag(MouseButtonFlags.RBUTTON) ? -1 : 1); var target = FindCharacter(mouseButtonFlags.HasFlag(MouseButtonFlags.RBUTTON) ? -1 : 1);
SwitchCharacter(target); SwitchCharacter(target);
} }
@ -196,8 +197,8 @@ internal sealed class CharacterSwitch : IDisposable
try try
{ {
string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.GameData?.Name?.ToString(); string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.Value.Name.ToString();
string? homeWorld = _clientState.LocalPlayer?.HomeWorld.GameData?.Name?.ToString(); string? homeWorld = _clientState.LocalPlayer?.HomeWorld.Value.Name.ToString();
var characterIds = _autoRetainerApi.GetRegisteredCharacters() ?? new(); var characterIds = _autoRetainerApi.GetRegisteredCharacters() ?? new();
var characterIdsOnHomeWorld = characterIds var characterIdsOnHomeWorld = characterIds
.Where(x => _autoRetainerApi.GetOfflineCharacterData(x)?.World == homeWorld).ToList(); .Where(x => _autoRetainerApi.GetOfflineCharacterData(x)?.World == homeWorld).ToList();

4
KitchenSink/Commands/DropboxQueue.cs
View File

@ -240,12 +240,12 @@ internal sealed class DropboxQueue : IDisposable
if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality)) if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality))
itemCount = itemCount with itemCount = itemCount with
{ {
HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity HighQualityQuantity = itemCount.HighQualityQuantity + item->Quantity
}; };
else else
itemCount = itemCount with itemCount = itemCount with
{ {
NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity NormalQualityQuantity = itemCount.NormalQualityQuantity + item->Quantity
}; };
allItems[item->ItemId] = itemCount; allItems[item->ItemId] = itemCount;

4
KitchenSink/KitchenSink.csproj
View File

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

8
KitchenSink/packages.lock.json
View File

@ -4,9 +4,9 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "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": { "DotNet.ReproducibleBuilds": {
"type": "Direct", "type": "Direct",
@ -88,7 +88,7 @@
"llib": { "llib": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"DalamudPackager": "[2.1.13, )" "DalamudPackager": "[11.0.0, )"
} }
} }
} }

2
LLib

@ -1 +1 @@
Subproject commit 93fac6efb01a1272192d929fd863328271512ea4 Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c