Merge pull request #1 from Pathoschild/update-code

Update for current game/mod frameworks, expand .gitignore & add .gitattributes

.gitattributes

@@ -0,0 +1,2 @@
+# always normalise line endings
+* text=auto

.gitignore

@@ -1,11 +1,25 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
-
-*.zip
-/FarmHouseRedone/bin/Debug/Newtonsoft.Json.dll
-/FarmHouseRedone/bin/Debug/Newtonsoft.Json.xml
-/.vs/FarmHouseRedone/v15/Server/sqlite3/db.lock
-/.vs/FarmHouseRedone/v15/Server/sqlite3/storage.ide
-/.vs/FarmHouseRedone/v15/Server/sqlite3/storage.ide-shm
-/.vs/FarmHouseRedone/v15/Server/sqlite3/storage.ide-wal
+# user-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# build results
+[Dd]ebug/
+[Rr]elease/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio cache/options
+.vs/
+
+# ReSharper
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# NuGet packages
+*.nupkg
+**/packages/*
+*.nuget.props
+*.nuget.targets

FarmHouseRedone.sln

@@ -1,22 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29001.49
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmHouseRedone", "FarmHouseRedone\FarmHouseRedone.csproj", "{AA94136D-0A02-4A7C-800E-79DCCEEA977A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{F061CA68-97E1-4050-AE82-286ECF056F63}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FarmHouseRedone", "FarmHouseRedone\FarmHouseRedone.csproj", "{D12F100E-FC98-4DAB-AA61-4D81A3FE6C0B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AA94136D-0A02-4A7C-800E-79DCCEEA977A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA94136D-0A02-4A7C-800E-79DCCEEA977A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA94136D-0A02-4A7C-800E-79DCCEEA977A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA94136D-0A02-4A7C-800E-79DCCEEA977A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D12F100E-FC98-4DAB-AA61-4D81A3FE6C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D12F100E-FC98-4DAB-AA61-4D81A3FE6C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D12F100E-FC98-4DAB-AA61-4D81A3FE6C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D12F100E-FC98-4DAB-AA61-4D81A3FE6C0B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F560DF41-9873-489E-8A27-1905117A6DFA}
+	EndGlobalSection
 EndGlobal

FarmHouseRedone/DecoratableLocation_Patch.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using StardewValley.Locations;
-using Harmony;
 using xTile;
 
 namespace FarmHouseRedone

FarmHouseRedone/Event_Patch.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Harmony;
 using System.Reflection.Emit;
+using HarmonyLib;
 using StardewValley;
 using Microsoft.Xna.Framework;
 

FarmHouseRedone/FarmHouseRedone.csproj

@@ -1,117 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AA94136D-0A02-4A7C-800E-79DCCEEA977A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FarmHouseRedone</RootNamespace>
-    <AssemblyName>FarmHouseRedone</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.1.2.0.1\lib\net45\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="Netcode">
-      <HintPath>F:\SteamLibrary\SteamApps\common\Stardew Valley\Netcode.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Stardew Valley">
-      <HintPath>F:\SteamLibrary\SteamApps\common\Stardew Valley\Stardew Valley.exe</HintPath>
-    </Reference>
-    <Reference Include="StardewModdingAPI">
-      <HintPath>F:\SteamLibrary\SteamApps\common\Stardew Valley\StardewModdingAPI.exe</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xTile">
-      <HintPath>F:\SteamLibrary\SteamApps\common\Stardew Valley\xTile.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Config.cs" />
-    <Compile Include="DecoratableLocation_Patch.cs" />
-    <Compile Include="Event_Patch.cs" />
-    <Compile Include="Farmer_Patch.cs" />
-    <Compile Include="FarmHouseState.cs" />
-    <Compile Include="FarmHouseStates.cs" />
-    <Compile Include="FarmHouse_Patch.cs" />
-    <Compile Include="FarmState.cs" />
-    <Compile Include="Farm_Patch.cs" />
-    <Compile Include="Game1_Patch.cs" />
-    <Compile Include="GameLocation_Patch.cs" />
-    <Compile Include="Image\ImageInfo.cs" />
-    <Compile Include="Image\Model.cs" />
-    <Compile Include="Image\Renderer.cs" />
-    <Compile Include="LevelNUpgrade.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="MapUtilities\FacadeHelper.cs" />
-    <Compile Include="MapUtilities\MapMerger.cs" />
-    <Compile Include="MapUtilities\SheetHelper.cs" />
-    <Compile Include="ModEntry.cs" />
-    <Compile Include="NPC_Patchcs.cs" />
-    <Compile Include="ObjectIDHelper.cs" />
-    <Compile Include="Object_Patch.cs" />
-    <Compile Include="OtherLocations\DecoratableState.cs" />
-    <Compile Include="OtherLocations\DecoratableStates.cs" />
-    <Compile Include="OtherLocations\FakeDecor\FakeDecorHandler.cs" />
-    <Compile Include="Pathing\ClaustrophobiaWeight.cs" />
-    <Compile Include="Pathing\Node.cs" />
-    <Compile Include="Pathing\Path.cs" />
-    <Compile Include="Pathing\PathingGrid.cs" />
-    <Compile Include="Pathing\ProximityWeight.cs" />
-    <Compile Include="Patio.cs" />
-    <Compile Include="PatioManager.cs" />
-    <Compile Include="Pet_Patch.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Shed_Patch.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="Wallpaper_Patch.cs" />
-    <Compile Include="Wand_Patch.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Manifest.json" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+<Project Sdk="Microsoft.NET.Sdk">
     <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>
+        <Version>0.1.0</Version>
+        <TargetFramework>net5.0</TargetFramework>
+
+        <EnableHarmony>true</EnableHarmony>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
-  </Target>
-</Project>
+
+    <ItemGroup>
+        <PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="4.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="Newtonsoft.Json">
+            <HintPath>$(GamePath)\smapi-internal\Newtonsoft.Json.dll</HintPath>
+        </Reference>
+    </ItemGroup>
+</Project>

FarmHouseRedone/FarmHouseStates.cs

@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using StardewModdingAPI;
 using StardewValley;
 using StardewValley.Locations;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using xTile;
 using xTile.ObjectModel;
-using xTile.Display;
-using Harmony;
 using System.IO;
+using HarmonyLib;
 using Newtonsoft.Json.Linq;
 
 namespace FarmHouseRedone
@@ -32,7 +28,7 @@ public static class FarmHouseStates
         internal static string modPath;
         internal static IContentHelper loader;
         internal static IReflectionHelper reflector;
-        internal static HarmonyInstance harmony;
+        internal static Harmony harmony;
 
         public static List<LevelNUpgrade> upgrades;
         public static int selectedUpgrade = -1;
@@ -793,7 +789,7 @@ public static Map makeMapCopy(FarmHouse house, string mapPath)
                 {
                     newLayer.Properties[key] = layer.Properties[key];
                 }
-                newMap.Layers.Add(newLayer);
+                newMap.AddLayer(newLayer);
             }
             foreach(string key in sourceMap.Properties.Keys)
             {

FarmHouseRedone/FarmHouse_Patch.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using HarmonyLib;
 using StardewModdingAPI;
-using Harmony;
 using StardewValley.Locations;
 using StardewValley;
 using Microsoft.Xna.Framework;

FarmHouseRedone/Farm_Patch.cs

@@ -1,21 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using StardewValley;
-using StardewValley.Projectiles;
-using StardewValley.TerrainFeatures;
-using StardewValley.Buildings;
-using StardewValley.Locations;
 using StardewValley.Menus;
 using StardewModdingAPI;
 using Netcode;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Harmony;
-using System.Reflection;
 using System.Reflection.Emit;
+using HarmonyLib;
 
 namespace FarmHouseRedone
 {

FarmHouseRedone/Farmer_Patch.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using StardewValley;
+using StardewValley;
 using StardewValley.Locations;
-using Harmony;
 
 namespace FarmHouseRedone
 {

FarmHouseRedone/Game1_Patch.cs

@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using StardewValley;
 using StardewValley.Locations;
 using StardewValley.Buildings;
-using Harmony;
 using System.Reflection.Emit;
+using HarmonyLib;
 
 namespace FarmHouseRedone
 {

FarmHouseRedone/GameLocation_Patch.cs

@@ -1,15 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using StardewValley;
-using xTile.Tiles;
-using xTile.ObjectModel;
+using StardewValley;
 using xTile.Dimensions;
 using Microsoft.Xna.Framework;
-using Harmony;
-using System.Reflection.Emit;
 
 namespace FarmHouseRedone
 {

FarmHouseRedone/ModEntry.cs

@@ -1,16 +1,12 @@
 using System;
-using System.Reflection;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using HarmonyLib;
 using xTile;
 using StardewModdingAPI;
 using StardewValley;
 using StardewValley.Locations;
 using StardewValley.Characters;
 using Microsoft.Xna.Framework;
-using Harmony;
 using Netcode;
 
 namespace FarmHouseRedone
@@ -24,7 +20,7 @@ public override void Entry(IModHelper helper)
             Logger.monitor = Monitor;
             config = helper.ReadConfig<Config>();
             Logger.debugMode = config.debug;
-            var harmony = HarmonyInstance.Create("mabelsyrup.farmhouse");
+            var harmony = new Harmony("mabelsyrup.farmhouse");
 
             FarmHouseStates.harmony = harmony;
             FarmHouseStates.modPath = helper.DirectoryPath;