From 6755054c97182154a54bd2edc39c4c9a0daee7fb Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 2 Jul 2021 09:36:24 -0700 Subject: [PATCH] refactor flora stuff --- .../java/com/dfsek/terra/addons/biome/BiomeTemplate.java | 2 +- .../java/com/dfsek/terra/addons/flora}/FloraFactory.java | 5 ++--- .../java/com/dfsek/terra/addons/flora}/FloraLayerLoader.java | 4 ++-- .../java/com/dfsek/terra/addons/flora}/FloraPopulator.java | 4 ++-- .../java/com/dfsek/terra/addons/flora}/FloraTemplate.java | 4 ++-- .../java/com/dfsek/terra/addons/flora}/flora/FloraLayer.java | 2 +- .../java/com/dfsek/terra/addons/flora}/flora/TerraFlora.java | 2 +- .../src/main/java/com/dfsek/terra/config/GenericLoaders.java | 4 ++-- 8 files changed, 13 insertions(+), 14 deletions(-) rename common/{implementation/src/main/java/com/dfsek/terra/config/factories => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/FloraFactory.java (86%) rename common/{implementation/src/main/java/com/dfsek/terra/config/loaders/config => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/FloraLayerLoader.java (93%) rename common/{implementation/src/main/java/com/dfsek/terra/world/population => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/FloraPopulator.java (95%) rename common/{implementation/src/main/java/com/dfsek/terra/config/templates => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/FloraTemplate.java (95%) rename common/{implementation/src/main/java/com/dfsek/terra/world/population/items => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/flora/FloraLayer.java (94%) rename common/{implementation/src/main/java/com/dfsek/terra/world/population/items => addons/flora/src/main/java/com/dfsek/terra/addons/flora}/flora/TerraFlora.java (99%) diff --git a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java index e4a08b528..5c41b42b3 100644 --- a/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java +++ b/common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java @@ -23,7 +23,7 @@ import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.world.population.items.TerraStructure; -import com.dfsek.terra.world.population.items.flora.FloraLayer; +import com.dfsek.terra.addons.flora.flora.FloraLayer; import com.dfsek.terra.world.population.items.ores.OreHolder; import com.dfsek.terra.world.population.items.tree.TreeLayer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java similarity index 86% rename from common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java index 62460a8ef..def4be7be 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.factories; +package com.dfsek.terra.addons.flora; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.ConfigFactory; @@ -6,9 +6,8 @@ import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.palette.NoisePalette; import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; -import com.dfsek.terra.config.templates.FloraTemplate; import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.world.population.items.flora.TerraFlora; +import com.dfsek.terra.addons.flora.flora.TerraFlora; public class FloraFactory implements ConfigFactory { @Override diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraLayerLoader.java similarity index 93% rename from common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraLayerLoader.java index 0bf8dd5f7..768c7675b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraLayerLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config; +package com.dfsek.terra.addons.flora; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; @@ -10,7 +10,7 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.world.population.items.flora.FloraLayer; +import com.dfsek.terra.addons.flora.flora.FloraLayer; import java.lang.reflect.Type; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraPopulator.java similarity index 95% rename from common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraPopulator.java index 53635cedc..31ec4890a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraPopulator.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.world.population; +package com.dfsek.terra.addons.flora; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.profiler.ProfileFrame; @@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; -import com.dfsek.terra.world.population.items.flora.FloraLayer; +import com.dfsek.terra.addons.flora.flora.FloraLayer; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java similarity index 95% rename from common/implementation/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java index be5358206..c55550c51 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.templates; +package com.dfsek.terra.addons.flora; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; @@ -6,7 +6,7 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; -import com.dfsek.terra.world.population.items.flora.TerraFlora; +import com.dfsek.terra.addons.flora.flora.TerraFlora; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/FloraLayer.java similarity index 94% rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/FloraLayer.java index 942809705..69ab3462c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/FloraLayer.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.world.population.items.flora; +package com.dfsek.terra.addons.flora.flora; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/TerraFlora.java similarity index 99% rename from common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java rename to common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/TerraFlora.java index 6dcc68948..17730e452 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java +++ b/common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/TerraFlora.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.world.population.items.flora; +package com.dfsek.terra.addons.flora.flora; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java index d676ccc70..73bf11e4e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -44,8 +44,8 @@ import com.dfsek.terra.config.loaders.palette.CarverPaletteLoader; import com.dfsek.terra.config.loaders.palette.PaletteHolderLoader; import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader; import com.dfsek.terra.config.loaders.palette.slant.SlantHolderLoader; -import com.dfsek.terra.world.population.items.flora.FloraLayer; -import com.dfsek.terra.world.population.items.flora.TerraFlora; +import com.dfsek.terra.addons.flora.flora.FloraLayer; +import com.dfsek.terra.addons.flora.flora.TerraFlora; import com.dfsek.terra.world.population.items.ores.OreConfig; import com.dfsek.terra.world.population.items.ores.OreHolder; import com.dfsek.terra.world.population.items.tree.TreeLayer;