remove disabled & broken draw logic

1 files changed, 323 insertions, 387 deletions

diff --git a/src/StardewModdingAPI/Inheritance/SGame.cs b/src/StardewModdingAPI/Inheritance/SGame.cs
index a7c63941..74a3d5d5 100644
--- a/src/StardewModdingAPI/Inheritance/SGame.cs
+++ b/src/StardewModdingAPI/Inheritance/SGame.cs
@@ -369,459 +369,395 @@ namespace StardewModdingAPI.Inheritance
             // track frame rate
             SGame.FramesPerSecond = 1 / (float)gameTime.ElapsedGameTime.TotalSeconds;
 
-            if (Constants.EnableCompletelyOverridingBaseCalls)
+            try
             {
-                try
+                if (!this.ZoomLevelIsOne)
+                    this.GraphicsDevice.SetRenderTarget(this.Screen);
+
+                this.GraphicsDevice.Clear(this.BgColour);
+                if (Game1.options.showMenuBackground && Game1.activeClickableMenu != null && Game1.activeClickableMenu.showWithoutTransparencyIfOptionIsSet())
                 {
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    Game1.activeClickableMenu.drawBackground(Game1.spriteBatch);
+                    GraphicsEvents.InvokeOnPreRenderGuiEvent(null, EventArgs.Empty);
+                    Game1.activeClickableMenu.draw(Game1.spriteBatch);
+                    GraphicsEvents.InvokeOnPostRenderGuiEvent(null, EventArgs.Empty);
+                    Game1.spriteBatch.End();
                     if (!this.ZoomLevelIsOne)
-                        this.GraphicsDevice.SetRenderTarget(this.Screen);
-
-                    this.GraphicsDevice.Clear(this.BgColour);
-                    if (Game1.options.showMenuBackground && Game1.activeClickableMenu != null && Game1.activeClickableMenu.showWithoutTransparencyIfOptionIsSet())
+                    {
+                        this.GraphicsDevice.SetRenderTarget(null);
+                        this.GraphicsDevice.Clear(this.BgColour);
+                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
+                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
+                        Game1.spriteBatch.End();
+                    }
+                    return;
+                }
+                if (Game1.gameMode == 11)
+                {
+                    Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    Game1.spriteBatch.DrawString(Game1.smoothFont, "Stardew Valley has crashed...", new Vector2(16f, 16f), Color.HotPink);
+                    Game1.spriteBatch.DrawString(Game1.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));
+                    Game1.spriteBatch.DrawString(Game1.smoothFont, Game1.parseText(Game1.errorMessage, Game1.smoothFont, Game1.graphics.GraphicsDevice.Viewport.Width), new Vector2(16f, 48f), Color.White);
+                    Game1.spriteBatch.End();
+                    return;
+                }
+                if (Game1.currentMinigame != null)
+                {
+                    Game1.currentMinigame.draw(Game1.spriteBatch);
+                    if (Game1.globalFade && !Game1.menuUp && (!Game1.nameSelectUp || Game1.messagePause))
                     {
                         Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        Game1.activeClickableMenu.drawBackground(Game1.spriteBatch);
-                        GraphicsEvents.InvokeOnPreRenderGuiEvent(null, EventArgs.Empty);
-                        Game1.activeClickableMenu.draw(Game1.spriteBatch);
-                        GraphicsEvents.InvokeOnPostRenderGuiEvent(null, EventArgs.Empty);
+                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * ((Game1.gameMode == 0) ? (1f - Game1.fadeToBlackAlpha) : Game1.fadeToBlackAlpha));
+                        Game1.spriteBatch.End();
+                    }
+                    if (!this.ZoomLevelIsOne)
+                    {
+                        this.GraphicsDevice.SetRenderTarget(null);
+                        this.GraphicsDevice.Clear(this.BgColour);
+                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
+                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
                         Game1.spriteBatch.End();
-                        if (!this.ZoomLevelIsOne)
-                        {
-                            this.GraphicsDevice.SetRenderTarget(null);
-                            this.GraphicsDevice.Clear(this.BgColour);
-                            Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                            Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                            Game1.spriteBatch.End();
-                        }
-                        return;
                     }
-                    if (Game1.gameMode == 11)
+                    return;
+                }
+                if (Game1.showingEndOfNightStuff)
+                {
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    Game1.activeClickableMenu?.draw(Game1.spriteBatch);
+                    Game1.spriteBatch.End();
+                    if (!this.ZoomLevelIsOne)
                     {
-                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        Game1.spriteBatch.DrawString(Game1.smoothFont, "Stardew Valley has crashed...", new Vector2(16f, 16f), Color.HotPink);
-                        Game1.spriteBatch.DrawString(Game1.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));
-                        Game1.spriteBatch.DrawString(Game1.smoothFont, Game1.parseText(Game1.errorMessage, Game1.smoothFont, Game1.graphics.GraphicsDevice.Viewport.Width), new Vector2(16f, 48f), Color.White);
+                        this.GraphicsDevice.SetRenderTarget(null);
+                        this.GraphicsDevice.Clear(this.BgColour);
+                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
+                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
                         Game1.spriteBatch.End();
-                        return;
                     }
-                    if (Game1.currentMinigame != null)
+                    return;
+                }
+                if (Game1.gameMode == 6)
+                {
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    string text = "";
+                    int num = 0;
+                    while (num < gameTime.TotalGameTime.TotalMilliseconds % 999.0 / 333.0)
                     {
-                        Game1.currentMinigame.draw(Game1.spriteBatch);
-                        if (Game1.globalFade && !Game1.menuUp && (!Game1.nameSelectUp || Game1.messagePause))
-                        {
-                            Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * ((Game1.gameMode == 0) ? (1f - Game1.fadeToBlackAlpha) : Game1.fadeToBlackAlpha));
-                            Game1.spriteBatch.End();
-                        }
-                        if (!this.ZoomLevelIsOne)
-                        {
-                            this.GraphicsDevice.SetRenderTarget(null);
-                            this.GraphicsDevice.Clear(this.BgColour);
-                            Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                            Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                            Game1.spriteBatch.End();
-                        }
-                        return;
+                        text += ".";
+                        num++;
                     }
-                    if (Game1.showingEndOfNightStuff)
+                    SpriteText.drawString(Game1.spriteBatch, "Loading" + text, 64, Game1.graphics.GraphicsDevice.Viewport.Height - 64, 999, -1, 999, 1f, 1f, false, 0, "Loading...");
+                    Game1.spriteBatch.End();
+                    if (!this.ZoomLevelIsOne)
                     {
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        Game1.activeClickableMenu?.draw(Game1.spriteBatch);
+                        this.GraphicsDevice.SetRenderTarget(null);
+                        this.GraphicsDevice.Clear(this.BgColour);
+                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
+                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
                         Game1.spriteBatch.End();
-                        if (!this.ZoomLevelIsOne)
-                        {
-                            this.GraphicsDevice.SetRenderTarget(null);
-                            this.GraphicsDevice.Clear(this.BgColour);
-                            Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                            Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                            Game1.spriteBatch.End();
-                        }
-                        return;
                     }
