fix: fix issue with orig() call not working by doing it ourselves

.github/workflows/tag.yml

@@ -1,30 +0,0 @@
-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 }}

.github/workflows/tag_changelog_config.js

@@ -1,15 +0,0 @@
-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" },
-  ],
-};

.woodpecker.yml

@@ -0,0 +1,69 @@
+clone:
+  git:
+    image: woodpeckerci/plugin-git:latest
+    settings:
+      path: MagicStorageVoidBag
+    when:
+      event: tag
+
+pipeline:
+  fetch-deps:
+    image: alpine/git:latest
+    commands:
+      - git clone https://github.com/blushiemagic/MagicStorage.git
+      - 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
+    when:
+      event: tag
+
+  build:
+    image: jackbondpreston/fna-alpine
+    commands:
+      - |
+        echo "Shell: $SHELL"
+        echo "CI_WORKSPACE: $CI_WORKSPACE"
+      - cat tModLoader.targets
+      - cd MagicStorage && dotnet build -c Release || true
+      - cp bin/Release/net6.0/MagicStorage.dll .
+      - 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
+
+  github-release:
+    image: plugins/github-release
+    settings:
+      api_key:
+        from_secret: github-api-key
+      base_url: https://github.com/api/v3/
+      upload_url: https://github.com/api/uploads
+      files: release/*
+    environment:
+      - DRONE_REPO_OWNER=jackbondpreston
+      - CI_REPO_OWNER=jackbondpreston
+    when:
+      event: tag

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<MSVoidBag>()) {
+
+            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;
+                locator.location = new Point16(i, j);
-                bag.location = new Point16(i, j);
                 if (player.selectedItem == 58) {
                     Main.mouseItem = item.Clone();
                 }

MagicStorageVoidBag.csproj

@@ -12,10 +12,10 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MagicStorage">
-      <HintPath>../Mod Libraries/MagicStorage.dll</HintPath>
+      <HintPath>..\MagicStorage\MagicStorage.dll</HintPath>
     </Reference>
     <Reference Include="MagicStorageHooks">
-      <HintPath>lib\MagicStorageHooks.dll</HintPath>
+      <HintPath>lib\MagicStorage_Hooks.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>

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

description.txt

@@ -1,2 +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.
+
+Thanks to the original MagicStorage mod for some code and of course the functionality of the original mod!

description_workshop.txt

@@ -1,4 +1,7 @@
 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!