Merge branch 'master' into release

7 files changed, 0 insertions, 421 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/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