Skip to content

Commit

Permalink
Bump language version to c#9
Browse files Browse the repository at this point in the history
  • Loading branch information
kwsch committed Dec 25, 2020
1 parent c027a2c commit 83169b8
Show file tree
Hide file tree
Showing 46 changed files with 297 additions and 305 deletions.
2 changes: 1 addition & 1 deletion NHSE.Core/Encryption/Aes128Ctr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public sealed class CounterModeCryptoTransform : ICryptoTransform
{
private readonly byte[] _counter;
private readonly ICryptoTransform _counterEncryptor;
private readonly Queue<byte> _xorMask = new Queue<byte>();
private readonly Queue<byte> _xorMask = new();
private readonly SymmetricAlgorithm _symmetricAlgorithm;

public CounterModeCryptoTransform(SymmetricAlgorithm symmetricAlgorithm, byte[] key, byte[] counter)
Expand Down
420 changes: 210 additions & 210 deletions NHSE.Core/Hashing/FileHashRevision.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NHSE.Core/NHSE.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<LangVersion>8</LangVersion>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Save/Files/MainSave.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public TurnipStonk Turnips

public Museum Museum
{
get => new Museum(Data.Slice(Offsets.Museum, Museum.SIZE));
get => new(Data.Slice(Offsets.Museum, Museum.SIZE));
set => value.Data.CopyTo(Data, Offsets.Museum);
}

Expand Down
4 changes: 2 additions & 2 deletions NHSE.Core/Save/Files/Personal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public AchievementList Achievements
set => value.ToBytes().CopyTo(Data, Offsets.CountAchievement);
}

public RecipeBook GetRecipeBook() => new RecipeBook(Data.Slice(Offsets.Recipes, RecipeBook.SIZE));
public RecipeBook GetRecipeBook() => new(Data.Slice(Offsets.Recipes, RecipeBook.SIZE));
public void SetRecipeBook(RecipeBook book) => book.Save(Data, Offsets.Recipes);

public short[] GetEventFlagsPlayer()
Expand Down Expand Up @@ -164,7 +164,7 @@ public GSaveDate ProfileTimestamp
public bool ProfileIsMakeVillage
{
get => Data[Offsets.ProfileIsMakeVillage] != 0;
set => Data[Offsets.ProfileIsMakeVillage] = (byte)(value ? 1 : 0);
set => Data[Offsets.ProfileIsMakeVillage] = value ? 1 : 0;
}

#endregion
Expand Down
46 changes: 23 additions & 23 deletions NHSE.Core/Save/Meta/RevisionChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@ public static class RevisionChecker
// Patches where the sizes of individual files changed
private static readonly SaveFileSizes[] SizesByRevision =
{
new SaveFileSizes(0xAC0938, 0x6BC50, 0x263B4, 0xB44580, 0x69508), // 1.0.0
new SaveFileSizes(0xAC2AA0, 0x6BED0, 0x263C0, 0xB44590, 0x69560), // 1.1.0
new SaveFileSizes(0xACECD0, 0x6D6C0, 0x2C9C0, 0xB44590, 0x69560), // 1.2.0
new SaveFileSizes(0xACED80, 0x6D6D0, 0x2C9C0, 0xB44590, 0x69560), // 1.3.0
new SaveFileSizes(0xB05790, 0x74420, 0x2C9C0, 0xB44590, 0x69560), // 1.4.0
new SaveFileSizes(0xB20750, 0x76390, 0x2C9C0, 0xB44590, 0x69560), // 1.5.0
new SaveFileSizes(0xB258E0, 0x76CF0, 0x2C9C0, 0xB44590, 0x69560), // 1.6.0
new(0xAC0938, 0x6BC50, 0x263B4, 0xB44580, 0x69508), // 1.0.0
new(0xAC2AA0, 0x6BED0, 0x263C0, 0xB44590, 0x69560), // 1.1.0
new(0xACECD0, 0x6D6C0, 0x2C9C0, 0xB44590, 0x69560), // 1.2.0
new(0xACED80, 0x6D6D0, 0x2C9C0, 0xB44590, 0x69560), // 1.3.0
new(0xB05790, 0x74420, 0x2C9C0, 0xB44590, 0x69560), // 1.4.0
new(0xB20750, 0x76390, 0x2C9C0, 0xB44590, 0x69560), // 1.5.0
new(0xB258E0, 0x76CF0, 0x2C9C0, 0xB44590, 0x69560), // 1.6.0
};

