Fixed skinData processing, split gld processing method, added stack traces in errors instead of error messages

Author: johnklipi

src/Loader.cs

@@ -181,21 +181,8 @@ internal record TypeMapping(Type type, bool shouldCreateCache = true);
 
 		[typeof(SkinData)] = new((token, duringEnumCacheCreation) =>
 		{
-			string id = Util.GetJTokenName(token);
-			int index = Registry.skinInfo.FindIndex(t => t.id == id);
-			if (Registry.skinInfo.ElementAtOrDefault(index) != null)
-			{
-				SkinData skinData = new();
-				if (token["color"] != null)
-				{
-					skinData.color = (int)token["color"];
-				}
-				if (token["language"] != null)
-				{
-					skinData.language = token["language"].ToString();
-				}
-				Registry.skinInfo[index] = new Visual.SkinInfo(Registry.skinInfo[index].idx, Registry.skinInfo[index].id, skinData);
-			}
+			var prop = token.Parent.Cast<JProperty>();
+			prop.Replace(new JProperty(prop.Name.ToLower(), prop.Value));
 		}),
 	};
 
@@ -488,7 +475,7 @@ public static void LoadLocalizationFile(Mod mod, Mod.File file)
 		}
 		catch (Exception e)
 		{
-			Plugin.logger.LogError($"Error on loading locatization from {mod.id} mod: {e.Message}");
+			Plugin.logger.LogError($"Error on loading locatization from {mod.id} mod: {e.StackTrace}");
 		}
 	}
 
@@ -569,7 +556,7 @@ public static void UpdateSprite(string name)
 		}
 		catch (Exception e)
 		{
-			Plugin.logger.LogError($"Error on loading sprite data from {mod.id} mod: {e.Message}");
+			Plugin.logger.LogError($"Error on loading sprite data from {mod.id} mod: {e.StackTrace}");
 			return null;
 		}
 	}
@@ -628,7 +615,7 @@ public static void LoadPrefabInfoFile(Mod mod, Mod.File file)
 		}
 		catch (Exception e)
 		{
-			Plugin.logger.LogError($"Error on loading prefab info from {mod.id} mod: {e.Message}");
+			Plugin.logger.LogError($"Error on loading prefab info from {mod.id} mod: {e.StackTrace}");
 		}
 	}
 
@@ -741,7 +728,7 @@ public static void LoadGameLogicDataPatch(Mod mod, JObject gld, JObject patch)
 		}
 		catch (Exception e)
 		{
-			Plugin.logger.LogError($"Error on loading patch from {mod.id} mod: {e.Message}");
+			Plugin.logger.LogError($"Error on loading patch from {mod.id} mod: {e.StackTrace}");
 			mod.status = Mod.Status.Error;
 		}
 	}
