relocate stuff

build.gradle

@@ -13,8 +13,7 @@ apply plugin: "net.minecraftforge.gradle"
 apply plugin: "maven-publish"
 apply plugin: "eclipse"
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 
 version = "${mc_version}-${mod_version}${getClassifier()}"
 
@@ -99,8 +98,8 @@ task apiJar(type: Jar) {
     include "com/terraforged/fm/**"
     include "com/terraforged/api/**"
     include "com/terraforged/core/**"
+    include "com/terraforged/n2d/**"
     include "com/terraforged/world/**"
-    include "me/dags/**"
     classifier "api"
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-mod_version=0.1.0
+mod_version=0.1.0-BETA
 mc_version=1.15.2
 forge_version=31.1.77
 mcp_channel=snapshot

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

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

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

@@ -23,21 +23,21 @@
  * SOFTWARE.
  */
 
-package com.terraforged;
+package com.terraforged.mod;
 
 import com.terraforged.api.material.WGTags;
-import com.terraforged.chunk.settings.SettingsHelper;
-import com.terraforged.command.TerraCommand;
-import com.terraforged.config.ConfigManager;
-import com.terraforged.data.DataGen;
-import com.terraforged.feature.context.ContextSelectorFeature;
-import com.terraforged.feature.decorator.poisson.PoissonAtSurface;
-import com.terraforged.feature.feature.BushFeature;
-import com.terraforged.feature.feature.DiskFeature;
-import com.terraforged.feature.feature.FreezeLayer;
+import com.terraforged.mod.chunk.settings.SettingsHelper;
+import com.terraforged.mod.server.command.TerraCommand;
+import com.terraforged.mod.config.ConfigManager;
+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.BushFeature;
+import com.terraforged.mod.feature.feature.DiskFeature;
+import com.terraforged.mod.feature.feature.FreezeLayer;
 import com.terraforged.fm.template.TemplateManager;
-import com.terraforged.util.DataPackFinder;
-import com.terraforged.util.Environment;
+import com.terraforged.mod.util.DataPackFinder;
+import com.terraforged.mod.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/mod/TerraWorld.java

@@ -23,20 +23,20 @@
  * SOFTWARE.
  */
 
-package com.terraforged;
+package com.terraforged.mod;
 
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.ChunkGeneratorFactory;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.TerraContext;
-import com.terraforged.chunk.TerraGenSettings;
-import com.terraforged.chunk.settings.DimesionSettings;
-import com.terraforged.chunk.settings.SettingsHelper;
-import com.terraforged.chunk.settings.TerraSettings;
-import com.terraforged.chunk.test.TestChunkGenerator;
-import com.terraforged.gui.SettingsScreen;
-import com.terraforged.util.Environment;
-import com.terraforged.util.nbt.NBTHelper;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+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.settings.DimesionSettings;
+import com.terraforged.mod.chunk.settings.SettingsHelper;
+import com.terraforged.mod.chunk.settings.TerraSettings;
+import com.terraforged.mod.chunk.test.TestChunkGenerator;
+import com.terraforged.mod.client.gui.SettingsScreen;
+import com.terraforged.mod.util.Environment;
+import com.terraforged.mod.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/mod/biome/Bryce.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/com/terraforged/mod/biome/StoneForest.java

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

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

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

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

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

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

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

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

@@ -23,9 +23,9 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.map;
+package com.terraforged.mod.biome.map;
 
-import com.terraforged.biome.provider.BiomeHelper;
+import com.terraforged.mod.biome.provider.BiomeHelper;
 import com.terraforged.world.biome.BiomeType;
 import net.minecraft.world.biome.Biome;
 

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

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

src/main/java/com/terraforged/mod/biome/map/SimpleBiomeMap.java

@@ -1,12 +1,12 @@
-package com.terraforged.biome.map;
+package com.terraforged.mod.biome.map;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.terraforged.biome.map.defaults.DefaultBiomes;
-import com.terraforged.biome.map.set.BiomeSet;
-import com.terraforged.biome.map.set.BiomeTypeSet;
-import com.terraforged.biome.map.set.RiverSet;
-import com.terraforged.biome.map.set.TemperatureSet;
+import com.terraforged.mod.biome.map.defaults.DefaultBiomes;
+import com.terraforged.mod.biome.map.set.BiomeSet;
+import com.terraforged.mod.biome.map.set.BiomeTypeSet;
+import com.terraforged.mod.biome.map.set.RiverSet;
+import com.terraforged.mod.biome.map.set.TemperatureSet;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.n2d.util.NoiseUtil;
 import com.terraforged.world.biome.BiomeType;

src/main/java/com/terraforged/mod/biome/map/defaults/BiomeTemps.java

@@ -1,4 +1,4 @@
-package com.terraforged.biome.map.defaults;
+package com.terraforged.mod.biome.map.defaults;
 
 public class BiomeTemps {
 

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

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

src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java

@@ -1,6 +1,6 @@
-package com.terraforged.biome.map.defaults;
+package com.terraforged.mod.biome.map.defaults;
 
-import com.terraforged.biome.ModBiomes;
+import com.terraforged.mod.biome.ModBiomes;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
 

src/main/java/com/terraforged/mod/biome/map/set/BiomeSet.java

@@ -1,11 +1,11 @@
-package com.terraforged.biome.map.set;
+package com.terraforged.mod.biome.map.set;
 
 import com.google.gson.JsonElement;
-import com.terraforged.biome.map.defaults.DefaultBiome;
-import com.terraforged.biome.provider.BiomeHelper;
+import com.terraforged.mod.biome.map.defaults.DefaultBiome;
+import com.terraforged.mod.biome.provider.BiomeHelper;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.n2d.util.NoiseUtil;
-import com.terraforged.util.ListUtils;
+import com.terraforged.mod.util.ListUtils;
 import net.minecraft.world.biome.Biome;
 
 import java.util.Collections;

src/main/java/com/terraforged/mod/biome/map/set/BiomeTypeSet.java

@@ -1,9 +1,9 @@
-package com.terraforged.biome.map.set;
+package com.terraforged.mod.biome.map.set;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.terraforged.biome.map.defaults.DefaultBiome;
+import com.terraforged.mod.biome.map.defaults.DefaultBiome;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.biome.BiomeType;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/mod/biome/map/set/RiverSet.java

@@ -1,8 +1,8 @@
-package com.terraforged.biome.map.set;
+package com.terraforged.mod.biome.map.set;
 
-import com.terraforged.biome.map.BiomeMap;
-import com.terraforged.biome.map.defaults.DefaultBiome;
-import com.terraforged.biome.map.defaults.DefaultBiomes;
+import com.terraforged.mod.biome.map.BiomeMap;
+import com.terraforged.mod.biome.map.defaults.DefaultBiome;
+import com.terraforged.mod.biome.map.defaults.DefaultBiomes;
 import com.terraforged.core.cell.Cell;
 import net.minecraft.world.biome.Biome;
 

src/main/java/com/terraforged/mod/biome/map/set/TemperatureSet.java

@@ -1,10 +1,10 @@
-package com.terraforged.biome.map.set;
+package com.terraforged.mod.biome.map.set;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.terraforged.biome.map.defaults.BiomeTemps;
-import com.terraforged.biome.map.defaults.DefaultBiome;
+import com.terraforged.mod.biome.map.defaults.BiomeTemps;
+import com.terraforged.mod.biome.map.defaults.DefaultBiome;
 import com.terraforged.core.cell.Cell;
 import net.minecraft.world.biome.Biome;
 

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

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

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

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

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

@@ -1,7 +1,7 @@
-package com.terraforged.biome.modifier;
+package com.terraforged.mod.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
-import com.terraforged.biome.map.BiomeMap;
+import com.terraforged.mod.biome.map.BiomeMap;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.n2d.Module;
 import com.terraforged.n2d.Source;

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

@@ -23,13 +23,13 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.modifier;
+package com.terraforged.mod.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
 import com.terraforged.api.biome.modifier.ModifierManager;
-import com.terraforged.biome.map.BiomeMap;
-import com.terraforged.biome.provider.DesertBiomes;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.map.BiomeMap;
+import com.terraforged.mod.biome.provider.DesertBiomes;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.biome.BiomeType;
 import com.terraforged.world.terrain.ITerrain;

src/main/java/com/terraforged/mod/biome/modifier/CoastModifier.java

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.modifier;
+package com.terraforged.mod.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
-import com.terraforged.biome.map.BiomeMap;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.map.BiomeMap;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.world.terrain.Terrains;
 import net.minecraft.world.biome.Biome;

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

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

src/main/java/com/terraforged/mod/biome/modifier/MountainModifier.java

@@ -1,9 +1,9 @@
-package com.terraforged.biome.modifier;
+package com.terraforged.mod.biome.modifier;
 
 import com.terraforged.api.biome.modifier.BiomeModifier;
-import com.terraforged.biome.map.BiomeMap;
-import com.terraforged.biome.map.defaults.DefaultBiome;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.map.BiomeMap;
+import com.terraforged.mod.biome.map.defaults.DefaultBiome;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import net.minecraft.world.biome.Biome;
 

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

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

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

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.provider;
+package com.terraforged.mod.biome.provider;
 
-import com.terraforged.biome.ModBiomes;
-import com.terraforged.biome.map.BiomeMap;
-import com.terraforged.biome.map.BiomeMapBuilder;
-import com.terraforged.biome.map.BiomePredicate;
+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.n2d.util.Vec2f;
 import com.terraforged.world.biome.BiomeData;
 import com.terraforged.world.biome.BiomeType;

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

@@ -1,8 +1,8 @@
-package com.terraforged.biome.provider;
+package com.terraforged.mod.biome.provider;
 
 import com.electronwill.nightconfig.core.CommentedConfig;
-import com.terraforged.Log;
-import com.terraforged.config.ConfigManager;
+import com.terraforged.mod.Log;
+import com.terraforged.mod.config.ConfigManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.common.BiomeDictionary;

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

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

src/main/java/com/terraforged/mod/biome/provider/TerraBiomeProvider.java

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

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

@@ -1,7 +1,7 @@
-package com.terraforged.biome.spawn;
+package com.terraforged.mod.biome.spawn;
 
-import com.terraforged.Log;
-import com.terraforged.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.Log;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
 import com.terraforged.world.continent.MutableVeci;
 import com.terraforged.world.continent.SpawnType;
 import net.minecraft.util.math.BlockPos;

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

@@ -1,8 +1,8 @@
-package com.terraforged.biome.spawn;
+package com.terraforged.mod.biome.spawn;
 
-import com.terraforged.Log;
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.command.search.Search;
+import com.terraforged.mod.Log;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.server.command.search.Search;
 import com.terraforged.core.cell.Cell;
 import net.minecraft.util.math.BlockPos;
 

src/main/java/com/terraforged/mod/biome/surface/BriceSurface.java

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

src/main/java/com/terraforged/mod/biome/surface/DesertSurface.java

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

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

@@ -23,15 +23,15 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.surface;
+package com.terraforged.mod.biome.surface;
 
 import com.terraforged.api.biome.surface.MaskedSurface;
 import com.terraforged.api.biome.surface.Surface;
 import com.terraforged.api.biome.surface.SurfaceContext;
 import com.terraforged.api.material.layer.LayerMaterial;
-import com.terraforged.biome.provider.DesertBiomes;
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.provider.DesertBiomes;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.n2d.Module;
 import com.terraforged.n2d.Source;

src/main/java/com/terraforged/mod/biome/surface/ForestSurface.java

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

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

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.biome.surface;
+package com.terraforged.mod.biome.surface;
 
 import com.terraforged.api.biome.surface.MaskedSurface;
 import com.terraforged.api.biome.surface.SurfaceContext;
 import com.terraforged.api.material.state.States;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.n2d.Module;
 import com.terraforged.n2d.Source;

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

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

src/main/java/com/terraforged/mod/biome/surface/StoneForestSurface.java

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

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

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

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

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

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

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

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

@@ -23,32 +23,32 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk;
+package com.terraforged.mod.chunk;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.biome.surface.SurfaceManager;
 import com.terraforged.api.material.layer.LayerManager;
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.generator.BiomeGenerator;
-import com.terraforged.chunk.generator.FeatureGenerator;
-import com.terraforged.chunk.generator.Generator;
-import com.terraforged.chunk.generator.MobGenerator;
-import com.terraforged.chunk.generator.StructureGenerator;
-import com.terraforged.chunk.generator.SurfaceGenerator;
-import com.terraforged.chunk.generator.TerrainCarver;
-import com.terraforged.chunk.generator.TerrainGenerator;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.chunk.generator.BiomeGenerator;
+import com.terraforged.mod.chunk.generator.FeatureGenerator;
+import com.terraforged.mod.chunk.generator.Generator;
+import com.terraforged.mod.chunk.generator.MobGenerator;
+import com.terraforged.mod.chunk.generator.StructureGenerator;
+import com.terraforged.mod.chunk.generator.SurfaceGenerator;
+import com.terraforged.mod.chunk.generator.TerrainCarver;
+import com.terraforged.mod.chunk.generator.TerrainGenerator;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.tile.Size;
 import com.terraforged.core.tile.Tile;
 import com.terraforged.core.tile.chunk.ChunkReader;
 import com.terraforged.core.tile.gen.TileCache;
-import com.terraforged.feature.BlockDataManager;
+import com.terraforged.mod.feature.BlockDataManager;
 import com.terraforged.fm.FeatureManager;
 import com.terraforged.fm.data.DataManager;
 import com.terraforged.fm.structure.StructureManager;
-import com.terraforged.material.Materials;
-import com.terraforged.material.geology.GeoManager;
-import com.terraforged.util.setup.SetupHooks;
+import com.terraforged.mod.material.Materials;
+import com.terraforged.mod.material.geology.GeoManager;
+import com.terraforged.mod.util.setup.SetupHooks;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;

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

@@ -23,18 +23,18 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk;
+package com.terraforged.mod.chunk;
 
 import com.electronwill.nightconfig.core.CommentedConfig;
 import com.terraforged.api.chunk.column.DecoratorContext;
 import com.terraforged.api.biome.surface.ChunkSurfaceBuffer;
 import com.terraforged.api.biome.surface.SurfaceContext;
-import com.terraforged.chunk.settings.TerraSettings;
-import com.terraforged.config.PerfDefaults;
+import com.terraforged.mod.chunk.settings.TerraSettings;
+import com.terraforged.mod.config.PerfDefaults;
 import com.terraforged.core.concurrent.thread.ThreadPools;
 import com.terraforged.core.tile.gen.TileCache;
 import com.terraforged.core.tile.gen.TileGenerator;
-import com.terraforged.material.Materials;
+import com.terraforged.mod.material.Materials;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.WorldGeneratorFactory;
 import com.terraforged.world.heightmap.Heightmap;

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

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

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

@@ -1,23 +1,23 @@
-package com.terraforged.chunk;
+package com.terraforged.mod.chunk;
 
-import com.terraforged.Log;
+import com.terraforged.mod.Log;
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.biome.surface.SurfaceManager;
-import com.terraforged.biome.ModBiomes;
-import com.terraforged.biome.surface.BriceSurface;
-import com.terraforged.biome.surface.DesertSurface;
-import com.terraforged.biome.surface.StoneForestSurface;
-import com.terraforged.biome.surface.ForestSurface;
-import com.terraforged.biome.surface.IcebergsSurface;
-import com.terraforged.biome.surface.SwampSurface;
-import com.terraforged.chunk.column.BedrockDecorator;
-import com.terraforged.chunk.column.ErosionDecorator;
-import com.terraforged.chunk.column.GeologyDecorator;
-import com.terraforged.chunk.column.post.LayerDecorator;
-import com.terraforged.chunk.column.post.SnowEroder;
-import com.terraforged.feature.BlockDataManager;
-import com.terraforged.feature.Matchers;
-import com.terraforged.feature.feature.FreezeLayer;
+import com.terraforged.mod.biome.ModBiomes;
+import com.terraforged.mod.biome.surface.BriceSurface;
+import com.terraforged.mod.biome.surface.DesertSurface;
+import com.terraforged.mod.biome.surface.StoneForestSurface;
+import com.terraforged.mod.biome.surface.ForestSurface;
+import com.terraforged.mod.biome.surface.IcebergsSurface;
+import com.terraforged.mod.biome.surface.SwampSurface;
+import com.terraforged.mod.chunk.column.BedrockDecorator;
+import com.terraforged.mod.chunk.column.ErosionDecorator;
+import com.terraforged.mod.chunk.column.GeologyDecorator;
+import com.terraforged.mod.chunk.column.post.LayerDecorator;
+import com.terraforged.mod.chunk.column.post.SnowEroder;
+import com.terraforged.mod.feature.BlockDataManager;
+import com.terraforged.mod.feature.Matchers;
+import com.terraforged.mod.feature.feature.FreezeLayer;
 import com.terraforged.fm.FeatureManager;
 import com.terraforged.fm.data.DataManager;
 import com.terraforged.fm.matcher.biome.BiomeMatcher;
@@ -28,8 +28,8 @@ import com.terraforged.fm.predicate.FeaturePredicate;
 import com.terraforged.fm.predicate.MinHeight;
 import com.terraforged.fm.structure.StructureManager;
 import com.terraforged.fm.transformer.FeatureTransformer;
-import com.terraforged.material.geology.GeoManager;
-import com.terraforged.util.setup.SetupHooks;
+import com.terraforged.mod.material.geology.GeoManager;
+import com.terraforged.mod.util.setup.SetupHooks;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
 import net.minecraft.world.gen.feature.Feature;

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

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

src/main/java/com/terraforged/mod/chunk/column/BaseDecorator.java

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

src/main/java/com/terraforged/mod/chunk/column/BedrockDecorator.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.column;
+package com.terraforged.mod.chunk.column;
 
 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.mod.chunk.TerraContext;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/terraforged/mod/chunk/column/CoastDecorator.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.column;
+package com.terraforged.mod.chunk.column;
 
 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.mod.chunk.TerraContext;
 import com.terraforged.core.util.VariablePredicate;
 import com.terraforged.world.terrain.Terrains;
 import net.minecraft.block.BlockState;

src/main/java/com/terraforged/mod/chunk/column/ErosionDecorator.java

@@ -23,13 +23,13 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.column;
+package com.terraforged.mod.chunk.column;
 
 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.mod.chunk.TerraContext;
+import com.terraforged.mod.material.Materials;
 import com.terraforged.world.terrain.Terrains;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;

src/main/java/com/terraforged/mod/chunk/column/GeologyDecorator.java

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

src/main/java/com/terraforged/mod/chunk/column/post/LayerDecorator.java

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

src/main/java/com/terraforged/mod/chunk/column/post/SnowEroder.java

@@ -23,12 +23,12 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.column.post;
+package com.terraforged.mod.chunk.column.post;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
-import com.terraforged.chunk.TerraContext;
-import com.terraforged.chunk.column.ErosionDecorator;
+import com.terraforged.mod.chunk.TerraContext;
+import com.terraforged.mod.chunk.column.ErosionDecorator;
 import com.terraforged.n2d.source.Rand;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.terraforged.chunk.generator;
+package com.terraforged.mod.chunk.generator;
 
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.util.TerraContainer;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.util.TerraContainer;
 import com.terraforged.core.tile.chunk.ChunkReader;
 import com.terraforged.world.terrain.decorator.Decorator;
 import net.minecraft.util.math.ChunkPos;

src/main/java/com/terraforged/mod/chunk/generator/FeatureGenerator.java

@@ -1,12 +1,12 @@
-package com.terraforged.chunk.generator;
+package com.terraforged.mod.chunk.generator;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.chunk.column.DecoratorContext;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.fix.RegionFix;
-import com.terraforged.chunk.util.TerraContainer;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.fix.RegionFix;
+import com.terraforged.mod.chunk.util.TerraContainer;
 import com.terraforged.core.tile.chunk.ChunkReader;
-import com.terraforged.util.Environment;
+import com.terraforged.mod.util.Environment;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.biome.Biome;

src/main/java/com/terraforged/mod/chunk/generator/Generator.java

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

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

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

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

@@ -1,6 +1,6 @@
-package com.terraforged.chunk.generator;
+package com.terraforged.mod.chunk.generator;
 
-import com.terraforged.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
 import com.terraforged.fm.predicate.FeaturePredicate;
 import net.minecraft.network.DebugPacketSender;
 import net.minecraft.util.SharedSeedRandom;

src/main/java/com/terraforged/mod/chunk/generator/SurfaceGenerator.java

@@ -1,11 +1,11 @@
-package com.terraforged.chunk.generator;
+package com.terraforged.mod.chunk.generator;
 
 import com.terraforged.api.chunk.column.ColumnDecorator;
 import com.terraforged.api.biome.surface.ChunkSurfaceBuffer;
 import com.terraforged.api.biome.surface.SurfaceContext;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.util.FastChunk;
-import com.terraforged.chunk.util.TerraContainer;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.util.FastChunk;
+import com.terraforged.mod.chunk.util.TerraContainer;
 import com.terraforged.core.tile.chunk.ChunkReader;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.world.chunk.IChunk;

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

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

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

@@ -1,12 +1,12 @@
-package com.terraforged.chunk.generator;
+package com.terraforged.mod.chunk.generator;
 
 import com.terraforged.api.chunk.column.DecoratorContext;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.column.BaseDecorator;
-import com.terraforged.chunk.util.FastChunk;
-import com.terraforged.chunk.util.TerraContainer;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.column.BaseDecorator;
+import com.terraforged.mod.chunk.util.FastChunk;
+import com.terraforged.mod.chunk.util.TerraContainer;
 import com.terraforged.core.tile.chunk.ChunkReader;
-import com.terraforged.feature.TerrainHelper;
+import com.terraforged.mod.feature.TerrainHelper;
 import com.terraforged.world.climate.Climate;
 import com.terraforged.world.heightmap.Levels;
 import com.terraforged.world.terrain.Terrains;

src/main/java/com/terraforged/mod/chunk/settings/DimesionSettings.java

@@ -1,6 +1,6 @@
-package com.terraforged.chunk.settings;
+package com.terraforged.mod.chunk.settings;
 
-import com.terraforged.TerraWorld;
+import com.terraforged.mod.TerraWorld;
 import com.terraforged.core.serialization.annotation.Comment;
 import com.terraforged.core.serialization.annotation.Range;
 import com.terraforged.core.serialization.annotation.Serializable;

src/main/java/com/terraforged/mod/chunk/settings/Miscellaneous.java

@@ -23,9 +23,9 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.settings;
+package com.terraforged.mod.chunk.settings;
 
-import com.terraforged.biome.modifier.MountainModifier;
+import com.terraforged.mod.biome.modifier.MountainModifier;
 import com.terraforged.core.serialization.annotation.Comment;
 import com.terraforged.core.serialization.annotation.Range;
 import com.terraforged.core.serialization.annotation.Serializable;

src/main/java/com/terraforged/mod/chunk/settings/SettingsHelper.java

@@ -1,11 +1,11 @@
-package com.terraforged.chunk.settings;
+package com.terraforged.mod.chunk.settings;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.terraforged.Log;
-import com.terraforged.util.nbt.NBTHelper;
+import com.terraforged.mod.Log;
+import com.terraforged.mod.util.nbt.NBTHelper;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.world.storage.WorldInfo;
 

src/main/java/com/terraforged/mod/chunk/settings/StructureSettings.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.settings;
+package com.terraforged.mod.chunk.settings;
 
 import com.terraforged.core.serialization.annotation.Comment;
 import com.terraforged.core.serialization.annotation.Range;

src/main/java/com/terraforged/mod/chunk/settings/TerraSettings.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.settings;
+package com.terraforged.mod.chunk.settings;
 
 import com.terraforged.core.serialization.annotation.Serializable;
 import com.terraforged.core.settings.Settings;

src/main/java/com/terraforged/mod/chunk/settings/preset/Preset.java

@@ -1,6 +1,6 @@
-package com.terraforged.chunk.settings.preset;
+package com.terraforged.mod.chunk.settings.preset;
 
-import com.terraforged.chunk.settings.TerraSettings;
+import com.terraforged.mod.chunk.settings.TerraSettings;
 
 import java.io.File;
 

src/main/java/com/terraforged/mod/chunk/settings/preset/PresetManager.java

@@ -1,13 +1,13 @@
-package com.terraforged.chunk.settings.preset;
+package com.terraforged.mod.chunk.settings.preset;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.terraforged.Log;
-import com.terraforged.chunk.settings.SettingsHelper;
-import com.terraforged.chunk.settings.TerraSettings;
-import com.terraforged.util.nbt.NBTHelper;
+import com.terraforged.mod.Log;
+import com.terraforged.mod.chunk.settings.SettingsHelper;
+import com.terraforged.mod.chunk.settings.TerraSettings;
+import com.terraforged.mod.util.nbt.NBTHelper;
 import net.minecraft.nbt.CompoundNBT;
 
 import java.io.BufferedReader;

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

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

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

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.test;
+package com.terraforged.mod.chunk.test;
 
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.core.cell.Cell;
 import net.minecraft.world.biome.Biome;
 

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

@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-package com.terraforged.chunk.test;
+package com.terraforged.mod.chunk.test;
 
-import com.terraforged.biome.provider.TerraBiomeProvider;
-import com.terraforged.chunk.TerraChunkGenerator;
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.chunk.TerraChunkGenerator;
+import com.terraforged.mod.chunk.TerraContext;
 import net.minecraft.world.gen.GenerationSettings;
 
 public class TestChunkGenerator extends TerraChunkGenerator {

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

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

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

@@ -1,6 +1,6 @@
-package com.terraforged.chunk.test;
+package com.terraforged.mod.chunk.test;
 
-import com.terraforged.chunk.TerraContext;
+import com.terraforged.mod.chunk.TerraContext;
 import com.terraforged.world.GeneratorContext;
 import com.terraforged.world.WorldGeneratorFactory;
 

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

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

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

@@ -1,7 +1,7 @@
-package com.terraforged.chunk.util;
+package com.terraforged.mod.chunk.util;
 
 import com.terraforged.api.biome.BiomeVariant;
-import com.terraforged.biome.provider.TerraBiomeProvider;
+import com.terraforged.mod.biome.provider.TerraBiomeProvider;
 import com.terraforged.core.cell.Cell;
 import com.terraforged.core.tile.chunk.ChunkReader;
 import com.terraforged.core.util.PosIterator;

src/main/java/com/terraforged/mod/client/gui/GuiKeys.java

@@ -1,6 +1,6 @@
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
-import com.terraforged.util.TranslationKey;
+import com.terraforged.mod.util.TranslationKey;
 
 public class GuiKeys {
 

src/main/java/com/terraforged/mod/client/gui/Instance.java

@@ -1,7 +1,7 @@
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
-import com.terraforged.chunk.settings.TerraSettings;
-import com.terraforged.util.nbt.NBTHelper;
+import com.terraforged.mod.chunk.settings.TerraSettings;
+import com.terraforged.mod.util.nbt.NBTHelper;
 import net.minecraft.nbt.CompoundNBT;
 
 public class Instance {

src/main/java/com/terraforged/mod/client/gui/OverlayRenderer.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
 import net.minecraft.client.gui.screen.Screen;
 

src/main/java/com/terraforged/mod/client/gui/OverlayScreen.java

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
-import com.terraforged.gui.element.CheckBox;
-import com.terraforged.gui.element.Element;
+import com.terraforged.mod.client.gui.element.CheckBox;
+import com.terraforged.mod.client.gui.element.Element;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.Widget;

src/main/java/com/terraforged/mod/client/gui/ScrollPane.java

@@ -23,10 +23,10 @@
  * SOFTWARE.
  */
 
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
-import com.terraforged.gui.element.Element;
-import com.terraforged.gui.preview.Preview;
+import com.terraforged.mod.client.gui.element.Element;
+import com.terraforged.mod.client.gui.preview.Preview;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.screen.Screen;

src/main/java/com/terraforged/mod/client/gui/SettingsScreen.java

@@ -23,17 +23,17 @@
  * SOFTWARE.
  */
 
-package com.terraforged.gui;
+package com.terraforged.mod.client.gui;
 
-import com.terraforged.chunk.settings.SettingsHelper;
-import com.terraforged.chunk.settings.TerraSettings;
-import com.terraforged.gui.element.TerraLabel;
-import com.terraforged.gui.page.Page;
-import com.terraforged.gui.page.PresetsPage;
-import com.terraforged.gui.page.SimplePage;
-import com.terraforged.gui.page.SimplePreviewPage;
-import com.terraforged.gui.page.WorldPage;
-import com.terraforged.gui.preview.PreviewPage;
+import com.terraforged.mod.chunk.settings.SettingsHelper;
+import com.terraforged.mod.chunk.settings.TerraSettings;
+import com.terraforged.mod.client.gui.element.TerraLabel;
+import com.terraforged.mod.client.gui.page.Page;
+import com.terraforged.mod.client.gui.page.PresetsPage;
+import com.terraforged.mod.client.gui.page.SimplePage;
+import com.terraforged.mod.client.gui.page.SimplePreviewPage;
+import com.terraforged.mod.client.gui.page.WorldPage;
+import com.terraforged.mod.client.gui.preview.PreviewPage;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.screen.CreateWorldScreen;

src/main/java/com/terraforged/mod/client/gui/element/CheckBox.java

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-package com.terraforged.gui.element;
+package com.terraforged.mod.client.gui.element;
 
 public class CheckBox extends TerraButton implements Element {