mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add functionality for pregenerating from console and specifying a world you're not in

Browse Source
This commit is contained in:
CocoTheOwner 2021-02-07 11:06:08 +01:00
parent cb27043d12
commit 3eb864deb9
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java
View File

@ -5,16 +5,23 @@ import com.volmit.iris.pregen.Pregenerator;
import com.volmit.iris.util.KList; import com.volmit.iris.util.KList;
import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarCommand;
import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.MortarSender;
import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.awt.HeadlessException;
import java.awt.*;
public class CommandIrisPregen extends MortarCommand public class CommandIrisPregen extends MortarCommand
{ {
public CommandIrisPregen() public CommandIrisPregen()
{ {
super("pregen"); super("pregen");
setDescription("Pregen this world with optional parameters: '1k' = 1000 by 1000 blocks, '1c' = 1 by 1 chunks, and '1r' = 32 by 32 chunks"); setDescription(
"Pregen this world with optional parameters: " +
"\n'1k' = 1000 by 1000 blocks, '1c' = 1 by 1 chunks, and '1r' = 32 by 32 chunks." +
"\nIf you are using the console or want to pregen a world you're not in:" +
"\nalso specify the name of the world. E.g. /ir pregen 5k world"
);
requiresPermission(Iris.perm.studio); requiresPermission(Iris.perm.studio);
setCategory("Pregen"); setCategory("Pregen");
} }
@ -81,7 +88,18 @@ public class CommandIrisPregen extends MortarCommand
else if(sender.isPlayer()) else if(sender.isPlayer())
{ {
Player p = sender.player(); Player p = sender.player();
World world = p.getWorld(); World world;
if (args[1] == null) {
world = p.getWorld();
} else {
try {
world = Bukkit.getWorld(args[1]);
} catch (Exception e){
sender.sendMessage("Could not find specified world");
sender.sendMessage("Please doublecheck your command. E.g. /ir pregen 5k world");
return true;
}
}
try { try {
new Pregenerator(world, getVal(args[0])); new Pregenerator(world, getVal(args[0]));
} catch (NumberFormatException e){ } catch (NumberFormatException e){
@ -97,9 +115,28 @@ public class CommandIrisPregen extends MortarCommand
} }
else else
{ {
sender.sendMessage("Players only."); if (args[0] == null){
sender.sendMessage("Please specify the size of the pregen and the name of the world. E.g. /ir pregen 5k world");
return true;
}
if (args[1] == null){
sender.sendMessage("Please specify the name of the world after the command. E.g. /ir pregen 5k world");
return true;
}
World world = Bukkit.getWorld(args[1]);
try {
new Pregenerator(world, getVal(args[0]));
} catch (NumberFormatException e){
sender.sendMessage("Invalid argument in command");
return true;
} catch (NullPointerException e){
sender.sendMessage("Not all required parameters specified");
} catch (HeadlessException e){
sender.sendMessage("If you are seeing this and are using a hosted server, please turn off 'useServerLaunchedGUIs' in the settings");
}
return true;
} }
return true;
} }
private int getVal(String arg) { private int getVal(String arg) {