fix some refactor errors

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java

@@ -0,0 +1,36 @@
+package com.dfsek.terra.addons.structure.command;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.PopulationUtil;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.UserDefinedBiome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import net.jafama.FastMath;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Random;
+import java.util.function.Consumer;
+
+public class AsyncStructureFinder extends AsyncFeatureFinder<ConfiguredStructure> {
+    public AsyncStructureFinder(BiomeProvider provider, ConfiguredStructure target, @NotNull Vector3 origin, World world, int startRadius, int maxRadius, Consumer<Vector3> callback, TerraPlugin main) {
+        super(provider, target, origin, world, startRadius, maxRadius, callback, main);
+        setSearchSize(target.getSpawn().getWidth() + 2 * target.getSpawn().getSeparation());
+    }
+
+    @Override
+    public Vector3 finalizeVector(Vector3 orig) {
+        return target.getSpawn().getChunkSpawn(orig.getBlockX(), orig.getBlockZ(), world.getSeed());
+    }
+
+    @Override
+    public boolean isValid(int x, int z, ConfiguredStructure target) {
+        Vector3 spawn = target.getSpawn().getChunkSpawn(x, z, world.getSeed());
+        if(!((UserDefinedBiome) provider.getBiome(spawn)).getConfig().getStructures().contains(target)) return false;
+        Random random = new FastRandom(PopulationUtil.getCarverChunkSeed(FastMath.floorDiv(spawn.getBlockX(), 16), FastMath.floorDiv(spawn.getBlockZ(), 16), world.getSeed()));
+        return target.getStructure().get(random).test(spawn.setY(target.getSpawnStart().get(random)), world, random, Rotation.fromDegrees(90 * random.nextInt(4)));
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/SpawnCommand.java

@@ -0,0 +1,48 @@
+package com.dfsek.terra.addons.structure.command.structure;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.CommandTemplate;
+import com.dfsek.terra.api.command.annotation.Command;
+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.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.addons.structure.structures.parser.lang.constants.NumericConstant;
+import com.dfsek.terra.addons.structure.structures.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.structure.structures.script.functions.CheckFunction;
+import com.dfsek.terra.addons.structure.structures.structure.buffer.StructureBuffer;
+import com.dfsek.terra.addons.structure.structures.tokenizer.Position;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.vector.Vector3;
+
+import java.util.HashMap;
+
+@DebugCommand
+@PlayerCommand
+@WorldCommand
+@Command(
+        usage = "/terra spawn"
+)
+public class SpawnCommand implements CommandTemplate {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public void execute(CommandSender sender) {
+        Player player = (Player) sender;
+        Vector3 p = player.position();
+        int x = p.getBlockX();
+        int y = p.getBlockY();
+        int z = p.getBlockZ();
+        Position dummy = new Position(0, 0);
+
+        String check = new CheckFunction(main, new NumericConstant(0, dummy), new NumericConstant(0, dummy), new NumericConstant(0, dummy), dummy).apply(new TerraImplementationArguments(new StructureBuffer(
+                new Vector3(x, y, z)
+        ), Rotation.NONE, new FastRandom(), player.world(), 0), new HashMap<>());
+
+        sender.sendMessage("Found: " + check);
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureCommand.java

@@ -0,0 +1,39 @@
+package com.dfsek.terra.addons.structure.command.structure;
+
+import com.dfsek.terra.api.command.CommandTemplate;
+import com.dfsek.terra.api.command.annotation.Command;
+import com.dfsek.terra.api.command.annotation.Subcommand;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.config.lang.LangUtil;
+
+@Command(
+        subcommands = {
+                @Subcommand(
+                        clazz = StructureExportCommand.class,
+                        value = "export",
+                        aliases = "ex"
+                ),
+                @Subcommand(
+                        clazz = StructureLoadCommand.class,
+                        value = "load",
+                        aliases = "ld"
+                ),
+                @Subcommand(
+                        clazz = SpawnCommand.class,
+                        value = "spawn",
+                        aliases = "s"
+                ),
+                @Subcommand(
+                        clazz = StructureLocateCommand.class,
+                        value = "locate",
+                        aliases = "l"
+                )
+        },
+        usage = "/te structure"
+)
+public class StructureCommand implements CommandTemplate {
+    @Override
+    public void execute(CommandSender sender) {
+        LangUtil.send("command.structure.main-menu", sender);
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java

@@ -0,0 +1,111 @@
+package com.dfsek.terra.addons.structure.command.structure;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.entity.Sign;
+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.inject.ArgumentTarget;
+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.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.vector.Vector3;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+@PlayerCommand
+@WorldCommand
+@DebugCommand
+@Command(
+        arguments = {
+                @Argument(
+                        value = "id"
+                )
+        },
+        usage = "/terra structure export <ID>"
+)
+public class StructureExportCommand implements CommandTemplate {
+    @Inject
+    private TerraPlugin main;
+
+    @ArgumentTarget("id")
+    private String id;
+
+    @Override
+    public void execute(CommandSender sender) {
+        Player player = (Player) sender;
+
+        Pair<Vector3, Vector3> l = main.getWorldHandle().getSelectedLocation(player);
+
+        Vector3 l1 = l.getLeft();
+        Vector3 l2 = l.getRight();
+
+        StringBuilder scriptBuilder = new StringBuilder("id \"" + id + "\";\nnum y = 0;\n");
+
+        int centerX = 0;
+        int centerY = 0;
+        int centerZ = 0;
+
+        for(int x = l1.getBlockX(); x <= l2.getBlockX(); x++) {
+            for(int y = l1.getBlockY(); y <= l2.getBlockY(); y++) {
+                for(int z = l1.getBlockZ(); z <= l2.getBlockZ(); z++) {
+                    BlockEntity state = player.world().getBlockState(x, y, z);
+                    if(state instanceof Sign) {
+                        Sign sign = (Sign) state;
+                        if(sign.getLine(0).equals("[TERRA]") && sign.getLine(1).equals("[CENTER]")) {
+                            centerX = x - l1.getBlockX();
+                            centerY = y - l1.getBlockY();
+                            centerZ = z - l1.getBlockZ();
+                        }
+                    }
+                }
+            }
+        }
+
+        for(int x = l1.getBlockX(); x <= l2.getBlockX(); x++) {
+            for(int y = l1.getBlockY(); y <= l2.getBlockY(); y++) {
+                for(int z = l1.getBlockZ(); z <= l2.getBlockZ(); z++) {
+
+                    BlockState data = player.world().getBlockData(x, y, z);
+                    if(data.isStructureVoid()) continue;
+                    BlockEntity state = player.world().getBlockState(x, y, z);
+                    if(state instanceof Sign) {
+                        Sign sign = (Sign) state;
+                        if(sign.getLine(0).equals("[TERRA]")) {
+                            data = main.getWorldHandle().createBlockData(sign.getLine(2) + sign.getLine(3));
+                        }
+                    }
+                    if(!data.isStructureVoid()) {
+                        scriptBuilder.append("block(").append(x - l1.getBlockX() - centerX).append(", y + ").append(y - l1.getBlockY() - centerY).append(", ").append(z - l1.getBlockZ() - centerZ).append(", ")
+                                .append("\"");
+                        scriptBuilder.append(data.getAsString()).append("\");\n");
+                    }
+                }
+            }
+        }
+
+        File file = new File(main.getDataFolder() + File.separator + "export" + File.separator + "structures", id + ".tesf");
+        try {
+            file.getParentFile().mkdirs();
+            file.createNewFile();
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+        try(BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
+            writer.write(scriptBuilder.toString());
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+
+        sender.sendMessage("Exported structure to " + file.getAbsolutePath());
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java

@@ -0,0 +1,90 @@
+package com.dfsek.terra.addons.structure.command.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.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.addons.structure.command.structure.argument.ScriptArgumentParser;
+import com.dfsek.terra.addons.structure.command.structure.completer.RotationCompleter;
+import com.dfsek.terra.addons.structure.command.structure.completer.ScriptCompleter;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+@PlayerCommand
+@DebugCommand
+@WorldCommand
+@Command(
+        arguments = {
+                @Argument(
+                        value = "structure",
+                        tabCompleter = ScriptCompleter.class,
+                        argumentParser = ScriptArgumentParser.class
+                ),
+                @Argument(
+                        value = "rotation",
+                        required = false,
+                        tabCompleter = RotationCompleter.class,
+                        argumentParser = IntegerArgumentParser.class,
+                        defaultValue = "0"
+                )
+        },
+        switches = {
+                @Switch(value = "chunk",
+                        aliases = "c"
+                )
+        },
+        usage = "/terra structure load [ROTATION] [-c]"
+)
+public class StructureLoadCommand implements CommandTemplate {
+    @ArgumentTarget("rotation")
+    private Integer rotation = 0;
+
+    @SwitchTarget("chunk")
+    private boolean chunk;
+
+    @ArgumentTarget("structure")
+    private Structure script;
+
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public void execute(CommandSender sender) {
+        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.generate(player.position(), player.world(), player.world().getChunkAt(player.position()), random, r);
+        } else {
+            script.generate(player.position(), player.world(), random, r);
+        }
+        long l = System.nanoTime() - t;
+
+        sender.sendMessage("Took " + ((double) l) / 1000000 + "ms");
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java

@@ -0,0 +1,74 @@
+package com.dfsek.terra.addons.structure.command.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.PlayerCommand;
+import com.dfsek.terra.api.command.annotation.type.WorldCommand;
+import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
+import com.dfsek.terra.addons.structure.command.structure.argument.StructureArgumentParser;
+import com.dfsek.terra.addons.structure.command.structure.completer.StructureCompleter;
+import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.world.population.items.TerraStructure;
+
+import java.util.Locale;
+
+@PlayerCommand
+@WorldCommand
+@Command(
+        arguments = {
+                @Argument(
+                        value = "structure",
+                        tabCompleter = StructureCompleter.class,
+                        argumentParser = StructureArgumentParser.class
+                ),
+                @Argument(
+                        value = "radius",
+                        required = false,
+                        defaultValue = "100",
+                        argumentParser = IntegerArgumentParser.class
+                )
+        },
+        switches = {
+                @Switch(
+                        value = "teleport",
+                        aliases = {"t", "tp"}
+                )
+        }
+)
+public class StructureLocateCommand implements CommandTemplate {
+    @Inject
+    private TerraPlugin main;
+
+    @ArgumentTarget("structure")
+    private TerraStructure structure;
+
+    @ArgumentTarget("radius")
+    private Integer radius;
+
+    @SwitchTarget("teleport")
+    private boolean teleport;
+
+    @Override
+    public void execute(CommandSender sender) {
+        Player player = (Player) sender;
+
+        new Thread(new AsyncStructureFinder(main.getWorld(player.world()).getBiomeProvider(), structure, player.position().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())), player.world(), 0, radius, location -> {
+            if(location != null) {
+                sender.sendMessage(String.format("The nearest %s is at [%d, ~, %d] (%.1f blocks away)", structure.getTemplate().getID().toLowerCase(Locale.ROOT), location.getBlockX(), location.getBlockZ(), location.add(new Vector3(0, player.position().getY(), 0)).distance(player.position())));
+                if(teleport) {
+                    main.runPossiblyUnsafeTask(() -> player.position(new Vector3(location.getX(), player.position().getY(), location.getZ())));
+                }
+            } else LangUtil.send("command.biome.unable-to-locate", sender);
+        }, main), "Biome Location Thread").start();
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java

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

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java

@@ -0,0 +1,19 @@
+package com.dfsek.terra.addons.structure.command.structure.argument;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.arg.ArgumentParser;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.world.population.items.TerraStructure;
+
+public class StructureArgumentParser implements ArgumentParser<ConfiguredStructure> {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public ConfiguredStructure parse(CommandSender sender, String arg) {
+        return main.getWorld(((Player) sender).world()).getConfig().getRegistry(TerraStructure.class).get(arg);
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/RotationCompleter.java

@@ -0,0 +1,14 @@
+package com.dfsek.terra.addons.structure.command.structure.completer;
+
+import com.dfsek.terra.api.command.tab.TabCompleter;
+import com.dfsek.terra.api.entity.CommandSender;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class RotationCompleter implements TabCompleter {
+    @Override
+    public List<String> complete(CommandSender sender) {
+        return Arrays.asList("0", "90", "180", "270");
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.addons.structure.command.structure.completer;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.tab.TabCompleter;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.addons.structure.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).world()).getConfig().getRegistry(StructureScript.class).entries().stream().map(Structure::getId).collect(Collectors.toList());
+    }
+}

common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.addons.structure.command.structure.completer;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.command.tab.TabCompleter;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.world.population.items.TerraStructure;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StructureCompleter implements TabCompleter {
+    @Inject
+    private TerraPlugin main;
+
+    @Override
+    public List<String> complete(CommandSender sender) {
+        Player player = (Player) sender;
+        return new ArrayList<>(main.getWorld(player.world()).getConfig().getRegistry(TerraStructure.class).keys());
+    }
+}