update readme to reflect licensing change

.editorconfig

@@ -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 = false
+ij_yaml_space_before_colon = true
 ij_yaml_spaces_within_braces = true
 ij_yaml_spaces_within_brackets = true

README.md

@@ -7,36 +7,25 @@ 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
+## Licensing
 
-To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and
-produce JARs in `platforms/<platform>/build/libs`
+Terra as a whole is licensed under the GNU General Public License, version 3.0. Terra's API is licensed under the GNU Lesser General Public
+License, version 3.0, in order to allow linking to the API without GPL infection.
 
-### Production JARs:
-* Bukkit: `Terra-<version>-shaded.jar`
-* Fabric: `Terra-<version>-shaded-mapped.jar`
-* Forge: `Terra-<version>-shaded.jar`
+## Building and running Terra
 
-### Building a Specific Platform
-To build a specific platform, run `gradlew :platforms:<platform>:build`.
+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.
 
-JARs are produced 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.
+
+**Note: You will need to adjust the `NAME` variable `bukkit.yml` of the test server if you are not using the default Terra config.**
 
-### 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!

build.gradle.kts

@@ -1,27 +1,10 @@
 import com.dfsek.terra.getGitHash
 
-val versionObj = Version("5", "3", "1", true)
+val versionObj = Version("5", "1", "2", 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.

buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt

@@ -7,11 +7,26 @@ 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 {

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -3,16 +3,14 @@ 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.*
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.filter
+import org.gradle.kotlin.dsl.withType
 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
@@ -21,7 +19,7 @@ fun Project.configureCompilation() {
     tasks.withType<JavaCompile> {
         options.encoding = "UTF-8"
         doFirst {
-            options.compilerArgs.add("-Xlint:all")
+            options.compilerArgs = mutableListOf("-Xlint:all")
         }
     }
 
@@ -37,19 +35,4 @@ 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)
-    }
 }

buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt

@@ -1,27 +1,13 @@
 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("https://maven.enginehub.org/repo/") }
+        maven { url = uri("http://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/") }
@@ -32,7 +18,9 @@ fun Project.configureDependencies() {
 
     dependencies {
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        "api"("org.jetbrains:annotations:20.1.0")
+        "testImplementation"("org.yaml:snakeyaml:1.27")
+        "testImplementation"("com.googlecode.json-simple:json-simple:1.1.1")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        "compileOnly"("org.jetbrains:annotations:20.1.0")
     }
 }

buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt

@@ -14,6 +14,17 @@ 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 {
@@ -27,6 +38,21 @@ 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)
@@ -36,14 +62,8 @@ fun Project.configureDistribution() {
         archiveClassifier.set("shaded")
         setVersion(project.version)
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
+        relocate("parsii", "com.dfsek.terra.lib.parsii")
         relocate("net.jafama", "com.dfsek.terra.lib.jafama")
-        relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
-        relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone")
-        relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc")
-        relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework")
-        relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation")
-        relocate("org.json", "com.dfsek.terra.lib.json")
-        relocate("org.yaml", "com.dfsek.terra.lib.yaml")
         minimize()
     }
     convention.getPlugin<BasePluginConvention>().archivesBaseName = project.name

common/build.gradle.kts

@@ -1,14 +1,11 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
+import com.dfsek.terra.configureCommon
 
 plugins {
     `java-library`
     `maven-publish`
-    idea
 }
 
-configureCompilation()
-configureDependencies()
+configureCommon()
 
 group = "com.dfsek.terra.common"
 
@@ -17,14 +14,13 @@ dependencies {
     "shadedApi"("commons-io:commons-io:2.4")
 
     "shadedApi"("com.dfsek:Paralithic:0.3.2")
-    "shadedApi"("com.dfsek:Tectonic:1.3.1")
+    "shadedApi"("com.dfsek:Tectonic:1.2.3")
     "shadedApi"("net.jafama:jafama:2.3.2")
     "shadedApi"("org.yaml:snakeyaml:1.27")
     "shadedApi"("org.ow2.asm:asm:9.0")
     "shadedApi"("commons-io:commons-io:2.6")
 
-    "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1")
-    "shadedApi"("org.yaml:snakeyaml:1.27")
+    "compileOnly"("com.googlecode.json-simple:json-simple:1.1")
 
     "compileOnly"("com.google.guava:guava:30.0-jre")
 

common/src/main/java/com/dfsek/terra/api/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

common/src/main/java/com/dfsek/terra/api/TerraPlugin.java

@@ -7,19 +7,14 @@ 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.
@@ -69,10 +64,4 @@ public interface TerraPlugin extends LoaderRegistrar {
     default void runPossiblyUnsafeTask(Runnable task) {
         task.run();
     }
-
-    Profiler getProfiler();
-
-    default JarFile getModJar() throws URISyntaxException, IOException {
-        return JarUtil.getJarFile();
-    }
 }

common/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java

@@ -65,7 +65,7 @@ public class TerraCommandManager implements CommandManager {
             return;
         }
 
-        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).getWorld()).isTerraWorld())) {
+        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !TerraWorld.isTerraWorld(((Player) sender).getWorld()))) {
             sender.sendMessage("Command must be executed in a Terra world.");
             return;
         }

common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java

@@ -1,7 +1,6 @@
 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 {
@@ -14,8 +13,4 @@ public interface ItemStack extends Handle {
     ItemMeta getItemMeta();
 
     void setItemMeta(ItemMeta meta);
-
-    default boolean isDamageable() {
-        return getItemMeta() instanceof Damageable;
-    }
 }

common/src/main/java/com/dfsek/terra/api/platform/world/World.java

@@ -6,8 +6,6 @@ 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;
@@ -19,12 +17,20 @@ 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) {
@@ -34,12 +40,4 @@ 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();
-    }
 }

common/src/main/java/com/dfsek/terra/api/structures/loot/functions/DamageFunction.java

@@ -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()));

common/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java

@@ -29,7 +29,6 @@ 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;
@@ -40,7 +39,6 @@ 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;
 
@@ -54,7 +52,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, Charset.defaultCharset()));
+            parser = new Parser(IOUtils.toString(inputStream));
         } catch(IOException e) {
             throw new RuntimeException(e);
         }
@@ -89,12 +87,6 @@ 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())));
 
@@ -112,31 +104,22 @@ public class StructureScript {
      * @param rotation Rotation of structure
      * @return Whether generation was successful
      */
-    @SuppressWarnings("try")
     public boolean execute(Location location, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript:" + id)) {
-            StructureBuffer buffer = new StructureBuffer(location);
-            boolean level = applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
-            buffer.paste();
-            return level;
-        }
+        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) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) {
-            StructureBuffer buffer = computeBuffer(location, random, rotation);
-            buffer.paste(chunk);
-            return buffer.succeeded();
-        }
+        StructureBuffer buffer = computeBuffer(location, random, rotation);
+        buffer.paste(chunk);
+        return buffer.succeeded();
     }
 
-    @SuppressWarnings("try")
     public boolean test(Location location, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) {
-            StructureBuffer buffer = computeBuffer(location, random, rotation);
-            return buffer.succeeded();
-        }
+        StructureBuffer buffer = computeBuffer(location, random, rotation);
+        return buffer.succeeded();
     }
 
     private StructureBuffer computeBuffer(Location location, Random random, Rotation rotation) {
@@ -151,19 +134,13 @@ public class StructureScript {
         }
     }
 
-    @SuppressWarnings("try")
     public boolean executeInBuffer(Buffer buffer, Random random, Rotation rotation, int recursions) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) {
-            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, recursions));
-        }
+        return applyBlock(new TerraImplementationArguments(buffer, rotation, random, recursions));
     }
 
-    @SuppressWarnings("try")
     public boolean executeDirect(Location location, Random random, Rotation rotation) {
-        try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) {
-            DirectBuffer buffer = new DirectBuffer(location);
-            return applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
-        }
+        DirectBuffer buffer = new DirectBuffer(location);
+        return applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
     }
 
     public String getId() {

common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java

@@ -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(entity.getWorld().getTerraGenerator().getConfigPack(), entity, entity.getLocation()));
+        main.getEventManager().callEvent(new EntitySpawnEvent(main.getWorld(entity.getWorld()).getGenerator().getConfigPack(), entity, entity.getLocation()));
     }
 }

common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java

@@ -32,7 +32,7 @@ public class BufferedLootApplication implements BufferedItem {
             }
             Container container = (Container) data;
 
-            LootPopulateEvent event = new LootPopulateEvent(block, container, table, block.getLocation().getWorld().getTerraGenerator().getConfigPack(), structure);
+            LootPopulateEvent event = new LootPopulateEvent(block, container, table, main.getWorld(block.getLocation().getWorld()).getGenerator().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());
-            e.printStackTrace();
+            main.getDebugLogger().stack(e);
         }
     }
 }

common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java

@@ -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());
-            e.printStackTrace();
+            main.getDebugLogger().stack(e);
         }
     }
 }

common/src/main/java/com/dfsek/terra/api/transform/Transformer.java

@@ -53,7 +53,6 @@ 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;

common/src/main/java/com/dfsek/terra/api/util/JarUtil.java

@@ -1,13 +1,9 @@
 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;
@@ -36,12 +32,4 @@ 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();
-    }
 }

common/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java

@@ -13,11 +13,6 @@ public class MutableInteger extends MutableNumber<Integer> {
         add(1);
     }
 
-    public void addMod(int add, int mod) {
-        add(add);
-        value %= mod;
-    }
-
     public void decrement() {
         subtract(1);
     }

common/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java

@@ -4,10 +4,16 @@ 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
@@ -15,9 +21,8 @@ public class ProfileQueryCommand implements CommandTemplate {
 
     @Override
     public void execute(CommandSender sender) {
-        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.");
+        Player player = (Player) sender;
+        TerraWorld world = main.getWorld(player.getWorld());
+        player.sendMessage(world.getProfiler().getResultsFormatted());
     }
 }

common/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java

@@ -4,10 +4,16 @@ 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
@@ -15,7 +21,9 @@ public class ProfileResetCommand implements CommandTemplate {
 
     @Override
     public void execute(CommandSender sender) {
-        main.getProfiler().reset();
-        sender.sendMessage("Profiler reset.");
+        Player player = (Player) sender;
+        TerraWorld world = main.getWorld(player.getWorld());
+        world.getProfiler().reset();
+        player.sendMessage("Profiler reset.");
     }
 }

common/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java

@@ -4,10 +4,16 @@ 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
@@ -15,7 +21,9 @@ public class ProfileStartCommand implements CommandTemplate {
 
     @Override
     public void execute(CommandSender sender) {
-        main.getProfiler().start();
-        sender.sendMessage("Profiling enabled.");
+        Player player = (Player) sender;
+        TerraWorld world = main.getWorld(player.getWorld());
+        world.getProfiler().setProfiling(true);
+        player.sendMessage("Profiling enabled.");
     }
 }

common/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java

@@ -4,10 +4,16 @@ 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
@@ -15,7 +21,9 @@ public class ProfileStopCommand implements CommandTemplate {
 
     @Override
     public void execute(CommandSender sender) {
-        main.getProfiler().stop();
-        sender.sendMessage("Profiling disabled.");
+        Player player = (Player) sender;
+        TerraWorld world = main.getWorld(player.getWorld());
+        world.getProfiler().setProfiling(false);
+        player.sendMessage("Profiling disabled.");
     }
 }

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

