Merge addons folder into packs folder, addons now go into packs

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -122,16 +122,15 @@ private void load(@Nullable ResourcePack preloadedResourcePack) throws IOExcepti
                 unload(); //ensure nothing is left running (from a failed load or something)
 
                 //load addons
-                Path addonsFolder = serverInterface.getConfigFolder().resolve("addons");
-                Files.createDirectories(addonsFolder);
-                Addons.tryLoadAddons(addonsFolder, true);
-                //serverInterface.getModsFolder().ifPresent(Addons::tryLoadAddons);
+                Path packsFolder = serverInterface.getConfigFolder().resolve("packs");
+                Files.createDirectories(packsFolder);
+                Addons.tryLoadAddons(packsFolder);
 
                 //load configs
                 BlueMapConfigManager configManager = BlueMapConfigManager.builder()
                         .minecraftVersion(serverInterface.getMinecraftVersion())
                         .configRoot(serverInterface.getConfigFolder())
-                        .packsFolder(serverInterface.getConfigFolder().resolve("packs"))
+                        .packsFolder(packsFolder)
                         .modsFolder(serverInterface.getModsFolder().orElse(null))
                         .useMetricsConfig(serverInterface.isMetricsEnabled() == Tristate.UNDEFINED)
                         .autoConfigWorlds(serverInterface.getLoadedServerWorlds())

implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java

@@ -333,15 +333,16 @@ public static void main(String[] args) {
             }
 
             // load addons
-            Path addonsFolder = cli.configFolder.resolve("addons");
-            Files.createDirectories(addonsFolder);
-            Addons.tryLoadAddons(cli.configFolder.resolve("addons"), true);
+            Path packsFolder = cli.configFolder.resolve("packs");
+            Files.createDirectories(packsFolder);
+            Addons.tryLoadAddons(packsFolder);
 
             // load configs
             BlueMapConfigManager configs = BlueMapConfigManager.builder()
                     .minecraftVersion(cli.minecraftVersion)
                     .configRoot(cli.configFolder)
                     .modsFolder(cli.modsFolder)
+                    .packsFolder(packsFolder)
                     .usePluginConfig(false)
                     .defaultDataFolder(Path.of("data"))
                     .defaultWebroot(Path.of("web"))