[Feature] Save Command (and tweaks to logging)

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SaveCommand.java

@@ -0,0 +1,39 @@
+package io.github.thebusybiscuit.slimefun4.core.commands.subcommands;
+
+import io.github.thebusybiscuit.slimefun4.core.commands.SlimefunCommand;
+import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand;
+import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide;
+import io.github.thebusybiscuit.slimefun4.core.services.AutoSavingService;
+import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+public class SaveCommand extends SubCommand {
+    private final AutoSavingService service;
+
+    @ParametersAreNonnullByDefault
+    SaveCommand(Slimefun plugin, SlimefunCommand cmd) {
+        super(plugin, cmd, "save", false);
+        this.service = Slimefun.getAutoSavingService();
+    }
+
+    @Override
+    public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) {
+        if (!(sender instanceof Player)) {
+            Slimefun.getLocalization().sendMessage(sender, "messages.only-players", true);
+            return;
+        }
+
+        if (sender.hasPermission("slimefun.command.save")) {
+            boolean savedPlayers = this.service.saveAllPlayers(false);
+            Slimefun.getLocalization().sendMessage(sender, "commands.save.players." + savedPlayers, true);
+            boolean savedBlocks = this.service.saveAllBlocks(false);
+            Slimefun.getLocalization().sendMessage(sender, "commands.save.blocks." + savedBlocks, true);
+        } else {
+            Slimefun.getLocalization().sendMessage(sender, "messages.no-permission", true);
+        }
+    }
+}

src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/SlimefunSubCommands.java

@@ -42,6 +42,7 @@ public static Collection<SubCommand> getAllCommands(@Nonnull SlimefunCommand cmd
         commands.add(new BackpackCommand(plugin, cmd));
         commands.add(new ChargeCommand(plugin, cmd));
         commands.add(new DebugCommand(plugin, cmd));
+        commands.add(new SaveCommand(plugin, cmd))
 
         return commands;
     }

src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java

@@ -29,6 +29,8 @@
 public class AutoSavingService {
 
     private int interval;
+    private boolean savingPlayers;
+    private boolean savingBlocks;
 
     /**
      * This method starts the {@link AutoSavingService} with the given interval.
@@ -41,19 +43,25 @@ public class AutoSavingService {
     public void start(@Nonnull Slimefun plugin, int interval) {
         this.interval = interval;
 
-        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, this::saveAllPlayers, 2000L, interval * 60L * 20L);
-        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, this::saveAllBlocks, 2000L, interval * 60L * 20L);
+        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> saveAllPlayers(true), 2000L, interval * 60L * 20L);
+        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> saveAllBlocks(true), 2000L, interval * 60L * 20L);
     }
 
     /**
      * This method saves every {@link PlayerProfile} in memory and removes profiles
      * that were marked for deletion.
      */
-    private void saveAllPlayers() {
+    public boolean saveAllPlayers(boolean auto) {
+        if (this.savingPlayers) {
+            return false;
+        }
+
+        this.savingPlayers = true;
+        long startTime = System.currentTimeMillis();
         Iterator<PlayerProfile> iterator = PlayerProfile.iterator();
         int players = 0;
 
-        Debug.log(TestCase.PLAYER_PROFILE_DATA, "Saving all players data");
+        Debug.log(TestCase.PLAYER_PROFILE_DATA, "Saving all player data");
 
         while (iterator.hasNext()) {
             PlayerProfile profile = iterator.next();
@@ -81,14 +89,28 @@ private void saveAllPlayers() {
         }
 
         if (players > 0) {
-            Slimefun.logger().log(Level.INFO, "Auto-saved all player data for {0} player(s)!", players);
+            if (auto) {
+                Slimefun.logger().log(Level.INFO, "Auto-saved all player data for {0} player(s)!", players);
+            } else {
+                Slimefun.logger().log(Level.INFO, "Saved all player data for {0} player(s)!", players);
+            }
+            Slimefun.logger().log(Level.INFO, "Took {0}ms!", System.currentTimeMillis() - startTime);
         }
+
+        this.savingPlayers = false;
+        return true;
     }
 
     /**
      * This method saves the data of every {@link Block} marked dirty by {@link BlockStorage}.
      */
-    private void saveAllBlocks() {
+    public boolean saveAllBlocks(boolean auto) {
+        if (this.savingBlocks) {
+            return false;
+        }
+
+        this.savingBlocks = true;
+        long startTime = System.currentTimeMillis();
         Set<BlockStorage> worlds = new HashSet<>();
 
         for (World world : Bukkit.getWorlds()) {
@@ -104,14 +126,22 @@ private void saveAllBlocks() {
         }
 
         if (!worlds.isEmpty()) {
-            Slimefun.logger().log(Level.INFO, "Auto-saving block data... (Next auto-save: {0}m)", interval);
+            if (auto) {
+                Slimefun.logger().log(Level.INFO, "Auto-saving block data... (Next auto-save: {0}m)", interval);
+            } else {
+                Slimefun.logger().log(Level.INFO, "Saving block data...");
+            }
 
             for (BlockStorage storage : worlds) {
                 storage.save();
             }
         }
 
         BlockStorage.saveChunks();
+        Slimefun.logger().log(Level.INFO, "Saved all block data, took {0}ms!", System.currentTimeMillis() - startTime);
+
+        this.savingBlocks = false;
+        return true;
     }
 
 }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java

@@ -828,6 +828,11 @@ private static void validateInstance() {
         return instance.blockDataService;
     }
 
+    public static @Nonnull AutoSavingService getAutoSavingService() {
+        validateInstance();
+        return instance.autoSavingService;
+    }
+
     /**
      * This method returns out world settings service.
      * That service is responsible for managing item settings per

src/main/resources/languages/en/messages.yml

@@ -39,6 +39,14 @@ commands:
     running: '&7Running debug mode with test: &6%test%'
     disabled: '&7Disabled debug mode.'
 
+  save:
+    players:
+      true: 'Successfully saved player-data!'
+      false: 'Player-data is already saving!'
+    blocks:
+      true: 'Successfully saved blockstorage!'
+      false: 'Blockstorage is already saving!'
+
 placeholderapi:
   profile-loading: 'Loading...'