- move fm

- tweaks to batching

Engine

@@ -1 +1 @@
-Subproject commit d60a706048b8013993f58d42ccaa8e1eb25a0601
+Subproject commit 67af3049fe2b82e8edb5cf0afb87cdf8314b2c97

FeatureManager

@@ -1 +1 @@
-Subproject commit 60fa2c047096cafc95f4db1ccaa07d3475de6e49
+Subproject commit 6cd959a0b0f3c5150ea70234c2c9b0a81d144d4a

build.gradle

@@ -91,6 +91,16 @@ task collectLibs(type: Copy) {
     duplicatesStrategy = "EXCLUDE"
 }
 
+task apiJar(type: Jar) {
+    from { zipTree(tasks.jar.archivePath) }
+    include "com/terraforged/fm/**"
+    include "com/terraforged/api/**"
+    include "com/terraforged/core/**"
+    include "com/terraforged/world/**"
+    include "me/dags/**"
+    classifier "api"
+}
+
 processResources {
     filesMatching("**/mods.toml") {
         expand("version": "${mod_version}${getClassifier()}", "mc_version": mc_version)
@@ -101,6 +111,10 @@ classes {
     dependsOn(collectLibs)
 }
 
+build {
+    finalizedBy(apiJar)
+}
+
 static def getClassifier() {
     if (System.getenv("GIT_TAG_NAME") != null) {
         return ""

src/main/java/com/terraforged/Log.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod;
+package com.terraforged;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/com/terraforged/TerraForgedMod.java

@@ -23,18 +23,18 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod;
+package com.terraforged;
 
 import com.terraforged.api.material.WGTags;
-import com.terraforged.mod.feature.manager.template.TemplateManager;
-import com.terraforged.mod.command.TerraCommand;
-import com.terraforged.mod.data.DataGen;
-import com.terraforged.mod.feature.context.ContextSelectorFeature;
-import com.terraforged.mod.feature.decorator.poisson.PoissonAtSurface;
-import com.terraforged.mod.feature.feature.DiskFeature;
-import com.terraforged.mod.settings.SettingsHelper;
-import com.terraforged.mod.util.DataPackFinder;
-import com.terraforged.mod.util.Environment;
+import com.terraforged.command.TerraCommand;
+import com.terraforged.data.DataGen;
+import com.terraforged.feature.decorator.poisson.PoissonAtSurface;
+import com.terraforged.feature.feature.DiskFeature;
+import com.terraforged.fm.template.TemplateManager;
+import com.terraforged.feature.context.ContextSelectorFeature;
+import com.terraforged.settings.SettingsHelper;
+import com.terraforged.util.DataPackFinder;
+import com.terraforged.util.Environment;
 import net.minecraft.world.biome.Biomes;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.OreFeatureConfig;

src/main/java/com/terraforged/TerraWorld.java

@@ -23,20 +23,20 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod;
+package com.terraforged;
 
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.chunk.ChunkGeneratorFactory;
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.TerraContext;
-import com.terraforged.mod.chunk.TerraGenSettings;
-import com.terraforged.mod.chunk.test.TestChunkGenerator;
-import com.terraforged.mod.gui.SettingsScreen;
-import com.terraforged.mod.settings.DimesionSettings;
-import com.terraforged.mod.settings.SettingsHelper;
-import com.terraforged.mod.settings.TerraSettings;
-import com.terraforged.mod.util.Environment;
-import com.terraforged.mod.util.nbt.NBTHelper;
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.chunk.ChunkGeneratorFactory;
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.TerraContext;
+import com.terraforged.chunk.TerraGenSettings;
+import com.terraforged.chunk.test.TestChunkGenerator;
+import com.terraforged.gui.SettingsScreen;
+import com.terraforged.settings.DimesionSettings;
+import com.terraforged.settings.SettingsHelper;
+import com.terraforged.settings.TerraSettings;
+import com.terraforged.util.Environment;
+import com.terraforged.util.nbt.NBTHelper;
 import com.terraforged.world.terrain.Terrains;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.CreateWorldScreen;

src/main/java/com/terraforged/api/event/SetupEvent.java

@@ -32,7 +32,7 @@ import com.terraforged.api.material.geology.GeologyManager;
 import com.terraforged.api.material.layer.LayerManager;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.terrain.provider.TerrainProvider;
-import com.terraforged.mod.feature.manager.modifier.FeatureModifiers;
+import com.terraforged.fm.modifier.FeatureModifiers;
 import net.minecraftforge.eventbus.api.Event;
 
 public abstract class SetupEvent<T> extends Event {

src/main/java/com/terraforged/biome/ColdSteppe.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/Dunes.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/FirForest.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/FlowerPlains.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.google.common.collect.ImmutableList;
 import com.terraforged.api.biome.BiomeVariant;

src/main/java/com/terraforged/biome/FrozenLake.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/Lake.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/Marshland.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/ModBiomes.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/biome/SavannaScrub.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.block.BlockState;

src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.block.BlockState;

src/main/java/com/terraforged/biome/SnowyFirForest.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/SnowyTaigaScrub.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/Steppe.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/TaigaScrub.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/WarmBeach.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome;
+package com.terraforged.biome;
 
 import com.terraforged.api.biome.BiomeVariant;
 import net.minecraft.entity.EntityClassification;

src/main/java/com/terraforged/biome/map/AbstractBiomeMap.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.terraforged.biome.provider.BiomeHelper;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.ModBiomes;
-import com.terraforged.mod.biome.provider.BiomeHelper;
+import com.terraforged.biome.ModBiomes;
 import me.dags.noise.util.NoiseUtil;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;

src/main/java/com/terraforged/biome/map/BasicBiomeMap.java

@@ -23,13 +23,13 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.terraforged.biome.provider.BiomeHelper;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.provider.BiomeHelper;
 import net.minecraft.world.biome.Biome;
 
 import java.util.Arrays;

src/main/java/com/terraforged/biome/map/BiomeGroup.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import com.terraforged.core.util.grid.FixedGrid;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/biome/map/BiomeMap.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import com.google.gson.JsonElement;
 import com.terraforged.core.cell.Cell;

src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java

@@ -23,13 +23,13 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
+import com.terraforged.biome.provider.BiomeHelper;
 import com.terraforged.core.util.grid.FixedGrid;
 import com.terraforged.world.biome.BiomeData;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.provider.BiomeHelper;
-import com.terraforged.mod.util.ListUtils;
+import com.terraforged.util.ListUtils;
 import net.minecraft.world.biome.Biome;
 
 import java.util.ArrayList;

src/main/java/com/terraforged/biome/map/BiomePredicate.java

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
+import com.terraforged.biome.provider.BiomeHelper;
 import com.terraforged.world.biome.BiomeData;
-import com.terraforged.mod.biome.provider.BiomeHelper;
 import net.minecraft.world.biome.Biome;
 
 import java.util.function.BiPredicate;

src/main/java/com/terraforged/biome/map/DefaultBiome.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import net.minecraft.world.biome.Biome;
 

src/main/java/com/terraforged/biome/map/GridBiomeMap.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.map;
+package com.terraforged.biome.map;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.Seed;

src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
 import com.terraforged.core.cell.Cell;

src/main/java/com/terraforged/biome/modifier/BeachModifier.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
+import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.heightmap.Levels;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.biome.map.BiomeMap;
-import com.terraforged.mod.chunk.TerraContext;
 import net.minecraft.world.biome.Biome;
 
 public class BeachModifier implements BiomeModifier {

src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java

@@ -23,15 +23,15 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
 import com.terraforged.api.biome.modifier.ModifierManager;
+import com.terraforged.biome.provider.DesertBiomes;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.map.BiomeMap;
-import com.terraforged.mod.biome.provider.DesertBiomes;
-import com.terraforged.mod.chunk.TerraContext;
+import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.chunk.TerraContext;
 import net.minecraft.world.biome.Biome;
 
 import java.util.ArrayList;

src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
+import com.terraforged.biome.provider.DesertBiomes;
 import com.terraforged.core.cell.Cell;
-import com.terraforged.mod.biome.provider.DesertBiomes;
 import net.minecraft.world.biome.Biome;
 
 public class DesertColorModifier implements BiomeModifier {

src/main/java/com/terraforged/biome/modifier/SandBiomeModifier.java

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.modifier;
+package com.terraforged.biome.modifier;
 
 import com.terraforged.core.cell.Cell;
-import com.terraforged.mod.chunk.TerraContext;
+import com.terraforged.chunk.TerraContext;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -40,7 +40,7 @@ public class SandBiomeModifier extends AbstractMaxHeightModifier {
     private final Set<Biome> biomes;
 
     public SandBiomeModifier(TerraContext context) {
-        super(context.seed, context.factory.getClimate(), 50, 2, context.levels.scale(8), context.levels.ground(5), context.levels.ground(25));
+        super(context.seed, context.factory.getClimate(), 50, 2, context.levels.scale(16), context.levels.ground(10), context.levels.ground(25));
         this.biomes = ForgeRegistries.BIOMES.getValues().stream()
                 .filter(biome -> context.materials.isSand(biome.getSurfaceBuilderConfig().getTop().getBlock()))
                 .collect(Collectors.toSet());

src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.provider;
+package com.terraforged.biome.provider;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/biome/provider/BiomeHelper.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.provider;
+package com.terraforged.biome.provider;
 
 import com.terraforged.world.biome.BiomeData;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.ModBiomes;
-import com.terraforged.mod.biome.map.BiomeMap;
-import com.terraforged.mod.biome.map.BiomeMapBuilder;
-import com.terraforged.mod.biome.map.BiomePredicate;
+import com.terraforged.biome.ModBiomes;
+import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.biome.map.BiomeMapBuilder;
+import com.terraforged.biome.map.BiomePredicate;
 import me.dags.noise.util.Vec2f;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/biome/provider/BiomeProvider.java

@@ -23,18 +23,18 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.provider;
+package com.terraforged.biome.provider;
 
 import com.google.common.collect.Sets;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.region.chunk.ChunkReader;
 import com.terraforged.world.terrain.decorator.Decorator;
 import com.terraforged.world.heightmap.WorldLookup;
-import com.terraforged.mod.biome.map.BiomeMap;
-import com.terraforged.mod.biome.modifier.BiomeModifierManager;
-import com.terraforged.mod.chunk.util.TerraContainer;
-import com.terraforged.mod.chunk.TerraContext;
-import com.terraforged.mod.util.setup.SetupHooks;
+import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.biome.modifier.BiomeModifierManager;
+import com.terraforged.chunk.util.TerraContainer;
+import com.terraforged.chunk.TerraContext;
+import com.terraforged.util.setup.SetupHooks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.biome.Biome;
 

src/main/java/com/terraforged/biome/provider/BiomeWeights.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome.provider;
+package com.terraforged.biome.provider;
 
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/biome/provider/DesertBiomes.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.provider;
+package com.terraforged.biome.provider;
 
 import com.terraforged.api.material.layer.LayerManager;
 import com.terraforged.api.material.layer.LayerMaterial;
 import com.terraforged.core.concurrent.ObjectPool;
-import com.terraforged.mod.material.Materials;
-import com.terraforged.mod.util.DummyBlockReader;
-import com.terraforged.mod.util.ListUtils;
+import com.terraforged.material.Materials;
+import com.terraforged.util.DummyBlockReader;
+import com.terraforged.util.ListUtils;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.material.MaterialColor;

src/main/java/com/terraforged/biome/spawn/SpawnHandler.java

@@ -1,8 +1,8 @@
-package com.terraforged.mod.biome.spawn;
+package com.terraforged.biome.spawn;
 
+import com.terraforged.biome.provider.BiomeProvider;
 import com.terraforged.world.continent.MutableVeci;
-import com.terraforged.mod.Log;
-import com.terraforged.mod.biome.provider.BiomeProvider;
+import com.terraforged.Log;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import net.minecraft.world.gen.feature.Feature;

src/main/java/com/terraforged/biome/spawn/SpawnSearch.java

@@ -1,9 +1,9 @@
-package com.terraforged.mod.biome.spawn;
+package com.terraforged.biome.spawn;
 
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.command.search.Search;
 import com.terraforged.core.cell.Cell;
-import com.terraforged.mod.Log;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.command.search.Search;
+import com.terraforged.Log;
 import net.minecraft.util.math.BlockPos;
 
 public class SpawnSearch extends Search {

src/main/java/com/terraforged/biome/surface/DunesSurface.java

@@ -23,17 +23,17 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.surface;
+package com.terraforged.biome.surface;
 
 import com.terraforged.api.chunk.surface.Surface;
 import com.terraforged.api.chunk.surface.SurfaceContext;
 import com.terraforged.api.material.layer.LayerMaterial;
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.biome.provider.DesertBiomes;
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.heightmap.Levels;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.biome.provider.DesertBiomes;
-import com.terraforged.mod.chunk.TerraContext;
 import me.dags.noise.Module;
 import me.dags.noise.Source;
 import me.dags.noise.func.CellFunc;

src/main/java/com/terraforged/biome/surface/IcebergsSurface.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.surface;
+package com.terraforged.biome.surface;
 
 import com.terraforged.api.chunk.surface.Surface;
 import com.terraforged.api.chunk.surface.SurfaceContext;
 import com.terraforged.api.material.state.States;
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.heightmap.Levels;
-import com.terraforged.mod.chunk.TerraContext;
 import me.dags.noise.Module;
 import me.dags.noise.Source;
 import me.dags.noise.util.NoiseUtil;

src/main/java/com/terraforged/biome/surface/SteppeSurface.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome.surface;
+package com.terraforged.biome.surface;
 
 import com.terraforged.api.chunk.surface.Surface;
 import com.terraforged.api.chunk.surface.SurfaceContext;

src/main/java/com/terraforged/biome/surface/SwampSurface.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.biome.surface;
+package com.terraforged.biome.surface;
 
 import com.terraforged.api.chunk.surface.Surface;
 import com.terraforged.api.chunk.surface.SurfaceContext;

src/main/java/com/terraforged/biome/tag/BiomeTagManager.java

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.biome.tag;
+package com.terraforged.biome.tag;
 
 import com.terraforged.api.biome.BiomeTags;
-import com.terraforged.mod.Log;
+import com.terraforged.Log;
 import net.minecraft.profiler.IProfiler;
 import net.minecraft.resources.IFutureReloadListener;
 import net.minecraft.resources.IResourceManager;

src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java

@@ -23,9 +23,9 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
-import com.terraforged.mod.biome.provider.BiomeProvider;
+import com.terraforged.biome.provider.BiomeProvider;
 import net.minecraft.world.gen.ChunkGenerator;
 import net.minecraft.world.gen.OverworldGenSettings;
 

src/main/java/com/terraforged/chunk/TerraChunkGenerator.java

@@ -23,29 +23,29 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.surface.SurfaceManager;
 import com.terraforged.api.material.layer.LayerManager;
+import com.terraforged.biome.provider.BiomeProvider;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.region.Size;
 import com.terraforged.core.region.chunk.ChunkReader;
 import com.terraforged.core.region.gen.RegionCache;
-import com.terraforged.mod.feature.manager.FeatureManager;
-import com.terraforged.mod.feature.manager.data.DataManager;
-import com.terraforged.mod.Log;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.chunk.generator.BiomeGenerator;
-import com.terraforged.mod.chunk.generator.MobGenerator;
-import com.terraforged.mod.chunk.generator.StructureGenerator;
-import com.terraforged.mod.chunk.generator.TerrainCarver;
-import com.terraforged.mod.chunk.generator.TerrainGenerator;
-import com.terraforged.mod.feature.BlockDataManager;
-import com.terraforged.mod.material.Materials;
-import com.terraforged.mod.material.geology.GeoManager;
-import com.terraforged.mod.util.Environment;
-import com.terraforged.mod.util.setup.SetupHooks;
+import com.terraforged.fm.FeatureManager;
+import com.terraforged.material.Materials;
+import com.terraforged.material.geology.GeoManager;
+import com.terraforged.fm.data.DataManager;
+import com.terraforged.Log;
+import com.terraforged.chunk.generator.BiomeGenerator;
+import com.terraforged.chunk.generator.MobGenerator;
+import com.terraforged.chunk.generator.StructureGenerator;
+import com.terraforged.chunk.generator.TerrainCarver;
+import com.terraforged.chunk.generator.TerrainGenerator;
+import com.terraforged.feature.BlockDataManager;
+import com.terraforged.util.Environment;
+import com.terraforged.util.setup.SetupHooks;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
@@ -112,7 +112,7 @@ public class TerraChunkGenerator extends ChunkGenerator<GenerationSettings> {
 
     @Override
     public final void generateStructures(BiomeManager biomes, IChunk chunk, ChunkGenerator<?> generator, TemplateManager templates) {
-        structureGenerator.generateStructureStarts(biomes, chunk, generator, templates);
+        structureGenerator.generateStructureStarts(biomes, chunk, templates);
     }
 
     @Override
@@ -234,6 +234,12 @@ public class TerraChunkGenerator extends ChunkGenerator<GenerationSettings> {
         return postProcessors;
     }
 
+    public final void queueChunk(int chunkX, int chunkZ) {
+        int rx = regionCache.chunkToRegion(chunkX);
+        int rz = regionCache.chunkToRegion(chunkZ);
+        regionCache.queueRegion(rx, rz);
+    }
+
     public final ChunkReader getChunkReader(int chunkX, int chunkZ) {
         return regionCache.getChunk(chunkX, chunkZ);
     }

src/main/java/com/terraforged/chunk/TerraContext.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer;
@@ -31,12 +31,12 @@ import com.terraforged.api.chunk.surface.SurfaceContext;
 import com.terraforged.core.region.gen.RegionCache;
 import com.terraforged.core.region.gen.RegionGenerator;
 import com.terraforged.core.concurrent.ThreadPool;
+import com.terraforged.material.Materials;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.WorldGeneratorFactory;
 import com.terraforged.world.heightmap.Heightmap;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.material.Materials;
-import com.terraforged.mod.settings.TerraSettings;
+import com.terraforged.settings.TerraSettings;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.chunk.IChunk;
 import net.minecraft.world.gen.GenerationSettings;

src/main/java/com/terraforged/chunk/TerraGenSettings.java

@@ -23,9 +23,9 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
-import com.terraforged.mod.settings.StructureSettings;
+import com.terraforged.settings.StructureSettings;
 import net.minecraft.world.gen.OverworldGenSettings;
 
 public class TerraGenSettings extends OverworldGenSettings {

src/main/java/com/terraforged/chunk/TerraSetupFactory.java

@@ -1,31 +1,31 @@
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.surface.SurfaceManager;
-import com.terraforged.mod.Log;
-import com.terraforged.mod.biome.ModBiomes;
-import com.terraforged.mod.biome.surface.IcebergsSurface;
-import com.terraforged.mod.biome.surface.SteppeSurface;
-import com.terraforged.mod.biome.surface.SwampSurface;
-import com.terraforged.mod.decorator.feature.LayerDecorator;
-import com.terraforged.mod.decorator.feature.SnowEroder;
-import com.terraforged.mod.decorator.terrain.BedrockDecorator;
-import com.terraforged.mod.decorator.terrain.CoastDecorator;
-import com.terraforged.mod.decorator.terrain.ErosionDecorator;
-import com.terraforged.mod.decorator.terrain.GeologyDecorator;
-import com.terraforged.mod.feature.BlockDataManager;
-import com.terraforged.mod.feature.Matchers;
-import com.terraforged.mod.feature.manager.FeatureManager;
-import com.terraforged.mod.feature.manager.data.DataManager;
-import com.terraforged.mod.feature.manager.matcher.biome.BiomeMatcher;
-import com.terraforged.mod.feature.manager.matcher.feature.FeatureMatcher;
-import com.terraforged.mod.feature.manager.modifier.FeatureModifiers;
-import com.terraforged.mod.feature.manager.predicate.DeepWater;
-import com.terraforged.mod.feature.manager.predicate.FeaturePredicate;
-import com.terraforged.mod.feature.manager.predicate.MinDepth;
-import com.terraforged.mod.feature.manager.predicate.MinHeight;
-import com.terraforged.mod.material.geology.GeoManager;
-import com.terraforged.mod.util.setup.SetupHooks;
+import com.terraforged.biome.ModBiomes;
+import com.terraforged.biome.surface.IcebergsSurface;
+import com.terraforged.biome.surface.SteppeSurface;
+import com.terraforged.biome.surface.SwampSurface;
+import com.terraforged.decorator.feature.LayerDecorator;
+import com.terraforged.decorator.feature.SnowEroder;
+import com.terraforged.feature.Matchers;
+import com.terraforged.fm.FeatureManager;
+import com.terraforged.fm.matcher.biome.BiomeMatcher;
+import com.terraforged.fm.matcher.feature.FeatureMatcher;
+import com.terraforged.fm.modifier.FeatureModifiers;
+import com.terraforged.fm.predicate.DeepWater;
+import com.terraforged.fm.predicate.FeaturePredicate;
+import com.terraforged.fm.predicate.MinDepth;
+import com.terraforged.fm.predicate.MinHeight;
+import com.terraforged.material.geology.GeoManager;
+import com.terraforged.Log;
+import com.terraforged.decorator.terrain.BedrockDecorator;
+import com.terraforged.decorator.terrain.CoastDecorator;
+import com.terraforged.decorator.terrain.ErosionDecorator;
+import com.terraforged.decorator.terrain.GeologyDecorator;
+import com.terraforged.feature.BlockDataManager;
+import com.terraforged.fm.data.DataManager;
+import com.terraforged.util.setup.SetupHooks;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
 import net.minecraft.world.gen.feature.Feature;
@@ -111,7 +111,6 @@ public class TerraSetupFactory {
         manager.replace(Biomes.DEEP_FROZEN_OCEAN.delegate.get(), new IcebergsSurface(context, 30, 30));
         manager.replace(Biomes.SWAMP.delegate.get(), new SwampSurface());
         manager.replace(ModBiomes.MARSHLAND, new SwampSurface());
-        manager.replace(ModBiomes.STEPPE, new SteppeSurface());
         return SetupHooks.setup(manager, context);
     }
 

src/main/java/com/terraforged/chunk/TerraTerrainProvider.java

@@ -23,13 +23,13 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk;
+package com.terraforged.chunk;
 
 import com.terraforged.core.cell.Populator;
+import com.terraforged.util.setup.SetupHooks;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.heightmap.RegionConfig;
 import com.terraforged.world.terrain.provider.StandardTerrainProvider;
-import com.terraforged.mod.util.setup.SetupHooks;
 
 public class TerraTerrainProvider extends StandardTerrainProvider {
 

src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.fix;
+package com.terraforged.chunk.fix;
 
 import com.terraforged.api.chunk.ChunkDelegate;
 import com.terraforged.api.material.state.States;
-import com.terraforged.mod.material.Materials;
+import com.terraforged.material.Materials;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.IChunk;

src/main/java/com/terraforged/chunk/fix/RegionDelegate.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.chunk.fix;
+package com.terraforged.chunk.fix;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;

src/main/java/com/terraforged/chunk/fix/RegionFix.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.fix;
+package com.terraforged.chunk.fix;
 
 import net.minecraft.world.gen.ChunkGenerator;
 import net.minecraft.world.gen.WorldGenRegion;

src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java

@@ -1,9 +1,9 @@
-package com.terraforged.mod.chunk.generator;
+package com.terraforged.chunk.generator;
 
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.util.TerraContainer;
 import com.terraforged.core.region.chunk.ChunkReader;
 import com.terraforged.world.terrain.decorator.Decorator;
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.util.TerraContainer;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.ChunkPrimer;

src/main/java/com/terraforged/chunk/generator/MobGenerator.java

@@ -1,6 +1,6 @@
-package com.terraforged.mod.chunk.generator;
+package com.terraforged.chunk.generator;
 
-import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.TerraChunkGenerator;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/terraforged/chunk/generator/StructureGenerator.java

@@ -1,6 +1,6 @@
-package com.terraforged.mod.chunk.generator;
+package com.terraforged.chunk.generator;
 
-import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.TerraChunkGenerator;
 import net.minecraft.network.DebugPacketSender;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.util.math.BlockPos;
@@ -26,8 +26,10 @@ public class StructureGenerator {
         this.generator = generator;
     }
 
-    public void generateStructureStarts(BiomeManager biomes, IChunk chunk, ChunkGenerator<?> generator, TemplateManager templates) {
+    public void generateStructureStarts(BiomeManager biomes, IChunk chunk, TemplateManager templates) {
         ChunkPos chunkpos = chunk.getPos();
+        generator.queueChunk(chunkpos.x, chunkpos.z);
+
         BlockPos biomePos = new BlockPos(chunkpos.getXStart() + 9, 0, chunkpos.getZStart() + 9);
 
         for (Structure<?> structure : Feature.STRUCTURES.values()) {

src/main/java/com/terraforged/chunk/generator/TerrainCarver.java

@@ -1,7 +1,7 @@
-package com.terraforged.mod.chunk.generator;
+package com.terraforged.chunk.generator;
 
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.fix.ChunkCarverFix;
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.fix.ChunkCarverFix;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java

@@ -1,17 +1,17 @@
-package com.terraforged.mod.chunk.generator;
+package com.terraforged.chunk.generator;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer;
 import com.terraforged.api.chunk.surface.SurfaceContext;
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.fix.RegionFix;
+import com.terraforged.chunk.util.FastChunk;
+import com.terraforged.chunk.util.TerraContainer;
 import com.terraforged.core.region.chunk.ChunkReader;
-import com.terraforged.mod.chunk.util.FastChunk;
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.util.TerraContainer;
-import com.terraforged.mod.chunk.fix.RegionFix;
-import com.terraforged.mod.decorator.ChunkPopulator;
-import com.terraforged.mod.feature.TerrainHelper;
-import com.terraforged.mod.util.Environment;
+import com.terraforged.feature.TerrainHelper;
+import com.terraforged.decorator.ChunkPopulator;
+import com.terraforged.util.Environment;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;

src/main/java/com/terraforged/chunk/test/Test.java

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.test;
+package com.terraforged.chunk.test;
 
+import com.terraforged.biome.ModBiomes;
 import com.terraforged.world.terrain.Terrain;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.biome.ModBiomes;
 import net.minecraft.world.biome.Biome;
 
 public class Test {

src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.test;
+package com.terraforged.chunk.test;
 
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.chunk.TerraContext;
 import net.minecraft.world.biome.Biome;
 
 public class TestBiomeProvider extends BiomeProvider {

src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java

@@ -23,15 +23,15 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.test;
+package com.terraforged.chunk.test;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.cell.Populator;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.heightmap.WorldHeightmap;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.TerraContext;
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.TerraContext;
 import net.minecraft.world.gen.GenerationSettings;
 
 public class TestChunkGenerator extends TerraChunkGenerator {

src/main/java/com/terraforged/chunk/test/TestHeightMap.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.chunk.test;
+package com.terraforged.chunk.test;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.GeneratorContext;

src/main/java/com/terraforged/chunk/test/TestTerraContext.java

@@ -1,8 +1,8 @@
-package com.terraforged.mod.chunk.test;
+package com.terraforged.chunk.test;
 
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.WorldGeneratorFactory;
-import com.terraforged.mod.chunk.TerraContext;
 
 public class TestTerraContext extends TerraContext {
 

src/main/java/com/terraforged/chunk/util/FastChunk.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.chunk.util;
+package com.terraforged.chunk.util;
 
 import com.terraforged.api.chunk.ChunkDelegate;
 import net.minecraft.block.BlockState;

src/main/java/com/terraforged/chunk/util/TerraContainer.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.chunk.util;
+package com.terraforged.chunk.util;
 
 import com.terraforged.api.biome.BiomeVariant;
 import com.terraforged.core.cell.Cell;

src/main/java/com/terraforged/command/TerraCommand.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.command;
+package com.terraforged.command;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
@@ -31,22 +31,22 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.terraforged.biome.provider.BiomeProvider;
+import com.terraforged.command.arg.BiomeArgType;
+import com.terraforged.command.arg.TerrainArgType;
+import com.terraforged.command.search.BiomeSearchTask;
+import com.terraforged.command.search.BothSearchTask;
+import com.terraforged.command.search.Search;
+import com.terraforged.command.search.TerrainSearchTask;
 import com.terraforged.core.cell.Cell;
+import com.terraforged.settings.SettingsHelper;
 import com.terraforged.world.WorldGenerator;
 import com.terraforged.world.terrain.Terrain;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.Log;
-import com.terraforged.mod.biome.provider.BiomeProvider;
-import com.terraforged.mod.chunk.TerraChunkGenerator;
-import com.terraforged.mod.chunk.TerraContext;
-import com.terraforged.mod.command.arg.BiomeArgType;
-import com.terraforged.mod.command.arg.TerrainArgType;
-import com.terraforged.mod.command.search.BiomeSearchTask;
-import com.terraforged.mod.command.search.BothSearchTask;
-import com.terraforged.mod.command.search.Search;
-import com.terraforged.mod.command.search.TerrainSearchTask;
-import com.terraforged.mod.data.DataGen;
-import com.terraforged.mod.settings.SettingsHelper;
+import com.terraforged.Log;
+import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.chunk.TerraContext;
+import com.terraforged.data.DataGen;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.Commands;
 import net.minecraft.command.arguments.ArgumentSerializer;

src/main/java/com/terraforged/command/arg/BiomeArgType.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.command.arg;
+package com.terraforged.command.arg;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;

src/main/java/com/terraforged/command/arg/TerrainArgType.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.command.arg;
+package com.terraforged.command.arg;
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;

src/main/java/com/terraforged/command/search/BiomeSearchTask.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.command.search;
+package com.terraforged.command.search;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;

src/main/java/com/terraforged/command/search/BothSearchTask.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.command.search;
+package com.terraforged.command.search;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/com/terraforged/command/search/Search.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.command.search;
+package com.terraforged.command.search;
 
 import net.minecraft.util.math.BlockPos;
 

src/main/java/com/terraforged/command/search/TerrainSearchTask.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.command.search;
+package com.terraforged.command.search;
 
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.WorldGenerator;

src/main/java/com/terraforged/data/DataGen.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.data;
+package com.terraforged.data;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;

src/main/java/com/terraforged/data/LangGenerator.java

@@ -1,9 +1,9 @@
-package com.terraforged.mod.data;
+package com.terraforged.data;
 
 import com.terraforged.core.util.NameUtil;
-import com.terraforged.mod.gui.preview.PreviewSettings;
-import com.terraforged.mod.settings.TerraSettings;
-import com.terraforged.mod.util.nbt.NBTHelper;
+import com.terraforged.gui.preview.PreviewSettings;
+import com.terraforged.settings.TerraSettings;
+import com.terraforged.util.nbt.NBTHelper;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.INBT;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/terraforged/data/WorldGenBiomes.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.data;
+package com.terraforged.data;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.biome.provider.BiomeHelper;
 import com.terraforged.world.biome.BiomeType;
-import com.terraforged.mod.biome.map.BiomeMap;
-import com.terraforged.mod.biome.provider.BiomeHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;
 

src/main/java/com/terraforged/data/WorldGenBlocks.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.data;
+package com.terraforged.data;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

src/main/java/com/terraforged/data/WorldGenFeatures.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.data;
+package com.terraforged.data;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;

src/main/java/com/terraforged/decorator/ChunkPopulator.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator;
+package com.terraforged.decorator;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;

src/main/java/com/terraforged/decorator/feature/LayerDecorator.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.feature;
+package com.terraforged.decorator.feature;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;

src/main/java/com/terraforged/decorator/feature/SnowEroder.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.feature;
+package com.terraforged.decorator.feature;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
-import com.terraforged.mod.chunk.TerraContext;
-import com.terraforged.mod.decorator.terrain.ErosionDecorator;
+import com.terraforged.chunk.TerraContext;
+import com.terraforged.decorator.terrain.ErosionDecorator;
 import me.dags.noise.source.Rand;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;

src/main/java/com/terraforged/decorator/terrain/BedrockDecorator.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.terrain;
+package com.terraforged.decorator.terrain;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.material.state.States;
-import com.terraforged.mod.chunk.TerraContext;
+import com.terraforged.chunk.TerraContext;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/terraforged/decorator/terrain/CoastDecorator.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.terrain;
+package com.terraforged.decorator.terrain;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.material.state.States;
+import com.terraforged.chunk.TerraContext;
 import com.terraforged.core.util.VariablePredicate;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.chunk.TerraContext;
 import net.minecraft.block.BlockState;
 import net.minecraft.world.chunk.IChunk;
 

src/main/java/com/terraforged/decorator/terrain/ErosionDecorator.java

@@ -23,14 +23,14 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.terrain;
+package com.terraforged.decorator.terrain;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.material.state.States;
+import com.terraforged.chunk.TerraContext;
+import com.terraforged.material.Materials;
 import com.terraforged.world.terrain.Terrains;
-import com.terraforged.mod.chunk.TerraContext;
-import com.terraforged.mod.material.Materials;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.material.Material;

src/main/java/com/terraforged/decorator/terrain/GeologyDecorator.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.decorator.terrain;
+package com.terraforged.decorator.terrain;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer;
-import com.terraforged.mod.material.geology.GeoManager;
+import com.terraforged.material.geology.GeoManager;
 import net.minecraft.world.chunk.IChunk;
 
 public class GeologyDecorator implements ColumnDecorator {

src/main/java/com/terraforged/feature/BlockDataConfig.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.feature;
+package com.terraforged.feature;
 
 import com.google.gson.JsonObject;
 import net.minecraft.block.Block;

src/main/java/com/terraforged/feature/BlockDataManager.java

@@ -1,9 +1,9 @@
-package com.terraforged.mod.feature;
+package com.terraforged.feature;
 
 import com.google.common.collect.ImmutableMap;
-import com.terraforged.mod.feature.manager.data.DataManager;
-import com.terraforged.mod.feature.manager.util.Json;
-import com.terraforged.mod.feature.sapling.SaplingConfig;
+import com.terraforged.feature.sapling.SaplingConfig;
+import com.terraforged.fm.data.DataManager;
+import com.terraforged.fm.util.Json;
 import net.minecraft.block.Block;
 
 import java.util.HashMap;

src/main/java/com/terraforged/feature/Matchers.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.feature;
+package com.terraforged.feature;
 
-import com.terraforged.mod.feature.manager.matcher.BiomeFeatureMatcher;
-import com.terraforged.mod.feature.manager.matcher.biome.BiomeMatcher;
-import com.terraforged.mod.feature.manager.matcher.feature.FeatureMatcher;
-import com.terraforged.mod.feature.feature.DiskFeature;
+import com.terraforged.feature.feature.DiskFeature;
+import com.terraforged.fm.matcher.BiomeFeatureMatcher;
+import com.terraforged.fm.matcher.biome.BiomeMatcher;
+import com.terraforged.fm.matcher.feature.FeatureMatcher;
 import net.minecraft.block.Blocks;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.feature.Feature;

src/main/java/com/terraforged/feature/TerrainHelper.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.mod.feature;
+package com.terraforged.feature;
 
 import it.unimi.dsi.fastutil.longs.LongIterator;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;

src/main/java/com/terraforged/feature/context/ChanceContext.java

@@ -1,11 +1,11 @@
-package com.terraforged.mod.feature.context;
+package com.terraforged.feature.context;
 
+import com.terraforged.chunk.fix.RegionDelegate;
+import com.terraforged.chunk.util.TerraContainer;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.region.chunk.ChunkReader;
 import com.terraforged.core.concurrent.ObjectPool;
 import com.terraforged.world.heightmap.Levels;
-import com.terraforged.mod.chunk.util.TerraContainer;
-import com.terraforged.mod.chunk.fix.RegionDelegate;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.biome.BiomeContainer;

src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.feature.context;
+package com.terraforged.feature.context;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.Dynamic;

src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java

@@ -1,4 +1,4 @@
-package com.terraforged.mod.feature.context;
+package com.terraforged.feature.context;
 
 import com.terraforged.core.concurrent.ObjectPool;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/terraforged/feature/context/ContextualFeature.java

@@ -1,10 +1,10 @@
-package com.terraforged.mod.feature.context;
+package com.terraforged.feature.context;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.OptionalDynamic;
 import com.mojang.datafixers.types.DynamicOps;
-import com.terraforged.mod.feature.context.modifier.ContextModifier;
+import com.terraforged.feature.context.modifier.ContextModifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 

src/main/java/com/terraforged/feature/context/modifier/Biome.java

@@ -1,7 +1,7 @@
-package com.terraforged.mod.feature.context.modifier;
+package com.terraforged.feature.context.modifier;
 
 import com.mojang.datafixers.Dynamic;
-import com.terraforged.mod.feature.context.ChanceContext;
+import com.terraforged.feature.context.ChanceContext;
 import net.minecraft.util.math.BlockPos;
 
 public class Biome extends RangeContextModifier {

src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java

@@ -1,9 +1,9 @@
-package com.terraforged.mod.feature.context.modifier;
+package com.terraforged.feature.context.modifier;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.types.DynamicOps;
-import com.terraforged.mod.feature.context.ChanceContext;
+import com.terraforged.feature.context.ChanceContext;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.Map;

src/main/java/com/terraforged/feature/context/modifier/Elevation.java

@@ -1,7 +1,7 @@
-package com.terraforged.mod.feature.context.modifier;
+package com.terraforged.feature.context.modifier;
 
 import com.mojang.datafixers.Dynamic;
-import com.terraforged.mod.feature.context.ChanceContext;
+import com.terraforged.feature.context.ChanceContext;
 import net.minecraft.util.math.BlockPos;
 
 public class Elevation extends RangeContextModifier {

src/main/java/com/terraforged/feature/context/modifier/None.java

@@ -1,8 +1,8 @@
-package com.terraforged.mod.feature.context.modifier;
+package com.terraforged.feature.context.modifier;
 
 import com.mojang.datafixers.Dynamic;
 import com.mojang.datafixers.types.DynamicOps;
-import com.terraforged.mod.feature.context.ChanceContext;
+import com.terraforged.feature.context.ChanceContext;
 import net.minecraft.util.math.BlockPos;
 
 public class None implements ContextModifier {