let users get size for any worlds, not just the main 3

Author: hyperdefined

src/main/java/lol/hyper/anarchystats/AnarchyStats.java

@@ -12,6 +12,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.logging.Logger;
 
 public final class AnarchyStats extends JavaPlugin {
@@ -20,6 +21,7 @@ public final class AnarchyStats extends JavaPlugin {
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public FileConfiguration config;
     public final Logger logger = this.getLogger();
+    public final ArrayList<Path> worldPaths = new ArrayList<>();
 
     public CommandInfo commandInfo;
     public CommandReload commandReload;
@@ -42,7 +44,7 @@ public void onEnable() {
 
         this.getCommand(config.getString("info-command-override")).setExecutor(commandInfo);
         this.getCommand("anarchystats").setExecutor(commandReload);
-        Bukkit.getScheduler().runTaskAsynchronously(this, () -> this.updateWorldSize(WorldSize.world, WorldSize.nether, WorldSize.end));
+        Bukkit.getScheduler().runTaskAsynchronously(this, this::updateWorldSize);
 
         new Updater(this, 66089).getVersion(version -> {
             if (this.getDescription().getVersion().equalsIgnoreCase(version)) {
@@ -58,14 +60,22 @@ public void onEnable() {
     public void onDisable() {
     }
 
-    public void updateWorldSize(Path world, Path nether, Path end) {
-        worldSize = WorldSize.readableFileSize(WorldSize.getWorldSize(world) + WorldSize.getWorldSize(nether) + WorldSize.getWorldSize(end));
+    public void updateWorldSize() {
+        worldSize = WorldSize.readableFileSize(WorldSize.getWorldSize(worldPaths));
     }
 
     public void loadConfig() {
         config = YamlConfiguration.loadConfiguration(configFile);
-        WorldSize.world = Paths.get(Paths.get(".").toAbsolutePath().normalize().toString() + File.separator + config.getString("world-files.overworld"));
-        WorldSize.nether = Paths.get(Paths.get(".").toAbsolutePath().normalize().toString() + File.separator + config.getString("world-files.nether"));
-        WorldSize.end = Paths.get(Paths.get(".").toAbsolutePath().normalize().toString() + File.separator + config.getString("world-files.end"));
+        if (worldPaths.size() > 0) {
+            worldPaths.clear();
+        }
+        for (String x : config.getStringList("worlds-to-use")) {
+            Path currentPath = Paths.get(Paths.get(".").toAbsolutePath().normalize().toString() + File.separator + x);
+            if (!currentPath.toFile().exists()) {
+                logger.warning("World file " + x + " does not exist!");
+            } else {
+                worldPaths.add(currentPath);
+            }
+        }
     }
 }

src/main/java/lol/hyper/anarchystats/WorldSize.java

@@ -6,6 +6,7 @@
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class WorldSize {
@@ -21,38 +22,40 @@ public class WorldSize {
      *
      * https://stackoverflow.com/a/19877372
      */
-    public static long getWorldSize(Path path) {
+    public static long getWorldSize(ArrayList<Path> paths) {
 
         final AtomicLong size = new AtomicLong(0);
 
-        try {
-            Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+        for (Path p : paths) {
+            try {
+                Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
 
-                    size.addAndGet(attrs.size());
-                    return FileVisitResult.CONTINUE;
-                }
+                        size.addAndGet(attrs.size());
+                        return FileVisitResult.CONTINUE;
+                    }
 
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc) {
+                    @Override
+                    public FileVisitResult visitFileFailed(Path file, IOException exc) {
 
-                    Bukkit.getLogger().warning("File " + file + " doesn't exist. (" + exc + ")");
-                    // Skip folders that can't be traversed
-                    return FileVisitResult.CONTINUE;
-                }
+                        Bukkit.getLogger().warning("File " + file + " doesn't exist. (" + exc + ")");
+                        // Skip folders that can't be traversed
+                        return FileVisitResult.CONTINUE;
+                    }
 
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
 
-                    if (exc != null)
-                        Bukkit.getLogger().warning("Had trouble traversing: " + dir + " (" + exc + ")");
-                    // Ignore errors traversing a folder
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-        } catch (IOException e) {
-            throw new AssertionError("walkFileTree will not throw IOException if the FileVisitor does not");
+                        if (exc != null)
+                            Bukkit.getLogger().warning("Had trouble traversing: " + dir + " (" + exc + ")");
+                        // Ignore errors traversing a folder
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+            } catch (IOException e) {
+                throw new AssertionError("walkFileTree will not throw IOException if the FileVisitor does not");
+            }
         }
 
         return size.get();

src/main/java/lol/hyper/anarchystats/commands/CommandInfo.java

@@ -2,7 +2,6 @@
 
 import lol.hyper.anarchystats.AnarchyStats;
 import lol.hyper.anarchystats.MessageParser;
-import lol.hyper.anarchystats.WorldSize;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -20,7 +19,7 @@ public CommandInfo(AnarchyStats anarchyStats, MessageParser messageParser) {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Bukkit.getScheduler().runTaskAsynchronously(anarchyStats, () -> anarchyStats.updateWorldSize(WorldSize.world, WorldSize.nether, WorldSize.end));
+        Bukkit.getScheduler().runTaskAsynchronously(anarchyStats, anarchyStats::updateWorldSize);
         for (String x : messageParser.getCommandMessage()) {
             sender.sendMessage(x);
         }

src/main/resources/config.yml

@@ -1,5 +1,6 @@
 # Some plugins use /info for things. This let's you change the plugins command so they don't override.
 # Default is /info.
+# This requires a whole server restart.
 info-command-override: "info"
 
 # This is the start date of your world.
@@ -11,12 +12,13 @@ date: 05/27/2019 # This date is May 27th, 2019.
 # You can find examples on how to custom this here: https://www.journaldev.com/17899/java-simpledateformat-java-date-format <- There is a chart at the bottom of the page.
 date-format: "M/dd/yyyy"
 
-# Some servers have different folder names for the worlds. Please update these to match yours.
-# Leave default if you didn't change the names.
-world-files:
-  overworld: "world"
-  nether: "world_nether"
-  end: "world_the_end"
+# This let's you set which worlds will be included in the size calculation.
+# By default, it uses the default worlds.
+# You can add more or change the names.
+worlds-to-use:
+  - "world"
+  - "world_nether"
+  - "world_the_end"
 
 # This is where you can change what message is on the command.
 # {{STARTDATE}} - Displays the start date for the server. Uses the date above.