Finished templates

PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java

@@ -37,24 +37,24 @@ import com.intellectualcrafters.plot.listeners.PlotPlusListener;
 import com.intellectualcrafters.plot.listeners.WorldEditListener;
 import com.intellectualcrafters.plot.titles.AbstractTitle;
 import com.intellectualcrafters.plot.titles.DefaultTitle;
-import com.intellectualcrafters.plot.util.ChunkManager;
-import com.intellectualcrafters.plot.util.BlockUpdateUtil;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.BlockUpdateUtil;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.ConsoleColors;
 import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.SetupUtils;
 import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager;
 import com.intellectualcrafters.plot.util.bukkit.BukkitEventUtil;
+import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
 import com.intellectualcrafters.plot.util.bukkit.BukkitSetupUtils;
 import com.intellectualcrafters.plot.util.bukkit.BukkitTaskManager;
 import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
-import com.intellectualcrafters.plot.util.bukkit.BukkitChunkManager;
 import com.intellectualcrafters.plot.util.bukkit.Metrics;
 import com.intellectualcrafters.plot.util.bukkit.SendChunk;
 import com.intellectualcrafters.plot.util.bukkit.SetBlockFast;
 import com.intellectualcrafters.plot.util.bukkit.SetBlockFast_1_8;
-import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
 import com.intellectualcrafters.plot.util.bukkit.SetBlockSlow;
 import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper;

PlotSquared/src/main/java/com/intellectualcrafters/plot/IPlotMain.java

@@ -5,9 +5,8 @@ import java.io.File;
 import net.milkbowl.vault.economy.Economy;
 
 import com.intellectualcrafters.plot.generator.HybridUtils;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.SetupUtils;
 import com.intellectualcrafters.plot.util.TaskManager;

PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java

@@ -49,8 +49,8 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.ClusterManager;
 import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.ExpireManager;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java

@@ -35,8 +35,8 @@ import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java

@@ -20,9 +20,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Template.java

@@ -24,13 +24,9 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
 import java.util.Set;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 import org.bukkit.configuration.ConfigurationSection;
@@ -38,13 +34,16 @@ import org.bukkit.configuration.file.YamlConfiguration;
 
 import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Configuration;
+import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.object.FileBytes;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.SetupObject;
 import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.SetupUtils;
