Merge pull request Pathoschild#40 from Zoryn4163/master

Zoryn4163 · Zoryn4163 · commit f09fbc878312 · 2016-03-21T02:29:16.000-04:00
adds first tick update
diff --git a/StardewModdingAPI/Constants.cs b/StardewModdingAPI/Constants.cs
@@ -35,7 +35,7 @@ public static class Constants
 
         public const int MinorVersion = 38;
 
-        public const int PatchVersion = 1;
+        public const int PatchVersion = 3;
 
         public const string Build = "Alpha";
 
diff --git a/StardewModdingAPI/Events/Game.cs b/StardewModdingAPI/Events/Game.cs
@@ -11,6 +11,7 @@ public static class GameEvents
         public static event EventHandler GameLoaded = delegate { };
         public static event EventHandler Initialize = delegate { };
         public static event EventHandler LoadContent = delegate { };
+        public static event EventHandler FirstUpdateTick = delegate { };
         /// <summary>
         /// Fires every update (1/60 of a second)
         /// </summary>
@@ -110,5 +111,10 @@ public static void InvokeOneSecondTick()
         {
             OneSecondTick.Invoke(null, EventArgs.Empty);
         }
+
+        public static void InvokeFirstUpdateTick()
+        {
+            FirstUpdateTick.Invoke(null, EventArgs.Empty);
+        }
     }
 }
diff --git a/StardewModdingAPI/Extensions.cs b/StardewModdingAPI/Extensions.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Xna.Framework;
@@ -59,11 +60,42 @@ public static int GetHash(this IEnumerable enumerable)
                 hash ^= v.GetHashCode();
             }
             return hash;
-        } 
+        }
 
-        public static T Cast<T>(this object o) where T : StardewValley.Object
+        public static T Cast<T>(this object o) where T : class
         {
             return o as T;
         }
+
+        public static FieldInfo[] GetPrivateFields(this object o)
+        {
+            return o.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic);
+        }
+
+        public static FieldInfo GetBaseFieldInfo(this Type t, string name)
+        {
+            return t.GetField(name, BindingFlags.Instance | BindingFlags.NonPublic);
+        }
+
+        public static T GetBaseFieldValue<T>(this Type t, object o, string name) where T : class
+        {
+            return t.GetBaseFieldInfo(name).GetValue(o) as T;
+        }
+
+        /*
+        public static T GetBaseFieldValue<T>(this object o, string name) where T : class
+        {
+            return o.GetType().GetBaseFieldInfo(name).GetValue(o) as T;
+        }*/
+
+        public static object GetBaseFieldValue(this object o, string name)
+        {
+            return o.GetType().GetBaseFieldInfo(name).GetValue(o);
+        }
+
+        public static void SetBaseFieldValue (this object o, string name, object newValue)
+        {
+            o.GetType().GetBaseFieldInfo(name).SetValue(o, newValue);
+        }
     }
 }
diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs
@@ -174,6 +174,13 @@ public Buttons[] GetFrameReleasedButtons(PlayerIndex index)
         public Farmer PreviousFarmer { get; private set; }
 
         public Int32 CurrentUpdateTick { get; private set; }
+        public bool FirstUpdate { get; private set; }
+
+        public RenderTarget2D Screen
+        {
+            get { return typeof (Game1).GetBaseFieldValue<RenderTarget2D>(Program.gamePtr, "screen"); }
+            set { typeof (Game1).SetBaseFieldValue("screen", value); }
+        }
 
         private static SGame instance;
         public static SGame Instance { get { return instance; } }
@@ -183,6 +190,7 @@ public Buttons[] GetFrameReleasedButtons(PlayerIndex index)
         public SGame()
         {
             instance = this;
+            FirstUpdate = true;
 
             /*
 #if DEBUG
@@ -255,6 +263,11 @@ protected override void Update(GameTime gameTime)
             }
 
             Events.GameEvents.InvokeUpdateTick();
+            if (FirstUpdate)
+            {
+                GameEvents.InvokeFirstUpdateTick();
+                FirstUpdate = false;
+            }
 
             if (CurrentUpdateTick % 2 == 0)
                 Events.GameEvents.InvokeSecondUpdateTick();
@@ -278,7 +291,6 @@ protected override void Update(GameTime gameTime)
             if (CurrentUpdateTick >= 60)
                 CurrentUpdateTick = 0;
 
-
             PreviouslyPressedKeys = CurrentlyPressedKeys;
             for(PlayerIndex i = PlayerIndex.One; i <= PlayerIndex.Four; i++)
             {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public static class GameEvents`
`11`	`11`	`public static event EventHandler GameLoaded = delegate { };`
`12`	`12`	`public static event EventHandler Initialize = delegate { };`
`13`	`13`	`public static event EventHandler LoadContent = delegate { };`
	`14`	`+ public static event EventHandler FirstUpdateTick = delegate { };`
`14`	`15`	`/// <summary>`
`15`	`16`	`/// Fires every update (1/60 of a second)`
`16`	`17`	`/// </summary>`
`@@ -110,5 +111,10 @@ public static void InvokeOneSecondTick()`
`110`	`111`	`{`
`111`	`112`	`OneSecondTick.Invoke(null, EventArgs.Empty);`
`112`	`113`	`}`
	`114`	`+`
	`115`	`+ public static void InvokeFirstUpdateTick()`
	`116`	`+ {`
	`117`	`+ FirstUpdateTick.Invoke(null, EventArgs.Empty);`
	`118`	`+ }`
`113`	`119`	`}`
`114`	`120`	`}`