still doesnt work but it works more™️

create TerraOptionsScreen
bump version
2026-05-20 00:30:20 +00:00 · 2021-05-09 14:31:51 -07:00 · 2021-05-09 01:24:04 -07:00 · 2021-05-05 15:24:55 -07:00 · 2021-05-05 15:22:02 -07:00 · 2021-05-04 16:45:25 -07:00
253 changed files with 5146 additions and 2252 deletions
@@ -342,6 +342,6 @@ ij_json_wrap_long_lines = false
 indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = true
 ij_yaml_keep_line_breaks = true
-ij_yaml_space_before_colon = true
+ij_yaml_space_before_colon = false
 ij_yaml_spaces_within_braces = true
 ij_yaml_spaces_within_brackets = true
@@ -7,20 +7,36 @@ to your specifications, with no knowledge of Java required.

 * Paper+ servers (Paper, Tuinity, Purpur, etc): [SpigotMC](https://www.spigotmc.org/resources/85151/)
 * Fabric: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
+* Forge: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)

-## Building and running Terra
+## Building and Running Terra

-To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will produce a jar in `build/libs`
-called `Terra-[CURRENT VERSION].jar`. You can put this right into your plugins dir, along with the correct Gaea version.
+To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and
+produce JARs in `platforms/<platform>/build/libs`

-If you would like to test it with a default server config, just run `./gradlew setupServer` or
-`./gradlew.bat setupServer` to set up the server, then `./gradlew testWithPaper` or `gradlew.bat testWithPaper` to run the server. If you
-want a clean installation of the server, re-run the `setupServer` task. This will download a default server config
-from [here](https://github.com/PolyhedralDev/WorldGenTestServer)
-and install the server in the `target/server` directory, along with all the needed plugins.
+### Production JARs:
+* Bukkit: `Terra-<version>-shaded.jar`
+* Fabric: `Terra-<version>-shaded-mapped.jar`
+* Forge: `Terra-<version>-shaded.jar`

-**Note: You will need to adjust the `NAME` variable `bukkit.yml` of the test server if you are not using the default Terra config.**
+### Building a Specific Platform
+To build a specific platform, run `gradlew :platforms:<platform>:build`.

+JARs are produced in `platforms/<platform>/build/libs`.
+
+### Running Minecraft in the IDE
+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).
+* Fabric
+  * `runClient` - Run a Minecraft client with Terra installed.
+  * `runServer` - Run a Minecraft server with Terra installed.
+* Forge
+  * `runClient` - Run a Minecraft client with Terra installed.
+  * `runServer` - Run a Minecraft server with Terra installed.
 ## Contributing
 Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and
 submit a PR!
@@ -1,10 +1,27 @@
 import com.dfsek.terra.getGitHash

