Fix

Author: johnklipi

src/Loader.cs

@@ -836,63 +836,71 @@ internal static void CreateMappings(JObject rootObject)
 		foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
 		{
 			JObject? token = jtoken.TryCast<JObject>();
-			if (token != null)
+			if (token == null)
+				continue;
+
+			string dataType = Util.GetJTokenName(token, 2);
+			if (!typeMappings.TryGetValue(dataType, out TypeMapping? typeMapping))
+				continue;
+
+			if (token["idx"] == null || !typeMapping.shouldCreateCache)
+				continue;
+
+			Type targetType = typeMapping.type;
+			if (!targetType.IsEnum)
 			{
-				string dataType = Util.GetJTokenName(token, 2);
-				if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
-				{
-					if (token["idx"] != null && typeMapping.shouldCreateCache)
-					{
-						Type targetType = typeMapping.type;
-						if (!targetType.IsEnum)
-						{
-							Plugin.logger.LogWarning($"Type {targetType.FullName} is not an enum, skipping!");
-							continue;
-						}
-						string id = Util.GetJTokenName(token);
-						if((int)token["idx"] == -1)
-                        {
-							token["idx"] = Registry.autoidx;
-                        }
-						else if(PolyMod.Plugin.config.allowUnsafeIndexes)
-                        {
-							Array values = Enum.GetValues(targetType);
-
-							var maxValue = values.Cast<int>().Max();
-
-							if(maxValue >= (int)token["idx"])
-                            {
-								continue;
-                            }
-                        }
-
-						MethodInfo? methodInfo = typeof(EnumCache<>).MakeGenericType(targetType).GetMethod("AddMapping");
-						if (methodInfo != null)
-						{
-							methodInfo.Invoke(null, new object[] { id, (int)token["idx"] });
-							methodInfo.Invoke(null, new object[] { id, (int)token["idx"] });
-							if (Loader.typeHandlers.TryGetValue(targetType, out var handler))
-							{
-								handler(token, true);
-							}
-							Plugin.logger.LogInfo("Created mapping for " + targetType.ToString() + " with id " + id + " and index " + (int)token["idx"]);
-						}
+				Plugin.logger.LogWarning($"Type {targetType.FullName} is not an enum, skipping!");
+				continue;
+			}
 
-						if((int)token["idx"] == Registry.autoidx)
-							Registry.autoidx++;
-					}
+			string id = Util.GetJTokenName(token);
+
+			if((int)token["idx"] == -1)
+			{
+				token["idx"] = Registry.autoidx;
+				Registry.autoidx++;
+			}
+			else if(Plugin.config.allowUnsafeIndexes)
+			{
+				Array values = Enum.GetValues(targetType);
+
+				var maxValue = values.Cast<int>().Max();
+
+				if(maxValue >= (int)token["idx"])
+				{
+					continue;
 				}
 			}
+			else
+			{
+				continue;
+			}
+
+			MethodInfo? methodInfo = typeof(EnumCache<>).MakeGenericType(targetType).GetMethod("AddMapping");
+			if (methodInfo == null)
+			{
+				Plugin.logger.LogWarning($"Missing AddMapping method for {targetType.FullName}");
+				continue;
+			}
+
+			methodInfo.Invoke(null, new object[] { id, (int)token["idx"] });
+			methodInfo.Invoke(null, new object[] { id, (int)token["idx"] });
+
+			if (typeHandlers.TryGetValue(targetType, out var handler))
+			{
+				handler(token, true);
+			}
+			Plugin.logger.LogInfo("Created mapping for " + targetType.ToString() + " with id " + id + " and index " + (int)token["idx"]);
 		}
 		foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
 		{
 			JObject? token = jtoken.TryCast<JObject>();
 			if (token != null)
 			{
 				string dataType = Util.GetJTokenName(token, 2);
-				if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
+				if (typeMappings.TryGetValue(dataType, out TypeMapping? typeMapping))
 				{
-					if (Loader.typeHandlers.TryGetValue(typeMapping.type, out var handler))
+					if (typeHandlers.TryGetValue(typeMapping.type, out var handler))
 					{
 						handler(token, false);
 					}

src/Managers/Compatibility.cs

@@ -1,5 +1,4 @@
 using HarmonyLib;
-using Polytopia.IO;
 using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;

src/Managers/Loc.cs

@@ -3,7 +3,6 @@
 using Il2CppInterop.Runtime.InteropTypes.Arrays;
 using System.Reflection;
 using LibCpp2IL;
-using Polytopia.Data;
 
 namespace PolyMod.Managers;
 

src/Registry.cs

@@ -1,6 +1,5 @@
 using LibCpp2IL;
 using PolyMod.Managers;
-using Polytopia.Data;
 using PolytopiaBackendBase.Game;
 using UnityEngine;
 using PolytopiaBackendBase.Common;