cache value of ModDependentConfigSection

Forge Tweaks

README.md

@@ -7,7 +7,7 @@ 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)
+* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
 
 ## Building and Running Terra
 
@@ -32,15 +32,15 @@ To run Minecraft with Terra in the IDE (for testing) use the following tasks:
   * `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.
+  * `runClient` - Run a Minecraft Fabric client with Terra installed.
+  * `runServer` - Run a Minecraft Fabric server with Terra installed.
 * Forge
-  * `runClient` - Run a Minecraft client with Terra installed.
-  * `runServer` - Run a Minecraft server with Terra installed.
+  * `runClient` - Run a Minecraft Forge client with Terra installed.
+  * `runServer` - Run a Minecraft Forge 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!
 Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project!
 
 ## Beta
-Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!
+Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!

build.gradle.kts

@@ -1,6 +1,6 @@
 import com.dfsek.terra.getGitHash
 
-val versionObj = Version("5", "3", "0", true)
+val versionObj = Version("5", "3", "3", true)
 
 allprojects {
     version = versionObj

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

@@ -29,7 +29,12 @@ fun Project.configureCompilation() {
         include("**/*.*")
         filter<org.apache.tools.ant.filters.ReplaceTokens>(
                 "tokens" to mapOf(
-                        "VERSION" to project.version.toString()
+                        "VERSION" to project.version.toString(),
+                        "DESCRIPTION" to project.properties["terra.description"],
+                        "WIKI" to project.properties["terra.wiki"],
+                        "SOURCE" to project.properties["terra.source"],
+                        "ISSUES" to project.properties["terra.issues"],
+                        "LICENSE" to project.properties["terra.license"]
                 )
         )
     }

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

@@ -4,10 +4,10 @@ import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.platform.modloader.Mod;
 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.task.TaskScheduler;
 import com.dfsek.terra.api.util.JarUtil;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.Logger;
@@ -20,6 +20,8 @@ import com.dfsek.terra.world.TerraWorld;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.Set;
 import java.util.jar.JarFile;
 
 /**
@@ -77,5 +79,7 @@ public interface TerraPlugin extends LoaderRegistrar {
         return JarUtil.getJarFile();
     }
 
-    TaskScheduler getScheduler();
+    default Set<Mod> getMods() {
+        return Collections.emptySet();
+    }
 }

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java

@@ -1,6 +1,9 @@
 package com.dfsek.terra.api.event.events.config;
 
+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.terra.api.event.events.PackEvent;
+import com.dfsek.terra.config.fileloaders.Loader;
 import com.dfsek.terra.config.pack.ConfigPack;
 
 /**
@@ -8,13 +11,34 @@ import com.dfsek.terra.config.pack.ConfigPack;
  */
 public abstract class ConfigPackLoadEvent implements PackEvent {
     private final ConfigPack pack;
+    private final ExceptionalConsumer<ConfigTemplate> configLoader;
+    private final Loader loader;
 
-    public ConfigPackLoadEvent(ConfigPack pack) {
+    public ConfigPackLoadEvent(ConfigPack pack, ExceptionalConsumer<ConfigTemplate> configLoader, Loader loader) {
         this.pack = pack;
+        this.configLoader = configLoader;
+        this.loader = loader;
     }
 
     @Override
     public ConfigPack getPack() {
         return pack;
     }
+
+    /**
+     * Load a custom {@link ConfigTemplate} using the pack manifest.
+     *
+     * @param template Template to register.
+     */
+    public void loadTemplate(ConfigTemplate template) throws ConfigException {
+        configLoader.accept(template);
+    }
+
+    public interface ExceptionalConsumer<T extends ConfigTemplate> {
+        void accept(T value) throws ConfigException;
+    }
+
+    public Loader getLoader() {
+        return loader;
+    }
 }

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java

@@ -1,12 +1,14 @@
 package com.dfsek.terra.api.event.events.config;
 
+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.config.fileloaders.Loader;
 import com.dfsek.terra.config.pack.ConfigPack;
 
 /**
  * Called when a config pack has finished loading.
  */
 public class ConfigPackPostLoadEvent extends ConfigPackLoadEvent {
-    public ConfigPackPostLoadEvent(ConfigPack pack) {
-        super(pack);
+    public ConfigPackPostLoadEvent(ConfigPack pack, ExceptionalConsumer<ConfigTemplate> configTemplateLoader, Loader loader) {
+        super(pack, configTemplateLoader, loader);
     }
 }

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java

@@ -1,12 +1,14 @@
 package com.dfsek.terra.api.event.events.config;
 
+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.config.fileloaders.Loader;
 import com.dfsek.terra.config.pack.ConfigPack;
 
 /**
  * Called before a config pack's registries are filled. At this point, the pack manifest has been loaded, and all registries are empty.
  */
 public class ConfigPackPreLoadEvent extends ConfigPackLoadEvent {
-    public ConfigPackPreLoadEvent(ConfigPack pack) {
-        super(pack);
+    public ConfigPackPreLoadEvent(ConfigPack pack, ExceptionalConsumer<ConfigTemplate> configLoader, Loader loader) {
+        super(pack, configLoader, loader);
     }
 }

common/src/main/java/com/dfsek/terra/api/platform/modloader/Mod.java

@@ -0,0 +1,9 @@
+package com.dfsek.terra.api.platform.modloader;
+
+public interface Mod {
+    String getID();
+
+    String getVersion();
+
+    String getName();
+}

common/src/main/java/com/dfsek/terra/api/task/TaskScheduler.java

@@ -1,35 +0,0 @@
-package com.dfsek.terra.api.task;
-
-public interface TaskScheduler {
-    /**
-     * Run a task synchronously on the next tick.
-     * Functionally equivalent to {@link #runTask(Runnable, long)}
-     * @param task Task to run.
-     */
-    default void runTask(Runnable task) {
-        runTask(task, 0);
-    }
-
-    /**
-     * Schedule a task asynchronously immediately.
-     * Functionally equivalent to {@link #runTaskAsynchronously(Runnable)} (Runnable, long)}
-     * @param task Task to run.
-     */
-    default void runTaskAsynchronously(Runnable task) {
-        runTaskAsynchronously(task, 0);
-    }
-
-    /**
-     * Run a task asynchronously after a number of ticks.
-     * @param task Task to run.
-     * @param ticks Delay before running the task, in ticks.
-     */
-    void runTaskAsynchronously(Runnable task, long ticks);
-
-    /**
-     * Run a task synchronously after a number of ticks.
-     * @param task Task to run.
-     * @param ticks Delay before running the task, in ticks.
-     */
-    void runTask(Runnable task, long ticks);
-}

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

@@ -1,8 +0,0 @@
-package com.dfsek.terra.api.transform;
-
-public class NotNullValidator<T> implements Validator<T> {
-    @Override
-    public boolean validate(T value) {
-        return !(value == null);
-    }
-}

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

@@ -1,6 +1,12 @@
 package com.dfsek.terra.api.transform;
 
 
+import java.util.Objects;
+
 public interface Validator<T> {
     boolean validate(T value) throws TransformException;
+
+    static <T> Validator<T> notNull() {
+        return Objects::nonNull;
+    }
 }

common/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java

@@ -49,21 +49,4 @@ public final class Either<L, R> {
     public boolean hasRight() {
         return !leftPresent;
     }
-
-    @Override
-    public int hashCode() {
-        if(hasLeft()) return left.hashCode();
-        return right.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if(!(o instanceof Either<?, ?>)) return false;
-
-        Either<?, ?> that = (Either<?, ?>) o;
-
-        if(hasLeft() && that.hasLeft()) return left.equals(that.left);
-        if(hasRight() && that.hasRight()) return right.equals(that.right);
-        return false;
-    }
 }

common/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.api.util.generic.pair;
 
-import java.util.Objects;
-
 public class ImmutablePair<L, R> {
     private final L left;
     private final R right;
@@ -26,15 +24,4 @@ public class ImmutablePair<L, R> {
     public Pair<L, R> mutable() {
         return new Pair<>(left, right);
     }
-    @Override
-    public int hashCode() {
-        return Objects.hash(left, right);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if(!(o instanceof ImmutablePair)) return false;
-        ImmutablePair<?, ?> that = (ImmutablePair<?, ?>) o;
-        return that.left.equals(left) && that.right.equals(right);
-    }
 }

common/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.api.util.generic.pair;
 
-import java.util.Objects;
-
 public class Pair<L, R> {
     private L left;
     private R right;
@@ -34,16 +32,4 @@ public class Pair<L, R> {
     public ImmutablePair<L, R> immutable() {
         return new ImmutablePair<>(left, right);
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(left, right);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if(!(o instanceof Pair)) return false;
-        Pair<?, ?> that = (Pair<?, ?>) o;
-        return that.left.equals(left) && that.right.equals(right);
-    }
 }

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

@@ -46,6 +46,8 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTempl
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate;
+import com.dfsek.terra.config.loaders.mod.ModDependentConfigSection;
+import com.dfsek.terra.config.loaders.mod.ModDependentConfigSectionLoader;
 import com.dfsek.terra.config.loaders.palette.CarverPaletteLoader;
 import com.dfsek.terra.config.loaders.palette.PaletteHolderLoader;
 import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader;
@@ -108,7 +110,8 @@ public class GenericLoaders implements LoaderRegistrar {
 
         if(main != null) {
             registry.registerLoader(TerraAddon.class, main.getAddons())
-                    .registerLoader(BlockType.class, (t, object, cf) -> main.getWorldHandle().createBlockData((String) object).getBlockType());
+                    .registerLoader(BlockType.class, (t, object, cf) -> main.getWorldHandle().createBlockData((String) object).getBlockType())
+                    .registerLoader(ModDependentConfigSection.class, new ModDependentConfigSectionLoader(main));
         }
     }
 }

common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java

@@ -1,147 +0,0 @@
-package com.dfsek.terra.config.builder;
-
-import com.dfsek.paralithic.eval.parser.Scope;
-import com.dfsek.paralithic.eval.tokenizer.ParseException;
-import com.dfsek.terra.api.math.noise.NoiseSampler;
-import com.dfsek.terra.api.math.noise.samplers.ExpressionSampler;
-import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
-import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
-import com.dfsek.terra.world.generation.WorldGenerator;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class GeneratorBuilder {
-    private final Map<Long, WorldGenerator> gens = Collections.synchronizedMap(new HashMap<>());
-
-    private String noiseEquation;
-
-    private String elevationEquation;
-
-    private String carvingEquation;
-
-    private Scope varScope;
-
-    private Map<String, NoiseSeeded> noiseBuilderMap;
-
-    private Map<String, FunctionTemplate> functionTemplateMap;
-
-    private PaletteHolder palettes;
-
-    private PaletteHolder slantPalettes;
-
-    private boolean preventInterpolation;
-
-    private boolean interpolateElevation;
-
-    private NoiseSeeded biomeNoise;
-
-    private double elevationWeight;
-
-    private int blendDistance;
-
-    private int blendStep;
-
-    private double blendWeight;
-
-    public WorldGenerator build(long seed) {
-        synchronized(gens) {
-            return gens.computeIfAbsent(seed, k -> {
-                NoiseSampler noise;
-                NoiseSampler elevation;
-                NoiseSampler carving;
-                try {
-                    noise = new ExpressionSampler(noiseEquation, varScope, seed, noiseBuilderMap, functionTemplateMap);
-                    elevation = elevationEquation == null ? new ConstantSampler(0) : new ExpressionSampler(elevationEquation, varScope, seed, noiseBuilderMap, functionTemplateMap);
-                    carving = new ExpressionSampler(carvingEquation, varScope, seed, noiseBuilderMap, functionTemplateMap);
-                } catch(ParseException e) {
-                    throw new RuntimeException(e);
-                }
-                return new WorldGenerator(palettes, slantPalettes, noise, elevation, carving, biomeNoise.apply(seed), elevationWeight, blendDistance, blendStep, blendWeight);
-            });
-        }
-    }
-
-    public void setBlendWeight(double blendWeight) {
-        this.blendWeight = blendWeight;
-    }
-
-    public void setFunctionTemplateMap(Map<String, FunctionTemplate> functionTemplateMap) {
-        this.functionTemplateMap = functionTemplateMap;
-    }
-
-    public void setBlendStep(int blendStep) {
-        this.blendStep = blendStep;
-    }
-
-    public void setBlendDistance(int blendDistance) {
-        this.blendDistance = blendDistance;
-    }
-
-    public void setBiomeNoise(NoiseSeeded biomeNoise) {
-        this.biomeNoise = biomeNoise;
-    }
-
-    public void setElevationWeight(double elevationWeight) {
-        this.elevationWeight = elevationWeight;
-    }
-
-    public void setNoiseEquation(String noiseEquation) {
-        this.noiseEquation = noiseEquation;
-    }
-
-    public void setElevationEquation(String elevationEquation) {
-        this.elevationEquation = elevationEquation;
-    }
-
-    public void setCarvingEquation(String carvingEquation) {
-        this.carvingEquation = carvingEquation;
-    }
-
-    public Scope getVarScope() {
-        return varScope;
-    }
-
-    public void setVarScope(Scope varScope) {
-        this.varScope = varScope;
-    }
-
-    public void setNoiseBuilderMap(Map<String, NoiseSeeded> noiseBuilderMap) {
-        this.noiseBuilderMap = noiseBuilderMap;
-    }
-
-    public PaletteHolder getPalettes() {
-        return palettes;
-    }
-
-    public void setPalettes(PaletteHolder palettes) {
-        this.palettes = palettes;
-    }
-
-    public PaletteHolder getSlantPalettes() {
-        return slantPalettes;
-    }
-
-    public void setSlantPalettes(PaletteHolder slantPalettes) {
-        this.slantPalettes = slantPalettes;
-    }
-
-    public boolean isPreventInterpolation() {
-        return preventInterpolation;
-    }
-
-    public void setPreventInterpolation(boolean preventInterpolation) {
-        this.preventInterpolation = preventInterpolation;
-    }
-
-    public void setInterpolateElevation(boolean interpolateElevation) {
-        this.interpolateElevation = interpolateElevation;
-    }
-
-    public boolean interpolateElevation() {
-        return interpolateElevation;
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.dfsek.terra.config.fileloaders;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
@@ -20,7 +21,7 @@ public class ZIPLoader extends Loader {
             ZipEntry entry = entries.nextElement();
             if(!entry.isDirectory() && entry.getName().equals(singleFile)) return file.getInputStream(entry);
         }
-        throw new IllegalArgumentException("No such file: " + singleFile);
+        throw new FileNotFoundException("No such file: " + singleFile);
     }
 
     @Override

common/src/main/java/com/dfsek/terra/config/loaders/mod/ModDependentConfigSection.java

@@ -0,0 +1,46 @@
+package com.dfsek.terra.config.loaders.mod;
+
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.platform.modloader.Mod;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class ModDependentConfigSection<T> {
+    private static final Object NULL = new Object(); // Null object
+    private final TerraPlugin main;
+    private final Map<String, T> results = new HashMap<>();
+    private final T defaultValue;
+    @SuppressWarnings("unchecked")
+    private T value = (T) NULL;
+
+    protected ModDependentConfigSection(TerraPlugin main, T defaultValue) {
+        this.main = main;
+        this.defaultValue = defaultValue;
+    }
+
+    public void add(String id, T value) {
+        results.put(id, value);
+    }
+
+    public static <T1> ModDependentConfigSection<T1> withDefault(T1 defaultValue) {
+        return new ModDependentConfigSection<>(null, defaultValue);
+    }
+
+    public T get() {
+        if(value == NULL) value = compute(); // Cache the value.
+        return value;
+    }
+
+    private T compute() {
+        if(main != null) {
+            Set<String> mods = main.getMods().stream().map(Mod::getID).collect(Collectors.toSet());
+            for(Map.Entry<String, T> entry : results.entrySet()) {
+                if(mods.contains(entry.getKey())) return entry.getValue();
+            }
+        }
+        return defaultValue;
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/mod/ModDependentConfigSectionLoader.java

@@ -0,0 +1,43 @@
+package com.dfsek.terra.config.loaders.mod;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.tectonic.loading.TypeLoader;
+import com.dfsek.terra.api.TerraPlugin;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+public class ModDependentConfigSectionLoader implements TypeLoader<ModDependentConfigSection<?>> {
+    private final TerraPlugin main;
+
+    public ModDependentConfigSectionLoader(TerraPlugin main) {
+        this.main = main;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public ModDependentConfigSection<?> load(Type type, Object c, ConfigLoader loader) throws LoadException {
+        if(type instanceof ParameterizedType) {
+            ParameterizedType pType = (ParameterizedType) type;
+            Type generic = pType.getActualTypeArguments()[0];
+
+            if(c instanceof Map && ((Map<?, ?>) c).containsKey("default")) {
+                Map<String, ?> map = (Map<String, ?>) c;
+
+                ModDependentConfigSection<Object> configSection = new ModDependentConfigSection<>(main, loader.loadType(generic, map.get("default")));
+
+                if(map.containsKey("mods")) {
+                    for(Map.Entry<String, ?> modEntry : ((Map<String, ?>) map.get("mods")).entrySet()) {
+                        configSection.add(modEntry.getKey(), loader.loadType(generic, modEntry.getValue()));
+                    }
+                }
+
+                return configSection;
+            } else {
+                return ModDependentConfigSection.withDefault(loader.loadType(generic, c)); // Load the original type otherwise.
+            }
+        } else throw new LoadException("Unable to load config! Could not retrieve parameterized type: " + type);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.pack;
 
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.tectonic.abstraction.AbstractConfigLoader;
+import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
@@ -110,6 +111,8 @@ public class ConfigPack implements LoaderRegistrar {
     private final TerraPlugin main;
     private final Loader loader;
 
+    private final Configuration configuration;
+
     private final BiomeProvider.BiomeProviderBuilder biomeProviderBuilder;
 
 
@@ -130,11 +133,15 @@ public class ConfigPack implements LoaderRegistrar {
             File pack = new File(folder, "pack.yml");
 
             try {
-                selfLoader.load(template, new FileInputStream(pack));
+                configuration = new Configuration(new FileInputStream(pack));
+                selfLoader.load(template, configuration);
 
                 main.logger().info("Loading config pack \"" + template.getID() + "\"");
 
+                main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration), loader));
+
                 load(l, main);
+
                 ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
                 selfLoader.load(packPostTemplate, new FileInputStream(pack));
                 biomeProviderBuilder = packPostTemplate.getProviderBuilder();
@@ -174,9 +181,12 @@ public class ConfigPack implements LoaderRegistrar {
 
                 if(pack == null) throw new LoadException("No pack.yml file found in " + file.getName());
 
-                selfLoader.load(template, file.getInputStream(pack));
+                configuration = new Configuration(file.getInputStream(pack));
+                selfLoader.load(template, configuration);
                 main.logger().info("Loading config pack \"" + template.getID() + "\"");
 
+                main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration), loader));
+
                 load(l, main);
 
                 ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
@@ -211,8 +221,6 @@ public class ConfigPack implements LoaderRegistrar {
 
 
     private void load(long start, TerraPlugin main) throws ConfigException {
-        main.getEventManager().callEvent(new ConfigPackPreLoadEvent(this));
-
         for(Map.Entry<String, Double> var : template.getVariables().entrySet()) {
             varScope.create(var.getKey(), var.getValue());
         }
@@ -245,7 +253,7 @@ public class ConfigPack implements LoaderRegistrar {
                 .open("flora", ".yml").then(configs -> buildAll(new FloraFactory(), floraRegistry, abstractConfigLoader.loadConfigs(configs, FloraTemplate::new), main)).close()
                 .open("biomes", ".yml").then(configs -> buildAll(new BiomeFactory(this), biomeRegistry, abstractConfigLoader.loadConfigs(configs, () -> new BiomeTemplate(this, main)), main)).close();
 
-        main.getEventManager().callEvent(new ConfigPackPostLoadEvent(this));
+        main.getEventManager().callEvent(new ConfigPackPostLoadEvent(this, template -> selfLoader.load(template, configuration), loader));
         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/config/pack/ConfigPackTemplate.java

@@ -6,12 +6,14 @@ import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
+import com.dfsek.terra.config.loaders.mod.ModDependentConfigSection;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class ConfigPackTemplate implements ConfigTemplate {
@@ -39,7 +41,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
 
     @Value("structures.locatable")
     @Default
-    private Map<String, String> locatable = new HashMap<>();
+    private Map<String, ModDependentConfigSection<String>> locatable = new HashMap<>();
 
     @Value("blend.terrain.elevation")
     @Default
@@ -47,19 +49,19 @@ public class ConfigPackTemplate implements ConfigTemplate {
 
     @Value("vanilla.mobs")
     @Default
-    private boolean vanillaMobs = true;
+    private ModDependentConfigSection<Boolean> vanillaMobs = ModDependentConfigSection.withDefault(true);
 
     @Value("vanilla.caves")
     @Default
-    private boolean vanillaCaves = false;
+    private ModDependentConfigSection<Boolean> vanillaCaves = ModDependentConfigSection.withDefault(false);
 
     @Value("vanilla.decorations")
     @Default
-    private boolean vanillaDecorations = false;
+    private ModDependentConfigSection<Boolean> vanillaDecorations = ModDependentConfigSection.withDefault(false);
 
     @Value("vanilla.structures")
     @Default
-    private boolean vanillaStructures = false;
+    private ModDependentConfigSection<Boolean> vanillaStructures = ModDependentConfigSection.withDefault(false);
 
     @Value("author")
     @Default
@@ -67,7 +69,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
 
     @Value("disable.sapling")
     @Default
-    private boolean disableSaplings = false;
+    private ModDependentConfigSection<Boolean> disableSaplings = ModDependentConfigSection.withDefault(false);
 
     @Value("version")
     @Default
@@ -75,42 +77,42 @@ public class ConfigPackTemplate implements ConfigTemplate {
 
     @Value("disable.carvers")
     @Default
-    private boolean disableCarvers = false;
+    private ModDependentConfigSection<Boolean> disableCarvers = ModDependentConfigSection.withDefault(false);
 
     @Value("disable.structures")
     @Default
-    private boolean disableStructures = false;
+    private ModDependentConfigSection<Boolean> disableStructures = ModDependentConfigSection.withDefault(false);
 
     @Value("disable.ores")
     @Default
-    private boolean disableOres = false;
+    private ModDependentConfigSection<Boolean> disableOres = ModDependentConfigSection.withDefault(false);
 
     @Value("disable.trees")
     @Default
-    private boolean disableTrees = false;
+    private ModDependentConfigSection<Boolean> disableTrees = ModDependentConfigSection.withDefault(false);
 
     @Value("disable.flora")
     @Default
-    private boolean disableFlora = false;
+    private ModDependentConfigSection<Boolean> disableFlora = ModDependentConfigSection.withDefault(false);
 
     public boolean disableCarvers() {
-        return disableCarvers;
+        return disableCarvers.get();
     }
 
     public boolean disableFlora() {
-        return disableFlora;
+        return disableFlora.get();
     }
 
     public boolean disableOres() {
-        return disableOres;
+        return disableOres.get();
     }
 
     public boolean disableStructures() {
-        return disableStructures;
+        return disableStructures.get();
     }
 
     public boolean disableTrees() {
-        return disableTrees;
+        return disableTrees.get();
     }
 
     public LinkedHashMap<String, FunctionTemplate> getFunctions() {
@@ -122,7 +124,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
     }
 
     public boolean isDisableSaplings() {
-        return disableSaplings;
+        return disableSaplings.get();
     }
 
     public String getID() {
@@ -134,19 +136,19 @@ public class ConfigPackTemplate implements ConfigTemplate {
     }
 
     public boolean vanillaMobs() {
-        return vanillaMobs;
+        return vanillaMobs.get();
     }
 
     public boolean vanillaCaves() {
-        return vanillaCaves;
+        return vanillaCaves.get();
     }
 
     public boolean vanillaDecorations() {
-        return vanillaDecorations;
+        return vanillaDecorations.get();
     }
 
     public boolean vanillaStructures() {
-        return vanillaStructures;
+        return vanillaStructures.get();
     }
 
     public Map<String, NoiseSeeded> getNoiseBuilderMap() {
@@ -162,7 +164,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
     }
 
     public Map<String, String> getLocatable() {
-        return locatable;
+        return locatable.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().get()));
     }
 
     public boolean doBetaCarvers() {

common/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java

@@ -4,20 +4,16 @@ import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.tectonic.config.ValidatedConfigTemplate;
-import com.dfsek.tectonic.exception.ValidationException;
 import com.dfsek.terra.api.math.GridSpawn;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
-import org.checkerframework.checker.units.qual.A;
 
-import java.time.Duration;
 import java.util.List;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
-public class StructureTemplate extends AbstractableTemplate implements ValidatedConfigTemplate {
+public class StructureTemplate extends AbstractableTemplate implements ConfigTemplate {
     @Value("id")
     private String id;
 
@@ -38,21 +34,6 @@ public class StructureTemplate extends AbstractableTemplate implements Validated
     @Default
     private List<Void> features = new GlueList<>();
 
-    @Value("repeat.scripts")
-    @Default
-    @Abstractable
-    private ProbabilityCollection<StructureScript> repeatScripts = new ProbabilityCollection<>();
-
-    @Value("repeat.ticks.min")
-    @Default
-    @Abstractable
-    private long minRepeat = 20;
-
-    @Value("repeat.ticks.max")
-    @Default
-    @Abstractable
-    private long maxRepeat = 20;
-
     public String getID() {
         return id;
     }
@@ -72,10 +53,4 @@ public class StructureTemplate extends AbstractableTemplate implements Validated
     public GridSpawn getSpawn() {
         return spawn;
     }
-
-    @Override
-    public boolean validate() throws ValidationException {
-        if(maxRepeat < minRepeat) throw new ValidationException("repeat.ticks.max must be greater than repeat.ticks.min");
-        return true;
-    }
 }

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

@@ -70,7 +70,7 @@ public class TerraWorld {
         double noise = sampler.sample(fdX, y, fdZ);
         if(noise > 0) {
             int level = 0;
-            for(int yi = world.getMaxHeight(); yi > y; yi--) {
+            for(int yi = world.getMaxHeight()-1; yi > y; yi--) {
                 if(sampler.sample(fdX, yi, fdZ) > 0) level++;
                 else level = 0;
             }

common/src/main/resources/config.yml

@@ -7,7 +7,6 @@ cache:
   carver: 512
   structure: 32
   sampler: 128
-master-disable:
-  caves: false
+  biome-provider: 32
 script:
   max-recursion: 1000

common/src/main/resources/lang/cs_cz.yml

@@ -0,0 +1,122 @@
+enable:
+  - "Pokud se vám líbí Terra, můžete nás podpořit na Patreon!"
+  - "Získáte přístup k experimentálním funkcím, než budou vydány!"
+  - "Podpořit projekt můžete zde: https://www.patreon.com/dfsek"
+disable:
+  - "Děkujeme, že používáte Terra!"
+command:
+  debug-only: "Tento příkaz musí být použit se zapnutým debug modem!"
+  player-only: "Tento příkaz je pouze pro hráče!"
+  invalid: "Neznámý příkaz. (Očekáváno %1$s argumentů, nalezeno %2$s)."
+  players-only: "Příkaz je pouze pro použití hráčem."
+  world: "Tento příkaz musí být použit v Terra světě!"
+  reload: "Obnoven Terra konfig."
+  reload-error: "Nastaly chyby při obnově Terra konfigurace. Podívejte se do logů pro více informací."
+  version: "Na tomto serveru běží Terra verze \"%1$s\", na platformě \"%2$s\""
+  main-menu:
+    - "--------------------Terra--------------------"
+    - "reload    - Obnoví konfigurační data"
+    - "biome     - Ukáže aktuální biom"
+    - "ore       - Generuje žílu rud v lokaci, ve směru kam se koukáte (Pro debugging)"
+    - "save-data - Uložit populační data"
+    - "structure - Nahrát a exportovat struktury"
+    - "profile   - Profiler možnosti"
+    - "image     - Obrázek/GUI možnosti"
+  biome:
+    biome-found: "Lokalizován biom na (%1$s, %2$s)"
+    unable-to-locate: "Nelze lokalizovat biom."
+    invalid-radius: "Nesprávný radius: \"%s\""
+    invalid: "Nesprávné ID bomu: \"%s\""
+    in: "Jste v \"%s\""
+  packs:
+    main: "Aktuální instalované konfigurační balíčky:"
+    pack: " - %1$s v%3$s od %2$s"
+    none: "Žádné konfigurační balíčky nejsou nainstalovány."
+  ore:
+    main-menu:
+      - "---------------Terra/ore---------------"
+      - "Generuje žílu rud na bloku, na který koukáte."
+    out-of-range: "Blok mimo dosah"
+    invalid-ore: "Nelze nalézt Rudu \"%s\""
+  geometry:
+    main-menu:
+      - "---------------Terra/geometry----------------"
+      - "Různé voxel geometrické debugging příkazy"
+      - "sphere       - Generuje kouli"
+      - "deformsphere - Generuje deformovanou kouli"
+      - "tube         - Generuje válec"
+    deform:
+      invalid-radius: "Nesprávný radius: \"%s\""
+      invalid-deform: "Nesprávná deformace: \"%s\""
+      invalid-frequency: "Nesprávná frekvence: \"%s\""
+    sphere:
+      invalid-radius: "Nesprávný radius: \"%s\""
+    tube:
+      invalid-radius: "Nesprávný radius: \"%s\""
+  image:
+    main-menu:
+      - "---------------Terra/image---------------"
+      - "render - Vykreslí obrázek s danou šířkou a výškou, který může být později importován jako svět."
+      - "gui    - Otevřít debug GUI (Musí být zapnuto v konfigu)"
+    gui:
+      main-menu:
+        - "-------------Terra/image/gui-------------"
+        - "raw  - Otevře GUI s raw Biom daty"
+        - "step - Znovu vykreslí data k lepšímu zobrazení borderu"
+      debug: "Debug mod musí být zapnutý pro použití této možnosti! Debug GUI NENÍ PRODUKČNĚ BEZPEČNÉ!"
+    render:
+      save: "Uložen obrázek jako \"%s\""
+      error: "Nastala chyba při generování obrázku!"
+  profile:
+    main-menu:
+      - "---------------Terra/profile---------------"
+      - "start - Zapne profiler"
+      - "stop  - Vypne profiler"
+      - "query - Ukáže profiler data"
+      - "reset - Resetuje profiler data"
+    reset: "Profiler byl resetován."
+    start: "Profiler byl zapnut."
+    stop: "Profiler byl vypnut."
+  structure:
+    main-menu:
+      - "---------------Terra/structure---------------"
+      - "export - Export vašeho výběru WorldEdit jako Terra struktura."
+      - "load   - Načíst Terra strukturu"
+    invalid-radius: "Nesprávný radius: \"%s\""
+    invalid-rotation: "Nesprávná rotace: \"%s\""
+    invalid: "Nesprávné ID struktury: \"%s\""
+    export: "Uložena struktura do \"%s\""
+world-config:
+  load: "Načteny konfigurační hodnoty světa pro svět \"%s\"..."
+  not-found: "Konfigurace pro svět \"%s\" nenalezena. Kopíruji defaultní konfig."
+  using-image: "Načítám svět z obrázku."
+  error: "Nelze načíst konfigurace pro svět %s"
+  done: "Načítání světa \"%1$s\" dokončeno. Uplynulý čas: %2$sms"
+config-pack:
+  loaded: "Konfigurační balíček %1$s v%4$s od %3$s byl načten za %2$sms."
+config:
+  loaded: "Načten %1$s ze souboru %2$s"
+  loaded-all: "Načteno %1$s %2$s(s) za %3$sms."
+  error:
+    invalid-failover: "Nesprávný typ failover: \"%s\""
+    duplicate: "Duplikační ID nalezeno v souboru: %s"
+    file:
+      - "Konfigurační chyba pro Terra objekt. Soubor: %1$s"
+      - "%2$s"
+      - "Opravte jej před pokračováním!"
+    generic:
+      - "Nastala chyba při načítání konfigurace."
+      - "Prosíme nahlašte to na Terra."
+warning:
+  no-population: "Žádné populační chunky nebyly načteny. Pokud je to poprvé, co zapínáte server s Terra, či vytváříte nový svět, je tohle normální."
+error:
+  severe-config: "Vážná konfigurační chyba zabránila Terra ze správné generace terénu na koordinátech: %1$s, %2$s. Prosíme zkontrolujte konfiguraci pro chyby. Jakékoli konfigurační chyby jsou vypsány výše."
+debug:
+  data-save : "Uložena populační data."
+use-paper:
+  - "Vypadá to, že používáte Spigot/CraftBukkit."
+  - "Ačkoli Terra &ofunguje&r na Spigot, některé funkce budou ztraceny. (Terra je netestována na CraftBukkit; žádná podpora nebude dána pro CraftBukkit)."
+  - "Pro nejvíce funkcí s Terra, použijte Paper."
+  - "Navíc, Paper přináší obrovské výkonnostní zlepešení než Spigot, a všechny Spigot pluginy by měli fungovat s Paper!"
+  - "Pro nejlepší zážitek s Terra a všemi pluginy, použijte prosím Paper."
+  - "Více info najdete na stránce Paperu: https://papermc.io/"

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

@@ -18,7 +18,6 @@ import com.dfsek.terra.api.platform.world.Biome;
 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.task.TaskScheduler;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.JavaLogger;
@@ -139,11 +138,6 @@ public class DistributionTest {
             return null;
         }
 
-        @Override
-        public TaskScheduler getScheduler() {
-            return null;
-        }
-
         @Override
         public Profiler getProfiler() {
             return null;

gradle.properties

@@ -7,4 +7,9 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.warning.mode=all
 #org.gradle.logging.level=info
-org.gradle.configureondemand=true
+# Project information
+terra.description=A fast, modern, extensible, platform-agnostic data-driven world generator
+terra.source=https://github.com/PolyhedralDev/Terra
+terra.issues=https://github.com/PolyhedralDev/Terra/issues
+terra.wiki=https://github.com/PolyhedralDev/Terra/wiki
+terra.license=GNU General Public License, version 3.0

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

@@ -0,0 +1,27 @@
+package com.dfsek.terra.bukkit;
+
+import com.dfsek.terra.api.platform.modloader.Mod;
+import org.bukkit.plugin.Plugin;
+
+public class BukkitPlugin implements Mod {
+    private final Plugin plugin;
+
+    public BukkitPlugin(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public String getID() {
+        return plugin.getName();
+    }
+
+    @Override
+    public String getVersion() {
+        return plugin.getDescription().getVersion();
+    }
+
+    @Override
+    public String getName() {
+        return plugin.getName();
+    }
+}

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

@@ -14,11 +14,11 @@ import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.platform.modloader.Mod;
 import com.dfsek.terra.api.platform.world.Biome;
 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.task.TaskScheduler;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.JavaLogger;
 import com.dfsek.terra.api.util.logging.Logger;
@@ -33,7 +33,6 @@ import com.dfsek.terra.bukkit.listeners.CommonListener;
 import com.dfsek.terra.bukkit.listeners.PaperListener;
 import com.dfsek.terra.bukkit.listeners.SpigotListener;
 import com.dfsek.terra.bukkit.listeners.TerraListener;
-import com.dfsek.terra.bukkit.task.BukkitTaskScheduler;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.world.BukkitBiome;
 import com.dfsek.terra.bukkit.world.BukkitWorld;
@@ -59,9 +58,12 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
@@ -71,8 +73,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
 
     private final Profiler profiler = new ProfilerImpl();
 
-    private final TaskScheduler scheduler = new BukkitTaskScheduler(this);
-
     private final ConfigRegistry registry = new ConfigRegistry();
     private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
 
@@ -155,11 +155,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         return profiler;
     }
 
-    @Override
-    public TaskScheduler getScheduler() {
-        return scheduler;
-    }
-
     @Override
     public void onDisable() {
         BukkitChunkGeneratorWrapper.saveAll();
@@ -315,6 +310,11 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         genericLoaders.register(registry);
     }
 
+    @Override
+    public Set<Mod> getMods() {
+        return Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(BukkitPlugin::new).collect(Collectors.toSet());
+    }
+
     @Override
     public LockedRegistry<TerraAddon> getAddons() {
         return addonLockedRegistry;

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

@@ -19,7 +19,6 @@ public class PaperListener implements Listener {
     @EventHandler
     public void onStructureLocate(StructureLocateEvent e) {
         if(!BukkitAdapter.adapt(e.getWorld()).isTerraWorld()) return;
-        e.setResult(null); // Assume no result.
         String name = "minecraft:" + e.getType().getName();
         main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
         TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getWorld()));
@@ -32,10 +31,8 @@ public class PaperListener implements Listener {
             }, main);
             finder.run(); // Do this synchronously.
         } else {
-            main.logger().warning("No overrides are defined for \"" + name + "\"");
+            e.setResult(e.getOrigin());
+            main.logger().warning("No overrides are defined for \"" + name + "\". Locating this structure will NOT work properly!");
         }
-
     }
-
-
 }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/task/BukkitTaskScheduler.java

@@ -1,33 +0,0 @@
-package com.dfsek.terra.bukkit.task;
-
-import com.dfsek.terra.api.task.TaskScheduler;
-import com.dfsek.terra.bukkit.TerraBukkitPlugin;
-import org.bukkit.Bukkit;
-
-public class BukkitTaskScheduler implements TaskScheduler {
-    private final TerraBukkitPlugin plugin;
-
-    public BukkitTaskScheduler(TerraBukkitPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void runTaskAsynchronously(Runnable task, long ticks) {
-        Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, task, ticks);
-    }
-
-    @Override
-    public void runTask(Runnable task, long ticks) {
-        Bukkit.getScheduler().runTaskLater(plugin, task, ticks);
-    }
-
-    @Override
-    public void runTask(Runnable task) {
-        Bukkit.getScheduler().runTask(plugin, task);
-    }
-
-    @Override
-    public void runTaskAsynchronously(Runnable task) {
-        Bukkit.getScheduler().runTask(plugin, task);
-    }
-}

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

@@ -3,16 +3,13 @@ main: "com.dfsek.terra.bukkit.TerraBukkitPlugin"
 version: "@VERSION@"
 load: "STARTUP"
 author: dfsek
+website: "@WIKI@"
 api-version: "1.13"
-description: "An insanely powerful free & open-source data-driven world generator."
+description: "@DESCRIPTION@"
 softdepend: [ "WorldEdit" ]
 commands:
   terra:
     description: "Terra base command"
     usage: "/terra "
     aliases: [ "te" ]
-    permission: "terra.command"
-  locate:
-    description: "Locate a Terra Structure"
-    usage: "/locate <STRUCTURE_ID> <radius>"
-    permission: "terra.locate"
+    permission: "terra.command"

platforms/fabric/build.gradle.kts

@@ -27,7 +27,13 @@ dependencies {
     "mappings"("net.fabricmc:yarn:1.16.5+build.5:v2")
     "modImplementation"("net.fabricmc:fabric-loader:0.11.2")
 
-    "modImplementation"("net.fabricmc.fabric-api:fabric-api:0.31.0+1.16")
+    "modCompileOnly"("com.sk89q.worldedit:worldedit-fabric-mc1.16:7.2.0-SNAPSHOT") {
+        exclude(group = "com.google.guava", module = "guava")
+        exclude(group = "com.google.code.gson", module = "gson")
+        exclude(group = "it.unimi.dsi", module = "fastutil")
+        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+        exclude(group = "org.apache.logging.log4j", module = "log4j-core")
+    }
 }
 
 

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

@@ -0,0 +1,28 @@
+package com.dfsek.terra.fabric;
+
+import com.dfsek.terra.api.platform.modloader.Mod;
+import net.fabricmc.loader.api.ModContainer;
+
+
+public class FabricMod implements Mod {
+    private final ModContainer mod;
+
+    public FabricMod(ModContainer mod) {
+        this.mod = mod;
+    }
+
+    @Override
+    public String getID() {
+        return mod.getMetadata().getId();
+    }
+
+    @Override
+    public String getVersion() {
+        return mod.getMetadata().getVersion().getFriendlyString();
+    }
+
+    @Override
+    public String getName() {
+        return mod.getMetadata().getName();
+    }
+}

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

@@ -1,23 +0,0 @@
-package com.dfsek.terra.fabric;
-
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.dedicated.MinecraftDedicatedServer;
-
-public class FabricUtil {
-    @SuppressWarnings("deprecation")
-    public static MinecraftServer getServer() {
-        Object game = FabricLoader.getInstance().getGameInstance();
-        if(game instanceof MinecraftDedicatedServer) {
-            return (MinecraftDedicatedServer) game;
-        } else if(game instanceof MinecraftClient) {
-            MinecraftClient client = (MinecraftClient) game;
-            if(!client.isIntegratedServerRunning()) {
-                throw new IllegalStateException("Client is not running integrated server: " + client);
-            }
-            return client.getServer();
-        }
-        throw new IllegalStateException("No MinecraftServer initialized: " + game);
-    }
-}

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

@@ -1,5 +1,9 @@
 package com.dfsek.terra.fabric;
 
+import com.dfsek.tectonic.config.Configuration;
+import com.dfsek.tectonic.exception.ConfigException;
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addons.TerraAddon;
@@ -8,147 +12,135 @@ import com.dfsek.terra.api.addons.annotations.Author;
 import com.dfsek.terra.api.addons.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
-import com.dfsek.terra.api.command.exception.CommandException;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
+import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
 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.modloader.Mod;
 import com.dfsek.terra.api.platform.world.Tree;
 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.task.TaskScheduler;
-import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
+import com.dfsek.terra.api.transform.Validator;
+import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.Logger;
 import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfig;
-import com.dfsek.terra.config.builder.BiomeBuilder;
 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.config.PostLoadCompatibilityOptions;
+import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
 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.fabric.task.FabricTaskScheduler;
+import com.dfsek.terra.fabric.util.FabricUtil;
 import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 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.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;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.world.GeneratorType;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.LiteralText;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.WorldAccess;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.BiomeEffects;
-import net.minecraft.world.biome.GenerationSettings;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.chunk.ChunkGenerator;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
+import net.minecraft.world.dimension.DimensionType;
 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.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.FeatureConfig;
-import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-
-import static net.minecraft.server.command.CommandManager.argument;
-import static net.minecraft.server.command.CommandManager.literal;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
+    private final org.apache.logging.log4j.Logger log4jLogger = LogManager.getLogger();
     public static final PopulatorFeature POPULATOR_FEATURE = new PopulatorFeature(DefaultFeatureConfig.CODEC);
     public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE));
     private static TerraFabricPlugin instance;
-    private final Map<Long, TerraWorld> worldMap = new HashMap<>();
+    private final Map<DimensionType, Pair<ServerWorld, TerraWorld>> worldMap = new HashMap<>();
+
+    public Map<DimensionType, Pair<ServerWorld, TerraWorld>> getWorldMap() {
+        return worldMap;
+    }
+
     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();
-
         @Override
         public void info(String message) {
-            logger.info(message);
+            log4jLogger.info(message);
         }
 
         @Override
         public void warning(String message) {
-            logger.warn(message);
+            log4jLogger.warn(message);
         }
 
         @Override
         public void severe(String message) {
-            logger.error(message);
+            log4jLogger.error(message);
         }
     };
+
     private final DebugLogger debugLogger = new DebugLogger(logger);
     private final ItemHandle itemHandle = new FabricItemHandle();
     private final WorldHandle worldHandle = new FabricWorldHandle();
     private final ConfigRegistry registry = new ConfigRegistry();
     private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
-    private final AddonRegistry addonRegistry = new AddonRegistry(new FabricAddon(this), this);
-    private final LockedRegistry<TerraAddon> addonLockedRegistry = new LockedRegistry<>(addonRegistry);
-    private final PluginConfig config = new PluginConfig();
-    private final Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
-            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), new NotNullValidator<>())
-            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();
 
-    private final TaskScheduler scheduler = new FabricTaskScheduler();
+    private final FabricAddon fabricAddon = new FabricAddon(this);
+    private final AddonRegistry addonRegistry = new AddonRegistry(fabricAddon, this);
+    private final LockedRegistry<TerraAddon> addonLockedRegistry = new LockedRegistry<>(addonRegistry);
+
+    private final PluginConfig config = new PluginConfig();
+
+    private final Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
+            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), Validator.notNull())
+            .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), Validator.notNull()).build();
     private File dataFolder;
+    private final CommandManager manager = new TerraCommandManager(this);
+
+    public CommandManager getManager() {
+        return manager;
+    }
 
     public static TerraFabricPlugin getInstance() {
         return instance;
     }
 
-    public static String createBiomeID(ConfigPack pack, String biomeID) {
-        return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
-    }
-
     @Override
     public WorldHandle getWorldHandle() {
         return worldHandle;
@@ -156,15 +148,12 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
 
     @Override
     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 getWorld(((WorldAccess) world).getDimension());
     }
 
-    public TerraWorld getWorld(long seed) {
-        TerraWorld world = worldMap.get(seed);
-        if(world == null) throw new IllegalArgumentException("No world exists with seed " + seed);
+    public TerraWorld getWorld(DimensionType type) {
+        TerraWorld world = worldMap.get(type).getRight();
+        if(world == null) throw new IllegalArgumentException("No world exists with dimension type " + type);
         return world;
     }
 
@@ -185,7 +174,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
 
     @Override
     public boolean isDebug() {
-        return true;
+        return config.isDebug();
     }
 
     @Override
@@ -208,14 +197,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         config.load(this);
         LangUtil.load(config.getLanguage(), this); // Load language.
         boolean succeed = registry.loadAll(this);
-        Map<Long, TerraWorld> newMap = new HashMap<>();
-        worldMap.forEach((seed, tw) -> {
-            tw.getConfig().getSamplerCache().clear();
-            String packID = tw.getConfig().getTemplate().getID();
-            newMap.put(seed, new TerraWorld(tw.getWorld(), registry.get(packID), this));
+        worldMap.forEach((seed, pair) -> {
+            pair.getRight().getConfig().getSamplerCache().clear();
+            String packID = pair.getRight().getConfig().getTemplate().getID();
+            pair.setRight(new TerraWorld(pair.getRight().getWorld(), registry.get(packID), this));
         });
-        worldMap.clear();
-        worldMap.putAll(newMap);
         return succeed;
     }
 
@@ -249,50 +235,21 @@ 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) -> biomeFixer.translate((String) o))
+                .registerLoader(Identifier.class, (t, o, l) -> {
+                    Identifier identifier = Identifier.tryParse((String) o);
+                    if(identifier == null) throw new LoadException("Invalid identifier: " + o);
+                    return identifier;
+                });
     }
 
-    private Biome createBiome(BiomeBuilder biome) {
-        BiomeTemplate template = biome.getTemplate();
-        Map<String, Integer> colors = template.getColors();
+    public void packInit() {
+        logger.info("Loading config packs...");
+        registry.loadAll(this);
 
-        Biome vanilla = (Biome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
+        registry.forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> Registry.register(BuiltinRegistries.BIOME, new Identifier("terra", FabricUtil.createBiomeID(pack, id)), FabricUtil.createBiome(fabricAddon, biome, pack)))); // Register all Terra biomes.
 
-        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());
-
-        if(colors.containsKey("grass")) {
-            effects.grassColor(colors.get("grass"));
-        } else {
-            accessor.getGrassColor().ifPresent(effects::grassColor);
-        }
-        if(colors.containsKey("foliage")) {
-            effects.foliageColor(colors.get("foliage"));
-        } else {
-            accessor.getFoliageColor().ifPresent(effects::foliageColor);
-        }
-
-        return new Biome.Builder()
-                .precipitation(vanilla.getPrecipitation())
-                .category(vanilla.getCategory())
-                .depth(vanilla.getDepth())
-                .scale(vanilla.getScale())
-                .temperature(vanilla.getTemperature())
-                .downfall(vanilla.getDownfall())
-                .effects(effects.build())
-                .spawnSettings(vanilla.getSpawnSettings())
-                .generationSettings(generationSettings.build())
-                .build();
+        logger.info("Loaded packs.");
     }
 
     @Override
@@ -302,6 +259,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         this.dataFolder = new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra");
         saveDefaultConfig();
         config.load(this);
+        debugLogger.setDebug(config.isDebug());
         LangUtil.load(config.getLanguage(), this);
         logger.info("Initializing Terra...");
 
@@ -310,93 +268,21 @@ 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(Registry.FEATURE, new Identifier("terra", "populator"), POPULATOR_FEATURE);
+        RegistryKey<ConfiguredFeature<?, ?>> floraKey = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("terra", "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);
         } catch(MalformedCommandException e) {
             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());
-                    for(int i = 0; i < max; i++) {
-                        RequiredArgumentBuilder<ServerCommandSource, String> next = argument("arg" + (max - i - 1), StringArgumentType.word());
-
-                        arg = next.then(assemble(arg, manager));
-                    }
-
-                    dispatcher.register(literal("terra").executes(context -> 1).then(assemble(arg, manager)));
-                    dispatcher.register(literal("te").executes(context -> 1).then(assemble(arg, manager)));
-                    //dispatcher.register(literal("te").redirect(root));
-                }
-        );
-
-    }
-
-    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) {
-            }
-            try {
-                manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest);
-            } catch(CommandException e) {
-                sender.sendMessage(e.getMessage());
-            }
-            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);
-            } catch(CommandException e) {
-                context.getSource().sendError(new LiteralText(e.getMessage()));
-            }
-            return 1;
-        });
-    }
-
-    private List<String> parseCommand(String command) {
-        if(command.startsWith("/terra ")) command = command.substring("/terra ".length());
-        else if(command.startsWith("/te ")) command = command.substring("/te ".length());
-        List<String> c = new ArrayList<>(Arrays.asList(command.split(" ")));
-        if(command.endsWith(" ")) c.add("");
-        return c;
+        logger.info("Finished initialization.");
     }
 
 
@@ -406,23 +292,31 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
     }
 
     @Override
-    public Profiler getProfiler() {
-        return profiler;
+    public Set<Mod> getMods() {
+        return FabricLoader.getInstance().getAllMods().stream().map(FabricMod::new).collect(Collectors.toSet());
     }
 
     @Override
-    public TaskScheduler getScheduler() {
-        return scheduler;
+    public Profiler getProfiler() {
+        return profiler;
     }
 
     @Addon("Terra-Fabric")
     @Author("Terra")
     @Version("1.0.0")
-    private static final class FabricAddon extends TerraAddon implements EventListener {
+    public static final class FabricAddon extends TerraAddon implements EventListener {
+
         private final TerraPlugin main;
 
+        private final Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
+
+        private final Map<ConfigPack, Configuration> compatConfigs = new HashMap<>();
+
+        private final ConfigLoader compatLoader = new ConfigLoader();
+
         private FabricAddon(TerraPlugin main) {
             this.main = main;
+            main.register(compatLoader);
         }
 
         @Override
@@ -453,13 +347,68 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
             injectTree(treeRegistry, "MEGA_SPRUCE", ConfiguredFeatures.MEGA_SPRUCE);
             injectTree(treeRegistry, "CRIMSON_FUNGUS", ConfiguredFeatures.CRIMSON_FUNGI);
             injectTree(treeRegistry, "WARPED_FUNGUS", ConfiguredFeatures.WARPED_FUNGI);
+
+            Configuration compat;
+
+            try {
+                compat = new Configuration(event.getLoader().get("compat.yml"));
+                main.logger().info("Loading compatibility options from compat.yml.");
+            } catch(FileNotFoundException e) {
+                compat = new Configuration(new HashMap<>()); // blank config
+                main.logger().info("No compat.yml found, not loading compatibility options.");
+            } catch(IOException e) {
+                throw new RuntimeException("Failed to load compatibility config", e); // Something went wrong.
+            }
+
+            compatConfigs.put(event.getPack(), compat);
+
+            PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
+
+            try {
+                compatLoader.load(template, compat);
+            } catch(ConfigException e) {
+                e.printStackTrace();
+            }
+
+            if(template.doRegistryInjection()) {
+                BuiltinRegistries.CONFIGURED_FEATURE.getEntries().forEach(entry -> {
+                    if(!template.getExcludedRegistryFeatures().contains(entry.getKey().getValue())) {
+                        try {
+                            event.getPack().getTreeRegistry().add(entry.getKey().getValue().toString(), (Tree) entry.getValue());
+                            main.getDebugLogger().info("Injected ConfiguredFeature " + entry.getKey().getValue() + " as Tree.");
+                        } catch(DuplicateEntryException ignored) {
+                        }
+                    }
+                });
+            }
+            templates.put(event.getPack(), Pair.of(template, null));
+
         }
 
+        @Priority(Priority.HIGHEST)
+        @Global
+        public void createInjectionOptions(ConfigPackPostLoadEvent event) {
+            PostLoadCompatibilityOptions template = new PostLoadCompatibilityOptions();
+
+            try {
+                compatLoader.load(template, compatConfigs.get(event.getPack()));
+            } catch(ConfigException e) {
+                e.printStackTrace();
+            }
+
+            templates.get(event.getPack()).setRight(template);
+        }
+
+
         private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
             try {
                 registry.add(id, (Tree) tree);
             } catch(DuplicateEntryException ignore) {
             }
         }
+
+        public Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> getTemplates() {
+            return templates;
+        }
     }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlock.java

@@ -7,7 +7,7 @@ import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.state.BlockState;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.FluidBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.WorldAccess;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricDirectional.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.fabric.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Directional;
-import com.dfsek.terra.fabric.FabricAdapter;
 import com.dfsek.terra.fabric.block.FabricBlockData;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.DirectionProperty;
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricOrientable.java

@@ -2,8 +2,8 @@ package com.dfsek.terra.fabric.block.data;
 
 import com.dfsek.terra.api.platform.block.Axis;
 import com.dfsek.terra.api.platform.block.data.Orientable;
-import com.dfsek.terra.fabric.FabricAdapter;
 import com.dfsek.terra.fabric.block.FabricBlockData;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.math.Direction;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricSlab.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;
 
 import com.dfsek.terra.api.platform.block.data.Slab;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/data/FabricStairs.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.fabric.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Stairs;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
 

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

@@ -0,0 +1,30 @@
+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.builder.BiomeBuilder;
+import net.minecraft.util.Identifier;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class PostLoadCompatibilityOptions implements ConfigTemplate {
+    @Value("structures.inject-biome.exclude-biomes")
+    @Default
+    private Map<BiomeBuilder, Set<Identifier>> excludedPerBiomeStructures = new HashMap<>();
+
+    @Value("features.inject-biome.exclude-biomes")
+    @Default
+    private Map<BiomeBuilder, Set<Identifier>> excludedPerBiomeFeatures = new HashMap<>();
+
+    public Map<BiomeBuilder, Set<Identifier>> getExcludedPerBiomeFeatures() {
+        return excludedPerBiomeFeatures;
+    }
+
+    public Map<BiomeBuilder, Set<Identifier>> getExcludedPerBiomeStructures() {
+        return excludedPerBiomeStructures;
+    }
+}

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

@@ -0,0 +1,45 @@
+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 net.minecraft.util.Identifier;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class PreLoadCompatibilityOptions implements ConfigTemplate {
+    @Value("features.inject-registry.enable")
+    @Default
+    private boolean doRegistryInjection = false;
+
+    @Value("features.inject-namespaces")
+    @Default
+    private Set<String> featureNamespaces = new HashSet<>();
+
+    @Value("structures.inject-namespaces")
+    @Default
+    private Set<String> structureNamespaces = new HashSet<>();
+
+    @Value("features.inject-registry.excluded-features")
+    @Default
+    private Set<Identifier> excludedRegistryFeatures = new HashSet<>();
+
+
+    public Set<String> getFeatureNamespaces() {
+        return featureNamespaces;
+    }
+
+    public Set<String> getStructureNamespaces() {
+        return structureNamespaces;
+    }
+
+    public boolean doRegistryInjection() {
+        return doRegistryInjection;
+    }
+
+    public Set<Identifier> getExcludedRegistryFeatures() {
+        return excludedRegistryFeatures;
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java

@@ -4,11 +4,13 @@ import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.generator.ChunkData;
 import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
 import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.fabric.FabricAdapter;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.block.FabricBlockData;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;
@@ -18,6 +20,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.jafama.FastMath;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.entity.SpawnGroup;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureManager;
 import net.minecraft.util.math.BlockPos;
@@ -27,9 +30,14 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.ChunkRegion;
 import net.minecraft.world.Heightmap;
+import net.minecraft.world.SpawnHelper;
 import net.minecraft.world.WorldAccess;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.biome.source.BiomeAccess;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.gen.ChunkRandom;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
@@ -38,6 +46,7 @@ import net.minecraft.world.gen.chunk.VerticalBlockSample;
 import net.minecraft.world.gen.feature.StructureFeature;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -55,13 +64,14 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
             PACK_CODEC.fieldOf("pack").stable().forGetter(generator -> generator.pack))
             .apply(instance, instance.stable(FabricChunkGeneratorWrapper::new)));
     private final ConfigPack pack;
+    private DimensionType dimensionType;
 
     public ConfigPack getPack() {
         return pack;
     }
 
     public FabricChunkGeneratorWrapper(TerraBiomeSource biomeSource, long seed, ConfigPack configPack) {
-        super(biomeSource, new StructuresConfig(false));
+        super(biomeSource, new StructuresConfig(configPack.getTemplate().vanillaStructures()));
         this.pack = configPack;
 
         this.delegate = new DefaultChunkGenerator3D(pack, TerraFabricPlugin.getInstance());
@@ -87,31 +97,31 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     }
 
+    public void setDimensionType(DimensionType dimensionType) {
+        this.dimensionType = dimensionType;
+    }
+
     @Nullable
     @Override
     public BlockPos locateStructure(ServerWorld world, StructureFeature<?> feature, BlockPos center, int radius, boolean skipExistingChunks) {
-        String name = Objects.requireNonNull(Registry.STRUCTURE_FEATURE.getId(feature)).toString();
-        TerraWorld terraWorld = TerraFabricPlugin.getInstance().getWorld((World) world);
-        TerraStructure located = pack.getStructure(pack.getTemplate().getLocatable().get(name));
-        if(located != null) {
-            CompletableFuture<BlockPos> result = new CompletableFuture<>();
-            AsyncStructureFinder finder = new AsyncStructureFinder(terraWorld.getBiomeProvider(), located, FabricAdapter.adapt(center).toLocation((World) world), 0, 500, location -> {
-                result.complete(FabricAdapter.adapt(location));
-            }, TerraFabricPlugin.getInstance());
-            finder.run(); // Do this synchronously.
-            try {
-                return result.get();
-            } catch(InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
+        if(!pack.getTemplate().disableStructures()) {
+            String name = Objects.requireNonNull(Registry.STRUCTURE_FEATURE.getId(feature)).toString();
+            TerraWorld terraWorld = TerraFabricPlugin.getInstance().getWorld((World) world);
+            TerraStructure located = pack.getStructure(pack.getTemplate().getLocatable().get(name));
+            if(located != null) {
+                CompletableFuture<BlockPos> result = new CompletableFuture<>();
+                AsyncStructureFinder finder = new AsyncStructureFinder(terraWorld.getBiomeProvider(), located, FabricAdapter.adapt(center).toLocation((World) world), 0, 500, location -> {
+                    result.complete(FabricAdapter.adapt(location));
+                }, TerraFabricPlugin.getInstance());
+                finder.run(); // Do this synchronously.
+                try {
+                    return result.get();
+                } catch(InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
             }
         }
-        TerraFabricPlugin.getInstance().logger().warning("No overrides are defined for \"" + name + "\"");
-        return null;
-    }
-
-    @Override
-    public void generateFeatures(ChunkRegion region, StructureAccessor accessor) {
-        super.generateFeatures(region, accessor);
+        return super.locateStructure(world, feature, center, radius, skipExistingChunks);
     }
 
     @Override
@@ -121,44 +131,39 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     @Override
     public void carve(long seed, BiomeAccess access, Chunk chunk, GenerationStep.Carver carver) {
-        // No caves
+        if(pack.getTemplate().vanillaCaves()) super.carve(seed, access, chunk, carver);
     }
 
     @Override
     public void setStructureStarts(DynamicRegistryManager dynamicRegistryManager, StructureAccessor structureAccessor, Chunk chunk, StructureManager structureManager, long worldSeed) {
-
+        if(pack.getTemplate().vanillaStructures())
+            super.setStructureStarts(dynamicRegistryManager, structureAccessor, chunk, structureManager, worldSeed);
     }
 
-
-
     @Override
     public boolean isStrongholdStartingChunk(ChunkPos chunkPos) {
+        if(pack.getTemplate().vanillaStructures()) return super.isStrongholdStartingChunk(chunkPos);
         return false;
     }
 
     @Override
     public int getHeight(int x, int z, Heightmap.Type heightmapType) {
-        TerraWorld world = TerraFabricPlugin.getInstance().getWorld(seed);
-        Sampler sampler = world.getConfig().getSamplerCache().getChunk(FastMath.floorDiv(x, 16), FastMath.floorDiv(z, 16));
-        int cx = FastMath.floorMod(x, 16);
-        int cz = FastMath.floorMod(z, 16);
-
+        TerraWorld world = TerraFabricPlugin.getInstance().getWorld(dimensionType);
         int height = world.getWorld().getMaxHeight();
-
-        while (height >= 0 && sampler.sample(cx, height - 1, cz) < 0) {
+        while(height >= 0 && !heightmapType.getBlockPredicate().test(((FabricBlockData) world.getUngeneratedBlock(x, height - 1, z)).getHandle())) {
             height--;
         }
-
         return height;
     }
 
     @Override
     public BlockView getColumnSample(int x, int z) {
-        int height = 64; // TODO: implementation
+        TerraWorld world = TerraFabricPlugin.getInstance().getWorld(dimensionType);
+        int height = getHeight(x, z, Heightmap.Type.WORLD_SURFACE);
         BlockState[] array = new BlockState[256];
         for(int y = 255; y >= 0; y--) {
             if(y > height) {
-                if(y > getSeaLevel()) {
+                if(y > ((UserDefinedBiome) world.getBiomeProvider().getBiome(x, z)).getConfig().getSeaLevel()) {
                     array[y] = Blocks.AIR.getDefaultState();
                 } else {
                     array[y] = Blocks.WATER.getDefaultState();
@@ -171,6 +176,39 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
         return new VerticalBlockSample(array);
     }
 
+    @Override
+    public List<SpawnSettings.SpawnEntry> getEntitySpawnList(Biome biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) {
+        if(pack.getTemplate().vanillaStructures()) {
+            if(accessor.getStructureAt(pos, true, StructureFeature.SWAMP_HUT).hasChildren()) {
+                if(group == SpawnGroup.MONSTER) return StructureFeature.SWAMP_HUT.getMonsterSpawns();
+                if(group == SpawnGroup.CREATURE) return StructureFeature.SWAMP_HUT.getCreatureSpawns();
+            }
+
+            if(group == SpawnGroup.MONSTER) {
+                if(accessor.getStructureAt(pos, false, StructureFeature.PILLAGER_OUTPOST).hasChildren()) {
+                    return StructureFeature.PILLAGER_OUTPOST.getMonsterSpawns();
+                } else if(accessor.getStructureAt(pos, false, StructureFeature.MONUMENT).hasChildren()) {
+                    return StructureFeature.MONUMENT.getMonsterSpawns();
+                } else if(accessor.getStructureAt(pos, true, StructureFeature.FORTRESS).hasChildren()) {
+                    return StructureFeature.FORTRESS.getMonsterSpawns();
+                }
+            }
+        }
+        return super.getEntitySpawnList(biome, accessor, group, pos);
+    }
+
+    @Override
+    public void populateEntities(ChunkRegion region) {
+        if(pack.getTemplate().vanillaMobs()) {
+            int cx = region.getCenterChunkX();
+            int cy = region.getCenterChunkZ();
+            Biome biome = region.getBiome((new ChunkPos(cx, cy)).getStartPos());
+            ChunkRandom chunkRandom = new ChunkRandom();
+            chunkRandom.setPopulationSeed(region.getSeed(), cx << 4, cy << 4);
+            SpawnHelper.populateEntities(region, biome, cx, cy, chunkRandom);
+        }
+    }
+
     @Override
     public TerraChunkGenerator getHandle() {
         return delegate;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/PopulatorFeature.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.fabric.generation;
 
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
 import com.mojang.serialization.Codec;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.StructureWorldAccess;
@@ -22,6 +21,7 @@ public class PopulatorFeature extends Feature<DefaultFeatureConfig> {
 
     @Override
     public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) {
+        if(!(chunkGenerator instanceof FabricChunkGeneratorWrapper)) return true;
         FabricChunkGeneratorWrapper gen = (FabricChunkGeneratorWrapper) chunkGenerator;
         gen.getHandle().getPopulators().forEach(populator -> populator.populate((World) world, (Chunk) world));
         return true;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java

@@ -4,6 +4,7 @@ import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.util.FabricUtil;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.util.Identifier;
@@ -11,8 +12,8 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryLookupCodec;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
-import net.minecraft.world.gen.feature.StructureFeature;
 
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class TerraBiomeSource extends BiomeSource {
@@ -31,7 +32,9 @@ public class TerraBiomeSource extends BiomeSource {
     private final ConfigPack pack;
 
     public TerraBiomeSource(Registry<Biome> biomes, long seed, ConfigPack pack) {
-        super(biomes.stream().collect(Collectors.toList()));
+        super(biomes.stream()
+                .filter(biome -> Objects.requireNonNull(biomes.getId(biome)).getNamespace().equals("terra")) // Filter out non-Terra biomes.
+                .collect(Collectors.toList()));
         this.biomeRegistry = biomes;
         this.seed = seed;
         this.grid = pack.getBiomeProviderBuilder().build(seed);
@@ -51,14 +54,6 @@ public class TerraBiomeSource extends BiomeSource {
     @Override
     public Biome getBiomeForNoiseGen(int biomeX, int biomeY, int biomeZ) {
         UserDefinedBiome biome = (UserDefinedBiome) grid.getBiome(biomeX << 2, biomeZ << 2);
-        return biomeRegistry.get(new Identifier("terra", TerraFabricPlugin.createBiomeID(pack, biome.getID())));
+        return biomeRegistry.get(new Identifier("terra", FabricUtil.createBiomeID(pack, biome.getID())));
     }
-
-
-    @Override
-    public boolean hasStructureFeature(StructureFeature<?> feature) {
-        return false;
-    }
-
-
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.fabric.generation;
+
+import com.dfsek.terra.config.pack.ConfigPack;
+import net.minecraft.client.world.GeneratorType;
+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;
+
+public class TerraGeneratorType extends GeneratorType {
+    private final ConfigPack pack;
+
+    public TerraGeneratorType(ConfigPack pack) {
+        super("terra." + pack.getTemplate().getID());
+        this.pack = pack;
+    }
+
+    @Override
+    protected ChunkGenerator getChunkGenerator(Registry<Biome> biomeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, long seed) {
+        return new FabricChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java

@@ -1,9 +1,13 @@
 package com.dfsek.terra.fabric.handle;
 
+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.platform.entity.Player;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.fabric.block.FabricBlockData;
+import com.dfsek.terra.fabric.util.FabricAdapter;
+import com.dfsek.terra.fabric.util.WorldEditUtil;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.block.BlockState;
@@ -33,4 +37,14 @@ public class FabricWorldHandle implements WorldHandle {
         if(identifier == null) identifier = Identifier.tryParse("minecraft:" + id.toLowerCase(Locale.ROOT));
         return (EntityType) Registry.ENTITY_TYPE.get(identifier);
     }
+
+    @Override
+    public Pair<Location, Location> getSelectedLocation(Player player) {
+        try {
+            Class.forName("com.sk89q.worldedit.WorldEdit");
+        } catch(ClassNotFoundException e) {
+            throw new IllegalStateException("WorldEdit is not installed.");
+        }
+        return WorldEditUtil.getSelection(player);
+    }
 }

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

@@ -0,0 +1,86 @@
+package com.dfsek.terra.fabric.mixin;
+
+import com.dfsek.terra.api.command.exception.CommandException;
+import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.platform.entity.Entity;
+import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.server.command.CommandManager;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.LiteralText;
+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;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
+
+@Mixin(CommandManager.class)
+public abstract class CommandManagerMixin {
+    @Shadow
+    @Final
+    private CommandDispatcher<ServerCommandSource> dispatcher;
+
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/CommandDispatcher;findAmbiguities(Lcom/mojang/brigadier/AmbiguityConsumer;)V", remap = false))
+    private void injectTerraCommands(CommandManager.RegistrationEnvironment environment, CallbackInfo ci) {
+        com.dfsek.terra.api.command.CommandManager manager = TerraFabricPlugin.getInstance().getManager();
+        int max = manager.getMaxArgumentDepth();
+        RequiredArgumentBuilder<ServerCommandSource, String> arg = argument("arg" + (max - 1), StringArgumentType.word());
+        for(int i = 0; i < max; i++) {
+            RequiredArgumentBuilder<ServerCommandSource, String> next = argument("arg" + (max - i - 1), StringArgumentType.word());
+
+            arg = next.then(assemble(arg, manager));
+        }
+
+        dispatcher.register(literal("terra").executes(context -> 1).then(assemble(arg, manager)));
+        dispatcher.register(literal("te").executes(context -> 1).then(assemble(arg, manager)));
+    }
+
+    private RequiredArgumentBuilder<ServerCommandSource, String> assemble(RequiredArgumentBuilder<ServerCommandSource, String> in, com.dfsek.terra.api.command.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) {
+            }
+            try {
+                manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest);
+            } catch(CommandException e) {
+                sender.sendMessage(e.getMessage());
+            }
+            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);
+            } catch(CommandException e) {
+                context.getSource().sendError(new LiteralText(e.getMessage()));
+            }
+            return 1;
+        });
+    }
+
+    private List<String> parseCommand(String command) {
+        if(command.startsWith("/terra ")) command = command.substring("/terra ".length());
+        else if(command.startsWith("/te ")) command = command.substring("/te ".length());
+        List<String> c = new ArrayList<>(Arrays.asList(command.split(" ")));
+        if(command.endsWith(" ")) c.add("");
+        return c;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.dfsek.terra.fabric.mixin;
+
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
+import com.dfsek.terra.world.TerraWorld;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.WorldGenerationProgressListener;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.gen.Spawner;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.level.ServerWorldProperties;
+import net.minecraft.world.level.storage.LevelStorage;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+@Mixin(ServerWorld.class)
+public abstract class ServerWorldMixin {
+    @Inject(method = "<init>", at = @At(value = "RETURN"))
+    public void injectConstructor(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> registryKey, DimensionType dimensionType, WorldGenerationProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List<Spawner> list, boolean bl, CallbackInfo ci) {
+        if(chunkGenerator instanceof FabricChunkGeneratorWrapper) {
+            TerraFabricPlugin.getInstance().getWorldMap().put(dimensionType, Pair.of((ServerWorld) (Object) this, new TerraWorld((com.dfsek.terra.api.platform.world.World) this, ((FabricChunkGeneratorWrapper) chunkGenerator).getPack(), TerraFabricPlugin.getInstance())));
+            ((FabricChunkGeneratorWrapper) chunkGenerator).setDimensionType(dimensionType);
+            TerraFabricPlugin.getInstance().logger().info("Registered world " + this + " to dimension type " + dimensionType);
+        }
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java

@@ -3,11 +3,13 @@ package com.dfsek.terra.fabric.mixin.implementations;
 import net.minecraft.world.biome.Biome;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(Biome.class)
 @Implements(@Interface(iface = com.dfsek.terra.api.platform.world.Biome.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class BiomeMixin {
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ChunkGeneratorMixin.java

@@ -3,11 +3,13 @@ package com.dfsek.terra.fabric.mixin.implementations;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(ChunkGenerator.class)
 @Implements(@Interface(iface = com.dfsek.terra.api.platform.world.generator.ChunkGenerator.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class ChunkGeneratorMixin {
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockEntityMixin.java

@@ -3,14 +3,15 @@ package com.dfsek.terra.fabric.mixin.implementations.block;
 import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.state.BlockState;
-import com.dfsek.terra.fabric.FabricAdapter;
 import com.dfsek.terra.fabric.block.FabricBlock;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -29,6 +30,7 @@ public abstract class BlockEntityMixin {
     @Shadow
     public abstract boolean hasWorld();
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/BlockMixin.java

@@ -2,12 +2,13 @@ package com.dfsek.terra.fabric.mixin.implementations.block;
 
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -17,6 +18,7 @@ public abstract class BlockMixin {
     @Shadow
     private BlockState defaultState;
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/LootableContainerBlockEntityMixin.java

@@ -6,6 +6,7 @@ import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(LootableContainerBlockEntity.class)
@@ -15,6 +16,7 @@ public abstract class LootableContainerBlockEntityMixin extends BlockEntityMixin
         return (Inventory) this;
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java

@@ -51,7 +51,5 @@ public abstract class ChunkRegionMixin {
         ((ChunkRegion) (Object) this).setBlockState(new BlockPos(x + (centerChunkX << 4), y, z + (centerChunkZ << 4)), ((FabricBlockData) blockData).getHandle(), 0);
     }
 
-    public Object terra$getHandle() {
-        return this;
-    }
+    // getHandle already added in world/ChunkRegionMixin.
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java

@@ -12,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -47,6 +48,7 @@ public abstract class WorldChunkMixin {
         ((net.minecraft.world.chunk.Chunk) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockData) blockData).getHandle(), false);
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java

@@ -9,6 +9,7 @@ import net.minecraft.world.chunk.ProtoChunk;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -26,6 +27,7 @@ public abstract class ProtoChunkMixin {
         ((net.minecraft.world.chunk.Chunk) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockData) blockData).getHandle(), false);
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java

@@ -2,13 +2,14 @@ package com.dfsek.terra.fabric.mixin.implementations.entity;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.fabric.FabricAdapter;
+import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.entity.Entity;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -29,6 +30,7 @@ public abstract class EntityMixin {
     @Shadow
     public abstract void sendSystemMessage(Text message, UUID senderUuid);
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityTypeMixin.java

@@ -3,11 +3,13 @@ package com.dfsek.terra.fabric.mixin.implementations.entity;
 import net.minecraft.entity.EntityType;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(EntityType.class)
 @Implements(@Interface(iface = com.dfsek.terra.api.platform.entity.EntityType.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class EntityTypeMixin {
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/ServerCommandSourceMixin.java

@@ -6,6 +6,7 @@ import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -19,6 +20,7 @@ public abstract class ServerCommandSourceMixin {
         sendFeedback(new LiteralText(message), true);
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/LockableContainerBlockEntityMixin.java

@@ -6,11 +6,13 @@ import net.minecraft.block.entity.LockableContainerBlockEntity;
 import net.minecraft.item.Items;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(LockableContainerBlockEntity.class)
 @Implements(@Interface(iface = Inventory.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public class LockableContainerBlockEntityMixin {
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemMixin.java

@@ -4,6 +4,7 @@ import com.dfsek.terra.api.platform.inventory.ItemStack;
 import net.minecraft.item.Item;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -13,6 +14,7 @@ public abstract class ItemMixin {
     @Shadow
     public abstract int getMaxDamage();
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/item/ItemStackMixin.java

@@ -50,6 +50,7 @@ public abstract class ItemStackMixin {
         setTag(((ItemStack) (Object) meta).getTag());
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/EnchantmentMixin.java

@@ -5,6 +5,7 @@ import net.minecraft.enchantment.Enchantment;
 import net.minecraft.util.registry.Registry;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
@@ -19,6 +20,7 @@ public abstract class EnchantmentMixin {
     @Shadow
     public abstract boolean canCombine(Enchantment other);
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/inventory/meta/ItemStackMetaMixin.java

@@ -28,6 +28,7 @@ public abstract class ItemStackMetaMixin {
     @Shadow
     public abstract void addEnchantment(net.minecraft.enchantment.Enchantment enchantment, int level);
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java

@@ -67,6 +67,7 @@ public abstract class ChunkRegionMixin {
         return 0;
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java

@@ -58,6 +58,7 @@ public abstract class ServerWorldMixin {
         return 0;
     }
 
+    @Intrinsic
     public Object terra$getHandle() {
         return this;
     }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/init/MinecraftClientMixin.java

@@ -0,0 +1,29 @@
+package com.dfsek.terra.fabric.mixin.init;
+
+import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.generation.TerraGeneratorType;
+import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.RunArgs;
+import net.minecraft.client.world.GeneratorType;
+import net.minecraft.text.LiteralText;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public class MinecraftClientMixin {
+    @Inject(method = "<init>", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/util/WindowProvider;createWindow(Lnet/minecraft/client/WindowSettings;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/util/Window;", // sorta arbitrary position, after mod init, before window opens
+            shift = At.Shift.BEFORE))
+    public void injectConstructor(RunArgs args, CallbackInfo callbackInfo) {
+        TerraFabricPlugin.getInstance().packInit(); // Load during MinecraftClient construction, after other mods have registered blocks and stuff
+        TerraFabricPlugin.getInstance().getConfigRegistry().forEach(pack -> {
+            final GeneratorType generatorType = new TerraGeneratorType(pack);
+            //noinspection ConstantConditions
+            ((GeneratorTypeAccessor) generatorType).setTranslationKey(new LiteralText("Terra:" + pack.getTemplate().getID()));
+            GeneratorTypeAccessor.getValues().add(1, generatorType);
+        });
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/init/ServerMainMixin.java

@@ -0,0 +1,16 @@
+package com.dfsek.terra.fabric.mixin.init;
+
+import com.dfsek.terra.fabric.TerraFabricPlugin;
+import net.minecraft.server.Main;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Main.class)
+public class ServerMainMixin {
+    @Inject(method = "main([Ljava/lang/String;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/registry/DynamicRegistryManager;create()Lnet/minecraft/util/registry/DynamicRegistryManager$Impl;"))
+    private static void injectConstructor(String[] args, CallbackInfo ci) {
+        TerraFabricPlugin.getInstance().packInit(); // Load during MinecraftServer construction, after other mods have registered blocks and stuff
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/task/FabricTaskScheduler.java

@@ -1,25 +0,0 @@
-package com.dfsek.terra.fabric.task;
-
-import com.dfsek.terra.api.task.TaskScheduler;
-import com.dfsek.terra.fabric.FabricUtil;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.ServerTask;
-import net.minecraft.util.Util;
-
-public class FabricTaskScheduler implements TaskScheduler {
-    @Override
-    public void runTaskAsynchronously(Runnable task, long ticks) {
-        runTask(() -> Util.getMainWorkerExecutor().execute(task), ticks);
-    }
-
-    @Override
-    public void runTaskAsynchronously(Runnable task) {
-        Util.getMainWorkerExecutor().execute(task);
-    }
-
-    @Override
-    public void runTask(Runnable task, long ticks) {
-        MinecraftServer server = FabricUtil.getServer();
-        server.send(new ServerTask(server.getTicks() + (int) ticks, task));
-    }
-}

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric;
+package com.dfsek.terra.fabric.util;
 
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.Axis;

platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java

@@ -0,0 +1,118 @@
+package com.dfsek.terra.fabric.util;
+
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.config.builder.BiomeBuilder;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
+import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeEffects;
+import net.minecraft.world.biome.GenerationSettings;
+import net.minecraft.world.gen.GenerationStep;
+import net.minecraft.world.gen.carver.ConfiguredCarver;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+public final class FabricUtil {
+    public static String createBiomeID(ConfigPack pack, String biomeID) {
+        return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
+    }
+
+    /**
+     * Clones a Vanilla biome and injects Terra data to create a Terra-vanilla biome delegate.
+     *
+     * @param fabricAddon The Fabric addon instance.
+     * @param biome       The Terra BiomeBuilder.
+     * @param pack        The ConfigPack this biome belongs to.
+     * @return The Minecraft delegate biome.
+     */
+    public static Biome createBiome(TerraFabricPlugin.FabricAddon fabricAddon, BiomeBuilder biome, ConfigPack pack) {
+        BiomeTemplate template = biome.getTemplate();
+        Map<String, Integer> colors = template.getColors();
+
+        Biome vanilla = (Biome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
+
+        GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
+
+        generationSettings.surfaceBuilder(vanilla.getGenerationSettings().getSurfaceBuilder()); // It needs a surfacebuilder, even though we dont use it.
+
+        generationSettings.feature(GenerationStep.Feature.VEGETAL_DECORATION, TerraFabricPlugin.POPULATOR_CONFIGURED_FEATURE);
+
+        if(pack.getTemplate().vanillaCaves()) {
+            for(GenerationStep.Carver carver : GenerationStep.Carver.values()) {
+                for(Supplier<ConfiguredCarver<?>> configuredCarverSupplier : vanilla.getGenerationSettings().getCarversForStep(carver)) {
+                    generationSettings.carver(carver, configuredCarverSupplier.get());
+                }
+            }
+        }
+
+        Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions> pair = fabricAddon.getTemplates().get(pack);
+        PreLoadCompatibilityOptions compatibilityOptions = pair.getLeft();
+        PostLoadCompatibilityOptions postLoadCompatibilityOptions = pair.getRight();
+
+        TerraFabricPlugin.getInstance().getDebugLogger().info("Injecting Vanilla structures and features into Terra biome " + biome.getTemplate().getID());
+
+        for(Supplier<ConfiguredStructureFeature<?, ?>> structureFeature : vanilla.getGenerationSettings().getStructureFeatures()) {
+            Identifier key = Objects.requireNonNull(BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE.getId(structureFeature.get()));
+            if(compatibilityOptions.getStructureNamespaces().contains(key.getNamespace()) && !postLoadCompatibilityOptions.getExcludedPerBiomeStructures().getOrDefault(biome, Collections.emptySet()).contains(key)) {
+                generationSettings.structureFeature(structureFeature.get());
+                TerraFabricPlugin.getInstance().getDebugLogger().info("Injected structure " + key);
+            }
+        }
+
+        for(int step = 0; step < vanilla.getGenerationSettings().getFeatures().size(); step++) {
+            for(Supplier<ConfiguredFeature<?, ?>> featureSupplier : vanilla.getGenerationSettings().getFeatures().get(step)) {
+                Identifier key = Objects.requireNonNull(BuiltinRegistries.CONFIGURED_FEATURE.getId(featureSupplier.get()));
+                if(compatibilityOptions.getFeatureNamespaces().contains(key.getNamespace()) && !postLoadCompatibilityOptions.getExcludedPerBiomeFeatures().getOrDefault(biome, Collections.emptySet()).contains(key)) {
+                    generationSettings.feature(step, featureSupplier);
+                    TerraFabricPlugin.getInstance().getDebugLogger().info("Injected feature " + key + " at stage " + step);
+                }
+            }
+        }
+
+
+        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());
+
+        if(colors.containsKey("grass")) {
+            effects.grassColor(colors.get("grass"));
+        } else {
+            accessor.getGrassColor().ifPresent(effects::grassColor);
+        }
+        if(colors.containsKey("foliage")) {
+            effects.foliageColor(colors.get("foliage"));
+        } else {
+            accessor.getFoliageColor().ifPresent(effects::foliageColor);
+        }
+
+        return new Biome.Builder()
+                .precipitation(vanilla.getPrecipitation())
+                .category(vanilla.getCategory())
+                .depth(vanilla.getDepth())
+                .scale(vanilla.getScale())
+                .temperature(vanilla.getTemperature())
+                .downfall(vanilla.getDownfall())
+                .effects(effects.build())
+                .spawnSettings(vanilla.getSpawnSettings())
+                .generationSettings(generationSettings.build())
+                .build();
+    }
+}

platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java

@@ -0,0 +1,29 @@
+package com.dfsek.terra.fabric.util;
+
+import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.Region;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.world.World;
+
+public final class WorldEditUtil {
+    public static Pair<Location, Location> getSelection(Player player) {
+        WorldEdit worldEdit = WorldEdit.getInstance();
+        try {
+            Region selection = worldEdit.getSessionManager()
+                    .get(com.sk89q.worldedit.fabric.FabricAdapter.adaptPlayer((ServerPlayerEntity) player))
+                    .getSelection(com.sk89q.worldedit.fabric.FabricAdapter.adapt((World) player.getWorld()));
+            BlockVector3 min = selection.getMinimumPoint();
+            BlockVector3 max = selection.getMaximumPoint();
+            Location l1 = new Location(player.getWorld(), min.getBlockX(), min.getBlockY(), min.getBlockZ());
+            Location l2 = new Location(player.getWorld(), max.getBlockX(), max.getBlockY(), max.getBlockZ());
+            return Pair.of(l1, l2);
+        } catch(IncompleteRegionException e) {
+            throw new IllegalStateException("No selection has been made", e);
+        }
+    }
+}

platforms/fabric/src/main/resources/fabric.mod.json

@@ -3,15 +3,16 @@
   "id": "terra",
   "version": "@VERSION@",
   "name": "Terra",
-  "description": "An insanely powerful free & open-source data-driven world generator.",
+  "description": "@DESCRIPTION@",
   "authors": [
     "dfsek"
   ],
   "contact": {
-    "homepage": "https://github.com/PolyhedralDev/Terra/wiki",
-    "sources": "https://github.com/PolyhedralDev/Terra"
+    "homepage": "@WIKI@",
+    "sources": "@SOURCE@",
+    "issues": "@ISSUES@"
   },
-  "license": "GPL-3.0",
+  "license": "@LICENSE@",
   "icon": "assets/terra/icon.png",
   "environment": "*",
   "entrypoints": {
@@ -24,7 +25,6 @@
   ],
   "depends": {
     "fabricloader": ">=0.7.4",
-    "fabric": "*",
     "minecraft": "1.16.x"
   },
   "accessWidener": "terra.accesswidener"

platforms/fabric/src/main/resources/terra.mixins.json

@@ -4,7 +4,9 @@
   "package": "com.dfsek.terra.fabric.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "CommandManagerMixin",
     "GeneratorOptionsMixin",
+    "ServerWorldMixin",
     "access.BiomeEffectsAccessor",
     "access.MobSpawnerLogicAccessor",
     "access.StateAccessor",
@@ -33,9 +35,12 @@
     "implementations.world.ServerWorldMixin"
   ],
   "client": [
-    "access.GeneratorTypeAccessor"
+    "access.GeneratorTypeAccessor",
+    "init.MinecraftClientMixin"
+  ],
+  "server": [
+    "init.ServerMainMixin"
   ],
-  "server": [],
   "injectors": {
     "defaultRequire": 1
   },

platforms/forge/build.gradle.kts

@@ -1,6 +1,6 @@
 import com.dfsek.terra.configureCommon
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.minecraftforge.gradle.common.util.RunConfig
-import net.minecraftforge.gradle.mcp.task.GenerateSRG
 import net.minecraftforge.gradle.userdev.UserDevExtension
 import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
 
@@ -55,11 +55,17 @@ if ("true" == System.getProperty("idea.sync.active")) {
     }
 }
 
+
+tasks.named<ShadowJar>("shadowJar") {
+    archiveBaseName.set(tasks.getByName<Jar>("jar").archiveBaseName.orNull) // Pain. Agony, even.
+    archiveClassifier.set("") // Suffering, if you will.
+}
+
 afterEvaluate {
-    val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
-    reobf.maybeCreate("shadowJar").run {
-        group = "forge"
-        mappings = tasks.getByName<GenerateSRG>("createMcpToSrg").output
+    tasks.named<RenameJarInPlace>("reobfJar") {
+        val shadow = tasks.getByName<ShadowJar>("shadowJar");
+        dependsOn(shadow)
+        input = shadow.archiveFile.orNull?.asFile
     }
 }
 
@@ -71,7 +77,7 @@ configure<UserDevExtension> {
     runs {
         val runConfig = Action<RunConfig> {
             properties(mapOf(
-                    "forge.logging.markers" to "SCAN,REGISTRIES,REGISTRYDUMP",
+                    //"forge.logging.markers" to "SCAN,REGISTRIES,REGISTRYDUMP",
                     "forge.logging.console.level" to "debug"
             ))
             arg("-mixin.config=terra.mixins.json")
@@ -124,12 +130,12 @@ tasks.jar {
 }
 
 tasks.register<com.modrinth.minotaur.TaskModrinthUpload>("publishModrinthForge") {
-    dependsOn("reobfShadowJar")
+    dependsOn("reobfJar")
     group = "forge"
     token = System.getenv("MODRINTH_SECRET")
     projectId = "FIlZB9L0"
     versionNumber = "${project.version}-forge"
-    uploadFile = tasks.named<RenameJarInPlace>("reobfShadowJar").get().input.absoluteFile
+    uploadFile = tasks.named<RenameJarInPlace>("reobfJar").get().input.absoluteFile
     releaseType = "alpha"
     addGameVersion("1.16.5")
     addLoader("forge")

platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java

@@ -0,0 +1,90 @@
+package com.dfsek.terra.forge;
+
+import com.dfsek.terra.api.math.vector.Vector3;
+import com.dfsek.terra.api.platform.block.BlockFace;
+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.forge.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.data.ForgeDirectional;
+import com.dfsek.terra.forge.block.data.ForgeMultipleFacing;
+import com.dfsek.terra.forge.block.data.ForgeOrientable;
+import com.dfsek.terra.forge.block.data.ForgeRotatable;
+import com.dfsek.terra.forge.block.data.ForgeSlab;
+import com.dfsek.terra.forge.block.data.ForgeStairs;
+import com.dfsek.terra.forge.block.data.ForgeWaterlogged;
+import net.minecraft.block.BlockState;
+import net.minecraft.state.properties.BlockStateProperties;
+import net.minecraft.tileentity.LockableLootTileEntity;
+import net.minecraft.tileentity.MobSpawnerTileEntity;
+import net.minecraft.tileentity.SignTileEntity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IWorld;
+
+import java.util.Arrays;
+
+public final class ForgeAdapter {
+    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 ForgeBlockData adapt(BlockState state) {
+        if(state.hasProperty(BlockStateProperties.STAIRS_SHAPE)) return new ForgeStairs(state);
+
+        if(state.hasProperty(BlockStateProperties.SLAB_TYPE)) return new ForgeSlab(state);
+
+        if(state.hasProperty(BlockStateProperties.AXIS)) return new ForgeOrientable(state, BlockStateProperties.AXIS);
+        if(state.hasProperty(BlockStateProperties.HORIZONTAL_AXIS)) return new ForgeOrientable(state, BlockStateProperties.HORIZONTAL_AXIS);
+
+        if(state.hasProperty(BlockStateProperties.ROTATION_16)) return new ForgeRotatable(state);
+
+        if(state.hasProperty(BlockStateProperties.FACING)) return new ForgeDirectional(state, BlockStateProperties.FACING);
+        if(state.hasProperty(BlockStateProperties.FACING_HOPPER)) return new ForgeDirectional(state, BlockStateProperties.FACING_HOPPER);
+        if(state.hasProperty(BlockStateProperties.HORIZONTAL_FACING))
+            return new ForgeDirectional(state, BlockStateProperties.HORIZONTAL_FACING);
+
+        if(state.getProperties().containsAll(Arrays.asList(BlockStateProperties.NORTH, BlockStateProperties.SOUTH, BlockStateProperties.EAST, BlockStateProperties.WEST)))
+            return new ForgeMultipleFacing(state);
+        if(state.hasProperty(BlockStateProperties.WATERLOGGED)) return new ForgeWaterlogged(state);
+        return new ForgeBlockData(state);
+    }
+
+    public static com.dfsek.terra.api.platform.block.state.BlockState adapt(com.dfsek.terra.api.platform.block.Block block) {
+        IWorld worldAccess = (IWorld) block.getLocation().getWorld();
+
+        TileEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector()));
+        if(entity instanceof SignTileEntity) {
+            return (Sign) entity;
+        } else if(entity instanceof MobSpawnerTileEntity) {
+            return (MobSpawner) entity;
+        } else if(entity instanceof LockableLootTileEntity) {
+            return (Container) entity;
+        }
+        return null;
+    }
+
+    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);
+        }
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeMod.java

@@ -0,0 +1,27 @@
+package com.dfsek.terra.forge;
+
+import com.dfsek.terra.api.platform.modloader.Mod;
+import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
+
+public class ForgeMod implements Mod {
+    private final ModInfo mod;
+
+    public ForgeMod(ModInfo mod) {
+        this.mod = mod;
+    }
+
+    @Override
+    public String getID() {
+        return mod.getModId();
+    }
+
+    @Override
+    public String getVersion() {
+        return mod.getVersion().getQualifier();
+    }
+
+    @Override
+    public String getName() {
+        return mod.getDisplayName();
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeUtil.java

@@ -0,0 +1,109 @@
+package com.dfsek.terra.forge;
+
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.config.builder.BiomeBuilder;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.config.templates.BiomeTemplate;
+import com.dfsek.terra.forge.config.PostLoadCompatibilityOptions;
+import com.dfsek.terra.forge.config.PreLoadCompatibilityOptions;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeAmbience;
+import net.minecraft.world.biome.BiomeGenerationSettings;
+import net.minecraft.world.gen.GenerationStage;
+import net.minecraft.world.gen.carver.ConfiguredCarver;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.StructureFeature;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public final class ForgeUtil {
+    public static String createBiomeID(ConfigPack pack, String biomeID) {
+        return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
+    }
+
+    public static Biome createBiome(BiomeBuilder biome, ConfigPack pack, TerraForgePlugin.ForgeAddon forgeAddon) {
+        BiomeTemplate template = biome.getTemplate();
+        Map<String, Integer> colors = template.getColors();
+
+        Biome vanilla = (Biome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
+
+        BiomeGenerationSettings.Builder generationSettings = new BiomeGenerationSettings.Builder();
+
+        generationSettings.surfaceBuilder(vanilla.getGenerationSettings().getSurfaceBuilder()); // It needs a surfacebuilder, even though we dont use it.
+
+        generationSettings.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, TerraForgePlugin.POPULATOR_CONFIGURED_FEATURE);
+
+        if(pack.getTemplate().vanillaCaves()) {
+            for(GenerationStage.Carving carver : GenerationStage.Carving.values()) {
+                for(Supplier<ConfiguredCarver<?>> configuredCarverSupplier : vanilla.getGenerationSettings().getCarvers(carver)) {
+                    generationSettings.addCarver(carver, configuredCarverSupplier.get());
+                }
+            }
+        }
+
+        Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions> pair = forgeAddon.getTemplates().get(pack);
+        PreLoadCompatibilityOptions compatibilityOptions = pair.getLeft();
+        PostLoadCompatibilityOptions postLoadCompatibilityOptions = pair.getRight();
+
+        TerraForgePlugin.getInstance().getDebugLogger().info("Injecting Vanilla structures and features into Terra biome " + biome.getTemplate().getID());
+
+        for(Supplier<StructureFeature<?, ?>> structureFeature : vanilla.getGenerationSettings().structures()) {
+            ResourceLocation key = WorldGenRegistries.CONFIGURED_STRUCTURE_FEATURE.getKey(structureFeature.get());
+            if(!compatibilityOptions.getExcludedBiomeStructures().contains(key) && !postLoadCompatibilityOptions.getExcludedPerBiomeStructures().getOrDefault(biome, Collections.emptySet()).contains(key)) {
+                generationSettings.addStructureStart(structureFeature.get());
+                TerraForgePlugin.getInstance().getDebugLogger().info("Injected structure " + key);
+            }
+        }
+
+        if(compatibilityOptions.doBiomeInjection()) {
+            for(int step = 0; step < vanilla.getGenerationSettings().features().size(); step++) {
+                for(Supplier<ConfiguredFeature<?, ?>> featureSupplier : vanilla.getGenerationSettings().features().get(step)) {
+                    ResourceLocation key = WorldGenRegistries.CONFIGURED_FEATURE.getKey(featureSupplier.get());
+                    if(!compatibilityOptions.getExcludedBiomeFeatures().contains(key) && !postLoadCompatibilityOptions.getExcludedPerBiomeFeatures().getOrDefault(biome, Collections.emptySet()).contains(key)) {
+                        generationSettings.addFeature(step, featureSupplier);
+                        TerraForgePlugin.getInstance().getDebugLogger().info("Injected feature " + key + " at stage " + step);
+                    }
+                }
+            }
+        }
+
+        BiomeAmbience vanillaEffects = vanilla.getSpecialEffects();
+        BiomeAmbience.Builder effects = new BiomeAmbience.Builder()
+                .waterColor(colors.getOrDefault("water", vanillaEffects.getWaterColor()))
+                .waterFogColor(colors.getOrDefault("water-fog", vanillaEffects.getWaterFogColor()))
+                .fogColor(colors.getOrDefault("fog", vanillaEffects.getFogColor()))
+                .skyColor(colors.getOrDefault("sky", vanillaEffects.getSkyColor()))
+                .grassColorModifier(vanillaEffects.getGrassColorModifier());
+
+        if(colors.containsKey("grass")) {
+            effects.grassColorOverride(colors.get("grass"));
+        } else {
+            vanillaEffects.getGrassColorOverride().ifPresent(effects::grassColorOverride);
+        }
+
+        if(colors.containsKey("foliage")) {
+            effects.foliageColorOverride(colors.get("foliage"));
+        } else {
+            vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+        }
+
+        return new Biome.Builder()
+                .precipitation(vanilla.getPrecipitation())
+                .biomeCategory(vanilla.getBiomeCategory())
+                .depth(vanilla.getDepth())
+                .scale(vanilla.getScale())
+                .temperature(vanilla.getBaseTemperature())
+                .downfall(vanilla.getDownfall())
+                .specialEffects(effects.build())
+                .mobSpawnSettings(vanilla.getMobSettings())
+                .generationSettings(generationSettings.build())
+                .build()
+                .setRegistryName("terra", createBiomeID(template.getPack(), template.getID()));
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.forge;
 
+import com.dfsek.tectonic.exception.ConfigException;
+import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addons.TerraAddon;
@@ -8,15 +10,14 @@ import com.dfsek.terra.api.addons.annotations.Author;
 import com.dfsek.terra.api.addons.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
-import com.dfsek.terra.api.command.exception.CommandException;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.TerraEventManager;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
+import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
 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.handle.ItemHandle;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
@@ -24,68 +25,48 @@ import com.dfsek.terra.api.platform.world.Tree;
 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.task.TaskScheduler;
-import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
+import com.dfsek.terra.api.transform.Validator;
 import com.dfsek.terra.api.util.JarUtil;
+import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.logging.DebugLogger;
-import com.dfsek.terra.api.util.mutable.MutableInteger;
 import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfig;
-import com.dfsek.terra.config.builder.BiomeBuilder;
 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.forge.inventory.ForgeItemHandle;
-import com.dfsek.terra.forge.world.ForgeAdapter;
-import com.dfsek.terra.forge.world.ForgeBiome;
-import com.dfsek.terra.forge.world.ForgeTree;
-import com.dfsek.terra.forge.world.ForgeWorldHandle;
-import com.dfsek.terra.forge.world.features.PopulatorFeature;
-import com.dfsek.terra.forge.world.generator.ForgeChunkGenerator;
-import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper;
-import com.dfsek.terra.forge.world.generator.config.TerraLevelType;
+import com.dfsek.terra.forge.config.PostLoadCompatibilityOptions;
+import com.dfsek.terra.forge.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.forge.generation.ForgeChunkGeneratorWrapper;
+import com.dfsek.terra.forge.generation.PopulatorFeature;
+import com.dfsek.terra.forge.generation.TerraBiomeSource;
+import com.dfsek.terra.forge.handle.ForgeItemHandle;
+import com.dfsek.terra.forge.handle.ForgeWorldHandle;
 import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
 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.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.command.CommandSource;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.world.DimensionType;
+import net.minecraft.world.IWorld;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.BiomeAmbience;
-import net.minecraft.world.biome.BiomeGenerationSettings;
-import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.Features;
 import net.minecraft.world.gen.feature.IFeatureConfig;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 import net.minecraft.world.gen.placement.DecoratedPlacement;
 import net.minecraft.world.gen.placement.NoPlacementConfig;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ForgeWorldTypeScreens;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.world.ForgeWorldType;
-import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.event.RegistryEvent;
+import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.ForgeRegistry;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.objectweb.asm.Type;
@@ -95,20 +76,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Consumer;
+import java.util.Set;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 import java.util.zip.ZipFile;
 
-import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal;
-import static com.mojang.brigadier.builder.RequiredArgumentBuilder.argument;
-
 @Mod("terra")
 @Mod.EventBusSubscriber(modid = "terra", bus = Mod.EventBusSubscriber.Bus.MOD)
 public class TerraForgePlugin implements TerraPlugin {
@@ -116,7 +91,7 @@ public class TerraForgePlugin implements TerraPlugin {
     public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configured(IFeatureConfig.NONE).decorated(DecoratedPlacement.NOPE.configured(NoPlacementConfig.INSTANCE));
 
     private static TerraForgePlugin INSTANCE;
-    private final Map<Long, TerraWorld> worldMap = new HashMap<>();
+    private final Map<DimensionType, Pair<ServerWorld, TerraWorld>> worldMap = new HashMap<>();
     private final EventManager eventManager = new TerraEventManager(this);
     private final GenericLoaders genericLoaders = new GenericLoaders(this);
     private final Profiler profiler = new ProfilerImpl();
@@ -141,129 +116,51 @@ public class TerraForgePlugin implements TerraPlugin {
             logger.error(message);
         }
     };
+
     private final DebugLogger debugLogger = new DebugLogger(logger);
     private final ItemHandle itemHandle = new ForgeItemHandle();
     private final WorldHandle worldHandle = new ForgeWorldHandle();
     private final ConfigRegistry registry = new ConfigRegistry();
     private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
-    private final AddonRegistry addonRegistry = new AddonRegistry(new ForgeAddon(this), this);
+
+    private final ForgeAddon addon = new ForgeAddon(this);
+
+    private final AddonRegistry addonRegistry = new AddonRegistry(addon, this);
     private final LockedRegistry<TerraAddon> addonLockedRegistry = new LockedRegistry<>(addonRegistry);
     private final PluginConfig config = new PluginConfig();
     private final Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
-            .addTransform(id -> ForgeRegistries.BIOMES.getValue(ResourceLocation.tryParse(id)), new NotNullValidator<>())
-            .addTransform(id -> ForgeRegistries.BIOMES.getValue(ResourceLocation.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();
-    private File dataFolder;
+            .addTransform(id -> ForgeRegistries.BIOMES.getValue(ResourceLocation.tryParse(id)), Validator.notNull())
+            .addTransform(id -> ForgeRegistries.BIOMES.getValue(ResourceLocation.tryParse("minecraft:" + id.toLowerCase())), Validator.notNull()).build();
+    private final File dataFolder;
 
     public TerraForgePlugin() {
         if(INSTANCE != null) throw new IllegalStateException("Only one TerraPlugin instance may exist.");
         INSTANCE = this;
-        MinecraftForge.EVENT_BUS.register(ClientEvents.class);
-        MinecraftForge.EVENT_BUS.register(getClass());
-        MinecraftForge.EVENT_BUS.register(ForgeEvents.class);
+        this.dataFolder = Paths.get("config", "Terra").toFile();
+        saveDefaultConfig();
+        config.load(this);
+        debugLogger.setDebug(config.isDebug());
+        LangUtil.load(config.getLanguage(), this);
+        try {
+            CommandUtil.registerAll(manager);
+        } catch(MalformedCommandException e) {
+            e.printStackTrace(); // TODO do something here even though this should literally never happen
+        }
     }
 
     public static TerraForgePlugin getInstance() {
         return INSTANCE;
     }
 
-    public static String createBiomeID(ConfigPack pack, String biomeID) {
-        return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
-    }
-
-    private static RequiredArgumentBuilder<CommandSource, String> assemble(RequiredArgumentBuilder<CommandSource, String> in, CommandManager manager) {
-        return in.suggests((context, builder) -> {
-            List<String> args = parseCommand(context.getInput());
-            CommandSender sender = ForgeAdapter.adapt(context.getSource());
-            try {
-                manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest);
-            } catch(CommandException e) {
-                sender.sendMessage(e.getMessage());
-            }
-            return builder.buildFuture();
-        }).executes(context -> {
-            List<String> args = parseCommand(context.getInput());
-            try {
-                manager.execute(args.remove(0), ForgeAdapter.adapt(context.getSource()), args);
-            } catch(CommandException e) {
-                context.getSource().sendFailure(new StringTextComponent(e.getMessage()));
-            }
-            return 1;
+    @SubscribeEvent
+    public static void setupListener(FMLCommonSetupEvent event) {
+        event.enqueueWork(() -> {
+            Registry.register(Registry.BIOME_SOURCE, "terra:biome", TerraBiomeSource.CODEC);
+            Registry.register(Registry.CHUNK_GENERATOR, "terra:generator", ForgeChunkGeneratorWrapper.CODEC);
         });
     }
 
-    private static List<String> parseCommand(String command) {
-        if(command.startsWith("/terra ")) command = command.substring("/terra ".length());
-        else if(command.startsWith("/te ")) command = command.substring("/te ".length());
-        List<String> c = new ArrayList<>(Arrays.asList(command.split(" ")));
-        if(command.endsWith(" ")) c.add("");
-        return c;
-    }
-
-    @SubscribeEvent
-    public static void register(RegistryEvent.Register<Biome> event) {
-        INSTANCE.setup(); // Setup now because we need the biomes, and this event happens after blocks n stuff
-        INSTANCE.getConfigRegistry().forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> event.getRegistry().register(INSTANCE.createBiome(biome)))); // Register all Terra biomes.
-    }
-
-    @SubscribeEvent
-    public static void registerLevels(RegistryEvent.Register<ForgeWorldType> event) {
-        INSTANCE.logger().info("Registering level types...");
-        event.getRegistry().register(TerraLevelType.FORGE_WORLD_TYPE);
-    }
-
-    @SubscribeEvent
-    public static void registerPop(RegistryEvent.Register<Feature<?>> event) {
-        event.getRegistry().register(POPULATOR_FEATURE);
-    }
-
-    public Biome createBiome(BiomeBuilder biome) {
-        BiomeTemplate template = biome.getTemplate();
-        Map<String, Integer> colors = template.getColors();
-
-        Biome vanilla = ((ForgeBiome) new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0)).getHandle();
-
-        BiomeGenerationSettings.Builder generationSettings = new BiomeGenerationSettings.Builder();
-        generationSettings.surfaceBuilder(SurfaceBuilder.DEFAULT.configured(new SurfaceBuilderConfig(Blocks.GRASS_BLOCK.defaultBlockState(), Blocks.DIRT.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()))); // It needs a surfacebuilder, even though we dont use it.
-        generationSettings.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, POPULATOR_CONFIGURED_FEATURE);
-
-        BiomeAmbience vanillaEffects = vanilla.getSpecialEffects();
-        BiomeAmbience.Builder effects = new BiomeAmbience.Builder()
-                .waterColor(colors.getOrDefault("water", vanillaEffects.getWaterColor()))
-                .waterFogColor(colors.getOrDefault("water-fog", vanillaEffects.getWaterFogColor()))
-                .fogColor(colors.getOrDefault("fog", vanillaEffects.getFogColor()))
-                .skyColor(colors.getOrDefault("sky", vanillaEffects.getSkyColor()))
-                .grassColorModifier(vanillaEffects.getGrassColorModifier());
-
-        if(colors.containsKey("grass")) {
-            effects.grassColorOverride(colors.get("grass"));
-        } else {
-            vanillaEffects.getGrassColorOverride().ifPresent(effects::grassColorOverride);
-        }
-        vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
-        if(colors.containsKey("foliage")) {
-            effects.foliageColorOverride(colors.get("foliage"));
-        } else {
-            vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
-        }
-
-        return new Biome.Builder()
-                .precipitation(vanilla.getPrecipitation())
-                .biomeCategory(vanilla.getBiomeCategory())
-                .depth(vanilla.getDepth())
-                .scale(vanilla.getScale())
-                .temperature(vanilla.getBaseTemperature())
-                .downfall(vanilla.getDownfall())
-                .specialEffects(effects.build())
-                .mobSpawnSettings(vanilla.getMobSettings())
-                .generationSettings(generationSettings.build())
-                .build().setRegistryName("terra", createBiomeID(template.getPack(), template.getID()));
-    }
-
-    public void setup() {
-        this.dataFolder = Paths.get("config", "Terra").toFile();
-        saveDefaultConfig();
-        config.load(this);
-        LangUtil.load(config.getLanguage(), this);
+    public void init() {
         logger.info("Initializing Terra...");
 
         if(!addonRegistry.loadAll()) {
@@ -272,15 +169,11 @@ public class TerraForgePlugin implements TerraPlugin {
         logger.info("Loaded addons.");
 
         registry.loadAll(this);
-
         logger.info("Loaded packs.");
 
-
-        try {
-            CommandUtil.registerAll(manager);
-        } catch(MalformedCommandException e) {
-            e.printStackTrace(); // TODO do something here even though this should literally never happen
-        }
+        ((ForgeRegistry<Biome>) ForgeRegistries.BIOMES).unfreeze(); // Evil
+        getConfigRegistry().forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> ForgeRegistries.BIOMES.register(ForgeUtil.createBiome(biome, pack, addon)))); // Register all Terra biomes.
+        ((ForgeRegistry<Biome>) ForgeRegistries.BIOMES).freeze();
     }
 
     @Override
@@ -290,12 +183,22 @@ public class TerraForgePlugin implements TerraPlugin {
 
     @Override
     public TerraWorld getWorld(World world) {
-        return worldMap.computeIfAbsent(world.getSeed(), w -> {
-            logger.info("Loading world " + w);
-            return new TerraWorld(world, ((ForgeChunkGeneratorWrapper) ((ForgeChunkGenerator) world.getGenerator()).getHandle()).getPack(), this);
-        });
+        return getWorld(((IWorld) world).dimensionType());
     }
 
+    public TerraWorld getWorld(DimensionType type) {
+        TerraWorld world = worldMap.get(type).getRight();
+        if(world == null) throw new IllegalArgumentException("No world exists with dimension type " + type);
+        return world;
+    }
+
+    /**
+     * evil code brought to you by Forge Mod Loader
+     * <p>
+     * Forge changes the JAR URI to something that cannot
+     * be resolved back to the original JAR, so we have to
+     * do this to get our JAR.
+     */
     @Override
     public JarFile getModJar() throws URISyntaxException, IOException {
         File modsDir = new File("./mods");
@@ -312,17 +215,6 @@ public class TerraForgePlugin implements TerraPlugin {
         return JarUtil.getJarFile();
     }
 
-    @Override
-    public TaskScheduler getScheduler() {
-        return null;
-    }
-
-    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 com.dfsek.terra.api.util.logging.Logger logger() {
         return logger;
@@ -340,7 +232,7 @@ public class TerraForgePlugin implements TerraPlugin {
 
     @Override
     public boolean isDebug() {
-        return true;
+        return config.isDebug();
     }
 
     @Override
@@ -363,14 +255,11 @@ public class TerraForgePlugin implements TerraPlugin {
         config.load(this);
         LangUtil.load(config.getLanguage(), this); // Load language.
         boolean succeed = registry.loadAll(this);
-        Map<Long, TerraWorld> newMap = new HashMap<>();
-        worldMap.forEach((seed, tw) -> {
-            tw.getConfig().getSamplerCache().clear();
-            String packID = tw.getConfig().getTemplate().getID();
-            newMap.put(seed, new TerraWorld(tw.getWorld(), registry.get(packID), this));
+        worldMap.forEach((seed, pair) -> {
+            pair.getRight().getConfig().getSamplerCache().clear();
+            String packID = pair.getRight().getConfig().getTemplate().getID();
+            pair.setRight(new TerraWorld(pair.getRight().getWorld(), registry.get(packID), this));
         });
-        worldMap.clear();
-        worldMap.putAll(newMap);
         return succeed;
     }
 
@@ -404,7 +293,12 @@ public class TerraForgePlugin implements TerraPlugin {
         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) -> new ForgeBiome(biomeFixer.translate((String) o)));
+                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o))
+                .registerLoader(ResourceLocation.class, (t, o, l) -> {
+                    ResourceLocation identifier = ResourceLocation.tryParse((String) o);
+                    if(identifier == null) throw new LoadException("Invalid identifier: " + o);
+                    return identifier;
+                });
     }
 
     @Override
@@ -412,33 +306,30 @@ public class TerraForgePlugin implements TerraPlugin {
         return eventManager;
     }
 
+    @Override
+    public Set<com.dfsek.terra.api.platform.modloader.Mod> getMods() {
+        return net.minecraftforge.fml.ModList.get().getMods().stream().map(ForgeMod::new).collect(Collectors.toSet());
+    }
+
     @Override
     public Profiler getProfiler() {
         return profiler;
     }
 
-    @Mod.EventBusSubscriber(modid = "terra", bus = Mod.EventBusSubscriber.Bus.FORGE)
-    public static final class ForgeEvents {
-        @SuppressWarnings({"unchecked", "rawtypes"})
-        @SubscribeEvent
-        public static void registerCommands(RegisterCommandsEvent event) {
-            int max = INSTANCE.manager.getMaxArgumentDepth();
-            RequiredArgumentBuilder<CommandSource, String> arg = argument("arg" + (max - 1), StringArgumentType.word());
-            for(int i = 0; i < max; i++) {
-                RequiredArgumentBuilder<CommandSource, String> next = argument("arg" + (max - i - 1), StringArgumentType.word());
+    public CommandManager getManager() {
+        return manager;
+    }
 
-                arg = next.then(assemble(arg, INSTANCE.manager));
-            }
-
-            event.getDispatcher().register(literal("terra").executes(context -> 1).then((ArgumentBuilder) assemble(arg, INSTANCE.manager)));
-            event.getDispatcher().register(literal("te").executes(context -> 1).then((ArgumentBuilder) assemble(arg, INSTANCE.manager)));
-        }
+    public Map<DimensionType, Pair<ServerWorld, TerraWorld>> getWorldMap() {
+        return worldMap;
     }
 
     @Addon("Terra-Forge")
     @Author("Terra")
     @Version("1.0.0")
-    private static final class ForgeAddon extends TerraAddon implements EventListener {
+    public static final class ForgeAddon extends TerraAddon implements EventListener {
+
+        private final Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
 
         private final TerraPlugin main;
 
@@ -474,43 +365,51 @@ public class TerraForgePlugin implements TerraPlugin {
             injectTree(treeRegistry, "MEGA_SPRUCE", Features.MEGA_SPRUCE);
             injectTree(treeRegistry, "CRIMSON_FUNGUS", Features.CRIMSON_FUNGI);
             injectTree(treeRegistry, "WARPED_FUNGUS", Features.WARPED_FUNGI);
+            PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
+            try {
+                event.loadTemplate(template);
+            } catch(ConfigException e) {
+                e.printStackTrace();
+            }
+
+            if(template.doRegistryInjection()) {
+                WorldGenRegistries.CONFIGURED_FEATURE.entrySet().forEach(entry -> {
+                    if(!template.getExcludedRegistryFeatures().contains(entry.getKey().getRegistryName())) {
+                        try {
+                            event.getPack().getTreeRegistry().add(entry.getKey().getRegistryName().toString(), (Tree) entry.getValue());
+                            main.getDebugLogger().info("Injected ConfiguredFeature " + entry.getKey().getRegistryName() + " as Tree: " + entry.getValue());
+                        } catch(DuplicateEntryException ignored) {
+                        }
+                    }
+                });
+            }
+            templates.put(event.getPack(), Pair.of(template, null));
+        }
+
+        @Priority(Priority.HIGHEST)
+        @Global
+        public void createInjectionOptions(ConfigPackPostLoadEvent event) {
+            PostLoadCompatibilityOptions template = new PostLoadCompatibilityOptions();
+
+            try {
+                event.loadTemplate(template);
+            } catch(ConfigException e) {
+                e.printStackTrace();
+            }
+
+            templates.get(event.getPack()).setRight(template);
         }
 
 
         private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
             try {
-                registry.add(id, new ForgeTree(tree, id, TerraForgePlugin.getInstance()));
+                registry.add(id, (Tree) tree);
             } catch(DuplicateEntryException ignore) {
             }
         }
-    }
 
-    @Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
-    public static final class ClientEvents {
-        @SubscribeEvent
-        public static void register(FMLClientSetupEvent event) {
-            INSTANCE.logger.info("Client setup...");
-
-            ForgeWorldType world = TerraLevelType.FORGE_WORLD_TYPE;
-            ForgeWorldTypeScreens.registerFactory(world, (returnTo, dimensionGeneratorSettings) -> new Screen(world.getDisplayName()) {
-                private final MutableInteger num = new MutableInteger(0);
-                private final List<ConfigPack> packs = new ArrayList<>();
-                private final Button toggle = new Button(0, 25, 120, 20, new StringTextComponent(""), button -> {
-                    num.increment();
-                    if(num.get() >= packs.size()) num.set(0);
-                    button.setMessage(new StringTextComponent("Pack: " + packs.get(num.get()).getTemplate().getID()));
-                });
-
-                @Override
-                protected void init() {
-                    packs.clear();
-                    INSTANCE.registry.forEach((Consumer<ConfigPack>) packs::add);
-                    addButton(new Button(0, 0, 120, 20, new StringTextComponent("Close"), btn -> Minecraft.getInstance().setScreen(returnTo)));
-                    toggle.setMessage(new StringTextComponent("Pack: " + packs.get(num.get()).getTemplate().getID()));
-                    addButton(toggle);
-                }
-            });
+        public Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> getTemplates() {
+            return templates;
         }
     }
-
 }

platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.world.block;
+package com.dfsek.terra.forge.block;
 
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.Block;
@@ -6,9 +6,8 @@ import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.BlockType;
 import com.dfsek.terra.api.platform.block.state.BlockState;
-import com.dfsek.terra.forge.world.ForgeAdapter;
-import com.dfsek.terra.forge.world.block.state.ForgeBlockState;
-import com.dfsek.terra.forge.world.handles.world.ForgeWorldAccess;
+import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.forge.ForgeAdapter;
 import net.minecraft.block.FlowingFluidBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
@@ -35,7 +34,7 @@ public class ForgeBlock implements Block {
 
     @Override
     public BlockState getState() {
-        return ForgeBlockState.newInstance(this);
+        return ForgeAdapter.adapt(this);
     }
 
     @Override
@@ -51,7 +50,7 @@ public class ForgeBlock implements Block {
 
     @Override
     public Location getLocation() {
-        return ForgeAdapter.adapt(delegate.position).toLocation(new ForgeWorldAccess(delegate.worldAccess));
+        return ForgeAdapter.adapt(delegate.position).toLocation((World) delegate.worldAccess);
     }
 
     @Override

platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java

@@ -1,8 +1,7 @@
-package com.dfsek.terra.forge.world.block;
+package com.dfsek.terra.forge.block;
 
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.forge.world.ForgeAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.state.Property;
@@ -39,7 +38,7 @@ public class ForgeBlockData implements BlockData {
 
     @Override
     public BlockType getBlockType() {
-        return ForgeAdapter.adapt(delegate.getBlock());
+        return (BlockType) delegate.getBlock();
     }
 
     @Override

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeAnaloguePowerable.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.data.AnaloguePowerable;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 
 /**

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeDirectional.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Directional;
-import com.dfsek.terra.forge.world.ForgeAdapter;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.ForgeAdapter;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.DirectionProperty;
 

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeEnumAdapter.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.Axis;
 import com.dfsek.terra.api.platform.block.BlockFace;

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeMultipleFacing.java

@@ -1,12 +1,11 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.MultipleFacing;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;
 
-
 import java.util.HashSet;
 import java.util.Set;
 

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeOrientable.java

@@ -1,13 +1,12 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.Axis;
 import com.dfsek.terra.api.platform.block.data.Orientable;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.EnumProperty;
 import net.minecraft.util.Direction;
 
-
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeRotatable.java

@@ -1,8 +1,8 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Rotatable;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;
 

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeSlab.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.data.Slab;
 import net.minecraft.block.BlockState;

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeStairs.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.BlockFace;
 import com.dfsek.terra.api.platform.block.data.Stairs;

platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeWaterlogged.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.forge.world.block.data;
+package com.dfsek.terra.forge.block.data;
 
 import com.dfsek.terra.api.platform.block.data.Waterlogged;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;
 

platforms/forge/src/main/java/com/dfsek/terra/forge/config/PostLoadCompatibilityOptions.java

@@ -0,0 +1,30 @@
+package com.dfsek.terra.forge.config;
+
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.config.builder.BiomeBuilder;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class PostLoadCompatibilityOptions implements ConfigTemplate {
+    @Value("structures.inject-biome.exclude-biomes")
+    @Default
+    private Map<BiomeBuilder, Set<ResourceLocation>> excludedPerBiomeStructures = new HashMap<>();
+
+    @Value("features.inject-biome.exclude-biomes")
+    @Default
+    private Map<BiomeBuilder, Set<ResourceLocation>> excludedPerBiomeFeatures = new HashMap<>();
+
+    public Map<BiomeBuilder, Set<ResourceLocation>> getExcludedPerBiomeFeatures() {
+        return excludedPerBiomeFeatures;
+    }
+
+    public Map<BiomeBuilder, Set<ResourceLocation>> getExcludedPerBiomeStructures() {
+        return excludedPerBiomeStructures;
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/config/PreLoadCompatibilityOptions.java

@@ -0,0 +1,52 @@
+package com.dfsek.terra.forge.config;
+
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.config.ConfigTemplate;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class PreLoadCompatibilityOptions implements ConfigTemplate {
+    @Value("features.inject-registry.enable")
+    @Default
+    private boolean doRegistryInjection = false;
+
+    @Value("features.inject-biome.enable")
+    @Default
+    private boolean doBiomeInjection = false;
+
+    @Value("features.inject-registry.excluded-features")
+    @Default
+    private Set<ResourceLocation> excludedRegistryFeatures = new HashSet<>();
+
+    @Value("features.inject-biome.excluded-features")
+    @Default
+    private Set<ResourceLocation> excludedBiomeFeatures = new HashSet<>();
+
+    @Value("structures.inject-biome.excluded-features")
+    @Default
+    private Set<ResourceLocation> excludedBiomeStructures = new HashSet<>();
+
+    public boolean doBiomeInjection() {
+        return doBiomeInjection;
+    }
+
+    public boolean doRegistryInjection() {
+        return doRegistryInjection;
+    }
+
+    public Set<ResourceLocation> getExcludedBiomeFeatures() {
+        return excludedBiomeFeatures;
+    }
+
+    public Set<ResourceLocation> getExcludedRegistryFeatures() {
+        return excludedRegistryFeatures;
+    }
+
+    public Set<ResourceLocation> getExcludedBiomeStructures() {
+        return excludedBiomeStructures;
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java

@@ -0,0 +1,202 @@
+package com.dfsek.terra.forge.generation;
+
+import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.platform.world.generator.ChunkData;
+import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.world.biome.UserDefinedBiome;
+import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
+import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
+import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.forge.ForgeAdapter;
+import com.dfsek.terra.forge.TerraForgePlugin;
+import com.dfsek.terra.forge.block.ForgeBlockData;
+import com.dfsek.terra.world.TerraWorld;
+import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D;
+import com.dfsek.terra.world.generation.math.samplers.Sampler;
+import com.dfsek.terra.world.population.items.TerraStructure;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.jafama.FastMath;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.EntityClassification;
+import net.minecraft.util.SharedSeedRandom;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.registry.DynamicRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.Blockreader;
+import net.minecraft.world.DimensionType;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IWorld;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeManager;
+import net.minecraft.world.biome.MobSpawnInfo;
+import net.minecraft.world.chunk.IChunk;
+import net.minecraft.world.gen.ChunkGenerator;
+import net.minecraft.world.gen.GenerationStage;
+import net.minecraft.world.gen.Heightmap;
+import net.minecraft.world.gen.WorldGenRegion;
+import net.minecraft.world.gen.feature.structure.Structure;
+import net.minecraft.world.gen.feature.structure.StructureManager;
+import net.minecraft.world.gen.feature.template.TemplateManager;
+import net.minecraft.world.gen.settings.DimensionStructuresSettings;
+import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.spawner.WorldEntitySpawner;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper {
+    private final long seed;
+    private final DefaultChunkGenerator3D delegate;
+    private final TerraBiomeSource biomeSource;
+    public static final Codec<ConfigPack> PACK_CODEC = (RecordCodecBuilder.create(config -> config.group(
+            Codec.STRING.fieldOf("pack").forGetter(pack -> pack.getTemplate().getID())
+    ).apply(config, config.stable(TerraForgePlugin.getInstance().getConfigRegistry()::get))));
+    public static final Codec<ForgeChunkGeneratorWrapper> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            TerraBiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.biomeSource),
+            Codec.LONG.fieldOf("seed").stable().forGetter(generator -> generator.seed),
+            PACK_CODEC.fieldOf("pack").stable().forGetter(generator -> generator.pack))
+            .apply(instance, instance.stable(ForgeChunkGeneratorWrapper::new)));
+    private final ConfigPack pack;
+
+    public ConfigPack getPack() {
+        return pack;
+    }
+
+    private DimensionType dimensionType;
+
+    public ForgeChunkGeneratorWrapper(TerraBiomeSource biomeSource, long seed, ConfigPack configPack) {
+        super(biomeSource, new DimensionStructuresSettings(configPack.getTemplate().vanillaStructures()));
+        this.pack = configPack;
+
+        this.delegate = new DefaultChunkGenerator3D(pack, TerraForgePlugin.getInstance());
+        delegate.getMain().logger().info("Loading world with config pack " + pack.getTemplate().getID());
+        this.biomeSource = biomeSource;
+
+        this.seed = seed;
+    }
+
+    @Override
+    protected @NotNull Codec<? extends ChunkGenerator> codec() {
+        return CODEC;
+    }
+
+    @Override
+    public @NotNull ChunkGenerator withSeed(long seed) {
+        return new ForgeChunkGeneratorWrapper((TerraBiomeSource) this.biomeSource.withSeed(seed), seed, pack);
+    }
+
+    @Override
+    public void buildSurfaceAndBedrock(@NotNull WorldGenRegion p_225551_1_, @NotNull IChunk p_225551_2_) {
+
+    }
+
+    @Nullable
+    @Override
+    public BlockPos findNearestMapFeature(@NotNull ServerWorld world, @NotNull Structure<?> feature, @NotNull BlockPos center, int radius, boolean skipExistingChunks) {
+        if(!pack.getTemplate().disableStructures()) {
+            String name = Objects.requireNonNull(Registry.STRUCTURE_FEATURE.getKey(feature)).toString();
+            TerraWorld terraWorld = TerraForgePlugin.getInstance().getWorld((World) world);
+            TerraStructure located = pack.getStructure(pack.getTemplate().getLocatable().get(name));
+            if(located != null) {
+                CompletableFuture<BlockPos> result = new CompletableFuture<>();
+                AsyncStructureFinder finder = new AsyncStructureFinder(terraWorld.getBiomeProvider(), located, ForgeAdapter.adapt(center).toLocation((World) world), 0, 500, location -> {
+                    result.complete(ForgeAdapter.adapt(location));
+                }, TerraForgePlugin.getInstance());
+                finder.run(); // Do this synchronously.
+                try {
+                    return result.get();
+                } catch(InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return super.findNearestMapFeature(world, feature, center, radius, skipExistingChunks);
+    }
+
+    @Override
+    public boolean hasStronghold(@NotNull ChunkPos p_235952_1_) {
+        if(pack.getTemplate().vanillaStructures()) return super.hasStronghold(p_235952_1_);
+        return false;
+    }
+
+    @Override
+    public void createStructures(@NotNull DynamicRegistries dynamicRegistries, @NotNull StructureManager manager, @NotNull IChunk chunk, @NotNull TemplateManager templateManager, long p_242707_5_) {
+        if(pack.getTemplate().vanillaStructures()) super.createStructures(dynamicRegistries, manager, chunk, templateManager, p_242707_5_);
+    }
+
+    @Override
+    public void applyCarvers(long p_230350_1_, @NotNull BiomeManager biomeManager, @NotNull IChunk chunk, GenerationStage.@NotNull Carving carving) {
+        if(pack.getTemplate().vanillaCaves()) super.applyCarvers(p_230350_1_, biomeManager, chunk, carving);
+    }
+
+    @Override
+    public void fillFromNoise(@NotNull IWorld world, @NotNull StructureManager p_230352_2_, @NotNull IChunk chunk) {
+        delegate.generateChunkData((World) world, new FastRandom(), chunk.getPos().x, chunk.getPos().z, (ChunkData) chunk);
+    }
+
+    @Override
+    public int getBaseHeight(int x, int z, Heightmap.@NotNull Type type) {
+        TerraWorld world = TerraForgePlugin.getInstance().getWorld(dimensionType);
+        int height = world.getWorld().getMaxHeight();
+        while(height >= 0 && !type.isOpaque().test(((ForgeBlockData) world.getUngeneratedBlock(x, height - 1, z)).getHandle())) {
+            height--;
+        }
+        return height;
+    }
+
+    @Override
+    public @NotNull IBlockReader getBaseColumn(int x, int z) {
+        TerraWorld world = TerraForgePlugin.getInstance().getWorld(dimensionType);
+        int height = getBaseHeight(x, z, Heightmap.Type.WORLD_SURFACE);
+        BlockState[] array = new BlockState[256];
+        for(int y = 255; y >= 0; y--) {
+            if(y > height) {
+                if(y > ((UserDefinedBiome) world.getBiomeProvider().getBiome(x, z)).getConfig().getSeaLevel()) {
+                    array[y] = Blocks.AIR.defaultBlockState();
+                } else {
+                    array[y] = Blocks.WATER.defaultBlockState();
+                }
+            } else {
+                array[y] = Blocks.STONE.defaultBlockState();
+            }
+        }
+
+        return new Blockreader(array);
+    }
+
+    @Override
+    public void spawnOriginalMobs(WorldGenRegion region) {
+        if(pack.getTemplate().vanillaMobs()) {
+            int cx = region.getCenterX();
+            int cy = region.getCenterZ();
+            Biome biome = region.getBiome((new ChunkPos(cx, cy)).getWorldPosition());
+            SharedSeedRandom chunkRandom = new SharedSeedRandom();
+            chunkRandom.setDecorationSeed(region.getSeed(), cx << 4, cy << 4);
+            WorldEntitySpawner.spawnMobsForChunkGeneration(region, biome, cx, cy, chunkRandom);
+        }
+    }
+
+    @Override
+    public List<MobSpawnInfo.Spawners> getMobsAt(Biome p_230353_1_, StructureManager p_230353_2_, EntityClassification p_230353_3_, BlockPos p_230353_4_) {
+        List<MobSpawnInfo.Spawners> spawns = net.minecraftforge.common.world.StructureSpawnManager.getStructureSpawns(p_230353_2_, p_230353_3_, p_230353_4_);
+        if(spawns != null) return spawns;
+        return super.getMobsAt(p_230353_1_, p_230353_2_, p_230353_3_, p_230353_4_);
+    }
+
+    @Override
+    public TerraChunkGenerator getHandle() {
+        return delegate;
+    }
+
+    public void setDimensionType(DimensionType dimensionType) {
+        this.dimensionType = dimensionType;
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/generation/PopulatorFeature.java

@@ -1,9 +1,7 @@
-package com.dfsek.terra.forge.world.features;
+package com.dfsek.terra.forge.generation;
 
-import com.dfsek.terra.forge.world.generator.ForgeChunkGenerator;
-import com.dfsek.terra.forge.world.generator.ForgeChunkGeneratorWrapper;
-import com.dfsek.terra.forge.world.handles.ForgeWorld;
-import com.dfsek.terra.forge.world.handles.chunk.ForgeChunkWorldAccess;
+import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.platform.world.World;
 import com.mojang.serialization.Codec;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ISeedReader;
@@ -23,11 +21,9 @@ public class PopulatorFeature extends Feature<NoFeatureConfig> {
     }
 
     @Override
-    public boolean place(@NotNull ISeedReader world, @NotNull ChunkGenerator generator, @NotNull Random random, BlockPos pos, @NotNull NoFeatureConfig config) {
+    public boolean place(@NotNull ISeedReader world, @NotNull ChunkGenerator generator, @NotNull Random random, @NotNull BlockPos pos, @NotNull NoFeatureConfig config) {
         ForgeChunkGeneratorWrapper gen = (ForgeChunkGeneratorWrapper) generator;
-        ForgeChunkWorldAccess chunk = new ForgeChunkWorldAccess(world, pos.getX() >> 4, pos.getZ() >> 4);
-        ForgeWorld world1 = new ForgeWorld(world.getLevel(), new ForgeChunkGenerator(generator));
-        gen.getHandle().getPopulators().forEach(populator -> populator.populate(world1, chunk));
+        gen.getHandle().getPopulators().forEach(populator -> populator.populate((World) world, (Chunk) world));
         return true;
     }
 

platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java

@@ -1,8 +1,9 @@
-package com.dfsek.terra.forge.world;
+package com.dfsek.terra.forge.generation;
 
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.forge.ForgeUtil;
 import com.dfsek.terra.forge.TerraForgePlugin;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
@@ -51,6 +52,6 @@ public class TerraBiomeSource extends net.minecraft.world.biome.provider.BiomePr
     @Override
     public @NotNull Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) {
         UserDefinedBiome biome = (UserDefinedBiome) grid.getBiome(biomeX << 2, biomeZ << 2);
-        return Objects.requireNonNull(biomeRegistry.get(new ResourceLocation("terra", TerraForgePlugin.createBiomeID(pack, biome.getID()))));
+        return Objects.requireNonNull(biomeRegistry.get(new ResourceLocation("terra", ForgeUtil.createBiomeID(pack, biome.getID()))));
     }
 }

platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.forge.generation;
+
+import com.dfsek.terra.config.pack.ConfigPack;
+import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.ChunkGenerator;
+import net.minecraft.world.gen.DimensionSettings;
+import org.jetbrains.annotations.NotNull;
+
+public class TerraGeneratorType extends BiomeGeneratorTypeScreens {
+    private final ConfigPack pack;
+
+    public TerraGeneratorType(ConfigPack pack) {
+        super(new StringTextComponent("Terra:" + pack.getTemplate().getID()));
+        this.pack = pack;
+    }
+
+    @Override
+    protected @NotNull ChunkGenerator generator(@NotNull Registry<Biome> biomeRegistry, @NotNull Registry<DimensionSettings> chunkGeneratorSettingsRegistry, long seed) {
+        return new ForgeChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
+    }
+}

platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeItemHandle.java

@@ -1,14 +1,12 @@
-package com.dfsek.terra.forge.inventory;
+package com.dfsek.terra.forge.handle;
 
 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.forge.world.ForgeAdapter;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.command.arguments.ItemArgument;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Set;
@@ -19,7 +17,7 @@ public class ForgeItemHandle implements ItemHandle {
     @Override
     public Item createItem(String data) {
         try {
-            return ForgeAdapter.adapt(new ItemArgument().parse(new StringReader(data)).getItem());
+            return (Item) new ItemArgument().parse(new StringReader(data)).getItem();
         } catch(CommandSyntaxException e) {
             throw new IllegalArgumentException("Invalid item data \"" + data + "\"", e);
         }
@@ -27,11 +25,11 @@ public class ForgeItemHandle implements ItemHandle {
 
     @Override
     public Enchantment getEnchantment(String id) {
-        return ForgeAdapter.adapt(ForgeRegistries.ENCHANTMENTS.getValue(ResourceLocation.tryParse(id)));
+        return (Enchantment) ForgeRegistries.ENCHANTMENTS.getValue(ResourceLocation.tryParse(id));
     }
 
     @Override
     public Set<Enchantment> getEnchantments() {
-        return ForgeRegistries.ENCHANTMENTS.getEntries().stream().map(entry -> ForgeAdapter.adapt(entry.getValue())).collect(Collectors.toSet());
+        return ForgeRegistries.ENCHANTMENTS.getEntries().stream().map(entry -> (Enchantment) entry.getValue()).collect(Collectors.toSet());
     }
 }

platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeWorldHandle.java

@@ -1,14 +1,14 @@
-package com.dfsek.terra.forge.world;
+package com.dfsek.terra.forge.handle;
 
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.forge.world.block.ForgeBlockData;
+import com.dfsek.terra.forge.ForgeAdapter;
+import com.dfsek.terra.forge.block.ForgeBlockData;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.block.BlockState;
 import net.minecraft.command.arguments.BlockStateParser;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Locale;
@@ -31,6 +31,6 @@ public class ForgeWorldHandle implements WorldHandle {
     public EntityType getEntity(String id) {
         ResourceLocation identifier = ResourceLocation.tryParse(id);
         if(identifier == null) identifier = ResourceLocation.tryParse("minecraft:" + id.toLowerCase(Locale.ROOT));
-        return ForgeAdapter.adapt(ForgeRegistries.ENTITIES.getValue(identifier));
+        return (EntityType) ForgeRegistries.ENTITIES.getValue(identifier);
     }
 }