Update for Stardew Valley 1.5 & SMAPI 3.0, minor fixes and refactoring

.gitattributes

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

DeluxeGrabber.sln

@@ -1,26 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeluxeGrabber", "DeluxeGrabber\DeluxeGrabber.csproj", "{46A2FEC7-F9EB-4A12-A43F-92906F884961}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{EDB8B326-C681-41B3-ACA6-653A156FAD38}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeluxeGrabber", "DeluxeGrabber\DeluxeGrabber.csproj", "{58E63D8A-EB9B-4488-A191-61F66229A5BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|x86.ActiveCfg = Debug|x86
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|x86.Build.0 = Debug|x86
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|x86.ActiveCfg = Release|x86
-		{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|x86.Build.0 = Release|x86
+		{58E63D8A-EB9B-4488-A191-61F66229A5BE}.Debug|x86.ActiveCfg = Debug|x86
+		{58E63D8A-EB9B-4488-A191-61F66229A5BE}.Debug|x86.Build.0 = Debug|x86
+		{58E63D8A-EB9B-4488-A191-61F66229A5BE}.Release|x86.ActiveCfg = Release|x86
+		{58E63D8A-EB9B-4488-A191-61F66229A5BE}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DeluxeGrabber/DeluxeGrabber.csproj

@@ -1,83 +1,16 @@
-<?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')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{46A2FEC7-F9EB-4A12-A43F-92906F884961}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DeluxeGrabber</RootNamespace>
     <AssemblyName>DeluxeGrabber</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </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>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <RootNamespace>DeluxeGrabber</RootNamespace>
+    <Version>2.5.1</Version>
+    <TargetFramework>net452</TargetFramework>
+    <Platforms>x86</Platforms>
     <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <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" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ModAPI.cs" />
-    <Compile Include="ModConfig.cs" />
-    <Compile Include="ModEntry.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="manifest.json" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0-beta-20180819\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
+    <PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0-beta-20180819\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0-beta-20180819\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.2.0-beta-20180819\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0-beta-20180819\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
-  </Target>
-</Project>
+
+</Project>

DeluxeGrabber/ModAPI.cs

@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 
 namespace DeluxeGrabber {
-    public class PrismaticAPI {
-        private ModConfig config = new ModConfig();
-        public int GrabberRange { get { return config.GrabberRange; } }
+    public class ModAPI {
+        private readonly ModConfig Config;
+
+        public int GrabberRange { get { return this.Config.GrabberRange; } }
 
         public IEnumerable<Vector2> GetGrabberCoverage(Vector2 origin) {
             for (int x = -GrabberRange; x <= GrabberRange; x++) {
@@ -13,5 +14,9 @@ public IEnumerable<Vector2> GetGrabberCoverage(Vector2 origin) {
                 }
             }
         }
+
+        internal ModAPI(ModConfig config) {
+            this.Config = config;
+        }
     }
 }