private static readonly FileHeaderInfo[] RevisionInfo =
{
new FileHeaderInfo { Major = 0x67, Minor = 0x6F, HeaderRevision = 0, Unk1 = 2, SaveRevision = 0, Unk2 = 2 }, // 1.0.0
new FileHeaderInfo { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 1, Unk2 = 2 }, // 1.1.0
new FileHeaderInfo { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 2, Unk2 = 2 }, // 1.1.1
new FileHeaderInfo { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 3, Unk2 = 2 }, // 1.1.2
new FileHeaderInfo { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 4, Unk2 = 2 }, // 1.1.3
new FileHeaderInfo { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 5, Unk2 = 2 }, // 1.1.4
new FileHeaderInfo { Major = 0x20006, Minor = 0x20008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 6, Unk2 = 2 }, // 1.2.0
new FileHeaderInfo { Major = 0x20006, Minor = 0x20008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 7, Unk2 = 2 }, // 1.2.1
new FileHeaderInfo { Major = 0x40002, Minor = 0x40008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 8, Unk2 = 2 }, // 1.3.0
new FileHeaderInfo { Major = 0x40002, Minor = 0x40008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 9, Unk2 = 2 }, // 1.3.1
new FileHeaderInfo { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 10, Unk2 = 2 }, // 1.4.0
new FileHeaderInfo { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 11, Unk2 = 2 }, // 1.4.1
new FileHeaderInfo { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 12, Unk2 = 2 }, // 1.4.2
new FileHeaderInfo { Major = 0x60001, Minor = 0x6000C, HeaderRevision = 0, Unk1 = 2, SaveRevision = 13, Unk2 = 2 }, // 1.5.0
new FileHeaderInfo { Major = 0x60001, Minor = 0x6000C, HeaderRevision = 0, Unk1 = 2, SaveRevision = 14, Unk2 = 2 }, // 1.5.1
new FileHeaderInfo { Major = 0x70001, Minor = 0x70006, HeaderRevision = 0, Unk1 = 2, SaveRevision = 15, Unk2 = 2 }, // 1.6.0
new() { Major = 0x67, Minor = 0x6F, HeaderRevision = 0, Unk1 = 2, SaveRevision = 0, Unk2 = 2 }, // 1.0.0
new() { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 1, Unk2 = 2 }, // 1.1.0
new() { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 2, Unk2 = 2 }, // 1.1.1
new() { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 3, Unk2 = 2 }, // 1.1.2
new() { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 4, Unk2 = 2 }, // 1.1.3
new() { Major = 0x6D, Minor = 0x78, HeaderRevision = 0, Unk1 = 2, SaveRevision = 5, Unk2 = 2 }, // 1.1.4
new() { Major = 0x20006, Minor = 0x20008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 6, Unk2 = 2 }, // 1.2.0
new() { Major = 0x20006, Minor = 0x20008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 7, Unk2 = 2 }, // 1.2.1
new() { Major = 0x40002, Minor = 0x40008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 8, Unk2 = 2 }, // 1.3.0
new() { Major = 0x40002, Minor = 0x40008, HeaderRevision = 0, Unk1 = 2, SaveRevision = 9, Unk2 = 2 }, // 1.3.1
new() { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 10, Unk2 = 2 }, // 1.4.0
new() { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 11, Unk2 = 2 }, // 1.4.1
new() { Major = 0x50001, Minor = 0x5000B, HeaderRevision = 0, Unk1 = 2, SaveRevision = 12, Unk2 = 2 }, // 1.4.2
new() { Major = 0x60001, Minor = 0x6000C, HeaderRevision = 0, Unk1 = 2, SaveRevision = 13, Unk2 = 2 }, // 1.5.0
new() { Major = 0x60001, Minor = 0x6000C, HeaderRevision = 0, Unk1 = 2, SaveRevision = 14, Unk2 = 2 }, // 1.5.1
new() { Major = 0x70001, Minor = 0x70006, HeaderRevision = 0, Unk1 = 2, SaveRevision = 15, Unk2 = 2 }, // 1.6.0
};