@@ -768,124 +755,135 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r
 	{
 		try
 		{
-			foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
+			CreateMappings(rootObject);
+			ProcessPrefabs();
+			ProcessEmbark();
+			ProcessAttract();
+		}
+		catch (Exception e)
+		{
+			Plugin.logger.LogError($"Error on processing modified game logic data : {e.StackTrace}");
+		}
+	}
+	internal static void CreateMappings(JObject rootObject)
+	{
+		foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
+		{
+			JObject? token = jtoken.TryCast<JObject>();
+			if (token != null)
 			{
-				JObject? token = jtoken.TryCast<JObject>();
-				if (token != null)
+				string dataType = Util.GetJTokenName(token, 2);
+				if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
 				{
-					string dataType = Util.GetJTokenName(token, 2);
-					if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
+					if (token["idx"] != null && (int)token["idx"] == -1 && typeMapping.shouldCreateCache)
 					{
-						if (token["idx"] != null && (int)token["idx"] == -1 && typeMapping.shouldCreateCache)
+						Type targetType = typeMapping.type;
+						string id = Util.GetJTokenName(token);
+						token["idx"] = Registry.autoidx;
+						MethodInfo? methodInfo = typeof(EnumCache<>).MakeGenericType(targetType).GetMethod("AddMapping");
+						if (methodInfo != null)
 						{
-							Type targetType = typeMapping.type;
-							string id = Util.GetJTokenName(token);
-							token["idx"] = Registry.autoidx;
-							MethodInfo? methodInfo = typeof(EnumCache<>).MakeGenericType(targetType).GetMethod("AddMapping");
-							if (methodInfo != null)
+							methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
+							methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
+
+							if (Loader.typeHandlers.TryGetValue(targetType, out var handler))
 							{
-								methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
-								methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
-
-								if (Loader.typeHandlers.TryGetValue(targetType, out var handler))
-								{
-									handler(token, true);
-								}
-								Plugin.logger.LogInfo("Created mapping for " + targetType.ToString() + " with id " + id + " and index " + Registry.autoidx);
-								Registry.autoidx++;
+								handler(token, true);
 							}
+							Plugin.logger.LogInfo("Created mapping for " + targetType.ToString() + " with id " + id + " and index " + Registry.autoidx);
+							Registry.autoidx++;
 						}
 					}
 				}
 			}
-			foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
+		}
+		foreach (JToken jtoken in rootObject.SelectTokens("$.*.*").ToArray())
+		{
+			JObject? token = jtoken.TryCast<JObject>();
+			if (token != null)
 			{
-				JObject? token = jtoken.TryCast<JObject>();
-				if (token != null)
+				string dataType = Util.GetJTokenName(token, 2);
+				if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
 				{
-					string dataType = Util.GetJTokenName(token, 2);
-					if (Loader.typeMappings.TryGetValue(dataType, out Loader.TypeMapping? typeMapping))
+					if (Loader.typeHandlers.TryGetValue(typeMapping.type, out var handler))
 					{
-						if (Loader.typeHandlers.TryGetValue(typeMapping.type, out var handler))
-						{
-							handler(token, false);
-						}
+						handler(token, false);
 					}
 				}
 			}
-			foreach (System.Collections.Generic.KeyValuePair<int, string> item in Registry.prefabNames)
+		}
+	}
+	internal static void ProcessPrefabs()
+	{
+		foreach (System.Collections.Generic.KeyValuePair<int, string> item in Registry.prefabNames)
+		{
+			UnitData.Type unitPrefabType = UnitData.Type.Scout;
+			string prefabId = item.Value;
+			if (Enum.TryParse(prefabId, out UnitData.Type parsedType))
+			{
+				unitPrefabType = parsedType;
+				PrefabManager.units.TryAdd(item.Key, PrefabManager.units[(int)unitPrefabType]);
+			}
+			else
 			{
-				UnitData.Type unitPrefabType = UnitData.Type.Scout;
-				string prefabId = item.Value;
-				if (Enum.TryParse(prefabId, out UnitData.Type parsedType))
+				KeyValuePair<Visual.PrefabInfo, Unit> prefabInfo = Registry.unitPrefabs.FirstOrDefault(kv => kv.Key.name == prefabId);
+				if (!EqualityComparer<Visual.PrefabInfo>.Default.Equals(prefabInfo.Key, default))
 				{
-					unitPrefabType = parsedType;
-					PrefabManager.units.TryAdd(item.Key, PrefabManager.units[(int)unitPrefabType]);
+					PrefabManager.units.TryAdd(item.Key, prefabInfo.Value);
 				}
 				else
 				{
-					KeyValuePair<Visual.PrefabInfo, Unit> prefabInfo = Registry.unitPrefabs.FirstOrDefault(kv => kv.Key.name == prefabId);
-					if (!EqualityComparer<Visual.PrefabInfo>.Default.Equals(prefabInfo.Key, default))
-					{
-						PrefabManager.units.TryAdd(item.Key, prefabInfo.Value);
-					}
-					else
-					{
-						PrefabManager.units.TryAdd(item.Key, PrefabManager.units[(int)unitPrefabType]);
-					}
+					PrefabManager.units.TryAdd(item.Key, PrefabManager.units[(int)unitPrefabType]);
 				}
 			}
-			foreach (Visual.SkinInfo skin in Registry.skinInfo)
+		}
+	}
+	internal static void ProcessEmbark()
+	{
+		foreach (KeyValuePair<string, string> entry in Main.embarkNames)
+		{
+			try
 			{
-				if (skin.skinData != null)
-					gameLogicData.skinData[(SkinType)skin.idx] = skin.skinData;
+				UnitData.Type unit = EnumCache<UnitData.Type>.GetType(entry.Key);
+				UnitData.Type newUnit = EnumCache<UnitData.Type>.GetType(entry.Value);
+				Main.embarkOverrides[unit] = newUnit;
+				Plugin.logger.LogInfo($"Embark unit type for {entry.Key} is now {entry.Value}");
 			}
-			foreach (KeyValuePair<string, string> entry in Main.embarkNames)
+			catch
 			{
-				try
-				{
-					UnitData.Type unit = EnumCache<UnitData.Type>.GetType(entry.Key);
-					UnitData.Type newUnit = EnumCache<UnitData.Type>.GetType(entry.Value);
-					Main.embarkOverrides[unit] = newUnit;
-					Plugin.logger.LogInfo($"Embark unit type for {entry.Key} is now {entry.Value}");
-				}
-				catch
-				{
-					Plugin.logger.LogError($"Embark unit type for {entry.Key} is not valid: {entry.Value}");
-				}
+				Plugin.logger.LogError($"Embark unit type for {entry.Key} is not valid: {entry.Value}");
 			}
-			foreach (KeyValuePair<string, string> entry in Main.attractsResourceNames)
+		}
+	}
+	internal static void ProcessAttract()
+	{
+		foreach (KeyValuePair<string, string> entry in Main.attractsResourceNames)
+		{
+			try
 			{
-				try
-				{
-					ImprovementData.Type improvement = EnumCache<ImprovementData.Type>.GetType(entry.Key);
-					ResourceData.Type resource = EnumCache<ResourceData.Type>.GetType(entry.Value);
-					Main.attractsResourceOverrides[improvement] = resource;
-					Plugin.logger.LogInfo($"Improvement {entry.Key} now attracts {entry.Value}");
-				}
-				catch
-				{
-					Plugin.logger.LogError($"Improvement {entry.Key} resource type is not valid: {entry.Value}");
-				}
+				ImprovementData.Type improvement = EnumCache<ImprovementData.Type>.GetType(entry.Key);
+				ResourceData.Type resource = EnumCache<ResourceData.Type>.GetType(entry.Value);
+				Main.attractsResourceOverrides[improvement] = resource;
+				Plugin.logger.LogInfo($"Improvement {entry.Key} now attracts {entry.Value}");
 			}
-			foreach (KeyValuePair<string, string> entry in Main.attractsTerrainNames)
+			catch
 			{
-				try
-				{
-					ImprovementData.Type improvement = EnumCache<ImprovementData.Type>.GetType(entry.Key);
-					Polytopia.Data.TerrainData.Type terrain = EnumCache<Polytopia.Data.TerrainData.Type>.GetType(entry.Value);
-					Main.attractsTerrainOverrides[improvement] = terrain;
-					Plugin.logger.LogInfo($"Improvement {entry.Key} now attracts on {entry.Value}");
-				}
-				catch
-				{
-					Plugin.logger.LogError($"Improvement {entry.Key} terrain type is not valid: {entry.Value}");
-				}
+				Plugin.logger.LogError($"Improvement {entry.Key} resource type is not valid: {entry.Value}");
 			}
 		}
-		catch (Exception e)
+		foreach (KeyValuePair<string, string> entry in Main.attractsTerrainNames)
 		{
-			Plugin.logger.LogError($"Error on processing modified game logic data : {e.Message}");
+			try
+			{
+				ImprovementData.Type improvement = EnumCache<ImprovementData.Type>.GetType(entry.Key);
+				Polytopia.Data.TerrainData.Type terrain = EnumCache<Polytopia.Data.TerrainData.Type>.GetType(entry.Value);
+				Main.attractsTerrainOverrides[improvement] = terrain;
+				Plugin.logger.LogInfo($"Improvement {entry.Key} now attracts on {entry.Value}");
+			}
+			catch
+			{
+				Plugin.logger.LogError($"Improvement {entry.Key} terrain type is not valid: {entry.Value}");
+			}
 		}
 	}
 }