Reverted to previous SGame class with minor changes for 1.1, updated version number.

2 files changed, 381 insertions, 380 deletions

diff --git a/src/StardewModdingAPI/Constants.cs b/src/StardewModdingAPI/Constants.cs
index 87e67126..c1761d61 100644
--- a/src/StardewModdingAPI/Constants.cs
+++ b/src/StardewModdingAPI/Constants.cs
@@ -10,7 +10,7 @@ namespace StardewModdingAPI
     /// </summary>
     public static class Constants
     {
-        public static readonly Version Version = new Version(0, 40, 0, "1.1");
+        public static readonly Version Version = new Version(0, 40, 1, "1.1");
 
         /// <summary>
         ///     Not quite "constant", but it makes more sense for it to be here, at least for now
diff --git a/src/StardewModdingAPI/Inheritance/SGame.cs b/src/StardewModdingAPI/Inheritance/SGame.cs
index 43df0b43..ce9611ff 100644
--- a/src/StardewModdingAPI/Inheritance/SGame.cs
+++ b/src/StardewModdingAPI/Inheritance/SGame.cs
@@ -52,7 +52,6 @@ namespace StardewModdingAPI.Inheritance
         /// The current KeyboardState

         /// </summary>

         public KeyboardState KStateNow { get; private set; }

-

         /// <summary>

         /// The prior KeyboardState

         /// </summary>

@@ -112,27 +111,22 @@ namespace StardewModdingAPI.Inheritance
         /// The player's Combat level on the prior frame

         /// </summary>

         public int PreviousCombatLevel { get; private set; }

-

         /// <summary>

         /// The player's Farming level on the prior frame

         /// </summary>

         public int PreviousFarmingLevel { get; private set; }

-

         /// <summary>

         /// The player's Fishing level on the prior frame

         /// </summary>

         public int PreviousFishingLevel { get; private set; }

-

         /// <summary>

         /// The player's Foraging level on the prior frame

         /// </summary>

         public int PreviousForagingLevel { get; private set; }

-

         /// <summary>

         /// The player's Mining level on the prior frame

         /// </summary>

         public int PreviousMiningLevel { get; private set; }

-

         /// <summary>

         /// The player's Luck level on the prior frame

         /// </summary>

@@ -205,8 +199,8 @@ namespace StardewModdingAPI.Inheritance
         /// </summary>

         public RenderTarget2D Screen

         {

-            get { return typeof(Game1).GetBaseFieldValue<RenderTarget2D>(Program.gamePtr, "screen"); }

-            set { typeof(Game1).SetBaseFieldValue<RenderTarget2D>(this, "screen", value); }

+            get { return typeof (Game1).GetBaseFieldValue<RenderTarget2D>(Program.gamePtr, "screen"); }

+            set { typeof (Game1).SetBaseFieldValue<RenderTarget2D>(this, "screen", value); }

         }

 

         /// <summary>

@@ -214,20 +208,11 @@ namespace StardewModdingAPI.Inheritance
         /// </summary>

         public Color BgColour

         {

-            get { return (Color) typeof(Game1).GetBaseFieldValue<object>(Program.gamePtr, "bgColor"); }

+            get { return (Color)typeof(Game1).GetBaseFieldValue<object>(Program.gamePtr, "bgColor"); }

             set { typeof(Game1).SetBaseFieldValue<object>(this, "bgColor", value); }

         }

 

         /// <summary>

-        /// The current FramesThisSecond in Game1 (Private field, uses reflection)

-        /// </summary>

-        public int FramesThisSecond

-        {

-            get { return (int)typeof(Game1).GetBaseFieldValue<object>(null, "framesThisSecond"); }

-            set { typeof(Game1).SetBaseFieldValue<object>(null, "framesThisSecond", value); }

-        }

-

-        /// <summary>

         /// Static accessor for an Instance of the class SGame

         /// </summary>

         public static SGame Instance { get; private set; }

@@ -241,7 +226,6 @@ namespace StardewModdingAPI.Inheritance
         /// Whether or not we're in a pseudo 'debug' mode. Mostly for displaying information like FPS.

         /// </summary>

         public static bool Debug { get; private set; }

-

         internal static Queue<String> DebugMessageQueue { get; private set; }

 

         /// <summary>

@@ -253,8 +237,8 @@ namespace StardewModdingAPI.Inheritance
         /// <summary>

         /// Gets ALL static fields that belong to 'Game1'

         /// </summary>

-        public static FieldInfo[] GetStaticFields => typeof(Game1).GetFields();

-

+        public static FieldInfo[] GetStaticFields => typeof (Game1).GetFields();

+        

         /// <summary>

         /// Whether or not a button was just pressed on the controller

         /// </summary>

@@ -290,7 +274,7 @@ namespace StardewModdingAPI.Inheritance
         {

             return WasButtonJustPressed(button, value > 0.2f ? ButtonState.Pressed : ButtonState.Released, stateIndex);

         }

-

+        

         /// <summary>

         /// Whether or not an analog button was just released on the controller

         /// </summary>

@@ -402,19 +386,19 @@ namespace StardewModdingAPI.Inheritance
         /// <summary>

         /// 

         /// </summary>

-        public static MethodInfo DrawFarmBuildings = typeof(Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance);

+        public static MethodInfo DrawFarmBuildings = typeof (Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance);

 

         /// <summary>

         /// 

         /// </summary>

-        public static MethodInfo DrawHUD = typeof(Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance);

+        public static MethodInfo DrawHUD = typeof (Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance);

 

         /// <summary>

         /// 

         /// </summary>

-        public static MethodInfo DrawDialogueBox = typeof(Game1).GetMethod("drawDialogueBox", BindingFlags.NonPublic | BindingFlags.Instance);

+        public static MethodInfo DrawDialogueBox = typeof (Game1).GetMethod("drawDialogueBox", BindingFlags.NonPublic | BindingFlags.Instance);

 

-        public static MethodInfo CheckForEscapeKeys = typeof(Game1).GetMethod("checkForEscapeKeys", BindingFlags.NonPublic | BindingFlags.Instance);

+        public static MethodInfo CheckForEscapeKeys = typeof (Game1).GetMethod("checkForEscapeKeys", BindingFlags.NonPublic | BindingFlags.Instance);

 

         public static MethodInfo UpdateControlInput = typeof(Game1).GetMethod("UpdateControlInput", BindingFlags.NonPublic | BindingFlags.Instance);

 

@@ -486,7 +470,7 @@ namespace StardewModdingAPI.Inheritance
                 debugMode = !debugMode;

             }

 

