From c257d705758a23cf28ce2c1f00b6d3d42cd30a26 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Wed, 21 Dec 2016 13:27:56 -0500
Subject: rename SMAPI config file for consistency (#192, #202)

---
 src/StardewModdingAPI.Installer/InteractiveInstaller.cs            | 5 +++--
 src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj | 4 ++--
 src/StardewModdingAPI/Program.cs                                   | 2 +-
 src/StardewModdingAPI/StardewModdingAPI-settings.json              | 4 ----
 src/StardewModdingAPI/StardewModdingAPI.config.json                | 4 ++++
 src/StardewModdingAPI/StardewModdingAPI.csproj                     | 3 ++-
 6 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 src/StardewModdingAPI/StardewModdingAPI-settings.json
 create mode 100644 src/StardewModdingAPI/StardewModdingAPI.config.json

(limited to 'src')

diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
index 4cef1a12..ce6c83d9 100644
--- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
+++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
@@ -55,7 +55,7 @@ namespace StardewModdingApi.Installer
         {
             // common
             "StardewModdingAPI.exe",
-            "StardewModdingAPI-settings.json",
+            "StardewModdingAPI.config.json",
             "StardewModdingAPI.AssemblyRewriters.dll",
             "steam_appid.txt",
 
@@ -72,7 +72,8 @@ namespace StardewModdingApi.Installer
             "StardewModdingAPI.pdb",
 
             // obsolete
-            "Mods/.cache"
+            "Mods/.cache", // 1.3-1.4
+            "StardewModdingAPI-settings.json" // 1.0-1.4
         };
 
 
diff --git a/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj b/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj
index f82bce0f..c9dedd45 100644
--- a/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj
+++ b/src/StardewModdingAPI.Installer/StardewModdingAPI.Installer.csproj
@@ -73,7 +73,7 @@
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe" DestinationFolder="$(CompiledInstallerPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe.mdb" DestinationFolder="$(CompiledInstallerPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.AssemblyRewriters.dll" DestinationFolder="$(CompiledInstallerPath)\Mono" />
-    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI-settings.json" DestinationFolder="$(CompiledInstallerPath)\Mono" />
+    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.config.json" DestinationFolder="$(CompiledInstallerPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Numerics.dll" DestinationFolder="$(CompiledInstallerPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\System.Runtime.Caching.dll" DestinationFolder="$(CompiledInstallerPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\unix-launcher.sh" DestinationFiles="$(CompiledInstallerPath)\Mono\StardewModdingAPI" />
@@ -87,7 +87,7 @@
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.pdb" DestinationFolder="$(CompiledInstallerPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.xml" DestinationFolder="$(CompiledInstallerPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.AssemblyRewriters.dll" DestinationFolder="$(CompiledInstallerPath)\Windows" />
-    <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI-settings.json" DestinationFolder="$(CompiledInstallerPath)\Windows" />
+    <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.config.json" DestinationFolder="$(CompiledInstallerPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\steam_appid.txt" DestinationFolder="$(CompiledInstallerPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="@(CompiledMods)" DestinationFolder="$(CompiledInstallerPath)\Windows\Mods\%(RecursiveDir)" />
   </Target>
diff --git a/src/StardewModdingAPI/Program.cs b/src/StardewModdingAPI/Program.cs
index 7c9cdcc3..9de7496e 100644
--- a/src/StardewModdingAPI/Program.cs
+++ b/src/StardewModdingAPI/Program.cs
@@ -102,7 +102,7 @@ namespace StardewModdingAPI
 
             // load user settings
             {
-                string settingsFileName = $"{typeof(Program).Assembly.GetName().Name}-settings.json";
+                string settingsFileName = $"{typeof(Program).Assembly.GetName().Name}.config.json";
                 string settingsPath = Path.Combine(Constants.ExecutionPath, settingsFileName);
                 if (File.Exists(settingsPath))
                 {
diff --git a/src/StardewModdingAPI/StardewModdingAPI-settings.json b/src/StardewModdingAPI/StardewModdingAPI-settings.json
deleted file mode 100644
index d27d0141..00000000
--- a/src/StardewModdingAPI/StardewModdingAPI-settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  /* show all deprecation notices in the console? */
-  "DeveloperMode": true
-}
diff --git a/src/StardewModdingAPI/StardewModdingAPI.config.json b/src/StardewModdingAPI/StardewModdingAPI.config.json
new file mode 100644
index 00000000..d27d0141
--- /dev/null
+++ b/src/StardewModdingAPI/StardewModdingAPI.config.json
@@ -0,0 +1,4 @@
+{
+  /* show all deprecation notices in the console? */
+  "DeveloperMode": true
+}
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 875bc1f3..cbcd9964 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -202,7 +202,7 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="StardewModdingAPI-settings.json">
+    <Content Include="StardewModdingAPI.config.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="unix-launcher.sh">
@@ -251,6 +251,7 @@
   </PropertyGroup>
   <Target Name="AfterBuild" Condition="$(Configuration) == 'Debug'">
     <Copy SourceFiles="$(TargetDir)\$(TargetName).exe" DestinationFolder="$(GamePath)" />
+    <Copy SourceFiles="$(TargetDir)\$(TargetName).config.json" DestinationFolder="$(GamePath)" />
     <Copy SourceFiles="$(TargetDir)\StardewModdingAPI.AssemblyRewriters.dll" DestinationFolder="$(GamePath)" />
     <Copy SourceFiles="$(TargetDir)\$(TargetName).exe.mdb" DestinationFolder="$(GamePath)" Condition="$(OS) != 'Windows_NT'" />
     <Copy SourceFiles="$(TargetDir)\$(TargetName).pdb" DestinationFolder="$(GamePath)" Condition="$(OS) == 'Windows_NT'" />
-- 
cgit