diff --git a/build.gradle b/build.gradle index 3522d61..b1ae38e 100644 --- a/build.gradle +++ b/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" } diff --git a/gradle.properties b/gradle.properties index b38ed21..18441d0 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/com/terraforged/Log.java b/src/main/java/com/terraforged/mod/Log.java similarity index 98% rename from src/main/java/com/terraforged/Log.java rename to src/main/java/com/terraforged/mod/Log.java index c21ef6f..dd5af8d 100644 --- a/src/main/java/com/terraforged/Log.java +++ b/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; diff --git a/src/main/java/com/terraforged/TerraForgedMod.java b/src/main/java/com/terraforged/mod/TerraForgedMod.java similarity index 86% rename from src/main/java/com/terraforged/TerraForgedMod.java rename to src/main/java/com/terraforged/mod/TerraForgedMod.java index 864a610..1413f1d 100644 --- a/src/main/java/com/terraforged/TerraForgedMod.java +++ b/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; diff --git a/src/main/java/com/terraforged/TerraWorld.java b/src/main/java/com/terraforged/mod/TerraWorld.java similarity index 88% rename from src/main/java/com/terraforged/TerraWorld.java rename to src/main/java/com/terraforged/mod/TerraWorld.java index 2807b0f..0c94f11 100644 --- a/src/main/java/com/terraforged/TerraWorld.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/Bryce.java b/src/main/java/com/terraforged/mod/biome/Bryce.java similarity index 98% rename from src/main/java/com/terraforged/biome/Bryce.java rename to src/main/java/com/terraforged/mod/biome/Bryce.java index a792e88..6192ac4 100644 --- a/src/main/java/com/terraforged/biome/Bryce.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/ColdSteppe.java b/src/main/java/com/terraforged/mod/biome/ColdSteppe.java similarity index 99% rename from src/main/java/com/terraforged/biome/ColdSteppe.java rename to src/main/java/com/terraforged/mod/biome/ColdSteppe.java index c4eb77d..36d348b 100644 --- a/src/main/java/com/terraforged/biome/ColdSteppe.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/FirForest.java b/src/main/java/com/terraforged/mod/biome/FirForest.java similarity index 99% rename from src/main/java/com/terraforged/biome/FirForest.java rename to src/main/java/com/terraforged/mod/biome/FirForest.java index 2521e54..da72855 100644 --- a/src/main/java/com/terraforged/biome/FirForest.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/FlowerPlains.java b/src/main/java/com/terraforged/mod/biome/FlowerPlains.java similarity index 99% rename from src/main/java/com/terraforged/biome/FlowerPlains.java rename to src/main/java/com/terraforged/mod/biome/FlowerPlains.java index 917f81c..3adca77 100644 --- a/src/main/java/com/terraforged/biome/FlowerPlains.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/FrozenLake.java b/src/main/java/com/terraforged/mod/biome/FrozenLake.java similarity index 99% rename from src/main/java/com/terraforged/biome/FrozenLake.java rename to src/main/java/com/terraforged/mod/biome/FrozenLake.java index ac46d2c..fc44c9d 100644 --- a/src/main/java/com/terraforged/biome/FrozenLake.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/Lake.java b/src/main/java/com/terraforged/mod/biome/Lake.java similarity index 99% rename from src/main/java/com/terraforged/biome/Lake.java rename to src/main/java/com/terraforged/mod/biome/Lake.java index 14dc5a2..1cc1d03 100644 --- a/src/main/java/com/terraforged/biome/Lake.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/Marshland.java b/src/main/java/com/terraforged/mod/biome/Marshland.java similarity index 99% rename from src/main/java/com/terraforged/biome/Marshland.java rename to src/main/java/com/terraforged/mod/biome/Marshland.java index fe7ff97..2e17f27 100644 --- a/src/main/java/com/terraforged/biome/Marshland.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/ModBiomes.java b/src/main/java/com/terraforged/mod/biome/ModBiomes.java similarity index 99% rename from src/main/java/com/terraforged/biome/ModBiomes.java rename to src/main/java/com/terraforged/mod/biome/ModBiomes.java index d7f8154..a5503bd 100644 --- a/src/main/java/com/terraforged/biome/ModBiomes.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/SavannaScrub.java b/src/main/java/com/terraforged/mod/biome/SavannaScrub.java similarity index 99% rename from src/main/java/com/terraforged/biome/SavannaScrub.java rename to src/main/java/com/terraforged/mod/biome/SavannaScrub.java index 3560dec..9ac7079 100644 --- a/src/main/java/com/terraforged/biome/SavannaScrub.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java b/src/main/java/com/terraforged/mod/biome/ShatteredSavannaScrub.java similarity index 99% rename from src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java rename to src/main/java/com/terraforged/mod/biome/ShatteredSavannaScrub.java index 2cdfc88..aac48de 100644 --- a/src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/SnowyFirForest.java b/src/main/java/com/terraforged/mod/biome/SnowyFirForest.java similarity index 99% rename from src/main/java/com/terraforged/biome/SnowyFirForest.java rename to src/main/java/com/terraforged/mod/biome/SnowyFirForest.java index 37c1af2..421f49b 100644 --- a/src/main/java/com/terraforged/biome/SnowyFirForest.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/SnowyTaigaScrub.java b/src/main/java/com/terraforged/mod/biome/SnowyTaigaScrub.java similarity index 99% rename from src/main/java/com/terraforged/biome/SnowyTaigaScrub.java rename to src/main/java/com/terraforged/mod/biome/SnowyTaigaScrub.java index 204bdc1..84ab46c 100644 --- a/src/main/java/com/terraforged/biome/SnowyTaigaScrub.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/Steppe.java b/src/main/java/com/terraforged/mod/biome/Steppe.java similarity index 99% rename from src/main/java/com/terraforged/biome/Steppe.java rename to src/main/java/com/terraforged/mod/biome/Steppe.java index aae4fcb..742d870 100644 --- a/src/main/java/com/terraforged/biome/Steppe.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/StoneForest.java b/src/main/java/com/terraforged/mod/biome/StoneForest.java similarity index 99% rename from src/main/java/com/terraforged/biome/StoneForest.java rename to src/main/java/com/terraforged/mod/biome/StoneForest.java index edca0e2..9e4b56a 100644 --- a/src/main/java/com/terraforged/biome/StoneForest.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/TaigaScrub.java b/src/main/java/com/terraforged/mod/biome/TaigaScrub.java similarity index 99% rename from src/main/java/com/terraforged/biome/TaigaScrub.java rename to src/main/java/com/terraforged/mod/biome/TaigaScrub.java index 3b3f944..c6d3985 100644 --- a/src/main/java/com/terraforged/biome/TaigaScrub.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/WarmBeach.java b/src/main/java/com/terraforged/mod/biome/WarmBeach.java similarity index 99% rename from src/main/java/com/terraforged/biome/WarmBeach.java rename to src/main/java/com/terraforged/mod/biome/WarmBeach.java index 3cce1b2..9627606 100644 --- a/src/main/java/com/terraforged/biome/WarmBeach.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/BiomeMap.java b/src/main/java/com/terraforged/mod/biome/map/BiomeMap.java similarity index 98% rename from src/main/java/com/terraforged/biome/map/BiomeMap.java rename to src/main/java/com/terraforged/mod/biome/map/BiomeMap.java index 69f9a17..ccaa9fe 100644 --- a/src/main/java/com/terraforged/biome/map/BiomeMap.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java b/src/main/java/com/terraforged/mod/biome/map/BiomeMapBuilder.java similarity index 98% rename from src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java rename to src/main/java/com/terraforged/mod/biome/map/BiomeMapBuilder.java index bb78f44..6c1d1a0 100644 --- a/src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/BiomePredicate.java b/src/main/java/com/terraforged/mod/biome/map/BiomePredicate.java similarity index 97% rename from src/main/java/com/terraforged/biome/map/BiomePredicate.java rename to src/main/java/com/terraforged/mod/biome/map/BiomePredicate.java index e3477ee..cea6122 100644 --- a/src/main/java/com/terraforged/biome/map/BiomePredicate.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/SimpleBiomeMap.java b/src/main/java/com/terraforged/mod/biome/map/SimpleBiomeMap.java similarity index 93% rename from src/main/java/com/terraforged/biome/map/SimpleBiomeMap.java rename to src/main/java/com/terraforged/mod/biome/map/SimpleBiomeMap.java index 311754b..974d2f1 100644 --- a/src/main/java/com/terraforged/biome/map/SimpleBiomeMap.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/defaults/BiomeTemps.java b/src/main/java/com/terraforged/mod/biome/map/defaults/BiomeTemps.java similarity index 70% rename from src/main/java/com/terraforged/biome/map/defaults/BiomeTemps.java rename to src/main/java/com/terraforged/mod/biome/map/defaults/BiomeTemps.java index 581b529..99c2efb 100644 --- a/src/main/java/com/terraforged/biome/map/defaults/BiomeTemps.java +++ b/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 { diff --git a/src/main/java/com/terraforged/biome/map/defaults/DefaultBiome.java b/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiome.java similarity index 87% rename from src/main/java/com/terraforged/biome/map/defaults/DefaultBiome.java rename to src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiome.java index cbc9081..15105df 100644 --- a/src/main/java/com/terraforged/biome/map/defaults/DefaultBiome.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/defaults/DefaultBiomes.java b/src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java similarity index 95% rename from src/main/java/com/terraforged/biome/map/defaults/DefaultBiomes.java rename to src/main/java/com/terraforged/mod/biome/map/defaults/DefaultBiomes.java index 1cef1cc..44a3d9d 100644 --- a/src/main/java/com/terraforged/biome/map/defaults/DefaultBiomes.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/set/BiomeSet.java b/src/main/java/com/terraforged/mod/biome/map/set/BiomeSet.java similarity index 91% rename from src/main/java/com/terraforged/biome/map/set/BiomeSet.java rename to src/main/java/com/terraforged/mod/biome/map/set/BiomeSet.java index 8f9716e..32774a1 100644 --- a/src/main/java/com/terraforged/biome/map/set/BiomeSet.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/set/BiomeTypeSet.java b/src/main/java/com/terraforged/mod/biome/map/set/BiomeTypeSet.java similarity index 91% rename from src/main/java/com/terraforged/biome/map/set/BiomeTypeSet.java rename to src/main/java/com/terraforged/mod/biome/map/set/BiomeTypeSet.java index a9162e7..c02dc84 100644 --- a/src/main/java/com/terraforged/biome/map/set/BiomeTypeSet.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/set/RiverSet.java b/src/main/java/com/terraforged/mod/biome/map/set/RiverSet.java similarity index 74% rename from src/main/java/com/terraforged/biome/map/set/RiverSet.java rename to src/main/java/com/terraforged/mod/biome/map/set/RiverSet.java index 3f4b91d..49628bf 100644 --- a/src/main/java/com/terraforged/biome/map/set/RiverSet.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/map/set/TemperatureSet.java b/src/main/java/com/terraforged/mod/biome/map/set/TemperatureSet.java similarity index 88% rename from src/main/java/com/terraforged/biome/map/set/TemperatureSet.java rename to src/main/java/com/terraforged/mod/biome/map/set/TemperatureSet.java index 285fc26..6a152c2 100644 --- a/src/main/java/com/terraforged/biome/map/set/TemperatureSet.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/AbstractMaxHeightModifier.java similarity index 98% rename from src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/AbstractMaxHeightModifier.java index 34ffeb1..7a62baf 100644 --- a/src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/AbstractOffsetModifier.java similarity index 97% rename from src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/AbstractOffsetModifier.java index 5358c57..5ba1157 100644 --- a/src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/BeachModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/BeachModifier.java similarity index 93% rename from src/main/java/com/terraforged/biome/modifier/BeachModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/BeachModifier.java index 38a797a..7dc1d6e 100644 --- a/src/main/java/com/terraforged/biome/modifier/BeachModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java b/src/main/java/com/terraforged/mod/biome/modifier/BiomeModifierManager.java similarity index 94% rename from src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java rename to src/main/java/com/terraforged/mod/biome/modifier/BiomeModifierManager.java index 5e039fb..59e9fbe 100644 --- a/src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/CoastModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/CoastModifier.java similarity index 93% rename from src/main/java/com/terraforged/biome/modifier/CoastModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/CoastModifier.java index f3a117f..341b4c2 100644 --- a/src/main/java/com/terraforged/biome/modifier/CoastModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/DesertColorModifier.java similarity index 95% rename from src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/DesertColorModifier.java index 046e12d..f2c4614 100644 --- a/src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/modifier/MountainModifier.java b/src/main/java/com/terraforged/mod/biome/modifier/MountainModifier.java similarity index 84% rename from src/main/java/com/terraforged/biome/modifier/MountainModifier.java rename to src/main/java/com/terraforged/mod/biome/modifier/MountainModifier.java index c7d1e2c..eed4c34 100644 --- a/src/main/java/com/terraforged/biome/modifier/MountainModifier.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java b/src/main/java/com/terraforged/mod/biome/provider/AbstractBiomeProvider.java similarity index 97% rename from src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java rename to src/main/java/com/terraforged/mod/biome/provider/AbstractBiomeProvider.java index fa70a79..a431457 100644 --- a/src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/provider/BiomeHelper.java b/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java similarity index 97% rename from src/main/java/com/terraforged/biome/provider/BiomeHelper.java rename to src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java index 60070da..042f095 100644 --- a/src/main/java/com/terraforged/biome/provider/BiomeHelper.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/provider/BiomeWeights.java b/src/main/java/com/terraforged/mod/biome/provider/BiomeWeights.java similarity index 94% rename from src/main/java/com/terraforged/biome/provider/BiomeWeights.java rename to src/main/java/com/terraforged/mod/biome/provider/BiomeWeights.java index 356bf53..847d0fb 100644 --- a/src/main/java/com/terraforged/biome/provider/BiomeWeights.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/provider/DesertBiomes.java b/src/main/java/com/terraforged/mod/biome/provider/DesertBiomes.java similarity index 95% rename from src/main/java/com/terraforged/biome/provider/DesertBiomes.java rename to src/main/java/com/terraforged/mod/biome/provider/DesertBiomes.java index a12d074..a29588a 100644 --- a/src/main/java/com/terraforged/biome/provider/DesertBiomes.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/provider/TerraBiomeProvider.java b/src/main/java/com/terraforged/mod/biome/provider/TerraBiomeProvider.java similarity index 95% rename from src/main/java/com/terraforged/biome/provider/TerraBiomeProvider.java rename to src/main/java/com/terraforged/mod/biome/provider/TerraBiomeProvider.java index 5c66e77..8886ded 100644 --- a/src/main/java/com/terraforged/biome/provider/TerraBiomeProvider.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/spawn/SpawnHandler.java b/src/main/java/com/terraforged/mod/biome/spawn/SpawnHandler.java similarity index 95% rename from src/main/java/com/terraforged/biome/spawn/SpawnHandler.java rename to src/main/java/com/terraforged/mod/biome/spawn/SpawnHandler.java index 86a7879..5ca37f8 100644 --- a/src/main/java/com/terraforged/biome/spawn/SpawnHandler.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/spawn/SpawnSearch.java b/src/main/java/com/terraforged/mod/biome/spawn/SpawnSearch.java similarity index 85% rename from src/main/java/com/terraforged/biome/spawn/SpawnSearch.java rename to src/main/java/com/terraforged/mod/biome/spawn/SpawnSearch.java index 5722c54..f57b08a 100644 --- a/src/main/java/com/terraforged/biome/spawn/SpawnSearch.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/BriceSurface.java b/src/main/java/com/terraforged/mod/biome/surface/BriceSurface.java similarity index 98% rename from src/main/java/com/terraforged/biome/surface/BriceSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/BriceSurface.java index 99dade5..941d9ea 100644 --- a/src/main/java/com/terraforged/biome/surface/BriceSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/DesertSurface.java b/src/main/java/com/terraforged/mod/biome/surface/DesertSurface.java similarity index 97% rename from src/main/java/com/terraforged/biome/surface/DesertSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/DesertSurface.java index 27eedea..8d36295 100644 --- a/src/main/java/com/terraforged/biome/surface/DesertSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/DunesSurface.java b/src/main/java/com/terraforged/mod/biome/surface/DunesSurface.java similarity index 95% rename from src/main/java/com/terraforged/biome/surface/DunesSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/DunesSurface.java index ad68057..db1b026 100644 --- a/src/main/java/com/terraforged/biome/surface/DunesSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/ForestSurface.java b/src/main/java/com/terraforged/mod/biome/surface/ForestSurface.java similarity index 96% rename from src/main/java/com/terraforged/biome/surface/ForestSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/ForestSurface.java index dcf73bd..b5a93e5 100644 --- a/src/main/java/com/terraforged/biome/surface/ForestSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/IcebergsSurface.java b/src/main/java/com/terraforged/mod/biome/surface/IcebergsSurface.java similarity index 98% rename from src/main/java/com/terraforged/biome/surface/IcebergsSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/IcebergsSurface.java index 91647f8..7096b57 100644 --- a/src/main/java/com/terraforged/biome/surface/IcebergsSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/SteppeSurface.java b/src/main/java/com/terraforged/mod/biome/surface/SteppeSurface.java similarity index 96% rename from src/main/java/com/terraforged/biome/surface/SteppeSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/SteppeSurface.java index d7d5c87..09547cb 100644 --- a/src/main/java/com/terraforged/biome/surface/SteppeSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/StoneForestSurface.java b/src/main/java/com/terraforged/mod/biome/surface/StoneForestSurface.java similarity index 97% rename from src/main/java/com/terraforged/biome/surface/StoneForestSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/StoneForestSurface.java index e4c1b66..e5e9a57 100644 --- a/src/main/java/com/terraforged/biome/surface/StoneForestSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/surface/SwampSurface.java b/src/main/java/com/terraforged/mod/biome/surface/SwampSurface.java similarity index 96% rename from src/main/java/com/terraforged/biome/surface/SwampSurface.java rename to src/main/java/com/terraforged/mod/biome/surface/SwampSurface.java index 8b7c42a..5054c0d 100644 --- a/src/main/java/com/terraforged/biome/surface/SwampSurface.java +++ b/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; diff --git a/src/main/java/com/terraforged/biome/tag/BiomeTagManager.java b/src/main/java/com/terraforged/mod/biome/tag/BiomeTagManager.java similarity index 97% rename from src/main/java/com/terraforged/biome/tag/BiomeTagManager.java rename to src/main/java/com/terraforged/mod/biome/tag/BiomeTagManager.java index 371a414..f870efc 100644 --- a/src/main/java/com/terraforged/biome/tag/BiomeTagManager.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java b/src/main/java/com/terraforged/mod/chunk/ChunkGeneratorFactory.java similarity index 93% rename from src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java rename to src/main/java/com/terraforged/mod/chunk/ChunkGeneratorFactory.java index d765d16..ba7e7ba 100644 --- a/src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/TerraChunkGenerator.java b/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java similarity index 92% rename from src/main/java/com/terraforged/chunk/TerraChunkGenerator.java rename to src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java index ff25c28..2f3cffe 100644 --- a/src/main/java/com/terraforged/chunk/TerraChunkGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/TerraContext.java b/src/main/java/com/terraforged/mod/chunk/TerraContext.java similarity index 95% rename from src/main/java/com/terraforged/chunk/TerraContext.java rename to src/main/java/com/terraforged/mod/chunk/TerraContext.java index fb6cbbf..092406d 100644 --- a/src/main/java/com/terraforged/chunk/TerraContext.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/TerraGenSettings.java b/src/main/java/com/terraforged/mod/chunk/TerraGenSettings.java similarity index 97% rename from src/main/java/com/terraforged/chunk/TerraGenSettings.java rename to src/main/java/com/terraforged/mod/chunk/TerraGenSettings.java index 6ffe581..c0b2fbc 100644 --- a/src/main/java/com/terraforged/chunk/TerraGenSettings.java +++ b/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 { diff --git a/src/main/java/com/terraforged/chunk/TerraSetupFactory.java b/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java similarity index 85% rename from src/main/java/com/terraforged/chunk/TerraSetupFactory.java rename to src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java index 66f59e0..0ca4b77 100644 --- a/src/main/java/com/terraforged/chunk/TerraSetupFactory.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/TerraTerrainProvider.java b/src/main/java/com/terraforged/mod/chunk/TerraTerrainProvider.java similarity index 95% rename from src/main/java/com/terraforged/chunk/TerraTerrainProvider.java rename to src/main/java/com/terraforged/mod/chunk/TerraTerrainProvider.java index 819bf01..319ed6b 100644 --- a/src/main/java/com/terraforged/chunk/TerraTerrainProvider.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/BaseDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/BaseDecorator.java similarity index 98% rename from src/main/java/com/terraforged/chunk/column/BaseDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/BaseDecorator.java index 7124157..267de15 100644 --- a/src/main/java/com/terraforged/chunk/column/BaseDecorator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/BedrockDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/BedrockDecorator.java similarity index 96% rename from src/main/java/com/terraforged/chunk/column/BedrockDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/BedrockDecorator.java index 19ac871..b76c087 100644 --- a/src/main/java/com/terraforged/chunk/column/BedrockDecorator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/CoastDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/CoastDecorator.java similarity index 96% rename from src/main/java/com/terraforged/chunk/column/CoastDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/CoastDecorator.java index b649081..86327a8 100644 --- a/src/main/java/com/terraforged/chunk/column/CoastDecorator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/ErosionDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/ErosionDecorator.java similarity index 98% rename from src/main/java/com/terraforged/chunk/column/ErosionDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/ErosionDecorator.java index 02a8f19..2055448 100644 --- a/src/main/java/com/terraforged/chunk/column/ErosionDecorator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/GeologyDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/GeologyDecorator.java similarity index 95% rename from src/main/java/com/terraforged/chunk/column/GeologyDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/GeologyDecorator.java index d65a506..13d8943 100644 --- a/src/main/java/com/terraforged/chunk/column/GeologyDecorator.java +++ b/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 { diff --git a/src/main/java/com/terraforged/chunk/column/post/LayerDecorator.java b/src/main/java/com/terraforged/mod/chunk/column/post/LayerDecorator.java similarity index 98% rename from src/main/java/com/terraforged/chunk/column/post/LayerDecorator.java rename to src/main/java/com/terraforged/mod/chunk/column/post/LayerDecorator.java index 30ccf81..f8ca7e8 100644 --- a/src/main/java/com/terraforged/chunk/column/post/LayerDecorator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/column/post/SnowEroder.java b/src/main/java/com/terraforged/mod/chunk/column/post/SnowEroder.java similarity index 96% rename from src/main/java/com/terraforged/chunk/column/post/SnowEroder.java rename to src/main/java/com/terraforged/mod/chunk/column/post/SnowEroder.java index 298201a..fa14591 100644 --- a/src/main/java/com/terraforged/chunk/column/post/SnowEroder.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java b/src/main/java/com/terraforged/mod/chunk/fix/ChunkCarverFix.java similarity index 96% rename from src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java rename to src/main/java/com/terraforged/mod/chunk/fix/ChunkCarverFix.java index 0273654..0792eae 100644 --- a/src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/fix/RegionDelegate.java b/src/main/java/com/terraforged/mod/chunk/fix/RegionDelegate.java similarity index 99% rename from src/main/java/com/terraforged/chunk/fix/RegionDelegate.java rename to src/main/java/com/terraforged/mod/chunk/fix/RegionDelegate.java index cb880fd..77351f2 100644 --- a/src/main/java/com/terraforged/chunk/fix/RegionDelegate.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/fix/RegionFix.java b/src/main/java/com/terraforged/mod/chunk/fix/RegionFix.java similarity index 97% rename from src/main/java/com/terraforged/chunk/fix/RegionFix.java rename to src/main/java/com/terraforged/mod/chunk/fix/RegionFix.java index 88a974b..2a1c3a2 100644 --- a/src/main/java/com/terraforged/chunk/fix/RegionFix.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/BiomeGenerator.java similarity index 86% rename from src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/BiomeGenerator.java index 9244a37..b2a4978 100644 --- a/src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/FeatureGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/FeatureGenerator.java similarity index 91% rename from src/main/java/com/terraforged/chunk/generator/FeatureGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/FeatureGenerator.java index 94b6139..0c4bcc0 100644 --- a/src/main/java/com/terraforged/chunk/generator/FeatureGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/Generator.java b/src/main/java/com/terraforged/mod/chunk/generator/Generator.java similarity index 98% rename from src/main/java/com/terraforged/chunk/generator/Generator.java rename to src/main/java/com/terraforged/mod/chunk/generator/Generator.java index b5f9866..ecfca40 100644 --- a/src/main/java/com/terraforged/chunk/generator/Generator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/MobGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/MobGenerator.java similarity index 97% rename from src/main/java/com/terraforged/chunk/generator/MobGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/MobGenerator.java index 24b0d3f..c86de9f 100644 --- a/src/main/java/com/terraforged/chunk/generator/MobGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/StructureGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/StructureGenerator.java similarity index 97% rename from src/main/java/com/terraforged/chunk/generator/StructureGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/StructureGenerator.java index 7556626..ae66be6 100644 --- a/src/main/java/com/terraforged/chunk/generator/StructureGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/SurfaceGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/SurfaceGenerator.java similarity index 92% rename from src/main/java/com/terraforged/chunk/generator/SurfaceGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/SurfaceGenerator.java index 2ca1811..55b5e63 100644 --- a/src/main/java/com/terraforged/chunk/generator/SurfaceGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/TerrainCarver.java b/src/main/java/com/terraforged/mod/chunk/generator/TerrainCarver.java similarity index 92% rename from src/main/java/com/terraforged/chunk/generator/TerrainCarver.java rename to src/main/java/com/terraforged/mod/chunk/generator/TerrainCarver.java index fcc394e..1cecbfb 100644 --- a/src/main/java/com/terraforged/chunk/generator/TerrainCarver.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java b/src/main/java/com/terraforged/mod/chunk/generator/TerrainGenerator.java similarity index 85% rename from src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java rename to src/main/java/com/terraforged/mod/chunk/generator/TerrainGenerator.java index 691580b..fd80f56 100644 --- a/src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/DimesionSettings.java b/src/main/java/com/terraforged/mod/chunk/settings/DimesionSettings.java similarity index 96% rename from src/main/java/com/terraforged/chunk/settings/DimesionSettings.java rename to src/main/java/com/terraforged/mod/chunk/settings/DimesionSettings.java index 37389f7..ba88b7e 100644 --- a/src/main/java/com/terraforged/chunk/settings/DimesionSettings.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/Miscellaneous.java b/src/main/java/com/terraforged/mod/chunk/settings/Miscellaneous.java similarity index 95% rename from src/main/java/com/terraforged/chunk/settings/Miscellaneous.java rename to src/main/java/com/terraforged/mod/chunk/settings/Miscellaneous.java index 9124822..573dbc4 100644 --- a/src/main/java/com/terraforged/chunk/settings/Miscellaneous.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/SettingsHelper.java b/src/main/java/com/terraforged/mod/chunk/settings/SettingsHelper.java similarity index 95% rename from src/main/java/com/terraforged/chunk/settings/SettingsHelper.java rename to src/main/java/com/terraforged/mod/chunk/settings/SettingsHelper.java index d782c3f..299e92b 100644 --- a/src/main/java/com/terraforged/chunk/settings/SettingsHelper.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/StructureSettings.java b/src/main/java/com/terraforged/mod/chunk/settings/StructureSettings.java similarity index 99% rename from src/main/java/com/terraforged/chunk/settings/StructureSettings.java rename to src/main/java/com/terraforged/mod/chunk/settings/StructureSettings.java index ecf5975..df5bb21 100644 --- a/src/main/java/com/terraforged/chunk/settings/StructureSettings.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/TerraSettings.java b/src/main/java/com/terraforged/mod/chunk/settings/TerraSettings.java similarity index 97% rename from src/main/java/com/terraforged/chunk/settings/TerraSettings.java rename to src/main/java/com/terraforged/mod/chunk/settings/TerraSettings.java index ce5173f..0f04b62 100644 --- a/src/main/java/com/terraforged/chunk/settings/TerraSettings.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/preset/Preset.java b/src/main/java/com/terraforged/mod/chunk/settings/preset/Preset.java similarity index 91% rename from src/main/java/com/terraforged/chunk/settings/preset/Preset.java rename to src/main/java/com/terraforged/mod/chunk/settings/preset/Preset.java index ba3e4c4..db3f237 100644 --- a/src/main/java/com/terraforged/chunk/settings/preset/Preset.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/settings/preset/PresetManager.java b/src/main/java/com/terraforged/mod/chunk/settings/preset/PresetManager.java similarity index 94% rename from src/main/java/com/terraforged/chunk/settings/preset/PresetManager.java rename to src/main/java/com/terraforged/mod/chunk/settings/preset/PresetManager.java index 063ae46..482127f 100644 --- a/src/main/java/com/terraforged/chunk/settings/preset/PresetManager.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/test/Test.java b/src/main/java/com/terraforged/mod/chunk/test/Test.java similarity index 95% rename from src/main/java/com/terraforged/chunk/test/Test.java rename to src/main/java/com/terraforged/mod/chunk/test/Test.java index 8676eb0..80b7061 100644 --- a/src/main/java/com/terraforged/chunk/test/Test.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java b/src/main/java/com/terraforged/mod/chunk/test/TestBiomeProvider.java similarity index 90% rename from src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java rename to src/main/java/com/terraforged/mod/chunk/test/TestBiomeProvider.java index 1bb7ee7..22decc3 100644 --- a/src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java b/src/main/java/com/terraforged/mod/chunk/test/TestChunkGenerator.java similarity index 89% rename from src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java rename to src/main/java/com/terraforged/mod/chunk/test/TestChunkGenerator.java index 70587b9..7300800 100644 --- a/src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java +++ b/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 { diff --git a/src/main/java/com/terraforged/chunk/test/TestHeightMap.java b/src/main/java/com/terraforged/mod/chunk/test/TestHeightMap.java similarity index 95% rename from src/main/java/com/terraforged/chunk/test/TestHeightMap.java rename to src/main/java/com/terraforged/mod/chunk/test/TestHeightMap.java index b8e20a6..868dad2 100644 --- a/src/main/java/com/terraforged/chunk/test/TestHeightMap.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/test/TestTerraContext.java b/src/main/java/com/terraforged/mod/chunk/test/TestTerraContext.java similarity index 82% rename from src/main/java/com/terraforged/chunk/test/TestTerraContext.java rename to src/main/java/com/terraforged/mod/chunk/test/TestTerraContext.java index 5deb243..4c20867 100644 --- a/src/main/java/com/terraforged/chunk/test/TestTerraContext.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/util/FastChunk.java b/src/main/java/com/terraforged/mod/chunk/util/FastChunk.java similarity index 99% rename from src/main/java/com/terraforged/chunk/util/FastChunk.java rename to src/main/java/com/terraforged/mod/chunk/util/FastChunk.java index 2a22e94..2d87139 100644 --- a/src/main/java/com/terraforged/chunk/util/FastChunk.java +++ b/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; diff --git a/src/main/java/com/terraforged/chunk/util/TerraContainer.java b/src/main/java/com/terraforged/mod/chunk/util/TerraContainer.java similarity index 97% rename from src/main/java/com/terraforged/chunk/util/TerraContainer.java rename to src/main/java/com/terraforged/mod/chunk/util/TerraContainer.java index 297abf9..295ffa3 100644 --- a/src/main/java/com/terraforged/chunk/util/TerraContainer.java +++ b/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; diff --git a/src/main/java/com/terraforged/gui/GuiKeys.java b/src/main/java/com/terraforged/mod/client/gui/GuiKeys.java similarity index 96% rename from src/main/java/com/terraforged/gui/GuiKeys.java rename to src/main/java/com/terraforged/mod/client/gui/GuiKeys.java index 5803656..6bda3fa 100644 --- a/src/main/java/com/terraforged/gui/GuiKeys.java +++ b/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 { diff --git a/src/main/java/com/terraforged/gui/Instance.java b/src/main/java/com/terraforged/mod/client/gui/Instance.java similarity index 73% rename from src/main/java/com/terraforged/gui/Instance.java rename to src/main/java/com/terraforged/mod/client/gui/Instance.java index cdc1238..5744a51 100644 --- a/src/main/java/com/terraforged/gui/Instance.java +++ b/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 { diff --git a/src/main/java/com/terraforged/gui/OverlayRenderer.java b/src/main/java/com/terraforged/mod/client/gui/OverlayRenderer.java similarity index 96% rename from src/main/java/com/terraforged/gui/OverlayRenderer.java rename to src/main/java/com/terraforged/mod/client/gui/OverlayRenderer.java index 41cb51e..2390166 100644 --- a/src/main/java/com/terraforged/gui/OverlayRenderer.java +++ b/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; diff --git a/src/main/java/com/terraforged/gui/OverlayScreen.java b/src/main/java/com/terraforged/mod/client/gui/OverlayScreen.java similarity index 95% rename from src/main/java/com/terraforged/gui/OverlayScreen.java rename to src/main/java/com/terraforged/mod/client/gui/OverlayScreen.java index ef691c9..d3ab784 100644 --- a/src/main/java/com/terraforged/gui/OverlayScreen.java +++ b/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; diff --git a/src/main/java/com/terraforged/gui/ScrollPane.java b/src/main/java/com/terraforged/mod/client/gui/ScrollPane.java similarity index 96% rename from src/main/java/com/terraforged/gui/ScrollPane.java rename to src/main/java/com/terraforged/mod/client/gui/ScrollPane.java index f44dcf8..081ef0b 100644 --- a/src/main/java/com/terraforged/gui/ScrollPane.java +++ b/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; diff --git a/src/main/java/com/terraforged/gui/SettingsScreen.java b/src/main/java/com/terraforged/mod/client/gui/SettingsScreen.java similarity index 94% rename from src/main/java/com/terraforged/gui/SettingsScreen.java rename to src/main/java/com/terraforged/mod/client/gui/SettingsScreen.java index cd694dd..251ecd6 100644 --- a/src/main/java/com/terraforged/gui/SettingsScreen.java +++ b/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; diff --git a/src/main/java/com/terraforged/gui/element/CheckBox.java b/src/main/java/com/terraforged/mod/client/gui/element/CheckBox.java similarity index 97% rename from src/main/java/com/terraforged/gui/element/CheckBox.java rename to src/main/java/com/terraforged/mod/client/gui/element/CheckBox.java index c781e75..190dafc 100644 --- a/src/main/java/com/terraforged/gui/element/CheckBox.java +++ b/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 { diff --git a/src/main/java/com/terraforged/gui/element/Element.java b/src/main/java/com/terraforged/mod/client/gui/element/Element.java similarity index 97% rename from src/main/java/com/terraforged/gui/element/Element.java rename to src/main/java/com/terraforged/mod/client/gui/element/Element.java index bc9a063..3147bea 100644 --- a/src/main/java/com/terraforged/gui/element/Element.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/Element.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.client.resources.I18n; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/gui/element/TerraButton.java b/src/main/java/com/terraforged/mod/client/gui/element/TerraButton.java similarity index 98% rename from src/main/java/com/terraforged/gui/element/TerraButton.java rename to src/main/java/com/terraforged/mod/client/gui/element/TerraButton.java index eedd858..498ee09 100644 --- a/src/main/java/com/terraforged/gui/element/TerraButton.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/TerraButton.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/main/java/com/terraforged/gui/element/TerraLabel.java b/src/main/java/com/terraforged/mod/client/gui/element/TerraLabel.java similarity index 97% rename from src/main/java/com/terraforged/gui/element/TerraLabel.java rename to src/main/java/com/terraforged/mod/client/gui/element/TerraLabel.java index 0d2a69b..9fce37f 100644 --- a/src/main/java/com/terraforged/gui/element/TerraLabel.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/TerraLabel.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/terraforged/gui/element/TerraSlider.java b/src/main/java/com/terraforged/mod/client/gui/element/TerraSlider.java similarity index 98% rename from src/main/java/com/terraforged/gui/element/TerraSlider.java rename to src/main/java/com/terraforged/mod/client/gui/element/TerraSlider.java index fa82cd2..f09b6fa 100644 --- a/src/main/java/com/terraforged/gui/element/TerraSlider.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/TerraSlider.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.client.gui.widget.Slider; diff --git a/src/main/java/com/terraforged/gui/element/TerraTextInput.java b/src/main/java/com/terraforged/mod/client/gui/element/TerraTextInput.java similarity index 97% rename from src/main/java/com/terraforged/gui/element/TerraTextInput.java rename to src/main/java/com/terraforged/mod/client/gui/element/TerraTextInput.java index 672ba72..ac4c403 100644 --- a/src/main/java/com/terraforged/gui/element/TerraTextInput.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/TerraTextInput.java @@ -1,4 +1,4 @@ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/main/java/com/terraforged/gui/element/TerraToggle.java b/src/main/java/com/terraforged/mod/client/gui/element/TerraToggle.java similarity index 98% rename from src/main/java/com/terraforged/gui/element/TerraToggle.java rename to src/main/java/com/terraforged/mod/client/gui/element/TerraToggle.java index 74f0460..36e5c55 100644 --- a/src/main/java/com/terraforged/gui/element/TerraToggle.java +++ b/src/main/java/com/terraforged/mod/client/gui/element/TerraToggle.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.element; +package com.terraforged.mod.client.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/gui/page/BasePage.java b/src/main/java/com/terraforged/mod/client/gui/page/BasePage.java similarity index 97% rename from src/main/java/com/terraforged/gui/page/BasePage.java rename to src/main/java/com/terraforged/mod/client/gui/page/BasePage.java index ee93328..5f61d5e 100644 --- a/src/main/java/com/terraforged/gui/page/BasePage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/BasePage.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; public abstract class BasePage extends Page { diff --git a/src/main/java/com/terraforged/gui/page/Page.java b/src/main/java/com/terraforged/mod/client/gui/page/Page.java similarity index 92% rename from src/main/java/com/terraforged/gui/page/Page.java rename to src/main/java/com/terraforged/mod/client/gui/page/Page.java index 50d2734..91397f5 100644 --- a/src/main/java/com/terraforged/gui/page/Page.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/Page.java @@ -23,17 +23,17 @@ * SOFTWARE. */ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.gui.OverlayRenderer; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.gui.ScrollPane; -import com.terraforged.gui.element.Element; -import com.terraforged.gui.element.TerraLabel; -import com.terraforged.gui.element.TerraSlider; -import com.terraforged.gui.element.TerraTextInput; -import com.terraforged.gui.element.TerraToggle; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.client.gui.OverlayRenderer; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.client.gui.ScrollPane; +import com.terraforged.mod.client.gui.element.Element; +import com.terraforged.mod.client.gui.element.TerraLabel; +import com.terraforged.mod.client.gui.element.TerraSlider; +import com.terraforged.mod.client.gui.element.TerraTextInput; +import com.terraforged.mod.client.gui.element.TerraToggle; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.Widget; diff --git a/src/main/java/com/terraforged/gui/page/PresetsPage.java b/src/main/java/com/terraforged/mod/client/gui/page/PresetsPage.java similarity index 91% rename from src/main/java/com/terraforged/gui/page/PresetsPage.java rename to src/main/java/com/terraforged/mod/client/gui/page/PresetsPage.java index 0f133b6..f39a249 100644 --- a/src/main/java/com/terraforged/gui/page/PresetsPage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/PresetsPage.java @@ -1,17 +1,17 @@ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.chunk.settings.SettingsHelper; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.chunk.settings.preset.Preset; -import com.terraforged.chunk.settings.preset.PresetManager; -import com.terraforged.gui.GuiKeys; -import com.terraforged.gui.Instance; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.gui.ScrollPane; -import com.terraforged.gui.element.TerraButton; -import com.terraforged.gui.element.TerraLabel; -import com.terraforged.gui.element.TerraTextInput; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.chunk.settings.SettingsHelper; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.chunk.settings.preset.Preset; +import com.terraforged.mod.chunk.settings.preset.PresetManager; +import com.terraforged.mod.client.gui.GuiKeys; +import com.terraforged.mod.client.gui.Instance; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.client.gui.ScrollPane; +import com.terraforged.mod.client.gui.element.TerraButton; +import com.terraforged.mod.client.gui.element.TerraLabel; +import com.terraforged.mod.client.gui.element.TerraTextInput; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.client.gui.widget.Widget; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/gui/page/SimplePage.java b/src/main/java/com/terraforged/mod/client/gui/page/SimplePage.java similarity index 82% rename from src/main/java/com/terraforged/gui/page/SimplePage.java rename to src/main/java/com/terraforged/mod/client/gui/page/SimplePage.java index 87a4d9b..d5e41ad 100644 --- a/src/main/java/com/terraforged/gui/page/SimplePage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/SimplePage.java @@ -1,9 +1,9 @@ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.gui.Instance; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.util.TranslationKey; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.client.gui.Instance; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.util.TranslationKey; import net.minecraft.nbt.CompoundNBT; import java.util.function.Function; diff --git a/src/main/java/com/terraforged/gui/page/SimplePreviewPage.java b/src/main/java/com/terraforged/mod/client/gui/page/SimplePreviewPage.java similarity index 69% rename from src/main/java/com/terraforged/gui/page/SimplePreviewPage.java rename to src/main/java/com/terraforged/mod/client/gui/page/SimplePreviewPage.java index f413e55..b1065b5 100644 --- a/src/main/java/com/terraforged/gui/page/SimplePreviewPage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/SimplePreviewPage.java @@ -1,9 +1,9 @@ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.gui.Instance; -import com.terraforged.util.TranslationKey; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.client.gui.Instance; +import com.terraforged.mod.util.TranslationKey; +import com.terraforged.mod.util.nbt.NBTHelper; import java.util.function.Function; diff --git a/src/main/java/com/terraforged/gui/page/UpdatablePage.java b/src/main/java/com/terraforged/mod/client/gui/page/UpdatablePage.java similarity index 63% rename from src/main/java/com/terraforged/gui/page/UpdatablePage.java rename to src/main/java/com/terraforged/mod/client/gui/page/UpdatablePage.java index 8b612b7..158b0e1 100644 --- a/src/main/java/com/terraforged/gui/page/UpdatablePage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/UpdatablePage.java @@ -1,7 +1,7 @@ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.gui.OverlayScreen; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.client.gui.OverlayScreen; import java.util.function.Consumer; diff --git a/src/main/java/com/terraforged/gui/page/WorldPage.java b/src/main/java/com/terraforged/mod/client/gui/page/WorldPage.java similarity index 92% rename from src/main/java/com/terraforged/gui/page/WorldPage.java rename to src/main/java/com/terraforged/mod/client/gui/page/WorldPage.java index 5f369d6..f996101 100644 --- a/src/main/java/com/terraforged/gui/page/WorldPage.java +++ b/src/main/java/com/terraforged/mod/client/gui/page/WorldPage.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.gui.page; +package com.terraforged.mod.client.gui.page; -import com.terraforged.TerraWorld; -import com.terraforged.gui.GuiKeys; -import com.terraforged.gui.Instance; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.gui.element.TerraTextInput; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.TerraWorld; +import com.terraforged.mod.client.gui.GuiKeys; +import com.terraforged.mod.client.gui.Instance; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.client.gui.element.TerraTextInput; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.client.gui.widget.Widget; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/terraforged/gui/preview/Preview.java b/src/main/java/com/terraforged/mod/client/gui/preview/Preview.java similarity index 98% rename from src/main/java/com/terraforged/gui/preview/Preview.java rename to src/main/java/com/terraforged/mod/client/gui/preview/Preview.java index aa24a1b..2af7133 100644 --- a/src/main/java/com/terraforged/gui/preview/Preview.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview/Preview.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.preview; +package com.terraforged.mod.client.gui.preview; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -34,9 +34,9 @@ import com.terraforged.core.settings.Settings; import com.terraforged.core.tile.Size; import com.terraforged.core.tile.Tile; import com.terraforged.core.tile.gen.TileGenerator; -import com.terraforged.gui.GuiKeys; +import com.terraforged.mod.client.gui.GuiKeys; import com.terraforged.n2d.util.NoiseUtil; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.util.nbt.NBTHelper; import com.terraforged.world.GeneratorContext; import com.terraforged.world.continent.MutableVeci; import com.terraforged.world.heightmap.Levels; diff --git a/src/main/java/com/terraforged/gui/preview/PreviewPage.java b/src/main/java/com/terraforged/mod/client/gui/preview/PreviewPage.java similarity index 89% rename from src/main/java/com/terraforged/gui/preview/PreviewPage.java rename to src/main/java/com/terraforged/mod/client/gui/preview/PreviewPage.java index 30d4386..5847ece 100644 --- a/src/main/java/com/terraforged/gui/preview/PreviewPage.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview/PreviewPage.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.gui.preview; +package com.terraforged.mod.client.gui.preview; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.gui.GuiKeys; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.gui.element.TerraButton; -import com.terraforged.gui.page.UpdatablePage; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.client.gui.GuiKeys; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.client.gui.element.TerraButton; +import com.terraforged.mod.client.gui.page.UpdatablePage; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import java.util.function.Consumer; diff --git a/src/main/java/com/terraforged/gui/preview/PreviewSettings.java b/src/main/java/com/terraforged/mod/client/gui/preview/PreviewSettings.java similarity index 97% rename from src/main/java/com/terraforged/gui/preview/PreviewSettings.java rename to src/main/java/com/terraforged/mod/client/gui/preview/PreviewSettings.java index 087309a..e50f85d 100644 --- a/src/main/java/com/terraforged/gui/preview/PreviewSettings.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview/PreviewSettings.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.preview; +package com.terraforged.mod.client.gui.preview; import com.terraforged.core.serialization.annotation.Comment; import com.terraforged.core.serialization.annotation.Range; diff --git a/src/main/java/com/terraforged/gui/preview/RenderMode.java b/src/main/java/com/terraforged/mod/client/gui/preview/RenderMode.java similarity index 98% rename from src/main/java/com/terraforged/gui/preview/RenderMode.java rename to src/main/java/com/terraforged/mod/client/gui/preview/RenderMode.java index 1998cf3..5117758 100644 --- a/src/main/java/com/terraforged/gui/preview/RenderMode.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview/RenderMode.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.gui.preview; +package com.terraforged.mod.client.gui.preview; import com.terraforged.core.cell.Cell; import com.terraforged.n2d.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/gui/preview2/MCRenderAPI.java b/src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderAPI.java similarity index 94% rename from src/main/java/com/terraforged/gui/preview2/MCRenderAPI.java rename to src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderAPI.java index 656decd..1f5d38d 100644 --- a/src/main/java/com/terraforged/gui/preview2/MCRenderAPI.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderAPI.java @@ -1,4 +1,4 @@ -package com.terraforged.gui.preview2; +package com.terraforged.mod.client.gui.preview2; import com.mojang.blaze3d.systems.RenderSystem; import com.terraforged.core.render.RenderAPI; diff --git a/src/main/java/com/terraforged/gui/preview2/MCRenderBuffer.java b/src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderBuffer.java similarity index 97% rename from src/main/java/com/terraforged/gui/preview2/MCRenderBuffer.java rename to src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderBuffer.java index 9750d7e..9002fc1 100644 --- a/src/main/java/com/terraforged/gui/preview2/MCRenderBuffer.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview2/MCRenderBuffer.java @@ -1,4 +1,4 @@ -package com.terraforged.gui.preview2; +package com.terraforged.mod.client.gui.preview2; import com.terraforged.core.render.RenderBuffer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/terraforged/gui/preview2/Preview.java b/src/main/java/com/terraforged/mod/client/gui/preview2/Preview.java similarity index 97% rename from src/main/java/com/terraforged/gui/preview2/Preview.java rename to src/main/java/com/terraforged/mod/client/gui/preview2/Preview.java index a9b9d23..22d10d5 100644 --- a/src/main/java/com/terraforged/gui/preview2/Preview.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview2/Preview.java @@ -1,7 +1,7 @@ -package com.terraforged.gui.preview2; +package com.terraforged.mod.client.gui.preview2; import com.mojang.blaze3d.systems.RenderSystem; -import com.terraforged.chunk.settings.TerraSettings; +import com.terraforged.mod.chunk.settings.TerraSettings; import com.terraforged.core.concurrent.thread.ThreadPool; import com.terraforged.core.concurrent.thread.ThreadPools; import com.terraforged.core.render.RenderAPI; diff --git a/src/main/java/com/terraforged/gui/preview2/PreviewPage.java b/src/main/java/com/terraforged/mod/client/gui/preview2/PreviewPage.java similarity index 79% rename from src/main/java/com/terraforged/gui/preview2/PreviewPage.java rename to src/main/java/com/terraforged/mod/client/gui/preview2/PreviewPage.java index 4f466bd..106e756 100644 --- a/src/main/java/com/terraforged/gui/preview2/PreviewPage.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview2/PreviewPage.java @@ -1,10 +1,10 @@ -package com.terraforged.gui.preview2; +package com.terraforged.mod.client.gui.preview2; -import com.terraforged.chunk.settings.TerraSettings; -import com.terraforged.gui.OverlayScreen; -import com.terraforged.gui.element.TerraButton; -import com.terraforged.gui.page.UpdatablePage; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.chunk.settings.TerraSettings; +import com.terraforged.mod.client.gui.OverlayScreen; +import com.terraforged.mod.client.gui.element.TerraButton; +import com.terraforged.mod.client.gui.page.UpdatablePage; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import java.util.function.Consumer; @@ -35,8 +35,8 @@ public class PreviewPage extends UpdatablePage { Column right = getColumn(1); preview.x = 0; preview.y = 0; - preview.setWidth(com.terraforged.gui.preview.Preview.WIDTH); - preview.setHeight(com.terraforged.gui.preview.Preview.HEIGHT); + preview.setWidth(com.terraforged.mod.client.gui.preview.Preview.WIDTH); + preview.setHeight(com.terraforged.mod.client.gui.preview.Preview.HEIGHT); addElements(right.left, right.top, right, settings, right.scrollPane::addButton, this::update); diff --git a/src/main/java/com/terraforged/gui/preview2/PreviewSettings.java b/src/main/java/com/terraforged/mod/client/gui/preview2/PreviewSettings.java similarity index 90% rename from src/main/java/com/terraforged/gui/preview2/PreviewSettings.java rename to src/main/java/com/terraforged/mod/client/gui/preview2/PreviewSettings.java index 5d5575f..26d06f1 100644 --- a/src/main/java/com/terraforged/gui/preview2/PreviewSettings.java +++ b/src/main/java/com/terraforged/mod/client/gui/preview2/PreviewSettings.java @@ -1,4 +1,4 @@ -package com.terraforged.gui.preview2; +package com.terraforged.mod.client.gui.preview2; import com.terraforged.core.render.RenderMode; import com.terraforged.core.serialization.annotation.Range; diff --git a/src/main/java/com/terraforged/config/ConfigManager.java b/src/main/java/com/terraforged/mod/config/ConfigManager.java similarity index 98% rename from src/main/java/com/terraforged/config/ConfigManager.java rename to src/main/java/com/terraforged/mod/config/ConfigManager.java index bfe786b..a398a01 100644 --- a/src/main/java/com/terraforged/config/ConfigManager.java +++ b/src/main/java/com/terraforged/mod/config/ConfigManager.java @@ -1,10 +1,10 @@ -package com.terraforged.config; +package com.terraforged.mod.config; import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.Config; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.toml.TomlFormat; -import com.terraforged.Log; +import com.terraforged.mod.Log; import joptsimple.internal.Strings; import java.io.IOException; diff --git a/src/main/java/com/terraforged/config/ConfigRef.java b/src/main/java/com/terraforged/mod/config/ConfigRef.java similarity index 91% rename from src/main/java/com/terraforged/config/ConfigRef.java rename to src/main/java/com/terraforged/mod/config/ConfigRef.java index 051fbd1..0a73815 100644 --- a/src/main/java/com/terraforged/config/ConfigRef.java +++ b/src/main/java/com/terraforged/mod/config/ConfigRef.java @@ -1,7 +1,7 @@ -package com.terraforged.config; +package com.terraforged.mod.config; import com.electronwill.nightconfig.core.file.CommentedFileConfig; -import com.terraforged.Log; +import com.terraforged.mod.Log; import java.util.function.Supplier; diff --git a/src/main/java/com/terraforged/config/PerfDefaults.java b/src/main/java/com/terraforged/mod/config/PerfDefaults.java similarity index 95% rename from src/main/java/com/terraforged/config/PerfDefaults.java rename to src/main/java/com/terraforged/mod/config/PerfDefaults.java index e41770c..3d7897c 100644 --- a/src/main/java/com/terraforged/config/PerfDefaults.java +++ b/src/main/java/com/terraforged/mod/config/PerfDefaults.java @@ -1,7 +1,7 @@ -package com.terraforged.config; +package com.terraforged.mod.config; import com.electronwill.nightconfig.core.CommentedConfig; -import com.terraforged.Log; +import com.terraforged.mod.Log; import com.terraforged.core.concurrent.thread.ThreadPools; public class PerfDefaults { diff --git a/src/main/java/com/terraforged/data/DataGen.java b/src/main/java/com/terraforged/mod/data/DataGen.java similarity index 98% rename from src/main/java/com/terraforged/data/DataGen.java rename to src/main/java/com/terraforged/mod/data/DataGen.java index 6bfe648..13a3df4 100644 --- a/src/main/java/com/terraforged/data/DataGen.java +++ b/src/main/java/com/terraforged/mod/data/DataGen.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.data; +package com.terraforged.mod.data; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; diff --git a/src/main/java/com/terraforged/data/LangGenerator.java b/src/main/java/com/terraforged/mod/data/LangGenerator.java similarity index 91% rename from src/main/java/com/terraforged/data/LangGenerator.java rename to src/main/java/com/terraforged/mod/data/LangGenerator.java index 0869c11..da76609 100644 --- a/src/main/java/com/terraforged/data/LangGenerator.java +++ b/src/main/java/com/terraforged/mod/data/LangGenerator.java @@ -1,11 +1,11 @@ -package com.terraforged.data; +package com.terraforged.mod.data; -import com.terraforged.chunk.settings.TerraSettings; +import com.terraforged.mod.chunk.settings.TerraSettings; import com.terraforged.core.util.NameUtil; -import com.terraforged.gui.GuiKeys; -import com.terraforged.gui.preview2.PreviewSettings; -import com.terraforged.util.TranslationKey; -import com.terraforged.util.nbt.NBTHelper; +import com.terraforged.mod.client.gui.GuiKeys; +import com.terraforged.mod.client.gui.preview2.PreviewSettings; +import com.terraforged.mod.util.TranslationKey; +import com.terraforged.mod.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/terraforged/data/WorldGenBiomes.java b/src/main/java/com/terraforged/mod/data/WorldGenBiomes.java similarity index 93% rename from src/main/java/com/terraforged/data/WorldGenBiomes.java rename to src/main/java/com/terraforged/mod/data/WorldGenBiomes.java index 057685b..ded748b 100644 --- a/src/main/java/com/terraforged/data/WorldGenBiomes.java +++ b/src/main/java/com/terraforged/mod/data/WorldGenBiomes.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.data; +package com.terraforged.mod.data; import com.google.gson.GsonBuilder; -import com.terraforged.biome.map.BiomeMap; -import com.terraforged.biome.provider.BiomeHelper; +import com.terraforged.mod.biome.map.BiomeMap; +import com.terraforged.mod.biome.provider.BiomeHelper; import com.terraforged.world.biome.BiomeType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/terraforged/data/WorldGenBlocks.java b/src/main/java/com/terraforged/mod/data/WorldGenBlocks.java similarity index 98% rename from src/main/java/com/terraforged/data/WorldGenBlocks.java rename to src/main/java/com/terraforged/mod/data/WorldGenBlocks.java index f9799f0..91fe0f6 100644 --- a/src/main/java/com/terraforged/data/WorldGenBlocks.java +++ b/src/main/java/com/terraforged/mod/data/WorldGenBlocks.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.data; +package com.terraforged.mod.data; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/terraforged/data/WorldGenFeatures.java b/src/main/java/com/terraforged/mod/data/WorldGenFeatures.java similarity index 98% rename from src/main/java/com/terraforged/data/WorldGenFeatures.java rename to src/main/java/com/terraforged/mod/data/WorldGenFeatures.java index 99c3884..cbe327b 100644 --- a/src/main/java/com/terraforged/data/WorldGenFeatures.java +++ b/src/main/java/com/terraforged/mod/data/WorldGenFeatures.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.data; +package com.terraforged.mod.data; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/main/java/com/terraforged/feature/BlockDataConfig.java b/src/main/java/com/terraforged/mod/feature/BlockDataConfig.java similarity index 87% rename from src/main/java/com/terraforged/feature/BlockDataConfig.java rename to src/main/java/com/terraforged/mod/feature/BlockDataConfig.java index 84d2727..fcf6f54 100644 --- a/src/main/java/com/terraforged/feature/BlockDataConfig.java +++ b/src/main/java/com/terraforged/mod/feature/BlockDataConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.feature; +package com.terraforged.mod.feature; import com.google.gson.JsonObject; import net.minecraft.block.Block; diff --git a/src/main/java/com/terraforged/feature/BlockDataManager.java b/src/main/java/com/terraforged/mod/feature/BlockDataManager.java similarity index 92% rename from src/main/java/com/terraforged/feature/BlockDataManager.java rename to src/main/java/com/terraforged/mod/feature/BlockDataManager.java index 9c27d8e..66971f4 100644 --- a/src/main/java/com/terraforged/feature/BlockDataManager.java +++ b/src/main/java/com/terraforged/mod/feature/BlockDataManager.java @@ -1,7 +1,7 @@ -package com.terraforged.feature; +package com.terraforged.mod.feature; import com.google.common.collect.ImmutableMap; -import com.terraforged.feature.sapling.SaplingConfig; +import com.terraforged.mod.feature.sapling.SaplingConfig; import com.terraforged.fm.data.DataManager; import com.terraforged.fm.util.Json; import net.minecraft.block.Block; diff --git a/src/main/java/com/terraforged/feature/Matchers.java b/src/main/java/com/terraforged/mod/feature/Matchers.java similarity index 96% rename from src/main/java/com/terraforged/feature/Matchers.java rename to src/main/java/com/terraforged/mod/feature/Matchers.java index e41d411..daa0770 100644 --- a/src/main/java/com/terraforged/feature/Matchers.java +++ b/src/main/java/com/terraforged/mod/feature/Matchers.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.feature; +package com.terraforged.mod.feature; -import com.terraforged.feature.feature.DiskFeature; +import com.terraforged.mod.feature.feature.DiskFeature; import com.terraforged.fm.matcher.BiomeFeatureMatcher; import com.terraforged.fm.matcher.biome.BiomeMatcher; import com.terraforged.fm.matcher.feature.FeatureMatcher; diff --git a/src/main/java/com/terraforged/feature/TerrainHelper.java b/src/main/java/com/terraforged/mod/feature/TerrainHelper.java similarity index 99% rename from src/main/java/com/terraforged/feature/TerrainHelper.java rename to src/main/java/com/terraforged/mod/feature/TerrainHelper.java index 632cb75..650b141 100644 --- a/src/main/java/com/terraforged/feature/TerrainHelper.java +++ b/src/main/java/com/terraforged/mod/feature/TerrainHelper.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.feature; +package com.terraforged.mod.feature; import com.google.common.collect.ImmutableSet; import com.terraforged.n2d.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/feature/context/ChanceContext.java b/src/main/java/com/terraforged/mod/feature/context/ChanceContext.java similarity index 94% rename from src/main/java/com/terraforged/feature/context/ChanceContext.java rename to src/main/java/com/terraforged/mod/feature/context/ChanceContext.java index feae2a8..6939500 100644 --- a/src/main/java/com/terraforged/feature/context/ChanceContext.java +++ b/src/main/java/com/terraforged/mod/feature/context/ChanceContext.java @@ -1,7 +1,7 @@ -package com.terraforged.feature.context; +package com.terraforged.mod.feature.context; -import com.terraforged.chunk.TerraChunkGenerator; -import com.terraforged.chunk.fix.RegionDelegate; +import com.terraforged.mod.chunk.TerraChunkGenerator; +import com.terraforged.mod.chunk.fix.RegionDelegate; import com.terraforged.core.cell.Cell; import com.terraforged.core.concurrent.Resource; import com.terraforged.core.concurrent.cache.SafeCloseable; diff --git a/src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java b/src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java similarity index 95% rename from src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java rename to src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java index b6128ee..17496a2 100644 --- a/src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java +++ b/src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.context; +package com.terraforged.mod.feature.context; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java b/src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java similarity index 97% rename from src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java rename to src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java index 5c44c19..85468aa 100644 --- a/src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java +++ b/src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.context; +package com.terraforged.mod.feature.context; import com.terraforged.core.concurrent.Resource; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/feature/context/ContextualFeature.java b/src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java similarity index 96% rename from src/main/java/com/terraforged/feature/context/ContextualFeature.java rename to src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java index cd5fc25..8d60b8c 100644 --- a/src/main/java/com/terraforged/feature/context/ContextualFeature.java +++ b/src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java @@ -1,10 +1,10 @@ -package com.terraforged.feature.context; +package com.terraforged.mod.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.feature.context.modifier.ContextModifier; +import com.terraforged.mod.feature.context.modifier.ContextModifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.gen.feature.ConfiguredFeature; diff --git a/src/main/java/com/terraforged/feature/context/modifier/Biome.java b/src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java similarity index 83% rename from src/main/java/com/terraforged/feature/context/modifier/Biome.java rename to src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java index 75666ef..c3e1da3 100644 --- a/src/main/java/com/terraforged/feature/context/modifier/Biome.java +++ b/src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java @@ -1,7 +1,7 @@ -package com.terraforged.feature.context.modifier; +package com.terraforged.mod.feature.context.modifier; import com.mojang.datafixers.Dynamic; -import com.terraforged.feature.context.ChanceContext; +import com.terraforged.mod.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class Biome extends RangeContextModifier { diff --git a/src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java b/src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java similarity index 88% rename from src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java rename to src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java index dd7bbf3..f540823 100644 --- a/src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java +++ b/src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java @@ -1,9 +1,9 @@ -package com.terraforged.feature.context.modifier; +package com.terraforged.mod.feature.context.modifier; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.feature.context.ChanceContext; +import com.terraforged.mod.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; import java.util.Map; diff --git a/src/main/java/com/terraforged/feature/context/modifier/Elevation.java b/src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java similarity index 84% rename from src/main/java/com/terraforged/feature/context/modifier/Elevation.java rename to src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java index 4c06715..0230bf9 100644 --- a/src/main/java/com/terraforged/feature/context/modifier/Elevation.java +++ b/src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java @@ -1,7 +1,7 @@ -package com.terraforged.feature.context.modifier; +package com.terraforged.mod.feature.context.modifier; import com.mojang.datafixers.Dynamic; -import com.terraforged.feature.context.ChanceContext; +import com.terraforged.mod.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class Elevation extends RangeContextModifier { diff --git a/src/main/java/com/terraforged/feature/context/modifier/None.java b/src/main/java/com/terraforged/mod/feature/context/modifier/None.java similarity index 80% rename from src/main/java/com/terraforged/feature/context/modifier/None.java rename to src/main/java/com/terraforged/mod/feature/context/modifier/None.java index 68f1828..6a4d572 100644 --- a/src/main/java/com/terraforged/feature/context/modifier/None.java +++ b/src/main/java/com/terraforged/mod/feature/context/modifier/None.java @@ -1,8 +1,8 @@ -package com.terraforged.feature.context.modifier; +package com.terraforged.mod.feature.context.modifier; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.feature.context.ChanceContext; +import com.terraforged.mod.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class None implements ContextModifier { diff --git a/src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java b/src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java similarity index 89% rename from src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java rename to src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java index ba13f0b..dc26c4b 100644 --- a/src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java +++ b/src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java @@ -1,10 +1,10 @@ -package com.terraforged.feature.context.modifier; +package com.terraforged.mod.feature.context.modifier; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.feature.context.ChanceContext; -import com.terraforged.util.RangeModifier; +import com.terraforged.mod.feature.context.ChanceContext; +import com.terraforged.mod.util.RangeModifier; import net.minecraft.util.math.BlockPos; public abstract class RangeContextModifier extends RangeModifier implements ContextModifier { diff --git a/src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java b/src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java similarity index 91% rename from src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java rename to src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java index cf3231b..c9fb32a 100644 --- a/src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java +++ b/src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java @@ -1,6 +1,6 @@ -package com.terraforged.feature.decorator.poisson; +package com.terraforged.mod.feature.decorator.poisson; -import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.mod.chunk.TerraChunkGenerator; import com.terraforged.core.cell.Cell; import com.terraforged.core.tile.chunk.ChunkReader; import com.terraforged.n2d.Module; diff --git a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java similarity index 89% rename from src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java rename to src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java index 4691105..9f7b3a1 100644 --- a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java +++ b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.decorator.poisson; +package com.terraforged.mod.feature.decorator.poisson; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java similarity index 98% rename from src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java rename to src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java index 3bf09e3..7bf2150 100644 --- a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java +++ b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.decorator.poisson; +package com.terraforged.mod.feature.decorator.poisson; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java similarity index 97% rename from src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java rename to src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java index 2dafbcc..3a28c72 100644 --- a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java +++ b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.decorator.poisson; +package com.terraforged.mod.feature.decorator.poisson; import com.terraforged.core.util.poisson.Poisson; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonVisitor.java similarity index 96% rename from src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java rename to src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonVisitor.java index 8bcd186..998ff1c 100644 --- a/src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java +++ b/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonVisitor.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.decorator.poisson; +package com.terraforged.mod.feature.decorator.poisson; import com.terraforged.core.util.poisson.Poisson; import com.terraforged.core.util.poisson.PoissonContext; diff --git a/src/main/java/com/terraforged/feature/feature/BushFeature.java b/src/main/java/com/terraforged/mod/feature/feature/BushFeature.java similarity index 99% rename from src/main/java/com/terraforged/feature/feature/BushFeature.java rename to src/main/java/com/terraforged/mod/feature/feature/BushFeature.java index aaa89e5..225ffb8 100644 --- a/src/main/java/com/terraforged/feature/feature/BushFeature.java +++ b/src/main/java/com/terraforged/mod/feature/feature/BushFeature.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.feature; +package com.terraforged.mod.feature.feature; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/feature/feature/DiskFeature.java b/src/main/java/com/terraforged/mod/feature/feature/DiskFeature.java similarity index 98% rename from src/main/java/com/terraforged/feature/feature/DiskFeature.java rename to src/main/java/com/terraforged/mod/feature/feature/DiskFeature.java index cd39b72..6433b77 100644 --- a/src/main/java/com/terraforged/feature/feature/DiskFeature.java +++ b/src/main/java/com/terraforged/mod/feature/feature/DiskFeature.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.feature; +package com.terraforged.mod.feature.feature; import com.terraforged.n2d.Module; import com.terraforged.n2d.Source; diff --git a/src/main/java/com/terraforged/feature/feature/FreezeLayer.java b/src/main/java/com/terraforged/mod/feature/feature/FreezeLayer.java similarity index 98% rename from src/main/java/com/terraforged/feature/feature/FreezeLayer.java rename to src/main/java/com/terraforged/mod/feature/feature/FreezeLayer.java index d0b5066..868387f 100644 --- a/src/main/java/com/terraforged/feature/feature/FreezeLayer.java +++ b/src/main/java/com/terraforged/mod/feature/feature/FreezeLayer.java @@ -1,4 +1,4 @@ -package com.terraforged.feature.feature; +package com.terraforged.mod.feature.feature; import com.terraforged.fm.template.BlockUtils; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/feature/sapling/SaplingConfig.java b/src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java similarity index 97% rename from src/main/java/com/terraforged/feature/sapling/SaplingConfig.java rename to src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java index 919ff33..f563269 100644 --- a/src/main/java/com/terraforged/feature/sapling/SaplingConfig.java +++ b/src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java @@ -1,8 +1,8 @@ -package com.terraforged.feature.sapling; +package com.terraforged.mod.feature.sapling; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.terraforged.feature.BlockDataConfig; +import com.terraforged.mod.feature.BlockDataConfig; import com.terraforged.fm.template.TemplateManager; import com.terraforged.fm.template.feature.TemplateFeatureConfig; import com.terraforged.fm.util.Json; diff --git a/src/main/java/com/terraforged/feature/sapling/SaplingListener.java b/src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java similarity index 97% rename from src/main/java/com/terraforged/feature/sapling/SaplingListener.java rename to src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java index 6a777b2..74a6f92 100644 --- a/src/main/java/com/terraforged/feature/sapling/SaplingListener.java +++ b/src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.feature.sapling; +package com.terraforged.mod.feature.sapling; -import com.terraforged.TerraWorld; -import com.terraforged.chunk.TerraChunkGenerator; -import com.terraforged.chunk.TerraContext; -import com.terraforged.feature.BlockDataManager; +import com.terraforged.mod.TerraWorld; +import com.terraforged.mod.chunk.TerraChunkGenerator; +import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.mod.feature.BlockDataManager; import com.terraforged.fm.template.Template; import com.terraforged.fm.template.feature.TemplateFeature; import com.terraforged.fm.template.feature.TemplateFeatureConfig; diff --git a/src/main/java/com/terraforged/material/Materials.java b/src/main/java/com/terraforged/mod/material/Materials.java similarity index 98% rename from src/main/java/com/terraforged/material/Materials.java rename to src/main/java/com/terraforged/mod/material/Materials.java index 4ec046d..f493350 100644 --- a/src/main/java/com/terraforged/material/Materials.java +++ b/src/main/java/com/terraforged/mod/material/Materials.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.material; +package com.terraforged.mod.material; import com.terraforged.api.material.WGTags; import com.terraforged.api.material.layer.LayerManager; import com.terraforged.api.material.state.States; import com.terraforged.core.concurrent.Resource; -import com.terraforged.util.DummyBlockReader; +import com.terraforged.mod.util.DummyBlockReader; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectSets; import net.minecraft.block.AirBlock; diff --git a/src/main/java/com/terraforged/material/geology/GeoGenerator.java b/src/main/java/com/terraforged/mod/material/geology/GeoGenerator.java similarity index 97% rename from src/main/java/com/terraforged/material/geology/GeoGenerator.java rename to src/main/java/com/terraforged/mod/material/geology/GeoGenerator.java index d094abb..5918dcf 100644 --- a/src/main/java/com/terraforged/material/geology/GeoGenerator.java +++ b/src/main/java/com/terraforged/mod/material/geology/GeoGenerator.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.material.geology; +package com.terraforged.mod.material.geology; import com.terraforged.api.material.geology.StrataConfig; import com.terraforged.api.material.geology.StrataGenerator; -import com.terraforged.material.Materials; +import com.terraforged.mod.material.Materials; import com.terraforged.n2d.Source; import com.terraforged.world.geology.Strata; import net.minecraft.block.Block; diff --git a/src/main/java/com/terraforged/material/geology/GeoManager.java b/src/main/java/com/terraforged/mod/material/geology/GeoManager.java similarity index 96% rename from src/main/java/com/terraforged/material/geology/GeoManager.java rename to src/main/java/com/terraforged/mod/material/geology/GeoManager.java index 1288d5a..c1a7163 100644 --- a/src/main/java/com/terraforged/material/geology/GeoManager.java +++ b/src/main/java/com/terraforged/mod/material/geology/GeoManager.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.material.geology; +package com.terraforged.mod.material.geology; import com.terraforged.api.material.geology.GeologyManager; import com.terraforged.api.material.geology.StrataConfig; -import com.terraforged.chunk.TerraContext; +import com.terraforged.mod.chunk.TerraContext; import com.terraforged.core.Seed; -import com.terraforged.material.Materials; +import com.terraforged.mod.material.Materials; import com.terraforged.n2d.Module; import com.terraforged.n2d.Source; import com.terraforged.world.geology.Geology; diff --git a/src/main/java/com/terraforged/command/TerraCommand.java b/src/main/java/com/terraforged/mod/server/command/TerraCommand.java similarity index 95% rename from src/main/java/com/terraforged/command/TerraCommand.java rename to src/main/java/com/terraforged/mod/server/command/TerraCommand.java index 47987c7..80919a5 100644 --- a/src/main/java/com/terraforged/command/TerraCommand.java +++ b/src/main/java/com/terraforged/mod/server/command/TerraCommand.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.command; +package com.terraforged.mod.server.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; @@ -31,20 +31,20 @@ 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.Log; -import com.terraforged.biome.provider.TerraBiomeProvider; -import com.terraforged.chunk.TerraChunkGenerator; -import com.terraforged.chunk.TerraContext; -import com.terraforged.chunk.settings.SettingsHelper; -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.mod.Log; +import com.terraforged.mod.biome.provider.TerraBiomeProvider; +import com.terraforged.mod.chunk.TerraChunkGenerator; +import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.mod.chunk.settings.SettingsHelper; +import com.terraforged.mod.server.command.arg.BiomeArgType; +import com.terraforged.mod.server.command.arg.TerrainArgType; +import com.terraforged.mod.server.command.search.BiomeSearchTask; +import com.terraforged.mod.server.command.search.BothSearchTask; +import com.terraforged.mod.server.command.search.Search; +import com.terraforged.mod.server.command.search.TerrainSearchTask; import com.terraforged.core.cell.Cell; import com.terraforged.core.concurrent.Resource; -import com.terraforged.data.DataGen; +import com.terraforged.mod.data.DataGen; import com.terraforged.world.WorldGenerator; import com.terraforged.world.terrain.Terrain; import com.terraforged.world.terrain.Terrains; diff --git a/src/main/java/com/terraforged/command/arg/BiomeArgType.java b/src/main/java/com/terraforged/mod/server/command/arg/BiomeArgType.java similarity index 98% rename from src/main/java/com/terraforged/command/arg/BiomeArgType.java rename to src/main/java/com/terraforged/mod/server/command/arg/BiomeArgType.java index c8127af..01f3fbd 100644 --- a/src/main/java/com/terraforged/command/arg/BiomeArgType.java +++ b/src/main/java/com/terraforged/mod/server/command/arg/BiomeArgType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.command.arg; +package com.terraforged.mod.server.command.arg; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/com/terraforged/command/arg/TerrainArgType.java b/src/main/java/com/terraforged/mod/server/command/arg/TerrainArgType.java similarity index 98% rename from src/main/java/com/terraforged/command/arg/TerrainArgType.java rename to src/main/java/com/terraforged/mod/server/command/arg/TerrainArgType.java index 65f6b3e..edae287 100644 --- a/src/main/java/com/terraforged/command/arg/TerrainArgType.java +++ b/src/main/java/com/terraforged/mod/server/command/arg/TerrainArgType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.command.arg; +package com.terraforged.mod.server.command.arg; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/com/terraforged/command/search/BiomeSearchTask.java b/src/main/java/com/terraforged/mod/server/command/search/BiomeSearchTask.java similarity index 88% rename from src/main/java/com/terraforged/command/search/BiomeSearchTask.java rename to src/main/java/com/terraforged/mod/server/command/search/BiomeSearchTask.java index f5a83da..01cd6c6 100644 --- a/src/main/java/com/terraforged/command/search/BiomeSearchTask.java +++ b/src/main/java/com/terraforged/mod/server/command/search/BiomeSearchTask.java @@ -1,6 +1,6 @@ -package com.terraforged.command.search; +package com.terraforged.mod.server.command.search; -import com.terraforged.biome.provider.TerraBiomeProvider; +import com.terraforged.mod.biome.provider.TerraBiomeProvider; import com.terraforged.core.cell.Cell; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/command/search/BothSearchTask.java b/src/main/java/com/terraforged/mod/server/command/search/BothSearchTask.java similarity index 93% rename from src/main/java/com/terraforged/command/search/BothSearchTask.java rename to src/main/java/com/terraforged/mod/server/command/search/BothSearchTask.java index b2fb6a9..97b7a4b 100644 --- a/src/main/java/com/terraforged/command/search/BothSearchTask.java +++ b/src/main/java/com/terraforged/mod/server/command/search/BothSearchTask.java @@ -1,4 +1,4 @@ -package com.terraforged.command.search; +package com.terraforged.mod.server.command.search; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/command/search/ChunkGeneratorSearch.java b/src/main/java/com/terraforged/mod/server/command/search/ChunkGeneratorSearch.java similarity index 95% rename from src/main/java/com/terraforged/command/search/ChunkGeneratorSearch.java rename to src/main/java/com/terraforged/mod/server/command/search/ChunkGeneratorSearch.java index f4f8dea..dff4e17 100644 --- a/src/main/java/com/terraforged/command/search/ChunkGeneratorSearch.java +++ b/src/main/java/com/terraforged/mod/server/command/search/ChunkGeneratorSearch.java @@ -1,4 +1,4 @@ -package com.terraforged.command.search; +package com.terraforged.mod.server.command.search; import net.minecraft.util.math.BlockPos; import net.minecraft.world.gen.ChunkGenerator; diff --git a/src/main/java/com/terraforged/command/search/Search.java b/src/main/java/com/terraforged/mod/server/command/search/Search.java similarity index 97% rename from src/main/java/com/terraforged/command/search/Search.java rename to src/main/java/com/terraforged/mod/server/command/search/Search.java index d33d6ab..b27edae 100644 --- a/src/main/java/com/terraforged/command/search/Search.java +++ b/src/main/java/com/terraforged/mod/server/command/search/Search.java @@ -1,4 +1,4 @@ -package com.terraforged.command.search; +package com.terraforged.mod.server.command.search; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/command/search/TerrainSearchTask.java b/src/main/java/com/terraforged/mod/server/command/search/TerrainSearchTask.java similarity index 94% rename from src/main/java/com/terraforged/command/search/TerrainSearchTask.java rename to src/main/java/com/terraforged/mod/server/command/search/TerrainSearchTask.java index cfa294c..ce24ea8 100644 --- a/src/main/java/com/terraforged/command/search/TerrainSearchTask.java +++ b/src/main/java/com/terraforged/mod/server/command/search/TerrainSearchTask.java @@ -1,4 +1,4 @@ -package com.terraforged.command.search; +package com.terraforged.mod.server.command.search; import com.terraforged.core.cell.Cell; import com.terraforged.world.WorldGenerator; diff --git a/src/main/java/com/terraforged/util/DataPackFinder.java b/src/main/java/com/terraforged/mod/util/DataPackFinder.java similarity index 89% rename from src/main/java/com/terraforged/util/DataPackFinder.java rename to src/main/java/com/terraforged/mod/util/DataPackFinder.java index 6533ebe..c74602e 100644 --- a/src/main/java/com/terraforged/util/DataPackFinder.java +++ b/src/main/java/com/terraforged/mod/util/DataPackFinder.java @@ -1,6 +1,6 @@ -package com.terraforged.util; +package com.terraforged.mod.util; -import com.terraforged.Log; +import com.terraforged.mod.Log; import net.minecraft.resources.FolderPackFinder; import net.minecraft.resources.ResourcePackInfo; diff --git a/src/main/java/com/terraforged/util/DummyBlockReader.java b/src/main/java/com/terraforged/mod/util/DummyBlockReader.java similarity index 98% rename from src/main/java/com/terraforged/util/DummyBlockReader.java rename to src/main/java/com/terraforged/mod/util/DummyBlockReader.java index 298ed66..dc45f37 100644 --- a/src/main/java/com/terraforged/util/DummyBlockReader.java +++ b/src/main/java/com/terraforged/mod/util/DummyBlockReader.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util; +package com.terraforged.mod.util; import com.terraforged.core.concurrent.Resource; import com.terraforged.core.concurrent.pool.ObjectPool; diff --git a/src/main/java/com/terraforged/util/Environment.java b/src/main/java/com/terraforged/mod/util/Environment.java similarity index 96% rename from src/main/java/com/terraforged/util/Environment.java rename to src/main/java/com/terraforged/mod/util/Environment.java index 1639aa6..5d57520 100644 --- a/src/main/java/com/terraforged/util/Environment.java +++ b/src/main/java/com/terraforged/mod/util/Environment.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.util; +package com.terraforged.mod.util; -import com.terraforged.Log; +import com.terraforged.mod.Log; public class Environment { diff --git a/src/main/java/com/terraforged/util/ListUtils.java b/src/main/java/com/terraforged/mod/util/ListUtils.java similarity index 98% rename from src/main/java/com/terraforged/util/ListUtils.java rename to src/main/java/com/terraforged/mod/util/ListUtils.java index b7a171f..5268c02 100644 --- a/src/main/java/com/terraforged/util/ListUtils.java +++ b/src/main/java/com/terraforged/mod/util/ListUtils.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util; +package com.terraforged.mod.util; import com.terraforged.n2d.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/util/NBTLeavesFixer.java b/src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java similarity index 99% rename from src/main/java/com/terraforged/util/NBTLeavesFixer.java rename to src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java index cd835ee..099b0b4 100644 --- a/src/main/java/com/terraforged/util/NBTLeavesFixer.java +++ b/src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java @@ -1,4 +1,4 @@ -package com.terraforged.util; +package com.terraforged.mod.util; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompressedStreamTools; diff --git a/src/main/java/com/terraforged/util/RangeModifier.java b/src/main/java/com/terraforged/mod/util/RangeModifier.java similarity index 96% rename from src/main/java/com/terraforged/util/RangeModifier.java rename to src/main/java/com/terraforged/mod/util/RangeModifier.java index f6a2f53..e360f0a 100644 --- a/src/main/java/com/terraforged/util/RangeModifier.java +++ b/src/main/java/com/terraforged/mod/util/RangeModifier.java @@ -1,4 +1,4 @@ -package com.terraforged.util; +package com.terraforged.mod.util; public abstract class RangeModifier { diff --git a/src/main/java/com/terraforged/util/TranslationKey.java b/src/main/java/com/terraforged/mod/util/TranslationKey.java similarity index 97% rename from src/main/java/com/terraforged/util/TranslationKey.java rename to src/main/java/com/terraforged/mod/util/TranslationKey.java index 2d7b965..bdba02c 100644 --- a/src/main/java/com/terraforged/util/TranslationKey.java +++ b/src/main/java/com/terraforged/mod/util/TranslationKey.java @@ -1,4 +1,4 @@ -package com.terraforged.util; +package com.terraforged.mod.util; import com.terraforged.core.util.NameUtil; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/terraforged/util/annotation/Name.java b/src/main/java/com/terraforged/mod/util/annotation/Name.java similarity index 96% rename from src/main/java/com/terraforged/util/annotation/Name.java rename to src/main/java/com/terraforged/mod/util/annotation/Name.java index 440e22e..4809ef9 100644 --- a/src/main/java/com/terraforged/util/annotation/Name.java +++ b/src/main/java/com/terraforged/mod/util/annotation/Name.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util.annotation; +package com.terraforged.mod.util.annotation; public @interface Name { diff --git a/src/main/java/com/terraforged/util/annotation/Ref.java b/src/main/java/com/terraforged/mod/util/annotation/Ref.java similarity index 96% rename from src/main/java/com/terraforged/util/annotation/Ref.java rename to src/main/java/com/terraforged/mod/util/annotation/Ref.java index 98cdf18..b63e01b 100644 --- a/src/main/java/com/terraforged/util/annotation/Ref.java +++ b/src/main/java/com/terraforged/mod/util/annotation/Ref.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util.annotation; +package com.terraforged.mod.util.annotation; public @interface Ref { diff --git a/src/main/java/com/terraforged/util/nbt/NBTHelper.java b/src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java similarity index 99% rename from src/main/java/com/terraforged/util/nbt/NBTHelper.java rename to src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java index eedb099..536261a 100644 --- a/src/main/java/com/terraforged/util/nbt/NBTHelper.java +++ b/src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util.nbt; +package com.terraforged.mod.util.nbt; import com.google.gson.JsonElement; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/util/nbt/NBTReader.java b/src/main/java/com/terraforged/mod/util/nbt/NBTReader.java similarity index 98% rename from src/main/java/com/terraforged/util/nbt/NBTReader.java rename to src/main/java/com/terraforged/mod/util/nbt/NBTReader.java index 018e99c..e634bf1 100644 --- a/src/main/java/com/terraforged/util/nbt/NBTReader.java +++ b/src/main/java/com/terraforged/mod/util/nbt/NBTReader.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util.nbt; +package com.terraforged.mod.util.nbt; import com.terraforged.core.serialization.serializer.Reader; import net.minecraft.nbt.ByteNBT; diff --git a/src/main/java/com/terraforged/util/nbt/NBTWriter.java b/src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java similarity index 97% rename from src/main/java/com/terraforged/util/nbt/NBTWriter.java rename to src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java index de0db15..4e793f8 100644 --- a/src/main/java/com/terraforged/util/nbt/NBTWriter.java +++ b/src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java @@ -1,4 +1,4 @@ -package com.terraforged.util.nbt; +package com.terraforged.mod.util.nbt; import com.terraforged.core.serialization.serializer.AbstractWriter; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/util/setup/SetupDebug.java b/src/main/java/com/terraforged/mod/util/setup/SetupDebug.java similarity index 97% rename from src/main/java/com/terraforged/util/setup/SetupDebug.java rename to src/main/java/com/terraforged/mod/util/setup/SetupDebug.java index ae09030..75f01b9 100644 --- a/src/main/java/com/terraforged/util/setup/SetupDebug.java +++ b/src/main/java/com/terraforged/mod/util/setup/SetupDebug.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.util.setup; +package com.terraforged.mod.util.setup; -import com.terraforged.Log; +import com.terraforged.mod.Log; import com.terraforged.api.event.SetupEvent; import com.terraforged.core.Seed; import com.terraforged.n2d.Source; diff --git a/src/main/java/com/terraforged/util/setup/SetupHooks.java b/src/main/java/com/terraforged/mod/util/setup/SetupHooks.java similarity index 98% rename from src/main/java/com/terraforged/util/setup/SetupHooks.java rename to src/main/java/com/terraforged/mod/util/setup/SetupHooks.java index 83c9a41..2c1d37c 100644 --- a/src/main/java/com/terraforged/util/setup/SetupHooks.java +++ b/src/main/java/com/terraforged/mod/util/setup/SetupHooks.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.util.setup; +package com.terraforged.mod.util.setup; import com.terraforged.api.biome.modifier.ModifierManager; import com.terraforged.api.chunk.column.ColumnDecorator;