Merge branch 'develop' into stable

1 files changed, 103 insertions, 49 deletions

diff --git a/src/SMAPI/StardewModdingAPI.csproj b/src/SMAPI/StardewModdingAPI.csproj
index edddbd2a..0d0a5fe9 100644
--- a/src/SMAPI/StardewModdingAPI.csproj
+++ b/src/SMAPI/StardewModdingAPI.csproj
@@ -27,6 +27,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <LargeAddressAware Condition="'$(OS)' == 'Windows_NT'">true</LargeAddressAware>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
@@ -42,7 +43,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
     <OutputPath>$(SolutionDir)\..\bin\Release\SMAPI</OutputPath>
-    <DocumentationFile>$(SolutionDir)\..\bin\Debug\SMAPI\StardewModdingAPI.xml</DocumentationFile>
+    <DocumentationFile>$(SolutionDir)\..\bin\Release\SMAPI\StardewModdingAPI.xml</DocumentationFile>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
@@ -53,16 +54,20 @@
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
+    <Reference Include="0Harmony, Version=1.0.9.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\0Harmony.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -72,7 +77,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Management" Condition="$(OS) == 'Windows_NT'" />
     <Reference Include="System.Numerics">
       <Private>True</Private>
     </Reference>
@@ -86,20 +90,55 @@
     <Compile Include="..\..\build\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Events\GameLoopUpdatedEventArgs.cs" />
+    <Compile Include="Events\GameLoopLaunchedEventArgs.cs" />
+    <Compile Include="Events\InputMouseWheelScrolledEventArgs.cs" />
+    <Compile Include="Events\InputCursorMovedEventArgs.cs" />
+    <Compile Include="Events\InputButtonReleasedEventArgs.cs" />
+    <Compile Include="Events\InputButtonPressedEventArgs.cs" />
+    <Compile Include="Events\EventArgsLocationBuildingsChanged.cs" />
+    <Compile Include="Events\IInputEvents.cs" />
+    <Compile Include="Events\IGameLoopEvents.cs" />
+    <Compile Include="Events\IWorldEvents.cs" />
+    <Compile Include="Events\MultiplayerEvents.cs" />
+    <Compile Include="Events\WorldDebrisListChangedEventArgs.cs" />
+    <Compile Include="Events\GameLoopUpdatingEventArgs.cs" />
+    <Compile Include="Events\WorldNpcListChangedEventArgs.cs" />
+    <Compile Include="Events\WorldLargeTerrainFeatureListChangedEventArgs.cs" />
+    <Compile Include="Events\WorldTerrainFeatureListChangedEventArgs.cs" />
+    <Compile Include="Events\WorldBuildingListChangedEventArgs.cs" />
+    <Compile Include="Events\WorldLocationListChangedEventArgs.cs" />
+    <Compile Include="Events\WorldObjectListChangedEventArgs.cs" />
+    <Compile Include="Framework\ContentManagers\BaseContentManager.cs" />
+    <Compile Include="Framework\ContentManagers\GameContentManager.cs" />
+    <Compile Include="Framework\ContentManagers\IContentManager.cs" />
+    <Compile Include="Framework\ContentManagers\ModContentManager.cs" />
+    <Compile Include="Framework\Models\ModFolderExport.cs" />
+    <Compile Include="Framework\ModLoading\TypeReferenceComparer.cs" />
+    <Compile Include="Framework\Patching\GamePatcher.cs" />
+    <Compile Include="Framework\Patching\IHarmonyPatch.cs" />
+    <Compile Include="Framework\Serialisation\ColorConverter.cs" />
+    <Compile Include="Framework\Serialisation\PointConverter.cs" />
+    <Compile Include="Framework\Serialisation\RectangleConverter.cs" />
+    <Compile Include="Framework\Events\ModEventsBase.cs" />
     <Compile Include="Framework\Events\EventManager.cs" />
