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", "");