-            if (Constants.EnableCompletelyOverridingBaseCalls && false)

+            if (Constants.EnableCompletelyOverridingBaseCalls)

             {

                 #region Overridden Update Call

 

@@ -515,7 +499,8 @@ namespace StardewModdingAPI.Inheritance
                         //this.checkForEscapeKeys();

                         updateMusic();

                         updateRaindropPosition();

-                        bloom?.tick(gameTime);

+                        if (bloom != null)

+                            bloom.tick(gameTime);

                         if (globalFade)

                         {

                             if (!dialogueUp)

@@ -567,7 +552,8 @@ namespace StardewModdingAPI.Inheritance
                             if (pauseThenDoFunctionTimer <= 0)

                             {

                                 freezeControls = false;

-                                afterPause?.Invoke();

+                                if (afterPause != null)

+                                    afterPause();

                             }

                         }

                         if (gameMode == 3 || gameMode == 2)

@@ -664,8 +650,8 @@ namespace StardewModdingAPI.Inheritance
                                                 currentMinigame.releaseLeftClick(getMouseX(), getMouseY());

                                             foreach (Buttons b in Utility.getPressedButtons(oldPadState, state3))

                                                 currentMinigame.receiveKeyRelease(Utility.mapGamePadButtonToKey(b));

-                                            if (state3.IsConnected && state3.IsButtonDown(Buttons.A))

-                                                currentMinigame?.leftClickHeld(0, 0);

+                                            if (state3.IsConnected && state3.IsButtonDown(Buttons.A) && currentMinigame != null)

+                                                currentMinigame.leftClickHeld(0, 0);

                                         }

                                         if (currentMinigame == null)

                                         {

@@ -781,7 +767,8 @@ namespace StardewModdingAPI.Inheritance
                             if (gameMode == 10)

                                 UpdateOther(gameTime);

                         }

-                        audioEngine?.Update();

+                        if (audioEngine != null)

+                            audioEngine.Update();

                         if (multiplayerMode == 2 && gameMode == 3)

                             server.sendMessages(gameTime);

                     }

@@ -793,7 +780,7 @@ namespace StardewModdingAPI.Inheritance
 

                 //typeof (Game).GetMethod("Update", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(this, new object[] {gameTime});

                 //base.Update(gameTime);

-

+                

                 #endregion

             }

             else