+    <Compile Include="Events\IModEvents.cs" />
     <Compile Include="Framework\Events\ManagedEvent.cs" />
     <Compile Include="Events\SpecialisedEvents.cs" />
     <Compile Include="Framework\ContentPack.cs" />
     <Compile Include="Framework\Content\ContentCache.cs" />
     <Compile Include="Framework\Events\ManagedEventBase.cs" />
-    <Compile Include="Framework\Input\InputState.cs" />
+    <Compile Include="Framework\Events\ModEvents.cs" />
+    <Compile Include="Framework\Events\ModGameLoopEvents.cs" />
+    <Compile Include="Framework\Events\ModInputEvents.cs" />
+    <Compile Include="Framework\Input\GamePadStateBuilder.cs" />
+    <Compile Include="Framework\ModHelpers\InputHelper.cs" />
+    <Compile Include="Framework\StateTracking\Comparers\GenericEqualsComparer.cs" />
+    <Compile Include="Framework\WatcherCore.cs" />
+    <Compile Include="IInputHelper.cs" />
+    <Compile Include="Framework\Input\SInputState.cs" />
     <Compile Include="Framework\Input\InputStatus.cs" />
-    <Compile Include="Framework\LegacyManifestVersion.cs" />
-    <Compile Include="Framework\ModData\ModDatabase.cs" />
-    <Compile Include="Framework\ModData\ModDataField.cs" />
-    <Compile Include="Framework\ModData\ModDataFieldKey.cs" />
-    <Compile Include="Framework\ModData\ParsedModDataRecord.cs" />
-    <Compile Include="Framework\Models\ManifestContentPackFor.cs" />
+    <Compile Include="Framework\ModHelpers\MultiplayerHelper.cs" />
     <Compile Include="Framework\ModLoading\Finders\EventFinder.cs" />
     <Compile Include="Framework\ModLoading\Finders\FieldFinder.cs" />
     <Compile Include="Framework\ModLoading\Finders\MethodFinder.cs" />
@@ -109,7 +148,7 @@
     <Compile Include="Framework\ModLoading\IInstructionHandler.cs" />
     <Compile Include="Framework\ModLoading\IncompatibleInstructionException.cs" />
     <Compile Include="Framework\ModLoading\InstructionHandleResult.cs" />
-    <Compile Include="Framework\ModLoading\Platform.cs" />
+    <Compile Include="Framework\ModLoading\ModWarning.cs" />
     <Compile Include="Framework\ModLoading\PlatformAssemblyMap.cs" />
     <Compile Include="Framework\ModLoading\RewriteHelper.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\FieldReplaceRewriter.cs" />
@@ -119,22 +158,32 @@
     <Compile Include="Framework\ModLoading\Rewriters\VirtualEntryCallRemover.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\MethodParentRewriter.cs" />
     <Compile Include="Framework\ModLoading\Rewriters\TypeReferenceRewriter.cs" />
-    <Compile Include="Framework\ContentManagerShim.cs" />
     <Compile Include="Framework\Exceptions\SAssemblyLoadFailedException.cs" />
     <Compile Include="Framework\ModLoading\AssemblyLoadStatus.cs" />
+    <Compile Include="Framework\Events\ModWorldEvents.cs" />
     <Compile Include="Framework\Reflection\InterfaceProxyBuilder.cs" />
     <Compile Include="Framework\Reflection\InterfaceProxyFactory.cs" />
