diff --git a/RecrownedAthenaeum/ContentSystem/ContentData.cs b/RecrownedAthenaeum/ContentSystem/ContentData.cs
deleted file mode 100644
index 2d32c20..0000000
--- a/RecrownedAthenaeum/ContentSystem/ContentData.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace RecrownedAthenaeum.ContentSystem
-{
- struct ContentData
- {
- internal Type type;
- internal string assetName;
- internal bool usePathModifier;
-
- public ContentData(string assetName, Type type, bool usePathModifier)
- {
- this.type = type;
- this.assetName = assetName;
- this.usePathModifier = usePathModifier;
- }
- }
-}
diff --git a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs b/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs
deleted file mode 100644
index 1cc2836..0000000
--- a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Microsoft.Xna.Framework.Content;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-
-namespace RecrownedAthenaeum.ContentSystem
-{
- ///
- /// Wrapper for the content manager that helps with controlling it by adding automated multithreaded content loading.
- ///
- public class AssetManager
- {
- Thread thread;
- readonly ContentManager contentManager;
- readonly Queue queue;
- Dictionary assets;
- ///
- /// 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.
- ///
- private readonly Dictionary contentPathModifier;
- ///
- /// Used when no path modifier is defined for that specific type.
- ///
- public IContentPathResolver normalPathModifier = new NormalContentResolver();
- volatile float progress;
- volatile bool running;
-
- ///
- /// Whether or not the queue is empty and all content is loaded.
- ///
- public bool Done { get { return !running && queue.Count == 0; } }
-
- ///
- /// The progress of the loading. 1 is complete while 0 is incomplete.
- ///
- public float Progress { get { return progress; } }
-
- ///
- /// Wraps the .
- ///
- /// The manager to wrap.
- public AssetManager()
- {
- this.contentManager = contentManager;
- assets = new Dictionary();
- queue = new Queue();
- contentPathModifier = new Dictionary();
- }
- ///
- /// Adds a to this handler.
- ///
- ///
- ///
- public void AddContentPathResolver(Type assetType, IContentPathResolver contentResolver) {
- contentPathModifier.Add(assetType, contentResolver);
- }
- ///
- /// Removes the for the key.
- ///
- ///
- public void RemoveContentResolver(Type assetType) {
- contentPathModifier.Remove(assetType);
- }
- private void Load(string assetName, Type type, bool usePathModifier)
- {
- Debug.WriteLine("Loading asset: " + assetName);
- string path = assetName;
- if (usePathModifier)
- {
- IContentPathResolver handler;
- if (contentPathModifier.ContainsKey(type))
- {
- handler = contentPathModifier[type];
- }
- else
- {
- handler = normalPathModifier;
- }
- path = handler.Modify(assetName);
- }
- assets.Add(assetName, contentManager.Load