fix: work around magic storage locator sync bug
This commit is contained in:
parent
87378aeb00
commit
0e4aa1caa5
@ -1,15 +1,21 @@
|
|||||||
using MagicStorage.Items;
|
using MagicStorage.Items;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using Terraria;
|
using Terraria;
|
||||||
|
using Terraria.DataStructures;
|
||||||
using Terraria.GameContent.Creative;
|
using Terraria.GameContent.Creative;
|
||||||
using Terraria.ID;
|
using Terraria.ID;
|
||||||
using Terraria.Localization;
|
using Terraria.Localization;
|
||||||
using Terraria.ModLoader;
|
using Terraria.ModLoader;
|
||||||
|
using Terraria.ModLoader.IO;
|
||||||
|
|
||||||
namespace MagicStorageVoidBag.Items {
|
namespace MagicStorageVoidBag.Items {
|
||||||
[ExtendsFromMod("MagicStorage")]
|
[ExtendsFromMod("MagicStorage")]
|
||||||
public class MSVoidBag : PortableAccess {
|
public class MSVoidBag : PortableAccess {
|
||||||
|
[CloneByReference]
|
||||||
|
internal Dictionary<string, Point16> locationsByWorld = new();
|
||||||
|
|
||||||
public override void SetStaticDefaults() {
|
public override void SetStaticDefaults() {
|
||||||
CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;
|
CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;
|
||||||
@ -24,6 +30,9 @@ namespace MagicStorageVoidBag.Items {
|
|||||||
Item.useAnimation = 28;
|
Item.useAnimation = 28;
|
||||||
Item.useTime = 28;
|
Item.useTime = 28;
|
||||||
Item.value = Item.sellPrice(gold: 10);
|
Item.value = Item.sellPrice(gold: 10);
|
||||||
|
|
||||||
|
location = Point16.NegativeOne;
|
||||||
|
locationsByWorld[Main.worldName] = location;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void ModifyTooltips(List<TooltipLine> lines) {
|
public override void ModifyTooltips(List<TooltipLine> lines) {
|
||||||
@ -43,5 +52,55 @@ namespace MagicStorageVoidBag.Items {
|
|||||||
recipe.AddIngredient(ItemID.VoidLens);
|
recipe.AddIngredient(ItemID.VoidLens);
|
||||||
recipe.Register();
|
recipe.Register();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void UpdateInventory(Player player) {
|
||||||
|
if (!locationsByWorld.ContainsKey(Main.worldName) || location != locationsByWorld[Main.worldName]) {
|
||||||
|
locationsByWorld[Main.worldName] = location;
|
||||||
|
if (Main.netMode == NetmodeID.MultiplayerClient) {
|
||||||
|
int p = Array.IndexOf(Main.player, player);
|
||||||
|
int i = Array.IndexOf(player.inventory, Item);
|
||||||
|
if (p >= 0 && i >= 0) {
|
||||||
|
NetMessage.SendData(MessageID.SyncEquipment, -1, -1, null, p, i, player.inventory[i].prefix);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SaveData(TagCompound tag) {
|
||||||
|
tag["X"] = location.X;
|
||||||
|
tag["Y"] = location.Y;
|
||||||
|
|
||||||
|
tag["version"] = SAVE_VERSION;
|
||||||
|
|
||||||
|
tag["locations"] = locationsByWorld
|
||||||
|
.Select(kvp => new TagCompound() {
|
||||||
|
["world"] = kvp.Key,
|
||||||
|
["X"] = kvp.Value.X,
|
||||||
|
["Y"] = kvp.Value.Y
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadData(TagCompound tag) {
|
||||||
|
if (tag.GetInt("version") < SAVE_VERSION || tag.GetList<TagCompound>("locations") is not List<TagCompound> locations) {
|
||||||
|
location = new Point16(tag.GetShort("X"), tag.GetShort("Y"));
|
||||||
|
locationsByWorld[Main.worldName] = location;
|
||||||
|
} else {
|
||||||
|
locationsByWorld = locations.ToDictionary(t => t.GetString("world"), t => new Point16(t.GetShort("X"), t.GetShort("Y")));
|
||||||
|
if (locationsByWorld.ContainsKey(Main.worldName)) {
|
||||||
|
location = locationsByWorld[Main.worldName];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void NetSend(BinaryWriter writer) {
|
||||||
|
writer.Write(location.X);
|
||||||
|
writer.Write(location.Y);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void NetReceive(BinaryReader reader) {
|
||||||
|
location = new Point16(reader.ReadInt16(), reader.ReadInt16());
|
||||||
|
locationsByWorld[Main.worldName] = location;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
displayName = MagicStorage Void Bag
|
displayName = MagicStorage Void Bag
|
||||||
author = jack
|
author = jack
|
||||||
version = 1.4
|
version = 1.5
|
||||||
modReferences = MagicStorage
|
modReferences = MagicStorage
|
||||||
sortAfter = MagicStorage
|
sortAfter = MagicStorage
|
||||||
includeSource = true
|
includeSource = true
|
||||||
|
Loading…
Reference in New Issue
Block a user