Compare commits
No commits in common. "main" and "v1.6" have entirely different histories.
|
@ -23,10 +23,10 @@ pipeline:
|
||||||
wget https://github.com/steviegt6/tml-patcher/releases/latest/download/TML.Patcher.zip
|
wget https://github.com/steviegt6/tml-patcher/releases/latest/download/TML.Patcher.zip
|
||||||
unzip -q TML.Patcher.zip -d TMLPatcher
|
unzip -q TML.Patcher.zip -d TMLPatcher
|
||||||
- |
|
- |
|
||||||
rm -f /root/.steam/SteamApps/workshop/content/1281930/2563309347/workshop.json
|
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)
|
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)
|
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 ./
|
cp /root/.steam/steamapps/workshop/content/1281930/2563309347/$YEAR.$VER/MagicStorage.tmod ./
|
||||||
- dotnet TMLPatcher/TML.Patcher.dll extract MagicStorage.tmod
|
- dotnet TMLPatcher/TML.Patcher.dll extract MagicStorage.tmod
|
||||||
- cp MagicStorage/MagicStorage.dll $CI_WORKSPACE/
|
- cp MagicStorage/MagicStorage.dll $CI_WORKSPACE/
|
||||||
when:
|
when:
|
||||||
|
|
|
@ -12,7 +12,7 @@ using Terraria.ModLoader;
|
||||||
namespace MagicStorageVoidBag.Hooks {
|
namespace MagicStorageVoidBag.Hooks {
|
||||||
internal class GetItemVoidVaultHook {
|
internal class GetItemVoidVaultHook {
|
||||||
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
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);
|
var i = player.inventory.FirstOrDefault(i => i.type == ModContent.ItemType<MSVoidBag>(), null);
|
||||||
|
|
||||||
newItem = newItem.Clone();
|
newItem = newItem.Clone();
|
||||||
|
@ -33,7 +33,7 @@ namespace MagicStorageVoidBag.Hooks {
|
||||||
|
|
||||||
heart.TryDeposit(returnItem);
|
heart.TryDeposit(returnItem);
|
||||||
heart.ResetCompactStage();
|
heart.ResetCompactStage();
|
||||||
StorageGUI.SetRefresh();
|
StorageGUI.needRefresh = true;
|
||||||
|
|
||||||
if (returnItem.stack != newItem.stack) {
|
if (returnItem.stack != newItem.stack) {
|
||||||
if (newItem.IsACoin) {
|
if (newItem.IsACoin) {
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace MagicStorageVoidBag.Hooks {
|
||||||
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
||||||
|
|
||||||
// Despite the constant negative press cofveve
|
// 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);
|
var i = player.inventory.FirstOrDefault(i => i.type == ModContent.ItemType<MSVoidBag>(), null);
|
||||||
if (i == null) goto original;
|
if (i == null) goto original;
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@ namespace MagicStorageVoidBag.ILPatches {
|
||||||
internal class PlayerUpdatePatch : ILPatch {
|
internal class PlayerUpdatePatch : ILPatch {
|
||||||
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
||||||
public void Patch(ILContext il) {
|
public void Patch(ILContext il) {
|
||||||
try {
|
|
||||||
if (il == null) {
|
if (il == null) {
|
||||||
Logger.Error("ILContext null!");
|
Logger.Error("ILContext null!");
|
||||||
return;
|
return;
|
||||||
|
@ -24,24 +23,17 @@ namespace MagicStorageVoidBag.ILPatches {
|
||||||
var c = new ILCursor(il);
|
var c = new ILCursor(il);
|
||||||
var setterMethod = typeof(Player).GetProperty(nameof(Player.IsVoidVaultEnabled)).GetSetMethod();
|
var setterMethod = typeof(Player).GetProperty(nameof(Player.IsVoidVaultEnabled)).GetSetMethod();
|
||||||
if (!c.TryGotoNext(i => i.MatchCallOrCallvirt(setterMethod))) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Emit(OpCodes.Ldarg_0);
|
c.Emit(OpCodes.Ldarg_0);
|
||||||
c.Emit(OpCodes.Ldc_I4, ModContent.ItemType<MSVoidBag>());
|
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.Call, hasItemMethod);
|
||||||
c.Emit(OpCodes.Or);
|
c.Emit(OpCodes.Or);
|
||||||
|
|
||||||
Logger.Debug("...Complete!");
|
Logger.Debug("...Complete!");
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ILPatchFailureException(MagicStorageVoidBag.Instance, il, e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,15 @@
|
||||||
Mods: {
|
Mods: {
|
||||||
MagicStorageVoidBag: {
|
MagicStorageVoidBag: {
|
||||||
ItemName.MSVoidBag: Magic Void Bag
|
ItemName: {
|
||||||
ItemTooltip.MSVoidBag:
|
MSVoidBag: Magic Void Bag
|
||||||
|
}
|
||||||
|
ItemTooltip: {
|
||||||
|
MSVoidBag:
|
||||||
'''
|
'''
|
||||||
<right> Storage Heart to store location
|
<right> Storage Heart to store location
|
||||||
Currently not set to any location
|
Currently not set to any location
|
||||||
'''
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Items: {
|
|
||||||
MSVoidBag: {
|
|
||||||
DisplayName: M S Void Bag
|
|
||||||
Tooltip: ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -11,17 +11,17 @@ namespace MagicStorageVoidBag {
|
||||||
private PlayerUpdatePatch playerUpdatePatch = new();
|
private PlayerUpdatePatch playerUpdatePatch = new();
|
||||||
|
|
||||||
public override void Load() {
|
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() {
|
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();
|
base.Unload();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
displayName = MagicStorage Void Bag
|
displayName = MagicStorage Void Bag
|
||||||
author = jack
|
author = jack
|
||||||
version = 1.7
|
version = 1.6
|
||||||
modReferences = MagicStorage
|
modReferences = MagicStorage
|
||||||
sortAfter = MagicStorage
|
sortAfter = MagicStorage
|
||||||
includeSource = true
|
includeSource = true
|
||||||
homepage = https://git.jackbondpreston.me/jack/MagicStorageVoidBag
|
homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
|
||||||
|
|
Loading…
Reference in New Issue
Block a user