@@ -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 = main.getModJar()) {
+                try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
                     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("Either you're on Forge, or this is a bug. If it's the latter, report this to Terra!");
+                    main.getDebugLogger().error("Report this to Terra!");
                 }
             }
         } catch(ConfigException | IOException e) {

common/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java

@@ -9,6 +9,9 @@ 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() {
@@ -30,11 +33,31 @@ 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");

common/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java

@@ -1,6 +1,5 @@
 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;
 
@@ -19,12 +18,8 @@ public abstract class Loader {
      *
      * @param consumer Something to do with the streams.
      */
-    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);
+    public Loader then(ExceptionalConsumer<List<InputStream>> consumer) throws ConfigException {
+        consumer.accept(new GlueList<>(streams.values()));
         return this;
     }
 

common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java

@@ -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 = main.getModJar()) {
+        try(JarFile jar = new JarFile(new File(TerraPlugin.class.getProtectionDomain().getCodeSource().getLocation().toURI()))) {
             copyResourcesToDirectory(jar, "lang", file.toString());
         } catch(IOException | URISyntaxException e) {
             main.getDebugLogger().error("Failed to dump language files!");

common/src/main/java/com/dfsek/terra/config/loaders/config/OreHolderLoader.java

@@ -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()), configLoader.loadClass(OreConfig.class, entry.getValue()), entry.getKey());
+            holder.add(configLoader.loadClass(Ore.class, entry.getKey()), (OreConfig) configLoader.loadType(OreConfig.class, entry.getValue()));
         }
 
         return holder;

common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java

@@ -139,7 +139,6 @@ public class ConfigPack implements LoaderRegistrar {
                 selfLoader.load(packPostTemplate, new FileInputStream(pack));
                 biomeProviderBuilder = packPostTemplate.getProviderBuilder();
                 biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
-                checkDeadEntries(main);
             } catch(FileNotFoundException e) {
                 throw new LoadException("No pack.yml file found in " + folder.getAbsolutePath(), e);
             }
@@ -184,7 +183,6 @@ public class ConfigPack implements LoaderRegistrar {
                 selfLoader.load(packPostTemplate, file.getInputStream(pack));
                 biomeProviderBuilder = packPostTemplate.getProviderBuilder();
                 biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
-                checkDeadEntries(main);
             } catch(IOException e) {
                 throw new LoadException("Unable to load pack.yml from ZIP file", e);
             }
@@ -200,16 +198,6 @@ public class ConfigPack implements LoaderRegistrar {
         for(C template : configTemplates) registry.add(template.getID(), factory.build(template, main));
     }
 
-    private void checkDeadEntries(TerraPlugin main) {
-        biomeRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in biome registry: '" + id + "'"));
-        paletteRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in palette registry: '" + id + "'"));
-        floraRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in flora registry: '" + id + "'"));
-        carverRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in carver registry: '" + id + "'"));
-        treeRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in tree registry: '" + id + "'"));
-        oreRegistry.getDeadEntries().forEach((id, value) -> main.getDebugLogger().warn("Dead entry in ore registry: '" + id + "'"));
-    }
-
-
     private void load(long start, TerraPlugin main) throws ConfigException {
         main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this));
 
@@ -237,13 +225,13 @@ public class ConfigPack implements LoaderRegistrar {
         }).close();
 
         loader
-                .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();
+                .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();
 
         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.");

common/src/main/java/com/dfsek/terra/profiler/DataHolder.java

@@ -0,0 +1,36 @@
+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);
+    }
+}

common/src/main/java/com/dfsek/terra/profiler/DataType.java

@@ -0,0 +1,24 @@
+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;
+    }
+}

common/src/main/java/com/dfsek/terra/profiler/Desire.java

@@ -0,0 +1,10 @@
+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
+
+}

common/src/main/java/com/dfsek/terra/profiler/Frame.java

@@ -1,24 +0,0 @@
-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;
-    }
-}

common/src/main/java/com/dfsek/terra/profiler/Measurement.java

@@ -0,0 +1,87 @@
+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();
+    }
+
+}

common/src/main/java/com/dfsek/terra/profiler/ProfileFrame.java

@@ -1,14 +0,0 @@
-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();
-    }
-}

common/src/main/java/com/dfsek/terra/profiler/ProfileFuture.java

@@ -0,0 +1,18 @@
+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();
+    }
+}

common/src/main/java/com/dfsek/terra/profiler/Profiler.java

@@ -1,56 +0,0 @@
-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();
-}

common/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java

@@ -1,91 +0,0 @@
-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);
-    }
-}

common/src/main/java/com/dfsek/terra/profiler/Timings.java

@@ -1,73 +0,0 @@
-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());
-    }
-}

common/src/main/java/com/dfsek/terra/profiler/WorldProfiler.java

@@ -0,0 +1,85 @@
+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;
+    }
+}

common/src/main/java/com/dfsek/terra/profiler/exception/MalformedStackException.java

@@ -1,17 +0,0 @@
-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);
-    }
-}

common/src/main/java/com/dfsek/terra/profiler/exception/ProfilerException.java

@@ -1,17 +0,0 @@
-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);
-    }
-}

common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java

