Finished Adjustable lights and started work on making menu compatability patches for gamepads. Also the farm swapper seems to be broken at the moment. Pitty.

Revitalize/Revitalize/Revitalize/Class1.cs

@@ -27,6 +27,8 @@ using Revitalize.Persistance;
 using Revitalize.Draw;
 using Revitalize.Aesthetics;
 using Revitalize.Aesthetics.WeatherDebris;
+using System.Reflection;
+using StardewValley.Menus;
 
 namespace Revitalize
 {
@@ -43,6 +45,8 @@ namespace Revitalize
     {
         public static string key_binding="P";
         public static string key_binding2 = "E";
+        public static string key_binding3 = "F";
+      public static  bool useMenuFocus;
         public static string path;
         const int range = 1;
 
@@ -58,6 +62,7 @@ namespace Revitalize
       public static  bool hasLoadedTerrainList;
         List<GameLoc> newLoc;
 
+        public static Menus.Compatability.CompatInterface compatabilityMenu;
 
       public static  bool gameLoaded;
 
@@ -81,7 +86,9 @@ namespace Revitalize
             StardewModdingAPI.Events.GraphicsEvents.OnPreRenderHudEvent += GraphicsEvents_OnPreRenderHudEvent;
 
             StardewModdingAPI.Events.GraphicsEvents.OnPostRenderHudEvent += draw;
-            
+
+            StardewModdingAPI.Events.GameEvents.UpdateTick += MenuCompatability;
+            StardewModdingAPI.Events.GraphicsEvents.Resize += GraphicsEvents_Resize;
 
             //StardewModdingAPI.Events.TimeEvents.DayOfMonthChanged += Util.WaterAllCropsInAllLocations;
             hasLoadedTerrainList = false;
@@ -91,6 +98,54 @@ namespace Revitalize
 
             PlayerVariables.initializePlayerVariables();
             Log.AsyncG("Revitalize: Running on API Version: " +StardewModdingAPI.Constants.ApiVersion);
+            compatabilityMenu = null;
+            useMenuFocus = true;
+            
+        }
+
+        private void GraphicsEvents_Resize(object sender, EventArgs e)
+        {
+            if (compatabilityMenu != null)
+            {
+                compatabilityMenu.resize();
+            }
+        }
+
+        private void MenuCompatability(object sender, EventArgs e)
+        {
+            if (Game1.options.gamepadControls == false && useMenuFocus==false) return;
+            if (compatabilityMenu != null)
+            {
+                compatabilityMenu.Compatability();
+                compatabilityMenu.Update();
+                return;
+            }
+            if (Game1.activeClickableMenu is StardewValley.Menus.TitleMenu && Revitalize.Menus.Compatability.CompatabilityManager.characterCustomizer==false)
+            {
+              if(compatabilityMenu==null)  compatabilityMenu = new Menus.Compatability.Vanilla.TitleMenu();
+             
+                
+            }
+            if (Game1.activeClickableMenu is StardewValley.Menus.TitleMenu && Revitalize.Menus.Compatability.CompatabilityManager.characterCustomizer == true)
+            {
+               // compatabilityMenu = new Menus.Compatability.Vanilla.TitleMenu();
+              //  compatabilityMenu.Compatability();
+            }
+            if (Game1.activeClickableMenu is StardewValley.Menus.TitleMenu && Revitalize.Menus.Compatability.CompatabilityManager.loadMenu == true)
+            {
+                // compatabilityMenu = new Menus.Compatability.Vanilla.TitleMenu();
+                //  compatabilityMenu.Compatability();
+            }
+            if (Game1.activeClickableMenu is StardewValley.Menus.TitleMenu && Revitalize.Menus.Compatability.CompatabilityManager.aboutMenu == true)
+            {
+                // compatabilityMenu = new Menus.Compatability.Vanilla.TitleMenu();
+                //  compatabilityMenu.Compatability();
+            }
+            else
+            {
+               // compatabilityMenu = null;
+            }
+            
         }
 
         private void draw(object sender, EventArgs e)
@@ -140,7 +195,6 @@ namespace Revitalize
                 Util.WaterAllCropsInAllLocations();
             }
             WeatherDebrisSystem.update();