-val versionObj = Version("5", "1", "3", true)
+val versionObj = Version("5", "3", "1", true)

 allprojects {
    version = versionObj
    group = "com.dfsek.terra"
+
+    tasks.withType<JavaCompile>().configureEach {
+        options.isFork = true
+        options.isIncremental = true
+    }
+    tasks.withType<Test>().configureEach {
+        useJUnitPlatform()
+
+        maxHeapSize = "2G"
+        ignoreFailures = false
+        failFast = true
+        maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1
+
+        reports.html.isEnabled = false
+        reports.junitXml.isEnabled = false
+    }
+
 }
 /**
 * Version class that does version stuff.
@@ -7,26 +7,11 @@ import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream

 fun Project.configureCommon() {
-    apply(plugin = "java-library")
-    apply(plugin = "maven-publish")
-    apply(plugin = "idea")
-
    configureDependencies()
    configureCompilation()
    configureDistribution()

    version = rootProject.version
-
-
-
-    tasks.withType<Test>().configureEach {
-        useJUnitPlatform()
-
-        maxHeapSize = "2G"
-        ignoreFailures = false
-        failFast = true
-        maxParallelForks = 12
-    }
 }

 fun Project.getGitHash(): String {
@@ -3,14 +3,16 @@ package com.dfsek.terra
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.filter
-import org.gradle.kotlin.dsl.withType
+import org.gradle.kotlin.dsl.*
 import org.gradle.language.jvm.tasks.ProcessResources

 fun Project.configureCompilation() {
+    apply(plugin = "maven-publish")
+    apply(plugin = "idea")
+
    configure<JavaPluginConvention> {
        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_1_8
@@ -19,7 +21,7 @@ fun Project.configureCompilation() {
    tasks.withType<JavaCompile> {
        options.encoding = "UTF-8"
        doFirst {
-            options.compilerArgs = mutableListOf("-Xlint:all")
+            options.compilerArgs.add("-Xlint:all")
        }
    }

@@ -35,4 +37,19 @@ fun Project.configureCompilation() {
    tasks.withType<Javadoc> {
        options.encoding = "UTF-8"
    }
+
+    tasks.withType<Jar> {
+        archiveBaseName.set("Terra-${archiveBaseName.get()}")
+        from("../LICENSE", "../../LICENSE")
+    }
+
+    tasks.register<Jar>("sourcesJar") {
+        archiveClassifier.set("sources")
+    }
+
+    tasks.register<Jar>("javadocJar") {
+        dependsOn("javadoc")
+        archiveClassifier.set("javadoc")
+        from(tasks.getByName<Javadoc>("javadoc").destinationDir)
+    }
 }
@@ -1,13 +1,27 @@
 package com.dfsek.terra

 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.repositories

 fun Project.configureDependencies() {
+    apply(plugin = "java")
+    apply(plugin = "java-library")
+
+    configurations {
+        val shaded = create("shaded")
+        val shadedApi = create("shadedApi")
+        shaded.extendsFrom(shadedApi)
+        getByName("api").extendsFrom(shadedApi)
+        val shadedImplementation = create("shadedImplementation")
+        shaded.extendsFrom(shadedImplementation)
+        getByName("implementation").extendsFrom(shadedImplementation)
+    }

    repositories {
-        maven { url = uri("http://maven.enginehub.org/repo/") }
+        maven { url = uri("https://maven.enginehub.org/repo/") }
        maven { url = uri("https://repo.codemc.org/repository/maven-public") }
        maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
        maven { url = uri("https://maven.fabricmc.net/") }
@@ -19,6 +33,6 @@ fun Project.configureDependencies() {
    dependencies {
        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
        "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        "compileOnly"("org.jetbrains:annotations:20.1.0")
+        "api"("org.jetbrains:annotations:20.1.0")
    }
 }
@@ -14,17 +14,6 @@ fun Project.configureDistribution() {
    apply(plugin = "java-library")
    apply(plugin = "com.github.johnrengelman.shadow")

-    configurations {
-        val shaded = create("shaded")
-        getByName("compile").extendsFrom(shaded)
-        val shadedApi = create("shadedApi")
-        shaded.extendsFrom(shadedApi)
-        getByName("api").extendsFrom(shadedApi)
-        val shadedImplementation = create("shadedImplementation")
-        shaded.extendsFrom(shadedImplementation)
-        getByName("implementation").extendsFrom(shadedImplementation)
-    }
-
    val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
        group = "terra"
        doFirst {
@@ -38,21 +27,6 @@ fun Project.configureDistribution() {
    }
    tasks["processResources"].dependsOn(downloadDefaultPacks)

-    tasks.withType<Jar> {
-        archiveBaseName.set("Terra-${archiveBaseName.get()}")
-        from("../LICENSE", "../../LICENSE")
-    }
-
-    tasks.register<Jar>("sourcesJar") {
-        archiveClassifier.set("sources")
-    }
-
-    tasks.register<Jar>("javadocJar") {
-        dependsOn("javadoc")
-        archiveClassifier.set("javadoc")
-        from(tasks.getByName<Javadoc>("javadoc").destinationDir)
-    }
-
    tasks.named<ShadowJar>("shadowJar") {
        // Tell shadow to download the packs
        dependsOn(downloadDefaultPacks)
@@ -1,26 +1,14 @@
-import com.dfsek.terra.configureCommon
-import com.github.javaparser.StaticJavaParser
-import com.github.javaparser.ast.CompilationUnit
-import com.github.javaparser.ast.body.FieldDeclaration
-import com.github.javaparser.ast.expr.StringLiteralExpr
-import com.github.javaparser.ast.type.PrimitiveType
-import com.github.javaparser.ast.type.PrimitiveType.Primitive
-import com.github.javaparser.ast.type.Type
-import com.github.javaparser.ast.Node
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration
+import com.dfsek.terra.configureCompilation
+import com.dfsek.terra.configureDependencies

 plugins {
    `java-library`
    `maven-publish`
+    idea
 }

-buildscript {
-    dependencies {
-        classpath("com.github.javaparser:javaparser-symbol-solver-core:3.20.2")
-    }
-}
-
-configureCommon()
+configureCompilation()
+configureDependencies()

 group = "com.dfsek.terra.common"

@@ -29,7 +17,7 @@ dependencies {
    "shadedApi"("commons-io:commons-io:2.4")

    "shadedApi"("com.dfsek:Paralithic:0.3.2")
-    "shadedApi"("com.dfsek:Tectonic:1.2.3")
+    "shadedApi"("com.dfsek:Tectonic:1.3.1")
    "shadedApi"("net.jafama:jafama:2.3.2")
    "shadedApi"("org.yaml:snakeyaml:1.27")
    "shadedApi"("org.ow2.asm:asm:9.0")
@@ -66,201 +54,4 @@ publishing {
            }
        }
    }
-}
-
-sourceSets {
-    create("tectonic") {
-
-    }
-}
-
-tasks.create<SourceTask>("tectonicDocs") {
-    group = "terra"
-    println("Scanning sources...")
-
-
-    val docs = HashMap<String, String>()
-
-    val refactor = HashMap<String, String>()
-
-    val sources = HashMap<String, CompilationUnit>()
-
-    sourceSets.main.get().java.forEach {
-        sources[it.name.substring(0, it.name.length - 5)] = StaticJavaParser.parse(it)
-    }
-
-    sources.forEach { (name, unit) ->
-        unit.getClassByName(name).ifPresent { declaration ->
-            if (declaration.isAnnotationPresent("AutoDocAlias")) {
-                refactor[name] = (declaration.getAnnotationByName("AutoDocAlias").get().childNodes[1] as StringLiteralExpr).asString()
-                println("Refactoring $name to ${refactor[name]}.")
-            } else if (declaration.isAnnotationPresent("AutoDocShadow")) {
-                refactor[name] = (declaration.getAnnotationByName("AutoDocShadow").get().childNodes[1] as StringLiteralExpr).asString()
-                println("Shadowing $name to ${refactor[name]}.")
-            }
-        }
-    }
-
-    val children = HashMap<String, MutableList<ClassOrInterfaceDeclaration>>()
-    sources.forEach { (name, unit) ->
-        unit.getClassByName(name).ifPresent { declaration ->
-            if(!declaration.isAnnotationPresent("AutoDocShadow")) {
-                declaration.extendedTypes.forEach { classOrInterfaceType ->
-                    val inherit = classOrInterfaceType.name.asString()
-                    if (!children.containsKey(inherit)) children[inherit] = ArrayList()
-                    children[inherit]!!.add(declaration)
-                }
-            }
-        }
-    }
-
-    val linksAll = HashMap<String, Set<String>>()
-
-    sources.forEach { (name, unit) ->
-        val doc = StringBuilder()
-        doc.append("# ${generify(name, refactor)}\n")
-
-        var applicable = false
-
-        val links = HashSet<String>()
-
-        unit.getClassByName(name).ifPresent { declaration ->
-            applicable = scanForParent(sources, declaration, "ConfigTemplate", "ValidatedConfigTemplate", "ObjectTemplate")
-
-            declaration.javadoc.ifPresent {
-                doc.append("${sanitizeJavadoc(it.toText())}    \n")
-            }
-            declaration.extendedTypes.forEach {
-                if (!it.name.asString().equals("AbstractableTemplate")) {
-                    doc.append("Inherits from ${parseTypeLink(it, refactor, links, false)}    \n    \n")
-                }
-            }
-            if (children.containsKey(name)) {
-                doc.append("Children:\n")
-                children[name]!!.forEach {
-                    doc.append("* ${parseTypeLink(it.name, refactor, links)}\n")
-                }
-                doc.append("    \n\n")
-            }
-            doc.append("\n")
-        }
-
-
-        unit.findAll(FieldDeclaration::class.java).filter { it.isAnnotationPresent("Value") }.forEach { fieldDeclaration ->
-            doc.append("## ${(fieldDeclaration.getAnnotationByName("Value").get().childNodes[1] as StringLiteralExpr).asString()}\n")
-
-            if (fieldDeclaration.isAnnotationPresent("Default")) {
-                doc.append("* Default value: ${fieldDeclaration.variables[0]}    \n")
-            }
-            val type = fieldDeclaration.commonType
-            doc.append("* Type: ${parseTypeLink(type, refactor, links)}    \n")
-            doc.append("\n")
-
-            fieldDeclaration.javadoc.ifPresent {
-                doc.append(sanitizeJavadoc(it.toText()))
-            }
-            doc.append("\n\n")
-            applicable = true
-        }
-        val s = doc.toString()
-        if (s.isNotEmpty() && applicable) {
-            docs[generify(name, refactor)] = s
-            linksAll[name] = links
-        }
-    }
-    println("Done. Generated ${docs.size} files")
-
-    val docsDir = File(buildDir, "tectonic")
-    docsDir.mkdirs()
-    val files = HashSet<String>()
-
-    docs.forEach {
-        val save = File(docsDir, "${it.key}.md")
-        files.add(it.key)
-        if (save.exists()) save.delete()
-        save.createNewFile()
-        save.writeText(it.value)
-    }
-
-    sourceSets["tectonic"].resources.forEach {
-        files.add(it.name.substringBefore('.'))
-        it.copyTo(File(docsDir, it.name), true)
-    }
-
-    linksAll.forEach { (file, links) ->
-        links.forEach {
-            if(!files.contains(it)) println("WARNING: Dead link to \"$it\" in file \"$file\"")
-        }
-    }
-}
-
-fun scanForParent(map: HashMap<String, CompilationUnit>, current: ClassOrInterfaceDeclaration, vararg parent: String): Boolean {
-    for (type in current.implementedTypes) {
-        if(parent.contains(type.childNodes[0].toString())) return true
-    }
-    for(type in current.extendedTypes) {
-        val name = type.childNodes[0].toString()
-        if(map.containsKey(name)) {
-            val op = map[name]!!.getClassByName(name)
-            if(op.isPresent && scanForParent(map, op.get(), *parent)) {
-                return true
-            }
-        }
-    }
-    return false
-}
-
-fun parseTypeLink(type: Node, refactor: Map<String, String>, links: MutableSet<String>, generic: Boolean = true): String {
-    val st = parseType(type, refactor)
-
-    if (type is Type && type.childNodes.size > 1 && generic) {
-        val outer = generify(type.childNodes[0].toString(), refactor)
-
-        val builder = StringBuilder()
-        builder.append("[$outer](./$outer)\\<")
-        links.add(outer)
-
-        for (i in 1 until type.childNodes.size) {
-            builder.append(parseTypeLink(type.childNodes[i], refactor, links, generic))
-            if (i != type.childNodes.size - 1) builder.append(", ")
-        }
-
-        builder.append("\\>")
-
-        return builder.toString()
-    }
-    links.add(st)
-    return "[$st](./$st)"
-}
-
-fun parseType(type: Node, refactor: Map<String, String>): String {
-    if (type is PrimitiveType) {
-        return when (type.type) {
-            Primitive.BOOLEAN -> "Boolean"
-            Primitive.BYTE -> "Byte"
-            Primitive.DOUBLE -> "Double"
-            Primitive.INT -> "Integer"
-            Primitive.CHAR -> "Char"
-            Primitive.FLOAT -> "Float"
-            Primitive.SHORT -> "Short"
-            Primitive.LONG -> "Long"
-            else -> type.asString()
-        }
-    }
-    if(type is Type && type.childNodes.size > 1) return generify(type.childNodes[0].toString(), refactor)
-    return generify(type.toString(), refactor)
-}
-
-fun generify(type: String, refactor: Map<String, String>): String {
-    return when (type) {
-        "HashMap", "LinkedHashMap" -> "Map"
-        "ArrayList", "LinkedList", "GlueList" -> "List"
-        "HashSet" -> "Set"
-        else -> refactor.getOrDefault(type, type)
-    }
-}
-
-fun sanitizeJavadoc(doc: String): String {
-    return doc
-            .replace("<p>", "")
 }
@@ -7,14 +7,19 @@ import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.LockedRegistry;
+import com.dfsek.terra.api.util.JarUtil;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.Logger;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.world.TerraWorld;

 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.jar.JarFile;

 /**
 * Represents a Terra mod/plugin instance.
@@ -64,4 +69,10 @@ public interface TerraPlugin extends LoaderRegistrar {
    default void runPossiblyUnsafeTask(Runnable task) {
        task.run();
    }
+
+    Profiler getProfiler();
+
+    default JarFile getModJar() throws URISyntaxException, IOException {
+        return JarUtil.getJarFile();
+    }
 }
@@ -65,7 +65,7 @@ public class TerraCommandManager implements CommandManager {
            return;
        }

-        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !TerraWorld.isTerraWorld(((Player) sender).getWorld()))) {
+        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).getWorld()).isTerraWorld())) {
            sender.sendMessage("Command must be executed in a Terra world.");
            return;
        }
@@ -1,17 +0,0 @@
-package com.dfsek.terra.api.docs;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * For use in Terra AutoDoc, to specify
- * that references to the annotated class
- * should be refactored in the documentation.
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface AutoDocAlias {
-    String value();
-}
@@ -1,17 +0,0 @@
-package com.dfsek.terra.api.docs;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * For use in Terra AutoDoc, to specify
- * that references to the annotated class
- * should be shadowed to the target class.
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target(ElementType.TYPE)
-public @interface AutoDocShadow {
-    String value();
-}
@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.platform.inventory;

 import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.platform.inventory.item.Damageable;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

 public interface ItemStack extends Handle {
@@ -13,4 +14,8 @@ public interface ItemStack extends Handle {
    ItemMeta getItemMeta();

    void setItemMeta(ItemMeta meta);
+
+    default boolean isDamageable() {
+        return getItemMeta() instanceof Damageable;
+    }
 }
@@ -6,6 +6,8 @@ import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.entity.Entity;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.world.generation.TerraChunkGenerator;

 import java.io.File;
 import java.util.UUID;
@@ -17,20 +19,12 @@ public interface World extends Handle {

    ChunkGenerator getGenerator();

-    String getName();
-
-    UUID getUID();
-
-    boolean isChunkGenerated(int x, int z);
-
    Chunk getChunkAt(int x, int z);

    default Chunk getChunkAt(Location location) {
        return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
    }

-    File getWorldFolder();
-
    Block getBlockAt(int x, int y, int z);

    default Block getBlockAt(Location l) {
@@ -40,4 +34,12 @@ public interface World extends Handle {
    Entity spawnEntity(Location location, EntityType entityType);

    int getMinHeight();
+
+    default boolean isTerraWorld() {
+        return getGenerator().getHandle() instanceof GeneratorWrapper;
+    }
+
+    default TerraChunkGenerator getTerraGenerator() {
+        return ((GeneratorWrapper) getGenerator().getHandle()).getHandle();
+    }
 }
@@ -34,8 +34,8 @@ public class DamageFunction implements LootFunction {
    @Override
    public ItemStack apply(ItemStack original, Random r) {
        if(original == null) return null;
+        if(!original.isDamageable()) return original;
        ItemMeta meta = original.getItemMeta();
-        if(!(meta instanceof Damageable)) return original;
        double itemDurability = (r.nextDouble() * (max - min)) + min;
        Damageable damage = (Damageable) meta;
        damage.setDamage((int) (original.getType().getMaxDurability() - (itemDurability / 100) * original.getType().getMaxDurability()));
@@ -29,6 +29,7 @@ import com.dfsek.terra.api.structures.structure.Rotation;
 import com.dfsek.terra.api.structures.structure.buffer.Buffer;
 import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.registry.config.FunctionRegistry;
 import com.dfsek.terra.registry.config.LootRegistry;
 import com.dfsek.terra.registry.config.ScriptRegistry;
@@ -39,6 +40,7 @@ import org.apache.commons.io.IOUtils;

 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;

@@ -52,7 +54,7 @@ public class StructureScript {
    public StructureScript(InputStream inputStream, TerraPlugin main, ScriptRegistry registry, LootRegistry lootRegistry, FunctionRegistry functionRegistry) throws ParseException {
        Parser parser;
        try {
-            parser = new Parser(IOUtils.toString(inputStream));
+            parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset()));
        } catch(IOException e) {
            throw new RuntimeException(e);
        }
@@ -87,6 +89,12 @@ public class StructureScript {
                .registerFunction("ceil", new UnaryNumberFunctionBuilder(number -> FastMath.ceil(number.doubleValue())))
                .registerFunction("log", new UnaryNumberFunctionBuilder(number -> FastMath.log(number.doubleValue())))
                .registerFunction("round", new UnaryNumberFunctionBuilder(number -> FastMath.round(number.doubleValue())))
+                .registerFunction("sin", new UnaryNumberFunctionBuilder(number -> FastMath.sin(number.doubleValue())))
+                .registerFunction("cos", new UnaryNumberFunctionBuilder(number -> FastMath.cos(number.doubleValue())))
+                .registerFunction("tan", new UnaryNumberFunctionBuilder(number -> FastMath.tan(number.doubleValue())))
+                .registerFunction("asin", new UnaryNumberFunctionBuilder(number -> FastMath.asin(number.doubleValue())))
+                .registerFunction("acos", new UnaryNumberFunctionBuilder(number -> FastMath.acos(number.doubleValue())))
+                .registerFunction("atan", new UnaryNumberFunctionBuilder(number -> FastMath.atan(number.doubleValue())))
                .registerFunction("max", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.max(number.doubleValue(), number2.doubleValue())))
                .registerFunction("min", new BinaryNumberFunctionBuilder((number, number2) -> FastMath.min(number.doubleValue(), number2.doubleValue())));

@@ -104,22 +112,31 @@ public class StructureScript {
     * @param rotation Rotation of structure
     * @return Whether generation was successful
     */
+    @SuppressWarnings("try")
    public boolean execute(Location location, Random random, Rotation rotation) {
-        StructureBuffer buffer = new StructureBuffer(location);
-        boolean level = applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
-        buffer.paste();
-        return level;
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript:" + id)) {
+            StructureBuffer buffer = new StructureBuffer(location);
+            boolean level = applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
+            buffer.paste();
+            return level;
+        }
    }

+    @SuppressWarnings("try")
    public boolean execute(Location location, Chunk chunk, Random random, Rotation rotation) {
-        StructureBuffer buffer = computeBuffer(location, random, rotation);
-        buffer.paste(chunk);
-        return buffer.succeeded();
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) {
+            StructureBuffer buffer = computeBuffer(location, random, rotation);
+            buffer.paste(chunk);
+            return buffer.succeeded();
+        }
    }

+    @SuppressWarnings("try")
    public boolean test(Location location, Random random, Rotation rotation) {
-        StructureBuffer buffer = computeBuffer(location, random, rotation);
-        return buffer.succeeded();
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) {
+            StructureBuffer buffer = computeBuffer(location, random, rotation);
+            return buffer.succeeded();
+        }
    }

    private StructureBuffer computeBuffer(Location location, Random random, Rotation rotation) {
@@ -134,13 +151,19 @@ public class StructureScript {
        }
    }

+    @SuppressWarnings("try")
    public boolean executeInBuffer(Buffer buffer, Random random, Rotation rotation, int recursions) {
-        return applyBlock(new TerraImplementationArguments(buffer, rotation, random, recursions));
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) {
+            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, recursions));
+        }
    }

+    @SuppressWarnings("try")
    public boolean executeDirect(Location location, Random random, Rotation rotation) {
-        DirectBuffer buffer = new DirectBuffer(location);
-        return applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
+        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) {
+            DirectBuffer buffer = new DirectBuffer(location);
+            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
+        }
    }

    public String getId() {
@@ -19,6 +19,6 @@ public class BufferedEntity implements BufferedItem {
    @Override
    public void paste(Location origin) {
        Entity entity = origin.clone().add(0.5, 0, 0.5).getWorld().spawnEntity(origin, type);
-        main.getEventManager().callEvent(new EntitySpawnEvent(main.getWorld(entity.getWorld()).getGenerator().getConfigPack(), entity, entity.getLocation()));
+        main.getEventManager().callEvent(new EntitySpawnEvent(entity.getWorld().getTerraGenerator().getConfigPack(), entity, entity.getLocation()));
    }
 }
@@ -32,7 +32,7 @@ public class BufferedLootApplication implements BufferedItem {
            }
            Container container = (Container) data;

-            LootPopulateEvent event = new LootPopulateEvent(block, container, table, main.getWorld(block.getLocation().getWorld()).getGenerator().getConfigPack(), structure);
+            LootPopulateEvent event = new LootPopulateEvent(block, container, table, block.getLocation().getWorld().getTerraGenerator().getConfigPack(), structure);
            main.getEventManager().callEvent(event);
            if(event.isCancelled()) return;

@@ -40,7 +40,7 @@ public class BufferedLootApplication implements BufferedItem {
            data.update(false);
        } catch(Exception e) {
            main.logger().warning("Could not apply loot at " + origin + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
+            e.printStackTrace();
        }
    }
 }
