Fix custom hats

source/Patches/CustomHats/CustomHatPatch.cs

@@ -1,8 +1,8 @@
+using HarmonyLib;
+using Reactor.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using HarmonyLib;
-using Reactor.Extensions;
 using TMPro;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -21,39 +21,42 @@ public static void Postfix(HatsTab __instance)
 
             foreach (var hat in allHats)
             {
-                if (!hatGroups.ContainsKey(hat.StoreName)) 
+                if (!hatGroups.ContainsKey(hat.StoreName))
                     hatGroups[hat.StoreName] = new List<HatBehaviour>();
                 hatGroups[hat.StoreName].Add(hat);
             }
 
-            foreach (ColorChip instanceColorChip in __instance.ColorChips) 
+            foreach (ColorChip instanceColorChip in __instance.ColorChips)
                 instanceColorChip.gameObject.Destroy();
 
             __instance.ColorChips.Clear();
 
-
-            var groupNameText = __instance.transform.parent.parent.GetComponentInChildren<GameSettingMenu>(true).GetComponentInChildren<TextMeshPro>(true);
-
+
+            var groupNameText = __instance.transform.parent.parent
+                .GetComponentInChildren<GameSettingMenu>(true)
+                .GetComponentInChildren<TextMeshPro>(true);
+
             int hatIdx = 0;
             foreach ((string groupName, List<HatBehaviour> hats) in hatGroups)
             {
                 var text = Object.Instantiate(groupNameText.gameObject);
                 text.transform.localScale = Vector3.one;
-                text.transform.parent = __instance.scroller.Inner;
+                text.transform.SetParent(__instance.scroller.Inner);
 
                 var tmp = text.GetComponent<TextMeshPro>();
                 tmp.text = groupName;
                 tmp.alignment = TextAlignmentOptions.Center;
                 tmp.fontSize = 3f;
+                tmp.enableAutoSizing = true;
                 tmp.fontSizeMax = 3f;
                 tmp.fontSizeMin = 0f;
-                
+
                 hatIdx = (hatIdx + 3) / 4 * 4;
 
                 float xLerp = __instance.XRange.Lerp(0.5f);
                 float yLerp = __instance.YStart - (hatIdx / __instance.NumPerRow) * __instance.YOffset;
                 text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
-                
+
                 hatIdx += 4;
                 foreach (var hat in hats.OrderBy(HatManager.Instance.GetIdFromHat))
                 {
@@ -70,7 +73,7 @@ public static void Postfix(HatsTab __instance)
                 }
 
             }
-            
+
             __instance.scroller.YBounds.max = -(__instance.YStart - (hatIdx + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;
         }
     }

source/Patches/CustomHats/HatLoader.cs

@@ -1,11 +1,15 @@
+extern alias Il2CppNewtonsoft;
+using BepInEx.Logging;
+using Il2CppNewtonsoft::Newtonsoft.Json;
+using Il2CppNewtonsoft::Newtonsoft.Json.Linq;
+using Reactor;
+using Reactor.Extensions;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text;
-using BepInEx.Logging;
-using Newtonsoft.Json;
-using Reactor;
-using Reactor.Extensions;
+using UnhollowerBaseLib;
 using UnityEngine;
 
 namespace TownOfUs.Patches.CustomHats
@@ -24,9 +28,7 @@ internal static void LoadHats()
             Log.LogMessage($"Generating Hats from namespace {HAT_RESOURCE_NAMESPACE}");
             try
             {
-                var hatJson = LoadJson();
-
-                var hatBehaviours = DiscoverHatBehaviours(hatJson);
+                var hatBehaviours = DiscoverHatBehaviours(LoadJson());
 
                 DestroyableSingleton<HatManager>.Instance.AllHats.ForEach(
                     (Action<HatBehaviour>)(x => x.StoreName = "Vanilla")
@@ -36,25 +38,43 @@ internal static void LoadHats()
                     hatBehaviours[i].Order = HAT_ORDER_BASELINE + i;
                     HatManager.Instance.AllHats.Add(hatBehaviours[i]);
                 }
-            
+
             }
             catch (Exception e)
             {
                 Log.LogError($"Error while loading hats: {e.Message}\nStack: {e.StackTrace}");
             }
         }
 
-        private static HatMetadataJson LoadJson()
+        private static List<HatMetadataElement> LoadJson()
         {
+            var element = new List<HatMetadataElement>();
+
             var stream = Assembly.GetManifestResourceStream($"{HAT_RESOURCE_NAMESPACE}.{HAT_METADATA_JSON}");
-            return JsonConvert.DeserializeObject<HatMetadataJson>(Encoding.UTF8.GetString(stream.ReadFully()));
+            var streamContent = Encoding.UTF8.GetString(stream.ReadFully());
+            var obj = JObject.Parse(streamContent);
+
+            for (var json = obj["credits"].First; json != null; json = json.Next)
+            {
+                var hatdatas = new HatMetadataElement
+                {
+                    Id = (string)json["id"],
+                    Name = (string)json["name"] ?? string.Empty,
+                    Artist = (string)json["artist"] ?? string.Empty
+                };
+
+                if (hatdatas.Id != null)
+                    element.Add(hatdatas);
+            }
+
+            return element;
         }
 
-        private static List<HatBehaviour> DiscoverHatBehaviours(HatMetadataJson metadata)
+        private static List<HatBehaviour> DiscoverHatBehaviours(List<HatMetadataElement> metadata)
         {
             var hatBehaviours = new List<HatBehaviour>();
 
-            foreach (var hatCredit in metadata.Credits)
+            foreach (var hatCredit in metadata)
             {
                 try
                 {
@@ -69,9 +89,8 @@ private static List<HatBehaviour> DiscoverHatBehaviours(HatMetadataJson metadata
                 }
                 catch (Exception e)
                 {
-                    // Log.LogError(
-                    //     $"Error loading hat {hatCredit.Id} in metadata file ({HAT_METADATA_JSON})");
-                    // Log.LogError($"{e.Message}\nStack:{e.StackTrace}");
+                    Log.LogError($"Error loading hat {hatCredit.Id} in metadata file ({HAT_METADATA_JSON})");
+                    Log.LogError($"{e.Message}\nStack:{e.StackTrace}");
                 }
             }
 
@@ -80,13 +99,12 @@ private static List<HatBehaviour> DiscoverHatBehaviours(HatMetadataJson metadata
 
         private static HatBehaviour GenerateHatBehaviour(byte[] mainImg)
         {
-
-            //TODO: Move to Graphics Utils class
+            // TODO: Move to Graphics Utils class
             var tex2D = new Texture2D(1, 1, TextureFormat.ARGB32, false);
             TownOfUs.LoadImage(tex2D, mainImg, false);
             var sprite = Sprite.Create(tex2D, new Rect(0.0f, 0.0f, tex2D.width, tex2D.height), new Vector2(0.5f, 0.5f), 100);
-            
-            
+
+
             var hat = ScriptableObject.CreateInstance<HatBehaviour>();
             hat.MainImage = sprite;
             hat.ChipOffset = new Vector2(-0.1f, 0.35f);