Autoformat

Also removes legacy v1 code from v2

README.md

@@ -47,14 +47,7 @@ JARs are produced in `platforms/<platform>/build/libs`.
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
 
 * Bukkit
-    * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test
-      server. (Only needs to be run once).
-    * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur)
-      test server. (Only needs to be run once).
-    * `runPaper` - Run the Paper test server with Terra (`installPaper` must
-      have been run previously).
-    * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must
-      have been run previously).
+    * `runServer` - Run the Paper test server with Terra installed.
 * Fabric
     * `runClient` - Run a Minecraft Fabric client with Terra installed.
     * `runServer` - Run a Minecraft Fabric server with Terra installed.

buildSrc/build.gradle.kts

@@ -3,15 +3,6 @@ plugins {
     kotlin("jvm") version embeddedKotlinVersion
 }
 
-buildscript {
-    configurations.all {
-        resolutionStrategy {
-            force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version
-            force("org.ow2.asm:asm-commons:9.3")
-        }
-    }
-}
-
 repositories {
     mavenCentral()
     gradlePluginPortal()
@@ -24,11 +15,12 @@ repositories {
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    //TODO Allow pulling from Versions.kt
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin","1.5.6")
     
-    implementation("org.ow2.asm:asm:9.3")
-    implementation("org.ow2.asm:asm-tree:9.3")
-    implementation("com.dfsek.tectonic:common:4.2.0")
-    implementation("org.yaml:snakeyaml:1.27")
+    implementation("org.ow2.asm", "asm", "9.5")
+    implementation("org.ow2.asm", "asm-tree", "9.5")
+    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("org.yaml", "snakeyaml", "2.2")
 }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -48,6 +48,9 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
+        maven("https://nexuslite.gcnt.net/repos/other/") {
+            name = "GCNT"
+        }
     }
     
     dependencies {
@@ -58,4 +61,4 @@ fun Project.configureDependencies() {
         compileOnly("com.google.guava:guava:30.0-jre")
         testImplementation("com.google.guava:guava:30.0-jre")
     }
-}
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,68 +1,71 @@
 object Versions {
     object Libraries {
-        const val tectonic = "4.2.0"
-        const val paralithic = "0.7.0"
-        const val strata = "1.1.1"
+        const val tectonic = "4.2.1"
+        const val paralithic = "0.7.1"
+        const val strata = "1.3.2"
         
-        const val cloud = "1.8.0"
+        const val cloud = "1.8.4"
         
-        const val slf4j = "1.7.36"
-        const val log4j_slf4j_impl = "2.14.1"
+        const val slf4j = "2.0.9"
+        const val log4j_slf4j_impl = "2.20.0"
         
         object Internal {
-            const val apacheText = "1.9"
+            const val shadow = "8.1.1"
+            const val apacheText = "1.10.0"
             const val jafama = "2.3.2"
-            const val apacheIO = "2.6"
-            const val fastutil = "8.5.6"
+            const val apacheIO = "2.14.0"
+            const val guava = "32.1.3-jre"
+            const val asm = "9.5"
+            const val snakeYml = "2.2"
         }
     }
     
     object Fabric {
-        const val fabricLoader = "0.14.8"
-        const val fabricAPI = "0.83.1+1.20.1"
-    }
-    
-    object Quilt {
-        const val quiltLoader = "0.17.0"
-        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
+        const val fabricAPI = "0.90.0+${Mod.minecraft}"
     }
+//
+//    object Quilt {
+//        const val quiltLoader = "0.20.2"
+//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
+//    }
     
     object Mod {
-        const val mixin = "0.11.2+mixin.0.8.5"
+        const val mixin = "0.12.5+mixin.0.8.5"
         
-        const val minecraft = "1.20.1"
-        const val yarn = "$minecraft+build.2"
-        const val fabricLoader = "0.14.21"
+        const val minecraft = "1.20.2"
+        const val yarn = "$minecraft+build.4"
+        const val fabricLoader = "0.14.23"
         
-        const val architecuryLoom = "0.12.0.290"
-        const val architecturyPlugin = "3.4-SNAPSHOT"
+        const val architecuryLoom = "1.3.357"
+        const val architecturyPlugin = "3.4.146"
         
-        const val loomQuiltflower = "1.7.1"
+        const val loomVineflower = "1.11.0"
     }
     
     object Forge {
-        const val forge = "${Mod.minecraft}-47.0.3"
-        const val burningwave = "12.53.0"
+        const val forge = "${Mod.minecraft}-48.0.13"
+        const val burningwave = "12.63.0"
     }
     
     object Bukkit {
         const val paper = "1.18.2-R0.1-SNAPSHOT"
         const val paperLib = "1.0.5"
-        const val minecraft = "1.20.1"
+        const val foliaLib = "0.2.5"
+        const val minecraft = "1.20.2"
         const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
+        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
+        const val runPaper = "2.2.0"
+        const val paperWeight = "1.5.6"
     }
-    
-    object Sponge {
-        const val sponge = "9.0.0-SNAPSHOT"
-        const val mixin = "0.8.2"
-        const val minecraft = "1.17.1"
-    }
-    
+//
+//    object Sponge {
+//        const val sponge = "9.0.0-SNAPSHOT"
+//        const val mixin = "0.8.2"
+//        const val minecraft = "1.17.1"
+//    }
+//
     object CLI {
         const val nbt = "6.1"
-        const val logback = "1.2.9"
-        const val commonsIO = "2.7"
-        const val guava = "31.0.1-jre"
+        const val logback = "1.4.11"
     }
 }

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

@@ -50,6 +50,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
                                               () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
                 })
                 .failThrough();
-        logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
+        if(platform.getTerraConfig().isDebugLog())
+            logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
     }
 }

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

@@ -90,6 +90,7 @@ public class BiomePipelineAddon implements AddonInitializer {
                     event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
                 });
         
-        logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead.");
+        if(platform.getTerraConfig().isDebugLog())
+            logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead.");
     }
 }

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

@@ -22,7 +22,7 @@ public class TopLocator implements Locator {
     
     @Override
     public BinaryColumn getSuitableCoordinates(Column<?> column) {
-        for(int y : search) {
+        for(int y = search.getMax(); y >= search.getMin(); y--) {
             if(column.getBlock(y).isAir() && !column.getBlock(y - 1).isAir()) {
                 return new BinaryColumn(y, y + 1, yi -> true);
             }

common/addons/config-number-predicate/build.gradle.kts

@@ -0,0 +1,13 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+}
+
+
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.numberpredicate.lib.paralithic")
+}

common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/DoublePredicateLoader.java

@@ -0,0 +1,34 @@
+package com.dfsek.terra.addons.numberpredicate;
+
+import com.dfsek.paralithic.Expression;
+import com.dfsek.paralithic.eval.parser.Parser;
+import com.dfsek.paralithic.eval.parser.Scope;
+import com.dfsek.paralithic.eval.tokenizer.ParseException;
+import com.dfsek.tectonic.api.depth.DepthTracker;
+import com.dfsek.tectonic.api.exception.LoadException;
+import com.dfsek.tectonic.api.loader.ConfigLoader;
+import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.AnnotatedType;
+import java.util.function.DoublePredicate;
+
+
+public class DoublePredicateLoader implements TypeLoader<DoublePredicate> {
+    @Override
+    public DoublePredicate load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader,
+                                DepthTracker depthTracker) throws LoadException {
+        if (o instanceof String expressionString) {
+            Scope scope = new Scope();
+            scope.addInvocationVariable("value");
+            try {
+                Expression expression = new Parser().parse(expressionString, scope);
+                return d -> expression.evaluate(d) != 0; // Paralithic expressions treat '!= 0' as true
+            } catch(ParseException e) {
+                throw new LoadException("Failed to parse double predicate expression", e, depthTracker);
+            }
+        } else {
+            throw new LoadException("Double predicates must be defined as a string. E.g. 'value > 3'", depthTracker);
+        }
+    }
+}

common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.numberpredicate;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.DoublePredicate;
+import java.util.function.Supplier;
+
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+
+public class NumberPredicateAddon implements AddonInitializer {
+    
+    @Inject
+    private Platform plugin;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        plugin.getEventManager()
+              .getHandler(FunctionalEventHandler.class)
+              .register(addon, ConfigPackPreLoadEvent.class)
+              .then(event -> event.getPack().applyLoader(DoublePredicate.class, new DoublePredicateLoader()))
+              .priority(50)
+              .failThrough();
+    }
+}

common/addons/config-number-predicate/src/main/resources/terra.addon.yml

@@ -0,0 +1,12 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: config-number-predicate
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addons.numberpredicate.NumberPredicateAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-ore-v2/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2021 Polyhedral Development
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

common/addons/config-ore-v2/README.md

@@ -0,0 +1,3 @@
+# config-ore-v2
+
+Registers the default configuration for Terra Ores, `ORE`.

common/addons/config-ore-v2/build.gradle.kts

