more command stuff

common/src/main/java/com/dfsek/terra/commands/AddonsCommand.java

@@ -0,0 +1,17 @@
+package com.dfsek.terra.commands;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.CommandTemplate;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.platform.CommandSender;
+
+public class AddonsCommand implements CommandTemplate {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public void execute(CommandSender sender) {
+        sender.sendMessage("Installed Addons:");
+        main.getAddons().forEach(addon -> sender.sendMessage(" - " + addon.getName() + " v" + addon.getVersion() + " by " + addon.getAuthor()));
+    }
+}

common/src/main/java/com/dfsek/terra/commands/CommandUtil.java

@@ -9,5 +9,6 @@ public final class CommandUtil {
         manager.register("structure", StructureCommand.class);
         manager.register("profile", ProfileCommand.class);
         manager.register("reload", ReloadCommand.class);
+        manager.register("addons", AddonsCommand.class);
     }
 }

common/src/main/java/com/dfsek/terra/commands/structure/ScriptArgumentParser.java

@@ -0,0 +1,18 @@
+package com.dfsek.terra.commands.structure;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.arg.ArgumentParser;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.structures.script.StructureScript;
+
+public class ScriptArgumentParser implements ArgumentParser<StructureScript> {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public StructureScript parse(CommandSender sender, String arg) {
+        return main.getWorld(((Player) sender).getWorld()).getConfig().getScriptRegistry().get(arg);
+    }
+}

common/src/main/java/com/dfsek/terra/commands/structure/ScriptCompleter.java

@@ -0,0 +1,21 @@
+package com.dfsek.terra.commands.structure;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.tab.TabCompleter;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.structures.script.StructureScript;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ScriptCompleter implements TabCompleter {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public List<String> complete(CommandSender sender) {
+        return main.getWorld(((Player) sender).getWorld()).getConfig().getScriptRegistry().entries().stream().map(StructureScript::getId).collect(Collectors.toList());
+    }
+}

common/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java

@@ -1,15 +1,35 @@
 package com.dfsek.terra.commands.structure;
 
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Argument;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.Switch;
 import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget;
+import com.dfsek.terra.api.command.annotation.inject.SwitchTarget;
+import com.dfsek.terra.api.command.annotation.type.DebugCommand;
+import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
+import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
+import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.structures.script.StructureScript;
+import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.util.FastRandom;
 
+import java.util.concurrent.ThreadLocalRandom;
+
+@PlayerCommand
+@DebugCommand
+@WorldCommand
 @Command(
         arguments = {
+                @Argument(
+                        value = "structure",
+                        tabCompleter = ScriptCompleter.class,
+                        argumentParser = ScriptArgumentParser.class
+                ),
                 @Argument(
                         value = "rotation",
                         required = false,
@@ -25,10 +45,43 @@ import com.dfsek.terra.api.platform.CommandSender;
 )
 public class StructureLoadCommand implements CommandTemplate {
     @ArgumentTarget("rotation")
-    private Integer rotation;
+    private Integer rotation = 0;
+
+    @SwitchTarget("chunk")
+    private boolean chunk;
+
+    @ArgumentTarget("structure")
+    private StructureScript script;
+
+    @Inject
+    private TerraPlugin main;
 
     @Override
     public void execute(CommandSender sender) {
         System.out.println(rotation);
+
+        Player player = (Player) sender;
+
+        long t = System.nanoTime();
+        FastRandom random = new FastRandom(ThreadLocalRandom.current().nextLong());
+        Rotation r;
+        try {
+            r = Rotation.fromDegrees(rotation);
+        } catch(Exception e) {
+            sender.sendMessage("Invalid rotation: " + rotation);
+            return;
+        }
+        if(script == null) {
+            sender.sendMessage("Invalid structure.");
+            return;
+        }
+        if(this.chunk) {
+            script.execute(player.getLocation(), player.getWorld().getChunkAt(player.getLocation()), random, r);
+        } else {
+            script.execute(player.getLocation(), random, r);
+        }
+        long l = System.nanoTime() - t;
+
+        sender.sendMessage("Took " + ((double) l) / 1000000 + "ms");
     }
 }