diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-23 20:53:12 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-23 20:53:12 -0400 |
| commit | 2d36105c33ffba77eb979ef6ef0d2e7d906b09bc (patch) | |
| tree | fe74c3eb7dea4e6e7d59c00cab2e2308c43da3d0 /src/StardewModdingAPI/Utilities | |
| parent | a149f82b7a00d1ebf5ab33e529be93ce70873947 (diff) | |
| download | SMAPI-2d36105c33ffba77eb979ef6ef0d2e7d906b09bc.tar.gz SMAPI-2d36105c33ffba77eb979ef6ef0d2e7d906b09bc.tar.bz2 SMAPI-2d36105c33ffba77eb979ef6ef0d2e7d906b09bc.zip | |
drop support for SMAPI 1.x (#360)
Diffstat (limited to 'src/StardewModdingAPI/Utilities')
| -rw-r--r-- | src/StardewModdingAPI/Utilities/SButton.cs | 14 | ||||
| -rw-r--r-- | src/StardewModdingAPI/Utilities/SDate.cs | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/StardewModdingAPI/Utilities/SButton.cs b/src/StardewModdingAPI/Utilities/SButton.cs index 33058a64..fa5ae648 100644 --- a/src/StardewModdingAPI/Utilities/SButton.cs +++ b/src/StardewModdingAPI/Utilities/SButton.cs @@ -6,12 +6,7 @@ namespace StardewModdingAPI.Utilities { /// <summary>A unified button constant which includes all controller, keyboard, and mouse buttons.</summary> /// <remarks>Derived from <see cref="Keys"/>, <see cref="Buttons"/>, and <see cref="System.Windows.Forms.MouseButtons"/>.</remarks> -#if SMAPI_1_x - internal -#else - public -#endif - enum SButton + public enum SButton { /// <summary>No valid key.</summary> None = 0, @@ -594,12 +589,7 @@ namespace StardewModdingAPI.Utilities } /// <summary>Provides extension methods for <see cref="SButton"/>.</summary> -#if SMAPI_1_x - internal -#else - public -#endif - static class SButtonExtensions + public static class SButtonExtensions { /********* ** Accessors diff --git a/src/StardewModdingAPI/Utilities/SDate.cs b/src/StardewModdingAPI/Utilities/SDate.cs index 5073259d..326d7fc7 100644 --- a/src/StardewModdingAPI/Utilities/SDate.cs +++ b/src/StardewModdingAPI/Utilities/SDate.cs @@ -32,10 +32,8 @@ namespace StardewModdingAPI.Utilities /// <summary>The year.</summary> public int Year { get; } -#if !SMAPI_1_x /// <summary>The day of week.</summary> public DayOfWeek DayOfWeek { get; } -#endif /********* @@ -69,9 +67,7 @@ namespace StardewModdingAPI.Utilities this.Day = day; this.Season = season; this.Year = year; -#if !SMAPI_1_x this.DayOfWeek = this.GetDayOfWeek(); -#endif } /// <summary>Get the current in-game date.</summary> |