API 11 (untested)
This commit is contained in:
parent
fa4f8c2b2c
commit
e615cdfcd9
@ -1 +1 @@
|
||||
Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
|
||||
Subproject commit 069cf988b5da8657bc13ade73bfcbc2675601023
|
2
ECommons
2
ECommons
@ -1 +1 @@
|
||||
Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a
|
||||
Subproject commit 974a0ef35536b7f0a10a278539f7136d6966baa3
|
3
KitchenSink.sln.DotSettings
Normal file
3
KitchenSink.sln.DotSettings
Normal 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>
|
@ -10,6 +10,7 @@ using Dalamud.Game.Text;
|
||||
using Dalamud.Interface.ImGuiNotification;
|
||||
using Dalamud.Plugin.Ipc.Exceptions;
|
||||
using Dalamud.Plugin.Services;
|
||||
using FFXIVClientStructs.FFXIV.Client.System.Input;
|
||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||
|
||||
namespace KitchenSink.Commands;
|
||||
@ -55,13 +56,13 @@ internal sealed class CharacterSwitch : IDisposable
|
||||
{
|
||||
unsafe
|
||||
{
|
||||
uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.Id;
|
||||
uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.Id;
|
||||
uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.RowId;
|
||||
uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.RowId;
|
||||
if (homeWorldId == currentWorldId)
|
||||
{
|
||||
UIInputData* uiInputData = UIInputData.Instance();
|
||||
MouseButtonFlags mouseButtonFlags =
|
||||
uiInputData != null ? uiInputData->MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON;
|
||||
uiInputData != null ? uiInputData->CursorInputs.MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON;
|
||||
var target = FindCharacter(mouseButtonFlags.HasFlag(MouseButtonFlags.RBUTTON) ? -1 : 1);
|
||||
SwitchCharacter(target);
|
||||
}
|
||||
@ -196,8 +197,8 @@ internal sealed class CharacterSwitch : IDisposable
|
||||
|
||||
try
|
||||
{
|
||||
string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.GameData?.Name?.ToString();
|
||||
string? homeWorld = _clientState.LocalPlayer?.HomeWorld.GameData?.Name?.ToString();
|
||||
string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.Value.Name.ToString();
|
||||
string? homeWorld = _clientState.LocalPlayer?.HomeWorld.Value.Name.ToString();
|
||||
var characterIds = _autoRetainerApi.GetRegisteredCharacters() ?? new();
|
||||
var characterIdsOnHomeWorld = characterIds
|
||||
.Where(x => _autoRetainerApi.GetOfflineCharacterData(x)?.World == homeWorld).ToList();
|
||||
|
@ -240,12 +240,12 @@ internal sealed class DropboxQueue : IDisposable
|
||||
if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality))
|
||||
itemCount = itemCount with
|
||||
{
|
||||
HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity
|
||||
HighQualityQuantity = itemCount.HighQualityQuantity + item->Quantity
|
||||
};
|
||||
else
|
||||
itemCount = itemCount with
|
||||
{
|
||||
NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity
|
||||
NormalQualityQuantity = itemCount.NormalQualityQuantity + item->Quantity
|
||||
};
|
||||
|
||||
allItems[item->ItemId] = itemCount;
|
||||
|
@ -1,6 +1,6 @@
|
||||
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
|
||||
<Project Sdk="Dalamud.NET.Sdk/11.0.0">
|
||||
<PropertyGroup>
|
||||
<Version>1.2</Version>
|
||||
<Version>2.0</Version>
|
||||
<OutputPath>dist</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
|
@ -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",
|
||||
@ -88,7 +88,7 @@
|
||||
"llib": {
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"DalamudPackager": "[2.1.13, )"
|
||||
"DalamudPackager": "[11.0.0, )"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
2
LLib
2
LLib
@ -1 +1 @@
|
||||
Subproject commit 93fac6efb01a1272192d929fd863328271512ea4
|
||||
Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c
|
Loading…
Reference in New Issue
Block a user