From c1de30609a0ce090cca695e92899edc023c80461 Mon Sep 17 00:00:00 2001 From: Jackson <9527380+Jaksuhn@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:03:43 +0200 Subject: [PATCH] remove waits from clicks --- SomethingNeedDoing/Grammar/Commands/ClickCommand.cs | 11 +++-------- SomethingNeedDoing/Grammar/Commands/MacroCommand.cs | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/SomethingNeedDoing/Grammar/Commands/ClickCommand.cs b/SomethingNeedDoing/Grammar/Commands/ClickCommand.cs index 641ca82a..67a3c4d5 100644 --- a/SomethingNeedDoing/Grammar/Commands/ClickCommand.cs +++ b/SomethingNeedDoing/Grammar/Commands/ClickCommand.cs @@ -26,7 +26,7 @@ internal class ClickCommand : MacroCommand private string methodName; private readonly string[] values = []; - private ClickCommand(string text, string addon, string method, string[] mParams, WaitModifier wait) : base(text, wait) + private ClickCommand(string text, string addon, string method, string[] mParams) : base(text) { addonName = addon; methodName = method; @@ -35,12 +35,7 @@ private ClickCommand(string text, string addon, string method, string[] mParams, public static unsafe ClickCommand Parse(string text) { - var mods = Regex.Match(text, @"<[^>]*>"); - var modsText = mods.Success ? mods.Value : string.Empty; - _ = WaitModifier.TryParse(ref modsText, out var waitModifier); - - text = !modsText.IsNullOrEmpty() ? text.Replace(modsText, string.Empty).Trim() : text.Trim(); - var match = Regex.Match(text.Replace(modsText, string.Empty).Trim()); + var match = Regex.Match(text); if (!match.Success) throw new MacroSyntaxError(text); @@ -49,7 +44,7 @@ public static unsafe ClickCommand Parse(string text) var methodName = clickValue[1]; var values = clickValue.Skip(2).ToArray(); - return new ClickCommand(text, addonName, methodName, values, waitModifier); + return new ClickCommand(text, addonName, methodName, values); } public override async Task Execute(ActiveMacro macro, CancellationToken token) diff --git a/SomethingNeedDoing/Grammar/Commands/MacroCommand.cs b/SomethingNeedDoing/Grammar/Commands/MacroCommand.cs index 094fedab..3af4a4a4 100644 --- a/SomethingNeedDoing/Grammar/Commands/MacroCommand.cs +++ b/SomethingNeedDoing/Grammar/Commands/MacroCommand.cs @@ -14,6 +14,7 @@ internal abstract class MacroCommand { private static readonly Random Rand = new(); + protected MacroCommand(string text) : this(text, 0, 0) { } protected MacroCommand(string text, WaitModifier waitMod) : this(text, waitMod.Wait, waitMod.Until) { } protected MacroCommand(string text, WaitModifier waitMod, IndexModifier indexMod) : this(text, waitMod.Wait, waitMod.Until, indexMod.ObjectId) { }