From ae3bb75fe6095cfd0a0079871e06dda393c2cb78 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 3 May 2025 23:54:11 -0500 Subject: [PATCH] ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual --- PKHeX.Core/PKM/HOME/GameDataCore.cs | 6 ++---- PKHeX.Core/PKM/PA8.cs | 6 ++---- PKHeX.Core/PKM/PB7.cs | 6 ++---- PKHeX.Core/PKM/PK5.cs | 6 ++---- PKHeX.Core/PKM/PK6.cs | 6 ++---- PKHeX.Core/PKM/PK7.cs | 6 ++---- PKHeX.Core/PKM/PK9.cs | 6 ++---- PKHeX.Core/PKM/Shared/G3PKM.cs | 6 ++---- PKHeX.Core/PKM/Shared/G4PKM.cs | 6 ++---- PKHeX.Core/PKM/Shared/G8PKM.cs | 6 ++---- PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs | 3 +-- 11 files changed, 21 insertions(+), 42 deletions(-) diff --git a/PKHeX.Core/PKM/HOME/GameDataCore.cs b/PKHeX.Core/PKM/HOME/GameDataCore.cs index e6c37a1a1..ce98310d0 100644 --- a/PKHeX.Core/PKM/HOME/GameDataCore.cs +++ b/PKHeX.Core/PKM/HOME/GameDataCore.cs @@ -303,15 +303,13 @@ public string OriginalTrainerName public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PKM/PA8.cs b/PKHeX.Core/PKM/PA8.cs index 75f435c8c..0a25181ba 100644 --- a/PKHeX.Core/PKM/PA8.cs +++ b/PKHeX.Core/PKM/PA8.cs @@ -546,15 +546,13 @@ public static int GetStat(int baseStat, int level, Nature nature, int statIndex) public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PKM/PB7.cs b/PKHeX.Core/PKM/PB7.cs index 880ca2ce1..dd585da6c 100644 --- a/PKHeX.Core/PKM/PB7.cs +++ b/PKHeX.Core/PKM/PB7.cs @@ -443,15 +443,13 @@ public override string OriginalTrainerName public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PKM/PK5.cs b/PKHeX.Core/PKM/PK5.cs index ea18ce278..dc15a63f4 100644 --- a/PKHeX.Core/PKM/PK5.cs +++ b/PKHeX.Core/PKM/PK5.cs @@ -343,15 +343,13 @@ public void UpdateHandler(ITrainerInfo tr) public bool GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return ((MarkingValue >> index) & 1) != 0; } public void SetMarking(int index, bool value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index)); } diff --git a/PKHeX.Core/PKM/PK6.cs b/PKHeX.Core/PKM/PK6.cs index 87694b92a..80497ea42 100644 --- a/PKHeX.Core/PKM/PK6.cs +++ b/PKHeX.Core/PKM/PK6.cs @@ -460,15 +460,13 @@ protected override void TradeHT(ITrainerInfo tr) public bool GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return ((MarkingValue >> index) & 1) != 0; } public void SetMarking(int index, bool value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index)); } diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs index f6319bca5..9066adbd3 100644 --- a/PKHeX.Core/PKM/PK7.cs +++ b/PKHeX.Core/PKM/PK7.cs @@ -427,15 +427,13 @@ public override string OriginalTrainerName public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PKM/PK9.cs b/PKHeX.Core/PKM/PK9.cs index 821bfbefa..fc9396a53 100644 --- a/PKHeX.Core/PKM/PK9.cs +++ b/PKHeX.Core/PKM/PK9.cs @@ -511,15 +511,13 @@ public void ClearMoveRecordFlags() public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PKM/Shared/G3PKM.cs b/PKHeX.Core/PKM/Shared/G3PKM.cs index 8c0d7dc68..035c629a9 100644 --- a/PKHeX.Core/PKM/Shared/G3PKM.cs +++ b/PKHeX.Core/PKM/Shared/G3PKM.cs @@ -44,15 +44,13 @@ public abstract class G3PKM : PKM, IRibbonSetEvent3, IRibbonSetCommon3, IRibbonS public bool GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return ((MarkingValue >> index) & 1) != 0; } public void SetMarking(int index, bool value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index)); } diff --git a/PKHeX.Core/PKM/Shared/G4PKM.cs b/PKHeX.Core/PKM/Shared/G4PKM.cs index cc1197ca2..4ef82f06a 100644 --- a/PKHeX.Core/PKM/Shared/G4PKM.cs +++ b/PKHeX.Core/PKM/Shared/G4PKM.cs @@ -172,15 +172,13 @@ public abstract class G4PKM : PKM, IHandlerUpdate, public bool GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return ((MarkingValue >> index) & 1) != 0; } public void SetMarking(int index, bool value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); MarkingValue = (byte)((MarkingValue & ~(1 << index)) | ((value ? 1 : 0) << index)); } diff --git a/PKHeX.Core/PKM/Shared/G8PKM.cs b/PKHeX.Core/PKM/Shared/G8PKM.cs index 8989fc301..15f05e9b8 100644 --- a/PKHeX.Core/PKM/Shared/G8PKM.cs +++ b/PKHeX.Core/PKM/Shared/G8PKM.cs @@ -460,15 +460,13 @@ public ulong Tracker public MarkingColor GetMarking(int index) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); return (MarkingColor)((MarkingValue >> (index * 2)) & 3); } public void SetMarking(int index, MarkingColor value) { - if ((uint)index >= MarkingCount) - throw new ArgumentOutOfRangeException(nameof(index)); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)MarkingCount); var shift = index * 2; MarkingValue = (ushort)((MarkingValue & ~(0b11 << shift)) | (((byte)value & 3) << shift)); } diff --git a/PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs b/PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs index 69817a268..4fddd011b 100644 --- a/PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs +++ b/PKHeX.Core/PersonalInfo/Info/PersonalInfo4.cs @@ -111,8 +111,7 @@ public bool GetIsLearnTutorType(int index) public void SetIsLearnTutorType(int index, bool value) { - if ((uint)index >= CountTutor) - throw new ArgumentOutOfRangeException(nameof(index), index, null); + ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual((uint)index, (uint)CountTutor); TypeTutors[index] = value; }