refactor terrascript into API, loader, and function addons

common/addons/api-terrascript/build.gradle.kts

@@ -1,2 +1,3 @@
 dependencies {
+    "shadedApi"("commons-io:commons-io:2.6")
 }

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/StructureScript.java

@@ -0,0 +1,13 @@
+package com.dfsek.terra.addons.terrascript.api;
+
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.World;
+
+import java.util.Random;
+
+public interface StructureScript extends Structure {
+    @SuppressWarnings("try")
+    boolean test(Vector3 location, World world, Random random, Rotation rotation);
+}

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/TerraImplementationArguments.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script;
+package com.dfsek.terra.addons.terrascript.api;
 
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.api.structure.buffer.Buffer;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/Cell.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer;
+package com.dfsek.terra.addons.terrascript.api.buffer;
 
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/DirectBuffer.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer;
+package com.dfsek.terra.addons.terrascript.api.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/IntermediateBuffer.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer;
+package com.dfsek.terra.addons.terrascript.api.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/StructureBuffer.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer;
+package com.dfsek.terra.addons.terrascript.api.buffer;
 
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/items/BufferedBlock.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer.items;
+package com.dfsek.terra.addons.terrascript.api.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/items/BufferedEntity.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer.items;
+package com.dfsek.terra.addons.terrascript.api.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.entity.Entity;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/items/BufferedLootApplication.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.addons.terrascript.buffer.items;
+package com.dfsek.terra.addons.terrascript.api.buffer.items;
 
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
+import com.dfsek.terra.addons.terrascript.api.StructureScript;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.entity.Container;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/items/BufferedPulledBlock.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer.items;
+package com.dfsek.terra.addons.terrascript.api.buffer.items;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/buffer/items/BufferedStateManipulator.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.buffer.items;
+package com.dfsek.terra.addons.terrascript.api.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.entity.BlockEntity;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/ConstantExpression.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.parser.lang.constants;
+package com.dfsek.terra.addons.terrascript.api.lang;
 
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;

common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/lang/Item.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.addons.terrascript.api.lang;
 
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.Map;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/BinaryNumberFunctionBuilder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/BiomeFunctionBuilder.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction;
+import com.dfsek.terra.addons.terrascript.functions.BiomeFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/BlockFunctionBuilder.java

