Merge pull request #4 from Drakansoul/fix-plugin

Fix plugin
Drakansoul · Jul 8, 2024 · d0dc907 · d0dc907
2 parents 6389f6f + 4d2b77f
commit d0dc907
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 54 deletions.
diff --git a/DisPlacePlugin/Configuration.cs b/DisPlacePlugin/Configuration.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Dalamud.Configuration;
-using Dalamud.Plugin;
-using DisPlacePlugin.Objects;
 
 namespace DisPlacePlugin
 {

diff --git a/DisPlacePlugin/DalamudApi.cs b/DisPlacePlugin/DalamudApi.cs
@@ -1,6 +1,4 @@
-global using Dalamud;
-using Dalamud.Game;
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Game;
 using Dalamud.IoC;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;

diff --git a/DisPlacePlugin/DisPlacePlugin.cs b/DisPlacePlugin/DisPlacePlugin.cs
@@ -1,19 +1,6 @@
-using Dalamud.Data;
-using Dalamud.Game;
-using Dalamud.Game.ClientState;
-using Dalamud.Game.ClientState.Objects;
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Game.Command;
-using Dalamud.Game.Gui;
-using Dalamud.Game.Network;
-using Dalamud.IoC;
-using Dalamud.Logging;
+using Dalamud.Game.Command;
 using Dalamud.Plugin;
-using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using FFXIVClientStructs.FFXIV.Client.Game.MJI;
-using FFXIVClientStructs.FFXIV.Client.Game.Object;
-using ImGuiScene;
 using Lumina.Excel.GeneratedSheets;
 using DisPlacePlugin.Objects;
 using DisPlacePlugin.Util;
@@ -97,8 +84,8 @@ public void Initialize()
 
             IsSaveLayoutHook = HookManager.Hook<UpdateLayoutDelegate>("40 53 48 83 ec 20 48 8b d9 48 8b 0d ?? ?? ?? ?? e8 ?? ?? ?? ?? 33 d2 48 8b c8 e8 ?? ?? ?? ?? 84 c0 75 ?? 38 83 ?? 01 00 00", IsSaveLayoutDetour);
 
-            SelectItemHook = HookManager.Hook<SelectItemDelegate>("48 89 5c 24 18 55 56 57 41 54 41 55 41 56 41 57 48 83 ec ??", SelectItemDetour);
-
+            SelectItemHook = HookManager.Hook<SelectItemDelegate>("E8 ?? ?? 00 00 48 8B CE E8 ?? ?? 00 00 48 8B ?? ?? ?? 48", SelectItemDetour);
+            
             UpdateYardObjHook = HookManager.Hook<UpdateYardDelegate>("48 89 74 24 18 57 48 83 ec 20 b8 dc 02 00 00 0f b7 f2 ??", UpdateYardObj);
 
             GetGameObjectHook = HookManager.Hook<GetObjectDelegate>("48 89 5c 24 08 48 89 74 24 10 57 48 83 ec 20 0f b7 f2 33 db 0f 1f 40 00 0f 1f 84 00 00 00 00 00", GetGameObject);
@@ -142,7 +129,7 @@ private void UpdateYardObj(IntPtr objectList, ushort index)
         {
             UpdateYardObjHook.Original(objectList, index);
         }
-
+        
         unsafe static public void SelectItemDetour(IntPtr housing, IntPtr item)
         {
             SelectItemHook.Original(housing, item);
@@ -153,7 +140,7 @@ unsafe static public void SelectItem(IntPtr item)
         {
             SelectItemDetour((IntPtr)Memory.Instance.HousingStructure, item);
         }
-
+        
 
         public unsafe void PlaceItems()
         {
@@ -183,7 +170,7 @@ public unsafe void PlaceItems()
                         Log($"{item.Name} is already correctly placed");
                         continue;
                     }
-
+                    
                     SetItemPosition(item);
 
                     if (Config.LoadInterval > 0)
@@ -218,15 +205,20 @@ unsafe public static void SetItemPosition(HousingItem rowItem)
 
             if (rowItem.ItemStruct == IntPtr.Zero) return;
 
-            Log("Placing " + rowItem.Name);
-
             var MemInstance = Memory.Instance;
 
             logHousingDetour = true;
             ApplyChange = true;
 
-            SelectItem(rowItem.ItemStruct);
+            //SelectItem(rowItem.ItemStruct);
+
+            var thisItem = MemInstance.HousingStructure->ActiveItem;
+            if (thisItem == null) {
+                    DalamudApi.PluginLog.Error("Error occured while writing position! Item Was null");
+                    return;
+            }
 
+            Log("Placing " + rowItem.Name);
 
             Vector3 position = new Vector3(rowItem.X, rowItem.Y, rowItem.Z);
             Vector3 rotation = new Vector3();

diff --git a/DisPlacePlugin/Gui/ConfigurationWindow.cs b/DisPlacePlugin/Gui/ConfigurationWindow.cs
@@ -132,11 +132,14 @@ private void LogLayoutMode()
 
         private bool CheckModeForSave()
         {
+            return true; // LOL, LMAO
+            /*
             if (Memory.Instance.IsHousingMode()) return true;
 
             LogError("Unable to save layouts outside of Layout mode");
             LogLayoutMode();
             return false;
+            */
         }
 
         private bool CheckModeForLoad()
@@ -310,10 +313,9 @@ unsafe private void DrawGeneralSettings()
 
             ImGui.Dummy(new Vector2(0, 15));
 
-            //bool noFloors = Memory.Instance.GetCurrentTerritory() != Memory.HousingArea.Indoors || Memory.Instance.GetIndoorHouseSize().Equals("Apartment");
+            bool noFloors = Memory.Instance.GetCurrentTerritory() != Memory.HousingArea.Indoors || Memory.Instance.GetIndoorHouseSize().Equals("Apartment");
 
-            //if (!noFloors)
-            if(false)
+            if (!noFloors)
             {
 
                 ImGui.Text("Selected Floors");

diff --git a/DisPlacePlugin/Memory.cs b/DisPlacePlugin/Memory.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices;
-using Dalamud.Game;
-using Dalamud.Logging;
-using Dalamud.Plugin;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.MJI;
 using Lumina.Excel.GeneratedSheets;
@@ -342,8 +338,9 @@ public unsafe void WritePosition(Vector3 newPosition)
             try
             {
                 var item = HousingStructure->ActiveItem;
-                if (item == null)
+                if (item == null) {
                     return;
+                }
 
                 // Set the position.
                 item->Position = newPosition;

diff --git a/DisPlacePlugin/Objects/Structs.cs b/DisPlacePlugin/Objects/Structs.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.InteropServices;
-using FFXIVClientStructs.FFXIV.Client.Game;
-using FFXIVClientStructs.FFXIV.Client.Game.MJI;
-using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using Lumina.Excel.GeneratedSheets;
-using static FFXIVClientStructs.FFXIV.Client.Game.InventoryItem;
-using static DisPlacePlugin.Utils;
 
 namespace DisPlacePlugin
 {

diff --git a/DisPlacePlugin/Util/HookManager.cs b/DisPlacePlugin/Util/HookManager.cs
@@ -1,11 +1,6 @@
-using Dalamud.Game;
-using Dalamud.Hooking;
-using Dalamud.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DisPlacePlugin
 {

diff --git a/DisPlacePlugin/Util/HookWrapper.cs b/DisPlacePlugin/Util/HookWrapper.cs
@@ -1,7 +1,5 @@
 using System;
 using Dalamud.Hooking;
-using Dalamud.Logging;
-using Dalamud.Plugin;
 
 namespace DisPlacePlugin
 {

diff --git a/DisPlacePlugin/Util/Plots.cs b/DisPlacePlugin/Util/Plots.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DisPlacePlugin.Util
 {

diff --git a/DisPlacePlugin/Util/Utils.cs b/DisPlacePlugin/Util/Utils.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using Dalamud.Logging;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 using DisPlacePlugin.Objects;