ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make old-Base64 parsing not throw on unknown items, and instead use default items and a log warning.

Browse source
This commit is contained in:
Ottermandias 2023-08-08 14:53:51 +02:00
parent d1e517004a
commit 79ec604e89
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Glamourer/Designs/DesignBase64Migration.cs
View file

@ -16,8 +16,7 @@ public class DesignBase64Migration
public const int Base64SizeV4 = 95; public const int Base64SizeV4 = 95;
public static unsafe DesignData MigrateBase64(ItemManager items, HumanModelList humans, string base64, out EquipFlag equipFlags, public static unsafe DesignData MigrateBase64(ItemManager items, HumanModelList humans, string base64, out EquipFlag equipFlags,
out CustomizeFlag customizeFlags, out CustomizeFlag customizeFlags, out bool writeProtected, out bool applyHat, out bool applyVisor, out bool applyWeapon)
out bool writeProtected, out bool applyHat, out bool applyVisor, out bool applyWeapon)
{ {
static void CheckSize(int length, int requiredLength) static void CheckSize(int length, int requiredLength)
{ {
@ -113,7 +112,10 @@ public class DesignBase64Migration
var mdl = eq[idx]; var mdl = eq[idx];
var item = items.Identify(slot, mdl.Set, mdl.Variant); var item = items.Identify(slot, mdl.Set, mdl.Variant);
if (!item.Valid) if (!item.Valid)
throw new Exception("Base64 string invalid, item could not be identified."); {
Glamourer.Log.Warning("Base64 string invalid, item could not be identified.");
item = ItemManager.NothingItem(slot);
}
data.SetItem(slot, item); data.SetItem(slot, item);
data.SetStain(slot, mdl.Stain); data.SetStain(slot, mdl.Stain);
@ -123,7 +125,10 @@ public class DesignBase64Migration
? items.DefaultSword ? items.DefaultSword
: items.Identify(EquipSlot.MainHand, cur[0].Set, cur[0].Type, cur[0].Variant); : items.Identify(EquipSlot.MainHand, cur[0].Set, cur[0].Type, cur[0].Variant);
if (!main.Valid) if (!main.Valid)
throw new Exception("Base64 string invalid, weapon could not be identified."); {
Glamourer.Log.Warning("Base64 string invalid, weapon could not be identified.");
main = items.DefaultSword;
}
data.SetItem(EquipSlot.MainHand, main); data.SetItem(EquipSlot.MainHand, main);
data.SetStain(EquipSlot.MainHand, cur[0].Stain); data.SetStain(EquipSlot.MainHand, cur[0].Stain);
@ -134,11 +139,11 @@ public class DesignBase64Migration
{ {
off = items.Identify(EquipSlot.OffHand, (SetId)(main.ModelId.Id + 50), main.WeaponType, main.Variant, main.Type); off = items.Identify(EquipSlot.OffHand, (SetId)(main.ModelId.Id + 50), main.WeaponType, main.Variant, main.Type);
var gauntlet = items.Identify(EquipSlot.Hands, cur[1].Set, (Variant)cur[1].Type.Id); var gauntlet = items.Identify(EquipSlot.Hands, cur[1].Set, (Variant)cur[1].Type.Id);
if (!gauntlet.Valid) if (gauntlet.Valid)
throw new Exception("Base64 string invalid, item could not be identified."); {
data.SetItem(EquipSlot.Hands, gauntlet);
data.SetItem(EquipSlot.Hands, gauntlet); data.SetStain(EquipSlot.Hands, cur[0].Stain);
data.SetStain(EquipSlot.Hands, cur[0].Stain); }
} }
else else
{ {
@ -148,7 +153,10 @@ public class DesignBase64Migration
} }
if (main.Type.ValidOffhand() != FullEquipType.Unknown && !off.Valid) if (main.Type.ValidOffhand() != FullEquipType.Unknown && !off.Valid)
throw new Exception("Base64 string invalid, weapon could not be identified."); {
Glamourer.Log.Warning("Base64 string invalid, weapon could not be identified.");
off = items.GetDefaultOffhand(main);
}
data.SetItem(EquipSlot.OffHand, off); data.SetItem(EquipSlot.OffHand, off);
data.SetStain(EquipSlot.OffHand, cur[1].Stain); data.SetStain(EquipSlot.OffHand, cur[1].Stain);