-
         }
    
 
@@ -275,7 +329,7 @@ namespace Revitalize
             {
                // System.Threading.Thread.Sleep(1);
                
-                   Game1.activeClickableMenu = new GameMenu();
+                   Game1.activeClickableMenu = new  Revitalize.Menus.GameMenu();
             }
             gametick = false;
             
@@ -284,7 +338,7 @@ namespace Revitalize
 
         private void ShopCall(object sender, StardewModdingAPI.Events.EventArgsKeyPressed e)
         {
-            Game1.currentSeason = "spring";
+           // Game1.currentSeason = "spring";
             Game1.player.money = 9999;
           //  Log.AsyncG(Game1.tileSize);
 

Revitalize/Revitalize/Revitalize/Menus/Compatability/CompatInterface.cs

@@ -0,0 +1,32 @@
+using Microsoft.Xna.Framework;
+using StardewValley.Menus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Revitalize.Menus.Compatability
+{
+  public  interface CompatInterface
+    {
+
+       Dictionary<Point,Rectangle> ComponentList
+        {
+            get;
+            set;
+        }
+
+    void Compatability();
+        void Update();
+        void moveLeft();
+        void moveRight();
+        void moveUp();
+        void moveDown();
+        void resize();
+     //   void updateMouse(Point p);
+       // Point getComponentCenter(Rectangle r);
+
+    }
+
+}

Revitalize/Revitalize/Revitalize/Menus/Compatability/CompatabilityManager.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Revitalize.Menus.Compatability
+{
+    class CompatabilityManager
+    {
+        public static bool characterCustomizer;
+        public static bool loadMenu;
+        public static bool aboutMenu;
+    }
+}

Revitalize/Revitalize/Revitalize/Menus/Compatability/MenuCompatabilityBase.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Xna.Framework;
+using StardewValley;
+using System.Timers;
+using StardewModdingAPI;
+
+namespace Revitalize.Menus.Compatability
+{
+    class MenuCompatabilityBase : Revitalize.Menus.Compatability.CompatInterface
+    {
+
+        public static Point startingPositionIndex = new Point(0, 1);
+        public static Point CurrentLocationIndex;
+        public Dictionary<Point, Rectangle> componentList;
+        public int width;
+        public int height;
+
+        public int maxX;
+        public int minX;
+        public int maxY;
+        public int minY;
+
+
+        public static int millisecondMoveDelay;
+        public static System.Timers.Timer movementTimer;
+        public static bool canMoveInMenu;
+
+        public static void activateTimer() { 
+             SetTimer();        
+   }
+
+    private static void SetTimer()
+    {
+        
+            // Create a timer with a two second interval.
+            if (canMoveInMenu == true)
+            {
+                movementTimer = new System.Timers.Timer(millisecondMoveDelay);
+                // Hook up the Elapsed event for the timer. 
+                movementTimer.Elapsed += OnTimedEvent;
+                movementTimer.AutoReset = false;
+                movementTimer.Enabled = true;
+                canMoveInMenu = false;
+            }
+            else
+            {
+                return;
+            }
+    }
+
+    private static void OnTimedEvent(System.Object source, ElapsedEventArgs e)
+    {
+            movementTimer.Enabled = false;
+           // movementTimer.Dispose();
+            canMoveInMenu = true;
+    }
+
+    public Dictionary<Point, Rectangle> ComponentList
+        {
+            get
+            {
+                return this.componentList;
+                //  throw new NotImplementedException();
+                //  return this.componentList;
+            }
+
+            set
+            {
+                // throw new NotImplementedException();
+            }
+        }
+
+        public virtual void Compatability()
+        {
+           // throw new NotImplementedException();
+        }
+
+        
+
+        public virtual void moveLeft()
+        {
+          //  throw new NotImplementedException();
+        }
+
+        public virtual void moveRight()
+        {
+            //throw new NotImplementedException();
+        }
+
+        public virtual void Update()
+        {
+           // throw new NotImplementedException();
+        }
+
+        public virtual void updateMouse(Point p)
+        {
+            
+            if (p.X == 0 && p.Y == 0) p = startingPositionIndex;
+                Game1.setMousePosition(p);
+            
+        }
+
+        public virtual Point getComponentCenter(Rectangle r)
+        {
+            // throw new NotImplementedException();
+            return new Point(r.X + r.Width / 2, r.Y + r.Height / 2);
+        }
+
+        public virtual void moveUp()
+        {
+          //  throw new NotImplementedException();
+        }
+
+        public virtual void moveDown()
+        {
+           // throw new NotImplementedException();
+        }
+
+        public virtual void resize()
+        {
+            
+        }
+    }
+}

Revitalize/Revitalize/Revitalize/Menus/Compatability/Vanilla/TitleMenu.cs

@@ -0,0 +1,222 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
+using StardewModdingAPI;
+using StardewValley;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using StardewValley.Menus;
+
+namespace Revitalize.Menus.Compatability.Vanilla
+{
+    class TitleMenu:Revitalize.Menus.Compatability.MenuCompatabilityBase
+    {
+        public TitleMenu()
+        {
+            minY = 1;
+            maxY = 2;
+            minX = 1;
+            maxX = 5;
+            canMoveInMenu = true;
+            this.width = Game1.viewport.Width;
+            this.height = Game1.viewport.Height;
+
+            componentList = new Dictionary<Point, Rectangle>();
+
+            CurrentLocationIndex =startingPositionIndex= new Point(2, 2);
+
+            
+           
+            componentList.Add(new Point(2, 2), new Rectangle(width / 2 - 333 - 48, height - 174 - 24, 222, 174));//play
+            componentList.Add(new Point(3, 2), new Rectangle(this.width / 2 - 111 - 24, this.height - 174 - 24, 222, 174));//load
+            componentList.Add(new Point(4, 2), new Rectangle(this.width / 2 + 111, this.height - 174 - 24, 222, 174));//exit
+            componentList.Add(new Point(5, 2), new Rectangle(this.width + -66 - 48, this.height - 75 - 24, 66, 75)); //about
+            //int end = componentList.Count+1;
+            
+            //full screen button
+            for (int i = 4; i <= 5; i++)
+            {
+                componentList.Add(new Point(i, 1), new Rectangle(Game1.viewport.Width - 9 * Game1.pixelZoom - Game1.tileSize / 4, Game1.tileSize / 4, 9 * Game1.pixelZoom, 9 * Game1.pixelZoom));
+            }
+            //MUTE BUTTON
+            componentList.Add(new Point(1, 1),new Rectangle(Game1.tileSize / 4, Game1.tileSize / 4, 9 * Game1.pixelZoom, 9 * Game1.pixelZoom));
+            componentList.Add(new Point(2, 1), new Rectangle(Game1.tileSize / 4, Game1.tileSize / 4, 9 * Game1.pixelZoom, 9 * Game1.pixelZoom));
+            componentList.Add(new Point(3, 1), new Rectangle(Game1.tileSize / 4, Game1.tileSize / 4, 9 * Game1.pixelZoom, 9 * Game1.pixelZoom));
+            //add in menu secrets here
+
+
+            CompatabilityManager.characterCustomizer = false;
+            Menus.Compatability.MenuCompatabilityBase.millisecondMoveDelay = 100;
+            //Log.AsyncC("WTF");
+        }
+
+
+        public override void Compatability()
+        {
+            // Get the current gamepad state.
+            GamePadState currentState = GamePad.GetState(PlayerIndex.One);
+
+//            Log.AsyncG("DOES THIS WORK???");
+
+            if ((double)currentState.ThumbSticks.Left.X < 0 || currentState.IsButtonDown(Buttons.LeftThumbstickLeft))
+            {
+               // Log.AsyncC(currentState.ThumbSticks.Left);
+                moveLeft();
+            }
+            if ((double)currentState.ThumbSticks.Left.X > 0 || currentState.IsButtonDown(Buttons.LeftThumbstickRight))
+            {
+               // Log.AsyncC(currentState.ThumbSticks.Left);
+                moveRight();
+            }
+
+            if ((double)currentState.ThumbSticks.Left.Y < 0 || currentState.IsButtonDown(Buttons.LeftThumbstickRight))
+            {
+                // Log.AsyncC(currentState.ThumbSticks.Left);
+                moveDown();
+            }
+
+            if ((double)currentState.ThumbSticks.Left.Y > 0 || currentState.IsButtonDown(Buttons.LeftThumbstickRight))
+            {
+                // Log.AsyncC(currentState.ThumbSticks.Left);
+                moveUp();
+            }
+
+
+
+
+            Update();
+        }
+
+     
+        //same code as movement but no change
+        public override void Update()
+        {
+          
+            GamePadState currentState = GamePad.GetState(PlayerIndex.One);
+            if (currentState.Buttons.A ==ButtonState.Pressed && CurrentLocationIndex.X==2 && CurrentLocationIndex.Y==2)
+            {
+               
+                Class1.compatabilityMenu = null;
+                CompatabilityManager.characterCustomizer = true;
+
+               // Log.AsyncC("A pressed");
+                return;
+            }
+
+            if (currentState.Buttons.A == ButtonState.Pressed && CurrentLocationIndex.X == 3 && CurrentLocationIndex.Y == 2)
+            {
+
+                Class1.compatabilityMenu = null;
+                CompatabilityManager.loadMenu = true;
+
+                // Log.AsyncC("A pressed");
+                return;
+            }
+
+            if (currentState.Buttons.A == ButtonState.Pressed && CurrentLocationIndex.X == 5 && CurrentLocationIndex.Y == 2)
+            {
+
+                Class1.compatabilityMenu = null;
+                CompatabilityManager.aboutMenu = true;
+
+                // Log.AsyncC("A pressed");
+                return;
+            }
+
+            Rectangle p;
+          
+
+            componentList.TryGetValue(CurrentLocationIndex, out p);
+            
+            
+            updateMouse(getComponentCenter(p));
+        }
+
+        public override void moveLeft()
+        {
+            if (canMoveInMenu == false) return;
+            activateTimer();
+            CurrentLocationIndex.X--;
+
+            Rectangle p;
+            if (CurrentLocationIndex.X <= minX)
+            {
+                CurrentLocationIndex.X = minX;
+            }
+            //  Log.AsyncC("CRY");
+            componentList.TryGetValue(CurrentLocationIndex, out p);
+
+
+
+            updateMouse(getComponentCenter(p));
+
+        }
+        public override void moveRight()
+        {
+           
+            if (canMoveInMenu == false) return;
+            activateTimer();
+            CurrentLocationIndex.X++;
+           
+            Rectangle p;
+
+            if (CurrentLocationIndex.X >= maxX)
+            {
+                CurrentLocationIndex.X = maxX;
+            }
+
+       
+
+          //  Log.AsyncC("CRY");
+            componentList.TryGetValue(CurrentLocationIndex, out p);
+            updateMouse(getComponentCenter(p));
+
+
+        }
+
+        public override void moveDown()
+        {
+            if (canMoveInMenu == false) return;
+            activateTimer();
+            CurrentLocationIndex.Y++;
+
+            Rectangle p;
+            if (CurrentLocationIndex.Y > maxY)
+            {
+                CurrentLocationIndex.Y = maxY;
+            }
+            //  Log.AsyncC("CRY");
+            componentList.TryGetValue(CurrentLocationIndex, out p);
+
+
+            updateMouse(getComponentCenter(p));
+        }
+
+        public override void moveUp()
+        {
+            if (canMoveInMenu == false) return;
+            activateTimer();
+            CurrentLocationIndex.Y--;
+
+            Rectangle p;
+
+            //  Log.AsyncC("CRY");
+         componentList.TryGetValue(CurrentLocationIndex, out p);
+
+            if (CurrentLocationIndex.Y < minY)
+            {
+                CurrentLocationIndex.Y = minY;
+            }
+
+            updateMouse(getComponentCenter(p));
+        }
+
+        public override void resize()
+        {
+            Class1.compatabilityMenu = new TitleMenu();
+        }
+
+    }
+}

Revitalize/Revitalize/Revitalize/Menus/FarmOptionsMenu.cs

@@ -270,15 +270,18 @@ namespace Revitalize.Menus
                             {
                                 if (c.name == "Farm")
                                 {
-
-                            Util.removeAllWaterTilesFromMap(c);
-                            c.map = v.map;
+                         
+                                Util.removeAllWaterTilesFromMap(c);
+                            
+                          
+                                c.map = v.map;
                                     whichFarm = count;
                                     Log.AsyncG("MAP SWAP!");
                          Class1.persistentMapSwap.mapPath= Path.Combine(Game1.content.RootDirectory,"Maps","Farms", v.clicky.name,v.clicky.name);
                             Log.AsyncG(Class1.persistentMapSwap.mapPath);
                             Serialize.serializeMapSwapData(Class1.persistentMapSwap);
-                                }
+                            Util.removeAllWaterTilesFromMap(c);
+                        }
                             }
                         }
 