@@ -21,7 +21,7 @@ public class BufferedStateManipulator implements BufferedItem {
            state.update(false);
        } catch(Exception e) {
            main.logger().warning("Could not apply BlockState at " + origin + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
+            e.printStackTrace();
        }
    }
 }
@@ -53,6 +53,7 @@ public class Transformer<F, T> {
        private final LinkedHashMap<Transform<F, T>, List<Validator<T>>> transforms = new LinkedHashMap<>();

        @SafeVarargs
+        @SuppressWarnings("varargs")
        public final Builder<F, T> addTransform(Transform<F, T> transform, Validator<T>... validators) {
            transforms.put(transform, Arrays.asList(validators));
            return this;
@@ -1,9 +1,13 @@
 package com.dfsek.terra.api.util;

+import com.dfsek.terra.api.TerraPlugin;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -32,4 +36,12 @@ public class JarUtil {
            }
        }
    }
+
+    public static JarFile getJarFile() throws URISyntaxException, IOException {
+        return new JarFile(new File(getJarURL().toURI()));
+    }
+
+    public static URL getJarURL() {
+        return TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation();
+    }
 }
@@ -13,6 +13,11 @@ public class MutableInteger extends MutableNumber<Integer> {
        add(1);
    }

+    public void addMod(int add, int mod) {
+        add(add);
+        value %= mod;
+    }
+
    public void decrement() {
        subtract(1);
    }
@@ -4,16 +4,10 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
-import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.world.TerraWorld;

