diff --git a/Hooks/StorageHeartRightClickHook.cs b/Hooks/StorageHeartRightClickHook.cs index 5ca186b..31c1e86 100644 --- a/Hooks/StorageHeartRightClickHook.cs +++ b/Hooks/StorageHeartRightClickHook.cs @@ -1,24 +1,25 @@ using MagicStorage.Components; -using MagicStorageVoidBag.Items; +using MagicStorage.Items; using Terraria; using Terraria.DataStructures; using Terraria.Localization; -using Terraria.ModLoader; 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, StorageHeart heart, int i, int j) { + 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.type == ModContent.ItemType()) { + + if (item.ModItem == null) return false; + + if (item.ModItem is Locator locator) { if (Main.tile[i, j].TileFrameX % 36 == 18) i--; if (Main.tile[i, j].TileFrameY % 36 == 18) j--; - MSVoidBag bag = (MSVoidBag)item.ModItem; - bag.location = new Point16(i, j); + locator.location = new Point16(i, j); if (player.selectedItem == 58) { Main.mouseItem = item.Clone(); } diff --git a/MagicStorageVoidBag.csproj b/MagicStorageVoidBag.csproj index 4f1d66d..c650833 100644 --- a/MagicStorageVoidBag.csproj +++ b/MagicStorageVoidBag.csproj @@ -12,10 +12,10 @@ - ../MagicStorage/MagicStorage.dll + ..\MagicStorage\MagicStorage.dll - lib/MagicStorageHooks.dll + lib\MagicStorage_Hooks.dll \ No newline at end of file diff --git a/build.txt b/build.txt index addf245..57d8083 100644 --- a/build.txt +++ b/build.txt @@ -1,8 +1,8 @@ displayName = MagicStorage Void Bag author = jack -version = 1.1 +version = 1.2 modReferences = MagicStorage -dllReferences = MagicStorageHooks +dllReferences = MagicStorage_Hooks sortAfter = MagicStorage includeSource = true homepage = https://github.com/jackbondpreston/MagicStorageVoidBag diff --git a/lib/MagicStorageHooks.dll b/lib/MagicStorageHooks.dll deleted file mode 100644 index d877b81..0000000 Binary files a/lib/MagicStorageHooks.dll and /dev/null differ diff --git a/lib/MagicStorage_Hooks.dll b/lib/MagicStorage_Hooks.dll new file mode 100644 index 0000000..a373a2f Binary files /dev/null and b/lib/MagicStorage_Hooks.dll differ