diff --git a/Hooks/GetItemVoidVaultHook.cs b/Hooks/GetItemVoidVaultHook.cs index 800ed09..372527e 100644 --- a/Hooks/GetItemVoidVaultHook.cs +++ b/Hooks/GetItemVoidVaultHook.cs @@ -33,7 +33,7 @@ namespace MagicStorageVoidBag.Hooks { heart.TryDeposit(returnItem); heart.ResetCompactStage(); - StorageGUI.modSearchBox.OnChanged(); + StorageGUI.needRefresh = true; if (returnItem.stack != newItem.stack) { if (newItem.IsACoin) { diff --git a/Hooks/StorageHeartRightClickHook.cs b/Hooks/StorageHeartRightClickHook.cs deleted file mode 100644 index d66e03e..0000000 --- a/Hooks/StorageHeartRightClickHook.cs +++ /dev/null @@ -1,32 +0,0 @@ -using MagicStorage.Components; -using MagicStorage.Items; -using Terraria; -using Terraria.DataStructures; -using Terraria.Localization; - - -namespace MagicStorageVoidBag.Hooks { - internal class StorageHeartRightClickHook { - private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger; - public static bool Hook(On.MagicStorage.Components.StorageHeart.orig_RightClick orig, MagicStorage.Components.StorageHeart heart, int i, int j) { - // https://github.com/blushiemagic/MagicStorage/blob/1.4-stable/Components/StorageHeart.cs#L23 - Player player = Main.LocalPlayer; - Item item = player.HeldItem; - - if (!item.IsAir && item.ModItem is Locator locator) { - if (Main.tile[i, j].TileFrameX % 36 == 18) i--; - if (Main.tile[i, j].TileFrameY % 36 == 18) j--; - - locator.location = new Point16(i, j); - if (player.selectedItem == 58) { - Main.mouseItem = item.Clone(); - } - - Main.NewText(Language.GetTextValue("Mods.MagicStorage.LocatorSet", i, j)); - return true; - } - - return orig(heart, i, j); - } - } -} diff --git a/MagicStorageVoidBag.cs b/MagicStorageVoidBag.cs index 18bf333..fa7e1ef 100644 --- a/MagicStorageVoidBag.cs +++ b/MagicStorageVoidBag.cs @@ -15,7 +15,6 @@ namespace MagicStorageVoidBag { On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook; On.Terraria.Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook; - On.MagicStorage.Components.StorageHeart.RightClick += StorageHeartRightClickHook.Hook; } public override void Unload() { @@ -23,7 +22,6 @@ namespace MagicStorageVoidBag { On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook; On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook; - On.MagicStorage.Components.StorageHeart.RightClick -= StorageHeartRightClickHook.Hook; base.Unload(); } diff --git a/MagicStorageVoidBag.csproj b/MagicStorageVoidBag.csproj index c650833..9aa1d81 100644 --- a/MagicStorageVoidBag.csproj +++ b/MagicStorageVoidBag.csproj @@ -14,8 +14,5 @@ ..\MagicStorage\MagicStorage.dll - - lib\MagicStorage_Hooks.dll - \ No newline at end of file diff --git a/build.txt b/build.txt index 2abba43..22c474b 100644 --- a/build.txt +++ b/build.txt @@ -1,8 +1,7 @@ displayName = MagicStorage Void Bag author = jack -version = 1.3 +version = 1.4 modReferences = MagicStorage -dllReferences = MagicStorage_Hooks sortAfter = MagicStorage includeSource = true homepage = https://github.com/jackbondpreston/MagicStorageVoidBag diff --git a/lib/MagicStorage_Hooks.dll b/lib/MagicStorage_Hooks.dll deleted file mode 100644 index a373a2f..0000000 Binary files a/lib/MagicStorage_Hooks.dll and /dev/null differ