summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI.Installer/InteractiveInstaller.cs3
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs (renamed from src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs)6
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs (renamed from src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs)2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs38
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs38
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs38
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs2
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/ModEntry.cs20
-rw-r--r--src/SMAPI.Mods.ConsoleCommands/manifest.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/ModEntry.cs74
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/DialogueErrorPatch.cs (renamed from src/SMAPI/Patches/DialogueErrorPatch.cs)9
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/EventErrorPatch.cs (renamed from src/SMAPI/Patches/EventErrorPatch.cs)4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/LoadErrorPatch.cs (renamed from src/SMAPI/Patches/LoadErrorPatch.cs)2
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/ObjectErrorPatch.cs (renamed from src/SMAPI/Patches/ObjectErrorPatch.cs)4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/ScheduleErrorPatch.cs (renamed from src/SMAPI/Patches/ScheduleErrorPatch.cs)4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/Patches/UtilityErrorPatches.cs96
-rw-r--r--src/SMAPI.Mods.ErrorHandler/SMAPI.Mods.ErrorHandler.csproj46
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/de.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/default.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/es.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/fr.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/hu.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/it.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/ja.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/ko.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/pt.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/ru.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/tr.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/i18n/zh.json4
-rw-r--r--src/SMAPI.Mods.ErrorHandler/manifest.json9
-rw-r--r--src/SMAPI.Mods.SaveBackup/manifest.json4
-rw-r--r--src/SMAPI.Tests/Utilities/KeybindListTests.cs152
-rw-r--r--src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs23
-rw-r--r--src/SMAPI.Toolkit/Framework/ModScanning/ModParseError.cs3
-rw-r--r--src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs84
-rw-r--r--src/SMAPI.Toolkit/SemanticVersion.cs12
-rw-r--r--src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs4
-rw-r--r--src/SMAPI.Web/wwwroot/schemas/manifest.json2
-rw-r--r--src/SMAPI.sln9
-rw-r--r--src/SMAPI.sln.DotSettings2
-rw-r--r--src/SMAPI/Constants.cs4
-rw-r--r--src/SMAPI/Events/ButtonsChangedEventArgs.cs67
-rw-r--r--src/SMAPI/Events/IInputEvents.cs3
-rw-r--r--src/SMAPI/Framework/ContentManagers/GameContentManager.cs2
-rw-r--r--src/SMAPI/Framework/ContentManagers/ModContentManager.cs15
-rw-r--r--src/SMAPI/Framework/Events/EventManager.cs4
-rw-r--r--src/SMAPI/Framework/Events/ModInputEvents.cs7
-rw-r--r--src/SMAPI/Framework/Logging/LogManager.cs11
-rw-r--r--src/SMAPI/Framework/ModHelpers/InputHelper.cs14
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs9
-rw-r--r--src/SMAPI/Framework/Models/SConfig.cs9
-rw-r--r--src/SMAPI/Framework/Networking/MultiplayerPeer.cs10
-rw-r--r--src/SMAPI/Framework/SChatBox.cs49
-rw-r--r--src/SMAPI/Framework/SCore.cs76
-rw-r--r--src/SMAPI/Framework/SGame.cs17
-rw-r--r--src/SMAPI/Framework/SGameRunner.cs22
-rw-r--r--src/SMAPI/Framework/SMultiplayer.cs86
-rw-r--r--src/SMAPI/Framework/Serialization/KeybindConverter.cs82
-rw-r--r--src/SMAPI/IInputHelper.cs6
-rw-r--r--src/SMAPI/IMultiplayerPeer.cs7
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs139
-rw-r--r--src/SMAPI/Metadata/InstructionMetadata.cs28
-rw-r--r--src/SMAPI/Properties/AssemblyInfo.cs1
-rw-r--r--src/SMAPI/SButtonState.cs2
-rw-r--r--src/SMAPI/SMAPI.config.json7
-rw-r--r--src/SMAPI/Utilities/Keybind.cs139
-rw-r--r--src/SMAPI/Utilities/KeybindList.cs161
-rw-r--r--src/SMAPI/Utilities/PerScreen.cs53
-rw-r--r--src/SMAPI/i18n/de.json4
-rw-r--r--src/SMAPI/i18n/default.json3
-rw-r--r--src/SMAPI/i18n/es.json3
-rw-r--r--src/SMAPI/i18n/fr.json3
-rw-r--r--src/SMAPI/i18n/hu.json3
-rw-r--r--src/SMAPI/i18n/it.json3
-rw-r--r--src/SMAPI/i18n/ja.json3
-rw-r--r--src/SMAPI/i18n/ko.json3
-rw-r--r--src/SMAPI/i18n/pt.json3
-rw-r--r--src/SMAPI/i18n/ru.json3
-rw-r--r--src/SMAPI/i18n/tr.json3
-rw-r--r--src/SMAPI/i18n/zh.json3
101 files changed, 1447 insertions, 404 deletions
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 035ec382..ff74a659 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -28,7 +28,8 @@ namespace StardewModdingApi.Installer
/// <summary>The mod IDs which the installer should allow as bundled mods.</summary>
private readonly string[] BundledModIDs = {
"SMAPI.SaveBackup",
- "SMAPI.ConsoleCommands"
+ "SMAPI.ConsoleCommands",
+ "SMAPI.ErrorHandler"
};
/// <summary>Get the absolute file or folder paths to remove when uninstalling SMAPI.</summary>
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
index 98daa906..01cab92e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
@@ -4,8 +4,8 @@ using System.Linq;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
{
- /// <summary>The base implementation for a trainer command.</summary>
- internal abstract class TrainerCommand : ITrainerCommand
+ /// <summary>The base implementation for a console command.</summary>
+ internal abstract class ConsoleCommand : IConsoleCommand
{
/*********
** Accessors
@@ -50,7 +50,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
/// <param name="description">The command description.</param>
/// <param name="mayNeedInput">Whether the command may need to perform logic when the player presses a button.</param>
/// <param name="mayNeedUpdate">Whether the command may need to perform logic when the game updates.</param>
- protected TrainerCommand(string name, string description, bool mayNeedInput = false, bool mayNeedUpdate = false)
+ protected ConsoleCommand(string name, string description, bool mayNeedInput = false, bool mayNeedUpdate = false)
{
this.Name = name;
this.Description = description;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
index d4d36e5d..9c82bbd3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
@@ -1,7 +1,7 @@
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
{
/// <summary>A console command to register.</summary>
- internal interface ITrainerCommand
+ internal interface IConsoleCommand
{
/*********
** Accessors
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
index 8f59342e..957b0e75 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
@@ -5,7 +5,7 @@ using StardewValley;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
{
/// <summary>A command which runs one of the game's save migrations.</summary>
- internal class ApplySaveFixCommand : TrainerCommand
+ internal class ApplySaveFixCommand : ConsoleCommand
{
/*********
** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
index e4010111..1955c14e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
@@ -3,7 +3,7 @@
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
{
/// <summary>A command which sends a debug command to the game.</summary>
- internal class DebugCommand : TrainerCommand
+ internal class DebugCommand : ConsoleCommand
{
/*********
** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
index 54d27185..27f6ce53 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
@@ -3,7 +3,7 @@
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
{
/// <summary>A command which shows the data files.</summary>
- internal class ShowDataFilesCommand : TrainerCommand
+ internal class ShowDataFilesCommand : ConsoleCommand
{
/*********
** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
index 0257892f..71093184 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
@@ -3,7 +3,7 @@
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
{
/// <summary>A command which shows the game files.</summary>
- internal class ShowGameFilesCommand : TrainerCommand
+ internal class ShowGameFilesCommand : ConsoleCommand
{
/*********
** Public methods
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
index 11aa10c3..46583dc3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
@@ -3,7 +3,7 @@ using System;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
{
/// <summary>A command which logs the keys being pressed for 30 seconds once enabled.</summary>
- internal class TestInputCommand : TrainerCommand
+ internal class TestInputCommand : ConsoleCommand
{
/*********
** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index 6cb2b624..0e8f7517 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -7,7 +7,7 @@ using Object = StardewValley.Object;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
{
/// <summary>A command which adds an item to the player inventory.</summary>
- internal class AddCommand : TrainerCommand
+ internal class AddCommand : ConsoleCommand
{
/*********
** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index a835455e..1f12e5f9 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -4,7 +4,7 @@ using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
{
/// <summary>A command which list item types.</summary>
- internal class ListItemTypesCommand : TrainerCommand
+ internal class ListItemTypesCommand : ConsoleCommand
{
/*********
** Fields
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI