Date (#1)

* yy

* fixed invisible menus

Author: RealSweetPanda

Framework/NewSaveGameMenuV2.cs

@@ -36,9 +36,10 @@ public NewSaveGameMenuV2() {
 
         public event EventHandler SaveComplete;
 
-        public virtual void receiveRightClick(int x, int y, bool playSound = true) { }
+        public override void receiveRightClick(int x, int y, bool playSound = true) { }
 
         public void complete() {
+            Game1.dayOfMonth = Game1.dayOfMonth - 1;
             Game1.playSound("money");
             completePause = 1500;
             loader = null;
@@ -49,11 +50,11 @@ public void complete() {
             SaveComplete(this, EventArgs.Empty);
         }
 
-        public virtual bool readyToClose() {
+        public override bool readyToClose() {
             return false;
         }
 
-        public virtual void update(GameTime time) {
+        public override void update(GameTime time) {
             if (quit) {
                 if (!Game1.activeClickableMenu.Equals(this) || !Game1.PollForEndOfNewDaySync())
                     return;
@@ -92,13 +93,17 @@ public virtual void update(GameTime time) {
                                     if (Game1.newDaySync.readyForSave()) {
                                         multiplayer.saveFarmhands();
                                         Game1.game1.IsSaving = true;
+                                        Game1.dayOfMonth = Game1.dayOfMonth + 2;
                                         loader = SaveGame.Save();
+                                        
                                     }
                                 }
                                 else {
                                     multiplayer.saveFarmhands();
                                     Game1.game1.IsSaving = true;
+                                    Game1.dayOfMonth = Game1.dayOfMonth + 2;
                                     loader = SaveGame.Save();
+                                    Game1.dayOfMonth = Game1.dayOfMonth - 1;
                                 }
                             }
                             else {
@@ -154,7 +159,7 @@ public static void saveClientOptions() {
             startupPreferences.savePreferences(false);
         }
 
-        public virtual void draw(SpriteBatch b) {
+        public override void draw(SpriteBatch b) {
             base.draw(b);
             var vector2 = Utility.makeSafe(new Vector2(64f, Game1.viewport.Height - 64), new Vector2(64f, 64f));
             var flag = false;

Framework/NewShippingMenuV2.cs

@@ -3,6 +3,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using StardewModdingAPI;
 using StardewValley;
 using StardewValley.BellsAndWhistles;
 using StardewValley.Menus;
@@ -151,14 +152,14 @@ public void RepositionItems() {
             currentTab = Utility.Clamp(currentTab, 0, (categoryItems[currentPage].Count - 1) / itemsPerCategoryPage);
         }
 
-        protected virtual void customSnapBehavior(int direction, int oldRegion, int oldID) {
+        protected override void customSnapBehavior(int direction, int oldRegion, int oldID) {
             if (oldID != 103 || direction != 1 || !showForwardButton())
                 return;
             currentlySnappedComponent = getComponentWithID(102);
             snapCursorToCurrentSnappedComponent();
         }
 
-        public virtual void snapToDefaultClickableComponent() {
+        public override void snapToDefaultClickableComponent() {
             if (currentPage != -1)
                 currentlySnappedComponent = getComponentWithID(103);
             else
@@ -256,7 +257,7 @@ public string getCategoryName(int index) {
             }
         }
 
-        public virtual void update(GameTime time) {
+        public override void update(GameTime time) {
             base.update(time);
             if (_hasFinished) {
                 shipItems();
@@ -451,13 +452,13 @@ public string getCategorySound(int which) {
             }
         }
 
-        public virtual void applyMovementKey(int direction) {
+        public override void applyMovementKey(int direction) {
             if (!CanReceiveInput())
                 return;
             base.applyMovementKey(direction);
         }
 
-        public virtual void performHoverAction(int x, int y) {
+        public override void performHoverAction(int x, int y) {
             if (!CanReceiveInput())
                 return;
             base.performHoverAction(x, y);
@@ -476,7 +477,7 @@ public bool CanReceiveInput() {
             return introTimer <= 0 && !outro;
         }
 
-        public virtual void receiveKeyPress(Keys key) {
+        public override void receiveKeyPress(Keys key) {
             if (!CanReceiveInput())
                 return;
             if (introTimer <= 0 && !Game1.options.gamepadControls && (key.Equals((Keys) 27) ||
@@ -492,7 +493,7 @@ public virtual void receiveKeyPress(Keys key) {
             }
         }
 
-        public virtual void receiveGamePadButton(Buttons b) {
+        public override void receiveGamePadButton(Buttons b) {
             if (!CanReceiveInput())
                 return;
             base.receiveGamePadButton(b);
@@ -528,7 +529,7 @@ private void okClicked() {
             Game1.changeMusicTrack("none");
         }
 
-        public virtual void receiveLeftClick(int x, int y, bool playSound = true) {
+        public override void receiveLeftClick(int x, int y, bool playSound = true) {
             if (!CanReceiveInput())
                 return;
             if (outro && !savedYet) {
@@ -593,18 +594,20 @@ public virtual void receiveLeftClick(int x, int y, bool playSound = true) {
             }
         }
 
-        public virtual void receiveRightClick(int x, int y, bool playSound = true) { }
+        public override void receiveRightClick(int x, int y, bool playSound = true) { }
 
         public bool showForwardButton() {
             return categoryItems[currentPage].Count > itemsPerCategoryPage * (currentTab + 1);
         }
 
-        public virtual void gameWindowSizeChanged(Rectangle oldBounds, Rectangle newBounds) {
+        public override void gameWindowSizeChanged(Rectangle oldBounds, Rectangle newBounds) {
             initialize(0, 0, Game1.viewport.Width, Game1.viewport.Height);
             RepositionItems();
         }
 
-        public virtual void draw(SpriteBatch b) {
+        public override void draw(SpriteBatch b)
+        {
+            SaveAnywhere.ModMonitor.Log("Test",LogLevel.Debug);
             if (Game1.wasRainingYesterday) {
                 b.Draw(Game1.mouseCursors, new Rectangle(0, 0, Game1.viewport.Width, Game1.viewport.Height),
                     new Rectangle(639, 858, 1, 184),

Framework/SaveManager.cs

@@ -100,6 +100,7 @@ public void LoadData() {
                 return;
             Game1.timeOfDay = data.Time;
             ResumeSwimming(data);
+            Game1.dayOfMonth = Game1.dayOfMonth - 1;
             SetPositions(data.Characters);
             var onLoaded = OnLoaded;
             if (onLoaded != null)

SaveAnywhere.cs

@@ -105,7 +105,6 @@ private void OnDayStarted(object sender, DayStartedEventArgs e) {
             else if (firstLoad) {
                 SaveManager.ClearData();
             }
-
             ShouldResetSchedules = true;
         }
 
@@ -119,6 +118,7 @@ private void OnButtonPressed(object sender, ButtonPressedEventArgs e) {
                 else {
                     IsCustomSaving = true;
                     SaveManager.BeginSaveData();
+
                 }
             }
             else {