Merge branch 'hotfix-log4j'

CmlLib · Dec 20, 2021 · 09a6796 · 09a6796
2 parents 1cf3d0f + 0f55035
commit 09a6796
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/CmlLib/CmlLib.csproj b/CmlLib/CmlLib.csproj
@@ -4,7 +4,7 @@
         <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
         <LangVersion>8.0</LangVersion>
         <Nullable>enable</Nullable>
-        <Version>3.3.4</Version>
+        <Version>3.3.5</Version>
         <Description>Minecraft Launcher Library for .NET
 Support all version, forge, optifine
         </Description>

diff --git a/CmlLib/Core/Installer/MForge.cs b/CmlLib/Core/Installer/MForge.cs
@@ -285,8 +285,8 @@ private bool checkProcessorOutputs(JObject outputs, Dictionary<string, string> m
         {
             foreach (var outitem in outputs)
             {
-                var key = Mapper.Interpolation(outitem.Key, mapData);
-                var value = Mapper.Interpolation(outitem.Value.ToString(), mapData);
+                var key = Mapper.Interpolation(outitem.Key, mapData, true);
+                var value = Mapper.Interpolation(outitem.Value.ToString(), mapData, true);
 
                 if (!File.Exists(key) || !IOUtil.CheckSHA1(key, value))
                     return false;

diff --git a/CmlLib/Core/Launcher/MLaunch.cs b/CmlLib/Core/Launcher/MLaunch.cs
@@ -147,7 +147,7 @@ public string[] CreateArg()
                 args.Add(Mapper.Interpolation(version.LoggingClient?.Argument, new Dictionary<string, string?>()
                 {
                     { "path", minecraftPath.GetLogConfigFilePath(version.LoggingClient?.Id ?? version.Id) }
-                }));
+                }, true));
 
             // main class
             if (!string.IsNullOrEmpty(version.MainClass))

diff --git a/CmlLib/Core/Mapper.cs b/CmlLib/Core/Mapper.cs
@@ -16,10 +16,10 @@ public static string[] Map(string[] arg, Dictionary<string, string?> dicts, stri
             var args = new List<string>(arg.Length);
             foreach (string item in arg)
             {
-                var a = Interpolation(item, dicts);
+                var a = Interpolation(item, dicts, false);
                 if (checkPath)
                     a = ToFullPath(a, prepath);
-                args.Add(handleEArg(a));
+                args.Add(HandleEmptyArg(a));
             }
 
             return args.ToArray();
@@ -30,8 +30,8 @@ public static string[] MapInterpolation(string[] arg, Dictionary<string, string?
             var args = new List<string>(arg.Length);
             foreach (string item in arg)
             {
-                var a = Interpolation(item, dicts);
-                args.Add(handleEArg(a));
+                var a = Interpolation(item, dicts, true);
+                args.Add(a);
             }
 
             return args.ToArray();
@@ -43,15 +43,15 @@ public static string[] MapPathString(string[] arg, string prepath)
             foreach (string item in arg)
             {
                 var a = ToFullPath(item, prepath);
-                args.Add(handleEArg(a));
+                args.Add(HandleEmptyArg(a));
             }
 
             return args.ToArray();
         }
 
-        public static string Interpolation(string str, Dictionary<string, string?> dicts)
+        public static string Interpolation(string str, Dictionary<string, string?> dicts, bool handleEmpty)
         {
-            str = argBracket.Replace(str, new MatchEvaluator((match =>
+            str = argBracket.Replace(str, (match =>
             {
                 if (match.Groups.Count < 2)
                     return match.Value;
@@ -66,9 +66,12 @@ public static string Interpolation(string str, Dictionary<string, string?> dicts
                 }
 
                 return match.Value;
-            })));
+            }));
 
-            return str;
+            if (handleEmpty)
+                return HandleEmptyArg(str);
+            else
+                return str;
         }
 
         public static string ToFullPath(string str, string prepath)
@@ -114,7 +117,7 @@ static string replaceByPos(StringBuilder sb, string replace, int startIndex, int
         // key="va  l" => key="va  l"
         // va lue => "va lue"
         // "va lue" => "va lue"
-        static string handleEArg(string input)
+        public static string HandleEmptyArg(string input)
         {
             if (input.Contains("="))
             {