Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
01fb135385
|
|||
28ba14cb94
|
|||
d001727c2d
|
@ -33,7 +33,7 @@ namespace MagicStorageVoidBag.Hooks {
|
|||||||
|
|
||||||
heart.TryDeposit(returnItem);
|
heart.TryDeposit(returnItem);
|
||||||
heart.ResetCompactStage();
|
heart.ResetCompactStage();
|
||||||
StorageGUI.modSearchBox.OnChanged();
|
StorageGUI.needRefresh = true;
|
||||||
|
|
||||||
if (returnItem.stack != newItem.stack) {
|
if (returnItem.stack != newItem.stack) {
|
||||||
if (newItem.IsACoin) {
|
if (newItem.IsACoin) {
|
||||||
|
@ -1,34 +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.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--;
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
21
LICENSE
Normal file
21
LICENSE
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2022 Jack Bond-Preston
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
@ -15,7 +15,6 @@ namespace MagicStorageVoidBag {
|
|||||||
|
|
||||||
On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
|
On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
|
||||||
On.Terraria.Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
|
On.Terraria.Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
|
||||||
On.MagicStorage.Components.StorageHeart.RightClick += StorageHeartRightClickHook.Hook;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Unload() {
|
public override void Unload() {
|
||||||
@ -23,7 +22,6 @@ namespace MagicStorageVoidBag {
|
|||||||
|
|
||||||
On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
|
On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
|
||||||
On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
|
On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
|
||||||
On.MagicStorage.Components.StorageHeart.RightClick -= StorageHeartRightClickHook.Hook;
|
|
||||||
|
|
||||||
base.Unload();
|
base.Unload();
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,5 @@
|
|||||||
<Reference Include="MagicStorage">
|
<Reference Include="MagicStorage">
|
||||||
<HintPath>..\MagicStorage\MagicStorage.dll</HintPath>
|
<HintPath>..\MagicStorage\MagicStorage.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="MagicStorageHooks">
|
|
||||||
<HintPath>lib\MagicStorage_Hooks.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -1,8 +1,7 @@
|
|||||||
displayName = MagicStorage Void Bag
|
displayName = MagicStorage Void Bag
|
||||||
author = jack
|
author = jack
|
||||||
version = 1.2
|
version = 1.4
|
||||||
modReferences = MagicStorage
|
modReferences = MagicStorage
|
||||||
dllReferences = MagicStorage_Hooks
|
|
||||||
sortAfter = MagicStorage
|
sortAfter = MagicStorage
|
||||||
includeSource = true
|
includeSource = true
|
||||||
homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
|
homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
|
||||||
|
Binary file not shown.
Reference in New Issue
Block a user