@@ -861,13 +848,13 @@ namespace StardewModdingAPI.Inheritance
 

                 try

                 {

-                    if (options.zoomLevel != 1f)

+                    if (!ZoomLevelIsOne)

                     {

-                        base.GraphicsDevice.SetRenderTarget(Screen);

+                        GraphicsDevice.SetRenderTarget(Screen);

                     }

-                    FramesThisSecond++;

-                    base.GraphicsDevice.Clear(BgColour);

-                    if ((options.showMenuBackground && (activeClickableMenu != null)) && activeClickableMenu.showWithoutTransparencyIfOptionIsSet())

+

+                    GraphicsDevice.Clear(BgColour);

+                    if (options.showMenuBackground && activeClickableMenu != null && activeClickableMenu.showWithoutTransparencyIfOptionIsSet())

                     {

                         spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

                         activeClickableMenu.drawBackground(spriteBatch);

@@ -875,453 +862,467 @@ namespace StardewModdingAPI.Inheritance
                         activeClickableMenu.draw(spriteBatch);

                         GraphicsEvents.InvokeOnPostRenderGuiEvent(null, EventArgs.Empty);

                         spriteBatch.End();

-                        if (options.zoomLevel != 1f)

+                        if (!ZoomLevelIsOne)

                         {

-                            base.GraphicsDevice.SetRenderTarget(null);

-                            base.GraphicsDevice.Clear(BgColour);

+                            GraphicsDevice.SetRenderTarget(null);

+                            GraphicsDevice.Clear(BgColour);

                             spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);

-                            spriteBatch.Draw(Screen, Vector2.Zero, new Rectangle?(Screen.Bounds), Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

+                            spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

                             spriteBatch.End();

                         }

+                        return;

                     }

-                    else if (gameMode == 11)

+                    if (gameMode == 11)

                     {

                         spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

                         spriteBatch.DrawString(smoothFont, "Stardew Valley has crashed...", new Vector2(16f, 16f), Color.HotPink);

-                        spriteBatch.DrawString(smoothFont, "Please send the error report or a screenshot of this message to @ConcernedApe. (http://stardewvalley.net/contact/)", new Vector2(16f, 32f), new Color(0, 0xff, 0));

+                        spriteBatch.DrawString(smoothFont, "Please send the error report or a screenshot of this message to @ConcernedApe. (http://stardewvalley.net/contact/)", new Vector2(16f, 32f), new Color(0, 255, 0));

                         spriteBatch.DrawString(smoothFont, parseText(errorMessage, smoothFont, graphics.GraphicsDevice.Viewport.Width), new Vector2(16f, 48f), Color.White);

                         spriteBatch.End();

+                        return;

                     }

-                    else if (currentMinigame != null)

+                    if (currentMinigame != null)

                     {

                         currentMinigame.draw(spriteBatch);

-                        if ((globalFade && !menuUp) && (!nameSelectUp || messagePause))

+                        if (globalFade && !menuUp && (!nameSelectUp || messagePause))

                         {

                             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                            spriteBatch.Draw(fadeToBlackRect, graphics.GraphicsDevice.Viewport.Bounds, (Color)(Color.Black * ((gameMode == 0) ? (1f - fadeToBlackAlpha) : fadeToBlackAlpha)));

+                            spriteBatch.Draw(fadeToBlackRect, graphics.GraphicsDevice.Viewport.Bounds, Color.Black * ((gameMode == 0) ? (1f - fadeToBlackAlpha) : fadeToBlackAlpha));

                             spriteBatch.End();

                         }

-                        if (options.zoomLevel != 1f)

+                        if (!ZoomLevelIsOne)

                         {

-                            base.GraphicsDevice.SetRenderTarget(null);

-                            base.GraphicsDevice.Clear(BgColour);

+                            GraphicsDevice.SetRenderTarget(null);

+                            GraphicsDevice.Clear(BgColour);

                             spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);

-                            spriteBatch.Draw(Screen, Vector2.Zero, new Rectangle?(Screen.Bounds), Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

+                            spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

                             spriteBatch.End();

                         }

+                        return;

                     }

-                    else if (showingEndOfNightStuff)

+                    if (showingEndOfNightStuff)

                     {

                         spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                        if (activeClickableMenu != null)

-                        {

-                            activeClickableMenu.draw(spriteBatch);

-                        }

+                        activeClickableMenu?.draw(spriteBatch);

                         spriteBatch.End();

-                        if (options.zoomLevel != 1f)

+                        if (!ZoomLevelIsOne)

                         {

-                            base.GraphicsDevice.SetRenderTarget(null);

-                            base.GraphicsDevice.Clear(BgColour);

+                            GraphicsDevice.SetRenderTarget(null);

+                            GraphicsDevice.Clear(BgColour);

                             spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);

-                            spriteBatch.Draw(Screen, Vector2.Zero, new Rectangle?(Screen.Bounds), Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

+                            spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

                             spriteBatch.End();

                         }

+                        return;

                     }

-                    else if (gameMode == 6)

+                    if (gameMode == 6)

                     {

                         spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                        string str = "";

-                        for (int i = 0; i < ((gameTime.TotalGameTime.TotalMilliseconds % 999.0) / 333.0); i++)

+                        string text = "";

+                        int num = 0;

+                        while (num < gameTime.TotalGameTime.TotalMilliseconds % 999.0 / 333.0)

                         {

-                            str = str + ".";

+                            text += ".";

+                            num++;

                         }

-                        SpriteText.drawString(spriteBatch, "Loading" + str, 0x40, graphics.GraphicsDevice.Viewport.Height - 0x40, 0x3e7, -1, 0x3e7, 1f, 1f, false, 0, "Loading...", -1);

+                        SpriteText.drawString(spriteBatch, "Loading" + text, 64, graphics.GraphicsDevice.Viewport.Height - 64, 999, -1, 999, 1f, 1f, false, 0, "Loading...");

                         spriteBatch.End();

-                        if (options.zoomLevel != 1f)

+                        if (!ZoomLevelIsOne)

                         {

-                            base.GraphicsDevice.SetRenderTarget(null);

-                            base.GraphicsDevice.Clear(BgColour);

+                            GraphicsDevice.SetRenderTarget(null);

+                            GraphicsDevice.Clear(BgColour);

                             spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);

-                            spriteBatch.Draw(Screen, Vector2.Zero, new Rectangle?(Screen.Bounds), Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

+                            spriteBatch.Draw(Screen, Vector2.Zero, Screen.Bounds, Color.White, 0f, Vector2.Zero, options.zoomLevel, SpriteEffects.None, 1f);

                             spriteBatch.End();

                         }

+                        return;

+                    }

+                    if (gameMode == 0)

+                    {

+                        spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

                     }

                     else

                     {

-                        if (gameMode == 0)

+                        if (drawLighting)

                         {

-                            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                        }

-                        else

-                        {

-                            if (drawLighting)

-                            {

-                                base.GraphicsDevice.SetRenderTarget(lightmap);

-                                base.GraphicsDevice.Clear((Color)(Color.White * 0f));

-                                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, null, null);

-                                spriteBatch.Draw(staminaRect, lightmap.Bounds, currentLocation.name.Equals("UndergroundMine") ? mine.getLightingColor(gameTime) : ((!ambientLight.Equals(Color.White) && (!isRaining || !currentLocation.isOutdoors)) ? ambientLight : outdoorLight));

-                                for (int j = 0; j < currentLightSources.Count; j++)

-                                {

-                                    if (Utility.isOnScreen(currentLightSources.ElementAt<LightSource>(j).position, (int)((currentLightSources.ElementAt<LightSource>(j).radius * tileSize) * 4f)))

-                                    {

-                                        spriteBatch.Draw(currentLightSources.ElementAt<LightSource>(j).lightTexture, (Vector2)(GlobalToLocal(viewport, currentLightSources.ElementAt<LightSource>(j).position) / ((float)(options.lightingQuality / 2))), new Rectangle?(currentLightSources.ElementAt<LightSource>(j).lightTexture.Bounds), currentLightSources.ElementAt<LightSource>(j).color, 0f, new Vector2((float)currentLightSources.ElementAt<LightSource>(j).lightTexture.Bounds.Center.X, (float)currentLightSources.ElementAt<LightSource>(j).lightTexture.Bounds.Center.Y), (float)(currentLightSources.ElementAt<LightSource>(j).radius / ((float)(options.lightingQuality / 2))), SpriteEffects.None, 0.9f);

-                                    }

-                                }

-                                spriteBatch.End();

-                                base.GraphicsDevice.SetRenderTarget((options.zoomLevel == 1f) ? null : Screen);

-                            }

-                            if (bloomDay && (bloom != null))

+                            GraphicsDevice.SetRenderTarget(lightmap);

+                            GraphicsDevice.Clear(Color.White * 0f);

+                            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, null, null);

+                            spriteBatch.Draw(staminaRect, lightmap.Bounds, currentLocation.name.Equals("UndergroundMine") ? mine.getLightingColor(gameTime) : ((!ambientLight.Equals(Color.White) && (!isRaining || !currentLocation.isOutdoors)) ? ambientLight : outdoorLight));

+                            for (int i = 0; i < currentLightSources.Count; i++)

                             {

-                                bloom.BeginDraw();

-                            }

-                            base.GraphicsDevice.Clear(BgColour);

-                            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                            GraphicsEvents.InvokeOnPreRenderEvent(null, EventArgs.Empty);

-                            if (background != null)

-                            {

-                                background.draw(spriteBatch);

-                            }

-                            mapDisplayDevice.BeginScene(spriteBatch);

-                            currentLocation.Map.GetLayer("Back").Draw(mapDisplayDevice, viewport, Location.Origin, false, pixelZoom);

-                            currentLocation.drawWater(spriteBatch);

-                            if (CurrentEvent == null)

-                            {

-                                foreach (NPC npc in currentLocation.characters)

+                                if (Utility.isOnScreen(currentLightSources.ElementAt(i).position, (int) (currentLightSources.ElementAt(i).radius * tileSize * 4f)))

                                 {

-                                    if (((!npc.swimming && !npc.hideShadow) && (!npc.isInvisible && !npc.IsMonster)) && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(npc.getTileLocation()))

-                                    {

-                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, npc.position + new Vector2(((float)(npc.sprite.spriteWidth * pixelZoom)) / 2f, (float)(npc.GetBoundingBox().Height + (npc.IsMonster ? 0 : (pixelZoom * 3))))), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)((pixelZoom + (((float)npc.yJumpOffset) / 40f)) * npc.scale), SpriteEffects.None, Math.Max((float)0f, (float)(((float)npc.getStandingY()) / 10000f)) - 1E-06f);

-                                    }

