diff options
-rw-r--r-- | .editorconfig (renamed from src/.editorconfig) | 0 | ||||
-rw-r--r-- | build/GlobalAssemblyInfo.cs (renamed from src/GlobalAssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | build/common.targets (renamed from src/common.targets) | 0 | ||||
-rw-r--r-- | build/prepare-install-package.targets (renamed from src/prepare-install-package.targets) | 0 | ||||
-rw-r--r-- | docs/CONTRIBUTING.md (renamed from CONTRIBUTING.md) | 0 | ||||
-rw-r--r-- | docs/LICENSE.md (renamed from LICENSE) | 0 | ||||
-rw-r--r-- | docs/README.md | 36 | ||||
-rw-r--r-- | docs/imgs/SMAPI.png | bin | 252371 -> 0 bytes | |||
-rw-r--r-- | docs/release-notes.md (renamed from release-notes.md) | 0 | ||||
-rw-r--r-- | docs/technical-docs.md (renamed from README.md) | 61 | ||||
-rw-r--r-- | src/ModBuildConfig/README.md | 121 | ||||
-rw-r--r-- | src/ModBuildConfig/assets/nuget-icon.pdn | bin | 0 -> 7401 bytes | |||
-rw-r--r-- | src/ModBuildConfig/assets/nuget-icon.png | bin | 0 -> 5054 bytes | |||
-rw-r--r-- | src/ModBuildConfig/build/smapi.targets | 273 | ||||
-rw-r--r-- | src/ModBuildConfig/package.nuspec | 22 | ||||
-rw-r--r-- | src/ModBuildConfig/release-notes.md | 28 | ||||
-rw-r--r-- | src/SMAPI.AssemblyRewriters/Properties/AssemblyInfo.cs (renamed from src/StardewModdingAPI.AssemblyRewriters/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.AssemblyRewriters/SpriteBatchMethods.cs (renamed from src/StardewModdingAPI.AssemblyRewriters/SpriteBatchMethods.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj (renamed from src/StardewModdingAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj) | 6 | ||||
-rw-r--r-- | src/SMAPI.Installer/Enums/Platform.cs (renamed from src/StardewModdingAPI.Installer/Enums/Platform.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Installer/Enums/ScriptAction.cs (renamed from src/StardewModdingAPI.Installer/Enums/ScriptAction.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Installer/InteractiveInstaller.cs (renamed from src/StardewModdingAPI.Installer/InteractiveInstaller.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Installer/Program.cs (renamed from src/StardewModdingAPI.Installer/Program.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Installer/Properties/AssemblyInfo.cs (renamed from src/StardewModdingAPI.Installer/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Installer/StardewModdingAPI.Installer.csproj (renamed from src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj) | 8 | ||||
-rw-r--r-- | src/SMAPI.Installer/readme.txt (renamed from src/StardewModdingAPI.Installer/readme.txt) | 0 | ||||
-rw-r--r-- | src/SMAPI.Models/ModInfoModel.cs (renamed from src/StardewModdingAPI.Models/ModInfoModel.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Models/ModSeachModel.cs (renamed from src/StardewModdingAPI.Models/ModSeachModel.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Models/StardewModdingAPI.Models.projitems (renamed from src/StardewModdingAPI.Models/StardewModdingAPI.Models.projitems) | 0 | ||||
-rw-r--r-- | src/SMAPI.Models/StardewModdingAPI.Models.shproj (renamed from src/StardewModdingAPI.Models/StardewModdingAPI.Models.shproj) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/Core/ModResolverTests.cs (renamed from src/StardewModdingAPI.Tests/Core/ModResolverTests.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/Core/TranslationTests.cs (renamed from src/StardewModdingAPI.Tests/Core/TranslationTests.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/Properties/AssemblyInfo.cs (renamed from src/StardewModdingAPI.Tests/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/Sample.cs (renamed from src/StardewModdingAPI.Tests/Sample.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/StardewModdingAPI.Tests.csproj (renamed from src/StardewModdingAPI.Tests/StardewModdingAPI.Tests.csproj) | 8 | ||||
-rw-r--r-- | src/SMAPI.Tests/Utilities/SDateTests.cs (renamed from src/StardewModdingAPI.Tests/Utilities/SDateTests.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/Utilities/SemanticVersionTests.cs (renamed from src/StardewModdingAPI.Tests/Utilities/SemanticVersionTests.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Tests/packages.config (renamed from src/StardewModdingAPI.Tests/packages.config) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Controllers/ModsController.cs (renamed from src/StardewModdingAPI.Web/Controllers/ModsController.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs (renamed from src/StardewModdingAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs (renamed from src/StardewModdingAPI.Web/Framework/InternalControllerFeatureProvider.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ModRepositories/BaseRepository.cs (renamed from src/StardewModdingAPI.Web/Framework/ModRepositories/BaseRepository.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs (renamed from src/StardewModdingAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs (renamed from src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ModRepositories/IModRepository.cs (renamed from src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs (renamed from src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/RewriteSubdomainRule.cs (renamed from src/StardewModdingAPI.Web/Framework/RewriteSubdomainRule.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Framework/VersionConstraint.cs (renamed from src/StardewModdingAPI.Web/Framework/VersionConstraint.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Program.cs (renamed from src/StardewModdingAPI.Web/Program.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Properties/AssemblyInfo.cs (renamed from src/StardewModdingAPI.Web/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/Properties/launchSettings.json (renamed from src/StardewModdingAPI.Web/Properties/launchSettings.json) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/StardewModdingAPI.Web.csproj (renamed from src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj) | 6 | ||||
-rw-r--r-- | src/SMAPI.Web/Startup.cs (renamed from src/StardewModdingAPI.Web/Startup.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/appsettings.Development.json (renamed from src/StardewModdingAPI.Web/appsettings.Development.json) | 0 | ||||
-rw-r--r-- | src/SMAPI.Web/appsettings.json (renamed from src/StardewModdingAPI.Web/appsettings.json) | 0 | ||||
-rw-r--r-- | src/SMAPI.sln (renamed from src/StardewModdingAPI.sln) | 44 | ||||
-rw-r--r-- | src/SMAPI.sln.DotSettings (renamed from src/StardewModdingAPI.sln.DotSettings) | 0 | ||||
-rw-r--r-- | src/SMAPI/App.config (renamed from src/StardewModdingAPI/App.config) | 0 | ||||
-rw-r--r-- | src/SMAPI/Constants.cs (renamed from src/StardewModdingAPI/Constants.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/ContentSource.cs (renamed from src/StardewModdingAPI/ContentSource.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Context.cs (renamed from src/StardewModdingAPI/Context.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/ChangeType.cs (renamed from src/StardewModdingAPI/Events/ChangeType.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/ContentEvents.cs (renamed from src/StardewModdingAPI/Events/ContentEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/ControlEvents.cs (renamed from src/StardewModdingAPI/Events/ControlEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsClickableMenuChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsClickableMenuChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsClickableMenuClosed.cs (renamed from src/StardewModdingAPI/Events/EventArgsClickableMenuClosed.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsControllerButtonPressed.cs (renamed from src/StardewModdingAPI/Events/EventArgsControllerButtonPressed.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsControllerButtonReleased.cs (renamed from src/StardewModdingAPI/Events/EventArgsControllerButtonReleased.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsControllerTriggerPressed.cs (renamed from src/StardewModdingAPI/Events/EventArgsControllerTriggerPressed.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsControllerTriggerReleased.cs (renamed from src/StardewModdingAPI/Events/EventArgsControllerTriggerReleased.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsCurrentLocationChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsCurrentLocationChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsGameLocationsChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsGameLocationsChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsInput.cs (renamed from src/StardewModdingAPI/Events/EventArgsInput.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsIntChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsIntChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsInventoryChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsKeyPressed.cs (renamed from src/StardewModdingAPI/Events/EventArgsKeyPressed.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsKeyboardStateChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsKeyboardStateChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsLevelUp.cs (renamed from src/StardewModdingAPI/Events/EventArgsLevelUp.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsLocationObjectsChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsLocationObjectsChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsMineLevelChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsMineLevelChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsMouseStateChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsMouseStateChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/EventArgsValueChanged.cs (renamed from src/StardewModdingAPI/Events/EventArgsValueChanged.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/GameEvents.cs (renamed from src/StardewModdingAPI/Events/GameEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/GraphicsEvents.cs (renamed from src/StardewModdingAPI/Events/GraphicsEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/InputEvents.cs (renamed from src/StardewModdingAPI/Events/InputEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/ItemStackChange.cs (renamed from src/StardewModdingAPI/Events/ItemStackChange.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/LocationEvents.cs (renamed from src/StardewModdingAPI/Events/LocationEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/MenuEvents.cs (renamed from src/StardewModdingAPI/Events/MenuEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/MineEvents.cs (renamed from src/StardewModdingAPI/Events/MineEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/PlayerEvents.cs (renamed from src/StardewModdingAPI/Events/PlayerEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/SaveEvents.cs (renamed from src/StardewModdingAPI/Events/SaveEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Events/TimeEvents.cs (renamed from src/StardewModdingAPI/Events/TimeEvents.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Command.cs (renamed from src/StardewModdingAPI/Framework/Command.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/CommandManager.cs (renamed from src/StardewModdingAPI/Framework/CommandManager.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Content/AssetData.cs (renamed from src/StardewModdingAPI/Framework/Content/AssetData.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Content/AssetDataForDictionary.cs (renamed from src/StardewModdingAPI/Framework/Content/AssetDataForDictionary.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Content/AssetDataForImage.cs (renamed from src/StardewModdingAPI/Framework/Content/AssetDataForImage.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Content/AssetDataForObject.cs (renamed from src/StardewModdingAPI/Framework/Content/AssetDataForObject.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Content/AssetInfo.cs (renamed from src/StardewModdingAPI/Framework/Content/AssetInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ContentManagerShim.cs (renamed from src/StardewModdingAPI/Framework/ContentManagerShim.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/CursorPosition.cs (renamed from src/StardewModdingAPI/Framework/CursorPosition.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/DeprecationLevel.cs (renamed from src/StardewModdingAPI/Framework/DeprecationLevel.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/DeprecationManager.cs (renamed from src/StardewModdingAPI/Framework/DeprecationManager.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs (renamed from src/StardewModdingAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Exceptions/SContentLoadException.cs (renamed from src/StardewModdingAPI/Framework/Exceptions/SContentLoadException.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Exceptions/SParseException.cs (renamed from src/StardewModdingAPI/Framework/Exceptions/SParseException.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/GameVersion.cs (renamed from src/StardewModdingAPI/Framework/GameVersion.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/IModMetadata.cs (renamed from src/StardewModdingAPI/Framework/IModMetadata.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/InternalExtensions.cs (renamed from src/StardewModdingAPI/Framework/InternalExtensions.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Logging/ConsoleInterceptionManager.cs (renamed from src/StardewModdingAPI/Framework/Logging/ConsoleInterceptionManager.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Logging/InterceptingTextWriter.cs (renamed from src/StardewModdingAPI/Framework/Logging/InterceptingTextWriter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Logging/LogFileManager.cs (renamed from src/StardewModdingAPI/Framework/Logging/LogFileManager.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/BaseHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/BaseHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/CommandHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/CommandHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/ContentHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/ModHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/ModHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/ModRegistryHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/ReflectionHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/TranslationHelper.cs (renamed from src/StardewModdingAPI/Framework/ModHelpers/TranslationHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/AssemblyLoadStatus.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/AssemblyLoader.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/AssemblyParseResult.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Finders/EventFinder.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Finders/FieldFinder.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Finders/MethodFinder.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Finders/PropertyFinder.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Finders/TypeFinder.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/IInstructionHandler.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/IInstructionHandler.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/IncompatibleInstructionException.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/InstructionHandleResult.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/InstructionHandleResult.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/InvalidModStateException.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/InvalidModStateException.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/ModDependencyStatus.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/ModDependencyStatus.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/ModMetadata.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/ModMetadata.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/ModMetadataStatus.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/ModMetadataStatus.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/ModResolver.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Platform.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Platform.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/PlatformAssemblyMap.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/RewriteHelper.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/RewriteHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs (renamed from src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModRegistry.cs (renamed from src/StardewModdingAPI/Framework/ModRegistry.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/Manifest.cs (renamed from src/StardewModdingAPI/Framework/Models/Manifest.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ManifestDependency.cs (renamed from src/StardewModdingAPI/Framework/Models/ManifestDependency.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ModCompatibility.cs (renamed from src/StardewModdingAPI/Framework/Models/ModCompatibility.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ModDataID.cs (renamed from src/StardewModdingAPI/Framework/Models/ModDataID.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ModDataRecord.cs (renamed from src/StardewModdingAPI/Framework/Models/ModDataRecord.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/ModStatus.cs (renamed from src/StardewModdingAPI/Framework/Models/ModStatus.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Models/SConfig.cs (renamed from src/StardewModdingAPI/Framework/Models/SConfig.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Monitor.cs (renamed from src/StardewModdingAPI/Framework/Monitor.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Reflection/CacheEntry.cs (renamed from src/StardewModdingAPI/Framework/Reflection/CacheEntry.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Reflection/PrivateField.cs (renamed from src/StardewModdingAPI/Framework/Reflection/PrivateField.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Reflection/PrivateMethod.cs (renamed from src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Reflection/PrivateProperty.cs (renamed from src/StardewModdingAPI/Framework/Reflection/PrivateProperty.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Reflection/Reflector.cs (renamed from src/StardewModdingAPI/Framework/Reflection/Reflector.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/RequestExitDelegate.cs (renamed from src/StardewModdingAPI/Framework/RequestExitDelegate.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/SContentManager.cs (renamed from src/StardewModdingAPI/Framework/SContentManager.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/SGame.cs (renamed from src/StardewModdingAPI/Framework/SGame.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/JsonHelper.cs (renamed from src/StardewModdingAPI/Framework/Serialisation/JsonHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/SFieldConverter.cs (renamed from src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs (renamed from src/StardewModdingAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Utilities/ContextHash.cs (renamed from src/StardewModdingAPI/Framework/Utilities/ContextHash.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/Utilities/Countdown.cs (renamed from src/StardewModdingAPI/Framework/Utilities/Countdown.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Framework/WebApiClient.cs (renamed from src/StardewModdingAPI/Framework/WebApiClient.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetData.cs (renamed from src/StardewModdingAPI/IAssetData.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetDataForDictionary.cs (renamed from src/StardewModdingAPI/IAssetDataForDictionary.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetDataForImage.cs (renamed from src/StardewModdingAPI/IAssetDataForImage.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetEditor.cs (renamed from src/StardewModdingAPI/IAssetEditor.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetInfo.cs (renamed from src/StardewModdingAPI/IAssetInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IAssetLoader.cs (renamed from src/StardewModdingAPI/IAssetLoader.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/ICommandHelper.cs (renamed from src/StardewModdingAPI/ICommandHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IContentHelper.cs (renamed from src/StardewModdingAPI/IContentHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/ICursorPosition.cs (renamed from src/StardewModdingAPI/ICursorPosition.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IManifest.cs (renamed from src/StardewModdingAPI/IManifest.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IManifestDependency.cs (renamed from src/StardewModdingAPI/IManifestDependency.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IMod.cs (renamed from src/StardewModdingAPI/IMod.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IModHelper.cs (renamed from src/StardewModdingAPI/IModHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IModLinked.cs (renamed from src/StardewModdingAPI/IModLinked.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IModRegistry.cs (renamed from src/StardewModdingAPI/IModRegistry.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IMonitor.cs (renamed from src/StardewModdingAPI/IMonitor.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IPrivateField.cs (renamed from src/StardewModdingAPI/IPrivateField.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IPrivateMethod.cs (renamed from src/StardewModdingAPI/IPrivateMethod.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IPrivateProperty.cs (renamed from src/StardewModdingAPI/IPrivateProperty.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/IReflectionHelper.cs (renamed from src/StardewModdingAPI/IReflectionHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/ISemanticVersion.cs (renamed from src/StardewModdingAPI/ISemanticVersion.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/ITranslationHelper.cs (renamed from src/StardewModdingAPI/ITranslationHelper.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/LogLevel.cs (renamed from src/StardewModdingAPI/LogLevel.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Metadata/CoreAssets.cs (renamed from src/StardewModdingAPI/Metadata/CoreAssets.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Metadata/InstructionMetadata.cs (renamed from src/StardewModdingAPI/Metadata/InstructionMetadata.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Mod.cs (renamed from src/StardewModdingAPI/Mod.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/PatchMode.cs (renamed from src/StardewModdingAPI/PatchMode.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Program.cs (renamed from src/StardewModdingAPI/Program.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Properties/AssemblyInfo.cs (renamed from src/StardewModdingAPI/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/SemanticVersion.cs (renamed from src/StardewModdingAPI/SemanticVersion.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/StardewModdingAPI.config.json (renamed from src/StardewModdingAPI/StardewModdingAPI.config.json) | 0 | ||||
-rw-r--r-- | src/SMAPI/StardewModdingAPI.csproj (renamed from src/StardewModdingAPI/StardewModdingAPI.csproj) | 10 | ||||
-rw-r--r-- | src/SMAPI/Translation.cs (renamed from src/StardewModdingAPI/Translation.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Utilities/SButton.cs (renamed from src/StardewModdingAPI/Utilities/SButton.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/Utilities/SDate.cs (renamed from src/StardewModdingAPI/Utilities/SDate.cs) | 0 | ||||
-rw-r--r-- | src/SMAPI/icon.ico (renamed from src/StardewModdingAPI/icon.ico) | bin | 15086 -> 15086 bytes | |||
-rw-r--r-- | src/SMAPI/packages.config (renamed from src/StardewModdingAPI/packages.config) | 0 | ||||
-rw-r--r-- | src/SMAPI/steam_appid.txt (renamed from src/StardewModdingAPI/steam_appid.txt) | 0 | ||||
-rw-r--r-- | src/SMAPI/unix-launcher.sh (renamed from src/StardewModdingAPI/unix-launcher.sh) | 0 | ||||
-rw-r--r-- | src/TrainerMod/TrainerMod.csproj | 8 |
207 files changed, 539 insertions, 92 deletions
diff --git a/src/.editorconfig b/.editorconfig index a5cdcf97..a5cdcf97 100644 --- a/src/.editorconfig +++ b/.editorconfig diff --git a/src/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index 196d67c5..196d67c5 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs diff --git a/src/common.targets b/build/common.targets index ee138524..ee138524 100644 --- a/src/common.targets +++ b/build/common.targets diff --git a/src/prepare-install-package.targets b/build/prepare-install-package.targets index f2a2b23c..f2a2b23c 100644 --- a/src/prepare-install-package.targets +++ b/build/prepare-install-package.targets diff --git a/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 52d47a4b..52d47a4b 100644 --- a/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md diff --git a/LICENSE b/docs/LICENSE.md index 02bbb60b..02bbb60b 100644 --- a/LICENSE +++ b/docs/LICENSE.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 00000000..92a39dbe --- /dev/null +++ b/docs/README.md @@ -0,0 +1,36 @@ +**SMAPI** is an [open-source](LICENSE.md) modding API for [Stardew Valley](http://stardewvalley.net/) +that lets you play the game with mods. It's safely installed alongside the game's executable, and +doesn't change any of your game files. It serves six main purposes: + +1. **Load mods into the game.** + _SMAPI loads mods when the game is starting up so they can interact with it. (Code mods aren't + possible without SMAPI to load them.)_ + +2. **Provide APIs and events for mods.** + _SMAPI provides low-level APIs and events which let mods interact with the game in ways they + otherwise couldn't._ + +3. **Rewrite mods for crossplatform compatibility.** + _SMAPI rewrites mods' compiled code before loading them so they work on Linux/Mac/Windows + without the mods needing to handle differences between the Linux/Mac and Windows versions of the + game._ + +4. **Rewrite mods to update them.** + _SMAPI detects when a mod accesses part of the game that changed in a recent update which + affects many mods, and rewrites the mod so it's compatible._ + +5. **Intercept errors.** + _SMAPI intercepts errors that happen in the game, displays the error details in the console + window, and in most cases automatically recovers the game. This prevents mods from accidentally + crashing the game, and makes it possible to troubleshoot errors in the game itself that would + otherwise show a generic 'program has stopped working' type of message._ + +6. **Provide update checks.** + _SMAPI automatically checks for new versions of your installed mods, and notifies you when any + are available._ + +## Documentation +* [For players & mod creators](http://stardewvalleywiki.com/Modding:Index) +* [Release notes](release-notes.md) +* [Technical docs](technical-docs.md) +* [Chat on Discord](https://discord.gg/KCJHWhX) with SMAPI developers and other modders diff --git a/docs/imgs/SMAPI.png b/docs/imgs/SMAPI.png Binary files differdeleted file mode 100644 index 50f375b6..00000000 --- a/docs/imgs/SMAPI.png +++ /dev/null diff --git a/release-notes.md b/docs/release-notes.md index 5b102df3..5b102df3 100644 --- a/release-notes.md +++ b/docs/release-notes.md diff --git a/README.md b/docs/technical-docs.md index 0f2f05a6..d37d327d 100644 --- a/README.md +++ b/docs/technical-docs.md @@ -1,61 +1,19 @@ -![](docs/imgs/SMAPI.png) +← [README](README.md) + +This file provides more technical documentation about SMAPI. If you only want to use or create +mods, this section isn't relevant to you; see the main README to use or create mods. ## Contents -* [What is SMAPI?](#what-is-smapi) -* **[For players](#for-players)** -* **[For mod developers](#for-mod-developers)** -* [For SMAPI developers](#for-smapi-developers) +* [Development](#development) * [Compiling from source](#compiling-from-source) * [Debugging a local build](#debugging-a-local-build) * [Preparing a release](#preparing-a-release) -* [Advanced usage](#advanced-usage) +* [Customisation](#customisation) * [Configuration file](#configuration-file) * [Command-line arguments](#command-line-arguments) + * [Compile flags](#compile-flags) -## What is SMAPI? -**SMAPI** is an [open-source](LICENSE) modding API for [Stardew Valley](http://stardewvalley.net/) -that lets you play the game with mods. It's safely installed alongside the game's executable, and -doesn't change any of your game files. It serves five main purposes: - -1. **Load mods into the game.** - _SMAPI loads mods when the game is starting up so they can interact with it. (Code mods aren't - possible without SMAPI to load them.)_ - -2. **Provide APIs and events for mods.** - _SMAPI provides low-level APIs and events which let mods interact with the game in ways they - otherwise couldn't._ - -3. **Rewrite mods for crossplatform compatibility.** - _SMAPI rewrites mods' compiled code before loading them so they work on Linux/Mac/Windows - without the mods needing to handle differences between the Linux/Mac and Windows versions of the - game._ - -4. **Rewrite mods to update them.** - _SMAPI detects when a mod accesses part of the game that changed in a recent update which - affects many mods, and rewrites the mod so it's compatible._ - -5. **Intercept errors.** - _SMAPI intercepts errors that happen in the game, displays the error details in the console - window, and in most cases automatically recovers the game. This prevents mods from accidentally - crashing the game, and makes it possible to troubleshoot errors in the game itself that would - otherwise show a generic 'program has stopped working' type of message._ - -## For players -* [Intro & FAQs](http://stardewvalleywiki.com/Modding:Player_FAQs) -* [Installing SMAPI](http://stardewvalleywiki.com/Modding:Installing_SMAPI) -* [Release notes](release-notes.md#release-notes) -* Need help? Come [chat on Discord](https://discord.gg/KCJHWhX) or [post in the support forums](http://community.playstarbound.com/threads/smapi-stardew-modding-api.108375/). - _Please don't submit issues on GitHub for support questions._ - -## For mod developers -* [Modding documentation](http://stardewvalleywiki.com/Modding:Index) -* [Release notes](release-notes.md#release-notes) -* [Chat on Discord](https://discord.gg/KCJHWhX) with SMAPI developers and other modders - -## For SMAPI developers -_This section is about compiling SMAPI itself from source. If you don't know what that means, this -section isn't relevant to you; see the previous sections to use or create mods._ - +## Development ### Compiling from source Using an official SMAPI release is recommended for most users. @@ -139,7 +97,7 @@ on the wiki for the first-time setup. * delete `internal/Windows/StardewModdingAPI.xml`. 7. Compress the two folders into `SMAPI <version>.zip` and `SMAPI <version> for developers.zip`. -## Advanced usage +## Customisation ### Configuration file You can customise the SMAPI behaviour by editing the `StardewModdingAPI.config.json` file in your game folder. @@ -177,4 +135,3 @@ SMAPI uses a small number of conditional compilation constants, which you can se flag | purpose ---- | ------- `SMAPI_FOR_WINDOWS` | Indicates that SMAPI is being compiled on Windows for players on Windows. Set automatically in `crossplatform.targets`. - diff --git a/src/ModBuildConfig/README.md b/src/ModBuildConfig/README.md new file mode 100644 index 00000000..c261e705 --- /dev/null +++ b/src/ModBuildConfig/README.md @@ -0,0 +1,121 @@ +**Stardew.ModBuildConfig** is an open-source NuGet package which automates the build configuration +for [Stardew Valley](http://stardewvalley.net/) [SMAPI](https://github.com/Pathoschild/SMAPI) mods. + +The package... + +* lets you write your mod once, and compile it on any computer. It detects the current platform + (Linux, Mac, or Windows) and game install path, and injects the right references automatically. +* configures Visual Studio so you can debug into the mod code when the game is running (_Windows + only_). +* packages the mod automatically into the game's mod folder when you build the code (_optional_). + +## Contents +* [Install](#install) +* [Simplify mod development](#simplify-mod-development) +* [Troubleshoot](#troubleshoot) +* [Versions](#versions) + +## Install +**When creating a new mod:** + +1. Create an empty library project. +2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig). +3. [Write your code](http://canimod.com/guides/creating-a-smapi-mod). +4. Compile on any platform. + +**When migrating an existing mod:** + +1. Remove any project references to `Microsoft.Xna.*`, `MonoGame`, Stardew Valley, + `StardewModdingAPI`, and `xTile`. +2. Reference the [`Pathoschild.Stardew.ModBuildConfig` NuGet package](https://www.nuget.org/packages/Pathoschild.Stardew.ModBuildConfig). +3. Compile on any platform. + +## Simplify mod development +### Package your mod into the game folder automatically +You can copy your mod files into the `Mods` folder automatically each time you build, so you don't +need to do it manually: + +1. Edit your mod's `.csproj` file. +2. Add this block above the first `</PropertyGroup>` line: + + ```xml + <DeployModFolderName>$(MSBuildProjectName)</DeployModFolderName> + ``` + +That's it! Each time you build, the files in `<game path>\Mods\<mod name>` will be updated with +your `manifest.json`, build output, and any `i18n` files. + +Notes: +* To add custom files, just [add them to the build output](https://stackoverflow.com/a/10828462/262123). +* To customise the folder name, just replace `$(MSBuildProjectName)` with the folder name you want. +* If your project references another mod, make sure the reference is [_not_ marked 'copy local'](https://msdn.microsoft.com/en-us/library/t1zz5y8c(v=vs.100).aspx). + +### Debug into the mod code (Windows-only) +Stepping into your mod code when the game is running is straightforward, since this package injects +the configuration automatically. To do it: + +1. [Package your mod into the game folder automatically](#package-your-mod-into-the-game-folder-automatically). +2. Launch the project with debugging in Visual Studio or MonoDevelop. + +This will deploy your mod files into the game folder, launch SMAPI, and attach a debugger +automatically. Now you can step through your code, set breakpoints, etc. + +### Create release zips automatically (Windows-only) +You can create the mod package automatically when you build: + +1. Edit your mod's `.csproj` file. +2. Add this block above the first `</PropertyGroup>` line: + + ```xml + <DeployModZipTo>$(SolutionDir)\_releases</DeployModZipTo> + ``` + +That's it! Each time you build, the mod files will be zipped into `_releases\<mod name>.zip`. (You +can change the value to save the zips somewhere else.) + +## Troubleshoot +### "Failed to find the game install path" +That error means the package couldn't figure out where the game is installed. You need to specify +the game location yourself. There's two ways to do that: + +* **Option 1: set the path globally.** + _This will apply to every project that uses version 1.5+ of package._ + + 1. Get the full folder path containing the Stardew Valley executable. + 2. Create this file path: + + platform | path + --------- | ---- + Linux/Mac | `~/stardewvalley.targets` + Windows | `%USERPROFILE%\stardewvalley.targets` + + 3. Save the file with this content: + + ```xml + <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <GamePath>PATH_HERE</GamePath> + </PropertyGroup> + </Project> + ``` + + 4. Replace `PATH_HERE` with your custom game install path. + +* **Option 2: set the path in the project file.** + _(You'll need to do it for every project that uses the package.)_ + 1. Get the folder path containing the Stardew Valley `.exe` file. + 2. Add this to your `.csproj` file under the `<Project` line: + + ```xml + <PropertyGroup> + <GamePath>PATH_HERE</GamePath> + </PropertyGroup> + ``` + + 3. Replace `PATH_HERE` with your custom game install path. + +The configuration will check your custom path first, then fall back to the default paths (so it'll +still compile on a different computer). + +## Versions +See [release notes](release-notes.md). diff --git a/src/ModBuildConfig/assets/nuget-icon.pdn b/src/ModBuildConfig/assets/nuget-icon.pdn Binary files differnew file mode 100644 index 00000000..7bd5c0c5 --- /dev/null +++ b/src/ModBuildConfig/assets/nuget-icon.pdn diff --git a/src/ModBuildConfig/assets/nuget-icon.png b/src/ModBuildConfig/assets/nuget-icon.png Binary files differnew file mode 100644 index 00000000..611cdf88 --- /dev/null +++ b/src/ModBuildConfig/assets/nuget-icon.png diff --git a/src/ModBuildConfig/build/smapi.targets b/src/ModBuildConfig/build/smapi.targets new file mode 100644 index 00000000..a1b6aab3 --- /dev/null +++ b/src/ModBuildConfig/build/smapi.targets @@ -0,0 +1,273 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!--********************************************* + ** Define build tasks + **********************************************--> + <!--###### + ## create a release zip file for a mod (CodeTaskFactory only available on Windows?) + #######--> + <UsingTask TaskName="CreateModReleaseZip" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" Condition="'$(OS)' == 'Windows_NT'"> + <ParameterGroup> + <ModName ParameterType="System.String" Required="true" /> + <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" /> + <OutputFolderPath ParameterType="System.String" Required="true" /> + </ParameterGroup> + <Task> + <Reference Include="System.IO" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.Web.Extensions"/> + <Code Type="Class" Language="cs"> + <![CDATA[ + using System; + using System.Collections.Generic; + using System.IO; + using System.IO.Compression; + using System.Web.Script.Serialization; + using Microsoft.Build.Framework; + using Microsoft.Build.Utilities; + + /// <summary>A build task which packs mod files into a conventional release zip.</summary> + public class CreateModReleaseZip : Task, ITask + { + /********* + ** Accessors + *********/ + /// <summary>The mod files to pack.</summary> + public ITaskItem[] Files { get; set; } + + /// <summary>The name of the mod.</param> + public string ModName { get; set; } + + /// <summary>The absolute or relative path to the folder which should contain the generated zip file.</summary> + public string OutputFolderPath { get; set; } + + + /********* + ** Public methods + *********/ + public override bool Execute() + { + try + { + // create output path if needed + Directory.CreateDirectory(OutputFolderPath); + + // get zip filename + string fileName = string.Format("{0}-{1}.zip", this.ModName, this.GetManifestVersion()); + + // clear old zip file if present + string zipPath = Path.Combine(OutputFolderPath, fileName); + if (File.Exists(zipPath)) + File.Delete(zipPath); + + // create zip file + using (Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write)) + using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create)) + { + foreach (ITaskItem file in Files) + { + // get file info + string filePath = file.ItemSpec; + string entryName = ModName + '/' + file.GetMetadata("RecursiveDir") + file.GetMetadata("Filename") + file.GetMetadata("Extension"); + if (new FileInfo(filePath).Directory.Name.Equals("i18n", StringComparison.InvariantCultureIgnoreCase)) + entryName = Path.Combine("i18n", entryName); + + // add to zip + using (Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read)) + using (Stream fileStreamInZip = archive.CreateEntry(entryName).Open()) + { + fileStream.CopyTo(fileStreamInZip); + } + } + } + + return true; + } + catch (Exception ex) + { + Log.LogErrorFromException(ex); + return false; + } + } + + /// <summary>Get a semantic version from the mod manifest (if available).</summary> + public string GetManifestVersion() + { + // Get the file JSON string + string json = ""; + foreach(ITaskItem file in Files) + { + if(Path.GetFileName(file.ItemSpec).ToLower() != "manifest.json") + continue; + json = File.ReadAllText(file.ItemSpec); + break; + } + + // Serialize the manifest json into a data object, then get a version object from that. + IDictionary<string, object> data = (IDictionary<string, object>)new JavaScriptSerializer().DeserializeObject(json); + IDictionary<string, object> version = (IDictionary<string, object>)data["Version"]; + + // Store our version numbers for ease of use + int major = (int)version["MajorVersion"]; + int minor = (int)version["MinorVersion"]; + int patch = (int)version["PatchVersion"]; + + return String.Format("{0}.{1}.{2}", major, minor, patch); + } + } + ]]> + </Code> + </Task> + </UsingTask> + + + <!--********************************************* + ** Find the basic mod metadata + **********************************************--> + <!--###### + ## import developer's custom settings (if any) + #######--> + <Import Condition="$(OS) != 'Windows_NT' AND Exists('$(HOME)\stardewvalley.targets')" Project="$(HOME)\stardewvalley.targets" /> + <Import Condition="$(OS) == 'Windows_NT' AND Exists('$(USERPROFILE)\stardewvalley.targets')" Project="$(USERPROFILE)\stardewvalley.targets" /> + + <!--###### + ## find platform + game path + #######--> + <Choose> + <When Condition="$(OS) == 'Unix' OR $(OS) == 'OSX'"> + <PropertyGroup> + <!-- Linux --> + <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/GOG Games/Stardew Valley/game</GamePath> + <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/.local/share/Steam/steamapps/common/Stardew Valley</GamePath> + + <!-- Mac (may be 'Unix' or 'OSX') --> + <GamePath Condition="!Exists('$(GamePath)')">/Applications/Stardew Valley.app/Contents/MacOS</GamePath> + <GamePath Condition="!Exists('$(GamePath)')">$(HOME)/Library/Application Support/Steam/steamapps/common/Stardew Valley/Contents/MacOS</GamePath> + </PropertyGroup> + </When> + <When Condition="$(OS) == 'Windows_NT'"> + <PropertyGroup> + <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\GalaxyClient\Games\Stardew Valley</GamePath> + <GamePath Condition="!Exists('$(GamePath)')">C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley</GamePath> + <GamePath Condition="!Exists('$(GamePath)')">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\GOG.com\Games\1453375253', 'PATH', null, RegistryView.Registry32))</GamePath> + <GamePath Condition="!Exists('$(GamePath)')">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 413150', 'InstallLocation', null, RegistryView.Registry64, RegistryView.Registry32))</GamePath> + </PropertyGroup> + </When> + </Choose> + + + <!--********************************************* + ** Inject the assembly references and debugging configuration + **********************************************--> + <Choose> + <When Condition="$(OS) == 'Windows_NT'"> + <!-- references --> + <ItemGroup> + <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> + <Private>false</Private> + </Reference> + <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> + <Private>false</Private> + </Reference> + <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> + <Private>false</Private> + </Reference> + <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> + <Private>false</Private> + </Reference> + <Reference Include="Stardew Valley"> + <HintPath>$(GamePath)\Stardew Valley.exe</HintPath> + <Private>false</Private> + </Reference> + <Reference Include="StardewModdingAPI"> + <HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath> + <Private>false</Private> + </Reference> + <Reference Include="xTile, Version=2.0.4.0, Culture=neutral, processorArchitecture=x86"> + <HintPath>$(GamePath)\xTile.dll</HintPath> + <Private>false</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + </ItemGroup> + + <!-- launch game for debugging --> + <PropertyGroup> + <StartAction>Program</StartAction> + <StartProgram>$(GamePath)\StardewModdingAPI.exe</StartProgram> + <StartWorkingDirectory>$(GamePath)</StartWorkingDirectory> + </PropertyGroup> + </When> + <Otherwise> + <!-- references --> + <ItemGroup> + <Reference Include="MonoGame.Framework"> + <HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath> + <Private>false</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="StardewValley"> + <HintPath>$(GamePath)\StardewValley.exe</HintPath> + <Private>false</Private> + </Reference> + <Reference Include="StardewModdingAPI"> + <HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath> + <Private>false</Private> + </Reference> + <Reference Include="xTile"> + <HintPath>$(GamePath)\xTile.dll</HintPath> + <Private>false</Private> + </Reference> + </ItemGroup> + </Otherwise> + </Choose> + + + <!--********************************************* + ** Perform build logic + **********************************************--> + <!--###### + ## validate metadata before build + #######--> + <Target Name="BeforeBuild"> + <!-- show error for unknown platform --> + <Error Condition="'$(OS)' != 'OSX' AND '$(OS)' != 'Unix' AND '$(OS)' != 'Windows_NT'" Text="The build config package doesn't recognise OS type '$(OS)'." /> + + <!-- if game path is invalid, show one user-friendly error instead of a slew of reference errors --> + <Error Condition="!Exists('$(GamePath)')" Text="Failed to find the game install path. See https://github.com/Pathoschild/Stardew.ModBuildConfig#troubleshoot for help." /> + <Error Condition="'$(OS)' == 'Windows_NT' AND !Exists('$(GamePath)\Stardew Valley.exe')" Text="Found a game folder at $(GamePath), but it doesn't contain Stardew Valley. You should delete this folder if it's empty." /> + <Error Condition="'$(OS)' != 'Windows_NT' AND !Exists('$(GamePath)\StardewValley.exe')" Text="Found a game folder at $(GamePath), but it doesn't contain Stardew Valley. You should delete this folder if it's empty." /> + <Error Condition="!Exists('$(GamePath)\StardewModdingAPI.exe')" Text="Found a game folder at $(GamePath), but it doesn't contain SMAPI." /> + </Target> + + <!--###### + ## Deploy files after build + #######--> + <Target Name="AfterBuild" Condition="'$(DeployModFolderName)' != '' OR '$(DeployModZipTo)' != ''"> + <!--collect file paths--> + <PropertyGroup> + <ModDeployPath>$(GamePath)\Mods\$(DeployModFolderName)</ModDeployPath> + <DeployModZipTo Condition="'$(OS)' != 'Windows_NT'"><!--disable on Linux/Mac where CodeTaskFactory doesn't seem to be available--></DeployModZipTo> + </PropertyGroup> + <ItemGroup> + <BuildFiles Include="$(TargetDir)\**\*.*" Exclude="$(TargetDir)\manifest.json;$(TargetDir)\i18n\**\*.*" /> + + <BuildFiles Include="$(ProjectDir)\manifest.json" Condition="'@(BuildFiles)' != ''" /> + <BuildFiles Include="$(TargetDir)\manifest.json" Condition="'@(BuildFiles)' != '' AND !EXISTS('$(ProjectDir)\manifest.json')" /> + + <I18nFiles Include="$(ProjectDir)\i18n\*.json" Condition="'@(BuildFiles)' != ''" /> + <I18nFiles Include="$(TargetDir)\i18n\*.json" Condition="'@(BuildFiles)' != '' AND !EXISTS('$(ProjectDir)\i18n')" /> + </ItemGroup> + + <!--validate paths--> + <Error Text="Could not deploy mod automatically because no build output was found." Condition="'@(BuildFiles)' == ''" /> + <Error Text="Could not deploy mod automatically because no manifest.json was found in the project or build output." Condition="!Exists('$(TargetDir)\manifest.json') AND !Exists('$(ProjectDir)\manifest.json')" /> + + <!-- copy mod files into mod folder if <DeployModFolderName> property is set --> + <Message Text="Deploying mod to $(ModDeployPath)..." Importance="high" Condition="'$(DeployModFolderName)' != ''" /> + <Copy SourceFiles="@(BuildFiles)" DestinationFolder="$(ModDeployPath)\%(RecursiveDir)" SkipUnchangedFiles="true" Condition="'$(DeployModFolderName)' != ''" /> + <Copy SourceFiles="@(I18nFiles)" DestinationFolder="$(ModDeployPath)\i18n" SkipUnchangedFiles="true" Condition="'$(DeployModFolderName)' != ''" /> + + <!-- create release zip if <DeployModZipTo> property is set --> + <Message Text="Generating mod release at $(DeployModZipTo)\$(MSBuildProjectName).zip..." Importance="high" Condition="'$(DeployModZipTo)' != ''" /> + <CreateModReleaseZip ModName="$(MSBuildProjectName)" Files="@(BuildFiles);@(I18nFiles)" OutputFolderPath="$(DeployModZipTo)" Condition="'$(DeployModZipTo)' != ''" /> + </Target> +</Project> diff --git a/src/ModBuildConfig/package.nuspec b/src/ModBuildConfig/package.nuspec new file mode 100644 index 00000000..b8e96481 --- /dev/null +++ b/src/ModBuildConfig/package.nuspec @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> + <metadata> + <id>Pathoschild.Stardew.ModBuildConfig</id> + <version>1.7.1</version> + <title>MSBuild config for Stardew Valley mods</title> + <authors>Pathoschild</authors> + <owners>Pathoschild</owners> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <licenseUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig/blob/1.7.1/LICENSE.txt</licenseUrl> + <projectUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig#readme</projectUrl> + <iconUrl>https://raw.githubusercontent.com/Pathoschild/Stardew.ModBuildConfig/1.7.1/assets/nuget-icon.png</iconUrl> + <description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods.</description> + <releaseNotes> + 1.7 added an option to create release zips on build and added a reference to XNA's XACT library for audio-related mods. + 1.7.1 fixed an issue where i18n folders were flattened, and ensures that the manifest/i18n files in the project take precedence over those in the build output if both are present.</releaseNotes> + </metadata> + <files> + <file src="build/smapi.targets" target="build/Pathoschild.Stardew.ModBuildConfig.targets" /> + <file src="readme.md" /> + </files> +</package> diff --git a/src/ModBuildConfig/release-notes.md b/src/ModBuildConfig/release-notes.md new file mode 100644 index 00000000..ff2734f8 --- /dev/null +++ b/src/ModBuildConfig/release-notes.md @@ -0,0 +1,28 @@ +## Release notes +### 1.6 +* Added support for deploying mod files into `Mods` automatically. +* Added a build error if a game folder is found, but doesn't contain Stardew Valley or SMAPI. + +### 1.5 +* Added support for setting a custom game path globally. +* Added default GOG path on Mac. + +### 1.4 +* Fixed detection of non-default game paths on 32-bit Windows. +* Removed support for SilVerPLuM (discontinued). +* Removed support for overriding the target platform (no longer needed since SMAPI crossplatforms mods automatically). + +### 1.3 +* Added support for non-default game paths on Windows. + +### 1.2 +* Exclude game binaries from mod build output. + +### 1.1 +* Added support for overriding the target platform. + +### 1.0 +* Initial release. +* Added support for detecting the game path automatically. +* Added support for injecting XNA/MonoGame references automatically based on the OS. +* Added support for mod builders like SilVerPLuM. diff --git a/src/StardewModdingAPI.AssemblyRewriters/Properties/AssemblyInfo.cs b/src/SMAPI.AssemblyRewriters/Properties/AssemblyInfo.cs index 7cc6804a..7cc6804a 100644 --- a/src/StardewModdingAPI.AssemblyRewriters/Properties/AssemblyInfo.cs +++ b/src/SMAPI.AssemblyRewriters/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.AssemblyRewriters/SpriteBatchMethods.cs b/src/SMAPI.AssemblyRewriters/SpriteBatchMethods.cs index a7f100f2..a7f100f2 100644 --- a/src/StardewModdingAPI.AssemblyRewriters/SpriteBatchMethods.cs +++ b/src/SMAPI.AssemblyRewriters/SpriteBatchMethods.cs diff --git a/src/StardewModdingAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj b/src/SMAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj index c8b03086..651b822d 100644 --- a/src/StardewModdingAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj +++ b/src/SMAPI.AssemblyRewriters/StardewModdingAPI.AssemblyRewriters.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -33,12 +33,12 @@ <Reference Include="System" /> </ItemGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs"> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs"> <Link>Properties\GlobalAssemblyInfo.cs</Link> </Compile> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="SpriteBatchMethods.cs" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\common.targets" /> + <Import Project="..\..\build\common.targets" /> </Project>
\ No newline at end of file diff --git a/src/StardewModdingAPI.Installer/Enums/Platform.cs b/src/SMAPI.Installer/Enums/Platform.cs index 9bcaa3c3..9bcaa3c3 100644 --- a/src/StardewModdingAPI.Installer/Enums/Platform.cs +++ b/src/SMAPI.Installer/Enums/Platform.cs diff --git a/src/StardewModdingAPI.Installer/Enums/ScriptAction.cs b/src/SMAPI.Installer/Enums/ScriptAction.cs index e62b2a7c..e62b2a7c 100644 --- a/src/StardewModdingAPI.Installer/Enums/ScriptAction.cs +++ b/src/SMAPI.Installer/Enums/ScriptAction.cs diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs index 1a132e54..1a132e54 100644 --- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs +++ b/src/SMAPI.Installer/InteractiveInstaller.cs diff --git a/src/StardewModdingAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs index 8f328ecf..8f328ecf 100644 --- a/src/StardewModdingAPI.Installer/Program.cs +++ b/src/SMAPI.Installer/Program.cs diff --git a/src/StardewModdingAPI.Installer/Properties/AssemblyInfo.cs b/src/SMAPI.Installer/Properties/AssemblyInfo.cs index 3a6a4648..3a6a4648 100644 --- a/src/StardewModdingAPI.Installer/Properties/AssemblyInfo.cs +++ b/src/SMAPI.Installer/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj index 58ce519c..f8e368a4 100644 --- a/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj +++ b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -36,7 +36,7 @@ <Reference Include="System" /> </ItemGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs"> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs"> <Link>Properties\GlobalAssemblyInfo.cs</Link> </Compile> <Compile Include="Enums\ScriptAction.cs" /> @@ -51,6 +51,6 @@ </Content> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\common.targets" /> - <Import Project="$(SolutionDir)\prepare-install-package.targets" /> + <Import Project="..\..\build\common.targets" /> + <Import Project="..\..\build\prepare-install-package.targets" /> </Project>
\ No newline at end of file diff --git a/src/StardewModdingAPI.Installer/readme.txt b/src/SMAPI.Installer/readme.txt index eb27ac52..eb27ac52 100644 --- a/src/StardewModdingAPI.Installer/readme.txt +++ b/src/SMAPI.Installer/readme.txt diff --git a/src/StardewModdingAPI.Models/ModInfoModel.cs b/src/SMAPI.Models/ModInfoModel.cs index 44071230..44071230 100644 --- a/src/StardewModdingAPI.Models/ModInfoModel.cs +++ b/src/SMAPI.Models/ModInfoModel.cs diff --git a/src/StardewModdingAPI.Models/ModSeachModel.cs b/src/SMAPI.Models/ModSeachModel.cs index 526fbaf3..526fbaf3 100644 --- a/src/StardewModdingAPI.Models/ModSeachModel.cs +++ b/src/SMAPI.Models/ModSeachModel.cs diff --git a/src/StardewModdingAPI.Models/StardewModdingAPI.Models.projitems b/src/SMAPI.Models/StardewModdingAPI.Models.projitems index e2cb29e1..e2cb29e1 100644 --- a/src/StardewModdingAPI.Models/StardewModdingAPI.Models.projitems +++ b/src/SMAPI.Models/StardewModdingAPI.Models.projitems diff --git a/src/StardewModdingAPI.Models/StardewModdingAPI.Models.shproj b/src/SMAPI.Models/StardewModdingAPI.Models.shproj index c80517af..c80517af 100644 --- a/src/StardewModdingAPI.Models/StardewModdingAPI.Models.shproj +++ b/src/SMAPI.Models/StardewModdingAPI.Models.shproj diff --git a/src/StardewModdingAPI.Tests/Core/ModResolverTests.cs b/src/SMAPI.Tests/Core/ModResolverTests.cs index 051ffe99..051ffe99 100644 --- a/src/StardewModdingAPI.Tests/Core/ModResolverTests.cs +++ b/src/SMAPI.Tests/Core/ModResolverTests.cs diff --git a/src/StardewModdingAPI.Tests/Core/TranslationTests.cs b/src/SMAPI.Tests/Core/TranslationTests.cs index 63404a41..63404a41 100644 --- a/src/StardewModdingAPI.Tests/Core/TranslationTests.cs +++ b/src/SMAPI.Tests/Core/TranslationTests.cs diff --git a/src/StardewModdingAPI.Tests/Properties/AssemblyInfo.cs b/src/SMAPI.Tests/Properties/AssemblyInfo.cs index ee09145b..ee09145b 100644 --- a/src/StardewModdingAPI.Tests/Properties/AssemblyInfo.cs +++ b/src/SMAPI.Tests/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.Tests/Sample.cs b/src/SMAPI.Tests/Sample.cs index 99835d92..99835d92 100644 --- a/src/StardewModdingAPI.Tests/Sample.cs +++ b/src/SMAPI.Tests/Sample.cs diff --git a/src/StardewModdingAPI.Tests/StardewModdingAPI.Tests.csproj b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj index 41525bcb..42c3318f 100644 --- a/src/StardewModdingAPI.Tests/StardewModdingAPI.Tests.csproj +++ b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -45,7 +45,7 @@ <Reference Include="System" /> </ItemGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs"> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs"> <Link>Properties\GlobalAssemblyInfo.cs</Link> </Compile> <Compile Include="Utilities\SemanticVersionTests.cs" /> @@ -59,11 +59,11 @@ <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\StardewModdingAPI\StardewModdingAPI.csproj"> + <ProjectReference Include="..\SMAPI\StardewModdingAPI.csproj"> <Project>{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}</Project> <Name>StardewModdingAPI</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\common.targets" /> + <Import Project="..\..\build\common.targets" /> </Project>
\ No newline at end of file diff --git a/src/StardewModdingAPI.Tests/Utilities/SDateTests.cs b/src/SMAPI.Tests/Utilities/SDateTests.cs index 25acbaf3..25acbaf3 100644 --- a/src/StardewModdingAPI.Tests/Utilities/SDateTests.cs +++ b/src/SMAPI.Tests/Utilities/SDateTests.cs diff --git a/src/StardewModdingAPI.Tests/Utilities/SemanticVersionTests.cs b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs index 03cd26c9..03cd26c9 100644 --- a/src/StardewModdingAPI.Tests/Utilities/SemanticVersionTests.cs +++ b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs diff --git a/src/StardewModdingAPI.Tests/packages.config b/src/SMAPI.Tests/packages.config index 5fdfebdb..5fdfebdb 100644 --- a/src/StardewModdingAPI.Tests/packages.config +++ b/src/SMAPI.Tests/packages.config diff --git a/src/StardewModdingAPI.Web/Controllers/ModsController.cs b/src/SMAPI.Web/Controllers/ModsController.cs index 7dcfcf13..7dcfcf13 100644 --- a/src/StardewModdingAPI.Web/Controllers/ModsController.cs +++ b/src/SMAPI.Web/Controllers/ModsController.cs diff --git a/src/StardewModdingAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs index 03de639e..03de639e 100644 --- a/src/StardewModdingAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs +++ b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs diff --git a/src/StardewModdingAPI.Web/Framework/InternalControllerFeatureProvider.cs b/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs index 2c24c610..2c24c610 100644 --- a/src/StardewModdingAPI.Web/Framework/InternalControllerFeatureProvider.cs +++ b/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/BaseRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/BaseRepository.cs index d98acd89..d98acd89 100644 --- a/src/StardewModdingAPI.Web/Framework/ModRepositories/BaseRepository.cs +++ b/src/SMAPI.Web/Framework/ModRepositories/BaseRepository.cs diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs index ed7bd60b..ed7bd60b 100644 --- a/src/StardewModdingAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs +++ b/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs index 174fb79a..174fb79a 100644 --- a/src/StardewModdingAPI.Web/Framework/ModRepositories/GitHubRepository.cs +++ b/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/IModRepository.cs index 98e4c957..98e4c957 100644 --- a/src/StardewModdingAPI.Web/Framework/ModRepositories/IModRepository.cs +++ b/src/SMAPI.Web/Framework/ModRepositories/IModRepository.cs diff --git a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs index 71970bec..71970bec 100644 --- a/src/StardewModdingAPI.Web/Framework/ModRepositories/NexusRepository.cs +++ b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs diff --git a/src/StardewModdingAPI.Web/Framework/RewriteSubdomainRule.cs b/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs index 5a56844f..5a56844f 100644 --- a/src/StardewModdingAPI.Web/Framework/RewriteSubdomainRule.cs +++ b/src/SMAPI.Web/Framework/RewriteSubdomainRule.cs diff --git a/src/StardewModdingAPI.Web/Framework/VersionConstraint.cs b/src/SMAPI.Web/Framework/VersionConstraint.cs index be9c0918..be9c0918 100644 --- a/src/StardewModdingAPI.Web/Framework/VersionConstraint.cs +++ b/src/SMAPI.Web/Framework/VersionConstraint.cs diff --git a/src/StardewModdingAPI.Web/Program.cs b/src/SMAPI.Web/Program.cs index eeecb791..eeecb791 100644 --- a/src/StardewModdingAPI.Web/Program.cs +++ b/src/SMAPI.Web/Program.cs diff --git a/src/StardewModdingAPI.Web/Properties/AssemblyInfo.cs b/src/SMAPI.Web/Properties/AssemblyInfo.cs index 63f787a4..63f787a4 100644 --- a/src/StardewModdingAPI.Web/Properties/AssemblyInfo.cs +++ b/src/SMAPI.Web/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.Web/Properties/launchSettings.json b/src/SMAPI.Web/Properties/launchSettings.json index 3acee14d..3acee14d 100644 --- a/src/StardewModdingAPI.Web/Properties/launchSettings.json +++ b/src/SMAPI.Web/Properties/launchSettings.json diff --git a/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj b/src/SMAPI.Web/StardewModdingAPI.Web.csproj index 746b1a69..6b1d0687 100644 --- a/src/StardewModdingAPI.Web/StardewModdingAPI.Web.csproj +++ b/src/SMAPI.Web/StardewModdingAPI.Web.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk.Web"> +<Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> <TargetFramework>netcoreapp2.0</TargetFramework> @@ -6,7 +6,7 @@ </PropertyGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" /> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" /> </ItemGroup> <ItemGroup> @@ -21,6 +21,6 @@ <ItemGroup> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" /> </ItemGroup> - <Import Project="..\StardewModdingAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" /> + <Import Project="..\SMAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" /> </Project> diff --git a/src/StardewModdingAPI.Web/Startup.cs b/src/SMAPI.Web/Startup.cs index eaf14983..eaf14983 100644 --- a/src/StardewModdingAPI.Web/Startup.cs +++ b/src/SMAPI.Web/Startup.cs diff --git a/src/StardewModdingAPI.Web/appsettings.Development.json b/src/SMAPI.Web/appsettings.Development.json index fa8ce71a..fa8ce71a 100644 --- a/src/StardewModdingAPI.Web/appsettings.Development.json +++ b/src/SMAPI.Web/appsettings.Development.json diff --git a/src/StardewModdingAPI.Web/appsettings.json b/src/SMAPI.Web/appsettings.json index 852f6f71..852f6f71 100644 --- a/src/StardewModdingAPI.Web/appsettings.json +++ b/src/SMAPI.Web/appsettings.json diff --git a/src/StardewModdingAPI.sln b/src/SMAPI.sln index 5e8a2c93..5936ff43 100644 --- a/src/StardewModdingAPI.sln +++ b/src/SMAPI.sln @@ -5,42 +5,50 @@ VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerMod", "TrainerMod\TrainerMod.csproj", "{28480467-1A48-46A7-99F8-236D95225359}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI", "StardewModdingAPI\StardewModdingAPI.csproj", "{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI", "SMAPI\StardewModdingAPI.csproj", "{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "metadata", "metadata", "{86C452BE-D2D8-45B4-B63F-E329EB06CEDA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{86C452BE-D2D8-45B4-B63F-E329EB06CEDA}" ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig + ..\.editorconfig = ..\.editorconfig ..\.gitattributes = ..\.gitattributes ..\.gitignore = ..\.gitignore - common.targets = common.targets - ..\CONTRIBUTING.md = ..\CONTRIBUTING.md - GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs - ..\LICENSE = ..\LICENSE - prepare-install-package.targets = prepare-install-package.targets - ..\README.md = ..\README.md - ..\release-notes.md = ..\release-notes.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.Installer", "StardewModdingAPI.Installer\StardewModdingAPI.Installer.csproj", "{443DDF81-6AAF-420A-A610-3459F37E5575}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.Installer", "SMAPI.Installer\StardewModdingAPI.Installer.csproj", "{443DDF81-6AAF-420A-A610-3459F37E5575}" ProjectSection(ProjectDependencies) = postProject {28480467-1A48-46A7-99F8-236D95225359} = {28480467-1A48-46A7-99F8-236D95225359} {F1A573B0-F436-472C-AE29-0B91EA6B9F8F} = {F1A573B0-F436-472C-AE29-0B91EA6B9F8F} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.AssemblyRewriters", "StardewModdingAPI.AssemblyRewriters\StardewModdingAPI.AssemblyRewriters.csproj", "{10DB0676-9FC1-4771-A2C8-E2519F091E49}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.AssemblyRewriters", "SMAPI.AssemblyRewriters\StardewModdingAPI.AssemblyRewriters.csproj", "{10DB0676-9FC1-4771-A2C8-E2519F091E49}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.Tests", "StardewModdingAPI.Tests\StardewModdingAPI.Tests.csproj", "{36CCB19E-92EB-48C7-9615-98EEFD45109B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI.Tests", "SMAPI.Tests\StardewModdingAPI.Tests.csproj", "{36CCB19E-92EB-48C7-9615-98EEFD45109B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StardewModdingAPI.Web", "StardewModdingAPI.Web\StardewModdingAPI.Web.csproj", "{A308F679-51A3-4006-92D5-BAEC7EBD01A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StardewModdingAPI.Web", "SMAPI.Web\StardewModdingAPI.Web.csproj", "{A308F679-51A3-4006-92D5-BAEC7EBD01A1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Internal", "Internal", "{82D22ED7-A0A7-4D64-8E92-4B6A5E74ED11}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "StardewModdingAPI.Models", "StardewModdingAPI.Models\StardewModdingAPI.Models.shproj", "{2AA02FB6-FF03-41CF-A215-2EE60AB4F5DC}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "StardewModdingAPI.Models", "SMAPI.Models\StardewModdingAPI.Models.shproj", "{2AA02FB6-FF03-41CF-A215-2EE60AB4F5DC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{EB35A917-67B9-4EFA-8DFC-4FB49B3949BB}" + ProjectSection(SolutionItems) = preProject + ..\docs\CONTRIBUTING.md = ..\docs\CONTRIBUTING.md + ..\docs\LICENSE.md = ..\docs\LICENSE.md + ..\docs\README.md = ..\docs\README.md + ..\docs\release-notes.md = ..\docs\release-notes.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{09CF91E5-5BAB-4650-A200-E5EA9A633046}" + ProjectSection(SolutionItems) = preProject + ..\build\common.targets = ..\build\common.targets + ..\build\GlobalAssemblyInfo.cs = ..\build\GlobalAssemblyInfo.cs + ..\build\prepare-install-package.targets = ..\build\prepare-install-package.targets + EndProjectSection EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - StardewModdingAPI.Models\StardewModdingAPI.Models.projitems*{2aa02fb6-ff03-41cf-a215-2ee60ab4f5dc}*SharedItemsImports = 13 - StardewModdingAPI.Models\StardewModdingAPI.Models.projitems*{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}*SharedItemsImports = 4 + SMAPI.Models\StardewModdingAPI.Models.projitems*{2aa02fb6-ff03-41cf-a215-2ee60ab4f5dc}*SharedItemsImports = 13 + SMAPI.Models\StardewModdingAPI.Models.projitems*{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -121,6 +129,8 @@ Global {10DB0676-9FC1-4771-A2C8-E2519F091E49} = {82D22ED7-A0A7-4D64-8E92-4B6A5E74ED11} {36CCB19E-92EB-48C7-9615-98EEFD45109B} = {82D22ED7-A0A7-4D64-8E92-4B6A5E74ED11} {2AA02FB6-FF03-41CF-A215-2EE60AB4F5DC} = {82D22ED7-A0A7-4D64-8E92-4B6A5E74ED11} + {EB35A917-67B9-4EFA-8DFC-4FB49B3949BB} = {86C452BE-D2D8-45B4-B63F-E329EB06CEDA} + {09CF91E5-5BAB-4650-A200-E5EA9A633046} = {86C452BE-D2D8-45B4-B63F-E329EB06CEDA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {70143042-A862-47A8-A677-7C819DDC90DC} diff --git a/src/StardewModdingAPI.sln.DotSettings b/src/SMAPI.sln.DotSettings index d16ef684..d16ef684 100644 --- a/src/StardewModdingAPI.sln.DotSettings +++ b/src/SMAPI.sln.DotSettings diff --git a/src/StardewModdingAPI/App.config b/src/SMAPI/App.config index 27cdf0f7..27cdf0f7 100644 --- a/src/StardewModdingAPI/App.config +++ b/src/SMAPI/App.config diff --git a/src/StardewModdingAPI/Constants.cs b/src/SMAPI/Constants.cs index 4d0a9ca9..4d0a9ca9 100644 --- a/src/StardewModdingAPI/Constants.cs +++ b/src/SMAPI/Constants.cs diff --git a/src/StardewModdingAPI/ContentSource.cs b/src/SMAPI/ContentSource.cs index 35c8bc21..35c8bc21 100644 --- a/src/StardewModdingAPI/ContentSource.cs +++ b/src/SMAPI/ContentSource.cs diff --git a/src/StardewModdingAPI/Context.cs b/src/SMAPI/Context.cs index 119e14c8..119e14c8 100644 --- a/src/StardewModdingAPI/Context.cs +++ b/src/SMAPI/Context.cs diff --git a/src/StardewModdingAPI/Events/ChangeType.cs b/src/SMAPI/Events/ChangeType.cs index 4b207f08..4b207f08 100644 --- a/src/StardewModdingAPI/Events/ChangeType.cs +++ b/src/SMAPI/Events/ChangeType.cs diff --git a/src/StardewModdingAPI/Events/ContentEvents.cs b/src/SMAPI/Events/ContentEvents.cs index 4b4e2ad0..4b4e2ad0 100644 --- a/src/StardewModdingAPI/Events/ContentEvents.cs +++ b/src/SMAPI/Events/ContentEvents.cs diff --git a/src/StardewModdingAPI/Events/ControlEvents.cs b/src/SMAPI/Events/ControlEvents.cs index 80d0f547..80d0f547 100644 --- a/src/StardewModdingAPI/Events/ControlEvents.cs +++ b/src/SMAPI/Events/ControlEvents.cs diff --git a/src/StardewModdingAPI/Events/EventArgsClickableMenuChanged.cs b/src/SMAPI/Events/EventArgsClickableMenuChanged.cs index 2a2aa163..2a2aa163 100644 --- a/src/StardewModdingAPI/Events/EventArgsClickableMenuChanged.cs +++ b/src/SMAPI/Events/EventArgsClickableMenuChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsClickableMenuClosed.cs b/src/SMAPI/Events/EventArgsClickableMenuClosed.cs index 5e6585f0..5e6585f0 100644 --- a/src/StardewModdingAPI/Events/EventArgsClickableMenuClosed.cs +++ b/src/SMAPI/Events/EventArgsClickableMenuClosed.cs diff --git a/src/StardewModdingAPI/Events/EventArgsControllerButtonPressed.cs b/src/SMAPI/Events/EventArgsControllerButtonPressed.cs index 3243b80b..3243b80b 100644 --- a/src/StardewModdingAPI/Events/EventArgsControllerButtonPressed.cs +++ b/src/SMAPI/Events/EventArgsControllerButtonPressed.cs diff --git a/src/StardewModdingAPI/Events/EventArgsControllerButtonReleased.cs b/src/SMAPI/Events/EventArgsControllerButtonReleased.cs index e05a080b..e05a080b 100644 --- a/src/StardewModdingAPI/Events/EventArgsControllerButtonReleased.cs +++ b/src/SMAPI/Events/EventArgsControllerButtonReleased.cs diff --git a/src/StardewModdingAPI/Events/EventArgsControllerTriggerPressed.cs b/src/SMAPI/Events/EventArgsControllerTriggerPressed.cs index a2087733..a2087733 100644 --- a/src/StardewModdingAPI/Events/EventArgsControllerTriggerPressed.cs +++ b/src/SMAPI/Events/EventArgsControllerTriggerPressed.cs diff --git a/src/StardewModdingAPI/Events/EventArgsControllerTriggerReleased.cs b/src/SMAPI/Events/EventArgsControllerTriggerReleased.cs index d2eecbec..d2eecbec 100644 --- a/src/StardewModdingAPI/Events/EventArgsControllerTriggerReleased.cs +++ b/src/SMAPI/Events/EventArgsControllerTriggerReleased.cs diff --git a/src/StardewModdingAPI/Events/EventArgsCurrentLocationChanged.cs b/src/SMAPI/Events/EventArgsCurrentLocationChanged.cs index 25d3ebf3..25d3ebf3 100644 --- a/src/StardewModdingAPI/Events/EventArgsCurrentLocationChanged.cs +++ b/src/SMAPI/Events/EventArgsCurrentLocationChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsGameLocationsChanged.cs b/src/SMAPI/Events/EventArgsGameLocationsChanged.cs index fb8c821e..fb8c821e 100644 --- a/src/StardewModdingAPI/Events/EventArgsGameLocationsChanged.cs +++ b/src/SMAPI/Events/EventArgsGameLocationsChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsInput.cs b/src/SMAPI/Events/EventArgsInput.cs index 66cb19f2..66cb19f2 100644 --- a/src/StardewModdingAPI/Events/EventArgsInput.cs +++ b/src/SMAPI/Events/EventArgsInput.cs diff --git a/src/StardewModdingAPI/Events/EventArgsIntChanged.cs b/src/SMAPI/Events/EventArgsIntChanged.cs index 0c742d12..0c742d12 100644 --- a/src/StardewModdingAPI/Events/EventArgsIntChanged.cs +++ b/src/SMAPI/Events/EventArgsIntChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs b/src/SMAPI/Events/EventArgsInventoryChanged.cs index 1ee02842..1ee02842 100644 --- a/src/StardewModdingAPI/Events/EventArgsInventoryChanged.cs +++ b/src/SMAPI/Events/EventArgsInventoryChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsKeyPressed.cs b/src/SMAPI/Events/EventArgsKeyPressed.cs index d9d81e10..d9d81e10 100644 --- a/src/StardewModdingAPI/Events/EventArgsKeyPressed.cs +++ b/src/SMAPI/Events/EventArgsKeyPressed.cs diff --git a/src/StardewModdingAPI/Events/EventArgsKeyboardStateChanged.cs b/src/SMAPI/Events/EventArgsKeyboardStateChanged.cs index 14e397ce..14e397ce 100644 --- a/src/StardewModdingAPI/Events/EventArgsKeyboardStateChanged.cs +++ b/src/SMAPI/Events/EventArgsKeyboardStateChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsLevelUp.cs b/src/SMAPI/Events/EventArgsLevelUp.cs index fe6696d4..fe6696d4 100644 --- a/src/StardewModdingAPI/Events/EventArgsLevelUp.cs +++ b/src/SMAPI/Events/EventArgsLevelUp.cs diff --git a/src/StardewModdingAPI/Events/EventArgsLocationObjectsChanged.cs b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs index 058999e9..058999e9 100644 --- a/src/StardewModdingAPI/Events/EventArgsLocationObjectsChanged.cs +++ b/src/SMAPI/Events/EventArgsLocationObjectsChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsMineLevelChanged.cs b/src/SMAPI/Events/EventArgsMineLevelChanged.cs index c82fed35..c82fed35 100644 --- a/src/StardewModdingAPI/Events/EventArgsMineLevelChanged.cs +++ b/src/SMAPI/Events/EventArgsMineLevelChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsMouseStateChanged.cs b/src/SMAPI/Events/EventArgsMouseStateChanged.cs index 57298164..57298164 100644 --- a/src/StardewModdingAPI/Events/EventArgsMouseStateChanged.cs +++ b/src/SMAPI/Events/EventArgsMouseStateChanged.cs diff --git a/src/StardewModdingAPI/Events/EventArgsValueChanged.cs b/src/SMAPI/Events/EventArgsValueChanged.cs index 1d25af49..1d25af49 100644 --- a/src/StardewModdingAPI/Events/EventArgsValueChanged.cs +++ b/src/SMAPI/Events/EventArgsValueChanged.cs diff --git a/src/StardewModdingAPI/Events/GameEvents.cs b/src/SMAPI/Events/GameEvents.cs index b477376e..b477376e 100644 --- a/src/StardewModdingAPI/Events/GameEvents.cs +++ b/src/SMAPI/Events/GameEvents.cs diff --git a/src/StardewModdingAPI/Events/GraphicsEvents.cs b/src/SMAPI/Events/GraphicsEvents.cs index fff51bed..fff51bed 100644 --- a/src/StardewModdingAPI/Events/GraphicsEvents.cs +++ b/src/SMAPI/Events/GraphicsEvents.cs diff --git a/src/StardewModdingAPI/Events/InputEvents.cs b/src/SMAPI/Events/InputEvents.cs index c31eb698..c31eb698 100644 --- a/src/StardewModdingAPI/Events/InputEvents.cs +++ b/src/SMAPI/Events/InputEvents.cs diff --git a/src/StardewModdingAPI/Events/ItemStackChange.cs b/src/SMAPI/Events/ItemStackChange.cs index f9ae6df6..f9ae6df6 100644 --- a/src/StardewModdingAPI/Events/ItemStackChange.cs +++ b/src/SMAPI/Events/ItemStackChange.cs diff --git a/src/StardewModdingAPI/Events/LocationEvents.cs b/src/SMAPI/Events/LocationEvents.cs index b834bc1c..b834bc1c 100644 --- a/src/StardewModdingAPI/Events/LocationEvents.cs +++ b/src/SMAPI/Events/LocationEvents.cs diff --git a/src/StardewModdingAPI/Events/MenuEvents.cs b/src/SMAPI/Events/MenuEvents.cs index bd8d897e..bd8d897e 100644 --- a/src/StardewModdingAPI/Events/MenuEvents.cs +++ b/src/SMAPI/Events/MenuEvents.cs diff --git a/src/StardewModdingAPI/Events/MineEvents.cs b/src/SMAPI/Events/MineEvents.cs index 9cf7edac..9cf7edac 100644 --- a/src/StardewModdingAPI/Events/MineEvents.cs +++ b/src/SMAPI/Events/MineEvents.cs diff --git a/src/StardewModdingAPI/Events/PlayerEvents.cs b/src/SMAPI/Events/PlayerEvents.cs index 5a9a9d5f..5a9a9d5f 100644 --- a/src/StardewModdingAPI/Events/PlayerEvents.cs +++ b/src/SMAPI/Events/PlayerEvents.cs diff --git a/src/StardewModdingAPI/Events/SaveEvents.cs b/src/SMAPI/Events/SaveEvents.cs index 50e6d729..50e6d729 100644 --- a/src/StardewModdingAPI/Events/SaveEvents.cs +++ b/src/SMAPI/Events/SaveEvents.cs diff --git a/src/StardewModdingAPI/Events/TimeEvents.cs b/src/SMAPI/Events/TimeEvents.cs index 9aea5e04..9aea5e04 100644 --- a/src/StardewModdingAPI/Events/TimeEvents.cs +++ b/src/SMAPI/Events/TimeEvents.cs diff --git a/src/StardewModdingAPI/Framework/Command.cs b/src/SMAPI/Framework/Command.cs index 943e018d..943e018d 100644 --- a/src/StardewModdingAPI/Framework/Command.cs +++ b/src/SMAPI/Framework/Command.cs diff --git a/src/StardewModdingAPI/Framework/CommandManager.cs b/src/SMAPI/Framework/CommandManager.cs index 79a23d03..79a23d03 100644 --- a/src/StardewModdingAPI/Framework/CommandManager.cs +++ b/src/SMAPI/Framework/CommandManager.cs diff --git a/src/StardewModdingAPI/Framework/Content/AssetData.cs b/src/SMAPI/Framework/Content/AssetData.cs index 1ab9eebd..1ab9eebd 100644 --- a/src/StardewModdingAPI/Framework/Content/AssetData.cs +++ b/src/SMAPI/Framework/Content/AssetData.cs diff --git a/src/StardewModdingAPI/Framework/Content/AssetDataForDictionary.cs b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs index e9b29b12..e9b29b12 100644 --- a/src/StardewModdingAPI/Framework/Content/AssetDataForDictionary.cs +++ b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs diff --git a/src/StardewModdingAPI/Framework/Content/AssetDataForImage.cs b/src/SMAPI/Framework/Content/AssetDataForImage.cs index 45c5588b..45c5588b 100644 --- a/src/StardewModdingAPI/Framework/Content/AssetDataForImage.cs +++ b/src/SMAPI/Framework/Content/AssetDataForImage.cs diff --git a/src/StardewModdingAPI/Framework/Content/AssetDataForObject.cs b/src/SMAPI/Framework/Content/AssetDataForObject.cs index f30003e4..f30003e4 100644 --- a/src/StardewModdingAPI/Framework/Content/AssetDataForObject.cs +++ b/src/SMAPI/Framework/Content/AssetDataForObject.cs diff --git a/src/StardewModdingAPI/Framework/Content/AssetInfo.cs b/src/SMAPI/Framework/Content/AssetInfo.cs index d580dc06..d580dc06 100644 --- a/src/StardewModdingAPI/Framework/Content/AssetInfo.cs +++ b/src/SMAPI/Framework/Content/AssetInfo.cs diff --git a/src/StardewModdingAPI/Framework/ContentManagerShim.cs b/src/SMAPI/Framework/ContentManagerShim.cs index d46f23a3..d46f23a3 100644 --- a/src/StardewModdingAPI/Framework/ContentManagerShim.cs +++ b/src/SMAPI/Framework/ContentManagerShim.cs diff --git a/src/StardewModdingAPI/Framework/CursorPosition.cs b/src/SMAPI/Framework/CursorPosition.cs index db02b3d1..db02b3d1 100644 --- a/src/StardewModdingAPI/Framework/CursorPosition.cs +++ b/src/SMAPI/Framework/CursorPosition.cs diff --git a/src/StardewModdingAPI/Framework/DeprecationLevel.cs b/src/SMAPI/Framework/DeprecationLevel.cs index c0044053..c0044053 100644 --- a/src/StardewModdingAPI/Framework/DeprecationLevel.cs +++ b/src/SMAPI/Framework/DeprecationLevel.cs diff --git a/src/StardewModdingAPI/Framework/DeprecationManager.cs b/src/SMAPI/Framework/DeprecationManager.cs index b07c6c7d..b07c6c7d 100644 --- a/src/StardewModdingAPI/Framework/DeprecationManager.cs +++ b/src/SMAPI/Framework/DeprecationManager.cs diff --git a/src/StardewModdingAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs index ec9279f1..ec9279f1 100644 --- a/src/StardewModdingAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs +++ b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs diff --git a/src/StardewModdingAPI/Framework/Exceptions/SContentLoadException.cs b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs index 85d85e3d..85d85e3d 100644 --- a/src/StardewModdingAPI/Framework/Exceptions/SContentLoadException.cs +++ b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs diff --git a/src/StardewModdingAPI/Framework/Exceptions/SParseException.cs b/src/SMAPI/Framework/Exceptions/SParseException.cs index f7133ee7..f7133ee7 100644 --- a/src/StardewModdingAPI/Framework/Exceptions/SParseException.cs +++ b/src/SMAPI/Framework/Exceptions/SParseException.cs diff --git a/src/StardewModdingAPI/Framework/GameVersion.cs b/src/SMAPI/Framework/GameVersion.cs index 48159f61..48159f61 100644 --- a/src/StardewModdingAPI/Framework/GameVersion.cs +++ b/src/SMAPI/Framework/GameVersion.cs diff --git a/src/StardewModdingAPI/Framework/IModMetadata.cs b/src/SMAPI/Framework/IModMetadata.cs index c21734a7..c21734a7 100644 --- a/src/StardewModdingAPI/Framework/IModMetadata.cs +++ b/src/SMAPI/Framework/IModMetadata.cs diff --git a/src/StardewModdingAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs index 3709e05d..3709e05d 100644 --- a/src/StardewModdingAPI/Framework/InternalExtensions.cs +++ b/src/SMAPI/Framework/InternalExtensions.cs diff --git a/src/StardewModdingAPI/Framework/Logging/ConsoleInterceptionManager.cs b/src/SMAPI/Framework/Logging/ConsoleInterceptionManager.cs index b8f2c34e..b8f2c34e 100644 --- a/src/StardewModdingAPI/Framework/Logging/ConsoleInterceptionManager.cs +++ b/src/SMAPI/Framework/Logging/ConsoleInterceptionManager.cs diff --git a/src/StardewModdingAPI/Framework/Logging/InterceptingTextWriter.cs b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs index 9ca61b59..9ca61b59 100644 --- a/src/StardewModdingAPI/Framework/Logging/InterceptingTextWriter.cs +++ b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs diff --git a/src/StardewModdingAPI/Framework/Logging/LogFileManager.cs b/src/SMAPI/Framework/Logging/LogFileManager.cs index 8cfe0527..8cfe0527 100644 --- a/src/StardewModdingAPI/Framework/Logging/LogFileManager.cs +++ b/src/SMAPI/Framework/Logging/LogFileManager.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/BaseHelper.cs b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs index 16032da1..16032da1 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/BaseHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/CommandHelper.cs b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs index bdedb07c..bdedb07c 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/CommandHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs index 4440ae40..4440ae40 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/ModHelper.cs b/src/SMAPI/Framework/ModHelpers/ModHelper.cs index 665b9cf4..665b9cf4 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/ModHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ModHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs index 9e824694..9e824694 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/ModRegistryHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/ReflectionHelper.cs b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs index 8d435416..8d435416 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/ReflectionHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs index bbe3a81a..bbe3a81a 100644 --- a/src/StardewModdingAPI/Framework/ModHelpers/TranslationHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs index 4378798c..4378798c 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs +++ b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoadStatus.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs index 11be19fc..11be19fc 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoadStatus.cs +++ b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs index 1e3c4a05..1e3c4a05 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs +++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs index b56a776c..b56a776c 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyParseResult.cs +++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Finders/EventFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs index e4beb7a9..e4beb7a9 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Finders/EventFinder.cs +++ b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Finders/FieldFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs index 00805815..00805815 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Finders/FieldFinder.cs +++ b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Finders/MethodFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs index 5358f181..5358f181 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Finders/MethodFinder.cs +++ b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Finders/PropertyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs index e54c86cf..e54c86cf 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Finders/PropertyFinder.cs +++ b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Finders/TypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs index 45349def..45349def 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Finders/TypeFinder.cs +++ b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/IInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs index 8830cc74..8830cc74 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/IInstructionHandler.cs +++ b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/IncompatibleInstructionException.cs b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs index 17ec24b1..17ec24b1 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/IncompatibleInstructionException.cs +++ b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/InstructionHandleResult.cs b/src/SMAPI/Framework/ModLoading/InstructionHandleResult.cs index 0ae598fc..0ae598fc 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/InstructionHandleResult.cs +++ b/src/SMAPI/Framework/ModLoading/InstructionHandleResult.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/InvalidModStateException.cs b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs index 075e237a..075e237a 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/InvalidModStateException.cs +++ b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/ModDependencyStatus.cs b/src/SMAPI/Framework/ModLoading/ModDependencyStatus.cs index 0774b487..0774b487 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/ModDependencyStatus.cs +++ b/src/SMAPI/Framework/ModLoading/ModDependencyStatus.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/ModMetadata.cs b/src/SMAPI/Framework/ModLoading/ModMetadata.cs index 5055da75..5055da75 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/ModMetadata.cs +++ b/src/SMAPI/Framework/ModLoading/ModMetadata.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/ModMetadataStatus.cs b/src/SMAPI/Framework/ModLoading/ModMetadataStatus.cs index ab65f7b4..ab65f7b4 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/ModMetadataStatus.cs +++ b/src/SMAPI/Framework/ModLoading/ModMetadataStatus.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index d0ef1b08..d0ef1b08 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Platform.cs b/src/SMAPI/Framework/ModLoading/Platform.cs index 45e881c4..45e881c4 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Platform.cs +++ b/src/SMAPI/Framework/ModLoading/Platform.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/PlatformAssemblyMap.cs b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs index 463f45e8..463f45e8 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/PlatformAssemblyMap.cs +++ b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/RewriteHelper.cs b/src/SMAPI/Framework/ModLoading/RewriteHelper.cs index 56a60a72..56a60a72 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/RewriteHelper.cs +++ b/src/SMAPI/Framework/ModLoading/RewriteHelper.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs index 63358b39..63358b39 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs +++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs index a20b8bee..a20b8bee 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs +++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldToPropertyRewriter.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs index 974fcf4c..974fcf4c 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs +++ b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs index 74f2fcdd..74f2fcdd 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs +++ b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs diff --git a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs b/src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs index 322a7df1..322a7df1 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs +++ b/src/SMAPI/Framework/ModLoading/Rewriters/VirtualEntryCallRemover.cs diff --git a/src/StardewModdingAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs index 9dde7a20..9dde7a20 100644 --- a/src/StardewModdingAPI/Framework/ModRegistry.cs +++ b/src/SMAPI/Framework/ModRegistry.cs diff --git a/src/StardewModdingAPI/Framework/Models/Manifest.cs b/src/SMAPI/Framework/Models/Manifest.cs index b85787e5..b85787e5 100644 --- a/src/StardewModdingAPI/Framework/Models/Manifest.cs +++ b/src/SMAPI/Framework/Models/Manifest.cs diff --git a/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs b/src/SMAPI/Framework/Models/ManifestDependency.cs index 5646b335..5646b335 100644 --- a/src/StardewModdingAPI/Framework/Models/ManifestDependency.cs +++ b/src/SMAPI/Framework/Models/ManifestDependency.cs diff --git a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs b/src/SMAPI/Framework/Models/ModCompatibility.cs index 54737e6c..54737e6c 100644 --- a/src/StardewModdingAPI/Framework/Models/ModCompatibility.cs +++ b/src/SMAPI/Framework/Models/ModCompatibility.cs diff --git a/src/StardewModdingAPI/Framework/Models/ModDataID.cs b/src/SMAPI/Framework/Models/ModDataID.cs index d19434fa..d19434fa 100644 --- a/src/StardewModdingAPI/Framework/Models/ModDataID.cs +++ b/src/SMAPI/Framework/Models/ModDataID.cs diff --git a/src/StardewModdingAPI/Framework/Models/ModDataRecord.cs b/src/SMAPI/Framework/Models/ModDataRecord.cs index c6a12188..c6a12188 100644 --- a/src/StardewModdingAPI/Framework/Models/ModDataRecord.cs +++ b/src/SMAPI/Framework/Models/ModDataRecord.cs diff --git a/src/StardewModdingAPI/Framework/Models/ModStatus.cs b/src/SMAPI/Framework/Models/ModStatus.cs index 343ccb7e..343ccb7e 100644 --- a/src/StardewModdingAPI/Framework/Models/ModStatus.cs +++ b/src/SMAPI/Framework/Models/ModStatus.cs diff --git a/src/StardewModdingAPI/Framework/Models/SConfig.cs b/src/SMAPI/Framework/Models/SConfig.cs index 401e1a3a..401e1a3a 100644 --- a/src/StardewModdingAPI/Framework/Models/SConfig.cs +++ b/src/SMAPI/Framework/Models/SConfig.cs diff --git a/src/StardewModdingAPI/Framework/Monitor.cs b/src/SMAPI/Framework/Monitor.cs index bf338386..bf338386 100644 --- a/src/StardewModdingAPI/Framework/Monitor.cs +++ b/src/SMAPI/Framework/Monitor.cs diff --git a/src/StardewModdingAPI/Framework/Reflection/CacheEntry.cs b/src/SMAPI/Framework/Reflection/CacheEntry.cs index 30faca37..30faca37 100644 --- a/src/StardewModdingAPI/Framework/Reflection/CacheEntry.cs +++ b/src/SMAPI/Framework/Reflection/CacheEntry.cs diff --git a/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs b/src/SMAPI/Framework/Reflection/PrivateField.cs index 0bf45969..0bf45969 100644 --- a/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs +++ b/src/SMAPI/Framework/Reflection/PrivateField.cs diff --git a/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs b/src/SMAPI/Framework/Reflection/PrivateMethod.cs index ba2374f4..ba2374f4 100644 --- a/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs +++ b/src/SMAPI/Framework/Reflection/PrivateMethod.cs diff --git a/src/StardewModdingAPI/Framework/Reflection/PrivateProperty.cs b/src/SMAPI/Framework/Reflection/PrivateProperty.cs index 08204b7e..08204b7e 100644 --- a/src/StardewModdingAPI/Framework/Reflection/PrivateProperty.cs +++ b/src/SMAPI/Framework/Reflection/PrivateProperty.cs diff --git a/src/StardewModdingAPI/Framework/Reflection/Reflector.cs b/src/SMAPI/Framework/Reflection/Reflector.cs index 5c2d90fa..5c2d90fa 100644 --- a/src/StardewModdingAPI/Framework/Reflection/Reflector.cs +++ b/src/SMAPI/Framework/Reflection/Reflector.cs diff --git a/src/StardewModdingAPI/Framework/RequestExitDelegate.cs b/src/SMAPI/Framework/RequestExitDelegate.cs index 12d0ea0c..12d0ea0c 100644 --- a/src/StardewModdingAPI/Framework/RequestExitDelegate.cs +++ b/src/SMAPI/Framework/RequestExitDelegate.cs diff --git a/src/StardewModdingAPI/Framework/SContentManager.cs b/src/SMAPI/Framework/SContentManager.cs index 43de6e96..43de6e96 100644 --- a/src/StardewModdingAPI/Framework/SContentManager.cs +++ b/src/SMAPI/Framework/SContentManager.cs diff --git a/src/StardewModdingAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs index 7287cab7..7287cab7 100644 --- a/src/StardewModdingAPI/Framework/SGame.cs +++ b/src/SMAPI/Framework/SGame.cs diff --git a/src/StardewModdingAPI/Framework/Serialisation/JsonHelper.cs b/src/SMAPI/Framework/Serialisation/JsonHelper.cs index 3193aa3c..3193aa3c 100644 --- a/src/StardewModdingAPI/Framework/Serialisation/JsonHelper.cs +++ b/src/SMAPI/Framework/Serialisation/JsonHelper.cs diff --git a/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs b/src/SMAPI/Framework/Serialisation/SFieldConverter.cs index 917c950d..917c950d 100644 --- a/src/StardewModdingAPI/Framework/Serialisation/SFieldConverter.cs +++ b/src/SMAPI/Framework/Serialisation/SFieldConverter.cs diff --git a/src/StardewModdingAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs b/src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs index 37108556..37108556 100644 --- a/src/StardewModdingAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs +++ b/src/SMAPI/Framework/Serialisation/SelectiveStringEnumConverter.cs diff --git a/src/StardewModdingAPI/Framework/Utilities/ContextHash.cs b/src/SMAPI/Framework/Utilities/ContextHash.cs index 6c0fdc90..6c0fdc90 100644 --- a/src/StardewModdingAPI/Framework/Utilities/ContextHash.cs +++ b/src/SMAPI/Framework/Utilities/ContextHash.cs diff --git a/src/StardewModdingAPI/Framework/Utilities/Countdown.cs b/src/SMAPI/Framework/Utilities/Countdown.cs index 921a35ce..921a35ce 100644 --- a/src/StardewModdingAPI/Framework/Utilities/Countdown.cs +++ b/src/SMAPI/Framework/Utilities/Countdown.cs diff --git a/src/StardewModdingAPI/Framework/WebApiClient.cs b/src/SMAPI/Framework/WebApiClient.cs index f3c7de28..f3c7de28 100644 --- a/src/StardewModdingAPI/Framework/WebApiClient.cs +++ b/src/SMAPI/Framework/WebApiClient.cs diff --git a/src/StardewModdingAPI/IAssetData.cs b/src/SMAPI/IAssetData.cs index c3021144..c3021144 100644 --- a/src/StardewModdingAPI/IAssetData.cs +++ b/src/SMAPI/IAssetData.cs diff --git a/src/StardewModdingAPI/IAssetDataForDictionary.cs b/src/SMAPI/IAssetDataForDictionary.cs index 53c24346..53c24346 100644 --- a/src/StardewModdingAPI/IAssetDataForDictionary.cs +++ b/src/SMAPI/IAssetDataForDictionary.cs diff --git a/src/StardewModdingAPI/IAssetDataForImage.cs b/src/SMAPI/IAssetDataForImage.cs index 4584a20e..4584a20e 100644 --- a/src/StardewModdingAPI/IAssetDataForImage.cs +++ b/src/SMAPI/IAssetDataForImage.cs diff --git a/src/StardewModdingAPI/IAssetEditor.cs b/src/SMAPI/IAssetEditor.cs index d2c6f295..d2c6f295 100644 --- a/src/StardewModdingAPI/IAssetEditor.cs +++ b/src/SMAPI/IAssetEditor.cs diff --git a/src/StardewModdingAPI/IAssetInfo.cs b/src/SMAPI/IAssetInfo.cs index 5dd58e2e..5dd58e2e 100644 --- a/src/StardewModdingAPI/IAssetInfo.cs +++ b/src/SMAPI/IAssetInfo.cs diff --git a/src/StardewModdingAPI/IAssetLoader.cs b/src/SMAPI/IAssetLoader.cs index ad97b941..ad97b941 100644 --- a/src/StardewModdingAPI/IAssetLoader.cs +++ b/src/SMAPI/IAssetLoader.cs diff --git a/src/StardewModdingAPI/ICommandHelper.cs b/src/SMAPI/ICommandHelper.cs index fb562e32..fb562e32 100644 --- a/src/StardewModdingAPI/ICommandHelper.cs +++ b/src/SMAPI/ICommandHelper.cs diff --git a/src/StardewModdingAPI/IContentHelper.cs b/src/SMAPI/IContentHelper.cs index b78b165b..b78b165b 100644 --- a/src/StardewModdingAPI/IContentHelper.cs +++ b/src/SMAPI/IContentHelper.cs diff --git a/src/StardewModdingAPI/ICursorPosition.cs b/src/SMAPI/ICursorPosition.cs index ddb8eb49..ddb8eb49 100644 --- a/src/StardewModdingAPI/ICursorPosition.cs +++ b/src/SMAPI/ICursorPosition.cs diff --git a/src/StardewModdingAPI/IManifest.cs b/src/SMAPI/IManifest.cs index 9db1d538..9db1d538 100644 --- a/src/StardewModdingAPI/IManifest.cs +++ b/src/SMAPI/IManifest.cs diff --git a/src/StardewModdingAPI/IManifestDependency.cs b/src/SMAPI/IManifestDependency.cs index e86cd1f4..e86cd1f4 100644 --- a/src/StardewModdingAPI/IManifestDependency.cs +++ b/src/SMAPI/IManifestDependency.cs diff --git a/src/StardewModdingAPI/IMod.cs b/src/SMAPI/IMod.cs index 35ac7c0f..35ac7c0f 100644 --- a/src/StardewModdingAPI/IMod.cs +++ b/src/SMAPI/IMod.cs diff --git a/src/StardewModdingAPI/IModHelper.cs b/src/SMAPI/IModHelper.cs index 116e8508..116e8508 100644 --- a/src/StardewModdingAPI/IModHelper.cs +++ b/src/SMAPI/IModHelper.cs diff --git a/src/StardewModdingAPI/IModLinked.cs b/src/SMAPI/IModLinked.cs index 172ee30c..172ee30c 100644 --- a/src/StardewModdingAPI/IModLinked.cs +++ b/src/SMAPI/IModLinked.cs diff --git a/src/StardewModdingAPI/IModRegistry.cs b/src/SMAPI/IModRegistry.cs index 5ef3fd65..5ef3fd65 100644 --- a/src/StardewModdingAPI/IModRegistry.cs +++ b/src/SMAPI/IModRegistry.cs diff --git a/src/StardewModdingAPI/IMonitor.cs b/src/SMAPI/IMonitor.cs index 62c479bc..62c479bc 100644 --- a/src/StardewModdingAPI/IMonitor.cs +++ b/src/SMAPI/IMonitor.cs diff --git a/src/StardewModdingAPI/IPrivateField.cs b/src/SMAPI/IPrivateField.cs index 3e681c12..3e681c12 100644 --- a/src/StardewModdingAPI/IPrivateField.cs +++ b/src/SMAPI/IPrivateField.cs diff --git a/src/StardewModdingAPI/IPrivateMethod.cs b/src/SMAPI/IPrivateMethod.cs index 67fc8b3c..67fc8b3c 100644 --- a/src/StardewModdingAPI/IPrivateMethod.cs +++ b/src/SMAPI/IPrivateMethod.cs diff --git a/src/StardewModdingAPI/IPrivateProperty.cs b/src/SMAPI/IPrivateProperty.cs index 8d67fa7a..8d67fa7a 100644 --- a/src/StardewModdingAPI/IPrivateProperty.cs +++ b/src/SMAPI/IPrivateProperty.cs diff --git a/src/StardewModdingAPI/IReflectionHelper.cs b/src/SMAPI/IReflectionHelper.cs index fb2c7861..fb2c7861 100644 --- a/src/StardewModdingAPI/IReflectionHelper.cs +++ b/src/SMAPI/IReflectionHelper.cs diff --git a/src/StardewModdingAPI/ISemanticVersion.cs b/src/SMAPI/ISemanticVersion.cs index 0483c97b..0483c97b 100644 --- a/src/StardewModdingAPI/ISemanticVersion.cs +++ b/src/SMAPI/ISemanticVersion.cs diff --git a/src/StardewModdingAPI/ITranslationHelper.cs b/src/SMAPI/ITranslationHelper.cs index c4b72444..c4b72444 100644 --- a/src/StardewModdingAPI/ITranslationHelper.cs +++ b/src/SMAPI/ITranslationHelper.cs diff --git a/src/StardewModdingAPI/LogLevel.cs b/src/SMAPI/LogLevel.cs index 89647876..89647876 100644 --- a/src/StardewModdingAPI/LogLevel.cs +++ b/src/SMAPI/LogLevel.cs diff --git a/src/StardewModdingAPI/Metadata/CoreAssets.cs b/src/SMAPI/Metadata/CoreAssets.cs index 24f23af7..24f23af7 100644 --- a/src/StardewModdingAPI/Metadata/CoreAssets.cs +++ b/src/SMAPI/Metadata/CoreAssets.cs diff --git a/src/StardewModdingAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs index 3346f1ac..3346f1ac 100644 --- a/src/StardewModdingAPI/Metadata/InstructionMetadata.cs +++ b/src/SMAPI/Metadata/InstructionMetadata.cs diff --git a/src/StardewModdingAPI/Mod.cs b/src/SMAPI/Mod.cs index ee75ba54..ee75ba54 100644 --- a/src/StardewModdingAPI/Mod.cs +++ b/src/SMAPI/Mod.cs diff --git a/src/StardewModdingAPI/PatchMode.cs b/src/SMAPI/PatchMode.cs index b4286a89..b4286a89 100644 --- a/src/StardewModdingAPI/PatchMode.cs +++ b/src/SMAPI/PatchMode.cs diff --git a/src/StardewModdingAPI/Program.cs b/src/SMAPI/Program.cs index 7dfdc745..7dfdc745 100644 --- a/src/StardewModdingAPI/Program.cs +++ b/src/SMAPI/Program.cs diff --git a/src/StardewModdingAPI/Properties/AssemblyInfo.cs b/src/SMAPI/Properties/AssemblyInfo.cs index b0a065f5..b0a065f5 100644 --- a/src/StardewModdingAPI/Properties/AssemblyInfo.cs +++ b/src/SMAPI/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI/SemanticVersion.cs b/src/SMAPI/SemanticVersion.cs index 1b99dae6..1b99dae6 100644 --- a/src/StardewModdingAPI/SemanticVersion.cs +++ b/src/SMAPI/SemanticVersion.cs diff --git a/src/StardewModdingAPI/StardewModdingAPI.config.json b/src/SMAPI/StardewModdingAPI.config.json index ebc1235b..ebc1235b 100644 --- a/src/StardewModdingAPI/StardewModdingAPI.config.json +++ b/src/SMAPI/StardewModdingAPI.config.json diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj index 3721a11b..c6ff75d1 100644 --- a/src/StardewModdingAPI/StardewModdingAPI.csproj +++ b/src/SMAPI/StardewModdingAPI.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -87,7 +87,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs"> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs"> <Link>Properties\GlobalAssemblyInfo.cs</Link> </Compile> <Compile Include="Framework\Models\ModCompatibility.cs" /> @@ -265,13 +265,13 @@ <Install>false</Install> </BootstrapperPackage> </ItemGroup> - <Import Project="..\StardewModdingAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" /> + <Import Project="..\SMAPI.Models\StardewModdingAPI.Models.projitems" Label="Shared" /> <ItemGroup> - <ProjectReference Include="..\StardewModdingAPI.AssemblyRewriters\StardewModdingAPI.AssemblyRewriters.csproj"> + <ProjectReference Include="..\SMAPI.AssemblyRewriters\StardewModdingAPI.AssemblyRewriters.csproj"> <Project>{10db0676-9fc1-4771-a2c8-e2519f091e49}</Project> <Name>StardewModdingAPI.AssemblyRewriters</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\common.targets" /> + <Import Project="..\..\build\common.targets" /> </Project>
\ No newline at end of file diff --git a/src/StardewModdingAPI/Translation.cs b/src/SMAPI/Translation.cs index ce344f81..ce344f81 100644 --- a/src/StardewModdingAPI/Translation.cs +++ b/src/SMAPI/Translation.cs diff --git a/src/StardewModdingAPI/Utilities/SButton.cs b/src/SMAPI/Utilities/SButton.cs index fa5ae648..fa5ae648 100644 --- a/src/StardewModdingAPI/Utilities/SButton.cs +++ b/src/SMAPI/Utilities/SButton.cs diff --git a/src/StardewModdingAPI/Utilities/SDate.cs b/src/SMAPI/Utilities/SDate.cs index 326d7fc7..326d7fc7 100644 --- a/src/StardewModdingAPI/Utilities/SDate.cs +++ b/src/SMAPI/Utilities/SDate.cs diff --git a/src/StardewModdingAPI/icon.ico b/src/SMAPI/icon.ico Binary files differindex 587a6e74..587a6e74 100644 --- a/src/StardewModdingAPI/icon.ico +++ b/src/SMAPI/icon.ico diff --git a/src/StardewModdingAPI/packages.config b/src/SMAPI/packages.config index e5fa3c3a..e5fa3c3a 100644 --- a/src/StardewModdingAPI/packages.config +++ b/src/SMAPI/packages.config diff --git a/src/StardewModdingAPI/steam_appid.txt b/src/SMAPI/steam_appid.txt index 9fe92b96..9fe92b96 100644 --- a/src/StardewModdingAPI/steam_appid.txt +++ b/src/SMAPI/steam_appid.txt diff --git a/src/StardewModdingAPI/unix-launcher.sh b/src/SMAPI/unix-launcher.sh index 70f1873a..70f1873a 100644 --- a/src/StardewModdingAPI/unix-launcher.sh +++ b/src/SMAPI/unix-launcher.sh diff --git a/src/TrainerMod/TrainerMod.csproj b/src/TrainerMod/TrainerMod.csproj index 383e8c28..3182338c 100644 --- a/src/TrainerMod/TrainerMod.csproj +++ b/src/TrainerMod/TrainerMod.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> @@ -48,7 +48,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\GlobalAssemblyInfo.cs"> + <Compile Include="..\..\build\GlobalAssemblyInfo.cs"> <Link>Properties\GlobalAssemblyInfo.cs</Link> </Compile> <Compile Include="Framework\Commands\ArgumentParser.cs" /> @@ -85,7 +85,7 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\StardewModdingAPI\StardewModdingAPI.csproj"> + <ProjectReference Include="..\SMAPI\StardewModdingAPI.csproj"> <Project>{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}</Project> <Name>StardewModdingAPI</Name> <Private>False</Private> @@ -98,5 +98,5 @@ <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\common.targets" /> + <Import Project="..\..\build\common.targets" /> </Project>
\ No newline at end of file |