-    <Compile Include="Framework\Serialisation\SmapiConverters\ManifestContentPackForConverter.cs" />
-    <Compile Include="Framework\Serialisation\SmapiConverters\ManifestDependencyArrayConverter.cs" />
-    <Compile Include="Framework\Serialisation\SmapiConverters\SemanticVersionConverter.cs" />
-    <Compile Include="Framework\Serialisation\SimpleReadOnlyConverter.cs" />
-    <Compile Include="Framework\Serialisation\CrossplatformConverters\RectangleConverter.cs" />
-    <Compile Include="Framework\Serialisation\CrossplatformConverters\ColorConverter.cs" />
-    <Compile Include="Framework\Serialisation\CrossplatformConverters\PointConverter.cs" />
+    <Compile Include="Framework\RewriteFacades\SpriteBatchMethods.cs" />
+    <Compile Include="Framework\SMultiplayer.cs" />
+    <Compile Include="Framework\StateTracking\Comparers\EquatableComparer.cs" />
+    <Compile Include="Framework\StateTracking\Comparers\ObjectReferenceComparer.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\BaseDisposableWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\ComparableWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\NetDictionaryWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\NetValueWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\NetCollectionWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\ObservableCollectionWatcher.cs" />
+    <Compile Include="Framework\StateTracking\FieldWatchers\WatcherFactory.cs" />
+    <Compile Include="Framework\StateTracking\ICollectionWatcher.cs" />
+    <Compile Include="Framework\StateTracking\IDictionaryWatcher.cs" />
+    <Compile Include="Framework\StateTracking\IValueWatcher.cs" />
+    <Compile Include="Framework\StateTracking\IWatcher.cs" />
+    <Compile Include="Framework\StateTracking\WorldLocationsTracker.cs" />
+    <Compile Include="Framework\StateTracking\LocationTracker.cs" />
+    <Compile Include="Framework\StateTracking\PlayerTracker.cs" />
     <Compile Include="Framework\Utilities\ContextHash.cs" />
-    <Compile Include="Framework\Utilities\PathUtilities.cs" />
     <Compile Include="IContentPack.cs" />
-    <Compile Include="IManifestContentPackFor.cs" />
+    <Compile Include="IMultiplayerHelper.cs" />
     <Compile Include="IReflectedField.cs" />
     <Compile Include="IReflectedMethod.cs" />
     <Compile Include="IReflectedProperty.cs" />
@@ -155,8 +204,8 @@
     <Compile Include="Events\EventArgsControllerButtonReleased.cs" />
     <Compile Include="Events\EventArgsControllerTriggerPressed.cs" />
     <Compile Include="Events\EventArgsControllerTriggerReleased.cs" />
-    <Compile Include="Events\EventArgsCurrentLocationChanged.cs" />
-    <Compile Include="Events\EventArgsGameLocationsChanged.cs" />
+    <Compile Include="Events\EventArgsPlayerWarped.cs" />
+    <Compile Include="Events\EventArgsLocationsChanged.cs" />
     <Compile Include="Events\EventArgsIntChanged.cs" />
     <Compile Include="Events\EventArgsInventoryChanged.cs" />
     <Compile Include="Events\EventArgsKeyboardStateChanged.cs" />
@@ -191,16 +240,11 @@
     <Compile Include="Context.cs" />
     <Compile Include="Framework\Logging\ConsoleInterceptionManager.cs" />
     <Compile Include="Framework\Logging\InterceptingTextWriter.cs" />
-    <Compile Include="Framework\Models\ManifestDependency.cs" />
-    <Compile Include="Framework\ModData\ModStatus.cs" />
     <Compile Include="Framework\Models\SConfig.cs" />
     <Compile Include="Framework\ModLoading\ModMetadata.cs" />
     <Compile Include="Framework\Reflection\ReflectedProperty.cs" />
     <Compile Include="Framework\RequestExitDelegate.cs" />
-    <Compile Include="Framework\ContentCore.cs" />
-    <Compile Include="Framework\Exceptions\SParseException.cs" />
-    <Compile Include="Framework\Serialisation\JsonHelper.cs" />
-    <Compile Include="Framework\Serialisation\SmapiConverters\StringEnumConverter.cs" />
+    <Compile Include="Framework\ContentCoordinator.cs" />
     <Compile Include="IAssetEditor.cs" />
     <Compile Include="IAssetInfo.cs" />
     <Compile Include="IAssetLoader.cs" />
@@ -209,7 +253,6 @@
     <Compile Include="IAssetDataForDictionary.cs" />
     <Compile Include="IAssetDataForImage.cs" />
     <Compile Include="IContentHelper.cs" />
-    <Compile Include="IManifestDependency.cs" />
     <Compile Include="IModRegistry.cs" />
     <Compile Include="Events\LocationEvents.cs" />
     <Compile Include="Events\MenuEvents.cs" />
