From 3ea47114030b9eb7f6ab8b3bfa24083de5f4102a Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Wed, 11 Jan 2023 14:08:20 -0500 Subject: [PATCH] fix: change signatures for 6.3 --- ChatTwo/GameFunctions/Chat.cs | 2 +- ChatTwo/GameFunctions/Context.cs | 2 +- ChatTwo/Ui/Settings.cs | 1 - ChatTwo/packages.lock.json | 26 +++++++++++++------------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ChatTwo/GameFunctions/Chat.cs b/ChatTwo/GameFunctions/Chat.cs index 28f7475..28e6d4e 100755 --- a/ChatTwo/GameFunctions/Chat.cs +++ b/ChatTwo/GameFunctions/Chat.cs @@ -38,7 +38,7 @@ internal sealed unsafe class Chat : IDisposable { [Signature("44 8B 89 ?? ?? ?? ?? 4C 8B C1 45 85 C9")] private readonly delegate* unmanaged _getTellHistory = null!; - [Signature("E8 ?? ?? ?? ?? B8 ?? ?? ?? ?? 48 8D 4D 50")] + [Signature("E8 ?? ?? ?? ?? 48 8D 4D 50 E8 ?? ?? ?? ?? 48 8B 17")] private readonly delegate* unmanaged _printTell = null!; [Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 01")] diff --git a/ChatTwo/GameFunctions/Context.cs b/ChatTwo/GameFunctions/Context.cs index 0b64f47..5b863e2 100755 --- a/ChatTwo/GameFunctions/Context.cs +++ b/ChatTwo/GameFunctions/Context.cs @@ -48,7 +48,7 @@ internal sealed unsafe class Context { return; } - // 6.05: 20E4CB + // 6.3: 221EFD var a1 = this.Plugin.Functions.GetInfoProxyByIndex(0x14); fixed (byte* namePtr = name.ToTerminatedBytes()) { diff --git a/ChatTwo/Ui/Settings.cs b/ChatTwo/Ui/Settings.cs index fda897e..00501c5 100755 --- a/ChatTwo/Ui/Settings.cs +++ b/ChatTwo/Ui/Settings.cs @@ -13,7 +13,6 @@ internal sealed class Settings : IUiComponent { private Configuration Mutable { get; } private List Tabs { get; } - private int _currentTab; internal Settings(PluginUi ui) { diff --git a/ChatTwo/packages.lock.json b/ChatTwo/packages.lock.json index 2ae5c01..d54fc47 100755 --- a/ChatTwo/packages.lock.json +++ b/ChatTwo/packages.lock.json @@ -1,24 +1,24 @@ { "version": 1, "dependencies": { - "net6.0-windows7.0": { + "net7.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.8, )", - "resolved": "2.1.8", - "contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A==" + "requested": "[2.1.10, )", + "resolved": "2.1.10", + "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw==" }, "LiteDB": { "type": "Direct", - "requested": "[5.0.12, )", - "resolved": "5.0.12", - "contentHash": "HaOjSIGS9BRm7dw42qcHd5NGYl5wdjsFB31pImt3QQNLKUNEmRAr7ADos5VsujwBc9c4otJgb+G6NA4MlzKyAw==" + "requested": "[5.0.15, )", + "resolved": "5.0.15", + "contentHash": "nucyfCOGSATH553BxplxExP3BOqEwmHt0B57426EIaQjD3CC1Odb52VVCGgTxyYaD2oe3B/cJk8jDo6XiBJqPg==" }, "Pidgin": { "type": "Direct", - "requested": "[3.2.0, )", - "resolved": "3.2.0", - "contentHash": "pUm2B95hRRvcPO50mCMUST2B3/M6b99CUHaZOIpFJpnD2twgKea83ZqYyllvwxr64EIhch9o/xy02zfbisg1Kw==" + "requested": "[3.2.1, )", + "resolved": "3.2.1", + "contentHash": "Jl7OaTEcyMxh4bCLTyh8Tnk0Efwd4hIYvszaLkFhU6oDIa7rdZF1s9f1MAvC4xyevzGwR8ZmVTQwoDyih6/66A==" }, "SharpDX.Direct2D1": { "type": "Direct", @@ -33,9 +33,9 @@ }, "XivCommon": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "X58/iHscbwzF9JziooBKYE4S0XDYuGYI7Eg5Er1LhdQSjGwMLes0whRdKtH591wIhefFiS5G14W6EEL3Qt76wg==" + "requested": "[7.0.0-alpha.1, )", + "resolved": "7.0.0-alpha.1", + "contentHash": "4Yy4Wg3bnI/g9BSEYAqOZALmVMJZS0wcP847VlUIThBqIS/47O6tw2BI84he4KuPSTfIsYOzrcz3vAia8+Pn3g==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive",