create DimensionConfig

improve fabric/forge getHeight impl
override entity spawning stuff
2026-05-20 08:40:26 +00:00 · 2021-05-29 00:39:32 -07:00 · 2021-05-29 00:22:41 -07:00 · 2021-05-29 00:19:04 -07:00 · 2021-05-22 21:48:12 -07:00 · 2021-05-22 21:37:16 -07:00
38 changed files with 1159 additions and 518 deletions
@@ -1,6 +1,6 @@
 import com.dfsek.terra.getGitHash

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

 allprojects {
    version = versionObj
@@ -1,5 +1,7 @@
 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.pack.ConfigPack;

@@ -8,13 +10,28 @@ import com.dfsek.terra.config.pack.ConfigPack;
 */
 public abstract class ConfigPackLoadEvent implements PackEvent {
    private final ConfigPack pack;
+    private final ExceptionalConsumer<ConfigTemplate> configLoader;

-    public ConfigPackLoadEvent(ConfigPack pack) {
+    public ConfigPackLoadEvent(ConfigPack pack, ExceptionalConsumer<ConfigTemplate> configLoader) {
        this.pack = pack;
+        this.configLoader = configLoader;
    }

    @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;
+    }
 }
@@ -1,12 +1,13 @@
 package com.dfsek.terra.api.event.events.config;

+import com.dfsek.tectonic.config.ConfigTemplate;
 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> loader) {
+        super(pack, loader);
    }
 }
@@ -1,12 +1,14 @@
 package com.dfsek.terra.api.event.events.config;

+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.tectonic.exception.ConfigException;
 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) {
+        super(pack, configLoader);
    }
 }
@@ -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);
-    }
-}
@@ -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;
+    }
 }
@@ -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;
-    }
-}
@@ -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)));
+
                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)));
+
                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)));
        main.logger().info("Loaded config pack \"" + template.getID() + "\" v" + template.getVersion() + " by " + template.getAuthor() + " in " + (System.nanoTime() - start) / 1000000D + "ms.");
    }

@@ -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;
            }
@@ -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/"
@@ -27,8 +27,6 @@ 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")
@@ -1,5 +1,8 @@
 package com.dfsek.terra.fabric;

+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,144 +11,136 @@ 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.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.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.DimensionConfig;
+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.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.FileInputStream;
+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;
-

 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 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 DimensionConfig dimensionConfig = new DimensionConfig();
+
    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();
+            .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;
@@ -153,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;
    }

@@ -182,7 +174,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {

    @Override
    public boolean isDebug() {
-        return true;
+        return config.isDebug();
    }

    @Override
@@ -205,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;
    }

@@ -246,70 +235,30 @@ 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));
-    }
-
-    private Biome createBiome(BiomeBuilder biome) {
-        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(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();
+                .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;
+                });
    }

    public void packInit() {
        logger.info("Loading config packs...");
        registry.loadAll(this);

-        registry.forEach(pack -> pack.getBiomeRegistry().forEach((id, biome) -> Registry.register(BuiltinRegistries.BIOME, new Identifier("terra", createBiomeID(pack, id)), createBiome(biome)))); // Register all Terra biomes.
+        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.

-        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);
-            });
+        File configFile = new File(getDataFolder(), "config.yml");
+        ConfigLoader loader = new ConfigLoader();
+        loader.registerLoader(ConfigPack.class, registry);
+        register(loader);
+        try {
+            logger.info("Loading dimension config...");
+            loader.load(dimensionConfig, new FileInputStream(configFile));
+            logger.info("Loaded " + dimensionConfig.getDimensionPacks().size() + " dimension overrides.");
+        } catch(ConfigException | FileNotFoundException e) {
+            throw new RuntimeException("Failed to load dimension config", e);
        }

        logger.info("Loaded packs.");
@@ -322,6 +271,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...");

@@ -331,76 +281,22 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        logger.info("Loaded addons.");


-
-        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.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), FabricChunkGeneratorWrapper.CODEC);
        Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), TerraBiomeSource.CODEC);

-        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));
-                }
-        );
        logger.info("Finished initialization.");
    }

-    private RequiredArgumentBuilder<ServerCommandSource, String> assemble(RequiredArgumentBuilder<ServerCommandSource, String> in, CommandManager manager) {
-        return in.suggests((context, builder) -> {
-            List<String> args = parseCommand(context.getInput());
-            CommandSender sender = (CommandSender) context.getSource();
-            try {
-                sender = (Entity) context.getSource().getEntityOrThrow();
-            } catch(CommandSyntaxException ignore) {
-            }
-            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;
-    }
-

    @Override
    public EventManager getEventManager() {
@@ -415,10 +311,12 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
    @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 FabricAddon(TerraPlugin main) {
            this.main = main;
        }
@@ -451,6 +349,40 @@ 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);
+
+            PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
+            try {
+                event.loadTemplate(template);
+            } 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 {
+                event.loadTemplate(template);
+            } catch(ConfigException e) {
+                e.printStackTrace();
+            }
+
+            templates.get(event.getPack()).setRight(template);
        }


@@ -460,5 +392,9 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
            } catch(DuplicateEntryException ignore) {
            }
        }
+
+        public Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> getTemplates() {
+            return templates;
+        }
    }
 }
@@ -0,0 +1,21 @@
+package com.dfsek.terra.fabric.config;
+
+import com.dfsek.tectonic.annotations.Default;
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.config.pack.ConfigPack;
+import net.minecraft.util.Identifier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class DimensionConfig implements ConfigTemplate {
+    @Value("dimensions")
+    @Default
+    private Map<Identifier, ConfigPack> dimensionPacks = new HashMap<>();
+
+    public Map<Identifier, ConfigPack> getDimensionPacks() {
+        return dimensionPacks;
+    }
+}
@@ -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;
+    }
+}
@@ -0,0 +1,52 @@
+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-biome.enable")
+    @Default
+    private boolean doBiomeInjection = false;
+
+    @Value("features.inject-registry.excluded-features")
+    @Default
+    private Set<Identifier> excludedRegistryFeatures = new HashSet<>();
+
+    @Value("features.inject-biome.excluded-features")
+    @Default
+    private Set<Identifier> excludedBiomeFeatures = new HashSet<>();
+
+    @Value("structures.inject-biome.excluded-features")
+    @Default
+    private Set<Identifier> excludedBiomeStructures = new HashSet<>();
+
+    public boolean doBiomeInjection() {
+        return doBiomeInjection;
+    }
+
+    public boolean doRegistryInjection() {
+        return doRegistryInjection;
+    }
+
+    public Set<Identifier> getExcludedBiomeFeatures() {
+        return excludedBiomeFeatures;
+    }
+
+    public Set<Identifier> getExcludedRegistryFeatures() {
+        return excludedRegistryFeatures;
+    }
+
+    public Set<Identifier> getExcludedBiomeStructures() {
+        return excludedBiomeStructures;
+    }
+}
@@ -4,10 +4,12 @@ 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.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;
@@ -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,26 +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;
+        return super.locateStructure(world, feature, center, radius, skipExistingChunks);
    }

    @Override
@@ -127,32 +142,28 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener

    @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();
@@ -165,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;
@@ -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;
-    }
-
-
 }
@@ -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);
+    }
+}
@@ -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;
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -1,8 +1,12 @@
 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;
@@ -15,5 +19,11 @@ public class MinecraftClientMixin {
            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);
+        });
    }
 }