public static readonly IReadOnlyList<SaveFileSizes> SizeInfo = new[]
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Strings/GameStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public sealed class GameStrings : IRemakeString
public readonly Dictionary<string, string> VillagerMap;
public readonly Dictionary<string, string> VillagerDefaultPhraseMap;
public readonly List<ComboItem> ItemDataSource;
public readonly Dictionary<string, string> InternalNameTranslation = new Dictionary<string, string>();
public readonly Dictionary<string, string> InternalNameTranslation = new();

public IReadOnlyDictionary<string, string> BodyParts { get; }
public IReadOnlyDictionary<string, string> BodyColor { get; }
Expand Down
6 changes: 3 additions & 3 deletions NHSE.Core/Structures/GameLists.cs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public static class GameLists
07411, // mussel
};

public static readonly HashSet<ushort> Shells = new HashSet<ushort>
public static readonly HashSet<ushort> Shells = new()
{
1374, // sea snail
1375, // venus comb
Expand All @@ -401,7 +401,7 @@ public static class GameLists
12968, // pearl
};

public static readonly HashSet<ushort> Terraforming = new HashSet<ushort>
public static readonly HashSet<ushort> Terraforming = new()
{
3075, // path construction permit
3247, // waterscaping permit
Expand All @@ -417,7 +417,7 @@ public static class GameLists
9771, // custom design path permit
};

