From 1b54dd2d28dd192a4967f0bf257a057bd50e64a0 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Mon, 21 Jan 2019 23:38:25 -0600
Subject: [PATCH] refactor and moved normal resolver to library (forgot to
 commit this part last time).

---
 .../ContentSystem/ContentManagerController.cs  | 10 +++++-----
 ...PathModifier.cs => IContentPathResolver.cs} |  6 +++---
 .../ContentSystem/NormalContentResolver.cs     | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 rename RecrownedAthenaeum/ContentSystem/{IContentPathModifier.cs => IContentPathResolver.cs} (71%)
 create mode 100644 RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs

diff --git a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs b/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs
index e7749a7..7fd41e3 100644
--- a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs
+++ b/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs
@@ -1,5 +1,5 @@
 using Microsoft.Xna.Framework.Content;
-using RecrownedAthenaeum.ContentSystem.ContentResolvers;
+using RecrownedAthenaeum.ContentSystem;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -19,11 +19,11 @@ namespace RecrownedAthenaeum.ContentSystem
         /// <summary>
         /// Path modifiers to change the path in which the content manager looks to load a file. Used for better organizing things while not needing to type entire path.
         /// </summary>
-        public readonly Dictionary<Type, IContentPathModifier> contentPathModifier;
+        public readonly Dictionary<Type, IContentPathResolver> contentPathModifier;
         /// <summary>
         /// Used when no path modifier is defined for that specific type.
         /// </summary>
-        public IContentPathModifier normalPathModifier = new NormalContentResolver();
+        public IContentPathResolver normalPathModifier = new NormalContentResolver();
         volatile float progress;
         volatile bool running;
 
@@ -46,7 +46,7 @@ namespace RecrownedAthenaeum.ContentSystem
             this.contentManager = contentManager;
             assets = new Dictionary<string, IDisposable>();
             queue = new Queue<ContentData>();
-            contentPathModifier = new Dictionary<Type, IContentPathModifier>();
+            contentPathModifier = new Dictionary<Type, IContentPathResolver>();
         }
 
         private void Load(string assetName, Type type, bool usePathModifier)
@@ -55,7 +55,7 @@ namespace RecrownedAthenaeum.ContentSystem
             string path = assetName;
             if (usePathModifier)
             {
-                IContentPathModifier handler;
+                IContentPathResolver handler;
                 if (contentPathModifier.ContainsKey(type))
                 {
                     handler = contentPathModifier[type];
diff --git a/RecrownedAthenaeum/ContentSystem/IContentPathModifier.cs b/RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs
similarity index 71%
rename from RecrownedAthenaeum/ContentSystem/IContentPathModifier.cs
rename to RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs
index ad64344..e2cd9b7 100644
--- a/RecrownedAthenaeum/ContentSystem/IContentPathModifier.cs
+++ b/RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs
@@ -3,13 +3,13 @@
     /// <summary>
     /// Modifies the given path based on a name. Used to simplify long paths for the <see cref="ContentManagerController"/>
     /// </summary>
-    public interface IContentPathModifier
+    public interface IContentPathResolver
     {
         /// <summary>
         /// Returns the complete path with the content folder as root.
         /// </summary>
-        /// <param name="assetName">Is the asset's name</param>
+        /// <param name="contentPath">Is the asset's name</param>
         /// <returns></returns>
-        string Modify(string assetName);
+        string Modify(string contentPath);
     }
 }
diff --git a/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs b/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs
new file mode 100644
index 0000000..c0d1968
--- /dev/null
+++ b/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs
@@ -0,0 +1,18 @@
+namespace RecrownedAthenaeum.ContentSystem
+{
+    /// <summary>
+    /// A resolver that does nothing. Used for looking in the root by default.
+    /// </summary>
+    public class NormalContentResolver : IContentPathResolver
+    {
+        /// <summary>
+        /// Passes the path through without modification as this is the normal content resolver and is meant to just pass things on.
+        /// </summary>
+        /// <param name="contentPath">The path to modify.</param>
+        /// <returns></returns>
+        public string Modify(string contentPath)
+        {
+            return contentPath;
+        }
+    }
+}