From e5f61cc901b31f2f810c4947b98b5ef251cb8175 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Tue, 11 Jan 2022 02:06:12 -0500
Subject: [PATCH] refactor: make some methods static

---
 ChatTwo/GameFunctions.cs  | 7 +++----
 ChatTwo/PayloadHandler.cs | 4 ++--
 ChatTwo/Plugin.cs         | 2 +-
 ChatTwo/Ui/Settings.cs    | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ChatTwo/GameFunctions.cs b/ChatTwo/GameFunctions.cs
index 5b83064..82d56cf 100755
--- a/ChatTwo/GameFunctions.cs
+++ b/ChatTwo/GameFunctions.cs
@@ -229,7 +229,7 @@ internal unsafe class GameFunctions : IDisposable {
         }
     }
 
-    internal void SetChatInteractable(bool interactable) {
+    internal static void SetChatInteractable(bool interactable) {
         for (var i = 0; i < 4; i++) {
             SetAddonInteractable($"ChatLogPanel_{i}", interactable);
         }
@@ -249,7 +249,7 @@ internal unsafe class GameFunctions : IDisposable {
         return (*flags & (1 << 22)) == 0;
     }
 
-    internal void OpenItemTooltip(uint id) {
+    internal static void OpenItemTooltip(uint id) {
         var atkStage = AtkStage.GetSingleton();
         var agent = Framework.Instance()->GetUiModule()->GetAgentModule()->GetAgentByInternalId(AgentId.ItemDetail);
         var addon = atkStage->RaptureAtkUnitManager->GetAddonByName("ItemDetail");
@@ -289,7 +289,7 @@ internal unsafe class GameFunctions : IDisposable {
         (*vf5)(addon, 0, 15);
     }
 
-    internal void CloseItemTooltip() {
+    internal static void CloseItemTooltip() {
         // hide addon first to prevent the "addon close" sound
         var addon = AtkStage.GetSingleton()->RaptureAtkUnitManager->GetAddonByName("ItemDetail");
         if (addon != null) {
@@ -382,7 +382,6 @@ internal unsafe class GameFunctions : IDisposable {
     // 0x10005: copy item name
     // 0x10006: search recipes using this material
 
-
     internal void TryOn(uint itemId, byte stainId) {
         if (this._tryOn == null) {
             return;
diff --git a/ChatTwo/PayloadHandler.cs b/ChatTwo/PayloadHandler.cs
index 65e47b8..083e19e 100755
--- a/ChatTwo/PayloadHandler.cs
+++ b/ChatTwo/PayloadHandler.cs
@@ -32,7 +32,7 @@ internal sealed class PayloadHandler {
         this.DrawPopups();
 
         if (this._handleTooltips && ++this._hoverCounter - this._lastHoverCounter > 1) {
-            this.Ui.Plugin.Functions.CloseItemTooltip();
+            GameFunctions.CloseItemTooltip();
             this._hoveredItem = 0;
             this._hoverCounter = this._lastHoverCounter = 0;
             this._handleTooltips = false;
@@ -91,7 +91,7 @@ internal sealed class PayloadHandler {
             }
             case ItemPayload item: {
                 if (this.Ui.Plugin.Config.NativeItemTooltips) {
-                    this.Ui.Plugin.Functions.OpenItemTooltip(item.ItemId);
+                    GameFunctions.OpenItemTooltip(item.ItemId);
 
                     this._handleTooltips = true;
                     if (this._hoveredItem != item.ItemId) {
diff --git a/ChatTwo/Plugin.cs b/ChatTwo/Plugin.cs
index 5156c5d..636bcd9 100755
--- a/ChatTwo/Plugin.cs
+++ b/ChatTwo/Plugin.cs
@@ -66,7 +66,7 @@ public sealed class Plugin : IDalamudPlugin {
 
     public void Dispose() {
         this.Framework.Update -= this.FrameworkUpdate;
-        this.Functions.SetChatInteractable(true);
+        GameFunctions.SetChatInteractable(true);
 
         this.Ui.Dispose();
         this.Store.Dispose();
diff --git a/ChatTwo/Ui/Settings.cs b/ChatTwo/Ui/Settings.cs
index a2fc89a..7eb4d92 100755
--- a/ChatTwo/Ui/Settings.cs
+++ b/ChatTwo/Ui/Settings.cs
@@ -197,7 +197,7 @@ internal sealed class Settings : IUiComponent {
             }
 
             if (!this._hideChat && hideChatChanged) {
-                this.Ui.Plugin.Functions.SetChatInteractable(true);
+                GameFunctions.SetChatInteractable(true);
             }
 
             this.Initialise();