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/App.config | 9 ++++--- StardewModdingAPI/Config.cs | 2 +- StardewModdingAPI/Events/Graphics.cs | 7 +++-- StardewModdingAPI/Extensions.cs | 2 +- StardewModdingAPI/Inheritance/Menus/SBobberBar.cs | 4 +-- StardewModdingAPI/Inheritance/Menus/SGameMenu.cs | 4 +-- StardewModdingAPI/Inheritance/SGame.cs | 33 ++++++++++++++--------- StardewModdingAPI/JsonResolver.cs | 4 +-- StardewModdingAPI/Program.cs | 4 +-- StardewModdingAPI/packages.config | 1 + 10 files changed, 39 insertions(+), 31 deletions(-) (limited to 'StardewModdingAPI') diff --git a/StardewModdingAPI/App.config b/StardewModdingAPI/App.config index 6a8daa0d..6664f1ed 100644 --- a/StardewModdingAPI/App.config +++ b/StardewModdingAPI/App.config @@ -1,9 +1,10 @@ - + + - + - + - + \ No newline at end of file diff --git a/StardewModdingAPI/Config.cs b/StardewModdingAPI/Config.cs index d978d848..c5b7beca 100644 --- a/StardewModdingAPI/Config.cs +++ b/StardewModdingAPI/Config.cs @@ -155,7 +155,7 @@ namespace StardewModdingAPI return; } - var s = JsonConvert.SerializeObject(baseConfig, typeof (T), Formatting.Indented, new JsonSerializerSettings {ContractResolver = new JsonResolver()}); + var s = JsonConvert.SerializeObject(baseConfig, typeof(T), Formatting.Indented, new JsonSerializerSettings {ContractResolver = new JsonResolver()}); if (!Directory.Exists(baseConfig.ConfigDir)) Directory.CreateDirectory(baseConfig.ConfigDir); diff --git a/StardewModdingAPI/Events/Graphics.cs b/StardewModdingAPI/Events/Graphics.cs index ed129137..331d3e3a 100644 --- a/StardewModdingAPI/Events/Graphics.cs +++ b/StardewModdingAPI/Events/Graphics.cs @@ -45,22 +45,21 @@ namespace StardewModdingAPI.Events /// /// Occurs before the GUI is drawn. Does not check for conditional statements. /// - public static event EventHandler OnPreRenderGuiEventNoCheck = delegate { }; + /// /// Occurs after the GUI is drawn. Does not check for conditional statements. /// - public static event EventHandler OnPostRenderGuiEventNoCheck = delegate { }; + /// /// Occurs before the HUD is drawn. Does not check for conditional statements. /// - public static event EventHandler OnPreRenderHudEventNoCheck = delegate { }; + /// /// Occurs after the HUD is drawn. Does not check for conditional statements. /// - public static event EventHandler OnPostRenderHudEventNoCheck = delegate { }; /// diff --git a/StardewModdingAPI/Extensions.cs b/StardewModdingAPI/Extensions.cs index fcf7eda2..abad6ce2 100644 --- a/StardewModdingAPI/Extensions.cs +++ b/StardewModdingAPI/Extensions.cs @@ -32,7 +32,7 @@ namespace StardewModdingAPI public static string ToSingular(this IEnumerable ienum, string split = ", ") // where T : class { //Apparently Keys[] won't split normally :l - if (typeof (T) == typeof (Keys)) + if (typeof(T) == typeof(Keys)) { return string.Join(split, ienum.ToArray()); } 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 { diff --git a/StardewModdingAPI/JsonResolver.cs b/StardewModdingAPI/JsonResolver.cs index 8aac2313..b6e763f7 100644 --- a/StardewModdingAPI/JsonResolver.cs +++ b/StardewModdingAPI/JsonResolver.cs @@ -13,14 +13,14 @@ namespace StardewModdingAPI { protected override JsonContract CreateContract(Type objectType) { - if (objectType == typeof (Rectangle) || objectType == typeof (Rectangle?)) + if (objectType == typeof(Rectangle) || objectType == typeof(Rectangle?)) { Console.WriteLine("FOUND A RECT"); JsonContract contract = CreateObjectContract(objectType); contract.Converter = new RectangleConverter(); return contract; } - if (objectType == typeof (Object)) + if (objectType == typeof(Object)) { Log.AsyncY("FOUND AN OBJECT"); JsonContract contract = CreateObjectContract(objectType); diff --git a/StardewModdingAPI/Program.cs b/StardewModdingAPI/Program.cs index 9097e285..60e6efb4 100644 --- a/StardewModdingAPI/Program.cs +++ b/StardewModdingAPI/Program.cs @@ -325,10 +325,10 @@ namespace StardewModdingAPI var mod = Assembly.UnsafeLoadFrom(targDll); - if (mod.DefinedTypes.Count(x => x.BaseType == typeof (Mod)) > 0) + if (mod.DefinedTypes.Count(x => x.BaseType == typeof(Mod)) > 0) { Log.AsyncY("Loading Mod DLL..."); - var tar = mod.DefinedTypes.First(x => x.BaseType == typeof (Mod)); + var tar = mod.DefinedTypes.First(x => x.BaseType == typeof(Mod)); var m = (Mod) mod.CreateInstance(tar.ToString()); m.PathOnDisk = targDir; m.Manifest = manifest; diff --git a/StardewModdingAPI/packages.config b/StardewModdingAPI/packages.config index 03310458..0196f5b3 100644 --- a/StardewModdingAPI/packages.config +++ b/StardewModdingAPI/packages.config @@ -1,4 +1,5 @@  + -- cgit