mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-08-29 05:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor flora stuff

Browse Source
This commit is contained in:
dfsek
2021-07-02 09:36:24 -07:00
parent 62520af8e7
commit 6755054c97
8 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/biome/config/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.carving.UserDefinedCarver;
import com.dfsek.terra.world.population.items.TerraStructure; 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.ores.OreHolder;
import com.dfsek.terra.world.population.items.tree.TreeLayer; import com.dfsek.terra.world.population.items.tree.TreeLayer;
common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java
+2 -3
View File
@@ -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.TerraPlugin;
import com.dfsek.terra.api.config.ConfigFactory; 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.NoisePalette;
import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.api.world.palette.PaletteImpl;
import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; 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.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<FloraTemplate, Flora> { public class FloraFactory implements ConfigFactory<FloraTemplate, Flora> {
@Override @Override
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraLayerLoader.java
+2 -2
View File
@@ -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.ConfigException;
import com.dfsek.tectonic.exception.LoadException; 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.api.world.Flora;
import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.config.loaders.Types;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; 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.lang.reflect.Type;
import java.util.Map; import java.util.Map;
common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraPopulator.java
+2 -2
View File
@@ -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.TerraPlugin;
import com.dfsek.terra.api.profiler.ProfileFrame; 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.UserDefinedBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.TerraBlockPopulator; 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 org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.HashMap;
common/implementation/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java
+2 -2
View File
@@ -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.Abstractable;
import com.dfsek.tectonic.annotations.Default; 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.config.AbstractableTemplate;
import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.api.util.collections.MaterialSet;
import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; 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; import java.util.List;
common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/FloraLayer.java
+1 -1
View File
@@ -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.noise.NoiseSampler;
import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.ProbabilityCollection;
common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java → common/addons/flora/src/main/java/com/dfsek/terra/addons/flora/flora/TerraFlora.java
+1 -1
View File
@@ -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.TerraPlugin;
import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.BlockState;
common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
+2 -2
View File
@@ -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.PaletteHolderLoader;
import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader; import com.dfsek.terra.config.loaders.palette.PaletteLayerLoader;
import com.dfsek.terra.config.loaders.palette.slant.SlantHolderLoader; import com.dfsek.terra.config.loaders.palette.slant.SlantHolderLoader;
import com.dfsek.terra.world.population.items.flora.FloraLayer; import com.dfsek.terra.addons.flora.flora.FloraLayer;
import com.dfsek.terra.world.population.items.flora.TerraFlora; 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.OreConfig;
import com.dfsek.terra.world.population.items.ores.OreHolder; import com.dfsek.terra.world.population.items.ores.OreHolder;
import com.dfsek.terra.world.population.items.tree.TreeLayer; import com.dfsek.terra.world.population.items.tree.TreeLayer;