@@ -220,36 +263,29 @@
     <Compile Include="Framework\DeprecationLevel.cs" />
     <Compile Include="Framework\DeprecationManager.cs" />
     <Compile Include="Framework\InternalExtensions.cs" />
-    <Compile Include="Framework\ModData\ModDataRecord.cs" />
     <Compile Include="Framework\ModLoading\AssemblyLoader.cs" />
     <Compile Include="Framework\Reflection\CacheEntry.cs" />
     <Compile Include="Framework\Reflection\ReflectedField.cs" />
     <Compile Include="Framework\Reflection\ReflectedMethod.cs" />
     <Compile Include="Framework\Reflection\Reflector.cs" />
-    <Compile Include="IManifest.cs" />
     <Compile Include="IMod.cs" />
     <Compile Include="IModHelper.cs" />
     <Compile Include="IModLinked.cs" />
     <Compile Include="Framework\Logging\LogFileManager.cs" />
-    <Compile Include="IPrivateProperty.cs" />
-    <Compile Include="ISemanticVersion.cs" />
     <Compile Include="ITranslationHelper.cs" />
     <Compile Include="LogLevel.cs" />
     <Compile Include="Framework\ModRegistry.cs" />
-    <Compile Include="Framework\WebApiClient.cs" />
     <Compile Include="IMonitor.cs" />
     <Compile Include="Events\ChangeType.cs" />
     <Compile Include="Events\ItemStackChange.cs" />
     <Compile Include="Framework\Monitor.cs" />
-    <Compile Include="Framework\Models\Manifest.cs" />
     <Compile Include="Metadata\InstructionMetadata.cs" />
     <Compile Include="Mod.cs" />
     <Compile Include="PatchMode.cs" />
+    <Compile Include="GamePlatform.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Framework\SGame.cs" />
-    <Compile Include="IPrivateField.cs" />
-    <Compile Include="IPrivateMethod.cs" />
     <Compile Include="IReflectionHelper.cs" />
     <Compile Include="SemanticVersion.cs" />
     <Compile Include="Translation.cs" />
@@ -263,13 +299,17 @@
       <SubType>Designer</SubType>
     </None>
     <Content Include="StardewModdingAPI.config.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\SMAPI.Web\wwwroot\StardewModdingAPI.metadata.json">
+      <Link>StardewModdingAPI.metadata.json</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
     <Content Include="steam_appid.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
@@ -284,13 +324,27 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <Import Project="..\SMAPI.Common\StardewModdingAPI.Common.projitems" Label="Shared" />
   <ItemGroup>
-    <ProjectReference Include="..\SMAPI.AssemblyRewriters\StardewModdingAPI.AssemblyRewriters.csproj">
-      <Project>{10db0676-9fc1-4771-a2c8-e2519f091e49}</Project>
-      <Name>StardewModdingAPI.AssemblyRewriters</Name>
+    <Analyzer Include="..\SMAPI.ModBuildConfig.Analyzer\bin\netstandard1.3\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\StardewModdingAPI.Toolkit.CoreInterfaces\StardewModdingAPI.Toolkit.CoreInterfaces.csproj">
+      <Project>{d5cfd923-37f1-4bc3-9be8-e506e202ac28}</Project>
+      <Name>StardewModdingAPI.Toolkit.CoreInterfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\StardewModdingAPI.Toolkit\StardewModdingAPI.Toolkit.csproj">
+      <Project>{ea5cfd2e-9453-4d29-b80f-8e0ea23f4ac6}</Project>
+      <Name>StardewModdingAPI.Toolkit</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\SMAPI.Internal\SMAPI.Internal.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\build\common.targets" />
+  <Import Project="..\packages\LargeAddressAware.1.0.3\build\LargeAddressAware.targets" Condition="Exists('..\packages\LargeAddressAware.1.0.3\build\LargeAddressAware.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\LargeAddressAware.1.0.3\build\LargeAddressAware.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LargeAddressAware.1.0.3\build\LargeAddressAware.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file