+                                    spriteBatch.Draw(currentLightSources.ElementAt(i).lightTexture, GlobalToLocal(viewport, currentLightSources.ElementAt(i).position) / options.lightingQuality, currentLightSources.ElementAt(i).lightTexture.Bounds, currentLightSources.ElementAt(i).color, 0f, new Vector2(currentLightSources.ElementAt(i).lightTexture.Bounds.Center.X, currentLightSources.ElementAt(i).lightTexture.Bounds.Center.Y), currentLightSources.ElementAt(i).radius / options.lightingQuality, SpriteEffects.None, 0.9f);

                                 }

                             }

-                            else

+                            spriteBatch.End();

+                            GraphicsDevice.SetRenderTarget(ZoomLevelIsOne ? null : Screen);

+                        }

+                        if (bloomDay)

+                        {

+                            bloom?.BeginDraw();

+                        }

+                        GraphicsDevice.Clear(BgColour);

+                        spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

+                        GraphicsEvents.InvokeOnPreRenderEvent(null, EventArgs.Empty);

+                        background?.draw(spriteBatch);

+                        mapDisplayDevice.BeginScene(spriteBatch);

+                        currentLocation.Map.GetLayer("Back").Draw(mapDisplayDevice, viewport, Location.Origin, false, pixelZoom);

