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();
@@ -33,7 +33,7 @@ namespace MagicStorageVoidBag.Hooks {
 
             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;
 

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!");
         }
     }
 }

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: ""
-			}
 		}
 	}
+
 }

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;
-            Terraria.On_Player.ItemSpaceForCofveve += ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault += GetItemVoidVaultHook.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;
-            Terraria.On_Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
+            On.Terraria.Player.GetItem_VoidVault -= GetItemVoidVaultHook.Hook;
+            On.Terraria.Player.ItemSpaceForCofveve -= ItemSpaceForCofveveHook.Hook;
 
             base.Unload();
         }