-                    if (Game1.gameMode == 6)
+                    return;
+                }
+                if (Game1.gameMode == 0)
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                else
+                {
+                    if (Game1.drawLighting)
                     {
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        string text = "";
-                        int num = 0;
-                        while (num < gameTime.TotalGameTime.TotalMilliseconds % 999.0 / 333.0)
+                        this.GraphicsDevice.SetRenderTarget(Game1.lightmap);
+                        this.GraphicsDevice.Clear(Color.White * 0f);
+                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, null, null);
+                        Game1.spriteBatch.Draw(Game1.staminaRect, Game1.lightmap.Bounds, Game1.currentLocation.name.Equals("UndergroundMine") ? Game1.mine.getLightingColor(gameTime) : ((!Game1.ambientLight.Equals(Color.White) && (!Game1.isRaining || !Game1.currentLocation.isOutdoors)) ? Game1.ambientLight : Game1.outdoorLight));
+                        for (int i = 0; i < Game1.currentLightSources.Count; i++)
                         {
-                            text += ".";
-                            num++;
+                            if (Utility.isOnScreen(Game1.currentLightSources.ElementAt(i).position, (int)(Game1.currentLightSources.ElementAt(i).radius * Game1.tileSize * 4f)))
+                                Game1.spriteBatch.Draw(Game1.currentLightSources.ElementAt(i).lightTexture, Game1.GlobalToLocal(Game1.viewport, Game1.currentLightSources.ElementAt(i).position) / Game1.options.lightingQuality, Game1.currentLightSources.ElementAt(i).lightTexture.Bounds, Game1.currentLightSources.ElementAt(i).color, 0f, new Vector2(Game1.currentLightSources.ElementAt(i).lightTexture.Bounds.Center.X, Game1.currentLightSources.ElementAt(i).lightTexture.Bounds.Center.Y), Game1.currentLightSources.ElementAt(i).radius / Game1.options.lightingQuality, SpriteEffects.None, 0.9f);
                         }
-                        SpriteText.drawString(Game1.spriteBatch, "Loading" + text, 64, Game1.graphics.GraphicsDevice.Viewport.Height - 64, 999, -1, 999, 1f, 1f, false, 0, "Loading...");
                         Game1.spriteBatch.End();
-                        if (!this.ZoomLevelIsOne)
-                        {
-                            this.GraphicsDevice.SetRenderTarget(null);
-                            this.GraphicsDevice.Clear(this.BgColour);
-                            Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                            Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                            Game1.spriteBatch.End();
-                        }
-                        return;
+                        this.GraphicsDevice.SetRenderTarget(this.ZoomLevelIsOne ? null : this.Screen);
                     }
-                    if (Game1.gameMode == 0)
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                    else
+                    if (Game1.bloomDay)
+                        Game1.bloom?.BeginDraw();
+                    this.GraphicsDevice.Clear(this.BgColour);
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    GraphicsEvents.InvokeOnPreRenderEvent(null, EventArgs.Empty);
+                    Game1.background?.draw(Game1.spriteBatch);
+                    Game1.mapDisplayDevice.BeginScene(Game1.spriteBatch);
+                    Game1.currentLocation.Map.GetLayer("Back").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
+                    Game1.currentLocation.drawWater(Game1.spriteBatch);
+                    if (Game1.CurrentEvent == null)
                     {
-                        if (Game1.drawLighting)
+                        using (List<NPC>.Enumerator enumerator = Game1.currentLocation.characters.GetEnumerator())
                         {
-                            this.GraphicsDevice.SetRenderTarget(Game1.lightmap);
-                            this.GraphicsDevice.Clear(Color.White * 0f);
-                            Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, null, null);
-                            Game1.spriteBatch.Draw(Game1.staminaRect, Game1.lightmap.Bounds, Game1.currentLocation.name.Equals("UndergroundMine") ? Game1.mine.getLightingColor(gameTime) : ((!Game1.ambientLight.Equals(Color.White) && (!Game1.isRaining || !Game1.currentLocation.isOutdoors)) ? Game1.ambientLight : Game1.outdoorLight));
-                            for (int i = 0; i < Game1.currentLightSources.Count; i++)
+                            while (enumerator.MoveNext())
                             {
-                                if (Utility.isOnScreen(Game1.currentLightSources.ElementAt(i).position, (int)(Game1.currentLightSources.ElementAt(i).radius * Game1.tileSize * 4f)))
-                                    Game1.spriteBatch.Draw(Game1.currentLightSources.ElementAt(i).lightTexture, Game1.GlobalToLocal(Game1.viewport, Game1.currentLightSources.ElementAt(i).position) / Game1.options.lightingQuality, Game1.currentLightSources.ElementAt(i).lightTexture.Bounds, Game1.currentLightSources.ElementAt(i).color, 0f, new Vector2(Game1.currentLightSources.ElementAt(i).lightTexture.Bounds.Center.X, Game1.currentLightSources.ElementAt(i).lightTexture.Bounds.Center.Y), Game1.currentLightSources.ElementAt(i).radius / Game1.options.lightingQuality, SpriteEffects.None, 0.9f);
+                                NPC current = enumerator.Current;
+                                if (current != null && !current.swimming && !current.hideShadow && !current.IsMonster && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current.getTileLocation()))
+                                    Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current.position + new Vector2(current.sprite.spriteWidth * Game1.pixelZoom / 2f, current.GetBoundingBox().Height + (current.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current.yJumpOffset / 40f) * current.scale, SpriteEffects.None, Math.Max(0f, current.getStandingY() / 10000f) - 1E-06f);
                             }
-                            Game1.spriteBatch.End();
-                            this.GraphicsDevice.SetRenderTarget(this.ZoomLevelIsOne ? null : this.Screen);
+                            goto IL_B30;
                         }
