create TerraScriptAPIAddon

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

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

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

@@ -0,0 +1,26 @@
+package com.dfsek.terra.addons.terrascript.api;
+
+import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.api.lang.Variable;
+import com.dfsek.terra.api.properties.Context;
+
+import java.util.Map;
+
+public interface Function<T> extends Returnable<T> {
+    Function<?> NULL = new Function<Object>() {
+        @Override
+        public ReturnType returnType() {
+            return null;
+        }
+
+        @Override
+        public Object apply(Context context, Map<String, Variable<?>> variableMap) {
+            return null;
+        }
+
+        @Override
+        public Position getPosition() {
+            return null;
+        }
+    };
+}

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

@@ -0,0 +1,14 @@
+package com.dfsek.terra.addons.terrascript.api;
+
+import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
+
+import java.util.List;
+
+public interface FunctionBuilder<T extends Function<?>> {
+    T build(List<Returnable<?>> argumentList, Position position) throws ParseException;
+
+    int argNumber();
+
+    Returnable.ReturnType getArgument(int position);
+}

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.terrascript.tokenizer;
+package com.dfsek.terra.addons.terrascript.api;
 
 public class Position {
     private final int line;

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/TerraProperties.java

@@ -1,13 +1,13 @@
-package com.dfsek.terra.addons.terrascript.script;
+package com.dfsek.terra.addons.terrascript.api;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
+import com.dfsek.terra.api.properties.Properties;
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.world.World;
 
 import java.util.Random;
 
-public class TerraImplementationArguments implements ImplementationArguments {
+public class TerraProperties implements Properties {
     private final Buffer buffer;
     private final Rotation rotation;
     private final Random random;
@@ -15,7 +15,7 @@ public class TerraImplementationArguments implements ImplementationArguments {
     private final int recursions;
     private boolean waterlog = false;
 
-    public TerraImplementationArguments(Buffer buffer, Rotation rotation, Random random, World world, int recursions) {
+    public TerraProperties(Buffer buffer, Rotation rotation, Random random, World world, int recursions) {
         this.buffer = buffer;
         this.rotation = rotation;
         this.random = random;

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

@@ -0,0 +1,16 @@
+package com.dfsek.terra.addons.terrascript.api;
+
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
+
+@Addon("api-terrascript")
+@Version("1.0.0")
+@Author("Terra")
+public class TerraScriptAPIAddon extends TerraAddon {
+    @Override
+    public void initialize() {
+
+    }
+}

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/exception/ParseException.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.addons.terrascript.parser.exceptions;
+package com.dfsek.terra.addons.terrascript.api.exception;
 
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Position;
 
 public class ParseException extends Exception {
     private static final long serialVersionUID = 6744390543046766386L;

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

@@ -1,9 +1,7 @@
-package com.dfsek.terra.addons.terrascript.parser.lang.constants;
+package com.dfsek.terra.addons.terrascript.api.lang;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.Map;
 
@@ -17,7 +15,7 @@ public abstract class ConstantExpression<T> implements Returnable<T> {
     }
 
     @Override
-    public T apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
+    public T apply(Context context, Map<String, Variable<?>> variableMap) {
         return constant;
     }
 

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

@@ -0,0 +1,12 @@
+package com.dfsek.terra.addons.terrascript.api.lang;
+
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.api.properties.Context;
+
+import java.util.Map;
+
+public interface Item<T> {
+    T apply(Context context, Map<String, Variable<?>> variableMap);
+
+    Position getPosition();
+}

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

@@ -0,0 +1,43 @@
+package com.dfsek.terra.addons.terrascript.api.lang;
+
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.api.properties.Context;
+
+import java.util.Map;
+
+public interface Returnable<T> extends Item<T> {
+    ReturnType returnType();
+
+    enum ReturnType {
+        NUMBER(true), STRING(true), BOOLEAN(false), VOID(false), OBJECT(false);
+
+        private final boolean comparable;
+
+        ReturnType(boolean comparable) {
+            this.comparable = comparable;
+        }
+
+        public boolean isComparable() {
+            return comparable;
+        }
+    }
+
+    static <T> Returnable<T> constant(T value, ReturnType type, Position position) {
+        return new Returnable<T>() {
+            @Override
+            public ReturnType returnType() {
+                return type;
+            }
+
+            @Override
+            public T apply(Context context, Map<String, Variable<?>> variableMap) {
+                return value;
+            }
+
+            @Override
+            public Position getPosition() {
+                return position;
+            }
+        };
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.dfsek.terra.addons.terrascript.api.lang;
+
+import com.dfsek.terra.addons.terrascript.api.Position;
+
+public interface Variable<T> {
+    T getValue();
+
+    void setValue(T value);
+
+    Returnable.ReturnType getType();
+
+    Position getPosition();
+}

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java

@@ -20,7 +20,8 @@ import java.util.function.Supplier;
 @Author("Terra")
 @Version("1.0.0")
 public class ImageBiomeProviderAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
 
     @Inject
     private TerraPlugin main;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java

@@ -3,9 +3,9 @@ package com.dfsek.terra.addons.biome.pipeline;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 
 public class BiomeHolderImpl implements BiomeHolder {
     private final Vector2 origin;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.biome.pipeline;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.vector.Vector2;
 
 import java.util.ArrayList;
 import java.util.List;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java

@@ -3,7 +3,6 @@ package com.dfsek.terra.addons.biome.pipeline;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.BiomeProviderLoader;
 import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
@@ -11,6 +10,7 @@ import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorT
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.addon.annotations.Addon;
@@ -22,7 +22,6 @@ import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 
 import java.util.function.Supplier;
 
@@ -31,10 +30,13 @@ import java.util.function.Supplier;
 @Version("1.0.0")
 public class BiomePipelineAddon extends TerraAddon {
 
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
+    };
 
-    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {};
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
+    };
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
     @Inject
     private TerraPlugin main;
 

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.api;
 
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 public interface BiomeHolder {
     BiomeHolder expand(BiomeExpander expander, long seed);

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java

@@ -5,10 +5,10 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.addons.biome.pipeline.BiomePipeline;
 import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 
 import java.util.List;
 

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.addons.biome.pipeline.config;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 
 public class NoiseSourceTemplate extends SourceTemplate {
     @Value("noise")

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java

@@ -2,9 +2,7 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator;

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java

@@ -19,7 +19,8 @@ import java.util.function.Supplier;
 @Author("Terra")
 @Version("1.0.0")
 public class SingleBiomeProviderAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
 
     @Inject
     private TerraPlugin main;

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java

@@ -16,10 +16,10 @@ import com.dfsek.terra.api.world.biome.GenerationSettings;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.ChunkData;
-import com.dfsek.terra.api.world.generator.Palette;
-import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;
 import com.dfsek.terra.api.world.generator.GenerationStage;
+import com.dfsek.terra.api.world.generator.Palette;
+import com.dfsek.terra.api.world.generator.Sampler;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java

@@ -13,10 +13,10 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import java.util.function.Supplier;
 
 public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
+    public static final TypeKey<TerraBiome> BIOME_TYPE_TOKEN = new TypeKey<>() {
+    };
     private final BiomeFactory factory;
 
-    public static final TypeKey<TerraBiome> BIOME_TYPE_TOKEN = new TypeKey<>() {};
-
     public BiomeConfigType(ConfigPack pack) {
         this.factory = new BiomeFactory(pack);
     }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java

@@ -6,7 +6,6 @@ import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.world.generator.Palette;
 
 import java.lang.reflect.AnnotatedType;
-import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 

common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java

@@ -25,7 +25,8 @@ import java.util.function.Supplier;
 @Version("1.0.0")
 @Author("Terra")
 public class DistributorAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<Distributor>>> DISTRIBUTOR_TOKEN = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<Distributor>>> DISTRIBUTOR_TOKEN = new TypeKey<>() {
+    };
     @Inject
     private TerraPlugin main;
 

common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java

@@ -7,6 +7,7 @@ public class NoiseDistributor implements Distributor {
     private final NoiseSampler sampler;
 
     private final double threshold;
+
     public NoiseDistributor(NoiseSampler sampler, double threshold) {
         this.sampler = sampler;
         this.threshold = threshold;

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java

@@ -11,7 +11,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import java.util.function.Supplier;
 
 public class FeatureConfigType implements ConfigType<FeatureTemplate, Feature> {
-    public static final TypeKey<Feature> FEATURE_TYPE_KEY = new TypeKey<>() {};
+    public static final TypeKey<Feature> FEATURE_TYPE_KEY = new TypeKey<>() {
+    };
 
     private final FeatureFactory factory = new FeatureFactory();
 

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.addons.feature;
 
 import com.dfsek.tectonic.annotations.Final;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java

@@ -11,10 +11,10 @@ import com.dfsek.terra.api.world.Flora;
 import java.util.function.Supplier;
 
 public class FloraConfigType implements ConfigType<FloraTemplate, Flora> {
+    public static final TypeKey<Flora> FLORA_TYPE_TOKEN = new TypeKey<>() {
+    };
     private final FloraFactory factory = new FloraFactory();
 
-    public static final TypeKey<Flora> FLORA_TYPE_TOKEN = new TypeKey<>(){};
-
     @Override
     public FloraTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
         return new FloraTemplate();

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.addons.flora.flora.gen;
 
-import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.properties.base.Properties;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java

@@ -34,8 +34,10 @@ import java.util.function.Supplier;
 @Author("Terra")
 public class LocatorAddon extends TerraAddon {
 
-    public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {};
-    public static final TypeKey<Supplier<ObjectTemplate<Pattern>>> PATTERN_TOKEN = new TypeKey<>() {};
+    public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {
+    };
+    public static final TypeKey<Supplier<ObjectTemplate<Pattern>>> PATTERN_TOKEN = new TypeKey<>() {
+    };
     @Inject
     private TerraPlugin main;
 

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java

@@ -4,7 +4,6 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.structure.feature.Locator;
 

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java

@@ -3,7 +3,6 @@ package com.dfsek.terra.addons.feature.locator.config;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 import com.dfsek.terra.addons.feature.locator.locators.RandomLocator;
-import com.dfsek.terra.addons.feature.locator.locators.SurfaceLocator;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern;
+import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.Range;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern;
+import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.MaterialSet;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern;
+import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.Range;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern;
+import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.util.Range;
 
 public class SolidMatchPatternTemplate implements ObjectTemplate<Pattern> {

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java

@@ -6,9 +6,6 @@ import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class PatternLocator implements Locator {
     private final Pattern pattern;
     private final Range search;

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java

@@ -5,8 +5,6 @@ import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 
 public class RandomLocator implements Locator {

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java

@@ -7,8 +7,6 @@ import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;
 
-import java.util.Collections;
-
 public class SurfaceLocator implements Locator {
     private final Range search;
 

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.addons.feature.locator.patterns;
 
-import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.Column;

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java

@@ -45,11 +45,11 @@ import java.util.function.Supplier;
 @Author("Terra")
 @Version("1.0.0")
 public class NoiseAddon extends TerraAddon {
+    public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {
+    };
     @Inject
     private TerraPlugin plugin;
 
-    public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {};
-
     @Override
     public void initialize() {
         plugin.getEventManager()

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java

@@ -5,7 +5,6 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
 import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public abstract class NoiseTemplate<T extends NoiseFunction> extends SamplerTemplate<T> {

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java

@@ -3,7 +3,6 @@ package com.dfsek.terra.addons.noise.config.templates.noise;
 import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 public class SimpleNoiseTemplate extends NoiseTemplate<NoiseFunction> {

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise.paralithic.noise;
 
 import com.dfsek.paralithic.functions.dynamic.Context;
 import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
-import com.dfsek.terra.addons.noise.util.HashMapDoubleDouble;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java

@@ -23,10 +23,6 @@ public abstract class NoiseFunction implements NoiseSampler {
 
     protected long salt;
 
-    public void setSalt(long salt) {
-        this.salt = salt;
-    }
-
     public NoiseFunction() {
         this.salt = 0;
     }
@@ -119,6 +115,10 @@ public abstract class NoiseFunction implements NoiseSampler {
         return sinLookup((int) ((a + Math.PI / 2) * precision + 0.5f));
     }
 
+    public void setSalt(long salt) {
+        this.salt = salt;
+    }
+
     public double getFrequency() {
         return frequency;
     }

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java

@@ -11,8 +11,9 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import java.util.function.Supplier;
 
 public class OreConfigType implements ConfigType<OreTemplate, Ore> {
+    public static final TypeKey<Ore> ORE_TYPE_TOKEN = new TypeKey<>() {
+    };
     private final OreFactory factory = new OreFactory();
-    public static final TypeKey<Ore> ORE_TYPE_TOKEN = new TypeKey<>(){};
 
     @Override
     public OreTemplate getTemplate(ConfigPack pack, TerraPlugin main) {

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java

@@ -14,11 +14,11 @@ import com.dfsek.terra.api.world.generator.Palette;
 import java.util.function.Supplier;
 
 public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
+    public static final TypeKey<Palette> PALETTE_TYPE_TOKEN = new TypeKey<>() {
+    };
     private final PaletteFactory factory = new PaletteFactory();
     private final TerraPlugin main;
 
-    public static final TypeKey<Palette> PALETTE_TYPE_TOKEN = new TypeKey<>(){};
-
     public PaletteConfigType(TerraPlugin main) {
         this.main = main;
     }

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java

@@ -7,7 +7,6 @@ import com.dfsek.terra.api.world.generator.Palette;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 /**
  * A class representation of a "slice" of the world.

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.structure;
 
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 

common/addons/structure-terrascript-functions/build.gradle.kts

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly(project(":common:addons:api-terrascript"))
+    testImplementation(project(":common:addons:api-terrascript"))
+}

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

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.lang.Variable;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.List;
 import java.util.Map;
@@ -29,8 +29,8 @@ public class BinaryNumberFunctionBuilder implements FunctionBuilder<Function<Num
 
             @SuppressWarnings("unchecked")
             @Override
-            public Number apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-                return function.apply(((Returnable<Number>) argumentList.get(0)).apply(implementationArguments, variableMap), ((Returnable<Number>) argumentList.get(1)).apply(implementationArguments, variableMap));
+            public Number apply(Context context, Map<String, Variable<?>> variableMap) {
+                return function.apply(((Returnable<Number>) argumentList.get(0)).apply(context, variableMap), ((Returnable<Number>) argumentList.get(1)).apply(context, variableMap));
             }
 
             @Override

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.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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,12 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.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.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.BlockFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.ConstantExpression;
+import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.functions.BlockFunction;
 import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
@@ -22,10 +21,10 @@ 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 = Returnable.constant(true, Returnable.ReturnType.BOOLEAN, 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.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
-import com.dfsek.terra.addons.terrascript.script.functions.LootFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.PullFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.StateFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+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.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,12 +1,12 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.lang.Variable;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.List;
 import java.util.Map;
@@ -14,9 +14,9 @@ import java.util.function.BiConsumer;
 
 public class UnaryBooleanFunctionBuilder implements FunctionBuilder<Function<Void>> {
 
-    private final BiConsumer<Boolean, TerraImplementationArguments> function;
+    private final BiConsumer<Boolean, TerraProperties> function;
 
-    public UnaryBooleanFunctionBuilder(BiConsumer<Boolean, TerraImplementationArguments> function) {
+    public UnaryBooleanFunctionBuilder(BiConsumer<Boolean, TerraProperties> function) {
         this.function = function;
     }
 
@@ -30,8 +30,8 @@ public class UnaryBooleanFunctionBuilder implements FunctionBuilder<Function<Voi
 
             @SuppressWarnings("unchecked")
             @Override
-            public Void apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-                function.accept(((Returnable<Boolean>) argumentList.get(0)).apply(implementationArguments, variableMap), (TerraImplementationArguments) implementationArguments);
+            public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+                function.accept(((Returnable<Boolean>) argumentList.get(0)).apply(context, variableMap), context.get(TerraProperties.class));
                 return null;
             }
 

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

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.lang.Variable;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.List;
 import java.util.Map;
@@ -28,8 +28,8 @@ public class UnaryNumberFunctionBuilder implements FunctionBuilder<Function<Numb
 
             @SuppressWarnings("unchecked")
             @Override
-            public Number apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-                return function.apply(((Returnable<Number>) argumentList.get(0)).apply(implementationArguments, variableMap));
+            public Number apply(Context context, Map<String, Variable<?>> variableMap) {
+                return function.apply(((Returnable<Number>) argumentList.get(0)).apply(context, variableMap));
             }
 
             @Override

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

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.lang.Variable;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.List;
 import java.util.Map;
@@ -28,8 +28,8 @@ public class UnaryStringFunctionBuilder implements FunctionBuilder<Function<Void
 
             @SuppressWarnings("unchecked")
             @Override
-            public Void apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-                function.accept(((Returnable<String>) argumentList.get(0)).apply(implementationArguments, variableMap));
+            public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+                function.accept(((Returnable<String>) argumentList.get(0)).apply(context, variableMap));
                 return null;
             }
 

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

@@ -1,21 +1,21 @@
-package com.dfsek.terra.addons.terrascript.script.builders;
+package com.dfsek.terra.addons.terrascript.builders;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.lang.Variable;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.List;
 import java.util.Map;
 
 public class ZeroArgFunctionBuilder<T> implements FunctionBuilder<Function<T>> {
-    private final java.util.function.Function<TerraImplementationArguments, T> function;
+    private final java.util.function.Function<TerraProperties, T> function;
     private final Returnable.ReturnType type;
 
-    public ZeroArgFunctionBuilder(java.util.function.Function<TerraImplementationArguments, T> function, Returnable.ReturnType type) {
+    public ZeroArgFunctionBuilder(java.util.function.Function<TerraProperties, T> function, Returnable.ReturnType type) {
         this.function = function;
         this.type = type;
     }
@@ -29,8 +29,8 @@ public class ZeroArgFunctionBuilder<T> implements FunctionBuilder<Function<T>> {
             }
 
             @Override
-            public T apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-                return function.apply((TerraImplementationArguments) implementationArguments);
+            public T apply(Context context, Map<String, Variable<?>> variableMap) {
+                return function.apply(context.get(TerraProperties.class));
             }
 
             @Override

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

@@ -0,0 +1,55 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.api.lang.Variable;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import net.jafama.FastMath;
+
+import java.util.Map;
+
+public class BiomeFunction implements Function<String> {
+    private final TerraPlugin main;
+    private final Returnable<Number> x, y, z;
+    private final Position position;
+
+
+    public BiomeFunction(TerraPlugin main, Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Position position) {
+        this.main = main;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.position = position;
+    }
+
+
+    @Override
+    public String apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties properties = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+
+        RotationUtil.rotateVector(xz, properties.getRotation());
+
+        BiomeProvider grid = properties.getWorld().getBiomeProvider();
+
+        return grid.getBiome(properties.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).intValue(), FastMath.roundToInt(xz.getZ()))), properties.getWorld().getSeed()).getID();
+    }
+
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.STRING;
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.items.BufferedBlock;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import net.jafama.FastMath;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BlockFunction implements Function<Void> {
+    protected final Returnable<Number> x, y, z;
+    protected final Returnable<String> blockData;
+    protected final TerraPlugin main;
+    private final Map<String, BlockState> data = new HashMap<>();
+    private final Returnable<Boolean> overwrite;
+    private final Position position;
+
+    public BlockFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> blockData, Returnable<Boolean> overwrite, TerraPlugin main, Position position) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.blockData = blockData;
+        this.overwrite = overwrite;
+        this.main = main;
+        this.position = position;
+    }
+
+    void setBlock(Context context, Map<String, Variable<?>> variableMap, TerraProperties arguments, BlockState rot) {
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+
+        RotationUtil.rotateVector(xz, arguments.getRotation());
+
+        RotationUtil.rotateBlockData(rot, arguments.getRotation().inverse());
+        arguments.getBuffer().addItem(new BufferedBlock(rot, overwrite.apply(context, variableMap), main, arguments.isWaterlog()), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())));
+    }
+
+    @Override
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        BlockState rot = getBlockState(context, variableMap).clone();
+        setBlock(context, variableMap, arguments, rot);
+        return null;
+    }
+
+    protected BlockState getBlockState(Context context, Map<String, Variable<?>> variableMap) {
+        return data.computeIfAbsent(blockData.apply(context, variableMap), main.getWorldHandle()::createBlockData);
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.VOID;
+    }
+
+    public static class Constant extends BlockFunction {
+        private final BlockState state;
+
+        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());
+        }
+
+        @Override
+        protected BlockState getBlockState(Context arguments, Map<String, Variable<?>> variableMap) {
+            return state;
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import net.jafama.FastMath;
+
+import java.util.Map;
+
+public class CheckBlockFunction implements Function<String> {
+    private final Returnable<Number> x, y, z;
+    private final Position position;
+
+    public CheckBlockFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Position position) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.position = position;
+    }
+
+
+    @Override
+    public String apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties properties = context.get(TerraProperties.class);
+
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+
+        RotationUtil.rotateVector(xz, properties.getRotation());
+
+        String data = properties.getWorld().getBlockData(properties.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())))).getAsString();
+        if(data.contains("[")) return data.substring(0, data.indexOf('[')); // Strip properties
+        else return data;
+    }
+
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.STRING;
+    }
+}

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/CheckFunction.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.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.TerraProperties;
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
@@ -31,17 +31,17 @@ public class CheckFunction implements Function<String> {
 
 
     @Override
-    public String apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
+    public String apply(Context context, Map<String, Variable<?>> variableMap) {
 
 
-        TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments;
+        TerraProperties arguments = context.get(TerraProperties.class);
 
 
-        Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), z.apply(implementationArguments, variableMap).doubleValue());
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
 
-        Vector3 location = arguments.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())));
+        Vector3 location = arguments.getBuffer().getOrigin().clone().add(new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())));
 
         return apply(location, arguments.getWorld());
     }
@@ -57,7 +57,8 @@ public class CheckFunction implements Function<String> {
         //BiomeProvider provider = tw.getBiomeProvider();
         //TerraBiome b = provider.getBiome(vector.getBlockX(), vector.getBlockZ());
 
-        /*if(vector.getY() > c.getSeaLevel())*/ return "AIR"; // Above sea level
+        /*if(vector.getY() > c.getSeaLevel())*/
+        return "AIR"; // Above sea level
         //return "OCEAN"; // Below sea level
     }
 

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

@@ -1,16 +1,16 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity;
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.items.BufferedEntity;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
@@ -35,13 +35,13 @@ public class EntityFunction implements Function<Void> {
     }
 
     @Override
-    public Void apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-        TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments;
-        Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), z.apply(implementationArguments, variableMap).doubleValue());
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
 
-        arguments.getBuffer().addItem(new BufferedEntity(data, main), new Vector3(xz.getX(), y.apply(implementationArguments, variableMap).doubleValue(), xz.getZ()));
+        arguments.getBuffer().addItem(new BufferedEntity(data, main), new Vector3(xz.getX(), y.apply(context, variableMap).doubleValue(), xz.getZ()));
         return null;
     }
 

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

@@ -0,0 +1,46 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import net.jafama.FastMath;
+
+import java.util.Map;
+
+public class GetMarkFunction implements Function<String> {
+    private final Returnable<Number> x, y, z;
+    private final Position position;
+
+    public GetMarkFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Position position) {
+        this.position = position;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    @Override
+    public String apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+
+        RotationUtil.rotateVector(xz, arguments.getRotation());
+        String mark = arguments.getBuffer().getMark(new Vector3(FastMath.floorToInt(xz.getX()), FastMath.floorToInt(y.apply(context, variableMap).doubleValue()), FastMath.floorToInt(xz.getZ())));
+        return mark == null ? "" : mark;
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.STRING;
+    }
+}

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/LootFunction.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.buffer.items.BufferedLootApplication;
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.items.BufferedLootApplication;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.util.RotationUtil;
@@ -38,13 +38,13 @@ public class LootFunction implements Function<Void> {
     }
 
     @Override
-    public Void apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-        TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments;
-        Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), z.apply(implementationArguments, variableMap).doubleValue());
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
 
-        String id = data.apply(implementationArguments, variableMap);
+        String id = data.apply(context, variableMap);
         LootTable table = registry.get(id);
 
         if(table == null) {
@@ -52,7 +52,7 @@ public class LootFunction implements Function<Void> {
             return null;
         }
 
-        arguments.getBuffer().addItem(new BufferedLootApplication(table, main, script), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), FastMath.roundToInt(xz.getZ())));
+        arguments.getBuffer().addItem(new BufferedLootApplication(table, main, script), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).intValue(), FastMath.roundToInt(xz.getZ())));
         return null;
     }
 

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

@@ -1,16 +1,16 @@
-package com.dfsek.terra.addons.terrascript.script.functions;
+package com.dfsek.terra.addons.terrascript.functions;
 
-import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock;
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.items.BufferedPulledBlock;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
@@ -34,14 +34,14 @@ public class PullFunction implements Function<Void> {
     }
 
     @Override
-    public Void apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-        TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments;
-        Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), z.apply(implementationArguments, variableMap).doubleValue());
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
         BlockState rot = data.clone();
         RotationUtil.rotateBlockData(rot, arguments.getRotation().inverse());
-        arguments.getBuffer().addItem(new BufferedPulledBlock(rot), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), FastMath.roundToInt(xz.getZ())));
+        arguments.getBuffer().addItem(new BufferedPulledBlock(rot), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).intValue(), FastMath.roundToInt(xz.getZ())));
         return null;
     }
 

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

@@ -0,0 +1,36 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
+
+import java.util.Map;
+
+public class RandomFunction implements Function<Integer> {
+    private final Returnable<Number> numberReturnable;
+    private final Position position;
+
+    public RandomFunction(Returnable<Number> numberReturnable, Position position) {
+        this.numberReturnable = numberReturnable;
+        this.position = position;
+    }
+
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.NUMBER;
+    }
+
+    @Override
+    public Integer apply(Context context, Map<String, Variable<?>> variableMap) {
+        return context.get(TerraProperties.class).getRandom().nextInt(numberReturnable.apply(context, variableMap).intValue());
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.Variable;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
+
+import java.util.Map;
+
+public class RecursionsFunction implements Function<Number> {
+    private final Position position;
+
+    public RecursionsFunction(Position position) {
+        this.position = position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.NUMBER;
+    }
+
+    @Override
+    public Number apply(Context context, Map<String, Variable<?>> variableMap) {
+        return context.get(TerraProperties.class).getRecursions();
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.TerraProperties;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import net.jafama.FastMath;
+
+import java.util.Map;
+
+public class SetMarkFunction implements Function<Void> {
+    private final Returnable<Number> x, y, z;
+    private final Position position;
+    private final Returnable<String> mark;
+
+    public SetMarkFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> mark, Position position) {
+        this.position = position;
+        this.mark = mark;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    @Override
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+
+        RotationUtil.rotateVector(xz, arguments.getRotation());
+
+        arguments.getBuffer().setMark(mark.apply(context, variableMap), new Vector3(FastMath.floorToInt(xz.getX()), FastMath.floorToInt(y.apply(context, variableMap).doubleValue()), FastMath.floorToInt(xz.getZ())));
+        return null;
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.VOID;
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.dfsek.terra.addons.terrascript.functions;
+
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.items.BufferedStateManipulator;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.util.RotationUtil;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.vector.Vector3;
+import net.jafama.FastMath;
+
+import java.util.Map;
+
+public class StateFunction implements Function<Void> {
+    private final Returnable<String> data;
+    private final Returnable<Number> x, y, z;
+    private final Position position;
+    private final TerraPlugin main;
+
+    public StateFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> data, TerraPlugin main, Position position) {
+        this.position = position;
+        this.main = main;
+        this.data = data;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    @Override
+    public Void apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
+        RotationUtil.rotateVector(xz, arguments.getRotation());
+
+        arguments.getBuffer().addItem(new BufferedStateManipulator(main, data.apply(context, variableMap)), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).intValue(), FastMath.roundToInt(xz.getZ())));
+        return null;
+    }
+
+    @Override
+    public Position getPosition() {
+        return position;
+    }
+
+    @Override
+    public ReturnType returnType() {
+        return ReturnType.VOID;
+    }
+}

common/addons/structure-terrascript-functions/src/main/java/com/dfsek/terra/addons/terrascript/functions/StructureFunction.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.buffer.IntermediateBuffer;
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.api.buffer.IntermediateBuffer;
+import com.dfsek.terra.addons.terrascript.api.TerraProperties;
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
@@ -44,17 +44,17 @@ public class StructureFunction implements Function<Boolean> {
     }
 
     @Override
-    public Boolean apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
-        TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments;
+    public Boolean apply(Context context, Map<String, Variable<?>> variableMap) {
+        TerraProperties arguments = context.get(TerraProperties.class);
 
         if(arguments.getRecursions() > main.getTerraConfig().getMaxRecursion())
             throw new RuntimeException("Structure recursion too deep: " + arguments.getRecursions());
 
-        Vector2 xz = new Vector2(x.apply(implementationArguments, variableMap).doubleValue(), z.apply(implementationArguments, variableMap).doubleValue());
+        Vector2 xz = new Vector2(x.apply(context, variableMap).doubleValue(), z.apply(context, variableMap).doubleValue());
 
         RotationUtil.rotateVector(xz, arguments.getRotation());
 
-        String app = id.apply(implementationArguments, variableMap);
+        String app = id.apply(context, variableMap);
         Structure script = registry.get(app);
         if(script == null) {
             main.logger().severe("No such structure " + app);
@@ -62,7 +62,7 @@ public class StructureFunction implements Function<Boolean> {
         }
 
         Rotation rotation1;
-        String rotString = rotations.get(arguments.getRandom().nextInt(rotations.size())).apply(implementationArguments, variableMap);
+        String rotString = rotations.get(arguments.getRandom().nextInt(rotations.size())).apply(context, variableMap);
         try {
             rotation1 = Rotation.valueOf(rotString);
         } catch(IllegalArgumentException e) {
@@ -70,7 +70,7 @@ public class StructureFunction implements Function<Boolean> {
             return null;
         }
 
-        Vector3 offset = new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ()));
+        Vector3 offset = new Vector3(FastMath.roundToInt(xz.getX()), y.apply(context, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ()));
 
         return script.generate(new IntermediateBuffer(arguments.getBuffer(), offset), arguments.getWorld(), arguments.getRandom(), arguments.getRotation().rotate(rotation1), arguments.getRecursions() + 1);
     }

common/addons/structure-terrascript-loader/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 
 dependencies {
     "shadedApi"("commons-io:commons-io:2.6")
+    compileOnly(project(":common:addons:api-terrascript"))
+    testImplementation(project(":common:addons:api-terrascript"))
 }
 
 tasks.named<ShadowJar>("shadowJar") {

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

@@ -1,12 +1,13 @@
 package com.dfsek.terra.addons.terrascript;
 
 import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.script.StructureScript;
+import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+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;
 import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Depends;
 import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
@@ -21,6 +22,7 @@ import java.util.Map;
 @Addon("structure-terrascript-loader")
 @Author("Terra")
 @Version("1.0.0")
+@Depends("api-terrascript")
 public class TerraScriptAddon extends TerraAddon {
     @Inject
     private TerraPlugin main;
@@ -36,7 +38,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

@@ -1,16 +1,17 @@
 package com.dfsek.terra.addons.terrascript.parser;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
+import com.dfsek.terra.addons.terrascript.api.Function;
+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.Item;
+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.Item;
 import com.dfsek.terra.addons.terrascript.parser.lang.Keyword;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 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.functions.Function;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.BreakKeyword;
 import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.ContinueKeyword;
 import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.FailKeyword;
@@ -38,7 +39,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.NotE
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Assignment;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Declaration;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Getter;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.addons.terrascript.tokenizer.Token;
 import com.dfsek.terra.addons.terrascript.tokenizer.Tokenizer;
 

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.api.exception.ParseException;
+import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Token;
 
 import java.util.Arrays;

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

@@ -1,7 +1,9 @@
 package com.dfsek.terra.addons.terrascript.parser.lang;
 
-import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.addons.terrascript.api.Position;
+import com.dfsek.terra.addons.terrascript.api.lang.Item;
+import com.dfsek.terra.addons.terrascript.api.lang.Variable;
+import com.dfsek.terra.api.properties.Context;
 
 import java.util.HashMap;
 import java.util.List;
@@ -20,15 +22,15 @@ public class Block implements Item<Block.ReturnInfo<?>> {
         return items;
     }
 
-    public ReturnInfo<?> apply(ImplementationArguments implementationArguments) {
-        return apply(implementationArguments, new HashMap<>());
+    public ReturnInfo<?> apply(Context context) {
+        return apply(context, new HashMap<>());
     }
 
     @Override
-    public ReturnInfo<?> apply(ImplementationArguments implementationArguments, Map<String, Variable<?>> variableMap) {
+    public ReturnInfo<?> apply(Context context, Map<String, Variable<?>> variableMap) {
         Map<String, Variable<?>> scope = new HashMap<>(variableMap);
         for(Item<?> item : items) {
-            Object result = item.apply(implementationArguments, scope);
+            Object result = item.apply(context, scope);
             if(result instanceof ReturnInfo) {
                 ReturnInfo<?> level = (ReturnInfo<?>) result;
                 if(!level.getLevel().equals(ReturnLevel.NONE)) return level;