@@ -0,0 +1,11 @@
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+}
+
+tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+    relocate("net.jafama", "com.dfsek.terra.addons.ore.lib.jafama")
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.ore.v2;
+
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+
+
+public class OreAddon implements AddonInitializer {
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1))
+                .failThrough();
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.ore.v2;
+
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.config.ConfigFactory;
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.config.ConfigType;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+
+
+public class OreConfigType implements ConfigType<OreTemplate, Structure> {
+    public static final TypeKey<Structure> ORE_TYPE_TOKEN = new TypeKey<>() {
+    };
+    private final OreFactory factory = new OreFactory();
+    
+    @Override
+    public OreTemplate getTemplate(ConfigPack pack, Platform platform) {
+        return new OreTemplate();
+    }
+    
+    @Override
+    public ConfigFactory<OreTemplate, Structure> getFactory() {
+        return factory;
+    }
+    
+    @Override
+    public TypeKey<Structure> getTypeKey() {
+        return ORE_TYPE_TOKEN;
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.ore.v2;
+
+import com.dfsek.terra.addons.ore.v2.ores.VanillaOre;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.config.ConfigFactory;
+import com.dfsek.terra.api.structure.Structure;
+
+
+public class OreFactory implements ConfigFactory<OreTemplate, Structure> {
+    @Override
+    public VanillaOre build(OreTemplate config, Platform platform) {
+        BlockState m = config.getMaterial();
+        return new VanillaOre(m, config.getSize(), config.getReplaceable(), config.doPhysics(), config.isExposed(),
+                              config.getMaterialOverrides());
+    }
+}

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.ore.v2;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Final;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.config.AbstractableTemplate;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.collection.MaterialSet;
+
+
+@SuppressWarnings({ "unused", "FieldMayBeFinal" })
+public class OreTemplate implements AbstractableTemplate {
+    @Value("id")
+    @Final
+    private String id;
+    
+    @Value("material")
+    private @Meta BlockState material;
+    
+    @Value("material-overrides")
+    @Default
+    private @Meta Map<@Meta BlockType, @Meta BlockState> materials = new HashMap<>();
+    
+    @Value("replace")
+    private @Meta MaterialSet replaceable;
+    
+    @Value("physics")
+    @Default
+    private @Meta boolean physics = false;
+    
+    @Value("size")
+    private @Meta double size;
+    
+    @Value("exposed")
+    @Default
+    @Description("The chance that ore blocks bordering air will be discarded as candidates for ore. 0 = 0%, 1 = 100%")
+    private @Meta double exposed = 0.0f;
+    
+    public boolean doPhysics() {
+        return physics;
+    }
+    
+    public double getSize() {
+        return size;
+    }
+    
+    public BlockState getMaterial() {
+        return material;
+    }
+    
+    public MaterialSet getReplaceable() {
+        return replaceable;
+    }
+    
+    public String getID() {
+        return id;
+    }
+    
+    public Map<BlockType, BlockState> getMaterialOverrides() {
+        return materials;
+    }
+    
+    public double isExposed() {
+        return exposed;
+    }
+}

common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java

@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.ore.v2.ores;
+
+import net.jafama.FastMath;
+
+import java.util.BitSet;
+import java.util.Map;
+import java.util.Random;
+
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.util.Rotation;
+import com.dfsek.terra.api.util.collection.MaterialSet;
+import com.dfsek.terra.api.util.vector.Vector3Int;
+import com.dfsek.terra.api.world.WritableWorld;
+
+
+public class VanillaOre implements Structure {
+    
+    private final BlockState material;
+    
+    private final double size;
+    private final MaterialSet replaceable;
+    private final boolean applyGravity;
+    private final double exposed;
+    private final Map<BlockType, BlockState> materials;
+    
+    public VanillaOre(BlockState material, double size, MaterialSet replaceable, boolean applyGravity,
+                      double exposed, Map<BlockType, BlockState> materials) {
+        this.material = material;
+        this.size = size;
+        this.replaceable = replaceable;
+        this.applyGravity = applyGravity;
+        this.exposed = exposed;
+        this.materials = materials;
+    }
+    
+    protected static boolean shouldNotDiscard(Random random, double chance) {
+        if(chance <= 0.0F) {
+            return true;
+        } else if(chance >= 1.0F) {
+            return false;
+        } else {
+            return random.nextFloat() >= chance;
+        }
+    }
+    
+    public static double lerp(double t, double v0, double v1) {
+        return v0 + t * (v1 - v0);
+    }
+    
+    @Override
+    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+        float randomRadian = random.nextFloat() * (float) Math.PI;
+        double eigthSize = size / 8.0F;
+        
+        // Place points to form a line segment
+        double startX = (double) location.getX() + FastMath.sin(randomRadian) * eigthSize;
+        double endX = (double) location.getX() - FastMath.sin(randomRadian) * eigthSize;
+        
+        double startZ = (double) location.getZ() + FastMath.cos(randomRadian) * eigthSize;
+        double endZ = (double) location.getZ() - FastMath.cos(randomRadian) * eigthSize;
+        
+        double startY = location.getY() + random.nextInt(3) - 2;
+        double endY = location.getY() + random.nextInt(3) - 2;
+        
+        int sizeInt = (int) size;
+        double[] points = new double[sizeInt * 4];
+        
+        // Compute initial point positions and radius
+        for(int i = 0; i < sizeInt; ++i) {
+            float t = (float) i / (float) sizeInt;
+            double xt = lerp(t, startX, endX);
+            double yt = lerp(t, startY, endY);
+            double zt = lerp(t, startZ, endZ);
+            double roll = random.nextDouble() * size / 16.0;
+            // Taper radius closer to line ends
+            double radius = ((FastMath.sin((float) Math.PI * t) + 1.0F) * roll + 1.0) / 2.0;
+            points[i * 4] = xt;
+            points[i * 4 + 1] = yt;
+            points[i * 4 + 2] = zt;
+            points[i * 4 + 3] = radius;
+        }
+        
+        // Compare every point to every other point
+        for(int a = 0; a < sizeInt - 1; ++a) {
+            double radiusA = points[a * 4 + 3];
+            if(radiusA > 0.0) {
+                for(int b = a + 1; b < sizeInt; ++b) {
+                    double radiusB = points[b * 4 + 3];
+                    if(radiusB > 0.0) {
+                        double dxt = points[a * 4] - points[b * 4];
+                        double dyt = points[a * 4 + 1] - points[b * 4 + 1];
+                        double dzt = points[a * 4 + 2] - points[b * 4 + 2];
+                        double dRadius = radiusA - radiusB;
+                        
+                        // If the radius difference is greater than the distance between the two points
+                        if(dRadius * dRadius > dxt * dxt + dyt * dyt + dzt * dzt) {
+                            // Set smaller of two radii to -1
+                            if(dRadius > 0.0) {
+                                points[b * 4 + 3] = -1.0;
+                            } else {
+                                points[a * 4 + 3] = -1.0;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        int outset = (int) FastMath.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F);
+        int x = (int) (location.getX() - FastMath.ceil(eigthSize) - outset);
+        int y = location.getY() - 2 - outset;
+        int z = (int) (location.getZ() - FastMath.ceil(eigthSize) - outset);
+        
+        int horizontalSize = (int) (2 * (FastMath.ceil(eigthSize) + outset));
+        int verticalSize = 2 * (2 + outset);
+        
+        int sphereCount = 0;
+        BitSet visited = new BitSet(horizontalSize * verticalSize * horizontalSize);
+        
+        // Generate a sphere at each point
+        for(int i = 0; i < sizeInt; ++i) {
+            double radius = points[i * 4 + 3];
+            if(radius > 0.0) {
+                double xt = points[i * 4];
+                double yt = points[i * 4 + 1];
+                double zt = points[i * 4 + 2];
+                
+                int xLowerBound = (int) FastMath.max(FastMath.floor(xt - radius), x);
+                int xUpperBound = (int) FastMath.max(FastMath.floor(xt + radius), xLowerBound);
+                
+                int yLowerBound = (int) FastMath.max(FastMath.floor(yt - radius), y);
+                int yUpperBound = (int) FastMath.max(FastMath.floor(yt + radius), yLowerBound);
+                
+                int zLowerBound = (int) FastMath.max(FastMath.floor(zt - radius), z);
+                int zUpperBound = (int) FastMath.max(FastMath.floor(zt + radius), zLowerBound);
+                
+                // Iterate over coordinates within bounds
+                for(int xi = xLowerBound; xi <= xUpperBound; ++xi) {
+                    double dx = ((double) xi + 0.5 - xt) / radius;
+                    if(dx * dx < 1.0) {
+                        for(int yi = yLowerBound; yi <= yUpperBound; ++yi) {
+                            double dy = ((double) yi + 0.5 - yt) / radius;
+                            if(dx * dx + dy * dy < 1.0) {
+                                for(int zi = zLowerBound; zi <= zUpperBound; ++zi) {
+                                    double dz = ((double) zi + 0.5 - zt) / radius;
+                                    
+                                    // If position is inside the sphere
+                                    if(dx * dx + dy * dy + dz * dz < 1.0 && !(yi < world.getMinHeight() || yi >= world.getMaxHeight())) {
+                                        int index = xi - x + (yi - y) * horizontalSize + (zi - z) * horizontalSize * verticalSize;
+                                        if(!visited.get(index)) { // Skip blocks that have already been visited
+                                            
+                                            visited.set(index);
+                                            BlockType block = world.getBlockState(xi, yi, zi).getBlockType();
+                                            if(shouldPlace(block, random, world, xi, yi, zi)) {
+                                                world.setBlockState(xi, yi, zi, getMaterial(block), isApplyGravity());
+                                                ++sphereCount;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        return sphereCount > 0;
+    }
+    
+    public boolean shouldPlace(BlockType type, Random random, WritableWorld world, int x, int y, int z) {
+        if(!getReplaceable().contains(type)) {
+            return false;
+        } else if(shouldNotDiscard(random, exposed)) {
+            return true;
+        } else {
+            return !(world.getBlockState(x, y, z - 1).isAir() ||
+                     world.getBlockState(x, y, z + 1).isAir() ||
+                     world.getBlockState(x, y - 1, z).isAir() ||
+                     world.getBlockState(x, y + 1, z).isAir() ||
+                     world.getBlockState(x - 1, y, z).isAir() ||
+                     world.getBlockState(x + 1, y, z).isAir());
+        }
+    }
+    
+    public BlockState getMaterial(BlockType replace) {
+        return materials.getOrDefault(replace, material);
+    }
+    
+    public MaterialSet getReplaceable() {
+        return replaceable;
+    }
+    
+    public boolean isApplyGravity() {
+        return applyGravity;
+    }
+}

common/addons/config-ore-v2/src/main/resources/terra.addon.yml

@@ -0,0 +1,12 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: config-ore-v2
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addons.ore.v2.OreAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

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

@@ -14,8 +14,13 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class OreAddon implements AddonInitializer {
+    private static final Logger logger = LoggerFactory.getLogger(OreAddon.class);
+    
     @Inject
     private Platform platform;
     
@@ -29,5 +34,8 @@ public class OreAddon implements AddonInitializer {
                 .register(addon, ConfigPackPreLoadEvent.class)
                 .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1))
                 .failThrough();
+        
+        if(platform.getTerraConfig().isDebugLog())
+            logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead.");
     }
 }

common/addons/locator-slant-noise-3d/build.gradle.kts

@@ -0,0 +1,6 @@
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:chunk-generator-noise-3d"))
+}

common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocator.java

@@ -0,0 +1,32 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
+import com.dfsek.terra.api.structure.feature.BinaryColumn;
+import com.dfsek.terra.api.structure.feature.Locator;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;
+
+import java.util.function.DoublePredicate;
+
+
+public class SlantLocator implements Locator {
+    
+    private final DoublePredicate predicate;
+    
+    public SlantLocator(DoublePredicate predicate) {
+        this.predicate = predicate;
+    }
+    
+    @Override
+    public BinaryColumn getSuitableCoordinates(Column<?> column) {
+        return column.newBinaryColumn(y -> {
+            int x = column.getX();
+            int z = column.getZ();
+            World world = column.getWorld();
+            NoiseChunkGenerator3D generator = (NoiseChunkGenerator3D) world.getGenerator();
+            BiomeProvider biomeProvider = world.getBiomeProvider();
+            return predicate.test(generator.getSlant(x, y, z, world, biomeProvider));
+        });
+    }
+}

common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorAddon.java

@@ -0,0 +1,37 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.structure.feature.Locator;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+
+import java.util.function.Supplier;
+
+
+public class SlantLocatorAddon implements AddonInitializer {
+    
+    public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {
+    };
+    
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .priority(1)
+                .then(event -> event.getPack().getOrCreateRegistry(LOCATOR_TOKEN).register(addon.key("SLANT"), SlantLocatorTemplate::new))
+                .failThrough();
+    }
+}

common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorTemplate.java

@@ -0,0 +1,20 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.api.structure.feature.Locator;
+
+import java.util.function.DoublePredicate;
+
+
+public class SlantLocatorTemplate implements ObjectTemplate<Locator> {
+    
+    @Value("condition")
+    private DoublePredicate predicate;
+    
+    @Override
+    public Locator get() {
+        return new SlantLocator(predicate);
+    }
+}

common/addons/locator-slant-noise-3d/src/main/resources/terra.addon.yml

@@ -0,0 +1,14 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: locator-slant-noise-3d
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addon.feature.locator.slant.SlantLocatorAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
+depends:
+  chunk-generator-noise-3d: "[1.2.0,2.0.0)"

common/addons/structure-terrascript-v2/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2021 Polyhedral Development
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

common/addons/structure-terrascript-v2/README.md

@@ -0,0 +1,4 @@
+# structure-terrascript-loader
+
+Implements the TerraScript structure scripting language, and loads all `*.tesf`
+files into the Structure registry.

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

@@ -0,0 +1,244 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+version = version("1.0.0")
+
+dependencies {
+    api("commons-io:commons-io:2.7")
+    api("org.ow2.asm:asm:9.5")
+    api("org.ow2.asm:asm-commons:9.5")
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+}
+
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.v2.lib.commons")
+    relocate("net.jafama", "com.dfsek.terra.addons.terrascript.v2.lib.jafama")
+}
+
+val astSourceSet = buildDir.resolve("generated/ast")
+val astPackage = astSourceSet.resolve("com/dfsek/terra/addons/terrascript/v2/ast")
+
+data class ASTClass(
+        val name: String,
+        val imports: List<String>,
+        val nodes: List<ASTNode>,
+        val constructorFields: List<Pair<String, String>> = emptyList(),
+)
+
+data class ASTNode(
+        val name: String,
+        val constructorFields: List<Pair<String, String>>,
+        val mutableFields: List<Pair<String, String>> = emptyList() // TODO - Remove mutability from AST nodes
+)
+
+// Auto generate AST classes rather than writing them by hand
+tasks.register("genTerrascriptAstClasses") {
+
+    val packageName = astPackage.toRelativeString(astSourceSet).replace('/', '.')
+    fun generateClass(clazz: ASTClass) {
+        val src = StringBuilder()
+        src.appendLine("package $packageName;\n");
+        for (imprt in clazz.imports) src.appendLine("import $imprt;")
+        src.appendLine("""
+        
+        /**
+         * Auto-generated class via genTerrascriptAstClasses gradle task
+         */
+        public abstract class ${clazz.name} {
+        
+        """.trimIndent())
+
+        for (field in clazz.constructorFields) {
+            src.appendLine("    public final ${field.second} ${field.first};")
+        }
+
+        src.appendLine("""
+        | 
+        |    public ${clazz.name}(${clazz.constructorFields.joinToString { "${it.second} ${it.first}" }}) {
+        """.trimMargin())
+
+        for (field in clazz.constructorFields) {
+            src.appendLine("        this.${field.first} = ${field.first};")
+        }
+
+        src.appendLine("""
+        |    }
+        |
+        |    public interface Visitor<R> {
+        |        
+        """.trimMargin())
+        for (node in clazz.nodes) {
+            src.appendLine("        R visit${node.name}${clazz.name}(${node.name} ${clazz.name.toLowerCase()});")
+        }
+
+        src.appendLine("""
+            |
+            |    }
+            |    
+            |    public abstract <R> R accept(Visitor<R> visitor);
+        """.trimMargin())
+
+        for (node in clazz.nodes) {
+            src.appendLine()
+            // Inner class declaration
+            src.appendLine("    public static class ${node.name} extends ${clazz.name} {\n")
+
+            // Add fields
+            for (field in node.constructorFields) {
+                src.appendLine("        public final ${field.second} ${field.first};")
+            }
+            for (field in node.mutableFields) {
+                src.appendLine("        private ${field.second} ${field.first};")
+            }
+            src.appendLine()
+
+            // Add constructor
+            src.appendLine("""
+            |        public ${node.name}(${node.constructorFields.plus(clazz.constructorFields).joinToString { "${it.second} ${it.first}" }}) {
+            |            super(${clazz.constructorFields.joinToString { it.first }});
+            """.trimMargin())
+
+            for (field in node.constructorFields) {
+                src.appendLine("            this.${field.first} = ${field.first};")
+            }
+            src.appendLine("        }")
+
+            // Add getters and setters for mutable fields
+            for (field in node.mutableFields) {
+                src.appendLine("""
+                    |        
+                    |        public void set${field.first.capitalize()}(${field.second} value) {
+                    |            this.${field.first} = value;
+                    |        }
+                    |        
+                    |        public ${field.second} get${field.first.capitalize()}() {
+                    |            if (this.${field.first} == null) throw new RuntimeException("Compilation bug! Field ${field.first} has not been set yet");
+                    |            return this.${field.first};
+                    |        }
+                """.trimMargin())
+            }
+
+            src.appendLine("""
+                |        
+                |        @Override
+                |        public <R> R accept(Visitor<R> visitor) {
+                |            return visitor.visit${node.name}${clazz.name}(this);
+                |        }
+                |    }
+            """.trimMargin())
+        }
+        src.appendLine("}")
+        val outputFile = astPackage.resolve("${clazz.name}.java")
+        outputFile.writeText(src.toString())
+    }
+
+    doLast {
+        astSourceSet.deleteRecursively()
+        astPackage.mkdirs()
+
+        listOf(
+            ASTClass(
+                "Expr",
+                listOf(
+                    "com.dfsek.terra.addons.terrascript.v2.Type",
+                    "com.dfsek.terra.addons.terrascript.v2.parser.UnaryOperator",
+                    "com.dfsek.terra.addons.terrascript.v2.parser.BinaryOperator",
+                    "com.dfsek.terra.addons.terrascript.v2.Environment",
+                    "com.dfsek.terra.addons.terrascript.v2.Environment.Symbol",
+                    "com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition",
+                    "java.util.List",
+                ),
+                listOf(
+                    ASTNode("Binary", listOf("left" to "Expr", "operator" to "BinaryOperator", "right" to "Expr")),
+                    ASTNode("Grouping", listOf("expression" to "Expr")),
+                    ASTNode("Literal", listOf("value" to "Object", "type" to "Type")),
+                    ASTNode("Unary", listOf("operator" to "UnaryOperator", "operand" to "Expr")),
+                    ASTNode("Call", listOf("callee" to "Expr", "arguments" to "List<Expr>")),
+                    ASTNode("Variable", listOf("identifier" to "String"), listOf("symbol" to "Symbol", "scope" to "Environment")),
+                    ASTNode("Assignment", listOf("lValue" to "Variable", "rValue" to "Expr")),
+                    ASTNode("Void", listOf()),
+                ),
+                listOf("position" to "SourcePosition")
+            ),
+            ASTClass(
+                "Stmt",
+                listOf(
+                    "com.dfsek.terra.addons.terrascript.v2.Type",
+                    "com.dfsek.terra.api.util.generic.pair.Pair",
+                    "com.dfsek.terra.addons.terrascript.v2.Environment",
+                    "com.dfsek.terra.addons.terrascript.v2.Environment.Symbol",
+                    "com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition",
+                    "java.util.List",
+                    "java.util.Optional",
+                ),
+                listOf(
+                    ASTNode("Expression", listOf("expression" to "Expr")),
+                    ASTNode("Block", listOf("statements" to "List<Stmt>")),
+                    ASTNode("FunctionDeclaration", listOf("identifier" to "String", "parameters" to "List<Pair<String, Type>>", "returnType" to "Type", "body" to "Block"), listOf("symbol" to "Symbol")),
+                    ASTNode("VariableDeclaration", listOf("type" to "Type", "identifier" to "String", "value" to "Expr"), listOf("scope" to "Environment")),
+                    ASTNode("Return", listOf("value" to "Expr"), listOf("type" to "Type")),
+                    ASTNode("If", listOf("condition" to "Expr", "trueBody" to "Block", "elseIfClauses" to "List<Pair<Expr, Block>>", "elseBody" to "Optional<Block>")),
+                    ASTNode("For", listOf("initializer" to "Stmt", "condition" to "Expr", "incrementer" to "Expr", "body" to "Block")),
+                    ASTNode("While", listOf("condition" to "Expr", "body" to "Block")),
+                    ASTNode("NoOp", listOf()),
+                    ASTNode("Break", listOf()),
+                    ASTNode("Continue", listOf()),
+                ),
+                listOf("position" to "SourcePosition")
+            ),
+            ASTClass(
+                "TypedExpr",
+                listOf(
+                    "com.dfsek.terra.addons.terrascript.v2.Type",
+                    "com.dfsek.terra.addons.terrascript.v2.parser.UnaryOperator",
+                    "com.dfsek.terra.addons.terrascript.v2.parser.BinaryOperator",
+                    "java.util.List",
+                ),
+                listOf(
+                    ASTNode("Binary", listOf("left" to "TypedExpr", "operator" to "BinaryOperator", "right" to "TypedExpr")),
+                    ASTNode("Grouping", listOf("expression" to "TypedExpr")),
+                    ASTNode("Literal", listOf("value" to "Object")),
+                    ASTNode("Unary", listOf("operator" to "UnaryOperator", "operand" to "TypedExpr")),
+                    ASTNode("Call", listOf("callee" to "TypedExpr", "arguments" to "List<TypedExpr>")),
+                    ASTNode("Variable", listOf("identifier" to "String")),
+                    ASTNode("Assignment", listOf("lValue" to "Variable", "rValue" to "TypedExpr")),
+                    ASTNode("Void", listOf()),
+                ),
+                listOf("type" to "Type")
+            ),
+            ASTClass(
+                "TypedStmt",
+                listOf(
+                    "com.dfsek.terra.addons.terrascript.v2.Type",
+                    "com.dfsek.terra.api.util.generic.pair.Pair",
+                    "java.util.List",
+                    "java.util.Optional",
+                ),
+                listOf(
+                    ASTNode("Expression", listOf("expression" to "TypedExpr")),
+                    ASTNode("Block", listOf("statements" to "List<TypedStmt>")),
+                    ASTNode("FunctionDeclaration", listOf("identifier" to "String", "parameters" to "List<Pair<String, Type>>", "returnType" to "Type", "body" to "Block", "scopedIdentifier" to "String")),
+                    ASTNode("VariableDeclaration", listOf("type" to "Type", "identifier" to "String", "value" to "TypedExpr")),
+                    ASTNode("Return", listOf("value" to "TypedExpr")),
+                    ASTNode("If", listOf("condition" to "TypedExpr", "trueBody" to "Block", "elseIfClauses" to "List<Pair<TypedExpr, Block>>", "elseBody" to "Optional<Block>")),
+                    ASTNode("For", listOf("initializer" to "TypedStmt", "condition" to "TypedExpr", "incrementer" to "TypedExpr", "body" to "Block")),
+                    ASTNode("While", listOf("condition" to "TypedExpr", "body" to "Block")),
+                    ASTNode("NoOp", listOf()),
+                    ASTNode("Break", listOf()),
+                    ASTNode("Continue", listOf()),
+                ),
+            ),
+        ).forEach(::generateClass)
+    }
+}
+
+tasks.getByName("compileJava") {
+    dependsOn("genTerrascriptAstClasses")
+}
+
+sourceSets.getByName("main") {
+    java {
+        srcDirs(astSourceSet)
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Environment.java

@@ -0,0 +1,132 @@
+package com.dfsek.terra.addons.terrascript.v2;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.NonexistentSymbolException;
+import com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.SymbolAlreadyExistsException;
+import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
+
+
+public class Environment {
+    
+    public final String name;
+    private final Environment outer;
+    private final boolean canAccessOuterVariables;
+    private final Map<String, Symbol> symbolTable = new HashMap<>();
+    private final boolean inLoop;
+    private final int index;
+    private int innerCount = 0;
+    
+    private Environment(@Nullable Environment outer, boolean canAccessOuterVariables, boolean inLoop, int index) {
+        this.outer = outer;
+        this.canAccessOuterVariables = canAccessOuterVariables;
+        this.inLoop = inLoop;
+        this.index = index;
+        this.name = String.join("_", getNestedIndexes().stream().map(Object::toString).toList());
+        // Populate global scope with built-in Java implemented methods
+        // TODO - Replace with AST import nodes
+        if(index == 0) NativeFunction.BUILTIN_FUNCTIONS.forEach((name, function) ->
+                                                                        symbolTable.put(name, new Symbol.Variable(
+                                                                                new Type.Function.Native(function.getReturnType(),
+                                                                                                         function.getParameterTypes(), name,
+                                                                                                         this, function))));
+    }
+    
+    public static Environment global() {
+        return new Environment(null, false, false, 0);
+    }
+    
+    public Environment lexicalInner() {
+        return new Environment(this, true, inLoop, innerCount++);
+    }
+    
+    public Environment loopInner() {
+        return new Environment(this, true, true, innerCount++);
+    }
+    
+    public Environment functionalInner() {
+        return new Environment(this, false, inLoop, innerCount++);
+    }
+    
+    private List<Integer> getNestedIndexes() {
+        List<Integer> idxs = new ArrayList<>();
+        for(Environment env = this; env.outer != null; env = env.outer) {
+            idxs.add(0, env.index);
+        }
+        return idxs;
+    }
+    
+    public Environment outer() {
+        if(outer == null) throw new RuntimeException("Attempted to retrieve outer scope of global scope");
+        return outer;
+    }
+    
+    /**
+     * Returns symbol table entry for a variable identifier, includes enclosing scopes in lookup.
+     * <br>
+     * Does not factor context of lookup, checks for order of declaration should be done while
+     * symbol tables are being populated.
+     *
+     * @param id identifier used in variable declaration
+     *
+     * @return variable symbol table entry
+     *
+     * @throws NonexistentSymbolException if symbol is not declared in symbol table
+     */
+    public Symbol getVariable(String id) throws NonexistentSymbolException {
+        Symbol symbol = symbolTable.get(id);
+        if(symbol != null) return symbol;
+        if(outer == null) throw new NonexistentSymbolException();
+        if(canAccessOuterVariables) return outer.getVariable(id);
+        
+        // Only functions can be accessed from restricted scopes
+        // TODO - Only make applicable to functions that cannot be reassigned
+        Symbol potentialFunction = outer.getVariableUnrestricted(id);
+        if(!(potentialFunction.type instanceof Type.Function)) throw new NonexistentSymbolException();
+        return potentialFunction;
+    }
+    
+    private Symbol getVariableUnrestricted(String id) throws NonexistentSymbolException {
+        Symbol symbol = symbolTable.get(id);
+        if(symbol != null) return symbol;
+        if(outer == null) throw new NonexistentSymbolException();
+        return outer.getVariableUnrestricted(id);
+    }
+    
+    public void put(String id, Symbol symbol) throws SymbolAlreadyExistsException {
+        if(symbolTable.containsKey(id)) throw new SymbolAlreadyExistsException();
+        symbolTable.put(id, symbol);
+    }
+    
+    public static abstract class Symbol {
+        
+        public final Type type;
+        
+        public Symbol(Type type) {
+            this.type = type;
+        }
+        
+        public static class Variable extends Symbol {
+            
+            public Variable(Type type) {
+                super(type);
+            }
+        }
+    }
+    
+    
+    public static class ScopeException extends Exception {
+        
+        public static class SymbolAlreadyExistsException extends ScopeException {
+        }
+        
+        
+        public static class NonexistentSymbolException extends ScopeException {
+        }
+        
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.addons.terrascript.v2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+
+
+public class ErrorHandler {
+    
+    private final List<CompilationException> exceptions = new ArrayList<>();
+    
+    public void add(CompilationException e) {
+        exceptions.add(e);
+    }
+    
+    public void throwAny() throws CompilationException {
+        for(CompilationException e : exceptions) {
+            throw e;
+        }
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/TerraScript2Addon.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2;
+
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.inject.annotations.Inject;
+
+
+public class TerraScript2Addon implements AddonInitializer {
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Type.java

@@ -0,0 +1,186 @@
+package com.dfsek.terra.addons.terrascript.v2;
+
+import com.google.common.collect.Streams;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType;
+import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+
+public interface Type {
+    
+    Type NUMBER = new Type() {
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return double.class;
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.DOUBLE;
+        }
+        
+        @Override
+        public String toString() {
+            return "num";
+        }
+    };
+    Type INTEGER = new Type() {
+        
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return int.class;
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.INTEGER;
+        }
+        
+        @Override
+        public String toString() {
+            return "int";
+        }
+    };
+    Type STRING = new Type() {
+        
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return String.class;
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.STRING;
+        }
+        
+        @Override
+        public String toString() {
+            return "str";
+        }
+    };
+    Type BOOLEAN = new Type() {
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return boolean.class;
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.BOOLEAN;
+        }
+        
+        @Override
+        public String toString() {
+            return "bool";
+        }
+    };
+    Type VOID = new Type() {
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return void.class;
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.VOID;
+        }
+        
+        @Override
+        public String toString() {
+            return "()";
+        }
+    };
+    
+    static Type fromString(String lexeme) throws TypeException {
+        return switch(lexeme) {
+            case "num" -> NUMBER;
+            case "int" -> INTEGER;
+            case "str" -> STRING;
+            case "bool" -> BOOLEAN;
+            case "()" -> VOID;
+            default -> throw new TypeException();
+        };
+    }
+    
+    java.lang.reflect.Type javaType();
+    
+    default boolean typeOf(Type type) {
+        return this.equals(type);
+    }
+    
+    CodegenType getCodegenType();
+    
+
+    class Function implements Type {
+        
+        private final Type returnType;
+        private final List<Type> parameters;
+        private final String id;
+        
+        public Function(Type returnType, List<Type> parameters, @Nullable String identifier, Environment declarationScope) {
+            this.returnType = returnType;
+            this.parameters = parameters;
+            this.id = identifier == null ? "ANONYMOUS" : identifier + declarationScope.name;
+        }
+        
+        private static boolean paramsAreSubtypes(List<Type> subtypes, List<Type> superTypes) {
+            if(subtypes.size() != superTypes.size()) return false;
+            return Streams.zip(subtypes.stream(), superTypes.stream(), Pair::of).allMatch(p -> p.getLeft().typeOf(p.getRight()));
+        }
+        
+        public Type getReturnType() {
+            return returnType;
+        }
+        
+        public List<Type> getParameters() {
+            return parameters;
+        }
+        
+        public String getId() {
+            return id;
+        }
+        
+        @Override
+        public boolean typeOf(Type type) {
+            if(!(type instanceof Function function)) return false;
+            return returnType.typeOf(function.returnType) && paramsAreSubtypes(parameters, function.parameters);
+        }
+        
+        @Override
+        public CodegenType getCodegenType() {
+            return CodegenType.OBJECT;
+        }
+        
+        @Override
+        public java.lang.reflect.Type javaType() {
+            return Function.class;
+        }
+        
+        @Override
+        public String toString() {
+            return "(" + String.join(",", parameters.stream().map(Object::toString).toList()) + ") -> " + returnType;
+        }
+        
+        public static class Native extends Function {
+            private final NativeFunction nativeFunction;
+            
+            public Native(Type returnType, List<Type> parameters, @org.jetbrains.annotations.Nullable String identifier,
+                          Environment declarationScope, NativeFunction nativeFunction) {
+                super(returnType, parameters, identifier, declarationScope);
+                this.nativeFunction = nativeFunction;
+            }
+            
+            public NativeFunction getNativeFunction() {
+                return nativeFunction;
+            }
+        }
+    }
+    
+    
+    class TypeException extends Exception {
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/CodegenType.java

@@ -0,0 +1,124 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen;
+
+import org.objectweb.asm.Opcodes;
+
+
+public class CodegenType {
+    
+    public static final CodegenType BOOLEAN = new CodegenType(InstructionType.INTEGER, "Z");
+    public static final CodegenType STRING = new CodegenType(InstructionType.OBJECT, "Ljava/lang/String;");
+    public static final CodegenType DOUBLE = new CodegenType(InstructionType.DOUBLE, "D");
+    public static final CodegenType INTEGER = new CodegenType(InstructionType.INTEGER, "I");
+    public static final CodegenType VOID = new CodegenType(InstructionType.VOID, "V");
+    public static final CodegenType OBJECT = new CodegenType(InstructionType.OBJECT, "Ljava/lang/Object;");
+    private final InstructionType instructionType;
+    private final String descriptor;
+    public CodegenType(InstructionType instructionType, String descriptor) {
+        this.instructionType = instructionType;
+        this.descriptor = descriptor;
+    }
+
+    public InstructionType bytecodeType() {
+        return instructionType;
+    }
+
+    public String getDescriptor() {
+        return descriptor;
+    }
+    
+    
+    public enum InstructionType {
+        DOUBLE {
+            @Override
+            public int slotSize() {
+                return 2;
+            }
+            
+            @Override
+            public int returnInsn() {
+                return Opcodes.DRETURN;
+            }
+            
+            @Override
+            public int loadInsn() {
+                return Opcodes.DLOAD;
+            }
+            
+            @Override
+            public int storeInsn() {
+                return Opcodes.DSTORE;
+            }
+        },
+        OBJECT {
+            @Override
+            public int slotSize() {
+                return 1;
+            }
+            
+            @Override
+            public int returnInsn() {
+                return Opcodes.ARETURN;
+            }
+            
+            @Override
+            public int loadInsn() {
+                return Opcodes.ALOAD;
+            }
+            
+            @Override
+            public int storeInsn() {
+                return Opcodes.ASTORE;
+            }
+        },
+        INTEGER {
+            @Override
+            public int slotSize() {
+                return 1;
+            }
+            
+            @Override
+            public int returnInsn() {
+                return Opcodes.IRETURN;
+            }
+            
+            @Override
+            public int loadInsn() {
+                return Opcodes.ILOAD;
+            }
+            
+            @Override
+            public int storeInsn() {
+                return Opcodes.ISTORE;
+            }
+        },
+        VOID {
+            @Override
+            public int slotSize() {
+                throw new UnsupportedOperationException();
+            }
+            
+            @Override
+            public int returnInsn() {
+                return Opcodes.RETURN;
+            }
+            
+            @Override
+            public int loadInsn() {
+                throw new UnsupportedOperationException();
+            }
+            
+            @Override
+            public int storeInsn() {
+                throw new UnsupportedOperationException();
+            }
+        };
+        
+        public abstract int slotSize();
+        
+        public abstract int returnInsn();
+        
+        public abstract int loadInsn();
+        
+        public abstract int storeInsn();
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/NativeFunction.java

@@ -0,0 +1,86 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.dfsek.terra.addons.terrascript.v2.Type;
+
+
+public interface NativeFunction {
+    Map<String, NativeFunction> BUILTIN_FUNCTIONS = new HashMap<>() {{
+        put("print", new StaticMethodOfStaticField(
+                "java/lang/System",
+                "out",
+                "java/io/PrintStream",
+                "println",
+                "(Ljava/lang/String;)V",
+                Type.VOID,
+                List.of(Type.STRING))
+           );
+        put("printNum", new StaticMethodOfStaticField(
+                "java/lang/System",
+                "out",
+                "java/io/PrintStream",
+                "println",
+                "(D)V",
+                Type.VOID,
+                List.of(Type.NUMBER))
+           );
+    }};
+    
+    void pushInstance(MethodVisitor method);
+    
+    void callMethod(MethodVisitor method);
+    
+    Type getReturnType();
+    
+    List<Type> getParameterTypes();
+    
+    class StaticMethodOfStaticField implements NativeFunction {
+        
+        private final String fieldOwner;
+        private final String fieldName;
+        private final String className;
+        private final String methodName;
+        private final String methodDescriptor;
+        private final Type returnType;
+        private final List<Type> parameters;
+        
+        // TODO - Use reflection to obtain these automatically
+        public StaticMethodOfStaticField(String fieldOwner, String fieldName, String className, String methodName, String methodDescriptor,
+                                         Type returnType, List<Type> parameters) {
+            this.fieldOwner = fieldOwner;
+            this.fieldName = fieldName;
+            this.className = className;
+            this.methodName = methodName;
+            this.methodDescriptor = methodDescriptor;
+            this.returnType = returnType;
+            this.parameters = parameters;
+        }
+        
+        @Override
+        public void pushInstance(MethodVisitor method) {
+            method.visitFieldInsn(Opcodes.GETSTATIC, fieldOwner, fieldName, "L" + className + ";");
+        }
+        
+        @Override
+        public void callMethod(MethodVisitor method) {
+            method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, className, methodName, methodDescriptor, false);
+        }
+        
+        @Override
+        public Type getReturnType() {
+            return returnType;
+        }
+        
+        @Override
+        public List<Type> getParameterTypes() {
+            return parameters;
+        }
+        
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/TerraScript.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen;
+
+
+public interface TerraScript {
+    
+    void execute();
+    
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/DynamicClassLoader.java

@@ -0,0 +1,16 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen.asm;
+
+public class DynamicClassLoader extends ClassLoader {
+    public DynamicClassLoader(Class<?> clazz) {
+        super(clazz.getClassLoader());
+    }
+    
+    public Class<?> defineClass(String name, byte[] data) {
+        return defineClass(name, data, 0, data.length);
+    }
+    
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        return Class.forName(name);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/OpcodeAlias.java

@@ -0,0 +1,17 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen.asm;
+
+import org.objectweb.asm.Opcodes;
+
+
+public class OpcodeAlias {
+    public static int CMP_GREATER_THAN = Opcodes.IFGT;
+    public static int CMP_GREATER_EQUALS = Opcodes.IFGE;
+    public static int CMP_LESS_THAN = Opcodes.IFLT;
+    public static int CMP_LESS_EQUALS = Opcodes.IFLE;
+    public static int CMP_EQUALS = Opcodes.IFEQ;
+    public static int CMP_NOT_EQUALS = Opcodes.IFNE;
+    public static int BOOL_FALSE = Opcodes.IFEQ;
+    public static int BOOL_TRUE = Opcodes.IFNE;
+    public static int INTEGERS_EQUAL = Opcodes.IF_ICMPEQ;
+    public static int INTEGERS_NOT_EQUAL = Opcodes.IF_ICMPNE;
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/TerraScriptClassGenerator.java

@@ -0,0 +1,565 @@
+package com.dfsek.terra.addons.terrascript.v2.codegen.asm;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.commons.LocalVariablesSorter;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.dfsek.terra.addons.terrascript.v2.Type;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Assignment;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Binary;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Call;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Grouping;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Literal;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Unary;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Variable;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Void;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Block;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Break;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Continue;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Expression;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.For;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.FunctionDeclaration;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.If;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.NoOp;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Return;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.VariableDeclaration;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.While;
+import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType;
+import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType.InstructionType;
+import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
+import com.dfsek.terra.addons.terrascript.v2.codegen.TerraScript;
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilerBugException;
+import com.dfsek.terra.addons.terrascript.v2.util.ASMUtil;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+import static com.dfsek.terra.addons.terrascript.v2.util.ASMUtil.dynamicName;
+
+
+public class TerraScriptClassGenerator {
+    
+    private static final Class<?> TARGET_CLASS = TerraScript.class;
+    
+    private static final boolean DUMP = true;
+    private final String debugPath;
+    private int generationCount = 0;
+    
+    public TerraScriptClassGenerator(String debugPath) {
+        this.debugPath = debugPath;
+    }
+    
+    /**
+     * @param root Assumed to be semantically correct
+     *
+     * @return Generated TerraScript instance
+     *
+     * @throws IOException
+     */
+    public TerraScript generate(Block root) throws IOException {
+        String targetClassName = dynamicName(TARGET_CLASS);
+        String generatedClassName = targetClassName + "_GENERATED_" + generationCount;
+        
+        ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+        
+        // Create class
+        classWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, generatedClassName, null, "java/lang/Object", new String[]{ targetClassName });
+        
+        // Generate constructor method
+        MethodVisitor constructor = classWriter.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+        constructor.visitCode();
+        constructor.visitVarInsn(Opcodes.ALOAD, 0); // Put this reference on stack
+        constructor.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+        constructor.visitInsn(Opcodes.RETURN); // Void return
+        constructor.visitMaxs(0, 0);
+        constructor.visitEnd();
+        
+        // Generate execute method
+        String methodName = "execute";
+        // Extract method description
+        MethodExtractor extractor = new MethodExtractor(methodName);
+        new ClassReader(targetClassName).accept(extractor, 0);
+        String description = extractor.methodDescription;
+        int exeAcc = Opcodes.ACC_PUBLIC;
+        MethodVisitor executeMethod = classWriter.visitMethod(exeAcc, methodName, description, null, null);
+        executeMethod.visitCode(); // Start method body
+        new MethodBytecodeGenerator(classWriter, generatedClassName, executeMethod, exeAcc, description).generate(
+                root); // Generate bytecode
+        // Finish up method
+        executeMethod.visitInsn(Opcodes.RETURN);
+        executeMethod.visitMaxs(0, 0);
+        executeMethod.visitEnd();
+        
+        // Finished generating class
+        classWriter.visitEnd();
+        
+        DynamicClassLoader loader = new DynamicClassLoader(
+                TARGET_CLASS); // Instantiate a new loader every time so classes can be GC'ed when they are no longer used. (Classes
+        // cannot be GC'ed until their loaders are).
+        
+        generationCount++;
+        
+        byte[] bytecode = classWriter.toByteArray();
+        
+        Class<?> generatedClass = loader.defineClass(generatedClassName.replace('/', '.'), bytecode);
+        
+        if(DUMP) {
+            File dump = new File(debugPath + "/" + generatedClass.getSimpleName() + ".class");
+            dump.getParentFile().mkdirs();
+            try(FileOutputStream out = new FileOutputStream(dump)) {
+                out.write(bytecode);
+            } catch(IOException e) {
+                e.printStackTrace();
+            }
+        }
+        
+        try {
+            Object instance = generatedClass.getDeclaredConstructor().newInstance();
+            return (TerraScript) instance;
+        } catch(ReflectiveOperationException e) {
+            throw new Error(e); // Should literally never happen
+        }
+    }
+    
+    private static class MethodBytecodeGenerator implements TypedStmt.Visitor<Void>, TypedExpr.Visitor<Void> {
+        
+        private final ClassWriter classWriter;
+        
+        private final String className;
+        
+        private final MethodVisitor method;
+        
+        private final String descriptor;
+        
+        private final LocalVariablesSorter lvs;
+        
+        private final Map<String, Integer> lvTable = new HashMap<>();
+        
+        private final Deque<Pair<Label, Label>> loopStack = new ArrayDeque<>();
+        
+        public MethodBytecodeGenerator(ClassWriter classWriter, String className, MethodVisitor method, int access, String descriptor) {
+            this.classWriter = classWriter;
+            this.className = className;
+            this.method = method;
+            this.descriptor = descriptor;
+            this.lvs = new LocalVariablesSorter(access, descriptor, method);
+        }
+        
+        private static boolean exprTypesEqual(Type type, TypedExpr... exprs) {
+            for(TypedExpr expr : exprs) {
+                if(expr.type != type) return false;
+            }
+            return true;
+        }
+        
+        public void generate(Block root) {
+            this.visitBlockTypedStmt(root);
+        }
+        
+        @Override
+        public Void visitBinaryTypedExpr(Binary expr) {
+            switch(expr.operator) {
+                case EQUALS, NOT_EQUALS, BOOLEAN_AND, BOOLEAN_OR, GREATER, GREATER_EQUALS, LESS, LESS_EQUALS -> pushComparisonBool(expr);
+                case ADD -> {
+                    pushBinaryOperands(expr);
+                    CodegenType codegenType = expr.type.getCodegenType();
+                    if(codegenType.bytecodeType() == InstructionType.DOUBLE)
+                        method.visitInsn(Opcodes.DADD);
+                    else if(Objects.equals(codegenType.getDescriptor(), "Ljava/lang/String;"))
+                        // TODO - Optimize string concatenation
+                        method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "concat",
+                                               "(Ljava/lang/String;)Ljava/lang/String;", false);
+                    else throw new RuntimeException("Could not generate bytecode for ADD binary operator returning type " + expr.type);
+                }
+                case SUBTRACT -> binaryInsn(expr, Opcodes.DSUB);
+                case MULTIPLY -> binaryInsn(expr, Opcodes.DMUL);
+                case DIVIDE -> binaryInsn(expr, Opcodes.DDIV);
+                default -> throw new RuntimeException("Unhandled binary operator " + expr.operator);
+            }
+            return null;
+        }
+        
+        @Override
+        public Void visitGroupingTypedExpr(Grouping expr) {
+            expr.expression.accept(this);
+            return null;
+        }
+        
+        @Override
+        public Void visitLiteralTypedExpr(Literal expr) {
+            if(expr.type.getCodegenType() == CodegenType.BOOLEAN)
+                if((boolean) expr.value) pushTrue();
+                else pushFalse();
+            else method.visitLdcInsn(expr.value);
+            return null;
+        }
+        
+        @Override
+        public Void visitUnaryTypedExpr(Unary expr) {
+            expr.operand.accept(this);
+            switch(expr.operator) {
+                case NOT -> invertBool();
+                case NEGATE -> method.visitInsn(Opcodes.DNEG);
+            }
+            return null;
+        }
+        
+        @Override
+        public Void visitCallTypedExpr(Call expr) {
+            // TODO - Remove specific handling of native functions
+            if(expr.callee.type instanceof Type.Function.Native nativeFunction) {
+                NativeFunction function = nativeFunction.getNativeFunction();
+                function.pushInstance(method);
+                expr.arguments.forEach(a -> a.accept(this));
+                function.callMethod(method);
+                return null;
+            }
+            // TODO - Add support for invokevirtual
+            expr.arguments.forEach(a -> a.accept(this));
+            List<Type> parameters = expr.arguments.stream().map(e -> e.type).toList();
+            method.visitMethodInsn(Opcodes.INVOKESTATIC, className, ((Type.Function) expr.callee.type).getId(),
+                                   getFunctionDescriptor(parameters, expr.type), false);
+            return null;
+        }
+        
+        @Override
+        public Void visitVariableTypedExpr(Variable expr) {
+            Type varType = expr.type;
+            method.visitVarInsn(varType.getCodegenType().bytecodeType().loadInsn(), lvTable.get(expr.identifier));
+            return null;
+        }
+        
+        @Override
+        public Void visitAssignmentTypedExpr(Assignment expr) {
+            expr.rValue.accept(this);
+            Type type = expr.lValue.type;
+            method.visitVarInsn(type.getCodegenType().bytecodeType().storeInsn(), lvTable.get(expr.lValue.identifier));
+            return null;
+        }
+        
+        @Override
+        public Void visitVoidTypedExpr(Void expr) {
+            return null;
+        }
+        
+        @Override
+        public Void visitExpressionTypedStmt(Expression stmt) {
+            stmt.expression.accept(this);
+            return null;
+        }
+        
+        @Override
+        public Void visitBlockTypedStmt(Block stmt) {
+            stmt.statements.forEach(s -> s.accept(this));
+            return null;
+        }
+        
+        /**
+         * Writes function as a private static method of the current class
+         *
+         * @param stmt
+         *
+         * @return
+         */
+        @Override
+        public Void visitFunctionDeclarationTypedStmt(FunctionDeclaration stmt) {
+            List<Type> parameterTypes = stmt.parameters.stream().map(Pair::getRight).toList();
+            
+            int access = Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC;
+            
+            MethodVisitor method = classWriter.visitMethod(access, stmt.scopedIdentifier,
+                                                           getFunctionDescriptor(parameterTypes, stmt.returnType), null, null);
+            
+            method.visitCode(); // Start method body
+            
+            MethodBytecodeGenerator funcGenerator = new MethodBytecodeGenerator(classWriter, className, method, access, descriptor);
+            
+            // Add local variable indexes for each parameter
+            int lvidx = 0;
+            for(Pair<String, Type> parameter : stmt.parameters) {
+                funcGenerator.lvTable.put(parameter.getLeft(), lvidx);
+                lvidx += parameter.getRight().getCodegenType().bytecodeType().slotSize(); // Increment by how many slots data type takes
+            }
+            
+            // Generate method bytecode
+            funcGenerator.generate(stmt.body);
+            
+            // Finish up
+            method.visitInsn(Opcodes.RETURN);
+            method.visitMaxs(0, 0);
+            method.visitEnd();
+            
+            return null;
+        }
+        
+        @Override
+        public Void visitVariableDeclarationTypedStmt(VariableDeclaration stmt) {
+            stmt.value.accept(this);
+            lvTable.put(stmt.identifier, lvs.newLocal(ASMUtil.tsTypeToAsmType(stmt.type)));
+            method.visitVarInsn(stmt.type.getCodegenType().bytecodeType().storeInsn(), lvTable.get(stmt.identifier));
+            return null;
+        }
+        
+        @Override
+        public Void visitReturnTypedStmt(Return stmt) {
+            stmt.value.accept(this);
+            method.visitInsn(stmt.value.type.getCodegenType().bytecodeType().returnInsn());
+            return null;
+        }
+        
+        @Override
+        public Void visitIfTypedStmt(If stmt) {
+            Label endIf = new Label();
+            conditionalStmt(stmt.condition, stmt.trueBody, endIf);
+            for(Pair<TypedExpr, Block> elseIfClause : stmt.elseIfClauses) {
+                conditionalStmt(elseIfClause.getLeft(), elseIfClause.getRight(), endIf);
+            }
+            stmt.elseBody.ifPresent(b -> b.accept(this));
+            label(endIf);
+            return null;
+        }
+        
+        @Override
+        public Void visitForTypedStmt(For stmt) {
+            Label loopStart = new Label();
+            Label loopBody = new Label();
+            Label loopEnd = new Label();
+            
+            stmt.initializer.accept(this);
+            jump(loopBody); // Skip over incrementer on first loop
+            
+            label(loopStart);
+            stmt.incrementer.accept(this);
+            label(loopBody);
+            loopStack.push(Pair.of(loopStart, loopEnd));
+            conditionalStmt(stmt.condition, stmt.body, loopStart);
+            loopStack.pop();
+            label(loopEnd);
+            return null;
+        }
+        
+        @Override
+        public Void visitWhileTypedStmt(While stmt) {
+            Label loopStart = new Label();
+            Label loopEnd = new Label();
+            
+            label(loopStart);
+            loopStack.push(Pair.of(loopStart, loopEnd));
+            conditionalStmt(stmt.condition, stmt.body, loopStart);
+            loopStack.pop();
+            label(loopEnd);
+            return null;
+        }
+        
+        @Override
+        public Void visitNoOpTypedStmt(NoOp stmt) {
+            return null;
+        }
+        
+        @Override
+        public Void visitBreakTypedStmt(Break stmt) {
+            jump(loopStack.getFirst().getRight());
+            return null;
+        }
+        
+        @Override
+        public Void visitContinueTypedStmt(Continue stmt) {
+            jump(loopStack.getFirst().getLeft());
+            return null;
+        }
+        
+        private boolean binaryOperandsSameType(Type type, Binary expr) {
+            return exprTypesEqual(type, expr.left, expr.right);
+        }
+        
+        /**
+         * Inverts a boolean on the stack
+         */
+        private void invertBool() {
+            Label invertToFalse = new Label();
+            Label finished = new Label();
+            jumpIf(OpcodeAlias.BOOL_TRUE, invertToFalse);
+            
+            pushFalse();
+            jump(finished);
+            
+            label(invertToFalse);
+            pushFalse();
+            
+            label(finished);
+        }
+        
+        private void pushBinaryOperands(Binary expr) {
+            expr.left.accept(this);
+            expr.right.accept(this);
+        }
+        
+        private void binaryInsn(Binary expr, int insn) {
+            pushBinaryOperands(expr);
+            method.visitInsn(insn);
+        }
+        
+        /**
+         * Pushes boolean on to the stack based on comparison result
+         *
+         * @param condition
+         */
+        private void pushComparisonBool(TypedExpr condition) {
+            Label trueFinished = new Label();
+            conditionalRunnable(condition, this::pushTrue, trueFinished);
+            pushFalse();
+            label(trueFinished);
+        }
+        
+        /**
+         * Executes a statement then jumps to the exit label if the condition is true, jumps over the statement if false
+         *
+         * @param condition
+         * @param stmt
+         * @param exit
+         */
+        private void conditionalStmt(TypedExpr condition, TypedStmt stmt, Label exit) {
+            conditionalRunnable(condition, () -> stmt.accept(this), exit);
+        }
+        
+        private void pushTrue() {
+            method.visitInsn(Opcodes.ICONST_1);
+        }
+        
+        private void pushFalse() {
+            method.visitInsn(Opcodes.ICONST_0);
+        }
+        
+        private void jumpIf(int opcode, Label label) {
+            method.visitJumpInsn(opcode, label);
+        }
+        
+        private void jump(Label label) {
+            method.visitJumpInsn(Opcodes.GOTO, label);
+        }
+        
+        private void label(Label label) {
+            method.visitLabel(label);
+        }
+        
+        private void conditionalRunnable(TypedExpr condition, Runnable trueBlock, Label trueFinished) {
+            Label exit = new Label(); // If the first conditional is false, jump over statement and don't execute it
+            if(condition instanceof Binary binaryCondition) {
+                switch(binaryCondition.operator) {
+                    case BOOLEAN_AND -> {
+                        // Operands assumed booleans
+                        binaryCondition.left.accept(this);
+                        jumpIf(OpcodeAlias.BOOL_FALSE, exit); // If left is false, short circuit, don't evaluate right
+                        binaryCondition.right.accept(this);
+                        jumpIf(OpcodeAlias.BOOL_FALSE, exit);
+                    }
+                    case BOOLEAN_OR -> {
+                        Label skipRight = new Label();
+                        // Operands assumed booleans
+                        binaryCondition.left.accept(this);
+                        jumpIf(OpcodeAlias.BOOL_TRUE, skipRight);
+                        binaryCondition.right.accept(this);
+                        jumpIf(OpcodeAlias.BOOL_FALSE, exit);
+                        label(skipRight);
+                    }
+                    case EQUALS -> {
+                        if(binaryOperandsSameType(Type.BOOLEAN, binaryCondition)) { // Operands assumed integers
+                            pushBinaryOperands(binaryCondition);
+                            jumpIf(OpcodeAlias.INTEGERS_NOT_EQUAL, exit);
+                            
+                        } else if(binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles
+                            binaryInsn(binaryCondition, Opcodes.DCMPG);
+                            jumpIf(OpcodeAlias.CMP_NOT_EQUALS, exit);
+                            
+                        } else if(binaryOperandsSameType(Type.STRING, binaryCondition)) {
+                            pushBinaryOperands(binaryCondition);
+                            method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z", false);
+                            jumpIf(OpcodeAlias.BOOL_FALSE, exit);
+                        } else throw new CompilerBugException();
+                    }
+                    case NOT_EQUALS -> {
+                        if(binaryOperandsSameType(Type.BOOLEAN, binaryCondition)) { // Operands assumed integers
+                            pushBinaryOperands(binaryCondition);
+                            jumpIf(OpcodeAlias.INTEGERS_EQUAL, exit);
+                            
+                        } else if(binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles
+                            binaryInsn(binaryCondition, Opcodes.DCMPG);
+                            jumpIf(OpcodeAlias.CMP_EQUALS, exit);
+                            
+                        } else if(binaryOperandsSameType(Type.STRING, binaryCondition)) { // Operands assumed references
+                            pushBinaryOperands(binaryCondition);
+                            method.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z", false);
+                            invertBool();
+                            jumpIf(OpcodeAlias.CMP_EQUALS, exit);
+                        } else throw new CompilerBugException();
+                    }
+                    case GREATER, GREATER_EQUALS, LESS, LESS_EQUALS -> {
+                        // Left and right assumed double
+                        binaryInsn(binaryCondition, switch(binaryCondition.operator) {
+                            case GREATER, GREATER_EQUALS -> Opcodes.DCMPL;
+                            case LESS, LESS_EQUALS -> Opcodes.DCMPG;
+                            default -> throw new IllegalStateException();
+                        });
+                        
+                        jumpIf(switch(binaryCondition.operator) {
+                            case GREATER -> OpcodeAlias.CMP_LESS_EQUALS;
+                            case GREATER_EQUALS -> OpcodeAlias.CMP_LESS_THAN;
+                            case LESS -> OpcodeAlias.CMP_GREATER_EQUALS;
+                            case LESS_EQUALS -> OpcodeAlias.CMP_GREATER_THAN;
+                            default -> throw new IllegalStateException();
+                        }, exit);
+                    }
+                    default -> throw new CompilerBugException();
+                }
+            } else {
+                // Assume condition returns bool
+                condition.accept(this);
+                jumpIf(OpcodeAlias.BOOL_FALSE, exit);
+            }
+            trueBlock.run();
+            jump(trueFinished); // Jump to end of statement after execution
+            label(exit);
+        }
+        
+        private String getFunctionDescriptor(List<Type> parameters, Type returnType) {
+            StringBuilder sb = new StringBuilder().append("(");
+            parameters.stream().map(parameter -> parameter.getCodegenType().getDescriptor()).forEach(sb::append);
+            sb.append(")");
+            sb.append(returnType.getCodegenType().getDescriptor());
+            return sb.toString();
+        }
+    }
+    
+    
+    private static class MethodExtractor extends ClassVisitor {
+        
+        private final String methodName;
+        private String methodDescription;
+        
+        protected MethodExtractor(String methodName) {
+            super(Opcodes.ASM9);
+            this.methodName = methodName;
+        }
+        
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+            if(name.equals(methodName))
+                methodDescription = descriptor;
+            return super.visitMethod(access, name, descriptor, signature, exceptions);
+        }
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/CompilationException.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.exception;
+
+import java.io.Serial;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class CompilationException extends Exception {
+    @Serial
+    private static final long serialVersionUID = 6744390543046766386L;
+    private final SourcePosition position;
+    
+    public CompilationException(String message, SourcePosition position) {
+        super(message);
+        this.position = position;
+    }
+    
+    @Override
+    public String getMessage() {
+        return "Error at " + position + ": " + super.getMessage();
+    }
+    
+    public SourcePosition getPosition() {
+        return position;
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/CompilerBugException.java

@@ -0,0 +1,5 @@
+package com.dfsek.terra.addons.terrascript.v2.exception;
+
+public class CompilerBugException extends RuntimeException {
+    // TODO - Add message constructor
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/lexer/EOFException.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.exception.lexer;
+
+import java.io.Serial;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class EOFException extends TokenizerException {
+    
+    @Serial
+    private static final long serialVersionUID = 3980047409902809440L;
+    
+    public EOFException(String message, SourcePosition position) {
+        super(message, position);
+    }
+    
+    public EOFException(String message, SourcePosition position, Throwable cause) {
+        super(message, position, cause);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/lexer/FormatException.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.exception.lexer;
+
+import java.io.Serial;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class FormatException extends TokenizerException {
+    
+    @Serial
+    private static final long serialVersionUID = -791308012940744455L;
+    
+    public FormatException(String message, SourcePosition position) {
+        super(message, position);
+    }
+    
+    public FormatException(String message, SourcePosition position, Throwable cause) {
+        super(message, position, cause);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/lexer/TokenizerException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.exception.lexer;
+
+import java.io.Serial;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+import com.dfsek.terra.addons.terrascript.v2.parser.ParseException;
+
+
+public abstract class TokenizerException extends ParseException {
+    
+    @Serial
+    private static final long serialVersionUID = 2792384010083575420L;
+    
+    public TokenizerException(String message, SourcePosition position) {
+        super(message, position);
+    }
+    
+    public TokenizerException(String message, SourcePosition position, Throwable cause) {
+        super(message, position, cause);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/IdentifierAlreadyDeclaredException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class IdentifierAlreadyDeclaredException extends CompilationException {
+    public IdentifierAlreadyDeclaredException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidArgumentsException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class InvalidArgumentsException extends CompilationException {
+    public InvalidArgumentsException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidCalleeException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class InvalidCalleeException extends CompilationException {
+    public InvalidCalleeException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidFunctionDeclarationException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class InvalidFunctionDeclarationException extends CompilationException {
+    public InvalidFunctionDeclarationException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/InvalidTypeException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class InvalidTypeException extends CompilationException {
+    public InvalidTypeException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/exception/semanticanalysis/UndefinedReferenceException.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class UndefinedReferenceException extends CompilationException {
+    public UndefinedReferenceException(String message, SourcePosition position) {
+        super(message, position);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Char.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.lexer;
+
+import java.util.Objects;
+
+
+public class Char {
+    private final char character;
+    private final SourcePosition position;
+    
+    
+    public Char(char character, SourcePosition position) {
+        this.character = character;
+        this.position = position;
+    }
+    
+    public boolean is(char... tests) {
+        for(char test : tests) {
+            if(test == character && test != '\0') {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    @Override
+    public String toString() {
+        return Character.toString(character);
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o) return true;
+        if(o == null || getClass() != o.getClass()) return false;
+        Char other = (Char) o;
+        return character == other.character && Objects.equals(position, other.position);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(character, position);
+    }
+    
+    public char getCharacter() {
+        return character;
+    }
+    
+    public boolean isWhitespace() {
+        return Character.isWhitespace(character);
+    }
+    
+    public boolean isNewLine() {
+        return character == '\n';
+    }
+    
+    public boolean isDigit() {
+        return Character.isDigit(character);
+    }
+    
+    public boolean isEOF() {
+        return character == '\0';
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Lexer.java

@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.lexer;
+
+import com.google.common.collect.Sets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.EOFException;
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.FormatException;
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.TokenizerException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
+import com.dfsek.terra.addons.terrascript.v2.parser.ParseException;
+
+
+public class Lexer {
+    public static final Set<Character> syntaxSignificant = Sets.newHashSet(':', ';', '(', ')', '"', ',', '\\', '=', '{', '}', '+', '-', '*',
+                                                                           '/',
+                                                                           '>', '<', '!'); // Reserved chars
+    private final LookaheadStream reader;
+    private Token current;
+    
+    public Lexer(String data) {
+        reader = new LookaheadStream(data + '\0');
+        current = tokenize();
+    }
+    
+    public List<Token> analyze() {
+        List<Token> tokens = new ArrayList<>();
+        while(hasNext()) {
+            tokens.add(consumeUnchecked());
+        }
+        tokens.add(current()); // Add EOF token
+        return tokens;
+    }
+    
+    /**
+     * Get the first token.
+     *
+     * @return First token
+     *
+     * @throws ParseException If token does not exist
+     */
+    public Token current() {
+        return current;
+    }
+    
+    /**
+     * Consume (get and remove) the first token.
+     *
+     * @return First token
+     *
+     * @throws ParseException If token does not exist
+     */
+    public Token consume(String wrongTypeMessage, TokenType expected, TokenType... more) {
+        if(!current.isType(expected) && Arrays.stream(more).noneMatch(t -> t == current.type())) throw new ParseException(wrongTypeMessage,
+                                                                                                                          current.position());
+        return consumeUnchecked();
+    }
+    
+    public Token consumeUnchecked() {
+        if(current.type() == TokenType.END_OF_FILE) return current;
+        Token temp = current;
+        current = tokenize();
+        return temp;
+    }
+    
+    /**
+     * Whether this {@code Tokenizer} contains additional tokens.
+     *
+     * @return {@code true} if more tokens are present, otherwise {@code false}
+     */
+    public boolean hasNext() {
+        return current.type() != TokenType.END_OF_FILE;
+    }
+    
+    private Token tokenize() throws TokenizerException {
+        consumeWhitespace();
+        SourcePosition position = reader.getPosition();
+        
+        // Skip line if comment
+        while(reader.matchesString("//", true)) skipLine();
+        
+        // Skip multi line comment
+        if(reader.matchesString("/*", true)) skipTo("*/");
+        
+        // Reached end of file
+        if(reader.current().isEOF()) return new Token(reader.consume().toString(), TokenType.END_OF_FILE, position);
+        
+        // Check if operator token
+        if(reader.matchesString("==", true))
+            return new Token("==", TokenType.EQUALS_EQUALS, position);
+        if(reader.matchesString("!=", true))
+            return new Token("!=", TokenType.BANG_EQUALS, position);
+        if(reader.matchesString(">=", true))
+            return new Token(">=", TokenType.GREATER_EQUAL, position);
+        if(reader.matchesString("<=", true))
+            return new Token("<=", TokenType.LESS_EQUALS, position);
+        if(reader.matchesString(">", true))
+            return new Token(">", TokenType.GREATER, position);
+        if(reader.matchesString("<", true))
+            return new Token("<", TokenType.LESS, position);
+        
+        // Check if logical operator
+        if(reader.matchesString("||", true))
+            return new Token("||", TokenType.BOOLEAN_OR, position);
+        if(reader.matchesString("&&", true))
+            return new Token("&&", TokenType.BOOLEAN_AND, position);
+        
+        // Check if number
+        if(isNumberStart()) {
+            StringBuilder num = new StringBuilder();
+            while(!reader.current().isEOF() && isNumberLike()) {
+                num.append(reader.consume().getCharacter());
+            }
+            return new Token(num.toString(), TokenType.NUMBER, position);
+        }
+        
+        // Check if string literal
+        if(reader.current().is('"')) {
+            reader.consume(); // Consume first quote
+            StringBuilder string = new StringBuilder();
+            boolean ignoreNext = false;
+            while((!reader.current().is('"')) || ignoreNext) {
+                if(reader.current().is('\\') && !ignoreNext) {
+                    ignoreNext = true;
+                    reader.consume();
+                    continue;
+                } else ignoreNext = false;
+                if(reader.current().isEOF())
+                    throw new FormatException("No end of string literal found. ", position);
+                string.append(reader.consume());
+            }
+            reader.consume(); // Consume last quote
+            
+            return new Token(string.toString(), TokenType.STRING, position);
+        }
+        
+        if(reader.current().is('('))
+            return new Token(reader.consume().toString(), TokenType.OPEN_PAREN, position);
+        if(reader.current().is(')'))
+            return new Token(reader.consume().toString(), TokenType.CLOSE_PAREN, position);
+        if(reader.current().is(':'))
+            return new Token(reader.consume().toString(), TokenType.COLON, position);
+        if(reader.current().is(';'))
+            return new Token(reader.consume().toString(), TokenType.STATEMENT_END, position);
+        if(reader.current().is(','))
+            return new Token(reader.consume().toString(), TokenType.SEPARATOR, position);
+        
+        if(reader.current().is('{')) return new Token(reader.consume().toString(), TokenType.BLOCK_BEGIN, position);
+        if(reader.current().is('}')) return new Token(reader.consume().toString(), TokenType.BLOCK_END, position);
+        
+        if(reader.current().is('='))
+            return new Token(reader.consume().toString(), TokenType.ASSIGNMENT, position);
+        if(reader.current().is('+'))
+            return new Token(reader.consume().toString(), TokenType.PLUS, position);
+        if(reader.current().is('-'))
+            return new Token(reader.consume().toString(), TokenType.MINUS,
+                             position);
+        if(reader.current().is('*'))
+            return new Token(reader.consume().toString(), TokenType.STAR,
+                             position);
+        if(reader.current().is('/'))
+            return new Token(reader.consume().toString(), TokenType.FORWARD_SLASH, position);
+        if(reader.current().is('%'))
+            return new Token(reader.consume().toString(), TokenType.MODULO_OPERATOR, position);
+        if(reader.current().is('!'))
+            return new Token(reader.consume().toString(), TokenType.BANG, position);
+        
+        // Read word
+        StringBuilder token = new StringBuilder();
+        while(!reader.current().isEOF() && !isSyntaxSignificant(reader.current().getCharacter())) {
+            Char c = reader.consume();
+            if(c.isWhitespace()) break;
+            token.append(c.getCharacter());
+        }
+        String tokenString = token.toString();
+        
+        // Check if word is a keyword
+        if(tokenString.equals("true"))
+            return new Token(tokenString, TokenType.BOOLEAN, position);
+        if(tokenString.equals("false"))
+            return new Token(tokenString, TokenType.BOOLEAN, position);
+        
+        if(tokenString.equals("var"))
+            return new Token(tokenString, TokenType.VARIABLE, position);
+        
+        if(tokenString.equals("fun"))
+            return new Token(tokenString, TokenType.FUNCTION, position);
+        
+        if(tokenString.equals("if"))
+            return new Token(tokenString, TokenType.IF_STATEMENT, position);
+        if(tokenString.equals("else"))
+            return new Token(tokenString, TokenType.ELSE, position);
+        if(tokenString.equals("while"))
+            return new Token(tokenString, TokenType.WHILE_LOOP, position);
+        if(tokenString.equals("for"))
+            return new Token(tokenString, TokenType.FOR_LOOP, position);
+        
+        if(tokenString.equals("return"))
+            return new Token(tokenString, TokenType.RETURN, position);
+        if(tokenString.equals("continue"))
+            return new Token(tokenString, TokenType.CONTINUE, position);
+        if(tokenString.equals("break"))
+            return new Token(tokenString, TokenType.BREAK, position);
+        if(tokenString.equals("fail"))
+            return new Token(tokenString, TokenType.FAIL, position);
+        
+        // If not keyword, assume it is an identifier
+        return new Token(tokenString, TokenType.IDENTIFIER, position);
+    }
+    
+    private void skipLine() {
+        while(!reader.current().isEOF() && !reader.current().isNewLine()) reader.consume();
+        consumeWhitespace();
+    }
+    
+    private void consumeWhitespace() {
+        while(!reader.current().isEOF() && reader.current().isWhitespace()) reader.consume(); // Consume whitespace.
+    }
+    
+    private void skipTo(String s) throws EOFException {
+        SourcePosition begin = reader.getPosition();
+        while(!reader.current().isEOF()) {
+            if(reader.matchesString(s, true)) {
+                consumeWhitespace();
+                return;
+            }
+            reader.consume();
+        }
+        throw new EOFException("Reached end of file without matching '" + s + "'", begin);
+    }
+    
+    private boolean isNumberLike() {
+        return reader.current().isDigit()
+               || reader.current().is('_', '.', 'E');
+    }
+    
+    private boolean isNumberStart() {
+        return reader.current().isDigit()
+               || reader.current().is('.') && reader.peek().isDigit();
+    }
+    
+    public boolean isSyntaxSignificant(char c) {
+        return syntaxSignificant.contains(c);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/LookaheadStream.java

@@ -0,0 +1,84 @@
+package com.dfsek.terra.addons.terrascript.v2.lexer;
+
+
+public class LookaheadStream {
+    
+    private final String source;
+    
+    private int index;
+    
+    private SourcePosition position = new SourcePosition(1, 1);
+    
+    public LookaheadStream(String source) {
+        this.source = source;
+    }
+    
+    /**
+     * Get the current character without consuming it.
+     *
+     * @return current character
+     */
+    public Char current() {
+        return new Char(source.charAt(index), position);
+    }
+    
+    /**
+     * Consume and return one character.
+     *
+     * @return Character that was consumed.
+     */
+    public Char consume() {
+        Char consumed = current();
+        incrementIndex(1);
+        return consumed;
+    }
+    
+    /**
+     * @return The next character in sequence.
+     */
+    public Char peek() {
+        int index = this.index + 1;
+        if(index + 1 >= source.length()) return null;
+        return new Char(source.charAt(index), getPositionAfter(1));
+    }
+    
+    /**
+     * Determines if the contained sequence of characters matches the string
+     *
+     * @param check            Input string to check against
+     * @param consumeIfMatched Whether to consume the string if there is a match
+     *
+     * @return If the string matches
+     */
+    public boolean matchesString(String check, boolean consumeIfMatched) {
+        boolean matches = check.equals(source.substring(index, Math.min(index + check.length(), source.length())));
+        if(matches && consumeIfMatched) incrementIndex(check.length());
+        return matches;
+    }
+    
+    /**
+     * @return Current position within the source file
+     */
+    public SourcePosition getPosition() {
+        return position;
+    }
+    
+    private void incrementIndex(int amount) {
+        position = getPositionAfter(amount);
+        index = Math.min(index + amount, source.length() - 1);
+    }
+    
+    private SourcePosition getPositionAfter(int chars) {
+        if(chars < 0) throw new IllegalArgumentException("Negative values are not allowed");
+        int line = position.line();
+        int column = position.column();
+        for(int i = index; i < Math.min(index + chars, source.length() - 1); i++) {
+            if(source.charAt(i) == '\n') {
+                line++;
+                column = 0;
+            }
+            column++;
+        }
+        return new SourcePosition(line, column);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/SourcePosition.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.lexer;
+
+import java.util.Objects;
+
+
+public record SourcePosition(int line, int column) {
+    
+    @Override
+    public String toString() {
+        return "line " + line + ", column " + column;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o) return true;
+        if(o == null || getClass() != o.getClass()) return false;
+        SourcePosition that = (SourcePosition) o;
+        return line == that.line && column == that.column;
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(line, column);
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Token.java

@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.lexer;
+
+import java.util.Objects;
+
+
+public class Token {
+    private final String lexeme;
+    private final TokenType type;
+    private final SourcePosition start;
+    
+    public Token(String lexeme, TokenType type, SourcePosition start) {
+        this.lexeme = type == TokenType.END_OF_FILE ? "END OF FILE" : lexeme;
+        this.type = type;
+        this.start = start;
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o) return true;
+        if(o == null || getClass() != o.getClass()) return false;
+        Token token = (Token) o;
+        return Objects.equals(lexeme, token.lexeme) && type == token.type && Objects.equals(start, token.start);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(lexeme, type, start);
+    }
+    
+    @Override
+    public String toString() {
+        return type + ": '" + lexeme + "'";
+    }
+    
+    public TokenType type() {
+        return type;
+    }
+    
+    public String lexeme() {
+        return lexeme;
+    }
+    
+    public SourcePosition position() {
+        return start;
+    }
+    
+    public boolean isType(TokenType... types) {
+        for(TokenType t : types) if(t == type) return true;
+        return false;
+    }
+    
+    public enum TokenType {
+        /**
+         * Function identifier or language keyword
+         */
+        IDENTIFIER,
+        
+        /**
+         * Numeric literal
+         */
+        NUMBER,
+        /**
+         * String literal
+         */
+        STRING,
+        /**
+         * Boolean literal
+         */
+        BOOLEAN,
+        /**
+         * Beginning of group
+         */
+        OPEN_PAREN,
+        /**
+         * Ending of group
+         */
+        CLOSE_PAREN,
+        /**
+         * End of statement
+         */
+        STATEMENT_END,
+        /**
+         * Argument separator
+         */
+        SEPARATOR,
+        /**
+         * Beginning of code block
+         */
+        BLOCK_BEGIN,
+        /**
+         * End of code block
+         */
+        BLOCK_END,
+        /**
+         * assignment operator
+         */
+        ASSIGNMENT,
+        /**
+         * Boolean equals operator
+         */
+        EQUALS_EQUALS,
+        /**
+         * Boolean not equals operator
+         */
+        BANG_EQUALS,
+        /**
+         * Boolean greater than operator
+         */
+        GREATER,
+        /**
+         * Boolean less than operator
+         */
+        LESS,
+        /**
+         * Boolean greater than or equal to operator
+         */
+        GREATER_EQUAL,
+        /**
+         * Boolean less than or equal to operator
+         */
+        LESS_EQUALS,
+        /**
+         * Addition/concatenation operator
+         */
+        PLUS,
+        /**
+         * Subtraction operator
+         */
+        MINUS,
+        /**
+         * Multiplication operator
+         */
+        STAR,
+        /**
+         * Division operator
+         */
+        FORWARD_SLASH,
+        /**
+         * Modulo operator.
+         */
+        MODULO_OPERATOR,
+        /**
+         * Boolean not operator
+         */
+        BANG,
+        /**
+         * Boolean or
+         */
+        BOOLEAN_OR,
+        /**
+         * Boolean and
+         */
+        BOOLEAN_AND,
+        /**
+         * Variable declaration
+         */
+        VARIABLE,
+        /**
+         * Function declaration
+         */
+        FUNCTION,
+        COLON,
+        /**
+         * If statement declaration
+         */
+        IF_STATEMENT,
+        /**
+         * While loop declaration
+         */
+        WHILE_LOOP,
+        /**
+         * Return statement
+         */
+        RETURN,
+        /**
+         * Continue statement
+         */
+        CONTINUE,
+        /**
+         * Break statement
+         */
+        BREAK,
+        /**
+         * Fail statement. Like return keyword, but specifies that generation has failed.
+         */
+        FAIL,
+        /**
+         * For loop initializer token
+         */
+        FOR_LOOP,
+        /**
+         * Else keyword
+         */
+        ELSE,
+        /**
+         * End of file
+         */
+        END_OF_FILE
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/parser/BinaryOperator.java

@@ -0,0 +1,25 @@
+package com.dfsek.terra.addons.terrascript.v2.parser;
+
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
+
+
+public enum BinaryOperator {
+    BOOLEAN_OR(Token.TokenType.BOOLEAN_OR),
+    BOOLEAN_AND(Token.TokenType.BOOLEAN_AND),
+    EQUALS(Token.TokenType.EQUALS_EQUALS),
+    NOT_EQUALS(Token.TokenType.BANG_EQUALS),
+    GREATER(Token.TokenType.GREATER),
+    GREATER_EQUALS(Token.TokenType.GREATER_EQUAL),
+    LESS(Token.TokenType.LESS),
+    LESS_EQUALS(Token.TokenType.LESS_EQUALS),
+    ADD(Token.TokenType.PLUS),
+    SUBTRACT(Token.TokenType.MINUS),
+    MULTIPLY(Token.TokenType.STAR),
+    DIVIDE(Token.TokenType.FORWARD_SLASH),
+    MODULO(Token.TokenType.MODULO_OPERATOR);
+    
+    public final Token.TokenType tokenType;
+    
+    BinaryOperator(Token.TokenType tokenType) { this.tokenType = tokenType; }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/parser/ParseException.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.terrascript.v2.parser;
+
+import java.io.Serial;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+
+public class ParseException extends RuntimeException {
+    @Serial
+    private static final long serialVersionUID = 6744390543046766386L;
+    private final SourcePosition position;
+    
+    public ParseException(String message, SourcePosition position) {
+        super(message);
+        this.position = position;
+    }
+    
+    public ParseException(String message, SourcePosition position, Throwable cause) {
+        super(message, cause);
+        this.position = position;
+    }
+    
+    @Override
+    public String getMessage() {
+        return "Error at " + position + ": " + super.getMessage();
+    }
+    
+    public SourcePosition getPosition() {
+        return position;
+    }
+}

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

@@ -0,0 +1,382 @@
+package com.dfsek.terra.addons.terrascript.v2.parser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.dfsek.terra.addons.terrascript.v2.Type;
+import com.dfsek.terra.addons.terrascript.v2.Type.TypeException;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Variable;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Block;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+
+/**
+ * TerraScript recursive descent parser
+ */
+public class Parser {
+    
+    private final List<Token> tokens;
+    
+    private int index = 0;
+    
+    private Parser(List<Token> tokens) {
+        if(tokens.stream().noneMatch(t -> t.isType(TokenType.END_OF_FILE)))
+            throw new IllegalArgumentException("Token list must contain at least one token of type " + TokenType.END_OF_FILE);
+        this.tokens = tokens;
+    }
+    
+    public static Block parse(List<Token> tokens) {
+        return new Parser(tokens).parseTokens();
+    }
+    
+    private Block parseTokens() {
+        List<Stmt> statements = new ArrayList<>();
+        while(hasNext()) {
+            statements.add(statement());
+        }
+        if(hasNext()) throw new ParseException("Tokens were remaining after parsing", current().position());
+        return new Stmt.Block(statements, new SourcePosition(0, 0));
+    }
+    
+    private Token current() {
+        return tokens.get(index);
+    }
+    
+    private boolean hasNext() {
+        return !current().isType(TokenType.END_OF_FILE);
+    }
+    
+    private Token consume(String wrongTypeMessage, TokenType expected, TokenType... more) {
+        if(!current().isType(expected) && Arrays.stream(more).noneMatch(t -> t == current().type())) throw new ParseException(
+                wrongTypeMessage, current().position());
+        return consumeUnchecked();
+    }
+    
+    public Token consumeUnchecked() {
+        if(!hasNext()) return current();
+        Token temp = current();
+        index++;
+        return temp;
+    }
+    
+    private void consumeStatementEnd(String after) {
+        consume("Expected ';' after " + after + ", found '" + current().lexeme() + "'", TokenType.STATEMENT_END);
+    }
+    
+    private Stmt statement() {
+        return switch(current().type()) {
+            case BLOCK_BEGIN -> block();
+            case FUNCTION -> functionDeclaration();
+            case VARIABLE -> variableDeclaration();
+            case RETURN -> returnStmt();
+            case IF_STATEMENT -> ifStmt();
+            case FOR_LOOP -> forLoop();
+            case WHILE_LOOP -> whileLoop();
+            case BREAK -> breakStmt();
+            case CONTINUE -> continueStmt();
+            case STATEMENT_END -> new Stmt.NoOp(consumeUnchecked().position());
+            default -> expressionStatement();
+        };
+    }
+    
+    private Stmt functionDeclaration() {
+        SourcePosition position = consume("Expected 'fun' keyword at start of function declaration", TokenType.FUNCTION).position();
+        String id = consume("Expected identifier after 'fun' keyword for function declaration", TokenType.IDENTIFIER).lexeme();
+        consume("Expected '(' after function identifier '" + id + "'", TokenType.OPEN_PAREN);
+        
+        // Parse parameters
+        List<Pair<String, Type>> params = new ArrayList<>();
+        while(!current().isType(TokenType.CLOSE_PAREN)) {
+            Token paramToken = consume("Expected parameter name or ')', found '" + current().lexeme() + "'", TokenType.IDENTIFIER);
+            String paramId = paramToken.lexeme();
+            if(params.stream().anyMatch(p -> Objects.equals(p.getLeft(), paramId)))
+                throw new ParseException("Parameter '" + paramId + "' has already been declared in function '" + id + "'",
+                                         paramToken.position());
+            
+            consume("Expected type declaration after parameter name. Example: '" + paramId + ": <type>'", TokenType.COLON);
+            Type paramType = typeExpr();
+            
+            params.add(Pair.of(paramId, paramType));
+            
+            if(current().isType(TokenType.CLOSE_PAREN)) break;
+            consume("Expected ',' or ')' after parameter declaration '" + paramId + "' in function '" + id + "'", TokenType.SEPARATOR);
+        }
+        
+        Type funcReturn = Type.VOID;
+        
+        consume("Expected ')' after " + (params.size() == 0 ? "')'" : "parameters") + " in declaration of function '" + id + "'",
+                TokenType.CLOSE_PAREN);
+        if(current().isType(TokenType.COLON)) {
+            consumeUnchecked();
+            funcReturn = typeExpr();
+        }
+        
+        Stmt.Block body = blockOrSingleStatement();
+        
+        return new Stmt.FunctionDeclaration(id, params, funcReturn, body, position);
+    }
+    
+    private Stmt.VariableDeclaration variableDeclaration() {
+        SourcePosition position = consume("Expected 'var' keyword at start of variable declaration", TokenType.VARIABLE).position();
+        String id = consume("Expected variable name after type for variable declaration", TokenType.IDENTIFIER).lexeme();
+        consume("Expected ':' after variable name", TokenType.COLON);
+        Type type = typeExpr();
+        consume("Expected '=' following variable type declaration", TokenType.ASSIGNMENT);
+        Expr expr = expression();
+        consumeStatementEnd("variable declaration");
+        
+        return new Stmt.VariableDeclaration(type, id, expr, position);
+    }
+    
+    private Type typeExpr() {
+        Token typeToken = consume("Expected " + TokenType.IDENTIFIER + " specified as variable type", TokenType.IDENTIFIER);
+        try {
+            return Type.fromString(typeToken.lexeme());
+        } catch(TypeException e) {
+            throw new ParseException("Failed to parse type expression", typeToken.position());
+        }
+    }
+    
+    private Stmt.Return returnStmt() {
+        SourcePosition position = consume("Expected 'return' keyword, found '" + current().lexeme() + "'", TokenType.RETURN).position();
+        Expr value = new Expr.Void(position);
+        if(!current().isType(TokenType.STATEMENT_END))
+            value = expression();
+        consumeStatementEnd("return statement");
+        return new Stmt.Return(value, position);
+    }
+    
+    private Stmt.If ifStmt() {
+        // Parse main if clause
+        SourcePosition position = consume("Expected 'if' keyword at beginning of if statement", TokenType.IF_STATEMENT).position();
+        consume("Expected '(' after 'if' keyword", TokenType.OPEN_PAREN);
+        Expr condition = expression();
+        consume("Expected ')' after if statement condition", TokenType.CLOSE_PAREN);
+        Stmt.Block trueBody = blockOrSingleStatement();
+        
+        // Parse any else clauses
+        Stmt.Block elseBody = null;
+        List<Pair<Expr, Stmt.Block>> elseIfClauses = new ArrayList<>();
+        while(current().isType(TokenType.ELSE)) {
+            consumeUnchecked(); // Consume else
+            
+            if(!current().isType(TokenType.IF_STATEMENT)) {
+                elseBody = blockOrSingleStatement();
+                break; // Else clause should be last in if statement
+            }
+            
+            consumeUnchecked(); // Consume if
+            consume("Expected '(' after 'else if', e.g. 'if else (<condition>) ...'", TokenType.OPEN_PAREN);
+            Expr elseIfCondition = expression();
+            consume("Expected ')' after 'else if' clause, e.g. 'else if (<condition>) ...'", TokenType.CLOSE_PAREN);
+            Stmt.Block elseIfBody = blockOrSingleStatement();
+            elseIfClauses.add(Pair.of(elseIfCondition, elseIfBody));
+        }
+        
+        return new Stmt.If(condition, trueBody, elseIfClauses, Optional.ofNullable(elseBody), position);
+    }
+    
+    private Stmt.For forLoop() {
+        SourcePosition position = consume("Expected 'for' keyword at beginning of for loop", TokenType.FOR_LOOP).position();
+        consume("Expected '(' after 'for' keyword", TokenType.OPEN_PAREN);
+        Stmt initializer = statement();
+        Expr condition;
+        if(current().isType(TokenType.STATEMENT_END)) {
+            condition = new Expr.Literal(true, Type.BOOLEAN,
+                                         current().position()); // If no condition is provided, set condition = true
+            consumeUnchecked();
+        } else {
+            condition = expression();
+            consumeStatementEnd("loop condition");
+        }
+        Expr incrementer;
+        if(current().isType(TokenType.CLOSE_PAREN)) {
+            incrementer = null;
+            consumeUnchecked();
+        } else {
+            incrementer = expression();
+            consume("Expected ')' after for loop incrementer", TokenType.CLOSE_PAREN);
+        }
+        Stmt.Block body = blockOrSingleStatement();
+        return new Stmt.For(initializer, condition, incrementer, body, position);
+    }
+    
+    private Stmt.While whileLoop() {
+        SourcePosition position = consume("Expected 'for' keyword at beginning of while loop", TokenType.WHILE_LOOP).position();
+        consume("Expected '(' after 'while' keyword", TokenType.OPEN_PAREN);
+        Expr condition = expression();
+        consume("Expected ')' after while loop condition", TokenType.CLOSE_PAREN);
+        Stmt.Block body = blockOrSingleStatement();
+        return new Stmt.While(condition, body, position);
+    }
+    
+    private Stmt.Break breakStmt() {
+        SourcePosition position = consume("Expected 'break' keyword for break statement", TokenType.BREAK).position();
+        consumeStatementEnd("'break' keyword");
+        return new Stmt.Break(position);
+    }
+    
+    private Stmt.Continue continueStmt() {
+        SourcePosition position = consume("Expected 'continue' keyword for continue statement", TokenType.CONTINUE).position();
+        consumeStatementEnd("'continue' keyword");
+        return new Stmt.Continue(position);
+    }
+    
+    private Stmt.Block blockOrSingleStatement() {
+        if(!current().isType(TokenType.BLOCK_BEGIN)) return new Stmt.Block(List.of(statement()), current().position());
+        return block();
+    }
+    
+    private Stmt.Block block() {
+        SourcePosition position = consume("Expected '{' at start of block", TokenType.BLOCK_BEGIN).position();
+        List<Stmt> statements = new ArrayList<>();
+        while(!current().isType(TokenType.BLOCK_END)) {
+            statements.add(statement());
+        }
+        consume("Expected '}' at end of block", TokenType.BLOCK_END);
+        return new Stmt.Block(statements, position);
+    }
+    
+    private Stmt expressionStatement() {
+        Expr expression = expression();
+        consumeStatementEnd("expression statement");
+        return new Stmt.Expression(expression, expression.position);
+    }
+    
+    private Expr expression() {
+        return assignment();
+    }
+    
+    private Expr leftAssociativeBinaryExpression(Supplier<Expr> higherPrecedence, BinaryOperator... operators) {
+        Expr expr = higherPrecedence.get();
+        loop:
+        while(true) {
+            for(BinaryOperator operator : operators) {
+                if(current().isType(operator.tokenType)) {
+                    SourcePosition position = consumeUnchecked().position(); // Consume operator token
+                    expr = new Expr.Binary(expr, operator, higherPrecedence.get(), position);
+                    continue loop;
+                }
+            }
+            break; // Break if not any operator
+        }
+        return expr;
+    }
+    
+    private Expr rightAssociativeBinaryExpression(Supplier<Expr> higherPrecedence, BinaryOperator... operators) {
+        Expr expr = higherPrecedence.get();
+        for(BinaryOperator operator : operators) {
+            if(current().isType(operator.tokenType)) {
+                SourcePosition position = consumeUnchecked().position(); // Consume operator token
+                return new Expr.Binary(expr, operator, rightAssociativeBinaryExpression(higherPrecedence, operators), position);
+            }
+        }
+        return expr;
+    }
+    
+    private Expr assignment() {
+        Expr expr = logicOr();
+        if(current().isType(TokenType.ASSIGNMENT)) {
+            SourcePosition position = consumeUnchecked().position(); // Consume operator token
+            if(!(expr instanceof Variable variable)) throw new ParseException("Invalid assignment target", position);
+            return new Expr.Assignment(variable, assignment(), position);
+        }
+        return expr;
+    }
+    
+    private Expr logicOr() {
+        return leftAssociativeBinaryExpression(this::logicAnd, BinaryOperator.BOOLEAN_OR);
+    }
+    
+    private Expr logicAnd() {
+        return leftAssociativeBinaryExpression(this::equality, BinaryOperator.BOOLEAN_AND);
+    }
+    
+    private Expr equality() {
+        return leftAssociativeBinaryExpression(this::comparison, BinaryOperator.EQUALS, BinaryOperator.NOT_EQUALS);
+    }
+    
+    private Expr comparison() {
+        return leftAssociativeBinaryExpression(this::term, BinaryOperator.GREATER, BinaryOperator.GREATER_EQUALS, BinaryOperator.LESS,
+                                               BinaryOperator.LESS_EQUALS);
+    }
+    
+    private Expr term() {
+        return leftAssociativeBinaryExpression(this::factor, BinaryOperator.ADD, BinaryOperator.SUBTRACT);
+    }
+    
+    private Expr factor() {
+        return leftAssociativeBinaryExpression(this::unary, BinaryOperator.MULTIPLY, BinaryOperator.DIVIDE, BinaryOperator.MODULO);
+    }
+    
+    private Expr unary() {
+        UnaryOperator[] operators = { UnaryOperator.NOT, UnaryOperator.NEGATE };
+        for(UnaryOperator operator : operators) {
+            if(current().isType(operator.tokenType)) {
+                SourcePosition position = consumeUnchecked().position();
+                return new Expr.Unary(operator, unary(), position);
+            }
+        }
+        return postfix();
+    }
+    
+    private Expr postfix() {
+        Expr expr = primary();
+        while(current().isType(TokenType.OPEN_PAREN)) {
+            expr = call(expr);
+        }
+        return expr;
+    }
+    
+    private Expr primary() {
+        Token token = consumeUnchecked();
+        SourcePosition position = token.position();
+        return switch(token.type()) {
+            case NUMBER -> new Expr.Literal(Double.parseDouble(token.lexeme()), Type.NUMBER, position);
+            case STRING -> new Expr.Literal(token.lexeme(), Type.STRING, position);
+            case BOOLEAN -> new Expr.Literal(Boolean.parseBoolean(token.lexeme()), Type.BOOLEAN, position);
+            case IDENTIFIER -> variable(token);
+            case OPEN_PAREN -> {
+                if(current().isType(TokenType.CLOSE_PAREN)) {
+                    consumeUnchecked(); // Consume ')'
+                    yield new Expr.Void(position); // () evaluates to void
+                }
+                Expr expr = expression();
+                consume("Expected ')' to close '(' located at " + position, TokenType.CLOSE_PAREN);
+                yield new Expr.Grouping(expr, position);
+            }
+            default -> throw new ParseException("Unexpected token '" + token.lexeme() + "'", position);
+        };
+    }
+    
+    private Expr call(Expr function) {
+        SourcePosition position = consume("Expected '(' to initiate function call on function", TokenType.OPEN_PAREN).position();
+        
+        List<Expr> args = new ArrayList<>();
+        while(!current().isType(TokenType.CLOSE_PAREN)) {
+            args.add(expression());
+            if(current().isType(TokenType.CLOSE_PAREN)) break;
+            consume("Expected ',' or ')' after passed argument in function call", TokenType.SEPARATOR);
+        }
+        
+        consume("Expected ')' after " + (args.size() == 0 ? "')'" : "arguments") + " in function call",
+                TokenType.CLOSE_PAREN);
+        
+        return new Expr.Call(function, args, position);
+    }
+    
+    private Expr variable(Token identifier) {
+        return new Expr.Variable(identifier.lexeme(), identifier.position());
+    }
+    
+    
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/parser/UnaryOperator.java

@@ -0,0 +1,13 @@
+package com.dfsek.terra.addons.terrascript.v2.parser;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
+
+
+public enum UnaryOperator {
+    NOT(Token.TokenType.BANG),
+    NEGATE(Token.TokenType.MINUS);
+    
+    public final Token.TokenType tokenType;
+    
+    UnaryOperator(Token.TokenType tokenType) { this.tokenType = tokenType; }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/ScopeAnalyzer.java

@@ -0,0 +1,189 @@
+package com.dfsek.terra.addons.terrascript.v2.semanticanalysis;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.terrascript.v2.Environment;
+import com.dfsek.terra.addons.terrascript.v2.Environment.Symbol;
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.Type;
+import com.dfsek.terra.addons.terrascript.v2.Type.Function;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Assignment;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Binary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Call;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Grouping;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Literal;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Unary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Variable;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Visitor;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Void;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.IdentifierAlreadyDeclaredException;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+import static com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.SymbolAlreadyExistsException;
+
+
+public class ScopeAnalyzer implements Visitor<Void>, Stmt.Visitor<Void> {
+    
+    private final ErrorHandler errorHandler;
+    private Environment currentScope;
+    
+    
+    public ScopeAnalyzer(Environment globalScope, ErrorHandler errorHandler) {
+        this.currentScope = globalScope;
+        this.errorHandler = errorHandler;
+    }
+    
+    @Override
+    public Void visitBinaryExpr(Binary expr) {
+        expr.right.accept(this);
+        expr.left.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitGroupingExpr(Grouping expr) {
+        expr.expression.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitLiteralExpr(Literal expr) {
+        return null;
+    }
+    
+    @Override
+    public Void visitUnaryExpr(Unary expr) {
+        expr.operand.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitCallExpr(Call expr) {
+        expr.callee.accept(this);
+        expr.arguments.forEach(e -> e.accept(this));
+        return null;
+    }
+    
+    @Override
+    public Void visitVariableExpr(Variable expr) {
+        expr.setScope(currentScope);
+        return null;
+    }
+    
+    @Override
+    public Void visitAssignmentExpr(Assignment expr) {
+        expr.lValue.accept(this);
+        expr.rValue.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitVoidExpr(Void expr) {
+        return null;
+    }
+    
+    @Override
+    public Void visitExpressionStmt(Stmt.Expression stmt) {
+        stmt.expression.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitBlockStmt(Stmt.Block stmt) {
+        currentScope = currentScope.lexicalInner();
+        stmt.statements.forEach(s -> s.accept(this));
+        currentScope = currentScope.outer();
+        return null;
+    }
+    
+    @Override
+    public Void visitFunctionDeclarationStmt(Stmt.FunctionDeclaration stmt) {
+        currentScope = currentScope.functionalInner();
+        for(Pair<String, Type> param : stmt.parameters) {
+            try {
+                currentScope.put(param.getLeft(), new Symbol.Variable(param.getRight()));
+            } catch(SymbolAlreadyExistsException e) {
+                throw new IllegalStateException("Formal parameter '" + param.getLeft() + "' defined in '" + stmt.identifier +
+                                                "' already exists in the function scope");
+            }
+        }
+        stmt.body.accept(this);
+        currentScope = currentScope.outer();
+        try {
+            List<Type> parameters = stmt.parameters.stream().map(Pair::getRight).toList();
+            Function function = new Function(stmt.returnType, parameters, stmt.identifier, currentScope);
+            Symbol.Variable symbol = new Symbol.Variable(function);
+            stmt.setSymbol(symbol);
+            currentScope.put(stmt.identifier, symbol);
+        } catch(SymbolAlreadyExistsException e) {
+            errorHandler.add(new IdentifierAlreadyDeclaredException("Name '" + stmt.identifier + "' is already defined in this scope",
+                                                                    stmt.position));
+        }
+        return null;
+    }
+    
+    @Override
+    public Void visitVariableDeclarationStmt(Stmt.VariableDeclaration stmt) {
+        stmt.setScope(currentScope);
+        stmt.value.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitReturnStmt(Stmt.Return stmt) {
+        stmt.value.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitIfStmt(Stmt.If stmt) {
+        stmt.condition.accept(this);
+        stmt.trueBody.accept(this);
+        for(Pair<Expr, Stmt.Block> clause : stmt.elseIfClauses) {
+            clause.getLeft().accept(this);
+            clause.getRight().accept(this);
+        }
+        stmt.elseBody.ifPresent(b -> b.accept(this));
+        return null;
+    }
+    
+    @Override
+    public Expr.Void visitForStmt(Stmt.For stmt) {
+        currentScope = currentScope.loopInner(); // Loop initializer, condition, and incrementer belong to inner scope
+        
+        stmt.initializer.accept(this);
+        stmt.condition.accept(this);
+        stmt.incrementer.accept(this);
+        stmt.body.accept(this);
+        
+        currentScope = currentScope.outer();
+        return null;
+    }
+    
+    @Override
+    public Expr.Void visitWhileStmt(Stmt.While stmt) {
+        stmt.condition.accept(this);
+        currentScope = currentScope.loopInner();
+        stmt.body.accept(this);
+        currentScope = currentScope.outer();
+        return null;
+    }
+    
+    @Override
+    public Expr.Void visitNoOpStmt(Stmt.NoOp stmt) {
+        return null;
+    }
+    
+    @Override
+    public Expr.Void visitBreakStmt(Stmt.Break stmt) {
+        return null;
+    }
+    
+    @Override
+    public Expr.Void visitContinueStmt(Stmt.Continue stmt) {
+        return null;
+    }
+    
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/SemanticAnalyzer.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.addons.terrascript.v2.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.Environment;
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
+
+
+public class SemanticAnalyzer {
+    
+    public static TypedStmt.Block analyze(Stmt.Block root, ErrorHandler errorHandler) throws Exception {
+        new ScopeAnalyzer(Environment.global(), errorHandler).visitBlockStmt(root);
+        errorHandler.throwAny();
+        
+        new VariableAnalyzer(errorHandler).visitBlockStmt(root);
+        errorHandler.throwAny();
+        
+        TypedStmt.Block checkedRoot = (TypedStmt.Block) new TypeChecker(errorHandler).visitBlockStmt(root);
+        errorHandler.throwAny();
+        
+        return checkedRoot;
+    }
+    
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java

@@ -0,0 +1,279 @@
+package com.dfsek.terra.addons.terrascript.v2.semanticanalysis;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.Type;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Assignment;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Binary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Call;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Grouping;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Literal;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Unary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Variable;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Visitor;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Void;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidArgumentsException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidCalleeException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidFunctionDeclarationException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidTypeException;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+import static com.dfsek.terra.addons.terrascript.v2.util.OrdinalUtil.ordinalOf;
+
+
+public class TypeChecker implements Visitor<TypedExpr>, Stmt.Visitor<TypedStmt> {
+    
+    private final ErrorHandler errorHandler;
+    
+    TypeChecker(ErrorHandler errorHandler) { this.errorHandler = errorHandler; }
+    
+    @Override
+    public TypedExpr visitBinaryExpr(Binary expr) {
+        TypedExpr left = expr.left.accept(this);
+        TypedExpr right = expr.right.accept(this);
+        
+        Type leftType = left.type;
+        Type rightType = right.type;
+        
+        Type type = switch(expr.operator) {
+            case BOOLEAN_OR, BOOLEAN_AND -> {
+                if(!leftType.typeOf(Type.BOOLEAN) || !rightType.typeOf(Type.BOOLEAN))
+                    errorHandler.add(new InvalidTypeException(
+                            "Both operands of '" + expr.operator + "' operator must be of type '" + Type.BOOLEAN + "', found types '" +
+                            leftType + "' and '" + rightType + "'", expr.position));
+                yield Type.BOOLEAN;
+            }
+            case EQUALS, NOT_EQUALS -> {
+                if(!leftType.typeOf(rightType)) errorHandler.add(new InvalidTypeException(
+                        "Both operands of equality operator (==) must be of the same type, found mismatched types '" + leftType +
+                        "' and '" + rightType + "'", expr.position));
+                yield Type.BOOLEAN;
+            }
+            case GREATER, GREATER_EQUALS, LESS, LESS_EQUALS -> {
+                if(!leftType.typeOf(Type.NUMBER) || !rightType.typeOf(Type.NUMBER))
+                    errorHandler.add(new InvalidTypeException(
+                            "Both operands of '" + expr.operator + "' operator must be of type '" + Type.NUMBER + "', found types '" +
+                            leftType + "' and '" + rightType + "'", expr.position));
+                yield Type.BOOLEAN;
+            }
+            case ADD -> {
+                if(leftType.typeOf(Type.NUMBER) && rightType.typeOf(Type.NUMBER)) {
+                    yield Type.NUMBER;
+                }
+                if(leftType.typeOf(Type.STRING) || rightType.typeOf(Type.STRING)) {
+                    yield Type.STRING;
+                }
+                errorHandler.add(new InvalidTypeException(
+                        "Addition operands must be either both of type '" + Type.NUMBER + "', or one of type '" + Type.STRING + "'",
+                        expr.position));
+                yield Type.VOID;
+            }
+            case SUBTRACT, MULTIPLY, DIVIDE, MODULO -> {
+                if(!leftType.typeOf(Type.NUMBER) || !rightType.typeOf(Type.NUMBER))
+                    errorHandler.add(new InvalidTypeException(
+                            "Both operands of '" + expr.operator + "' operator must be of type '" + Type.NUMBER + "', found types '" +
+                            leftType + "' and '" + rightType + "'", expr.position));
+                yield Type.NUMBER;
+            }
+        };
+        return new TypedExpr.Binary(left, expr.operator, right, type);
+    }
+    
+    @Override
+    public TypedExpr visitGroupingExpr(Grouping expr) {
+        return expr.expression.accept(this);
+    }
+    
+    @Override
+    public TypedExpr visitLiteralExpr(Literal expr) {
+        return new TypedExpr.Literal(expr.value, expr.type);
+    }
+    
+    @Override
+    public TypedExpr visitUnaryExpr(Unary expr) {
+        TypedExpr right = expr.operand.accept(this);
+        Type type = switch(expr.operator) {
+            case NOT -> {
+                if(!right.type.typeOf(Type.BOOLEAN)) throw new RuntimeException();
+                yield Type.BOOLEAN;
+            }
+            case NEGATE -> {
+                if(!right.type.typeOf(Type.NUMBER)) throw new RuntimeException();
+                yield Type.NUMBER;
+            }
+        };
+        return new TypedExpr.Unary(expr.operator, right, type);
+    }
+    
+    @Override
+    public TypedExpr visitCallExpr(Call expr) {
+        
+        TypedExpr function = expr.callee.accept(this);
+        
+        if(!(function.type instanceof Type.Function functionType)) {
+            errorHandler.add(
+                    new InvalidCalleeException("Cannot call type '" + function.type + "', only functions can be called", expr.position));
+            return new TypedExpr.Void(Type.VOID);
+        }
+        
+        List<TypedExpr> arguments = expr.arguments.stream().map(a -> a.accept(this)).toList();
+        List<Type> parameters = functionType.getParameters();
+        
+        if(arguments.size() != parameters.size())
+            errorHandler.add(new InvalidArgumentsException(
+                    "Provided " + arguments.size() + " arguments to function call, expected " + parameters.size() + " arguments",
+                    expr.position));
+        
+        for(int i = 0; i < parameters.size(); i++) {
+            Type expectedType = parameters.get(i);
+            Type providedType = arguments.get(i).type;
+            if(!expectedType.typeOf(providedType))
+                errorHandler.add(new InvalidTypeException(
+                        ordinalOf(i + 1) + " argument provided for function. Function expects type " + expectedType + ", found " +
+                        providedType + " instead", expr.position));
+        }
+        
+        return new TypedExpr.Call(function, arguments, functionType.getReturnType());
+    }
+    
+    @Override
+    public TypedExpr visitVariableExpr(Variable expr) {
+        return new TypedExpr.Variable(expr.identifier, expr.getSymbol().type);
+    }
+    
+    @Override
+    public TypedExpr visitAssignmentExpr(Assignment expr) {
+        TypedExpr.Variable left = (TypedExpr.Variable) expr.lValue.accept(this);
+        TypedExpr right = expr.rValue.accept(this);
+        Type expected = left.type;
+        String id = expr.lValue.identifier;
+        if(!right.type.typeOf(expected))
+            errorHandler.add(new InvalidTypeException(
+                    "Cannot assign variable '" + id + "' to value of type '" + right.type + "', '" + id + "' is declared with type '" +
+                    expected + "'",
+                    expr.position));
+        return new TypedExpr.Assignment(left, right, right.type);
+    }
+    
+    @Override
+    public TypedExpr visitVoidExpr(Void expr) {
+        return new TypedExpr.Void(Type.VOID);
+    }
+    
+    @Override
+    public TypedStmt visitExpressionStmt(Stmt.Expression stmt) {
+        return new TypedStmt.Expression(stmt.expression.accept(this));
+    }
+    
+    @Override
+    public TypedStmt visitBlockStmt(Stmt.Block stmt) {
+        return new TypedStmt.Block(stmt.statements.stream().map(s -> s.accept(this)).toList());
+    }
+    
+    @Override
+    public TypedStmt visitFunctionDeclarationStmt(Stmt.FunctionDeclaration stmt) {
+        TypedStmt.Block body = new TypedStmt.Block(stmt.body.statements.stream().map(s -> s.accept(this)).toList());
+        boolean hasReturn = alwaysReturns(body, stmt);
+        if(!stmt.returnType.typeOf(Type.VOID) && !hasReturn) {
+            errorHandler.add(
+                    new InvalidFunctionDeclarationException("Function body for '" + stmt.identifier + "' does not contain return statement",
+                                                            stmt.position));
+        }
+        return new TypedStmt.FunctionDeclaration(stmt.identifier, stmt.parameters, stmt.returnType, body,
+                                                 ((Type.Function) stmt.getSymbol().type).getId());
+    }
+    
+    private boolean alwaysReturns(TypedStmt stmt, Stmt.FunctionDeclaration function) {
+        if(stmt instanceof TypedStmt.Return ret) {
+            if(!ret.value.type.typeOf(function.returnType))
+                errorHandler.add(new InvalidTypeException(
+                        "Return statement must match function's return type. Function '" + function.identifier + "' expects " +
+                        function.returnType + ", found " + ret.value.type + " instead", function.position));
+            return true;
+        } else if(stmt instanceof TypedStmt.If ifStmt) {
+            return alwaysReturns(ifStmt.trueBody, function) &&
+                   ifStmt.elseIfClauses.stream().map(Pair::getRight).allMatch(s -> alwaysReturns(s, function)) &&
+                   ifStmt.elseBody.map(body -> alwaysReturns(body, function)).orElse(
+                           false); // If else body is not defined then statement does not always return
+        } else if(stmt instanceof TypedStmt.Block block) {
+            return block.statements.stream().anyMatch(s -> alwaysReturns(s, function));
+        }
+        return false;
+    }
+    
+    @Override
+    public TypedStmt visitVariableDeclarationStmt(Stmt.VariableDeclaration stmt) {
+        TypedExpr value = stmt.value.accept(this);
+        if(!stmt.type.typeOf(value.type))
+            errorHandler.add(new InvalidTypeException(
+                    "Type of value assigned to variable '" + stmt.identifier +
+                    "' does not match variable's declared type. Expected type '" +
+                    stmt.type + "', found '" + value.type + "' instead", stmt.position));
+        return new TypedStmt.VariableDeclaration(stmt.type, stmt.identifier, value);
+    }
+    
+    @Override
+    public TypedStmt visitReturnStmt(Stmt.Return stmt) {
+        return new TypedStmt.Return(stmt.value.accept(this));
+    }
+    
+    @Override
+    public TypedStmt visitIfStmt(Stmt.If stmt) {
+        TypedExpr condition = stmt.condition.accept(this);
+        if(!condition.type.typeOf(Type.BOOLEAN)) errorHandler.add(new InvalidTypeException(
+                "If statement conditional must be of type '" + Type.BOOLEAN + "', found '" + condition.type + "' instead.", stmt.position));
+        
+        TypedStmt.Block trueBody = (TypedStmt.Block) stmt.trueBody.accept(this);
+        List<Pair<TypedExpr, TypedStmt.Block>> elseIfClauses = stmt.elseIfClauses.stream().map(c -> {
+            TypedExpr clauseCondition = c.getLeft().accept(this);
+            if(!clauseCondition.type.typeOf(Type.BOOLEAN)) errorHandler.add(new InvalidTypeException(
+                    "Else if clause conditional must be of type '" + Type.BOOLEAN + "', found '" + condition.type + "' instead.",
+                    stmt.position));
+            return Pair.of(clauseCondition, (TypedStmt.Block) c.getRight().accept(this));
+        }).toList();
+        
+        Optional<TypedStmt.Block> elseBody = stmt.elseBody.map(b -> (TypedStmt.Block) b.accept(this));
+        
+        return new TypedStmt.If(condition, trueBody, elseIfClauses, elseBody);
+    }
+    
+    @Override
+    public TypedStmt visitForStmt(Stmt.For stmt) {
+        TypedStmt initializer = stmt.initializer.accept(this);
+        TypedExpr condition = stmt.condition.accept(this);
+        if(!condition.type.typeOf(Type.BOOLEAN)) errorHandler.add(new InvalidTypeException(
+                "For statement conditional must be of type '" + Type.BOOLEAN + "', found '" + condition.type + "' instead.",
+                stmt.position));
+        TypedExpr incrementer = stmt.incrementer.accept(this);
+        return new TypedStmt.For(initializer, condition, incrementer, (TypedStmt.Block) stmt.body.accept(this));
+    }
+    
+    @Override
+    public TypedStmt visitWhileStmt(Stmt.While stmt) {
+        TypedExpr condition = stmt.condition.accept(this);
+        if(!condition.type.typeOf(Type.BOOLEAN)) errorHandler.add(new InvalidTypeException(
+                "While statement conditional must be of type '" + Type.BOOLEAN + "', found '" + condition.type + "' instead.",
+                stmt.position));
+        return new TypedStmt.While(condition, (TypedStmt.Block) stmt.body.accept(this));
+    }
+    
+    @Override
+    public TypedStmt visitNoOpStmt(Stmt.NoOp stmt) {
+        return new TypedStmt.NoOp();
+    }
+    
+    @Override
+    public TypedStmt visitBreakStmt(Stmt.Break stmt) {
+        return new TypedStmt.Break();
+    }
+    
+    @Override
+    public TypedStmt visitContinueStmt(Stmt.Continue stmt) {
+        return new TypedStmt.Continue();
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/VariableAnalyzer.java

@@ -0,0 +1,172 @@
+package com.dfsek.terra.addons.terrascript.v2.semanticanalysis;
+
+import com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.NonexistentSymbolException;
+import com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.SymbolAlreadyExistsException;
+import com.dfsek.terra.addons.terrascript.v2.Environment.Symbol;
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Assignment;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Binary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Call;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Grouping;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Literal;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Unary;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Variable;
+import com.dfsek.terra.addons.terrascript.v2.ast.Expr.Void;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Block;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Break;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Continue;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Expression;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.For;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.FunctionDeclaration;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.If;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.NoOp;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Return;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.VariableDeclaration;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.While;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.IdentifierAlreadyDeclaredException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.UndefinedReferenceException;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
+
+public class VariableAnalyzer implements Expr.Visitor<Void>, Stmt.Visitor<Void> {
+    
+    private final ErrorHandler errorHandler;
+    
+    public VariableAnalyzer(ErrorHandler errorHandler) { this.errorHandler = errorHandler; }
+    
+    @Override
+    public Void visitBinaryExpr(Binary expr) {
+        expr.left.accept(this);
+        expr.right.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitGroupingExpr(Grouping expr) {
+        expr.expression.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitLiteralExpr(Literal expr) {
+        return null;
+    }
+    
+    @Override
+    public Void visitUnaryExpr(Unary expr) {
+        expr.operand.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitCallExpr(Call expr) {
+        expr.callee.accept(this);
+        expr.arguments.forEach(e -> e.accept(this));
+        return null;
+    }
+    
+    @Override
+    public Void visitVariableExpr(Variable expr) {
+        String id = expr.identifier;
+        try {
+            expr.setSymbol(expr.getScope().getVariable(id));
+        } catch(NonexistentSymbolException e) {
+            errorHandler.add(
+                    new UndefinedReferenceException("'" + id + "' not is defined in this scope", expr.position));
+        }
+        return null;
+    }
+    
+    @Override
+    public Void visitAssignmentExpr(Assignment expr) {
+        expr.lValue.accept(this);
+        expr.rValue.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitVoidExpr(Void expr) {
+        return null;
+    }
+    
+    @Override
+    public Void visitExpressionStmt(Expression stmt) {
+        stmt.expression.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitBlockStmt(Block stmt) {
+        stmt.statements.forEach(s -> s.accept(this));
+        return null;
+    }
+    
+    @Override
+    public Void visitFunctionDeclarationStmt(FunctionDeclaration stmt) {
+        stmt.body.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitVariableDeclarationStmt(VariableDeclaration stmt) {
+        stmt.value.accept(this);
+        try {
+            stmt.getScope().put(stmt.identifier, new Symbol.Variable(stmt.type));
+        } catch(SymbolAlreadyExistsException e) {
+            errorHandler.add(new IdentifierAlreadyDeclaredException("Name '" + stmt.identifier + "' is already defined in this scope",
+                                                                    stmt.position));
+        }
+        return null;
+    }
+    
+    @Override
+    public Void visitReturnStmt(Return stmt) {
+        stmt.value.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitIfStmt(If stmt) {
+        stmt.condition.accept(this);
+        stmt.trueBody.accept(this);
+        for(Pair<Expr, Block> clause : stmt.elseIfClauses) {
+            clause.getLeft().accept(this);
+            clause.getRight().accept(this);
+        }
+        stmt.elseBody.ifPresent(b -> b.accept(this));
+        return null;
+    }
+    
+    @Override
+    public Void visitForStmt(For stmt) {
+        stmt.initializer.accept(this);
+        stmt.condition.accept(this);
+        stmt.incrementer.accept(this);
+        stmt.body.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitWhileStmt(While stmt) {
+        stmt.condition.accept(this);
+        stmt.body.accept(this);
+        return null;
+    }
+    
+    @Override
+    public Void visitNoOpStmt(NoOp stmt) {
+        return null;
+    }
+    
+    @Override
+    public Void visitBreakStmt(Break stmt) {
+        return null;
+    }
+    
+    @Override
+    public Void visitContinueStmt(Continue stmt) {
+        return null;
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/util/ASMUtil.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.addons.terrascript.v2.util;
+
+import com.dfsek.terra.addons.terrascript.v2.Type;
+
+
+public class ASMUtil {
+    
+    /**
+     * Dynamically get name to account for possibility of shading
+     *
+     * @param clazz Class instance
+     *
+     * @return Internal class name
+     */
+    public static String dynamicName(Class<?> clazz) {
+        return clazz.getCanonicalName().replace('.', '/');
+    }
+    
+    public static org.objectweb.asm.Type tsTypeToAsmType(Type type) {
+        return org.objectweb.asm.Type.getType((Class<?>) type.javaType());
+    }
+}

common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/util/OrdinalUtil.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.terrascript.v2.util;
+
+public class OrdinalUtil {
+    public static String ordinalOf(int i) {
+        String[] suffixes = new String[]{ "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th" };
+        return switch(i % 100) {
+            case 11, 12, 13 -> i + "th";
+            default -> i + suffixes[i % 10];
+        };
+    }
+}

common/addons/structure-terrascript-v2/src/main/resources/terra.addon.yml

@@ -0,0 +1,12 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: structure-terrascript-v2
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addons.terrascript.v2.TerraScript2Addon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/structure-terrascript-v2/src/test/java/codegen/CodeGenTest.java

@@ -0,0 +1,118 @@
+package codegen;
+
+import org.junit.jupiter.api.Test;
+
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Block;
+import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
+import com.dfsek.terra.addons.terrascript.v2.codegen.TerraScript;
+import com.dfsek.terra.addons.terrascript.v2.codegen.asm.TerraScriptClassGenerator;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
+import com.dfsek.terra.addons.terrascript.v2.parser.Parser;
+import com.dfsek.terra.addons.terrascript.v2.semanticanalysis.SemanticAnalyzer;
+
+
+public class CodeGenTest {
+    
+    @Test
+    public void test() {
+        testValid("""
+                  printNum(12345);
+                  
+                  if (1 == 1) print("Dis is true");
+                  
+                  var a: num = 1;
+                  var b: num = 2;
+                  var e: str = "test";
+                  
+                  if (a <= b) {
+                      print("a is <= b");
+                  } else {
+                      print("a is not <= b");
+                  }
+                  
+                  if (e == "foo") {
+                      print("e is == foo");
+                  } else if (e == "bar") {
+                      print("e is == bar");
+                  } else {
+                      print("e is not foo or bar");
+                  }
+                  
+                  if (true && false || (false && true)) {
+                      print("Thin is tru");
+                  } else {
+                      print("Thin is not tru :(");
+                  }
+                  
+                  fun loopTwiceThenBreak() {
+                      var i: num = 0;
+                      while (true) {
+                          print("looped");
+                          if (i == 1) break;
+                          i = i + 1;
+                      }
+                  }
+                  
+                  print("Should loop twice:");
+                  loopTwiceThenBreak();
+                  
+                  retNum();
+                  var bln: bool = true;
+                  
+                  print(takesArgs("test", 3, true));
+                  print(retStr());
+                  
+                  doStuff("Ayo", "world", true);
+                  
+                  fun retNum(): num {
+                      return 3 + 3;
+                  }
+                  
+                  fun retBool(): bool {
+                      return true;
+                  }
+                  
+                  fun concatThree(a: str, b: str, c: str): str {
+                      fun concatTwo(a: str, b: str): str {
+                          return a + b;
+                      }
+                      return concatTwo(a, b) + c;
+                  }
+                  
+                  fun retStr(): str {
+                      fun concatTwo(a: str, b: str): str {
+                          return a + b;
+                      }
+                      var hello: str = "Hell";
+                      hello = concatTwo(hello, "o");
+                      var world: str = "world!";
+                      return concatThree(hello, " ", world);
+                  }
+                  
+                  fun takesArgs(a: str, b: num, c: bool): str {
+                      return a;
+                  }
+                  
+                  fun doStuff(a: str, b: str, c: bool) {
+                      print("Doing stuff");
+                      if (c) {
+                          print(concatThree(a, " ", b));
+                      } else {
+                          print("c is false");
+                      }
+                  }
+                  """);
+    }
+    
+    private void testValid(String validSource) {
+        try {
+            Block script = Parser.parse(new Lexer(validSource).analyze());
+            TypedStmt.Block typedScript = SemanticAnalyzer.analyze(script, new ErrorHandler());
+            TerraScript ts = new TerraScriptClassGenerator("./build/codegentest").generate(typedScript);
+            ts.execute();
+        } catch(Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

common/addons/structure-terrascript-v2/src/test/java/lexer/LexerTest.java

@@ -0,0 +1,32 @@
+package lexer;
+
+import org.junit.jupiter.api.Test;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+public class LexerTest {
+    
+    private static void tokenTypeTest(String input, TokenType type) {
+        Lexer lexer = new Lexer(input);
+        assertEquals(new Token(input, type, new SourcePosition(1, 1)), lexer.current());
+    }
+    
+    @Test
+    public void typeTest() {
+        tokenTypeTest("identifier", TokenType.IDENTIFIER);
+        tokenTypeTest("(", TokenType.OPEN_PAREN);
+        tokenTypeTest(")", TokenType.CLOSE_PAREN);
+    }
+    
+    @Test
+    public void multipleTokensTest() {
+        Lexer lexer = new Lexer("(3 + 2)");
+        lexer.analyze().forEach(System.out::println);
+    }
+}

common/addons/structure-terrascript-v2/src/test/java/lexer/LookaheadStreamTest.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package lexer;
+
+import org.junit.jupiter.api.Test;
+
+import com.dfsek.terra.addons.terrascript.v2.lexer.Char;
+import com.dfsek.terra.addons.terrascript.v2.lexer.LookaheadStream;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+public class LookaheadStreamTest {
+    @Test
+    public void lookahead() {
+        String testString = "Test string...\nNew line";
+        
+        LookaheadStream lookahead = new LookaheadStream(testString);
+        
+        Char first = new Char('T', new SourcePosition(1, 1));
+        Char second = new Char('e', new SourcePosition(1, 2));
+        Char third = new Char('s', new SourcePosition(1, 3));
+        Char space = new Char(' ', new SourcePosition(1, 5));
+        Char newline = new Char('\n', new SourcePosition(1, 15));
+        Char lineTwoColOne = new Char('N', new SourcePosition(2, 1));
+        String lineTwo = "New line";
+        
+        assertTrue(lookahead.matchesString("Test", false));
+        assertTrue(lookahead.matchesString(testString, false));
+        assertFalse(lookahead.matchesString(testString + "asdf", false));
+        assertFalse(lookahead.matchesString("Foo", false));
+        
+        assertEquals(first, lookahead.current());
+        assertEquals(first, lookahead.current());
+        
+        assertEquals(new SourcePosition(1, 1), lookahead.getPosition());
+        assertEquals(new SourcePosition(1, 1), lookahead.getPosition());
+        
+        assertEquals(second, lookahead.peek());
+        assertEquals(second, lookahead.peek());
+        
+        assertEquals(first, lookahead.consume());
+        
+        assertFalse(lookahead.matchesString(testString, false));
+        
+        assertEquals(second, lookahead.current());
+        
+        assertEquals(second, lookahead.consume());
+        
+        assertEquals(third, lookahead.current());
+        
+        assertTrue(lookahead.matchesString("st", true));
+        
+        assertEquals(space, lookahead.current());
+        
+        assertEquals(space, lookahead.consume());
+        
+        assertTrue(lookahead.matchesString("string...", false));
+        assertTrue(lookahead.matchesString("string...", true));
+        assertFalse(lookahead.matchesString("string...", false));
+        
+        assertEquals(newline, lookahead.current());
+        assertEquals(newline, lookahead.consume());
+        
+        assertEquals(lineTwoColOne, lookahead.current());
+        
+        assertTrue(lookahead.matchesString(lineTwo, false));
+        assertFalse(lookahead.matchesString(lineTwo + "asdf", false));
+        assertTrue(lookahead.matchesString(lineTwo, true));
+        
+        assertEquals(new SourcePosition(2, 8), lookahead.getPosition());
+        
+        assertDoesNotThrow(lookahead::consume);
+        assertEquals(new SourcePosition(2, 8), lookahead.getPosition());
+        
+        assertDoesNotThrow(lookahead::consume);
+        assertEquals(new SourcePosition(2, 8), lookahead.getPosition());
+    }
+}

common/addons/structure-terrascript-v2/src/test/java/semanticanalysis/SemanticAnalyzerTest.java

@@ -0,0 +1,369 @@
+package semanticanalysis;
+
+import org.junit.jupiter.api.Test;
+
+import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.IdentifierAlreadyDeclaredException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidCalleeException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidFunctionDeclarationException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidTypeException;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.UndefinedReferenceException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
+import com.dfsek.terra.addons.terrascript.v2.parser.Parser;
+import com.dfsek.terra.addons.terrascript.v2.semanticanalysis.SemanticAnalyzer;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+public class SemanticAnalyzerTest {
+    
+    @Test
+    public void testVariableReference() {
+        // Use of declared variable
+        testValid("var a: num = 1; a + a;");
+        
+        // Can't use undeclared variable
+        testInvalid("a + a;", UndefinedReferenceException.class);
+        
+        // Can't reference variable before declaration
+        testInvalid("a + a; var a: num = 1;", UndefinedReferenceException.class);
+        
+        // Variable declarations shouldn't be accessible from inner scopes
+        testInvalid("{ var a: num = 1; } a + a;", UndefinedReferenceException.class);
+        
+        // Can access variables declared in outer scope
+        testValid("var a: num = 3; { a + a; }");
+        
+        // Should not be able to use variables from outer scope if they're declared after scope
+        testInvalid("{ a + a; } var a: num = 2;", UndefinedReferenceException.class);
+        
+        // Can't use undeclared variable as function argument
+        testInvalid("fun test(p: str) {} test(a);", UndefinedReferenceException.class);
+        
+        // Same as above, but in inner scope
+        testInvalid("fun test(p: str) {} { test(a); }", UndefinedReferenceException.class);
+        
+        // Cannot assign undeclared variable
+        testInvalid("a = 1;", UndefinedReferenceException.class);
+        
+        // Cannot assign to variable declared after assignment
+        testInvalid("a = 2; var a: num = 1;", UndefinedReferenceException.class);
+    }
+    
+    @Test
+    public void testAssignment() {
+        // Simple assignment
+        testValid("var a: num = 1; a = 2;");
+        
+        // Can assign variables declared in outer scope
+        testValid("""
+                  var a: num = 1;
+                  { a = 2; }
+                  """);
+        
+        // Cannot assign variables declared in inner scope
+        testInvalid("""
+                    { var a: num = 1; }
+                    a = 2;
+                    """, UndefinedReferenceException.class);
+        
+        // Cannot assign variables declared in outer scope after reference
+        testInvalid("""
+                    { a = 2; }
+                    var a: num = 1;
+                    """, UndefinedReferenceException.class);
+        
+        // Cannot assign variable to expression of different type
+        testInvalid("var a: num = 1; a = true;", InvalidTypeException.class);
+    }
+    
+    @Test
+    public void testReturnStatement() {
+        // Function return must match signature
+        testInvalid("fun returnBool(): bool {}", InvalidFunctionDeclarationException.class);
+        testInvalid("fun returnNum(): num { return \"Not num\"; }", InvalidTypeException.class);
+        
+        // Return statements can be empty for void return
+        testValid("fun returnVoid() { return; }");
+        
+        // Return statement returns type matching function signature
+        testValid("fun returnNum(): num { return 3; }");
+        
+        testValid("fun returnVoid() { return (); }");
+    }
+    
+    @Test
+    public void testFunctionReturnControlFlowAnalysis() {
+        // Non-void returning function bodies must contain at least one statement that always returns
+        testInvalid("""
+                    fun returnsNum(): num {
+                    }
+                    """, InvalidFunctionDeclarationException.class);
+        
+        testValid("""
+                  fun returnsNum(): num {
+                      return 1;
+                  }
+                  """);
+        
+        testValid("""
+                  fun returnsNum(): num {
+                      1 + 1;
+                      return 1;
+                  }
+                  """);
+        
+        // Statements after the first always-return-statement are unreachable, unreachable code is legal
+        testValid("""
+                  fun returnsNum(): num {
+                      return 1;
+                      1 + 1; // Unreachable
+                  }
+                  """);
+        
+        // Void returning functions can omit returns
+        testValid("""
+                  fun returnsNothing() {
+                  }
+                  """);
+        
+        // Returns can still be explicitly used for void returning functions
+        testValid("""
+                  fun returnsNum(p: bool) {
+                      if (p) {
+                          return;
+                      }
+                  }
+                  """);
+        
+        // If all if-statement bodies always return, then the statement is considered as always returning
+        testValid("""
+                  fun returnsNum(p: bool): num {
+                      if (p) {
+                          return 1;
+                      } else {
+                          return 0;
+                      }
+                  }
+                  """);
+        
+        testValid("""
+                  fun returnsNum(p1: bool, p2: bool): num {
+                      if (p1) {
+                          return 1;
+                      } else if (p2) {
+                          return 2;
+                      } else {
+                          return 3;
+                      }
+                  }
+                  """);
+        
+        // If no else body is defined, an if-statement does not always return, therefore the function does not contain any
+        // always-return-statements
+        testInvalid("""
+                    fun returnsNum(p: bool): num {
+                        if (p) {
+                            return 1;
+                        }
+                    }
+                    """, InvalidFunctionDeclarationException.class);
+        
+        testInvalid("""
+                    fun returnsNum(p1: bool, p2: bool): num {
+                        if (p1) {
+                            return 1;
+                        } else if (p2) {
+                            return 2;
+                        }
+                    }
+                    """, InvalidFunctionDeclarationException.class);
+        
+        // Nested ifs should work
+        testValid("""
+                  fun returnsNum(p1: bool, p2: bool): num {
+                      if (p1) {
+                          if (p2) {
+                              return 1;
+                          } else {
+                              return 2;
+                          }
+                      } else {
+                          return 3;
+                      }
+                  }
+                  """);
+        
+        testInvalid("""
+                    fun returnsNum(p1: bool, p2: bool): num {
+                        if (p1) {
+                            if (p2) {
+                                return 1;
+                            }
+                            // No else clause here, so will not always return
+                        } else {
+                            return 3;
+                        }
+                    }
+                    """, InvalidFunctionDeclarationException.class);
+        
+        // If-statement may not always return but a return statement after it means function will always return
+        testValid("""
+                  fun returnsNum(p: bool): num {
+                      if (p) {
+                          return 1;
+                      }
+                      return 2;
+                  }
+                  """);
+        
+        // Same applies when statements are swapped
+        testValid("""
+                  fun returnsNum(p: bool): num {
+                      return 1;
+                      // Unreachable
+                      if (p) {
+                          return 2;
+                      }
+                  }
+                  """);
+    }
+    
+    @Test
+    public void testFunctionCall() {
+        // Simple function declaration then call
+        testValid("fun test() {}; test();");
+        
+        // Can be used before declaration
+        testValid("test(); fun test() {};");
+        
+        // Can be used from outer scope
+        testValid("fun test() {}; { test(); }");
+        
+        // Can be used from outer scope before declaration
+        testValid("{ test(); } fun test() {};");
+        
+        // Can be used in many outer scopes
+        testValid("{{{{{ test(); }}}}} fun test() {};");
+        
+        // Calling function that hasn't been declared
+        testInvalid("test();", UndefinedReferenceException.class);
+        
+        // Cannot call non functions
+        testInvalid("var test: num = 1; test();", InvalidCalleeException.class);
+        
+        // Cannot use functions declared in inner scopes
+        testInvalid("{ fun test() {} } test();", UndefinedReferenceException.class);
+        testInvalid("test(); { fun test() {} }", UndefinedReferenceException.class);
+        
+        // Mutual recursion supported
+        testValid("fun a() { b(); } fun b() { a(); }");
+    }
+    
+    @Test
+    public void testFunctionArgumentPassing() {
+        // Simple argument passing
+        testValid("fun test(p: num); test(1);");
+        
+        // Passing multiple arguments
+        testValid("fun test(p1: num, p2: bool); test(1, false);");
+        
+        // Argument type must match parameter type
+        testInvalid("fun test(p: num); test(false);", InvalidTypeException.class);
+        
+        // Function return
+        testValid("""
+                  fun returnBool(): bool {
+                      return true;
+                  }
+                  fun takeBool(p: bool) {}
+                  takeBool(returnBool());
+                  """);
+        
+        // Should not be able to pass argument of type not matching parameter type
+        testInvalid("""
+                    fun returnBool(): bool {
+                        return true;
+                    }
+                    fun takeNum(p: num) {}
+                    takeNum(returnBool());
+                    """, InvalidTypeException.class);
+    }
+    
+    @Test
+    public void testParameterUse() {
+        // Function bodies should be able to use parameter names
+        testValid("fun test(a: num, b: num) { a + b; }");
+        testInvalid("fun test(a: num, b: num) { a + c; }", UndefinedReferenceException.class);
+        
+        // Function bodies can't use variables from outer scope
+        testInvalid("var a: num = 1; fun doStuff() { a + 2; }", UndefinedReferenceException.class);
+        testInvalid("fun doStuff() { a + 2; } var a: num = 1;", UndefinedReferenceException.class);
+        
+        // Type checking parameters
+        testValid("fun takesNum(a: num) {} fun test(numberParam: num) { takesNum(numberParam); }");
+        testInvalid("fun takesNum(a: num) {} fun test(boolParam: bool) { takesNum(boolParam); }", InvalidTypeException.class);
+    }
+    
+    @Test
+    public void testShadowing() {
+        // Can't shadow variable in immediate scope
+        testInvalid("var a: num = 1; var a: num = 2;", IdentifierAlreadyDeclaredException.class);
+        
+        // Can shadow variable from outer scope
+        testValid("var a: num = 1; { var a: num = 2; }");
+        
+        // Can declare variable after same identifier is used previously in an inner scope
+        testValid("{ var a: num = 2; } var a: num = 1;");
+        
+        // Ensure shadowed variable type is used
+        testValid("""
+                  fun takesNum(p: num) {}
+                  var a: bool = false;
+                  {
+                      var a: num = 1;
+                      takesNum(a);
+                  }
+                  """);
+        
+        // Should not be able to use type of shadowed variable in use of shadowing variable
+        testInvalid("""
+                    fun takesNum(p: num) {}
+                    var a: num = false;
+                    {
+                        var a: bool = 1;
+                        takesNum(a);
+                    }
+                    """, InvalidTypeException.class);
+        
+        // Functions can be shadowed in inner scopes
+        testValid("""
+                  fun test() {}
+                  {
+                    fun test() {}
+                  }
+                  {
+                    fun test() {}
+                  }
+                  """);
+        
+        // Functions can't be shadowed in the same immediate scope
+        testInvalid("""
+                    fun test() {}
+                    fun test() {}
+                    """, IdentifierAlreadyDeclaredException.class);
+        
+        // Can't use function name that is already declared as a variable
+        testInvalid("var id: num = 1; fun id() {}", IdentifierAlreadyDeclaredException.class);
+    }
+    
+    private <T extends Exception> void testInvalid(String invalidSource, Class<T> exceptionType) {
+        ErrorHandler errorHandler = new ErrorHandler();
+        assertThrows(exceptionType, () -> SemanticAnalyzer.analyze(Parser.parse(new Lexer(invalidSource).analyze()), errorHandler));
+    }
+    
+    private void testValid(String validSource) {
+        ErrorHandler errorHandler = new ErrorHandler();
+        assertDoesNotThrow(() -> SemanticAnalyzer.analyze(Parser.parse(new Lexer(validSource).analyze()), errorHandler));
+    }
+}

common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java

@@ -21,6 +21,8 @@ public interface PluginConfig {
     
     boolean isDebugScript();
     
+    boolean isDebugLog();
+    
     int getBiomeSearchResolution();
     
     int getStructureCache();

common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java

@@ -51,6 +51,10 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
     @Default
     private boolean debugScript = false;
     
+    @Value("debug.log")
+    @Default
+    private boolean debugLog = false;
+    
     @Value("biome-search-resolution")
     @Default
     private int biomeSearch = 4;
@@ -91,6 +95,8 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
             logger.info("Debug profiler enabled.");
         if(debugScript)
             logger.info("Script debug blocks enabled.");
+        if(debugLog)
+            logger.info("Debug logging enabled.");
     }
     
     @Override
@@ -113,6 +119,11 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
         return debugScript;
     }
     
+    @Override
+    public boolean isDebugLog() {
+        return debugLog;
+    }
+    
     @Override
     public int getBiomeSearchResolution() {
         return biomeSearch;

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-org.gradle.jvmargs=-Xmx4096m

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

platforms/bukkit/build.gradle.kts

@@ -1,9 +1,11 @@
 plugins {
-    id("xyz.jpenilla.run-paper") version "1.0.6"
+    id("xyz.jpenilla.run-paper") version Versions.Bukkit.runPaper
 }
 
 repositories {
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+        name = "Sonatype"
+    }
 }
 
 dependencies {
@@ -13,12 +15,14 @@ dependencies {
     shaded(project(":platforms:bukkit:nms:v1_19_R2", configuration = "reobf"))
     shaded(project(":platforms:bukkit:nms:v1_19_R3", configuration = "reobf"))
     shaded(project(":platforms:bukkit:nms:v1_20_R1", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_20_R2", configuration = "reobf"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {
     shadowJar {
         relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
+        relocate("com.tcoded.folialib", "com.dfsek.terra.lib.folialib")
         relocate("com.google.common", "com.dfsek.terra.lib.google.common")
         relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j")
         exclude("org/slf4j/**")

platforms/bukkit/common/build.gradle.kts

@@ -5,14 +5,11 @@ repositories {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    api("org.slf4j:slf4j-api:1.8.0-beta4") {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
-    
-    compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}")
+    compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
     
     shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    shadedApi("com.google.guava:guava:30.0-jre")
+    shadedApi("com.tcoded", "FoliaLib" , Versions.Bukkit.foliaLib)
+    shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava)
     
     shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java

@@ -17,6 +17,7 @@
 
 package com.dfsek.terra.bukkit;
 
+import io.papermc.lib.PaperLib;
 import org.bukkit.Location;
 
 import com.dfsek.terra.api.entity.Entity;
@@ -44,14 +45,14 @@ public class BukkitEntity implements Entity {
     
     @Override
     public void position(Vector3 location) {
-        entity.teleport(BukkitAdapter.adapt(location).toLocation(entity.getWorld()));
+        PaperLib.teleportAsync(entity, BukkitAdapter.adapt(location).toLocation(entity.getWorld()));
     }
     
     @Override
     public void world(ServerWorld world) {
         Location newLoc = entity.getLocation().clone();
         newLoc.setWorld(BukkitAdapter.adapt(world));
-        entity.teleport(newLoc);
+        PaperLib.teleportAsync(entity, newLoc);
     }
     
     @Override

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java

@@ -17,6 +17,7 @@
 
 package com.dfsek.terra.bukkit;
 
+import io.papermc.lib.PaperLib;
 import org.bukkit.Location;
 
 import com.dfsek.terra.api.entity.Player;
@@ -45,14 +46,14 @@ public class BukkitPlayer implements Player {
     
     @Override
     public void position(Vector3 location) {
-        delegate.teleport(BukkitAdapter.adapt(location).toLocation(delegate.getWorld()));
+        PaperLib.teleportAsync(delegate, BukkitAdapter.adapt(location).toLocation(delegate.getWorld()));
     }
     
     @Override
     public void world(ServerWorld world) {
         Location newLoc = delegate.getLocation().clone();
         newLoc.setWorld(BukkitAdapter.adapt(world));
-        delegate.teleport(newLoc);
+        PaperLib.teleportAsync(delegate, newLoc);
     }
     
     @Override

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java

@@ -20,6 +20,7 @@ package com.dfsek.terra.bukkit;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
+import com.tcoded.folialib.wrapper.task.WrappedTask;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
@@ -29,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Consumer;
 
 import com.dfsek.terra.AbstractPlatform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -85,7 +87,7 @@ public class PlatformImpl extends AbstractPlatform {
     
     @Override
     public void runPossiblyUnsafeTask(@NotNull Runnable task) {
-        Bukkit.getScheduler().runTask(plugin, task);
+        plugin.getFoliaLib().getImpl().runAsync(task);
     }
     
     @Override

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -42,6 +42,7 @@ import com.dfsek.terra.bukkit.nms.Initializer;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.util.VersionUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import com.tcoded.folialib.FoliaLib;
 
 
 public class TerraBukkitPlugin extends JavaPlugin {
@@ -50,6 +51,8 @@ public class TerraBukkitPlugin extends JavaPlugin {
     private final PlatformImpl platform = new PlatformImpl(this);
     private final Map<String, com.dfsek.terra.api.world.chunk.generation.ChunkGenerator> generatorMap = new HashMap<>();
     
+    private final FoliaLib foliaLib = new FoliaLib(this);
+    
     @Override
     public void onEnable() {
         if(!doVersionCheck()) {
@@ -150,7 +153,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
                                  """.strip());
                 };
                 runnable.run();
-                Bukkit.getScheduler().scheduleAsyncDelayedTask(this, runnable, 200L);
+                getFoliaLib().getImpl().runLaterAsync(runnable, 200L);
                 // Bukkit.shutdown(); // we're not *that* evil
                 Bukkit.getPluginManager().disablePlugin(this);
                 return false;
@@ -177,4 +180,8 @@ public class TerraBukkitPlugin extends JavaPlugin {
             return pack.getGeneratorProvider().newInstance(pack);
         }), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air());
     }
+    
+    public FoliaLib getFoliaLib() {
+        return foliaLib;
+    }
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/PaperUtil.java

@@ -17,6 +17,8 @@
 
 package com.dfsek.terra.bukkit.util;
 
+import com.dfsek.terra.bukkit.TerraBukkitPlugin;
+
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -25,10 +27,10 @@ import static io.papermc.lib.PaperLib.suggestPaper;
 
 
 public final class PaperUtil {
-    public static void checkPaper(JavaPlugin main) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> {
+    public static void checkPaper(TerraBukkitPlugin plugin) {
+        plugin.getFoliaLib().getImpl().runLaterAsync(() -> {
             if(!PaperLib.isPaper()) {
-                suggestPaper(main);
+                suggestPaper(plugin);
             }
         }, 100L);
     }

platforms/bukkit/common/src/main/resources/plugin.yml

@@ -6,3 +6,4 @@ author: dfsek
 website: "@WIKI@"
 api-version: "1.13"
 description: "@DESCRIPTION@"
+folia-supported: true

platforms/bukkit/nms/v1_18_R2/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 dependencies {
     api(project(":platforms:bukkit:common"))
     paperDevBundle("1.18.2-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {

platforms/bukkit/nms/v1_19_R1/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 dependencies {
     api(project(":platforms:bukkit:common"))
     paperDevBundle("1.19-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {

platforms/bukkit/nms/v1_19_R2/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 dependencies {
     api(project(":platforms:bukkit:common"))
     paperDevBundle("1.19.3-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {

platforms/bukkit/nms/v1_19_R3/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 dependencies {
     api(project(":platforms:bukkit:common"))
     paperDevBundle("1.19.4-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {

platforms/bukkit/nms/v1_20_R1/build.gradle.kts

@@ -6,8 +6,8 @@ repositories {
 
 dependencies {
     api(project(":platforms:bukkit:common"))
-    paperDevBundle(Versions.Bukkit.paperDevBundle)
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    paperDevBundle("1.20.1-R0.1-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 
 tasks {

platforms/bukkit/nms/v1_20_R2/build.gradle.kts

@@ -0,0 +1,17 @@
+apply(plugin = "io.papermc.paperweight.userdev")
+
+repositories {
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+}
+
+dependencies {
+    api(project(":platforms:bukkit:common"))
+    paperDevBundle(Versions.Bukkit.paperDevBundle)
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
+}
+
+tasks {
+    assemble {
+        dependsOn("reobfJar")
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/AwfulBukkitHacks.java

@@ -0,0 +1,101 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.core.WritableRegistry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.biome.Biome;
+import org.bukkit.NamespacedKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+import com.dfsek.terra.registry.master.ConfigRegistry;
+
+
+public class AwfulBukkitHacks {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AwfulBukkitHacks.class);
+    
+    private static final Map<ResourceLocation, List<ResourceLocation>> terraBiomeMap = new HashMap<>();
+    
+    public static void registerBiomes(ConfigRegistry configRegistry) {
+        try {
+            LOGGER.info("Hacking biome registry...");
+            WritableRegistry<Biome> biomeRegistry = (WritableRegistry<Biome>) RegistryFetcher.biomeRegistry();
+            
+            Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry<?>) biomeRegistry, false);
+            
+            configRegistry.forEach(pack -> pack.getRegistry(com.dfsek.terra.api.world.biome.Biome.class).forEach((key, biome) -> {
+                try {
+                    BukkitPlatformBiome platformBiome = (BukkitPlatformBiome) biome.getPlatformBiome();
+                    NamespacedKey vanillaBukkitKey = platformBiome.getHandle().getKey();
+                    ResourceLocation vanillaMinecraftKey = new ResourceLocation(vanillaBukkitKey.getNamespace(), vanillaBukkitKey.getKey());
+                    Biome platform = NMSBiomeInjector.createBiome(biome, Objects.requireNonNull(biomeRegistry.get(vanillaMinecraftKey)));
+                    
+                    ResourceKey<Biome> delegateKey = ResourceKey.create(
+                            Registries.BIOME,
+                            new ResourceLocation("terra", NMSBiomeInjector.createBiomeID(pack, key))
+                                                                       );
+                    
+                    Reference<Biome> holder = biomeRegistry.register(delegateKey, platform, Lifecycle.stable());
+                    Reflection.REFERENCE.invokeBindValue(holder, platform); // IMPORTANT: bind holder.
+                    
+                    platformBiome.getContext().put(new NMSBiomeInfo(delegateKey));
+                    
+                    terraBiomeMap.computeIfAbsent(vanillaMinecraftKey, i -> new ArrayList<>()).add(delegateKey.location());
+                    
+                    LOGGER.debug("Registered biome: " + delegateKey);
+                } catch(NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }));
+            
+            Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry<?>) biomeRegistry, true); // freeze registry again :)
+            
+            LOGGER.info("Doing tag garbage....");
+            Map<TagKey<Biome>, List<Holder<Biome>>> collect = biomeRegistry
+                    .getTags() // streamKeysAndEntries
+                    .collect(HashMap::new,
+                             (map, pair) ->
+                                     map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())),
+                             HashMap::putAll);
+            
+            terraBiomeMap
+                    .forEach((vb, terraBiomes) ->
+                                     NMSBiomeInjector.getEntry(biomeRegistry, vb).ifPresentOrElse(
+                                             vanilla -> terraBiomes.forEach(
+                                                     tb -> NMSBiomeInjector.getEntry(biomeRegistry, tb).ifPresentOrElse(
+                                                             terra -> {
+                                                                 LOGGER.debug("{} (vanilla for {}): {}",
+                                                                              vanilla.unwrapKey().orElseThrow().location(),
+                                                                              terra.unwrapKey().orElseThrow().location(),
+                                                                              vanilla.tags().toList());
+                                                                 vanilla.tags()
+                                                                        .forEach(tag -> collect
+                                                                                .computeIfAbsent(tag, t -> new ArrayList<>())
+                                                                                .add(terra));
+                                                             },
+                                                             () -> LOGGER.error("No such biome: {}", tb))),
+                                             () -> LOGGER.error("No vanilla biome: {}", vb)));
+            
+            biomeRegistry.resetTags();
+            biomeRegistry.bindTags(ImmutableMap.copyOf(collect));
+            
+        } catch(SecurityException | IllegalArgumentException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+}
+

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInfo.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.Biome;
+
+import com.dfsek.terra.api.properties.Properties;
+
+
+public record NMSBiomeInfo(ResourceKey<Biome> biomeKey) implements Properties {
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInjector.java

@@ -0,0 +1,78 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSpecialEffects;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
+
+
+public class NMSBiomeInjector {
+
+    public static <T> Optional<Holder<T>> getEntry(Registry<T> registry, ResourceLocation identifier) {
+        return registry.getOptional(identifier)
+                       .flatMap(registry::getResourceKey)
+                       .flatMap(registry::getHolder);
+    }
+
+    public static Biome createBiome(com.dfsek.terra.api.world.biome.Biome biome, Biome vanilla)
+    throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+        Biome.BiomeBuilder builder = new Biome.BiomeBuilder();
+
+        builder
+                .downfall(vanilla.climateSettings.downfall())
+                .temperature(vanilla.getBaseTemperature())
+                .mobSpawnSettings(vanilla.getMobSettings())
+                .generationSettings(vanilla.getGenerationSettings());
+
+
+        BiomeSpecialEffects.Builder effects = new BiomeSpecialEffects.Builder();
+
+        effects.grassColorModifier(vanilla.getSpecialEffects().getGrassColorModifier());
+
+        VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
+
+        effects.fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
+
+               .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
+
+               .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
+
+               .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()));
+
+        if(vanillaBiomeProperties.getFoliageColor() == null) {
+            vanilla.getSpecialEffects().getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+        } else {
+            effects.foliageColorOverride(vanillaBiomeProperties.getFoliageColor());
+        }
+
+        if(vanillaBiomeProperties.getGrassColor() == null) {
+            vanilla.getSpecialEffects().getGrassColorOverride().ifPresent(effects::grassColorOverride);
+        } else {
+            // grass
+            effects.grassColorOverride(vanillaBiomeProperties.getGrassColor());
+        }
+
+        vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound);
+        vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound);
+        vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound);
+        vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic);
+        vanilla.getAmbientParticle().ifPresent(effects::ambientParticle);
+
+        builder.specialEffects(effects.build());
+
+        return builder.build();
+    }
+
+    public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) {
+        return pack.getID()
+                   .toLowerCase() + "/" + biomeID.getNamespace().toLowerCase(Locale.ROOT) + "/" + biomeID.getID().toLowerCase(Locale.ROOT);
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeProvider.java

@@ -0,0 +1,47 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.Holder;
+import java.util.stream.Stream;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.Climate.Sampler;
+import org.jetbrains.annotations.NotNull;
+
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+
+
+public class NMSBiomeProvider extends BiomeSource {
+    private final BiomeProvider delegate;
+    private final long seed;
+    private final Registry<Biome> biomeRegistry = RegistryFetcher.biomeRegistry();
+
+    public NMSBiomeProvider(BiomeProvider delegate, long seed) {
+        super();
+        this.delegate = delegate;
+        this.seed = seed;
+    }
+    @Override
+    protected Stream<Holder<Biome>> collectPossibleBiomes() {
+      return delegate.stream()
+                    .map(biome -> RegistryFetcher.biomeRegistry()
+                                                 .getHolderOrThrow(((BukkitPlatformBiome) biome.getPlatformBiome()).getContext()
+                                                                                                              .get(NMSBiomeInfo.class)
+                                                                                                              .biomeKey()));
+    }
+
+    @Override
+    protected @NotNull Codec<? extends BiomeSource> codec() {
+        return BiomeSource.CODEC;
+    }
+
+    @Override
+    public @NotNull Holder<Biome> getNoiseBiome(int x, int y, int z, @NotNull Sampler sampler) {
+        return biomeRegistry.getHolderOrThrow(((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed)
+                                                                             .getPlatformBiome()).getContext()
+                                                                                                 .get(NMSBiomeInfo.class)
+                                                                                                 .biomeKey());
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSChunkGeneratorDelegate.java

@@ -0,0 +1,170 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.NoiseColumn;
+import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.Beardifier;
+import net.minecraft.world.level.levelgen.DensityFunction.SinglePointContext;
+import net.minecraft.world.level.levelgen.GenerationStep.Carving;
+import net.minecraft.world.level.levelgen.Heightmap.Types;
+import net.minecraft.world.level.levelgen.RandomState;
+import net.minecraft.world.level.levelgen.blending.Blender;
+import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.info.WorldProperties;
+import com.dfsek.terra.bukkit.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.bukkit.world.BukkitWorldProperties;
+import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
+
+
+public class NMSChunkGeneratorDelegate extends ChunkGenerator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMSChunkGeneratorDelegate.class);
+    private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate;
+    
+    private final ChunkGenerator vanilla;
+    private final ConfigPack pack;
+    
+    private final long seed;
+    
+    public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, long seed) {
+        super(biomeProvider);
+        this.delegate = pack.getGeneratorProvider().newInstance(pack);
+        this.vanilla = vanilla;
+        this.pack = pack;
+        this.seed = seed;
+    }
+    
+    @Override
+    protected @NotNull Codec<? extends ChunkGenerator> codec() {
+        return ChunkGenerator.CODEC;
+    }
+    
+    @Override
+    public void applyCarvers(@NotNull WorldGenRegion chunkRegion, long seed, @NotNull RandomState noiseConfig, @NotNull BiomeManager world,
+                             @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk, @NotNull Carving carverStep) {
+        // no-op
+    }
+    
+    @Override
+    public void buildSurface(@NotNull WorldGenRegion region, @NotNull StructureManager structures, @NotNull RandomState noiseConfig,
+                             @NotNull ChunkAccess chunk) {
+        // no-op
+    }
+    
+    @Override
+    public void applyBiomeDecoration(@NotNull WorldGenLevel world, @NotNull ChunkAccess chunk,
+                                     @NotNull StructureManager structureAccessor) {
+        vanilla.applyBiomeDecoration(world, chunk, structureAccessor);
+    }
+    
+    @Override
+    public void spawnOriginalMobs(@NotNull WorldGenRegion region) {
+        vanilla.spawnOriginalMobs(region);
+    }
+    
+    @Override
+    public int getGenDepth() {
+        return vanilla.getGenDepth();
+    }
+    
+    @Override
+    public @NotNull CompletableFuture<ChunkAccess> fillFromNoise(@NotNull Executor executor, @NotNull Blender blender,
+                                                                 @NotNull RandomState noiseConfig,
+                                                                 @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk) {
+        return vanilla.fillFromNoise(executor, blender, noiseConfig, structureAccessor, chunk)
+                .thenApply(c -> {
+                    LevelAccessor level = Reflection.STRUCTURE_MANAGER.getLevel(structureAccessor);
+                    BiomeProvider biomeProvider = pack.getBiomeProvider();
+                    PreLoadCompatibilityOptions compatibilityOptions = pack.getContext().get(PreLoadCompatibilityOptions.class);
+                    if(compatibilityOptions.isBeard()) {
+                        beard(structureAccessor, chunk, new BukkitWorldProperties(level.getMinecraftWorld().getWorld()), biomeProvider, compatibilityOptions);
+                    }
+                    return c;
+                });
+    }
+    
+    private void beard(StructureManager structureAccessor, ChunkAccess chunk, WorldProperties world, BiomeProvider biomeProvider,
+                       PreLoadCompatibilityOptions compatibilityOptions) {
+        Beardifier structureWeightSampler = Beardifier.forStructuresInChunk(structureAccessor, chunk.getPos());
+        double threshold = compatibilityOptions.getBeardThreshold();
+        double airThreshold = compatibilityOptions.getAirThreshold();
+        int xi = chunk.getPos().x << 4;
+        int zi = chunk.getPos().z << 4;
+        for(int x = 0; x < 16; x++) {
+            for(int z = 0; z < 16; z++) {
+                int depth = 0;
+                for(int y = world.getMaxHeight(); y >= world.getMinHeight(); y--) {
+                    double noise = structureWeightSampler.compute(new SinglePointContext(x + xi, y, z + zi));
+                    if(noise > threshold) {
+                        chunk.setBlockState(new BlockPos(x, y, z), ((CraftBlockData) ((BukkitBlockState) delegate
+                                .getPalette(x + xi, y, z + zi, world, biomeProvider)
+                                .get(depth, x + xi, y, z + zi, world.getSeed())).getHandle()).getState(), false);
+                        depth++;
+                    } else if(noise < airThreshold) {
+                        chunk.setBlockState(new BlockPos(x, y, z), Blocks.AIR.defaultBlockState(), false);
+                    } else {
+                        depth = 0;
+                    }
+                }
+            }
+        }
+    }
+    
+    @Override
+    public int getSeaLevel() {
+        return vanilla.getSeaLevel();
+    }
+    
+    @Override
+    public int getMinY() {
+        return vanilla.getMinY();
+    }
+    
+    @Override
+    public int getBaseHeight(int x, int z, @NotNull Types heightmap, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) {
+        WorldProperties properties = new NMSWorldProperties(seed, world);
+        int y = properties.getMaxHeight();
+        BiomeProvider biomeProvider = pack.getBiomeProvider();
+        while(y >= getMinY() && !heightmap.isOpaque().test(
+                ((CraftBlockData) delegate.getBlock(properties, x, y - 1, z, biomeProvider).getHandle()).getState())) {
+            y--;
+        }
+        return y;
+    }
+    
+    @Override
+    public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) {
+        BlockState[] array = new BlockState[world.getHeight()];
+        WorldProperties properties = new NMSWorldProperties(seed, world);
+        BiomeProvider biomeProvider = pack.getBiomeProvider();
+        for(int y = properties.getMaxHeight() - 1; y >= properties.getMinHeight(); y--) {
+            array[y - properties.getMinHeight()] = ((CraftBlockData) delegate.getBlock(properties, x, y, z, biomeProvider)
+                                                                             .getHandle()).getState();
+        }
+        return new NoiseColumn(getMinY(), array);
+    }
+
+    @Override
+    public void addDebugScreenInfo(@NotNull List<String> text, @NotNull RandomState noiseConfig, @NotNull BlockPos pos) {
+
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInitializer.java

@@ -0,0 +1,15 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import org.bukkit.Bukkit;
+
+import com.dfsek.terra.bukkit.PlatformImpl;
+import com.dfsek.terra.bukkit.nms.Initializer;
+
+
+public class NMSInitializer implements Initializer {
+    @Override
+    public void initialize(PlatformImpl platform) {
+        AwfulBukkitHacks.registerBiomes(platform.getRawConfigRegistry());
+        Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), platform.getPlugin());
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInjectListener.java

@@ -0,0 +1,48 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldInitEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
+
+
+public class NMSInjectListener implements Listener {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMSInjectListener.class);
+    private static final Set<World> INJECTED = new HashSet<>();
+    private static final ReentrantLock INJECT_LOCK = new ReentrantLock();
+    
+    @EventHandler
+    public void onWorldInit(WorldInitEvent event) {
+        if(!INJECTED.contains(event.getWorld()) &&
+           event.getWorld().getGenerator() instanceof BukkitChunkGeneratorWrapper bukkitChunkGeneratorWrapper) {
+            INJECT_LOCK.lock();
+            INJECTED.add(event.getWorld());
+            LOGGER.info("Preparing to take over the world: {}", event.getWorld().getName());
+            CraftWorld craftWorld = (CraftWorld) event.getWorld();
+            ServerLevel serverWorld = craftWorld.getHandle();
+            
+            ConfigPack pack = bukkitChunkGeneratorWrapper.getPack();
+            
+            ChunkGenerator vanilla = serverWorld.getChunkSource().getGenerator();
+            NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), craftWorld.getSeed());
+    
+            serverWorld.getChunkSource().chunkMap.generator = new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed());
+            
+            LOGGER.info("Successfully injected into world.");
+            
+            INJECT_LOCK.unlock();
+        }
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSWorldProperties.java

@@ -0,0 +1,36 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.world.level.LevelHeightAccessor;
+
+import com.dfsek.terra.api.world.info.WorldProperties;
+
+
+public class NMSWorldProperties implements WorldProperties {
+    private final long seed;
+    private final LevelHeightAccessor height;
+    
+    public NMSWorldProperties(long seed, LevelHeightAccessor height) {
+        this.seed = seed;
+        this.height = height;
+    }
+    
+    @Override
+    public Object getHandle() {
+        return height;
+    }
+    
+    @Override
+    public long getSeed() {
+        return seed;
+    }
+    
+    @Override
+    public int getMaxHeight() {
+        return height.getMaxBuildHeight();
+    }
+    
+    @Override
+    public int getMinHeight() {
+        return height.getMinBuildHeight();
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/Reflection.java

@@ -0,0 +1,50 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureManager;
+import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
+import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldSetter;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.MethodName;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies;
+
+
+public class Reflection {
+    public static final MappedRegistryProxy MAPPED_REGISTRY;
+    public static final StructureManagerProxy STRUCTURE_MANAGER;
+    
+    public static final ReferenceProxy REFERENCE;
+    
+    static {
+        ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar();
+        ReflectionProxyFactory reflectionProxyFactory = ReflectionProxyFactory.create(reflectionRemapper,
+                                                                                      Reflection.class.getClassLoader());
+        
+        MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class);
+        STRUCTURE_MANAGER = reflectionProxyFactory.reflectionProxy(StructureManagerProxy.class);
+        REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class);
+    }
+    
+    
+    @Proxies(MappedRegistry.class)
+    public interface MappedRegistryProxy {
+        @FieldSetter("frozen")
+        void setFrozen(MappedRegistry<?> instance, boolean frozen);
+    }
+    
+    @Proxies(StructureManager.class)
+    public interface StructureManagerProxy {
+        @FieldGetter("level")
+        LevelAccessor getLevel(StructureManager instance);
+    }
+    
+    @Proxies(Holder.Reference.class)
+    public interface ReferenceProxy {
+        @MethodName("bindValue")
+        <T> void invokeBindValue(Reference<T> instance, T value);
+    }
+}

platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/RegistryFetcher.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.world.level.biome.Biome;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+
+
+public class RegistryFetcher {
+    private static <T> Registry<T> getRegistry(ResourceKey<Registry<T>> key) {
+        CraftServer craftserver = (CraftServer) Bukkit.getServer();
+        DedicatedServer dedicatedserver = craftserver.getServer();
+        return dedicatedserver
+                .registryAccess()
+                .registryOrThrow(key);
+    }
+    
+    public static Registry<Biome> biomeRegistry() {
+        return getRegistry(Registries.BIOME);
+    }
+}