diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-03-11 19:09:08 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-03-11 19:09:08 -0400 |
| commit | 41715cefcde3c838bb079cb37aac5a3b2dcb1004 (patch) | |
| tree | 88d5d6c035acb9a2b48fb60f635ccb2156788e9f /src/SMAPI/Events | |
| parent | 80315ec46695d9c2b1121a0a6208105d7e165e89 (diff) | |
| download | SMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.tar.gz SMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.tar.bz2 SMAPI-41715cefcde3c838bb079cb37aac5a3b2dcb1004.zip | |
add initial compatibility with Stardew Valley 1.3 (#453)
Diffstat (limited to 'src/SMAPI/Events')
| -rw-r--r-- | src/SMAPI/Events/EventArgsInventoryChanged.cs | 12 | ||||
| -rw-r--r-- | src/SMAPI/Events/EventArgsLocationObjectsChanged.cs | 18 |
2 files changed, 27 insertions, 3 deletions
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; } |