From 9503dfb94b432b1e6e268dc415327eec507a70c2 Mon Sep 17 00:00:00 2001 From: Gormogon Date: Sun, 29 May 2016 15:47:53 -0400 Subject: Fix formatting for consistency. --- StardewModdingAPI/Inheritance/Menus/SBobberBar.cs | 4 +-- StardewModdingAPI/Inheritance/Menus/SGameMenu.cs | 4 +-- StardewModdingAPI/Inheritance/SGame.cs | 33 ++++++++++++++--------- 3 files changed, 24 insertions(+), 17 deletions(-) (limited to 'StardewModdingAPI/Inheritance') diff --git a/StardewModdingAPI/Inheritance/Menus/SBobberBar.cs b/StardewModdingAPI/Inheritance/Menus/SBobberBar.cs index ddac33c6..5f410280 100644 --- a/StardewModdingAPI/Inheritance/Menus/SBobberBar.cs +++ b/StardewModdingAPI/Inheritance/Menus/SBobberBar.cs @@ -281,12 +281,12 @@ namespace StardewModdingAPI.Inheritance.Menus public static FieldInfo[] GetPrivateFields() { - return typeof (BobberBar).GetFields(BindingFlags.Instance | BindingFlags.NonPublic); + return typeof(BobberBar).GetFields(BindingFlags.Instance | BindingFlags.NonPublic); } public static FieldInfo GetBaseFieldInfo(string name) { - return typeof (BobberBar).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic); + return typeof(BobberBar).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic); } } } \ No newline at end of file diff --git a/StardewModdingAPI/Inheritance/Menus/SGameMenu.cs b/StardewModdingAPI/Inheritance/Menus/SGameMenu.cs index f45758f7..7264faac 100644 --- a/StardewModdingAPI/Inheritance/Menus/SGameMenu.cs +++ b/StardewModdingAPI/Inheritance/Menus/SGameMenu.cs @@ -38,12 +38,12 @@ namespace StardewModdingAPI.Inheritance.Menus public static FieldInfo[] GetPrivateFields() { - return typeof (GameMenu).GetFields(BindingFlags.Instance | BindingFlags.NonPublic); + return typeof(GameMenu).GetFields(BindingFlags.Instance | BindingFlags.NonPublic); } public static FieldInfo GetBaseFieldInfo(string name) { - return typeof (GameMenu).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic); + return typeof(GameMenu).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic); } } } \ No newline at end of file diff --git a/StardewModdingAPI/Inheritance/SGame.cs b/StardewModdingAPI/Inheritance/SGame.cs index b0cff241..5597e463 100644 --- a/StardewModdingAPI/Inheritance/SGame.cs +++ b/StardewModdingAPI/Inheritance/SGame.cs @@ -52,6 +52,7 @@ namespace StardewModdingAPI.Inheritance /// The current KeyboardState /// public KeyboardState KStateNow { get; private set; } + /// /// The prior KeyboardState /// @@ -111,22 +112,27 @@ namespace StardewModdingAPI.Inheritance /// The player's Combat level on the prior frame /// public int PreviousCombatLevel { get; private set; } + /// /// The player's Farming level on the prior frame /// public int PreviousFarmingLevel { get; private set; } + /// /// The player's Fishing level on the prior frame /// public int PreviousFishingLevel { get; private set; } + /// /// The player's Foraging level on the prior frame /// public int PreviousForagingLevel { get; private set; } + /// /// The player's Mining level on the prior frame /// public int PreviousMiningLevel { get; private set; } + /// /// The player's Luck level on the prior frame /// @@ -199,8 +205,8 @@ namespace StardewModdingAPI.Inheritance /// public RenderTarget2D Screen { - get { return typeof (Game1).GetBaseFieldValue(Program.gamePtr, "screen"); } - set { typeof (Game1).SetBaseFieldValue(this, "screen", value); } + get { return typeof(Game1).GetBaseFieldValue(Program.gamePtr, "screen"); } + set { typeof(Game1).SetBaseFieldValue(this, "screen", value); } } /// @@ -208,7 +214,7 @@ namespace StardewModdingAPI.Inheritance /// public Color BgColour { - get { return (Color)typeof(Game1).GetBaseFieldValue(Program.gamePtr, "bgColor"); } + get { return (Color) typeof(Game1).GetBaseFieldValue(Program.gamePtr, "bgColor"); } set { typeof(Game1).SetBaseFieldValue(this, "bgColor", value); } } @@ -226,6 +232,7 @@ namespace StardewModdingAPI.Inheritance /// Whether or not we're in a pseudo 'debug' mode. Mostly for displaying information like FPS. /// public static bool Debug { get; private set; } + internal static Queue DebugMessageQueue { get; private set; } /// @@ -237,8 +244,8 @@ namespace StardewModdingAPI.Inheritance /// /// Gets ALL static fields that belong to 'Game1' /// - public static FieldInfo[] GetStaticFields => typeof (Game1).GetFields(); - + public static FieldInfo[] GetStaticFields => typeof(Game1).GetFields(); + /// /// Whether or not a button was just pressed on the controller /// @@ -274,7 +281,7 @@ namespace StardewModdingAPI.Inheritance { return WasButtonJustPressed(button, value > 0.2f ? ButtonState.Pressed : ButtonState.Released, stateIndex); } - + /// /// Whether or not an analog button was just released on the controller /// @@ -386,19 +393,19 @@ namespace StardewModdingAPI.Inheritance /// /// /// - public static MethodInfo DrawFarmBuildings = typeof (Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance); + public static MethodInfo DrawFarmBuildings = typeof(Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance); /// /// /// - public static MethodInfo DrawHUD = typeof (Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance); + public static MethodInfo DrawHUD = typeof(Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance); /// /// /// - public static MethodInfo DrawDialogueBox = typeof (Game1).GetMethod("drawDialogueBox", BindingFlags.NonPublic | BindingFlags.Instance); + public static MethodInfo DrawDialogueBox = typeof(Game1).GetMethod("drawDialogueBox", BindingFlags.NonPublic | BindingFlags.Instance); - public static MethodInfo CheckForEscapeKeys = typeof (Game1).GetMethod("checkForEscapeKeys", BindingFlags.NonPublic | BindingFlags.Instance); + public static MethodInfo CheckForEscapeKeys = typeof(Game1).GetMethod("checkForEscapeKeys", BindingFlags.NonPublic | BindingFlags.Instance); public static MethodInfo UpdateControlInput = typeof(Game1).GetMethod("UpdateControlInput", BindingFlags.NonPublic | BindingFlags.Instance); @@ -780,7 +787,7 @@ namespace StardewModdingAPI.Inheritance //typeof (Game).GetMethod("Update", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(this, new object[] {gameTime}); //base.Update(gameTime); - + #endregion } else @@ -1322,7 +1329,7 @@ namespace StardewModdingAPI.Inheritance spriteBatch.End(); } - GraphicsEvents.InvokeDrawTick(); + GraphicsEvents.InvokeDrawTick(); } catch (Exception ex) { @@ -1675,7 +1682,7 @@ namespace StardewModdingAPI.Inheritance { try { - return typeof (Game1).GetMethod(name, BindingFlags.NonPublic | BindingFlags.Instance).Invoke(Program.gamePtr, parameters); + return typeof(Game1).GetMethod(name, BindingFlags.NonPublic | BindingFlags.Instance).Invoke(Program.gamePtr, parameters); } catch { -- cgit