Feat/last executed placeholders

build.gradle

@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.12.0'
+version = '8.13.0'
 description = 'CommandTimer'
 
 repositories {
@@ -74,7 +74,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.12.0'
+            version = '8.13.0'
 
             from components.java
         }

docs/docs/placeholders.md

@@ -14,7 +14,9 @@ to replace `task` with your actual task name.
 - `%commandtimer_ALLTASKS_nextTaskName%`: Show the name of the next task that will be executed
 - `%commandtimer_task_nextExecution%`: Get the next execution time in seconds
 - `%commandtimer_task_nextExecutionFormat%`: Same as previous placeholder, but formatted in `HH:mm:ss`
-- `%commandtimer_task_timeFormat%`: Same as previous placeholder, but you can replace `timeFormat` with a format of your
+- `%commandtimer_task_lastExecution%`: Get last execution time in seconds
+- `%commandtimer_task_lastExecutionFormat%`: Same as previous placeholder, but formatted in `HH:mm:ss`
+- `%commandtimer_task_timeFormat%`: Same as previous placeholders, but you can replace `timeFormat` with a format of your
   choice. You can use `DD`, `HH`, `mm` and `ss` as time selectors in your placeholder. If you want to
   escape certain characters you can use `'` around the character you want to escape. For a time format `12h34m03s` you
   will need the placeholder `%commandtimer_task_HH'h'mm'm'ss's'%`. Depending on your configuration file, you will need

java17-build.gradle

@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.12.0'
+version = '8.13.0'
 description = 'CommandTimer'
 
 repositories {
@@ -63,7 +63,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java17'
-            version = '8.12.0'
+            version = '8.13.0'
 
             from components.java
         }

java21-build.gradle

@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.12.0'
+version = '8.13.0'
 description = 'CommandTimer'
 
 repositories {
@@ -68,7 +68,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java21'
-            version = '8.12.0'
+            version = '8.13.0'
             from components.java
         }
     }

src/main/java/me/playbosswar/com/hooks/PAPIPlaceholders.java

@@ -95,6 +95,14 @@ public String onPlaceholderRequest(Player player, @NotNull String identifier) {
             return getNextExecutionText(task, fallbackMessage, true);
         }
 
+        if(placeholder.getPlaceholderType().equalsIgnoreCase("lastExecution")) {
+            return getLastExecutionText(task, fallbackMessage, false);
+        }
+
+        if(placeholder.getPlaceholderType().equalsIgnoreCase("lastExecutionFormat")) {
+            return getLastExecutionText(task, fallbackMessage, true);
+        }
+
         return getNextExecutionText(task, fallbackMessage, true, placeholder.getPlaceholderType());
     }
 
@@ -185,6 +193,17 @@ private long getNextExecution(Task task) {
         return timeLeft;
     }
 
+    private long getLastExecution(Task task) {
+        if (task.getLastExecuted() == null || !task.isActive()) {
+            return -1;
+        }
+
+        long now = new Date().getTime();
+        Interval interval = new Interval(task.getLastExecuted().getTime(), now);
+        Duration period = interval.toDuration();
+        return period.getStandardSeconds();
+    }
+
     private String getNextExecutionText(Task task, String fallbackMessage, boolean format, String timeFormat) {
         long seconds = getNextExecution(task);
 
@@ -199,10 +218,28 @@ private String getNextExecutionText(Task task, String fallbackMessage, boolean f
         return seconds + "";
     }
 
+    private String getLastExecutionText(Task task, String fallbackMessage, boolean format, String timeFormat) {
+        long seconds = getLastExecution(task);
+
+        if(seconds == -1) {
+            return fallbackMessage != null ? fallbackMessage : "";
+        }
+
+        if(format) {
+            return Tools.getTimeString((int) seconds, timeFormat);
+        }
+
+        return seconds + "";
+    }
+
     private String getNextExecutionText(Task task, String fallbackMessage, boolean format) {
         return getNextExecutionText(task, fallbackMessage, format, "HH:mm:ss");
     }
 
+    private String getLastExecutionText(Task task, String fallbackMessage, boolean format) {
+        return getLastExecutionText(task, fallbackMessage, format, "HH:mm:ss");
+    }
+
     // Get first task that will execute
     private Task getSoonestTask(List<Task> tasks) {
         Map<Task, Long> timeTillExecution = new HashMap<>();

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: me.playbosswar.com.CommandTimerPlugin
 name: "CommandTimer"
-version: "8.12.0"
+version: "8.13.0"
 description: "Schedule commands like you want"
 author: PlayBossWar
 api-version: 1.13