Implements Template reading.

Add template loading via Admin Panel. Improve LibraryPanel so it could find json and yml files.
BentoBoxWorld · Sep 18, 2021 · 2956553 · 2956553
1 parent 535cde8
commit 2956553
Show file tree

Hide file tree

Showing 12 changed files with 1,515 additions and 669 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesAddon.java b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
@@ -314,6 +314,10 @@ private void loadSettings() {
         this.saveResource("panels/main_panel.yml", false);
         this.saveResource("panels/multiple_panel.yml",false);
         this.saveResource("panels/gamemode_panel.yml",false);
+
+        // Save template
+        this.saveResource("template.yml",false);
+        this.saveResource("default.json",false);
     }
 
 

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/DefaultsCommand.java b/src/main/java/world/bentobox/challenges/commands/admin/DefaultsCommand.java
@@ -97,7 +97,8 @@ public void setup()
         @Override
         public boolean execute(User user, String label, List<String> args)
         {
-            return DefaultsCommand.this.addon.getImportManager().loadDefaultChallenges(user, this.getWorld());
+            DefaultsCommand.this.addon.getImportManager().loadDownloadedChallenges(user, this.getWorld(), "default");
+            return true;
         }
     }
 
@@ -135,10 +136,12 @@ public void setup()
         @Override
         public boolean execute(User user, String label, List<String> args)
         {
-            return DefaultsCommand.this.addon.getImportManager().generateDefaultChallengeFile(
+             DefaultsCommand.this.addon.getImportManager().generateDatabaseFile(
                 user,
                 this.getWorld(),
-                !args.isEmpty() && args.get(0).equalsIgnoreCase("overwrite"));
+                "defaults");
+
+             return true;
         }