-                        if (Game1.bloomDay)
-                            Game1.bloom?.BeginDraw();
-                        this.GraphicsDevice.Clear(this.BgColour);
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        GraphicsEvents.InvokeOnPreRenderEvent(null, EventArgs.Empty);
-                        Game1.background?.draw(Game1.spriteBatch);
-                        Game1.mapDisplayDevice.BeginScene(Game1.spriteBatch);
-                        Game1.currentLocation.Map.GetLayer("Back").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
-                        Game1.currentLocation.drawWater(Game1.spriteBatch);
-                        if (Game1.CurrentEvent == null)
-                        {
-                            using (List<NPC>.Enumerator enumerator = Game1.currentLocation.characters.GetEnumerator())
-                            {
-                                while (enumerator.MoveNext())
-                                {
-                                    NPC current = enumerator.Current;
-                                    if (current != null && !current.swimming && !current.hideShadow && !current.IsMonster && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current.getTileLocation()))
-                                        Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current.position + new Vector2(current.sprite.spriteWidth * Game1.pixelZoom / 2f, current.GetBoundingBox().Height + (current.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current.yJumpOffset / 40f) * current.scale, SpriteEffects.None, Math.Max(0f, current.getStandingY() / 10000f) - 1E-06f);
-                                }
-                                goto IL_B30;
-                            }
-                        }
-                        foreach (NPC current2 in Game1.CurrentEvent.actors)
-                        {
-                            if (!current2.swimming && !current2.hideShadow && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current2.getTileLocation()))
-                                Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current2.position + new Vector2(current2.sprite.spriteWidth * Game1.pixelZoom / 2f, current2.GetBoundingBox().Height + (current2.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current2.yJumpOffset / 40f) * current2.scale, SpriteEffects.None, Math.Max(0f, current2.getStandingY() / 10000f) - 1E-06f);
-                        }
-                        IL_B30:
-                        if (!Game1.player.swimming && !Game1.player.isRidingHorse() && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(Game1.player.getTileLocation()))
-                            Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.player.position + new Vector2(32f, 24f)), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), 4f - (((Game1.player.running || Game1.player.usingTool) && Game1.player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[Game1.player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, 0f);
-                        Game1.currentLocation.Map.GetLayer("Buildings").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
-                        Game1.mapDisplayDevice.EndScene();
-                        Game1.spriteBatch.End();
-                        Game1.spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        if (Game1.CurrentEvent == null)
+                    }
+                    foreach (NPC current2 in Game1.CurrentEvent.actors)
+                    {
+                        if (!current2.swimming && !current2.hideShadow && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current2.getTileLocation()))
+                            Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current2.position + new Vector2(current2.sprite.spriteWidth * Game1.pixelZoom / 2f, current2.GetBoundingBox().Height + (current2.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current2.yJumpOffset / 40f) * current2.scale, SpriteEffects.None, Math.Max(0f, current2.getStandingY() / 10000f) - 1E-06f);
+                    }
+                    IL_B30:
+                    if (!Game1.player.swimming && !Game1.player.isRidingHorse() && !Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(Game1.player.getTileLocation()))
+                        Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.player.position + new Vector2(32f, 24f)), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), 4f - (((Game1.player.running || Game1.player.usingTool) && Game1.player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[Game1.player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, 0f);
+                    Game1.currentLocation.Map.GetLayer("Buildings").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
+                    Game1.mapDisplayDevice.EndScene();
+                    Game1.spriteBatch.End();
+                    Game1.spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    if (Game1.CurrentEvent == null)
+                    {
+                        using (List<NPC>.Enumerator enumerator3 = Game1.currentLocation.characters.GetEnumerator())
                         {
-                            using (List<NPC>.Enumerator enumerator3 = Game1.currentLocation.characters.GetEnumerator())
+                            while (enumerator3.MoveNext())
                             {
-                                while (enumerator3.MoveNext())
-                                {
-                                    NPC current3 = enumerator3.Current;
-                                    if (current3 != null && !current3.swimming && !current3.hideShadow && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current3.getTileLocation()))
-                                        Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current3.position + new Vector2(current3.sprite.spriteWidth * Game1.pixelZoom / 2f, current3.GetBoundingBox().Height + (current3.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current3.yJumpOffset / 40f) * current3.scale, SpriteEffects.None, Math.Max(0f, current3.getStandingY() / 10000f) - 1E-06f);
-                                }
-                                goto IL_F5F;
+                                NPC current3 = enumerator3.Current;
+                                if (current3 != null && !current3.swimming && !current3.hideShadow && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current3.getTileLocation()))
+                                    Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current3.position + new Vector2(current3.sprite.spriteWidth * Game1.pixelZoom / 2f, current3.GetBoundingBox().Height + (current3.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current3.yJumpOffset / 40f) * current3.scale, SpriteEffects.None, Math.Max(0f, current3.getStandingY() / 10000f) - 1E-06f);
                             }
+                            goto IL_F5F;
                         }
-                        foreach (NPC current4 in Game1.CurrentEvent.actors)
-                        {
-                            if (!current4.swimming && !current4.hideShadow && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current4.getTileLocation()))
-                                Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current4.position + new Vector2(current4.sprite.spriteWidth * Game1.pixelZoom / 2f, current4.GetBoundingBox().Height + (current4.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current4.yJumpOffset / 40f) * current4.scale, SpriteEffects.None, Math.Max(0f, current4.getStandingY() / 10000f) - 1E-06f);
-                        }
-                        IL_F5F:
-                        if (!Game1.player.swimming && !Game1.player.isRidingHorse() && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(Game1.player.getTileLocation()))
-                            Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.player.position + new Vector2(32f, 24f)), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), 4f - (((Game1.player.running || Game1.player.usingTool) && Game1.player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[Game1.player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, Math.Max(0.0001f, Game1.player.getStandingY() / 10000f + 0.00011f) - 0.0001f);
-                        if (Game1.displayFarmer)
-                            Game1.player.draw(Game1.spriteBatch);
-                        if ((Game1.eventUp || Game1.killScreen) && !Game1.killScreen)
-                            Game1.currentLocation.currentEvent?.draw(Game1.spriteBatch);
-                        if (Game1.player.currentUpgrade != null && Game1.player.currentUpgrade.daysLeftTillUpgradeDone <= 3 && Game1.currentLocation.Name.Equals("Farm"))
-                            Game1.spriteBatch.Draw(Game1.player.currentUpgrade.workerTexture, Game1.GlobalToLocal(Game1.viewport, Game1.player.currentUpgrade.positionOfCarpenter), Game1.player.currentUpgrade.getSourceRectangle(), Color.White, 0f, Vector2.Zero, 1f, SpriteEffects.None, (Game1.player.currentUpgrade.positionOfCarpenter.Y + Game1.tileSize * 3 / 4) / 10000f);
-                        Game1.currentLocation.draw(Game1.spriteBatch);
-                        if (Game1.eventUp && Game1.currentLocation.currentEvent?.messageToScreen != null)
-                            Game1.drawWithBorder(Game1.currentLocation.currentEvent.messageToScreen, Color.Black, Color.White, new Vector2(Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width / 2 - Game1.borderFont.MeasureString(Game1.currentLocation.currentEvent.messageToScreen).X / 2f, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Height - Game1.tileSize), 0f, 1f, 0.999f);
-                        if (Game1.player.ActiveObject == null && (Game1.player.UsingTool || Game1.pickingTool) && Game1.player.CurrentTool != null && (!Game1.player.CurrentTool.Name.Equals("Seeds") || Game1.pickingTool))
-                            Game1.drawTool(Game1.player);
-                        if (Game1.currentLocation.Name.Equals("Farm"))
-                            SGame.DrawFarmBuildings.Invoke(Program.gamePtr, null);
-                        if (Game1.tvStation >= 0)
-                            Game1.spriteBatch.Draw(Game1.tvStationTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2(6 * Game1.tileSize + Game1.tileSize / 4, 2 * Game1.tileSize + Game1.tileSize / 2)), new Rectangle(Game1.tvStation * 24, 0, 24, 15), Color.White, 0f, Vector2.Zero, 4f, SpriteEffects.None, 1E-08f);
-                        if (Game1.panMode)
-                        {
-                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle((int)Math.Floor((Game1.getOldMouseX() + Game1.viewport.X) / (double)Game1.tileSize) * Game1.tileSize - Game1.viewport.X, (int)Math.Floor((Game1.getOldMouseY() + Game1.viewport.Y) / (double)Game1.tileSize) * Game1.tileSize - Game1.viewport.Y, Game1.tileSize, Game1.tileSize), Color.Lime * 0.75f);
-                            foreach (Warp current5 in Game1.currentLocation.warps)
-                                Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle(current5.X * Game1.tileSize - Game1.viewport.X, current5.Y * Game1.tileSize - Game1.viewport.Y, Game1.tileSize, Game1.tileSize), Color.Red * 0.75f);
-                        }
+                    }
+                    foreach (NPC current4 in Game1.CurrentEvent.actors)
+                    {
+                        if (!current4.swimming && !current4.hideShadow && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(current4.getTileLocation()))
+                            Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.viewport, current4.position + new Vector2(current4.sprite.spriteWidth * Game1.pixelZoom / 2f, current4.GetBoundingBox().Height + (current4.IsMonster ? 0 : (Game1.pixelZoom * 3)))), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), (Game1.pixelZoom + current4.yJumpOffset / 40f) * current4.scale, SpriteEffects.None, Math.Max(0f, current4.getStandingY() / 10000f) - 1E-06f);
+                    }
+                    IL_F5F:
+                    if (!Game1.player.swimming && !Game1.player.isRidingHorse() && Game1.currentLocation.shouldShadowBeDrawnAboveBuildingsLayer(Game1.player.getTileLocation()))
+                        Game1.spriteBatch.Draw(Game1.shadowTexture, Game1.GlobalToLocal(Game1.player.position + new Vector2(32f, 24f)), Game1.shadowTexture.Bounds, Color.White, 0f, new Vector2(Game1.shadowTexture.Bounds.Center.X, Game1.shadowTexture.Bounds.Center.Y), 4f - (((Game1.player.running || Game1.player.usingTool) && Game1.player.FarmerSprite.indexInCurrentAnimation > 1) ? (Math.Abs(FarmerRenderer.featureYOffsetPerFrame[Game1.player.FarmerSprite.CurrentFrame]) * 0.5f) : 0f), SpriteEffects.None, Math.Max(0.0001f, Game1.player.getStandingY() / 10000f + 0.00011f) - 0.0001f);
+                    if (Game1.displayFarmer)
+                        Game1.player.draw(Game1.spriteBatch);
+                    if ((Game1.eventUp || Game1.killScreen) && !Game1.killScreen)
+                        Game1.currentLocation.currentEvent?.draw(Game1.spriteBatch);
+                    if (Game1.player.currentUpgrade != null && Game1.player.currentUpgrade.daysLeftTillUpgradeDone <= 3 && Game1.currentLocation.Name.Equals("Farm"))
+                        Game1.spriteBatch.Draw(Game1.player.currentUpgrade.workerTexture, Game1.GlobalToLocal(Game1.viewport, Game1.player.currentUpgrade.positionOfCarpenter), Game1.player.currentUpgrade.getSourceRectangle(), Color.White, 0f, Vector2.Zero, 1f, SpriteEffects.None, (Game1.player.currentUpgrade.positionOfCarpenter.Y + Game1.tileSize * 3 / 4) / 10000f);
+                    Game1.currentLocation.draw(Game1.spriteBatch);
+                    if (Game1.eventUp && Game1.currentLocation.currentEvent?.messageToScreen != null)
+                        Game1.drawWithBorder(Game1.currentLocation.currentEvent.messageToScreen, Color.Black, Color.White, new Vector2(Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width / 2 - Game1.borderFont.MeasureString(Game1.currentLocation.currentEvent.messageToScreen).X / 2f, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Height - Game1.tileSize), 0f, 1f, 0.999f);
+                    if (Game1.player.ActiveObject == null && (Game1.player.UsingTool || Game1.pickingTool) && Game1.player.CurrentTool != null && (!Game1.player.CurrentTool.Name.Equals("Seeds") || Game1.pickingTool))
+                        Game1.drawTool(Game1.player);
+                    if (Game1.currentLocation.Name.Equals("Farm"))
+                        SGame.DrawFarmBuildings.Invoke(Program.gamePtr, null);
+                    if (Game1.tvStation >= 0)
+                        Game1.spriteBatch.Draw(Game1.tvStationTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2(6 * Game1.tileSize + Game1.tileSize / 4, 2 * Game1.tileSize + Game1.tileSize / 2)), new Rectangle(Game1.tvStation * 24, 0, 24, 15), Color.White, 0f, Vector2.Zero, 4f, SpriteEffects.None, 1E-08f);
+                    if (Game1.panMode)
+                    {
+                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle((int)Math.Floor((Game1.getOldMouseX() + Game1.viewport.X) / (double)Game1.tileSize) * Game1.tileSize - Game1.viewport.X, (int)Math.Floor((Game1.getOldMouseY() + Game1.viewport.Y) / (double)Game1.tileSize) * Game1.tileSize - Game1.viewport.Y, Game1.tileSize, Game1.tileSize), Color.Lime * 0.75f);
+                        foreach (Warp current5 in Game1.currentLocation.warps)
+                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle(current5.X * Game1.tileSize - Game1.viewport.X, current5.Y * Game1.tileSize - Game1.viewport.Y, Game1.tileSize, Game1.tileSize), Color.Red * 0.75f);
+                    }
+                    Game1.mapDisplayDevice.BeginScene(Game1.spriteBatch);
+                    Game1.currentLocation.Map.GetLayer("Front").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
+                    Game1.mapDisplayDevice.EndScene();
+                    Game1.currentLocation.drawAboveFrontLayer(Game1.spriteBatch);
+                    Game1.spriteBatch.End();
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    if (Game1.currentLocation.Name.Equals("Farm") && Game1.stats.SeedsSown >= 200u)
+                    {
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(3 * Game1.tileSize + Game1.tileSize / 4, Game1.tileSize + Game1.tileSize / 3)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize + Game1.tileSize, 2 * Game1.tileSize + Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(5 * Game1.tileSize, 2 * Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(3 * Game1.tileSize + Game1.tileSize / 2, 3 * Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(5 * Game1.tileSize - Game1.tileSize / 4, Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize, 3 * Game1.tileSize + Game1.tileSize / 6)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                        Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize + Game1.tileSize / 5, 2 * Game1.tileSize + Game1.tileSize / 3)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
+                    }
+                    if (Game1.displayFarmer && Game1.player.ActiveObject != null && Game1.player.ActiveObject.bigCraftable && this.checkBigCraftableBoundariesForFrontLayer() && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), Game1.player.getStandingY()), Game1.viewport.Size) == null)
+                        Game1.drawPlayerHeldObject(Game1.player);
+                    else if (Game1.displayFarmer && Game1.player.ActiveObject != null && ((Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location((int)Game1.player.position.X, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && !Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location((int)Game1.player.position.X, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size).TileIndexProperties.ContainsKey("FrontAlways")) || (Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.GetBoundingBox().Right, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && !Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.GetBoundingBox().Right, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size).TileIndexProperties.ContainsKey("FrontAlways"))))
+                        Game1.drawPlayerHeldObject(Game1.player);
+                    if ((Game1.player.UsingTool || Game1.pickingTool) && Game1.player.CurrentTool != null && (!Game1.player.CurrentTool.Name.Equals("Seeds") || Game1.pickingTool) && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), Game1.player.getStandingY()), Game1.viewport.Size) == null)
+                        Game1.drawTool(Game1.player);
+                    if (Game1.currentLocation.Map.GetLayer("AlwaysFront") != null)
+                    {
                         Game1.mapDisplayDevice.BeginScene(Game1.spriteBatch);
-                        Game1.currentLocation.Map.GetLayer("Front").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
+                        Game1.currentLocation.Map.GetLayer("AlwaysFront").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
                         Game1.mapDisplayDevice.EndScene();
-                        Game1.currentLocation.drawAboveFrontLayer(Game1.spriteBatch);
-                        Game1.spriteBatch.End();
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        if (Game1.currentLocation.Name.Equals("Farm") && Game1.stats.SeedsSown >= 200u)
-                        {
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(3 * Game1.tileSize + Game1.tileSize / 4, Game1.tileSize + Game1.tileSize / 3)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize + Game1.tileSize, 2 * Game1.tileSize + Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(5 * Game1.tileSize, 2 * Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(3 * Game1.tileSize + Game1.tileSize / 2, 3 * Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(5 * Game1.tileSize - Game1.tileSize / 4, Game1.tileSize)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize, 3 * Game1.tileSize + Game1.tileSize / 6)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                            Game1.spriteBatch.Draw(Game1.debrisSpriteSheet, Game1.GlobalToLocal(Game1.viewport, new Vector2(4 * Game1.tileSize + Game1.tileSize / 5, 2 * Game1.tileSize + Game1.tileSize / 3)), Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 16), Color.White);
-                        }
-                        if (Game1.displayFarmer && Game1.player.ActiveObject != null && Game1.player.ActiveObject.bigCraftable && this.checkBigCraftableBoundariesForFrontLayer() && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), Game1.player.getStandingY()), Game1.viewport.Size) == null)
-                            Game1.drawPlayerHeldObject(Game1.player);
-                        else if (Game1.displayFarmer && Game1.player.ActiveObject != null && ((Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location((int)Game1.player.position.X, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && !Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location((int)Game1.player.position.X, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size).TileIndexProperties.ContainsKey("FrontAlways")) || (Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.GetBoundingBox().Right, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && !Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.GetBoundingBox().Right, (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size).TileIndexProperties.ContainsKey("FrontAlways"))))
-                            Game1.drawPlayerHeldObject(Game1.player);
-                        if ((Game1.player.UsingTool || Game1.pickingTool) && Game1.player.CurrentTool != null && (!Game1.player.CurrentTool.Name.Equals("Seeds") || Game1.pickingTool) && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), (int)Game1.player.position.Y - Game1.tileSize * 3 / 5), Game1.viewport.Size) != null && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), Game1.player.getStandingY()), Game1.viewport.Size) == null)
-                            Game1.drawTool(Game1.player);
-                        if (Game1.currentLocation.Map.GetLayer("AlwaysFront") != null)
-                        {
-                            Game1.mapDisplayDevice.BeginScene(Game1.spriteBatch);
-                            Game1.currentLocation.Map.GetLayer("AlwaysFront").Draw(Game1.mapDisplayDevice, Game1.viewport, Location.Origin, false, Game1.pixelZoom);
-                            Game1.mapDisplayDevice.EndScene();
-                        }
-                        if (Game1.toolHold > 400f && Game1.player.CurrentTool.UpgradeLevel >= 1 && Game1.player.canReleaseTool)
-                        {
-                            Color color = Color.White;
-                            switch ((int)(Game1.toolHold / 600f) + 2)
-                            {
-                                case 1:
-                                    color = Tool.copperColor;
-                                    break;
-                                case 2:
-                                    color = Tool.steelColor;
-                                    break;
-                                case 3:
-                                    color = Tool.goldColor;
-                                    break;
-                                case 4:
-                                    color = Tool.iridiumColor;
-                                    break;
-                            }
-                            Game1.spriteBatch.Draw(Game1.littleEffect, new Rectangle((int)Game1.player.getLocalPosition(Game1.viewport).X - 2, (int)Game1.player.getLocalPosition(Game1.viewport).Y - (Game1.player.CurrentTool.Name.Equals("Watering Can") ? 0 : Game1.tileSize) - 2, (int)(Game1.toolHold % 600f * 0.08f) + 4, Game1.tileSize / 8 + 4), Color.Black);
-                            Game1.spriteBatch.Draw(Game1.littleEffect, new Rectangle((int)Game1.player.getLocalPosition(Game1.viewport).X, (int)Game1.player.getLocalPosition(Game1.viewport).Y - (Game1.player.CurrentTool.Name.Equals("Watering Can") ? 0 : Game1.tileSize), (int)(Game1.toolHold % 600f * 0.08f), Game1.tileSize / 8), color);
-                        }
-                        if (Game1.isDebrisWeather && Game1.currentLocation.IsOutdoors && !Game1.currentLocation.ignoreDebrisWeather && !Game1.currentLocation.Name.Equals("Desert") && Game1.viewport.X > -10)
-                        {
-                            foreach (WeatherDebris current6 in Game1.debrisWeather)
-                                current6.draw(Game1.spriteBatch);
-                        }
-                        Game1.farmEvent?.draw(Game1.spriteBatch);
-                        if (Game1.currentLocation.LightLevel > 0f && Game1.timeOfDay < 2000)
-                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * Game1.currentLocation.LightLevel);
-                        if (Game1.screenGlow)
-                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Game1.screenGlowColor * Game1.screenGlowAlpha);
-                        Game1.currentLocation.drawAboveAlwaysFrontLayer(Game1.spriteBatch);
-                        if (Game1.player.CurrentTool is FishingRod && ((Game1.player.CurrentTool as FishingRod).isTimingCast || (Game1.player.CurrentTool as FishingRod).castingChosenCountdown > 0f || (Game1.player.CurrentTool as FishingRod).fishCaught || (Game1.player.CurrentTool as FishingRod).showingTreasure))
-                            Game1.player.CurrentTool.draw(Game1.spriteBatch);
-                        if (Game1.isRaining && Game1.currentLocation.IsOutdoors && !Game1.currentLocation.Name.Equals("Desert") && !(Game1.currentLocation is Summit) && (!Game1.eventUp || Game1.currentLocation.isTileOnMap(new Vector2(Game1.viewport.X / Game1.tileSize, Game1.viewport.Y / Game1.tileSize))))
+                    }
+                    if (Game1.toolHold > 400f && Game1.player.CurrentTool.UpgradeLevel >= 1 && Game1.player.canReleaseTool)
+                    {
+                        Color color = Color.White;
+                        switch ((int)(Game1.toolHold / 600f) + 2)
                         {
-                            for (int j = 0; j < Game1.rainDrops.Length; j++)
-                                Game1.spriteBatch.Draw(Game1.rainTexture, Game1.rainDrops[j].position, Game1.getSourceRectForStandardTileSheet(Game1.rainTexture, Game1.rainDrops[j].frame), Color.White);
+                            case 1:
+                                color = Tool.copperColor;
+                                break;
+                            case 2:
+                                color = Tool.steelColor;
+                                break;
+                            case 3:
+                                color = Tool.goldColor;
+                                break;
+                            case 4:
+                                color = Tool.iridiumColor;
+                                break;
                         }
+                        Game1.spriteBatch.Draw(Game1.littleEffect, new Rectangle((int)Game1.player.getLocalPosition(Game1.viewport).X - 2, (int)Game1.player.getLocalPosition(Game1.viewport).Y - (Game1.player.CurrentTool.Name.Equals("Watering Can") ? 0 : Game1.tileSize) - 2, (int)(Game1.toolHold % 600f * 0.08f) + 4, Game1.tileSize / 8 + 4), Color.Black);
+                        Game1.spriteBatch.Draw(Game1.littleEffect, new Rectangle((int)Game1.player.getLocalPosition(Game1.viewport).X, (int)Game1.player.getLocalPosition(Game1.viewport).Y - (Game1.player.CurrentTool.Name.Equals("Watering Can") ? 0 : Game1.tileSize), (int)(Game1.toolHold % 600f * 0.08f), Game1.tileSize / 8), color);
+                    }
+                    if (Game1.isDebrisWeather && Game1.currentLocation.IsOutdoors && !Game1.currentLocation.ignoreDebrisWeather && !Game1.currentLocation.Name.Equals("Desert") && Game1.viewport.X > -10)
+                    {
+                        foreach (WeatherDebris current6 in Game1.debrisWeather)
+                            current6.draw(Game1.spriteBatch);
+                    }
+                    Game1.farmEvent?.draw(Game1.spriteBatch);
+                    if (Game1.currentLocation.LightLevel > 0f && Game1.timeOfDay < 2000)
+                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * Game1.currentLocation.LightLevel);
+                    if (Game1.screenGlow)
+                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Game1.screenGlowColor * Game1.screenGlowAlpha);
+                    Game1.currentLocation.drawAboveAlwaysFrontLayer(Game1.spriteBatch);
+                    if (Game1.player.CurrentTool is FishingRod && ((Game1.player.CurrentTool as FishingRod).isTimingCast || (Game1.player.CurrentTool as FishingRod).castingChosenCountdown > 0f || (Game1.player.CurrentTool as FishingRod).fishCaught || (Game1.player.CurrentTool as FishingRod).showingTreasure))
+                        Game1.player.CurrentTool.draw(Game1.spriteBatch);
+                    if (Game1.isRaining && Game1.currentLocation.IsOutdoors && !Game1.currentLocation.Name.Equals("Desert") && !(Game1.currentLocation is Summit) && (!Game1.eventUp || Game1.currentLocation.isTileOnMap(new Vector2(Game1.viewport.X / Game1.tileSize, Game1.viewport.Y / Game1.tileSize))))
+                    {
+                        for (int j = 0; j < Game1.rainDrops.Length; j++)
+                            Game1.spriteBatch.Draw(Game1.rainTexture, Game1.rainDrops[j].position, Game1.getSourceRectForStandardTileSheet(Game1.rainTexture, Game1.rainDrops[j].frame), Color.White);
+                    }
 
