diff --git a/.editorconfig b/.editorconfig index 5bfc44bd..38f3c261 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,12 +12,16 @@ insert_final_newline = true trim_trailing_whitespace = true charset = utf-8 -[*.{csproj,json,nuspec,targets}] +[*.{csproj,nuspec,targets}] indent_size = 2 [*.csproj] +charset = utf-8-bom insert_final_newline = false +[README.txt] +end_of_line=crlf + ########## ## C# formatting ## documentation: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference diff --git a/.gitattributes b/.gitattributes index cd1acd35..67d0626d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ # normalise line endings * text=auto +README.txt text=crlf diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..bea12a6d --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +patreon: pathoschild +ko_fi: pathoschild +custom: https://www.paypal.me/pathoschild diff --git a/.gitignore b/.gitignore index 7e0c1e9d..7080a8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ _ReSharper*/ # sensitive files appsettings.Development.json + +# AWS generated files +src/SMAPI.Web/aws-beanstalk-tools-defaults.json diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index ced7af52..a3ca3051 100644 --- a/build/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; [assembly: AssemblyProduct("SMAPI")] -[assembly: AssemblyVersion("2.11.2")] -[assembly: AssemblyFileVersion("2.11.2")] +[assembly: AssemblyVersion("2.11.3")] +[assembly: AssemblyFileVersion("2.11.3")] diff --git a/build/common.targets b/build/common.targets index e08e7066..0781d568 100644 --- a/build/common.targets +++ b/build/common.targets @@ -39,6 +39,11 @@ + + + $(AssemblySearchPaths);{GAC} + + $(GamePath)\Stardew Valley.exe @@ -93,12 +98,12 @@ - + - + diff --git a/build/prepare-install-package.targets b/build/prepare-install-package.targets index cd758e96..b7b70ed0 100644 --- a/build/prepare-install-package.targets +++ b/build/prepare-install-package.targets @@ -5,20 +5,18 @@ creates the build package in the bin\Packages folder. --> - + $(SolutionDir)\.. $(RootPath)\bin\$(Configuration) $(CompiledRootPath)\SMAPI $(CompiledRootPath)\SMAPI.Toolkit\net4.5 + $(CompiledRootPath)\Mods $(SolutionDir)\..\bin\SMAPI installer $(SolutionDir)\..\bin\SMAPI installer for developers windows unix - - - @@ -48,12 +46,19 @@ - + + + + + + + + diff --git a/build/prepare-nuget-package.targets b/build/prepare-nuget-package.targets index 0b4320a7..172bfdcc 100644 --- a/build/prepare-nuget-package.targets +++ b/build/prepare-nuget-package.targets @@ -5,7 +5,7 @@ package files to the bin\Pathoschild.Stardew.ModBuildConfig folder. --> - + $(SolutionDir)\..\bin\Pathoschild.Stardew.ModBuildConfig diff --git a/docs/release-notes.md b/docs/release-notes.md index c02b2dd2..5a7d5ef2 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,10 +1,29 @@ # Release notes -## 2.11.2 -Released 22 April 2019 for Stardew Valley 1.3.36. +## 2.11.3 +Released 13 September 2019 for Stardew Valley 1.3.36. * For players: - * Fixed error when a custom map references certain vanilla tilesheets on MacOS. - * Fixed compatibility with Arch Linux. + * SMAPI now prevents invalid items from breaking menus on hover. + * SMAPI now prevents invalid event preconditions from crashing the game (thanks to berkayylmao!). + * SMAPI now prevents more invalid dialogue from crashing the game. + * Fixed errors during early startup not shown before exit. + * Fixed various error messages and inconsistent spelling. + +* For the web UI: + * When filtering the mod list, clicking a mod link now automatically adds it to the visible mods. + * Added log parser instructions for Android. + * Fixed log parser failing in some cases due to time format localisation. + +* For modders: + * `this.Monitor.Log` now defaults to the `Trace` log level instead of `Debug`. The change will only take effect when you recompile the mod. + * Fixed 'location list changed' verbose log not correctly listing changes. + +## 2.11.2 +Released 23 April 2019 for Stardew Valley 1.3.36. + +* For players: + * Fixed error when a custom map references certain vanilla tilesheets on Linux/Mac. + * Fixed compatibility with some Linux distros. ## 2.11.1 Released 17 March 2019 for Stardew Valley 1.3.36. @@ -15,8 +34,10 @@ Released 17 March 2019 for Stardew Valley 1.3.36. * Updated mod compatibility list. * Fixed `world_clear` console command removing chests edited to have a debris name. -* For the web UI: +* For modders: * Added support for suppressing false-positive warnings in rare cases. + +* For the web UI: * The log parser now collapses redundant sections by default. * Fixed log parser column resize bug. diff --git a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj index 083044fb..ac64a774 100644 --- a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj +++ b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj @@ -1,62 +1,32 @@ - - - + + - Debug - x86 - {443DDF81-6AAF-420A-A610-3459F37E5575} - Exe - Properties StardewModdingAPI.Installer StardewModdingAPI.Installer - v4.5 - 512 - true + net45 + false latest - - + Exe x86 - true - full - false - $(SolutionDir)\..\bin\Debug\Installer - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - $(SolutionDir)\..\bin\Release\Installer - TRACE - prompt - 4 + $(SolutionDir)\..\bin\$(Configuration)\Installer + false + - - - + + - - Properties\GlobalAssemblyInfo.cs - - - - - - + + - - Always - - - - + PreserveNewest - + + + PreserveNewest + PreserveNewest @@ -67,14 +37,9 @@ PreserveNewest - - - {ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6} - StardewModdingAPI.Toolkit - - + - - \ No newline at end of file + + diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj b/src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj index 26065ec2..45953eec 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj +++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0 diff --git a/src/SMAPI.ModBuildConfig.Analyzer/StardewModdingAPI.ModBuildConfig.Analyzer.csproj b/src/SMAPI.ModBuildConfig.Analyzer/StardewModdingAPI.ModBuildConfig.Analyzer.csproj index 9d646e8f..1d8d7227 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer/StardewModdingAPI.ModBuildConfig.Analyzer.csproj +++ b/src/SMAPI.ModBuildConfig.Analyzer/StardewModdingAPI.ModBuildConfig.Analyzer.csproj @@ -1,4 +1,4 @@ - + netstandard1.3 @@ -11,12 +11,12 @@ - + - + diff --git a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj index 9118b043..44f0a3e7 100644 --- a/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj +++ b/src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj @@ -1,73 +1,34 @@ - - - + + - Debug - x86 - {EA4F1E80-743F-4A1D-9757-AE66904A196A} - Library - Properties StardewModdingAPI.ModBuildConfig StardewModdingAPI.ModBuildConfig - v4.5 - 512 + net45 + false latest + x86 + false - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - + + + + + + + + mod-build-config.md + + + - - - - - - - - - - - Designer - - - Designer - - - - - - - - {d5cfd923-37f1-4bc3-9be8-e506e202ac28} - StardewModdingAPI.Toolkit.CoreInterfaces - - - {ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6} - StardewModdingAPI.Toolkit - - + - - - \ No newline at end of file + + diff --git a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs index 77dace26..4807c46d 100644 --- a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs +++ b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using StardewModdingAPI.Events; using StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands; namespace StardewModdingAPI.Mods.ConsoleCommands diff --git a/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj index e0aacdbb..b535e2fd 100644 --- a/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj +++ b/src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj @@ -1,92 +1,35 @@ - - - + + - Debug - x86 - {28480467-1A48-46A7-99F8-236D95225359} - Library - Properties StardewModdingAPI.Mods.ConsoleCommands ConsoleCommands - v4.5 - 512 + net45 + false latest - - - true - full - false - $(SolutionDir)\..\bin\Debug\Mods\ConsoleCommands\ - DEBUG;TRACE - prompt - 4 - x86 - false - true - - - pdbonly - true - $(SolutionDir)\..\bin\Release\Mods\ConsoleCommands\ - TRACE - prompt - 4 - false - true + $(SolutionDir)\..\bin\$(Configuration)\Mods\ConsoleCommands + false x86 + - - + + False + + Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + PreserveNewest - - - {9898b56e-51eb-40cf-8b1f-aceb4b6397a7} - StardewModdingAPI - - - + + - \ No newline at end of file + + diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json index c1aabe48..74295410 100644 --- a/src/SMAPI.Mods.ConsoleCommands/manifest.json +++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json @@ -1,9 +1,9 @@ { - "Name": "Console Commands", - "Author": "SMAPI", - "Version": "2.11.2", - "Description": "Adds SMAPI console commands that let you manipulate the game.", - "UniqueID": "SMAPI.ConsoleCommands", - "EntryDll": "ConsoleCommands.dll", - "MinimumApiVersion": "2.11.2" + "Name": "Console Commands", + "Author": "SMAPI", + "Version": "2.11.3", + "Description": "Adds SMAPI console commands that let you manipulate the game.", + "UniqueID": "SMAPI.ConsoleCommands", + "EntryDll": "ConsoleCommands.dll", + "MinimumApiVersion": "2.11.3" } diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs index d10131b3..30dbfbe6 100644 --- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs +++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs @@ -46,7 +46,7 @@ namespace StardewModdingAPI.Mods.SaveBackup } catch (Exception ex) { - this.Monitor.Log($"Error backing up saves: {ex}"); + this.Monitor.Log($"Error backing up saves: {ex}", LogLevel.Error); } } @@ -87,7 +87,7 @@ namespace StardewModdingAPI.Mods.SaveBackup catch (Exception ex) when (ex is TypeLoadException || ex.InnerException is TypeLoadException) { // create uncompressed backup if compression fails - this.Monitor.Log("Couldn't zip the save backup, creating uncompressed backup instead."); + this.Monitor.Log("Couldn't zip the save backup, creating uncompressed backup instead.", LogLevel.Debug); this.Monitor.Log(ex.ToString(), LogLevel.Trace); this.RecursiveCopy(new DirectoryInfo(Constants.SavesPath), fallbackDir, copyRoot: false); } @@ -137,7 +137,7 @@ namespace StardewModdingAPI.Mods.SaveBackup } catch (Exception ex) { - this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}"); + this.Monitor.Log($"Error deleting old save backup '{file.Name}': {ex}", LogLevel.Error); } } } diff --git a/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj b/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj index 63a812f3..460f3c93 100644 --- a/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj +++ b/src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj @@ -1,57 +1,35 @@ - - - + + - Debug - x86 - {E272EB5D-8C57-417E-8E60-C1079D3F53C4} - Library - Properties StardewModdingAPI.Mods.SaveBackup SaveBackup - v4.5 - 512 + net45 + false latest + $(SolutionDir)\..\bin\$(Configuration)\Mods\SaveBackup + false + x86 - - true - full - false - $(SolutionDir)\..\bin\Debug\Mods\SaveBackup\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - $(SolutionDir)\..\bin\Release\Mods\SaveBackup\ - TRACE - prompt - 4 - + - + + False + + Properties\GlobalAssemblyInfo.cs - - + - + PreserveNewest - - - {d5cfd923-37f1-4bc3-9be8-e506e202ac28} - StardewModdingAPI.Toolkit.CoreInterfaces - False - - - + + - \ No newline at end of file + + diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json index 1581d139..e147bd39 100644 --- a/src/SMAPI.Mods.SaveBackup/manifest.json +++ b/src/SMAPI.Mods.SaveBackup/manifest.json @@ -1,9 +1,9 @@ { - "Name": "Save Backup", - "Author": "SMAPI", - "Version": "2.11.2", - "Description": "Automatically backs up all your saves once per day into its folder.", - "UniqueID": "SMAPI.SaveBackup", - "EntryDll": "SaveBackup.dll", - "MinimumApiVersion": "2.11.2" + "Name": "Save Backup", + "Author": "SMAPI", + "Version": "2.11.3", + "Description": "Automatically backs up all your saves once per day into its folder.", + "UniqueID": "SMAPI.SaveBackup", + "EntryDll": "SaveBackup.dll", + "MinimumApiVersion": "2.11.3" } diff --git a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj index 43cf99a8..1cb2d1e6 100644 --- a/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj +++ b/src/SMAPI.Tests/StardewModdingAPI.Tests.csproj @@ -1,35 +1,20 @@ - - - + + - Debug - x86 - {36CCB19E-92EB-48C7-9615-98EEFD45109B} - Library - Properties StardewModdingAPI.Tests StardewModdingAPI.Tests - v4.5 - 512 + net45 + false latest + x86 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - + + + + + + + @@ -39,38 +24,17 @@ - - - - + Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - {d5cfd923-37f1-4bc3-9be8-e506e202ac28} - StardewModdingAPI.Toolkit.CoreInterfaces - - - {ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6} - StardewModdingAPI.Toolkit - + - + - \ No newline at end of file + + diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifest.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifest.cs rename to src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs rename to src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifestDependency.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/IManifestDependency.cs rename to src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs b/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs rename to src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs b/src/SMAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs rename to src/SMAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj b/src/SMAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj similarity index 94% rename from src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj rename to src/SMAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj index 67adbd67..cbbb7fc9 100644 --- a/src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj +++ b/src/SMAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj @@ -1,4 +1,4 @@ - + net4.5;netstandard2.0 diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs similarity index 91% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs index 45b46ea6..989c18b0 100644 --- a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs +++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs @@ -40,14 +40,6 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi /// The custom mod page URL (if applicable). public string CustomUrl { get; set; } - /**** - ** SMAPI 3.0 readiness - ****/ - /// Whether the mod is ready for the upcoming SMAPI 3.0. - public WikiSmapi3Status Smapi3Status { get; set; } - - /// A URL related to the . - public string Smapi3Url { get; set; } /**** ** Stable compatibility @@ -59,6 +51,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi /// The human-readable summary of the compatibility status or workaround, without HTML formatitng. public string CompatibilitySummary { get; set; } + /// The game or SMAPI version which broke this mod, if applicable. + public string BrokeIn { get; set; } + /**** ** Beta compatibility @@ -70,6 +65,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi /// The human-readable summary of the compatibility status or workaround for the Stardew Valley beta (if any), without HTML formatitng. public string BetaCompatibilitySummary { get; set; } + /// The beta game or SMAPI version which broke this mod, if applicable. + public string BetaBrokeIn { get; set; } + /********* ** Public methods @@ -94,14 +92,13 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi this.CustomSourceUrl = wiki.CustomSourceUrl; this.CustomUrl = wiki.CustomUrl; - this.Smapi3Status = wiki.Smapi3Status; - this.Smapi3Url = wiki.Smapi3Url; - this.CompatibilityStatus = wiki.Compatibility.Status; this.CompatibilitySummary = wiki.Compatibility.Summary; + this.BrokeIn = wiki.Compatibility.BrokeIn; this.BetaCompatibilityStatus = wiki.BetaCompatibility?.Status; this.BetaCompatibilitySummary = wiki.BetaCompatibility?.Summary; + this.BetaBrokeIn = wiki.BetaCompatibility?.BrokeIn; } // internal DB data diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSeachModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSeachModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSeachModel.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSeachModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs rename to src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs similarity index 96% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs rename to src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs index ac279d88..3e9b8ea6 100644 --- a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs +++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs @@ -127,10 +127,6 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki } } - // parse SMAPI 3.0 readiness status - WikiSmapi3Status smapi3Status = this.GetAttributeAsEnum(node, "data-smapi-3-status") ?? WikiSmapi3Status.Unknown; - string smapi3Url = this.GetAttribute(node, "data-smapi-3-url"); - // yield model yield return new WikiModEntry { @@ -146,8 +142,6 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki ContentPackFor = contentPackFor, Compatibility = compatibility, BetaCompatibility = betaCompatibility, - Smapi3Status = smapi3Status, - Smapi3Url = smapi3Url, Warnings = warnings, Anchor = anchor }; diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs rename to src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs rename to src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs similarity index 90% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs rename to src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs index 35d43758..cf416cc6 100644 --- a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs +++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs @@ -42,12 +42,6 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki /// The mod's compatibility with the latest beta version of the game (if any). public WikiCompatibilityInfo BetaCompatibility { get; set; } - /// Whether the mod is ready for the upcoming SMAPI 3.0. - public WikiSmapi3Status Smapi3Status { get; set; } - - /// A URL related to the . - public string Smapi3Url { get; set; } - /// Whether a Stardew Valley or SMAPI beta which affects mod compatibility is in progress. If this is true, should be used for beta versions of SMAPI instead of . public bool HasBetaInfo => this.BetaCompatibility != null; diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs rename to src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/MetadataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/MetadataModel.cs rename to src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataField.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataField.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataModel.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataRecord.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModDatabase.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModStatus.cs b/src/SMAPI.Toolkit/Framework/ModData/ModStatus.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModStatus.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModStatus.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModData/ModWarning.cs b/src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModData/ModWarning.cs rename to src/SMAPI.Toolkit/Framework/ModData/ModWarning.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModFolder.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModFolder.cs rename to src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/ModScanning/ModScanner.cs rename to src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/UpdateData/ModRepositoryKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/ModRepositoryKey.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/UpdateData/ModRepositoryKey.cs rename to src/SMAPI.Toolkit/Framework/UpdateData/ModRepositoryKey.cs diff --git a/src/StardewModdingAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Framework/UpdateData/UpdateKey.cs rename to src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs diff --git a/src/StardewModdingAPI.Toolkit/ModToolkit.cs b/src/SMAPI.Toolkit/ModToolkit.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/ModToolkit.cs rename to src/SMAPI.Toolkit/ModToolkit.cs diff --git a/src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs b/src/SMAPI.Toolkit/Properties/AssemblyInfo.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs rename to src/SMAPI.Toolkit/Properties/AssemblyInfo.cs diff --git a/src/StardewModdingAPI.Toolkit/SemanticVersion.cs b/src/SMAPI.Toolkit/SemanticVersion.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/SemanticVersion.cs rename to src/SMAPI.Toolkit/SemanticVersion.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/ManifestContentPackForConverter.cs b/src/SMAPI.Toolkit/Serialisation/Converters/ManifestContentPackForConverter.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Converters/ManifestContentPackForConverter.cs rename to src/SMAPI.Toolkit/Serialisation/Converters/ManifestContentPackForConverter.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/ManifestDependencyArrayConverter.cs b/src/SMAPI.Toolkit/Serialisation/Converters/ManifestDependencyArrayConverter.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Converters/ManifestDependencyArrayConverter.cs rename to src/SMAPI.Toolkit/Serialisation/Converters/ManifestDependencyArrayConverter.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs b/src/SMAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs rename to src/SMAPI.Toolkit/Serialisation/Converters/SemanticVersionConverter.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Converters/SimpleReadOnlyConverter.cs b/src/SMAPI.Toolkit/Serialisation/Converters/SimpleReadOnlyConverter.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Converters/SimpleReadOnlyConverter.cs rename to src/SMAPI.Toolkit/Serialisation/Converters/SimpleReadOnlyConverter.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/InternalExtensions.cs b/src/SMAPI.Toolkit/Serialisation/InternalExtensions.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/InternalExtensions.cs rename to src/SMAPI.Toolkit/Serialisation/InternalExtensions.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs b/src/SMAPI.Toolkit/Serialisation/JsonHelper.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/JsonHelper.cs rename to src/SMAPI.Toolkit/Serialisation/JsonHelper.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialisation/Models/Manifest.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Models/Manifest.cs rename to src/SMAPI.Toolkit/Serialisation/Models/Manifest.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialisation/Models/ManifestContentPackFor.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestContentPackFor.cs rename to src/SMAPI.Toolkit/Serialisation/Models/ManifestContentPackFor.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialisation/Models/ManifestDependency.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/Models/ManifestDependency.cs rename to src/SMAPI.Toolkit/Serialisation/Models/ManifestDependency.cs diff --git a/src/StardewModdingAPI.Toolkit/Serialisation/SParseException.cs b/src/SMAPI.Toolkit/Serialisation/SParseException.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Serialisation/SParseException.cs rename to src/SMAPI.Toolkit/Serialisation/SParseException.cs diff --git a/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj b/src/SMAPI.Toolkit/StardewModdingAPI.Toolkit.csproj similarity index 78% rename from src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj rename to src/SMAPI.Toolkit/StardewModdingAPI.Toolkit.csproj index 351b36b6..46d38f17 100644 --- a/src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj +++ b/src/SMAPI.Toolkit/StardewModdingAPI.Toolkit.csproj @@ -1,4 +1,4 @@ - + net4.5;netstandard2.0 @@ -6,6 +6,7 @@ ..\..\bin\$(Configuration)\SMAPI.Toolkit ..\..\bin\$(Configuration)\SMAPI.Toolkit\$(TargetFramework)\StardewModdingAPI.Toolkit.xml latest + x86 @@ -19,7 +20,7 @@ - + diff --git a/src/StardewModdingAPI.Toolkit/Utilities/FileUtilities.cs b/src/SMAPI.Toolkit/Utilities/FileUtilities.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Utilities/FileUtilities.cs rename to src/SMAPI.Toolkit/Utilities/FileUtilities.cs diff --git a/src/StardewModdingAPI.Toolkit/Utilities/PathUtilities.cs b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs similarity index 100% rename from src/StardewModdingAPI.Toolkit/Utilities/PathUtilities.cs rename to src/SMAPI.Toolkit/Utilities/PathUtilities.cs diff --git a/src/SMAPI.Web/Controllers/IndexController.cs b/src/SMAPI.Web/Controllers/IndexController.cs index ea1a52b2..4e3602d5 100644 --- a/src/SMAPI.Web/Controllers/IndexController.cs +++ b/src/SMAPI.Web/Controllers/IndexController.cs @@ -141,7 +141,7 @@ namespace StardewModdingAPI.Web.Controllers foreach (GitAsset asset in release.Assets) { - if (asset.FileName.StartsWith("Z_OLD")) + if (asset.FileName.StartsWith("Z_")) continue; Match match = Regex.Match(asset.FileName, @"SMAPI-(?[\d\.]+(?:-.+)?)-installer(?-for-developers)?.zip"); diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs index 3f33c0c1..595e6b49 100644 --- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs +++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs @@ -15,7 +15,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing ** Fields *********/ /// A regex pattern matching the start of a SMAPI message. - private readonly Regex MessageHeaderPattern = new Regex(@"^\[(?