split flora addon into separate config and generation addons

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.flora;
 
 import com.dfsek.terra.addons.flora.config.BlockLayerTemplate;
-import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
@@ -9,12 +8,9 @@ import com.dfsek.terra.api.addon.annotations.Addon;
 import com.dfsek.terra.api.addon.annotations.Author;
 import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.EventListener;
-import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
-import com.dfsek.terra.api.util.seeded.BiomeBuilder;
-import com.dfsek.terra.api.world.generator.GenerationStageProvider;
 
 @Addon("config-flora")
 @Author("Terra")
@@ -30,14 +26,6 @@ public class FloraAddon extends TerraAddon implements EventListener {
 
     public void onPackLoad(ConfigPackPreLoadEvent event) throws DuplicateEntryException {
         event.getPack().registerConfigType(new FloraConfigType(event.getPack()), "FLORA", 2);
-        event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("FLORA", pack -> new FloraPopulator(main));
+        event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new);
-        event.getPack().applyLoader(FloraLayer.class, FloraLayerLoader::new)
-                .applyLoader(BlockLayer.class, BlockLayerTemplate::new);
-    }
-
-    public void onBiomeLoad(ConfigurationLoadEvent event) {
-        if(BiomeBuilder.class.isAssignableFrom(event.getType().getTypeClass())) {
-            event.getLoadedObject(BiomeBuilder.class).getContext().put(event.load(new BiomeFloraTemplate()).get());
-        }
     }
 }

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.addons.flora;
 
-import com.dfsek.terra.addons.flora.flora.TerraFlora;
+import com.dfsek.terra.addons.flora.flora.gen.TerraFlora;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.world.Flora;

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.addons.flora;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Final;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.flora.flora.TerraFlora;
 import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
+import com.dfsek.terra.addons.flora.flora.gen.TerraFlora;
 import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.flora.flora;
+package com.dfsek.terra.addons.flora.flora.gen;
 
 import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
 import com.dfsek.terra.api.TerraPlugin;

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFlora.java

@@ -1,6 +1,5 @@
-package com.dfsek.terra.addons.flora;
+package com.dfsek.terra.addons.generation.flora;
 
-import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.api.properties.Properties;
 
 import java.util.List;

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/BiomeFloraTemplate.java

@@ -1,10 +1,8 @@
-package com.dfsek.terra.addons.flora;
+package com.dfsek.terra.addons.generation.flora;
 
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.flora.flora.FloraLayer;
 
 import java.util.Collections;
 import java.util.List;

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraGenerationAddon.java

@@ -6,7 +6,11 @@ import com.dfsek.terra.api.addon.annotations.Addon;
 import com.dfsek.terra.api.addon.annotations.Author;
 import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.event.EventListener;
+import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.util.seeded.BiomeBuilder;
+import com.dfsek.terra.api.world.generator.GenerationStageProvider;
 
 @Addon("generation-stage-flora")
 @Version("1.0.0")
@@ -20,4 +24,15 @@ public class FloraGenerationAddon extends TerraAddon implements EventListener {
     public void initialize() {
         main.getEventManager().registerListener(this, this);
     }
+
+    public void onPackLoad(ConfigPackPreLoadEvent event) {
+        event.getPack().applyLoader(FloraLayer.class, FloraLayerLoader::new);
+        event.getPack().getOrCreateRegistry(GenerationStageProvider.class).register("FLORA", pack -> new FloraPopulator(main));
+    }
+
+    public void onBiomeLoad(ConfigurationLoadEvent event) {
+        if(BiomeBuilder.class.isAssignableFrom(event.getType().getTypeClass())) {
+            event.getLoadedObject(BiomeBuilder.class).getContext().put(event.load(new BiomeFloraTemplate()).get());
+        }
+    }
 }

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraLayer.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.flora.flora;
+package com.dfsek.terra.addons.generation.flora;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.Range;

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraLayerLoader.java

@@ -1,8 +1,7 @@
-package com.dfsek.terra.addons.flora;
+package com.dfsek.terra.addons.generation.flora;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;

common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraPopulator.java

@@ -1,6 +1,5 @@
-package com.dfsek.terra.addons.flora;
+package com.dfsek.terra.addons.generation.flora;
 
-import com.dfsek.terra.addons.flora.flora.FloraLayer;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.api.util.PopulationUtil;
@@ -8,7 +7,6 @@ import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.TerraGenerationStage;
 import org.jetbrains.annotations.NotNull;