-                        Game1.spriteBatch.End();
+                    Game1.spriteBatch.End();
 
-                        //base.Draw(gameTime);
+                    //base.Draw(gameTime);
 
-                        Game1.spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        if (Game1.eventUp && Game1.currentLocation.currentEvent != null)
-                        {
-                            foreach (NPC current7 in Game1.currentLocation.currentEvent.actors)
-                            {
-                                if (current7.isEmoting)
-                                {
-                                    Vector2 localPosition = current7.getLocalPosition(Game1.viewport);
-                                    localPosition.Y -= Game1.tileSize * 2 + Game1.pixelZoom * 3;
-                                    if (current7.age == 2)
-                                        localPosition.Y += Game1.tileSize / 2;
-                                    else if (current7.gender == 1)
-                                        localPosition.Y += Game1.tileSize / 6;
-                                    Game1.spriteBatch.Draw(Game1.emoteSpriteSheet, localPosition, new Rectangle(current7.CurrentEmoteIndex * (Game1.tileSize / 4) % Game1.emoteSpriteSheet.Width, current7.CurrentEmoteIndex * (Game1.tileSize / 4) / Game1.emoteSpriteSheet.Width * (Game1.tileSize / 4), Game1.tileSize / 4, Game1.tileSize / 4), Color.White, 0f, Vector2.Zero, 4f, SpriteEffects.None, current7.getStandingY() / 10000f);
-                                }
-                            }
-                        }
-                        Game1.spriteBatch.End();
-                        if (Game1.drawLighting)
+                    Game1.spriteBatch.Begin(SpriteSortMode.FrontToBack, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    if (Game1.eventUp && Game1.currentLocation.currentEvent != null)
+                    {
+                        foreach (NPC current7 in Game1.currentLocation.currentEvent.actors)
                         {
-                            Game1.spriteBatch.Begin(SpriteSortMode.Deferred, new BlendState
+                            if (current7.isEmoting)
                             {
-                                ColorBlendFunction = BlendFunction.ReverseSubtract,
-                                ColorDestinationBlend = Blend.One,
-                                ColorSourceBlend = Blend.SourceColor
-                            }, SamplerState.LinearClamp, null, null);
-                            Game1.spriteBatch.Draw(Game1.lightmap, Vector2.Zero, Game1.lightmap.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.lightingQuality, SpriteEffects.None, 1f);
-                            if (Game1.isRaining && Game1.currentLocation.isOutdoors && !(Game1.currentLocation is Desert))
-                            {
-                                Game1.spriteBatch.Draw(Game1.staminaRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.OrangeRed * 0.45f);
+                                Vector2 localPosition = current7.getLocalPosition(Game1.viewport);
+                                localPosition.Y -= Game1.tileSize * 2 + Game1.pixelZoom * 3;
+                                if (current7.age == 2)
+                                    localPosition.Y += Game1.tileSize / 2;
+                                else if (current7.gender == 1)
+                                    localPosition.Y += Game1.tileSize / 6;
+                                Game1.spriteBatch.Draw(Game1.emoteSpriteSheet, localPosition, new Rectangle(current7.CurrentEmoteIndex * (Game1.tileSize / 4) % Game1.emoteSpriteSheet.Width, current7.CurrentEmoteIndex * (Game1.tileSize / 4) / Game1.emoteSpriteSheet.Width * (Game1.tileSize / 4), Game1.tileSize / 4, Game1.tileSize / 4), Color.White, 0f, Vector2.Zero, 4f, SpriteEffects.None, current7.getStandingY() / 10000f);
                             }
-                            Game1.spriteBatch.End();
-                        }
-                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                        if (Game1.drawGrid)
-                        {
-                            int num2 = -Game1.viewport.X % Game1.tileSize;
-                            float num3 = -(float)Game1.viewport.Y % Game1.tileSize;
-                            for (int k = num2; k < Game1.graphics.GraphicsDevice.Viewport.Width; k += Game1.tileSize)
-                                Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle(k, (int)num3, 1, Game1.graphics.GraphicsDevice.Viewport.Height), Color.Red * 0.5f);
-                            for (float num4 = num3; num4 < (float)Game1.graphics.GraphicsDevice.Viewport.Height; num4 += (float)Game1.tileSize)
-                                Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle(num2, (int)num4, Game1.graphics.GraphicsDevice.Viewport.Width, 1), Color.Red * 0.5f);
                         }
