Merge pull request #469 from ffxivcode/Vector3-Culture-Fix

Fix for Vector3 Parsing for Other Cultures

AutoDuty/Data/Extensions.cs

@@ -61,9 +61,9 @@ public static string ToCustomString(this List<string> strings, string delimiter
             return outString;
         }
 
-        public static string ToCustomString(this PathAction pathAction) =>$"{(pathAction.Tag.EqualsAny(ActionTag.None, ActionTag.Treasure, ActionTag.Revival) ? "" : $"{pathAction.Tag.ToCustomString()}|")}{pathAction.Name}|{pathAction.Position.ToCustomString()}{(pathAction.Arguments.All(x => x.IsNullOrEmpty()) ? "" : $"|{pathAction.Arguments.ToCustomString()}")}{(pathAction.Note.IsNullOrEmpty() ? "" : $"|{pathAction.Note}")}"; 
+        public static string ToCustomString(this PathAction pathAction) =>$"{(pathAction.Tag.EqualsAny(ActionTag.None, ActionTag.Treasure, ActionTag.Revival) ? "" : $"{pathAction.Tag.ToCustomString()}|")}{pathAction.Name}|{pathAction.Position.ToCustomString()}{(pathAction.Arguments.All(x => x.IsNullOrEmpty()) ? "" : $"|{pathAction.Arguments.ToCustomString()}")}{(pathAction.Note.IsNullOrEmpty() ? "" : $"|{pathAction.Note}")}";
 
-        public static string ToCustomString(this Vector3 vector3) => $"{vector3.X:F2}, {vector3.Y:F2}, {vector3.Z:F2}";
+        public static string ToCustomString(this Vector3 vector3) => vector3.ToString("F2", CultureInfo.InvariantCulture).Trim('<', '>');
 
         public static List<string> ToConditional(this string conditionalString)
         {
@@ -91,15 +91,17 @@ public static List<string> ToConditional(this string conditionalString)
         }
 
 
-        public static bool TryToGetVector3(this string vector3String, out Vector3 vector3)
+        public static bool TryGetVector3(this string vector3String, out Vector3 vector3)
         {
             vector3 = Vector3.Zero;
-            var splitString = vector3String.Replace(" ", string.Empty).Replace("<", string.Empty).Replace(">", string.Empty).Split(',');
+            var cul = CultureInfo.InvariantCulture;
+            var strcomp = StringComparison.InvariantCulture;
+            var splitString = vector3String.Replace(" ", string.Empty, strcomp).Replace("<", string.Empty, strcomp).Replace(">", string.Empty, strcomp).Split(",");
 
             if (splitString.Length < 3) return false;
 
-            vector3 = new(float.Parse(splitString[0], CultureInfo.InvariantCulture), float.Parse(splitString[1], CultureInfo.InvariantCulture), float.Parse(splitString[2], CultureInfo.InvariantCulture));
-            
+            vector3 = new(float.Parse(splitString[0], cul), float.Parse(splitString[1], cul), float.Parse(splitString[2], cul));
+
             return true;
         }
 

AutoDuty/Helpers/FileHelper.cs

@@ -46,7 +46,7 @@ internal static void OnStart()
             try
             {
                 int i = 0;
-                var files = Plugin.AssemblyDirectoryInfo.EnumerateFiles("*.json", SearchOption.TopDirectoryOnly).Where(s => s.Name.StartsWith('('));
+                var files = Plugin.AssemblyDirectoryInfo.EnumerateFiles("*.json", SearchOption.AllDirectories).Where(s => s.Name.StartsWith('('));
 
                 foreach (var file in files)
                 {

AutoDuty/IPC/IPCProvider.cs

@@ -1,5 +1,4 @@
 using AutoDuty.Helpers;
-using AutoDuty.Windows;
 using ECommons.EzIpcManager;
 #nullable disable
 

AutoDuty/Managers/ActionsManager.cs

@@ -104,7 +104,7 @@ public unsafe void ConditionAction(PathAction action)
             {
                 case "GetDistanceToPlayer":
                     if (conditionArray.Length < 4) return;
-                    if (!conditionArray[1].TryToGetVector3(out var vector3)) return;
+                    if (!conditionArray[1].TryGetVector3(out var vector3)) return;
                     if (!float.TryParse(conditionArray[3], out var distance)) return;
                     if (!(operatorValue = conditionArray[2]).EqualsAny(operation.Keys)) return;
                     var getDistance = GetDistanceToPlayer(vector3);

AutoDuty/Managers/ContentPathsManager.cs

@@ -142,7 +142,7 @@ public PathFile PathFile
                                     {
                                         var action = x.Split('|');
                                         var name = action[0];
-                                        action[1].TryToGetVector3(out var v3);
+                                        var vector3 = action[1].TryGetVector3(out var v3) ? v3 : Vector3.Zero;
                                         var argument = action[2];
                                         var tag = ActionTag.None;
 
@@ -208,11 +208,7 @@ public PathFile PathFile
                                         var pathAction = new PathAction { Tag = tag, Name = action[0] };
                                         if (action.Length > 1)
                                         {
-                                            var position = action[1].Replace(" ", string.Empty).Split(",");
-
-                                            pathAction.Position = new(float.Parse(position[0]), float.Parse(position[1]), float.Parse(position[2]));
-
-
+                                            pathAction.Position = action[1].TryGetVector3(out var vector3) ? vector3 : Vector3.Zero;
                                             if (action.Length == 3)
                                             {
                                                 var argument = string.Empty;
@@ -262,7 +258,7 @@ public PathFile PathFile
 
                                 pathFile = JsonSerializer.Deserialize<PathFile>(json, BuildTab.jsonSerializerOptions);
                                 pathFile?.Actions.Select((Value, Index) => (Value, Index)).Each(x => x.Value.Arguments = [arguments[x.Index]]);
-                                pathFile.Actions.Each(x =>
+                                pathFile?.Actions.Each(x =>
                                 {
                                     var tag = ActionTag.None;
 

AutoDuty/Windows/BuildTab.cs

@@ -4,7 +4,6 @@
 using ImGuiNET;
 using System.Text.Json;
 using System;
-using static AutoDuty.AutoDuty;
 using System.Numerics;
 using System.Linq;
 using System.Collections.Generic;
@@ -502,11 +501,7 @@ private static void AddAction()
             _action.Name = _actionText;
             _action.Arguments = [.. _argumentsString.Split(",", StringSplitOptions.TrimEntries)];
             _action.Tag = _actionTag;
-            var position = _positionText.Replace(" ", string.Empty).Split(",");
-            if (!_comment && position.Length == 3 && float.TryParse(position[0], out var p1) && float.TryParse(position[1], out var p2) && float.TryParse(position[2], out var p3))
-                _action.Position = new(p1, p2, p3);
-            else
-                _action.Position = Vector3.Zero;
+            _action.Position = !_comment && _positionText.TryGetVector3(out var position) ? position : Vector3.Zero;
             _action.Note = _comment && !_note.StartsWith("<--") && !_note.EndsWith("-->") ? $"<-- {_note} -->" : _note;
             if (_buildListSelected == -1)
             {