summaryrefslogtreecommitdiff
path: root/src/SMAPI/Utilities/SDate.cs
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-09-07 13:06:27 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-09-07 13:06:27 -0400
commit5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83 (patch)
tree0a42305174eb84561a584549cd685c5e95670f36 /src/SMAPI/Utilities/SDate.cs
parent8da88b8fe5b41739c5cd0df3280b9770fc7f10a4 (diff)
parentf9fac11028354f15d786d5b854608edb10716f79 (diff)
downloadSMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.tar.gz
SMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.tar.bz2
SMAPI-5e43bdbf5cd6dbab36c25287c85d42ccfeea2c83.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Utilities/SDate.cs')
-rw-r--r--src/SMAPI/Utilities/SDate.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/SMAPI/Utilities/SDate.cs b/src/SMAPI/Utilities/SDate.cs
index 03230334..cd075dcc 100644
--- a/src/SMAPI/Utilities/SDate.cs
+++ b/src/SMAPI/Utilities/SDate.cs
@@ -1,5 +1,6 @@
using System;
using System.Linq;
+using Newtonsoft.Json;
using StardewModdingAPI.Framework;
using StardewValley;
@@ -35,15 +36,18 @@ namespace StardewModdingAPI.Utilities
/// <summary>The index of the season (where 0 is spring, 1 is summer, 2 is fall, and 3 is winter).</summary>
/// <remarks>This is used in some game calculations (e.g. seasonal game sprites) and methods (e.g. <see cref="Utility.getSeasonNameFromNumber"/>).</remarks>
+ [JsonIgnore]
public int SeasonIndex { get; }
/// <summary>The year.</summary>
public int Year { get; }
/// <summary>The day of week.</summary>
+ [JsonIgnore]
public DayOfWeek DayOfWeek { get; }
/// <summary>The number of days since the game began (starting at 1 for the first day of spring in Y1).</summary>
+ [JsonIgnore]
public int DaysSinceStart { get; }
@@ -62,6 +66,7 @@ namespace StardewModdingAPI.Utilities
/// <param name="season">The season name.</param>
/// <param name="year">The year.</param>
/// <exception cref="ArgumentException">One of the arguments has an invalid value (like day 35).</exception>
+ [JsonConstructor]
public SDate(int day, string season, int year)
: this(day, season, year, allowDayZero: false) { }
@@ -264,7 +269,6 @@ namespace StardewModdingAPI.Utilities
this.Year = year;
this.DayOfWeek = this.GetDayOfWeek(day);
this.DaysSinceStart = this.GetDaysSinceStart(day, season, year);
-
}
/// <summary>Get whether a date represents 0 spring Y1, which is the date during the in-game intro.</summary>