+                        currentLocation.drawWater(spriteBatch);

+                        if (CurrentEvent == null)

+                        {

+                            using (List<NPC>.Enumerator enumerator = currentLocation.characters.GetEnumerator())

                             {

-                                foreach (NPC npc2 in CurrentEvent.actors)

+                                while (enumerator.MoveNext())

                                 {

-                                    if ((!npc2.swimming && !npc2.hideShadow) && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(npc2.getTileLocation()))

+                                    NPC current = enumerator.Current;

+                                    if (current != null && !current.swimming && !current.hideShadow && !current.IsMonster && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current.getTileLocation()))

                                     {

-                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, npc2.position + new Vector2(((float)(npc2.sprite.spriteWidth * pixelZoom)) / 2f, (float)(npc2.GetBoundingBox().Height + (npc2.IsMonster ? 0 : ((npc2.sprite.spriteHeight <= 0x10) ? -pixelZoom : (pixelZoom * 3)))))), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)((pixelZoom + (((float)npc2.yJumpOffset) / 40f)) * npc2.scale), SpriteEffects.None, Math.Max((float)0f, (float)(((float)npc2.getStandingY()) / 10000f)) - 1E-06f);

+                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, current.position + new Vector2(current.sprite.spriteWidth * pixelZoom / 2f, current.GetBoundingBox().Height + (current.IsMonster ? 0 : (pixelZoom * 3)))), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), (pixelZoom + current.yJumpOffset / 40f) * current.scale, SpriteEffects.None, Math.Max(0f, current.getStandingY() / 10000f) - 1E-06f);

                                     }

                                 }

+                                goto IL_B30;

                             }

-                            if ((displayFarmer && !player.swimming) && (!player.isRidingHorse() && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(player.getTileLocation())))

-                            {

-                                spriteBatch.Draw(shadowTexture, GlobalToLocal(player.position + new Vector2(32f, 24f)), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)(4f - (((player.running || player.usingTool) && (player.FarmerSprite.indexInCurrentAnimation > 1)) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f)), SpriteEffects.None, 0f);

