17 changed files with 153 additions and 169 deletions
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@ -0,0 +1,30 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Create changelog text
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config_file: .github/workflows/tag_changelog_config.js
+
+      - name: Create release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: ${{ steps.changelog.outputs.changes }}
--- a/.github/workflows/tag_changelog_config.js
+++ b/.github/workflows/tag_changelog_config.js
@ -0,0 +1,15 @@
+module.exports = {
+  types: [
+    { types: ["feat", "feature"], label: "🎉 New Features" },
+    { types: ["fix", "bugfix"], label: "🐛 Bugfixes" },
+    { types: ["improvements", "enhancement"], label: "🔨 Improvements" },
+    { types: ["perf"], label: "🏎️ Performance Improvements" },
+    { types: ["build", "ci"], label: "🏗️ Build System" },
+    { types: ["refactor"], label: "🪚 Refactors" },
+    { types: ["doc", "docs"], label: "📚 Documentation Changes" },
+    { types: ["test", "tests"], label: "🔍 Tests" },
+    { types: ["style"], label: "💅 Code Style Changes" },
+    { types: ["chore"], label: "🧹 Chores" },
+    { types: ["other"], label: "Other Changes" },
+  ],
+};
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,64 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git:latest
-    settings:
-      path: MagicStorageVoidBag
-    when:
-      event: tag
-
-pipeline:
-  fetch-deps:
-    image: jackbondpreston/msvb-build-env
-    commands:
-      - steamcmd "+login anonymous" "+workshop_download_item 1281930 2563309347" "+quit"
-      - wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip
-      - unzip -q tModLoader.zip -d tModLoader
-      - rm tModLoader.zip
-      - ln -sf $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2-2.0.so.0 $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2.so
-      - >
-        echo "<Project ToolsVersion=\"14.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
-            <Import Project=\"$CI_WORKSPACE/tModLoader/tMLMod.targets\" />
-        </Project>" > tModLoader.targets
-      - |
-        wget https://github.com/steviegt6/tml-patcher/releases/latest/download/TML.Patcher.zip
-        unzip -q TML.Patcher.zip -d TMLPatcher
-      - |
-        rm -f /root/.steam/SteamApps/workshop/content/1281930/2563309347/workshop.json
-        YEAR=$(ls /root/.steam/SteamApps/workshop/content/1281930/2563309347 | cut -c -4 | sort -nr | head -n 1)
-        VER=$(find /root/.steam/SteamApps/workshop/content/1281930/2563309347/ -type d -name "$YEAR.*" -printf "%f\n" | cut -c 6- | sort -nr | head -n 1)
-        cp /root/.steam/SteamApps/workshop/content/1281930/2563309347/$YEAR.$VER/MagicStorage.tmod ./
-      - dotnet TMLPatcher/TML.Patcher.dll extract MagicStorage.tmod
-      - cp MagicStorage/MagicStorage.dll $CI_WORKSPACE/
-    when:
-      event: tag
-
-  build:
-    image: jackbondpreston/msvb-build-env
-    commands:
-      - |
-        echo "Shell: $SHELL"
-        echo "CI_WORKSPACE: $CI_WORKSPACE"
-      - cat tModLoader.targets
-      - cd $CI_WORKSPACE
-      - cd MagicStorageVoidBag
-      - rm -rf .git
-      - dotnet build -c Release || true
-      - cp bin/Release/net6.0/MagicStorageVoidBag.dll .
-      - cd $CI_WORKSPACE
-      - mkdir release
-      - cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/
-      - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/
-      - ls release
-    when:
-      event: tag
-    
-  gitea-release:
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: gitea-api-key
-      base_url: https://git.jackbondpreston.me
-      files: release/*
-    when:
-      event: tag
-
--- a/Hooks/GetItemVoidVaultHook.cs
+++ b/Hooks/GetItemVoidVaultHook.cs
@ -12,7 +12,7 @@ using Terraria.ModLoader;
 namespace MagicStorageVoidBag.Hooks {
    internal class GetItemVoidVaultHook {
        private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
-        public static bool Hook(Terraria.On_Player.orig_GetItem_VoidVault orig, Player player, int plr, Item[] inventory, Item newItem, GetItemSettings settings, Item returnItem) {
+        public static bool Hook(On.Terraria.Player.orig_GetItem_VoidVault orig, Player player, int plr, Item[] inventory, Item newItem, GetItemSettings settings, Item returnItem) {
            var i = player.inventory.FirstOrDefault(i => i.type == ModContent.ItemType<MSVoidBag>(), null);

            newItem = newItem.Clone();
@ -21,19 +21,19 @@ namespace MagicStorageVoidBag.Hooks {

            var bag = (MSVoidBag)i.ModItem;

-            if (bag.Location.X < 0 || bag.Location.Y < 0) goto original;
+            if (bag.location.X < 0 || bag.location.Y < 0) goto original;

-            Tile tile = Main.tile[bag.Location.X, bag.Location.Y];
+            Tile tile = Main.tile[bag.location.X, bag.location.Y];

            if (!tile.HasTile || tile.TileType != ModContent.TileType<StorageHeart>() || tile.TileFrameX != 0 || tile.TileFrameY != 0) goto original;
-            if (!TileEntity.ByPosition.TryGetValue(bag.Location, out TileEntity te)) goto original;
+            if (!TileEntity.ByPosition.TryGetValue(bag.location, out TileEntity te)) goto original;
            if (te.type != ModContent.TileEntityType<TEStorageHeart>()) goto original;

            TEStorageHeart heart = (TEStorageHeart)te;

            heart.TryDeposit(returnItem);
            heart.ResetCompactStage();
-            StorageGUI.SetRefresh();
+            StorageGUI.modSearchBox.OnChanged();

            if (returnItem.stack != newItem.stack) {
                if (newItem.IsACoin) {
--- a/Hooks/ItemSpaceForCofveveHook.cs
+++ b/Hooks/ItemSpaceForCofveveHook.cs
@ -16,7 +16,7 @@ namespace MagicStorageVoidBag.Hooks {
        private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;

        // Despite the constant negative press cofveve
-        public static bool Hook(Terraria.On_Player.orig_ItemSpaceForCofveve orig, Player player, Item newItem) {
+        public static bool Hook(On.Terraria.Player.orig_ItemSpaceForCofveve orig, Player player, Item newItem) {
            var i = player.inventory.FirstOrDefault(i => i.type == ModContent.ItemType<MSVoidBag>(), null);
            if (i == null) goto original;

@ -24,12 +24,12 @@ namespace MagicStorageVoidBag.Hooks {

            var bag = (MSVoidBag)i.ModItem;

-            if (bag.Location.X < 0 || bag.Location.Y < 0) goto original;
+            if (bag.location.X < 0 || bag.location.Y < 0) goto original;

-            Tile tile = Main.tile[bag.Location.X, bag.Location.Y];
+            Tile tile = Main.tile[bag.location.X, bag.location.Y];

            if (!tile.HasTile || tile.TileType != ModContent.TileType<StorageHeart>() || tile.TileFrameX != 0 || tile.TileFrameY != 0) goto original;
-            if (!TileEntity.ByPosition.TryGetValue(bag.Location, out TileEntity te)) goto original;
+            if (!TileEntity.ByPosition.TryGetValue(bag.location, out TileEntity te)) goto original;
            if (te.type != ModContent.TileEntityType<TEStorageHeart>()) goto original;

            if (Utility.HeartHasSpaceFor(newItem, (TEStorageHeart)te)) return true;
--- a/Hooks/StorageHeartRightClickHook.cs
+++ b/Hooks/StorageHeartRightClickHook.cs
@ -0,0 +1,33 @@
+using MagicStorage.Components;
+using MagicStorageVoidBag.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) {
+            // 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<MSVoidBag>()) {
+                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);
+                if (player.selectedItem == 58) {
+                    Main.mouseItem = item.Clone();
+                }
+
+                Main.NewText(Language.GetTextValue("Mods.MagicStorage.LocatorSet", i, j));
+                return true;
+            }
+
+            return orig(heart, i, j);
+        }
+    }
+}
--- a/ILPatches/PlayerUpdatePatch.cs
+++ b/ILPatches/PlayerUpdatePatch.cs
@ -13,35 +13,27 @@ namespace MagicStorageVoidBag.ILPatches {
    internal class PlayerUpdatePatch : ILPatch {
        private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
        public void Patch(ILContext il) {
-            try {
-                if (il == null) {
-                    Logger.Error("ILContext null!");
-                    return;
-                }
-
-                Logger.Debug("Patching Terraria.Player.Update IL...");
-
-                var c = new ILCursor(il);
-                var setterMethod = typeof(Player).GetProperty(nameof(Player.IsVoidVaultEnabled)).GetSetMethod();
-                if (!c.TryGotoNext(i => i.MatchCallOrCallvirt(setterMethod))) {
-                    Logger.Error("Failed to go to next call or callvirt! :(");
-                    return;
-                }
-
-                c.Emit(OpCodes.Ldarg_0);
-                c.Emit(OpCodes.Ldc_I4, ModContent.ItemType<MSVoidBag>());
-                var hasItemMethod = typeof(Player).GetMethod(nameof(Player.HasItem), new[] { typeof(int) });
-                if (hasItemMethod == null) {
-                    Logger.Error("Failed to reflect Player.HasItem(int)! :(");
-                    return;
-                }
-                c.Emit(OpCodes.Call, hasItemMethod);
-                c.Emit(OpCodes.Or);
-
-                Logger.Debug("...Complete!");
-            } catch (Exception e) {
-                throw new ILPatchFailureException(MagicStorageVoidBag.Instance, il, e);
+            if (il == null) {
+                Logger.Error("ILContext null!");
+                return;
            }
+
+            Logger.Debug("Patching Terraria.Player.Update IL...");
+
+            var c = new ILCursor(il);
+            var setterMethod = typeof(Player).GetProperty(nameof(Player.IsVoidVaultEnabled)).GetSetMethod();
+            if (!c.TryGotoNext(i => i.MatchCallOrCallvirt(setterMethod))) {
+                Logger.Warn("Failed to go to next call or callvirt! :(");
+                return;
+            }
+
+            c.Emit(OpCodes.Ldarg_0);
+            c.Emit(OpCodes.Ldc_I4, ModContent.ItemType<MSVoidBag>());
+            var hasItemMethod = typeof(Player).GetMethod(nameof(Player.HasItem));
+            c.Emit(OpCodes.Call, hasItemMethod);
+            c.Emit(OpCodes.Or);
+
+            Logger.Debug("...Complete!");
        }
    }
 }
--- a/Items/MSVoidBag.cs
+++ b/Items/MSVoidBag.cs
@ -27,10 +27,10 @@ namespace MagicStorageVoidBag.Items {
        }

        public override void ModifyTooltips(List<TooltipLine> lines) {
-            bool isSet = Location.X >= 0 && Location.Y >= 0;
+            bool isSet = location.X >= 0 && location.Y >= 0;
            for (int k = 0; k < lines.Count; k++)
                if (isSet && lines[k].Mod == "Terraria" && lines[k].Name == "Tooltip1") {
-                    lines[k].Text = Language.GetTextValue("Mods.MagicStorage.SetTo", Location.X, Location.Y);
+                    lines[k].Text = Language.GetTextValue("Mods.MagicStorage.SetTo", location.X, location.Y);
                } else if (!isSet && lines[k].Mod == "Terraria" && lines[k].Name == "Tooltip2") {
                    lines.RemoveAt(k);
                    k--;
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-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.
--- a/Localization/en-US.hjson
+++ b/Localization/en-US.hjson
@ -1,17 +1,15 @@
-Mods: {
+Mods: {
 	MagicStorageVoidBag: {
-		ItemName.MSVoidBag: Magic Void Bag
-		ItemTooltip.MSVoidBag:
+		ItemName: {
+			MSVoidBag: Magic Void Bag
+		}
+		ItemTooltip: {
+			MSVoidBag:
 			'''
 			<right> Storage Heart to store location
 			Currently not set to any location
 			'''
-
-		Items: {
-			MSVoidBag: {
-				DisplayName: M S Void Bag
-				Tooltip: ""
-			}
 		}
 	}
+
 }
--- a/MagicStorageVoidBag.cs
+++ b/MagicStorageVoidBag.cs
@ -10,18 +10,20 @@ namespace MagicStorageVoidBag {
        // IL Patches
        private PlayerUpdatePatch playerUpdatePatch = new();

-        public override void Load() { 
-            Terraria.IL_Player.Update += playerUpdatePatch.Patch;
+        public override void Load() {
+            IL.Terraria.Player.Update += playerUpdatePatch.Patch;

-            Terraria.On_Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
-            Terraria.On_Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
+            On.Terraria.Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
+            On.MagicStorage.Components.StorageHeart.RightClick += StorageHeartRightClickHook.Hook;
        }

        public override void Unload() {
-            Terraria.IL_Player.Update -= playerUpdatePatch.Patch;
+            IL.Terraria.Player.Update -= playerUpdatePatch.Patch;

-            Terraria.On_Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
-            Terraria.On_Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
+            On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
+            On.MagicStorage.Components.StorageHeart.RightClick -= StorageHeartRightClickHook.Hook;

            base.Unload();
        }
--- a/MagicStorageVoidBag.csproj
+++ b/MagicStorageVoidBag.csproj
@ -12,7 +12,10 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="MagicStorage">
-      <HintPath>..\MagicStorage\MagicStorage.dll</HintPath>
+      <HintPath>../Mod Libraries/MagicStorage.dll</HintPath>
+    </Reference>
+    <Reference Include="MagicStorageHooks">
+      <HintPath>lib\MagicStorageHooks.dll</HintPath>
    </Reference>
  </ItemGroup>
 </Project>
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@ -1,16 +1,16 @@
-{
-  "profiles": {
-    "Terraria": {
-      "commandName": "Executable",
-      "executablePath": "dotnet",
-      "commandLineArgs": "$(tMLPath)",
-      "workingDirectory": "$(tMLSteamPath)"
-    },
-    "TerrariaServer": {
-      "commandName": "Executable",
-      "executablePath": "dotnet",
-      "commandLineArgs": "$(tMLServerPath)",
-      "workingDirectory": "$(tMLSteamPath)"
-    }
-  }
+{
+  "profiles": {
+    "Terraria": {
+      "commandName": "Executable",
+      "executablePath": "dotnet",
+      "commandLineArgs": "$(tMLPath)",
+      "workingDirectory": "$(tMLSteamPath)"
+    },
+    "TerrariaServer": {
+      "commandName": "Executable",
+      "executablePath": "dotnet",
+      "commandLineArgs": "$(tMLServerPath)",
+      "workingDirectory": "$(tMLSteamPath)"
+    }
+  }
 }
--- a/build.txt
+++ b/build.txt
@ -1,7 +1,8 @@
-displayName = MagicStorage Void Bag
-author = jack
-version = 1.7
-modReferences = MagicStorage
-sortAfter = MagicStorage
-includeSource = true
-homepage = https://git.jackbondpreston.me/jack/MagicStorageVoidBag
+displayName = MagicStorage Void Bag
+author = jack
+version = 1.1
+modReferences = MagicStorage
+dllReferences = MagicStorageHooks
+sortAfter = MagicStorage
+includeSource = true
+homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
--- a/description.txt
+++ b/description.txt
@ -1,4 +1,2 @@
 Adds an upgraded void bag that combines functionality of the Void Bag and Portable Remote Storage Access, by putting items into a magic storage system when your inventory is full (and allowing remote access as usual).
-This item is crafted by combining a Void Bag with a Portable Remote Storage Access. To link it with your storage system, right click the Storage Heart with the bag equipped.
-
-Thanks to the original MagicStorage mod for some code and of course the functionality of the original mod!
+This item is crafted by combining a Void Bag with a Portable Remote Storage Access. To link it with your storage system, right click the Storage Heart with the bag equipped.
--- a/description_workshop.txt
+++ b/description_workshop.txt
@ -1,7 +1,4 @@
 Adds an upgraded void bag that combines functionality of the Void Bag and Portable Remote Storage Access, by putting items into a magic storage system when your inventory is full (and allowing remote access as usual).
 This item is crafted by combining a Void Bag with a Portable Remote Storage Access. To link it with your storage system, right click the Storage Heart with the bag equipped.

-GitHub: https://github.com/jackbondpreston/MagicStorageVoidBag
-Discord server if you need support/don't want to report bugs on GitHub: https://discord.gg/Z6V77mbtZQ
-
 Thanks to the original MagicStorage mod for some code and of course the functionality of the original mod!
--- a/lib/MagicStorageHooks.dll
+++ b/lib/MagicStorageHooks.dll