@@ -0,0 +1,117 @@
+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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+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 = BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE.getId(structureFeature.get());
+            if(!compatibilityOptions.getExcludedBiomeStructures().contains(key) && !postLoadCompatibilityOptions.getExcludedPerBiomeStructures().getOrDefault(biome, Collections.emptySet()).contains(key)) {
+                generationSettings.structureFeature(structureFeature.get());
+                TerraFabricPlugin.getInstance().getDebugLogger().info("Injected structure " + key);
+            }
+        }
+
+        if(compatibilityOptions.doBiomeInjection()) {
+            for(int step = 0; step < vanilla.getGenerationSettings().getFeatures().size(); step++) {
+                for(Supplier<ConfiguredFeature<?, ?>> featureSupplier : vanilla.getGenerationSettings().getFeatures().get(step)) {
+                    Identifier key = BuiltinRegistries.CONFIGURED_FEATURE.getId(featureSupplier.get());
+                    if(!compatibilityOptions.getExcludedBiomeFeatures().contains(key) && !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();
+    }
+}
@@ -25,7 +25,6 @@
  ],
  "depends": {
    "fabricloader": ">=0.7.4",
-    "fabric": "*",
    "minecraft": "1.16.x"
  },
  "accessWidener": "terra.accesswidener"
@@ -4,7 +4,9 @@
  "package": "com.dfsek.terra.fabric.mixin",
  "compatibilityLevel": "JAVA_8",
  "mixins": [
+    "CommandManagerMixin",
    "GeneratorOptionsMixin",
+    "ServerWorldMixin",
    "access.BiomeEffectsAccessor",
    "access.MobSpawnerLogicAccessor",
    "access.StateAccessor",
@@ -1,36 +1,78 @@
 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 net.minecraft.block.Blocks;
+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.surfacebuilders.SurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig;
+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);
    }

-    @SuppressWarnings("ConstantConditions")
-    public static Biome createBiome(BiomeBuilder biome) {
+    public static Biome createBiome(BiomeBuilder biome, ConfigPack pack, TerraForgePlugin.ForgeAddon forgeAddon) {
        BiomeTemplate template = biome.getTemplate();
        Map<String, Integer> colors = template.getColors();

-        Biome vanilla = (Biome) ((Object) new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0));
+        Biome vanilla = (Biome) (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.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()))
@@ -44,7 +86,7 @@ public final class ForgeUtil {
        } else {
            vanillaEffects.getGrassColorOverride().ifPresent(effects::grassColorOverride);
        }
-        vanillaEffects.getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+
        if(colors.containsKey("foliage")) {
            effects.foliageColorOverride(colors.get("foliage"));
        } else {
@@ -61,6 +103,7 @@ public final class ForgeUtil {
                .specialEffects(effects.build())
                .mobSpawnSettings(vanilla.getMobSettings())
                .generationSettings(generationSettings.build())
-                .build().setRegistryName("terra", createBiomeID(template.getPack(), template.getID()));
+                .build()
+                .setRegistryName("terra", createBiomeID(template.getPack(), template.getID()));
    }
 }
@@ -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;
@@ -14,6 +16,7 @@ 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.block.BlockData;
 import com.dfsek.terra.api.platform.handle.ItemHandle;
@@ -22,9 +25,10 @@ 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.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.commands.CommandUtil;
 import com.dfsek.terra.config.GenericLoaders;
@@ -32,6 +36,8 @@ import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
+import com.dfsek.terra.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;
@@ -45,6 +51,9 @@ import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.world.TerraWorld;
 import net.minecraft.util.ResourceLocation;
 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.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.Features;