+import com.intellectualcrafters.plot.util.TaskManager;
 
 public class Template extends SubCommand {
     public Template() {
@@ -53,32 +52,111 @@ public class Template extends SubCommand {
     
     @Override
     public boolean execute(final PlotPlayer plr, final String... args) {
-        if (args.length != 2) {
+        if (args.length != 2 && args.length != 3) {
-            MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world>");
+            MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template <import|export> <world> [template]");
             return false;
         }
         final String world = args[1];
         switch (args[0].toLowerCase()) {
             case "import": {
-                // TODO import template
+                if (args.length != 3) {
-                MainUtil.sendMessage(plr, "TODO");
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template import <world> <template>");
+                    return false;
+                }
+                if (PlotSquared.isPlotWorld(world)) {
+                    MainUtil.sendMessage(plr, C.SETUP_WORLD_TAKEN, world);
+                    return false;
+                }
+                boolean result = extractAllFiles(world, args[2]);
+                if (!result) {
+                    MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] +".template");
+                    return false;
+                }
+                File worldFile = new File(PlotSquared.IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml");
+                YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
+                PlotSquared.config.set("worlds." + world, worldConfig.get(""));
+                try {
+                    PlotSquared.config.save(PlotSquared.configFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                String generator = worldConfig.getString("generator.plugin");
+                if (generator == null) {
+                    generator = "PlotSquared";
+                }
+                int type = worldConfig.getInt("generator.type");
+                int terrain = worldConfig.getInt("generator.terrain");
+                SetupObject setup = new SetupObject();
+                setup.generator = generator;
+                setup.type = type;
+                setup.terrain = terrain;
+                setup.step = new ConfigurationNode[0];
+                setup.world = world;
+                SetupUtils.manager.setupWorld(setup);
+                MainUtil.sendMessage(plr, "Done!");
+                if (plr != null) {
+                    plr.teleport(BlockManager.manager.getSpawn(world));
+                }
                 return true;
             }
             case "export": {
+                if (args.length != 2) {
+                    MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template export <world>");
+                    return false;
+                }
                 final PlotWorld plotworld = PlotSquared.getPlotWorld(world);
                 if (!BlockManager.manager.isWorld(world) || (plotworld == null)) {
                     MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
                     return false;
                 }
-                PlotManager manager = PlotSquared.getPlotManager(world);
+                final PlotManager manager = PlotSquared.getPlotManager(world);
-                manager.export(plotworld);
+                TaskManager.runTaskAsync(new Runnable() {
+                    @Override
+                    public void run() {
+                        manager.exportTemplate(plotworld);
                         MainUtil.sendMessage(plr, "Done!");
                     }
-        }
+                });
-        // TODO allow world settings (including schematics to be packed into a single file)
-        // TODO allow world created based on these packaged files
                 return true;
             }
+        }
+        return true;
+    }
+    
+    public static boolean extractAllFiles(String world, String template) {
+        byte[] buffer = new byte[2048];
+        try {
+            File folder = new File(PlotSquared.IMP.getDirectory() + File.separator + "templates");
+            if (!folder.exists()) {
+                return false;
+            }
+            File input = new File(folder + File.separator + template +".template");
+            File output = PlotSquared.IMP.getDirectory();
+            if (!output.exists()) {
+                output.mkdirs();
+            }
+            ZipInputStream zis = new ZipInputStream(new FileInputStream(input));
+            ZipEntry ze = zis.getNextEntry();
+            while (ze != null) {
+                String name = ze.getName();
+                File newFile = new File((output + File.separator + name).replaceAll("__TEMP_DIR__", world));
+                new File(newFile.getParent()).mkdirs();
+                FileOutputStream fos = new FileOutputStream(newFile);
+                int len;
+                while ((len = zis.read(buffer)) > 0) {
+                    fos.write(buffer, 0, len);
+                }
+                fos.close();
+                ze = zis.getNextEntry();
+            }
+            zis.closeEntry();
+            zis.close();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
     
     public static byte[] getBytes(PlotWorld plotworld) {
         YamlConfiguration config = new YamlConfiguration();

PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trim.java

@@ -35,8 +35,8 @@ import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.TaskManager;
 

PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java

@@ -20,7 +20,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.events;
 
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/BukkitHybridUtils.java

@@ -15,8 +15,8 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.util.ChunkManager;
-import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
 import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
+import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
 
 public class BukkitHybridUtils extends HybridUtils {
     

PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java

@@ -40,22 +40,23 @@ import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
 public class HybridPlotManager extends ClassicPlotManager {
 
     @Override
-    public void export(PlotWorld plotworld) {
+    public void exportTemplate(PlotWorld plotworld) {
-        HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("settings.yml", Template.getBytes(plotworld))));
+        HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
         String psRoot = PlotSquared.IMP.getDirectory() + File.separator;
         String dir =  "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plotworld.worldname + File.separator;
+        String newDir =  "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
         try {
         File sideroad = new File(psRoot + dir + "sideroad.schematic");
         if (sideroad.exists()) {
-            files.add(new FileBytes(dir + "sideroad.schematic", Files.readAllBytes(sideroad.toPath())));
+            files.add(new FileBytes(newDir + "sideroad.schematic", Files.readAllBytes(sideroad.toPath())));
         }
         File intersection = new File(psRoot + dir + "intersection.schematic");
         if (sideroad.exists()) {
-            files.add(new FileBytes(dir + "intersection.schematic", Files.readAllBytes(intersection.toPath())));
+            files.add(new FileBytes(newDir + "intersection.schematic", Files.readAllBytes(intersection.toPath())));
         }
         File plot = new File(psRoot + dir + "plot.schematic");
         if (sideroad.exists()) {
-            files.add(new FileBytes(dir + "plot.schematic", Files.readAllBytes(plot.toPath())));
+            files.add(new FileBytes(newDir + "plot.schematic", Files.readAllBytes(plot.toPath())));
         }
         }
         catch (Exception e) {

PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java

@@ -11,8 +11,8 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;

PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java

@@ -5,8 +5,8 @@ import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 
 /**

PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java

@@ -31,7 +31,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
-import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -82,9 +81,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.StructureGrowEvent;
-import org.bukkit.event.world.WorldInitEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 
 import com.intellectualcrafters.plot.PlotSquared;
@@ -97,7 +93,6 @@ import com.intellectualcrafters.plot.object.BukkitPlayer;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotGenerator;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;

PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java

@@ -20,12 +20,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.object;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import com.intellectualcrafters.plot.PlotSquared;
 import com.intellectualcrafters.plot.commands.Template;
 
 public abstract class PlotManager {
@@ -88,8 +86,8 @@ public abstract class PlotManager {
 
     public abstract boolean finishPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds);
     
-    public void export(PlotWorld plotworld) {
+    public void exportTemplate(PlotWorld plotworld) {
-        HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("settings.yml", Template.getBytes(plotworld))));
+        HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
         Template.zipAll(plotworld.worldname, files);
     }
     

PlotSquared/src/main/java/com/intellectualcrafters/plot/util/BlockUpdateUtil.java

@@ -3,7 +3,6 @@ package com.intellectualcrafters.plot.util;
 import java.util.List;
 
 import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
 
 public abstract class BlockUpdateUtil {
     public static BlockUpdateUtil setBlockManager = null;

PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java

@@ -23,8 +23,8 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
 import com.intellectualcrafters.plot.util.bukkit.BukkitSetBlockManager;
+import com.intellectualcrafters.plot.util.bukkit.BukkitUtil;
 import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
 
 public class ClusterManager {

PlotSquared/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java

@@ -3,7 +3,6 @@ package com.intellectualcrafters.plot.util;
 import java.util.ArrayList;
 import java.util.UUID;
 
-
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;