Merge branch 'develop' into stable

8 files changed, 85 insertions, 21 deletions

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index fbc00d1d..42c3b21b 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -54,7 +54,7 @@ namespace StardewModdingAPI
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.12.7";
+        internal static string RawApiVersion = "3.12.8";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 86b69239..6dffb1de 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -247,7 +247,7 @@ namespace StardewModdingAPI.Framework
                     multiplayer: this.Multiplayer,
                     exitGameImmediately: this.ExitGameImmediately,
 
-                    onGameContentLoaded: this.OnGameContentLoaded,
+                    onGameContentLoaded: this.OnInstanceContentLoaded,
                     onGameUpdating: this.OnGameUpdating,
                     onPlayerInstanceUpdating: this.OnPlayerInstanceUpdating,
                     onGameExiting: this.OnGameExiting
@@ -429,8 +429,8 @@ namespace StardewModdingAPI.Framework
             ).Start();
         }
 
-        /// <summary>Raised after the game finishes loading its initial content.</summary>
-        private void OnGameContentLoaded()
+        /// <summary>Raised after an instance finishes loading its initial content.</summary>
+        private void OnInstanceContentLoaded()
         {
             // override map display device
             Game1.mapDisplayDevice = new SDisplayDevice(Game1.content, Game1.game1.GraphicsDevice);
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 55ab8377..4e134455 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -54,6 +54,9 @@ namespace StardewModdingAPI.Framework
         /// <summary>Raised when the instance is updating its state (roughly 60 times per second).</summary>
         private readonly Action<SGame, GameTime, Action> OnUpdating;
 
+        /// <summary>Raised after the instance finishes loading its initial content.</summary>
+        private readonly Action OnContentLoaded;
+
 
         /*********
         ** Accessors
@@ -106,7 +109,8 @@ namespace StardewModdingAPI.Framework
         /// <param name="multiplayer">The core multiplayer logic.</param>
         /// <param name="exitGameImmediately">Immediately exit the game without saving. This should only be invoked when an irrecoverable fatal error happens that risks save corruption or game-breaking bugs.</param>
         /// <param name="onUpdating">Raised when the instance is updating its state (roughly 60 times per second).</param>
-        public SGame(PlayerIndex playerIndex, int instanceIndex, Monitor monitor, Reflector reflection, EventManager eventManager, SInputState input, SModHooks modHooks, SMultiplayer multiplayer, Action<string> exitGameImmediately, Action<SGame, GameTime, Action> onUpdating)
+        /// <param name="onContentLoaded">Raised after the game finishes loading its initial content.</param>
+        public SGame(PlayerIndex playerIndex, int instanceIndex, Monitor monitor, Reflector reflection, EventManager eventManager, SInputState input, SModHooks modHooks, SMultiplayer multiplayer, Action<string> exitGameImmediately, Action<SGame, GameTime, Action> onUpdating, Action onContentLoaded)
             : base(playerIndex, instanceIndex)
         {
             // init XNA
@@ -124,6 +128,7 @@ namespace StardewModdingAPI.Framework
             this.Reflection = reflection;
             this.ExitGameImmediately = exitGameImmediately;
             this.OnUpdating = onUpdating;
+            this.OnContentLoaded = onContentLoaded;
         }
 
         /// <summary>Get the current input state for a button.</summary>
@@ -138,6 +143,13 @@ namespace StardewModdingAPI.Framework
             return input.GetState(button);
         }
 
+        /// <inheritdoc />
+        protected override void LoadContent()
+        {
+            base.LoadContent();
+
+            this.OnContentLoaded();
+        }
 
         /*********
         ** Protected methods
diff --git a/src/SMAPI/Framework/SGameRunner.cs b/src/SMAPI/Framework/SGameRunner.cs
index 45e7369c..b816bb7c 100644
--- a/src/SMAPI/Framework/SGameRunner.cs
+++ b/src/SMAPI/Framework/SGameRunner.cs
@@ -94,7 +94,7 @@ namespace StardewModdingAPI.Framework
         public override Game1 CreateGameInstance(PlayerIndex playerIndex = PlayerIndex.One, int instanceIndex = 0)
         {
             SInputState inputState = new SInputState();
-            return new SGame(playerIndex, instanceIndex, this.Monitor, this.Reflection, this.Events, inputState, this.ModHooks, this.Multiplayer, this.ExitGameImmediately, this.OnPlayerInstanceUpdating);
+            return new SGame(playerIndex, instanceIndex, this.Monitor, this.Reflection, this.Events, inputState, this.ModHooks, this.Multiplayer, this.ExitGameImmediately, this.OnPlayerInstanceUpdating, this.OnGameContentLoaded);
         }
 
         /// <inheritdoc />
@@ -129,14 +129,6 @@ namespace StardewModdingAPI.Framework
         /*********
         ** Protected methods
         *********/
-        /// <summary>Load content when the game is launched.</summary>
-        protected override void LoadContent()
-        {
-            base.LoadContent();
-
-            this.OnGameContentLoaded();
-        }
-
         /// <summary>Perform cleanup logic when the game exits.</summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="args">The event args.</param>
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 35ae26b3..7efd99a0 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Framework.ContentManagers;
 using StardewModdingAPI.Framework.Reflection;
@@ -183,8 +184,10 @@ namespace StardewModdingAPI.Metadata
 
                 if (!ignoreWorld)
                 {
-                    foreach (GameLocation location in this.GetLocations())
+                    foreach (LocationInfo info in this.GetLocationsWithInfo())
                     {
+                        GameLocation location = info.Location;
+
                         if (!string.IsNullOrWhiteSpace(location.mapPath.Value) && this.NormalizeAssetNameIgnoringEmpty(location.mapPath.Value) == key)
                         {
                             static ISet<string> GetWarpSet(GameLocation location)
@@ -195,7 +198,7 @@ namespace StardewModdingAPI.Metadata
                             }
 
                             var oldWarps = GetWarpSet(location);
-                            this.ReloadMap(location);
+                            this.ReloadMap(info);
                             var newWarps = GetWarpSet(location);
 
                             changedWarps = changedWarps || oldWarps.Count != newWarps.Count || oldWarps.Any(p => !newWarps.Contains(p));
@@ -905,9 +908,12 @@ namespace StardewModdingAPI.Metadata
         }
 
         /// <summary>Reload the map for a location.</summary>
-        /// <param name="location">The location whose map to reload.</param>
-        private void ReloadMap(GameLocation location)
+        /// <param name="locationInfo">The location whose map to reload.</param>
+        private void ReloadMap(LocationInfo locationInfo)
         {
+            GameLocation location = locationInfo.Location;
+            Vector2? playerPos = Game1.player?.Position;
+
             if (this.AggressiveMemoryOptimizations)
                 location.map.DisposeTileSheets(Game1.mapDisplayDevice);
 
@@ -926,6 +932,15 @@ namespace StardewModdingAPI.Metadata
             // update for changes
             location.updateWarps();
             location.updateDoors();
+            locationInfo.ParentBuilding?.updateInteriorWarps();
+
+            // reset player position
+            // The game may move the player as part of the map changes, even if they're not in that
+            // location. That's not needed in this case, and it can have weird effects like players
+            // warping onto the wrong tile (or even off-screen) if a patch changes the farmhouse
+            // map on location change.
+            if (playerPos.HasValue)
+                Game1.player.Position = playerPos.Value;
         }
 
         /// <summary>Reload the disposition data for matching NPCs.</summary>
@@ -1202,6 +1217,13 @@ namespace StardewModdingAPI.Metadata
         /// <param name="buildingInteriors">Whether to also get the interior locations for constructable buildings.</param>
         private IEnumerable<GameLocation> GetLocations(bool buildingInteriors = true)
         {
+            return this.GetLocationsWithInfo(buildingInteriors).Select(info => info.Location);
+        }
+
+        /// <summary>Get all locations in the game.</summary>
+        /// <param name="buildingInteriors">Whether to also get the interior locations for constructable buildings.</param>
+        private IEnumerable<LocationInfo> GetLocationsWithInfo(bool buildingInteriors = true)
+        {
             // get available root locations
             IEnumerable<GameLocation> rootLocations = Game1.locations;
             if (SaveGame.loaded?.locations != null)
@@ -1210,7 +1232,7 @@ namespace StardewModdingAPI.Metadata
             // yield root + child locations
             foreach (GameLocation location in rootLocations)
             {
-                yield return location;
+                yield return new LocationInfo(location, null);
 
                 if (buildingInteriors && location is BuildableGameLocation buildableLocation)
                 {
@@ -1218,7 +1240,7 @@ namespace StardewModdingAPI.Metadata
                     {
                         GameLocation indoors = building.indoors.Value;
                         if (indoors != null)
-                            yield return indoors;
+                            yield return new LocationInfo(indoors, building);
                     }
                 }
             }
@@ -1306,5 +1328,31 @@ namespace StardewModdingAPI.Metadata
             // remove key from cache
             return BuildingPainter.paintMaskLookup.Remove(key);
         }
+
+        /// <summary>Metadata about a location used in asset propagation.</summary>
+        private readonly struct LocationInfo
+        {
+            /*********
+            ** Accessors
+            *********/
+            /// <summary>The location instance.</summary>
+            public GameLocation Location { get; }
+
+            /// <summary>The building which contains the location, if any.</summary>
+            public Building ParentBuilding { get; }
+
+
+            /*********
+            ** Public methods
+            *********/
+            /// <summary>Construct an instance.</summary>
+            /// <param name="location">The location instance.</param>
+            /// <param name="parentBuilding">The building which contains the location, if any.</param>
+            public LocationInfo(GameLocation location, Building parentBuilding)
+            {
+                this.Location = location;
+                this.ParentBuilding = parentBuilding;
+            }
+        }
     }
 }
diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj
index 0f1b0516..c147e7dc 100644
--- a/src/SMAPI/SMAPI.csproj
+++ b/src/SMAPI/SMAPI.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>StardewModdingAPI</AssemblyName>
     <RootNamespace>StardewModdingAPI</RootNamespace>
     <Description>The modding API for Stardew Valley.</Description>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/SMAPI/i18n/pl.json b/src/SMAPI/i18n/pl.json
new file mode 100644
index 00000000..b9c788fc
--- /dev/null
+++ b/src/SMAPI/i18n/pl.json
@@ -0,0 +1,6 @@
+{

+    // short date format for SDate

+    // tokens: {{day}} (like 15), {{season}} (like Spring), {{seasonLowercase}} (like spring), {{year}} (like 2)

+    "generic.date": "{{day}} {{seasonLowercase}}",

+    "generic.date-with-year": "{{day}} {{seasonLowercase}} w roku {{year}}"

+}

diff --git a/src/SMAPI/i18n/th.json b/src/SMAPI/i18n/th.json
new file mode 100644
index 00000000..361b7aa7
--- /dev/null
+++ b/src/SMAPI/i18n/th.json
@@ -0,0 +1,6 @@
+{
+    // short date format for SDate
+    // tokens: {{day}} (like 15), {{season}} (like Spring), {{seasonLowercase}} (like spring), {{year}} (like 2)
+    "generic.date": "วันที่ {{day}} {{season}}",
+    "generic.date-with-year": "วันที่ {{day}} {{season}} ปีที่ {{year}}"
+}