Move GetLoaders to ObjectCreator.

OpenRA.Game/ModData.cs

@@ -68,8 +68,8 @@ namespace OpenRA
 			WidgetLoader = new WidgetLoader(this);
 			MapCache = new MapCache(this);
 
-			SoundLoaders = GetLoaders<ISoundLoader>(Manifest.SoundFormats, "sound");
+			SoundLoaders = ObjectCreator.GetLoaders<ISoundLoader>(Manifest.SoundFormats, "sound");
-			SpriteLoaders = GetLoaders<ISpriteLoader>(Manifest.SpriteFormats, "sprite");
+			SpriteLoaders = ObjectCreator.GetLoaders<ISpriteLoader>(Manifest.SpriteFormats, "sprite");
 
 			var sequenceFormat = Manifest.Get<SpriteSequenceFormat>();
 			var sequenceLoader = ObjectCreator.FindType(sequenceFormat.Type + "Loader");
@@ -129,21 +129,6 @@ namespace OpenRA
 			CursorProvider = new CursorProvider(this);
 		}
 
-		TLoader[] GetLoaders<TLoader>(IEnumerable<string> formats, string name)
-		{
-			var loaders = new List<TLoader>();
-			foreach (var format in formats)
-			{
-				var loader = ObjectCreator.FindType(format + "Loader");
-				if (loader == null || !loader.GetInterfaces().Contains(typeof(TLoader)))
-					throw new InvalidOperationException("Unable to find a {0} loader for type '{1}'.".F(name, format));
-
-				loaders.Add((TLoader)ObjectCreator.CreateBasic(loader));
-			}
-
-			return loaders.ToArray();
-		}
-
 		public IEnumerable<string> Languages { get; private set; }
 
 		void LoadTranslations(Map map)

OpenRA.Game/ObjectCreator.cs

@@ -154,6 +154,21 @@ namespace OpenRA
 				.SelectMany(ma => ma.GetTypes());
 		}
 
+		public TLoader[] GetLoaders<TLoader>(IEnumerable<string> formats, string name)
+		{
+			var loaders = new List<TLoader>();
+			foreach (var format in formats)
+			{
+				var loader = FindType(format + "Loader");
+				if (loader == null || !loader.GetInterfaces().Contains(typeof(TLoader)))
+					throw new InvalidOperationException("Unable to find a {0} loader for type '{1}'.".F(name, format));
+
+				loaders.Add((TLoader)CreateBasic(loader));
+			}
+
+			return loaders.ToArray();
+		}
+
 		~ObjectCreator()
 		{
 			Dispose(false);