-                            }

-                            currentLocation.Map.GetLayer("Buildings").Draw(mapDisplayDevice, viewport, Location.Origin, false, pixelZoom);

-                            mapDisplayDevice.EndScene();

-                            spriteBatch.End();

-                            spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

-                            if (CurrentEvent == null)

+                        }

+                        foreach (NPC current2 in CurrentEvent.actors)

+                        {

+                            if (!current2.swimming && !current2.hideShadow && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current2.getTileLocation()))

                             {

-                                foreach (NPC npc3 in currentLocation.characters)

-                                {

-                                    if ((!npc3.swimming && !npc3.hideShadow) && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(npc3.getTileLocation()))

-                                    {

-                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, npc3.position + new Vector2(((float)(npc3.sprite.spriteWidth * pixelZoom)) / 2f, (float)(npc3.GetBoundingBox().Height + (npc3.IsMonster ? 0 : (pixelZoom * 3))))), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)((pixelZoom + (((float)npc3.yJumpOffset) / 40f)) * npc3.scale), SpriteEffects.None, Math.Max((float)0f, (float)(((float)npc3.getStandingY()) / 10000f)) - 1E-06f);

-                                    }

-                                }

+                                spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, current2.position + new Vector2(current2.sprite.spriteWidth * pixelZoom / 2f, current2.GetBoundingBox().Height + (current2.IsMonster ? 0 : (pixelZoom * 3)))), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), (pixelZoom + current2.yJumpOffset / 40f) * current2.scale, SpriteEffects.None, Math.Max(0f, current2.getStandingY() / 10000f) - 1E-06f);

                             }

-                            else

+                        }

+                        IL_B30:

+                        if (!player.swimming && !player.isRidingHorse() && !currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(player.getTileLocation()))

+                        {

+                            spriteBatch.Draw(shadowTexture, GlobalToLocal(player.position + new Vector2(32f, 24f)), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), 4f - (((player.running || player.usingTool) && player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, 0f);

+                        }

+                        currentLocation.Map.GetLayer("Buildings").Draw(mapDisplayDevice, viewport, Location.Origin, false, pixelZoom);

+                        mapDisplayDevice.EndScene();

+                        spriteBatch.End();

+                        spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

+                        if (CurrentEvent == null)

+                        {

+                            using (List<NPC>.Enumerator enumerator3 = currentLocation.characters.GetEnumerator())

                             {

-                                foreach (NPC npc4 in CurrentEvent.actors)

+                                while (enumerator3.MoveNext())

                                 {

-                                    if ((!npc4.swimming && !npc4.hideShadow) && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(npc4.getTileLocation()))

+                                    NPC current3 = enumerator3.Current;

+                                    if (current3 != null && !current3.swimming && !current3.hideShadow && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current3.getTileLocation()))

                                     {

-                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, npc4.position + new Vector2(((float)(npc4.sprite.spriteWidth * pixelZoom)) / 2f, (float)(npc4.GetBoundingBox().Height + (npc4.IsMonster ? 0 : (pixelZoom * 3))))), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)((pixelZoom + (((float)npc4.yJumpOffset) / 40f)) * npc4.scale), SpriteEffects.None, Math.Max((float)0f, (float)(((float)npc4.getStandingY()) / 10000f)) - 1E-06f);

+                                        spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, current3.position + new Vector2(current3.sprite.spriteWidth * pixelZoom / 2f, current3.GetBoundingBox().Height + (current3.IsMonster ? 0 : (pixelZoom * 3)))), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), (pixelZoom + current3.yJumpOffset / 40f) * current3.scale, SpriteEffects.None, Math.Max(0f, current3.getStandingY() / 10000f) - 1E-06f);

                                     }

                                 }

+                                goto IL_F5F;

                             }

-                            if ((displayFarmer && !player.swimming) && (!player.isRidingHorse() && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(player.getTileLocation())))

-                            {

-                                spriteBatch.Draw(shadowTexture, GlobalToLocal(player.position + new Vector2(32f, 24f)), new Rectangle?(shadowTexture.Bounds), Color.White, 0f, new Vector2((float)shadowTexture.Bounds.Center.X, (float)shadowTexture.Bounds.Center.Y), (float)(4f - (((player.running || player.usingTool) && (player.FarmerSprite.indexInCurrentAnimation > 1)) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f)), SpriteEffects.None, Math.Max((float)0.0001f, (float)((((float)player.getStandingY()) / 10000f) + 0.00011f)) - 0.0001f);

-                            }