@@ -52,10 +61,12 @@ 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.server.ServerWorld;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 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;
@@ -78,7 +89,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();
@@ -109,12 +120,15 @@ public class TerraForgePlugin implements TerraPlugin {
    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();
+            .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() {
@@ -123,6 +137,7 @@ public class TerraForgePlugin implements TerraPlugin {
        this.dataFolder = Paths.get("config", "Terra").toFile();
        saveDefaultConfig();
        config.load(this);
+        debugLogger.setDebug(config.isDebug());
        LangUtil.load(config.getLanguage(), this);
        try {
            CommandUtil.registerAll(manager);
@@ -143,7 +158,7 @@ public class TerraForgePlugin implements TerraPlugin {
        });
    }

-    public void setup() {
+    public void init() {
        logger.info("Initializing Terra...");

        if(!addonRegistry.loadAll()) {
@@ -153,6 +168,10 @@ public class TerraForgePlugin implements TerraPlugin {

        registry.loadAll(this);
        logger.info("Loaded packs.");
+
+        ((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
@@ -162,10 +181,13 @@ 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) world.getGenerator()).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;
    }

    /**
@@ -191,12 +213,6 @@ public class TerraForgePlugin implements TerraPlugin {
        return JarUtil.getJarFile();
    }

-    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;
@@ -237,14 +253,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;
    }

@@ -278,7 +291,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) -> 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
@@ -295,10 +313,16 @@ public class TerraForgePlugin implements TerraPlugin {
        return 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;

@@ -334,6 +358,39 @@ 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);
        }


@@ -343,5 +400,9 @@ public class TerraForgePlugin implements TerraPlugin {
            } catch(DuplicateEntryException ignore) {
            }
        }
+
+        public Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> getTemplates() {
+            return templates;
+        }
    }
 }
@@ -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;
+    }
+}
@@ -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;
+    }
+}
@@ -4,32 +4,53 @@ 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;
@@ -49,8 +70,10 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera
        return pack;
    }

+    private DimensionType dimensionType;
+
    public ForgeChunkGeneratorWrapper(TerraBiomeSource biomeSource, long seed, ConfigPack configPack) {
-        super(biomeSource, new DimensionStructuresSettings(false));
+        super(biomeSource, new DimensionStructuresSettings(configPack.getTemplate().vanillaStructures()));
        this.pack = configPack;

        this.delegate = new DefaultChunkGenerator3D(pack, TerraForgePlugin.getInstance());
@@ -75,8 +98,32 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera

    }

+    @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;
    }

@@ -96,28 +143,23 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera
    }

    @Override
-    public int getBaseHeight(int x, int z, Heightmap.@NotNull Type p_222529_3_) {
-        TerraWorld world = TerraForgePlugin.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);
-
+    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 && sampler.sample(cx, height - 1, cz) < 0) {
+        while(height >= 0 && !type.isOpaque().test(((ForgeBlockData) world.getUngeneratedBlock(x, height-1, z)).getHandle())) {
            height--;
        }
-
        return height;
    }

    @Override
-    public @NotNull IBlockReader getBaseColumn(int p_230348_1_, int p_230348_2_) {
-        int height = 64; // TODO: implementation
+    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 > getSeaLevel()) {
+                if(y > ((UserDefinedBiome) world.getBiomeProvider().getBiome(x, z)).getConfig().getSeaLevel()) {
                    array[y] = Blocks.AIR.defaultBlockState();
                } else {
                    array[y] = Blocks.WATER.defaultBlockState();
@@ -130,9 +172,31 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera
        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;
+    }
 }
@@ -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);
+    }
+}
@@ -1,22 +0,0 @@
-package com.dfsek.terra.forge.generation;
-
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.forge.TerraForgePlugin;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.ChunkGenerator;
-import net.minecraft.world.gen.DimensionSettings;
-import net.minecraftforge.common.world.ForgeWorldType;
-
-public class TerraLevelType implements ForgeWorldType.IChunkGeneratorFactory {
-    public static final TerraLevelType TERRA_LEVEL_TYPE = new TerraLevelType();
-    public static final ForgeWorldType FORGE_WORLD_TYPE = new ForgeWorldType(TERRA_LEVEL_TYPE).setRegistryName("terra", "world");
-    @Override
-    public ChunkGenerator createChunkGenerator(Registry<Biome> biomeRegistry, Registry<DimensionSettings> dimensionSettingsRegistry, long seed, String generatorSettings) {
-        System.out.println(generatorSettings);
-        dimensionSettingsRegistry.forEach(System.out::println);
-        ConfigPack pack = TerraForgePlugin.getInstance().getConfigRegistry().get("DEFAULT");
-        TerraForgePlugin.getInstance().logger().info("Creating generator for config pack " + pack.getTemplate().getID());
-        return new ForgeChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack);
-    }
-}
@@ -1,50 +0,0 @@
-package com.dfsek.terra.forge.listener;
-
-import com.dfsek.terra.api.util.mutable.MutableInteger;
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.forge.TerraForgePlugin;
-import com.dfsek.terra.forge.generation.TerraLevelType;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ForgeWorldTypeScreens;
-import net.minecraftforge.common.world.ForgeWorldType;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
-public class ClientListener {
-    private static final TerraForgePlugin INSTANCE = TerraForgePlugin.getInstance();
-
-    @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.getConfigRegistry().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);
-            }
-        });
-    }
-}
@@ -1,31 +1,13 @@
 package com.dfsek.terra.forge.listener;

-import com.dfsek.terra.forge.ForgeUtil;
 import com.dfsek.terra.forge.TerraForgePlugin;
-import com.dfsek.terra.forge.generation.TerraLevelType;
-import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.feature.Feature;
-import net.minecraftforge.common.world.ForgeWorldType;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;

@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
 public class RegistryListener {
-    private static final TerraForgePlugin INSTANCE = TerraForgePlugin.getInstance();
-
-    @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 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(ForgeUtil.createBiome(biome)))); // Register all Terra biomes.
-    }
-
    @SubscribeEvent
    public static void registerPop(RegistryEvent.Register<Feature<?>> event) {
        event.getRegistry().register(TerraForgePlugin.POPULATOR_FEATURE);
@@ -0,0 +1,37 @@
+package com.dfsek.terra.forge.mixin;
+
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.forge.TerraForgePlugin;
+import com.dfsek.terra.forge.generation.ForgeChunkGeneratorWrapper;
+import com.dfsek.terra.world.TerraWorld;
+import net.minecraft.world.DimensionType;
+import net.minecraft.world.World;
+import net.minecraft.world.server.ServerChunkProvider;
+import net.minecraft.world.server.ServerWorld;
+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.Redirect;
+
+@Mixin(ServerWorld.class)
+public abstract class ServerWorldMixin {
+    @Shadow
+    @Final
+    private ServerChunkProvider chunkSource;
+
+    @Shadow
+    protected abstract void initCapabilities();
+
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerWorld;initCapabilities()V"))
+    public void injectConstructor(ServerWorld serverWorld) {
+        if(chunkSource.getGenerator() instanceof ForgeChunkGeneratorWrapper) {
+            ForgeChunkGeneratorWrapper chunkGeneratorWrapper = (ForgeChunkGeneratorWrapper) chunkSource.getGenerator();
+            DimensionType dimensionType = ((World) (Object) this).dimensionType();
+            TerraForgePlugin.getInstance().getWorldMap().put(dimensionType, Pair.of((ServerWorld) (Object) this, new TerraWorld((com.dfsek.terra.api.platform.world.World) this, chunkGeneratorWrapper.getPack(), TerraForgePlugin.getInstance())));
+            chunkGeneratorWrapper.setDimensionType(dimensionType);
+            TerraForgePlugin.getInstance().logger().info("Registered world " + this + " to dimension type " + dimensionType);
+        }
+        initCapabilities();
+    }
+}
@@ -0,0 +1,21 @@
+package com.dfsek.terra.forge.mixin.access;
+
+import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens;
+import net.minecraft.util.text.ITextComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(BiomeGeneratorTypeScreens.class)
+public interface BiomeGeneratorTypeScreensAccessor {
+    @Accessor("PRESETS")
+    static List<BiomeGeneratorTypeScreens> getPresets() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Mutable
+    @Accessor
+    void setDescription(ITextComponent description);
+}
@@ -0,0 +1,29 @@
+package com.dfsek.terra.forge.mixin.init;
+
+import com.dfsek.terra.forge.TerraForgePlugin;
+import com.dfsek.terra.forge.generation.TerraGeneratorType;
+import com.dfsek.terra.forge.mixin.access.BiomeGeneratorTypeScreensAccessor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens;
+import net.minecraft.resources.ResourcePackList;
+import net.minecraft.util.text.StringTextComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(Minecraft.class)
+public abstract class MinecraftClientMixin {
+    @Redirect(method = "<init>", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/resources/ResourcePackList;reload()V" // sorta arbitrary position, after mod init, before window opens
+    ))
+    public void injectConstructor(ResourcePackList resourcePackList) {
+        TerraForgePlugin.getInstance().init(); // Load during MinecraftClient construction, after other mods have registered blocks and stuff
+        TerraForgePlugin.getInstance().getConfigRegistry().forEach(pack -> {
+            final BiomeGeneratorTypeScreens generatorType = new TerraGeneratorType(pack);
+            //noinspection ConstantConditions
+            ((BiomeGeneratorTypeScreensAccessor) generatorType).setDescription(new StringTextComponent("Terra:" + pack.getTemplate().getID()));
+            BiomeGeneratorTypeScreensAccessor.getPresets().add(1, generatorType);
+        });
+        resourcePackList.reload();
+    }
+}
@@ -0,0 +1,16 @@
+package com.dfsek.terra.forge.mixin.init;
+
+import com.dfsek.terra.forge.TerraForgePlugin;
+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 MinecraftServerMixin {
+    @Inject(method = "main([Ljava/lang/String;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/registry/DynamicRegistries;builtin()Lnet/minecraft/util/registry/DynamicRegistries$Impl;"))
+    private static void injectConstructor(String[] args, CallbackInfo ci) {
+        TerraForgePlugin.getInstance().init(); // Load during MinecraftServer construction, after other mods have registered blocks and stuff
+    }
+}
@@ -5,7 +5,9 @@
  "refmap": "terra-refmap.json",
  "mixins": [
    "DimensionGeneratorSettingsMixin",
+    "ServerWorldMixin",
    "access.AbstractSpawnerAccessor",
+    "access.BiomeGeneratorTypeScreensAccessor",
    "implementations.BiomeMixin",
    "implementations.ChunkGeneratorMixin",
    "implementations.ConfiguredFeatureMixin",
@@ -31,6 +33,10 @@
    "implementations.world.WorldGenRegionMixin"
  ],
  "client": [
+    "init.MinecraftClientMixin"
+  ],
+  "server": [
+    "init.MinecraftServerMixin"
  ],
  "injectors": {
    "defaultRequire": 1
Author	SHA1	Message	Date
dfsek	33ef6a1ded	create DimensionConfig	2021-05-29 00:39:32 -07:00
dfsek	94d7f783c4	improve fabric/forge getHeight impl	2021-05-29 00:22:41 -07:00
dfsek	5fbcdea9e7	override entity spawning stuff	2021-05-29 00:19:04 -07:00
dfsek	fa164e5281	Merge pull request #199 from PolyhedralDev/dev/forge-tweaks Forge Tweaks	2021-05-22 21:48:12 -07:00
dfsek	ec3b0e5d04	implement vanilla mob override	2021-05-22 21:37:16 -07:00
dfsek	4c63c2681f	implement ForgeChunkGeneratorWrapper#getBaseColumn	2021-05-22 21:34:28 -07:00
dfsek	dd661feaf1	implement dimension type injection/caching	2021-05-22 21:24:25 -07:00
dfsek	1f17bfff1b	delegate strongholds to vanilla if vanilla structures are enabled	2021-05-22 21:12:44 -07:00
dfsek	809a0b375d	implement identifier loader	2021-05-22 21:11:52 -07:00
dfsek	d55b3415ac	implement structure locate override on Forge	2021-05-22 21:08:51 -07:00
dfsek	edcb818842	basic compatibility stuff on Forge	2021-05-22 18:03:34 -07:00
dfsek	1e429e1bb3	create forge compatibility configs	2021-05-22 17:11:50 -07:00
dfsek	3472859afb	remove unused event handlers	2021-05-22 17:10:50 -07:00
dfsek	26025ec276	remove unused class	2021-05-22 00:19:38 -07:00
dfsek	3b3905b513	mixin injection on client in forge	2021-05-21 23:36:20 -07:00
dfsek	ce3d09cf2e	add background to pack selection GUI	2021-05-19 09:23:20 -07:00
dfsek	5dd00db8d2	Merge pull request #191 from PolyhedralDev/dev/fabric-compat Options for mod compatibility on Fabric	2021-05-18 20:07:24 -07:00
dfsek	2dc7b50141	implement getColumnSample	2021-05-18 19:50:05 -07:00
dfsek	b2ebcc63aa	Merge remote-tracking branch 'origin/dev/fabric-compat' into dev/fabric-compat	2021-05-18 18:26:34 -07:00
dfsek	f45bc0a0cc	Merge remote-tracking branch 'origin/dev/fabric-compat' into dev/fabric-compat	2021-05-18 18:25:46 -07:00
dfsek	bbe53cbca3	fix height again	2021-05-18 18:25:31 -07:00
dfsek	7354155c52	bump version	2021-05-18 18:19:25 -07:00
dfsek	c1acfee910	Merge pull request #189 from Shadowhackercz/master Creating new locale for Czech	2021-05-18 17:56:31 -07:00
dfsek	5287323865	only inject carvers if vanilla.caves is enabled	2021-05-18 09:24:20 -07:00
dfsek	b09d0e42aa	fix biome specific exclusions	2021-05-18 09:06:43 -07:00
dfsek	a3f14061dd	fix structure location	2021-05-17 23:04:21 -07:00
dfsek	557098de17	use debug logger for feature info	2021-05-17 22:48:03 -07:00
dfsek	2fdb96a850	cleanup and add per-biome exclusions	2021-05-17 22:45:39 -07:00
dfsek	d93d064d97	fix getHeight	2021-05-17 20:50:27 -07:00
dfsek	ae76fb7dc4	use dimensiontype to get world	2021-05-17 20:16:32 -07:00
dfsek	2626afd066	override entity generation	2021-05-17 19:41:45 -07:00
dfsek	c0042cfb6b	switch to DimensionType map	2021-05-17 19:39:46 -07:00
dfsek	a549d2ef34	move client init code to MinecraftClientMixin	2021-05-17 19:26:25 -07:00
dfsek	4aa20c32b8	fix fabric debuglogger	2021-05-17 17:35:56 -07:00
dfsek	ce7033b4ca	filter out non-Terra biomes in TerraBiomeSource	2021-05-17 10:07:22 -07:00
dfsek	41a54f4b25	vanilla structures	2021-05-17 10:07:06 -07:00
dfsek	f96740f1fa	refactor util classes	2021-05-17 08:38:03 -07:00
Shadowhacker	8844cd5069	Creating new locale for Czech I've created a new localization file for Czech language	2021-05-17 03:53:07 +02:00
dfsek	800d846af4	carver and structure compatibility options	2021-05-16 16:47:17 -07:00
dfsek	95d50a0391	resolve merge conflicts	2021-05-16 00:42:29 -07:00
dfsek	5a83eab1fe	Merge remote-tracking branch 'origin/master' into dev/fabric-compat # Conflicts: # platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java	2021-05-16 00:34:42 -07:00
dfsek	bac026a1f4	Merge pull request #187 from PolyhedralDev/dev/fabric-no-api Remove dependency on Fabric API	2021-05-15 21:18:27 -07:00
dfsek	65482c493a	remove dependency on Fabric API	2021-05-15 20:30:06 -07:00
dfsek	242e56b1d8	conditional biome injection	2021-05-12 09:27:20 -07:00
dfsek	4c7aa11353	clean up TerraFabricPlugin	2021-05-12 08:39:43 -07:00
dfsek	cac84ffe03	fix typo	2021-05-12 00:55:14 -07:00
dfsek	cf66e1e226	registry injection	2021-05-12 00:53:25 -07:00
dfsek	fa647e1e2c	make loadConfig less jank	2021-05-12 00:48:38 -07:00
dfsek	4203121d40	basic feature loading implementation	2021-05-12 00:33:00 -07:00
dfsek	82fe6d5aa4	add api to load custom values from pack manifest.	2021-05-12 00:09:21 -07:00
dfsek	32db83f091	remove NotNullValidator	2021-05-11 23:56:08 -07:00