Region rarity

src/main/java/com/volmit/iris/command/CommandIris.java

@@ -19,6 +19,9 @@ public class CommandIris extends MortarCommand
 	@Command
 	private CommandIrisObject object;
 
+	@Command
+	private CommandIrisCreate create;
+
 	public CommandIris()
 	{
 		super("iris", "ir", "irs");

src/main/java/com/volmit/iris/command/CommandIrisCreate.java

@@ -0,0 +1,199 @@
+package com.volmit.iris.command;
+
+import java.io.File;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.WorldCreator;
+import org.bukkit.WorldType;
+import org.bukkit.entity.Player;
+import org.zeroturnaround.zip.ZipUtil;
+
+import com.volmit.iris.Iris;
+import com.volmit.iris.IrisDataManager;
+import com.volmit.iris.IrisSettings;
+import com.volmit.iris.gen.IrisChunkGenerator;
+import com.volmit.iris.object.IrisDimension;
+import com.volmit.iris.util.Form;
+import com.volmit.iris.util.J;
+import com.volmit.iris.util.MortarCommand;
+import com.volmit.iris.util.MortarSender;
+import com.volmit.iris.util.O;
+import com.volmit.iris.util.PregenJob;
+
+public class CommandIrisCreate extends MortarCommand
+{
+	public CommandIrisCreate()
+	{
+		super("create", "new", "+");
+		requiresPermission(Iris.perm.studio);
+		setCategory("Create");
+		setDescription("Create a new Iris World!");
+	}
+
+	@Override
+	public boolean handle(MortarSender sender, String[] args)
+	{
+		String worldName = args[0];
+		String type = "overworld";
+		long seed = 1337;
+		int pregen = 0;
+		boolean zip = false;
+		File folder = new File(worldName);
+
+		if(folder.exists())
+		{
+			sender.sendMessage("That world folder already exists!");
+			return true;
+		}
+
+		File iris = new File(folder, "iris");
+		iris.mkdirs();
+
+		for(String i : args)
+		{
+			if(i.equals("-zip"))
+			{
+				zip = true;
+			}
+
+			type = i.startsWith("type=") ? i.split("\\Q=\\E")[1] : type;
+			seed = i.startsWith("seed=") ? Long.valueOf(i.split("\\Q=\\E")[1]) : seed;
+			pregen = i.startsWith("pregen=") ? Integer.parseInt(i.split("\\Q=\\E")[1]) : pregen;
+		}
+
+		sender.sendMessage("Looking for Package: " + type);
+
+		IrisDimension dim = Iris.globaldata.getDimensionLoader().load(type);
+
+		if(dim == null)
+		{
+			for(File i : Iris.instance.getDataFolder("packs").listFiles())
+			{
+				if(i.isFile() && i.getName().equals(type + ".iris"))
+				{
+					sender.sendMessage("Found " + type + ".iris in packs folder");
+					ZipUtil.unpack(i, iris);
+					break;
+				}
+			}
+		}
+
+		else
+		{
+			sender.sendMessage("Foind " + type + " dimension in packs folder. Repackaging");
+			ZipUtil.unpack(Iris.proj.compilePackage(sender, type, true), iris);
+		}
+
+		File dimf = new File(iris, "dimensions/" + type + ".json");
+
+		if(!dimf.exists() || !dimf.isFile())
+		{
+			sender.sendMessage("Can't find the " + dimf.getName() + " in the dimensions folder of this pack! Failed!");
+			return true;
+		}
+
+		IrisDataManager dm = new IrisDataManager(folder);
+		dim = dm.getDimensionLoader().load(type);
+
+		if(dim == null)
+		{
+			sender.sendMessage("Can't load the dimension! Failed!");
+			return true;
+		}
+
+		sender.sendMessage(worldName + " type installed. Generating Spawn Area...");
+		IrisChunkGenerator gen = new IrisChunkGenerator("", 16);
+
+		sender.sendMessage("Generating with " + IrisSettings.get().threads + " threads per chunk");
+		O<Boolean> done = new O<Boolean>();
+		done.set(false);
+
+		J.a(() ->
+		{
+			double last = 0;
+			int req = 800;
+			while(!done.get())
+			{
+				boolean derp = false;
+				double v = (double) gen.getGenerated() / (double) req;
+
+				if(last > v || v > 1)
+				{
+					derp = true;
+					v = last;
+				}
+
+				else
+				{
+					last = v;
+				}
+
+				sender.sendMessage("Generating " + Form.pc(v) + (derp ? " (Waiting on Server...)" : ""));
+				J.sleep(3000);
+			}
+		});
+
+		World world = Bukkit.createWorld(new WorldCreator(worldName).seed(seed).generator(gen).type(WorldType.NORMAL).environment(dim.getEnvironment()));
+		done.set(true);
+		sender.sendMessage(worldName + " Spawn Area generated.");
+
+		O<Boolean> b = new O<Boolean>();
+		b.set(true);
+
+		if(pregen > 0)
+		{
+			b.set(false);
+			sender.sendMessage("Pregenerating " + worldName + " " + pregen + " x " + pregen);
+			sender.sendMessage("Expect Extreme server lag during this time. Use '/iris world pregen stop' to cancel");
+
+			new PregenJob(world, pregen, sender, () ->
+			{
+				b.set(true);
+			});
+		}
+
+		boolean zipp = zip;
+
+		J.a(() ->
+		{
+			while(!b.get())
+			{
+				J.sleep(1000);
+			}
+
+			Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () ->
+			{
+				world.save();
+
+				for(Player i : world.getPlayers())
+				{
+					i.kickPlayer("Please Rejoin in a different world.");
+				}
+
+				if(!Bukkit.unloadWorld(world, true))
+				{
+					sender.sendMessage("Couldn't unload the world for some reason.... Aborting zip.");
+					return;
+				}
+
+				if(zipp)
+				{
+					sender.sendMessage("Zipping up world");
+					ZipUtil.pack(folder, new File("" + folder.getName() + ".zip"), 9);
+					sender.sendMessage("Zipped to " + folder.getName() + ".zip");
+				}
+
+				sender.sendMessage("All Done!");
+			});
+		});
+
+		return true;
+	}
+
+	@Override
+	protected String getArgsUsage()
+	{
+		return "<name> [type=overworld] [seed=1337] [pregen=5000] [-zip]";
+	}
+}

src/main/java/com/volmit/iris/command/CommandIrisPregen.java

@@ -39,7 +39,9 @@ public class CommandIrisPregen extends MortarCommand
 		{
 			Player p = sender.player();
 			World world = p.getWorld();
-			new PregenJob(world, Integer.valueOf(args[0]));
+			new PregenJob(world, Integer.valueOf(args[0]), sender, () ->
+			{
+			});
 
 			return true;
 		}