-                        if (Game1.currentBillboard != 0)
-                            this.drawBillboard();
-
-                        GraphicsEvents.InvokeOnPreRenderHudEventNoCheck(null, EventArgs.Empty);
-                        if ((Game1.displayHUD || Game1.eventUp) && Game1.currentBillboard == 0 && Game1.gameMode == 3 && !Game1.freezeControls && !Game1.panMode)
+                    }
+                    Game1.spriteBatch.End();
+                    if (Game1.drawLighting)
+                    {
+                        Game1.spriteBatch.Begin(SpriteSortMode.Deferred, new BlendState
                         {
-                            GraphicsEvents.InvokeOnPreRenderHudEvent(null, EventArgs.Empty);
-                            SGame.DrawHUD.Invoke(Program.gamePtr, null);
-                            GraphicsEvents.InvokeOnPostRenderHudEvent(null, EventArgs.Empty);
-                        }
-                        else if (Game1.activeClickableMenu == null && Game1.farmEvent == null)
-                            Game1.spriteBatch.Draw(Game1.mouseCursors, new Vector2(Game1.getOldMouseX(), Game1.getOldMouseY()), Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 0, 16, 16), Color.White, 0f, Vector2.Zero, 4f + Game1.dialogueButtonScale / 150f, SpriteEffects.None, 1f);
-                        GraphicsEvents.InvokeOnPostRenderHudEventNoCheck(null, EventArgs.Empty);
-
-                        if (Game1.hudMessages.Any() && (!Game1.eventUp || Game1.isFestival()))
+                            ColorBlendFunction = BlendFunction.ReverseSubtract,
+                            ColorDestinationBlend = Blend.One,
+                            ColorSourceBlend = Blend.SourceColor
+                        }, SamplerState.LinearClamp, null, null);
+                        Game1.spriteBatch.Draw(Game1.lightmap, Vector2.Zero, Game1.lightmap.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.lightingQuality, SpriteEffects.None, 1f);
+                        if (Game1.isRaining && Game1.currentLocation.isOutdoors && !(Game1.currentLocation is Desert))
                         {
-                            for (int l = Game1.hudMessages.Count - 1; l >= 0; l--)
-                                Game1.hudMessages[l].draw(Game1.spriteBatch, l);
+                            Game1.spriteBatch.Draw(Game1.staminaRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.OrangeRed * 0.45f);
                         }
