ci: fix ci

This fix is now part of mainline Magic Storage

.woodpecker.yml

@@ -1,69 +1,64 @@
-clone:
+clone:
-  git:
+  git:
-    image: woodpeckerci/plugin-git:latest
+    image: woodpeckerci/plugin-git:latest
-    settings:
+    settings:
-      path: MagicStorageVoidBag
+      path: MagicStorageVoidBag
-    when:
+    when:
-      event: tag
+      event: tag
-
+
-pipeline:
+pipeline:
-  fetch-deps:
+  fetch-deps:
-    image: alpine/git:latest
+    image: jackbondpreston/msvb-build-env
-    commands:
+    commands:
-      - git clone https://github.com/blushiemagic/MagicStorage.git
+      - steamcmd "+login anonymous" "+workshop_download_item 1281930 2563309347" "+quit"
-      - wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip
+      - wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip
-      - unzip -q tModLoader.zip -d tModLoader
+      - unzip -q tModLoader.zip -d tModLoader
-      - rm tModLoader.zip
+      - rm tModLoader.zip
-      - ln -sf $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2-2.0.so.0 $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2.so
+      - 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\">
+        echo "<Project ToolsVersion=\"14.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
-            <Import Project=\"$CI_WORKSPACE/tModLoader/tMLMod.targets\" />
+            <Import Project=\"$CI_WORKSPACE/tModLoader/tMLMod.targets\" />
-        </Project>" > tModLoader.targets
+        </Project>" > tModLoader.targets
-    when:
+      - |
-      event: tag
+        wget https://github.com/steviegt6/tml-patcher/releases/latest/download/TML.Patcher.zip
-
+        unzip -q TML.Patcher.zip -d TMLPatcher
-  build:
+      - |
-    image: jackbondpreston/fna-alpine
+        rm -f /root/.steam/SteamApps/workshop/content/1281930/2563309347/workshop.json
-    commands:
+        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)
-        echo "Shell: $SHELL"
+        cp /root/.steam/SteamApps/workshop/content/1281930/2563309347/$YEAR.$VER/MagicStorage.tmod ./
-        echo "CI_WORKSPACE: $CI_WORKSPACE"
+      - dotnet TMLPatcher/TML.Patcher.dll extract MagicStorage.tmod
-      - cat tModLoader.targets
+      - cp MagicStorage/MagicStorage.dll $CI_WORKSPACE/
-      - cd MagicStorage && dotnet build -c Release || true
+    when:
-      - cp bin/Release/net6.0/MagicStorage.dll .
+      event: tag
-      - cd $CI_WORKSPACE
+
-      - cd MagicStorageVoidBag
+  build:
-      - rm -rf .git
+    image: jackbondpreston/msvb-build-env
-      - dotnet build -c Release || true
+    commands:
-      - cp bin/Release/net6.0/MagicStorageVoidBag.dll .
+      - |
-      - cd $CI_WORKSPACE
+        echo "Shell: $SHELL"
-      - mkdir release
+        echo "CI_WORKSPACE: $CI_WORKSPACE"
-      - cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/
+      - cat tModLoader.targets
-      - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/
+      - cd $CI_WORKSPACE
-      - ls release
+      - cd MagicStorageVoidBag
-    when:
+      - rm -rf .git
-      event: tag
+      - dotnet build -c Release || true
-    
+      - cp bin/Release/net6.0/MagicStorageVoidBag.dll .
-  gitea-release:
+      - cd $CI_WORKSPACE
-    image: plugins/gitea-release
+      - mkdir release
-    settings:
+      - cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/
-      api_key:
+      - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/
-        from_secret: gitea-api-key
+      - ls release
-      base_url: https://git.jackbondpreston.me
+    when:
-      files: release/*
+      event: tag
-    when:
+    
-      event: tag
+  gitea-release:
-
+    image: plugins/gitea-release
-  github-release:
+    settings:
-    image: plugins/github-release
+      api_key:
-    settings:
+        from_secret: gitea-api-key
-      api_key:
+      base_url: https://git.jackbondpreston.me
-        from_secret: github-api-key
+      files: release/*
-      base_url: https://github.com/api/v3/
+    when:
-      upload_url: https://github.com/api/uploads
+      event: tag
-      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(On.Terraria.Player.orig_GetItem_VoidVault orig, Player player, int plr, Item[] inventory, Item newItem, GetItemSettings settings, Item returnItem) {
+        public static bool Hook(Terraria.On_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.needRefresh = true;
+            StorageGUI.SetRefresh();
 
             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(On.Terraria.Player.orig_ItemSpaceForCofveve orig, Player player, Item newItem) {
+        public static bool Hook(Terraria.On_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,27 +13,35 @@ namespace MagicStorageVoidBag.ILPatches {
     internal class PlayerUpdatePatch : ILPatch {
         private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
         public void Patch(ILContext il) {
-            if (il == null) {
+            try {
-                Logger.Error("ILContext null!");
+                if (il == null) {
-                return;
+                    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);
             }
-
-            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!");
         }
     }
 }

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,15 +1,17 @@
-Mods: {
+Mods: {
 	MagicStorageVoidBag: {
-		ItemName: {
+		ItemName.MSVoidBag: Magic Void Bag
-			MSVoidBag: Magic Void Bag
+		ItemTooltip.MSVoidBag:
-		}
-		ItemTooltip: {
-			MSVoidBag:
 			'''
 			<right> Storage Heart to store location
 			Currently not set to any location
 			'''
+
+		Items: {
+			MSVoidBag: {
+				DisplayName: M S Void Bag
+				Tooltip: ""
+			}
 		}
 	}
-
 }

MagicStorageVoidBag.cs

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

Properties/launchSettings.json

@@ -1,16 +1,16 @@
-{
+{
-  "profiles": {
+  "profiles": {
-    "Terraria": {
+    "Terraria": {
-      "commandName": "Executable",
+      "commandName": "Executable",
-      "executablePath": "dotnet",
+      "executablePath": "dotnet",
-      "commandLineArgs": "$(tMLPath)",
+      "commandLineArgs": "$(tMLPath)",
-      "workingDirectory": "$(tMLSteamPath)"
+      "workingDirectory": "$(tMLSteamPath)"
-    },
+    },
-    "TerrariaServer": {
+    "TerrariaServer": {
-      "commandName": "Executable",
+      "commandName": "Executable",
-      "executablePath": "dotnet",
+      "executablePath": "dotnet",
-      "commandLineArgs": "$(tMLServerPath)",
+      "commandLineArgs": "$(tMLServerPath)",
-      "workingDirectory": "$(tMLSteamPath)"
+      "workingDirectory": "$(tMLSteamPath)"
-    }
+    }
-  }
+  }
 }

build.txt

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