@@ -7,19 +7,18 @@ import com.dfsek.terra.registry.exception.DuplicateEntryException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 /**
  * Registry implementation with read/write access. For internal use only.
  * @param <T>
  */
 public class OpenRegistry<T> implements Registry<T> {
-    private final Map<String, Entry<T>> objects = new HashMap<>();
+    private final Map<String, T> objects = new HashMap<>();
 
     @Override
     public T load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
@@ -36,10 +35,6 @@ public class OpenRegistry<T> implements Registry<T> {
      * @param value      Value to add.
      */
     public boolean add(String identifier, T value) {
-        return add(identifier, new Entry<>(value));
-    }
-
-    protected boolean add(String identifier, Entry<T> value) {
         boolean exists = objects.containsKey(identifier);
         objects.put(identifier, value);
         return exists;
@@ -65,24 +60,22 @@ public class OpenRegistry<T> implements Registry<T> {
 
     @Override
     public T get(String identifier) {
-        Entry<T> entry = objects.get(identifier);
-        if(entry == null) return null;
-        return entry.getValue();
+        return objects.get(identifier);
     }
 
     @Override
     public void forEach(Consumer<T> consumer) {
-        objects.forEach((id, obj) -> consumer.accept(obj.getRaw()));
+        objects.forEach((id, obj) -> consumer.accept(obj));
     }
 
     @Override
     public void forEach(BiConsumer<String, T> consumer) {
-        objects.forEach((id, entry) -> consumer.accept(id, entry.getRaw()));
+        objects.forEach(consumer);
     }
 
     @Override
     public Set<T> entries() {
-        return objects.values().stream().map(Entry::getRaw).collect(Collectors.toSet());
+        return new HashSet<>(objects.values());
     }
 
     @Override
@@ -90,41 +83,10 @@ public class OpenRegistry<T> implements Registry<T> {
         return objects.keySet();
     }
 
-    public Map<String, T> getDeadEntries() {
-        Map<String, T> dead = new HashMap<>();
-        objects.forEach((id, entry) -> {
-            if(entry.dead()) dead.put(id, entry.value); // dont increment value here.
-        });
-        return dead;
-    }
-
     /**
      * Clears all entries from the registry.
      */
     public void clear() {
         objects.clear();
     }
-
-
-    protected static final class Entry<T> {
-        private final T value;
-        private final AtomicInteger access = new AtomicInteger(0);
-
-        public Entry(T value) {
-            this.value = value;
-        }
-
-        public T getValue() {
-            access.incrementAndGet();
-            return value;
-        }
-
-        private T getRaw() {
-            return value;
-        }
-
-        public boolean dead() {
-            return access.get() == 0;
-        }
-    }
 }

common/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java

@@ -57,9 +57,7 @@ public class FloraRegistry extends OpenRegistry<Flora> {
 
     private void addItem(String id, Callable<ConstantFlora> flora) {
         try {
-            Entry<Flora> entry = new Entry<>(flora.call());
-            entry.getValue(); // Mark as not dead.
-            add(id, entry);
+            add(id, flora.call());
         } catch(Exception e) {
             main.logger().warning("Failed to load Flora item: " + id + ": " + e.getMessage());
         }
@@ -68,4 +66,10 @@ 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);
+    }
 }

common/src/main/java/com/dfsek/terra/world/TerraWorld.java

@@ -13,6 +13,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.pack.WorldConfig;
+import com.dfsek.terra.profiler.WorldProfiler;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;
 import net.jafama.FastMath;
 
@@ -20,25 +21,33 @@ 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(!w.isTerraWorld()) throw new IllegalArgumentException("World " + w + " is not a Terra World!");
+        if(!isTerraWorld(w)) 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;
@@ -52,6 +61,9 @@ public class TerraWorld {
         return safe;
     }
 
+    public WorldProfiler getProfiler() {
+        return profiler;
+    }
 
     /**
      * Get a block at an ungenerated location

common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 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(ProfileFrame ignore = main.getProfiler().profile("chunk_base_2d")) {
+        try(ProfileFuture ignore = tw.getProfiler().measure("TotalChunkGenTime")) {
             if(!tw.isSafe()) return chunk;
             int xOrig = (chunkX << 4);
             int zOrig = (chunkZ << 4);

common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
@@ -50,6 +50,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
 
     private final Carver carver;
 
+
     public DefaultChunkGenerator3D(ConfigPack c, TerraPlugin main) {
         this.configPack = c;
         this.main = main;
@@ -103,10 +104,9 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
     @Override
     @SuppressWarnings({"try"})
     public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
-        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) {
-            TerraWorld tw = main.getWorld(world);
-            BiomeProvider grid = tw.getBiomeProvider();
-
+        TerraWorld tw = main.getWorld(world);
+        BiomeProvider grid = tw.getBiomeProvider();
+        try(ProfileFuture ignore = tw.getProfiler().measure("TotalChunkGenTime")) {
             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(cx, cz);
+                    TerraBiome b = grid.getBiome(xOrig + x, zOrig + z);
                     BiomeTemplate c = ((UserDefinedBiome) b).getConfig();
 
                     int sea = c.getSeaLevel();
@@ -227,20 +227,17 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
         return false;
     }
 
-    @SuppressWarnings({"try"})
     static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
-        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);
+        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));
             }
         }
     }

common/src/main/java/com/dfsek/terra/world/generation/math/SamplerCache.java

@@ -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.getWorld().getTerraGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
+                        return world.getGenerator().createSampler(cx, cz, world.getBiomeProvider(), world.getWorld(), world.getConfig().getTemplate().getElevationBlend());
                     }
                 });
     }

common/src/main/java/com/dfsek/terra/world/population/CavePopulator.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 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(ProfileFrame ignore = main.getProfiler().profile("carving")) {
+        try(ProfileFuture ignored = tw.getProfiler().measure("CaveTime")) {
             Random random = PopulationUtil.getRandom(chunk);
             if(!tw.isSafe()) return;
             WorldConfig config = tw.getConfig();
@@ -49,40 +49,38 @@ 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) -> {
-                    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;
-                        }
+                    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()) {
@@ -95,7 +93,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 ignored) {
+                    } catch(NullPointerException ignore) {
                     }
                 }
                 for(Block b : updateNeeded) {

common/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;
 import org.jetbrains.annotations.NotNull;
@@ -32,8 +32,8 @@ public class FloraPopulator implements TerraBlockPopulator {
     @Override
     public void populate(@NotNull World world, @NotNull Chunk chunk) {
         TerraWorld tw = main.getWorld(world);
-        try(ProfileFrame ignore = main.getProfiler().profile("flora")) {
-            if(tw.getConfig().getTemplate().disableFlora()) return;
+        try(ProfileFuture ignored = tw.getProfiler().measure("FloraTime")) {
+            if(tw.getConfig().getTemplate().disableCarvers()) return;
 
             if(!tw.isSafe()) return;
             BiomeProvider provider = tw.getBiomeProvider();

common/src/main/java/com/dfsek/terra/world/population/OrePopulator.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 import com.dfsek.terra.world.TerraWorld;
 import org.jetbrains.annotations.NotNull;
 
@@ -27,8 +27,8 @@ public class OrePopulator implements TerraBlockPopulator {
     @Override
     public void populate(@NotNull World world, @NotNull Chunk chunk) {
         TerraWorld tw = main.getWorld(world);
-        try(ProfileFrame ignore = main.getProfiler().profile("ore")) {
-            if(tw.getConfig().getTemplate().disableOres()) return;
+        try(ProfileFuture ignored = tw.getProfiler().measure("OreTime")) {
+            if(tw.getConfig().getTemplate().disableCarvers()) return;
 
             if(!tw.isSafe()) return;
             for(int cx = -1; cx <= 1; cx++) {
@@ -40,13 +40,11 @@ public class OrePopulator implements TerraBlockPopulator {
                     BiomeTemplate config = ((UserDefinedBiome) b).getConfig();
                     int finalCx = cx;
                     int finalCz = cz;
-                    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);
-                            }
+                    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);
                         }
                     });
                 }

common/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java

@@ -11,8 +11,9 @@ 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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.TerraStructure;
 import net.jafama.FastMath;
@@ -31,8 +32,8 @@ public class StructurePopulator implements TerraBlockPopulator, Chunkified {
     @Override
     public void populate(@NotNull World world, @NotNull Chunk chunk) {
         TerraWorld tw = main.getWorld(world);
-        try(ProfileFrame ignore = main.getProfiler().profile("structure")) {
-            if(tw.getConfig().getTemplate().disableStructures()) return;
+        try(ProfileFuture ignored = tw.getProfiler().measure("StructureTime")) {
+            if(tw.getConfig().getTemplate().disableCarvers()) return;
 
             int cx = (chunk.getX() << 4);
             int cz = (chunk.getZ() << 4);

common/src/main/java/com/dfsek/terra/world/population/TreePopulator.java

@@ -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.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 import net.jafama.FastMath;
@@ -32,8 +32,8 @@ public class TreePopulator implements TerraBlockPopulator {
     @SuppressWarnings("try")
     public void populate(@NotNull World world, @NotNull Chunk chunk) {
         TerraWorld tw = main.getWorld(world);
-        try(ProfileFrame ignore = main.getProfiler().profile("tree")) {
-            if(tw.getConfig().getTemplate().disableTrees()) return;
+        try(ProfileFuture ignored = tw.getProfiler().measure("TreeTime")) {
+            if(tw.getConfig().getTemplate().disableCarvers()) return;
 
             if(!tw.isSafe()) return;
             BiomeProvider provider = tw.getBiomeProvider();
@@ -42,9 +42,8 @@ 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)));
-                        }
                     }
                 }
             }

common/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java

@@ -16,6 +16,7 @@ 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;

common/src/main/java/com/dfsek/terra/world/population/items/ores/OreHolder.java

@@ -1,7 +1,6 @@
 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;
@@ -12,24 +11,22 @@ import java.util.function.BiConsumer;
 public class OreHolder {
     private final List<Entry> entries = new GlueList<>();
 
-    public void forEach(BiConsumer<String, ImmutablePair<Ore, OreConfig>> consumer) {
-        entries.forEach(entry -> consumer.accept(entry.getId(), ImmutablePair.of(entry.getOre(), entry.getConfig())));
+    public void forEach(BiConsumer<Ore, OreConfig> consumer) {
+        entries.forEach(entry -> consumer.accept(entry.getOre(), entry.getConfig()));
     }
 
-    public OreHolder add(Ore ore, OreConfig config, String id) {
-        entries.add(new Entry(ore, config, id));
+    public OreHolder add(Ore ore, OreConfig config) {
+        entries.add(new Entry(ore, config));
         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, String id) {
+        private Entry(Ore ore, OreConfig config) {
             this.ore = ore;
             this.config = config;
-            this.id = id;
         }
 
         public OreConfig getConfig() {
@@ -39,9 +36,5 @@ public class OreHolder {
         public Ore getOre() {
             return ore;
         }
-
-        public String getId() {
-            return id;
-        }
     }
 }

common/src/test/java/biome/DistributionTest.java

@@ -40,7 +40,6 @@ import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.AbstractableTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.registry.config.BiomeRegistry;
 import com.dfsek.terra.registry.config.NoiseRegistry;
 import com.dfsek.terra.world.TerraWorld;
@@ -138,11 +137,6 @@ public class DistributionTest {
             return null;
         }
 
-        @Override
-        public Profiler getProfiler() {
-            return null;
-        }
-
         @Override
         public void register(TypeRegistry registry) {
 
@@ -159,7 +153,7 @@ public class DistributionTest {
         new GenericLoaders(MAIN).register(loader);
 
         BiomeRegistry biomeRegistry = new BiomeRegistry();
-        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.loadConfigs(inputStreams, TestBiome::new), MAIN));
+        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), MAIN));
 
         BiomeProviderTemplate template = new BiomeProviderTemplate();
         ConfigLoader pipeLoader = new ConfigLoader()

common/src/test/java/biome/ImageTest.java

@@ -46,7 +46,7 @@ public class ImageTest {
 
         OpenRegistry<TerraBiome> biomeRegistry = new OpenRegistry<TerraBiome>() {
         };
-        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.loadConfigs(inputStreams, TestBiome::new), null));
+        folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), null));
 
         return new ImageBiomeProvider(biomeRegistry.entries(), ImageIO.read(ImageTest.class.getResourceAsStream("/map.jpg")), 1, ImageBiomeProvider.Align.CENTER);
     }

common/src/test/java/profiler/ProfilerTest.java

@@ -1,63 +0,0 @@
-package profiler;
-
-import com.dfsek.terra.profiler.Profiler;
-import com.dfsek.terra.profiler.ProfilerImpl;
-
-public class ProfilerTest {
-    private static final Profiler PROFILER = new ProfilerImpl();
-    //@Test
-    public static void main(String... a) throws InterruptedException {
-        //PROFILER.start();
-        for(int i = 0; i < 1000; i++) {
-            doThing();
-        }
-
-        for(int i = 0; i < 100; i++) {
-            doThirdOtherThing();
-        }
-
-        for(int i = 0; i < 100; i++) {
-            doOtherThing();
-        }
-        PROFILER.stop();
-        PROFILER.push("thing");
-        PROFILER.push("thing2");
-        PROFILER.start();
-        PROFILER.pop("thing2");
-        PROFILER.pop("thing");
-        PROFILER.push("thing4");
-        PROFILER.pop("thing4");
-
-        PROFILER.getTimings().forEach((id, timings) -> {
-            System.out.println(id + ": " + timings.toString());
-        });
-    }
-
-    private static void doThing() throws InterruptedException {
-        PROFILER.push("thing");
-        Thread.sleep(1);
-        doOtherThing();
-        thing4();
-        PROFILER.pop("thing");
-    }
-
-    private static void doOtherThing() throws InterruptedException {
-        PROFILER.push("thing2");
-        Thread.sleep(2);
-        doThirdOtherThing();
-        thing4();
-        PROFILER.pop("thing2");
-    }
-
-    private static void doThirdOtherThing() throws InterruptedException {
-        PROFILER.push("thing3");
-        Thread.sleep(2);
-        PROFILER.pop("thing3");
-    }
-
-    private static void thing4() throws InterruptedException {
-        PROFILER.push("thing4");
-        Thread.sleep(2);
-        PROFILER.pop("thing4");
-    }
-}

common/src/test/java/structure/ParserTest.java

@@ -13,7 +13,6 @@ import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +20,7 @@ import java.util.Map;
 public class ParserTest {
     @Test
     public void parse() throws IOException, ParseException {
-        Parser parser = new Parser(IOUtils.toString(getClass().getResourceAsStream("/test.tesf"), Charset.defaultCharset()));
+        Parser parser = new Parser(IOUtils.toString(getClass().getResourceAsStream("/test.tesf")));
 
         parser.registerFunction("test", new FunctionBuilder<Test1>() {
             @Override

gradle.properties

@@ -1,10 +0,0 @@
-# Magic options for more perf
-org.gradle.jvmargs=-Xmx2048M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
-org.gradle.vfs.watch=true
-kapt.use.worker.api=true
-kapt.include.compile.classpath=false
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.warning.mode=all
-#org.gradle.logging.level=info
-org.gradle.configureondemand=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 org.gradle.jvmargs=-Xmx4096m

platforms/bukkit/build.gradle.kts

@@ -16,12 +16,19 @@ configureCommon()
 group = "com.dfsek.terra.bukkit"
 
 val mcVersion = "1.16.5"
-val testDir = "target/server"
+val testDir = "target/server/"
 val testMem = "3G"
 
 val paperURL = "https://papermc.io/api/v1/paper/%version%/latest/download/"
 val purpurURL = "https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/artifact/final/purpurclip.jar"
 
+repositories {
+    mavenCentral()
+    maven { url = uri("http://maven.enginehub.org/repo/") }
+    maven { url = uri("https://repo.codemc.org/repository/maven-public") }
+    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
+}
+
 dependencies {
     "shadedApi"(project(":common"))
 
@@ -32,17 +39,17 @@ dependencies {
 
     "compileOnly"("com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT")
 
-    "shadedApi"("com.google.guava:guava:30.0-jre")
+    "shadedImplementation"("com.google.guava:guava:30.0-jre")
 }
 
-val jvmFlags = listOf("-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200",
+val aikarsFlags = listOf("-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200",
         "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", "-XX:+AlwaysPreTouch",
         "-XX:G1NewSizePercent=30", "-XX:G1MaxNewSizePercent=40", "-XX:G1HeapRegionSize=8M",
         "-XX:G1ReservePercent=20", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4",
         "-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90",
         "-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem",
         "-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs",
-        "-Daikars.new.flags=true", "-DIReallyKnowWhatIAmDoingISwear", "-javaagent:paperclip.jar")
+        "-Daikars.new.flags=true", "-DIReallyKnowWhatIAmDoingISwear")
 
 fun downloadPaperclip(url: String, dir: String) {
     val clip = URL(url.replace("%version%", mcVersion))
@@ -70,8 +77,8 @@ fun installServer(dir: String) {
     // Cloning test setup.
     gitClone("https://github.com/PolyhedralDev/WorldGenTestServer")
     // Copying plugins
-    Files.move(file("WorldGenTestServer/plugins").toPath(),
-            file("$testDir/$dir/plugins").toPath(),
+    Files.move(Paths.get("WorldGenTestServer/plugins"),
+            Paths.get("$testDir/$dir/plugins"),
             StandardCopyOption.REPLACE_EXISTING)
     // Copying config
     val serverText = URL("https://raw.githubusercontent.com/PolyhedralDev/WorldGenTestServer/master/server.properties").readText()
@@ -153,7 +160,7 @@ task<JavaExec>(name = "runPaper") {
     }
 
     main = "io.papermc.paperclip.Paperclip"
-    jvmArgs = jvmFlags
+    jvmArgs = aikarsFlags
     maxHeapSize = testMem
     minHeapSize = testMem
     //args = listOf("nogui")
@@ -171,7 +178,7 @@ task<JavaExec>(name = "runPurpur") {
     }
 
     main = "io.papermc.paperclip.Paperclip"
-    jvmArgs = jvmFlags
+    jvmArgs = aikarsFlags
     maxHeapSize = testMem
     minHeapSize = testMem
     //args = listOf("nogui")
@@ -182,7 +189,6 @@ task<JavaExec>(name = "runPurpur") {
 tasks.named<ShadowJar>("shadowJar") {
     relocate("org.bstats.bukkit", "com.dfsek.terra.lib.bstats")
     relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
-    relocate("com.google.common", "com.dfsek.terra.lib.google.common")
 }
 
 publishing {

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

@@ -34,15 +34,12 @@ import com.dfsek.terra.bukkit.listeners.SpigotListener;
 import com.dfsek.terra.bukkit.listeners.TerraListener;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.world.BukkitBiome;
-import com.dfsek.terra.bukkit.world.BukkitWorld;
 import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.profiler.Profiler;
-import com.dfsek.terra.profiler.ProfilerImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.world.TerraWorld;
@@ -67,8 +64,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
     private final Map<World, TerraWorld> worldMap = new HashMap<>();
     private final Map<String, ConfigPack> worlds = new HashMap<>();
 
-    private final Profiler profiler = new ProfilerImpl();
-
     private final ConfigRegistry registry = new ConfigRegistry();
     private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
 
@@ -146,11 +141,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         Bukkit.getScheduler().runTask(this, task);
     }
 
-    @Override
-    public Profiler getProfiler() {
-        return profiler;
-    }
-
     @Override
     public void onDisable() {
         BukkitChunkGeneratorWrapper.saveAll();
@@ -269,15 +259,14 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         return checkedRegistry;
     }
 
-    public TerraWorld getWorld(World world) {
-        BukkitWorld w = (BukkitWorld) world;
-        if(!w.isTerraWorld())
+    public TerraWorld getWorld(World w) {
+        if(!TerraWorld.isTerraWorld(w))
             throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator());
         if(!worlds.containsKey(w.getName())) {
             getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\"");
             return new TerraWorld(w, ((TerraChunkGenerator) w.getGenerator().getHandle()).getConfigPack(), this);
         }
-        return worldMap.computeIfAbsent(w, w2 -> new TerraWorld(w, worlds.get(w.getName()), this));
+        return worldMap.computeIfAbsent(w, world -> new TerraWorld(w, worlds.get(w.getName()), this));
     }
 
     @Override

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java

@@ -3,11 +3,19 @@ package com.dfsek.terra.bukkit.generator;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.population.PopulationManager;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
+import com.dfsek.terra.profiler.DataType;
+import com.dfsek.terra.profiler.Measurement;
 import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.population.CavePopulator;
+import com.dfsek.terra.world.population.FloraPopulator;
+import com.dfsek.terra.world.population.OrePopulator;
+import com.dfsek.terra.world.population.StructurePopulator;
+import com.dfsek.terra.world.population.TreePopulator;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
@@ -16,10 +24,13 @@ import org.jetbrains.annotations.NotNull;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper {
 
@@ -52,7 +63,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
     }
 
     public static synchronized void fixChunk(Chunk c) {
-        if(!c.getWorld().isTerraWorld()) throw new IllegalArgumentException();
+        if(!TerraWorld.isTerraWorld(c.getWorld())) throw new IllegalArgumentException();
         popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld());
     }
 
@@ -65,6 +76,8 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
             e.printStackTrace();
         }
         popMap.put(w, popMan);
+        main.getWorld(w).getProfiler().addMeasurement(new Measurement(15000000, DataType.PERIOD_MILLISECONDS), "PopulationManagerTime");
+        popMan.attachProfiler(main.getWorld(w).getProfiler());
         needsLoad = false;
     }
 

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java

@@ -44,7 +44,7 @@ public class CommonListener implements Listener {
     public void onSaplingGrow(StructureGrowEvent e) {
         if(e.isCancelled()) return;
         World bukkit = BukkitAdapter.adapt(e.getWorld());
-        if(!bukkit.isTerraWorld()) return;
+        if(!TerraWorld.isTerraWorld(bukkit)) return;
         TerraWorld tw = main.getWorld(bukkit);
         WorldConfig c = tw.getConfig();
         if(c.getTemplate().isDisableSaplings()) return;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java

@@ -18,7 +18,7 @@ public class PaperListener implements Listener {
 
     @EventHandler
     public void onStructureLocate(StructureLocateEvent e) {
-        if(!BukkitAdapter.adapt(e.getWorld()).isTerraWorld()) return;
+        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getWorld()))) return;
         e.setResult(null); // Assume no result.
         String name = "minecraft:" + e.getType().getName();
         main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java

@@ -34,7 +34,7 @@ public class SpigotListener implements Listener {
         Entity entity = e.getEntity();
         if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
             main.getDebugLogger().info("Detected Ender Signal...");
-            if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
+            if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getEntity().getWorld()))) return;
             TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getEntity().getWorld()));
             EnderSignal signal = (EnderSignal) entity;
             TerraStructure config = tw.getConfig().getStructureRegistry().get(tw.getConfig().getTemplate().getLocatable().get("STRONGHOLD"));
@@ -53,7 +53,7 @@ public class SpigotListener implements Listener {
 
     @EventHandler
     public void onCartographerChange(VillagerAcquireTradeEvent e) {
-        if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
+        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getEntity().getWorld()))) return;
         if(!(e.getEntity() instanceof Villager)) return;
         if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
             main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
@@ -65,7 +65,7 @@ public class SpigotListener implements Listener {
 
     @EventHandler
     public void onCartographerLevel(VillagerCareerChangeEvent e) {
-        if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
+        if(!TerraWorld.isTerraWorld(BukkitAdapter.adapt(e.getEntity().getWorld()))) return;
         if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
             main.logger().severe("Prevented server crash by stopping Cartographer villager from spawning.");
             main.logger().severe("Please upgrade to Paper, which has a StructureLocateEvent that fixes this issue");

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java

@@ -22,9 +22,7 @@ public class TerraListener implements EventListener {
     public void injectTrees(ConfigPackPreLoadEvent event) {
         for(TreeType value : TreeType.values()) {
             try {
-                String id = BukkitAdapter.TREE_TRANSFORMER.translate(value);
-                event.getPack().getTreeRegistry().add(id, new BukkitTree(value, main));
-                event.getPack().getTreeRegistry().get(id); // Platform trees should never be marked "dead"
+                event.getPack().getTreeRegistry().add(BukkitAdapter.TREE_TRANSFORMER.translate(value), new BukkitTree(value, main));
             } catch(DuplicateEntryException ignore) { // If another addon has already registered trees, do nothing.
             }
         }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/ChunkCoordinate.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.bukkit.population;
 
 
 import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.bukkit.world.BukkitWorld;
 
 import java.io.Serializable;
 import java.util.UUID;
@@ -22,7 +21,7 @@ public class ChunkCoordinate implements Serializable {
     public ChunkCoordinate(Chunk c) {
         this.x = c.getX();
         this.z = c.getZ();
-        this.worldID = ((BukkitWorld) c.getWorld()).getUID();
+        this.worldID = c.getWorld().getUID();
     }
 
     public UUID getWorldID() {

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/Gaea.java

@@ -0,0 +1,20 @@
+package com.dfsek.terra.bukkit.population;
+
+
+import com.dfsek.terra.api.platform.world.World;
+
+import java.io.File;
+
+public class Gaea {
+    private static boolean debug;
+
+    public static File getGaeaFolder(World w) {
+        File f = new File(w.getWorldFolder(), "gaea");
+        f.mkdirs();
+        return f;
+    }
+
+    public static boolean isDebug() {
+        return debug;
+    }
+}

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java

@@ -5,11 +5,12 @@ import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generation.Chunkified;
+import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.bukkit.world.BukkitWorld;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.profiler.ProfileFuture;
+import com.dfsek.terra.profiler.WorldProfiler;
 import org.bukkit.generator.BlockPopulator;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,36 +26,39 @@ public class PopulationManager extends BlockPopulator {
     private final TerraChunkGenerator generator;
     private final HashSet<ChunkCoordinate> needsPop = new HashSet<>();
     private final TerraPlugin main;
+    private WorldProfiler profiler;
 
     public PopulationManager(TerraChunkGenerator generator, TerraPlugin main) {
         this.generator = generator;
         this.main = main;
     }
 
+    private ProfileFuture measure() {
+        if(profiler != null) return profiler.measure("PopulationManagerTime");
+        return null;
+    }
+
+    public void attachProfiler(WorldProfiler p) {
+        this.profiler = p;
+    }
+
     @SuppressWarnings("unchecked")
     public synchronized void saveBlocks(World w) throws IOException {
-        File f = new File(getDataFolder(w), "chunks.bin");
+        File f = new File(Gaea.getGaeaFolder(w), "chunks.bin");
         f.createNewFile();
         SerializationUtil.toFile((HashSet<ChunkCoordinate>) needsPop.clone(), f);
     }
 
     @SuppressWarnings("unchecked")
     public synchronized void loadBlocks(World w) throws IOException, ClassNotFoundException {
-        File f = new File(getDataFolder(w), "chunks.bin");
+        File f = new File(Gaea.getGaeaFolder(w), "chunks.bin");
         needsPop.addAll((HashSet<ChunkCoordinate>) SerializationUtil.fromFile(f));
     }
 
-    public static File getDataFolder(World w) {
-        File f = new File(((BukkitWorld) w).getWorldFolder(), "gaea");
-        f.mkdirs();
-        return f;
-    }
-
 
     // Synchronize to prevent chunks from being queued for population multiple times.
-    public synchronized void checkNeighbors(int x, int z, World world) {
-        BukkitWorld w = (BukkitWorld) world;
-        ChunkCoordinate c = new ChunkCoordinate(x, z, (w).getUID());
+    public synchronized void checkNeighbors(int x, int z, World w) {
+        ChunkCoordinate c = new ChunkCoordinate(x, z, w.getUID());
         if(w.isChunkGenerated(x + 1, z)
                 && w.isChunkGenerated(x - 1, z)
                 && w.isChunkGenerated(x, z + 1)
@@ -74,9 +78,8 @@ public class PopulationManager extends BlockPopulator {
     }
 
     @Override
-    @SuppressWarnings("try")
     public void populate(org.bukkit.@NotNull World world, @NotNull Random random, org.bukkit.@NotNull Chunk source) {
-        try(ProfileFrame ignore = main.getProfiler().profile("popman")) {
+        try(ProfileFuture ignored = measure()) {
             Chunk chunk = BukkitAdapter.adapt(source);
             needsPop.add(new ChunkCoordinate(chunk));
             int x = chunk.getX();

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java

@@ -5,10 +5,8 @@ import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Tree;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.profiler.ProfileFrame;
 import org.bukkit.TreeType;
 
-import java.util.Locale;
 import java.util.Random;
 
 public class BukkitTree implements Tree {
@@ -42,11 +40,8 @@ public class BukkitTree implements Tree {
     }
 
     @Override
-    @SuppressWarnings("try")
     public boolean plant(Location l, Random r) {
-        try(ProfileFrame ignore = main.getProfiler().profile("bukkit_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) {
-            return ((BukkitWorld) l.getWorld()).getHandle().generateTree(BukkitAdapter.adapt(l), delegate);
-        }
+        return ((BukkitWorld) l.getWorld()).getHandle().generateTree(BukkitAdapter.adapt(l), delegate);
     }
 
     @Override

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java

@@ -37,14 +37,17 @@ public class BukkitWorld implements World {
         return new BukkitChunkGenerator(delegate.getGenerator());
     }
 
+    @Override
     public String getName() {
         return delegate.getName();
     }
 
+    @Override
     public UUID getUID() {
         return delegate.getUID();
     }
 
+    @Override
     public boolean isChunkGenerated(int x, int z) {
         return delegate.isChunkGenerated(x, z);
     }
@@ -54,6 +57,7 @@ public class BukkitWorld implements World {
         return BukkitAdapter.adapt(delegate.getChunkAt(x, z));
     }
 
+    @Override
     public File getWorldFolder() {
         return delegate.getWorldFolder();
     }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitSign.java

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.platform.block.state.SerialState;
 import com.dfsek.terra.api.platform.block.state.Sign;
 import org.jetbrains.annotations.NotNull;
 
-@SuppressWarnings("deprecation")
 public class BukkitSign extends BukkitBlockState implements Sign {
     protected BukkitSign(org.bukkit.block.Sign block) {
         super(block);

platforms/fabric/build.gradle.kts

@@ -6,7 +6,6 @@ import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     `java-library`
-    `maven-publish`
     id("fabric-loom").version("0.6-SNAPSHOT")
     id("com.modrinth.minotaur").version("1.1.0")
 }
@@ -22,6 +21,8 @@ group = "com.dfsek.terra.fabric"
 
 dependencies {
     "shadedApi"(project(":common"))
+    "shadedImplementation"("org.yaml:snakeyaml:1.27")
+    "shadedImplementation"("com.googlecode.json-simple:json-simple:1.1.1")
 
     "minecraft"("com.mojang:minecraft:1.16.5")
     "mappings"("net.fabricmc:yarn:1.16.5+build.5:v2")
@@ -30,10 +31,14 @@ dependencies {
     "modImplementation"("net.fabricmc.fabric-api:fabric-api:0.31.0+1.16")
 }
 
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("org.json", "com.dfsek.terra.lib.json")
+    relocate("org.yaml", "com.dfsek.terra.lib.yaml")
+}
+
 
 configure<LoomGradleExtension> {
     accessWidener("src/main/resources/terra.accesswidener")
-    refmapName = "terra-refmap.json"
 }
 
 val remapped = tasks.register<RemapJarTask>("remapShadedJar") {
@@ -47,39 +52,15 @@ val remapped = tasks.register<RemapJarTask>("remapShadedJar") {
 }
 
 
-tasks.register<TaskModrinthUpload>("publishModrinthFabric") {
+tasks.register<TaskModrinthUpload>("publishModrinth") {
     dependsOn("remapShadedJar")
     group = "fabric"
     token = System.getenv("MODRINTH_SECRET")
     projectId = "FIlZB9L0"
-    versionNumber = "${project.version}-fabric"
+    versionNumber = project.version.toString()
     uploadFile = remapped.get().archiveFile.get().asFile
     releaseType = "beta"
     addGameVersion("1.16.4")
     addGameVersion("1.16.5")
     addLoader("fabric")
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAdapter.java

@@ -1,224 +0,0 @@
-package com.dfsek.terra.fabric;
-
-import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Bisected;
-import com.dfsek.terra.api.platform.block.data.Slab;
-import com.dfsek.terra.api.platform.block.data.Stairs;
-import com.dfsek.terra.api.platform.block.state.Container;
-import com.dfsek.terra.api.platform.block.state.MobSpawner;
-import com.dfsek.terra.api.platform.block.state.Sign;
-import com.dfsek.terra.fabric.block.FabricBlockData;
-import com.dfsek.terra.fabric.block.data.FabricDirectional;
-import com.dfsek.terra.fabric.block.data.FabricMultipleFacing;
-import com.dfsek.terra.fabric.block.data.FabricOrientable;
-import com.dfsek.terra.fabric.block.data.FabricRotatable;
-import com.dfsek.terra.fabric.block.data.FabricSlab;
-import com.dfsek.terra.fabric.block.data.FabricStairs;
-import com.dfsek.terra.fabric.block.data.FabricWaterlogged;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.LootableContainerBlockEntity;
-import net.minecraft.block.entity.MobSpawnerBlockEntity;
-import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.block.enums.BlockHalf;
-import net.minecraft.block.enums.SlabType;
-import net.minecraft.block.enums.StairShape;
-import net.minecraft.state.property.Properties;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.WorldAccess;
-
-import java.util.Arrays;
-
-public final class FabricAdapter {
-    public static BlockPos adapt(Vector3 v) {
-        return new BlockPos(v.getBlockX(), v.getBlockY(), v.getBlockZ());
-    }
-
-    public static Vector3 adapt(BlockPos pos) {
-        return new Vector3(pos.getX(), pos.getY(), pos.getZ());
-    }
-
-    public static FabricBlockData adapt(BlockState state) {
-        if(state.contains(Properties.STAIR_SHAPE)) return new FabricStairs(state);
-
-        if(state.contains(Properties.SLAB_TYPE)) return new FabricSlab(state);
-
-        if(state.contains(Properties.AXIS)) return new FabricOrientable(state, Properties.AXIS);
-        if(state.contains(Properties.HORIZONTAL_AXIS)) return new FabricOrientable(state, Properties.HORIZONTAL_AXIS);
-
-        if(state.contains(Properties.ROTATION)) return new FabricRotatable(state);
-
-        if(state.contains(Properties.FACING)) return new FabricDirectional(state, Properties.FACING);
-        if(state.contains(Properties.HOPPER_FACING)) return new FabricDirectional(state, Properties.HOPPER_FACING);
-        if(state.contains(Properties.HORIZONTAL_FACING)) return new FabricDirectional(state, Properties.HORIZONTAL_FACING);
-
-        if(state.getProperties().containsAll(Arrays.asList(Properties.NORTH, Properties.SOUTH, Properties.EAST, Properties.WEST)))
-            return new FabricMultipleFacing(state);
-        if(state.contains(Properties.WATERLOGGED)) return new FabricWaterlogged(state);
-        return new FabricBlockData(state);
-    }
-
-    public static Direction adapt(BlockFace face) {
-        switch(face) {
-            case NORTH:
-                return Direction.NORTH;
-            case WEST:
-                return Direction.WEST;
-            case SOUTH:
-                return Direction.SOUTH;
-            case EAST:
-                return Direction.EAST;
-            case UP:
-                return Direction.UP;
-            case DOWN:
-                return Direction.DOWN;
-            default:
-                throw new IllegalArgumentException("Illegal direction: " + face);
-        }
-    }
-
-
-    public static com.dfsek.terra.api.platform.block.state.BlockState adapt(com.dfsek.terra.api.platform.block.Block block) {
-        WorldAccess worldAccess = (WorldAccess) block.getLocation().getWorld();
-
-        BlockEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector()));
-        if(entity instanceof SignBlockEntity) {
-            return (Sign) entity;
-        } else if(entity instanceof MobSpawnerBlockEntity) {
-            return (MobSpawner) entity;
-        } else if(entity instanceof LootableContainerBlockEntity) {
-            return (Container) entity;
-        }
-        return null;
-    }
-
-    public static Stairs.Shape adapt(StairShape shape) {
-        switch(shape) {
-            case OUTER_RIGHT:
-                return Stairs.Shape.OUTER_RIGHT;
-            case INNER_RIGHT:
-                return Stairs.Shape.INNER_RIGHT;
-            case OUTER_LEFT:
-                return Stairs.Shape.OUTER_LEFT;
-            case INNER_LEFT:
-                return Stairs.Shape.INNER_LEFT;
-            case STRAIGHT:
-                return Stairs.Shape.STRAIGHT;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static Bisected.Half adapt(BlockHalf half) {
-        switch(half) {
-            case BOTTOM:
-                return Bisected.Half.BOTTOM;
-            case TOP:
-                return Bisected.Half.TOP;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static BlockFace adapt(Direction direction) {
-        switch(direction) {
-            case DOWN:
-                return BlockFace.DOWN;
-            case UP:
-                return BlockFace.UP;
-            case WEST:
-                return BlockFace.WEST;
-            case EAST:
-                return BlockFace.EAST;
-            case NORTH:
-                return BlockFace.NORTH;
-            case SOUTH:
-                return BlockFace.SOUTH;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static Slab.Type adapt(SlabType type) {
-        switch(type) {
-            case BOTTOM:
-                return Slab.Type.BOTTOM;
-            case TOP:
-                return Slab.Type.TOP;
-            case DOUBLE:
-                return Slab.Type.DOUBLE;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static StairShape adapt(Stairs.Shape shape) {
-        switch(shape) {
-            case STRAIGHT:
-                return StairShape.STRAIGHT;
-            case INNER_LEFT:
-                return StairShape.INNER_LEFT;
-            case OUTER_LEFT:
-                return StairShape.OUTER_LEFT;
-            case INNER_RIGHT:
-                return StairShape.INNER_RIGHT;
-            case OUTER_RIGHT:
-                return StairShape.OUTER_RIGHT;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static BlockHalf adapt(Bisected.Half half) {
-        switch(half) {
-            case TOP:
-                return BlockHalf.TOP;
-            case BOTTOM:
-                return BlockHalf.BOTTOM;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static SlabType adapt(Slab.Type type) {
-        switch(type) {
-            case DOUBLE:
-                return SlabType.DOUBLE;
-            case TOP:
-                return SlabType.TOP;
-            case BOTTOM:
-                return SlabType.BOTTOM;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static Axis adapt(Direction.Axis axis) {
-        switch(axis) {
-            case X:
-                return Axis.X;
-            case Y:
-                return Axis.Y;
-            case Z:
-                return Axis.Z;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    public static Direction.Axis adapt(Axis axis) {
-        switch(axis) {
-            case Z:
-                return Direction.Axis.Z;
-            case Y:
-                return Direction.Axis.Y;
-            case X:
-                return Direction.Axis.X;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java

@@ -18,7 +18,6 @@ import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.platform.CommandSender;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.entity.Entity;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.Tree;
@@ -37,23 +36,22 @@ import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.generation.PopulatorFeature;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
-import com.dfsek.terra.fabric.handle.FabricItemHandle;
-import com.dfsek.terra.fabric.handle.FabricWorldHandle;
-import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
-import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
-import com.dfsek.terra.profiler.Profiler;
-import com.dfsek.terra.profiler.ProfilerImpl;
+import com.dfsek.terra.fabric.inventory.FabricItemHandle;
+import com.dfsek.terra.fabric.mixin.GeneratorTypeAccessor;
+import com.dfsek.terra.fabric.world.FabricAdapter;
+import com.dfsek.terra.fabric.world.FabricBiome;
+import com.dfsek.terra.fabric.world.FabricTree;
+import com.dfsek.terra.fabric.world.FabricWorldHandle;
+import com.dfsek.terra.fabric.world.TerraBiomeSource;
+import com.dfsek.terra.fabric.world.features.PopulatorFeature;
+import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
+import com.dfsek.terra.fabric.world.generator.FabricChunkGeneratorWrapper;
 import com.dfsek.terra.registry.exception.DuplicateEntryException;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.world.TerraWorld;
-import com.google.common.collect.ImmutableMap;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
@@ -64,21 +62,20 @@ import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;
 import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.GeneratorOptions;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import net.minecraft.world.gen.decorator.Decorator;
 import net.minecraft.world.gen.decorator.NopeDecoratorConfig;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.ConfiguredFeatures;
+import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.FeatureConfig;
 import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
@@ -95,7 +92,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
@@ -109,9 +105,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
     private final Map<Long, TerraWorld> worldMap = new HashMap<>();
     private final EventManager eventManager = new TerraEventManager(this);
     private final GenericLoaders genericLoaders = new GenericLoaders(this);
-
-    private final Profiler profiler = new ProfilerImpl();
-
     private final Logger logger = new Logger() {
         private final org.apache.logging.log4j.Logger logger = LogManager.getLogger();
 
@@ -160,16 +153,10 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
     public TerraWorld getWorld(World world) {
         return worldMap.computeIfAbsent(world.getSeed(), w -> {
             logger.info("Loading world " + w);
-            return new TerraWorld(world, ((FabricChunkGeneratorWrapper) world.getGenerator()).getPack(), this);
+            return new TerraWorld(world, ((FabricChunkGeneratorWrapper) ((FabricChunkGenerator) world.getGenerator()).getHandle()).getPack(), this);
         });
     }
 
-    public TerraWorld getWorld(long seed) {
-        TerraWorld world = worldMap.get(seed);
-        if(world == null) throw new IllegalArgumentException("No world exists with seed " + seed);
-        return world;
-    }
-
     @Override
     public Logger logger() {
         return logger;
@@ -251,37 +238,41 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         genericLoaders.register(registry);
         registry
                 .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
-                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o));
+                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o)));
     }
 
     private Biome createBiome(BiomeBuilder biome) {
+        SpawnSettings.Builder spawnSettings = new SpawnSettings.Builder();
+        DefaultBiomeFeatures.addFarmAnimals(spawnSettings);
+        DefaultBiomeFeatures.addMonsters(spawnSettings, 95, 5, 100);
+
         BiomeTemplate template = biome.getTemplate();
         Map<String, Integer> colors = template.getColors();
 
-        Biome vanilla = (Biome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
+        Biome vanilla = ((FabricBiome) new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
 
         GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
         generationSettings.surfaceBuilder(SurfaceBuilder.DEFAULT.withConfig(new TernarySurfaceConfig(Blocks.GRASS_BLOCK.getDefaultState(), Blocks.DIRT.getDefaultState(), Blocks.GRAVEL.getDefaultState()))); // It needs a surfacebuilder, even though we dont use it.
         generationSettings.feature(GenerationStep.Feature.VEGETAL_DECORATION, POPULATOR_CONFIGURED_FEATURE);
 
 
-        BiomeEffectsAccessor accessor = (BiomeEffectsAccessor) vanilla.getEffects();
         BiomeEffects.Builder effects = new BiomeEffects.Builder()
-                .waterColor(colors.getOrDefault("water", accessor.getWaterColor()))
-                .waterFogColor(colors.getOrDefault("water-fog", accessor.getWaterFogColor()))
-                .fogColor(colors.getOrDefault("fog", accessor.getFogColor()))
-                .skyColor(colors.getOrDefault("sky", accessor.getSkyColor()))
-                .grassColorModifier(accessor.getGrassColorModifier());
+                .waterColor(colors.getOrDefault("water", vanilla.getEffects().waterColor))
+                .waterFogColor(colors.getOrDefault("water-fog", vanilla.getEffects().waterFogColor))
+                .fogColor(colors.getOrDefault("fog", vanilla.getEffects().fogColor))
+                .skyColor(colors.getOrDefault("sky", vanilla.getEffects().skyColor))
+                .grassColorModifier(vanilla.getEffects().grassColorModifier);
 
         if(colors.containsKey("grass")) {
             effects.grassColor(colors.get("grass"));
         } else {
-            accessor.getGrassColor().ifPresent(effects::grassColor);
+            vanilla.getEffects().grassColor.ifPresent(effects::grassColor);
         }
+        vanilla.getEffects().foliageColor.ifPresent(effects::foliageColor);
         if(colors.containsKey("foliage")) {
             effects.foliageColor(colors.get("foliage"));
         } else {
-            accessor.getFoliageColor().ifPresent(effects::foliageColor);
+            vanilla.getEffects().foliageColor.ifPresent(effects::foliageColor);
         }
 
         return new Biome.Builder()
@@ -292,51 +283,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                 .temperature(vanilla.getTemperature())
                 .downfall(vanilla.getDownfall())
                 .effects(effects.build())
-                .spawnSettings(vanilla.getSpawnSettings())
+                .spawnSettings(spawnSettings.build())
                 .generationSettings(generationSettings.build())
                 .build();
     }
 
-    public void packInit() {
-        logger.info("Loading config packs...");
-        registry.loadAll(this);
-
-        registry.forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> Registry.register(BuiltinRegistries.BIOME, new Identifier("terra", createBiomeID(pack, id)), createBiome(biome)))); // Register all Terra biomes.
-
-        if(FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            registry.forEach(pack -> {
-
-            });
-
-            ConfigPack pack = registry.get("DEFAULT");
-            final GeneratorType generatorType = new GeneratorType("terra") {
-                @Override
-                public TerraGeneratorOptions createDefaultOptions(DynamicRegistryManager.Impl registryManager, long seed, boolean generateStructures, boolean bonusChest) {
-                    Registry<Biome> registry = registryManager.get(Registry.BIOME_KEY);
-                    Registry<DimensionType> registry2 = registryManager.get(Registry.DIMENSION_TYPE_KEY);
-                    Registry<ChunkGeneratorSettings> registry3 = registryManager.get(Registry.NOISE_SETTINGS_WORLDGEN);
-
-
-                    return new TerraGeneratorOptions(seed, generateStructures, bonusChest, GeneratorOptions.method_28608(registry2, DimensionType.createDefaultDimensionOptions(registry2, registry, registry3, seed), this.getChunkGenerator(registry, registry3, seed)), registry, registry3);
-                }
-
-                @Override
-                protected ChunkGenerator getChunkGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed) {
-                    return new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
-                }
-            };
-            Map<Optional<GeneratorType>, GeneratorType.ScreenProvider> screenProviderMap = new HashMap<>(GeneratorTypeAccessor.getScreenProviders());
-
-            screenProviderMap.put(Optional.of(generatorType), (screen, generatorOptions) -> new TerraOptionsScreen(screen, (TerraGeneratorOptions) generatorOptions));
-
-            GeneratorTypeAccessor.setScreenProviders(ImmutableMap.copyOf(screenProviderMap)); // jumping through hoops because ImmutableMap
-
-            GeneratorTypeAccessor.getValues().add(generatorType);
-        }
-
-        logger.info("Loaded packs.");
-    }
-
     @Override
     public void onInitialize() {
         instance = this;
@@ -352,15 +303,32 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         }
         logger.info("Loaded addons.");
 
+        registry.loadAll(this);
 
+        logger.info("Loaded packs.");
 
         Registry.register(Registry.FEATURE, new Identifier("terra", "flora_populator"), POPULATOR_FEATURE);
         RegistryKey<ConfiguredFeature<?, ?>> floraKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("terra", "flora_populator"));
         Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, floraKey.getValue(), POPULATOR_CONFIGURED_FEATURE);
 
+        registry.forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> Registry.register(BuiltinRegistries.BIOME, new Identifier("terra", createBiomeID(pack, id)), createBiome(biome)))); // Register all Terra biomes.
         Registry.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), FabricChunkGeneratorWrapper.CODEC);
         Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), TerraBiomeSource.CODEC);
 
+        if(FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            registry.forEach(pack -> {
+                final GeneratorType generatorType = new GeneratorType("terra." + pack.getTemplate().getID()) {
+                    @Override
+                    protected ChunkGenerator getChunkGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed) {
+                        return new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
+                    }
+                };
+                //noinspection ConstantConditions
+                ((GeneratorTypeAccessor) generatorType).setTranslationKey(new LiteralText("Terra:" + pack.getTemplate().getID()));
+                GeneratorTypeAccessor.getVALUES().add(generatorType);
+            });
+        }
+
         CommandManager manager = new TerraCommandManager(this);
         try {
             CommandUtil.registerAll(manager);
@@ -368,6 +336,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
             e.printStackTrace(); // TODO do something here even though this should literally never happen
         }
 
+
         CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {
                     int max = manager.getMaxArgumentDepth();
                     RequiredArgumentBuilder<ServerCommandSource, String> arg = argument("arg" + (max - 1), StringArgumentType.word());
@@ -382,17 +351,13 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                     //dispatcher.register(literal("te").redirect(root));
                 }
         );
-        logger.info("Finished initialization.");
+
     }
 
     private RequiredArgumentBuilder<ServerCommandSource, String> assemble(RequiredArgumentBuilder<ServerCommandSource, String> in, CommandManager manager) {
         return in.suggests((context, builder) -> {
             List<String> args = parseCommand(context.getInput());
-            CommandSender sender = (CommandSender) context.getSource();
-            try {
-                sender = (Entity) context.getSource().getEntityOrThrow();
-            } catch(CommandSyntaxException ignore) {
-            }
+            CommandSender sender = FabricAdapter.adapt(context.getSource());
             try {
                 manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest);
             } catch(CommandException e) {
@@ -401,13 +366,8 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
             return builder.buildFuture();
         }).executes(context -> {
             List<String> args = parseCommand(context.getInput());
-            CommandSender sender = (CommandSender) context.getSource();
             try {
-                sender = (Entity) context.getSource().getEntityOrThrow();
-            } catch(CommandSyntaxException ignore) {
-            }
-            try {
-                manager.execute(args.remove(0), sender, args);
+                manager.execute(args.remove(0), FabricAdapter.adapt(context.getSource()), args);
             } catch(CommandException e) {
                 context.getSource().sendError(new LiteralText(e.getMessage()));
             }
@@ -429,11 +389,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         return eventManager;
     }
 
-    @Override
-    public Profiler getProfiler() {
-        return profiler;
-    }
-
     @Addon("Terra-Fabric")
     @Author("Terra")
     @Version("1.0.0")
@@ -478,7 +433,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
 
         private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
             try {
-                registry.add(id, (Tree) tree);
+                registry.add(id, new FabricTree(tree));
             } catch(DuplicateEntryException ignore) {
             }
         }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraGeneratorOptions.java

@@ -1,159 +0,0 @@
-package com.dfsek.terra.fabric;
-
-import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
-import com.dfsek.terra.fabric.mixin.access.SimpleRegistryAccessor;
-import com.google.common.collect.Iterators;
-import com.mojang.serialization.Lifecycle;
-import net.minecraft.client.world.GeneratorType;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryKey;
-import net.minecraft.util.registry.SimpleRegistry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.dimension.DimensionOptions;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.gen.GeneratorOptions;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.OptionalLong;
-import java.util.Random;
-
-public class TerraGeneratorOptions extends GeneratorOptions {
-    private final Map<DimensionType, ImmutablePair<GeneratorType, ChunkGenerator>> override = new HashMap<>();
-    private final Registry<Biome> biomeRegistry;
-    private final Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry;
-
-    public TerraGeneratorOptions(long seed, boolean generateStructures, boolean bonusChest, SimpleRegistry<DimensionOptions> simpleRegistry,
-                                 Registry<Biome> registry2, Registry<ChunkGeneratorSettings> registry3) {
-        super(seed, generateStructures, bonusChest, simpleRegistry);
-        System.out.println("Creating Terra options");
-        Thread.dumpStack();
-        this.biomeRegistry = registry2;
-        this.chunkGeneratorSettingsRegistry = registry3;
-    }
-
-    public Registry<ChunkGeneratorSettings> getChunkGeneratorSettingsRegistry() {
-        return chunkGeneratorSettingsRegistry;
-    }
-
-    public Registry<Biome> getBiomeRegistry() {
-        return biomeRegistry;
-    }
-
-    public void overrideChunkGenerator(DimensionType dimensionType, GeneratorType identifier, ChunkGenerator newGenerator) {
-        override.put(dimensionType, ImmutablePair.of(identifier, newGenerator));
-    }
-
-    @Override
-    public TerraGeneratorOptions toggleGenerateStructures() {
-        return new TerraGeneratorOptions(getSeed(), !shouldGenerateStructures(), hasBonusChest(), getDimensions(), biomeRegistry, chunkGeneratorSettingsRegistry);
-    }
-
-    @Override
-    public TerraGeneratorOptions toggleBonusChest() {
-        return new TerraGeneratorOptions(getSeed(), shouldGenerateStructures(), !hasBonusChest(), getDimensions(), biomeRegistry, chunkGeneratorSettingsRegistry);
-    }
-
-    @Override
-    public GeneratorOptions withHardcore(boolean hardcore, OptionalLong seed) {
-        long l = seed.orElse(this.getSeed());
-        SimpleRegistry<DimensionOptions> simpleRegistry2;
-        if(seed.isPresent()) {
-            simpleRegistry2 = new SimpleRegistry<>(Registry.DIMENSION_OPTIONS, Lifecycle.experimental());
-            long longSeed = seed.getAsLong();
-
-            for(Map.Entry<RegistryKey<DimensionOptions>, DimensionOptions> registryKeyDimensionOptionsEntry : getDimensions().getEntries()) {
-                RegistryKey<DimensionOptions> registryKey = registryKeyDimensionOptionsEntry.getKey();
-                simpleRegistry2.add(registryKey, new DimensionOptions(registryKeyDimensionOptionsEntry.getValue().getDimensionTypeSupplier(), registryKeyDimensionOptionsEntry.getValue().getChunkGenerator().withSeed(longSeed)), getDimensions().getEntryLifecycle(registryKeyDimensionOptionsEntry.getValue()));
-            }
-        } else {
-            simpleRegistry2 = getDimensions();
-        }
-
-        GeneratorOptions generatorOptions2;
-
-        if(this.isDebugWorld()) {
-            generatorOptions2 = new TerraGeneratorOptions(l, false, false, simpleRegistry2, biomeRegistry, chunkGeneratorSettingsRegistry);
-        } else {
-            generatorOptions2 = new TerraGeneratorOptions(l, this.shouldGenerateStructures(), hasBonusChest() && !hardcore, simpleRegistry2, biomeRegistry, chunkGeneratorSettingsRegistry);
-        }
-
-        return generatorOptions2;
-    }
-
-    public Map<DimensionType, ImmutablePair<GeneratorType, ChunkGenerator>> getOverrides() {
-        return override;
-    }
-
-    @Override
-    public ChunkGenerator getChunkGenerator() {
-        System.out.println("Getting chunk generator");
-        Thread.dumpStack();
-        return super.getChunkGenerator();
-    }
-
-    @Override
-    public SimpleRegistry<DimensionOptions> getDimensions() {
-        new SimpleRegistry<DimensionOptions>(Registry.DIMENSION_OPTIONS, Lifecycle.stable()) {
-            @Nullable
-            @Override
-            public DimensionOptions get(int index) {
-                DimensionOptions options = super.get(index);
-                if(options == null) return null;
-                return new DimensionOptionsOverride(options);
-            }
-
-            @Nullable
-            @Override
-            public DimensionOptions get(@Nullable RegistryKey<DimensionOptions> key) {
-                DimensionOptions options = super.get(key);
-                if(options == null) return null;
-                return new DimensionOptionsOverride(options);
-            }
-
-            @Nullable
-            @Override
-            public DimensionOptions get(@Nullable Identifier id) {
-                DimensionOptions options = super.get(id);
-                if(options == null) return null;
-                return new DimensionOptionsOverride(options);
-            }
-
-            @Nullable
-            @Override
-            public DimensionOptions getRandom(Random random) {
-                DimensionOptions options = super.getRandom(random);
-                if(options == null) return null;
-                return new DimensionOptionsOverride(options);
-            }
-
-            @SuppressWarnings({"unchecked", "ConstantConditions"})
-            @Override
-            public Iterator<DimensionOptions> iterator() {
-                return Iterators.filter(((SimpleRegistryAccessor<DimensionOptions>) (Object) this).getRawIdToEntry().stream().map(DimensionOptionsOverride::new).map(dimensionOptionsOverride -> (DimensionOptions) dimensionOptionsOverride).iterator(), Objects::nonNull);
-            }
-        };
-        return super.getDimensions();
-    }
-
-    public final class DimensionOptionsOverride extends DimensionOptions {
-
-        public DimensionOptionsOverride(DimensionOptions options) {
-            super(options.getDimensionTypeSupplier(), options.getChunkGenerator());
-            System.out.println("Overriding " + getDimensionType());
-        }
-
-        @Override
-        public ChunkGenerator getChunkGenerator() {
-            ChunkGenerator overridden = override.get(getDimensionType()).getRight();
-            if(overridden != null) return overridden;
-            return super.getChunkGenerator();
-        }
-    }
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraOptionsScreen.java

@@ -1,122 +0,0 @@
-package com.dfsek.terra.fabric;
-
-import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
-import com.dfsek.terra.api.util.mutable.MutableInteger;
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
-import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonListWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.options.CyclingOption;
-import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.world.GeneratorType;
-import net.minecraft.text.BaseText;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TerraOptionsScreen extends Screen {
-    private final Screen parent;
-    private final List<GeneratorType> generatorList = new ArrayList<>();
-    private final TerraGeneratorOptions terraGeneratorOptions;
-    private ButtonListWidget buttonListWidget;
-
-    public TerraOptionsScreen(Screen parent, TerraGeneratorOptions terraGeneratorOptions) {
-        super(new LiteralText("Terra Options"));
-        this.parent = parent;
-        this.terraGeneratorOptions = terraGeneratorOptions;
-        generatorList.add(GeneratorType.DEFAULT);
-
-        TerraFabricPlugin.getInstance().getConfigRegistry().forEach(pack -> generatorList.add(new TempGeneratorType(pack)));
-    }
-
-    @Override
-    protected void init() {
-        addButton(new ButtonWidget(width / 2 - 60, height - 30, 120, 20, new TranslatableText("terra.screen.close"), btn -> client.openScreen(parent)));
-        this.buttonListWidget = new ButtonListWidget(client, width - 20, height - 20, 32, height - 50, 25);
-
-        buttonListWidget.setLeftPos(10);
-
-        terraGeneratorOptions.getDimensions().getEntries().forEach((entry) -> buttonListWidget.addSingleOptionEntry(new GeneratorCycler(entry.getKey().getValue(), entry.getValue().getDimensionType())));
-
-        addChild(buttonListWidget);
-    }
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackground(matrices);
-        this.buttonListWidget.render(matrices, mouseX, mouseY, delta);
-        DrawableHelper.drawCenteredText(matrices, textRenderer, new TranslatableText("terra.config-screen"), width / 2, 20, 0xffffff);
-        super.render(matrices, mouseX, mouseY, delta);
-    }
-
-    private static final class TempGeneratorType extends GeneratorType {
-        private final ConfigPack pack;
-
-        protected TempGeneratorType(ConfigPack pack) {
-            super("terra:" + pack.getTemplate().getID());
-            this.pack = pack;
-            //noinspection ConstantConditions
-            ((GeneratorTypeAccessor) (Object) this).setTranslationKey(new LiteralText("Terra:" + this.pack.getTemplate().getID()));
-        }
-
-        @Override
-        protected ChunkGenerator getChunkGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed) {
-            return new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
-        }
-
-        @Override
-        public int hashCode() {
-            return pack.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if(!(obj instanceof TempGeneratorType)) return false;
-            return ((TempGeneratorType) obj).pack.equals(this.pack);
-        }
-    }
-
-    private final class GeneratorCycler extends CyclingOption {
-        private final MutableInteger amount = new MutableInteger(0);
-        private final DimensionType value;
-
-        public GeneratorCycler(Identifier key, DimensionType value) {
-            super(key.toString(), null, null);
-            this.value = value;
-            ImmutablePair<GeneratorType, ChunkGenerator> generatorTypeChunkGeneratorImmutablePair = terraGeneratorOptions.getOverrides().get(value);
-
-            if(generatorTypeChunkGeneratorImmutablePair != null) {
-                this.amount.set(generatorList.indexOf(generatorTypeChunkGeneratorImmutablePair.getLeft()));
-            }
-        }
-
-        @Override
-        public Text getMessage(GameOptions options) {
-            return ((BaseText) getDisplayPrefix()).copy().append(new LiteralText(": ")).append(generatorList.get(amount.get()).getTranslationKey().copy());
-        }
-
-        @Override
-        public void cycle(GameOptions options, int amount) {
-            this.amount.addMod(amount, generatorList.size());
-            terraGeneratorOptions.overrideChunkGenerator(value, generatorList.get(this.amount.get()),
-                    ((GeneratorTypeAccessor) generatorList.get(this.amount.get()))
-                            .callGetChunkGenerator(terraGeneratorOptions.getBiomeRegistry(),
-                                    terraGeneratorOptions.getChunkGeneratorSettingsRegistry(),
-                                    terraGeneratorOptions.getSeed()));
-        }
-    }
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/command/FabricCommandAdapter.java

@@ -0,0 +1,7 @@
+package com.dfsek.terra.fabric.command;
+
+public class FabricCommandAdapter {
+    public static void register() {
+
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/command/StringListArgumentType.java

@@ -0,0 +1,17 @@
+package com.dfsek.terra.fabric.command;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class StringListArgumentType implements ArgumentType<List<String>> {
+    @Override
+    public List<String> parse(StringReader reader) {
+        final String text = reader.getRemaining();
+        reader.setCursor(reader.getTotalLength());
+        return new ArrayList<>(Arrays.asList(text.split(" ")));
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/FabricWorldConfig.java

@@ -1,28 +0,0 @@
-package com.dfsek.terra.fabric.config;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.terra.config.pack.ConfigPack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class FabricWorldConfig implements ConfigTemplate {
-    @SuppressWarnings("FieldMayBeFinal")
-    @Value(".")
-    @Default
-    private Map<String, ConfigPack> worlds;
-
-    public FabricWorldConfig(Map<String, ConfigPack> worlds) {
-        this.worlds = worlds;
-    }
-
-    public FabricWorldConfig() {
-        this(new HashMap<>());
-    }
-
-    public Map<String, ConfigPack> getWorlds() {
-        return worlds;
-    }
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricEnchantment.java

@@ -1,17 +1,16 @@
-package com.dfsek.terra.forge.inventory;
+package com.dfsek.terra.fabric.inventory;
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
-import com.dfsek.terra.forge.world.ForgeAdapter;
+import com.dfsek.terra.fabric.world.FabricAdapter;
 import net.minecraft.util.registry.Registry;
-import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Objects;
 
-public class ForgeEnchantment implements Enchantment {
+public class FabricEnchantment implements Enchantment {
     private final net.minecraft.enchantment.Enchantment enchantment;
 
-    public ForgeEnchantment(net.minecraft.enchantment.Enchantment enchantment) {
+    public FabricEnchantment(net.minecraft.enchantment.Enchantment enchantment) {
         this.enchantment = enchantment;
     }
 
@@ -22,17 +21,17 @@ public class ForgeEnchantment implements Enchantment {
 
     @Override
     public boolean canEnchantItem(ItemStack itemStack) {
-        return enchantment.canEnchant(ForgeAdapter.adapt(itemStack));
+        return enchantment.isAcceptableItem(FabricAdapter.adapt(itemStack));
     }
 
     @Override
     public String getID() {
-        return Objects.requireNonNull(ForgeRegistries.ENCHANTMENTS.getKey(enchantment)).toString();
+        return Objects.requireNonNull(Registry.ENCHANTMENT.getId(enchantment)).toString();
     }
 
     @Override
     public boolean conflictsWith(Enchantment other) {
-        return !enchantment.isCompatibleWith(ForgeAdapter.adapt(other));
+        return !enchantment.canCombine(FabricAdapter.adapt(other));
     }
 
     @Override

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricInventory.java

@@ -0,0 +1,35 @@
+package com.dfsek.terra.fabric.inventory;
+
+import com.dfsek.terra.api.platform.inventory.Inventory;
+import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.fabric.world.FabricAdapter;
+import net.minecraft.item.Items;
+
+public class FabricInventory implements Inventory {
+    private final net.minecraft.inventory.Inventory delegate;
+
+    public FabricInventory(net.minecraft.inventory.Inventory delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public net.minecraft.inventory.Inventory getHandle() {
+        return delegate;
+    }
+
+    @Override
+    public int getSize() {
+        return delegate.size();
+    }
+
+    @Override
+    public ItemStack getItem(int slot) {
+        net.minecraft.item.ItemStack itemStack = delegate.getStack(slot);
+        return itemStack.getItem() == Items.AIR ? null : FabricAdapter.adapt(itemStack);
+    }
+
+    @Override
+    public void setItem(int slot, ItemStack newStack) {
+        delegate.setStack(slot, FabricAdapter.adapt(newStack));
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItem.java

@@ -1,12 +1,12 @@
-package com.dfsek.terra.forge.inventory;
+package com.dfsek.terra.fabric.inventory;
 
 import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 
-public class ForgeItem implements Item {
+public class FabricItem implements Item {
     private final net.minecraft.item.Item delegate;
 
-    public ForgeItem(net.minecraft.item.Item delegate) {
+    public FabricItem(net.minecraft.item.Item delegate) {
         this.delegate = delegate;
     }
 
@@ -17,7 +17,7 @@ public class ForgeItem implements Item {
 
     @Override
     public ItemStack newItemStack(int amount) {
-        return new ForgeItemStack(new net.minecraft.item.ItemStack(delegate, amount));
+        return new FabricItemStack(new net.minecraft.item.ItemStack(delegate, amount));
     }
 
     @Override

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java

@@ -1,8 +1,9 @@
-package com.dfsek.terra.fabric.handle;
+package com.dfsek.terra.fabric.inventory;
 
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
+import com.dfsek.terra.fabric.world.FabricAdapter;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.command.argument.ItemStackArgumentType;
@@ -17,7 +18,7 @@ public class FabricItemHandle implements ItemHandle {
     @Override
     public Item createItem(String data) {
         try {
-            return (Item) new ItemStackArgumentType().parse(new StringReader(data)).getItem();
+            return FabricAdapter.adapt(new ItemStackArgumentType().parse(new StringReader(data)).getItem());
         } catch(CommandSyntaxException e) {
             throw new IllegalArgumentException("Invalid item data \"" + data + "\"", e);
         }
@@ -25,11 +26,11 @@ public class FabricItemHandle implements ItemHandle {
 
     @Override
     public Enchantment getEnchantment(String id) {
-        return (Enchantment) (Registry.ENCHANTMENT.get(Identifier.tryParse(id)));
+        return FabricAdapter.adapt(Registry.ENCHANTMENT.get(Identifier.tryParse(id)));
     }
 
     @Override
     public Set<Enchantment> getEnchantments() {
-        return Registry.ENCHANTMENT.stream().map(enchantment -> (Enchantment) enchantment).collect(Collectors.toSet());
+        return Registry.ENCHANTMENT.stream().map(FabricAdapter::adapt).collect(Collectors.toSet());
     }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java

@@ -1,15 +1,15 @@
-package com.dfsek.terra.forge.inventory;
+package com.dfsek.terra.fabric.inventory;
 
 import com.dfsek.terra.api.platform.inventory.Item;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.forge.inventory.meta.ForgeDamageable;
-import com.dfsek.terra.forge.inventory.meta.ForgeItemMeta;
+import com.dfsek.terra.fabric.inventory.meta.FabricDamageable;
+import com.dfsek.terra.fabric.inventory.meta.FabricItemMeta;
 
-public class ForgeItemStack implements ItemStack {
+public class FabricItemStack implements ItemStack {
     private net.minecraft.item.ItemStack delegate;
 
-    public ForgeItemStack(net.minecraft.item.ItemStack delegate) {
+    public FabricItemStack(net.minecraft.item.ItemStack delegate) {
         this.delegate = delegate;
     }
 
@@ -25,18 +25,18 @@ public class ForgeItemStack implements ItemStack {
 
     @Override
     public Item getType() {
-        return new ForgeItem(delegate.getItem());
+        return new FabricItem(delegate.getItem());
     }
 
     @Override
     public ItemMeta getItemMeta() {
-        if(delegate.isDamageableItem()) return new ForgeDamageable(delegate.copy());
-        return new ForgeItemMeta(delegate.copy());
+        if(delegate.isDamageable()) return new FabricDamageable(delegate.copy());
+        return new FabricItemMeta(delegate.copy());
     }
 
     @Override
     public void setItemMeta(ItemMeta meta) {
-        this.delegate = ((ForgeItemMeta) meta).getHandle();
+        this.delegate = ((FabricItemMeta) meta).getHandle();
     }
 
     @Override

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/meta/FabricDamageable.java

@@ -1,25 +1,25 @@
-package com.dfsek.terra.forge.inventory.meta;
+package com.dfsek.terra.fabric.inventory.meta;
 
 import com.dfsek.terra.api.platform.inventory.item.Damageable;
 import net.minecraft.item.ItemStack;
 
-public class ForgeDamageable extends ForgeItemMeta implements Damageable {
-    public ForgeDamageable(ItemStack delegate) {
+public class FabricDamageable extends FabricItemMeta implements Damageable {
+    public FabricDamageable(ItemStack delegate) {
         super(delegate);
     }
 
     @Override
     public int getDamage() {
-        return delegate.getDamageValue();
+        return delegate.getDamage();
     }
 
     @Override
     public void setDamage(int damage) {
-        delegate.setDamageValue(damage);
+        delegate.setDamage(damage);
     }
 
     @Override
     public boolean hasDamage() {
-        return delegate.isDamaged();
+        return delegate.isDamageable();
     }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/meta/FabricItemMeta.java

@@ -1,21 +1,20 @@
-package com.dfsek.terra.forge.inventory.meta;
+package com.dfsek.terra.fabric.inventory.meta;
 
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.forge.world.ForgeAdapter;
-import net.minecraft.command.arguments.NBTCompoundTagArgument;
+import com.dfsek.terra.fabric.world.FabricAdapter;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.registry.Registry;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ForgeItemMeta implements ItemMeta {
+public class FabricItemMeta implements ItemMeta {
     protected final ItemStack delegate;
 
-    public ForgeItemMeta(ItemStack delegate) {
+    public FabricItemMeta(ItemStack delegate) {
         this.delegate = delegate;
     }
 
@@ -26,18 +25,18 @@ public class ForgeItemMeta implements ItemMeta {
 
     @Override
     public Map<Enchantment, Integer> getEnchantments() {
-        if(!delegate.isEnchanted()) return Collections.emptyMap();
+        if(!delegate.hasEnchantments()) return Collections.emptyMap();
         Map<Enchantment, Integer> map = new HashMap<>();
 
-        delegate.getEnchantmentTags().forEach(enchantment -> {
-            CompoundNBT eTag = (CompoundNBT) enchantment;
-            map.put(ForgeAdapter.adapt(Registry.ENCHANTMENT.byId(eTag.getInt("id"))), eTag.getInt("lvl"));
+        delegate.getEnchantments().forEach(enchantment -> {
+            CompoundTag eTag = (CompoundTag) enchantment;
+            map.put(FabricAdapter.adapt(Registry.ENCHANTMENT.get(eTag.getInt("id"))), eTag.getInt("lvl"));
         });
         return map;
     }
 
     @Override
     public void addEnchantment(Enchantment enchantment, int level) {
-        delegate.enchant(ForgeAdapter.adapt(enchantment), level);
+        delegate.addEnchantment(FabricAdapter.adapt(enchantment), level);
     }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/GeneratorTypeAccessor.java

@@ -0,0 +1,21 @@
+package com.dfsek.terra.fabric.mixin;
+
+import net.minecraft.client.world.GeneratorType;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(GeneratorType.class)
+public interface GeneratorTypeAccessor {
+    @Accessor
+    static List<GeneratorType> getVALUES() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Mutable
+    @Accessor
+    void setTranslationKey(Text translationKey);
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MinecraftServerMixin.java

@@ -1,25 +0,0 @@
-package com.dfsek.terra.fabric.mixin;
-
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.WorldGenerationProgressListener;
-import net.minecraft.world.SaveProperties;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MinecraftServer.class)
-public abstract class MinecraftServerMixin {
-    @Shadow
-    @Final
-    protected SaveProperties saveProperties;
-
-
-    @Inject(method = "createWorlds(Lnet/minecraft/server/WorldGenerationProgressListener;)V", at = @At("HEAD"))
-    public void injectCreateWorlds(WorldGenerationProgressListener worldGenerationProgressListener, CallbackInfo ci) {
-        System.out.println("Generator: " + this.saveProperties.getGeneratorOptions());
-        Thread.dumpStack();
-    }
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/MixinGeneratorOptions.java

@@ -2,9 +2,8 @@ package com.dfsek.terra.fabric.mixin;
 
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
-import com.dfsek.terra.fabric.TerraGeneratorOptions;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
+import com.dfsek.terra.fabric.world.TerraBiomeSource;
+import com.dfsek.terra.fabric.world.generator.FabricChunkGeneratorWrapper;
 import com.google.common.base.MoreObjects;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
@@ -14,26 +13,16 @@ import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.GeneratorOptions;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
-import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Properties;
 import java.util.Random;
 
-import static net.minecraft.world.gen.GeneratorOptions.method_28608;
+// Mixins commented out until loom fixes multi-project builds.
 
-@Mixin(GeneratorOptions.class)
-public abstract class GeneratorOptionsMixin {
-    @Shadow
-    public static NoiseChunkGenerator createOverworldGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed) {
-        return null;
-    }
-
-    @Inject(method = "fromProperties(Lnet/minecraft/util/registry/DynamicRegistryManager;Ljava/util/Properties;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true)
+//@Mixin(GeneratorOptions.class)
+public class MixinGeneratorOptions {
+    //@Inject(method = "fromProperties(Lnet/minecraft/util/registry/DynamicRegistryManager;Ljava/util/Properties;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true)
     private static void fromProperties(DynamicRegistryManager dynamicRegistryManager, Properties properties, CallbackInfoReturnable<GeneratorOptions> cir) {
         if(properties.get("level-type") == null) {
             return;
@@ -61,20 +50,13 @@ public abstract class GeneratorOptionsMixin {
             Registry<ChunkGeneratorSettings> chunkGeneratorSettings = dynamicRegistryManager.get(Registry.NOISE_SETTINGS_WORLDGEN);
             SimpleRegistry<DimensionOptions> dimensionOptions = DimensionType.createDefaultDimensionOptions(dimensionTypes, biomes, chunkGeneratorSettings, l);
 
-
             prop = prop.substring(prop.indexOf(":") + 1);
 
             ConfigPack pack = TerraFabricPlugin.getInstance().getConfigRegistry().get(prop);
 
             if(pack == null) throw new IllegalArgumentException("No such pack " + prop);
 
-            cir.setReturnValue(new TerraGeneratorOptions(l, generateStructures, false, method_28608(dimensionTypes, dimensionOptions, new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomes, l, pack), l, pack)), biomes, chunkGeneratorSettings));
+            cir.setReturnValue(new GeneratorOptions(l, generateStructures, false, GeneratorOptions.method_28608(dimensionTypes, dimensionOptions, new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomes, l, pack), l, pack))));
         }
     }
-
-    @Inject(method = "getDefaultOptions(Lnet/minecraft/util/registry/Registry;Lnet/minecraft/util/registry/Registry;Lnet/minecraft/util/registry/Registry;)Lnet/minecraft/world/gen/GeneratorOptions;", at = @At("HEAD"), cancellable = true)
-    private static void injectDefaultOptions(Registry<DimensionType> registry, Registry<Biome> registry2, Registry<ChunkGeneratorSettings> registry3, CallbackInfoReturnable<GeneratorOptions> cir) {
-        long l = (new Random()).nextLong();
-        cir.setReturnValue(new TerraGeneratorOptions(l, true, false, method_28608(registry, DimensionType.createDefaultDimensionOptions(registry, registry2, registry3, l), createOverworldGenerator(registry2, registry3, l)), registry2, registry3));
-    }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/BiomeEffectsAccessor.java

@@ -1,31 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import net.minecraft.world.biome.BiomeEffects;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.Optional;
-
-@Mixin(BiomeEffects.class)
-public interface BiomeEffectsAccessor {
-    @Accessor("fogColor")
-    int getFogColor();
-
-    @Accessor("waterColor")
-    int getWaterColor();
-
-    @Accessor("waterFogColor")
-    int getWaterFogColor();
-
-    @Accessor("skyColor")
-    int getSkyColor();
-
-    @Accessor("foliageColor")
-    Optional<Integer> getFoliageColor();
-
-    @Accessor("grassColor")
-    Optional<Integer> getGrassColor();
-
-    @Accessor("grassColorModifier")
-    BiomeEffects.GrassColorModifier getGrassColorModifier();
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/GeneratorTypeAccessor.java

@@ -1,42 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import net.minecraft.client.world.GeneratorType;
-import net.minecraft.text.Text;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-@Mixin(GeneratorType.class)
-public interface GeneratorTypeAccessor {
-    @Accessor("VALUES")
-    static List<GeneratorType> getValues() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Accessor("SCREEN_PROVIDERS")
-    static Map<Optional<GeneratorType>, GeneratorType.ScreenProvider> getScreenProviders() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Mutable
-    @Accessor("SCREEN_PROVIDERS")
-    static void setScreenProviders(Map<Optional<GeneratorType>, GeneratorType.ScreenProvider> SCREEN_PROVIDERS) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Mutable
-    @Accessor("translationKey")
-    void setTranslationKey(Text translationKey);
-
-    @Invoker("getChunkGenerator")
-    ChunkGenerator callGetChunkGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed);
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/LevelPropertiesAccessor.java

@@ -1,12 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import net.minecraft.world.gen.GeneratorOptions;
-import net.minecraft.world.level.LevelProperties;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(LevelProperties.class)
-public interface LevelPropertiesAccessor {
-    @Accessor("generatorOptions")
-    void setGeneratorOptions(GeneratorOptions generatorOptions);
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java

@@ -1,12 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import net.minecraft.util.Identifier;
-import net.minecraft.world.MobSpawnerLogic;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(MobSpawnerLogic.class)
-public interface MobSpawnerLogicAccessor {
-    @Invoker("getEntityId")
-    Identifier callGetEntityId();
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/SimpleRegistryAccessor.java

@@ -1,12 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import it.unimi.dsi.fastutil.objects.ObjectList;
-import net.minecraft.util.registry.SimpleRegistry;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(SimpleRegistry.class)
-public interface SimpleRegistryAccessor<T> {
-    @Accessor("rawIdToEntry")
-    ObjectList<T> getRawIdToEntry();
-}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/StateAccessor.java

@@ -1,17 +0,0 @@
-package com.dfsek.terra.fabric.mixin.access;
-
-import net.minecraft.state.State;
-import net.minecraft.state.property.Property;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.Map;
-import java.util.function.Function;
-
-@Mixin(State.class)
-public interface StateAccessor {
-    @Accessor("PROPERTY_MAP_PRINTER")
-    static Function<Map.Entry<Property<?>, Comparable<?>>, String> getPropertyMapPrinter() {
-        throw new UnsupportedOperationException();
-    }
-}