From 685de56fbbcc56bd6931790aaf63802368176b80 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 23 Feb 2021 21:00:55 +0100 Subject: [PATCH] Add proper getval to iris create --- .../manager/command/CommandIrisCreate.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java index 8b0dad3a2..066394d1d 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java @@ -49,7 +49,7 @@ public class CommandIrisCreate extends MortarCommand { 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; + pregen = i.startsWith("pregen=") ? getVal(i.split("\\Q=\\E")[1]) : pregen; } Iris.linkMultiverseCore.assignWorldType(worldName, type); @@ -185,6 +185,26 @@ public class CommandIrisCreate extends MortarCommand return true; } + private int getVal(String arg) { + + if(arg.toLowerCase().endsWith("c") || arg.toLowerCase().endsWith("chunks")) + { + return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qc\\E", "").replaceAll("\\Qchunks\\E", "")) * 16; + } + + if(arg.toLowerCase().endsWith("r") || arg.toLowerCase().endsWith("regions")) + { + return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qr\\E", "").replaceAll("\\Qregions\\E", "")) * 512; + } + + if(arg.toLowerCase().endsWith("k")) + { + return Integer.parseInt(arg.toLowerCase().replaceAll("\\Qk\\E", "")) * 1000; + } + + return Integer.parseInt(arg.toLowerCase()); + } + @Override protected String getArgsUsage() {