From fe007a7e33c9baf6c39fca030be1696b98b6d9a3 Mon Sep 17 00:00:00 2001
From:  <JoshuaNavarro@DESKTOP-1AFQIIL.localdomain>
Date: Wed, 5 Dec 2018 17:16:28 -0800
Subject: [PATCH] Updated to SMAPI 2.8. Working through compatibility
 currently. Updates to Happy Birthday next.

---
 .../AdditionalCropsFramework.csproj           |   6 +-
 .../AdditionalCropsFramework/packages.config  |   2 +-
 .../AdvancedSaveBackup.csproj                 |   6 +-
 .../AdvancedSaveBackup/packages.config        |   2 +-
 GeneralMods/AutoSpeed/AutoSpeed.csproj        |   6 +-
 GeneralMods/AutoSpeed/packages.config         |   2 +-
 .../BillboardAnywhere.csproj                  |   6 +-
 GeneralMods/BillboardAnywhere/packages.config |   2 +-
 .../BuildEndurance/BuildEndurance.csproj      |   6 +-
 GeneralMods/BuildEndurance/packages.config    |   2 +-
 GeneralMods/BuildHealth/BuildHealth.csproj    |   6 +-
 GeneralMods/BuildHealth/packages.config       |   2 +-
 .../BuyBackCollectables.csproj                |   6 +-
 .../BuyBackCollectables/packages.config       |   2 +-
 .../CustomNPCFramework.csproj                 |   6 +-
 .../CustomNPCFramework/packages.config        |   2 +-
 .../CustomShopsRedux/CustomShopsRedux.csproj  |   6 +-
 GeneralMods/CustomShopsRedux/packages.config  |   2 +-
 .../DailyQuestAnywhere.csproj                 |   6 +-
 .../DailyQuestAnywhere/packages.config        |   2 +-
 .../DebugSandBoxAndReferences.csproj          |   6 +-
 .../DebugSandBoxAndReferences/packages.config |   2 +-
 .../Fall28SnowDay/Fall28SnowDay.csproj        |   6 +-
 GeneralMods/Fall28SnowDay/packages.config     |   2 +-
 .../FarmersMarketStall.csproj                 |   6 +-
 .../FarmersMarketStall/packages.config        |   2 +-
 .../HappyBirthday/Framework/ModConfig.cs      |   6 +
 GeneralMods/HappyBirthday/GiftManager.cs      | 352 ++++++++++++++++++
 GeneralMods/HappyBirthday/HappyBirthday.cs    | 318 +---------------
 .../HappyBirthday/HappyBirthday.csproj        |   6 +-
 GeneralMods/HappyBirthday/PossibleGifts.cs    |  75 ----
 GeneralMods/HappyBirthday/packages.config     |   2 +-
 GeneralMods/MapEvents/EventSystem.csproj      |   6 +-
 GeneralMods/MapEvents/packages.config         |   2 +-
 GeneralMods/MoreRain/MoreRain.csproj          |   6 +-
 GeneralMods/MoreRain/packages.config          |   2 +-
 .../MuseumRearranger/MuseumRearranger.csproj  |   6 +-
 GeneralMods/MuseumRearranger/packages.config  |   2 +-
 GeneralMods/NightOwl/NightOwl.csproj          |   6 +-
 GeneralMods/NightOwl/packages.config          |   2 +-
 GeneralMods/NoMorePets/NoMorePets.csproj      |   6 +-
 GeneralMods/NoMorePets/packages.config        |   2 +-
 GeneralMods/SaveAnywhere/SaveAnywhere.csproj  |   6 +-
 GeneralMods/SaveAnywhere/packages.config      |   2 +-
 .../SimpleSoundManager.csproj                 |   6 +-
 .../SimpleSoundManager/packages.config        |   2 +-
 .../StardewSymphonyRemastered.csproj          |   6 +-
 .../StardewSymphonyRemastered/packages.config |   2 +-
 GeneralMods/StardustCore/StardustCore.csproj  |   6 +-
 GeneralMods/StardustCore/packages.config      |   2 +-
 .../SundropMapEvents/SundropMapEvents.csproj  |   6 +-
 GeneralMods/SundropMapEvents/packages.config  |   2 +-
 GeneralMods/TimeFreeze/TimeFreeze.csproj      |   6 +-
 GeneralMods/TimeFreeze/packages.config        |   2 +-
 .../UnifiedSaveCore/AUnifiedSaveCore.csproj   |   8 +-
 .../UnifiedSaveCore/Framework/ChestHandler.cs |  26 ++
 .../Framework/ObjectHandler.cs                |  75 ++++
 GeneralMods/UnifiedSaveCore/ModCore.cs        |   2 +
 GeneralMods/UnifiedSaveCore/packages.config   |   2 +-
 .../Vocalization/Vocalization.csproj          |  10 +-
 .../Vocalization/Vocalization/packages.config |   2 +-
 61 files changed, 593 insertions(+), 483 deletions(-)
 create mode 100644 GeneralMods/HappyBirthday/GiftManager.cs
 delete mode 100644 GeneralMods/HappyBirthday/PossibleGifts.cs
 create mode 100644 GeneralMods/UnifiedSaveCore/Framework/ChestHandler.cs
 create mode 100644 GeneralMods/UnifiedSaveCore/Framework/ObjectHandler.cs

