.woodpecker.yml

@@ -8,9 +8,9 @@ clone:
 
 pipeline:
   fetch-deps:
-    image: jackbondpreston/msvb-build-env
+    image: alpine/git:latest
     commands:
-      - steamcmd "+login anonymous" "+workshop_download_item 1281930 2563309347" "+quit"
+      - 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
@@ -19,26 +19,18 @@ pipeline:
         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
+    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
@@ -62,3 +54,16 @@ pipeline:
     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/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.needRefresh = true;
 
             if (returnItem.stack != newItem.stack) {
                 if (newItem.IsACoin) {

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;

ILPatches/PlayerUpdatePatch.cs

@@ -13,7 +13,6 @@ 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;
@@ -24,24 +23,17 @@ namespace MagicStorageVoidBag.ILPatches {
             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! :(");
+                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), new[] { typeof(int) });
+            var hasItemMethod = typeof(Player).GetMethod(nameof(Player.HasItem));
-                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);
-            }
         }
     }
 }

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--;

Localization/en-US.hjson

@@ -1,17 +1,15 @@
-Mods: {
+Mods: {
 	MagicStorageVoidBag: {
-		ItemName.MSVoidBag: Magic Void Bag
+		ItemName: {
-		ItemTooltip.MSVoidBag:
+			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: ""
-			}
-		}
-	}
 }

MagicStorageVoidBag.cs

@@ -11,17 +11,17 @@ namespace MagicStorageVoidBag {
         private PlayerUpdatePatch playerUpdatePatch = new();
 
         public override void Load() {
-            Terraria.IL_Player.Update += playerUpdatePatch.Patch;
+            IL.Terraria.Player.Update += playerUpdatePatch.Patch;
 
-            Terraria.On_Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.Hook;
-            Terraria.On_Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
         }
 
         public override void Unload() {
-            Terraria.IL_Player.Update -= playerUpdatePatch.Patch;
+            IL.Terraria.Player.Update -= playerUpdatePatch.Patch;
 
-            Terraria.On_Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
-            Terraria.On_Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
 
             base.Unload();
         }

build.txt

@@ -1,7 +1,7 @@
 displayName = MagicStorage Void Bag
 author = jack
-version = 1.7
+version = 1.4
 modReferences = MagicStorage
 sortAfter = MagicStorage
 includeSource = true
-homepage = https://git.jackbondpreston.me/jack/MagicStorageVoidBag
+homepage = https://github.com/jackbondpreston/MagicStorageVoidBag