Added option to change the times when the remaining time message is sent

src/main/java/com/bgsoftware/wildstacker/handlers/SettingsHandler.java

@@ -58,6 +58,11 @@ public final class SettingsHandler {
             "break-slots", "manage-menu", "break-charge", "place-charge", "spawners-override.spawn-conditions",
             "spawner-upgrades.ladders"};
 
+    // Global settings
+    public final String giveItemName;
+    public final ItemStack inspectTool, simulateTool;
+    public final Map<String, String> customNames;
+
     // Database settings
     public final String databaseType;
     public final String databaseMySQLAddress;
@@ -70,17 +75,17 @@ public final class SettingsHandler {
     public final boolean databaseMySQLPublicKeyRetrieval;
     public final long databaseMySQLWaitTimeout;
     public final long databaseMySQLMaxLifetime;
+    public final boolean deleteInvalidWorlds;
 
-    //Global settings
-    public final String giveItemName, killTaskTimeCommand;
-    public final ItemStack inspectTool, simulateTool;
-    public final boolean deleteInvalidWorlds, killTaskStackedEntities, killTaskUnstackedEntities,
+    // Kill task settings
+    public final String killTaskTimeCommand;
+    public final boolean killTaskStackedEntities, killTaskUnstackedEntities,
             killTaskStackedItems, killTaskUnstackedItems, killTaskSyncClearLagg;
-    public final Map<String, String> customNames;
     public final long killTaskInterval;
     public final Fast2EnumsArray<EntityType, SpawnCause> killTaskEntitiesWhitelist, killTaskEntitiesBlacklist;
     public final FastEnumArray<Material> killTaskItemsWhitelist, killTaskItemsBlacklist;
     public final List<String> killTaskEntitiesWorlds, killTaskItemsWorlds;
+    public final List<Long> killTaskRemainingTimes;
 
     //Items settings
     public final boolean itemsStackingEnabled, itemsParticlesEnabled, itemsFixStackEnabled, itemsDisplayEnabled,
@@ -204,6 +209,7 @@ public SettingsHandler(WildStackerPlugin plugin) {
         killTaskUnstackedItems = cfg.getBoolean("kill-task.unstacked-items", true);
         killTaskSyncClearLagg = cfg.getBoolean("kill-task.sync-clear-lagg", false);
         killTaskTimeCommand = cfg.getString("kill-task.time-command", "stacker timeleft");
+        killTaskRemainingTimes = cfg.getLongList("kill-task.remaining-times");
         killTaskEntitiesWhitelist = Fast2EnumsArray.fromList(cfg.getStringList("kill-task.kill-entities.whitelist"),
                 EntityType.class, SpawnCause.class);
         killTaskEntitiesBlacklist = Fast2EnumsArray.fromList(cfg.getStringList("kill-task.kill-entities.blacklist"),

src/main/java/com/bgsoftware/wildstacker/tasks/KillTask.java

@@ -34,7 +34,7 @@ public static long getTimeLeft() {
     public void run() {
         if (plugin.getSettings().killTaskInterval > 0) {
             if (timeLeft == 0) {
-                if (Bukkit.getOnlinePlayers().size() > 0) {
+                if (!Bukkit.getOnlinePlayers().isEmpty()) {
                     plugin.getSystemManager().performKillAll(true);
                     for (Player player : Bukkit.getOnlinePlayers())
                         Locale.KILL_ALL_ANNOUNCEMENT.send(player);
@@ -44,7 +44,7 @@ public void run() {
                 return;
             }
 
-            if (timeLeft == 10 || timeLeft == 30 || timeLeft == 60) {
+            if (plugin.getSettings().killTaskRemainingTimes.contains(timeLeft)) {
                 for (Player player : Bukkit.getOnlinePlayers())
                     Locale.KILL_ALL_REMAINING_TIME.send(player, timeLeft);
             }

src/main/resources/config.yml

@@ -68,6 +68,11 @@ kill-task:
   # You can split multiple commands using ",".
   # You can set it to '' in order to disable this feature.
   time-command: 'stacker timeleft'
+  # A list of times before the kill task runs when a remaining time message will be sent. (in seconds)
+  remaining-times:
+    - 60
+    - 30
+    - 10
   # All settings related to the kill-all task of entities.
   kill-entities:
     # A list of entities that will be cleared.