diff options
| -rw-r--r-- | StardewModdingAPI/Config.cs | 4 | ||||
| -rw-r--r-- | StardewModdingAPI/Events/Graphics.cs | 13 | ||||
| -rw-r--r-- | StardewModdingAPI/Inheritance/SGame.cs | 2 | ||||
| -rw-r--r-- | StardewModdingAPI/Logger.cs | 52 |
4 files changed, 46 insertions, 25 deletions
diff --git a/StardewModdingAPI/Config.cs b/StardewModdingAPI/Config.cs index 035d28d7..d978d848 100644 --- a/StardewModdingAPI/Config.cs +++ b/StardewModdingAPI/Config.cs @@ -165,12 +165,12 @@ namespace StardewModdingAPI } /// <summary> - /// Re-reads the json blob on the disk and merges its values with a default config + /// Re-reads the json blob on the disk and merges its values with a default config. /// NOTE: You MUST set your config EQUAL to the return of this method! /// </summary> public static T ReloadConfig<T>(this T baseConfig) where T : Config { - return baseConfig.UpdateConfig<T>(); + return baseConfig.LoadConfig<T>(); } } }
\ No newline at end of file diff --git a/StardewModdingAPI/Events/Graphics.cs b/StardewModdingAPI/Events/Graphics.cs index 79c5b4aa..4e533f92 100644 --- a/StardewModdingAPI/Events/Graphics.cs +++ b/StardewModdingAPI/Events/Graphics.cs @@ -12,8 +12,6 @@ namespace StardewModdingAPI.Events /// </summary>
public static event EventHandler Resize = delegate { };
-
-
/// <summary>
/// Occurs before anything is drawn.
/// </summary>
@@ -87,7 +85,10 @@ namespace StardewModdingAPI.Events OnPostRenderEvent.Invoke(sender, e);
}
-
+ internal static void InvokeResize(object sender, EventArgs e)
+ {
+ Resize.Invoke(sender, e);
+ }
#region To Remove
@@ -116,12 +117,6 @@ namespace StardewModdingAPI.Events DrawInRenderTargetTick.Invoke(null, EventArgs.Empty);
}
- [Obsolete("Should not be used.")]
- public static void InvokeResize(object sender, EventArgs e)
- {
- Resize.Invoke(sender, e);
- }
-
#endregion
}
}
\ No newline at end of file diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs index d6263d73..65711507 100644 --- a/StardewModdingAPI/Inheritance/SGame.cs +++ b/StardewModdingAPI/Inheritance/SGame.cs @@ -1245,6 +1245,8 @@ namespace StardewModdingAPI.Inheritance {
farmEvent?.drawAboveEverything(spriteBatch);
}
+ GraphicsEvents.InvokeDrawTick();
+ GraphicsEvents.InvokeDrawInRenderTargetTick();
GraphicsEvents.InvokeOnPostRenderEvent(null, EventArgs.Empty);
spriteBatch.End();
if (!ZoomLevelIsOne)
diff --git a/StardewModdingAPI/Logger.cs b/StardewModdingAPI/Logger.cs index 35903513..68638cb5 100644 --- a/StardewModdingAPI/Logger.cs +++ b/StardewModdingAPI/Logger.cs @@ -21,19 +21,7 @@ namespace StardewModdingAPI _writer.WriteToLog(li); } - #region Sync Logging - - /// <summary> - /// NOTICE: Sync logging is discouraged. Please use Async instead. - /// </summary> - /// <param name="message">Message to log</param> - /// <param name="colour">Colour of message</param> - public static void SyncColour(object message, ConsoleColor colour) - { - PrintLog(new LogInfo(message?.ToString(), colour)); - } - - #endregion + #region Exception Logging /// <summary> /// Catch unhandled exception from the application @@ -55,6 +43,22 @@ namespace StardewModdingAPI File.WriteAllText(Constants.LogDir + "\\MODDED_ErrorLog.Log_" + Extensions.Random.Next(100000000, 999999999) + ".txt", e.Exception.ToString()); } + #endregion + + #region Sync Logging + + /// <summary> + /// NOTICE: Sync logging is discouraged. Please use Async instead. + /// </summary> + /// <param name="message">Message to log</param> + /// <param name="colour">Colour of message</param> + public static void SyncColour(object message, ConsoleColor colour) + { + PrintLog(new LogInfo(message?.ToString(), colour)); + } + + #endregion + #region Async Logging public static void AsyncColour(object message, ConsoleColor colour) @@ -97,6 +101,26 @@ namespace StardewModdingAPI AsyncColour(message?.ToString(), ConsoleColor.Magenta); } + public static void Error(object message) + { + AsyncR("[ERROR] " + message); + } + + public static void Success(object message) + { + AsyncG("[SUCCESS] " + message); + } + + public static void Info(object message) + { + AsyncY("[INFO] " + message); + } + + public static void Out(object message) + { + Async("[OUT] " + message); + } + #endregion #region ToRemove @@ -157,7 +181,7 @@ namespace StardewModdingAPI } [Obsolete("Parameter 'values' is no longer supported. Format before logging.")] - public static void AsyncR(object message, params object[] values) + public static void Error(object message, params object[] values) { AsyncR(message); } |