+                        Game1.spriteBatch.End();
                     }
-                    Game1.farmEvent?.draw(Game1.spriteBatch);
-                    if (Game1.dialogueUp && !Game1.nameSelectUp && !Game1.messagePause && !(Game1.activeClickableMenu is DialogueBox))
-                        SGame.DrawDialogueBox.Invoke(Program.gamePtr, null);
-                    if (Game1.progressBar)
-                    {
-                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle((Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width - Game1.dialogueWidth) / 2, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - Game1.tileSize * 2, Game1.dialogueWidth, Game1.tileSize / 2), Color.LightGray);
-                        Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle((Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width - Game1.dialogueWidth) / 2, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - Game1.tileSize * 2, (int)(Game1.pauseAccumulator / Game1.pauseTime * Game1.dialogueWidth), Game1.tileSize / 2), Color.DimGray);
-                    }
-                    if (Game1.eventUp)
-                        Game1.currentLocation.currentEvent?.drawAfterMap(Game1.spriteBatch);
-                    if (Game1.isRaining && Game1.currentLocation.isOutdoors && !(Game1.currentLocation is Desert))
-                        Game1.spriteBatch.Draw(Game1.staminaRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Blue * 0.2f);
-                    if ((Game1.fadeToBlack || Game1.globalFade) && !Game1.menuUp && (!Game1.nameSelectUp || Game1.messagePause))
-                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * ((Game1.gameMode == 0) ? (1f - Game1.fadeToBlackAlpha) : Game1.fadeToBlackAlpha));
-                    else if (Game1.flashAlpha > 0f)
+                    Game1.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    if (Game1.drawGrid)
                     {
-                        if (Game1.options.screenFlash)
-                            Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.White * Math.Min(1f, Game1.flashAlpha));
-                        Game1.flashAlpha -= 0.1f;
+                        int num2 = -Game1.viewport.X % Game1.tileSize;
+                        float num3 = -(float)Game1.viewport.Y % Game1.tileSize;
+                        for (int k = num2; k < Game1.graphics.GraphicsDevice.Viewport.Width; k += Game1.tileSize)
+                            Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle(k, (int)num3, 1, Game1.graphics.GraphicsDevice.Viewport.Height), Color.Red * 0.5f);
+                        for (float num4 = num3; num4 < (float)Game1.graphics.GraphicsDevice.Viewport.Height; num4 += (float)Game1.tileSize)
+                            Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle(num2, (int)num4, Game1.graphics.GraphicsDevice.Viewport.Width, 1), Color.Red * 0.5f);
                     }
