diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..d33a2f3 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,7 @@ + + + 10 + enable + NHSE + + diff --git a/NHSE.Core/Editing/Batch/ItemMutator.cs b/NHSE.Core/Editing/Batch/ItemMutator.cs index ebfd42f..58a6c4b 100644 --- a/NHSE.Core/Editing/Batch/ItemMutator.cs +++ b/NHSE.Core/Editing/Batch/ItemMutator.cs @@ -21,10 +21,8 @@ public override ModifyResult Modify(Item item, IEnumerable fi if (!IsFilterMatch(cmd, item, pi)) return ModifyResult.Filtered; } -#pragma warning disable CA1031 // Do not catch general exception types // Swallow any error because this can be malformed user input. catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { Debug.WriteLine($"Failed to compare: {ex.Message} - {cmd.PropertyName} {cmd.PropertyValue}"); return ModifyResult.Error; @@ -40,10 +38,8 @@ public override ModifyResult Modify(Item item, IEnumerable fi if (tmp != ModifyResult.Modified) result = tmp; } -#pragma warning disable CA1031 // Do not catch general exception types // Swallow any error because this can be malformed user input. catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { Debug.WriteLine($"Failed to modify: {ex.Message} - {cmd.PropertyName} {cmd.PropertyValue}"); } @@ -199,10 +195,8 @@ public static bool IsFilterMatch(IEnumerable filters, object if (pi.IsValueEqual(obj, cmd.PropertyValue) == cmd.Evaluator) continue; } -#pragma warning disable CA1031 // Do not catch general exception types // User provided inputs can mismatch the type's required value format, and fail to be compared. catch (Exception e) -#pragma warning restore CA1031 // Do not catch general exception types { Debug.WriteLine($"Unable to compare {cmd.PropertyName} to {cmd.PropertyValue}."); Debug.WriteLine(e.Message); diff --git a/NHSE.Core/Editing/ItemRequest/ItemParser.cs b/NHSE.Core/Editing/ItemRequest/ItemParser.cs index 6ae8e2c..53ec045 100644 --- a/NHSE.Core/Editing/ItemRequest/ItemParser.cs +++ b/NHSE.Core/Editing/ItemRequest/ItemParser.cs @@ -37,9 +37,7 @@ public static IReadOnlyCollection GetItemsFromUserInput(string requestHex, var split = requestHex.Split(SplittersHex, StringSplitOptions.RemoveEmptyEntries); return GetItemsHexCode(split, cfg, type); } -#pragma warning disable CA1031 // Do not catch general exception types catch -#pragma warning restore CA1031 // Do not catch general exception types { var split = requestHex.Split(SplittersName, StringSplitOptions.RemoveEmptyEntries); return GetItemsLanguage(split, cfg, type, GameLanguage.DefaultLanguage); @@ -61,9 +59,7 @@ public static IReadOnlyCollection GetDIYsFromUserInput(string requestHex) var split = requestHex.Split(SplittersHex, StringSplitOptions.RemoveEmptyEntries); return GetDIYItemsHexCode(split); } -#pragma warning disable CA1031 // Do not catch general exception types catch -#pragma warning restore CA1031 // Do not catch general exception types { var split = requestHex.Split(SplittersName, StringSplitOptions.RemoveEmptyEntries); return GetDIYItemsLanguage(split); diff --git a/NHSE.Core/NHSE.Core.csproj b/NHSE.Core/NHSE.Core.csproj index 6977bf1..1b25623 100644 --- a/NHSE.Core/NHSE.Core.csproj +++ b/NHSE.Core/NHSE.Core.csproj @@ -2,8 +2,6 @@ net46;netstandard2.0 - 9 - enable diff --git a/NHSE.Core/Save/Files/MainSave.cs b/NHSE.Core/Save/Files/MainSave.cs index 7377da5..816eda3 100644 --- a/NHSE.Core/Save/Files/MainSave.cs +++ b/NHSE.Core/Save/Files/MainSave.cs @@ -69,7 +69,6 @@ public IReadOnlyList Buildings public IPlayerHouse GetPlayerHouse(int index) => Offsets.ReadPlayerHouse(Data, index); public void SetPlayerHouse(IPlayerHouse value, int index) => Offsets.WritePlayerHouse(value, Data, index); - public IPlayerHouse[] GetPlayerHouses() { var players = new IPlayerHouse[MainSaveOffsets.PlayerCount]; diff --git a/NHSE.Core/Strings/GameStrings.cs b/NHSE.Core/Strings/GameStrings.cs index 1bbd4a0..df4a07d 100644 --- a/NHSE.Core/Strings/GameStrings.cs +++ b/NHSE.Core/Strings/GameStrings.cs @@ -227,7 +227,6 @@ public List GetAssociatedItems(ushort id, out string baseItemName) return new List(); } - public bool HasAssociatedItems(string baseName, out List? items) { if (string.IsNullOrWhiteSpace(baseName)) diff --git a/NHSE.Core/Structures/Building/BridgeType.cs b/NHSE.Core/Structures/Building/BridgeType.cs index eab12af..d76e01c 100644 --- a/NHSE.Core/Structures/Building/BridgeType.cs +++ b/NHSE.Core/Structures/Building/BridgeType.cs @@ -3,9 +3,7 @@ /// /// Bridge model /// -#pragma warning disable CA1027 // Mark enums with FlagsAttribute public enum BridgeType : ushort -#pragma warning restore CA1027 // Mark enums with FlagsAttribute { BridgeStone03 = 0x00, BridgeStone04 = 0x01, diff --git a/NHSE.Core/Structures/Item/ItemKind.cs b/NHSE.Core/Structures/Item/ItemKind.cs index 4ff0abd..0730d2a 100644 --- a/NHSE.Core/Structures/Item/ItemKind.cs +++ b/NHSE.Core/Structures/Item/ItemKind.cs @@ -6,9 +6,7 @@ namespace NHSE.Core /// /// Kinds of items /// -#pragma warning disable CA1027 // Mark enums with FlagsAttribute public enum ItemKind : byte -#pragma warning restore CA1027 // Mark enums with FlagsAttribute { Bottoms_Long, Bottoms_Middle, diff --git a/NHSE.Core/Structures/Map/Layers/ItemLayer.cs b/NHSE.Core/Structures/Map/Layers/ItemLayer.cs index 1efbf52..e3310f4 100644 --- a/NHSE.Core/Structures/Map/Layers/ItemLayer.cs +++ b/NHSE.Core/Structures/Map/Layers/ItemLayer.cs @@ -206,12 +206,10 @@ private bool IsValidExtension(Item t, int x, int y) if (parent.ItemId == t.ExtensionItemId) return true; } -#pragma warning disable CA1031 // Do not catch general exception types catch { // corrupt? } -#pragma warning restore CA1031 // Do not catch general exception types return false; } } diff --git a/NHSE.Core/Structures/Misc/AchievementList.cs b/NHSE.Core/Structures/Misc/AchievementList.cs index c4d0649..60d00dc 100644 --- a/NHSE.Core/Structures/Misc/AchievementList.cs +++ b/NHSE.Core/Structures/Misc/AchievementList.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { /// diff --git a/NHSE.Core/Structures/Misc/GSaveAudioInfo.cs b/NHSE.Core/Structures/Misc/GSaveAudioInfo.cs index 008c596..4e6e3b0 100644 --- a/NHSE.Core/Structures/Misc/GSaveAudioInfo.cs +++ b/NHSE.Core/Structures/Misc/GSaveAudioInfo.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { [StructLayout(LayoutKind.Sequential, Pack = 2, Size = SIZE)] diff --git a/NHSE.Core/Structures/Misc/GSaveBBS.cs b/NHSE.Core/Structures/Misc/GSaveBBS.cs index 873357a..faccc65 100644 --- a/NHSE.Core/Structures/Misc/GSaveBBS.cs +++ b/NHSE.Core/Structures/Misc/GSaveBBS.cs @@ -78,4 +78,3 @@ public struct Handwriting public uint VerticesNum { get; set; } } } -#pragma warning restore CS8618, CA1815, CA1819, IDE1006 diff --git a/NHSE.Core/Structures/Misc/GSaveDate.cs b/NHSE.Core/Structures/Misc/GSaveDate.cs index 96abaec..14947b9 100644 --- a/NHSE.Core/Structures/Misc/GSaveDate.cs +++ b/NHSE.Core/Structures/Misc/GSaveDate.cs @@ -2,7 +2,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { [StructLayout(LayoutKind.Sequential, Pack = 4)] diff --git a/NHSE.Core/Structures/Misc/GSaveItemName.cs b/NHSE.Core/Structures/Misc/GSaveItemName.cs index d4e73d4..b49c30b 100644 --- a/NHSE.Core/Structures/Misc/GSaveItemName.cs +++ b/NHSE.Core/Structures/Misc/GSaveItemName.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { [StructLayout(LayoutKind.Explicit, Size = SIZE, Pack = 1)] diff --git a/NHSE.Core/Structures/Misc/GSavePlayerId.cs b/NHSE.Core/Structures/Misc/GSavePlayerId.cs index d53db3e..44bbf83 100644 --- a/NHSE.Core/Structures/Misc/GSavePlayerId.cs +++ b/NHSE.Core/Structures/Misc/GSavePlayerId.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { [StructLayout(LayoutKind.Sequential, Pack = 4)] diff --git a/NHSE.Core/Structures/Misc/GSavePlayerManpu.cs b/NHSE.Core/Structures/Misc/GSavePlayerManpu.cs index 921fcdb..0a8943b 100644 --- a/NHSE.Core/Structures/Misc/GSavePlayerManpu.cs +++ b/NHSE.Core/Structures/Misc/GSavePlayerManpu.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { /// diff --git a/NHSE.Core/Structures/Misc/GSaveRoomFloorWall.cs b/NHSE.Core/Structures/Misc/GSaveRoomFloorWall.cs index c715970..5805af0 100644 --- a/NHSE.Core/Structures/Misc/GSaveRoomFloorWall.cs +++ b/NHSE.Core/Structures/Misc/GSaveRoomFloorWall.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Runtime.InteropServices; -#pragma warning disable CS8618, CA1815, CA1819, IDE1006 namespace NHSE.Core { [StructLayout(LayoutKind.Sequential, Pack = 4, Size = SIZE)] diff --git a/NHSE.Core/Structures/Villager/PlayerHouse1.cs b/NHSE.Core/Structures/Villager/PlayerHouse1.cs index 39b1ee2..9f486ac 100644 --- a/NHSE.Core/Structures/Villager/PlayerHouse1.cs +++ b/NHSE.Core/Structures/Villager/PlayerHouse1.cs @@ -87,13 +87,12 @@ public Item OrderPostItemName } // cockroach @ 0x263f0 -- meh - public PlayerHouse2 Upgrade() { var data = new byte[PlayerHouse2.SIZE]; Data.Slice(0x0, 0x120).CopyTo(data, 0); // HouseLevel -> EventFlag for (int i = 0; i < MaxRoom; i++) - ((PlayerRoom1)GetRoom(i)).Upgrade().Write().CopyTo(data, 0x120 + i * PlayerRoom2.SIZE); // RoomList + ((PlayerRoom1)GetRoom(i)).Upgrade().Write().CopyTo(data, 0x120 + (i * PlayerRoom2.SIZE)); // RoomList Data.Slice(0x263D0, 0x30).CopyTo(data, 0x289F8); // PlayerList -> Cockroach return new PlayerHouse2(data); } diff --git a/NHSE.Injection/NHSE.Injection.csproj b/NHSE.Injection/NHSE.Injection.csproj index 7dd3785..0c19d3e 100644 --- a/NHSE.Injection/NHSE.Injection.csproj +++ b/NHSE.Injection/NHSE.Injection.csproj @@ -2,8 +2,6 @@ net46;netstandard2.0 - 9 - enable diff --git a/NHSE.Parsing/NHSE.Parsing.csproj b/NHSE.Parsing/NHSE.Parsing.csproj index 4f70477..b8d1ef1 100644 --- a/NHSE.Parsing/NHSE.Parsing.csproj +++ b/NHSE.Parsing/NHSE.Parsing.csproj @@ -2,8 +2,6 @@ netstandard2.0 - 9 - enable diff --git a/NHSE.Sprites/Item/ItemSprite.cs b/NHSE.Sprites/Item/ItemSprite.cs index 7cce459..626b7bb 100644 --- a/NHSE.Sprites/Item/ItemSprite.cs +++ b/NHSE.Sprites/Item/ItemSprite.cs @@ -53,9 +53,7 @@ public static Bitmap GetItemMarkup(Item item, Font font, int width, int height, { return Image.FromFile(path); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { Console.WriteLine(ex.Message); return Resources.leaf; diff --git a/NHSE.Sprites/NHSE.Sprites.csproj b/NHSE.Sprites/NHSE.Sprites.csproj index ce9ae3b..332fb7a 100644 --- a/NHSE.Sprites/NHSE.Sprites.csproj +++ b/NHSE.Sprites/NHSE.Sprites.csproj @@ -1,9 +1,8 @@  - net46;net5.0 - 9 - enable + net46;net6.0-windows + en @@ -11,9 +10,9 @@ - - - + + + diff --git a/NHSE.Tests/NHSE.Tests.csproj b/NHSE.Tests/NHSE.Tests.csproj index ef943ce..44555b4 100644 --- a/NHSE.Tests/NHSE.Tests.csproj +++ b/NHSE.Tests/NHSE.Tests.csproj @@ -1,8 +1,7 @@ - net5.0 - + net6.0 false diff --git a/NHSE.Villagers/NHSE.Villagers.csproj b/NHSE.Villagers/NHSE.Villagers.csproj index 5d062b6..323e40b 100644 --- a/NHSE.Villagers/NHSE.Villagers.csproj +++ b/NHSE.Villagers/NHSE.Villagers.csproj @@ -1,9 +1,8 @@ - net46;netstandard2.0 - 9 - enable + net46;net6.0-windows + en @@ -25,9 +24,9 @@ - - - + + + diff --git a/NHSE.Villagers/VillagerResources.cs b/NHSE.Villagers/VillagerResources.cs index 4f80eb1..fd65044 100644 --- a/NHSE.Villagers/VillagerResources.cs +++ b/NHSE.Villagers/VillagerResources.cs @@ -1,4 +1,5 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using NHSE.Core; using static NHSE.Villagers.Properties.Resources; @@ -25,8 +26,14 @@ public static VillagerData GetVillager(string villagerName) var nv = GetResourceNameVillager(villagerName); var nh = GetResourceNameHouse(villagerName); - var bv = (byte[])ResourceManager.GetObject(nv); - var bh = (byte[])ResourceManager.GetObject(nh); + var bv = (byte[]?)ResourceManager.GetObject(nv); + if (bv == null) + throw new ArgumentException($"Villager data not found for {villagerName} ({nv})", nameof(villagerName)); + + var bh = (byte[]?)ResourceManager.GetObject(nh); + if (bh == null) + throw new ArgumentException($"House data not found for {villagerName} ({nh})", nameof(villagerName)); + Debug.Assert(bv.Length == Villager2.SIZE); Debug.Assert(bh.Length == VillagerHouse2.SIZE); diff --git a/NHSE.WinForms/Editor.cs b/NHSE.WinForms/Editor.cs index 2bb70b6..9c94de3 100644 --- a/NHSE.WinForms/Editor.cs +++ b/NHSE.WinForms/Editor.cs @@ -69,9 +69,7 @@ private void Menu_Save_Click(object sender, EventArgs e) { SAV.Save((uint) DateTime.Now.Ticks); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(MessageStrings.MsgSaveDataExportFail, ex.Message); return; @@ -322,9 +320,7 @@ private void LoadPlayer(int index) var photo = pers.GetPhotoData(); PB_Player.Image = new Bitmap(new MemoryStream(photo)); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception e) -#pragma warning restore CA1031 // Do not catch general exception types { Console.WriteLine(e); } diff --git a/NHSE.WinForms/Main.cs b/NHSE.WinForms/Main.cs index 2a81fc8..088f354 100644 --- a/NHSE.WinForms/Main.cs +++ b/NHSE.WinForms/Main.cs @@ -57,7 +57,7 @@ private void Main_DragEnter(object sender, DragEventArgs e) private void Main_DragDrop(object sender, DragEventArgs e) { - var files = (string[]?)e.Data.GetData(DataFormats.FileDrop); + var files = (string[]?)e.Data?.GetData(DataFormats.FileDrop); if (files == null || files.Length == 0) return; Open(files[0]); @@ -99,9 +99,7 @@ private static void Open(string path) OpenFileOrPath(path); } #if !DEBUG -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); } diff --git a/NHSE.WinForms/NHSE.WinForms.csproj b/NHSE.WinForms/NHSE.WinForms.csproj index 86aea31..a6271c0 100644 --- a/NHSE.WinForms/NHSE.WinForms.csproj +++ b/NHSE.WinForms/NHSE.WinForms.csproj @@ -2,16 +2,11 @@ WinExe - net46;net5.0-windows + net46;net6.0-windows true - NHSE - NHSE - NHSE Animal Crossing - New Horizons Save Editor NHSE.WinForms.Program icon.ico - 9 - enable AnyCPU;x86 diff --git a/NHSE.WinForms/Subforms/Map/FieldItemEditor.cs b/NHSE.WinForms/Subforms/Map/FieldItemEditor.cs index 9b90dfd..279ee18 100644 --- a/NHSE.WinForms/Subforms/Map/FieldItemEditor.cs +++ b/NHSE.WinForms/Subforms/Map/FieldItemEditor.cs @@ -1012,8 +1012,9 @@ private void CB_MapAcreSelect_SelectedValueChanged(object sender, EventArgs e) if (value == oldValue) return; byte[] ValueBytes = BitConverter.GetBytes(value); - Map.Terrain.BaseAcres[index * 2] = ValueBytes[0]; - Map.Terrain.BaseAcres[index * 2 + 1] = ValueBytes[1]; + var a = index * 2; + Map.Terrain.BaseAcres[a] = ValueBytes[0]; + Map.Terrain.BaseAcres[a + 1] = ValueBytes[1]; ReloadBuildingsTerrain(); } diff --git a/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.Designer.cs b/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.Designer.cs index a4e4a03..21cc1e7 100644 --- a/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.Designer.cs +++ b/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.Designer.cs @@ -99,7 +99,7 @@ private void InitializeComponent() this.nw_rounded_tile.TabIndex = 0; this.nw_rounded_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.nw_rounded_tile.UseVisualStyleBackColor = true; - this.nw_rounded_tile.Click += new System.EventHandler(this.nw_rounded_tile_Click); + this.nw_rounded_tile.Click += new System.EventHandler(this.NW_Rounded_Tile_Click); // // n_tile // @@ -110,7 +110,7 @@ private void InitializeComponent() this.n_tile.Size = new System.Drawing.Size(64, 64); this.n_tile.TabIndex = 1; this.n_tile.UseVisualStyleBackColor = true; - this.n_tile.Click += new System.EventHandler(this.n_tile_Click); + this.n_tile.Click += new System.EventHandler(this.N_tile_Click); // // ne_rounded_tile // @@ -121,7 +121,7 @@ private void InitializeComponent() this.ne_rounded_tile.Size = new System.Drawing.Size(64, 64); this.ne_rounded_tile.TabIndex = 2; this.ne_rounded_tile.UseVisualStyleBackColor = true; - this.ne_rounded_tile.Click += new System.EventHandler(this.ne_rounded_tile_Click); + this.ne_rounded_tile.Click += new System.EventHandler(this.NE_rounded_tile_Click); // // w_tile // @@ -132,7 +132,7 @@ private void InitializeComponent() this.w_tile.Size = new System.Drawing.Size(64, 64); this.w_tile.TabIndex = 3; this.w_tile.UseVisualStyleBackColor = true; - this.w_tile.Click += new System.EventHandler(this.w_tile_Click); + this.w_tile.Click += new System.EventHandler(this.W_tile_Click); // // middle_tile // @@ -143,7 +143,7 @@ private void InitializeComponent() this.middle_tile.Size = new System.Drawing.Size(64, 64); this.middle_tile.TabIndex = 4; this.middle_tile.UseVisualStyleBackColor = true; - this.middle_tile.Click += new System.EventHandler(this.middle_tile_Click); + this.middle_tile.Click += new System.EventHandler(this.Middle_tile_Click); // // e_tile // @@ -154,7 +154,7 @@ private void InitializeComponent() this.e_tile.Size = new System.Drawing.Size(64, 64); this.e_tile.TabIndex = 5; this.e_tile.UseVisualStyleBackColor = true; - this.e_tile.Click += new System.EventHandler(this.e_tile_Click); + this.e_tile.Click += new System.EventHandler(this.E_tile_Click); // // sw_rounded_tile // @@ -165,7 +165,7 @@ private void InitializeComponent() this.sw_rounded_tile.Size = new System.Drawing.Size(64, 64); this.sw_rounded_tile.TabIndex = 6; this.sw_rounded_tile.UseVisualStyleBackColor = true; - this.sw_rounded_tile.Click += new System.EventHandler(this.sw_rounded_tile_Click); + this.sw_rounded_tile.Click += new System.EventHandler(this.SW_rounded_tile_Click); // // s_tile // @@ -176,7 +176,7 @@ private void InitializeComponent() this.s_tile.Size = new System.Drawing.Size(64, 64); this.s_tile.TabIndex = 7; this.s_tile.UseVisualStyleBackColor = true; - this.s_tile.Click += new System.EventHandler(this.s_tile_Click); + this.s_tile.Click += new System.EventHandler(this.S_tile_Click); // // se_rounded_tile // @@ -187,7 +187,7 @@ private void InitializeComponent() this.se_rounded_tile.Size = new System.Drawing.Size(64, 64); this.se_rounded_tile.TabIndex = 8; this.se_rounded_tile.UseVisualStyleBackColor = true; - this.se_rounded_tile.Click += new System.EventHandler(this.se_rounded_tile_Click); + this.se_rounded_tile.Click += new System.EventHandler(this.SE_rounded_tile_Click); // // nw_angular_tile // @@ -199,7 +199,7 @@ private void InitializeComponent() this.nw_angular_tile.TabIndex = 9; this.nw_angular_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.nw_angular_tile.UseVisualStyleBackColor = true; - this.nw_angular_tile.Click += new System.EventHandler(this.nw_angular_tile_Click); + this.nw_angular_tile.Click += new System.EventHandler(this.NW_angular_tile_Click); // // ne_angular_tile // @@ -211,7 +211,7 @@ private void InitializeComponent() this.ne_angular_tile.TabIndex = 10; this.ne_angular_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.ne_angular_tile.UseVisualStyleBackColor = true; - this.ne_angular_tile.Click += new System.EventHandler(this.ne_angular_tile_Click); + this.ne_angular_tile.Click += new System.EventHandler(this.NE_angular_tile_Click); // // sw_angular_tile // @@ -223,7 +223,7 @@ private void InitializeComponent() this.sw_angular_tile.TabIndex = 11; this.sw_angular_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.sw_angular_tile.UseVisualStyleBackColor = true; - this.sw_angular_tile.Click += new System.EventHandler(this.sw_angular_tile_Click); + this.sw_angular_tile.Click += new System.EventHandler(this.SW_angular_tile_Click); // // se_angular_tile // @@ -235,7 +235,7 @@ private void InitializeComponent() this.se_angular_tile.TabIndex = 12; this.se_angular_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.se_angular_tile.UseVisualStyleBackColor = true; - this.se_angular_tile.Click += new System.EventHandler(this.se_angular_tile_Click); + this.se_angular_tile.Click += new System.EventHandler(this.SE_angular_tile_Click); // // lbl_angular_borders // @@ -263,7 +263,7 @@ private void InitializeComponent() this.slider_thickness.Size = new System.Drawing.Size(104, 45); this.slider_thickness.TabIndex = 15; this.slider_thickness.Value = 1; - this.slider_thickness.ValueChanged += new System.EventHandler(this.slider_thickness_ValueChanged); + this.slider_thickness.ValueChanged += new System.EventHandler(this.SliderThicknessValueChanged); // // btn_normal_click // @@ -273,7 +273,7 @@ private void InitializeComponent() this.btn_normal_click.Size = new System.Drawing.Size(43, 39); this.btn_normal_click.TabIndex = 16; this.btn_normal_click.UseVisualStyleBackColor = true; - this.btn_normal_click.Click += new System.EventHandler(this.btn_normal_click_Click); + this.btn_normal_click.Click += new System.EventHandler(this.B_Normal_Click); // // btn_brush // @@ -283,7 +283,7 @@ private void InitializeComponent() this.btn_brush.Size = new System.Drawing.Size(43, 39); this.btn_brush.TabIndex = 17; this.btn_brush.UseVisualStyleBackColor = true; - this.btn_brush.Click += new System.EventHandler(this.btn_brush_Click); + this.btn_brush.Click += new System.EventHandler(this.B_Brush_Click); // // lbl_brush // @@ -328,7 +328,7 @@ private void InitializeComponent() this.slider_elevation.Name = "slider_elevation"; this.slider_elevation.Size = new System.Drawing.Size(104, 45); this.slider_elevation.TabIndex = 20; - this.slider_elevation.ValueChanged += new System.EventHandler(this.slider_elevation_ValueChanged); + this.slider_elevation.ValueChanged += new System.EventHandler(this.SliderElevationValueChanged); // // tabControl1 // @@ -380,7 +380,7 @@ private void InitializeComponent() this.dr_dirt_inside.TabIndex = 19; this.dr_dirt_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.dr_dirt_inside.UseVisualStyleBackColor = true; - this.dr_dirt_inside.Click += new System.EventHandler(this.dr_dirt_inside_Click); + this.dr_dirt_inside.Click += new System.EventHandler(this.DR_dirt_inside_Click); // // tr_dirt_inside // @@ -392,7 +392,7 @@ private void InitializeComponent() this.tr_dirt_inside.TabIndex = 17; this.tr_dirt_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.tr_dirt_inside.UseVisualStyleBackColor = true; - this.tr_dirt_inside.Click += new System.EventHandler(this.tr_dirt_inside_Click); + this.tr_dirt_inside.Click += new System.EventHandler(this.TR_dirt_inside_Click); // // dl_dirt_inside // @@ -404,7 +404,7 @@ private void InitializeComponent() this.dl_dirt_inside.TabIndex = 18; this.dl_dirt_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.dl_dirt_inside.UseVisualStyleBackColor = true; - this.dl_dirt_inside.Click += new System.EventHandler(this.dl_dirt_inside_Click); + this.dl_dirt_inside.Click += new System.EventHandler(this.DL_dirt_inside_Click); // // tl_dirt_inside // @@ -416,7 +416,7 @@ private void InitializeComponent() this.tl_dirt_inside.TabIndex = 16; this.tl_dirt_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.tl_dirt_inside.UseVisualStyleBackColor = true; - this.tl_dirt_inside.Click += new System.EventHandler(this.tl_dirt_inside_Click); + this.tl_dirt_inside.Click += new System.EventHandler(this.TL_dirt_inside_Click); // // label3 // @@ -467,7 +467,7 @@ private void InitializeComponent() this.dr_water_inside.TabIndex = 34; this.dr_water_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.dr_water_inside.UseVisualStyleBackColor = true; - this.dr_water_inside.Click += new System.EventHandler(this.dr_water_inside_Click); + this.dr_water_inside.Click += new System.EventHandler(this.DR_water_inside_Click); // // tr_water_inside // @@ -479,7 +479,7 @@ private void InitializeComponent() this.tr_water_inside.TabIndex = 32; this.tr_water_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.tr_water_inside.UseVisualStyleBackColor = true; - this.tr_water_inside.Click += new System.EventHandler(this.tr_water_inside_Click); + this.tr_water_inside.Click += new System.EventHandler(this.TR_water_inside_Click); // // dl_water_inside // @@ -491,7 +491,7 @@ private void InitializeComponent() this.dl_water_inside.TabIndex = 33; this.dl_water_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.dl_water_inside.UseVisualStyleBackColor = true; - this.dl_water_inside.Click += new System.EventHandler(this.dl_water_inside_Click); + this.dl_water_inside.Click += new System.EventHandler(this.DL_water_inside_Click); // // tl_water_inside // @@ -503,7 +503,7 @@ private void InitializeComponent() this.tl_water_inside.TabIndex = 31; this.tl_water_inside.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.tl_water_inside.UseVisualStyleBackColor = true; - this.tl_water_inside.Click += new System.EventHandler(this.tl_water_inside_Click); + this.tl_water_inside.Click += new System.EventHandler(this.TL_water_inside_Click); // // label4 // @@ -524,7 +524,7 @@ private void InitializeComponent() this.nw_angular_water_tile.TabIndex = 15; this.nw_angular_water_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.nw_angular_water_tile.UseVisualStyleBackColor = true; - this.nw_angular_water_tile.Click += new System.EventHandler(this.nw_angular_water_tile_Click); + this.nw_angular_water_tile.Click += new System.EventHandler(this.NW_angular_water_tile_Click); // // label1 // @@ -544,7 +544,7 @@ private void InitializeComponent() this.n_water_tile.Size = new System.Drawing.Size(64, 64); this.n_water_tile.TabIndex = 16; this.n_water_tile.UseVisualStyleBackColor = true; - this.n_water_tile.Click += new System.EventHandler(this.n_water_tile_Click); + this.n_water_tile.Click += new System.EventHandler(this.N_water_tile_Click); // // ne_angular_water_tile // @@ -555,7 +555,7 @@ private void InitializeComponent() this.ne_angular_water_tile.Size = new System.Drawing.Size(64, 64); this.ne_angular_water_tile.TabIndex = 17; this.ne_angular_water_tile.UseVisualStyleBackColor = true; - this.ne_angular_water_tile.Click += new System.EventHandler(this.ne_angular_water_tile_Click); + this.ne_angular_water_tile.Click += new System.EventHandler(this.NE_angular_water_tile_Click); // // w_water_tile // @@ -566,7 +566,7 @@ private void InitializeComponent() this.w_water_tile.Size = new System.Drawing.Size(64, 64); this.w_water_tile.TabIndex = 18; this.w_water_tile.UseVisualStyleBackColor = true; - this.w_water_tile.Click += new System.EventHandler(this.w_water_tile_Click); + this.w_water_tile.Click += new System.EventHandler(this.W_water_tile_Click); // // center_water_tile // @@ -577,7 +577,7 @@ private void InitializeComponent() this.center_water_tile.Size = new System.Drawing.Size(64, 64); this.center_water_tile.TabIndex = 19; this.center_water_tile.UseVisualStyleBackColor = true; - this.center_water_tile.Click += new System.EventHandler(this.center_water_tile_Click); + this.center_water_tile.Click += new System.EventHandler(this.Center_water_tile_Click); // // e_water_tile // @@ -610,7 +610,7 @@ private void InitializeComponent() this.sw_angular_water_tile.Size = new System.Drawing.Size(64, 64); this.sw_angular_water_tile.TabIndex = 21; this.sw_angular_water_tile.UseVisualStyleBackColor = true; - this.sw_angular_water_tile.Click += new System.EventHandler(this.sw_angular_water_tile_Click); + this.sw_angular_water_tile.Click += new System.EventHandler(this.SW_angular_water_tile_Click); // // label2 // @@ -630,7 +630,7 @@ private void InitializeComponent() this.se_angular_water_tile.Size = new System.Drawing.Size(64, 64); this.se_angular_water_tile.TabIndex = 23; this.se_angular_water_tile.UseVisualStyleBackColor = true; - this.se_angular_water_tile.Click += new System.EventHandler(this.se_angular_water_tile_Click); + this.se_angular_water_tile.Click += new System.EventHandler(this.SE_angular_water_tile_Click); // // se_diagonal_water_tile // @@ -642,7 +642,7 @@ private void InitializeComponent() this.se_diagonal_water_tile.TabIndex = 27; this.se_diagonal_water_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.se_diagonal_water_tile.UseVisualStyleBackColor = true; - this.se_diagonal_water_tile.Click += new System.EventHandler(this.se_diagonal_water_tile_Click); + this.se_diagonal_water_tile.Click += new System.EventHandler(this.SE_diagonal_water_tile_Click); // // ne_diagonal_water_tile // @@ -654,7 +654,7 @@ private void InitializeComponent() this.ne_diagonal_water_tile.TabIndex = 25; this.ne_diagonal_water_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.ne_diagonal_water_tile.UseVisualStyleBackColor = true; - this.ne_diagonal_water_tile.Click += new System.EventHandler(this.ne_diagonal_water_tile_Click); + this.ne_diagonal_water_tile.Click += new System.EventHandler(this.NE_diagonal_water_tile_Click); // // sw_diagonal_water_tile // @@ -678,7 +678,7 @@ private void InitializeComponent() this.nw_diagonal_water_tile.TabIndex = 24; this.nw_diagonal_water_tile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.nw_diagonal_water_tile.UseVisualStyleBackColor = true; - this.nw_diagonal_water_tile.Click += new System.EventHandler(this.nw_diagonal_water_tile_Click); + this.nw_diagonal_water_tile.Click += new System.EventHandler(this.NW_diagonal_water_tile_Click); // // cb_tileVariation // @@ -689,7 +689,7 @@ private void InitializeComponent() this.cb_tileVariation.TabIndex = 24; this.cb_tileVariation.Text = "Randomize tile variation"; this.cb_tileVariation.UseVisualStyleBackColor = true; - this.cb_tileVariation.CheckedChanged += new System.EventHandler(this.cb_tileVariation_CheckedChanged); + this.cb_tileVariation.CheckedChanged += new System.EventHandler(this.CB_TileVariation_CheckedChanged); // // TerrainBrushEditor // diff --git a/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.cs b/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.cs index 1a382a7..f30e0e9 100644 --- a/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.cs +++ b/NHSE.WinForms/Subforms/Map/TerrainBrushEditor.cs @@ -25,359 +25,260 @@ public partial class TerrainBrushEditor : Form public TerrainBrushEditor(PropertyGrid pG_TerrainTile, FieldItemEditor fieWindow) { InitializeComponent(); - this.PG_TerrainTile = pG_TerrainTile; - this.FIEWindow = fieWindow; + PG_TerrainTile = pG_TerrainTile; + FIEWindow = fieWindow; } #region Tiles buttons #region Dirt tiles - private void nw_rounded_tile_Click(object sender, EventArgs e) + private void NW_Rounded_Tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3B; - newTile.LandMakingAngle = 0; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3B, + LandMakingAngle = 0, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void n_tile_Click(object sender, EventArgs e) + private void N_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff5B; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff5B, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void ne_rounded_tile_Click(object sender, EventArgs e) + private void NE_rounded_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3B; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3B, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void w_tile_Click(object sender, EventArgs e) + private void W_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff5B; - newTile.LandMakingAngle = 0; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff5B, + LandMakingAngle = 0, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void middle_tile_Click(object sender, EventArgs e) + private void Middle_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.Elevation = (ushort)slider_elevation.Value; + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void e_tile_Click(object sender, EventArgs e) + private void E_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff5B; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff5B, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void sw_rounded_tile_Click(object sender, EventArgs e) + private void SW_rounded_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3B; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3B, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void s_tile_Click(object sender, EventArgs e) + private void S_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff5B; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff5B, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void se_rounded_tile_Click(object sender, EventArgs e) + private void SE_rounded_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3B; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3B, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void nw_angular_tile_Click(object sender, EventArgs e) + private void NW_angular_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3C; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3C, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void ne_angular_tile_Click(object sender, EventArgs e) + private void NE_angular_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3C; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3C, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void sw_angular_tile_Click(object sender, EventArgs e) + private void SW_angular_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3C; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3C, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void se_angular_tile_Click(object sender, EventArgs e) + private void SE_angular_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff3C; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff3C, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void tr_dirt_inside_Click(object sender, EventArgs e) + private void TR_dirt_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff7A; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff7A, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void dl_dirt_inside_Click(object sender, EventArgs e) + private void DL_dirt_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff7A; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff7A, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void dr_dirt_inside_Click(object sender, EventArgs e) + private void DR_dirt_inside_Click(object sender, EventArgs e) { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff7A; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; - - PG_TerrainTile.SelectedObject = newTile; + PG_TerrainTile.SelectedObject = new TerrainTile + { + UnitModel = TerrainUnitModel.Cliff7A, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; } #endregion Dirt tiles #region Water tiles - private void nw_diagonal_water_tile_Click(object sender, EventArgs e) + private void NW_diagonal_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3B; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3B, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void n_water_tile_Click(object sender, EventArgs e) + private void N_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River5B; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River5B, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void ne_diagonal_water_tile_Click(object sender, EventArgs e) + private void NE_diagonal_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3B; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3B, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void w_water_tile_Click(object sender, EventArgs e) + private void W_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River5B; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River5B, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void center_water_tile_Click(object sender, EventArgs e) + private void Center_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River8A; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River8A, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void e_water_tile_Click(object sender, EventArgs e) + private void e_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River5B; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River5B, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void sw_diagonal_water_tile_Click(object sender, EventArgs e) + private void sw_diagonal_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3B; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3B, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void s_water_tile_Click(object sender, EventArgs e) + private void s_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River5B; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River5B, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void se_diagonal_water_tile_Click(object sender, EventArgs e) + private void SE_diagonal_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3B; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3B, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void nw_angular_water_tile_Click(object sender, EventArgs e) + private void NW_angular_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3C; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3C, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void ne_angular_water_tile_Click(object sender, EventArgs e) + private void NE_angular_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3C; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3C, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void sw_angular_water_tile_Click(object sender, EventArgs e) + private void SW_angular_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3C; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3C, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void se_angular_water_tile_Click(object sender, EventArgs e) + private void SE_angular_water_tile_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River3C; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River3C, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void tl_dirt_inside_Click(object sender, EventArgs e) + private void TL_dirt_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.Cliff7A; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.Cliff7A, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void tl_water_inside_Click(object sender, EventArgs e) + private void TL_water_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River7A; - newTile.LandMakingAngle = 3; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River7A, + LandMakingAngle = 3, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void tr_water_inside_Click(object sender, EventArgs e) + private void TR_water_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River7A; - newTile.LandMakingAngle = 2; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River7A, + LandMakingAngle = 2, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void dl_water_inside_Click(object sender, EventArgs e) + private void DL_water_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River7A; - newTile.Elevation = (ushort)slider_elevation.Value; + UnitModel = TerrainUnitModel.River7A, + Elevation = (ushort)slider_elevation.Value, + }; - PG_TerrainTile.SelectedObject = newTile; - } - - private void dr_water_inside_Click(object sender, EventArgs e) + private void DR_water_inside_Click(object sender, EventArgs e) => PG_TerrainTile.SelectedObject = new TerrainTile { - TerrainTile newTile = new TerrainTile(); - newTile.UnitModel = TerrainUnitModel.River7A; - newTile.LandMakingAngle = 1; - newTile.Elevation = (ushort)slider_elevation.Value; - - PG_TerrainTile.SelectedObject = newTile; - } + UnitModel = TerrainUnitModel.River7A, + LandMakingAngle = 1, + Elevation = (ushort)slider_elevation.Value, + }; #endregion Water tiles #endregion Tiles buttons - private void slider_thickness_ValueChanged(object sender, EventArgs e) + private void SliderThicknessValueChanged(object sender, EventArgs e) { lbl_size_count.Text = slider_thickness.Value.ToString(); } - private void slider_elevation_ValueChanged(object sender, EventArgs e) + private void SliderElevationValueChanged(object sender, EventArgs e) { lbl_elevation_count.Text = slider_elevation.Value.ToString(); TerrainTile currentTile = (TerrainTile)PG_TerrainTile.SelectedObject; @@ -385,7 +286,7 @@ private void slider_elevation_ValueChanged(object sender, EventArgs e) PG_TerrainTile.SelectedObject = currentTile; } - private void btn_brush_Click(object sender, EventArgs e) + private void B_Brush_Click(object sender, EventArgs e) { brushSelected = true; } @@ -395,12 +296,12 @@ private void TerrainBrushEditor_FormClosed(object sender, FormClosedEventArgs e) brushSelected = false; } - private void btn_normal_click_Click(object sender, EventArgs e) + private void B_Normal_Click(object sender, EventArgs e) { brushSelected = false; } - private void cb_tileVariation_CheckedChanged(object sender, EventArgs e) + private void CB_TileVariation_CheckedChanged(object sender, EventArgs e) { randomizeVariation = cb_tileVariation.Checked; } diff --git a/NHSE.WinForms/Subforms/PlayerItemEditor.cs b/NHSE.WinForms/Subforms/PlayerItemEditor.cs index 987bdca..c7d48c9 100644 --- a/NHSE.WinForms/Subforms/PlayerItemEditor.cs +++ b/NHSE.WinForms/Subforms/PlayerItemEditor.cs @@ -127,17 +127,16 @@ static void AfterWrite(InjectionResult r) sysbot.Show(); } - private void ItemEditor_DragEnter(object sender, DragEventArgs e) + private void ItemEditor_DragEnter(object? sender, DragEventArgs e) { - if (e.Data.GetDataPresent(DataFormats.FileDrop)) + if (e.Data?.GetDataPresent(DataFormats.FileDrop) == true) e.Effect = DragDropEffects.Copy; } - private void PlayerItemEditor_DragDrop(object sender, DragEventArgs e) + private void PlayerItemEditor_DragDrop(object? sender, DragEventArgs e) { - string[] files = (string[])e.Data.GetData(DataFormats.FileDrop); - - if (files.Length != 1 || Directory.Exists(files[0])) + var files = (string[]?)e.Data?.GetData(DataFormats.FileDrop); + if (files?.Length != 1 || Directory.Exists(files[0])) return; string path = files[0]; // open first D&D diff --git a/NHSE.WinForms/Subforms/Program/ImageFetcher.cs b/NHSE.WinForms/Subforms/Program/ImageFetcher.cs index c169534..f1db6a9 100644 --- a/NHSE.WinForms/Subforms/Program/ImageFetcher.cs +++ b/NHSE.WinForms/Subforms/Program/ImageFetcher.cs @@ -41,7 +41,11 @@ private static string[] LoadHosts() return splitHosts; } +#if NETFRAMEWORK private void B_Download_Click(object sender, EventArgs e) +#elif NETCOREAPP + private async void B_Download_Click(object sender, EventArgs e) +#endif { var path = ItemSprite.PlatformAppDataPath; var hostSelected = AllHosts[CB_HostSelect.SelectedIndex]; @@ -54,15 +58,19 @@ private void B_Download_Click(object sender, EventArgs e) { if (!Directory.Exists(path)) Directory.CreateDirectory(path); - +#if NETFRAMEWORK using var webClient = new WebClient(); webClient.DownloadFileCompleted += Completed; webClient.DownloadProgressChanged += ProgressChanged; webClient.DownloadFileAsync(new Uri(hostSelected), ZipFilePath); +#elif NETCOREAPP + using var httpClient = new System.Net.Http.HttpClient(); + using var stream = await httpClient.GetStreamAsync(hostSelected).ConfigureAwait(false); + using var fileStream = new FileStream(ZipFilePath, FileMode.CreateNew); + await stream.CopyToAsync(fileStream).ConfigureAwait(false); +#endif } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message, ex.InnerException == null ? string.Empty : ex.InnerException.Message); SetUIDownloadState(true); @@ -100,9 +108,7 @@ private async void UnzipFile() SetUIDownloadState(true, true); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message, ex.InnerException == null ? string.Empty : ex.InnerException.Message); SetUIDownloadState(true); @@ -136,9 +142,17 @@ private async void CheckNetworkFileSizeAsync() L_FileSize.Text = string.Empty; try { + var host = AllHosts[CB_HostSelect.SelectedIndex]; +#if NETFRAMEWORK using var webClient = new WebClient(); - await webClient.OpenReadTaskAsync(new Uri(AllHosts[CB_HostSelect.SelectedIndex], UriKind.Absolute)).ConfigureAwait(false); + await webClient.OpenReadTaskAsync(new Uri(host, UriKind.Absolute)).ConfigureAwait(false); var hdr = webClient.ResponseHeaders?["Content-Length"]; +#elif NETCOREAPP + using var httpClient = new System.Net.Http.HttpClient(); + var httpInitialResponse = await httpClient.GetAsync(host).ConfigureAwait(false); + var hdr = httpInitialResponse.Content.Headers.ContentLength; +#endif + if (hdr == null) { L_FileSize.Text = "Failed."; @@ -148,9 +162,7 @@ private async void CheckNetworkFileSizeAsync() var totalSizeMb = totalSizeBytes / 1e+6; L_FileSize.Text = $"{totalSizeMb:0.##}MB"; } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { L_FileSize.Text = ex.Message; } diff --git a/NHSE.WinForms/Subforms/SysBot/SysBotController.cs b/NHSE.WinForms/Subforms/SysBot/SysBotController.cs index e923b18..88e1e8b 100644 --- a/NHSE.WinForms/Subforms/SysBot/SysBotController.cs +++ b/NHSE.WinForms/Subforms/SysBot/SysBotController.cs @@ -25,9 +25,7 @@ public bool Connect(string ip, string port) { Bot.Connect(ip, p); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); return false; diff --git a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs index 11bae67..6ad2983 100644 --- a/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs +++ b/NHSE.WinForms/Subforms/SysBot/SysBotRAMEdit.cs @@ -37,9 +37,7 @@ private void SysBotRAMEdit_FormClosing(object sender, FormClosingEventArgs e) { Bot.Bot.Disconnect(); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { Console.WriteLine(ex.Message); } diff --git a/NHSE.WinForms/Subforms/SysBot/SysBotUI.cs b/NHSE.WinForms/Subforms/SysBot/SysBotUI.cs index 1ff7fef..9a7b7a7 100644 --- a/NHSE.WinForms/Subforms/SysBot/SysBotUI.cs +++ b/NHSE.WinForms/Subforms/SysBot/SysBotUI.cs @@ -51,9 +51,7 @@ private void SysBotUI_FormClosing(object sender, FormClosingEventArgs e) { Bot.Bot.Disconnect(); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { Console.WriteLine(ex.Message); } @@ -87,9 +85,7 @@ private void B_WriteCurrent_Click(object sender, EventArgs e) return; WinFormsUtil.Alert(result.ToString()); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); } @@ -105,9 +101,7 @@ private void B_ReadCurrent_Click(object sender, EventArgs e) return; WinFormsUtil.Alert(result.ToString()); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); } @@ -161,9 +155,7 @@ private void ReadUSB_Click(object sender, EventArgs e) return; WinFormsUtil.Alert(result.ToString()); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); } @@ -193,9 +185,7 @@ private void WriteUSB_Click(object sender, EventArgs e) return; WinFormsUtil.Alert(result.ToString()); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); } diff --git a/NHSE.WinForms/Subforms/SysBot/USBBotController.cs b/NHSE.WinForms/Subforms/SysBot/USBBotController.cs index 796824b..206937c 100644 --- a/NHSE.WinForms/Subforms/SysBot/USBBotController.cs +++ b/NHSE.WinForms/Subforms/SysBot/USBBotController.cs @@ -13,9 +13,7 @@ public bool Connect() { return Bot.Connect(); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception ex) -#pragma warning restore CA1031 // Do not catch general exception types { WinFormsUtil.Error(ex.Message); return false; diff --git a/NHSE.WinForms/Subforms/Villager/VillagerMemoryEditor.cs b/NHSE.WinForms/Subforms/Villager/VillagerMemoryEditor.cs index 1f164e4..14f3af6 100644 --- a/NHSE.WinForms/Subforms/Villager/VillagerMemoryEditor.cs +++ b/NHSE.WinForms/Subforms/Villager/VillagerMemoryEditor.cs @@ -42,12 +42,15 @@ public VillagerMemoryEditor(IVillager villager) private void UpdatePlayerIslandStrings() { if (LB_Players.Items.Count < 1) + { for (int i = 0; i < Memories.Length; i++) LB_Players.Items.Add($"{i} - {Memories[i].PlayerName} ({Memories[i].TownName})"); + } else + { for (int i = 0; i < LB_Players.Items.Count; i++) LB_Players.Items[i] = $"{i} - {Memories[i].PlayerName} ({Memories[i].TownName})"; - + } } private void B_Cancel_Click(object sender, EventArgs e) => Close(); @@ -130,7 +133,7 @@ private void SavePlayer(in int playerIndex) memory.NickName = TB_NickName.Text; for (int i = 0; i < Greetings.Length; i++) memory.SetGreeting(Greetings[i].Text, i); - memory.GreetingSetDate = CAL_GreetDate.Value == CAL_GreetDate.MinDate ? new GSaveDate() : (GSaveDate)CAL_GreetDate.Value; + memory.GreetingSetDate = CAL_GreetDate.Value == CAL_GreetDate.MinDate ? new GSaveDate() : CAL_GreetDate.Value; } private void B_Dump_Click(object sender, EventArgs e) diff --git a/NHSE.WinForms/Util/TranslationUtil.cs b/NHSE.WinForms/Util/TranslationUtil.cs index e013683..9442f81 100644 --- a/NHSE.WinForms/Util/TranslationUtil.cs +++ b/NHSE.WinForms/Util/TranslationUtil.cs @@ -74,9 +74,7 @@ private static void SetLocalization(Type t, IReadOnlyCollection lines) { ReflectUtil.SetValue(t, prop, value); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception e) -#pragma warning restore CA1031 // Do not catch general exception types { Debug.WriteLine($"Property not present: {prop} || Value written: {value}"); Debug.WriteLine(e.Message); diff --git a/NHSE.WinForms/Util/WinFormsTranslator.cs b/NHSE.WinForms/Util/WinFormsTranslator.cs index e9ce2bc..a9cad66 100644 --- a/NHSE.WinForms/Util/WinFormsTranslator.cs +++ b/NHSE.WinForms/Util/WinFormsTranslator.cs @@ -65,9 +65,7 @@ private static IEnumerable GetTranslationFile(string lang) { return File.ReadAllLines(externalLangPath); } -#pragma warning disable CA1031 // Do not catch general exception types catch (Exception e) -#pragma warning restore CA1031 // Do not catch general exception types { /* In use? Just return the internal resource. */ Console.WriteLine(e.Message); @@ -193,9 +191,7 @@ public static void LoadAllForms(params string[] banlist) { var _ = Activator.CreateInstance(t, new object[argCount]); } -#pragma warning disable CA1031 // Do not catch general exception types catch -#pragma warning restore CA1031 // Do not catch general exception types { // ignored }