diff options
-rw-r--r-- | StardewInjector/App.config | 15 | ||||
-rw-r--r-- | StardewInjector/CecilUtils.cs | 173 | ||||
-rw-r--r-- | StardewInjector/Config.cs | 72 | ||||
-rw-r--r-- | StardewInjector/Program.cs | 30 | ||||
-rw-r--r-- | StardewInjector/Properties/AssemblyInfo.cs | 36 | ||||
-rw-r--r-- | StardewInjector/StardewHooker.cs | 190 | ||||
-rw-r--r-- | StardewInjector/StardewInjector.cs | 55 | ||||
-rw-r--r-- | StardewInjector/StardewInjector.csproj | 91 | ||||
-rw-r--r-- | StardewInjector/packages.config | 4 | ||||
-rw-r--r-- | StardewModdingAPI.sln | 104 | ||||
-rw-r--r-- | StardewModdingAPI/App.config | 18 | ||||
-rw-r--r-- | StardewModdingAPI/StardewModdingAPI.csproj | 5 | ||||
-rw-r--r-- | TrainerMod/TrainerMod.csproj | 3 |
13 files changed, 63 insertions, 733 deletions
diff --git a/StardewInjector/App.config b/StardewInjector/App.config deleted file mode 100644 index f1914205..00000000 --- a/StardewInjector/App.config +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <appSettings> - <add key="RunSpeed" value="0"/> - <add key="EnableTweakedDiagonalMovement" value="False"/> - <add key="EnableEasyFishing" value="False"/> - <add key="EnableAlwaysSpawnFishingBubble" value="False"/> - <add key="SecondsPerTenMinutes" value="7"/> - <add key="EnableDebugMode" value="False"/> - - </appSettings> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> - </startup> -</configuration> diff --git a/StardewInjector/CecilUtils.cs b/StardewInjector/CecilUtils.cs deleted file mode 100644 index acdf5198..00000000 --- a/StardewInjector/CecilUtils.cs +++ /dev/null @@ -1,173 +0,0 @@ -using Mono.Cecil; -using Mono.Cecil.Cil; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace StardewInjector -{ - public struct ScannerState - { - public ILProcessor ILProcessor; - public Instruction Instruction; - - public ScannerState(ILProcessor ilProc, Instruction ins) - { - ILProcessor = ilProc; - Instruction = ins; - } - - public ScannerState Previous(Func<Instruction, bool> until = null) - { - if (until != null) - { - Instruction cur = this.Instruction; - do - { - cur = cur.Previous; - } while (!until(cur)); - return new ScannerState(this.ILProcessor, cur); - } - return new ScannerState(this.ILProcessor, Instruction.Previous); - } - - public ScannerState Next(Func<Instruction, bool> until = null) - { - if (until != null) - { - Instruction cur = this.Instruction; - do - { - cur = cur.Next; - } while (!until(cur)); - return new ScannerState(this.ILProcessor, cur); - } - return new ScannerState(this.ILProcessor, Instruction.Next); - } - - public ScannerState Last() - { - var instructions = this.ILProcessor.Body.Instructions; - return new ScannerState(this.ILProcessor, instructions[instructions.Count - 1]); - } - - public ScannerState First() - { - var instructions = this.ILProcessor.Body.Instructions; - return new ScannerState(this.ILProcessor, instructions[0]); - } - - public ScannerState ReplaceCreate(OpCode opcode) - { - Instruction ins = this.ILProcessor.Create(opcode); - this.ILProcessor.Replace(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - - public ScannerState ReplaceCreate(OpCode opcode, object arg) - { - Instruction ins = this.ILProcessor.Create(opcode, arg as dynamic); - this.ILProcessor.Replace(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - - public ScannerState CreateBefore(OpCode opcode) - { - Instruction ins = this.ILProcessor.Create(opcode); - this.ILProcessor.InsertBefore(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - - public ScannerState CreateBefore(OpCode opcode, object arg) - { - Instruction ins = this.ILProcessor.Create(opcode, arg as dynamic); - this.ILProcessor.InsertBefore(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - - public ScannerState CreateAfter(OpCode opcode) - { - Instruction ins = this.ILProcessor.Create(opcode); - this.ILProcessor.InsertAfter(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - - public ScannerState CreateAfter(OpCode opcode, object arg) - { - Instruction ins = this.ILProcessor.Create(opcode, arg as dynamic); - this.ILProcessor.InsertAfter(this.Instruction, ins); - return new ScannerState(this.ILProcessor, ins); - } - } - - public static class CecilUtils - { - public static ScannerState Scanner(this MethodDefinition me) - { - return new ScannerState(me.Body.GetILProcessor(), me.Body.Instructions[0]); - } - - public static ScannerState FindSetField(this MethodDefinition me, string fieldName) - { - var instruction = me.Body.Instructions - .FirstOrDefault(i => i.OpCode == OpCodes.Stsfld && (i.Operand as FieldDefinition).Name == fieldName); - return new ScannerState(me.Body.GetILProcessor(), instruction); - } - - public static ScannerState FindLoadField(this MethodDefinition me, string fieldName) - { - var instruction = me.Body.Instructions - .FirstOrDefault(i => { - if (i.OpCode != OpCodes.Ldfld && i.OpCode != OpCodes.Ldsfld) - return false; - if (i.Operand is FieldDefinition && (i.Operand as FieldDefinition).Name == fieldName) - return true; - if (i.Operand is FieldReference && (i.Operand as FieldReference).Name == fieldName) - return true; - return false; - }); - return new ScannerState(me.Body.GetILProcessor(), instruction); - } - - public static ScannerState FindLoadConstant(this MethodDefinition me, int val) - { - var instruction = me.Body.Instructions - .FirstOrDefault(i => i.OpCode == OpCodes.Ldc_I4 && (int)i.Operand == val); - return new ScannerState(me.Body.GetILProcessor(), instruction); - } - - public static ScannerState FindLoadConstant(this MethodDefinition me, float val) - { - var instruction = me.Body.Instructions - .FirstOrDefault(i => i.OpCode == OpCodes.Ldc_R4 && (float)i.Operand == val); - return new ScannerState(me.Body.GetILProcessor(), instruction); - } - - public static MethodDefinition FindMethod(this ModuleDefinition me, string name) - { - var nameSplit = name.Split(new string[] { "::" }, StringSplitOptions.RemoveEmptyEntries); - if (nameSplit.Length < 2) - throw new ArgumentException("Invalid method full name", "name"); - - var currentType = me.Types.FirstOrDefault(t => t.FullName == nameSplit[0]); - if (currentType == null) - return null; - - return currentType.Methods.FirstOrDefault(m => m.Name == nameSplit[1]); - } - - public static FieldDefinition FindField(this ModuleDefinition me, string name) - { - var nameSplit = name.Split(new string[] { "::" }, StringSplitOptions.RemoveEmptyEntries); - if (nameSplit.Length < 2) - throw new ArgumentException("Invalid field full name", "name"); - - var currentType = me.Types.FirstOrDefault(t => t.FullName == nameSplit[0]); - if (currentType == null) - return null; - - return currentType.Fields.FirstOrDefault(m => m.Name == nameSplit[1]); - } - } -} diff --git a/StardewInjector/Config.cs b/StardewInjector/Config.cs deleted file mode 100644 index cea45e98..00000000 --- a/StardewInjector/Config.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Text; - -namespace StardewInjector -{ - public static class Config - { - public static bool EnableDebugMode - { - get - { - bool val = false; - bool.TryParse(ConfigurationManager.AppSettings["EnableDebugMode"], out val); - return val; - } - } - - public static bool EnableAlwaysSpawnFishingBubble - { - get - { - bool val = false; - bool.TryParse(ConfigurationManager.AppSettings["EnableAlwaysSpawnFishingBubble"], out val); - return val; - } - } - - public static bool EnableEasyFishing - { - get - { - bool val = false; - bool.TryParse(ConfigurationManager.AppSettings["EnableEasyFishing"], out val); - return val; - } - } - - public static int SecondsPerTenMinutes - { - get - { - int val = 7; - int.TryParse(ConfigurationManager.AppSettings["SecondsPerTenMinutes"], out val); - return val; - } - } - - public static float RunSpeed - { - get - { - float val = 1f; - float.TryParse(ConfigurationManager.AppSettings["RunSpeed"], out val); - return val; - } - } - - public static bool EnableTweakedDiagonalMovement - { - get - { - bool val = false; - bool.TryParse(ConfigurationManager.AppSettings["EnableTweakedDiagonalMovement"], out val); - return val; - } - } - - } -} diff --git a/StardewInjector/Program.cs b/StardewInjector/Program.cs deleted file mode 100644 index 41c72240..00000000 --- a/StardewInjector/Program.cs +++ /dev/null @@ -1,30 +0,0 @@ -/* -using Mono.Cecil; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace Stardew_Injector -{ - class Program - { - - private static Stardew_Hooker hooker = new Stardew_Hooker(); - - static void Main(string[] args) - { - hooker.Initialize(); - hooker.ApplyHooks(); - hooker.Finalize(); - - hooker.Run(); - Console.ReadLine(); - } - - } -} -*/
\ No newline at end of file diff --git a/StardewInjector/Properties/AssemblyInfo.cs b/StardewInjector/Properties/AssemblyInfo.cs deleted file mode 100644 index 0ba4aafe..00000000 --- a/StardewInjector/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("StardewInjector")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("StardewInjector")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("820406dc-ae78-461f-8c7f-6329f34f986c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/StardewInjector/StardewHooker.cs b/StardewInjector/StardewHooker.cs deleted file mode 100644 index a92b96c1..00000000 --- a/StardewInjector/StardewHooker.cs +++ /dev/null @@ -1,190 +0,0 @@ -using Microsoft.Xna.Framework; -using Mono.Cecil; -using Mono.Cecil.Cil; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using StardewModdingAPI; - -namespace StardewInjector -{ - public class Stardew_Hooker - { - private AssemblyDefinition m_vAsmDefinition = null; - private ModuleDefinition m_vModDefinition = null; - private Assembly m_vAssembly = null; - - public bool Initialize() - { - Console.WriteLine("Initiating StarDew_Injector...."); - try - { - this.m_vAsmDefinition = AssemblyDefinition.ReadAssembly(@"Stardew Valley.exe"); - this.m_vModDefinition = this.m_vAsmDefinition.MainModule; - return true; - } - catch (Exception ex) - { - Program.LogError(ex); - return false; - } - } - - public bool Finalize() - { - Console.WriteLine("Finalizing StarDew_Injector...."); - try - { - if (this.m_vAsmDefinition == null) - return false; - - using (MemoryStream mStream = new MemoryStream()) - { - // Write the edited data to the memory stream.. - this.m_vAsmDefinition.Write(mStream); - - // Load the new assembly from the memory stream buffer.. - this.m_vAssembly = Assembly.Load(mStream.GetBuffer()); - - Program.StardewAssembly = m_vAssembly; - - return true; - } - } - catch (Exception ex) - { - Program.LogError(ex); - return false; - } - } - - public bool Run() - { - if (this.m_vAssembly == null) - return false; - - Console.WriteLine("Starting Stardew Valley..."); - - m_vAssembly.EntryPoint.Invoke(null, new object[] {new string[0]}); - - return true; - } - - public void ApplyHooks() - { - Console.WriteLine("Applying StarDew_Injector...."); - try - { - InjectMovementSpeed(); - - if (Config.SecondsPerTenMinutes != 7) - InjectClockScale(); - - if (Config.EnableEasyFishing) - InjectEasyFishing(); - - if (Config.EnableAlwaysSpawnFishingBubble) - InjectMoreBubbles(); - - /* - if (Config.EnableDebugMode) - InjectDebugMode(); - */ - } - catch (Exception ex) - { - Program.LogError(ex); - } - - } - - private void InjectDebugMode() - { - this.m_vModDefinition.FindMethod("StardewValley.Program::.cctor") - .FindSetField("releaseBuild").Previous() - .ReplaceCreate(OpCodes.Ldc_I4_0); - - Console.WriteLine("Enabled debug mode."); - } - - private void InjectMoreBubbles() - { - this.m_vModDefinition.FindMethod("StardewValley.GameLocation::performTenMinuteUpdate") - .FindLoadField("currentLocation").Next(i => i.ToString().Contains("NextDouble")).Next() - .ReplaceCreate(OpCodes.Ldc_R8, 1.1); - - Console.WriteLine("Forced each area to always spawn a fishing bubble."); - } - - private void InjectEasyFishing() - { - this.m_vModDefinition.FindMethod("StardewValley.Menus.BobberBar::update") - .FindLoadConstant(694) - .Next(i => i.OpCode == OpCodes.Ldc_R4) - .ReplaceCreate(OpCodes.Ldc_R4, 0.001f) - .Next(i => i.OpCode == OpCodes.Ldc_R4) - .ReplaceCreate(OpCodes.Ldc_R4, 0.001f); - - Console.WriteLine("Replaced fish escape constants for all bobbers & bobber id 694 with 0.001, slowing it down."); - } - - private void InjectClockScale() - { - int timeScale = Config.SecondsPerTenMinutes; - timeScale *= 1000; - - this.m_vModDefinition.FindMethod("StardewValley.Game1::UpdateGameClock") - .FindLoadConstant(7000f) - .ReplaceCreate(OpCodes.Ldc_R4, timeScale*1.0f) - .Next(i => i.OpCode == OpCodes.Ldc_R4 && (float) i.Operand == 7000f) - .ReplaceCreate(OpCodes.Ldc_R4, timeScale*1.0f) - .Next(i => i.OpCode == OpCodes.Ldc_I4 && (int) i.Operand == 7000) - .ReplaceCreate(OpCodes.Ldc_I4, timeScale); - - Console.WriteLine("Updated lighting for new timescale ({0}).", timeScale); - } - - private void InjectMovementSpeed() - { - - - if (Config.EnableTweakedDiagonalMovement) - { - this.m_vModDefinition.FindMethod("StardewValley.Farmer::getMovementSpeed") - .FindLoadField("movementDirections").Next(i => i.OpCode == OpCodes.Ldc_I4_1) - .ReplaceCreate(OpCodes.Ldc_I4_4); - - Console.WriteLine("Removed diagonal movement check."); - } - - if (Config.RunSpeed > 0) - { - this.m_vModDefinition.FindMethod("StardewValley.Farmer::getMovementSpeed") - .FindLoadField("movementDirections").Last().CreateBefore(OpCodes.Ldc_R4, (float) Config.RunSpeed).CreateAfter(OpCodes.Add); - - Console.WriteLine("Added run speed: " + Config.RunSpeed); - } - - - } - - - - private void DumpInstructionsToFile(MethodDefinition methodDefinition) - { - var fileName = string.Format("{0}.{1}.txt", methodDefinition.DeclaringType.Name, methodDefinition.Name); - - using (var stream = File.OpenWrite(Path.Combine(".", fileName))) - using (var writer = new StreamWriter(stream)) - { - var ilProcessor = methodDefinition.Body.GetILProcessor(); - for (int i = 0; i < ilProcessor.Body.Instructions.Count; i++) - writer.WriteLine((i) + ":" + ilProcessor.Body.Instructions[i]); - } - } - } -}
\ No newline at end of file diff --git a/StardewInjector/StardewInjector.cs b/StardewInjector/StardewInjector.cs deleted file mode 100644 index 055a79f9..00000000 --- a/StardewInjector/StardewInjector.cs +++ /dev/null @@ -1,55 +0,0 @@ -using StardewModdingAPI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StardewInjector -{ - public class StardewInjector : Mod - { - public override string Name - { - get { return "Stardew Injector"; } - } - - public override string Authour - { - get { return "Zoryn Aaron"; } - } - - public override string Version - { - get { return "1.0"; } - } - - public override string Description - { - get { return "Pulled from https://github.com/kevinmurphy678/Stardew_Injector and converted to a mod."; } - } - - public static Stardew_Hooker hooker { get; set; } - public override void Entry(params object[] objects) - { - if (objects.Length <= 0 || (objects.Length > 0 && objects[0].AsBool() == false)) - { - hooker = new Stardew_Hooker(); - hooker.Initialize(); - hooker.ApplyHooks(); - hooker.Finalize(); - - Program.LogInfo("INJECTOR ENTERED"); - } - else if (objects.Length > 0 && objects[0].AsBool() == true) - { - Program.LogInfo("INJECTOR LAUNCHING"); - hooker.Run(); - } - else - { - Program.LogError("INVALID PARAMETERS FOR INJECTOR"); - } - } - } -} diff --git a/StardewInjector/StardewInjector.csproj b/StardewInjector/StardewInjector.csproj deleted file mode 100644 index 67595e0f..00000000 --- a/StardewInjector/StardewInjector.csproj +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" 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>{C9388F35-68D2-431C-88BB-E26286272256}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>StardewInjector</RootNamespace>
- <AssemblyName>StardewInjector</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </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>
- <PlatformTarget>x86</PlatformTarget>
- </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="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
- <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
- <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
- <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Configuration" />
- <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.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="CecilUtils.cs" />
- <Compile Include="Config.cs" />
- <Compile Include="Program.cs" />
- <Compile Include="StardewHooker.cs" />
- <Compile Include="StardewInjector.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\StardewModdingAPI\StardewModdingAPI.csproj">
- <Project>{f1a573b0-f436-472c-ae29-0b91ea6b9f8f}</Project>
- <Name>StardewModdingAPI</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <!-- 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"> - </Target> - <Target Name="AfterBuild"> - </Target> - -->
-</Project>
\ No newline at end of file diff --git a/StardewInjector/packages.config b/StardewInjector/packages.config deleted file mode 100644 index bedba391..00000000 --- a/StardewInjector/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
-</packages>
\ No newline at end of file diff --git a/StardewModdingAPI.sln b/StardewModdingAPI.sln index 7f30da48..9c4a41b5 100644 --- a/StardewModdingAPI.sln +++ b/StardewModdingAPI.sln @@ -1,58 +1,46 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerMod", "TrainerMod\TrainerMod.csproj", "{28480467-1A48-46A7-99F8-236D95225359}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewInjector", "StardewInjector\StardewInjector.csproj", "{C9388F35-68D2-431C-88BB-E26286272256}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI", "StardewModdingAPI\StardewModdingAPI.csproj", "{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Debug|x86.ActiveCfg = Debug|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.Build.0 = Release|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {28480467-1A48-46A7-99F8-236D95225359}.Release|x86.ActiveCfg = Release|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Debug|x86.ActiveCfg = Debug|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Release|Any CPU.Build.0 = Release|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C9388F35-68D2-431C-88BB-E26286272256}.Release|x86.ActiveCfg = Release|Any CPU - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|x86.ActiveCfg = Debug|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|x86.Build.0 = Debug|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.Build.0 = Release|Any CPU - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Mixed Platforms.Build.0 = Release|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|x86.ActiveCfg = Release|x86 - {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainerMod", "TrainerMod\TrainerMod.csproj", "{28480467-1A48-46A7-99F8-236D95225359}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewModdingAPI", "StardewModdingAPI\StardewModdingAPI.csproj", "{F1A573B0-F436-472C-AE29-0B91EA6B9F8F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Release|Any CPU.Build.0 = Release|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {28480467-1A48-46A7-99F8-236D95225359}.Release|x86.ActiveCfg = Release|Any CPU
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|x86.ActiveCfg = Debug|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Debug|x86.Build.0 = Debug|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|Mixed Platforms.Build.0 = Release|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|x86.ActiveCfg = Release|x86
+ {F1A573B0-F436-472C-AE29-0B91EA6B9F8F}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/StardewModdingAPI/App.config b/StardewModdingAPI/App.config index d08d307f..697c237b 100644 --- a/StardewModdingAPI/App.config +++ b/StardewModdingAPI/App.config @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?> -<configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> - <runtime> - <loadFromRemoteSources enabled="true"/> - </runtime> -</configuration>
\ No newline at end of file +<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+ </startup>
+ <runtime>
+ <loadFromRemoteSources enabled="true"/>
+ </runtime>
+</configuration>
diff --git a/StardewModdingAPI/StardewModdingAPI.csproj b/StardewModdingAPI/StardewModdingAPI.csproj index 3248a3a5..f0ed516f 100644 --- a/StardewModdingAPI/StardewModdingAPI.csproj +++ b/StardewModdingAPI/StardewModdingAPI.csproj @@ -34,6 +34,7 @@ <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
@@ -44,6 +45,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -53,14 +55,17 @@ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icon.ico</ApplicationIcon>
diff --git a/TrainerMod/TrainerMod.csproj b/TrainerMod/TrainerMod.csproj index 71569885..c7dbe94f 100644 --- a/TrainerMod/TrainerMod.csproj +++ b/TrainerMod/TrainerMod.csproj @@ -11,6 +11,7 @@ <AssemblyName>TrainerMod</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@ <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
|