From f48d42f52924700255768e51f9f21588ccfa2371 Mon Sep 17 00:00:00 2001 From: dags- Date: Thu, 14 May 2020 19:56:57 +0100 Subject: [PATCH] - move fm - tweaks to batching --- Engine | 2 +- FeatureManager | 2 +- build.gradle | 14 +++++ .../java/com/terraforged/{mod => }/Log.java | 2 +- .../terraforged/{mod => }/TerraForgedMod.java | 20 ++++---- .../com/terraforged/{mod => }/TerraWorld.java | 26 +++++----- .../com/terraforged/api/event/SetupEvent.java | 2 +- .../{mod => }/biome/ColdSteppe.java | 2 +- .../terraforged/{mod => }/biome/Dunes.java | 2 +- .../{mod => }/biome/FirForest.java | 2 +- .../{mod => }/biome/FlowerPlains.java | 2 +- .../{mod => }/biome/FrozenLake.java | 2 +- .../com/terraforged/{mod => }/biome/Lake.java | 2 +- .../{mod => }/biome/Marshland.java | 2 +- .../{mod => }/biome/ModBiomes.java | 2 +- .../{mod => }/biome/SavannaScrub.java | 2 +- .../biome/ShatteredSavannaScrub.java | 2 +- .../{mod => }/biome/SnowyFirForest.java | 2 +- .../{mod => }/biome/SnowyTaigaScrub.java | 2 +- .../terraforged/{mod => }/biome/Steppe.java | 2 +- .../{mod => }/biome/TaigaScrub.java | 2 +- .../{mod => }/biome/WarmBeach.java | 2 +- .../{mod => }/biome/map/AbstractBiomeMap.java | 6 +-- .../{mod => }/biome/map/BasicBiomeMap.java | 4 +- .../{mod => }/biome/map/BiomeGroup.java | 2 +- .../{mod => }/biome/map/BiomeMap.java | 2 +- .../{mod => }/biome/map/BiomeMapBuilder.java | 6 +-- .../{mod => }/biome/map/BiomePredicate.java | 4 +- .../{mod => }/biome/map/DefaultBiome.java | 2 +- .../{mod => }/biome/map/GridBiomeMap.java | 2 +- .../modifier/AbstractMaxHeightModifier.java | 2 +- .../modifier/AbstractOffsetModifier.java | 2 +- .../biome/modifier/BeachModifier.java | 6 +-- .../biome/modifier/BiomeModifierManager.java | 8 +-- .../biome/modifier/DesertColorModifier.java | 4 +- .../biome/modifier/SandBiomeModifier.java | 6 +-- .../biome/provider/AbstractBiomeProvider.java | 2 +- .../{mod => }/biome/provider/BiomeHelper.java | 10 ++-- .../biome/provider/BiomeProvider.java | 12 ++--- .../biome/provider/BiomeWeights.java | 2 +- .../biome/provider/DesertBiomes.java | 8 +-- .../{mod => }/biome/spawn/SpawnHandler.java | 6 +-- .../{mod => }/biome/spawn/SpawnSearch.java | 8 +-- .../{mod => }/biome/surface/DunesSurface.java | 8 +-- .../biome/surface/IcebergsSurface.java | 4 +- .../biome/surface/SteppeSurface.java | 2 +- .../{mod => }/biome/surface/SwampSurface.java | 2 +- .../{mod => }/biome/tag/BiomeTagManager.java | 4 +- .../chunk/ChunkGeneratorFactory.java | 4 +- .../{mod => }/chunk/TerraChunkGenerator.java | 38 ++++++++------ .../{mod => }/chunk/TerraContext.java | 6 +-- .../{mod => }/chunk/TerraGenSettings.java | 4 +- .../{mod => }/chunk/TerraSetupFactory.java | 51 +++++++++---------- .../{mod => }/chunk/TerraTerrainProvider.java | 4 +- .../{mod => }/chunk/fix/ChunkCarverFix.java | 4 +- .../{mod => }/chunk/fix/RegionDelegate.java | 2 +- .../{mod => }/chunk/fix/RegionFix.java | 2 +- .../chunk/generator/BiomeGenerator.java | 6 +-- .../chunk/generator/MobGenerator.java | 4 +- .../chunk/generator/StructureGenerator.java | 8 +-- .../chunk/generator/TerrainCarver.java | 6 +-- .../chunk/generator/TerrainGenerator.java | 16 +++--- .../{mod => }/chunk/test/Test.java | 4 +- .../chunk/test/TestBiomeProvider.java | 6 +-- .../chunk/test/TestChunkGenerator.java | 8 +-- .../{mod => }/chunk/test/TestHeightMap.java | 2 +- .../chunk/test/TestTerraContext.java | 4 +- .../{mod => }/chunk/util/FastChunk.java | 2 +- .../{mod => }/chunk/util/TerraContainer.java | 2 +- .../{mod => }/command/TerraCommand.java | 26 +++++----- .../{mod => }/command/arg/BiomeArgType.java | 2 +- .../{mod => }/command/arg/TerrainArgType.java | 2 +- .../command/search/BiomeSearchTask.java | 2 +- .../command/search/BothSearchTask.java | 2 +- .../{mod => }/command/search/Search.java | 2 +- .../command/search/TerrainSearchTask.java | 2 +- .../terraforged/{mod => }/data/DataGen.java | 2 +- .../{mod => }/data/LangGenerator.java | 8 +-- .../{mod => }/data/WorldGenBiomes.java | 6 +-- .../{mod => }/data/WorldGenBlocks.java | 2 +- .../{mod => }/data/WorldGenFeatures.java | 2 +- .../{mod => }/decorator/ChunkPopulator.java | 2 +- .../decorator/feature/LayerDecorator.java | 2 +- .../decorator/feature/SnowEroder.java | 6 +-- .../decorator/terrain/BedrockDecorator.java | 4 +- .../decorator/terrain/CoastDecorator.java | 4 +- .../decorator/terrain/ErosionDecorator.java | 6 +-- .../decorator/terrain/GeologyDecorator.java | 4 +- .../{mod => }/feature/BlockDataConfig.java | 2 +- .../{mod => }/feature/BlockDataManager.java | 8 +-- .../{mod => }/feature/Matchers.java | 10 ++-- .../{mod => }/feature/TerrainHelper.java | 2 +- .../feature/context/ChanceContext.java | 6 +-- .../context/ContextSelectorConfig.java | 2 +- .../context/ContextSelectorFeature.java | 2 +- .../feature/context/ContextualFeature.java | 4 +- .../feature/context/modifier/Biome.java | 4 +- .../context/modifier/ContextModifier.java | 4 +- .../feature/context/modifier/Elevation.java | 4 +- .../feature/context/modifier/None.java | 4 +- .../modifier/RangeContextModifier.java | 6 +-- .../decorator/poisson/BiomeVariance.java | 6 +-- .../decorator/poisson/PoissonAtSurface.java | 2 +- .../decorator/poisson/PoissonConfig.java | 2 +- .../decorator/poisson/PoissonDecorator.java | 2 +- .../decorator/poisson/PoissonVisitor.java | 2 +- .../feature/feature/DiskFeature.java | 2 +- .../{mod => }/feature/predicate/TreeLine.java | 6 +-- .../feature/sapling/SaplingConfig.java | 10 ++-- .../feature/sapling/SaplingListener.java | 16 +++--- .../{mod => }/gui/OverlayRenderer.java | 2 +- .../{mod => }/gui/OverlayScreen.java | 6 +-- .../terraforged/{mod => }/gui/ScrollPane.java | 6 +-- .../{mod => }/gui/SettingsScreen.java | 28 +++++----- .../{mod => }/gui/element/CheckBox.java | 2 +- .../{mod => }/gui/element/Element.java | 2 +- .../{mod => }/gui/element/TerraButton.java | 2 +- .../{mod => }/gui/element/TerraLabel.java | 2 +- .../{mod => }/gui/element/TerraSlider.java | 2 +- .../{mod => }/gui/element/TerraTextInput.java | 2 +- .../{mod => }/gui/element/TerraToggle.java | 2 +- .../{mod => }/gui/page/BasePage.java | 2 +- .../{mod => }/gui/page/ClimatePage.java | 8 +-- .../{mod => }/gui/page/MiscPage.java | 10 ++-- .../terraforged/{mod => }/gui/page/Page.java | 21 ++++---- .../{mod => }/gui/page/PresetPage.java | 4 +- .../{mod => }/gui/page/PresetsPage.java | 4 +- .../{mod => }/gui/page/RiverPage.java | 8 +-- .../{mod => }/gui/page/StructurePage.java | 8 +-- .../{mod => }/gui/page/TerrainPage.java | 8 +-- .../{mod => }/gui/page/WorldPage.java | 14 ++--- .../{mod => }/gui/preview/Preview.java | 4 +- .../{mod => }/gui/preview/PreviewPage.java | 10 ++-- .../gui/preview/PreviewSettings.java | 2 +- .../{mod => }/gui/preview/RenderMode.java | 2 +- .../{mod => }/material/Materials.java | 4 +- .../material/geology/GeoGenerator.java | 4 +- .../material/geology/GeoManager.java | 6 +-- .../{mod => }/settings/DimesionSettings.java | 4 +- .../{mod => }/settings/Miscellaneous.java | 2 +- .../{mod => }/settings/SettingsHelper.java | 7 ++- .../{mod => }/settings/StructureSettings.java | 2 +- .../{mod => }/settings/TerraSettings.java | 2 +- .../{mod => }/util/DataPackFinder.java | 4 +- .../{mod => }/util/DummyBlockReader.java | 2 +- .../{mod => }/util/Environment.java | 4 +- .../terraforged/{mod => }/util/ListUtils.java | 2 +- .../{mod => }/util/NBTLeavesFixer.java | 2 +- .../{mod => }/util/RangeModifier.java | 2 +- .../{mod => }/util/annotation/Name.java | 2 +- .../{mod => }/util/annotation/Ref.java | 2 +- .../{mod => }/util/nbt/NBTHelper.java | 2 +- .../{mod => }/util/nbt/NBTReader.java | 2 +- .../{mod => }/util/nbt/NBTWriter.java | 2 +- .../{mod => }/util/setup/SetupDebug.java | 4 +- .../{mod => }/util/setup/SetupHooks.java | 4 +- 156 files changed, 421 insertions(+), 402 deletions(-) rename src/main/java/com/terraforged/{mod => }/Log.java (98%) rename src/main/java/com/terraforged/{mod => }/TerraForgedMod.java (87%) rename src/main/java/com/terraforged/{mod => }/TerraWorld.java (89%) rename src/main/java/com/terraforged/{mod => }/biome/ColdSteppe.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/Dunes.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/FirForest.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/FlowerPlains.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/FrozenLake.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/Lake.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/Marshland.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/ModBiomes.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/SavannaScrub.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/ShatteredSavannaScrub.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/SnowyFirForest.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/SnowyTaigaScrub.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/Steppe.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/TaigaScrub.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/WarmBeach.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/map/AbstractBiomeMap.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/map/BasicBiomeMap.java (96%) rename src/main/java/com/terraforged/{mod => }/biome/map/BiomeGroup.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/map/BiomeMap.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/map/BiomeMapBuilder.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/map/BiomePredicate.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/map/DefaultBiome.java (85%) rename src/main/java/com/terraforged/{mod => }/biome/map/GridBiomeMap.java (99%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/AbstractMaxHeightModifier.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/AbstractOffsetModifier.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/BeachModifier.java (94%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/BiomeModifierManager.java (93%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/DesertColorModifier.java (95%) rename src/main/java/com/terraforged/{mod => }/biome/modifier/SandBiomeModifier.java (92%) rename src/main/java/com/terraforged/{mod => }/biome/provider/AbstractBiomeProvider.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/provider/BiomeHelper.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/provider/BiomeProvider.java (95%) rename src/main/java/com/terraforged/{mod => }/biome/provider/BiomeWeights.java (97%) rename src/main/java/com/terraforged/{mod => }/biome/provider/DesertBiomes.java (95%) rename src/main/java/com/terraforged/{mod => }/biome/spawn/SpawnHandler.java (94%) rename src/main/java/com/terraforged/{mod => }/biome/spawn/SpawnSearch.java (85%) rename src/main/java/com/terraforged/{mod => }/biome/surface/DunesSurface.java (95%) rename src/main/java/com/terraforged/{mod => }/biome/surface/IcebergsSurface.java (98%) rename src/main/java/com/terraforged/{mod => }/biome/surface/SteppeSurface.java (95%) rename src/main/java/com/terraforged/{mod => }/biome/surface/SwampSurface.java (96%) rename src/main/java/com/terraforged/{mod => }/biome/tag/BiomeTagManager.java (97%) rename src/main/java/com/terraforged/{mod => }/chunk/ChunkGeneratorFactory.java (93%) rename src/main/java/com/terraforged/{mod => }/chunk/TerraChunkGenerator.java (89%) rename src/main/java/com/terraforged/{mod => }/chunk/TerraContext.java (96%) rename src/main/java/com/terraforged/{mod => }/chunk/TerraGenSettings.java (97%) rename src/main/java/com/terraforged/{mod => }/chunk/TerraSetupFactory.java (74%) rename src/main/java/com/terraforged/{mod => }/chunk/TerraTerrainProvider.java (95%) rename src/main/java/com/terraforged/{mod => }/chunk/fix/ChunkCarverFix.java (96%) rename src/main/java/com/terraforged/{mod => }/chunk/fix/RegionDelegate.java (99%) rename src/main/java/com/terraforged/{mod => }/chunk/fix/RegionFix.java (97%) rename src/main/java/com/terraforged/{mod => }/chunk/generator/BiomeGenerator.java (89%) rename src/main/java/com/terraforged/{mod => }/chunk/generator/MobGenerator.java (97%) rename src/main/java/com/terraforged/{mod => }/chunk/generator/StructureGenerator.java (94%) rename src/main/java/com/terraforged/{mod => }/chunk/generator/TerrainCarver.java (93%) rename src/main/java/com/terraforged/{mod => }/chunk/generator/TerrainGenerator.java (93%) rename src/main/java/com/terraforged/{mod => }/chunk/test/Test.java (94%) rename src/main/java/com/terraforged/{mod => }/chunk/test/TestBiomeProvider.java (91%) rename src/main/java/com/terraforged/{mod => }/chunk/test/TestChunkGenerator.java (92%) rename src/main/java/com/terraforged/{mod => }/chunk/test/TestHeightMap.java (94%) rename src/main/java/com/terraforged/{mod => }/chunk/test/TestTerraContext.java (82%) rename src/main/java/com/terraforged/{mod => }/chunk/util/FastChunk.java (99%) rename src/main/java/com/terraforged/{mod => }/chunk/util/TerraContainer.java (99%) rename src/main/java/com/terraforged/{mod => }/command/TerraCommand.java (95%) rename src/main/java/com/terraforged/{mod => }/command/arg/BiomeArgType.java (98%) rename src/main/java/com/terraforged/{mod => }/command/arg/TerrainArgType.java (98%) rename src/main/java/com/terraforged/{mod => }/command/search/BiomeSearchTask.java (93%) rename src/main/java/com/terraforged/{mod => }/command/search/BothSearchTask.java (93%) rename src/main/java/com/terraforged/{mod => }/command/search/Search.java (98%) rename src/main/java/com/terraforged/{mod => }/command/search/TerrainSearchTask.java (94%) rename src/main/java/com/terraforged/{mod => }/data/DataGen.java (98%) rename src/main/java/com/terraforged/{mod => }/data/LangGenerator.java (93%) rename src/main/java/com/terraforged/{mod => }/data/WorldGenBiomes.java (95%) rename src/main/java/com/terraforged/{mod => }/data/WorldGenBlocks.java (98%) rename src/main/java/com/terraforged/{mod => }/data/WorldGenFeatures.java (98%) rename src/main/java/com/terraforged/{mod => }/decorator/ChunkPopulator.java (98%) rename src/main/java/com/terraforged/{mod => }/decorator/feature/LayerDecorator.java (98%) rename src/main/java/com/terraforged/{mod => }/decorator/feature/SnowEroder.java (96%) rename src/main/java/com/terraforged/{mod => }/decorator/terrain/BedrockDecorator.java (96%) rename src/main/java/com/terraforged/{mod => }/decorator/terrain/CoastDecorator.java (96%) rename src/main/java/com/terraforged/{mod => }/decorator/terrain/ErosionDecorator.java (98%) rename src/main/java/com/terraforged/{mod => }/decorator/terrain/GeologyDecorator.java (95%) rename src/main/java/com/terraforged/{mod => }/feature/BlockDataConfig.java (87%) rename src/main/java/com/terraforged/{mod => }/feature/BlockDataManager.java (84%) rename src/main/java/com/terraforged/{mod => }/feature/Matchers.java (88%) rename src/main/java/com/terraforged/{mod => }/feature/TerrainHelper.java (99%) rename src/main/java/com/terraforged/{mod => }/feature/context/ChanceContext.java (94%) rename src/main/java/com/terraforged/{mod => }/feature/context/ContextSelectorConfig.java (95%) rename src/main/java/com/terraforged/{mod => }/feature/context/ContextSelectorFeature.java (97%) rename src/main/java/com/terraforged/{mod => }/feature/context/ContextualFeature.java (96%) rename src/main/java/com/terraforged/{mod => }/feature/context/modifier/Biome.java (86%) rename src/main/java/com/terraforged/{mod => }/feature/context/modifier/ContextModifier.java (88%) rename src/main/java/com/terraforged/{mod => }/feature/context/modifier/Elevation.java (85%) rename src/main/java/com/terraforged/{mod => }/feature/context/modifier/None.java (80%) rename src/main/java/com/terraforged/{mod => }/feature/context/modifier/RangeContextModifier.java (84%) rename src/main/java/com/terraforged/{mod => }/feature/decorator/poisson/BiomeVariance.java (90%) rename src/main/java/com/terraforged/{mod => }/feature/decorator/poisson/PoissonAtSurface.java (89%) rename src/main/java/com/terraforged/{mod => }/feature/decorator/poisson/PoissonConfig.java (96%) rename src/main/java/com/terraforged/{mod => }/feature/decorator/poisson/PoissonDecorator.java (97%) rename src/main/java/com/terraforged/{mod => }/feature/decorator/poisson/PoissonVisitor.java (96%) rename src/main/java/com/terraforged/{mod => }/feature/feature/DiskFeature.java (98%) rename src/main/java/com/terraforged/{mod => }/feature/predicate/TreeLine.java (92%) rename src/main/java/com/terraforged/{mod => }/feature/sapling/SaplingConfig.java (91%) rename src/main/java/com/terraforged/{mod => }/feature/sapling/SaplingListener.java (94%) rename src/main/java/com/terraforged/{mod => }/gui/OverlayRenderer.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/OverlayScreen.java (95%) rename src/main/java/com/terraforged/{mod => }/gui/ScrollPane.java (96%) rename src/main/java/com/terraforged/{mod => }/gui/SettingsScreen.java (93%) rename src/main/java/com/terraforged/{mod => }/gui/element/CheckBox.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/element/Element.java (98%) rename src/main/java/com/terraforged/{mod => }/gui/element/TerraButton.java (98%) rename src/main/java/com/terraforged/{mod => }/gui/element/TerraLabel.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/element/TerraSlider.java (98%) rename src/main/java/com/terraforged/{mod => }/gui/element/TerraTextInput.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/element/TerraToggle.java (98%) rename src/main/java/com/terraforged/{mod => }/gui/page/BasePage.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/page/ClimatePage.java (92%) rename src/main/java/com/terraforged/{mod => }/gui/page/MiscPage.java (90%) rename src/main/java/com/terraforged/{mod => }/gui/page/Page.java (93%) rename src/main/java/com/terraforged/{mod => }/gui/page/PresetPage.java (65%) rename src/main/java/com/terraforged/{mod => }/gui/page/PresetsPage.java (74%) rename src/main/java/com/terraforged/{mod => }/gui/page/RiverPage.java (92%) rename src/main/java/com/terraforged/{mod => }/gui/page/StructurePage.java (91%) rename src/main/java/com/terraforged/{mod => }/gui/page/TerrainPage.java (92%) rename src/main/java/com/terraforged/{mod => }/gui/page/WorldPage.java (91%) rename src/main/java/com/terraforged/{mod => }/gui/preview/Preview.java (99%) rename src/main/java/com/terraforged/{mod => }/gui/preview/PreviewPage.java (93%) rename src/main/java/com/terraforged/{mod => }/gui/preview/PreviewSettings.java (97%) rename src/main/java/com/terraforged/{mod => }/gui/preview/RenderMode.java (98%) rename src/main/java/com/terraforged/{mod => }/material/Materials.java (97%) rename src/main/java/com/terraforged/{mod => }/material/geology/GeoGenerator.java (97%) rename src/main/java/com/terraforged/{mod => }/material/geology/GeoManager.java (96%) rename src/main/java/com/terraforged/{mod => }/settings/DimesionSettings.java (96%) rename src/main/java/com/terraforged/{mod => }/settings/Miscellaneous.java (98%) rename src/main/java/com/terraforged/{mod => }/settings/SettingsHelper.java (95%) rename src/main/java/com/terraforged/{mod => }/settings/StructureSettings.java (98%) rename src/main/java/com/terraforged/{mod => }/settings/TerraSettings.java (97%) rename src/main/java/com/terraforged/{mod => }/util/DataPackFinder.java (89%) rename src/main/java/com/terraforged/{mod => }/util/DummyBlockReader.java (98%) rename src/main/java/com/terraforged/{mod => }/util/Environment.java (96%) rename src/main/java/com/terraforged/{mod => }/util/ListUtils.java (98%) rename src/main/java/com/terraforged/{mod => }/util/NBTLeavesFixer.java (99%) rename src/main/java/com/terraforged/{mod => }/util/RangeModifier.java (95%) rename src/main/java/com/terraforged/{mod => }/util/annotation/Name.java (96%) rename src/main/java/com/terraforged/{mod => }/util/annotation/Ref.java (96%) rename src/main/java/com/terraforged/{mod => }/util/nbt/NBTHelper.java (99%) rename src/main/java/com/terraforged/{mod => }/util/nbt/NBTReader.java (98%) rename src/main/java/com/terraforged/{mod => }/util/nbt/NBTWriter.java (97%) rename src/main/java/com/terraforged/{mod => }/util/setup/SetupDebug.java (96%) rename src/main/java/com/terraforged/{mod => }/util/setup/SetupHooks.java (96%) diff --git a/Engine b/Engine index d60a706..67af304 160000 --- a/Engine +++ b/Engine @@ -1 +1 @@ -Subproject commit d60a706048b8013993f58d42ccaa8e1eb25a0601 +Subproject commit 67af3049fe2b82e8edb5cf0afb87cdf8314b2c97 diff --git a/FeatureManager b/FeatureManager index 60fa2c0..6cd959a 160000 --- a/FeatureManager +++ b/FeatureManager @@ -1 +1 @@ -Subproject commit 60fa2c047096cafc95f4db1ccaa07d3475de6e49 +Subproject commit 6cd959a0b0f3c5150ea70234c2c9b0a81d144d4a diff --git a/build.gradle b/build.gradle index bdcefd3..7c9e424 100644 --- a/build.gradle +++ b/build.gradle @@ -91,6 +91,16 @@ task collectLibs(type: Copy) { duplicatesStrategy = "EXCLUDE" } +task apiJar(type: Jar) { + from { zipTree(tasks.jar.archivePath) } + include "com/terraforged/fm/**" + include "com/terraforged/api/**" + include "com/terraforged/core/**" + include "com/terraforged/world/**" + include "me/dags/**" + classifier "api" +} + processResources { filesMatching("**/mods.toml") { expand("version": "${mod_version}${getClassifier()}", "mc_version": mc_version) @@ -101,6 +111,10 @@ classes { dependsOn(collectLibs) } +build { + finalizedBy(apiJar) +} + static def getClassifier() { if (System.getenv("GIT_TAG_NAME") != null) { return "" diff --git a/src/main/java/com/terraforged/mod/Log.java b/src/main/java/com/terraforged/Log.java similarity index 98% rename from src/main/java/com/terraforged/mod/Log.java rename to src/main/java/com/terraforged/Log.java index dd5af8d..c21ef6f 100644 --- a/src/main/java/com/terraforged/mod/Log.java +++ b/src/main/java/com/terraforged/Log.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod; +package com.terraforged; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/terraforged/mod/TerraForgedMod.java b/src/main/java/com/terraforged/TerraForgedMod.java similarity index 87% rename from src/main/java/com/terraforged/mod/TerraForgedMod.java rename to src/main/java/com/terraforged/TerraForgedMod.java index 8a23460..19ad444 100644 --- a/src/main/java/com/terraforged/mod/TerraForgedMod.java +++ b/src/main/java/com/terraforged/TerraForgedMod.java @@ -23,18 +23,18 @@ * SOFTWARE. */ -package com.terraforged.mod; +package com.terraforged; import com.terraforged.api.material.WGTags; -import com.terraforged.mod.feature.manager.template.TemplateManager; -import com.terraforged.mod.command.TerraCommand; -import com.terraforged.mod.data.DataGen; -import com.terraforged.mod.feature.context.ContextSelectorFeature; -import com.terraforged.mod.feature.decorator.poisson.PoissonAtSurface; -import com.terraforged.mod.feature.feature.DiskFeature; -import com.terraforged.mod.settings.SettingsHelper; -import com.terraforged.mod.util.DataPackFinder; -import com.terraforged.mod.util.Environment; +import com.terraforged.command.TerraCommand; +import com.terraforged.data.DataGen; +import com.terraforged.feature.decorator.poisson.PoissonAtSurface; +import com.terraforged.feature.feature.DiskFeature; +import com.terraforged.fm.template.TemplateManager; +import com.terraforged.feature.context.ContextSelectorFeature; +import com.terraforged.settings.SettingsHelper; +import com.terraforged.util.DataPackFinder; +import com.terraforged.util.Environment; import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.OreFeatureConfig; diff --git a/src/main/java/com/terraforged/mod/TerraWorld.java b/src/main/java/com/terraforged/TerraWorld.java similarity index 89% rename from src/main/java/com/terraforged/mod/TerraWorld.java rename to src/main/java/com/terraforged/TerraWorld.java index 9984787..7e1889a 100644 --- a/src/main/java/com/terraforged/mod/TerraWorld.java +++ b/src/main/java/com/terraforged/TerraWorld.java @@ -23,20 +23,20 @@ * SOFTWARE. */ -package com.terraforged.mod; +package com.terraforged; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.chunk.ChunkGeneratorFactory; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.chunk.TerraGenSettings; -import com.terraforged.mod.chunk.test.TestChunkGenerator; -import com.terraforged.mod.gui.SettingsScreen; -import com.terraforged.mod.settings.DimesionSettings; -import com.terraforged.mod.settings.SettingsHelper; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.Environment; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.chunk.ChunkGeneratorFactory; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraContext; +import com.terraforged.chunk.TerraGenSettings; +import com.terraforged.chunk.test.TestChunkGenerator; +import com.terraforged.gui.SettingsScreen; +import com.terraforged.settings.DimesionSettings; +import com.terraforged.settings.SettingsHelper; +import com.terraforged.settings.TerraSettings; +import com.terraforged.util.Environment; +import com.terraforged.util.nbt.NBTHelper; import com.terraforged.world.terrain.Terrains; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.CreateWorldScreen; diff --git a/src/main/java/com/terraforged/api/event/SetupEvent.java b/src/main/java/com/terraforged/api/event/SetupEvent.java index 663162a..d161252 100644 --- a/src/main/java/com/terraforged/api/event/SetupEvent.java +++ b/src/main/java/com/terraforged/api/event/SetupEvent.java @@ -32,7 +32,7 @@ import com.terraforged.api.material.geology.GeologyManager; import com.terraforged.api.material.layer.LayerManager; import com.terraforged.world.GeneratorContext; import com.terraforged.world.terrain.provider.TerrainProvider; -import com.terraforged.mod.feature.manager.modifier.FeatureModifiers; +import com.terraforged.fm.modifier.FeatureModifiers; import net.minecraftforge.eventbus.api.Event; public abstract class SetupEvent extends Event { diff --git a/src/main/java/com/terraforged/mod/biome/ColdSteppe.java b/src/main/java/com/terraforged/biome/ColdSteppe.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/ColdSteppe.java rename to src/main/java/com/terraforged/biome/ColdSteppe.java index 36d348b..c4eb77d 100644 --- a/src/main/java/com/terraforged/mod/biome/ColdSteppe.java +++ b/src/main/java/com/terraforged/biome/ColdSteppe.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/Dunes.java b/src/main/java/com/terraforged/biome/Dunes.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/Dunes.java rename to src/main/java/com/terraforged/biome/Dunes.java index 35d65c9..441f309 100644 --- a/src/main/java/com/terraforged/mod/biome/Dunes.java +++ b/src/main/java/com/terraforged/biome/Dunes.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/FirForest.java b/src/main/java/com/terraforged/biome/FirForest.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/FirForest.java rename to src/main/java/com/terraforged/biome/FirForest.java index da72855..2521e54 100644 --- a/src/main/java/com/terraforged/mod/biome/FirForest.java +++ b/src/main/java/com/terraforged/biome/FirForest.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/FlowerPlains.java b/src/main/java/com/terraforged/biome/FlowerPlains.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/FlowerPlains.java rename to src/main/java/com/terraforged/biome/FlowerPlains.java index 3adca77..917f81c 100644 --- a/src/main/java/com/terraforged/mod/biome/FlowerPlains.java +++ b/src/main/java/com/terraforged/biome/FlowerPlains.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.google.common.collect.ImmutableList; import com.terraforged.api.biome.BiomeVariant; diff --git a/src/main/java/com/terraforged/mod/biome/FrozenLake.java b/src/main/java/com/terraforged/biome/FrozenLake.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/FrozenLake.java rename to src/main/java/com/terraforged/biome/FrozenLake.java index fc44c9d..ac46d2c 100644 --- a/src/main/java/com/terraforged/mod/biome/FrozenLake.java +++ b/src/main/java/com/terraforged/biome/FrozenLake.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/Lake.java b/src/main/java/com/terraforged/biome/Lake.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/Lake.java rename to src/main/java/com/terraforged/biome/Lake.java index 1cc1d03..14dc5a2 100644 --- a/src/main/java/com/terraforged/mod/biome/Lake.java +++ b/src/main/java/com/terraforged/biome/Lake.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/Marshland.java b/src/main/java/com/terraforged/biome/Marshland.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/Marshland.java rename to src/main/java/com/terraforged/biome/Marshland.java index 2e17f27..fe7ff97 100644 --- a/src/main/java/com/terraforged/mod/biome/Marshland.java +++ b/src/main/java/com/terraforged/biome/Marshland.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/ModBiomes.java b/src/main/java/com/terraforged/biome/ModBiomes.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/ModBiomes.java rename to src/main/java/com/terraforged/biome/ModBiomes.java index 97b7f7d..fd57006 100644 --- a/src/main/java/com/terraforged/mod/biome/ModBiomes.java +++ b/src/main/java/com/terraforged/biome/ModBiomes.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/SavannaScrub.java b/src/main/java/com/terraforged/biome/SavannaScrub.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/SavannaScrub.java rename to src/main/java/com/terraforged/biome/SavannaScrub.java index 9ac7079..3560dec 100644 --- a/src/main/java/com/terraforged/mod/biome/SavannaScrub.java +++ b/src/main/java/com/terraforged/biome/SavannaScrub.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/biome/ShatteredSavannaScrub.java b/src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/ShatteredSavannaScrub.java rename to src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java index aac48de..2cdfc88 100644 --- a/src/main/java/com/terraforged/mod/biome/ShatteredSavannaScrub.java +++ b/src/main/java/com/terraforged/biome/ShatteredSavannaScrub.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/biome/SnowyFirForest.java b/src/main/java/com/terraforged/biome/SnowyFirForest.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/SnowyFirForest.java rename to src/main/java/com/terraforged/biome/SnowyFirForest.java index 421f49b..37c1af2 100644 --- a/src/main/java/com/terraforged/mod/biome/SnowyFirForest.java +++ b/src/main/java/com/terraforged/biome/SnowyFirForest.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/SnowyTaigaScrub.java b/src/main/java/com/terraforged/biome/SnowyTaigaScrub.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/SnowyTaigaScrub.java rename to src/main/java/com/terraforged/biome/SnowyTaigaScrub.java index 84ab46c..204bdc1 100644 --- a/src/main/java/com/terraforged/mod/biome/SnowyTaigaScrub.java +++ b/src/main/java/com/terraforged/biome/SnowyTaigaScrub.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/Steppe.java b/src/main/java/com/terraforged/biome/Steppe.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/Steppe.java rename to src/main/java/com/terraforged/biome/Steppe.java index 742d870..aae4fcb 100644 --- a/src/main/java/com/terraforged/mod/biome/Steppe.java +++ b/src/main/java/com/terraforged/biome/Steppe.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/TaigaScrub.java b/src/main/java/com/terraforged/biome/TaigaScrub.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/TaigaScrub.java rename to src/main/java/com/terraforged/biome/TaigaScrub.java index c6d3985..3b3f944 100644 --- a/src/main/java/com/terraforged/mod/biome/TaigaScrub.java +++ b/src/main/java/com/terraforged/biome/TaigaScrub.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/WarmBeach.java b/src/main/java/com/terraforged/biome/WarmBeach.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/WarmBeach.java rename to src/main/java/com/terraforged/biome/WarmBeach.java index 9627606..3cce1b2 100644 --- a/src/main/java/com/terraforged/mod/biome/WarmBeach.java +++ b/src/main/java/com/terraforged/biome/WarmBeach.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome; +package com.terraforged.biome; import com.terraforged.api.biome.BiomeVariant; import net.minecraft.entity.EntityClassification; diff --git a/src/main/java/com/terraforged/mod/biome/map/AbstractBiomeMap.java b/src/main/java/com/terraforged/biome/map/AbstractBiomeMap.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/map/AbstractBiomeMap.java rename to src/main/java/com/terraforged/biome/map/AbstractBiomeMap.java index 7adfa55..7b9b6a9 100644 --- a/src/main/java/com/terraforged/mod/biome/map/AbstractBiomeMap.java +++ b/src/main/java/com/terraforged/biome/map/AbstractBiomeMap.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.terraforged.biome.provider.BiomeHelper; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.ModBiomes; -import com.terraforged.mod.biome.provider.BiomeHelper; +import com.terraforged.biome.ModBiomes; import me.dags.noise.util.NoiseUtil; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; diff --git a/src/main/java/com/terraforged/mod/biome/map/BasicBiomeMap.java b/src/main/java/com/terraforged/biome/map/BasicBiomeMap.java similarity index 96% rename from src/main/java/com/terraforged/mod/biome/map/BasicBiomeMap.java rename to src/main/java/com/terraforged/biome/map/BasicBiomeMap.java index a483825..9401d7f 100644 --- a/src/main/java/com/terraforged/mod/biome/map/BasicBiomeMap.java +++ b/src/main/java/com/terraforged/biome/map/BasicBiomeMap.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.terraforged.biome.provider.BiomeHelper; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.provider.BiomeHelper; import net.minecraft.world.biome.Biome; import java.util.Arrays; diff --git a/src/main/java/com/terraforged/mod/biome/map/BiomeGroup.java b/src/main/java/com/terraforged/biome/map/BiomeGroup.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/map/BiomeGroup.java rename to src/main/java/com/terraforged/biome/map/BiomeGroup.java index 98fd7cc..0496819 100644 --- a/src/main/java/com/terraforged/mod/biome/map/BiomeGroup.java +++ b/src/main/java/com/terraforged/biome/map/BiomeGroup.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import com.terraforged.core.util.grid.FixedGrid; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/map/BiomeMap.java b/src/main/java/com/terraforged/biome/map/BiomeMap.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/map/BiomeMap.java rename to src/main/java/com/terraforged/biome/map/BiomeMap.java index 751423a..50f8983 100644 --- a/src/main/java/com/terraforged/mod/biome/map/BiomeMap.java +++ b/src/main/java/com/terraforged/biome/map/BiomeMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import com.google.gson.JsonElement; import com.terraforged.core.cell.Cell; diff --git a/src/main/java/com/terraforged/mod/biome/map/BiomeMapBuilder.java b/src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/map/BiomeMapBuilder.java rename to src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java index 1e276e3..2f9b036 100644 --- a/src/main/java/com/terraforged/mod/biome/map/BiomeMapBuilder.java +++ b/src/main/java/com/terraforged/biome/map/BiomeMapBuilder.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; +import com.terraforged.biome.provider.BiomeHelper; import com.terraforged.core.util.grid.FixedGrid; import com.terraforged.world.biome.BiomeData; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.provider.BiomeHelper; -import com.terraforged.mod.util.ListUtils; +import com.terraforged.util.ListUtils; import net.minecraft.world.biome.Biome; import java.util.ArrayList; diff --git a/src/main/java/com/terraforged/mod/biome/map/BiomePredicate.java b/src/main/java/com/terraforged/biome/map/BiomePredicate.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/map/BiomePredicate.java rename to src/main/java/com/terraforged/biome/map/BiomePredicate.java index 8e63870..7841bde 100644 --- a/src/main/java/com/terraforged/mod/biome/map/BiomePredicate.java +++ b/src/main/java/com/terraforged/biome/map/BiomePredicate.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; +import com.terraforged.biome.provider.BiomeHelper; import com.terraforged.world.biome.BiomeData; -import com.terraforged.mod.biome.provider.BiomeHelper; import net.minecraft.world.biome.Biome; import java.util.function.BiPredicate; diff --git a/src/main/java/com/terraforged/mod/biome/map/DefaultBiome.java b/src/main/java/com/terraforged/biome/map/DefaultBiome.java similarity index 85% rename from src/main/java/com/terraforged/mod/biome/map/DefaultBiome.java rename to src/main/java/com/terraforged/biome/map/DefaultBiome.java index 857ffb4..afba805 100644 --- a/src/main/java/com/terraforged/mod/biome/map/DefaultBiome.java +++ b/src/main/java/com/terraforged/biome/map/DefaultBiome.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/map/GridBiomeMap.java b/src/main/java/com/terraforged/biome/map/GridBiomeMap.java similarity index 99% rename from src/main/java/com/terraforged/mod/biome/map/GridBiomeMap.java rename to src/main/java/com/terraforged/biome/map/GridBiomeMap.java index c5278b6..5670741 100644 --- a/src/main/java/com/terraforged/mod/biome/map/GridBiomeMap.java +++ b/src/main/java/com/terraforged/biome/map/GridBiomeMap.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.map; +package com.terraforged.biome.map; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/terraforged/mod/biome/modifier/AbstractMaxHeightModifier.java b/src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/modifier/AbstractMaxHeightModifier.java rename to src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java index ca5fa5c..5fc0d7e 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/AbstractMaxHeightModifier.java +++ b/src/main/java/com/terraforged/biome/modifier/AbstractMaxHeightModifier.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.core.cell.Cell; import com.terraforged.core.Seed; diff --git a/src/main/java/com/terraforged/mod/biome/modifier/AbstractOffsetModifier.java b/src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/modifier/AbstractOffsetModifier.java rename to src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java index 5ba1157..5358c57 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/AbstractOffsetModifier.java +++ b/src/main/java/com/terraforged/biome/modifier/AbstractOffsetModifier.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.api.biome.modifier.BiomeModifier; import com.terraforged.core.cell.Cell; diff --git a/src/main/java/com/terraforged/mod/biome/modifier/BeachModifier.java b/src/main/java/com/terraforged/biome/modifier/BeachModifier.java similarity index 94% rename from src/main/java/com/terraforged/mod/biome/modifier/BeachModifier.java rename to src/main/java/com/terraforged/biome/modifier/BeachModifier.java index b82e173..822ed75 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/BeachModifier.java +++ b/src/main/java/com/terraforged/biome/modifier/BeachModifier.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.api.biome.modifier.BiomeModifier; +import com.terraforged.biome.map.BiomeMap; +import com.terraforged.chunk.TerraContext; import com.terraforged.core.cell.Cell; import com.terraforged.world.heightmap.Levels; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.biome.map.BiomeMap; -import com.terraforged.mod.chunk.TerraContext; import net.minecraft.world.biome.Biome; public class BeachModifier implements BiomeModifier { diff --git a/src/main/java/com/terraforged/mod/biome/modifier/BiomeModifierManager.java b/src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java similarity index 93% rename from src/main/java/com/terraforged/mod/biome/modifier/BiomeModifierManager.java rename to src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java index 13ed5b7..d94ae9a 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/BiomeModifierManager.java +++ b/src/main/java/com/terraforged/biome/modifier/BiomeModifierManager.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.api.biome.modifier.BiomeModifier; import com.terraforged.api.biome.modifier.ModifierManager; +import com.terraforged.biome.provider.DesertBiomes; import com.terraforged.core.cell.Cell; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.map.BiomeMap; -import com.terraforged.mod.biome.provider.DesertBiomes; -import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.biome.map.BiomeMap; +import com.terraforged.chunk.TerraContext; import net.minecraft.world.biome.Biome; import java.util.ArrayList; diff --git a/src/main/java/com/terraforged/mod/biome/modifier/DesertColorModifier.java b/src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java similarity index 95% rename from src/main/java/com/terraforged/mod/biome/modifier/DesertColorModifier.java rename to src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java index fc47448..ab17ccd 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/DesertColorModifier.java +++ b/src/main/java/com/terraforged/biome/modifier/DesertColorModifier.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.api.biome.modifier.BiomeModifier; +import com.terraforged.biome.provider.DesertBiomes; import com.terraforged.core.cell.Cell; -import com.terraforged.mod.biome.provider.DesertBiomes; import net.minecraft.world.biome.Biome; public class DesertColorModifier implements BiomeModifier { diff --git a/src/main/java/com/terraforged/mod/biome/modifier/SandBiomeModifier.java b/src/main/java/com/terraforged/biome/modifier/SandBiomeModifier.java similarity index 92% rename from src/main/java/com/terraforged/mod/biome/modifier/SandBiomeModifier.java rename to src/main/java/com/terraforged/biome/modifier/SandBiomeModifier.java index 110e1d6..7f4ba06 100644 --- a/src/main/java/com/terraforged/mod/biome/modifier/SandBiomeModifier.java +++ b/src/main/java/com/terraforged/biome/modifier/SandBiomeModifier.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.modifier; +package com.terraforged.biome.modifier; import com.terraforged.core.cell.Cell; -import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.chunk.TerraContext; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; import net.minecraftforge.registries.ForgeRegistries; @@ -40,7 +40,7 @@ public class SandBiomeModifier extends AbstractMaxHeightModifier { private final Set biomes; public SandBiomeModifier(TerraContext context) { - super(context.seed, context.factory.getClimate(), 50, 2, context.levels.scale(8), context.levels.ground(5), context.levels.ground(25)); + super(context.seed, context.factory.getClimate(), 50, 2, context.levels.scale(16), context.levels.ground(10), context.levels.ground(25)); this.biomes = ForgeRegistries.BIOMES.getValues().stream() .filter(biome -> context.materials.isSand(biome.getSurfaceBuilderConfig().getTop().getBlock())) .collect(Collectors.toSet()); diff --git a/src/main/java/com/terraforged/mod/biome/provider/AbstractBiomeProvider.java b/src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/provider/AbstractBiomeProvider.java rename to src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java index a431457..fa70a79 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/AbstractBiomeProvider.java +++ b/src/main/java/com/terraforged/biome/provider/AbstractBiomeProvider.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.provider; +package com.terraforged.biome.provider; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java b/src/main/java/com/terraforged/biome/provider/BiomeHelper.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java rename to src/main/java/com/terraforged/biome/provider/BiomeHelper.java index 8b9da6e..8491922 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/BiomeHelper.java +++ b/src/main/java/com/terraforged/biome/provider/BiomeHelper.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.provider; +package com.terraforged.biome.provider; import com.terraforged.world.biome.BiomeData; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.ModBiomes; -import com.terraforged.mod.biome.map.BiomeMap; -import com.terraforged.mod.biome.map.BiomeMapBuilder; -import com.terraforged.mod.biome.map.BiomePredicate; +import com.terraforged.biome.ModBiomes; +import com.terraforged.biome.map.BiomeMap; +import com.terraforged.biome.map.BiomeMapBuilder; +import com.terraforged.biome.map.BiomePredicate; import me.dags.noise.util.Vec2f; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java b/src/main/java/com/terraforged/biome/provider/BiomeProvider.java similarity index 95% rename from src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java rename to src/main/java/com/terraforged/biome/provider/BiomeProvider.java index b4e3482..945f5c0 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/BiomeProvider.java +++ b/src/main/java/com/terraforged/biome/provider/BiomeProvider.java @@ -23,18 +23,18 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.provider; +package com.terraforged.biome.provider; import com.google.common.collect.Sets; import com.terraforged.core.cell.Cell; import com.terraforged.core.region.chunk.ChunkReader; import com.terraforged.world.terrain.decorator.Decorator; import com.terraforged.world.heightmap.WorldLookup; -import com.terraforged.mod.biome.map.BiomeMap; -import com.terraforged.mod.biome.modifier.BiomeModifierManager; -import com.terraforged.mod.chunk.util.TerraContainer; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.util.setup.SetupHooks; +import com.terraforged.biome.map.BiomeMap; +import com.terraforged.biome.modifier.BiomeModifierManager; +import com.terraforged.chunk.util.TerraContainer; +import com.terraforged.chunk.TerraContext; +import com.terraforged.util.setup.SetupHooks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/provider/BiomeWeights.java b/src/main/java/com/terraforged/biome/provider/BiomeWeights.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/provider/BiomeWeights.java rename to src/main/java/com/terraforged/biome/provider/BiomeWeights.java index be782e8..344a719 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/BiomeWeights.java +++ b/src/main/java/com/terraforged/biome/provider/BiomeWeights.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome.provider; +package com.terraforged.biome.provider; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/biome/provider/DesertBiomes.java b/src/main/java/com/terraforged/biome/provider/DesertBiomes.java similarity index 95% rename from src/main/java/com/terraforged/mod/biome/provider/DesertBiomes.java rename to src/main/java/com/terraforged/biome/provider/DesertBiomes.java index 5aa7546..0f74549 100644 --- a/src/main/java/com/terraforged/mod/biome/provider/DesertBiomes.java +++ b/src/main/java/com/terraforged/biome/provider/DesertBiomes.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.provider; +package com.terraforged.biome.provider; import com.terraforged.api.material.layer.LayerManager; import com.terraforged.api.material.layer.LayerMaterial; import com.terraforged.core.concurrent.ObjectPool; -import com.terraforged.mod.material.Materials; -import com.terraforged.mod.util.DummyBlockReader; -import com.terraforged.mod.util.ListUtils; +import com.terraforged.material.Materials; +import com.terraforged.util.DummyBlockReader; +import com.terraforged.util.ListUtils; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.MaterialColor; diff --git a/src/main/java/com/terraforged/mod/biome/spawn/SpawnHandler.java b/src/main/java/com/terraforged/biome/spawn/SpawnHandler.java similarity index 94% rename from src/main/java/com/terraforged/mod/biome/spawn/SpawnHandler.java rename to src/main/java/com/terraforged/biome/spawn/SpawnHandler.java index e32a6a0..c0da46c 100644 --- a/src/main/java/com/terraforged/mod/biome/spawn/SpawnHandler.java +++ b/src/main/java/com/terraforged/biome/spawn/SpawnHandler.java @@ -1,8 +1,8 @@ -package com.terraforged.mod.biome.spawn; +package com.terraforged.biome.spawn; +import com.terraforged.biome.provider.BiomeProvider; import com.terraforged.world.continent.MutableVeci; -import com.terraforged.mod.Log; -import com.terraforged.mod.biome.provider.BiomeProvider; +import com.terraforged.Log; import net.minecraft.util.math.BlockPos; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.Feature; diff --git a/src/main/java/com/terraforged/mod/biome/spawn/SpawnSearch.java b/src/main/java/com/terraforged/biome/spawn/SpawnSearch.java similarity index 85% rename from src/main/java/com/terraforged/mod/biome/spawn/SpawnSearch.java rename to src/main/java/com/terraforged/biome/spawn/SpawnSearch.java index 39e170d..bbafdf2 100644 --- a/src/main/java/com/terraforged/mod/biome/spawn/SpawnSearch.java +++ b/src/main/java/com/terraforged/biome/spawn/SpawnSearch.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.biome.spawn; +package com.terraforged.biome.spawn; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.command.search.Search; import com.terraforged.core.cell.Cell; -import com.terraforged.mod.Log; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.command.search.Search; +import com.terraforged.Log; import net.minecraft.util.math.BlockPos; public class SpawnSearch extends Search { diff --git a/src/main/java/com/terraforged/mod/biome/surface/DunesSurface.java b/src/main/java/com/terraforged/biome/surface/DunesSurface.java similarity index 95% rename from src/main/java/com/terraforged/mod/biome/surface/DunesSurface.java rename to src/main/java/com/terraforged/biome/surface/DunesSurface.java index f61d268..211460f 100644 --- a/src/main/java/com/terraforged/mod/biome/surface/DunesSurface.java +++ b/src/main/java/com/terraforged/biome/surface/DunesSurface.java @@ -23,17 +23,17 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.surface; +package com.terraforged.biome.surface; import com.terraforged.api.chunk.surface.Surface; import com.terraforged.api.chunk.surface.SurfaceContext; import com.terraforged.api.material.layer.LayerMaterial; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.biome.provider.DesertBiomes; +import com.terraforged.chunk.TerraContext; import com.terraforged.core.cell.Cell; import com.terraforged.world.heightmap.Levels; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.biome.provider.DesertBiomes; -import com.terraforged.mod.chunk.TerraContext; import me.dags.noise.Module; import me.dags.noise.Source; import me.dags.noise.func.CellFunc; diff --git a/src/main/java/com/terraforged/mod/biome/surface/IcebergsSurface.java b/src/main/java/com/terraforged/biome/surface/IcebergsSurface.java similarity index 98% rename from src/main/java/com/terraforged/mod/biome/surface/IcebergsSurface.java rename to src/main/java/com/terraforged/biome/surface/IcebergsSurface.java index 3a80217..bf6e2c3 100644 --- a/src/main/java/com/terraforged/mod/biome/surface/IcebergsSurface.java +++ b/src/main/java/com/terraforged/biome/surface/IcebergsSurface.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.surface; +package com.terraforged.biome.surface; import com.terraforged.api.chunk.surface.Surface; import com.terraforged.api.chunk.surface.SurfaceContext; import com.terraforged.api.material.state.States; +import com.terraforged.chunk.TerraContext; import com.terraforged.core.cell.Cell; import com.terraforged.world.heightmap.Levels; -import com.terraforged.mod.chunk.TerraContext; import me.dags.noise.Module; import me.dags.noise.Source; import me.dags.noise.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/mod/biome/surface/SteppeSurface.java b/src/main/java/com/terraforged/biome/surface/SteppeSurface.java similarity index 95% rename from src/main/java/com/terraforged/mod/biome/surface/SteppeSurface.java rename to src/main/java/com/terraforged/biome/surface/SteppeSurface.java index c567912..1a9beaf 100644 --- a/src/main/java/com/terraforged/mod/biome/surface/SteppeSurface.java +++ b/src/main/java/com/terraforged/biome/surface/SteppeSurface.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome.surface; +package com.terraforged.biome.surface; import com.terraforged.api.chunk.surface.Surface; import com.terraforged.api.chunk.surface.SurfaceContext; diff --git a/src/main/java/com/terraforged/mod/biome/surface/SwampSurface.java b/src/main/java/com/terraforged/biome/surface/SwampSurface.java similarity index 96% rename from src/main/java/com/terraforged/mod/biome/surface/SwampSurface.java rename to src/main/java/com/terraforged/biome/surface/SwampSurface.java index 68d7d11..babc80b 100644 --- a/src/main/java/com/terraforged/mod/biome/surface/SwampSurface.java +++ b/src/main/java/com/terraforged/biome/surface/SwampSurface.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.biome.surface; +package com.terraforged.biome.surface; import com.terraforged.api.chunk.surface.Surface; import com.terraforged.api.chunk.surface.SurfaceContext; diff --git a/src/main/java/com/terraforged/mod/biome/tag/BiomeTagManager.java b/src/main/java/com/terraforged/biome/tag/BiomeTagManager.java similarity index 97% rename from src/main/java/com/terraforged/mod/biome/tag/BiomeTagManager.java rename to src/main/java/com/terraforged/biome/tag/BiomeTagManager.java index 26e5ac8..303b4c8 100644 --- a/src/main/java/com/terraforged/mod/biome/tag/BiomeTagManager.java +++ b/src/main/java/com/terraforged/biome/tag/BiomeTagManager.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.biome.tag; +package com.terraforged.biome.tag; import com.terraforged.api.biome.BiomeTags; -import com.terraforged.mod.Log; +import com.terraforged.Log; import net.minecraft.profiler.IProfiler; import net.minecraft.resources.IFutureReloadListener; import net.minecraft.resources.IResourceManager; diff --git a/src/main/java/com/terraforged/mod/chunk/ChunkGeneratorFactory.java b/src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java similarity index 93% rename from src/main/java/com/terraforged/mod/chunk/ChunkGeneratorFactory.java rename to src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java index 9b4d1f6..5585385 100644 --- a/src/main/java/com/terraforged/mod/chunk/ChunkGeneratorFactory.java +++ b/src/main/java/com/terraforged/chunk/ChunkGeneratorFactory.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; -import com.terraforged.mod.biome.provider.BiomeProvider; +import com.terraforged.biome.provider.BiomeProvider; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.OverworldGenSettings; diff --git a/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java b/src/main/java/com/terraforged/chunk/TerraChunkGenerator.java similarity index 89% rename from src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java rename to src/main/java/com/terraforged/chunk/TerraChunkGenerator.java index 41d5f4c..5b71e90 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java +++ b/src/main/java/com/terraforged/chunk/TerraChunkGenerator.java @@ -23,29 +23,29 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.surface.SurfaceManager; import com.terraforged.api.material.layer.LayerManager; +import com.terraforged.biome.provider.BiomeProvider; import com.terraforged.core.cell.Cell; import com.terraforged.core.region.Size; import com.terraforged.core.region.chunk.ChunkReader; import com.terraforged.core.region.gen.RegionCache; -import com.terraforged.mod.feature.manager.FeatureManager; -import com.terraforged.mod.feature.manager.data.DataManager; -import com.terraforged.mod.Log; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.chunk.generator.BiomeGenerator; -import com.terraforged.mod.chunk.generator.MobGenerator; -import com.terraforged.mod.chunk.generator.StructureGenerator; -import com.terraforged.mod.chunk.generator.TerrainCarver; -import com.terraforged.mod.chunk.generator.TerrainGenerator; -import com.terraforged.mod.feature.BlockDataManager; -import com.terraforged.mod.material.Materials; -import com.terraforged.mod.material.geology.GeoManager; -import com.terraforged.mod.util.Environment; -import com.terraforged.mod.util.setup.SetupHooks; +import com.terraforged.fm.FeatureManager; +import com.terraforged.material.Materials; +import com.terraforged.material.geology.GeoManager; +import com.terraforged.fm.data.DataManager; +import com.terraforged.Log; +import com.terraforged.chunk.generator.BiomeGenerator; +import com.terraforged.chunk.generator.MobGenerator; +import com.terraforged.chunk.generator.StructureGenerator; +import com.terraforged.chunk.generator.TerrainCarver; +import com.terraforged.chunk.generator.TerrainGenerator; +import com.terraforged.feature.BlockDataManager; +import com.terraforged.util.Environment; +import com.terraforged.util.setup.SetupHooks; import net.minecraft.entity.EntityClassification; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; @@ -112,7 +112,7 @@ public class TerraChunkGenerator extends ChunkGenerator { @Override public final void generateStructures(BiomeManager biomes, IChunk chunk, ChunkGenerator generator, TemplateManager templates) { - structureGenerator.generateStructureStarts(biomes, chunk, generator, templates); + structureGenerator.generateStructureStarts(biomes, chunk, templates); } @Override @@ -234,6 +234,12 @@ public class TerraChunkGenerator extends ChunkGenerator { return postProcessors; } + public final void queueChunk(int chunkX, int chunkZ) { + int rx = regionCache.chunkToRegion(chunkX); + int rz = regionCache.chunkToRegion(chunkZ); + regionCache.queueRegion(rx, rz); + } + public final ChunkReader getChunkReader(int chunkX, int chunkZ) { return regionCache.getChunk(chunkX, chunkZ); } diff --git a/src/main/java/com/terraforged/mod/chunk/TerraContext.java b/src/main/java/com/terraforged/chunk/TerraContext.java similarity index 96% rename from src/main/java/com/terraforged/mod/chunk/TerraContext.java rename to src/main/java/com/terraforged/chunk/TerraContext.java index d15ddc9..bfa8f83 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraContext.java +++ b/src/main/java/com/terraforged/chunk/TerraContext.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer; @@ -31,12 +31,12 @@ import com.terraforged.api.chunk.surface.SurfaceContext; import com.terraforged.core.region.gen.RegionCache; import com.terraforged.core.region.gen.RegionGenerator; import com.terraforged.core.concurrent.ThreadPool; +import com.terraforged.material.Materials; import com.terraforged.world.GeneratorContext; import com.terraforged.world.WorldGeneratorFactory; import com.terraforged.world.heightmap.Heightmap; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.material.Materials; -import com.terraforged.mod.settings.TerraSettings; +import com.terraforged.settings.TerraSettings; import net.minecraft.world.IWorld; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.gen.GenerationSettings; diff --git a/src/main/java/com/terraforged/mod/chunk/TerraGenSettings.java b/src/main/java/com/terraforged/chunk/TerraGenSettings.java similarity index 97% rename from src/main/java/com/terraforged/mod/chunk/TerraGenSettings.java rename to src/main/java/com/terraforged/chunk/TerraGenSettings.java index c7eba3d..ffa4f32 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraGenSettings.java +++ b/src/main/java/com/terraforged/chunk/TerraGenSettings.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; -import com.terraforged.mod.settings.StructureSettings; +import com.terraforged.settings.StructureSettings; import net.minecraft.world.gen.OverworldGenSettings; public class TerraGenSettings extends OverworldGenSettings { diff --git a/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java b/src/main/java/com/terraforged/chunk/TerraSetupFactory.java similarity index 74% rename from src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java rename to src/main/java/com/terraforged/chunk/TerraSetupFactory.java index a16bc8c..4dc75c2 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraSetupFactory.java +++ b/src/main/java/com/terraforged/chunk/TerraSetupFactory.java @@ -1,31 +1,31 @@ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.surface.SurfaceManager; -import com.terraforged.mod.Log; -import com.terraforged.mod.biome.ModBiomes; -import com.terraforged.mod.biome.surface.IcebergsSurface; -import com.terraforged.mod.biome.surface.SteppeSurface; -import com.terraforged.mod.biome.surface.SwampSurface; -import com.terraforged.mod.decorator.feature.LayerDecorator; -import com.terraforged.mod.decorator.feature.SnowEroder; -import com.terraforged.mod.decorator.terrain.BedrockDecorator; -import com.terraforged.mod.decorator.terrain.CoastDecorator; -import com.terraforged.mod.decorator.terrain.ErosionDecorator; -import com.terraforged.mod.decorator.terrain.GeologyDecorator; -import com.terraforged.mod.feature.BlockDataManager; -import com.terraforged.mod.feature.Matchers; -import com.terraforged.mod.feature.manager.FeatureManager; -import com.terraforged.mod.feature.manager.data.DataManager; -import com.terraforged.mod.feature.manager.matcher.biome.BiomeMatcher; -import com.terraforged.mod.feature.manager.matcher.feature.FeatureMatcher; -import com.terraforged.mod.feature.manager.modifier.FeatureModifiers; -import com.terraforged.mod.feature.manager.predicate.DeepWater; -import com.terraforged.mod.feature.manager.predicate.FeaturePredicate; -import com.terraforged.mod.feature.manager.predicate.MinDepth; -import com.terraforged.mod.feature.manager.predicate.MinHeight; -import com.terraforged.mod.material.geology.GeoManager; -import com.terraforged.mod.util.setup.SetupHooks; +import com.terraforged.biome.ModBiomes; +import com.terraforged.biome.surface.IcebergsSurface; +import com.terraforged.biome.surface.SteppeSurface; +import com.terraforged.biome.surface.SwampSurface; +import com.terraforged.decorator.feature.LayerDecorator; +import com.terraforged.decorator.feature.SnowEroder; +import com.terraforged.feature.Matchers; +import com.terraforged.fm.FeatureManager; +import com.terraforged.fm.matcher.biome.BiomeMatcher; +import com.terraforged.fm.matcher.feature.FeatureMatcher; +import com.terraforged.fm.modifier.FeatureModifiers; +import com.terraforged.fm.predicate.DeepWater; +import com.terraforged.fm.predicate.FeaturePredicate; +import com.terraforged.fm.predicate.MinDepth; +import com.terraforged.fm.predicate.MinHeight; +import com.terraforged.material.geology.GeoManager; +import com.terraforged.Log; +import com.terraforged.decorator.terrain.BedrockDecorator; +import com.terraforged.decorator.terrain.CoastDecorator; +import com.terraforged.decorator.terrain.ErosionDecorator; +import com.terraforged.decorator.terrain.GeologyDecorator; +import com.terraforged.feature.BlockDataManager; +import com.terraforged.fm.data.DataManager; +import com.terraforged.util.setup.SetupHooks; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.feature.Feature; @@ -111,7 +111,6 @@ public class TerraSetupFactory { manager.replace(Biomes.DEEP_FROZEN_OCEAN.delegate.get(), new IcebergsSurface(context, 30, 30)); manager.replace(Biomes.SWAMP.delegate.get(), new SwampSurface()); manager.replace(ModBiomes.MARSHLAND, new SwampSurface()); - manager.replace(ModBiomes.STEPPE, new SteppeSurface()); return SetupHooks.setup(manager, context); } diff --git a/src/main/java/com/terraforged/mod/chunk/TerraTerrainProvider.java b/src/main/java/com/terraforged/chunk/TerraTerrainProvider.java similarity index 95% rename from src/main/java/com/terraforged/mod/chunk/TerraTerrainProvider.java rename to src/main/java/com/terraforged/chunk/TerraTerrainProvider.java index 9527781..819bf01 100644 --- a/src/main/java/com/terraforged/mod/chunk/TerraTerrainProvider.java +++ b/src/main/java/com/terraforged/chunk/TerraTerrainProvider.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk; +package com.terraforged.chunk; import com.terraforged.core.cell.Populator; +import com.terraforged.util.setup.SetupHooks; import com.terraforged.world.GeneratorContext; import com.terraforged.world.heightmap.RegionConfig; import com.terraforged.world.terrain.provider.StandardTerrainProvider; -import com.terraforged.mod.util.setup.SetupHooks; public class TerraTerrainProvider extends StandardTerrainProvider { diff --git a/src/main/java/com/terraforged/mod/chunk/fix/ChunkCarverFix.java b/src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java similarity index 96% rename from src/main/java/com/terraforged/mod/chunk/fix/ChunkCarverFix.java rename to src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java index 0792eae..0273654 100644 --- a/src/main/java/com/terraforged/mod/chunk/fix/ChunkCarverFix.java +++ b/src/main/java/com/terraforged/chunk/fix/ChunkCarverFix.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.fix; +package com.terraforged.chunk.fix; import com.terraforged.api.chunk.ChunkDelegate; import com.terraforged.api.material.state.States; -import com.terraforged.mod.material.Materials; +import com.terraforged.material.Materials; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.IChunk; diff --git a/src/main/java/com/terraforged/mod/chunk/fix/RegionDelegate.java b/src/main/java/com/terraforged/chunk/fix/RegionDelegate.java similarity index 99% rename from src/main/java/com/terraforged/mod/chunk/fix/RegionDelegate.java rename to src/main/java/com/terraforged/chunk/fix/RegionDelegate.java index 77351f2..cb880fd 100644 --- a/src/main/java/com/terraforged/mod/chunk/fix/RegionDelegate.java +++ b/src/main/java/com/terraforged/chunk/fix/RegionDelegate.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.chunk.fix; +package com.terraforged.chunk.fix; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/chunk/fix/RegionFix.java b/src/main/java/com/terraforged/chunk/fix/RegionFix.java similarity index 97% rename from src/main/java/com/terraforged/mod/chunk/fix/RegionFix.java rename to src/main/java/com/terraforged/chunk/fix/RegionFix.java index 2a1c3a2..88a974b 100644 --- a/src/main/java/com/terraforged/mod/chunk/fix/RegionFix.java +++ b/src/main/java/com/terraforged/chunk/fix/RegionFix.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.fix; +package com.terraforged.chunk.fix; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.WorldGenRegion; diff --git a/src/main/java/com/terraforged/mod/chunk/generator/BiomeGenerator.java b/src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java similarity index 89% rename from src/main/java/com/terraforged/mod/chunk/generator/BiomeGenerator.java rename to src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java index d9608e1..00a7f7f 100644 --- a/src/main/java/com/terraforged/mod/chunk/generator/BiomeGenerator.java +++ b/src/main/java/com/terraforged/chunk/generator/BiomeGenerator.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.chunk.generator; +package com.terraforged.chunk.generator; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.util.TerraContainer; import com.terraforged.core.region.chunk.ChunkReader; import com.terraforged.world.terrain.decorator.Decorator; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.util.TerraContainer; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkPrimer; diff --git a/src/main/java/com/terraforged/mod/chunk/generator/MobGenerator.java b/src/main/java/com/terraforged/chunk/generator/MobGenerator.java similarity index 97% rename from src/main/java/com/terraforged/mod/chunk/generator/MobGenerator.java rename to src/main/java/com/terraforged/chunk/generator/MobGenerator.java index 149b279..d35a2ef 100644 --- a/src/main/java/com/terraforged/mod/chunk/generator/MobGenerator.java +++ b/src/main/java/com/terraforged/chunk/generator/MobGenerator.java @@ -1,6 +1,6 @@ -package com.terraforged.mod.chunk.generator; +package com.terraforged.chunk.generator; -import com.terraforged.mod.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraChunkGenerator; import net.minecraft.entity.EntityClassification; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/mod/chunk/generator/StructureGenerator.java b/src/main/java/com/terraforged/chunk/generator/StructureGenerator.java similarity index 94% rename from src/main/java/com/terraforged/mod/chunk/generator/StructureGenerator.java rename to src/main/java/com/terraforged/chunk/generator/StructureGenerator.java index 5965fda..78dae74 100644 --- a/src/main/java/com/terraforged/mod/chunk/generator/StructureGenerator.java +++ b/src/main/java/com/terraforged/chunk/generator/StructureGenerator.java @@ -1,6 +1,6 @@ -package com.terraforged.mod.chunk.generator; +package com.terraforged.chunk.generator; -import com.terraforged.mod.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraChunkGenerator; import net.minecraft.network.DebugPacketSender; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.BlockPos; @@ -26,8 +26,10 @@ public class StructureGenerator { this.generator = generator; } - public void generateStructureStarts(BiomeManager biomes, IChunk chunk, ChunkGenerator generator, TemplateManager templates) { + public void generateStructureStarts(BiomeManager biomes, IChunk chunk, TemplateManager templates) { ChunkPos chunkpos = chunk.getPos(); + generator.queueChunk(chunkpos.x, chunkpos.z); + BlockPos biomePos = new BlockPos(chunkpos.getXStart() + 9, 0, chunkpos.getZStart() + 9); for (Structure structure : Feature.STRUCTURES.values()) { diff --git a/src/main/java/com/terraforged/mod/chunk/generator/TerrainCarver.java b/src/main/java/com/terraforged/chunk/generator/TerrainCarver.java similarity index 93% rename from src/main/java/com/terraforged/mod/chunk/generator/TerrainCarver.java rename to src/main/java/com/terraforged/chunk/generator/TerrainCarver.java index 5ae3cf2..8460d0f 100644 --- a/src/main/java/com/terraforged/mod/chunk/generator/TerrainCarver.java +++ b/src/main/java/com/terraforged/chunk/generator/TerrainCarver.java @@ -1,7 +1,7 @@ -package com.terraforged.mod.chunk.generator; +package com.terraforged.chunk.generator; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.fix.ChunkCarverFix; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.fix.ChunkCarverFix; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/chunk/generator/TerrainGenerator.java b/src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java similarity index 93% rename from src/main/java/com/terraforged/mod/chunk/generator/TerrainGenerator.java rename to src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java index 185f5f0..69772e9 100644 --- a/src/main/java/com/terraforged/mod/chunk/generator/TerrainGenerator.java +++ b/src/main/java/com/terraforged/chunk/generator/TerrainGenerator.java @@ -1,17 +1,17 @@ -package com.terraforged.mod.chunk.generator; +package com.terraforged.chunk.generator; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer; import com.terraforged.api.chunk.surface.SurfaceContext; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.fix.RegionFix; +import com.terraforged.chunk.util.FastChunk; +import com.terraforged.chunk.util.TerraContainer; import com.terraforged.core.region.chunk.ChunkReader; -import com.terraforged.mod.chunk.util.FastChunk; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.util.TerraContainer; -import com.terraforged.mod.chunk.fix.RegionFix; -import com.terraforged.mod.decorator.ChunkPopulator; -import com.terraforged.mod.feature.TerrainHelper; -import com.terraforged.mod.util.Environment; +import com.terraforged.feature.TerrainHelper; +import com.terraforged.decorator.ChunkPopulator; +import com.terraforged.util.Environment; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/terraforged/mod/chunk/test/Test.java b/src/main/java/com/terraforged/chunk/test/Test.java similarity index 94% rename from src/main/java/com/terraforged/mod/chunk/test/Test.java rename to src/main/java/com/terraforged/chunk/test/Test.java index b79bbdf..e466db0 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/Test.java +++ b/src/main/java/com/terraforged/chunk/test/Test.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.test; +package com.terraforged.chunk.test; +import com.terraforged.biome.ModBiomes; import com.terraforged.world.terrain.Terrain; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.biome.ModBiomes; import net.minecraft.world.biome.Biome; public class Test { diff --git a/src/main/java/com/terraforged/mod/chunk/test/TestBiomeProvider.java b/src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java similarity index 91% rename from src/main/java/com/terraforged/mod/chunk/test/TestBiomeProvider.java rename to src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java index dc8c0d7..aeec4d1 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/TestBiomeProvider.java +++ b/src/main/java/com/terraforged/chunk/test/TestBiomeProvider.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.test; +package com.terraforged.chunk.test; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.chunk.TerraContext; import com.terraforged.core.cell.Cell; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.chunk.TerraContext; import net.minecraft.world.biome.Biome; public class TestBiomeProvider extends BiomeProvider { diff --git a/src/main/java/com/terraforged/mod/chunk/test/TestChunkGenerator.java b/src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java similarity index 92% rename from src/main/java/com/terraforged/mod/chunk/test/TestChunkGenerator.java rename to src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java index 73e140f..4d7e6bb 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/TestChunkGenerator.java +++ b/src/main/java/com/terraforged/chunk/test/TestChunkGenerator.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.test; +package com.terraforged.chunk.test; import com.terraforged.core.cell.Cell; import com.terraforged.core.cell.Populator; import com.terraforged.world.GeneratorContext; import com.terraforged.world.heightmap.WorldHeightmap; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraContext; import net.minecraft.world.gen.GenerationSettings; public class TestChunkGenerator extends TerraChunkGenerator { diff --git a/src/main/java/com/terraforged/mod/chunk/test/TestHeightMap.java b/src/main/java/com/terraforged/chunk/test/TestHeightMap.java similarity index 94% rename from src/main/java/com/terraforged/mod/chunk/test/TestHeightMap.java rename to src/main/java/com/terraforged/chunk/test/TestHeightMap.java index c4e14bd..22ec06b 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/TestHeightMap.java +++ b/src/main/java/com/terraforged/chunk/test/TestHeightMap.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.chunk.test; +package com.terraforged.chunk.test; import com.terraforged.core.cell.Cell; import com.terraforged.world.GeneratorContext; diff --git a/src/main/java/com/terraforged/mod/chunk/test/TestTerraContext.java b/src/main/java/com/terraforged/chunk/test/TestTerraContext.java similarity index 82% rename from src/main/java/com/terraforged/mod/chunk/test/TestTerraContext.java rename to src/main/java/com/terraforged/chunk/test/TestTerraContext.java index c8f3088..5deb243 100644 --- a/src/main/java/com/terraforged/mod/chunk/test/TestTerraContext.java +++ b/src/main/java/com/terraforged/chunk/test/TestTerraContext.java @@ -1,8 +1,8 @@ -package com.terraforged.mod.chunk.test; +package com.terraforged.chunk.test; +import com.terraforged.chunk.TerraContext; import com.terraforged.world.GeneratorContext; import com.terraforged.world.WorldGeneratorFactory; -import com.terraforged.mod.chunk.TerraContext; public class TestTerraContext extends TerraContext { diff --git a/src/main/java/com/terraforged/mod/chunk/util/FastChunk.java b/src/main/java/com/terraforged/chunk/util/FastChunk.java similarity index 99% rename from src/main/java/com/terraforged/mod/chunk/util/FastChunk.java rename to src/main/java/com/terraforged/chunk/util/FastChunk.java index 73ace63..a310c48 100644 --- a/src/main/java/com/terraforged/mod/chunk/util/FastChunk.java +++ b/src/main/java/com/terraforged/chunk/util/FastChunk.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.chunk.util; +package com.terraforged.chunk.util; import com.terraforged.api.chunk.ChunkDelegate; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/chunk/util/TerraContainer.java b/src/main/java/com/terraforged/chunk/util/TerraContainer.java similarity index 99% rename from src/main/java/com/terraforged/mod/chunk/util/TerraContainer.java rename to src/main/java/com/terraforged/chunk/util/TerraContainer.java index 24eba45..850b344 100644 --- a/src/main/java/com/terraforged/mod/chunk/util/TerraContainer.java +++ b/src/main/java/com/terraforged/chunk/util/TerraContainer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.chunk.util; +package com.terraforged.chunk.util; import com.terraforged.api.biome.BiomeVariant; import com.terraforged.core.cell.Cell; diff --git a/src/main/java/com/terraforged/mod/command/TerraCommand.java b/src/main/java/com/terraforged/command/TerraCommand.java similarity index 95% rename from src/main/java/com/terraforged/mod/command/TerraCommand.java rename to src/main/java/com/terraforged/command/TerraCommand.java index c14f1b9..32c29ce 100644 --- a/src/main/java/com/terraforged/mod/command/TerraCommand.java +++ b/src/main/java/com/terraforged/command/TerraCommand.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.command; +package com.terraforged.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; @@ -31,22 +31,22 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import com.terraforged.biome.provider.BiomeProvider; +import com.terraforged.command.arg.BiomeArgType; +import com.terraforged.command.arg.TerrainArgType; +import com.terraforged.command.search.BiomeSearchTask; +import com.terraforged.command.search.BothSearchTask; +import com.terraforged.command.search.Search; +import com.terraforged.command.search.TerrainSearchTask; import com.terraforged.core.cell.Cell; +import com.terraforged.settings.SettingsHelper; import com.terraforged.world.WorldGenerator; import com.terraforged.world.terrain.Terrain; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.Log; -import com.terraforged.mod.biome.provider.BiomeProvider; -import com.terraforged.mod.chunk.TerraChunkGenerator; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.command.arg.BiomeArgType; -import com.terraforged.mod.command.arg.TerrainArgType; -import com.terraforged.mod.command.search.BiomeSearchTask; -import com.terraforged.mod.command.search.BothSearchTask; -import com.terraforged.mod.command.search.Search; -import com.terraforged.mod.command.search.TerrainSearchTask; -import com.terraforged.mod.data.DataGen; -import com.terraforged.mod.settings.SettingsHelper; +import com.terraforged.Log; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraContext; +import com.terraforged.data.DataGen; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.command.arguments.ArgumentSerializer; diff --git a/src/main/java/com/terraforged/mod/command/arg/BiomeArgType.java b/src/main/java/com/terraforged/command/arg/BiomeArgType.java similarity index 98% rename from src/main/java/com/terraforged/mod/command/arg/BiomeArgType.java rename to src/main/java/com/terraforged/command/arg/BiomeArgType.java index 0dfc4a5..c8127af 100644 --- a/src/main/java/com/terraforged/mod/command/arg/BiomeArgType.java +++ b/src/main/java/com/terraforged/command/arg/BiomeArgType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.command.arg; +package com.terraforged.command.arg; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/com/terraforged/mod/command/arg/TerrainArgType.java b/src/main/java/com/terraforged/command/arg/TerrainArgType.java similarity index 98% rename from src/main/java/com/terraforged/mod/command/arg/TerrainArgType.java rename to src/main/java/com/terraforged/command/arg/TerrainArgType.java index 9465da4..65f6b3e 100644 --- a/src/main/java/com/terraforged/mod/command/arg/TerrainArgType.java +++ b/src/main/java/com/terraforged/command/arg/TerrainArgType.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.command.arg; +package com.terraforged.command.arg; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/com/terraforged/mod/command/search/BiomeSearchTask.java b/src/main/java/com/terraforged/command/search/BiomeSearchTask.java similarity index 93% rename from src/main/java/com/terraforged/mod/command/search/BiomeSearchTask.java rename to src/main/java/com/terraforged/command/search/BiomeSearchTask.java index 4a83c12..7164ffe 100644 --- a/src/main/java/com/terraforged/mod/command/search/BiomeSearchTask.java +++ b/src/main/java/com/terraforged/command/search/BiomeSearchTask.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.command.search; +package com.terraforged.command.search; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorldReader; diff --git a/src/main/java/com/terraforged/mod/command/search/BothSearchTask.java b/src/main/java/com/terraforged/command/search/BothSearchTask.java similarity index 93% rename from src/main/java/com/terraforged/mod/command/search/BothSearchTask.java rename to src/main/java/com/terraforged/command/search/BothSearchTask.java index 8dd576e..2e8acaf 100644 --- a/src/main/java/com/terraforged/mod/command/search/BothSearchTask.java +++ b/src/main/java/com/terraforged/command/search/BothSearchTask.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.command.search; +package com.terraforged.command.search; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/mod/command/search/Search.java b/src/main/java/com/terraforged/command/search/Search.java similarity index 98% rename from src/main/java/com/terraforged/mod/command/search/Search.java rename to src/main/java/com/terraforged/command/search/Search.java index 5a61899..d33d6ab 100644 --- a/src/main/java/com/terraforged/mod/command/search/Search.java +++ b/src/main/java/com/terraforged/command/search/Search.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.command.search; +package com.terraforged.command.search; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/mod/command/search/TerrainSearchTask.java b/src/main/java/com/terraforged/command/search/TerrainSearchTask.java similarity index 94% rename from src/main/java/com/terraforged/mod/command/search/TerrainSearchTask.java rename to src/main/java/com/terraforged/command/search/TerrainSearchTask.java index 0adf8f8..8a55ac3 100644 --- a/src/main/java/com/terraforged/mod/command/search/TerrainSearchTask.java +++ b/src/main/java/com/terraforged/command/search/TerrainSearchTask.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.command.search; +package com.terraforged.command.search; import com.terraforged.core.cell.Cell; import com.terraforged.world.WorldGenerator; diff --git a/src/main/java/com/terraforged/mod/data/DataGen.java b/src/main/java/com/terraforged/data/DataGen.java similarity index 98% rename from src/main/java/com/terraforged/mod/data/DataGen.java rename to src/main/java/com/terraforged/data/DataGen.java index 881b3f3..a802719 100644 --- a/src/main/java/com/terraforged/mod/data/DataGen.java +++ b/src/main/java/com/terraforged/data/DataGen.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.data; +package com.terraforged.data; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; diff --git a/src/main/java/com/terraforged/mod/data/LangGenerator.java b/src/main/java/com/terraforged/data/LangGenerator.java similarity index 93% rename from src/main/java/com/terraforged/mod/data/LangGenerator.java rename to src/main/java/com/terraforged/data/LangGenerator.java index 1ad19ea..74bf5be 100644 --- a/src/main/java/com/terraforged/mod/data/LangGenerator.java +++ b/src/main/java/com/terraforged/data/LangGenerator.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.data; +package com.terraforged.data; import com.terraforged.core.util.NameUtil; -import com.terraforged.mod.gui.preview.PreviewSettings; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.preview.PreviewSettings; +import com.terraforged.settings.TerraSettings; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/terraforged/mod/data/WorldGenBiomes.java b/src/main/java/com/terraforged/data/WorldGenBiomes.java similarity index 95% rename from src/main/java/com/terraforged/mod/data/WorldGenBiomes.java rename to src/main/java/com/terraforged/data/WorldGenBiomes.java index eb92713..c97e777 100644 --- a/src/main/java/com/terraforged/mod/data/WorldGenBiomes.java +++ b/src/main/java/com/terraforged/data/WorldGenBiomes.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.data; +package com.terraforged.data; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.terraforged.biome.map.BiomeMap; +import com.terraforged.biome.provider.BiomeHelper; import com.terraforged.world.biome.BiomeType; -import com.terraforged.mod.biome.map.BiomeMap; -import com.terraforged.mod.biome.provider.BiomeHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; diff --git a/src/main/java/com/terraforged/mod/data/WorldGenBlocks.java b/src/main/java/com/terraforged/data/WorldGenBlocks.java similarity index 98% rename from src/main/java/com/terraforged/mod/data/WorldGenBlocks.java rename to src/main/java/com/terraforged/data/WorldGenBlocks.java index 91fe0f6..f9799f0 100644 --- a/src/main/java/com/terraforged/mod/data/WorldGenBlocks.java +++ b/src/main/java/com/terraforged/data/WorldGenBlocks.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.data; +package com.terraforged.data; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/terraforged/mod/data/WorldGenFeatures.java b/src/main/java/com/terraforged/data/WorldGenFeatures.java similarity index 98% rename from src/main/java/com/terraforged/mod/data/WorldGenFeatures.java rename to src/main/java/com/terraforged/data/WorldGenFeatures.java index cbe327b..99c3884 100644 --- a/src/main/java/com/terraforged/mod/data/WorldGenFeatures.java +++ b/src/main/java/com/terraforged/data/WorldGenFeatures.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.data; +package com.terraforged.data; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/main/java/com/terraforged/mod/decorator/ChunkPopulator.java b/src/main/java/com/terraforged/decorator/ChunkPopulator.java similarity index 98% rename from src/main/java/com/terraforged/mod/decorator/ChunkPopulator.java rename to src/main/java/com/terraforged/decorator/ChunkPopulator.java index f9ca4c4..1a286d4 100644 --- a/src/main/java/com/terraforged/mod/decorator/ChunkPopulator.java +++ b/src/main/java/com/terraforged/decorator/ChunkPopulator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator; +package com.terraforged.decorator; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; diff --git a/src/main/java/com/terraforged/mod/decorator/feature/LayerDecorator.java b/src/main/java/com/terraforged/decorator/feature/LayerDecorator.java similarity index 98% rename from src/main/java/com/terraforged/mod/decorator/feature/LayerDecorator.java rename to src/main/java/com/terraforged/decorator/feature/LayerDecorator.java index 41a3d5a..2c9cddb 100644 --- a/src/main/java/com/terraforged/mod/decorator/feature/LayerDecorator.java +++ b/src/main/java/com/terraforged/decorator/feature/LayerDecorator.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.feature; +package com.terraforged.decorator.feature; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; diff --git a/src/main/java/com/terraforged/mod/decorator/feature/SnowEroder.java b/src/main/java/com/terraforged/decorator/feature/SnowEroder.java similarity index 96% rename from src/main/java/com/terraforged/mod/decorator/feature/SnowEroder.java rename to src/main/java/com/terraforged/decorator/feature/SnowEroder.java index 465e7a1..5749a09 100644 --- a/src/main/java/com/terraforged/mod/decorator/feature/SnowEroder.java +++ b/src/main/java/com/terraforged/decorator/feature/SnowEroder.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.feature; +package com.terraforged.decorator.feature; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.decorator.terrain.ErosionDecorator; +import com.terraforged.chunk.TerraContext; +import com.terraforged.decorator.terrain.ErosionDecorator; import me.dags.noise.source.Rand; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/terraforged/mod/decorator/terrain/BedrockDecorator.java b/src/main/java/com/terraforged/decorator/terrain/BedrockDecorator.java similarity index 96% rename from src/main/java/com/terraforged/mod/decorator/terrain/BedrockDecorator.java rename to src/main/java/com/terraforged/decorator/terrain/BedrockDecorator.java index 297a2ad..7c6e8aa 100644 --- a/src/main/java/com/terraforged/mod/decorator/terrain/BedrockDecorator.java +++ b/src/main/java/com/terraforged/decorator/terrain/BedrockDecorator.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.terrain; +package com.terraforged.decorator.terrain; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.material.state.States; -import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.chunk.TerraContext; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/terraforged/mod/decorator/terrain/CoastDecorator.java b/src/main/java/com/terraforged/decorator/terrain/CoastDecorator.java similarity index 96% rename from src/main/java/com/terraforged/mod/decorator/terrain/CoastDecorator.java rename to src/main/java/com/terraforged/decorator/terrain/CoastDecorator.java index b98a9c2..9d9458d 100644 --- a/src/main/java/com/terraforged/mod/decorator/terrain/CoastDecorator.java +++ b/src/main/java/com/terraforged/decorator/terrain/CoastDecorator.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.terrain; +package com.terraforged.decorator.terrain; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.material.state.States; +import com.terraforged.chunk.TerraContext; import com.terraforged.core.util.VariablePredicate; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.chunk.TerraContext; import net.minecraft.block.BlockState; import net.minecraft.world.chunk.IChunk; diff --git a/src/main/java/com/terraforged/mod/decorator/terrain/ErosionDecorator.java b/src/main/java/com/terraforged/decorator/terrain/ErosionDecorator.java similarity index 98% rename from src/main/java/com/terraforged/mod/decorator/terrain/ErosionDecorator.java rename to src/main/java/com/terraforged/decorator/terrain/ErosionDecorator.java index 4b03d21..e0ac4b1 100644 --- a/src/main/java/com/terraforged/mod/decorator/terrain/ErosionDecorator.java +++ b/src/main/java/com/terraforged/decorator/terrain/ErosionDecorator.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.terrain; +package com.terraforged.decorator.terrain; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.material.state.States; +import com.terraforged.chunk.TerraContext; +import com.terraforged.material.Materials; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.material.Materials; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/terraforged/mod/decorator/terrain/GeologyDecorator.java b/src/main/java/com/terraforged/decorator/terrain/GeologyDecorator.java similarity index 95% rename from src/main/java/com/terraforged/mod/decorator/terrain/GeologyDecorator.java rename to src/main/java/com/terraforged/decorator/terrain/GeologyDecorator.java index 80f381a..9ba358c 100644 --- a/src/main/java/com/terraforged/mod/decorator/terrain/GeologyDecorator.java +++ b/src/main/java/com/terraforged/decorator/terrain/GeologyDecorator.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.decorator.terrain; +package com.terraforged.decorator.terrain; import com.terraforged.api.chunk.column.ColumnDecorator; import com.terraforged.api.chunk.column.DecoratorContext; import com.terraforged.api.chunk.surface.ChunkSurfaceBuffer; -import com.terraforged.mod.material.geology.GeoManager; +import com.terraforged.material.geology.GeoManager; import net.minecraft.world.chunk.IChunk; public class GeologyDecorator implements ColumnDecorator { diff --git a/src/main/java/com/terraforged/mod/feature/BlockDataConfig.java b/src/main/java/com/terraforged/feature/BlockDataConfig.java similarity index 87% rename from src/main/java/com/terraforged/mod/feature/BlockDataConfig.java rename to src/main/java/com/terraforged/feature/BlockDataConfig.java index fcf6f54..84d2727 100644 --- a/src/main/java/com/terraforged/mod/feature/BlockDataConfig.java +++ b/src/main/java/com/terraforged/feature/BlockDataConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature; +package com.terraforged.feature; import com.google.gson.JsonObject; import net.minecraft.block.Block; diff --git a/src/main/java/com/terraforged/mod/feature/BlockDataManager.java b/src/main/java/com/terraforged/feature/BlockDataManager.java similarity index 84% rename from src/main/java/com/terraforged/mod/feature/BlockDataManager.java rename to src/main/java/com/terraforged/feature/BlockDataManager.java index bb615b5..9c27d8e 100644 --- a/src/main/java/com/terraforged/mod/feature/BlockDataManager.java +++ b/src/main/java/com/terraforged/feature/BlockDataManager.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.feature; +package com.terraforged.feature; import com.google.common.collect.ImmutableMap; -import com.terraforged.mod.feature.manager.data.DataManager; -import com.terraforged.mod.feature.manager.util.Json; -import com.terraforged.mod.feature.sapling.SaplingConfig; +import com.terraforged.feature.sapling.SaplingConfig; +import com.terraforged.fm.data.DataManager; +import com.terraforged.fm.util.Json; import net.minecraft.block.Block; import java.util.HashMap; diff --git a/src/main/java/com/terraforged/mod/feature/Matchers.java b/src/main/java/com/terraforged/feature/Matchers.java similarity index 88% rename from src/main/java/com/terraforged/mod/feature/Matchers.java rename to src/main/java/com/terraforged/feature/Matchers.java index 253e793..e41d411 100644 --- a/src/main/java/com/terraforged/mod/feature/Matchers.java +++ b/src/main/java/com/terraforged/feature/Matchers.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.feature; +package com.terraforged.feature; -import com.terraforged.mod.feature.manager.matcher.BiomeFeatureMatcher; -import com.terraforged.mod.feature.manager.matcher.biome.BiomeMatcher; -import com.terraforged.mod.feature.manager.matcher.feature.FeatureMatcher; -import com.terraforged.mod.feature.feature.DiskFeature; +import com.terraforged.feature.feature.DiskFeature; +import com.terraforged.fm.matcher.BiomeFeatureMatcher; +import com.terraforged.fm.matcher.biome.BiomeMatcher; +import com.terraforged.fm.matcher.feature.FeatureMatcher; import net.minecraft.block.Blocks; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.Feature; diff --git a/src/main/java/com/terraforged/mod/feature/TerrainHelper.java b/src/main/java/com/terraforged/feature/TerrainHelper.java similarity index 99% rename from src/main/java/com/terraforged/mod/feature/TerrainHelper.java rename to src/main/java/com/terraforged/feature/TerrainHelper.java index 4dcab74..eaa96da 100644 --- a/src/main/java/com/terraforged/mod/feature/TerrainHelper.java +++ b/src/main/java/com/terraforged/feature/TerrainHelper.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.feature; +package com.terraforged.feature; import it.unimi.dsi.fastutil.longs.LongIterator; import it.unimi.dsi.fastutil.objects.ObjectArrayList; diff --git a/src/main/java/com/terraforged/mod/feature/context/ChanceContext.java b/src/main/java/com/terraforged/feature/context/ChanceContext.java similarity index 94% rename from src/main/java/com/terraforged/mod/feature/context/ChanceContext.java rename to src/main/java/com/terraforged/feature/context/ChanceContext.java index f0b7095..a3c1448 100644 --- a/src/main/java/com/terraforged/mod/feature/context/ChanceContext.java +++ b/src/main/java/com/terraforged/feature/context/ChanceContext.java @@ -1,11 +1,11 @@ -package com.terraforged.mod.feature.context; +package com.terraforged.feature.context; +import com.terraforged.chunk.fix.RegionDelegate; +import com.terraforged.chunk.util.TerraContainer; import com.terraforged.core.cell.Cell; import com.terraforged.core.region.chunk.ChunkReader; import com.terraforged.core.concurrent.ObjectPool; import com.terraforged.world.heightmap.Levels; -import com.terraforged.mod.chunk.util.TerraContainer; -import com.terraforged.mod.chunk.fix.RegionDelegate; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.biome.BiomeContainer; diff --git a/src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java b/src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java similarity index 95% rename from src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java rename to src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java index 17496a2..b6128ee 100644 --- a/src/main/java/com/terraforged/mod/feature/context/ContextSelectorConfig.java +++ b/src/main/java/com/terraforged/feature/context/ContextSelectorConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.context; +package com.terraforged.feature.context; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java b/src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java similarity index 97% rename from src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java rename to src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java index 6be7ad8..9d514cf 100644 --- a/src/main/java/com/terraforged/mod/feature/context/ContextSelectorFeature.java +++ b/src/main/java/com/terraforged/feature/context/ContextSelectorFeature.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.context; +package com.terraforged.feature.context; import com.terraforged.core.concurrent.ObjectPool; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java b/src/main/java/com/terraforged/feature/context/ContextualFeature.java similarity index 96% rename from src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java rename to src/main/java/com/terraforged/feature/context/ContextualFeature.java index 8d60b8c..cd5fc25 100644 --- a/src/main/java/com/terraforged/mod/feature/context/ContextualFeature.java +++ b/src/main/java/com/terraforged/feature/context/ContextualFeature.java @@ -1,10 +1,10 @@ -package com.terraforged.mod.feature.context; +package com.terraforged.feature.context; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.OptionalDynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.mod.feature.context.modifier.ContextModifier; +import com.terraforged.feature.context.modifier.ContextModifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.gen.feature.ConfiguredFeature; diff --git a/src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java b/src/main/java/com/terraforged/feature/context/modifier/Biome.java similarity index 86% rename from src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java rename to src/main/java/com/terraforged/feature/context/modifier/Biome.java index d123c3f..1220609 100644 --- a/src/main/java/com/terraforged/mod/feature/context/modifier/Biome.java +++ b/src/main/java/com/terraforged/feature/context/modifier/Biome.java @@ -1,7 +1,7 @@ -package com.terraforged.mod.feature.context.modifier; +package com.terraforged.feature.context.modifier; import com.mojang.datafixers.Dynamic; -import com.terraforged.mod.feature.context.ChanceContext; +import com.terraforged.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class Biome extends RangeContextModifier { diff --git a/src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java b/src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java similarity index 88% rename from src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java rename to src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java index f540823..dd7bbf3 100644 --- a/src/main/java/com/terraforged/mod/feature/context/modifier/ContextModifier.java +++ b/src/main/java/com/terraforged/feature/context/modifier/ContextModifier.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.feature.context.modifier; +package com.terraforged.feature.context.modifier; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.mod.feature.context.ChanceContext; +import com.terraforged.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; import java.util.Map; diff --git a/src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java b/src/main/java/com/terraforged/feature/context/modifier/Elevation.java similarity index 85% rename from src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java rename to src/main/java/com/terraforged/feature/context/modifier/Elevation.java index 44119d4..fc893a8 100644 --- a/src/main/java/com/terraforged/mod/feature/context/modifier/Elevation.java +++ b/src/main/java/com/terraforged/feature/context/modifier/Elevation.java @@ -1,7 +1,7 @@ -package com.terraforged.mod.feature.context.modifier; +package com.terraforged.feature.context.modifier; import com.mojang.datafixers.Dynamic; -import com.terraforged.mod.feature.context.ChanceContext; +import com.terraforged.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class Elevation extends RangeContextModifier { diff --git a/src/main/java/com/terraforged/mod/feature/context/modifier/None.java b/src/main/java/com/terraforged/feature/context/modifier/None.java similarity index 80% rename from src/main/java/com/terraforged/mod/feature/context/modifier/None.java rename to src/main/java/com/terraforged/feature/context/modifier/None.java index 6a4d572..68f1828 100644 --- a/src/main/java/com/terraforged/mod/feature/context/modifier/None.java +++ b/src/main/java/com/terraforged/feature/context/modifier/None.java @@ -1,8 +1,8 @@ -package com.terraforged.mod.feature.context.modifier; +package com.terraforged.feature.context.modifier; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.mod.feature.context.ChanceContext; +import com.terraforged.feature.context.ChanceContext; import net.minecraft.util.math.BlockPos; public class None implements ContextModifier { diff --git a/src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java b/src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java similarity index 84% rename from src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java rename to src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java index 9d9e6cb..69e8d35 100644 --- a/src/main/java/com/terraforged/mod/feature/context/modifier/RangeContextModifier.java +++ b/src/main/java/com/terraforged/feature/context/modifier/RangeContextModifier.java @@ -1,10 +1,10 @@ -package com.terraforged.mod.feature.context.modifier; +package com.terraforged.feature.context.modifier; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; import com.mojang.datafixers.types.DynamicOps; -import com.terraforged.mod.feature.context.ChanceContext; -import com.terraforged.mod.util.RangeModifier; +import com.terraforged.feature.context.ChanceContext; +import com.terraforged.util.RangeModifier; import net.minecraft.util.math.BlockPos; public abstract class RangeContextModifier extends RangeModifier implements ContextModifier { diff --git a/src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java b/src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java similarity index 90% rename from src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java rename to src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java index 85a8d14..964e428 100644 --- a/src/main/java/com/terraforged/mod/feature/decorator/poisson/BiomeVariance.java +++ b/src/main/java/com/terraforged/feature/decorator/poisson/BiomeVariance.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.feature.decorator.poisson; +package com.terraforged.feature.decorator.poisson; import com.terraforged.core.cell.Cell; import com.terraforged.core.region.chunk.ChunkReader; -import com.terraforged.mod.chunk.util.TerraContainer; -import com.terraforged.mod.chunk.fix.RegionDelegate; +import com.terraforged.chunk.util.TerraContainer; +import com.terraforged.chunk.fix.RegionDelegate; import me.dags.noise.Module; import me.dags.noise.Source; import me.dags.noise.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java similarity index 89% rename from src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java rename to src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java index 9f7b3a1..4691105 100644 --- a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonAtSurface.java +++ b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonAtSurface.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.decorator.poisson; +package com.terraforged.feature.decorator.poisson; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java similarity index 96% rename from src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java rename to src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java index 5f62f0b..ef491d4 100644 --- a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonConfig.java +++ b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonConfig.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.decorator.poisson; +package com.terraforged.feature.decorator.poisson; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java similarity index 97% rename from src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java rename to src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java index f8a34e4..e867f45 100644 --- a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonDecorator.java +++ b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonDecorator.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.decorator.poisson; +package com.terraforged.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/mod/feature/decorator/poisson/PoissonVisitor.java b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java similarity index 96% rename from src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonVisitor.java rename to src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java index 998ff1c..8bcd186 100644 --- a/src/main/java/com/terraforged/mod/feature/decorator/poisson/PoissonVisitor.java +++ b/src/main/java/com/terraforged/feature/decorator/poisson/PoissonVisitor.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.decorator.poisson; +package com.terraforged.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/mod/feature/feature/DiskFeature.java b/src/main/java/com/terraforged/feature/feature/DiskFeature.java similarity index 98% rename from src/main/java/com/terraforged/mod/feature/feature/DiskFeature.java rename to src/main/java/com/terraforged/feature/feature/DiskFeature.java index e069bda..dcc2f1d 100644 --- a/src/main/java/com/terraforged/mod/feature/feature/DiskFeature.java +++ b/src/main/java/com/terraforged/feature/feature/DiskFeature.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.feature.feature; +package com.terraforged.feature.feature; import me.dags.noise.Module; import me.dags.noise.Source; diff --git a/src/main/java/com/terraforged/mod/feature/predicate/TreeLine.java b/src/main/java/com/terraforged/feature/predicate/TreeLine.java similarity index 92% rename from src/main/java/com/terraforged/mod/feature/predicate/TreeLine.java rename to src/main/java/com/terraforged/feature/predicate/TreeLine.java index e911681..d468455 100644 --- a/src/main/java/com/terraforged/mod/feature/predicate/TreeLine.java +++ b/src/main/java/com/terraforged/feature/predicate/TreeLine.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.feature.predicate; +package com.terraforged.feature.predicate; +import com.terraforged.fm.predicate.FeaturePredicate; import com.terraforged.world.climate.Climate; -import com.terraforged.mod.feature.manager.predicate.FeaturePredicate; -import com.terraforged.mod.chunk.TerraContext; +import com.terraforged.chunk.TerraContext; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.gen.Heightmap; diff --git a/src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java b/src/main/java/com/terraforged/feature/sapling/SaplingConfig.java similarity index 91% rename from src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java rename to src/main/java/com/terraforged/feature/sapling/SaplingConfig.java index 9826dd5..b62c5d6 100644 --- a/src/main/java/com/terraforged/mod/feature/sapling/SaplingConfig.java +++ b/src/main/java/com/terraforged/feature/sapling/SaplingConfig.java @@ -1,11 +1,11 @@ -package com.terraforged.mod.feature.sapling; +package com.terraforged.feature.sapling; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.terraforged.mod.feature.manager.template.TemplateManager; -import com.terraforged.mod.feature.manager.template.feature.TemplateFeatureConfig; -import com.terraforged.mod.feature.manager.util.Json; -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; +import com.terraforged.feature.BlockDataConfig; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java b/src/main/java/com/terraforged/feature/sapling/SaplingListener.java similarity index 94% rename from src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java rename to src/main/java/com/terraforged/feature/sapling/SaplingListener.java index 6369126..058a13d 100644 --- a/src/main/java/com/terraforged/mod/feature/sapling/SaplingListener.java +++ b/src/main/java/com/terraforged/feature/sapling/SaplingListener.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package com.terraforged.mod.feature.sapling; +package com.terraforged.feature.sapling; -import com.terraforged.mod.feature.manager.template.Template; -import com.terraforged.mod.feature.manager.template.feature.TemplateFeature; -import com.terraforged.mod.feature.manager.template.feature.TemplateFeatureConfig; -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.TerraWorld; +import com.terraforged.chunk.TerraChunkGenerator; +import com.terraforged.chunk.TerraContext; +import com.terraforged.fm.template.feature.TemplateFeature; +import com.terraforged.fm.template.feature.TemplateFeatureConfig; +import com.terraforged.fm.template.Template; +import com.terraforged.feature.BlockDataManager; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.Mirror; diff --git a/src/main/java/com/terraforged/mod/gui/OverlayRenderer.java b/src/main/java/com/terraforged/gui/OverlayRenderer.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/OverlayRenderer.java rename to src/main/java/com/terraforged/gui/OverlayRenderer.java index 2cc9fde..41cb51e 100644 --- a/src/main/java/com/terraforged/mod/gui/OverlayRenderer.java +++ b/src/main/java/com/terraforged/gui/OverlayRenderer.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui; +package com.terraforged.gui; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/com/terraforged/mod/gui/OverlayScreen.java b/src/main/java/com/terraforged/gui/OverlayScreen.java similarity index 95% rename from src/main/java/com/terraforged/mod/gui/OverlayScreen.java rename to src/main/java/com/terraforged/gui/OverlayScreen.java index 289e701..ef691c9 100644 --- a/src/main/java/com/terraforged/mod/gui/OverlayScreen.java +++ b/src/main/java/com/terraforged/gui/OverlayScreen.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.gui; +package com.terraforged.gui; -import com.terraforged.mod.gui.element.CheckBox; -import com.terraforged.mod.gui.element.Element; +import com.terraforged.gui.element.CheckBox; +import com.terraforged.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/mod/gui/ScrollPane.java b/src/main/java/com/terraforged/gui/ScrollPane.java similarity index 96% rename from src/main/java/com/terraforged/mod/gui/ScrollPane.java rename to src/main/java/com/terraforged/gui/ScrollPane.java index 2a58688..8a02fa7 100644 --- a/src/main/java/com/terraforged/mod/gui/ScrollPane.java +++ b/src/main/java/com/terraforged/gui/ScrollPane.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.gui; +package com.terraforged.gui; -import com.terraforged.mod.gui.element.Element; -import com.terraforged.mod.gui.preview.Preview; +import com.terraforged.gui.preview.Preview; +import com.terraforged.gui.element.Element; 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/mod/gui/SettingsScreen.java b/src/main/java/com/terraforged/gui/SettingsScreen.java similarity index 93% rename from src/main/java/com/terraforged/mod/gui/SettingsScreen.java rename to src/main/java/com/terraforged/gui/SettingsScreen.java index 9a5aad0..967c87a 100644 --- a/src/main/java/com/terraforged/mod/gui/SettingsScreen.java +++ b/src/main/java/com/terraforged/gui/SettingsScreen.java @@ -23,21 +23,21 @@ * SOFTWARE. */ -package com.terraforged.mod.gui; +package com.terraforged.gui; -import com.terraforged.mod.gui.element.TerraLabel; -import com.terraforged.mod.gui.page.ClimatePage; -import com.terraforged.mod.gui.page.MiscPage; -import com.terraforged.mod.gui.page.Page; -import com.terraforged.mod.gui.page.PresetsPage; -import com.terraforged.mod.gui.page.RiverPage; -import com.terraforged.mod.gui.page.StructurePage; -import com.terraforged.mod.gui.page.TerrainPage; -import com.terraforged.mod.gui.page.WorldPage; -import com.terraforged.mod.gui.preview.PreviewPage; -import com.terraforged.mod.settings.SettingsHelper; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.element.TerraLabel; +import com.terraforged.gui.page.ClimatePage; +import com.terraforged.gui.page.Page; +import com.terraforged.gui.page.StructurePage; +import com.terraforged.gui.page.TerrainPage; +import com.terraforged.gui.preview.PreviewPage; +import com.terraforged.gui.page.MiscPage; +import com.terraforged.gui.page.PresetsPage; +import com.terraforged.gui.page.RiverPage; +import com.terraforged.gui.page.WorldPage; +import com.terraforged.settings.SettingsHelper; +import com.terraforged.settings.TerraSettings; +import com.terraforged.util.nbt.NBTHelper; 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/mod/gui/element/CheckBox.java b/src/main/java/com/terraforged/gui/element/CheckBox.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/element/CheckBox.java rename to src/main/java/com/terraforged/gui/element/CheckBox.java index bf68624..c781e75 100644 --- a/src/main/java/com/terraforged/mod/gui/element/CheckBox.java +++ b/src/main/java/com/terraforged/gui/element/CheckBox.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; public class CheckBox extends TerraButton implements Element { diff --git a/src/main/java/com/terraforged/mod/gui/element/Element.java b/src/main/java/com/terraforged/gui/element/Element.java similarity index 98% rename from src/main/java/com/terraforged/mod/gui/element/Element.java rename to src/main/java/com/terraforged/gui/element/Element.java index f3dc045..bc9a063 100644 --- a/src/main/java/com/terraforged/mod/gui/element/Element.java +++ b/src/main/java/com/terraforged/gui/element/Element.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.client.resources.I18n; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/mod/gui/element/TerraButton.java b/src/main/java/com/terraforged/gui/element/TerraButton.java similarity index 98% rename from src/main/java/com/terraforged/mod/gui/element/TerraButton.java rename to src/main/java/com/terraforged/gui/element/TerraButton.java index 8628c84..eedd858 100644 --- a/src/main/java/com/terraforged/mod/gui/element/TerraButton.java +++ b/src/main/java/com/terraforged/gui/element/TerraButton.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.client.gui.widget.button.Button; diff --git a/src/main/java/com/terraforged/mod/gui/element/TerraLabel.java b/src/main/java/com/terraforged/gui/element/TerraLabel.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/element/TerraLabel.java rename to src/main/java/com/terraforged/gui/element/TerraLabel.java index 0877937..0d2a69b 100644 --- a/src/main/java/com/terraforged/mod/gui/element/TerraLabel.java +++ b/src/main/java/com/terraforged/gui/element/TerraLabel.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/terraforged/mod/gui/element/TerraSlider.java b/src/main/java/com/terraforged/gui/element/TerraSlider.java similarity index 98% rename from src/main/java/com/terraforged/mod/gui/element/TerraSlider.java rename to src/main/java/com/terraforged/gui/element/TerraSlider.java index 145a1ee..fa82cd2 100644 --- a/src/main/java/com/terraforged/mod/gui/element/TerraSlider.java +++ b/src/main/java/com/terraforged/gui/element/TerraSlider.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.fml.client.gui.widget.Slider; diff --git a/src/main/java/com/terraforged/mod/gui/element/TerraTextInput.java b/src/main/java/com/terraforged/gui/element/TerraTextInput.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/element/TerraTextInput.java rename to src/main/java/com/terraforged/gui/element/TerraTextInput.java index 81415f8..d791cba 100644 --- a/src/main/java/com/terraforged/mod/gui/element/TerraTextInput.java +++ b/src/main/java/com/terraforged/gui/element/TerraTextInput.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.TextFieldWidget; diff --git a/src/main/java/com/terraforged/mod/gui/element/TerraToggle.java b/src/main/java/com/terraforged/gui/element/TerraToggle.java similarity index 98% rename from src/main/java/com/terraforged/mod/gui/element/TerraToggle.java rename to src/main/java/com/terraforged/gui/element/TerraToggle.java index 7a3e2b7..74f0460 100644 --- a/src/main/java/com/terraforged/mod/gui/element/TerraToggle.java +++ b/src/main/java/com/terraforged/gui/element/TerraToggle.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.element; +package com.terraforged.gui.element; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/mod/gui/page/BasePage.java b/src/main/java/com/terraforged/gui/page/BasePage.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/page/BasePage.java rename to src/main/java/com/terraforged/gui/page/BasePage.java index f4b2b9b..ee93328 100644 --- a/src/main/java/com/terraforged/mod/gui/page/BasePage.java +++ b/src/main/java/com/terraforged/gui/page/BasePage.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; public abstract class BasePage extends Page { diff --git a/src/main/java/com/terraforged/mod/gui/page/ClimatePage.java b/src/main/java/com/terraforged/gui/page/ClimatePage.java similarity index 92% rename from src/main/java/com/terraforged/mod/gui/page/ClimatePage.java rename to src/main/java/com/terraforged/gui/page/ClimatePage.java index b23869e..4be8a34 100644 --- a/src/main/java/com/terraforged/mod/gui/page/ClimatePage.java +++ b/src/main/java/com/terraforged/gui/page/ClimatePage.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; import com.terraforged.core.settings.Settings; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.preview.PreviewPage; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.preview.PreviewPage; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; public class ClimatePage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/MiscPage.java b/src/main/java/com/terraforged/gui/page/MiscPage.java similarity index 90% rename from src/main/java/com/terraforged/mod/gui/page/MiscPage.java rename to src/main/java/com/terraforged/gui/page/MiscPage.java index cd7a0cc..b3257f5 100644 --- a/src/main/java/com/terraforged/mod/gui/page/MiscPage.java +++ b/src/main/java/com/terraforged/gui/page/MiscPage.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.element.TerraLabel; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.gui.element.TerraLabel; +import com.terraforged.settings.TerraSettings; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; public class MiscPage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/Page.java b/src/main/java/com/terraforged/gui/page/Page.java similarity index 93% rename from src/main/java/com/terraforged/mod/gui/page/Page.java rename to src/main/java/com/terraforged/gui/page/Page.java index a02e5aa..4047544 100644 --- a/src/main/java/com/terraforged/mod/gui/page/Page.java +++ b/src/main/java/com/terraforged/gui/page/Page.java @@ -23,17 +23,17 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.gui.OverlayRenderer; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.ScrollPane; -import com.terraforged.mod.gui.element.Element; -import com.terraforged.mod.gui.element.TerraLabel; -import com.terraforged.mod.gui.element.TerraSlider; -import com.terraforged.mod.gui.element.TerraTextInput; -import com.terraforged.mod.gui.element.TerraToggle; -import com.terraforged.mod.util.nbt.NBTHelper; +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.gui.OverlayRenderer; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.gui.ScrollPane; +import com.terraforged.gui.element.Element; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.Widget; @@ -41,7 +41,6 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; import net.minecraftforge.common.util.Constants; -import java.util.Comparator; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; diff --git a/src/main/java/com/terraforged/mod/gui/page/PresetPage.java b/src/main/java/com/terraforged/gui/page/PresetPage.java similarity index 65% rename from src/main/java/com/terraforged/mod/gui/page/PresetPage.java rename to src/main/java/com/terraforged/gui/page/PresetPage.java index 12be3a8..d4eb011 100644 --- a/src/main/java/com/terraforged/mod/gui/page/PresetPage.java +++ b/src/main/java/com/terraforged/gui/page/PresetPage.java @@ -1,6 +1,6 @@ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.gui.OverlayScreen; +import com.terraforged.gui.OverlayScreen; public class PresetPage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/PresetsPage.java b/src/main/java/com/terraforged/gui/page/PresetsPage.java similarity index 74% rename from src/main/java/com/terraforged/mod/gui/page/PresetsPage.java rename to src/main/java/com/terraforged/gui/page/PresetsPage.java index 5c8f733..0ad419b 100644 --- a/src/main/java/com/terraforged/mod/gui/page/PresetsPage.java +++ b/src/main/java/com/terraforged/gui/page/PresetsPage.java @@ -1,6 +1,6 @@ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.gui.OverlayScreen; +import com.terraforged.gui.OverlayScreen; public class PresetsPage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/RiverPage.java b/src/main/java/com/terraforged/gui/page/RiverPage.java similarity index 92% rename from src/main/java/com/terraforged/mod/gui/page/RiverPage.java rename to src/main/java/com/terraforged/gui/page/RiverPage.java index 94162dd..354858b 100644 --- a/src/main/java/com/terraforged/mod/gui/page/RiverPage.java +++ b/src/main/java/com/terraforged/gui/page/RiverPage.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; import com.terraforged.core.settings.Settings; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.preview.PreviewPage; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.gui.preview.PreviewPage; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; public class RiverPage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/StructurePage.java b/src/main/java/com/terraforged/gui/page/StructurePage.java similarity index 91% rename from src/main/java/com/terraforged/mod/gui/page/StructurePage.java rename to src/main/java/com/terraforged/gui/page/StructurePage.java index e2b30af..aab4187 100644 --- a/src/main/java/com/terraforged/mod/gui/page/StructurePage.java +++ b/src/main/java/com/terraforged/gui/page/StructurePage.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.settings.TerraSettings; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; public class StructurePage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/TerrainPage.java b/src/main/java/com/terraforged/gui/page/TerrainPage.java similarity index 92% rename from src/main/java/com/terraforged/mod/gui/page/TerrainPage.java rename to src/main/java/com/terraforged/gui/page/TerrainPage.java index 2dbd732..7975bf5 100644 --- a/src/main/java/com/terraforged/mod/gui/page/TerrainPage.java +++ b/src/main/java/com/terraforged/gui/page/TerrainPage.java @@ -23,12 +23,12 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; import com.terraforged.core.settings.Settings; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.preview.PreviewPage; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.preview.PreviewPage; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; public class TerrainPage extends BasePage { diff --git a/src/main/java/com/terraforged/mod/gui/page/WorldPage.java b/src/main/java/com/terraforged/gui/page/WorldPage.java similarity index 91% rename from src/main/java/com/terraforged/mod/gui/page/WorldPage.java rename to src/main/java/com/terraforged/gui/page/WorldPage.java index 6513e1f..495eaa8 100644 --- a/src/main/java/com/terraforged/mod/gui/page/WorldPage.java +++ b/src/main/java/com/terraforged/gui/page/WorldPage.java @@ -23,14 +23,14 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.page; +package com.terraforged.gui.page; -import com.terraforged.mod.TerraWorld; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.element.TerraTextInput; -import com.terraforged.mod.gui.preview.PreviewPage; -import com.terraforged.mod.settings.TerraSettings; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.TerraWorld; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.gui.element.TerraTextInput; +import com.terraforged.gui.preview.PreviewPage; +import com.terraforged.settings.TerraSettings; +import com.terraforged.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/mod/gui/preview/Preview.java b/src/main/java/com/terraforged/gui/preview/Preview.java similarity index 99% rename from src/main/java/com/terraforged/mod/gui/preview/Preview.java rename to src/main/java/com/terraforged/gui/preview/Preview.java index 700e8c6..bbbb432 100644 --- a/src/main/java/com/terraforged/mod/gui/preview/Preview.java +++ b/src/main/java/com/terraforged/gui/preview/Preview.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.preview; +package com.terraforged.gui.preview; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -34,11 +34,11 @@ import com.terraforged.core.region.gen.RegionGenerator; import com.terraforged.core.settings.Settings; import com.terraforged.core.concurrent.ThreadPool; import com.terraforged.core.concurrent.cache.CacheEntry; +import com.terraforged.util.nbt.NBTHelper; import com.terraforged.world.GeneratorContext; import com.terraforged.world.continent.MutableVeci; import com.terraforged.world.heightmap.Levels; import com.terraforged.world.terrain.Terrains; -import com.terraforged.mod.util.nbt.NBTHelper; import me.dags.noise.util.NoiseUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; diff --git a/src/main/java/com/terraforged/mod/gui/preview/PreviewPage.java b/src/main/java/com/terraforged/gui/preview/PreviewPage.java similarity index 93% rename from src/main/java/com/terraforged/mod/gui/preview/PreviewPage.java rename to src/main/java/com/terraforged/gui/preview/PreviewPage.java index 40d2af7..784987f 100644 --- a/src/main/java/com/terraforged/mod/gui/preview/PreviewPage.java +++ b/src/main/java/com/terraforged/gui/preview/PreviewPage.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.preview; +package com.terraforged.gui.preview; import com.terraforged.core.settings.Settings; -import com.terraforged.mod.gui.OverlayScreen; -import com.terraforged.mod.gui.element.TerraButton; -import com.terraforged.mod.gui.page.BasePage; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.gui.OverlayScreen; +import com.terraforged.gui.element.TerraButton; +import com.terraforged.gui.page.BasePage; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import java.util.function.Consumer; diff --git a/src/main/java/com/terraforged/mod/gui/preview/PreviewSettings.java b/src/main/java/com/terraforged/gui/preview/PreviewSettings.java similarity index 97% rename from src/main/java/com/terraforged/mod/gui/preview/PreviewSettings.java rename to src/main/java/com/terraforged/gui/preview/PreviewSettings.java index b283aae..2a87a3c 100644 --- a/src/main/java/com/terraforged/mod/gui/preview/PreviewSettings.java +++ b/src/main/java/com/terraforged/gui/preview/PreviewSettings.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.preview; +package com.terraforged.gui.preview; import com.terraforged.core.serialization.annotation.Comment; import com.terraforged.core.serialization.annotation.Range; diff --git a/src/main/java/com/terraforged/mod/gui/preview/RenderMode.java b/src/main/java/com/terraforged/gui/preview/RenderMode.java similarity index 98% rename from src/main/java/com/terraforged/mod/gui/preview/RenderMode.java rename to src/main/java/com/terraforged/gui/preview/RenderMode.java index 2085934..f420cd7 100644 --- a/src/main/java/com/terraforged/mod/gui/preview/RenderMode.java +++ b/src/main/java/com/terraforged/gui/preview/RenderMode.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.gui.preview; +package com.terraforged.gui.preview; import com.terraforged.core.cell.Cell; import com.terraforged.world.heightmap.Levels; diff --git a/src/main/java/com/terraforged/mod/material/Materials.java b/src/main/java/com/terraforged/material/Materials.java similarity index 97% rename from src/main/java/com/terraforged/mod/material/Materials.java rename to src/main/java/com/terraforged/material/Materials.java index c4b8d70..fd3a79e 100644 --- a/src/main/java/com/terraforged/mod/material/Materials.java +++ b/src/main/java/com/terraforged/material/Materials.java @@ -23,13 +23,13 @@ * SOFTWARE. */ -package com.terraforged.mod.material; +package com.terraforged.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.ObjectPool; -import com.terraforged.mod.util.DummyBlockReader; +import com.terraforged.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/mod/material/geology/GeoGenerator.java b/src/main/java/com/terraforged/material/geology/GeoGenerator.java similarity index 97% rename from src/main/java/com/terraforged/mod/material/geology/GeoGenerator.java rename to src/main/java/com/terraforged/material/geology/GeoGenerator.java index 947d6cd..3ae90eb 100644 --- a/src/main/java/com/terraforged/mod/material/geology/GeoGenerator.java +++ b/src/main/java/com/terraforged/material/geology/GeoGenerator.java @@ -23,11 +23,11 @@ * SOFTWARE. */ -package com.terraforged.mod.material.geology; +package com.terraforged.material.geology; import com.terraforged.api.material.geology.StrataConfig; import com.terraforged.api.material.geology.StrataGenerator; -import com.terraforged.mod.material.Materials; +import com.terraforged.material.Materials; import com.terraforged.world.geology.Strata; import me.dags.noise.Source; import net.minecraft.block.Block; diff --git a/src/main/java/com/terraforged/mod/material/geology/GeoManager.java b/src/main/java/com/terraforged/material/geology/GeoManager.java similarity index 96% rename from src/main/java/com/terraforged/mod/material/geology/GeoManager.java rename to src/main/java/com/terraforged/material/geology/GeoManager.java index 92ed10b..1f82bb7 100644 --- a/src/main/java/com/terraforged/mod/material/geology/GeoManager.java +++ b/src/main/java/com/terraforged/material/geology/GeoManager.java @@ -23,15 +23,15 @@ * SOFTWARE. */ -package com.terraforged.mod.material.geology; +package com.terraforged.material.geology; import com.terraforged.api.material.geology.GeologyManager; import com.terraforged.api.material.geology.StrataConfig; import com.terraforged.core.Seed; import com.terraforged.world.geology.Geology; import com.terraforged.world.geology.Strata; -import com.terraforged.mod.chunk.TerraContext; -import com.terraforged.mod.material.Materials; +import com.terraforged.chunk.TerraContext; +import com.terraforged.material.Materials; import me.dags.noise.Module; import me.dags.noise.Source; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/settings/DimesionSettings.java b/src/main/java/com/terraforged/settings/DimesionSettings.java similarity index 96% rename from src/main/java/com/terraforged/mod/settings/DimesionSettings.java rename to src/main/java/com/terraforged/settings/DimesionSettings.java index 10214ce..c218bcf 100644 --- a/src/main/java/com/terraforged/mod/settings/DimesionSettings.java +++ b/src/main/java/com/terraforged/settings/DimesionSettings.java @@ -1,9 +1,9 @@ -package com.terraforged.mod.settings; +package com.terraforged.settings; import com.terraforged.core.serialization.annotation.Comment; import com.terraforged.core.serialization.annotation.Range; import com.terraforged.core.serialization.annotation.Serializable; -import com.terraforged.mod.TerraWorld; +import com.terraforged.TerraWorld; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.StringNBT; import net.minecraft.world.WorldType; diff --git a/src/main/java/com/terraforged/mod/settings/Miscellaneous.java b/src/main/java/com/terraforged/settings/Miscellaneous.java similarity index 98% rename from src/main/java/com/terraforged/mod/settings/Miscellaneous.java rename to src/main/java/com/terraforged/settings/Miscellaneous.java index d68e17d..33b3593 100644 --- a/src/main/java/com/terraforged/mod/settings/Miscellaneous.java +++ b/src/main/java/com/terraforged/settings/Miscellaneous.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.settings; +package com.terraforged.settings; import com.terraforged.core.serialization.annotation.Comment; import com.terraforged.core.serialization.annotation.Serializable; diff --git a/src/main/java/com/terraforged/mod/settings/SettingsHelper.java b/src/main/java/com/terraforged/settings/SettingsHelper.java similarity index 95% rename from src/main/java/com/terraforged/mod/settings/SettingsHelper.java rename to src/main/java/com/terraforged/settings/SettingsHelper.java index 78ec610..13239e1 100644 --- a/src/main/java/com/terraforged/mod/settings/SettingsHelper.java +++ b/src/main/java/com/terraforged/settings/SettingsHelper.java @@ -1,12 +1,11 @@ -package com.terraforged.mod.settings; +package com.terraforged.settings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import com.terraforged.mod.Log; -import com.terraforged.mod.TerraWorld; -import com.terraforged.mod.util.nbt.NBTHelper; +import com.terraforged.Log; +import com.terraforged.util.nbt.NBTHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/terraforged/mod/settings/StructureSettings.java b/src/main/java/com/terraforged/settings/StructureSettings.java similarity index 98% rename from src/main/java/com/terraforged/mod/settings/StructureSettings.java rename to src/main/java/com/terraforged/settings/StructureSettings.java index 8201e4d..fbe599a 100644 --- a/src/main/java/com/terraforged/mod/settings/StructureSettings.java +++ b/src/main/java/com/terraforged/settings/StructureSettings.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.settings; +package com.terraforged.settings; import com.terraforged.core.serialization.annotation.Comment; import com.terraforged.core.serialization.annotation.Range; diff --git a/src/main/java/com/terraforged/mod/settings/TerraSettings.java b/src/main/java/com/terraforged/settings/TerraSettings.java similarity index 97% rename from src/main/java/com/terraforged/mod/settings/TerraSettings.java rename to src/main/java/com/terraforged/settings/TerraSettings.java index 30aad9e..8445f07 100644 --- a/src/main/java/com/terraforged/mod/settings/TerraSettings.java +++ b/src/main/java/com/terraforged/settings/TerraSettings.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.settings; +package com.terraforged.settings; import com.terraforged.core.settings.Settings; import com.terraforged.core.serialization.annotation.Serializable; diff --git a/src/main/java/com/terraforged/mod/util/DataPackFinder.java b/src/main/java/com/terraforged/util/DataPackFinder.java similarity index 89% rename from src/main/java/com/terraforged/mod/util/DataPackFinder.java rename to src/main/java/com/terraforged/util/DataPackFinder.java index c74602e..6533ebe 100644 --- a/src/main/java/com/terraforged/mod/util/DataPackFinder.java +++ b/src/main/java/com/terraforged/util/DataPackFinder.java @@ -1,6 +1,6 @@ -package com.terraforged.mod.util; +package com.terraforged.util; -import com.terraforged.mod.Log; +import com.terraforged.Log; import net.minecraft.resources.FolderPackFinder; import net.minecraft.resources.ResourcePackInfo; diff --git a/src/main/java/com/terraforged/mod/util/DummyBlockReader.java b/src/main/java/com/terraforged/util/DummyBlockReader.java similarity index 98% rename from src/main/java/com/terraforged/mod/util/DummyBlockReader.java rename to src/main/java/com/terraforged/util/DummyBlockReader.java index 43c6d1e..8030e92 100644 --- a/src/main/java/com/terraforged/mod/util/DummyBlockReader.java +++ b/src/main/java/com/terraforged/util/DummyBlockReader.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util; +package com.terraforged.util; import com.terraforged.core.concurrent.ObjectPool; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/terraforged/mod/util/Environment.java b/src/main/java/com/terraforged/util/Environment.java similarity index 96% rename from src/main/java/com/terraforged/mod/util/Environment.java rename to src/main/java/com/terraforged/util/Environment.java index 5d57520..1639aa6 100644 --- a/src/main/java/com/terraforged/mod/util/Environment.java +++ b/src/main/java/com/terraforged/util/Environment.java @@ -23,9 +23,9 @@ * SOFTWARE. */ -package com.terraforged.mod.util; +package com.terraforged.util; -import com.terraforged.mod.Log; +import com.terraforged.Log; public class Environment { diff --git a/src/main/java/com/terraforged/mod/util/ListUtils.java b/src/main/java/com/terraforged/util/ListUtils.java similarity index 98% rename from src/main/java/com/terraforged/mod/util/ListUtils.java rename to src/main/java/com/terraforged/util/ListUtils.java index 608d5be..1be8e94 100644 --- a/src/main/java/com/terraforged/mod/util/ListUtils.java +++ b/src/main/java/com/terraforged/util/ListUtils.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util; +package com.terraforged.util; import me.dags.noise.util.NoiseUtil; diff --git a/src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java b/src/main/java/com/terraforged/util/NBTLeavesFixer.java similarity index 99% rename from src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java rename to src/main/java/com/terraforged/util/NBTLeavesFixer.java index 099b0b4..cd835ee 100644 --- a/src/main/java/com/terraforged/mod/util/NBTLeavesFixer.java +++ b/src/main/java/com/terraforged/util/NBTLeavesFixer.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.util; +package com.terraforged.util; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompressedStreamTools; diff --git a/src/main/java/com/terraforged/mod/util/RangeModifier.java b/src/main/java/com/terraforged/util/RangeModifier.java similarity index 95% rename from src/main/java/com/terraforged/mod/util/RangeModifier.java rename to src/main/java/com/terraforged/util/RangeModifier.java index afdaeed..3ad43c1 100644 --- a/src/main/java/com/terraforged/mod/util/RangeModifier.java +++ b/src/main/java/com/terraforged/util/RangeModifier.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.util; +package com.terraforged.util; public abstract class RangeModifier { diff --git a/src/main/java/com/terraforged/mod/util/annotation/Name.java b/src/main/java/com/terraforged/util/annotation/Name.java similarity index 96% rename from src/main/java/com/terraforged/mod/util/annotation/Name.java rename to src/main/java/com/terraforged/util/annotation/Name.java index 4809ef9..440e22e 100644 --- a/src/main/java/com/terraforged/mod/util/annotation/Name.java +++ b/src/main/java/com/terraforged/util/annotation/Name.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util.annotation; +package com.terraforged.util.annotation; public @interface Name { diff --git a/src/main/java/com/terraforged/mod/util/annotation/Ref.java b/src/main/java/com/terraforged/util/annotation/Ref.java similarity index 96% rename from src/main/java/com/terraforged/mod/util/annotation/Ref.java rename to src/main/java/com/terraforged/util/annotation/Ref.java index b63e01b..98cdf18 100644 --- a/src/main/java/com/terraforged/mod/util/annotation/Ref.java +++ b/src/main/java/com/terraforged/util/annotation/Ref.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util.annotation; +package com.terraforged.util.annotation; public @interface Ref { diff --git a/src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java b/src/main/java/com/terraforged/util/nbt/NBTHelper.java similarity index 99% rename from src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java rename to src/main/java/com/terraforged/util/nbt/NBTHelper.java index 536261a..eedb099 100644 --- a/src/main/java/com/terraforged/mod/util/nbt/NBTHelper.java +++ b/src/main/java/com/terraforged/util/nbt/NBTHelper.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util.nbt; +package com.terraforged.util.nbt; import com.google.gson.JsonElement; import com.mojang.datafixers.Dynamic; diff --git a/src/main/java/com/terraforged/mod/util/nbt/NBTReader.java b/src/main/java/com/terraforged/util/nbt/NBTReader.java similarity index 98% rename from src/main/java/com/terraforged/mod/util/nbt/NBTReader.java rename to src/main/java/com/terraforged/util/nbt/NBTReader.java index e634bf1..018e99c 100644 --- a/src/main/java/com/terraforged/mod/util/nbt/NBTReader.java +++ b/src/main/java/com/terraforged/util/nbt/NBTReader.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util.nbt; +package com.terraforged.util.nbt; import com.terraforged.core.serialization.serializer.Reader; import net.minecraft.nbt.ByteNBT; diff --git a/src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java b/src/main/java/com/terraforged/util/nbt/NBTWriter.java similarity index 97% rename from src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java rename to src/main/java/com/terraforged/util/nbt/NBTWriter.java index 4e793f8..de0db15 100644 --- a/src/main/java/com/terraforged/mod/util/nbt/NBTWriter.java +++ b/src/main/java/com/terraforged/util/nbt/NBTWriter.java @@ -1,4 +1,4 @@ -package com.terraforged.mod.util.nbt; +package com.terraforged.util.nbt; import com.terraforged.core.serialization.serializer.AbstractWriter; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/terraforged/mod/util/setup/SetupDebug.java b/src/main/java/com/terraforged/util/setup/SetupDebug.java similarity index 96% rename from src/main/java/com/terraforged/mod/util/setup/SetupDebug.java rename to src/main/java/com/terraforged/util/setup/SetupDebug.java index f0b73da..65bb703 100644 --- a/src/main/java/com/terraforged/mod/util/setup/SetupDebug.java +++ b/src/main/java/com/terraforged/util/setup/SetupDebug.java @@ -23,10 +23,10 @@ * SOFTWARE. */ -package com.terraforged.mod.util.setup; +package com.terraforged.util.setup; import com.terraforged.api.event.SetupEvent; -import com.terraforged.mod.Log; +import com.terraforged.Log; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/terraforged/mod/util/setup/SetupHooks.java b/src/main/java/com/terraforged/util/setup/SetupHooks.java similarity index 96% rename from src/main/java/com/terraforged/mod/util/setup/SetupHooks.java rename to src/main/java/com/terraforged/util/setup/SetupHooks.java index e3b28f9..6431063 100644 --- a/src/main/java/com/terraforged/mod/util/setup/SetupHooks.java +++ b/src/main/java/com/terraforged/util/setup/SetupHooks.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package com.terraforged.mod.util.setup; +package com.terraforged.util.setup; import com.terraforged.api.biome.modifier.ModifierManager; import com.terraforged.api.chunk.column.ColumnDecorator; @@ -32,9 +32,9 @@ import com.terraforged.api.chunk.surface.SurfaceManager; import com.terraforged.api.event.SetupEvent; import com.terraforged.api.material.geology.GeologyManager; import com.terraforged.api.material.layer.LayerManager; +import com.terraforged.fm.modifier.FeatureModifiers; import com.terraforged.world.GeneratorContext; import com.terraforged.world.terrain.provider.TerrainProvider; -import com.terraforged.mod.feature.manager.modifier.FeatureModifiers; import net.minecraftforge.common.MinecraftForge; import java.util.List;