-                            if (displayFarmer)

-                            {

-                                player.draw(spriteBatch);

-                            }

-                            if ((eventUp || killScreen) && (!killScreen && (currentLocation.currentEvent != null)))

-                            {

-                                currentLocation.currentEvent.draw(spriteBatch);

-                            }

-                            if (((player.currentUpgrade != null) && (player.currentUpgrade.daysLeftTillUpgradeDone <= 3)) && currentLocation.Name.Equals("Farm"))

-                            {

-                                spriteBatch.Draw(player.currentUpgrade.workerTexture, GlobalToLocal(viewport, player.currentUpgrade.positionOfCarpenter), new Rectangle?(player.currentUpgrade.getSourceRectangle()), Color.White, 0f, Vector2.Zero, (float)1f, SpriteEffects.None, (player.currentUpgrade.positionOfCarpenter.Y + ((tileSize * 3) / 4)) / 10000f);

-                            }

-                            currentLocation.draw(spriteBatch);

-                            if ((eventUp && (currentLocation.currentEvent != null)) && (currentLocation.currentEvent.messageToScreen != null))

-                            {

-                                drawWithBorder(currentLocation.currentEvent.messageToScreen, Color.Black, Color.White, new Vector2((graphics.GraphicsDevice.Viewport.TitleSafeArea.Width / 2) - (borderFont.MeasureString(currentLocation.currentEvent.messageToScreen).X / 2f), (float)(graphics.GraphicsDevice.Viewport.TitleSafeArea.Height - tileSize)), 0f, 1f, 0.999f);

-                            }

-                            if (((player.ActiveObject == null) && (player.UsingTool || pickingTool)) && ((player.CurrentTool != null) && (!player.CurrentTool.Name.Equals("Seeds") || pickingTool)))

-                            {

-                                drawTool(player);

-                            }

-                            if (currentLocation.Name.Equals("Farm"))

-                            {

-                                DrawFarmBuildings.Invoke(Program.gamePtr, null);

-                            }

-                            if (tvStation >= 0)

+                        }

+                        foreach (NPC current4 in CurrentEvent.actors)

+                        {

+                            if (!current4.swimming && !current4.hideShadow && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current4.getTileLocation()))

                             {

-                                spriteBatch.Draw(tvStationTexture, GlobalToLocal(viewport, new Vector2((float)((6 * tileSize) + (tileSize / 4)), (float)((2 * tileSize) + (tileSize / 2)))), new Rectangle(tvStation * 0x18, 0, 0x18, 15), Color.White, 0f, Vector2.Zero, (float)4f, SpriteEffects.None, 1E-08f);

+                                spriteBatch.Draw(shadowTexture, GlobalToLocal(viewport, current4.position + new Vector2(current4.sprite.spriteWidth * pixelZoom / 2f, current4.GetBoundingBox().Height + (current4.IsMonster ? 0 : (pixelZoom * 3)))), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), (pixelZoom + current4.yJumpOffset / 40f) * current4.scale, SpriteEffects.None, Math.Max(0f, current4.getStandingY() / 10000f) - 1E-06f);

                             }

-                            if (panMode)

+                        }

+                        IL_F5F:

+                        if (!player.swimming && !player.isRidingHorse() && currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(player.getTileLocation()))