diff --git a/GeneralMods/AdditionalCropsFramework/AdditionalCropsFramework.csproj b/GeneralMods/AdditionalCropsFramework/AdditionalCropsFramework.csproj
index 7fce171c..9f500eed 100644
--- a/GeneralMods/AdditionalCropsFramework/AdditionalCropsFramework.csproj
+++ b/GeneralMods/AdditionalCropsFramework/AdditionalCropsFramework.csproj
@@ -100,15 +100,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/AdditionalCropsFramework/packages.config b/GeneralMods/AdditionalCropsFramework/packages.config
index 6766c23b..b8b15c8e 100644
--- a/GeneralMods/AdditionalCropsFramework/packages.config
+++ b/GeneralMods/AdditionalCropsFramework/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj
index 32b1ccda..eeae3c37 100644
--- a/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj
+++ b/GeneralMods/AdvancedSaveBackup/AdvancedSaveBackup.csproj
@@ -87,15 +87,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/AdvancedSaveBackup/packages.config b/GeneralMods/AdvancedSaveBackup/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/AdvancedSaveBackup/packages.config
+++ b/GeneralMods/AdvancedSaveBackup/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/AutoSpeed/AutoSpeed.csproj b/GeneralMods/AutoSpeed/AutoSpeed.csproj
index f73cb848..23545179 100644
--- a/GeneralMods/AutoSpeed/AutoSpeed.csproj
+++ b/GeneralMods/AutoSpeed/AutoSpeed.csproj
@@ -85,15 +85,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/AutoSpeed/packages.config b/GeneralMods/AutoSpeed/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/AutoSpeed/packages.config
+++ b/GeneralMods/AutoSpeed/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj
index ca00eaec..a3638df8 100644
--- a/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj
+++ b/GeneralMods/BillboardAnywhere/BillboardAnywhere.csproj
@@ -87,15 +87,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/BillboardAnywhere/packages.config b/GeneralMods/BillboardAnywhere/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/BillboardAnywhere/packages.config
+++ b/GeneralMods/BillboardAnywhere/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/BuildEndurance/BuildEndurance.csproj b/GeneralMods/BuildEndurance/BuildEndurance.csproj
index 2d297b06..0fd10fa4 100644
--- a/GeneralMods/BuildEndurance/BuildEndurance.csproj
+++ b/GeneralMods/BuildEndurance/BuildEndurance.csproj
@@ -86,15 +86,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/BuildEndurance/packages.config b/GeneralMods/BuildEndurance/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/BuildEndurance/packages.config
+++ b/GeneralMods/BuildEndurance/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/BuildHealth/BuildHealth.csproj b/GeneralMods/BuildHealth/BuildHealth.csproj
index bd14989f..d1627a93 100644
--- a/GeneralMods/BuildHealth/BuildHealth.csproj
+++ b/GeneralMods/BuildHealth/BuildHealth.csproj
@@ -86,15 +86,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/BuildHealth/packages.config b/GeneralMods/BuildHealth/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/BuildHealth/packages.config
+++ b/GeneralMods/BuildHealth/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj
index f664e01b..488853fb 100644
--- a/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj
+++ b/GeneralMods/BuyBackCollectables/BuyBackCollectables.csproj
@@ -88,15 +88,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/BuyBackCollectables/packages.config b/GeneralMods/BuyBackCollectables/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/BuyBackCollectables/packages.config
+++ b/GeneralMods/BuyBackCollectables/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj b/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj
index 9eeded7f..20071e85 100644
--- a/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj
+++ b/GeneralMods/CustomNPCFramework/CustomNPCFramework.csproj
@@ -119,15 +119,15 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GeneralMods/CustomNPCFramework/packages.config b/GeneralMods/CustomNPCFramework/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/CustomNPCFramework/packages.config
+++ b/GeneralMods/CustomNPCFramework/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/CustomShopsRedux/CustomShopsRedux.csproj b/GeneralMods/CustomShopsRedux/CustomShopsRedux.csproj
index e9f1b8c5..be195431 100644
--- a/GeneralMods/CustomShopsRedux/CustomShopsRedux.csproj
+++ b/GeneralMods/CustomShopsRedux/CustomShopsRedux.csproj
@@ -96,15 +96,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/CustomShopsRedux/packages.config b/GeneralMods/CustomShopsRedux/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/CustomShopsRedux/packages.config
+++ b/GeneralMods/CustomShopsRedux/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj b/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj
index c1a99c66..2d0790fc 100644
--- a/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj
+++ b/GeneralMods/DailyQuestAnywhere/DailyQuestAnywhere.csproj
@@ -87,15 +87,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/DailyQuestAnywhere/packages.config b/GeneralMods/DailyQuestAnywhere/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/DailyQuestAnywhere/packages.config
+++ b/GeneralMods/DailyQuestAnywhere/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/DebugSandBoxAndReferences/DebugSandBoxAndReferences.csproj b/GeneralMods/DebugSandBoxAndReferences/DebugSandBoxAndReferences.csproj
index 9be7d3e6..defda498 100644
--- a/GeneralMods/DebugSandBoxAndReferences/DebugSandBoxAndReferences.csproj
+++ b/GeneralMods/DebugSandBoxAndReferences/DebugSandBoxAndReferences.csproj
@@ -93,14 +93,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/DebugSandBoxAndReferences/packages.config b/GeneralMods/DebugSandBoxAndReferences/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/DebugSandBoxAndReferences/packages.config
+++ b/GeneralMods/DebugSandBoxAndReferences/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj b/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj
index 7bf38e37..e0b9c753 100644
--- a/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj
+++ b/GeneralMods/Fall28SnowDay/Fall28SnowDay.csproj
@@ -86,15 +86,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/Fall28SnowDay/packages.config b/GeneralMods/Fall28SnowDay/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/Fall28SnowDay/packages.config
+++ b/GeneralMods/Fall28SnowDay/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj b/GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj
index 7e2902ba..c2b0dbbc 100644
--- a/GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj
+++ b/GeneralMods/FarmersMarketStall/FarmersMarketStall.csproj
@@ -91,14 +91,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/FarmersMarketStall/packages.config b/GeneralMods/FarmersMarketStall/packages.config
index 28b59b1d..84563214 100644
--- a/GeneralMods/FarmersMarketStall/packages.config
+++ b/GeneralMods/FarmersMarketStall/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net461" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/HappyBirthday/Framework/ModConfig.cs b/GeneralMods/HappyBirthday/Framework/ModConfig.cs
index efbc1955..fb501b14 100644
--- a/GeneralMods/HappyBirthday/Framework/ModConfig.cs
+++ b/GeneralMods/HappyBirthday/Framework/ModConfig.cs
@@ -41,12 +41,18 @@
         /// </summary>
         public TranslationInfo translationInfo;
 
+        /// <summary>
+        /// Whether or not to load from the old BirthdayGifts.xnb located in StardewValley/Data or from the new BirthdayGifts.json located in the mod directory.
+        /// </summary>
+        public bool useLegacyBirthdayFiles;
+
         /// <summary>
         /// Constructor.
         /// </summary>
         public ModConfig()
         {
             this.translationInfo = new TranslationInfo();
+            this.useLegacyBirthdayFiles = true;
         }
     }
 }
