summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--StardewModdingAPI/App.config9
-rw-r--r--StardewModdingAPI/Config.cs2
-rw-r--r--StardewModdingAPI/Events/Graphics.cs7
-rw-r--r--StardewModdingAPI/Extensions.cs2
-rw-r--r--StardewModdingAPI/Inheritance/Menus/SBobberBar.cs4
-rw-r--r--StardewModdingAPI/Inheritance/Menus/SGameMenu.cs4
-rw-r--r--StardewModdingAPI/Inheritance/SGame.cs33
-rw-r--r--StardewModdingAPI/JsonResolver.cs4
-rw-r--r--StardewModdingAPI/Program.cs4
-rw-r--r--StardewModdingAPI/packages.config1
-rw-r--r--TrainerMod/packages.config1
11 files changed, 40 insertions, 31 deletions
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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
- <loadFromRemoteSources enabled="true"/>
+ <loadFromRemoteSources enabled="true" />
</runtime>
-</configuration>
+</configuration> \ 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
/// <summary>
/// Occurs before the GUI is drawn. Does not check for conditional statements.
/// </summary>
-
public static event EventHandler OnPreRenderGuiEventNoCheck = delegate { };
+
/// <summary>
/// Occurs after the GUI is drawn. Does not check for conditional statements.
/// </summary>
-
public static event EventHandler OnPostRenderGuiEventNoCheck = delegate { };
+
/// <summary>
/// Occurs before the HUD is drawn. Does not check for conditional statements.
/// </summary>
-
public static event EventHandler OnPreRenderHudEventNoCheck = delegate { };
+
/// <summary>
/// Occurs after the HUD is drawn. Does not check for conditional statements.
/// </summary>
-
public static event EventHandler OnPostRenderHudEventNoCheck = delegate { };
/// <summary>
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<T>(this IEnumerable<T> 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
/// </summary>
public KeyboardState KStateNow { get; private set; }
+
/// <summary>
/// The prior KeyboardState
/// </summary>
@@ -111,22 +112,27 @@ namespace StardewModdingAPI.Inheritance
/// The player's Combat level on the prior frame
/// </summary>
public int PreviousCombatLevel { get; private set; }
+
/// <summary>
/// The player's Farming level on the prior frame
/// </summary>
public int PreviousFarmingLevel { get; private set; }
+
/// <summary>
/// The player's Fishing level on the prior frame
/// </summary>
public int PreviousFishingLevel { get; private set; }
+
/// <summary>
/// The player's Foraging level on the prior frame
/// </summary>
public int PreviousForagingLevel { get; private set; }
+
/// <summary>
/// The player's Mining level on the prior frame
/// </summary>
public int PreviousMiningLevel { get; private set; }
+
/// <summary>
/// The player's Luck level on the prior frame
/// </summary>
@@ -199,8 +205,8 @@ namespace StardewModdingAPI.Inheritance
/// </summary>
public RenderTarget2D Screen
{
- get { return typeof (Game1).GetBaseFieldValue<RenderTarget2D>(Program.gamePtr, "screen"); }
- set { typeof (Game1).SetBaseFieldValue<RenderTarget2D>(this, "screen", value); }
+ get { return typeof(Game1).GetBaseFieldValue<RenderTarget2D>(Program.gamePtr, "screen"); }
+ set { typeof(Game1).SetBaseFieldValue<RenderTarget2D>(this, "screen", value); }
}
/// <summary>
@@ -208,7 +214,7 @@ namespace StardewModdingAPI.Inheritance
/// </summary>
public Color BgColour
{
- get { return (Color)typeof(Game1).GetBaseFieldValue<object>(Program.gamePtr, "bgColor"); }
+ get { return (Color) typeof(Game1).GetBaseFieldValue<object>(Program.gamePtr, "bgColor"); }
set { typeof(Game1).SetBaseFieldValue<object>(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.
/// </summary>
public static bool Debug { get; private set; }
+
internal static Queue<String> DebugMessageQueue { get; private set; }
/// <summary>
@@ -237,8 +244,8 @@ namespace StardewModdingAPI.Inheritance
/// <summary>
/// Gets ALL static fields that belong to 'Game1'
/// </summary>
- public static FieldInfo[] GetStaticFields => typeof (Game1).GetFields();
-
+ public static FieldInfo[] GetStaticFields => typeof(Game1).GetFields();
+
/// <summary>
/// Whether or not a button was just pressed on the controller
/// </summary>
@@ -274,7 +281,7 @@ namespace StardewModdingAPI.Inheritance
{
return WasButtonJustPressed(button, value > 0.2f ? ButtonState.Pressed : ButtonState.Released, stateIndex);
}
-
+
/// <summary>
/// Whether or not an analog button was just released on the controller
/// </summary>
@@ -386,19 +393,19 @@ namespace StardewModdingAPI.Inheritance
/// <summary>
///
/// </summary>
- public static MethodInfo DrawFarmBuildings = typeof (Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance);
+ public static MethodInfo DrawFarmBuildings = typeof(Game1).GetMethod("drawFarmBuildings", BindingFlags.NonPublic | BindingFlags.Instance);
/// <summary>
///
/// </summary>
- public static MethodInfo DrawHUD = typeof (Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance);
+ public static MethodInfo DrawHUD = typeof(Game1).GetMethod("drawHUD", BindingFlags.NonPublic | BindingFlags.Instance);
/// <summary>
///
/// </summary>
- 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 @@
<?xml version="1.0" encoding="utf-8"?>
+
<packages>
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net461" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net461" developmentDependency="true" />
diff --git a/TrainerMod/packages.config b/TrainerMod/packages.config
index adc92baf..c064c58d 100644
--- a/TrainerMod/packages.config
+++ b/TrainerMod/packages.config
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<packages>
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
</packages> \ No newline at end of file
generated by cgit (git 2.46.0) at 2025-02-17 22:21:19 +0000