+                        {

+                            spriteBatch.Draw(shadowTexture, GlobalToLocal(player.position + new Vector2(32f, 24f)), shadowTexture.Bounds, Color.White, 0f, new Vector2(shadowTexture.Bounds.Center.X, shadowTexture.Bounds.Center.Y), 4f - (((player.running || player.usingTool) && player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, Math.Max(0.0001f, player.getStandingY() / 10000f + 0.00011f) - 0.0001f);

+                        }

+                        if (displayFarmer)

+                        {

+                            player.draw(spriteBatch);

+                        }

+                        if ((eventUp || killScreen) && !killScreen)

+                        {

+                            currentLocation.currentEvent?.draw(spriteBatch);

+                        }

+                        if (player.currentUpgrade != null && player.currentUpgrade.daysLeftTillUpgradeDone <= 3 && currentLocation.Name.Equals("Farm"))

+                        {

+                            spriteBatch.Draw(player.currentUpgrade.workerTexture, GlobalToLocal(viewport, player.currentUpgrade.positionOfCarpenter), player.currentUpgrade.getSourceRectangle(), Color.White, 0f, Vector2.Zero, 1f, SpriteEffects.None, (player.currentUpgrade.positionOfCarpenter.Y + tileSize * 3 / 4) / 10000f);

+                        }

+                        currentLocation.draw(spriteBatch);

+                        if (eventUp && currentLocation.currentEvent?.messageToScreen != null)

+                        {

+                            drawWithBorder(currentLocation.currentEvent.messageToScreen, Color.Black, Color.White, new Vector2(graphics.GraphicsDevice.Viewport.TitleSafeArea.Width / 2 - borderFont.MeasureString(currentLocation.currentEvent.messageToScreen).X / 2f, graphics.GraphicsDevice.Viewport.TitleSafeArea.Height - tileSize), 0f, 1f, 0.999f);

+                        }

+                        if (player.ActiveObject == null && (player.UsingTool || pickingTool) && player.CurrentTool != null && (!player.CurrentTool.Name.Equals("Seeds") || pickingTool))

+                        {

+                            drawTool(player);

+                        }

+                        if (currentLocation.Name.Equals("Farm"))

+                        {

+                            //typeof (Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(Program.gamePtr, null);

+                            DrawFarmBuildings.Invoke(Program.gamePtr, null);

+                            //this.drawFarmBuildings();

+                        }

+                        if (tvStation >= 0)

+                        {

+                            spriteBatch.Draw(tvStationTexture, GlobalToLocal(viewport, new Vector2(6 * tileSize + tileSize / 4, 2 * tileSize + tileSize / 2)), new Rectangle(tvStation * 24, 0, 24, 15), Color.White, 0f, Vector2.Zero, 4f, SpriteEffects.None, 1E-08f);

+                        }

+                        if (panMode)

+                        {

+                            spriteBatch.Draw(fadeToBlackRect, new Rectangle((int) Math.Floor((getOldMouseX() + viewport.X) / (double) tileSize) * tileSize - viewport.X, (int) Math.Floor((getOldMouseY() + viewport.Y) / (double) tileSize) * tileSize - viewport.Y, tileSize, tileSize), Color.Lime * 0.75f);

+                            foreach (Warp current5 in currentLocation.warps)

                             {

-                                spriteBatch.Draw(fadeToBlackRect, new Rectangle((((int)Math.Floor((double)(((double)(getOldMouseX() + viewport.X)) / ((double)tileSize)))) * tileSize) - viewport.X, (((int)Math.Floor((double)(((double)(getOldMouseY() + viewport.Y)) / ((double)tileSize)))) * tileSize) - viewport.Y, tileSize, tileSize), (Color)(Color.Lime * 0.75f));

-                                foreach (Warp warp in currentLocation.warps)

-                                {

-                                    spriteBatch.Draw(fadeToBlackRect, new Rectangle((warp.X * tileSize) - viewport.X, (warp.Y * tileSize) - viewport.Y, tileSize, tileSize), (Color)(Color.Red * 0.75f));

-                                }

+                                spriteBatch.Draw(fadeToBlackRect, new Rectangle(current5.X * tileSize - viewport.X, current5.Y * tileSize - viewport.Y, tileSize, tileSize), Color.Red * 0.75f);

                             }

+                        }

+                        mapDisplayDevice.BeginScene(spriteBatch);

+                        currentLocation.Map.GetLayer("Front").Draw(mapDisplayDevice, viewport, Location.Origin, false, pixelZoom);

+                        mapDisplayDevice.EndScene();

+                        currentLocation.drawAboveFrontLayer(spriteBatch);

+                        spriteBatch.End();

+                        spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);

+                        if (currentLocation.Name.Equals("Farm") && stats.SeedsSown >= 200u)

+                        {

+                            spriteBatch.Draw(debrisSpriteSheet, GlobalToLocal(viewport, new Vector2(3 * tileSize + tileSize / 4, tileSize + tileSize / 3)), getSourceRectForStandardTileSheet(debrisSpriteSheet, 16), Color.White);

+                            spriteBatch.Draw(debrisSpriteSheet, GlobalToLocal(viewport, new Vector2(4 * tileSize + tileSize, 2 * tileSize + tileSize)), getSourceRectForStandardTileSheet(debrisSpriteSheet, 16), Color.White);

+                            spriteBatch.Draw(debrisSpriteSheet, GlobalToLocal(viewport, new Vector2(5 * tileSize, 2 * tileSize)), getSourceRectForStandardTileSheet(debrisSpriteSheet, 16), Color.White);

+                            spriteBatch.Draw(debrisSpriteSheet, GlobalToLocal(viewport, new Vector2(3 * tileSize + tileSize / 2, 3 * tileSize)), getSourceRectForStandardTileSheet(debrisSpriteSheet, 16), Color.White);

+                            spriteBatch.Draw(debrisSpriteSheet, GlobalToLocal(vi