Fixed splitting string by byte size, improved toy string image formatting

Author: marchellcx

LabExtended/API/Images/Conversion/ToyStringImageConvertor.cs

@@ -1,5 +1,5 @@
 using LabExtended.API.Toys;
-
+using LabExtended.Extensions;
 using NorthwoodLib.Pools;
 
 using LabExtended.Utilities;
@@ -91,10 +91,22 @@ public static void ConvertImage(ImageFile file)
 
                 builder.AppendLine();
             }
+            
+            frame.toyFrameData ??= new();
 
             builder.Append("</color>");
+            builder.ToString().SplitByLengthUtf8(MirrorMethods.MaxStringLength, frame.toyFrameData);
+
+            builder.Clear();
+
+            for (var x = 0; x < frame.toyFrameData.Count; x++)
+            {
+                builder.Append('{');
+                builder.Append(x);
+                builder.Append('}');
+            }
 
-            TextToy.SplitStringNonAlloc(builder.ToString(), frame.toyFrameData, out frame.toyFrameFormat);
+            frame.toyFrameFormat = builder.ToString();
         }
 
         StringBuilderPool.Shared.Return(builder);

LabExtended/Extensions/StringExtensions.cs

@@ -10,6 +10,8 @@ public static class StringExtensions
     {
         public const char LogAnsiColorEscapeChar = (char)27;
 
+        public static UTF8Encoding Utf8 { get; } = new(false, true);
+        
         public static readonly Regex NewLineRegex = new Regex("r\n|\r|\n", RegexOptions.Compiled);
 
         public static readonly Regex PascalCaseRegex = new Regex("([a-z,0-9](?=[A-Z])|[A-Z](?=[A-Z][a-z]))", RegexOptions.Compiled);
@@ -92,27 +94,67 @@ public static List<string> SplitByLength(this string str, int maxLength)
         {
             var list = new List<string>(Mathf.CeilToInt(str.Length / maxLength));
 
-            SplitByLengthNonAlloc(str, maxLength, list);
+            SplitByLength(str, maxLength, list);
             return list;
         }
 
-        public static void SplitByLengthNonAlloc(this string str, int maxLength, ICollection<string> target)
+        public static void SplitByLength(this string str, int maxLength, ICollection<string> target)
         {
             if (maxLength <= 0)
                 throw new ArgumentOutOfRangeException(nameof(maxLength));
+
+            if (target is null)
+                throw new ArgumentNullException(nameof(target));
+
+            while (str.Length > maxLength)
+            {
+                var otherStr = str.Substring(0, maxLength);
+
+                str = str.Remove(0, maxLength);
+                
+                target.Add(otherStr);
+            }
 
-            var builder = StringBuilderPool.Shared.Rent();
+            target.Add(str);
+        }
+        
+        public static void SplitByLengthUtf8(this string str, int maxLength, ICollection<string> target)
+        {
+            if (maxLength <= 0)
+                throw new ArgumentOutOfRangeException(nameof(maxLength));
+
+            if (target is null)
+                throw new ArgumentNullException(nameof(target));
 
-            for (var i = 0; i < str.Length; i++)
+            if (string.IsNullOrEmpty(str))
+                return;
+
+            var utf8 = Encoding.UTF8;
+            
+            var start = 0;
+            var length = str.Length;
+
+            while (start < length)
             {
-                builder.Append(str[i]);
+                var end = start;
+                var byteCount = 0;
 
-                if (builder.Length >= maxLength)
+                while (end < length)
                 {
-                    target.Add(builder.ToString());
-                    
-                    builder.Clear();
+                    var charSize = utf8.GetByteCount(new char[] { str[end] });
+
+                    if (byteCount + charSize > maxLength)
+                        break;
+
+                    byteCount += charSize;
+                    end++;
                 }
+
+                var chunk = str.Substring(start, end - start);
+                
+                target.Add(chunk);
+                
+                start = end;
             }
         }