diff --git a/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java index a4a6bff77..fdb009286 100644 --- a/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -22,12 +22,12 @@ import com.dfsek.terra.config.loaders.config.GridSpawnLoader; import com.dfsek.terra.config.loaders.config.OreConfigLoader; import com.dfsek.terra.config.loaders.config.OreHolderLoader; import com.dfsek.terra.config.loaders.config.TreeLayerLoader; -import com.dfsek.terra.config.loaders.config.biome.templates.ExpanderStageTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.BorderListMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.BorderMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.ReplaceListMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.ReplaceMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.SmoothMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.expander.ExpanderStageTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.BorderListMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.BorderMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.ReplaceListMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.ReplaceMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.SmoothMutatorTemplate; import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader; import com.dfsek.terra.config.loaders.config.sampler.templates.DomainWarpTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/StageBuilderLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/StageBuilderLoader.java index b9e6e4010..6cfd489ac 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/StageBuilderLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/StageBuilderLoader.java @@ -7,12 +7,12 @@ import com.dfsek.terra.api.util.seeded.SeededBuilder; import com.dfsek.terra.biome.pipeline.stages.ExpanderStage; import com.dfsek.terra.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.biome.pipeline.stages.Stage; -import com.dfsek.terra.config.loaders.config.biome.templates.ExpanderStageTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.BorderListMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.BorderMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.ReplaceListMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.ReplaceMutatorTemplate; -import com.dfsek.terra.config.loaders.config.biome.templates.mutator.SmoothMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.expander.ExpanderStageTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.BorderListMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.BorderMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.ReplaceListMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.ReplaceMutatorTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.SmoothMutatorTemplate; import java.lang.reflect.Type; import java.util.Map; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/StageTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/StageTemplate.java similarity index 88% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/StageTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/StageTemplate.java index 310e3cec4..24103b9d0 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/StageTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/StageTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates; +package com.dfsek.terra.config.loaders.config.biome.templates.stage; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/ExpanderStageTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java similarity index 69% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/ExpanderStageTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java index 0253ee893..0d25cdbc0 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/ExpanderStageTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java @@ -1,8 +1,9 @@ -package com.dfsek.terra.config.loaders.config.biome.templates; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.expander; import com.dfsek.terra.biome.pipeline.expand.FractalExpander; import com.dfsek.terra.biome.pipeline.stages.ExpanderStage; import com.dfsek.terra.biome.pipeline.stages.Stage; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate; public class ExpanderStageTemplate extends StageTemplate { @Override diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderListMutatorTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java similarity index 91% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderListMutatorTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java index a43653f52..3a10d7b47 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderListMutatorTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.math.ProbabilityCollection; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderMutatorTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java similarity index 89% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderMutatorTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java index 45d23e6a6..094c68dd6 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/BorderMutatorTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.math.ProbabilityCollection; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/MutatorStageTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java similarity index 71% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/MutatorStageTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java index 3f1d1cdb3..47ea30afd 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/MutatorStageTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.terra.biome.pipeline.mutator.BiomeMutator; import com.dfsek.terra.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.biome.pipeline.stages.Stage; -import com.dfsek.terra.config.loaders.config.biome.templates.StageTemplate; +import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate; public abstract class MutatorStageTemplate extends StageTemplate { public abstract BiomeMutator build(long seed); diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceListMutatorTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java similarity index 91% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceListMutatorTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java index 643667b66..9ac41f078 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceListMutatorTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.math.ProbabilityCollection; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceMutatorTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java similarity index 88% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceMutatorTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java index 688d6627a..9239d4ddd 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/ReplaceMutatorTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.math.ProbabilityCollection; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/SmoothMutatorTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/SmoothMutatorTemplate.java similarity index 79% rename from common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/SmoothMutatorTemplate.java rename to common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/SmoothMutatorTemplate.java index e74080bff..c01d2dbd1 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/mutator/SmoothMutatorTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/SmoothMutatorTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.mutator; +package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.terra.biome.pipeline.mutator.BiomeMutator; import com.dfsek.terra.biome.pipeline.mutator.SmoothMutator;