From 13e009b6fccfa82f1c02923cf9011a0c0ca435db Mon Sep 17 00:00:00 2001
From: bd_ <bd_@nadena.dev>
Date: Wed, 8 Feb 2023 22:33:48 +0900
Subject: [PATCH] chore: fix incorrect parameters for certain errors

---
 .../nadena.dev.modular-avatar/Editor/AnimatorMerger.cs    | 7 +++++--
 .../Editor/ErrorReporting/ErrorLog.cs                     | 8 ++++----
 .../Editor/RenameParametersHook.cs                        | 8 ++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
index faeaa2d8..953caaba 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
@@ -78,8 +78,11 @@ namespace nadena.dev.modular_avatar.core.editor
                 {
                     if (acp.type != param.type)
                     {
-                        BuildReport.LogFatal("error.merge_animator.param_type_mismatch", param.name, acp.type,
-                            param.type);
+                        BuildReport.LogFatal("error.merge_animator.param_type_mismatch", new[]
+                        {
+                            param.name, acp.type.ToString(),
+                            param.type.ToString()
+                        });
                     }
 
                     continue;
diff --git a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs
index 8dd6dff4..6fea2c85 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/ErrorReporting/ErrorLog.cs
@@ -291,9 +291,9 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
             return new AvatarReportScope();
         }
 
-        internal static void Log(ReportLevel level, string code, params object[] objects)
+        internal static void Log(ReportLevel level, string code, object[] strings, params Object[] objects)
         {
-            ErrorLog errorLog = new ErrorLog(level, code, objects);
+            ErrorLog errorLog = new ErrorLog(level, code, strings, objects);
 
             var avatarReport = CurrentReport._currentAvatar;
             if (avatarReport == null)
@@ -305,9 +305,9 @@ namespace nadena.dev.modular_avatar.editor.ErrorReporting
             avatarReport.logs.Add(errorLog);
         }
 
-        internal static void LogFatal(string code, params object[] objects)
+        internal static void LogFatal(string code, object[] strings, params Object[] objects)
         {
-            Log(ReportLevel.Error, code, objects);
+            Log(ReportLevel.Error, code, strings, objects);
             if (CurrentReport._currentAvatar != null)
             {
                 CurrentReport._currentAvatar.successful = false;
diff --git a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
index 06de5696..4eb1abe6 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
@@ -72,8 +72,12 @@ namespace nadena.dev.modular_avatar.core.editor
             expParams.parameters = parameters.ToArray();
             if (expParams.CalcTotalCost() > VRCExpressionParameters.MAX_PARAMETER_COST)
             {
-                BuildReport.LogFatal("error.rename_params.too_many_synced_params", expParams.CalcTotalCost(),
-                    VRCExpressionParameters.MAX_PARAMETER_COST);
+                BuildReport.LogFatal("error.rename_params.too_many_synced_params", new[]
+                    {
+                        "" + expParams.CalcTotalCost(),
+                        "" + VRCExpressionParameters.MAX_PARAMETER_COST,
+                    }
+                );
             }
 
             avatar.expressionParameters = expParams;