diff --git a/GeneralMods/HappyBirthday/GiftManager.cs b/GeneralMods/HappyBirthday/GiftManager.cs
new file mode 100644
index 00000000..7cee60e1
--- /dev/null
+++ b/GeneralMods/HappyBirthday/GiftManager.cs
@@ -0,0 +1,352 @@
+using Omegasis.HappyBirthday.Framework;
+using StardewModdingAPI;
+using StardewValley;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SObject = StardewValley.Object;
+
+namespace Omegasis.HappyBirthday
+{
+    public class GiftManager
+    {
+        public ModConfig Config
+        {
+            get
+            {
+                return HappyBirthday.Config;
+            }
+        }
+
+
+        private Dictionary<string,string> defaultBirthdayGifts=new Dictionary<string, string>() { 
+                ["Universal_Love_Gift"] = "74 1 446 1 204 1 446 5 773 1",
+                ["Universal_Like_Gift"] = "-2 3 -7 1 -26 2 -75 5 -80 3 72 1 220 1 221 1 395 1 613 1 634 1 635 1 636 1 637 1 638 1 724 1 233 1 223 1 465 20 -79 5",
+                ["Universal_Neutral_Gift"] = "194 1 262 5 -74 5 -75 3 334 5 335 1 390 20 388 20 -81 5 -79 3",
+                ["Robin"] = " BestGifts/224 1 426 1 636 1/GoodGift/-6 5 -79 5 424 1 709 1/NeutralGift//",
+                ["Demetrius"] = " Best Gifts/207 1 232 1 233 1 400 1/Good Gifts/-5 3 -79 5 422 1/NeutralGift/-4 3/",
+                ["Maru"] = " BestGift/72 1 197 1 190 1 215 1 222 1 243 1 336 1 337 1 400 1 787 1/Good Gift/-260 1 62 1 64 1 66 1 68 1 70 1 334 1 335 1 725 1 726 1/NeutralGift/",
+                ["Sebastian"] = " Best/84 1 227 1 236 1 575 1 305 1 /Good/267 1 276 1/Neutral/-4 3/",
+                ["Linus"] = " Best/88 1 90 1 234 1 242 1 280 1/Good/-5 3 -6 5 -79 5 -81 10/Neutral/-4 3/",
+                ["Pierre"] = " Best/202 1/Good/-5 3 -6 5 -7 1 18 1 22 1 402 1 418 1 259 1/Neutral//",
+                ["Caroline"] = " Best/213 1 593 1/Good/-7 1 18 1 402 1 418 1/Neutral// ",
+                ["Abigail"] = " Best/66 1 128 1 220 1 226 1 276 1 611 1/Good//Neutral// ",
+                ["Alex"] = " Best/201 1 212 1 662 1 664 1/Good/-5 3/Neutral// ",
+                ["George"] = " Best/20 1 205 1/Good/18 1 195 1 199 1 200 1 214 1 219 1 223 1 231 1 233 1/Neutral// ",
+                ["Evelyn"] = " Best/72 1 220 1 239 1 284 1 591 1 595 1/Good/-6 5 18 1 402 1 418 1/Neutral// ",
+                ["Lewis"] = " Best/200 1 208 1 235 1 260 1/Good/-80 5 24 1 88 1 90 1 192 1 258 1 264 1 272 1 274 1 278 1/Neutral// ",
+                ["Clint"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 336 1 337 1 605 1 649 1 749 1 337 5/Good/334 20 335 10 336 5/Neutral// ",
+                ["Penny"] = " Best/60 1 376 1 651 1 72 1 164 1 218 1 230 1 244 1 254 1/Good/-6 5 20 1 22 1/Neutral// ",
+                ["Pam"] = " Best/24 1 90 1 199 1 208 1 303 1 346 1/Good/-6 5 -75 5 -79 5 18 1 227 1 228 1 231 1 232 1 233 1 234 1 235 1 236 1 238 1 402 1 418 1/Neutral/-4 3/ ",
+                ["Emily"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 241 1 428 1 440 1 /Good/18 1 82 1 84 1 86 1 196 1 200 1 207 1 230 1 235 1 402 1 418 1/Neutral// ",
+                ["Haley"] = " Best/221 1 421 1 610 1 88 1 /Good/18 1 60 1 62 1 64 1 70 1 88 1 222 1 223 1 232 1 233 1 234 1 402 1 418 1 /Neutral// ",
+                ["Jas"] = " Best/221 1 595 1 604 1 /Good/18 1 60 1 64 1 70 1 88 1 232 1 233 1 234 1 222 1 223 1 340 1 344 1 402 1 418 1 /Neutral// ",
+                ["Vincent"] = " Best/221 1 398 1 612 1 /Good/18 1 60 1 64 1 70 1 88 1 232 1 233 1 234 1 222 1 223 1 340 1 344 1 402 1 418 1 /Neutral// ",
+                ["Jodi"] = " Best/72 1 200 1 211 1 214 1 220 1 222 1 225 1 231 1 /Good/-5 3 -6 5 -79 5 18 1 402 1 418 1 /Neutral// ",
+                ["Kent"] = " Best/607 1 649 1 /Good/-5 3 -79 5 18 1 402 1 418 1 /Neutral// ",
+                ["Sam"] = " Best/90 1 206 1 655 1 658 1 562 1 731 1/Good/167 1 210 1 213 1 220 1 223 1 224 1 228 1 232 1 233 1 239 1 -5 3/Neutral// ",
+                ["Leah"] = " Best/196 1 200 1 348 1 606 1 651 1 650 1 426 1 430 1 /Good/-5 3 -6 5 -79 5 -81 10 18 1 402 1 406 1 408 1 418 1 86 1 /Neutral// ",
+                ["Shane"] = " Best/206 1 215 1 260 1 346 1 /Good/-5 3 -79 5 303 1 /Neutral// ",
+                ["Marnie"] = " Best/72 1 221 1 240 1 608 1 /Good/-5 3 -6 5 402 1 418 1 /Neutral// ",
+                ["Elliott"] = " Best/715 1 732 1 218 1 444 1 /Good/727 1 728 1 -79 5 60 1 80 1 82 1 84 1 149 1 151 1 346 1 348 1 728 1 /Neutral/-4 3 / ",
+                ["Gus"] = " Best/72 1 213 1 635 1 729 1 /Good/348 1 303 1 -7 1 18 1 /Neutral// ",
+                ["Dwarf"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 749 1 /Good/82 1 84 1 86 1 96 1 97 1 98 1 99 1 121 1 122 1 /Neutral/-28 20 / ",
+                ["Wizard"] = " Best/107 1 155 1 422 1 769 1 768 1 /Good/-12 3 72 1 82 1 84 1/Neutral// ",
+                ["Harvey"] = " Best/348 1 237 1 432 1 395 1 342 1 /Good/-81 10 -79 5 -7 1 402 1 418 1 422 1 436 1 438 1 442 1 444 1 422 1 /Neutral// ",
+                ["Sandy"] = " Best/18 1 402 1 418 1 /Good/-75 5 -79 5 88 1 428 1 436 1 438 1 440 1 /Neutral// ",
+                ["Willy"] = " Best/72 1 143 1 149 1 154 1 276 1 337 1 698 1 /Good/66 1 336 1 340 1 699 1 707 1 /Neutral/-4 3 / ",
+                ["Krobus"] = " Best/72 1 16 1 276 1 337 1 305 1 /Good/66 1 336 1 340 1 /Neutral// "
+            };
+
+        public Dictionary<string, string> defaultSpouseBirthdayGifts = new Dictionary<string, string>() {
+
+            ["Universal_Love_Gift"] = "74 1 446 1 204 1 446 5 773 1",
+            ["Universal_Like_Gift"] = "-2 3 -7 1 -26 2 -75 5 -80 3 72 1 220 1 221 1 395 1 613 1 634 1 635 1 636 1 637 1 638 1 724 1 233 1 223 1 465 20 -79 5",
+            ["Universal_Neutral_Gift"] = "194 1 262 5 -74 5 -75 3 334 5 335 1 390 20 388 20 -81 5 -79 3",
+            ["Alex"] = "",
+            ["Elliott"] = "",
+            ["Harvey"] = "",
+            ["Sam"] = "",
+            ["Sebastian"] = "",
+            ["Shane"] = "",
+            ["Abigail"] = "",
+            ["Emily"] = "",
+            ["Haley"] = "",
+            ["Leah"] = "",
+            ["Maru"] = "",
+            ["Penny"] = "",
+
+
+        };
+
+        public List<Item> BirthdayGifts;
+
+        /// <summary>The next birthday gift the player will receive.</summary>
+        public Item BirthdayGiftToReceive;
+
+
+        public GiftManager()
+        {
+            this.BirthdayGifts = new List<Item>();
+        }
+
+        public void loadVillagerBirthdayGifts()
+        {
+            if (File.Exists("BirthdayGifts.json"))
+            {
+
+            }
+            else
+            {
+                HappyBirthday.ModHelper.Data.WriteJsonFile<Dictionary<string, string>>(HappyBirthday.ModHelper.DirectoryPath, this.defaultBirthdayGifts);
+            }
+        }
+
+
+
+        /// <summary>Get the default gift items.</summary>
+        /// <param name="name">The villager's name.</param>
+        private IEnumerable<SObject> GetDefaultBirthdayGifts(string name)
+        {
+            List<SObject> gifts = new List<SObject>();
+            try
+            {
+                // read from birthday gifts file
+                IDictionary<string, string> data = Game1.content.Load<Dictionary<string, string>>("Data\\BirthdayGifts");
+                data.TryGetValue(name, out string text);
+                if (text != null)
+                {
+                    string[] fields = text.Split('/');
+
+                    // love
+                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
+                    {
+                        string[] loveFields = fields[1].Split(' ');
+                        for (int i = 0; i < loveFields.Length; i += 2)
+                        {
+                            try
+                            {
+                                gifts.AddRange(this.GetItems(Convert.ToInt32(loveFields[i]), Convert.ToInt32(loveFields[i + 1])));
+                            }
+                            catch { }
+                        }
+                    }
+
+                    // like
+                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
+                    {
+                        string[] likeFields = fields[3].Split(' ');
+                        for (int i = 0; i < likeFields.Length; i += 2)
+                        {
+                            try
+                            {
+                                gifts.AddRange(this.GetItems(Convert.ToInt32(likeFields[i]), Convert.ToInt32(likeFields[i + 1])));
+                            }
+                            catch { }
+                        }
+                    }
+
+                    // neutral
+                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
+                    {
+                        string[] neutralFields = fields[5].Split(' ');
+
+                        for (int i = 0; i < neutralFields.Length; i += 2)
+                        {
+                            try
+                            {
+                                gifts.AddRange(this.GetItems(Convert.ToInt32(neutralFields[i]), Convert.ToInt32(neutralFields[i + 1])));
+                            }
+                            catch { }
+                        }
+                    }
+                }
+
+                // get NPC's preferred gifts
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
+                    gifts.AddRange(this.GetUniversalItems("Love", true));
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
+                    this.BirthdayGifts.AddRange(this.GetUniversalItems("Like", true));
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
+                    this.BirthdayGifts.AddRange(this.GetUniversalItems("Neutral", true));
+            }
+            catch
+            {
+                // get NPC's preferred gifts
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
+                {
+                    this.BirthdayGifts.AddRange(this.GetUniversalItems("Love", false));
+                    this.BirthdayGifts.AddRange(this.GetLovedItems(name));
+                }
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
+                {
+                    this.BirthdayGifts.AddRange(this.GetLikedItems(name));
+                    this.BirthdayGifts.AddRange(this.GetUniversalItems("Like", false));
+                }
+                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
+                    this.BirthdayGifts.AddRange(this.GetUniversalItems("Neutral", false));
+            }
+
+            if (Game1.player.isMarried())
+            {
+                if (name == Game1.player.spouse)
+                {
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(204, 1));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(220, 1));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(221, 1));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(223, 3));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(233, 3));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(234, 1));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(608, 1)); //pumpkin pie
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(612, 5));
+                    this.BirthdayGifts.Add((Item)new StardewValley.Object(773, 1)); //life elixer
+                }
+            }
+
+            //TODO: Make different tiers of gifts depending on the friendship, and if it is the spouse.
+            /*
+
+                */
+
+            return gifts;
+        }
+
+        /// <summary>Get the items loved by all villagers.</summary>
+        /// <param name="group">The group to get (one of <c>Like</c>, <c>Love</c>, <c>Neutral</c>).</param>
+        /// <param name="isBirthdayGiftList">Whether to get data from <c>Data\BirthdayGifts.xnb</c> instead of the game data.</param>
+        private IEnumerable<SObject> GetUniversalItems(string group, bool isBirthdayGiftList)
+        {
+            if (!isBirthdayGiftList)
+            {
+                // get raw data
+                Game1.NPCGiftTastes.TryGetValue($"Universal_{group}", out string text);
+                if (text == null)
+                    yield break;
+
+                // parse
+                string[] neutralIDs = text.Split(' ');
+                foreach (string neutralID in neutralIDs)
+                {
+                    foreach (SObject obj in this.GetItems(Convert.ToInt32(neutralID)))
+                        yield return obj;
+                }
+            }
+            else
+            {
+                // get raw data
+                Dictionary<string, string> data = Game1.content.Load<Dictionary<string, string>>("Data\\BirthdayGifts");
+                data.TryGetValue($"Universal_{group}_Gift", out string text);
+                if (text == null)
+                    yield break;
+
+                // parse
+                string[] array = text.Split(' ');
+                for (int i = 0; i < array.Length; i += 2)
+                {
+                    foreach (SObject obj in this.GetItems(Convert.ToInt32(array[i]), Convert.ToInt32(array[i + 1])))
+                        yield return obj;
+                }
+            }
+        }
+
+        /// <summary>Get a villager's loved items.</summary>
+        /// <param name="name">The villager's name.</param>
+        private IEnumerable<SObject> GetLikedItems(string name)
+        {
+            // get raw data
+            Game1.NPCGiftTastes.TryGetValue(name, out string text);
+            if (text == null)
+                yield break;
+
+            // parse
+            string[] data = text.Split('/');
+            string[] likedIDs = data[3].Split(' ');
+            foreach (string likedID in likedIDs)
+            {
+                foreach (SObject obj in this.GetItems(Convert.ToInt32(likedID)))
+                    yield return obj;
+            }
+        }
+
+        /// <summary>Get a villager's loved items.</summary>
+        /// <param name="name">The villager's name.</param>
+        private IEnumerable<SObject> GetLovedItems(string name)
+        {
+            // get raw data
+            Game1.NPCGiftTastes.TryGetValue(name, out string text);
+            if (text == null)
+                yield break;
+
+            // parse
+            string[] data = text.Split('/');
+            string[] lovedIDs = data[1].Split(' ');
+            foreach (string lovedID in lovedIDs)
+            {
+                foreach (SObject obj in this.GetItems(Convert.ToInt32(lovedID)))
+                    yield return obj;
+            }
+        }
+
+        /// <summary>Get the items matching the given ID.</summary>
+        /// <param name="id">The category or item ID.</param>
+        private IEnumerable<SObject> GetItems(int id)
+        {
+            return id < 0
+                ? ObjectUtility.GetObjectsInCategory(id)
+                : new[] { new SObject(id, 1) };
+        }
+
+
+
+        /// <summary>Get the items matching the given ID.</summary>
+        /// <param name="id">The category or item ID.</param>
+        /// <param name="stack">The stack size.</param>
+        private IEnumerable<SObject> GetItems(int id, int stack)
+        {
+            foreach (SObject obj in this.GetItems(id))
+                yield return new SObject(obj.ParentSheetIndex, stack);
+        }
+
+        /// <summary>Set the next birthday gift the player will receive.</summary>
+        /// <param name="name">The villager's name who's giving the gift.</param>
+        /// <remarks>This returns gifts based on the speaker's heart level towards the player: neutral for 3-4, good for 5-6, and best for 7-10.</remarks>
+        public void SetNextBirthdayGift(string name)
+        {
+            Item gift;
+            if (this.BirthdayGifts.Count > 0)
+            {
+                Random random = new Random();
+                int index = random.Next(this.BirthdayGifts.Count);
+                gift = this.BirthdayGifts[index];
+                if (Game1.player.isInventoryFull())
+                    Game1.createItemDebris(gift, Game1.player.getStandingPosition(), Game1.player.getDirection());
+                else
+                    this.BirthdayGiftToReceive = gift;
+                return;
+            }
+
+            this.BirthdayGifts.AddRange(this.GetDefaultBirthdayGifts(name));
+
+            Random rnd2 = new Random();
+            int r2 = rnd2.Next(this.BirthdayGifts.Count);
+            gift = this.BirthdayGifts.ElementAt(r2);
+            //Attempt to balance sapplings from being too OP as a birthday gift.
+            if (gift.Name.Contains("Sapling"))
+            {
+                gift.Stack = 1; //A good investment?
+            }
+            if (gift.Name.Contains("Rare Seed"))
+            {
+                gift.Stack = 2; //Still a little op but less so than 5.
+            }
+
+            if (Game1.player.isInventoryFull())
+                Game1.createItemDebris(gift, Game1.player.getStandingPosition(), Game1.player.getDirection());
+            else
+                this.BirthdayGiftToReceive = gift;
+
+            this.BirthdayGifts.Clear();
+        }
+    }
+}
diff --git a/GeneralMods/HappyBirthday/HappyBirthday.cs b/GeneralMods/HappyBirthday/HappyBirthday.cs
index b584cb3f..c73c25ee 100644
--- a/GeneralMods/HappyBirthday/HappyBirthday.cs
+++ b/GeneralMods/HappyBirthday/HappyBirthday.cs
@@ -40,11 +40,6 @@ namespace Omegasis.HappyBirthday
         /// <summary>The queue of villagers who haven't given a gift yet.</summary>
         private List<string> VillagerQueue;
 
