From df7d41fc37521ecfe039e9661cf288c933cb2bdc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 11 Dec 2016 21:03:57 -0500
Subject: [PATCH] move interfaces into root (#185)

---
 src/StardewModdingAPI/Framework/Reflection/PrivateField.cs  | 1 -
 src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs | 1 -
 .../Framework/Reflection/ReflectionHelper.cs                | 1 -
 src/StardewModdingAPI/IModHelper.cs                         | 4 +---
 src/StardewModdingAPI/{Reflection => }/IPrivateField.cs     | 2 +-
 src/StardewModdingAPI/{Reflection => }/IPrivateMethod.cs    | 2 +-
 src/StardewModdingAPI/{Reflection => }/IReflectionHelper.cs | 2 +-
 src/StardewModdingAPI/ModHelper.cs                          | 1 -
 src/StardewModdingAPI/StardewModdingAPI.csproj              | 6 +++---
 9 files changed, 7 insertions(+), 13 deletions(-)
 rename src/StardewModdingAPI/{Reflection => }/IPrivateField.cs (94%)
 rename src/StardewModdingAPI/{Reflection => }/IPrivateMethod.cs (95%)
 rename src/StardewModdingAPI/{Reflection => }/IReflectionHelper.cs (98%)

diff --git a/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs b/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs
index 6e7e3382..0bf45969 100644
--- a/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs
+++ b/src/StardewModdingAPI/Framework/Reflection/PrivateField.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using StardewModdingAPI.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
 {
diff --git a/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs b/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs
index 5b882eed..ba2374f4 100644
--- a/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs
+++ b/src/StardewModdingAPI/Framework/Reflection/PrivateMethod.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using StardewModdingAPI.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
 {
diff --git a/src/StardewModdingAPI/Framework/Reflection/ReflectionHelper.cs b/src/StardewModdingAPI/Framework/Reflection/ReflectionHelper.cs
index fd916bbe..38b4e357 100644
--- a/src/StardewModdingAPI/Framework/Reflection/ReflectionHelper.cs
+++ b/src/StardewModdingAPI/Framework/Reflection/ReflectionHelper.cs
@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Caching;
-using StardewModdingAPI.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
 {
diff --git a/src/StardewModdingAPI/IModHelper.cs b/src/StardewModdingAPI/IModHelper.cs
index 709c8692..183b3b2b 100644
--- a/src/StardewModdingAPI/IModHelper.cs
+++ b/src/StardewModdingAPI/IModHelper.cs
@@ -1,6 +1,4 @@
-using StardewModdingAPI.Reflection;
-
-namespace StardewModdingAPI
+namespace StardewModdingAPI
 {
     /// <summary>Provides simplified APIs for writing mods.</summary>
     public interface IModHelper
diff --git a/src/StardewModdingAPI/Reflection/IPrivateField.cs b/src/StardewModdingAPI/IPrivateField.cs
similarity index 94%
rename from src/StardewModdingAPI/Reflection/IPrivateField.cs
rename to src/StardewModdingAPI/IPrivateField.cs
index f758902f..3e681c12 100644
--- a/src/StardewModdingAPI/Reflection/IPrivateField.cs
+++ b/src/StardewModdingAPI/IPrivateField.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace StardewModdingAPI.Reflection
+namespace StardewModdingAPI
 {
     /// <summary>A private field obtained through reflection.</summary>
     /// <typeparam name="TValue">The field value type.</typeparam>
diff --git a/src/StardewModdingAPI/Reflection/IPrivateMethod.cs b/src/StardewModdingAPI/IPrivateMethod.cs
similarity index 95%
rename from src/StardewModdingAPI/Reflection/IPrivateMethod.cs
rename to src/StardewModdingAPI/IPrivateMethod.cs
index 4790303b..67fc8b3c 100644
--- a/src/StardewModdingAPI/Reflection/IPrivateMethod.cs
+++ b/src/StardewModdingAPI/IPrivateMethod.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace StardewModdingAPI.Reflection
+namespace StardewModdingAPI
 {
     /// <summary>A private method obtained through reflection.</summary>
     public interface IPrivateMethod
diff --git a/src/StardewModdingAPI/Reflection/IReflectionHelper.cs b/src/StardewModdingAPI/IReflectionHelper.cs
similarity index 98%
rename from src/StardewModdingAPI/Reflection/IReflectionHelper.cs
rename to src/StardewModdingAPI/IReflectionHelper.cs
index f5d7d547..5d747eda 100644
--- a/src/StardewModdingAPI/Reflection/IReflectionHelper.cs
+++ b/src/StardewModdingAPI/IReflectionHelper.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace StardewModdingAPI.Reflection
+namespace StardewModdingAPI
 {
     /// <summary>Simplifies access to private game code.</summary>
     public interface IReflectionHelper
diff --git a/src/StardewModdingAPI/ModHelper.cs b/src/StardewModdingAPI/ModHelper.cs
index 781deff4..1fcc0182 100644
--- a/src/StardewModdingAPI/ModHelper.cs
+++ b/src/StardewModdingAPI/ModHelper.cs
@@ -3,7 +3,6 @@ using System.IO;
 using Newtonsoft.Json;
 using StardewModdingAPI.Advanced;
 using StardewModdingAPI.Framework.Reflection;
-using StardewModdingAPI.Reflection;
 
 namespace StardewModdingAPI
 {
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 5f380cc6..4e547fa0 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -184,9 +184,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Inheritance\SGame.cs" />
-    <Compile Include="Reflection\IPrivateField.cs" />
-    <Compile Include="Reflection\IPrivateMethod.cs" />
-    <Compile Include="Reflection\IReflectionHelper.cs" />
+    <Compile Include="IPrivateField.cs" />
+    <Compile Include="IPrivateMethod.cs" />
+    <Compile Include="IReflectionHelper.cs" />
     <Compile Include="Version.cs" />
   </ItemGroup>
   <ItemGroup>