-                    if ((Game1.messagePause || Game1.globalFade) && Game1.dialogueUp)
-                        SGame.DrawDialogueBox.Invoke(Program.gamePtr, null);
-                    foreach (TemporaryAnimatedSprite current8 in Game1.screenOverlayTempSprites)
-                        current8.draw(Game1.spriteBatch, true);
-                    if (Game1.debugMode)
-                    {
-                        Game1.spriteBatch.DrawString(Game1.smallFont, string.Concat(new object[]
-                        {
-                            Game1.panMode ? ((Game1.getOldMouseX() + Game1.viewport.X) / Game1.tileSize + "," + (Game1.getOldMouseY() + Game1.viewport.Y) / Game1.tileSize) : string.Concat("aplayer: ", Game1.player.getStandingX() / Game1.tileSize, ", ", Game1.player.getStandingY() / Game1.tileSize),
-                            Environment.NewLine,
-                            "debugOutput: ",
-                            Game1.debugOutput
-                        }), new Vector2(this.GraphicsDevice.Viewport.TitleSafeArea.X, this.GraphicsDevice.Viewport.TitleSafeArea.Y), Color.Red, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0.9999999f);
-                    }
-                    /*if (inputMode)
-                    {
-                        spriteBatch.DrawString(smallFont, "Input: " + debugInput, new Vector2(tileSize, tileSize * 3), Color.Purple);
-                    }*/
-                    if (Game1.showKeyHelp)
-                        Game1.spriteBatch.DrawString(Game1.smallFont, Game1.keyHelpString, new Vector2(Game1.tileSize, Game1.viewport.Height - Game1.tileSize - (Game1.dialogueUp ? (Game1.tileSize * 3 + (Game1.isQuestion ? (Game1.questionChoices.Count * Game1.tileSize) : 0)) : 0) - Game1.smallFont.MeasureString(Game1.keyHelpString).Y), Color.LightGray, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0.9999999f);
+                    if (Game1.currentBillboard != 0)
+                        this.drawBillboard();
 
-                    GraphicsEvents.InvokeOnPreRenderGuiEventNoCheck(null, EventArgs.Empty);
-                    if (Game1.activeClickableMenu != null)
+                    GraphicsEvents.InvokeOnPreRenderHudEventNoCheck(null, EventArgs.Empty);
+                    if ((Game1.displayHUD || Game1.eventUp) && Game1.currentBillboard == 0 && Game1.gameMode == 3 && !Game1.freezeControls && !Game1.panMode)
                     {
-                        GraphicsEvents.InvokeOnPreRenderGuiEvent(null, EventArgs.Empty);
-                        Game1.activeClickableMenu.draw(Game1.spriteBatch);
-                        GraphicsEvents.InvokeOnPostRenderGuiEvent(null, EventArgs.Empty);
+                        GraphicsEvents.InvokeOnPreRenderHudEvent(null, EventArgs.Empty);
+                        SGame.DrawHUD.Invoke(Program.gamePtr, null);
+                        GraphicsEvents.InvokeOnPostRenderHudEvent(null, EventArgs.Empty);
                     }
-                    else
-                        Game1.farmEvent?.drawAboveEverything(Game1.spriteBatch);
-                    GraphicsEvents.InvokeOnPostRenderGuiEventNoCheck(null, EventArgs.Empty);
-
-                    GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
-                    Game1.spriteBatch.End();
+                    else if (Game1.activeClickableMenu == null && Game1.farmEvent == null)
+                        Game1.spriteBatch.Draw(Game1.mouseCursors, new Vector2(Game1.getOldMouseX(), Game1.getOldMouseY()), Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 0, 16, 16), Color.White, 0f, Vector2.Zero, 4f + Game1.dialogueButtonScale / 150f, SpriteEffects.None, 1f);
+                    GraphicsEvents.InvokeOnPostRenderHudEventNoCheck(null, EventArgs.Empty);
 
-                    GraphicsEvents.InvokeDrawInRenderTargetTick();
-
-                    if (!this.ZoomLevelIsOne)
+                    if (Game1.hudMessages.Any() && (!Game1.eventUp || Game1.isFestival()))
                     {
-                        this.GraphicsDevice.SetRenderTarget(null);
-                        this.GraphicsDevice.Clear(this.BgColour);
-                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.Opaque, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                        Game1.spriteBatch.End();
+                        for (int l = Game1.hudMessages.Count - 1; l >= 0; l--)
+                            Game1.hudMessages[l].draw(Game1.spriteBatch, l);
                     }
-
-                    GraphicsEvents.InvokeDrawTick();
                 }
