From 8f0035a577c8acf947e0d3f77a76c2c5c64fbd36 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 5 Mar 2022 17:15:38 -0800 Subject: [PATCH] Deduplicate savefile constructors No longer necessary as we don't keep BAK reference anymore. --- PKHeX.Core/Saves/SAV8LA.cs | 9 +-------- PKHeX.Core/Saves/SAV8SWSH.cs | 9 +-------- PKHeX.Core/Saves/SaveFile.cs | 7 +------ 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/PKHeX.Core/Saves/SAV8LA.cs b/PKHeX.Core/Saves/SAV8LA.cs index 3187b6c26..9531e4ebf 100644 --- a/PKHeX.Core/Saves/SAV8LA.cs +++ b/PKHeX.Core/Saves/SAV8LA.cs @@ -11,14 +11,7 @@ public sealed class SAV8LA : SaveFile, ISaveBlock8LA, ISCBlockArray, ISaveFileRe protected internal override string ShortSummary => $"{OT} ({Version}) - {LastSaved.LastSavedTime}"; public override string Extension => string.Empty; - public SAV8LA(byte[] data) : base(data) - { - Data = Array.Empty(); - AllBlocks = SwishCrypto.Decrypt(data); - Blocks = new SaveBlockAccessor8LA(this); - SaveRevision = Blocks.DetectRevision(); - Initialize(); - } + public SAV8LA(byte[] data) : this(SwishCrypto.Decrypt(data)) { } private SAV8LA(IReadOnlyList blocks) : base(Array.Empty()) { diff --git a/PKHeX.Core/Saves/SAV8SWSH.cs b/PKHeX.Core/Saves/SAV8SWSH.cs index 175812a0c..8e606a6d9 100644 --- a/PKHeX.Core/Saves/SAV8SWSH.cs +++ b/PKHeX.Core/Saves/SAV8SWSH.cs @@ -8,14 +8,7 @@ namespace PKHeX.Core /// public sealed class SAV8SWSH : SAV8, ISaveBlock8SWSH, ITrainerStatRecord, ISaveFileRevision, ISCBlockArray { - public SAV8SWSH(byte[] data) : base(data) - { - Data = Array.Empty(); - AllBlocks = SwishCrypto.Decrypt(data); - Blocks = new SaveBlockAccessor8SWSH(this); - SaveRevision = Zukan.GetRevision(); - Initialize(); - } + public SAV8SWSH(byte[] data) : this(SwishCrypto.Decrypt(data)) { } private SAV8SWSH(IReadOnlyList blocks) : base(Array.Empty()) { diff --git a/PKHeX.Core/Saves/SaveFile.cs b/PKHeX.Core/Saves/SaveFile.cs index 46e37e074..c24d879c1 100644 --- a/PKHeX.Core/Saves/SaveFile.cs +++ b/PKHeX.Core/Saves/SaveFile.cs @@ -23,12 +23,7 @@ protected SaveFile(byte[] data, bool exportable = true) Metadata = new SaveFileMetadata(this); } - protected SaveFile(int size = 0) - { - Data = size == 0 ? Array.Empty() : new byte[size]; - State = new SaveFileState(false); - Metadata = new SaveFileMetadata(this); - } + protected SaveFile(int size = 0) : this(size == 0 ? Array.Empty() : new byte[size], false) { } protected internal abstract string ShortSummary { get; } public abstract string Extension { get; }