Fix for default schematic files not being created

Fixes #4

Author: danbovey

src/main/java/com/boveybrawlers/TreeRepository/commands/CopyCommand.java

@@ -37,7 +37,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             return true;
         }
 
-        return false;
+        player.sendMessage(ChatColor.RED + "Usage: /tr copy [code]");
+        return true;
     }
 
 }

src/main/java/com/boveybrawlers/TreeRepository/commands/GroupCommand.java

@@ -38,7 +38,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             }
 
             int perPage = 4;
+            // page argument is at index 2 after group and [name]
             Pagination pagination = Pagination.parseArgs(args, 2, perPage, group.getList().size());
+            if(pagination == null) {
+                player.sendMessage(ChatColor.RED + "Usage: /tr group [name] (page)");
+                return true;
+            }
 
             String page = "";
             if(pagination.hasNextPage()) {
@@ -92,7 +97,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             return true;
         }
 
-        return false;
+        player.sendMessage(ChatColor.RED + "Usage: /tr group [name] (page)");
+        return true;
     }
 
 }

src/main/java/com/boveybrawlers/TreeRepository/commands/ListCommand.java

@@ -41,6 +41,10 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
         int perPage = 10;
         Pagination pagination = Pagination.parseArgs(args, argIndex, perPage, groups.size());
+        if(pagination == null) {
+            player.sendMessage(ChatColor.RED + "Usage: /tr list (page)");
+            return true;
+        }
 
         String page = "";
         if(pagination.hasNextPage()) {

src/main/java/com/boveybrawlers/TreeRepository/commands/ToolCommand.java

@@ -58,17 +58,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             wand.setItemMeta(meta);
 
             player.getInventory().addItem(wand);
-        } else {
-            if(player.hasMetadata(ToolCommand.toolType) && player.hasMetadata(ToolCommand.toolCode)) {
-                player.removeMetadata(ToolCommand.toolType, this.plugin);
-                player.removeMetadata(ToolCommand.toolCode, this.plugin);
 
-                player.sendMessage(ChatColor.DARK_AQUA + "Tree tool unbound from wooden hoe");
-            } else {
-                player.performCommand("treerepo help");
-            }
+            return true;
         }
 
+        player.sendMessage(ChatColor.RED + "Usage: /tr tool [code]");
         return true;
     }
 

src/main/java/com/boveybrawlers/TreeRepository/commands/TreeRepoCommand.java

@@ -31,8 +31,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         subCommands.put("list", new ListCommand(this.plugin));
         subCommands.put("tool", new ToolCommand(this.plugin));
 
-        // TODO: Command to build a temporary collection of trees to use in a tool
-
         if(args.length > 0) {
             CommandExecutor executor = subCommands.get(args[0].toLowerCase());
             if(executor == null) {

src/main/java/com/boveybrawlers/TreeRepository/managers/TreeManager.java

@@ -7,7 +7,6 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.util.FileUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,8 +26,10 @@ public class TreeManager {
     public TreeManager(TreeRepository plugin) {
         this.plugin = plugin;
 
+        String schematicsDir = "schematics";
+
         // Try to create the schematic directory when we start
-        String directory = this.plugin.getDataFolder() + File.separator + "schematics";
+        String directory = this.plugin.getDataFolder() + File.separator + schematicsDir;
         File schematicDir = new File(directory);
         if(!schematicDir.exists()) {
             boolean mkdirs = schematicDir.mkdirs();
@@ -68,15 +69,27 @@ public TreeManager(TreeRepository plugin) {
                     return;
                 }
 
-                Tree tree = new Tree(directory, code, name, description);
+                Tree tree = new Tree(directory, group, code, name, description);
                 Integer roots = (Integer) treeMap.get("roots");
                 if(roots != null) {
                     tree.setRoots(roots);
                 }
 
-                // Copy the tree to the plugin's schematics folder if it doesn't exist
+                // Check the tree's schematic exists at plugins/TreeRepository/{group}/{code}.schematic
                 if(!tree.getSchematic().exists()) {
-                    FileUtil.copy(tree.getSchematic(), new File(this.plugin.getDataFolder() + File.separator + "schematics", tree.getCode() + ".schematic"));
+                    // The tree doesn't exist so let's see if it exists in our resources
+                    InputStream is = this.plugin.getResource(schematicsDir + File.separator + tree.getFilePath());
+                    if(is != null) {
+                        try {
+                            FileUtils.copyInputStreamToFile(is, tree.getSchematic());
+                        } catch(IOException e) {
+                            e.printStackTrace();
+                            // Don't add the tree
+                            return;
+                        }
+                    } else {
+                        return;
+                    }
                 }
 
                 group.add(tree);

src/main/java/com/boveybrawlers/TreeRepository/objects/Tree.java

@@ -4,22 +4,27 @@
 
 public class Tree {
 
+    private String filePath;
     private File schematicFile;
 
     private String code;
     private String name;
     private String description;
     private Integer roots;
 
-    public Tree(String directory, String code, String name, String description) {
+    public Tree(String directory, Group group, String code, String name, String description) {
         this.code = code;
         this.name = name;
         this.description = description;
         this.roots = 0;
 
         // Store the reference to the file
-        this.schematicFile = new File(directory + File.separator + this.code + ".schematic");
+        this.filePath = group.getName() + File.separator + this.code + ".schematic";
+        this.schematicFile = new File(directory + File.separator + this.filePath);
+    }
 
+    public String getFilePath() {
+        return this.filePath;
     }
 
     public String getCode() {

src/main/java/com/boveybrawlers/TreeRepository/utils/Pagination.java

@@ -25,7 +25,11 @@ public Pagination(int page, int perPage, int listSize) {
     public static Pagination parseArgs(String[] args, int argIndex, int perPage, int listSize) {
         int page = 1;
         if(args.length > argIndex) {
-            page = Integer.parseInt(args[argIndex]);
+            try {
+                page = Integer.parseInt(args[argIndex]);
+            } catch(NumberFormatException ex) {
+                return null;
+            }
         }
 
         return new Pagination(page, perPage, listSize);