CHANGELOG.md

@@ -45,7 +45,6 @@ Additions
 
 Improvements
 - Improved RawContentManager's reader loading and added better exception handling
-- Improved CopyExtensions construction speed
 
 ## 5.0.0
 ### MLEM

MLEM.Data/CopyExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -10,7 +9,6 @@ namespace MLEM.Data {
     public static class CopyExtensions {
 
         private const BindingFlags DefaultFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-        private static readonly Dictionary<Type, ConstructorInfo> ConstructorCache = new Dictionary<Type, ConstructorInfo>();
 
         /// <summary>
         /// Creates a shallow copy of the object and returns it.
@@ -87,20 +85,17 @@ namespace MLEM.Data {
         }
 
         private static object Construct(Type t, BindingFlags flags) {
-            if (!ConstructorCache.TryGetValue(t, out var constructor)) {
+            var constructors = t.GetConstructors(flags);
-                var constructors = t.GetConstructors(flags);
+            // find a contructor with the correct attribute
-                // find a contructor with the correct attribute
+            var constructor = constructors.FirstOrDefault(c => c.GetCustomAttribute<CopyConstructorAttribute>() != null);
-                constructor = constructors.FirstOrDefault(c => c.GetCustomAttribute<CopyConstructorAttribute>() != null);
+            // find a parameterless construcotr
-                // find a parameterless construcotr
+            if (constructor == null)
-                if (constructor == null)
+                constructor = t.GetConstructor(flags, null, Type.EmptyTypes, null);
-                    constructor = t.GetConstructor(flags, null, Type.EmptyTypes, null);
+            // fall back to the first constructor
-                // fall back to the first constructor
+            if (constructor == null)
-                if (constructor == null)
+                constructor = constructors.FirstOrDefault();
-                    constructor = constructors.FirstOrDefault();
+            if (constructor == null)
-                if (constructor == null)
+                throw new NullReferenceException($"Type {t} does not have a constructor with the required visibility");
-                    throw new NullReferenceException($"Type {t} does not have a constructor with the required visibility");
-                ConstructorCache.Add(t, constructor);
-            }
             return constructor.Invoke(new object[constructor.GetParameters().Length]);
         }
 

MLEM.Ui/Style/UntexturedStyle.cs

@@ -1,6 +1,8 @@
+using System.Text;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using MLEM.Extensions;
+using MLEM.Font;
 
 namespace MLEM.Ui.Style {
     /// <summary>