From c50891a09367169f47c80d11ae5b5bcb0d3c50a2 Mon Sep 17 00:00:00 2001
From: Zoryn Aaron <zoryn4163@gmail.com>
Date: Sun, 20 Mar 2016 15:43:31 -0400
Subject: Zoryn returns. Added JSON. Added Config.cs.

---
 TrainerMod/TrainerMod.csproj | 25 ++++++++++++++++---------
 TrainerMod/packages.config   |  4 ++++
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 TrainerMod/packages.config

(limited to 'TrainerMod')

diff --git a/TrainerMod/TrainerMod.csproj b/TrainerMod/TrainerMod.csproj
index ddf1b317..2baa6a26 100644
--- a/TrainerMod/TrainerMod.csproj
+++ b/TrainerMod/TrainerMod.csproj
@@ -34,16 +34,16 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <Choose>
-	<When Condition="'$(SteamInstallPath)' != ''">
-	  <PropertyGroup>
-		<SteamPath>$(SteamInstallPath)</SteamPath>
+    <When Condition="'$(SteamInstallPath)' != ''">
+      <PropertyGroup>
+        <SteamPath>$(SteamInstallPath)</SteamPath>
       </PropertyGroup>
-	</When>
-  <Otherwise>
-	<PropertyGroup>
-	  <SteamPath>..\..\..\..\Games\SteamLibrary</SteamPath>
-    </PropertyGroup>
-	</Otherwise>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <SteamPath>..\</SteamPath>
+      </PropertyGroup>
+    </Otherwise>
   </Choose>
   <ItemGroup>
     <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
@@ -52,6 +52,10 @@
     <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
       <Private>False</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Stardew Valley">
       <HintPath>$(SteamPath)\steamapps\common\Stardew Valley\Stardew Valley.exe</HintPath>
       <Private>False</Private>
@@ -80,6 +84,9 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/TrainerMod/packages.config b/TrainerMod/packages.config
new file mode 100644
index 00000000..583acbdf
--- /dev/null
+++ b/TrainerMod/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+</packages>
\ No newline at end of file
-- 
cgit 


From f0cb2c0e63c9e00a7a902a7729c862a569d21061 Mon Sep 17 00:00:00 2001
From: Zoryn Aaron <zoryn4163@gmail.com>
Date: Sun, 20 Mar 2016 17:19:02 -0400
Subject: converted mod loading to a manifest structure. mods now go in
 ./Mods/<MODNAME>/ - in there you need a 'manifest.json' and your dll. See
 trainermod for example.

---
 TrainerMod/TrainerMod.cs     | 2 ++
 TrainerMod/TrainerMod.csproj | 1 +
 TrainerMod/manifest.json     | 7 +++++++
 3 files changed, 10 insertions(+)
 create mode 100644 TrainerMod/manifest.json

(limited to 'TrainerMod')

diff --git a/TrainerMod/TrainerMod.cs b/TrainerMod/TrainerMod.cs
index e2482c5d..bed66b21 100644
--- a/TrainerMod/TrainerMod.cs
+++ b/TrainerMod/TrainerMod.cs
@@ -16,6 +16,7 @@ namespace TrainerMod
 {
     public class TrainerMod : Mod
     {
+        /*
         public override string Name
         {
             get { return "Trainer Mod"; }
@@ -35,6 +36,7 @@ namespace TrainerMod
         {
             get { return "Registers several commands to use. Most commands are trainer-like in that they offer forms of cheating."; }
         }
+        */
 
         public static int frozenTime;
         public static bool infHealth, infStamina, infMoney, freezeTime;
diff --git a/TrainerMod/TrainerMod.csproj b/TrainerMod/TrainerMod.csproj
index 2baa6a26..6424ecdb 100644
--- a/TrainerMod/TrainerMod.csproj
+++ b/TrainerMod/TrainerMod.csproj
@@ -85,6 +85,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="manifest.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/TrainerMod/manifest.json b/TrainerMod/manifest.json
new file mode 100644
index 00000000..a85f8dc3
--- /dev/null
+++ b/TrainerMod/manifest.json
@@ -0,0 +1,7 @@
+{
+  "Name": "Trainer Mod",
+  "Authour": "Zoryn",
+  "Version": "1.0",
+  "Description": "Registers several commands to use. Most commands are trainer-like in that they offer forms of cheating.",
+  "EntryDll":  "TrainerMod.dll"
+}
\ No newline at end of file
-- 
cgit 


From cb9cdad62d4f457ab3081854e5aa363d03630bb8 Mon Sep 17 00:00:00 2001
From: Zoryn Aaron <zoryn4163@gmail.com>
Date: Sun, 20 Mar 2016 17:45:45 -0400
Subject: adds support for old-style mods that don't use manifest. It will be
 removed in future version

---
 TrainerMod/TrainerMod.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'TrainerMod')

diff --git a/TrainerMod/TrainerMod.csproj b/TrainerMod/TrainerMod.csproj
index 6424ecdb..8f1a494f 100644
--- a/TrainerMod/TrainerMod.csproj
+++ b/TrainerMod/TrainerMod.csproj
@@ -54,7 +54,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Stardew Valley">
       <HintPath>$(SteamPath)\steamapps\common\Stardew Valley\Stardew Valley.exe</HintPath>
@@ -85,7 +85,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="manifest.json" />
+    <None Include="manifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-- 
cgit 


From 17021ae35162cfa4a6dad2c0457d4981f38878bc Mon Sep 17 00:00:00 2001
From: Zoryn Aaron <zoryn4163@gmail.com>
Date: Sun, 20 Mar 2016 18:50:31 -0400
Subject: commit things

---
 TrainerMod/FodyWeavers.xml   |  4 ++++
 TrainerMod/TrainerMod.csproj | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 TrainerMod/FodyWeavers.xml

(limited to 'TrainerMod')

diff --git a/TrainerMod/FodyWeavers.xml b/TrainerMod/FodyWeavers.xml
new file mode 100644
index 00000000..52e39c5e
--- /dev/null
+++ b/TrainerMod/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  
+</Weavers>
\ No newline at end of file
diff --git a/TrainerMod/TrainerMod.csproj b/TrainerMod/TrainerMod.csproj
index 8f1a494f..1638a3c8 100644
--- a/TrainerMod/TrainerMod.csproj
+++ b/TrainerMod/TrainerMod.csproj
@@ -12,12 +12,14 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\StardewModdingAPI\bin\x86\Debug\Mods\</OutputPath>
+    <OutputPath>..\StardewModdingAPI\bin\x86\Debug\Mods\TrainerMod\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -52,10 +54,6 @@
     <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Stardew Valley">
       <HintPath>$(SteamPath)\steamapps\common\Stardew Valley\Stardew Valley.exe</HintPath>
       <Private>False</Private>
@@ -90,6 +88,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
-- 
cgit