Revitalize/Revitalize/Revitalize/Menus/LightCustomizer.cs

@@ -94,6 +94,7 @@ namespace Revitalize.Menus
 			Game1.player.FarmerSprite.StopAnimation();
             this.LightObject = Obj;
             colorChanged = false;
+            this.height = this.height / 3;
 		}
 
 		public override void gameWindowSizeChanged(Rectangle oldBounds, Rectangle newBounds)
@@ -111,9 +112,9 @@ namespace Revitalize.Menus
 
 			this.leftSelectionButtons.Clear();
 			this.rightSelectionButtons.Clear();
-			this.okButton = new ClickableTextureComponent("OK", new Rectangle(this.xPositionOnScreen + this.width - IClickableMenu.borderWidth - IClickableMenu.spaceToClearSideBorder - Game1.tileSize, this.yPositionOnScreen + this.height - IClickableMenu.borderWidth - IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 4, Game1.tileSize, Game1.tileSize), null, null, Game1.mouseCursors, Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 46, -1, -1), 1f, false);
-
-            this.cancelButton = new ClickableTextureComponent("Cancel", new Rectangle(this.xPositionOnScreen +this.width/4  - IClickableMenu.borderWidth - IClickableMenu.spaceToClearSideBorder - Game1.tileSize, this.yPositionOnScreen + this.height - IClickableMenu.borderWidth - IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 4, Game1.tileSize, Game1.tileSize), null, null, Game1.mouseCursors, Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 47, -1, -1), 1f, false);
+			this.okButton = new ClickableTextureComponent("OK", new Rectangle(this.xPositionOnScreen + this.width - IClickableMenu.borderWidth - IClickableMenu.spaceToClearSideBorder - Game1.tileSize, (this.yPositionOnScreen + this.height - IClickableMenu.borderWidth - IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 4)/3, Game1.tileSize, Game1.tileSize), null, null, Game1.mouseCursors, Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 46, -1, -1), 1f, false);
+            
+            this.cancelButton = new ClickableTextureComponent("Cancel", new Rectangle(this.xPositionOnScreen +this.width/4  - IClickableMenu.borderWidth - IClickableMenu.spaceToClearSideBorder - Game1.tileSize, (this.yPositionOnScreen + this.height - IClickableMenu.borderWidth - IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 4)/3, Game1.tileSize, Game1.tileSize), null, null, Game1.mouseCursors, Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, 47, -1, -1), 1f, false);
             /*
             this.nameBox = new TextBox(Game1.content.Load<Texture2D>("LooseSprites\\textBox"), null, Game1.smallFont, Game1.textColor)
 			{
@@ -271,7 +272,7 @@ namespace Revitalize.Menus
                 
                 //UTIL FUNCTION TO GET CORRECT COLOR
                 LightObject.lightColor = this.lightColorPicker.getSelectedColor();
-                LightObject.lightColor = Util.invertColor(LightObject.lightColor);
+                //LightObject.lightColor = Util.invertColor(LightObject.lightColor);
 
                 this.LightObject.removeLights(this.LightObject.thisLocation);
                 this.LightObject.addLights(this.LightObject.thisLocation,this.LightObject.lightColor);
@@ -451,8 +452,9 @@ namespace Revitalize.Menus
             //}
             else if (this.lightColorPicker.containsPoint(x, y))
 			{
-               
-               LightObject.lightColor =this.lightColorPicker.click(x, y);
+
+                LightObject.lightColor = this.lightColorPicker.click(x, y);
+                LightObject.lightColor = Util.invertColor(LightObject.lightColor);
                // LightObject.lightColor = Util.invertColor(LightObject.lightColor);
                 this.lastHeldColorPicker = this.lightColorPicker;
                 colorChanged = true;
@@ -617,8 +619,10 @@ namespace Revitalize.Menus
                // c2 = Util.invertColor(c2);
                 colorChanged = true;
                 this.lightColorPicker.setColor(c2);
-                this.LightObject.lightColor = c2;
-               // LightObject.lightColor = Util.invertColor(LightObject.lightColor);
+                this.LightObject.lightColor =Util.invertColor( c2);
+                this.LightObject.removeLights(this.LightObject.thisLocation);
+                this.LightObject.addLights(this.LightObject.thisLocation, this.LightObject.lightColor);
+                // LightObject.lightColor = Util.invertColor(LightObject.lightColor);
                 //this.eyeColorPicker.setColor(Game1.player.newEyeColor);
                 //this.hairColorPicker.setColor(Game1.player.hairstyleColor);
             }
@@ -635,8 +639,11 @@ namespace Revitalize.Menus
 					if (this.lastHeldColorPicker.Equals(this.lightColorPicker))
 					{
                         colorChanged = true;
-                        this.LightObject.lightColor=this.lightColorPicker.clickHeld(x, y);
-                     //   LightObject.lightColor = Util.invertColor(LightObject.lightColor);
+                        this.LightObject.lightColor=Util.invertColor(this.lightColorPicker.clickHeld(x, y));
+                        this.LightObject.removeLights(this.LightObject.thisLocation);
+                        this.LightObject.addLights(this.LightObject.thisLocation, this.LightObject.lightColor);
+
+                        //   LightObject.lightColor = Util.invertColor(LightObject.lightColor);
                     }
 				}
 				this.colorPickerTimer = 100;
@@ -805,8 +812,8 @@ namespace Revitalize.Menus
 		public override void draw(SpriteBatch b)
 		{
 			Game1.drawDialogueBox(this.xPositionOnScreen, this.yPositionOnScreen, this.width, this.height, false, true, null, false);
-			b.Draw(Game1.daybg, new Vector2((float)(this.xPositionOnScreen + Game1.tileSize + Game1.tileSize * 2 / 3 - 2), (float)(this.yPositionOnScreen + IClickableMenu.borderWidth + IClickableMenu.spaceToClearTopBorder - Game1.tileSize / 4)), Color.White);
-			Game1.player.FarmerRenderer.draw(b, Game1.player.FarmerSprite.CurrentAnimationFrame, Game1.player.FarmerSprite.CurrentFrame, Game1.player.FarmerSprite.SourceRect, new Vector2((float)(this.xPositionOnScreen - 2 + Game1.tileSize * 2 / 3 + Game1.tileSize * 2 - Game1.tileSize / 2), (float)(this.yPositionOnScreen + IClickableMenu.borderWidth - Game1.tileSize / 4 + IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 2)), Vector2.Zero, 0.8f, Color.White, 0f, 1f, Game1.player);
+			//b.Draw(Game1.daybg, new Vector2((float)(this.xPositionOnScreen + Game1.tileSize + Game1.tileSize * 2 / 3 - 2), (float)(this.yPositionOnScreen + IClickableMenu.borderWidth + IClickableMenu.spaceToClearTopBorder - Game1.tileSize / 4)), Color.White);
+			//Game1.player.FarmerRenderer.draw(b, Game1.player.FarmerSprite.CurrentAnimationFrame, Game1.player.FarmerSprite.CurrentFrame, Game1.player.FarmerSprite.SourceRect, new Vector2((float)(this.xPositionOnScreen - 2 + Game1.tileSize * 2 / 3 + Game1.tileSize * 2 - Game1.tileSize / 2), (float)(this.yPositionOnScreen + IClickableMenu.borderWidth - Game1.tileSize / 4 + IClickableMenu.spaceToClearTopBorder + Game1.tileSize / 2)), Vector2.Zero, 0.8f, Color.White, 0f, 1f, Game1.player);
 			if (!this.wizardSource)
 			{/*
 				using (List<ClickableComponent>.Enumerator enumerator = this.genderButtons.GetEnumerator())
@@ -838,13 +845,7 @@ namespace Revitalize.Menus
 			//	Game1.player.favoriteThing = this.favThingBox.Text;
 				//Game1.player.farmName = this.farmnameBox.Text;
 			}
-			using (List<ClickableComponent>.Enumerator enumerator = this.leftSelectionButtons.GetEnumerator())
-			{
-				while (enumerator.MoveNext())
-				{
-					((ClickableTextureComponent)enumerator.Current).draw(b);
-				}
-			}
+
 			foreach (ClickableComponent current in this.labels)
 			{
 				string text = "";
@@ -902,13 +903,6 @@ namespace Revitalize.Menus
 					Utility.drawTextWithShadow(b, text, Game1.smallFont, new Vector2((float)(current.bounds.X + Game1.tileSize / 3) - Game1.smallFont.MeasureString(text).X / 2f, (float)(current.bounds.Y + Game1.tileSize / 2)), color, 1f, -1f, -1, -1, 1f, 3);
 				}
 			}
-			using (List<ClickableComponent>.Enumerator enumerator = this.rightSelectionButtons.GetEnumerator())
-			{
-				while (enumerator.MoveNext())
-				{
-					((ClickableTextureComponent)enumerator.Current).draw(b);
-				}
-			}
 			if (!this.wizardSource)
 			{/*
 				IClickableMenu.drawTextureBox(b, this.farmTypeButtons[0].bounds.X - Game1.pixelZoom * 4, this.farmTypeButtons[0].bounds.Y - Game1.pixelZoom * 5, 30 * Game1.pixelZoom, 110 * Game1.pixelZoom + Game1.pixelZoom * 9, Color.White);

Revitalize/Revitalize/Revitalize/Revitalize.csproj

@@ -61,6 +61,10 @@
     <Compile Include="Magic\MagicMonitor.cs" />
     <Compile Include="Magic\Spell.cs" />
     <Compile Include="Menus\Billboard.cs" />
+    <Compile Include="Menus\Compatability\CompatabilityManager.cs" />
+    <Compile Include="Menus\Compatability\CompatInterface.cs" />
+    <Compile Include="Menus\Compatability\MenuCompatabilityBase.cs" />
+    <Compile Include="Menus\Compatability\Vanilla\TitleMenu.cs" />
     <Compile Include="Menus\FarmOptionsMenu.cs" />
     <Compile Include="Menus\GameMenu.cs" />
     <Compile Include="Menus\InventoryPage.cs" />
@@ -90,6 +94,7 @@
     <Compile Include="Util.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Menus\Compatability\Modded\" />
     <Folder Include="Persistance\Configs\" />
     <Folder Include="TerrainFeatures\" />
   </ItemGroup>

Revitalize/Revitalize/Revitalize/Util.cs

@@ -838,11 +838,21 @@ namespace Revitalize
 
         public static void removeAllWaterTilesFromMap(GameLocation c)
         {
+            Log.AsyncM(c.map.Layers[0].LayerWidth);
+            Log.AsyncM(c.map.Layers[0].LayerWidth);
             for (int i = 0; i < c.map.Layers[0].LayerWidth; i++)
             {
                 for (int j = 0; j < c.map.Layers[0].LayerHeight; j++)
                 {
-                        c.waterTiles[i, j] = false; 
+                    try
+                    {
+                        Log.AsyncY(i + " " + j);
+                        c.waterTiles[i, j] = false;
+                    }
+                    catch(Exception e)
+                    {
+                        
+                    }
                 }
             }
             Log.AsyncC("Removed All Water Tiles from "+c.name );

Revitalize/RevitalizeProjectDecompiled/Maps/Farms/FarmIcons/OmniFarm.yaml

@@ -0,0 +1,21 @@
+
+xnbData: 
+    target: "w"
+    compressed: true
+    hiDef: true
+    readerData: 
+        - 
+            type: "Microsoft.Xna.Framework.Content.Texture2DReader, Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553"
+            version: 0
+
+
+    numSharedResources: 0
+
+content:  #!Texture2D
+    format: 0
+
+extractedImages: 
+    - 
+        path: ""
+
+

Stardew_Valley_Mods/Museum_Rearrange/Museum_Rearranger/Museum_Rearranger/obj/Debug/Museum_Rearranger.csproj.FileListAbsolute.txt

@@ -1,4 +1,3 @@
-C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\Museum_Rearrange\Museum_Rearranger\Museum_Rearranger\obj\Debug\Museum_Rearranger.csprojResolveAssemblyReference.cache
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\Museum_Rearrange\Museum_Rearranger\Museum_Rearranger\bin\Debug\Museum_Rearranger.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\Museum_Rearrange\Museum_Rearranger\Museum_Rearranger\bin\Debug\Museum_Rearranger.pdb
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\Museum_Rearrange\Museum_Rearranger\Museum_Rearranger\obj\Debug\Museum_Rearranger.dll

Stardew_Valley_Mods/NightOwl/Stardew_NightOwl/Stardew_NightOwl/obj/Debug/Stardew_NightOwl.csproj.FileListAbsolute.txt

@@ -42,6 +42,5 @@ C:\Users\owner\Documents\Visual Studio 2015\Projects\Stardew_Valley_Mod_Folder\S
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\bin\Debug\Stardew_NightOwl.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\bin\Debug\Stardew_NightOwl.pdb
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\bin\Debug\Newtonsoft.Json.dll
-C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\obj\Debug\Stardew_NightOwl.csprojResolveAssemblyReference.cache
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\obj\Debug\Stardew_NightOwl.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\NightOwl\Stardew_NightOwl\Stardew_NightOwl\obj\Debug\Stardew_NightOwl.pdb

Stardew_Valley_Mods/StardewSymphony/StardewSymphony/StardewSymphony/obj/Debug/StardewSymphony.csproj.FileListAbsolute.txt

@@ -4,4 +4,3 @@ C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\StardewSymphony\StardewSymphony\StardewSymphony\bin\Debug\Stardew_Symphony.pdb
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\StardewSymphony\StardewSymphony\StardewSymphony\bin\Debug\Microsoft.Xna.Framework.Xact.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\StardewSymphony\StardewSymphony\StardewSymphony\bin\Debug\Microsoft.Xna.Framework.Xact.xml
-C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\StardewSymphony\StardewSymphony\StardewSymphony\obj\Debug\StardewSymphony.csprojResolveAssemblyReference.cache

Stardew_Valley_Mods/TimeFreeze/TimeFreeze/TimeFreeze/obj/Debug/TimeFreeze.csproj.FileListAbsolute.txt

@@ -1,5 +1,4 @@
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\TimeFreeze\TimeFreeze\TimeFreeze\bin\Debug\TimeFreeze.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\TimeFreeze\TimeFreeze\TimeFreeze\bin\Debug\TimeFreeze.pdb
-C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\TimeFreeze\TimeFreeze\TimeFreeze\obj\Debug\TimeFreeze.csprojResolveAssemblyReference.cache
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\TimeFreeze\TimeFreeze\TimeFreeze\obj\Debug\TimeFreeze.dll
 C:\Users\owner\Documents\Visual Studio 2015\Projects\github\Stardew_Valley_Mods\Stardew_Valley_Mods\TimeFreeze\TimeFreeze\TimeFreeze\obj\Debug\TimeFreeze.pdb