@Command
-@WorldCommand
-@PlayerCommand
@DebugCommand
 public class ProfileQueryCommand implements CommandTemplate {
    @Inject
@@ -21,8 +15,9 @@ public class ProfileQueryCommand implements CommandTemplate {

    @Override
    public void execute(CommandSender sender) {
-        Player player = (Player) sender;
-        TerraWorld world = main.getWorld(player.getWorld());
-        player.sendMessage(world.getProfiler().getResultsFormatted());
+        StringBuilder data = new StringBuilder("Terra Profiler data dump: \n");
+        main.getProfiler().getTimings().forEach((id, timings) -> data.append(id).append(": ").append(timings.toString()).append('\n'));
+        main.logger().info(data.toString());
+        sender.sendMessage("Profiler data dumped to console.");
    }
 }
@@ -4,16 +4,10 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
-import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.world.TerraWorld;

@Command
-@WorldCommand
-@PlayerCommand
@DebugCommand
 public class ProfileResetCommand implements CommandTemplate {
    @Inject
@@ -21,9 +15,7 @@ public class ProfileResetCommand implements CommandTemplate {

    @Override
    public void execute(CommandSender sender) {
-        Player player = (Player) sender;
-        TerraWorld world = main.getWorld(player.getWorld());
-        world.getProfiler().reset();
-        player.sendMessage("Profiler reset.");
+        main.getProfiler().reset();
+        sender.sendMessage("Profiler reset.");
    }
 }
@@ -4,16 +4,10 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
-import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.world.TerraWorld;

@Command
-@WorldCommand
-@PlayerCommand
@DebugCommand
 public class ProfileStartCommand implements CommandTemplate {
    @Inject
@@ -21,9 +15,7 @@ public class ProfileStartCommand implements CommandTemplate {

    @Override
    public void execute(CommandSender sender) {
-        Player player = (Player) sender;
-        TerraWorld world = main.getWorld(player.getWorld());
-        world.getProfiler().setProfiling(true);
-        player.sendMessage("Profiling enabled.");
+        main.getProfiler().start();
+        sender.sendMessage("Profiling enabled.");
    }
 }
@@ -4,16 +4,10 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.DebugCommand;
-import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
-import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.world.TerraWorld;

@Command
-@WorldCommand
-@PlayerCommand
@DebugCommand
 public class ProfileStopCommand implements CommandTemplate {
    @Inject
@@ -21,9 +15,7 @@ public class ProfileStopCommand implements CommandTemplate {

    @Override
    public void execute(CommandSender sender) {
-        Player player = (Player) sender;
-        TerraWorld world = main.getWorld(player.getWorld());
-        world.getProfiler().setProfiling(false);
-        player.sendMessage("Profiling disabled.");
+        main.getProfiler().stop();
+        sender.sendMessage("Profiling disabled.");
    }
 }
@@ -69,12 +69,12 @@ public class PluginConfig implements ConfigTemplate {
            ConfigLoader loader = new ConfigLoader();
            loader.load(this, file);
            if(dumpDefaultConfig) { // Don't dump default config if already loaded.
-                try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
+                try(JarFile jar = main.getModJar()) {
                    JarUtil.copyResourcesToDirectory(jar, "packs", new File(main.getDataFolder(), "packs").toString());
                } catch(IOException | URISyntaxException e) {
                    main.getDebugLogger().error("Failed to dump default config files!");
                    e.printStackTrace();
-                    main.getDebugLogger().error("Report this to Terra!");
+                    main.getDebugLogger().error("Either you're on Forge, or this is a bug. If it's the latter, report this to Terra!");
                }
            }
        } catch(ConfigException | IOException e) {
@@ -1,13 +1,11 @@
 package com.dfsek.terra.config.builder;

-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.config.templates.BiomeTemplate;

-@AutoDocAlias("TerraBiome")
 public interface BiomeBuilder extends SeededBuilder<TerraBiome> {
    ProbabilityCollection<Biome> getVanillaBiomes();

@@ -9,9 +9,6 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;

-import java.io.File;
-import java.util.UUID;
-
 public class DummyWorld implements World {
    @Override
    public Object getHandle() {
@@ -33,31 +30,11 @@ public class DummyWorld implements World {
        return () -> (GeneratorWrapper) () -> null;
    }

-    @Override
-    public String getName() {
-        return "DUMMY";
-    }
-
-    @Override
-    public UUID getUID() {
-        return UUID.randomUUID();
-    }
-
-    @Override
-    public boolean isChunkGenerated(int x, int z) {
-        return false;
-    }
-
    @Override
    public Chunk getChunkAt(int x, int z) {
        throw new UnsupportedOperationException("Cannot get chunk in DummyWorld");
    }

-    @Override
-    public File getWorldFolder() {
-        throw new UnsupportedOperationException("Cannot get folder of DummyWorld");
-    }
-
    @Override
    public Block getBlockAt(int x, int y, int z) {
        throw new UnsupportedOperationException("Cannot get block in DummyWorld");
@@ -1,5 +1,6 @@
 package com.dfsek.terra.config.fileloaders;

+import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.terra.api.util.GlueList;

@@ -18,8 +19,12 @@ public abstract class Loader {
     *
     * @param consumer Something to do with the streams.
     */
-    public Loader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException {
-        consumer.accept(new GlueList<>(streams.values()));
+    public Loader then(ExceptionalConsumer<List<Configuration>> consumer) throws ConfigException {
+        List<Configuration> list = new GlueList<>();
+        streams.forEach((id, stream) -> {
+                    list.add(new Configuration(stream, id));
+        });
+        consumer.accept(list);
        return this;
    }

@@ -17,7 +17,7 @@ public final class LangUtil {
    public static void load(String langID, TerraPlugin main) {
        Logger logger = main.logger();
        File file = new File(main.getDataFolder(), "lang");
-        try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
+        try(JarFile jar = main.getModJar()) {
            copyResourcesToDirectory(jar, "lang", file.toString());
        } catch(IOException | URISyntaxException e) {
            main.getDebugLogger().error("Failed to dump language files!");
@@ -18,7 +18,7 @@ public class OreHolderLoader implements TypeLoader<OreHolder> {
        Map<String, Object> map = (Map<String, Object>) o;

        for(Map.Entry<String, Object> entry : map.entrySet()) {
-            holder.add(configLoader.loadClass(Ore.class, entry.getKey()), (OreConfig) configLoader.loadType(OreConfig.class, entry.getValue()));
+            holder.add(configLoader.loadClass(Ore.class, entry.getKey()), configLoader.loadClass(OreConfig.class, entry.getValue()), entry.getKey());
        }

        return holder;
@@ -11,28 +11,16 @@ import com.dfsek.terra.api.world.biome.provider.StandardBiomeProvider;

 import java.util.List;

-/**
- * Configures a biome pipeline.
- */
@SuppressWarnings({"FieldMayBeFinal", "unused"})
 public class BiomePipelineTemplate extends BiomeProviderTemplate {
    private final TerraPlugin main;
-    /**
-     * Initial size of biome pipeline chunks.
-     */
    @Value("pipeline.initial-size")
    @Default
    private int initialSize = 2;

-    /**
-     * Mutator stages to be used in this biome pipeline.
-     */
    @Value("pipeline.stages")
    private List<StageSeeded> stages;

-    /**
-     * Biome source to initialize the pipeline.
-     */
    @Value("pipeline.source")
    private SourceSeeded source;

@@ -8,21 +8,10 @@ import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;

-/**
- * Configures a biome provider.
- */
 public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvider.BiomeProviderBuilder>, BiomeProvider.BiomeProviderBuilder {
-    /**
-     * Resolution of this provider.
-     * A resolution of 1 means that 1 block = 1 sample.
-     */
    @Value("resolution")
    @Default
    protected int resolution = 1;
-
-    /**
-     * Noise function to use for blending biomes at edges.
-     */
    @Value("blend.noise")
    @Default
    protected NoiseSeeded blend = new NoiseSeeded() {
@@ -36,13 +25,11 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
            return 2;
        }
    };
-
-    /**
-     * Amplitude of edge blending, in blocks.
-     */
    @Value("blend.amplitude")
    @Default
    protected double blendAmp = 0d;
+    @Value("type")
+    BiomeProvider.Type type;

    @Override
    public BiomeProvider.BiomeProviderBuilder get() {
@@ -9,21 +9,11 @@ import com.dfsek.terra.config.builder.BiomeBuilder;
 import java.awt.image.BufferedImage;
 import java.util.stream.Collectors;

-/**
- * Configures an image biome provider.
- */
 public class ImageProviderTemplate extends BiomeProviderTemplate {
    private final Registry<BiomeBuilder> biomes;
-
-    /**
-     * Image to use for biome selection.
-     */
    @Value("image.name")
    private BufferedImage image;

-    /**
-     * How the image should be aligned.
-     */
    @Value("image.align")
    private ImageBiomeProvider.Align align;

@@ -5,13 +5,7 @@ import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.biome.provider.SingleBiomeProvider;
 import com.dfsek.terra.config.builder.BiomeBuilder;

-/**
- * Configures a single-biome provider.
- */
 public class SingleBiomeProviderTemplate extends BiomeProviderTemplate {
-    /**
-     * The biome.
-     */
    @Value("biome")
    private BiomeBuilder biome;

@@ -1,27 +1,16 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.source;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.api.world.biome.pipeline.source.RandomSource;
 import com.dfsek.terra.config.builder.BiomeBuilder;

-/**
- * Configures a noise-based biome source.
- */
-@AutoDocAlias("NoiseSource")
 public class NoiseSourceTemplate extends SourceTemplate {
-    /**
-     * Noise function to use for selecting biomes.
-     */
    @Value("noise")
    private NoiseSeeded noise;

-    /**
-     * ProbabilityCollection of biomes to use.
-     */
    @Value("biomes")
    private ProbabilityCollection<BiomeBuilder> biomes;

@@ -1,11 +1,9 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.source;

 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.seeded.SourceSeeded;
 import com.dfsek.terra.api.world.biome.pipeline.source.BiomeSource;

-@AutoDocAlias("SourceSeeded")
 public abstract class SourceTemplate implements ObjectTemplate<SourceSeeded>, SourceSeeded {
    @Override
    public SourceSeeded get() {
@@ -2,17 +2,12 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage;

 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
 import com.dfsek.terra.api.util.seeded.StageSeeded;
 import com.dfsek.terra.api.world.biome.pipeline.stages.Stage;

-@AutoDocAlias("StageSeeded")
 public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {
-    /**
-     * Noise function to use for mutating biomes in this stage.
-     */
    @Value("noise")
    protected NoiseSeeded noise;

@@ -1,7 +1,6 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
@@ -12,30 +11,16 @@ import java.util.HashMap;
 import java.util.Map;

@SuppressWarnings("unused")
-@AutoDocAlias("BorderListMutator")
 public class BorderListMutatorTemplate extends MutatorStageTemplate {
-    /**
-     * Tag of the biome on the external side of the border.
-     */
    @Value("from")
    private String from;

-    /**
-     * Tag of biomes to replace when bordering biomes with
-     * tag "from".
-     */
    @Value("default-replace")
    private String defaultReplace;

-    /**
-     * Default replacement biomes.
-     */
    @Value("default-to")
    private ProbabilityCollection<BiomeBuilder> defaultTo;

-    /**
-     * Map of single biomes to their replacements.
-     */
    @Value("replace")
    private Map<BiomeBuilder, ProbabilityCollection<BiomeBuilder>> replace;

@@ -1,32 +1,19 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BorderMutator;
 import com.dfsek.terra.config.builder.BiomeBuilder;

@SuppressWarnings("unused")
-@AutoDocAlias("BorderMutator")
 public class BorderMutatorTemplate extends MutatorStageTemplate {
-    /**
-     * Tag of the biome on the external side of the border.
-     */
    @Value("from")
    private String from;

-    /**
-     * Tag of biomes to replace when bordering biomes
-     * with tag "from"
-     */
    @Value("replace")
    private String replace;

-    /**
-     * Collection of biomes to place at borders
-     * of "from" and "to"
-     */
    @Value("to")
    private ProbabilityCollection<BiomeBuilder> to;

@@ -1,12 +1,10 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.world.biome.pipeline.stages.Stage;
 import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate;

-@AutoDocAlias("MutatorStage")
 public abstract class MutatorStageTemplate extends StageTemplate {
    public abstract BiomeMutator build(long seed);

@@ -1,7 +1,6 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
@@ -12,11 +11,7 @@ import java.util.HashMap;
 import java.util.Map;

@SuppressWarnings("unused")
-@AutoDocAlias("ReplaceListMutator")
 public class ReplaceListMutatorTemplate extends MutatorStageTemplate {
-    /**
-     * Default tag to replace from
-     */
    @Value("default-from")
    private String defaultFrom;

@@ -1,24 +1,16 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.ReplaceMutator;
 import com.dfsek.terra.config.builder.BiomeBuilder;

@SuppressWarnings("unused")
-@AutoDocAlias("ReplaceMutator")
 public class ReplaceMutatorTemplate extends MutatorStageTemplate {
-    /**
-     * Tag of biomes to replace.
-     */
    @Value("from")
    private String from;

-    /**
-     * Biomes to replace with.
-     */
    @Value("to")
    private ProbabilityCollection<BiomeBuilder> to;

@@ -1,10 +1,8 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;

-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.SmoothMutator;

-@AutoDocAlias("SmoothMutator")
 public class SmoothMutatorTemplate extends MutatorStageTemplate {
    @Override
    public BiomeMutator build(long seed) {
@@ -6,7 +6,6 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.registry.config.NoiseRegistry;

@@ -15,7 +14,6 @@ import java.util.Locale;
 import java.util.Map;

@SuppressWarnings("unchecked")
-@AutoDocAlias("NoiseSeeded")
 public class NoiseSamplerBuilderLoader implements TypeLoader<NoiseSeeded> {
    private final NoiseRegistry noiseRegistry;

@@ -2,46 +2,28 @@ package com.dfsek.terra.config.loaders.config.sampler.templates;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.DomainWarpedSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

-/**
- * Defines a domain-warped noise function.
- */
@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("DomainWarpedSampler")
 public class DomainWarpTemplate extends SamplerTemplate<DomainWarpedSampler> {
-    /**
-     * Noise function used to warp input function.
-     */
    @Value("warp")
    private NoiseSeeded warp;

-    /**
-     * Input function (function to be warped)
-     */
    @Value("function")
    private NoiseSeeded function;

-    /**
-     * Salt for both warp function and
-     * input function.
-     */
    @Value("salt")
    @Default
    private int salt = 0;

-    /**
-     * Amplitude of warping. Values provided by
-     * the warp function are multiplied by this constant.
-     */
    @Value("amplitude")
    @Default
    private double amplitude = 1;

    @Override
-    public DomainWarpedSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new DomainWarpedSampler(function.apply(seed), warp.apply(seed), (int) (seed + salt), amplitude);
    }
 }
@@ -1,13 +1,12 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.ImageSampler;

 import java.awt.image.BufferedImage;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("ImageSampler")
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {

    @Value("image")
@@ -20,7 +19,7 @@ public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {
    private ImageSampler.Channel channel;

    @Override
-    public ImageSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new ImageSampler(image, channel, frequency);
    }
 }
@@ -4,14 +4,13 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.KernelSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

 import java.util.List;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("KernelSampler")
 public class KernelTemplate extends SamplerTemplate<KernelSampler> implements ValidatedConfigTemplate {

    @Value("kernel")
@@ -29,7 +28,7 @@ public class KernelTemplate extends SamplerTemplate<KernelSampler> implements Va
    private double frequency = 1;

    @Override
-    public KernelSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        double[][] k = new double[kernel.size()][kernel.get(0).size()];

        for(int x = 0; x < kernel.size(); x++) {
@@ -5,16 +5,11 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

@SuppressWarnings("FieldMayBeFinal")
-@AutoDocAlias("NoiseSeeded")
 public abstract class SamplerTemplate<T extends NoiseSampler> implements ValidatedConfigTemplate, ObjectTemplate<NoiseSeeded>, NoiseSeeded {
-    /**
-     * Number of dimensions for this sampler.
-     */
    @Value("dimensions")
    @Default
    private int dimensions = 2;
@@ -33,7 +28,4 @@ public abstract class SamplerTemplate<T extends NoiseSampler> implements Validat
    public NoiseSeeded get() {
        return this;
    }
-
-    @Override
-    public abstract T apply(Long seed);
 }
@@ -2,14 +2,12 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

@SuppressWarnings("FieldMayBeFinal")
-@AutoDocAlias("CellularSampler")
 public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
    @Value("distance")
    @Default
@@ -40,7 +38,7 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
    };

    @Override
-    public CellularSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        CellularSampler sampler = new CellularSampler((int) (long) seed + salt);
        sampler.setNoiseLookup(lookup.apply(seed));
        sampler.setFrequency(frequency);
@@ -2,19 +2,18 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

@SuppressWarnings("FieldMayBeFinal")
-@AutoDocAlias("ConstantSampler")
 public class ConstantNoiseTemplate extends SamplerTemplate<ConstantSampler> {
    @Value("value")
    @Default
    private double value = 0d;

    @Override
-    public ConstantSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new ConstantSampler(value);
    }
 }
@@ -8,8 +8,9 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.ExpressionFunction;
+import com.dfsek.terra.api.math.paralithic.BlankFunction;
 import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
@@ -23,7 +24,6 @@ import java.util.Map;


@SuppressWarnings({"FieldMayBeFinal", "unused"})
-@AutoDocAlias("ExpressionFunction")
 public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFunction> implements ValidatedConfigTemplate {
    @Value("variables")
    @Default
@@ -41,7 +41,7 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
    private LinkedHashMap<String, FunctionTemplate> expressions = new LinkedHashMap<>();

    @Override
-    public ExpressionFunction apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        try {
            Map<String, Function> noiseFunctionMap = generateFunctions(seed);
            return new ExpressionFunction(noiseFunctionMap, equation, vars);
@@ -2,31 +2,18 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.GaborNoiseSampler;

-/**
- * Defines a Gabor noise function.
- */
-@AutoDocAlias("GaborNoiseSampler")
 public class GaborNoiseTemplate extends NoiseTemplate<GaborNoiseSampler> {
-    /**
-     * Rotation to apply to noise. Only has noticeable effects in anisotropic mode.
-     */
    @Value("rotation")
    @Default
    private double rotation = 0.25;

-    /**
-     * Whether to use anisotropic or isotropic algorithm.
-     */
    @Value("isotropic")
    @Default
    private boolean isotropic = true;

-    /**
-     * Standard deviation of result values.
-     */
    @Value("deviation")
    @Default
    private double deviation = 1.0;
@@ -40,7 +27,7 @@ public class GaborNoiseTemplate extends NoiseTemplate<GaborNoiseSampler> {
    private double f0 = 0.625;

    @Override
-    public GaborNoiseSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        GaborNoiseSampler gaborNoiseSampler = new GaborNoiseSampler((int) (long) seed + salt);
        gaborNoiseSampler.setFrequency(frequency);
        gaborNoiseSampler.setRotation(rotation);
@@ -2,12 +2,10 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("NoiseFunction")
 public abstract class NoiseTemplate<T extends NoiseFunction> extends SamplerTemplate<T> {
    @Value("frequency")
    @Default
@@ -1,11 +1,10 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.noise;

-import com.dfsek.terra.api.docs.AutoDocShadow;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;

 import java.util.function.Function;

-@AutoDocShadow("NoiseFunction")
 public class SimpleNoiseTemplate extends NoiseTemplate<NoiseFunction> {
    private final Function<Integer, NoiseFunction> samplerSupplier;

@@ -14,7 +13,7 @@ public class SimpleNoiseTemplate extends NoiseTemplate<NoiseFunction> {
    }

    @Override
-    public NoiseFunction apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        NoiseFunction sampler = samplerSupplier.apply((int) (long) seed + salt);
        sampler.setFrequency(frequency);
        return sampler;
@@ -1,12 +1,11 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;

-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.fractal.BrownianMotionSampler;

-@AutoDocAlias("BrownianMotionSampler")
 public class BrownianMotionTemplate extends FractalTemplate<BrownianMotionSampler> {
    @Override
-    public BrownianMotionSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.apply(seed));
        sampler.setGain(fractalGain);
        sampler.setLacunarity(fractalLacunarity);
@@ -2,12 +2,10 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.samplers.noise.fractal.FractalNoiseFunction;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

-@AutoDocAlias("FractalNoiseFunction")
 public abstract class FractalTemplate<T extends FractalNoiseFunction> extends SamplerTemplate<T> {
    @Value("octaves")
    @Default
@@ -2,17 +2,16 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.fractal.PingPongSampler;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("PingPongSampler")
 public class PingPongTemplate extends FractalTemplate<PingPongSampler> {
    @Value("ping-pong")
    @Default
    private double pingPong = 2.0D;

    @Override
-    public PingPongSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.apply(seed));
        sampler.setGain(fractalGain);
        sampler.setLacunarity(fractalLacunarity);
@@ -1,12 +1,11 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;

-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.fractal.RidgedFractalSampler;

-@AutoDocAlias("RidgedFractalSampler")
 public class RidgedFractalTemplate extends FractalTemplate<RidgedFractalSampler> {
    @Override
-    public RidgedFractalSampler apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.apply(seed));
        sampler.setGain(fractalGain);
        sampler.setLacunarity(fractalLacunarity);
@@ -1,12 +1,12 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.ClampNormalizer;
+import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("ClampNormalizer")
-public class ClampNormalizerTemplate extends NormalizerTemplate<ClampNormalizer> {
+public class ClampNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {
    @Value("max")
    private double max;

@@ -14,7 +14,7 @@ public class ClampNormalizerTemplate extends NormalizerTemplate<ClampNormalizer>
    private double min;

    @Override
-    public ClampNormalizer apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new ClampNormalizer(function.apply(seed), min, max);
    }
 }
@@ -1,11 +1,10 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("LinearNormalizer")
 public class LinearNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {
    @Value("max")
    private double max;
@@ -14,7 +13,7 @@ public class LinearNormalizerTemplate extends NormalizerTemplate<LinearNormalize
    private double min;

    @Override
-    public LinearNormalizer apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new LinearNormalizer(function.apply(seed), min, max);
    }
 }
@@ -2,11 +2,10 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;

 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.NormalNormalizer;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("NormalNormalizer")
 public class NormalNormalizerTemplate extends NormalizerTemplate<NormalNormalizer> {
    @Value("mean")
    private double mean;
@@ -19,7 +18,7 @@ public class NormalNormalizerTemplate extends NormalizerTemplate<NormalNormalize
    private int groups = 16384;

    @Override
-    public NormalNormalizer apply(Long seed) {
+    public NoiseSampler apply(Long seed) {
        return new NormalNormalizer(function.apply(seed), groups, mean, stdDev);
    }
 }
@@ -1,12 +1,10 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;

 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.normalizer.Normalizer;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

-@AutoDocAlias("Normalizer")
 public abstract class NormalizerTemplate<T extends Normalizer> extends SamplerTemplate<T> {
    @Value("function")
    protected NoiseSeeded function;
@@ -237,13 +237,13 @@ public class ConfigPack implements LoaderRegistrar {
        }).close();

        loader
-                .open("carving", ".yml").then(streams -> buildAll(new CarverFactory(this), carverRegistry, abstractConfigLoader.load(streams, CarverTemplate::new), main)).close()
-                .open("palettes", ".yml").then(streams -> buildAll(new PaletteFactory(), paletteRegistry, abstractConfigLoader.load(streams, PaletteTemplate::new), main)).close()
-                .open("ores", ".yml").then(streams -> buildAll(new OreFactory(), oreRegistry, abstractConfigLoader.load(streams, OreTemplate::new), main)).close()
-                .open("structures/trees", ".yml").then(streams -> buildAll(new TreeFactory(), treeRegistry, abstractConfigLoader.load(streams, TreeTemplate::new), main)).close()
-                .open("structures/structures", ".yml").then(streams -> buildAll(new StructureFactory(), structureRegistry, abstractConfigLoader.load(streams, StructureTemplate::new), main)).close()
-                .open("flora", ".yml").then(streams -> buildAll(new FloraFactory(), floraRegistry, abstractConfigLoader.load(streams, FloraTemplate::new), main)).close()
-                .open("biomes", ".yml").then(streams -> buildAll(new BiomeFactory(this), biomeRegistry, abstractConfigLoader.load(streams, () -> new BiomeTemplate(this, main)), main)).close();
+                .open("carving", ".yml").then(configs -> buildAll(new CarverFactory(this), carverRegistry, abstractConfigLoader.loadConfigs(configs, CarverTemplate::new), main)).close()
+                .open("palettes", ".yml").then(configs -> buildAll(new PaletteFactory(), paletteRegistry, abstractConfigLoader.loadConfigs(configs, PaletteTemplate::new), main)).close()
+                .open("ores", ".yml").then(configs -> buildAll(new OreFactory(), oreRegistry, abstractConfigLoader.loadConfigs(configs, OreTemplate::new), main)).close()
+                .open("structures/trees", ".yml").then(configs -> buildAll(new TreeFactory(), treeRegistry, abstractConfigLoader.loadConfigs(configs, TreeTemplate::new), main)).close()
+                .open("structures/structures", ".yml").then(configs -> buildAll(new StructureFactory(), structureRegistry, abstractConfigLoader.loadConfigs(configs, StructureTemplate::new), main)).close()
+                .open("flora", ".yml").then(configs -> buildAll(new FloraFactory(), floraRegistry, abstractConfigLoader.loadConfigs(configs, FloraTemplate::new), main)).close()
+                .open("biomes", ".yml").then(configs -> buildAll(new BiomeFactory(this), biomeRegistry, abstractConfigLoader.loadConfigs(configs, () -> new BiomeTemplate(this, main)), main)).close();

        main.getEventManager().callEvent(new ConfigPackPostLoadEvent(this));
        main.logger().info("Loaded config pack \"" + template.getID() + "\" v" + template.getVersion() + " by " + template.getAuthor() + " in " + (System.nanoTime() - start) / 1000000D + "ms.");
@@ -15,52 +15,24 @@ import java.util.Set;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class ConfigPackTemplate implements ConfigTemplate {
-
-    /**
-     * The ID of the config pack.
-     */
    @Value("id")
    private String id;

-    /**
-     * Noise functions to be made available
-     * to noise equations in the config pack.
-     * <p>
-     * Keys are Paralithic function IDs,
-     * values are noise functions.
-     */
    @Value("noise")
    private Map<String, NoiseSeeded> noiseBuilderMap;

-    /**
-     * Addons this pack depends on.
-     */
    @Value("addons")
    @Default
    private Set<TerraAddon> addons = new HashSet<>();

-    /**
-     * Variables to be made available
-     * to noise equations in the config pack.
-     * <p>
-     * Keys are variable IDs,
-     * values are variable values.
-     */
    @Value("variables")
    @Default
    private Map<String, Double> variables = new HashMap<>();

-    /**
-     * Whether to enable beta noise
-     * carvers.
-     */
    @Value("beta.carving")
    @Default
    private boolean betaCarvers = false;

-    /**
-     *
-     */
    @Value("functions")
    @Default
    private LinkedHashMap<String, FunctionTemplate> functions = new LinkedHashMap<>();
@@ -9,7 +9,6 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler;
 import com.dfsek.terra.api.math.paralithic.BlankFunction;
@@ -39,7 +38,6 @@ import java.util.Map;
 import java.util.Set;

@SuppressWarnings({"FieldMayBeFinal", "unused"})
-@AutoDocAlias("TerraBiome")
 public class BiomeTemplate extends AbstractableTemplate implements ValidatedConfigTemplate {

    private final ConfigPack pack;
@@ -3,7 +3,6 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.util.collections.MaterialSet;
@@ -13,7 +12,6 @@ import java.util.HashMap;
 import java.util.Map;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("UserDefinedCarver")
 public class CarverTemplate extends AbstractableTemplate {
    @Value("id")
    private String id;
@@ -3,7 +3,6 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import com.dfsek.terra.world.population.items.flora.TerraFlora;
@@ -11,7 +10,6 @@ import com.dfsek.terra.world.population.items.flora.TerraFlora;
 import java.util.List;

@SuppressWarnings({"FieldMayBeFinal", "unused"})
-@AutoDocAlias("Flora")
 public class FloraTemplate extends AbstractableTemplate {
    @Value("id")
    private String id;
@@ -34,7 +32,7 @@ public class FloraTemplate extends AbstractableTemplate {
    @Value("irrigable")
    @Abstractable
    @Default
-    private MaterialSet irrigable = new MaterialSet();
+    private MaterialSet irrigable = null;

    @Value("rotatable")
    @Abstractable
@@ -3,14 +3,12 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.world.population.items.ores.Ore;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("Ore")
 public class OreTemplate extends AbstractableTemplate {
    @Value("id")
    private String id;
@@ -3,7 +3,6 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@@ -12,7 +11,6 @@ import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
 import java.util.List;

@SuppressWarnings({"FieldMayBeFinal", "unused"})
-@AutoDocAlias("Palette")
 public class PaletteTemplate extends AbstractableTemplate {
    @Value("noise")
    @Abstractable
@@ -4,7 +4,6 @@ import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.math.GridSpawn;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.structures.script.StructureScript;
@@ -14,7 +13,6 @@ import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import java.util.List;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("TerraStructure")
 public class StructureTemplate extends AbstractableTemplate implements ConfigTemplate {
    @Value("id")
    private String id;
@@ -3,13 +3,11 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.docs.AutoDocAlias;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;

@SuppressWarnings({"unused", "FieldMayBeFinal"})
-@AutoDocAlias("Tree")
 public class TreeTemplate extends AbstractableTemplate {
    @Value("scripts")
    @Abstractable
@@ -1,36 +0,0 @@
-package com.dfsek.terra.profiler;
-
-/**
- * Class to hold a profiler data value. Contains formatting method to highlight value based on desired range.
- */
-public class DataHolder {
-    private final long desired;
-    private final DataType type;
-    private final double desiredRangePercent;
-
-    /**
-     * Constructs a DataHolder with a DataType and a desired value, including a percentage around the desired value considered acceptable
-     *
-     * @param type                The type of data held in this instance.
-     * @param desired             The desired value. This should be the average value of whatever is being measured.
-     * @param desiredRangePercent The percentage around the desired value to be considered acceptable.
-     */
-    public DataHolder(DataType type, long desired, double desiredRangePercent) {
-        this.desired = desired;
-        this.type = type;
-        this.desiredRangePercent = desiredRangePercent;
-    }
-
-    /**
-     * Returns a String, formatted with Bungee ChatColors.<br>
-     * GREEN if the value is better than desired and outside of acceptable range.<br>
-     * YELLOW if the value is better or worse than desired, and within acceptable range.<br>
-     * RED if the value is worse than desired and outside of acceptable range.<br>
-     *
-     * @param data The data to format.
-     * @return String - The formatted data.
-     */
-    public String getFormattedData(long data) {
-        return type.getFormatted(data);
-    }
-}
@@ -1,24 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import net.jafama.FastMath;
-
-public enum DataType {
-    PERIOD_MILLISECONDS(Desire.LOW, 1000000, "ms"), PERIOD_NANOSECONDS(Desire.LOW, 1, "ns");
-    private final Desire desire;
-    private final long divisor;
-    private final String unit;
-
-    DataType(Desire d, long divisor, String unit) {
-        this.desire = d;
-        this.divisor = divisor;
-        this.unit = unit;
-    }
-
-    public String getFormatted(long value) {
-        return (double) FastMath.round(((double) value / divisor) * 100D) / 100D + unit;
-    }
-
-    public Desire getDesire() {
-        return desire;
-    }
-}
@@ -1,10 +0,0 @@
-package com.dfsek.terra.profiler;
-
-
-/**
- * Enum to represent the "goal" of a value, whether it is desirable for the value to be high (e.g. Frequency), or low (e.g. Period)
- */
-public enum Desire {
-    LOW, HIGH
-
-}
@@ -0,0 +1,24 @@
+package com.dfsek.terra.profiler;
+
+public class Frame {
+    private final String id;
+    private final long start;
+
+    public Frame(String id) {
+        this.id = id;
+        this.start = System.nanoTime();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}
@@ -1,87 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.util.GlueList;
-import net.jafama.FastMath;
-
-import java.math.BigInteger;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Class to record and hold all data for a single type of measurement performed by the profiler.
- */
-public class Measurement {
-    private final List<Long> measurements = new LinkedList<>();
-    private final long desirable;
-    private final DataType type;
-    private long min = Long.MAX_VALUE;
-    private long max = Long.MIN_VALUE;
-
-    /**
-     * Constructs a new Measurement with a desired value and DataType.
-     *
-     * @param desirable The desired value of the measurement.
-     * @param type      The type of data the measurement is holding.
-     */
-    public Measurement(long desirable, DataType type) {
-        this.desirable = desirable;
-        this.type = type;
-    }
-
-    public void record(long value) {
-        max = FastMath.max(value, max);
-        min = FastMath.min(value, min);
-        measurements.add(value);
-    }
-
-    public int size() {
-        return measurements.size();
-    }
-
-    public ProfileFuture beginMeasurement() {
-        ProfileFuture future = new ProfileFuture();
-        long current = System.nanoTime();
-        future.thenRun(() -> record(System.nanoTime() - current));
-        return future;
-    }
-
-    public void reset() {
-        min = Long.MAX_VALUE;
-        max = Long.MIN_VALUE;
-        measurements.clear();
-    }
-
-    public DataHolder getDataHolder() {
-        return new DataHolder(type, desirable, 0.25);
-    }
-
-    public long getMin() {
-        if(min == Long.MAX_VALUE) return 0;
-        return min;
-    }
-
-    public long getMax() {
-        if(max == Long.MIN_VALUE) return 0;
-        return max;
-    }
-
-    public long average() {
-        BigInteger running = BigInteger.valueOf(0);
-        List<Long> mTemp = new GlueList<>(measurements);
-        for(Long l : mTemp) {
-            running = running.add(BigInteger.valueOf(l));
-        }
-        if(measurements.size() == 0) return 0;
-        return running.divide(BigInteger.valueOf(measurements.size())).longValue();
-    }
-
-    public double getStdDev() {
-        return MathUtil.standardDeviation(new GlueList<>(measurements));
-    }
-
-    public int entries() {
-        return measurements.size();
-    }
-
-}
@@ -0,0 +1,14 @@
+package com.dfsek.terra.profiler;
+
+public class ProfileFrame implements AutoCloseable {
+    private final Runnable action;
+
+    public ProfileFrame(Runnable action) {
+        this.action = action;
+    }
+
+    @Override
+    public void close() {
+        action.run();
+    }
+}
@@ -1,18 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import java.util.concurrent.CompletableFuture;
-
-public class ProfileFuture extends CompletableFuture<Boolean> implements AutoCloseable {
-    public ProfileFuture() {
-        super();
-    }
-
-    public boolean complete() {
-        return super.complete(true);
-    }
-
-    @Override
-    public void close() {
-        this.complete();
-    }
-}
@@ -0,0 +1,56 @@
+package com.dfsek.terra.profiler;
+
+import java.util.Map;
+
+public interface Profiler {
+    /**
+     * Push a frame to this profiler.
+     *
+     * @param frame ID of frame.
+     */
+    void push(String frame);
+
+    /**
+     * Pop a frame from this profiler.
+     *
+     * @param frame ID of frame. Must match ID
+     *              at the top of the profiler stack.
+     */
+    void pop(String frame);
+
+    /**
+     * Start profiling.
+     */
+    void start();
+
+    /**
+     * Stop profiling.
+     */
+    void stop();
+
+    /**
+     * Get the profiler data.
+     *
+     * @return Profiler data.
+     */
+    Map<String, Timings> getTimings();
+
+    /**
+     * Return a {@link AutoCloseable} implementation that
+     * may be used in a try-with-resources statement for
+     * more intuitive profiling, with auto-push/pop.
+     *
+     * @param frame ID of frame.
+     * @return {@link AutoCloseable} implementation for use
+     * in try-with-resources.
+     */
+    default ProfileFrame profile(String frame) {
+        push(frame);
+        return new ProfileFrame(() -> pop(frame));
+    }
+
+    /**
+     * Clear the profiler data.
+     */
+    void reset();
+}
@@ -0,0 +1,91 @@
+package com.dfsek.terra.profiler;
+
+import com.dfsek.terra.api.util.mutable.MutableInteger;
+import com.dfsek.terra.profiler.exception.MalformedStackException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+public class ProfilerImpl implements Profiler {
+    private static final ThreadLocal<Stack<Frame>> THREAD_STACK = ThreadLocal.withInitial(Stack::new);
+    private static final ThreadLocal<Map<String, List<Long>>> TIMINGS = ThreadLocal.withInitial(HashMap::new);
+    private final List<Map<String, List<Long>>> accessibleThreadMaps = new ArrayList<>();
+    private volatile boolean running = false;
+    private static boolean instantiated = false;
+
+    private static final ThreadLocal<Boolean> SAFE = ThreadLocal.withInitial(() -> false);
+    private static final ThreadLocal<MutableInteger> STACK_SIZE = ThreadLocal.withInitial(() -> new MutableInteger(0));
+
+    public ProfilerImpl() {
+        if(instantiated) throw new IllegalStateException("Only one instance of Profiler may exist!");
+        instantiated = true;
+    }
+
+    @Override
+    public void push(String frame) {
+        STACK_SIZE.get().increment();
+        if(running && SAFE.get()) {
+            Stack<Frame> stack = THREAD_STACK.get();
+            stack.push(new Frame(stack.isEmpty() ? frame : stack.peek().getId() + "." + frame));
+        } else SAFE.set(false);
+    }
+
+    @Override
+    public void pop(String frame) {
+        MutableInteger size = STACK_SIZE.get();
+        size.decrement();
+        if(running && SAFE.get()) {
+            long time = System.nanoTime();
+            Stack<Frame> stack = THREAD_STACK.get();
+
+            Map<String, List<Long>> timingsMap = TIMINGS.get();
+
+            if(timingsMap.size() == 0) {
+                synchronized(accessibleThreadMaps) {
+                    accessibleThreadMaps.add(timingsMap);
+                }
+            }
+
+            Frame top = stack.pop();
+            if((stack.size() != 0 && !top.getId().endsWith("." + frame)) || (stack.size() == 0 && !top.getId().equals(frame)))
+                throw new MalformedStackException("Expected " + frame + ", found " + top);
+
+            List<Long> timings = timingsMap.computeIfAbsent(top.getId(), id -> new ArrayList<>());
+
+            timings.add(time - top.getStart());
+        }
+        if(size.get() == 0) SAFE.set(true);
+    }
+
+    @Override
+    public void start() {
+        running = true;
+    }
+
+    @Override
+    public void stop() {
+        running = false;
+    }
+
+    @Override
+    public Map<String, Timings> getTimings() {
+        Map<String, Timings> map = new HashMap<>();
+        accessibleThreadMaps.forEach(smap -> smap.forEach((key, list) -> {
+            String[] keys = key.split("\\.");
+            Timings timings = map.computeIfAbsent(keys[0], id -> new Timings());
+            for(int i = 1; i < keys.length; i++) {
+                timings = timings.getSubItem(keys[i]);
+            }
+            list.forEach(timings::addTime);
+        }));
+        return map;
+    }
+
+    @Override
+    public void reset() {
+        accessibleThreadMaps.forEach(Map::clear);
+    }
+}
@@ -0,0 +1,73 @@
+package com.dfsek.terra.profiler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class Timings {
+    private final Map<String, Timings> subItems = new HashMap<>();
+
+    private final List<Long> timings = new ArrayList<>();
+
+    public void addTime(long time) {
+        timings.add(time);
+    }
+
+    public List<Long> getTimings() {
+        return timings;
+    }
+
+    public double average() {
+        return (double) timings.stream().reduce(0L, Long::sum) / timings.size();
+    }
+
+    public long max() {
+        return timings.stream().mapToLong(Long::longValue).max().orElse(0L);
+    }
+
+    public long min() {
+        return timings.stream().mapToLong(Long::longValue).min().orElse(0L);
+    }
+
+    public double sum() {
+        return timings.stream().mapToDouble(Long::doubleValue).sum();
+    }
+
+    public Timings getSubItem(String id) {
+        return subItems.computeIfAbsent(id, s -> new Timings());
+    }
+
+    public String toString(int indent, Timings parent, Set<Integer> branches) {
+        StringBuilder builder = new StringBuilder();
+
+        builder.append((double) min() / 1000000).append("ms min / ").append(average() / 1000000).append("ms avg / ")
+                .append((double) max() / 1000000).append("ms max (").append(timings.size()).append(" samples, ")
+                .append((sum() / parent.sum()) * 100).append("% of parent)");
+
+        List<String> frames = new ArrayList<>();
+        Set<Integer> newBranches = new HashSet<>(branches);
+        newBranches.add(indent);
+        subItems.forEach((id, timings) -> frames.add(id + ": " + timings.toString(indent + 1, this, newBranches)));
+
+        for(int i = 0; i < frames.size(); i++) {
+            builder.append('\n');
+            for(int j = 0; j < indent; j++) {
+                if(branches.contains(j)) builder.append("│   ");
+                else builder.append("    ");
+            }
+            if(i == frames.size() - 1 && !frames.get(i).contains("\n")) builder.append("└───");
+            else builder.append("├───");
+            builder.append(frames.get(i));
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public String toString() {
+        return toString(1, this, Collections.emptySet());
+    }
+}
@@ -1,85 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.world.TerraWorld;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import net.jafama.FastMath;
-
-import java.util.Map;
-
-public class WorldProfiler {
-    private final BiMap<String, Measurement> measures = HashBiMap.create();
-    private final World world;
-    private boolean isProfiling;
-
-    public WorldProfiler(World w) {
-        if(!TerraWorld.isTerraWorld(w))
-            throw new IllegalArgumentException("Attempted to instantiate profiler on non-Terra managed world!");
-        this.addMeasurement(new Measurement(2500000, DataType.PERIOD_MILLISECONDS), "TotalChunkGenTime")
-                .addMeasurement(new Measurement(1500000, DataType.PERIOD_MILLISECONDS), "FloraTime")
-                .addMeasurement(new Measurement(10000000, DataType.PERIOD_MILLISECONDS), "TreeTime")
-                .addMeasurement(new Measurement(1500000, DataType.PERIOD_MILLISECONDS), "OreTime")
-                .addMeasurement(new Measurement(5000000, DataType.PERIOD_MILLISECONDS), "CaveTime")
-                .addMeasurement(new Measurement(1500000, DataType.PERIOD_MILLISECONDS), "StructureTime");
-
-        isProfiling = false;
-        this.world = w;
-    }
-
-    public String getResultsFormatted() {
-        if(! isProfiling) return "Profiler is not currently running.";
-        StringBuilder result = new StringBuilder("Gaea World Profiler Results (Min / Avg / Max / Std Dev): \n");
-        for(Map.Entry<String, Measurement> e : measures.entrySet()) {
-            result
-                    .append(e.getKey())
-                    .append(": ")
-                    .append(e.getValue().getDataHolder().getFormattedData(e.getValue().getMin()))
-                    .append(" / ")
-                    .append(e.getValue().getDataHolder().getFormattedData(e.getValue().average()))
-                    .append(" / ")
-                    .append(e.getValue().getDataHolder().getFormattedData(e.getValue().getMax()))
-                    .append(" / ")
-                    .append((double) FastMath.round((e.getValue().getStdDev() / 1000000) * 100D) / 100D)
-                    .append("ms")
-                    .append(" (x").append(e.getValue().size()).append(")\n");
-        }
-        return result.toString();
-    }
-
-    public void reset() {
-        for(Map.Entry<String, Measurement> e : measures.entrySet()) {
-            e.getValue().reset();
-        }
-    }
-
-    public com.dfsek.terra.profiler.WorldProfiler addMeasurement(Measurement m, String name) {
-        measures.put(name, m);
-        return this;
-    }
-
-    public void setMeasurement(String id, long value) {
-        if(isProfiling) measures.get(id).record(value);
-    }
-
-    public ProfileFuture measure(String id) {
-        if(isProfiling) return measures.get(id).beginMeasurement();
-        else return null;
-    }
-
-    public String getID(Measurement m) {
-        return measures.inverse().get(m);
-    }
-
-    public boolean isProfiling() {
-        return isProfiling;
-    }
-
-    public void setProfiling(boolean enabled) {
-        this.isProfiling = enabled;
-    }
-
-    public World getWorld() {
-        return world;
-    }
-}
@@ -0,0 +1,17 @@
+package com.dfsek.terra.profiler.exception;
+
+public class MalformedStackException extends ProfilerException {
+    private static final long serialVersionUID = -3009539681021691054L;
+
+    public MalformedStackException(String message) {
+        super(message);
+    }
+
+    public MalformedStackException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public MalformedStackException(Throwable cause) {
+        super(cause);
+    }
+}
@@ -0,0 +1,17 @@
+package com.dfsek.terra.profiler.exception;
+
+public class ProfilerException extends RuntimeException {
+    private static final long serialVersionUID = 8206737998791649002L;
+
+    public ProfilerException(String message) {
+        super(message);
+    }
+
+    public ProfilerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ProfilerException(Throwable cause) {
+        super(cause);
+    }
+}
@@ -65,7 +65,9 @@ public class OpenRegistry<T> implements Registry<T> {

    @Override
    public T get(String identifier) {
-        return objects.get(identifier).getValue();
+        Entry<T> entry = objects.get(identifier);
+        if(entry == null) return null;
+        return entry.getValue();
    }

    @Override
@@ -68,10 +68,4 @@ public class FloraRegistry extends OpenRegistry<Flora> {
    private BlockData data(String s) {
        return main.getWorldHandle().createBlockData(s);
    }
-
-
-    @Override
-    public Flora get(String identifier) {
-        return super.get(identifier);
-    }
 }
@@ -13,7 +13,6 @@ import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.pack.WorldConfig;
-import com.dfsek.terra.profiler.WorldProfiler;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;
 import net.jafama.FastMath;

@@ -21,33 +20,25 @@ public class TerraWorld {
    private final BiomeProvider provider;
    private final WorldConfig config;
    private final boolean safe;
-    private final WorldProfiler profiler;
    private final World world;
    private final BlockData air;


    public TerraWorld(World w, ConfigPack c, TerraPlugin main) {
-        if(!isTerraWorld(w)) throw new IllegalArgumentException("World " + w + " is not a Terra World!");
+        if(!w.isTerraWorld()) throw new IllegalArgumentException("World " + w + " is not a Terra World!");
        this.world = w;
        config = c.toWorldConfig(this);
        this.provider = config.getProvider();
-        profiler = new WorldProfiler(w);
        air = main.getWorldHandle().createBlockData("minecraft:air");
        main.getEventManager().callEvent(new TerraWorldLoadEvent(this, c));
        safe = true;
    }

-    public static boolean isTerraWorld(World w) {
-        return w.getGenerator().getHandle() instanceof GeneratorWrapper;
-    }

    public World getWorld() {
        return world;
    }

-    public TerraChunkGenerator getGenerator() {
-        return ((GeneratorWrapper) world.getGenerator().getHandle()).getHandle();
-    }

    public BiomeProvider getBiomeProvider() {
        return provider;
@@ -61,9 +52,6 @@ public class TerraWorld {
        return safe;
    }

-    public WorldProfiler getProfiler() {
-        return profiler;
-    }

    /**
     * Get a block at an ungenerated location
@@ -15,7 +15,7 @@ import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
@@ -94,7 +94,7 @@ public class DefaultChunkGenerator2D implements TerraChunkGenerator {
    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
        TerraWorld tw = main.getWorld(world);
        BiomeProvider grid = tw.getBiomeProvider();
-        try(ProfileFuture ignore = tw.getProfiler().measure("TotalChunkGenTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_2d")) {
            if(!tw.isSafe()) return chunk;
            int xOrig = (chunkX << 4);
            int zOrig = (chunkZ << 4);
@@ -23,7 +23,7 @@ import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.SinglePalette;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
@@ -50,7 +50,6 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {

    private final Carver carver;

-
    public DefaultChunkGenerator3D(ConfigPack c, TerraPlugin main) {
        this.configPack = c;
        this.main = main;
@@ -104,9 +103,10 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
    @Override
    @SuppressWarnings({"try"})
    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
-        TerraWorld tw = main.getWorld(world);
-        BiomeProvider grid = tw.getBiomeProvider();
-        try(ProfileFuture ignore = tw.getProfiler().measure("TotalChunkGenTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) {
+            TerraWorld tw = main.getWorld(world);
+            BiomeProvider grid = tw.getBiomeProvider();
+
            if(!tw.isSafe()) return chunk;
            int xOrig = (chunkX << 4);
            int zOrig = (chunkZ << 4);
@@ -120,7 +120,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
                    int cx = xOrig + x;
                    int cz = zOrig + z;

-                    TerraBiome b = grid.getBiome(xOrig + x, zOrig + z);
+                    TerraBiome b = grid.getBiome(cx, cz);
                    BiomeTemplate c = ((UserDefinedBiome) b).getConfig();

                    int sea = c.getSeaLevel();
@@ -227,17 +227,20 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
        return false;
    }

+    @SuppressWarnings({"try"})
    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
-        int xOrig = (chunkX << 4);
-        int zOrig = (chunkZ << 4);
-        BiomeProvider grid = main.getWorld(world).getBiomeProvider();
-        for(int x = 0; x < 4; x++) {
-            for(int z = 0; z < 4; z++) {
-                int cx = xOrig + (x << 2);
-                int cz = zOrig + (z << 2);
-                TerraBiome b = grid.getBiome(cx, cz);
+        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
+            int xOrig = (chunkX << 4);
+            int zOrig = (chunkZ << 4);
+            BiomeProvider grid = main.getWorld(world).getBiomeProvider();
+            for(int x = 0; x < 4; x++) {
+                for(int z = 0; z < 4; z++) {
+                    int cx = xOrig + (x << 2);
+                    int cz = zOrig + (z << 2);
+                    TerraBiome b = grid.getBiome(cx, cz);

-                biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
+                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
+                }
            }
        }
    }
@@ -25,7 +25,7 @@ public class SamplerCache {
                    public Sampler load(@NotNull Long key) {
                        int cx = (int) (key >> 32);
                        int cz = (int) key.longValue();
-                        return world.getGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
+                        return world.getWorld().getTerraGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
                    }
                });
    }
@@ -14,7 +14,7 @@ import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.pack.WorldConfig;
 import com.dfsek.terra.config.templates.CarverTemplate;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import org.jetbrains.annotations.NotNull;

@@ -38,7 +38,7 @@ public class CavePopulator implements TerraBlockPopulator, Chunkified {
        TerraWorld tw = main.getWorld(world);
        WorldHandle handle = main.getWorldHandle();
        BlockData AIR = handle.createBlockData("minecraft:air");
-        try(ProfileFuture ignored = tw.getProfiler().measure("CaveTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("carving")) {
            Random random = PopulationUtil.getRandom(chunk);
            if(!tw.isSafe()) return;
            WorldConfig config = tw.getConfig();
@@ -49,38 +49,40 @@ public class CavePopulator implements TerraBlockPopulator, Chunkified {
                Map<Location, BlockData> shiftCandidate = new HashMap<>();
                Set<Block> updateNeeded = new HashSet<>();
                c.carve(chunk.getX(), chunk.getZ(), world, (v, type) -> {
-                    Block b = chunk.getBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ());
-                    BlockData m = b.getBlockData();
-                    BlockType re = m.getBlockType();
-                    switch(type) {
-                        case CENTER:
-                            if(template.getInner().canReplace(re)) {
-                                b.setBlockData(template.getInner().get(v.getBlockY()).get(random), false);
-                                if(template.getUpdate().contains(re)) updateNeeded.add(b);
-                                if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
-                            }
-                            break;
-                        case WALL:
-                            if(template.getOuter().canReplace(re)) {
-                                b.setBlockData(template.getOuter().get(v.getBlockY()).get(random), false);
-                                if(template.getUpdate().contains(re)) updateNeeded.add(b);
-                                if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
-                            }
-                            break;
-                        case TOP:
-                            if(template.getTop().canReplace(re)) {
-                                b.setBlockData(template.getTop().get(v.getBlockY()).get(random), false);
-                                if(template.getUpdate().contains(re)) updateNeeded.add(b);
-                                if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
-                            }
-                            break;
-                        case BOTTOM:
-                            if(template.getBottom().canReplace(re)) {
-                                b.setBlockData(template.getBottom().get(v.getBlockY()).get(random), false);
-                                if(template.getUpdate().contains(re)) updateNeeded.add(b);
-                                if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
-                            }
-                            break;
+                    try(ProfileFrame ignored = main.getProfiler().profile("carving:" + c.getConfig().getID())) {
+                        Block b = chunk.getBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ());
+                        BlockData m = b.getBlockData();
+                        BlockType re = m.getBlockType();
+                        switch(type) {
+                            case CENTER:
+                                if(template.getInner().canReplace(re)) {
+                                    b.setBlockData(template.getInner().get(v.getBlockY()).get(random), false);
+                                    if(template.getUpdate().contains(re)) updateNeeded.add(b);
+                                    if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
+                                }
+                                break;
+                            case WALL:
+                                if(template.getOuter().canReplace(re)) {
+                                    b.setBlockData(template.getOuter().get(v.getBlockY()).get(random), false);
+                                    if(template.getUpdate().contains(re)) updateNeeded.add(b);
+                                    if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
+                                }
+                                break;
+                            case TOP:
+                                if(template.getTop().canReplace(re)) {
+                                    b.setBlockData(template.getTop().get(v.getBlockY()).get(random), false);
+                                    if(template.getUpdate().contains(re)) updateNeeded.add(b);
+                                    if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
+                                }
+                                break;
+                            case BOTTOM:
+                                if(template.getBottom().canReplace(re)) {
+                                    b.setBlockData(template.getBottom().get(v.getBlockY()).get(random), false);
+                                    if(template.getUpdate().contains(re)) updateNeeded.add(b);
+                                    if(template.getShift().containsKey(re)) shiftCandidate.put(b.getLocation(), m);
+                                }
+                                break;
+                        }
                    }
                });
                for(Map.Entry<Location, BlockData> entry : shiftCandidate.entrySet()) {
@@ -93,7 +95,7 @@ public class CavePopulator implements TerraBlockPopulator, Chunkified {
                        if(template.getShift().get(entry.getValue().getBlockType()).contains(mut.getBlock().getBlockData().getBlockType())) {
                            mut.getBlock().setBlockData(shiftStorage.computeIfAbsent(entry.getValue().getBlockType(), BlockType::getDefaultData), false);
                        }
-                    } catch(NullPointerException ignore) {
+                    } catch(NullPointerException ignored) {
                    }
                }
                for(Block b : updateNeeded) {
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ public class FloraPopulator implements TerraBlockPopulator {
    @Override
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
-        try(ProfileFuture ignored = tw.getProfiler().measure("FloraTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("flora")) {
            if(tw.getConfig().getTemplate().disableFlora()) return;

            if(!tw.isSafe()) return;
@@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import org.jetbrains.annotations.NotNull;

@@ -27,7 +27,7 @@ public class OrePopulator implements TerraBlockPopulator {
    @Override
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
-        try(ProfileFuture ignored = tw.getProfiler().measure("OreTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("ore")) {
            if(tw.getConfig().getTemplate().disableOres()) return;

            if(!tw.isSafe()) return;
@@ -40,11 +40,13 @@ public class OrePopulator implements TerraBlockPopulator {
                    BiomeTemplate config = ((UserDefinedBiome) b).getConfig();
                    int finalCx = cx;
                    int finalCz = cz;
-                    config.getOreHolder().forEach((ore, oreConfig) -> {
-                        int amount = oreConfig.getAmount().get(random);
-                        for(int i = 0; i < amount; i++) {
-                            Vector3 location = new Vector3(random.nextInt(16) + 16 * finalCx, oreConfig.getHeight().get(random), random.nextInt(16) + 16 * finalCz);
-                            ore.generate(location, chunk, random);
+                    config.getOreHolder().forEach((id, orePair) -> {
+                        try(ProfileFrame ignored = main.getProfiler().profile("ore:" + id)) {
+                            int amount = orePair.getRight().getAmount().get(random);
+                            for(int i = 0; i < amount; i++) {
+                                Vector3 location = new Vector3(random.nextInt(16) + 16 * finalCx, orePair.getRight().getHeight().get(random), random.nextInt(16) + 16 * finalCz);
+                                orePair.getLeft().generate(location, chunk, random);
+                            }
                        }
                    });
                }
@@ -11,9 +11,8 @@ import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.pack.WorldConfig;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.TerraStructure;
 import net.jafama.FastMath;
@@ -32,7 +31,7 @@ public class StructurePopulator implements TerraBlockPopulator, Chunkified {
    @Override
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
-        try(ProfileFuture ignored = tw.getProfiler().measure("StructureTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("structure")) {
            if(tw.getConfig().getTemplate().disableStructures()) return;

            int cx = (chunk.getX() << 4);
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 import net.jafama.FastMath;
@@ -32,7 +32,7 @@ public class TreePopulator implements TerraBlockPopulator {
    @SuppressWarnings("try")
    public void populate(@NotNull World world, @NotNull Chunk chunk) {
        TerraWorld tw = main.getWorld(world);
-        try(ProfileFuture ignored = tw.getProfiler().measure("TreeTime")) {
+        try(ProfileFrame ignore = main.getProfiler().profile("tree")) {
            if(tw.getConfig().getTemplate().disableTrees()) return;

            if(!tw.isSafe()) return;
@@ -42,8 +42,9 @@ public class TreePopulator implements TerraBlockPopulator {
                for(int z = 0; z < 16; z += 2) {
                    UserDefinedBiome biome = (UserDefinedBiome) provider.getBiome((chunk.getX() << 4) + x, (chunk.getZ() << 4) + z);
                    for(TreeLayer layer : biome.getConfig().getTrees()) {
-                        if(layer.getDensity() >= random.nextDouble() * 100)
+                        if(layer.getDensity() >= random.nextDouble() * 100) {
                            layer.place(chunk, new Vector2(offset(random, x), offset(random, z)));
+                        }
                    }
                }
            }
@@ -16,7 +16,6 @@ public abstract class Ore {
    protected TerraPlugin main;

    public Ore(BlockData material, MaterialSet replaceable, boolean applyGravity, TerraPlugin main) {
-
        this.material = material;
        this.replaceable = replaceable;
        this.applyGravity = applyGravity;
@@ -1,6 +1,7 @@
 package com.dfsek.terra.world.population.items.ores;

 import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.util.generic.pair.ImmutablePair;

 import java.util.List;
 import java.util.function.BiConsumer;
@@ -11,22 +12,24 @@ import java.util.function.BiConsumer;
 public class OreHolder {
    private final List<Entry> entries = new GlueList<>();

-    public void forEach(BiConsumer<Ore, OreConfig> consumer) {
-        entries.forEach(entry -> consumer.accept(entry.getOre(), entry.getConfig()));
+    public void forEach(BiConsumer<String, ImmutablePair<Ore, OreConfig>> consumer) {
+        entries.forEach(entry -> consumer.accept(entry.getId(), ImmutablePair.of(entry.getOre(), entry.getConfig())));
    }

-    public OreHolder add(Ore ore, OreConfig config) {
-        entries.add(new Entry(ore, config));
+    public OreHolder add(Ore ore, OreConfig config, String id) {
+        entries.add(new Entry(ore, config, id));
        return this;
    }

    private static final class Entry {
        private final Ore ore;
        private final OreConfig config;
+        private final String id;

-        private Entry(Ore ore, OreConfig config) {
+        private Entry(Ore ore, OreConfig config, String id) {
            this.ore = ore;
            this.config = config;
+            this.id = id;
        }

        public OreConfig getConfig() {
@@ -36,5 +39,9 @@ public class OreHolder {
        public Ore getOre() {
            return ore;
        }
+
+        public String getId() {
+            return id;
+        }
    }
 }
@@ -1,5 +0,0 @@
-# Boolean
-
-A Boolean data type represents a logical boolean value, a value which can
-be either `true` or `false`.
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dfsek	5354cdebf6	still doesnt work but it works more™️	2021-05-09 14:31:51 -07:00
dfsek	66758859bb	create TerraOptionsScreen	2021-05-09 01:24:04 -07:00
dfsek	1186fc6624	bump version	2021-05-05 15:24:55 -07:00
dfsek	a1b3680643	initialize later	2021-05-05 15:22:02 -07:00
dfsek	fd48f5f110	Merge pull request #158 from PolyhedralDev/dev/fabric-locate Override structure location on Fabric	2021-05-04 16:45:25 -07:00
dfsek	77a4c95c4a	override structure location on Fabric	2021-05-04 16:44:43 -07:00
dfsek	dbc60b1d82	Merge pull request #153 from PolyhedralDev/dev/fabric-mixins Implement Terra interfaces directly in Minecraft classes using Mixin.	2021-05-04 16:16:31 -07:00
dfsek	ed942bb997	update README.md	2021-05-04 16:13:05 -07:00
dfsek	6866084872	SignBlockEntityMixin cleanup	2021-05-04 16:10:37 -07:00
dfsek	4c77419dcd	fix sign getText on server	2021-05-04 15:04:53 -07:00
dfsek	ecba6e0843	Merge remote-tracking branch 'origin/dev/fabric-mixins' into dev/fabric-mixins	2021-05-04 09:21:21 -07:00
dfsek	86dcb476f1	update README with modern build instructions and Forge download links	2021-05-04 09:21:12 -07:00
dfsek	13e0857882	merge FabricEnumAdapter into FabricAdapter	2021-05-03 22:49:21 -07:00
dfsek	bf93a9239c	bump version	2021-05-03 22:28:01 -07:00
dfsek	2d18aab709	fix funky yaml formatting	2021-05-03 22:13:42 -07:00
dfsek	a1359da374	terrascript trig functions	2021-05-03 22:13:32 -07:00
dfsek	f7bda835f9	fix itemmeta application	2021-05-03 20:52:03 -07:00
dfsek	7595896831	fix refmap issues	2021-05-03 20:40:56 -07:00
dfsek	6614d19845	suppress warnings	2021-05-03 20:14:06 -07:00
dfsek	6209b86560	mixin maintenance	2021-05-03 20:12:48 -07:00
dfsek	a30859a3d4	dont try to remap Terra interfaces	2021-05-03 20:08:13 -07:00
dfsek	ddbb46289b	add package-info.java to implementation mixin package.	2021-05-03 20:03:25 -07:00
dfsek	64c35a9609	refactor Fabric project	2021-05-03 20:02:08 -07:00
dfsek	f21069ab2e	fix cache misses	2021-05-03 19:43:52 -07:00
dfsek	457729b832	replace most access wideners with mixins	2021-05-03 19:33:57 -07:00
dfsek	756f04a0b3	implement LockableContainerBlockEntityMixin	2021-05-03 18:38:40 -07:00
dfsek	5ee32cc3ba	add ConfiguredFeatureMixin	2021-05-03 17:35:43 -07:00
dfsek	955558bc21	implement BlockMixin	2021-05-03 11:37:54 -07:00
dfsek	c43a872c23	finish blockstate mixins	2021-05-03 11:27:36 -07:00
dfsek	de41b92d5d	add SignBlockEntityMixin	2021-05-03 10:27:40 -07:00
dfsek	03091230ed	refactor mixins	2021-05-03 10:09:21 -07:00
dfsek	a8c88915ea	override chunkregion hashcode	2021-05-02 23:39:40 -07:00
dfsek	4cd4720101	fix loot NPE	2021-05-02 23:08:54 -07:00
dfsek	3b9280b19c	start work on state mixins	2021-05-02 23:00:21 -07:00
dfsek	2d27e07441	implement BiomeMixin	2021-05-02 22:49:57 -07:00
dfsek	20a5762d2e	refactor mixins	2021-05-02 22:48:21 -07:00
dfsek	146f71f704	finish World mixins	2021-05-02 22:45:34 -07:00
dfsek	1d4b0bc100	cleanup	2021-05-02 22:26:23 -07:00
dfsek	138ee0a448	refactor fabric handles	2021-05-02 22:22:32 -07:00
dfsek	2c8cae9d45	create ChunkGeneratorMixin	2021-05-02 22:21:50 -07:00
dfsek	061d2b6493	implement EntityTypeMixin	2021-05-02 21:48:06 -07:00
dfsek	e71df936ab	EnchantmentMixin	2021-05-02 21:35:39 -07:00
dfsek	f4253acb78	item mixins	2021-05-02 21:27:25 -07:00
dfsek	c12518fa49	delete FabricItem.java	2021-05-02 21:11:09 -07:00
dfsek	4704b2ebf7	implement ItemMixin	2021-05-02 21:10:48 -07:00
dfsek	89fdfdfb34	suppress warnings	2021-05-02 20:42:54 -07:00
dfsek	35d85f2aa3	PlayerEntityMixin and EntityMixin	2021-05-02 20:38:25 -07:00
dfsek	c0368f1c6d	implement ServerCommandSourceMixin	2021-05-02 20:17:59 -07:00
dfsek	abc069046c	add ProtoChunkMixin and WorldChunkMixin	2021-05-02 20:13:24 -07:00
dfsek	46d0b08068	implement ChunkRegionMixin	2021-05-02 19:49:59 -07:00
dfsek	a7e3a0286e	add -forge and -fabric to Modrinth version numbers.	2021-05-02 17:46:55 -07:00
dfsek	6da8924868	Merge pull request #145 from PolyhedralDev/dev/forge Forge implementation	2021-05-02 17:38:56 -07:00
dfsek	d9dd6afe4b	Merge pull request #143 from solonovamax/improvement/better-gradle-performance Improve gradle performance significantly	2021-05-02 17:37:36 -07:00
dfsek	dfec26f789	fix forge modrinth task	2021-05-02 17:21:05 -07:00
dfsek	d13be5e159	add Forge modrinth publish task	2021-05-02 17:16:03 -07:00
dfsek	51c5f70d64	forge jarfile nightmare "solution"	2021-05-02 17:08:59 -07:00
dfsek	05b1902c06	Merge pull request #151 from DJtheRedstoner/patch-mixin-ap Fix mixin annotation processor issues	2021-05-02 15:47:32 -07:00
dfsek	f4ae2cac68	add MixinGeneratorOptions	2021-05-02 15:46:03 -07:00
dfsek	ea3995afce	fix refmap name	2021-05-02 15:44:30 -07:00
dfsek	c41d60c38f	remove manual refmap	2021-05-02 15:43:12 -07:00
DJtheRedstoner	19edcbddd5	Fix mixin annotation processor issues These issues were caused by CompilationConfig.configureCompilation() overwriting JavaCompile's options.compilerArgs list which removed any previously added arguments, including those added by fabric-loom and mixingradle.	2021-05-02 18:17:18 -04:00
dfsek	4f65555e82	remove mixins until annotation processor gets fixed.	2021-05-02 14:37:34 -07:00
dfsek	9956cab507	dont use vanilla registries	2021-05-01 22:21:27 -07:00
dfsek	fddf0c51b7	cleanup PopulationManager	2021-05-01 20:27:59 -07:00
dfsek	e2a52afb67	remove methods only used for cursed Bukkit stuff from common World interface.	2021-05-01 19:07:19 -07:00
dfsek	c8c3a33912	fix loot table issue	2021-05-01 18:40:31 -07:00
dfsek	b178f69e47	Merge remote-tracking branch 'origin/dev/forge' into dev/forge	2021-05-01 18:20:23 -07:00
dfsek	049a56fcb0	Mixin on Forge	2021-05-01 18:20:11 -07:00
solonovamax	2d41dd8f08	Don't use all cores processors for tests Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>	2021-05-01 16:53:45 -04:00
solonovamax	aa9e33af1d	Remove old and deprecated `compile` configuration + some minor refactoring Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>	2021-05-01 16:53:45 -04:00
dfsek	02870805c7	hoist calculations in chunk generator	2021-04-30 09:35:15 -07:00
dfsek	e493825ab7	bump version	2021-04-30 09:25:56 -07:00
dfsek	762b248641	update to latest Tectonic	2021-04-29 23:42:56 -07:00
dfsek	f81ccee020	cleanup	2021-04-29 23:31:03 -07:00
dfsek	3561e5f30f	commands on Forge	2021-04-29 23:19:49 -07:00
dfsek	c67817b9d2	fix structure issues	2021-04-29 22:00:40 -07:00
dfsek	756619edb6	Forge actually loads to worlds now	2021-04-29 21:48:32 -07:00
dfsek	ee1c889d54	world screen type	2021-04-29 21:11:26 -07:00
dfsek	9f3dcf07b6	Pack loading on Forge	2021-04-29 20:30:48 -07:00
dfsek	93a2f103f7	add pack.mcmeta	2021-04-29 16:41:14 -07:00
dfsek	3ea12ceeab	start implementing terraplugin	2021-04-29 12:30:17 -07:00
dfsek	ce8ec51ae4	forge actually loads now	2021-04-29 12:24:29 -07:00
dfsek	54bb4ef109	sort of working Forge project	2021-04-29 01:55:24 -07:00
dfsek	59b655ce5d	working forge buildscript	2021-04-29 01:27:28 -07:00
solonovamax	4c1e1bb7d5	Improve gradle performance significantly Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>	2021-04-28 20:43:53 -04:00
dfsek	eee54f507e	Merge pull request #138 from PolyhedralDev/dev/profilerimpl Fancy stack-based profiler	2021-04-26 21:32:42 -07:00
dfsek	6f1b1611ab	fix dumb gradle issue	2021-04-26 21:26:44 -07:00
dfsek	205499220d	profile more things	2021-04-26 20:59:21 -07:00
dfsek	a0c5631eba	bump version	2021-04-26 20:46:36 -07:00
dfsek	9323abc788	document Profiler	2021-04-26 19:04:20 -07:00
dfsek	632f898dc8	implement Profiler#reset	2021-04-26 19:01:53 -07:00
dfsek	8737b0d984	resolve merge conflict	2021-04-25 17:12:42 -07:00
dfsek	bcb68853d5	@SuppressWarnings go brrr	2021-04-25 17:11:50 -07:00
dfsek	8823d6d65e	fix stack size assumption at profiler start	2021-04-25 17:11:50 -07:00
dfsek	5d3a2b6e84	profile more things	2021-04-25 17:11:50 -07:00
dfsek	23fb7753ab	fancy unicode symbols B)	2021-04-25 17:11:50 -07:00
dfsek	f8e7e343cb	fix % parent issue	2021-04-25 17:11:50 -07:00
dfsek	e5f4c5dc8d	implement terrascript profiling	2021-04-25 17:11:49 -07:00
dfsek	8a10867e5f	implement new profiler	2021-04-25 17:11:04 -07:00
dfsek	da366a75e8	add autocloseable option	2021-04-25 17:09:08 -07:00
dfsek	eb4bf74cc6	implement TerraPlugin#getProfier	2021-04-25 17:09:08 -07:00
dfsek	168c0ced13	improve performance in deep operations	2021-04-25 17:09:07 -07:00
dfsek	5d4bdb431b	improve data output	2021-04-25 17:09:07 -07:00
dfsek	40188c671f	basic profiler implementation	2021-04-25 17:09:07 -07:00