Revert broken backwards compatibility changes

Author: austinv900

src/ExtensionMethods.cs

@@ -6,7 +6,7 @@
 using System.Text.RegularExpressions;
 using Oxide.Pooling;
 
-namespace Oxide
+namespace Oxide.Core
 {
     /// <summary>
     /// Useful extension methods which are added to base types
@@ -185,17 +185,187 @@ public static string ToSentence<T>(this IEnumerable<T> items)
         /// <returns></returns>
         public static HashSet<T> ToHashSet<T>(this IEnumerable<T> collection) => new HashSet<T>(collection);
 
-        #region Pooling
+    }
+}
 
+namespace Oxide.Plugins
+{
+    /// <summary>
+    /// Useful extension methods which are added to base types
+    /// </summary>
+    public static class ExtensionMethods
+    {
         /// <summary>
-        /// Gets a <see cref="IArrayPoolProvider{T}"/> from the factory
+        /// Returns the last portion of a path separated by slashes
         /// </summary>
-        /// <param name="factory"></param>
-        /// <typeparam name="T"></typeparam>
+        public static string Basename(this string text, string extension = null)
+        {
+            if (extension != null)
+            {
+                if (extension.Equals("*.*"))
+                {
+                    // Return the name excluding any extension
+                    Match match = Regex.Match(text, @"([^\\/]+)\.[^\.]+$");
+                    if (match.Success)
+                    {
+                        return match.Groups[1].Value;
+                    }
+                }
+                else
+                {
+                    // Return the name excluding the given extension
+                    if (extension[0] == '*')
+                    {
+                        extension = extension.Substring(1);
+                    }
+
+                    return Regex.Match(text, @"([^\\/]+)\" + extension + "+$").Groups[1].Value;
+                }
+            }
+            // No extension was given or the path has no extension, return the full file name
+            return Regex.Match(text, @"[^\\/]+$").Groups[0].Value;
+        }
+
+        /// <summary>
+        /// Checks if an array contains a specific item
+        /// </summary>
+        public static bool Contains<T>(this T[] array, T value)
+        {
+            foreach (T item in array)
+            {
+                if (item.Equals(value))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the directory portion of a path separated by slashes
+        /// </summary>
+        public static string Dirname(this string text) => Regex.Match(text, "(.+)[\\/][^\\/]+$").Groups[1].Value;
+
+        /// <summary>
+        /// Converts PascalCase and camelCase to multiple words
+        /// </summary>
+        public static string Humanize(this string name) => Regex.Replace(name, @"(\B[A-Z])", " $1");
+
+        /// <summary>
+        /// Checks if a string is a valid 64-bit Steam ID
+        /// </summary>
+        public static bool IsSteamId(this string id)
+        {
+            return ulong.TryParse(id, out ulong targetId) && targetId > 76561197960265728ul;
+        }
+
+        /// <summary>
+        /// Checks if a ulong is a valid 64-bit Steam ID
+        /// </summary>
+        public static bool IsSteamId(this ulong id) => id > 76561197960265728ul;
+
+        /// <summary>
+        /// Converts a string to plain text
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string Plaintext(this string text) => Formatter.ToPlaintext(text);
+
+        /// <summary>
+        /// Converts a string into a quote safe string
+        /// </summary>
+        /// <param name="text"></param>
         /// <returns></returns>
-        public static IArrayPoolProvider<T> GetArrayProvider<T>(this IPoolFactory factory) => factory.GetProvider<T[]>() as IArrayPoolProvider<T>;
+        public static string QuoteSafe(this string text) => "\"" + text.Replace("\"", "\\\"").TrimEnd('\\') + "\"";
+
+        /// <summary>
+        /// Converts a string into a quote safe string
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string Quote(this string text) => QuoteSafe(text);
+
+        /// <summary>
+        /// Returns a random value from an array
+        /// </summary>
+        public static T Sample<T>(this T[] array) => array[Core.Random.Range(0, array.Length)];
+
+        /// <summary>
+        /// Converts a string into a sanitized string for string.Format
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string Sanitize(this string text) => text.Replace("{", "{{").Replace("}", "}}");
+
+        /// <summary>
+        /// Converts a string to Sentence case
+        /// </summary>
+        public static string SentenceCase(this string text)
+        {
+            Regex regex = new Regex(@"(^[a-z])|\.\s+(.)", RegexOptions.ExplicitCapture);
+            return regex.Replace(text.ToLower(), s => s.Value.ToUpper());
+        }
+
+        /// <summary>
+        /// Converts a string to Title Case
+        /// </summary>
+        public static string TitleCase(this string text)
+        {
+            return CultureInfo.InstalledUICulture.TextInfo.ToTitleCase(text.Contains('_') ? text.Replace('_', ' ') : text);
+        }
+
+        /// <summary>
+        /// Converts a string to Title Case
+        /// </summary>
+        public static string Titleize(this string text) => TitleCase(text);
+
+        /// <summary>
+        /// Turns an array of strings into a sentence
+        /// </summary>
+        /// <param name="items"></param>
+        /// <returns></returns>
+        public static string ToSentence<T>(this IEnumerable<T> items)
+        {
+            IEnumerator<T> enumerator = items.GetEnumerator();
+            if (!enumerator.MoveNext())
+            {
+                return string.Empty;
+            }
+
+            T firstItem = enumerator.Current;
+            if (!enumerator.MoveNext())
+            {
+                return firstItem?.ToString();
+            }
+
+            StringBuilder builder = new StringBuilder(firstItem?.ToString());
+            bool moreItems = true;
+            while (moreItems)
+            {
+                T item = enumerator.Current;
+                moreItems = enumerator.MoveNext();
+                builder.Append(moreItems ? ", " : " and ");
+                builder.Append(item);
+            }
+            return builder.ToString();
+        }
+
+        /// <summary>
+        /// Shortens a string to the length specified
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="max"></param>
+        /// <returns></returns>
+        public static string Truncate(this string text, int max) => text.Length <= max ? text : text.Substring(0, max) + " ...";
 
-        #endregion
+        /// <summary>
+        /// Creates a new <see cref="HashSet{T}"/> based off a <see cref="IEnumerable{T}"/>
+        /// </summary>
+        /// <param name="collection">The collection to copy items from</param>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public static HashSet<T> ToHashSet<T>(this IEnumerable<T> collection) => new HashSet<T>(collection);
 
     }
 }