-        /// <summary>The gifts that villagers can give.</summary>
-        private List<Item> PossibleBirthdayGifts;
-
-        /// <summary>The next birthday gift the player will receive.</summary>
-        private Item BirthdayGiftToReceive;
 
         /// <summary>Whether we've already checked for and (if applicable) set up the player's birthday today.</summary>
         private bool CheckedForBirthday;
@@ -71,6 +66,7 @@ namespace Omegasis.HappyBirthday
 
         public BirthdayMessages messages;
 
+        public GiftManager giftManager;
 
         /*********
         ** Public methods
@@ -95,6 +91,8 @@ namespace Omegasis.HappyBirthday
             ModHelper = Helper;
 
             messages = new BirthdayMessages();
+            giftManager = new GiftManager();
+            
         }
 
 
@@ -215,13 +213,11 @@ namespace Omegasis.HappyBirthday
 
             // reset state
             this.VillagerQueue = new List<string>();
-            this.PossibleBirthdayGifts = new List<Item>();
-            this.BirthdayGiftToReceive = null;
             this.CheckedForBirthday = false;
 
             // load settings
             this.MigrateLegacyData();
-            this.PlayerData = this.Helper.ReadJsonFile<PlayerData>(this.DataFilePath) ?? new PlayerData();
+            this.PlayerData = this.Helper.Data.ReadJsonFile<PlayerData>(this.DataFilePath) ?? new PlayerData();
 
             messages.createBirthdayGreetings();
             //this.SeenEvent = false;
@@ -234,7 +230,7 @@ namespace Omegasis.HappyBirthday
         private void SaveEvents_BeforeSave(object sender, EventArgs e)
         {
             if (this.HasChosenBirthday)
-                this.Helper.WriteJsonFile(this.DataFilePath, this.PlayerData);
+                this.Helper.Data.WriteJsonFile(this.DataFilePath, this.PlayerData);
         }
 
         /// <summary>The method invoked when the game updates (roughly 60 times per second).</summary>
@@ -302,6 +298,7 @@ namespace Omegasis.HappyBirthday
                     }
                 }
 
+                //Don't constantly set the birthday menu.
                 if (Game1.activeClickableMenu != null)
                 {
                     if (Game1.activeClickableMenu.GetType() == typeof(BirthdayMenu)) return;
@@ -314,40 +311,7 @@ namespace Omegasis.HappyBirthday
                 }
             }
 
-            // unreachable since we exit early if Game1.eventUp
-            //if (Game1.eventUp)
-            //{
-            //    foreach (string npcName in this.VillagerQueue)
-            //    {
-            //        NPC npc = Game1.getCharacterFromName(npcName);
-
-            //        try
-            //        {
-            //            this.Dialogue.Add(npcName, npc.CurrentDialogue.Pop());
-            //        }
-            //        catch (Exception ex)
-            //        {
-            //            this.Monitor.Log(ex.ToString(), LogLevel.Error);
-            //            this.Dialogue.Add(npcName, npc.CurrentDialogue.ElementAt(0));
-            //            npc.loadSeasonalDialogue();
-            //        }
-
-            //        this.SeenEvent = true;
-            //    }
-            //}
-
-            //if (!Game1.eventUp && this.SeenEvent)
-            //{
-            //    foreach (KeyValuePair<string, Dialogue> v in this.Dialogue)
-            //    {
-            //        NPC npc = Game1.getCharacterFromName(v.Key);
-            //        npc.CurrentDialogue.Push(v.Value);
-            //    }
-            //    this.Dialogue.Clear();
-            //    this.SeenEvent = false;
-            //}
-
-            // set birthday gift
+            // Set birthday gift for the player to recieve from the npc they are currently talking with.
             if (Game1.currentSpeaker != null)
             {
                 string name = Game1.currentSpeaker.Name;
@@ -355,7 +319,7 @@ namespace Omegasis.HappyBirthday
                 {
                     try
                     {
-                        this.SetNextBirthdayGift(Game1.currentSpeaker.Name);
+                        giftManager.SetNextBirthdayGift(Game1.currentSpeaker.Name);
                         this.VillagerQueue.Remove(Game1.currentSpeaker.Name);
                     }
                     catch (Exception ex)
@@ -363,17 +327,20 @@ namespace Omegasis.HappyBirthday
                         this.Monitor.Log(ex.ToString(), LogLevel.Error);
                     }
                 }
+
+                //Validate the gift and give it to the player.
+                if (giftManager.BirthdayGiftToReceive != null)
+                {
+                    while (giftManager.BirthdayGiftToReceive.Name == "Error Item" || giftManager.BirthdayGiftToReceive.Name == "Rock" || giftManager.BirthdayGiftToReceive.Name == "???")
+                        giftManager.SetNextBirthdayGift(Game1.currentSpeaker.Name);
+                    Game1.player.addItemByMenuIfNecessaryElseHoldUp(giftManager.BirthdayGiftToReceive);
+                    giftManager.BirthdayGiftToReceive = null;
+                }
             }
-            if (this.BirthdayGiftToReceive != null && Game1.currentSpeaker != null)
-            {
-                while (this.BirthdayGiftToReceive.Name == "Error Item" || this.BirthdayGiftToReceive.Name == "Rock" || this.BirthdayGiftToReceive.Name == "???")
-                    this.SetNextBirthdayGift(Game1.currentSpeaker.Name);
-                Game1.player.addItemByMenuIfNecessaryElseHoldUp(this.BirthdayGiftToReceive);
-                this.BirthdayGiftToReceive = null;
-            }
+
         }
 
-        /// <summary>Set the player's birtday/</summary>
+        /// <summary>Set the player's birthday/</summary>
         /// <param name="season">The birthday season.</param>
         /// <param name="day">The birthday day.</param>
         private void SetBirthday(string season, int day)
@@ -400,251 +367,6 @@ namespace Omegasis.HappyBirthday
             }
         }
 
-        /// <summary>Set the next birthday gift the player will receive.</summary>
-        /// <param name="name">The villager's name who's giving the gift.</param>
-        /// <remarks>This returns gifts based on the speaker's heart level towards the player: neutral for 3-4, good for 5-6, and best for 7-10.</remarks>
-        private void SetNextBirthdayGift(string name)
-        {
-            Item gift;
-            if (this.PossibleBirthdayGifts.Count > 0)
-            {
-                Random random = new Random();
-                int index = random.Next(this.PossibleBirthdayGifts.Count);
-                gift = this.PossibleBirthdayGifts[index];
-                if (Game1.player.isInventoryFull())
-                    Game1.createItemDebris(gift, Game1.player.getStandingPosition(), Game1.player.getDirection());
-                else
-                    this.BirthdayGiftToReceive = gift;
-                return;
-            }
-
-            this.PossibleBirthdayGifts.AddRange(this.GetDefaultBirthdayGifts(name));
-
-            Random rnd2 = new Random();
-            int r2 = rnd2.Next(this.PossibleBirthdayGifts.Count);
-            gift = this.PossibleBirthdayGifts.ElementAt(r2);
-            //Attempt to balance sapplings from being too OP as a birthday gift.
-            if (gift.Name.Contains("Sapling"))
-            {
-                gift.Stack = 1; //A good investment?
-            }
-            if(gift.Name.Contains("Rare Seed"))
-            {
-                gift.Stack = 2; //Still a little op but less so than 5.
-            }
-
-            if (Game1.player.isInventoryFull())
-                Game1.createItemDebris(gift, Game1.player.getStandingPosition(), Game1.player.getDirection());
-            else
-                this.BirthdayGiftToReceive = gift;
-
-            this.PossibleBirthdayGifts.Clear();
-        }
-
-        /// <summary>Get the default gift items.</summary>
-        /// <param name="name">The villager's name.</param>
-        private IEnumerable<SObject> GetDefaultBirthdayGifts(string name)
-        {
-            List<SObject> gifts = new List<SObject>();
-            try
-            {
-                // read from birthday gifts file
-                IDictionary<string, string> data = Game1.content.Load<Dictionary<string, string>>("Data\\PossibleBirthdayGifts");
-                data.TryGetValue(name, out string text);
-                if (text != null)
-                {
-                    string[] fields = text.Split('/');
-
-                    // love
-                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
-                    {
-                        string[] loveFields = fields[1].Split(' ');
-                        for (int i = 0; i < loveFields.Length; i += 2)
-                        {
-                            try
-                            {
-                                gifts.AddRange(this.GetItems(Convert.ToInt32(loveFields[i]), Convert.ToInt32(loveFields[i + 1])));
-                            }
-                            catch { }
-                        }
-                    }
-
-                    // like
-                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
-                    {
-                        string[] likeFields = fields[3].Split(' ');
-                        for (int i = 0; i < likeFields.Length; i += 2)
-                        {
-                            try
-                            {
-                                gifts.AddRange(this.GetItems(Convert.ToInt32(likeFields[i]), Convert.ToInt32(likeFields[i + 1])));
-                            }
-                            catch { }
-                        }
-                    }
-
-                    // neutral
-                    if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
-                    {
-                        string[] neutralFields = fields[5].Split(' ');
-
-                        for (int i = 0; i < neutralFields.Length; i += 2)
-                        {
-                            try
-                            {
-                                gifts.AddRange(this.GetItems(Convert.ToInt32(neutralFields[i]), Convert.ToInt32(neutralFields[i + 1])));
-                            }
-                            catch { }
-                        }
-                    }
-                }
-
-                // get NPC's preferred gifts
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
-                    gifts.AddRange(this.GetUniversalItems("Love", true));
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
-                    this.PossibleBirthdayGifts.AddRange(this.GetUniversalItems("Like", true));
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
-                    this.PossibleBirthdayGifts.AddRange(this.GetUniversalItems("Neutral", true));
-            }
-            catch
-            {
-                // get NPC's preferred gifts
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLoveFriendshipLevel)
-                {
-                    this.PossibleBirthdayGifts.AddRange(this.GetUniversalItems("Love", false));
-                    this.PossibleBirthdayGifts.AddRange(this.GetLovedItems(name));
-                }
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minLikeFriendshipLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxLikeFriendshipLevel)
-                {
-                    this.PossibleBirthdayGifts.AddRange(this.GetLikedItems(name));
-                    this.PossibleBirthdayGifts.AddRange(this.GetUniversalItems("Like", false));
-                }
-                if (Game1.player.getFriendshipHeartLevelForNPC(name) >= Config.minNeutralFriendshipGiftLevel && Game1.player.getFriendshipHeartLevelForNPC(name) <= Config.maxNeutralFriendshipGiftLevel)
-                    this.PossibleBirthdayGifts.AddRange(this.GetUniversalItems("Neutral", false));
-            }
-
-            if (Game1.player.isMarried())
-            {
-                if (name == Game1.player.spouse)
-                {
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(198, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(204, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(220, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(221, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(223, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(233, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(234, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(286, 5));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(368, 5));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(608, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(612, 1));
-                    this.possible_birthday_gifts.Add((Item)new SytardewValley.Object(773, 1));
-                }
-            }
-
-            //TODO: Make different tiers of gifts depending on the friendship, and if it is the spouse.
-            /*
-
-                */
-
-            return gifts;
-        }
-
-        /// <summary>Get the items loved by all villagers.</summary>
-        /// <param name="group">The group to get (one of <c>Like</c>, <c>Love</c>, <c>Neutral</c>).</param>
-        /// <param name="isBirthdayGiftList">Whether to get data from <c>Data\PossibleBirthdayGifts.xnb</c> instead of the game data.</param>
-        private IEnumerable<SObject> GetUniversalItems(string group, bool isBirthdayGiftList)
-        {
-            if (!isBirthdayGiftList)
-            {
-                // get raw data
-                Game1.NPCGiftTastes.TryGetValue($"Universal_{group}", out string text);
-                if (text == null)
-                    yield break;
-
-                // parse
-                string[] neutralIDs = text.Split(' ');
-                foreach (string neutralID in neutralIDs)
-                {
-                    foreach (SObject obj in this.GetItems(Convert.ToInt32(neutralID)))
-                        yield return obj;
-                }
-            }
-            else
-            {
-                // get raw data
-                Dictionary<string, string> data = Game1.content.Load<Dictionary<string, string>>("Data\\PossibleBirthdayGifts");
-                data.TryGetValue($"Universal_{group}_Gift", out string text);
-                if (text == null)
-                    yield break;
-
-                // parse
-                string[] array = text.Split(' ');
-                for (int i = 0; i < array.Length; i += 2)
-                {
-                    foreach (SObject obj in this.GetItems(Convert.ToInt32(array[i]), Convert.ToInt32(array[i + 1])))
-                        yield return obj;
-                }
-            }
-        }
-
-        /// <summary>Get a villager's loved items.</summary>
-        /// <param name="name">The villager's name.</param>
-        private IEnumerable<SObject> GetLikedItems(string name)
-        {
-            // get raw data
-            Game1.NPCGiftTastes.TryGetValue(name, out string text);
-            if (text == null)
-                yield break;
-
-            // parse
-            string[] data = text.Split('/');
-            string[] likedIDs = data[3].Split(' ');
-            foreach (string likedID in likedIDs)
-            {
-                foreach (SObject obj in this.GetItems(Convert.ToInt32(likedID)))
-                    yield return obj;
-            }
-        }
-
-        /// <summary>Get a villager's loved items.</summary>
-        /// <param name="name">The villager's name.</param>
-        private IEnumerable<SObject> GetLovedItems(string name)
-        {
-            // get raw data
-            Game1.NPCGiftTastes.TryGetValue(name, out string text);
-            if (text == null)
-                yield break;
-
-            // parse
-            string[] data = text.Split('/');
-            string[] lovedIDs = data[1].Split(' ');
-            foreach (string lovedID in lovedIDs)
-            {
-                foreach (SObject obj in this.GetItems(Convert.ToInt32(lovedID)))
-                    yield return obj;
-            }
-        }
-
-        /// <summary>Get the items matching the given ID.</summary>
-        /// <param name="id">The category or item ID.</param>
-        private IEnumerable<SObject> GetItems(int id)
-        {
-            return id < 0
-                ? ObjectUtility.GetObjectsInCategory(id)
-                : new[] { new SObject(id, 1) };
-        }
-
-        /// <summary>Get the items matching the given ID.</summary>
-        /// <param name="id">The category or item ID.</param>
-        /// <param name="stack">The stack size.</param>
-        private IEnumerable<SObject> GetItems(int id, int stack)
-        {
-            foreach (SObject obj in this.GetItems(id))
-                yield return new SObject(obj.ParentSheetIndex, stack);
-        }
-
         /// <summary>Get whether today is the player's birthday.</summary>
         private bool IsBirthday()
         {
@@ -670,7 +392,7 @@ namespace Omegasis.HappyBirthday
                 try
                 {
                     string[] text = File.ReadAllLines(this.LegacyDataFilePath);
-                    this.Helper.WriteJsonFile(this.DataFilePath, new PlayerData
+                    this.Helper.Data.WriteJsonFile(this.DataFilePath, new PlayerData
                     {
                         BirthdaySeason = text[3],
                         BirthdayDay = Convert.ToInt32(text[5])
diff --git a/GeneralMods/HappyBirthday/HappyBirthday.csproj b/GeneralMods/HappyBirthday/HappyBirthday.csproj
index 812fffb6..6c2773a8 100644
--- a/GeneralMods/HappyBirthday/HappyBirthday.csproj
+++ b/GeneralMods/HappyBirthday/HappyBirthday.csproj
@@ -102,15 +102,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/HappyBirthday/PossibleGifts.cs b/GeneralMods/HappyBirthday/PossibleGifts.cs
deleted file mode 100644
index e0006879..00000000
--- a/GeneralMods/HappyBirthday/PossibleGifts.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using StardewModdingAPI;
-using System.Collections.Generic;
-
-namespace Omegasis.HappyBirthday
-{
-    public class PossibleGifts
-    {
-        private Dictionary<string,string> defaultBirthdayGifts=new Dictionary<string, string>() { 
-                ["Universal_Love_Gift"] = "74 1 446 1 204 1 446 5 773 1",
-                ["Universal_Like_Gift"] = "-2 3 -7 1 -26 2 -75 5 -80 3 72 1 220 1 221 1 395 1 613 1 634 1 635 1 636 1 637 1 638 1 724 1 233 1 223 1 465 20 -79 5",
-                ["Universal_Neutral_Gift"] = "194 1 262 5 -74 5 -75 3 334 5 335 1 390 20 388 20 -81 5 -79 3",
-                ["Robin"] = " BestGifts/224 1 426 1 636 1/GoodGift/-6 5 -79 5 424 1 709 1/NeutralGift//",
-                ["Demetrius"] = " Best Gifts/207 1 232 1 233 1 400 1/Good Gifts/-5 3 -79 5 422 1/NeutralGift/-4 3/",
-                ["Maru"] = " BestGift/72 1 197 1 190 1 215 1 222 1 243 1 336 1 337 1 400 1 787 1/Good Gift/-260 1 62 1 64 1 66 1 68 1 70 1 334 1 335 1 725 1 726 1/NeutralGift/",
-                ["Sebastian"] = " Best/84 1 227 1 236 1 575 1 305 1 /Good/267 1 276 1/Neutral/-4 3/",
-                ["Linus"] = " Best/88 1 90 1 234 1 242 1 280 1/Good/-5 3 -6 5 -79 5 -81 10/Neutral/-4 3/",
-                ["Pierre"] = " Best/202 1/Good/-5 3 -6 5 -7 1 18 1 22 1 402 1 418 1 259 1/Neutral//",
-                ["Caroline"] = " Best/213 1 593 1/Good/-7 1 18 1 402 1 418 1/Neutral// ",
-                ["Abigail"] = " Best/66 1 128 1 220 1 226 1 276 1 611 1/Good//Neutral// ",
-                ["Alex"] = " Best/201 1 212 1 662 1 664 1/Good/-5 3/Neutral// ",
-                ["George"] = " Best/20 1 205 1/Good/18 1 195 1 199 1 200 1 214 1 219 1 223 1 231 1 233 1/Neutral// ",
-                ["Evelyn"] = " Best/72 1 220 1 239 1 284 1 591 1 595 1/Good/-6 5 18 1 402 1 418 1/Neutral// ",
-                ["Lewis"] = " Best/200 1 208 1 235 1 260 1/Good/-80 5 24 1 88 1 90 1 192 1 258 1 264 1 272 1 274 1 278 1/Neutral// ",
-                ["Clint"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 336 1 337 1 605 1 649 1 749 1 337 5/Good/334 20 335 10 336 5/Neutral// ",
-                ["Penny"] = " Best/60 1 376 1 651 1 72 1 164 1 218 1 230 1 244 1 254 1/Good/-6 5 20 1 22 1/Neutral// ",
-                ["Pam"] = " Best/24 1 90 1 199 1 208 1 303 1 346 1/Good/-6 5 -75 5 -79 5 18 1 227 1 228 1 231 1 232 1 233 1 234 1 235 1 236 1 238 1 402 1 418 1/Neutral/-4 3/ ",
-                ["Emily"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 241 1 428 1 440 1 /Good/18 1 82 1 84 1 86 1 196 1 200 1 207 1 230 1 235 1 402 1 418 1/Neutral// ",
-                ["Haley"] = " Best/221 1 421 1 610 1 88 1 /Good/18 1 60 1 62 1 64 1 70 1 88 1 222 1 223 1 232 1 233 1 234 1 402 1 418 1 /Neutral// ",
-                ["Jas"] = " Best/221 1 595 1 604 1 /Good/18 1 60 1 64 1 70 1 88 1 232 1 233 1 234 1 222 1 223 1 340 1 344 1 402 1 418 1 /Neutral// ",
-                ["Vincent"] = " Best/221 1 398 1 612 1 /Good/18 1 60 1 64 1 70 1 88 1 232 1 233 1 234 1 222 1 223 1 340 1 344 1 402 1 418 1 /Neutral// ",
-                ["Jodi"] = " Best/72 1 200 1 211 1 214 1 220 1 222 1 225 1 231 1 /Good/-5 3 -6 5 -79 5 18 1 402 1 418 1 /Neutral// ",
-                ["Kent"] = " Best/607 1 649 1 /Good/-5 3 -79 5 18 1 402 1 418 1 /Neutral// ",
-                ["Sam"] = " Best/90 1 206 1 655 1 658 1 562 1 731 1/Good/167 1 210 1 213 1 220 1 223 1 224 1 228 1 232 1 233 1 239 1 -5 3/Neutral// ",
-                ["Leah"] = " Best/196 1 200 1 348 1 606 1 651 1 650 1 426 1 430 1 /Good/-5 3 -6 5 -79 5 -81 10 18 1 402 1 406 1 408 1 418 1 86 1 /Neutral// ",
-                ["Shane"] = " Best/206 1 215 1 260 1 346 1 /Good/-5 3 -79 5 303 1 /Neutral// ",
-                ["Marnie"] = " Best/72 1 221 1 240 1 608 1 /Good/-5 3 -6 5 402 1 418 1 /Neutral// ",
-                ["Elliott"] = " Best/715 1 732 1 218 1 444 1 /Good/727 1 728 1 -79 5 60 1 80 1 82 1 84 1 149 1 151 1 346 1 348 1 728 1 /Neutral/-4 3 / ",
-                ["Gus"] = " Best/72 1 213 1 635 1 729 1 /Good/348 1 303 1 -7 1 18 1 /Neutral// ",
-                ["Dwarf"] = " Best/60 1 62 1 64 1 66 1 68 1 70 1 749 1 /Good/82 1 84 1 86 1 96 1 97 1 98 1 99 1 121 1 122 1 /Neutral/-28 20 / ",
-                ["Wizard"] = " Best/107 1 155 1 422 1 769 1 768 1 /Good/-12 3 72 1 82 1 84 1/Neutral// ",
-                ["Harvey"] = " Best/348 1 237 1 432 1 395 1 342 1 /Good/-81 10 -79 5 -7 1 402 1 418 1 422 1 436 1 438 1 442 1 444 1 422 1 /Neutral// ",
-                ["Sandy"] = " Best/18 1 402 1 418 1 /Good/-75 5 -79 5 88 1 428 1 436 1 438 1 440 1 /Neutral// ",
-                ["Willy"] = " Best/72 1 143 1 149 1 154 1 276 1 337 1 698 1 /Good/66 1 336 1 340 1 699 1 707 1 /Neutral/-4 3 / ",
-                ["Krobus"] = " Best/72 1 16 1 276 1 337 1 305 1 /Good/66 1 336 1 340 1 /Neutral// "
-            };
-
-        private Dictionary<string, string> defaultSpouseBirthdayGifts = new Dictionary<string, string>() {
-
-            ["Universal_Love_Gift"] = "74 1 446 1 204 1 446 5 773 1",
-            ["Universal_Like_Gift"] = "-2 3 -7 1 -26 2 -75 5 -80 3 72 1 220 1 221 1 395 1 613 1 634 1 635 1 636 1 637 1 638 1 724 1 233 1 223 1 465 20 -79 5",
-            ["Universal_Neutral_Gift"] = "194 1 262 5 -74 5 -75 3 334 5 335 1 390 20 388 20 -81 5 -79 3",
-            ["Alex"] = "",
-            ["Elliott"] = "",
-            ["Harvey"] = "",
-            ["Sam"] = "",
-            ["Sebastian"] = "",
-            ["Shane"] = "",
-            ["Abigail"] = "",
-            ["Emily"] = "",
-            ["Haley"] = "",
-            ["Leah"] = "",
-            ["Maru"] = "",
-            ["Penny"] = "",
-
-
-        };
-
-        public Dictionary<string, string> BirthdayGifts;
-
-        public PossibleGifts()
-        {
-
-        }
-    }
-}
diff --git a/GeneralMods/HappyBirthday/packages.config b/GeneralMods/HappyBirthday/packages.config
index 6766c23b..b8b15c8e 100644
--- a/GeneralMods/HappyBirthday/packages.config
+++ b/GeneralMods/HappyBirthday/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/MapEvents/EventSystem.csproj b/GeneralMods/MapEvents/EventSystem.csproj
index ab41abf2..8dd8ec3a 100644
--- a/GeneralMods/MapEvents/EventSystem.csproj
+++ b/GeneralMods/MapEvents/EventSystem.csproj
@@ -95,15 +95,15 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GeneralMods/MapEvents/packages.config b/GeneralMods/MapEvents/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/MapEvents/packages.config
+++ b/GeneralMods/MapEvents/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/MoreRain/MoreRain.csproj b/GeneralMods/MoreRain/MoreRain.csproj
index 5f88a627..3b5337c8 100644
--- a/GeneralMods/MoreRain/MoreRain.csproj
+++ b/GeneralMods/MoreRain/MoreRain.csproj
@@ -85,15 +85,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/MoreRain/packages.config b/GeneralMods/MoreRain/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/MoreRain/packages.config
+++ b/GeneralMods/MoreRain/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/MuseumRearranger/MuseumRearranger.csproj b/GeneralMods/MuseumRearranger/MuseumRearranger.csproj
index 6b2a2047..07ec6f76 100644
--- a/GeneralMods/MuseumRearranger/MuseumRearranger.csproj
+++ b/GeneralMods/MuseumRearranger/MuseumRearranger.csproj
@@ -88,15 +88,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/MuseumRearranger/packages.config b/GeneralMods/MuseumRearranger/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/MuseumRearranger/packages.config
+++ b/GeneralMods/MuseumRearranger/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/NightOwl/NightOwl.csproj b/GeneralMods/NightOwl/NightOwl.csproj
index 40910ce2..a744fce1 100644
--- a/GeneralMods/NightOwl/NightOwl.csproj
+++ b/GeneralMods/NightOwl/NightOwl.csproj
@@ -91,15 +91,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/NightOwl/packages.config b/GeneralMods/NightOwl/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/NightOwl/packages.config
+++ b/GeneralMods/NightOwl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/NoMorePets/NoMorePets.csproj b/GeneralMods/NoMorePets/NoMorePets.csproj
index c5465b76..9b5cef2a 100644
--- a/GeneralMods/NoMorePets/NoMorePets.csproj
+++ b/GeneralMods/NoMorePets/NoMorePets.csproj
@@ -86,15 +86,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/NoMorePets/packages.config b/GeneralMods/NoMorePets/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/NoMorePets/packages.config
+++ b/GeneralMods/NoMorePets/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/SaveAnywhere/SaveAnywhere.csproj b/GeneralMods/SaveAnywhere/SaveAnywhere.csproj
index ba2e0479..a059c773 100644
--- a/GeneralMods/SaveAnywhere/SaveAnywhere.csproj
+++ b/GeneralMods/SaveAnywhere/SaveAnywhere.csproj
@@ -96,15 +96,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/SaveAnywhere/packages.config b/GeneralMods/SaveAnywhere/packages.config
index 2ddb1717..30506716 100644
--- a/GeneralMods/SaveAnywhere/packages.config
+++ b/GeneralMods/SaveAnywhere/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net452" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj b/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj
index 5ca4da99..b5eb855e 100644
--- a/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj
+++ b/GeneralMods/SimpleSoundManager/SimpleSoundManager.csproj
@@ -86,15 +86,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/SimpleSoundManager/packages.config b/GeneralMods/SimpleSoundManager/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/SimpleSoundManager/packages.config
+++ b/GeneralMods/SimpleSoundManager/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index a1190ad3..a243e985 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -236,7 +236,7 @@
     <Folder Include="Content\Music\XACT\" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
@@ -246,9 +246,9 @@
       <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\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/packages.config b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/packages.config
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/StardustCore/StardustCore.csproj b/GeneralMods/StardustCore/StardustCore.csproj
index 1dfa6272..3047358d 100644
--- a/GeneralMods/StardustCore/StardustCore.csproj
+++ b/GeneralMods/StardustCore/StardustCore.csproj
@@ -456,15 +456,15 @@
     <Folder Include="NetCode\NetLists\" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/StardustCore/packages.config b/GeneralMods/StardustCore/packages.config
index 6766c23b..b8b15c8e 100644
--- a/GeneralMods/StardustCore/packages.config
+++ b/GeneralMods/StardustCore/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/SundropMapEvents/SundropMapEvents.csproj b/GeneralMods/SundropMapEvents/SundropMapEvents.csproj
index f718c113..b5c6c929 100644
--- a/GeneralMods/SundropMapEvents/SundropMapEvents.csproj
+++ b/GeneralMods/SundropMapEvents/SundropMapEvents.csproj
@@ -91,15 +91,15 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GeneralMods/SundropMapEvents/packages.config b/GeneralMods/SundropMapEvents/packages.config
index 6766c23b..b8b15c8e 100644
--- a/GeneralMods/SundropMapEvents/packages.config
+++ b/GeneralMods/SundropMapEvents/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/TimeFreeze/TimeFreeze.csproj b/GeneralMods/TimeFreeze/TimeFreeze.csproj
index 32f03728..2e39ee10 100644
--- a/GeneralMods/TimeFreeze/TimeFreeze.csproj
+++ b/GeneralMods/TimeFreeze/TimeFreeze.csproj
@@ -87,15 +87,15 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\deploy.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/TimeFreeze/packages.config b/GeneralMods/TimeFreeze/packages.config
index 87b1c41e..af793ad3 100644
--- a/GeneralMods/TimeFreeze/packages.config
+++ b/GeneralMods/TimeFreeze/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/UnifiedSaveCore/AUnifiedSaveCore.csproj b/GeneralMods/UnifiedSaveCore/AUnifiedSaveCore.csproj
index 33b5f8bb..742a3407 100644
--- a/GeneralMods/UnifiedSaveCore/AUnifiedSaveCore.csproj
+++ b/GeneralMods/UnifiedSaveCore/AUnifiedSaveCore.csproj
@@ -50,9 +50,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Framework\ChestHandler.cs" />
     <Compile Include="Framework\NPCHandler.cs" />
     <Compile Include="Framework\IInformationHandler.cs" />
     <Compile Include="Framework\LocationHandler.cs" />
+    <Compile Include="Framework\ObjectHandler.cs" />
     <Compile Include="ISaveCoreAPI.cs" />
     <Compile Include="ModCore.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -64,14 +66,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.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\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/UnifiedSaveCore/Framework/ChestHandler.cs b/GeneralMods/UnifiedSaveCore/Framework/ChestHandler.cs
new file mode 100644
index 00000000..2ce4e305
--- /dev/null
+++ b/GeneralMods/UnifiedSaveCore/Framework/ChestHandler.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace UnifiedSaveCore.Framework
+{
+    public class ChestHandler : IInformationHandler
+    {
+        public void afterLoad()
+        {
+            
+        }
+
+        public void afterSave()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void beforeSave()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/GeneralMods/UnifiedSaveCore/Framework/ObjectHandler.cs b/GeneralMods/UnifiedSaveCore/Framework/ObjectHandler.cs
new file mode 100644
index 00000000..2dd1d228
--- /dev/null
+++ b/GeneralMods/UnifiedSaveCore/Framework/ObjectHandler.cs
@@ -0,0 +1,75 @@
+using Microsoft.Xna.Framework;
+using StardewValley;
+using StardewValley.Buildings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace UnifiedSaveCore.Framework
+{
+    public class ObjectHandler : IInformationHandler
+    {
+        public Dictionary<GameLocation, List<StardewValley.Object>> objects;
+
+        public ObjectHandler()
+        {
+            objects = new Dictionary<GameLocation, List<StardewValley.Object>>();
+        }
+
+        public void afterLoad()
+        {
+           
+        }
+
+        /// <summary>
+        /// After save restore all custom objects.
+        /// </summary>
+        public void afterSave()
+        {
+            foreach(KeyValuePair<GameLocation,List<StardewValley.Object>> pair in objects)
+            {
+                foreach(var obj in pair.Value)
+                {
+                    pair.Key.objects.Add(obj.tileLocation,obj);
+                }
+            }
+            objects.Clear();
+        }
+
+        /// <summary>
+        /// Before save iterate across all locations and remove all custom objects.
+        /// </summary>
+        public void beforeSave()
+        {
+            List<GameLocation> locations = new List<GameLocation>();
+            foreach(Building b in (Game1.getLocationFromName("Farm") as Farm).buildings)
+            {
+                locations.Add(b.indoors);
+            }
+            foreach(GameLocation loc in Game1.locations)
+            {
+                locations.Add(loc);
+            }
+
+            foreach(GameLocation loc in locations)
+            {
+                objects.Add(loc, new List<StardewValley.Object>());
+                foreach(var something in loc.objects)
+                {
+                    foreach(var obj in something.Values)
+                    {
+                        foreach(var type in UnifiedSaveCore.modTypes)
+                        {
+                            if (obj.GetType().ToString() == type.ToString())
+                            {
+                                objects[loc].Add(obj);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/GeneralMods/UnifiedSaveCore/ModCore.cs b/GeneralMods/UnifiedSaveCore/ModCore.cs
index 153829d8..4a84324e 100644
--- a/GeneralMods/UnifiedSaveCore/ModCore.cs
+++ b/GeneralMods/UnifiedSaveCore/ModCore.cs
@@ -77,6 +77,7 @@ namespace UnifiedSaveCore
                 "xTile",
             };
 
+
             //taken from attribute example.
             foreach (Assembly asm in assemblies)
             {
@@ -138,6 +139,7 @@ namespace UnifiedSaveCore
             dataHandlers = new List<IInformationHandler>();
             dataHandlers.Add(new LocationHandler());
             dataHandlers.Add(new NPCHandler());
+            dataHandlers.Add(new ObjectHandler());
 
         }
 
diff --git a/GeneralMods/UnifiedSaveCore/packages.config b/GeneralMods/UnifiedSaveCore/packages.config
index 28b59b1d..30506716 100644
--- a/GeneralMods/UnifiedSaveCore/packages.config
+++ b/GeneralMods/UnifiedSaveCore/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net461" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/GeneralMods/Vocalization/Vocalization/Vocalization.csproj b/GeneralMods/Vocalization/Vocalization/Vocalization.csproj
index fbe35047..7b2dee44 100644
--- a/GeneralMods/Vocalization/Vocalization/Vocalization.csproj
+++ b/GeneralMods/Vocalization/Vocalization/Vocalization.csproj
@@ -69,9 +69,6 @@
       <Name>StardustCore</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Graphics\MenuTab.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -86,6 +83,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -93,7 +93,7 @@
       <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\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+  <Import Project="..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
 </Project>
\ No newline at end of file
diff --git a/GeneralMods/Vocalization/Vocalization/packages.config b/GeneralMods/Vocalization/Vocalization/packages.config
index 28b59b1d..84563214 100644
--- a/GeneralMods/Vocalization/Vocalization/packages.config
+++ b/GeneralMods/Vocalization/Vocalization/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net461" />
+  <package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net461" />
 </packages>
\ No newline at end of file