From 0160d42302e1d321a9eca53c3ac61c3b29907af2 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Fri, 3 Sep 2021 21:28:12 +0200 Subject: [PATCH 1/7] aliases, startup NPE, pick option when console --- .../java/com/volmit/iris/core/commands/CommandIris.java | 2 +- .../java/com/volmit/iris/core/commands/CommandObject.java | 2 +- .../java/com/volmit/iris/core/loader/ResourceLoader.java | 8 +++++++- .../iris/util/decree/virtual/VirtualDecreeCommand.java | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 112b451d5..e48c389f9 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -39,7 +39,7 @@ public class CommandIris implements DecreeExecutor { private CommandObject object; private CommandWhat what; - @Decree(description = "Create a new world", aliases = "+") + @Decree(description = "Create a new world", aliases = {"+", "c"}) public void create( @Param(aliases = "world-name", description = "The name of the world to create") String name, diff --git a/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/src/main/java/com/volmit/iris/core/commands/CommandObject.java index 06384b16f..28ebc3bf0 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -101,7 +101,7 @@ public class CommandObject implements DecreeExecutor { } } - @Decree(description = "Get a powder that reveals objects", studio = true) + @Decree(description = "Get a powder that reveals objects", studio = true, aliases = "d") public void dust() { player().getInventory().addItem(WandSVC.createDust()); sender().playSound(Sound.AMBIENT_SOUL_SAND_VALLEY_ADDITIONS, 1f, 1.5f); diff --git a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java index 31c0e29af..7b8218257 100644 --- a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java @@ -158,8 +158,14 @@ public class ResourceLoader { } KSet m = new KSet<>(); + KList files = getFolders(); - for (File i : getFolders()) { + if (files == null) { + possibleKeys = new String[0]; + return possibleKeys; + } + + for (File i : files) { for (File j : matchAllFiles(i, (f) -> f.getName().endsWith(".json"))) { m.add(i.toURI().relativize(j.toURI()).getPath().replaceAll("\\Q.json\\E", "")); } diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index b44777f26..073b7c4d8 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -513,6 +513,11 @@ public class VirtualDecreeCommand { }; private String pickValidOption(VolmitSender sender, KList validOptions, DecreeParameterHandler handler, String name, String type) { + if (!sender.isPlayer()) { + String picked = handler.toStringForce(validOptions.getRandom()); + sender.sendMessage(C.RED + "We went ahead and picked an option for you: " + picked); + return picked; + } sender.sendHeader("Pick a " + name + " (" + type + ")"); sender.sendMessageRaw("This query will expire in 15 seconds."); String password = UUID.randomUUID().toString().replaceAll("\\Q-\\E", ""); From f42e418346e3547a9cb37ca379da1f330eeb5a8b Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 7 Sep 2021 17:43:13 +0200 Subject: [PATCH 2/7] Better context yes --- .../java/com/volmit/iris/core/commands/CommandIris.java | 2 -- .../iris/util/decree/virtual/VirtualDecreeCommand.java | 2 +- .../java/com/volmit/iris/util/plugin/VolmitSender.java | 9 +++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index c7907cd1b..e95d8bae6 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -191,8 +191,6 @@ public class CommandIris implements DecreeExecutor { PlatformChunkGenerator plat = IrisToolbelt.access(player().getWorld()); Engine engine = plat.getEngine(); try { - int vd = radius; - int rg = 0; Chunk cx = player().getLocation().getChunk(); KList js = new KList<>(); BurstExecutor b = MultiBurst.burst.burst(); diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index 141a655fe..3975ad1eb 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -449,7 +449,7 @@ public class VirtualDecreeCommand { value = update; } - if (i.isContextual() && value == null) { + if (sender.isPlayer() && i.isContextual() && value == null) { DecreeContextHandler ch = DecreeContextHandler.contextHandlers.get(i.getType()); if (ch != null) { diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 5513c3c05..8b06786ef 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -544,17 +544,15 @@ public class VolmitSender implements CommandSender { String nHoverTitle = p.getNames().convert((ff) -> "<#d665f0>" + ff).toString(", "); String nDescription = "<#3fe05a>✎ <#6ad97d>" + p.getDescription(); String nUsage; - String context = ""; - if (p.isRequired()) { + if (p.isContextual() && isPlayer()) { + nUsage = "<#ff9900>➱ <#ffcc00>The value may be derived from environment context" + newline; + } else if (p.isRequired()) { nUsage = "<#db4321>⚠ <#faa796>This parameter is required."; } else if (p.hasDefault()) { nUsage = "<#2181db>✔ <#78dcf0>Defaults to \"" + p.getParam().defaultValue() + "\" if undefined."; } else { nUsage = "<#a73abd>✔ <#78dcf0>This parameter is optional."; } - if (p.isContextual()) { - context = "<#ff9900>➱ <#ffcc00>The value may be derived from environment context" + newline; - } String type = "<#cc00ff>✢ <#ff33cc>This parameter is of type " + p.getType().getSimpleName(); String fullTitle; if (p.isRequired()) { @@ -567,7 +565,6 @@ public class VolmitSender implements CommandSender { .append("") From b34bac9b5e6860af549868030de0a105dd14435f Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 7 Sep 2021 17:44:03 +0200 Subject: [PATCH 3/7] Remove hot garbage --- .../iris/util/decree/virtual/VirtualDecreeCommand.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java index 3975ad1eb..b81c54ecf 100644 --- a/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java @@ -514,11 +514,6 @@ public class VirtualDecreeCommand { }; private String pickValidOption(VolmitSender sender, KList validOptions, DecreeParameterHandler handler, String name, String type) { - if (!sender.isPlayer()) { - String picked = handler.toStringForce(validOptions.getRandom()); - sender.sendMessage(C.RED + "We went ahead and picked an option for you: " + picked); - return picked; - } sender.sendHeader("Pick a " + name + " (" + type + ")"); sender.sendMessageRaw("This query will expire in 15 seconds."); String password = UUID.randomUUID().toString().replaceAll("\\Q-\\E", ""); From f0375ca4465d1db545ac06a4d999bd00042dc6ba Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 7 Sep 2021 17:51:08 +0200 Subject: [PATCH 4/7] Better ig --- .../com/volmit/iris/util/plugin/VolmitSender.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 8b06786ef..55d1de06a 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -544,22 +544,21 @@ public class VolmitSender implements CommandSender { String nHoverTitle = p.getNames().convert((ff) -> "<#d665f0>" + ff).toString(", "); String nDescription = "<#3fe05a>✎ <#6ad97d>" + p.getDescription(); String nUsage; + String fullTitle; if (p.isContextual() && isPlayer()) { - nUsage = "<#ff9900>➱ <#ffcc00>The value may be derived from environment context" + newline; + fullTitle = "<#ffcc00>[" + nTitle + "<#ffcc00>] "; + nUsage = "<#ff9900>➱ <#ffcc00>The value may be derived from environment context."; } else if (p.isRequired()) { + fullTitle = "[" + nTitle + "] "; nUsage = "<#db4321>⚠ <#faa796>This parameter is required."; } else if (p.hasDefault()) { + fullTitle = "<#4f4f4f>⊰" + nTitle + "<#4f4f4f>⊱"; nUsage = "<#2181db>✔ <#78dcf0>Defaults to \"" + p.getParam().defaultValue() + "\" if undefined."; } else { + fullTitle = "<#4f4f4f>⊰" + nTitle + "<#4f4f4f>⊱"; nUsage = "<#a73abd>✔ <#78dcf0>This parameter is optional."; } - String type = "<#cc00ff>✢ <#ff33cc>This parameter is of type " + p.getType().getSimpleName(); - String fullTitle; - if (p.isRequired()) { - fullTitle = "[" + nTitle + "] "; - } else { - fullTitle = "<#4f4f4f>⊰" + nTitle + "<#4f4f4f>⊱"; - } + String type = "<#cc00ff>✢ <#ff33cc>This parameter is of type " + p.getType().getSimpleName() + "."; nodes .append(" Date: Tue, 7 Sep 2021 22:16:52 +0200 Subject: [PATCH 5/7] Dum --- build.gradle | 2 +- .../java/com/volmit/iris/core/commands/CommandIris.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 80ecdc864..5895135cc 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ def main = 'com.volmit.iris.Iris' registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins', name) registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins', name) registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins', name) -registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins', name) +registerCustomOutputTask('Coco', 'G://MCServer/plugins', name) registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name) // ============================================================== diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index e95d8bae6..d63beb96a 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -196,14 +196,14 @@ public class CommandIris implements DecreeExecutor { BurstExecutor b = MultiBurst.burst.burst(); b.setMulticore(false); int rad = engine.getMantle().getRealRadius(); - for (int i = -(vd + rad); i <= vd + rad; i++) { - for (int j = -(vd + rad); j <= vd + rad; j++) { + for (int i = -(radius + rad); i <= radius + rad; i++) { + for (int j = -(radius + rad); j <= radius + rad; j++) { engine.getMantle().getMantle().deleteChunk(i + cx.getX(), j + cx.getZ()); } } - for (int i = -vd; i <= vd; i++) { - for (int j = -vd; j <= vd; j++) { + for (int i = -radius; i <= radius; i++) { + for (int j = -radius; j <= radius; j++) { int finalJ = j; int finalI = i; b.queue(() -> plat.injectChunkReplacement(player().getWorld(), finalI + cx.getX(), finalJ + cx.getZ(), (f) -> { From 44cd0e1e10ebe9fa167d98a397ae798158f3e23a Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Wed, 8 Sep 2021 14:33:59 +0200 Subject: [PATCH 6/7] Patch weird Kayori bug --- build.gradle | 2 +- src/main/java/com/volmit/iris/Iris.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5895135cc..d7ba474aa 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ def main = 'com.volmit.iris.Iris' registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins', name) registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins', name) registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins', name) -registerCustomOutputTask('Coco', 'G://MCServer/plugins', name) +registerCustomOutputTask('Coco', 'D://Documents/MCSM/plugins', name) registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name) // ============================================================== diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index c14a75d2e..86dd77cac 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -377,7 +377,7 @@ public class Iris extends VolmitPlugin implements Listener { IrisDimension dim = data.getDimensionLoader().load(j.getName().split("\\Q.\\E")[0]); if (dim == null) { - Iris.error("Failed to load " + j.getPath()); + Iris.error("Failed to load " + j.getPath() + " "); continue; } From 6e501c7b8aefead0321328b4d684d6ae9cc99655 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Wed, 8 Sep 2021 15:15:04 +0200 Subject: [PATCH 7/7] Print seed --- build.gradle | 2 +- src/main/java/com/volmit/iris/engine/IrisEngine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7eaca21f1..1ab17285d 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ def main = 'com.volmit.iris.Iris' registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins', name) registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins', name) registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins', name) -registerCustomOutputTask('Coco', 'D://Documents/MCSM/plugins', name) +registerCustomOutputTask('Coco', 'C://Users/sjoer/Desktop/MCSM/plugins', name) registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name) // ============================================================== diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index bd761671f..acf789022 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -134,7 +134,7 @@ public class IrisEngine implements Engine { context = new IrisContext(this); cleaning = new AtomicBoolean(false); context.touch(); - Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + 256 + " height) Seed: " + getSeedManager().toString()); + Iris.info("Initializing Engine: " + target.getWorld().name() + "/" + target.getDimension().getLoadKey() + " (" + 256 + " height) Seed: " + getSeedManager().getSeed()); getData().setEngine(this); minHeight = 0; failing = false;