-                catch (Exception ex)
+                Game1.farmEvent?.draw(Game1.spriteBatch);
+                if (Game1.dialogueUp && !Game1.nameSelectUp && !Game1.messagePause && !(Game1.activeClickableMenu is DialogueBox))
+                    SGame.DrawDialogueBox.Invoke(Program.gamePtr, null);
+                if (Game1.progressBar)
                 {
-                    Log.Error("An error occured in the overridden draw loop: " + ex);
+                    Game1.spriteBatch.Draw(Game1.fadeToBlackRect, new Rectangle((Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width - Game1.dialogueWidth) / 2, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - Game1.tileSize * 2, Game1.dialogueWidth, Game1.tileSize / 2), Color.LightGray);
+                    Game1.spriteBatch.Draw(Game1.staminaRect, new Rectangle((Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Width - Game1.dialogueWidth) / 2, Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - Game1.tileSize * 2, (int)(Game1.pauseAccumulator / Game1.pauseTime * Game1.dialogueWidth), Game1.tileSize / 2), Color.DimGray);
                 }
-            }
-            else
-            {
-                try
+                if (Game1.eventUp)
+                    Game1.currentLocation.currentEvent?.drawAfterMap(Game1.spriteBatch);
+                if (Game1.isRaining && Game1.currentLocation.isOutdoors && !(Game1.currentLocation is Desert))
+                    Game1.spriteBatch.Draw(Game1.staminaRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Blue * 0.2f);
+                if ((Game1.fadeToBlack || Game1.globalFade) && !Game1.menuUp && (!Game1.nameSelectUp || Game1.messagePause))
+                    Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * ((Game1.gameMode == 0) ? (1f - Game1.fadeToBlackAlpha) : Game1.fadeToBlackAlpha));
+                else if (Game1.flashAlpha > 0f)
                 {
-                    base.Draw(gameTime);
+                    if (Game1.options.screenFlash)
+                        Game1.spriteBatch.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.White * Math.Min(1f, Game1.flashAlpha));
+                    Game1.flashAlpha -= 0.1f;
                 }
-                catch (Exception ex)
+                if ((Game1.messagePause || Game1.globalFade) && Game1.dialogueUp)
+                    SGame.DrawDialogueBox.Invoke(Program.gamePtr, null);
+                foreach (TemporaryAnimatedSprite current8 in Game1.screenOverlayTempSprites)
+                    current8.draw(Game1.spriteBatch, true);
+                if (Game1.debugMode)
                 {
-                    Log.AsyncR("An error occured in the base draw loop: " + ex);
-                    Console.ReadKey();
+                    Game1.spriteBatch.DrawString(Game1.smallFont, string.Concat(new object[]
+                    {
+                            Game1.panMode ? ((Game1.getOldMouseX() + Game1.viewport.X) / Game1.tileSize + "," + (Game1.getOldMouseY() + Game1.viewport.Y) / Game1.tileSize) : string.Concat("aplayer: ", Game1.player.getStandingX() / Game1.tileSize, ", ", Game1.player.getStandingY() / Game1.tileSize),
+                            Environment.NewLine,
+                            "debugOutput: ",
+                            Game1.debugOutput
+                    }), new Vector2(this.GraphicsDevice.Viewport.TitleSafeArea.X, this.GraphicsDevice.Viewport.TitleSafeArea.Y), Color.Red, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0.9999999f);
                 }
-
-                GraphicsEvents.InvokeDrawTick();
-
-                if (Constants.EnableDrawingIntoRenderTarget)
+                /*if (inputMode)
                 {
-                    if (!Game1.options.zoomLevel.Equals(1.0f))
-                    {
-                        if (this.Screen.RenderTargetUsage == RenderTargetUsage.DiscardContents)
-                        {
-                            this.Screen = new RenderTarget2D(
-                                Game1.graphics.GraphicsDevice,
-                                Math.Min(4096, (int)(this.Window.ClientBounds.Width * (1.0 / Game1.options.zoomLevel))),
-                                Math.Min(4096, (int)(this.Window.ClientBounds.Height * (1.0 / Game1.options.zoomLevel))),
-                                false,
-                                SurfaceFormat.Color,
-                                DepthFormat.Depth16,
-                                1,
-                                RenderTargetUsage.PreserveContents
-                            );
-                        }
-                        this.GraphicsDevice.SetRenderTarget(this.Screen);
-                    }
-
-                    // Not beginning the batch due to inconsistancies with the standard draw tick...
-                    //spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
+                    spriteBatch.DrawString(smallFont, "Input: " + debugInput, new Vector2(tileSize, tileSize * 3), Color.Purple);
+                }*/
+                if (Game1.showKeyHelp)
+                    Game1.spriteBatch.DrawString(Game1.smallFont, Game1.keyHelpString, new Vector2(Game1.tileSize, Game1.viewport.Height - Game1.tileSize - (Game1.dialogueUp ? (Game1.tileSize * 3 + (Game1.isQuestion ? (Game1.questionChoices.Count * Game1.tileSize) : 0)) : 0) - Game1.smallFont.MeasureString(Game1.keyHelpString).Y), Color.LightGray, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0.9999999f);
 
-                    GraphicsEvents.InvokeDrawInRenderTargetTick();
+                GraphicsEvents.InvokeOnPreRenderGuiEventNoCheck(null, EventArgs.Empty);
+                if (Game1.activeClickableMenu != null)
+                {
+                    GraphicsEvents.InvokeOnPreRenderGuiEvent(null, EventArgs.Empty);
+                    Game1.activeClickableMenu.draw(Game1.spriteBatch);
+                    GraphicsEvents.InvokeOnPostRenderGuiEvent(null, EventArgs.Empty);
+                }
+                else
+                    Game1.farmEvent?.drawAboveEverything(Game1.spriteBatch);
+                GraphicsEvents.InvokeOnPostRenderGuiEventNoCheck(null, EventArgs.Empty);
 
-                    //spriteBatch.End();
+                GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
+                Game1.spriteBatch.End();
 
-                    //Re-draw the HUD
-                    Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, SamplerState.PointClamp, null, null);
-                    Game1.activeClickableMenu?.draw(Game1.spriteBatch);
-                    /*
-                if ((displayHUD || eventUp) && currentBillboard == 0 && gameMode == 3 && !freezeControls && !panMode)
-                    typeof (Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance)?.Invoke(Program.gamePtr, null);
-                */
-                    Game1.spriteBatch.Draw(Game1.mouseCursors, new Vector2(Game1.getOldMouseX(), Game1.getOldMouseY()), Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, Game1.options.gamepadControls ? 44 : 0, 16, 16), Color.White, 0.0f, Vector2.Zero, Game1.pixelZoom + Game1.dialogueButtonScale / 150f, SpriteEffects.None, 1f);
+                GraphicsEvents.InvokeDrawInRenderTargetTick();
 
+                if (!this.ZoomLevelIsOne)
+                {
+                    this.GraphicsDevice.SetRenderTarget(null);
+                    this.GraphicsDevice.Clear(this.BgColour);
+                    Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.Opaque, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
+                    Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
                     Game1.spriteBatch.End();
-
-                    if (!Game1.options.zoomLevel.Equals(1.0f))
-                    {
-                        this.GraphicsDevice.SetRenderTarget(null);
-                        Game1.spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.Opaque, SamplerState.LinearClamp, DepthStencilState.Default, RasterizerState.CullNone);
-                        Game1.spriteBatch.Draw(this.Screen, Vector2.Zero, this.Screen.Bounds, Color.White, 0.0f, Vector2.Zero, Game1.options.zoomLevel, SpriteEffects.None, 1f);
-                        Game1.spriteBatch.End();
-                    }
                 }
+
+                GraphicsEvents.InvokeDrawTick();
+            }
+            catch (Exception ex)
+            {
+                Log.Error("An error occured in the overridden draw loop: " + ex);
             }
 
             if (SGame.Debug)