diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2022-08-29 18:25:45 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2022-08-29 18:25:45 -0400 |
| commit | e0838a28c045939b497455217bd297e8052d11ee (patch) | |
| tree | 1283afab68c42fd1f426dfdf363c9d0e473f72cc /src/SMAPI/Framework/ContentManagers/ModContentManager.cs | |
| parent | a1bc96d365dc40275f198668d3f4c09bd7a92613 (diff) | |
| parent | 8b6c732d7168edacf44d4dbabd8613f2c38ebc19 (diff) | |
| download | SMAPI-e0838a28c045939b497455217bd297e8052d11ee.tar.gz SMAPI-e0838a28c045939b497455217bd297e8052d11ee.tar.bz2 SMAPI-e0838a28c045939b497455217bd297e8052d11ee.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/ContentManagers/ModContentManager.cs')
| -rw-r--r-- | src/SMAPI/Framework/ContentManagers/ModContentManager.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs index 8ecbc4cc..cc6f8372 100644 --- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs +++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs @@ -50,8 +50,10 @@ namespace StardewModdingAPI.Framework.ContentManagers /********* ** Accessors *********/ +#if SMAPI_DEPRECATED /// <summary>Whether to enable legacy compatibility mode for PyTK scale-up textures.</summary> internal static bool EnablePyTkLegacyMode; +#endif /********* @@ -202,6 +204,7 @@ namespace StardewModdingAPI.Framework.ContentManagers bool expectsRawData = typeof(T).IsAssignableTo(typeof(IRawTextureData)); bool asRawData = expectsRawData || this.UseRawImageLoading; +#if SMAPI_DEPRECATED // disable raw data if PyTK will rescale the image (until it supports raw data) if (asRawData && !expectsRawData) { @@ -212,9 +215,10 @@ namespace StardewModdingAPI.Framework.ContentManagers // current file has a '.pytk.json' rescale file though, since PyTK may still // rescale it if the original asset or another edit gets rescaled. asRawData = false; - this.Monitor.LogOnce("Enabled compatibility mode for PyTK 1.23.0 or earlier. This won't cause any issues, but may impact performance.", LogLevel.Warn); + this.Monitor.LogOnce("Enabled compatibility mode for PyTK 1.23.* or earlier. This won't cause any issues, but may impact performance. This will no longer be supported in the upcoming SMAPI 4.0.0.", LogLevel.Warn); } } +#endif // load if (asRawData) |