From 201d54bbeb2af5d44c35ad4cf77aadb84f09e135 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Tue, 1 Aug 2017 15:35:06 -0400
Subject: standardise code & update release notes (#339)

---
 src/StardewModdingAPI/Utilities/SDate.cs | 62 ++++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/StardewModdingAPI')

diff --git a/src/StardewModdingAPI/Utilities/SDate.cs b/src/StardewModdingAPI/Utilities/SDate.cs
index f6650231..bc3a2b38 100644
--- a/src/StardewModdingAPI/Utilities/SDate.cs
+++ b/src/StardewModdingAPI/Utilities/SDate.cs
@@ -19,8 +19,6 @@ namespace StardewModdingAPI.Utilities
         /// <summary>The number of days in a season.</summary>
         private readonly int DaysInSeason = 28;
 
-        /// <summary>The Day of the Week this date has</summary>
-        public DayOfWeek Weekday;
 
         /*********
         ** Accessors
@@ -34,6 +32,12 @@ 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
+
+
         /*********
         ** Public methods
         *********/
@@ -65,8 +69,7 @@ namespace StardewModdingAPI.Utilities
             this.Day = day;
             this.Season = season;
             this.Year = year;
-
-            this.Weekday = GetDayOfWeek();
+            this.DayOfWeek = this.GetDayOfWeek();
         }
 
         /// <summary>Get the current in-game date.</summary>
@@ -117,33 +120,6 @@ namespace StardewModdingAPI.Utilities
             return $"{this.Day:00} {this.Season} Y{this.Year}";
         }
 
-        /// <summary>
-        /// This gets the day of the week from the date
-        /// </summary>
-        /// <returns>A constant describing the day</returns>
-        private DayOfWeek GetDayOfWeek()
-        {
-            switch (this.Day % 7)
-            {
-                case 0:
-                    return DayOfWeek.Sunday;
-                case 1:
-                    return DayOfWeek.Monday;
-                case 2:
-                    return DayOfWeek.Tuesday;
-                case 3:
-                    return DayOfWeek.Wednesday;
-                case 4:
-                    return DayOfWeek.Thursday;
-                case 5:
-                    return DayOfWeek.Friday;
-                case 6:
-                    return DayOfWeek.Saturday;
-                default:
-                    return 0;
-            }
-        }
-
         /****
         ** IEquatable
         ****/
@@ -228,6 +204,30 @@ namespace StardewModdingAPI.Utilities
         /*********
         ** Private methods
         *********/
+        /// <summary>Get the day of week for the current date.</summary>
+        private DayOfWeek GetDayOfWeek()
+        {
+            switch (this.Day % 7)
+            {
+                case 0:
+                    return DayOfWeek.Sunday;
+                case 1:
+                    return DayOfWeek.Monday;
+                case 2:
+                    return DayOfWeek.Tuesday;
+                case 3:
+                    return DayOfWeek.Wednesday;
+                case 4:
+                    return DayOfWeek.Thursday;
+                case 5:
+                    return DayOfWeek.Friday;
+                case 6:
+                    return DayOfWeek.Saturday;
+                default:
+                    return 0;
+            }
+        }
+
         /// <summary>Get the current season index.</summary>
         /// <exception cref="InvalidOperationException">The current season wasn't recognised.</exception>
         private int GetSeasonIndex()
-- 
cgit