Merge branch 'develop' into stable

8 files changed, 26 insertions, 17 deletions

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 482ec816..77a19964 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -52,7 +52,7 @@ namespace StardewModdingAPI
         internal static int? LogScreenId { get; set; }
 
         /// <summary>SMAPI's current raw semantic version.</summary>
-        internal static string RawApiVersion = "3.18.2";
+        internal static string RawApiVersion = "3.18.3";
     }
 
     /// <summary>Contains SMAPI's constants and assumptions.</summary>
diff --git a/src/SMAPI/Context.cs b/src/SMAPI/Context.cs
index c822908e..978459e8 100644
--- a/src/SMAPI/Context.cs
+++ b/src/SMAPI/Context.cs
@@ -60,7 +60,7 @@ namespace StardewModdingAPI
         public static bool IsWorldReady
         {
             get => Context.IsWorldReadyForScreen.Value;
-            set => Context.IsWorldReadyForScreen.Value = value;
+            internal set => Context.IsWorldReadyForScreen.Value = value;
         }
 
         /// <summary>Whether <see cref="IsWorldReady"/> is true and the player is free to act in the world (no menu is displayed, no cutscene is in progress, etc).</summary>
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index badbd766..2c068784 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -130,7 +130,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     ".png" => this.LoadImageFile<T>(assetName, file),
                     ".tbin" or ".tmx" => this.LoadMapFile<T>(assetName, file),
                     ".xnb" => this.LoadXnbFile<T>(assetName),
-                    _ => this.HandleUnknownFileType<T>(assetName, file)
+                    _ => (T)this.HandleUnknownFileType(assetName, file, typeof(T))
                 };
             }
             catch (Exception ex)
@@ -323,13 +323,15 @@ namespace StardewModdingAPI.Framework.ContentManagers
         }
 
         /// <summary>Handle a request to load a file type that isn't supported by SMAPI.</summary>
-        /// <typeparam name="T">The expected file type.</typeparam>
         /// <param name="assetName">The asset name relative to the loader root directory.</param>
         /// <param name="file">The file to load.</param>
-        private T HandleUnknownFileType<T>(IAssetName assetName, FileInfo file)
+        /// <param name="assetType">The expected file type.</param>
+        private object HandleUnknownFileType(IAssetName assetName, FileInfo file, Type assetType)
         {
             this.ThrowLoadError(assetName, ContentLoadErrorType.InvalidName, $"unknown file extension '{file.Extension}'; must be one of '.fnt', '.json', '.png', '.tbin', '.tmx', or '.xnb'.");
-            return default;
+            return assetType.IsValueType
+                ? Activator.CreateInstance(assetType)
+                : null;
         }
 
         /// <summary>Assert that the asset type is compatible with one of the allowed types.</summary>
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index cb62e16f..607bb70d 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -180,13 +180,16 @@ namespace StardewModdingAPI.Framework.ModLoading
             return mods
                 .OrderBy(mod =>
                 {
-                    string id = mod.Manifest.UniqueID;
+                    string? id = mod.Manifest?.UniqueID;
 
-                    if (modIdsToLoadEarly.TryGetValue(id, out string? actualId))
-                        return -int.MaxValue + Array.IndexOf(earlyArray, actualId);
+                    if (id is not null)
+                    {
+                        if (modIdsToLoadEarly.TryGetValue(id, out string? actualId))
+                            return -int.MaxValue + Array.IndexOf(earlyArray, actualId);
 
-                    if (modIdsToLoadLate.TryGetValue(id, out actualId))
-                        return int.MaxValue - Array.IndexOf(lateArray, actualId);
+                        if (modIdsToLoadLate.TryGetValue(id, out actualId))
+                            return int.MaxValue - Array.IndexOf(lateArray, actualId);
+                    }
 
                     return 0;
                 })
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 1d146d5f..abba7f3b 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -433,7 +433,7 @@ namespace StardewModdingAPI.Framework
                 // apply load order customizations
                 if (this.Settings.ModsToLoadEarly.Any() || this.Settings.ModsToLoadLate.Any())
                 {
-                    HashSet<string> installedIds = new HashSet<string>(mods.Select(p => p.Manifest.UniqueID), StringComparer.OrdinalIgnoreCase);
+                    HashSet<string> installedIds = new HashSet<string>(mods.Select(p => p.Manifest?.UniqueID).Where(p => p is not null), StringComparer.OrdinalIgnoreCase);
 
                     string[] missingEarlyMods = this.Settings.ModsToLoadEarly.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();
                     string[] missingLateMods = this.Settings.ModsToLoadLate.Where(id => !installedIds.Contains(id)).OrderBy(p => p, StringComparer.OrdinalIgnoreCase).ToArray();
diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj
index 59ad47f0..530b75aa 100644
--- a/src/SMAPI/SMAPI.csproj
+++ b/src/SMAPI/SMAPI.csproj
@@ -8,7 +8,6 @@
     <OutputType>Exe</OutputType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LargeAddressAware Condition="'$(OS)' == 'Windows_NT'">true</LargeAddressAware>
     <ApplicationIcon>icon.ico</ApplicationIcon>
 
     <!--copy dependency DLLs to bin folder so we can include them in installer bundle -->
@@ -22,11 +21,10 @@
   <Import Project="..\..\build\common.targets" />
 
   <ItemGroup>
-    <PackageReference Include="LargeAddressAware" Version="1.0.6" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
     <PackageReference Include="MonoMod.Common" Version="22.3.5.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Pathoschild.Http.FluentClient" Version="4.2.0" />
+    <PackageReference Include="Pathoschild.Http.FluentClient" Version="4.3.0" />
     <PackageReference Include="Pintail" Version="2.2.2" />
     <PackageReference Include="Platonymous.TMXTile" Version="1.5.9" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
diff --git a/src/SMAPI/Utilities/PerScreen.cs b/src/SMAPI/Utilities/PerScreen.cs
index 87bf2027..674ec760 100644
--- a/src/SMAPI/Utilities/PerScreen.cs
+++ b/src/SMAPI/Utilities/PerScreen.cs
@@ -101,6 +101,12 @@ namespace StardewModdingAPI.Utilities
             this.RemoveScreens(_ => true);
         }
 
+        /// <summary>Get whether the current screen has a value created yet.</summary>
+        public bool IsActiveForScreen()
+        {
+            return this.States.ContainsKey(Context.ScreenId);
+        }
+
 
         /*********
         ** Private methods
diff --git a/src/SMAPI/i18n/ko.json b/src/SMAPI/i18n/ko.json
index 8d267e5e..8122a9e2 100644
--- a/src/SMAPI/i18n/ko.json
+++ b/src/SMAPI/i18n/ko.json
@@ -1,6 +1,6 @@
 {
     // short date format for SDate
     // tokens: {{day}} (like 15), {{season}} (like Spring), {{seasonLowercase}} (like spring), {{year}} (like 2)
-    "generic.date": "{{season}} {{day}}",
-    "generic.date-with-year": "{{year}} 학년 {{season}} {{day}}"
+    "generic.date": "{{season}} {{day}}일",
+    "generic.date-with-year": "{{year}}년차 {{season}} {{day}}일"
 }