allow post command ticks delay

CyR1en · Nov 5, 2023 · dbf163a · dbf163a
1 parent a5c3de5
commit dbf163a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/com/cyr1en/commandprompter/prompt/PromptParser.java b/src/main/java/com/cyr1en/commandprompter/prompt/PromptParser.java
@@ -183,24 +183,29 @@ private List<String> getPrompts(PromptContext promptContext) {
     }
 
     private static final Pattern PCM_INDEX_PATTERN = Pattern.compile("p:\\d+");
+    private static final Pattern PCM_DELAYED_PATTERN = Pattern.compile("exa:\\d+");
 
     private PromptQueue.PostCommandMeta parsePCM(String prompt) {
         plugin.getPluginLogger().debug("Parsing PCM: " + prompt);
+
+
         var matcher = PCM_INDEX_PATTERN.matcher(prompt);
         var count = 0;
         while (matcher.find()) count++;
-
         plugin.getPluginLogger().debug("Index Count: " + count);
-        var indexes = new int[count];
 
+        var indexes = new int[count];
         matcher.reset();
         count = 0;
         while (matcher.find()) {
             var index = matcher.group().split(":")[1];
             indexes[count] = Integer.parseInt(index);
             count++;
         }
-        var pcm = new PromptQueue.PostCommandMeta(cleanPrompt(prompt), indexes);
+
+        var delayMatcher = PCM_DELAYED_PATTERN.matcher(prompt);
+        var delay = delayMatcher.find() ? Integer.parseInt(delayMatcher.group().split(":")[1]) : 0;
+        var pcm = new PromptQueue.PostCommandMeta(cleanPrompt(prompt), indexes, delay);
         plugin.getPluginLogger().debug("Parsed PCM: " + pcm);
         return pcm;
     }
@@ -237,7 +242,7 @@ public String getCleanKey() {
     }
 
     public enum PromptQueueArgument implements Keyable {
-        POST_COMMAND("-exa");
+        POST_COMMAND("-exa(:\\d+)?");
 
         private final String key;
 

diff --git a/src/main/java/com/cyr1en/commandprompter/prompt/PromptQueue.java b/src/main/java/com/cyr1en/commandprompter/prompt/PromptQueue.java
@@ -66,6 +66,10 @@ public void addPCM(PostCommandMeta pcm) {
         postCommandMetas.add(pcm);
     }
 
+    public boolean containsPCM() {
+        return postCommandMetas != null && !postCommandMetas.isEmpty();
+    }
+
     public String getCommand() {
         return command;
     }
@@ -86,7 +90,13 @@ public void dispatch(CommandPrompter plugin, Player sender) {
             Dispatcher.dispatchCommand(plugin, (Player) sender, getCompleteCommand());
 
         if (!postCommandMetas.isEmpty())
-            postCommandMetas.forEach(pcm -> execPCM(pcm, sender));
+            postCommandMetas.forEach(pcm -> {
+                if (pcm.delayTicks() > 0)
+                    plugin.getServer().getScheduler().runTaskLater(plugin, () -> execPCM(pcm, sender),
+                            pcm.delayTicks());
+                else
+                    execPCM(pcm, sender);
+            });
     }
 
     private void execPCM(PostCommandMeta postCommandMeta, Player sender) {
@@ -115,7 +125,7 @@ private void execPCM(PostCommandMeta postCommandMeta, Player sender) {
      * @param promptIndex This will hold the index of the prompt answers to be
      *                    injected in this post command.
      */
-    public record PostCommandMeta(String command, int[] promptIndex) {
+    public record PostCommandMeta(String command, int[] promptIndex, int delayTicks) {
         @Override
         public String toString() {
             return "PostCommandMeta{" +