public static readonly HashSet<ushort> NoCheckReceived = new HashSet<ushort>(Terraforming)
public static readonly HashSet<ushort> NoCheckReceived = new(Terraforming)
{
Item.DIYRecipe,

Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Item/Item.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace NHSE.Core
[StructLayout(LayoutKind.Explicit, Size = SIZE, Pack = 1)]
public class Item : ICopyableItem<Item>
{
public static readonly Item NO_ITEM = new Item {ItemId = NONE};
public static readonly Item NO_ITEM = new() {ItemId = NONE};
public const ushort NONE = 0xFFFE;
public const ushort EXTENSION = 0xFFFD;
public const ushort FieldItemMin = 60_000;
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Item/ItemInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static bool TryGetMaxStackCount(ushort id, out ushort max)
return MaxCountByKind.TryGetValue(kind, out max);
}

private static readonly Dictionary<ItemKind, ushort> MaxCountByKind = new Dictionary<ItemKind, ushort>
private static readonly Dictionary<ItemKind, ushort> MaxCountByKind = new()
{
{Kind_Ftr, 00001},
{Kind_RoomWall, 00001},
Expand Down
4 changes: 2 additions & 2 deletions NHSE.Core/Structures/Item/ItemKind.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public enum ItemKind : byte

public static class ItemKindExtensions
{
private static readonly HashSet<ItemKind> Clothing = new HashSet<ItemKind>
private static readonly HashSet<ItemKind> Clothing = new()
{
Bottoms_Long,
Bottoms_Middle,
Expand All @@ -198,7 +198,7 @@ public static class ItemKindExtensions
Top_Short,
};

private static readonly HashSet<ItemKind> Furniture = new HashSet<ItemKind>
private static readonly HashSet<ItemKind> Furniture = new()
{
Ftr_1x1_Chair,
Ftr_1x1_Floor,
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Item/ItemSize.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static class ItemSizeExtensions
{
public const string EnumPrefix = "S_";

private static readonly Dictionary<ItemSizeType, ItemSize> Dictionary = new Dictionary<ItemSizeType, ItemSize>
private static readonly Dictionary<ItemSizeType, ItemSize> Dictionary = new()
{
{ItemSizeType.S_1_0x1_0 , new ItemSize( 2, 2)}, // 1x1
{ItemSizeType.S_2_0x1_0 , new ItemSize( 4, 2)}, // 2x1
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Item/VillagerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace NHSE.Core
public sealed class VillagerItem : Item, ICopyableItem<VillagerItem>
{
public new const int SIZE = 0x2C;
public new static readonly VillagerItem NO_ITEM = new VillagerItem { ItemId = NONE };
public new static readonly VillagerItem NO_ITEM = new() { ItemId = NONE };

public uint U08;
public uint U0C;
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Map/OutsideAcre.cs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public enum OutsideAcre : ushort

public static class CollisionUtil
{
public static readonly Dictionary<byte, Color> Dict = new Dictionary<byte, Color>
public static readonly Dictionary<byte, Color> Dict = new()
{
{00, Color.FromArgb( 70, 120, 64)}, // Grass
{01, Color.FromArgb(128, 215, 195)}, // River
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Villager/PlayerHouse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public Item DoorDecoItemName
set => value.ToBytesClass().CopyTo(Data, 0x263D4);
}

public bool PlayerHouseFlag { get => Data[0x263DC] != 0; set => Data[0x263DC] = (byte)(value ? 1 : 0); }
public bool PlayerHouseFlag { get => Data[0x263DC] != 0; set => Data[0x263DC] = value ? 1 : 0; }

public Item PostItemName
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Villager/Villager1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public GSaveRoomFloorWall Room

public DesignPatternPRO Design
{
get => new DesignPatternPRO(Data.Slice(0x12128, DesignPatternPRO.SIZE));
get => new(Data.Slice(0x12128, DesignPatternPRO.SIZE));
set => value.Data.CopyTo(Data, 0x12128);
}

Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Structures/Villager/Villager2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public GSaveRoomFloorWall Room

public DesignPatternPRO Design
{
get => new DesignPatternPRO(Data.Slice(0x128a8, DesignPatternPRO.SIZE));
get => new(Data.Slice(0x128a8, DesignPatternPRO.SIZE));
set => value.Data.CopyTo(Data, 0x128a8);
}

Expand Down
12 changes: 4 additions & 8 deletions NHSE.Core/Structures/Villager/VillagerConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,13 @@ public static bool IsVillager(int size)
/// <returns>True if can be converted, false if no conversion available.</returns>
public static bool IsCompatible(int size, int expect)
{
switch (expect)
return expect switch
{
// Can convert to any format
case Villager1.SIZE:
case Villager2.SIZE:
return IsVillager(size);

Villager1.SIZE or Villager2.SIZE => IsVillager(size),
// No conversion available
default:
return false;
}
_ => false,
};
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Util/ComboItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static void Add(this List<ComboItem> storage, IReadOnlyList<INamedValue>
public static void SortByText(this List<ComboItem> arr) => arr.Sort(Comparer);

private static readonly FunctorComparer<ComboItem> Comparer =
new FunctorComparer<ComboItem>((a, b) => string.CompareOrdinal(a.Text, b.Text));
new((a, b) => string.CompareOrdinal(a.Text, b.Text));

private sealed class FunctorComparer<T> : IComparer<T>
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Core/Util/RandUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public static class RandUtil
// Multi-thread safe rand, ha
public static Random Rand => _local.Value;

private static readonly ThreadLocal<Random> _local = new ThreadLocal<Random>(() => new Random());
private static readonly ThreadLocal<Random> _local = new(() => new Random());

public static uint Rand32() => Rand32(Rand);
public static uint Rand32(Random rnd) => (uint)rnd.Next(1 << 30) << 2 | (uint)rnd.Next(1 << 2);
Expand Down
6 changes: 3 additions & 3 deletions NHSE.Core/Util/ResourceUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public static class ResourceUtil
{
private static readonly Assembly thisAssembly = typeof(ResourceUtil).GetTypeInfo().Assembly;
private static readonly string[] manifestResourceNames = thisAssembly.GetManifestResourceNames();
private static readonly Dictionary<string, string> resourceNameMap = new Dictionary<string, string>();
private static readonly Dictionary<string, string[]> stringListCache = new Dictionary<string, string[]>();
private static readonly object getStringListLoadLock = new object();
private static readonly Dictionary<string, string> resourceNameMap = new();
private static readonly Dictionary<string, string[]> stringListCache = new();
private static readonly object getStringListLoadLock = new();

public static string[] GetStringList(string fileName)
{
Expand Down
4 changes: 2 additions & 2 deletions NHSE.Injection/NHSE.Injection.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<LangVersion>8</LangVersion>
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions NHSE.Injection/SysBot/SysBot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ public class SysBot : IRAMReadWriter
{
public string IP = "192.168.1.65";
public int Port = 6000;
public Socket Connection = new Socket(SocketType.Stream, ProtocolType.Tcp);
public Socket Connection = new(SocketType.Stream, ProtocolType.Tcp);
public bool Connected { get; private set; }

private readonly object _sync = new object();
private readonly object _sync = new();

public void Connect(string ip, int port)
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Injection/SysBot/USBBot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class USBBot : IRAMReadWriter

public bool Connected { get; private set; }

private readonly object _sync = new object();
private readonly object _sync = new();

public bool Connect()
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/BCSV/BCSV.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace NHSE.Parsing
{
public class BCSV
{
public static readonly BCSVEnumDictionary EnumLookup = new BCSVEnumDictionary(Resources.specs_130.Split('\n'));
public static readonly BCSVEnumDictionary EnumLookup = new(Resources.specs_130.Split('\n'));
public static bool DecodeColumnNames { private get; set; } = true;

public const int MAGIC = 0x42435356; // BCSV
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/BCSV/BCSVEnumDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace NHSE.Parsing
{
public class BCSVEnumDictionary
{
private readonly Dictionary<uint, string> Lookup = new Dictionary<uint, string>();
private readonly Dictionary<uint, string> Lookup = new();

public BCSVEnumDictionary(IEnumerable<string> lines)
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/GameBCSVDumper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public static Dictionary<ItemKind, ushort> GetItemStackDict(string pathBCSV, str
// clothing is split out more granularly in ItemKind and would cause errors
// since it's not likely to ever be stackable, we can skip
// none-type can be skipped and doesn't exist in ItemKind either
List<string> skipLabels = new List<string>
List<string> skipLabels = new()
{
"TopsDefault",
"Tops",
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/GameMSBTDumper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private static string GetForgerySuffix(string language)
};
}

private static readonly Dictionary<int, string> InternalItemList = new Dictionary<int, string>
private static readonly Dictionary<int, string> InternalItemList = new()
{
{4200, "k.k. slider's guitar (internal)"},
};
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/MSBT/BinaryReaderX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public string ReadString(int length)

public string PeekString(int length = 4)
{
List<byte> bytes = new List<byte>();
List<byte> bytes = new();
long startOffset = BaseStream.Position;

for (int i = 0; i < length; i++)
Expand Down
4 changes: 2 additions & 2 deletions NHSE.Parsing/MSBT/LBL1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ public class LBL1 : MSBTSection
{
public uint NumberOfGroups;

public readonly List<MSBTGroup> Groups = new List<MSBTGroup>();
public readonly List<MSBTLabel> Labels = new List<MSBTLabel>();
public readonly List<MSBTGroup> Groups = new();
public readonly List<MSBTLabel> Labels = new();

public LBL1() : base(string.Empty, Array.Empty<byte>())
{
Expand Down
4 changes: 2 additions & 2 deletions NHSE.Parsing/MSBT/MSBT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace NHSE.Parsing
public class MSBT
{
public readonly MSBTHeader Header;
public readonly LBL1 LBL1 = new LBL1();
public readonly TXT2 TXT2 = new TXT2();
public readonly LBL1 LBL1 = new();
public readonly TXT2 TXT2 = new();
public readonly Encoding FileEncoding;
public readonly List<string> SectionOrder;
public bool HasLabels;
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/MSBT/MSBTTextString.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class MSBTTextString
public readonly byte[] Value;
public readonly uint Index;

public static readonly MSBTTextString Empty = new MSBTTextString(Array.Empty<byte>(), 0);
public static readonly MSBTTextString Empty = new(Array.Empty<byte>(), 0);

public MSBTTextString(byte[] v, uint i)
{
Expand Down
2 changes: 1 addition & 1 deletion NHSE.Parsing/MSBT/TXT2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class TXT2 : MSBTSection
{
public uint NumberOfStrings;

public readonly List<MSBTTextString> Strings = new List<MSBTTextString>();
public readonly List<MSBTTextString> Strings = new();

public TXT2() : base(string.Empty, Array.Empty<byte>())
{
Expand Down
Loading

0 comments on commit 83169b8

Please sign in to comment.