@@ -1,15 +1,17 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
+import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant;
-import com.dfsek.terra.addons.terrascript.script.functions.BlockFunction;
+import com.dfsek.terra.addons.terrascript.api.lang.Variable;
+import com.dfsek.terra.addons.terrascript.functions.BlockFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
+import java.util.Map;
 
 public class BlockFunctionBuilder implements FunctionBuilder<BlockFunction> {
     private final TerraPlugin main;
@@ -22,10 +24,25 @@ public class BlockFunctionBuilder implements FunctionBuilder<BlockFunction> {
     @Override
     public BlockFunction build(List<Returnable<?>> argumentList, Position position) throws ParseException {
         if(argumentList.size() < 4) throw new ParseException("Expected data", position);
-        Returnable<Boolean> booleanReturnable = new BooleanConstant(true, position);
+        Returnable<Boolean> booleanReturnable = new Returnable<Boolean>() {
+            @Override
+            public ReturnType returnType() {
+                return ReturnType.BOOLEAN;
+            }
+
+            @Override
+            public Boolean apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
+                return true;
+            }
+
+            @Override
+            public Position getPosition() {
+                return position;
+            }
+        };
         if(argumentList.size() == 5) booleanReturnable = (Returnable<Boolean>) argumentList.get(4);
-        if(argumentList.get(3) instanceof StringConstant) {
-            return new BlockFunction.Constant((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), (StringConstant) argumentList.get(3), booleanReturnable, main, position);
+        if(argumentList.get(3).returnType() == Returnable.ReturnType.STRING && argumentList.get(3) instanceof ConstantExpression) {
+            return new BlockFunction.Constant((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), (ConstantExpression<String>) argumentList.get(3), booleanReturnable, main, position);
         }
         return new BlockFunction((Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), booleanReturnable, main, position);
     }

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/CheckBlockFunctionBuilder.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction;
+import com.dfsek.terra.addons.terrascript.functions.CheckBlockFunction;
 
 import java.util.List;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/CheckFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction;
+import com.dfsek.terra.addons.terrascript.functions.CheckFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/EntityFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction;
+import com.dfsek.terra.addons.terrascript.functions.EntityFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/GetMarkFunctionBuilder.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction;
+import com.dfsek.terra.addons.terrascript.functions.GetMarkFunction;
 
 import java.util.List;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/LootFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.StructureScript;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
-import com.dfsek.terra.addons.terrascript.script.functions.LootFunction;
+import com.dfsek.terra.addons.terrascript.functions.LootFunction;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/PullFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.PullFunction;
+import com.dfsek.terra.addons.terrascript.functions.PullFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/RandomFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction;
+import com.dfsek.terra.addons.terrascript.functions.RandomFunction;
 
 import java.util.List;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/RecursionsFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction;
+import com.dfsek.terra.addons.terrascript.functions.RecursionsFunction;
 
 import java.util.List;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/SetMarkFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction;
+import com.dfsek.terra.addons.terrascript.functions.SetMarkFunction;
 
 import java.util.List;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/StateFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.StateFunction;
+import com.dfsek.terra.addons.terrascript.functions.StateFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/StructureFunctionBuilder.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction;
+import com.dfsek.terra.addons.terrascript.functions.StructureFunction;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/UnaryBooleanFunctionBuilder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
@@ -6,7 +6,7 @@ import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 
 import java.util.List;
 import java.util.Map;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/UnaryNumberFunctionBuilder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/UnaryStringFunctionBuilder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/builders/ZeroArgFunctionBuilder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
@@ -6,7 +6,7 @@ import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 
 import java.util.List;
 import java.util.Map;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/BiomeFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/BlockFunction.java

@@ -1,13 +1,13 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedBlock;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.items.BufferedBlock;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.RotationUtil;
@@ -70,7 +70,7 @@ public class BlockFunction implements Function<Void> {
     public static class Constant extends BlockFunction {
         private final BlockState state;
 
-        public Constant(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, StringConstant blockData, Returnable<Boolean> overwrite, TerraPlugin main, Position position) {
+        public Constant(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, ConstantExpression<String> blockData, Returnable<Boolean> overwrite, TerraPlugin main, Position position) {
             super(x, y, z, blockData, overwrite, main, position);
             this.state = main.getWorldHandle().createBlockData(blockData.getConstant());
         }

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/CheckBlockFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/CheckFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/EntityFunction.java

@@ -1,14 +1,14 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.items.BufferedEntity;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.util.RotationUtil;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/GetMarkFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/LootFunction.java

@@ -1,13 +1,13 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.StructureScript;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.items.BufferedLootApplication;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/PullFunction.java

@@ -1,14 +1,14 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.items.BufferedPulledBlock;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.RotationUtil;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/RandomFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 
 import java.util.Map;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/RecursionsFunction.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 
 import java.util.Map;
 

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/SetMarkFunction.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/StateFunction.java

@@ -1,12 +1,12 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.items.BufferedStateManipulator;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/StructureFunction.java

@@ -1,12 +1,12 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
 import com.dfsek.terra.addons.terrascript.api.Function;
 import com.dfsek.terra.addons.terrascript.api.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.api.Position;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.IntermediateBuffer;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.addons.terrascript;
 
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
+import com.dfsek.terra.addons.terrascript.script.StructureScriptImpl;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.addon.annotations.Addon;
@@ -36,7 +36,7 @@ public class TerraScriptAddon extends TerraAddon {
                     event.getPack().getLoader().open("", ".tesf").thenEntries(entries -> {
                         for(Map.Entry<String, InputStream> entry : entries) {
                             try {
-                                StructureScript structureScript = new StructureScript(entry.getValue(), main, structureRegistry, lootRegistry, event.getPack().getRegistryFactory().create());
+                                com.dfsek.terra.addons.terrascript.api.StructureScript structureScript = new StructureScriptImpl(entry.getValue(), main, structureRegistry, lootRegistry, event.getPack().getRegistryFactory().create());
                                 structureRegistry.register(structureScript.getID(), structureScript);
                             } catch(ParseException e) {
                                 throw new LoadException("Failed to load script: ", e);

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java

@@ -9,7 +9,7 @@ import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.Block;
 import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.NumericConstant;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant;
 import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.BreakKeyword;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser.lang.constants;
 
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 
 public class BooleanConstant extends ConstantExpression<Boolean> {
     public BooleanConstant(Boolean constant, Position position) {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser.lang.constants;
 
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 
 public class NumericConstant extends ConstantExpression<Number> {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser.lang.constants;
 
 import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 
 public class StringConstant extends ConstantExpression<String> {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java

@@ -1,176 +0,0 @@
-package com.dfsek.terra.addons.terrascript.script;
-
-import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
-import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.buffer.DirectBuffer;
-import com.dfsek.terra.addons.terrascript.buffer.StructureBuffer;
-import com.dfsek.terra.addons.terrascript.parser.Parser;
-import com.dfsek.terra.addons.terrascript.parser.lang.Block;
-import com.dfsek.terra.addons.terrascript.script.builders.BinaryNumberFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.BiomeFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.BlockFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.CheckBlockFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.CheckFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.EntityFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.GetMarkFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.LootFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.PullFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.RandomFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.RecursionsFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.SetMarkFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.StateFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.StructureFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.UnaryBooleanFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.UnaryNumberFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.UnaryStringFunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.builders.ZeroArgFunctionBuilder;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.structure.LootTable;
-import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import net.jafama.FastMath;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.Random;
-import java.util.concurrent.ExecutionException;
-
-public class StructureScript implements Structure {
-    private final Block block;
-    private final String id;
-    private final Cache<Vector3, StructureBuffer> cache;
-    private final TerraPlugin main;
-    private String tempID;
-
-    public StructureScript(InputStream inputStream, TerraPlugin main, Registry<Structure> registry, Registry<LootTable> lootRegistry, Registry<FunctionBuilder<?>> functionRegistry) throws ParseException {
-        Parser parser;
-        try {
-            parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset()));
-        } catch(IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        functionRegistry.forEach(parser::registerFunction); // Register registry functions.
-
-        parser
-                .registerFunction("block", new BlockFunctionBuilder(main))
-                .registerFunction("debugBlock", new BlockFunctionBuilder(main))
-                .registerFunction("check", new CheckFunctionBuilder(main))
-                .registerFunction("structure", new StructureFunctionBuilder(registry, main))
-                .registerFunction("randomInt", new RandomFunctionBuilder())
-                .registerFunction("recursions", new RecursionsFunctionBuilder())
-                .registerFunction("setMark", new SetMarkFunctionBuilder())
-                .registerFunction("getMark", new GetMarkFunctionBuilder())
-                .registerFunction("pull", new PullFunctionBuilder(main))
-                .registerFunction("loot", new LootFunctionBuilder(main, lootRegistry, this))
-                .registerFunction("entity", new EntityFunctionBuilder(main))
-                .registerFunction("getBiome", new BiomeFunctionBuilder(main))
-                .registerFunction("getBlock", new CheckBlockFunctionBuilder())
-                .registerFunction("state", new StateFunctionBuilder(main))
-                .registerFunction("setWaterlog", new UnaryBooleanFunctionBuilder((waterlog, args) -> args.setWaterlog(waterlog)))
-                .registerFunction("originX", new ZeroArgFunctionBuilder<Number>(arguments -> arguments.getBuffer().getOrigin().getX(), Returnable.ReturnType.NUMBER))
-                .registerFunction("originY", new ZeroArgFunctionBuilder<Number>(arguments -> arguments.getBuffer().getOrigin().getY(), Returnable.ReturnType.NUMBER))
-                .registerFunction("originZ", new ZeroArgFunctionBuilder<Number>(arguments -> arguments.getBuffer().getOrigin().getZ(), Returnable.ReturnType.NUMBER))
-                .registerFunction("rotation", new ZeroArgFunctionBuilder<>(arguments -> arguments.getRotation().toString(), Returnable.ReturnType.STRING))
-                .registerFunction("rotationDegrees", new ZeroArgFunctionBuilder<>(arguments -> arguments.getRotation().getDegrees(), Returnable.ReturnType.NUMBER))
-                .registerFunction("print", new UnaryStringFunctionBuilder(string -> main.getDebugLogger().info("[" + tempID + "] " + string)))
-                .registerFunction("abs", new UnaryNumberFunctionBuilder(number -> FastMath.abs(number.doubleValue())))
-                .registerFunction("pow", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.pow(number.doubleValue(), number2.doubleValue())))
-                .registerFunction("sqrt", new UnaryNumberFunctionBuilder(number -> FastMath.sqrt(number.doubleValue())))
-                .registerFunction("floor", new UnaryNumberFunctionBuilder(number -> FastMath.floor(number.doubleValue())))
-                .registerFunction("ceil", new UnaryNumberFunctionBuilder(number -> FastMath.ceil(number.doubleValue())))
-                .registerFunction("log", new UnaryNumberFunctionBuilder(number -> FastMath.log(number.doubleValue())))
-                .registerFunction("round", new UnaryNumberFunctionBuilder(number -> FastMath.round(number.doubleValue())))
-                .registerFunction("sin", new UnaryNumberFunctionBuilder(number -> FastMath.sin(number.doubleValue())))
-                .registerFunction("cos", new UnaryNumberFunctionBuilder(number -> FastMath.cos(number.doubleValue())))
-                .registerFunction("tan", new UnaryNumberFunctionBuilder(number -> FastMath.tan(number.doubleValue())))
-                .registerFunction("asin", new UnaryNumberFunctionBuilder(number -> FastMath.asin(number.doubleValue())))
-                .registerFunction("acos", new UnaryNumberFunctionBuilder(number -> FastMath.acos(number.doubleValue())))
-                .registerFunction("atan", new UnaryNumberFunctionBuilder(number -> FastMath.atan(number.doubleValue())))
-                .registerFunction("max", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.max(number.doubleValue(), number2.doubleValue())))
-                .registerFunction("min", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.min(number.doubleValue(), number2.doubleValue())));
-
-        if(!main.getTerraConfig().isDebugScript()) {
-            parser.ignoreFunction("debugBlock");
-        }
-
-        block = parser.parse();
-        this.id = parser.getID();
-        tempID = id;
-        this.main = main;
-        this.cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getStructureCache()).build();
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    public boolean generate(Vector3 location, World world, Chunk chunk, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) {
-            StructureBuffer buffer = computeBuffer(location, world, random, rotation);
-            buffer.paste(location, chunk);
-            return buffer.succeeded();
-        }
-    }
-
-    @SuppressWarnings("try")
-    public boolean test(Vector3 location, World world, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) {
-            StructureBuffer buffer = computeBuffer(location, world, random, rotation);
-            return buffer.succeeded();
-        }
-    }
-
-    private StructureBuffer computeBuffer(Vector3 location, World world, Random random, Rotation rotation) {
-        try {
-            return cache.get(location, () -> {
-                StructureBuffer buf = new StructureBuffer(location);
-                buf.setSucceeded(applyBlock(new TerraImplementationArguments(buf, rotation, random, world, 0)));
-                return buf;
-            });
-        } catch(ExecutionException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    public boolean generate(Buffer buffer, World world, Random random, Rotation rotation, int recursions) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) {
-            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, recursions));
-        }
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    public boolean generate(Vector3 location, World world, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) {
-            DirectBuffer buffer = new DirectBuffer(location, world);
-            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, 0));
-        }
-    }
-
-    @Override
-    public String getID() {
-        return id;
-    }
-
-    private boolean applyBlock(TerraImplementationArguments arguments) {
-        try {
-            return block.apply(arguments).getLevel() != Block.ReturnLevel.FAIL;
-        } catch(RuntimeException e) {
-            main.logger().severe("Failed to generate structure at " + arguments.getBuffer().getOrigin() + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
-            return false;
-        }
-    }
-}

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScriptImpl.java

@@ -0,0 +1,117 @@
+package com.dfsek.terra.addons.terrascript.script;
+
+import com.dfsek.terra.addons.terrascript.api.FunctionBuilder;
+import com.dfsek.terra.addons.terrascript.api.StructureScript;
+import com.dfsek.terra.addons.terrascript.api.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.api.buffer.DirectBuffer;
+import com.dfsek.terra.addons.terrascript.api.buffer.StructureBuffer;
+import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.parser.Parser;
+import com.dfsek.terra.addons.terrascript.parser.lang.Block;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.profiler.ProfileFrame;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.structure.LootTable;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.structure.buffer.Buffer;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Random;
+import java.util.concurrent.ExecutionException;
+
+public class StructureScriptImpl implements StructureScript {
+    private final Block block;
+    private final String id;
+    private final Cache<Vector3, StructureBuffer> cache;
+    private final TerraPlugin main;
+    private String tempID;
+
+    public StructureScriptImpl(InputStream inputStream, TerraPlugin main, Registry<Structure> registry, Registry<LootTable> lootRegistry, Registry<FunctionBuilder<?>> functionRegistry) throws ParseException {
+        Parser parser;
+        try {
+            parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset()));
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        functionRegistry.forEach(parser::registerFunction); // Register registry functions.
+
+        block = parser.parse();
+        this.id = parser.getID();
+        tempID = id;
+        this.main = main;
+        this.cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getStructureCache()).build();
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    public boolean generate(Vector3 location, World world, Chunk chunk, Random random, Rotation rotation) {
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) {
+            StructureBuffer buffer = computeBuffer(location, world, random, rotation);
+            buffer.paste(location, chunk);
+            return buffer.succeeded();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    public boolean test(Vector3 location, World world, Random random, Rotation rotation) {
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) {
+            StructureBuffer buffer = computeBuffer(location, world, random, rotation);
+            return buffer.succeeded();
+        }
+    }
+
+    private StructureBuffer computeBuffer(Vector3 location, World world, Random random, Rotation rotation) {
+        try {
+            return cache.get(location, () -> {
+                StructureBuffer buf = new StructureBuffer(location);
+                buf.setSucceeded(applyBlock(new TerraImplementationArguments(buf, rotation, random, world, 0)));
+                return buf;
+            });
+        } catch(ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    public boolean generate(Buffer buffer, World world, Random random, Rotation rotation, int recursions) {
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) {
+            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, recursions));
+        }
+    }
+
+    @Override
+    @SuppressWarnings("try")
+    public boolean generate(Vector3 location, World world, Random random, Rotation rotation) {
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) {
+            DirectBuffer buffer = new DirectBuffer(location, world);
+            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, world, 0));
+        }
+    }
+
+    @Override
+    public String getID() {
+        return id;
+    }
+
+    private boolean applyBlock(TerraImplementationArguments arguments) {
+        try {
+            return block.apply(arguments).getLevel() != Block.ReturnLevel.FAIL;
+        } catch(RuntimeException e) {
+            main.logger().severe("Failed to generate structure at " + arguments.getBuffer().getOrigin() + ": " + e.getMessage());
+            main.getDebugLogger().stack(e);
+            return false;
+        }
+    }
+}