Chore/move last executed location

build.gradle

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

java17-build.gradle

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

java21-build.gradle

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

src/main/java/me/playbosswar/com/CommandTimerPlugin.java

@@ -26,6 +26,7 @@
 import me.playbosswar.com.updater.Updater;
 import me.playbosswar.com.utils.Files;
 import me.playbosswar.com.utils.Messages;
+import me.playbosswar.com.utils.migrations.MigrationManager;
 import me.playbosswar.com.utils.Tools;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -87,7 +88,7 @@ public void onEnable() {
 
         Bukkit.getPluginManager().registerEvents(new JoinEvents(), this);
 
-        Files.migrateFileNamesToFileUuids();
+        new MigrationManager(this).runMigrations();
         if(getConfig().getBoolean("database.enabled")) {
             try {
                 Class.forName("com.mysql.jdbc.Driver");

src/main/java/me/playbosswar/com/commands/MainCommand.java

@@ -15,6 +15,7 @@
 import me.playbosswar.com.utils.Files;
 import me.playbosswar.com.utils.Messages;
 import me.playbosswar.com.utils.Tools;
+import me.playbosswar.com.utils.migrations.MigrationManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -184,8 +185,33 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
         if(args.length == 2) {
             String action = args[0];
-            String taskName = args[1];
 
+            if(action.equalsIgnoreCase("rollback")) {
+                if(!sender.hasPermission("commandtimer.manage")) {
+                    Messages.sendNoPermission(sender);
+                    return true;
+                }
+
+                try {
+                    int targetVersion = Integer.parseInt(args[1]);
+                    MigrationManager migrationManager = new MigrationManager(CommandTimerPlugin.getInstance());
+
+                    if(targetVersion > migrationManager.getCurrentVersion()) {
+                        Messages.sendMessage(sender, "&cCannot rollback to version " + targetVersion + ". Current version is " + migrationManager.getCurrentVersion());
+                        return true;
+                    }
+
+                    Messages.sendMessage(sender, "&eStarting rollback to version " + targetVersion + "...");
+                    migrationManager.rollbackToVersion(targetVersion);
+                    Messages.sendMessage(sender, "&aRollback complete. Please restart the server for changes to take effect.");
+                    return true;
+                } catch(NumberFormatException e) {
+                    Messages.sendMessage(sender, "&cInvalid version number: " + args[1]);
+                    return true;
+                }
+            }
+
+            String taskName = args[1];
             Task task = tasksManager.getTaskByName(taskName);
             if(task == null) {
                 Messages.sendMessage(sender, languageManager.get(LanguageKey.NO_TASK));

src/main/java/me/playbosswar/com/language/LanguageManager.java

@@ -58,9 +58,7 @@ private void validateConfiguration() throws Exception {
         }
 
         if (fileSaveRequired) {
-            try {
-                String filePath = getLanguageFilePath(selectedLanguage);
-                FileWriter jsonFile = new FileWriter(filePath);
+            try (FileWriter jsonFile = new FileWriter(getLanguageFilePath(selectedLanguage))) {
                 jsonFile.write(selectedLanguageObject.toJSONString());
                 jsonFile.flush();
             } catch (IOException e) {

src/main/java/me/playbosswar/com/tasks/AdHocCommandsManager.java

@@ -124,10 +124,16 @@ private void storeCommand(AdHocCommand command) {
         GsonConverter gson = new GsonConverter();
         String json = gson.toJson(command);
         try {
-            FileWriter jsonFile = new FileWriter(Files.getAdHocCommandFile(command.getId()));
-            jsonFile.write(json);
-            jsonFile.flush();
-            jsonFile.close();
+            String path;
+            try {
+                path = Files.getAdHocCommandFile(command.getId());
+            } catch (IllegalStateException e) {
+                path = Files.getNewAdHocCommandFile(command.getId());
+            }
+            try (FileWriter jsonFile = new FileWriter(path)) {
+                jsonFile.write(json);
+                jsonFile.flush();
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/me/playbosswar/com/tasks/Task.java

@@ -14,7 +14,12 @@
 import me.playbosswar.com.tasks.persistors.*;
 import me.playbosswar.com.utils.Files;
 import me.playbosswar.com.utils.gson.GsonConverter;
+import me.playbosswar.com.utils.migrations.MigrationManager;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 
+import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.sql.SQLException;
@@ -40,9 +45,9 @@ public class Task {
     private Collection<DayOfWeek> days = new ArrayList<>();
     @DatabaseField
     private int executionLimit = -1;
-    private int timesExecuted = 0;
-    private int lastExecutedCommandIndex = 0;
-    private Date lastExecuted = new Date();
+    private transient int timesExecuted = 0;
+    private transient int lastExecutedCommandIndex = 0;
+    private transient Date lastExecuted = new Date();
     @DatabaseField
     private CommandExecutionMode commandExecutionMode = CommandExecutionMode.ALL;
     @DatabaseField(persisterClass = TaskIntervalPersistor.class)
@@ -184,6 +189,7 @@ public int getTimesExecuted() {
 
     public void setTimesExecuted(int timesExecuted) {
         this.timesExecuted = timesExecuted;
+        storeExecutionMetadata();
     }
 
     public Date getLastExecuted() {
@@ -192,6 +198,7 @@ public Date getLastExecuted() {
 
     public void setLastExecuted(Date lastExecuted) {
         this.lastExecuted = lastExecuted;
+        storeExecutionMetadata();
     }
 
     public boolean isActive() {
@@ -264,6 +271,7 @@ public int getLastExecutedCommandIndex() {
 
     public void setLastExecutedCommandIndex(int lastExecutedCommandIndex) {
         this.lastExecutedCommandIndex = lastExecutedCommandIndex;
+        storeExecutionMetadata();
     }
 
     public Condition getCondition() {
@@ -320,6 +328,10 @@ public void setId(UUID id) {
         this.id = id;
     }
 
+    public void storeExecutionMetadata() {
+        Files.updateLocalTaskMetadata(this);
+    }
+
     public void storeInstance() {
         if(CommandTimerPlugin.getInstance().getConfig().getBoolean("database.enabled")) {
             try {
@@ -336,10 +348,43 @@ public void storeInstance() {
         transaction.setContext("task", json);
 
         try {
-            FileWriter jsonFile = new FileWriter(Files.getTaskFile(id));
-            jsonFile.write(json);
-            jsonFile.flush();
-        } catch(IOException e) {
+            String path;
+            File existingFile = null;
+            try {
+                path = Files.getTaskFile(id);
+                existingFile = new File(path);
+            } catch (IllegalStateException e) {
+                path = Files.getNewTaskFile(id);
+            }
+
+            JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
+
+            if (existingFile != null && existingFile.exists()) {
+                try (FileReader fr = new FileReader(existingFile)) {
+                    JsonObject existingJson = new JsonParser().parse(fr).getAsJsonObject();
+                    if (existingJson.has("configVersion")) {
+                        jsonObject.addProperty("configVersion", existingJson.get("configVersion").getAsInt());
+                    } else {
+                        jsonObject.addProperty("configVersion", MigrationManager.CURRENT_VERSION);
+                    }
+                } catch (Exception e) {
+                    if (!jsonObject.has("configVersion")) {
+                        jsonObject.addProperty("configVersion", MigrationManager.CURRENT_VERSION);
+                    }
+                }
+            } else {
+                if (!jsonObject.has("configVersion")) {
+                    jsonObject.addProperty("configVersion", MigrationManager.CURRENT_VERSION);
+                }
+            }
+
+            json = gson.toJson(jsonObject);
+
+            try (FileWriter jsonFile = new FileWriter(path)) {
+                jsonFile.write(json);
+                jsonFile.flush();
+            }
+        } catch (IOException e) {
             e.printStackTrace();
             transaction.setThrowable(e);
             transaction.setStatus(SpanStatus.INTERNAL_ERROR);

src/main/java/me/playbosswar/com/tasks/TaskExecutionMetadata.java

@@ -1,19 +1,29 @@
 package me.playbosswar.com.tasks;
 
 import java.util.Date;
+import java.util.UUID;
 
-// Data class only used to store metadata in local json files
 public class TaskExecutionMetadata {
+    private UUID taskId;
     private int timesExecuted = 0;
     private int lastExecutedCommandIndex = 0;
     private Date lastExecuted = new Date();
 
-    public TaskExecutionMetadata(int timesExecuted, int lastExecutedCommandIndex, Date lastExecuted) {
+    public TaskExecutionMetadata(UUID taskId, int timesExecuted, int lastExecutedCommandIndex, Date lastExecuted) {
+        this.taskId = taskId;
         this.timesExecuted = timesExecuted;
         this.lastExecutedCommandIndex = lastExecutedCommandIndex;
         this.lastExecuted = lastExecuted;
     }
 
+    public UUID getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(UUID taskId) {
+        this.taskId = taskId;
+    }
+
     public int getTimesExecuted() {
         return timesExecuted;
     }

src/main/java/me/playbosswar/com/tasks/TaskRunner.java

@@ -65,8 +65,6 @@ private void processTask(Task task) {
             task.setLastExecutedCommandIndex(task.getCommands().indexOf(taskCommand));
             CommandTimerPlugin.getScheduler().runTask(() -> tasksManager.processCommandExecution(task, taskCommand));
         }
-
-        task.storeInstance();
     }
 
     @Override

src/main/java/me/playbosswar/com/tasks/TasksManager.java

@@ -59,7 +59,6 @@ public TasksManager(Plugin plugin) {
             if (task.isResetExecutionsAfterRestart()) {
                 task.setTimesExecuted(0);
                 task.setLastExecuted(new Date());
-                task.storeInstance();
             }
         });
 
@@ -104,6 +103,7 @@ public void removeTask(Task task) throws IOException {
             try {
                 loadedTasks.remove(task);
                 java.nio.file.Files.delete(Paths.get(Files.getTaskFile(task.getId())));
+                java.nio.file.Files.delete(Paths.get(Files.getTaskLocalExecutionFile(task.getId())));
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -159,7 +159,6 @@ public void processCommandExecution(Task task, TaskCommand taskCommand) {
             if (executed) {
                 task.setLastExecuted(new Date());
                 task.setTimesExecuted(task.getTimesExecuted() + 1);
-                task.storeInstance();
             }
         });
     }
@@ -409,8 +408,6 @@ private boolean isTimeInRange(LocalTime time, LocalTime start, LocalTime end) {
     }
 
     public void disable() {
-        List<Task> tasksToStore = loadedTasks.stream().filter(Task::isActive).collect(Collectors.toList());
-        tasksToStore.forEach(Task::storeInstance);
         stopRunner = true;
         if (runnerThread != null && runnerThread.isAlive()) {
             runnerThread.interrupt();