summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <github@jplamondonw.com>2018-03-11 19:09:08 -0400
committerJesse Plamondon-Willard <github@jplamondonw.com>2018-03-11 19:09:08 -0400
commit41715cefcde3c838bb079cb37aac5a3b2dcb1004 (patch)
tree88d5d6c035acb9a2b48fb60f635ccb2156788e9f
parent80315ec46695d9c2b1121a0a6208105d7e165e89 (diff)
downloadSMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.tar.gz
SMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.tar.bz2
SMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.zip
add initial compatibility with Stardew Valley 1.3 (#453)
-rw-r--r--build/common.targets4
-rw-r--r--docs/release-notes.md4
-rw-r--r--src/SMAPI.ModBuildConfig/build/smapi.targets4
-rw-r--r--src/SMAPI.ModBuildConfig/package.nuspec5
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs4
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs10
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs6
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs6
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs6
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs83
-rw-r--r--src/SMAPI/Constants.cs28
-rw-r--r--src/SMAPI/Events/EventArgsInventoryChanged.cs12
-rw-r--r--src/SMAPI/Events/EventArgsLocationObjectsChanged.cs18
-rw-r--r--src/SMAPI/Framework/GameVersion.cs4
-rw-r--r--src/SMAPI/Framework/SContentManager.cs69
-rw-r--r--src/SMAPI/Framework/SGame.cs631
-rw-r--r--src/SMAPI/Metadata/CoreAssets.cs38
-rw-r--r--src/SMAPI/Program.cs1
18 files changed, 881 insertions, 52 deletions
diff --git a/build/common.targets b/build/common.targets
index aa11344e..6773dbe4 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -38,6 +38,10 @@
<Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
<Private>False</Private>
</Reference>
+ <Reference Include="Netcode" Condition="Exists('$(GamePath)\Netcode.dll')">
+ <HintPath>$(GamePath)\Netcode.dll</HintPath>
+ <Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
+ </Reference>
<Reference Include="Stardew Valley">
<HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
<Private Condition="'$(MSBuildProjectName)' != 'StardewModdingAPI.Tests'">False</Private>
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 5cac1ed8..05a95fc1 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -1,4 +1,8 @@
# Release notes
+## 2.6 alpha
+* For players:
+ * Updated for Stardew Valley 1.3 (multiplayer update); no longer compatible with earlier versions.
+
## 2.5.3
* For players:
* Simplified and improved skipped-incompatible-mod messages.
diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets
index 83f0dcbd..7e8bbfc3 100644
--- a/src/SMAPI.ModBuildConfig/build/smapi.targets
+++ b/src/SMAPI.ModBuildConfig/build/smapi.targets
@@ -67,6 +67,10 @@
<Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
<Private>false</Private>
</Reference>
+ <Reference Include="Netcode" Condition="Exists('$(GamePath)\Netcode.dll')">
+ <HintPath>$(GamePath)\Netcode.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="Stardew Valley">
<HintPath>$(GamePath)\Stardew Valley.exe</HintPath>
<Private>false</Private>
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index 91f38a29..8393ab61 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Pathoschild.Stardew.ModBuildConfig</id>
- <version>2.0.2</version>
+ <version>2.0.3-alpha20180307</version>
<title>Build package for SMAPI mods</title>
<authors>Pathoschild</authors>
<owners>Pathoschild</owners>
@@ -26,6 +26,9 @@
2.0.2:
- Fixed compatibility issue on Linux.
+
+ 2.0.3:
+ - Added support for Stardew Valley 1.3.
</releaseNotes>
</metadata>
<files>
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index 14a519fb..a6f42b98 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -54,7 +54,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
// apply quality
if (match.Item is Object obj)
+#if STARDEW_VALLEY_1_3
+ obj.Quality = quality;
+#else
obj.quality = quality;
+#endif
else if (match.Item is Tool tool)
tool.UpgradeLevel = quality;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
index 5d098593..aa4fd105 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
@@ -1,4 +1,4 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
using StardewValley;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
@@ -36,7 +36,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
switch (target)
{
case "hair":
+#if STARDEW_VALLEY_1_3
+ Game1.player.hairstyleColor.Value = color;
+#else
Game1.player.hairstyleColor = color;
+#endif
monitor.Log("OK, your hair color is updated.", LogLevel.Info);
break;
@@ -46,7 +50,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
break;
case "pants":
+#if STARDEW_VALLEY_1_3
+ Game1.player.pantsColor.Value = color;
+#else
Game1.player.pantsColor = color;
+#endif
monitor.Log("OK, your pants color is updated.", LogLevel.Info);
break;
}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
index 5b1225e8..71e17f71 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
@@ -1,4 +1,4 @@
-using StardewValley;
+using StardewValley;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
{
@@ -39,7 +39,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
case "farm":
if (!string.IsNullOrWhiteSpace(name))
{
+#if STARDEW_VALLEY_1_3
+ Game1.player.farmName.Value = args[1];
+#else
Game1.player.farmName = args[1];
+#endif
monitor.Log($"OK, your farm's name is now {Game1.player.farmName}.", LogLevel.Info);
}
else
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
index da117006..c83c3b07 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
@@ -1,4 +1,4 @@
-using StardewValley;
+using StardewValley;
using StardewValley.Locations;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
@@ -21,7 +21,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
{
int level = (Game1.currentLocation as MineShaft)?.mineLevel ?? 0;
monitor.Log($"OK, warping you to mine level {level + 1}.", LogLevel.Info);
+#if STARDEW_VALLEY_1_3
+ Game1.enterMine(level + 1);
+#else
Game1.enterMine(false, level + 1, "");
+#endif
}
}
}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
index 1024b7b6..5947af1a 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using StardewValley;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
@@ -26,7 +26,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
// handle
level = Math.Max(1, level);
monitor.Log($"OK, warping you to mine level {level}.", LogLevel.Info);
+#if STARDEW_VALLEY_1_3
+ Game1.enterMine(level);
+#else
Game1.enterMine(true, level, "");
+#endif
}
}
}
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
index b5fe9f2f..9c0981c4 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Microsoft.Xna.Framework;
using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
using StardewValley;
@@ -95,39 +95,90 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
// fruit products
if (item.category == SObject.FruitsCategory)
{
- yield return new SearchableItem(ItemType.Object, this.CustomIDOffset + id, new SObject(348, 1)
+ // wine
+#if STARDEW_VALLEY_1_3
+ SObject wine =
+ new SObject(348, 1)
+ {
+ Name = $"{item.Name} Wine",
+ Price = item.price * 3
+ };
+ wine.preserve.Value = SObject.PreserveType.Wine;
+ wine.preservedParentSheetIndex.Value = item.parentSheetIndex;
+#else
+ SObject wine = new SObject(348, 1)
{
name = $"{item.Name} Wine",
price = item.price * 3,
preserve = SObject.PreserveType.Wine,
preservedParentSheetIndex = item.parentSheetIndex
- });
- yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 2 + id, new SObject(344, 1)
+ };
+#endif
+ yield return new SearchableItem(ItemType.Object, this.CustomIDOffset + id, wine);
+
+ // jelly
+#if STARDEW_VALLEY_1_3
+ SObject jelly = new SObject(344, 1)
+ {
+ Name = $"{item.Name} Jelly",
+ Price = 50 + item.Price * 2
+ };
+ jelly.preserve.Value = SObject.PreserveType.Jelly;
+ jelly.preservedParentSheetIndex.Value = item.parentSheetIndex;
+#else
+ SObject jelly = new SObject(344, 1)
{
name = $"{item.Name} Jelly",
price = 50 + item.Price * 2,
preserve = SObject.PreserveType.Jelly,
preservedParentSheetIndex = item.parentSheetIndex
- });
+ };
+#endif
+ yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 2 + id, jelly);
}
// vegetable products
else if (item.category == SObject.VegetableCategory)
{
- yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 3 + id, new SObject(350, 1)
+ // juice
+#if STARDEW_VALLEY_1_3
+ SObject juice = new SObject(350, 1)
+ {
+ Name = $"{item.Name} Juice",
+ Price = (int)(item.price * 2.25d)
+ };
+ juice.preserve.Value = SObject.PreserveType.Juice;
+ juice.preservedParentSheetIndex.Value = item.parentSheetIndex;
+#else
+ SObject juice = new SObject(350, 1)
{
name = $"{item.Name} Juice",
price = (int)(item.price * 2.25d),
preserve = SObject.PreserveType.Juice,
preservedParentSheetIndex = item.parentSheetIndex
- });
- yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 4 + id, new SObject(342, 1)
+ };
+#endif
+ yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 3 + id, juice);
+
+ // pickled
+#if STARDEW_VALLEY_1_3
+ SObject pickled = new SObject(342, 1)
+ {
+ Name = $"Pickled {item.Name}",
+ Price = 50 + item.Price * 2
+ };
+ pickled.preserve.Value = SObject.PreserveType.Pickle;
+ pickled.preservedParentSheetIndex.Value = item.parentSheetIndex;
+#else
+ SObject pickled = new SObject(342, 1)
{
name = $"Pickled {item.Name}",
price = 50 + item.Price * 2,
preserve = SObject.PreserveType.Pickle,
preservedParentSheetIndex = item.parentSheetIndex
- });
+ };
+#endif
+ yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 4 + id, pickled);
}
// flower honey
@@ -160,6 +211,19 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
// yield honey
if (type != null)
{
+#if STARDEW_VALLEY_1_3
+ SObject honey = new SObject(Vector2.Zero, 340, item.Name + " Honey", false, true, false, false)
+ {
+ Name = "Wild Honey"
+ };
+ honey.honeyType.Value = type;
+
+ if (type != SObject.HoneyType.Wild)
+ {
+ honey.Name = $"{item.Name} Honey";
+ honey.Price += item.Price * 2;
+ }
+#else
SObject honey = new SObject(Vector2.Zero, 340, item.Name + " Honey", false, true, false, false)
{
name = "Wild Honey",
@@ -170,6 +234,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
honey.name = $"{item.Name} Honey";
honey.price += item.price * 2;
}
+#endif
yield return new SearchableItem(ItemType.Object, this.CustomIDOffset * 5 + id, honey);
}
}
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 5b2f6e6e..011762fb 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -37,13 +37,28 @@ namespace StardewModdingAPI
** Public
****/
/// <summary>SMAPI's current semantic version.</summary>
- public static ISemanticVersion ApiVersion { get; } = new SemanticVersion("2.5.3");
+ public static ISemanticVersion ApiVersion { get; } =
+#if STARDEW_VALLEY_1_3
+ new SemanticVersion($"2.6-alpha.{DateTime.UtcNow:yyyyMMddHHmm}");
+#else
+ new SemanticVersion($"2.5.3");
+#endif
/// <summary>The minimum supported version of Stardew Valley.</summary>
- public static ISemanticVersion MinimumGameVersion { get; } = new SemanticVersion("1.2.30");
+ public static ISemanticVersion MinimumGameVersion { get; } =
+#if STARDEW_VALLEY_1_3
+ new GameVersion("1.3.0.2");
+#else
+ new SemanticVersion("1.2.33");
+#endif
/// <summary>The maximum supported version of Stardew Valley.</summary>
- public static ISemanticVersion MaximumGameVersion { get; } = new SemanticVersion("1.2.33");
+ public static ISemanticVersion MaximumGameVersion { get; } =
+#if STARDEW_VALLEY_1_3
+ null;
+#else
+ new SemanticVersion("1.2.33");
+#endif
/// <summary>The path to the game folder.</summary>
public static string ExecutionPath { get; } = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -169,7 +184,12 @@ namespace StardewModdingAPI
/// <summary>Get the name of a save directory for the current player.</summary>
private static string GetSaveFolderName()
{
- string prefix = new string(Game1.player.name.Where(char.IsLetterOrDigit).ToArray());
+ string prefix =
+#if STARDEW_VALLEY_1_3
+ new string(Game1.player.name.Value.Where(char.IsLetterOrDigit).ToArray());
+#else
+ new string(Game1.player.name.Where(char.IsLetterOrDigit).ToArray());
+#endif
return $"{prefix}_{Game1.uniqueIDForThisGame}";
}
diff --git a/src/SMAPI/Events/EventArgsInventoryChanged.cs b/src/SMAPI/Events/EventArgsInventoryChanged.cs
index 1ee02842..b85ae9db 100644
--- a/src/SMAPI/Events/EventArgsInventoryChanged.cs
+++ b/src/SMAPI/Events/EventArgsInventoryChanged.cs
@@ -12,7 +12,11 @@ namespace StardewModdingAPI.Events
** Accessors
*********/
/// <summary>The player's inventory.</summary>
+#if STARDEW_VALLEY_1_3
+ public IList<Item> Inventory { get; }
+#else
public List<Item> Inventory { get; }
+#endif
/// <summary>The added items.</summary>
public List<ItemStackChange> Added { get; }
@@ -30,7 +34,13 @@ namespace StardewModdingAPI.Events
/// <summary>Construct an instance.</summary>
/// <param name="inventory">The player's inventory.</param>
/// <param name="changedItems">The inventory changes.</param>
- public EventArgsInventoryChanged(List<Item> inventory, List<ItemStackChange> changedItems)
+ public EventArgsInventoryChanged(
+#if STARDEW_VALLEY_1_3
+ IList<Item> inventory,
+#else
+ List<Item> inventory,
+#endif
+ List<ItemStackChange> changedItems)
{
this.Inventory = inventory;
this.Added = changedItems.Where(n => n.ChangeType == ChangeType.Added).ToList();
diff --git a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
index 058999e9..de3c31ea 100644
--- a/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
+++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs
@@ -1,6 +1,10 @@
-using System;
+using System;
using Microsoft.Xna.Framework;
+#if STARDEW_VALLEY_1_3
+using Netcode;
+#else
using StardewValley;
+#endif
using Object = StardewValley.Object;
namespace StardewModdingAPI.Events
@@ -12,7 +16,11 @@ namespace StardewModdingAPI.Events
** Accessors
*********/
/// <summary>The current list of objects in the current location.</summary>
+#if STARDEW_VALLEY_1_3
+ public IDictionary<Vector2, NetRef<Object>> NewObjects { get; }
+#else
public SerializableDictionary<Vector2, Object> NewObjects { get; }
+#endif
/*********
@@ -20,7 +28,13 @@ namespace StardewModdingAPI.Events
*********/
/// <summary>Construct an instance.</summary>
/// <param name="newObjects">The current list of objects in the current location.</param>
- public EventArgsLocationObjectsChanged(SerializableDictionary<Vector2, Object> newObjects)
+ public EventArgsLocationObjectsChanged(
+#if STARDEW_VALLEY_1_3
+ IDictionary<Vector2, NetRef<Object>> newObjects
+#else
+ SerializableDictionary<Vector2, Object> newObjects
+#endif
+ )
{
this.NewObjects = newObjects;
}
diff --git a/src/SMAPI/Framework/GameVersion.cs b/src/SMAPI/Framework/GameVersion.cs
index 1884afe9..c347ffba 100644
--- a/src/SMAPI/Framework/GameVersion.cs
+++ b/src/SMAPI/Framework/GameVersion.cs
@@ -23,7 +23,9 @@ namespace StardewModdingAPI.Framework
["1.07"] = "1.0.7",
["1.07a"] = "1.0.8-prerelease1",
["1.08"] = "1.0.8",
- ["1.11"] = "1.1.1"
+ ["1.11"] = "1.1.1",
+ ["1.3.0.1"] = "1.13-alpha.1",
+ ["1.3.0.2"] = "1.13-alpha.2"
};
diff --git a/src/SMAPI/Framework/SContentManager.cs b/src/SMAPI/Framework/SContentManager.cs
index fa51bd53..29c6c684 100644
--- a/src/SMAPI/Framework/SContentManager.cs
+++ b/src/SMAPI/Framework/SContentManager.cs
@@ -41,11 +41,11 @@ namespace StardewModdingAPI.Framework
/// <summary>The underlying asset cache.</summary>
private readonly ContentCache Cache;
- /// <summary>The private <see cref="LocalizedContentManager"/> method which generates the locale portion of an asset name.</summary>
- private readonly IReflectedMethod GetKeyLocale;
+ /// <summary>The locale codes used in asset keys indexed by enum value.</summary>
+ private readonly IDictionary<LanguageCode, string> Locales;
- /// <summary>The language codes used in asset keys.</summary>
- private readonly IDictionary<string, LanguageCode> KeyLocales;
+ /// <summary>The language enum values indexed by locale code.</summary>
+ private readonly IDictionary<string, LanguageCode> LanguageCodes;
/// <summary>Provides metadata for core game assets.</summary>
private readonly CoreAssets CoreAssets;
@@ -95,12 +95,12 @@ namespace StardewModdingAPI.Framework
// init
this.Monitor = monitor ?? throw new ArgumentNullException(nameof(monitor));
this.Cache = new ContentCache(this, reflection);
- this.GetKeyLocale = reflection.GetMethod(this, "languageCode");
this.ModContentPrefix = this.GetAssetNameFromFilePath(Constants.ModPath);
// get asset data
- this.CoreAssets = new CoreAssets(this.NormaliseAssetName);
- this.KeyLocales = this.GetKeyLocales(reflection);
+ this.CoreAssets = new CoreAssets(this.NormaliseAssetName, reflection);
+ this.Locales = this.GetKeyLocales(reflection);
+ this.LanguageCodes = this.Locales.ToDictionary(p => p.Value, p => p.Key, StringComparer.InvariantCultureIgnoreCase);
}
/****
@@ -153,7 +153,7 @@ namespace StardewModdingAPI.Framework
/// <summary>Get the current content locale.</summary>
public string GetLocale()
{
- return this.GetKeyLocale.Invoke<string>();
+ return this.Locales[this.GetCurrentLanguage()];
}
/// <summary>Get whether the content manager has already loaded and cached the given asset.</summary>
@@ -398,29 +398,48 @@ namespace StardewModdingAPI.Framework
/// <summary>Get the locale codes (like <c>ja-JP</c>) used in asset keys.</summary>
/// <param name="reflection">Simplifies access to private game code.</param>
- private IDictionary<string, LanguageCode> GetKeyLocales(Reflector reflection)
+ private IDictionary<LanguageCode, string> GetKeyLocales(Reflector reflection)
{
- // get the private code field directly to avoid changed-code logic
+#if !STARDEW_VALLEY_1_3
IReflectedField<LanguageCode> codeField = reflection.GetField<LanguageCode>(typeof(LocalizedContentManager), "_currentLangCode");
-
- // remember previous settings
LanguageCode previousCode = codeField.GetValue();
+#endif
string previousOverride = this.LanguageCodeOverride;
- // create locale => code map
- IDictionary<string, LanguageCode> map = new Dictionary<string, LanguageCode>(StringComparer.InvariantCultureIgnoreCase);
- this.LanguageCodeOverride = null;
- foreach (LanguageCode code in Enum.GetValues(typeof(LanguageCode)))
+ try
{
- codeField.SetValue(code);
- map[this.GetKeyLocale.Invoke<string>()] = code;
- }
+ // temporarily disable language override
+ this.LanguageCodeOverride = null;
+
+ // create locale => code map
+ IReflectedMethod languageCodeString = reflection
+#if STARDEW_VALLEY_1_3
+ .GetMethod(this, "languageCodeString");
+#else
+ .GetMethod(this, "languageCode");
+#endif
+ IDictionary<LanguageCode, string> map = new Dictionary<LanguageCode, string>();
+ foreach (LanguageCode code in Enum.GetValues(typeof(LanguageCode)))
+ {
+#if STARDEW_VALLEY_1_3
+ map[code] = languageCodeString.Invoke<string>(code);
+#else
+ codeField.SetValue(code);
+ map[code] = languageCodeString.Invoke<string>();
+#endif
+ }
- // restore previous settings
- codeField.SetValue(previousCode);
- this.LanguageCodeOverride = previousOverride;
+ return map;
+ }
+ finally
+ {
+ // restore previous settings
+ this.LanguageCodeOverride = previousOverride;
+#if !STARDEW_VALLEY_1_3
+ codeField.SetValue(previousCode);
+#endif
- return map;
+ }
}
/// <summary>Get the asset name from a cache key.</summary>
@@ -444,7 +463,7 @@ namespace StardewModdingAPI.Framework
if (lastSepIndex >= 0)
{
string suffix = cacheKey.Substring(lastSepIndex + 1, cacheKey.Length - lastSepIndex - 1);
- if (this.KeyLocales.ContainsKey(suffix))
+ if (this.LanguageCodes.ContainsKey(suffix))
{
assetName = cacheKey.Substring(0, lastSepIndex);
localeCode = cacheKey.Substring(lastSepIndex + 1, cacheKey.Length - lastSepIndex - 1);
@@ -466,7 +485,7 @@ namespace StardewModdingAPI.Framework
private bool IsNormalisedKeyLoaded(string normalisedAssetName)
{
return this.Cache.ContainsKey(normalisedAssetName)
- || this.Cache.ContainsKey($"{normalisedAssetName}.{this.GetKeyLocale.Invoke<string>()}"); // translated asset
+ || this.Cache.ContainsKey($"{normalisedAssetName}.{this.Locales[this.GetCurrentLanguage()]}"); // translated asset
}
/// <summary>Track that a content manager loaded an asset.</summary>
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 5c45edca..acb3e794 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -9,6 +9,9 @@ using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
+#if STARDEW_VALLEY_1_3
+using Netcode;
+#endif
using StardewModdingAPI.Events;
using StardewModdingAPI.Framework.Events;
using StardewModdingAPI.Framework.Input;
@@ -20,7 +23,9 @@ using StardewValley.Locations;
using StardewValley.Menus;
using StardewValley.Tools;
using xTile.Dimensions;
+#if !STARDEW_VALLEY_1_3
using xTile.Layers;
+ #endif
namespace StardewModdingAPI.Framework
{
@@ -145,6 +150,9 @@ namespace StardewModdingAPI.Framework
private readonly Action drawFarmBuildings = () => SGame.Reflection.GetMethod(SGame.Instance, nameof(drawFarmBuildings)).Invoke();
private readonly Action drawHUD = () => SGame.Reflection.GetMethod(SGame.Instance, nameof(drawHUD)).Invoke();
private readonly Action drawDialogueBox = () => SGame.Reflection.GetMethod(SGame.Instance, nameof(drawDialogueBox)).Invoke();
+#if STARDEW_VALLEY_1_3
+ private readonly Action<SpriteBatch> drawOverlays = spriteBatch => SGame.Reflection.GetMethod(SGame.Instance, nameof(SGame.drawOverlays)).Invoke(spriteBatch);
+#endif
private readonly Action renderScreenBuffer = () => SGame.Reflection.GetMethod(SGame.Instance, nameof(renderScreenBuffer)).Invoke();
// ReSharper restore ArrangeStaticMemberQualifier, ArrangeThisQualifier, InconsistentNaming
@@ -488,6 +496,7 @@ namespace StardewModdingAPI.Framework
if (Context.IsWorldReady)
{
// raise current location changed
+ // ReSharper disable once PossibleUnintendedReferenceComparison
if (Game1.currentLocation != this.PreviousGameLocation)
{
if (this.VerboseLogging)
@@ -523,7 +532,13 @@ namespace StardewModdingAPI.Framework
// raise current location's object list changed
if (this.GetHash(Game1.currentLocation.objects) != this.PreviousLocationObjects)
- this.Events.Location_LocationObjectsChanged.Raise(new EventArgsLocationObjectsChanged(Game1.currentLocation.objects));
+ this.Events.Location_LocationObjectsChanged.Raise(new EventArgsLocationObjectsChanged(
+#if STARDEW_VALLEY_1_3
+ Game1.currentLocation.objects.FieldDict
+#else
+ Game1.currentLocation.objects
+#endif
+ ));
// raise time changed
if (Game1.timeOfDay != this.PreviousTime)
@@ -650,6 +665,619 @@ namespace StardewModdingAPI.Framework
[SuppressMessage("ReSharper", "RedundantCast", Justification = "copied from game code as-is")]
[SuppressMessage("ReSharper", "RedundantExplicitNullableCreation", Justification = "copied from game code as-is")]
[SuppressMessage("ReSharper", "RedundantTypeArgumentsOfMethod", Justification = "copied from game code as-is")]
+#if STARDEW_VALLEY_1_3
+ private void DrawImpl(GameTime gameTime)
+ {
+ if (Game1.debugMode)
+ {
+ if (SGame._fpsStopwatch.IsRunning)
+ {
+ float totalSeconds = (float)SGame._fpsStopwatch.Elapsed.TotalSeconds;
+ SGame._fpsList.Add(totalSeconds);
+ while (SGame._fpsList.Count >= 120)
+ SGame._fpsList.RemoveAt(0);
+ float num = 0.0f;
+ foreach (float fps in SGame._fpsList)
+ num += fps;
+ SGame._fps = (float)(1.0 / ((double)num / (double)SGame._fpsList.Count));
+ }
+ SGame._fpsStopwatch.Restart();
+ }
+ else
+ {
+ if (SGame._fpsStopwatch.IsRunning)
+ SGame._fpsStopwatch.Reset();
+ SGame._fps = 0.0f;
+ SGame._fpsList.Clear();
+ }
+ if (SGame._newDayTask != null)
+ {
+ this.GraphicsDevice.Clear(this.bgColor);
+ //base.Draw(gameTime);
+ }
+ else
+ {
+ if ((double)Game1.options.zoomLevel != 1.0)
+ this.GraphicsDevice.SetRenderTarget(this.screenWrapper);
+ if (this.IsSaving)
+ {
+ this.GraphicsDevice.Clear(this.bgColor);
+ IClickableMenu activeClickableMenu = Game1.activeClickableMenu;
+ if (activeClickableMenu != null)
+ {
+ Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, (DepthStencilState)null, (RasterizerState)null);
+ try
+ {
+ this.Events.Graphics_OnPreRenderGuiEvent.Raise();
+ activeClickableMenu.draw(Game1.spriteBatch);
+ this.Events.Graphics_OnPostRenderGuiEvent.Raise();
+ }
+ catch (Exception ex)
+ {
+ this.Monitor.Log($"The {activeClickableMenu.GetType().FullName} menu crashed while drawing itself during save. SMAPI will force it to exit to avoid crashing the game.\n{ex.GetLogSummary()}", LogLevel.Error);
+ activeClickableMenu.exitThisMenu();
+ }
+ this.RaisePostRender();