Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Release/StardewModdingAPI.exe
#	StardewModdingAPI/Program.cs
#	StardewModdingAPI/StardewModdingAPI.csproj

#	StardewModdingAPI/obj/x86/Debug/StardewModdingAPI.csproj.FileListAbsolute.txt
#	TrainerMod/bin/Debug/TrainerMod.dll
#	TrainerMod/obj/Debug/TrainerMod.dll

1 files changed, 21 insertions, 21 deletions

diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs
index bed57e34..21fbea70 100644
--- a/StardewModdingAPI/Inheritance/SGame.cs
+++ b/StardewModdingAPI/Inheritance/SGame.cs
@@ -170,14 +170,14 @@ namespace StardewModdingAPI.Inheritance
                 {
                     return ModItems.ElementAt(id).Value.Clone();
                 }
-                Program.LogError("ModItem Dictionary does not contain index: " + id);
+                Program.LogError("ModItem Dictionary does not contain index: " + id.ToString());
                 return null;
             }
             if (ModItems.ContainsKey(id))
             {
                 return ModItems[id].Clone();
             }
-            Program.LogError("ModItem Dictionary does not contain ID: " + id);
+            Program.LogError("ModItem Dictionary does not contain ID: " + id.ToString());
             return null;
         }
 
@@ -226,62 +226,62 @@ namespace StardewModdingAPI.Inheritance
                 Events.InvokeKeyPressed(k);
 
             if (KStateNow != KStatePrior)
-            {
-                Events.InvokeKeyboardChanged(KStateNow);
+            {

+                Events.InvokeKeyboardChanged(KStatePrior, KStateNow);
                 KStatePrior = KStateNow;
             }
 
             if (MStateNow != MStatePrior)
-            {
-                Events.InvokeMouseChanged(MStateNow);
+            {

+                Events.InvokeMouseChanged(MStatePrior, MStateNow);
                 MStatePrior = MStateNow;
             }
 
             if (activeClickableMenu != null && activeClickableMenu != PreviousActiveMenu)
-            {
-                Events.InvokeMenuChanged(activeClickableMenu);
+            {

+                Events.InvokeMenuChanged(PreviousActiveMenu, activeClickableMenu);
                 PreviousActiveMenu = activeClickableMenu;
             }
 
             if (locations.GetHash() != PreviousGameLocations)
-            {
+            {

                 Events.InvokeLocationsChanged(locations);
                 PreviousGameLocations = locations.GetHash();
             }
 
             if (currentLocation != PreviousGameLocation)
-            {
-                Events.InvokeCurrentLocationChanged(currentLocation);
+            {

+                Events.InvokeCurrentLocationChanged(PreviousGameLocation, currentLocation);
                 PreviousGameLocation = currentLocation;
             }
 
             if (player != null && player != PreviousFarmer)
-            {
-                Events.InvokeFarmerChanged(player);
+            {

+                Events.InvokeFarmerChanged(PreviousFarmer, player);
                 PreviousFarmer = player;
             }
 
             if (timeOfDay != PreviousTimeOfDay)
-            {
-                Events.InvokeTimeOfDayChanged(timeOfDay);
+            {

+                Events.InvokeTimeOfDayChanged(PreviousTimeOfDay, timeOfDay);
                 PreviousTimeOfDay = timeOfDay;
             }
 
             if (dayOfMonth != PreviousDayOfMonth)
-            {
-                Events.InvokeDayOfMonthChanged(dayOfMonth);
+            {

+                Events.InvokeDayOfMonthChanged(PreviousDayOfMonth, dayOfMonth);
                 PreviousDayOfMonth = dayOfMonth;
             }
 
             if (currentSeason != PreviousSeasonOfYear)
-            {
-                Events.InvokeSeasonOfYearChanged(currentSeason);
+            {

+                Events.InvokeSeasonOfYearChanged(PreviousSeasonOfYear, currentSeason);
                 PreviousSeasonOfYear = currentSeason;
             }
 
             if (year != PreviousYearOfGame)
-            {
-                Events.InvokeYearOfGameChanged(year);
+            {

+                Events.InvokeYearOfGameChanged(PreviousYearOfGame, year);
                 PreviousYearOfGame = year;
             }
         }