diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java index 7d10eac31..64f7e6d61 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java @@ -81,7 +81,7 @@ public class StructureLoadCommand implements CommandTemplate { 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); + script.generateDirect(player.position(), player.world(), random, r); } long l = System.nanoTime() - t; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 82a8fb8c2..96b4906c3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -112,17 +112,6 @@ public class StructureScript implements Structure { this.cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getStructureCache()).build(); } - @Override - @SuppressWarnings("try") - public boolean generate(Vector3 location, World world, Random random, Rotation rotation) { - try(ProfileFrame ignore = main.getProfiler().profile("terrascript:" + id)) { - StructureBuffer buffer = new StructureBuffer(location); - boolean level = applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, 0)); - buffer.paste(location, world); - return level; - } - } - @Override @SuppressWarnings("try") public boolean generate(Vector3 location, World world, Chunk chunk, Random random, Rotation rotation) { diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java index 28f2d32f7..d57f189a0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -10,16 +10,6 @@ import com.dfsek.terra.api.world.World; import java.util.Random; public interface Structure extends StringIdentifiable { - /** - * Paste the structure at a location - * - * @param location Location to paste structure - * @param world - * @param rotation Rotation of structure - * @return Whether generation was successful - */ - boolean generate(Vector3 location, World world, Random random, Rotation rotation); - boolean generate(Vector3 location, World world, Chunk chunk, Random random, Rotation rotation); boolean generate(Buffer buffer, World world, Random random, Rotation rotation, int recursions);