From 6cdef5d4ad2c03c3277e90512a60a59fffc19ad7 Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 16 Nov 2022 14:09:04 +1100 Subject: [PATCH] Move pipeline reimplementation to separate addon --- .../LICENSE | 0 .../biome-provider-pipeline-2/README.md | 12 +++++++++ .../build.gradle.kts | 2 +- .../pipeline/v2}/BiomePipelineAddon.java | 26 +++++++++---------- .../pipeline/v2}/BiomePipelineColumn.java | 2 +- .../pipeline/v2}/PipelineBiomeProvider.java | 12 ++++----- .../biome/pipeline/v2/api/BiomeChunk.java | 10 +++++++ .../biome/pipeline/v2}/api/Expander.java | 6 ++--- .../biome/pipeline/v2}/api/Pipeline.java | 2 +- .../biome/pipeline/v2}/api/SeededVector.java | 2 +- .../addons/biome/pipeline/v2/api/Source.java | 11 ++++++++ .../addons/biome/pipeline/v2}/api/Stage.java | 6 ++--- .../v2}/api/biome/DelegatedPipelineBiome.java | 2 +- .../pipeline/v2}/api/biome/PipelineBiome.java | 2 +- .../api/biome/PlaceholderPipelineBiome.java | 2 +- .../v2}/api/biome/SelfPipelineBiome.java | 2 +- .../v2}/config/BiomePipelineTemplate.java | 10 +++---- .../v2}/config/PipelineBiomeLoader.java | 4 +-- .../config/source/SamplerSourceTemplate.java | 8 +++--- .../v2}/config/source/SourceTemplate.java | 4 +-- .../v2}/config/stage/StageTemplate.java | 4 +-- .../stage/expander/ExpanderStageTemplate.java | 8 +++--- .../mutator/BorderListStageTemplate.java | 10 +++---- .../stage/mutator/BorderStageTemplate.java | 10 +++---- .../mutator/ReplaceListStageTemplate.java | 10 +++---- .../stage/mutator/ReplaceStageTemplate.java | 10 +++---- .../stage/mutator/SmoothStageTemplate.java | 8 +++--- .../pipeline/v2}/pipeline/BiomeChunkImpl.java | 13 +++++----- .../pipeline/v2}/pipeline/PipelineImpl.java | 14 +++++----- .../pipeline/v2}/source/SamplerSource.java | 6 ++--- .../pipeline/v2}/source/SingleSource.java | 6 ++--- .../v2}/stage/expander/FractalExpander.java | 10 +++---- .../v2}/stage/mutators/BorderListStage.java | 10 +++---- .../v2}/stage/mutators/BorderStage.java | 10 +++---- .../v2}/stage/mutators/ReplaceListStage.java | 10 +++---- .../v2}/stage/mutators/ReplaceStage.java | 10 +++---- .../v2}/stage/mutators/SmoothStage.java | 10 +++---- .../src/main/resources/terra.addon.yml | 4 +-- .../addons/biome-provider-pipeline/README.md | 7 ----- .../addons/biome/pipeline/api/BiomeChunk.java | 10 ------- .../addons/biome/pipeline/api/Source.java | 11 -------- 41 files changed, 160 insertions(+), 156 deletions(-) rename common/addons/{biome-provider-pipeline => biome-provider-pipeline-2}/LICENSE (100%) create mode 100644 common/addons/biome-provider-pipeline-2/README.md rename common/addons/{biome-provider-pipeline => biome-provider-pipeline-2}/build.gradle.kts (93%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/BiomePipelineAddon.java (77%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/BiomePipelineColumn.java (96%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/PipelineBiomeProvider.java (91%) create mode 100644 common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/BiomeChunk.java rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/Expander.java (74%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/Pipeline.java (79%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/SeededVector.java (89%) create mode 100644 common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Source.java rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/Stage.java (52%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/biome/DelegatedPipelineBiome.java (92%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/biome/PipelineBiome.java (92%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/biome/PlaceholderPipelineBiome.java (94%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/api/biome/SelfPipelineBiome.java (92%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/BiomePipelineTemplate.java (86%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/PipelineBiomeLoader.java (89%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/source/SamplerSourceTemplate.java (77%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/source/SourceTemplate.java (74%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/StageTemplate.java (85%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/expander/ExpanderStageTemplate.java (56%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/mutator/BorderListStageTemplate.java (73%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/mutator/BorderStageTemplate.java (68%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/mutator/ReplaceListStageTemplate.java (72%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/mutator/ReplaceStageTemplate.java (66%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/config/stage/mutator/SmoothStageTemplate.java (56%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/pipeline/BiomeChunkImpl.java (95%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/pipeline/PipelineImpl.java (85%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/source/SamplerSource.java (78%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/source/SingleSource.java (70%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/expander/FractalExpander.java (77%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/mutators/BorderListStage.java (90%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/mutators/BorderStage.java (88%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/mutators/ReplaceListStage.java (88%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/mutators/ReplaceStage.java (84%) rename common/addons/{biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline => biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2}/stage/mutators/SmoothStage.java (80%) rename common/addons/{biome-provider-pipeline => biome-provider-pipeline-2}/src/main/resources/terra.addon.yml (72%) delete mode 100644 common/addons/biome-provider-pipeline/README.md delete mode 100644 common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeChunk.java delete mode 100644 common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Source.java diff --git a/common/addons/biome-provider-pipeline/LICENSE b/common/addons/biome-provider-pipeline-2/LICENSE similarity index 100% rename from common/addons/biome-provider-pipeline/LICENSE rename to common/addons/biome-provider-pipeline-2/LICENSE diff --git a/common/addons/biome-provider-pipeline-2/README.md b/common/addons/biome-provider-pipeline-2/README.md new file mode 100644 index 000000000..d1d216dfd --- /dev/null +++ b/common/addons/biome-provider-pipeline-2/README.md @@ -0,0 +1,12 @@ +# biome-provider-pipeline-2 + +The second version of the Biome Pipeline, a procedural biome provider that uses a series +of "stages" to apply "mutations" to a 2D grid of biomes. + +Version 2 is a re-implementation of the original addon with the primary goal of providing +consistent scaling for noise relative to the world +(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been +included as a separate addon to maintain parity with packs utilizing the first version. + +This addon registers the `PIPELINE` biome provider type, and all associated +configurations. \ No newline at end of file diff --git a/common/addons/biome-provider-pipeline/build.gradle.kts b/common/addons/biome-provider-pipeline-2/build.gradle.kts similarity index 93% rename from common/addons/biome-provider-pipeline/build.gradle.kts rename to common/addons/biome-provider-pipeline-2/build.gradle.kts index 2629ac476..8ca2e3b81 100644 --- a/common/addons/biome-provider-pipeline/build.gradle.kts +++ b/common/addons/biome-provider-pipeline-2/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.0.1") +version = version("1.0.0") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java similarity index 77% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java index 3468e168c..66c1a7908 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java @@ -5,24 +5,24 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline; +package com.dfsek.terra.addons.biome.pipeline.v2; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.function.Supplier; -import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.PipelineBiomeLoader; -import com.dfsek.terra.addons.biome.pipeline.config.source.SamplerSourceTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothStageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Source; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader; +import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander.ExpanderStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderListStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineColumn.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineColumn.java similarity index 96% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineColumn.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineColumn.java index f94493489..9b3e1391a 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineColumn.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineColumn.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline; +package com.dfsek.terra.addons.biome.pipeline.v2; import java.util.function.Consumer; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java similarity index 91% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java index 86a74051b..9748741a8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java @@ -1,5 +1,10 @@ -package com.dfsek.terra.addons.biome.pipeline; +package com.dfsek.terra.addons.biome.pipeline.v2; +import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline; +import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import net.jafama.FastMath; @@ -9,11 +14,6 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.StreamSupport; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk; -import com.dfsek.terra.addons.biome.pipeline.api.Pipeline; -import com.dfsek.terra.addons.biome.pipeline.api.SeededVector; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.registry.key.StringIdentifiable; import com.dfsek.terra.api.util.Column; diff --git a/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/BiomeChunk.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/BiomeChunk.java new file mode 100644 index 000000000..818652f59 --- /dev/null +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/BiomeChunk.java @@ -0,0 +1,10 @@ +package com.dfsek.terra.addons.biome.pipeline.v2.api; + + +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; + + +public interface BiomeChunk { + + PipelineBiome get(int xInChunk, int zInChunk); +} diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Expander.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Expander.java similarity index 74% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Expander.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Expander.java index 3e8b9e42d..177e74694 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Expander.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Expander.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.addons.biome.pipeline.api; +package com.dfsek.terra.addons.biome.pipeline.v2.api; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; /** diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java similarity index 79% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java index cb52328ce..cfb9ee9a8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api; +package com.dfsek.terra.addons.biome.pipeline.v2.api; import java.util.List; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/SeededVector.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java similarity index 89% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/SeededVector.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java index 951b7e592..6581ca50c 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/SeededVector.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api; +package com.dfsek.terra.addons.biome.pipeline.v2.api; public record SeededVector(long seed, int x, int z) { diff --git a/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Source.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Source.java new file mode 100644 index 000000000..bfb135653 --- /dev/null +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Source.java @@ -0,0 +1,11 @@ +package com.dfsek.terra.addons.biome.pipeline.v2.api; + + +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; + + +public interface Source { + PipelineBiome get(long seed, int x, int z); + + Iterable getBiomes(); +} \ No newline at end of file diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Stage.java similarity index 52% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Stage.java index 4611968c3..ee2c75e89 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Stage.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.addons.biome.pipeline.api; +package com.dfsek.terra.addons.biome.pipeline.v2.api; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; public interface Stage { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/DelegatedPipelineBiome.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/DelegatedPipelineBiome.java similarity index 92% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/DelegatedPipelineBiome.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/DelegatedPipelineBiome.java index 70c94b58e..978e68b06 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/DelegatedPipelineBiome.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/DelegatedPipelineBiome.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api.biome; +package com.dfsek.terra.addons.biome.pipeline.v2.api.biome; import java.util.Set; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PipelineBiome.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PipelineBiome.java similarity index 92% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PipelineBiome.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PipelineBiome.java index df9cb4fc0..ccde84022 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PipelineBiome.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PipelineBiome.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api.biome; +package com.dfsek.terra.addons.biome.pipeline.v2.api.biome; import java.util.Set; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PlaceholderPipelineBiome.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PlaceholderPipelineBiome.java similarity index 94% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PlaceholderPipelineBiome.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PlaceholderPipelineBiome.java index 6ea7659be..87bd67120 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/PlaceholderPipelineBiome.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/PlaceholderPipelineBiome.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api.biome; +package com.dfsek.terra.addons.biome.pipeline.v2.api.biome; import java.util.HashSet; import java.util.Set; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/SelfPipelineBiome.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/SelfPipelineBiome.java similarity index 92% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/SelfPipelineBiome.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/SelfPipelineBiome.java index 53cf59c71..80583c1cb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/SelfPipelineBiome.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/biome/SelfPipelineBiome.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.api.biome; +package com.dfsek.terra.addons.biome.pipeline.v2.api.biome; import java.util.Collections; import java.util.Set; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java similarity index 86% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java index b88b75a7c..52ee4292d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config; +package com.dfsek.terra.addons.biome.pipeline.v2.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Description; @@ -14,10 +14,10 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.List; -import com.dfsek.terra.addons.biome.pipeline.PipelineBiomeProvider; -import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl; -import com.dfsek.terra.addons.biome.pipeline.api.Source; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/PipelineBiomeLoader.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/PipelineBiomeLoader.java similarity index 89% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/PipelineBiomeLoader.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/PipelineBiomeLoader.java index 799a7a0b1..5e7a08578 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/PipelineBiomeLoader.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/PipelineBiomeLoader.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.biome.pipeline.config; +package com.dfsek.terra.addons.biome.pipeline.v2.config; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.world.biome.Biome; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java similarity index 77% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java index a054976d7..dbfb1ef31 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java @@ -5,14 +5,14 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.source; +package com.dfsek.terra.addons.biome.pipeline.v2.config.source; import com.dfsek.tectonic.api.config.template.annotations.Description; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.api.Source; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.source.SamplerSource; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SourceTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java similarity index 74% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SourceTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java index a8e88a8ab..ba61f8940 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SourceTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java @@ -5,11 +5,11 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.source; +package com.dfsek.terra.addons.biome.pipeline.v2.config.source; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; public abstract class SourceTemplate implements ObjectTemplate { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java similarity index 85% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java index afed0c15e..c1cea771e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java @@ -5,13 +5,13 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage; import com.dfsek.tectonic.api.config.template.annotations.Description; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java similarity index 56% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java index a8fce25be..312880d3b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java @@ -5,11 +5,11 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.expander; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Expander; -import com.dfsek.terra.addons.biome.pipeline.stage.expander.FractalExpander; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander; public class ExpanderStageTemplate extends StageTemplate { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java similarity index 73% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java index fb415260d..57d5c7deb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java @@ -5,16 +5,16 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator; import com.dfsek.tectonic.api.config.template.annotations.Value; import java.util.Map; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderListStage; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java similarity index 68% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java index 5327c211c..605eeb9f4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java @@ -5,14 +5,14 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderStage; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java similarity index 72% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java index a6710286f..be9ade61c 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java @@ -5,16 +5,16 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator; import com.dfsek.tectonic.api.config.template.annotations.Value; import java.util.Map; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceListStage; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java similarity index 66% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java index 5a799eeb4..6f273a294 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java @@ -5,14 +5,14 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceStage; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothStageTemplate.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java similarity index 56% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothStageTemplate.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java index 50a7aa5b9..a13e441af 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothStageTemplate.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java @@ -5,11 +5,11 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; +package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator; -import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.stage.mutators.SmoothStage; +import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage; public class SmoothStageTemplate extends StageTemplate { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/BiomeChunkImpl.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java similarity index 95% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/BiomeChunkImpl.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java index b5f5b770f..cf739fa77 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/BiomeChunkImpl.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java @@ -1,15 +1,14 @@ -package com.dfsek.terra.addons.biome.pipeline.pipeline; +package com.dfsek.terra.addons.biome.pipeline.v2.pipeline; +import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; +import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import net.jafama.FastMath; import java.util.List; -import com.dfsek.terra.addons.biome.pipeline.api.SeededVector; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk; -import com.dfsek.terra.addons.biome.pipeline.api.Expander; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; - public class BiomeChunkImpl implements BiomeChunk { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java similarity index 85% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java index 9805c7b40..a01091d2e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java @@ -1,16 +1,16 @@ -package com.dfsek.terra.addons.biome.pipeline.pipeline; +package com.dfsek.terra.addons.biome.pipeline.v2.pipeline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk; -import com.dfsek.terra.addons.biome.pipeline.api.Expander; -import com.dfsek.terra.addons.biome.pipeline.api.Pipeline; -import com.dfsek.terra.addons.biome.pipeline.api.SeededVector; -import com.dfsek.terra.addons.biome.pipeline.api.Source; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline; +import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; public class PipelineImpl implements Pipeline { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SamplerSource.java similarity index 78% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SamplerSource.java index eca41806b..f6d66b9e2 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SamplerSource.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.addons.biome.pipeline.source; +package com.dfsek.terra.addons.biome.pipeline.v2.source; -import com.dfsek.terra.addons.biome.pipeline.api.Source; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SingleSource.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SingleSource.java similarity index 70% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SingleSource.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SingleSource.java index 6dcab0d3c..b2c0ee8db 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SingleSource.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SingleSource.java @@ -1,10 +1,10 @@ -package com.dfsek.terra.addons.biome.pipeline.source; +package com.dfsek.terra.addons.biome.pipeline.v2.source; import java.util.Collections; import java.util.Set; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.terra.addons.biome.pipeline.api.Source; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; public class SingleSource implements Source { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/expander/FractalExpander.java similarity index 77% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/expander/FractalExpander.java index 5c94b8943..c82743ba4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/expander/FractalExpander.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.addons.biome.pipeline.stage.expander; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.expander; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Expander; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; @@ -15,7 +15,7 @@ public class FractalExpander implements Expander { } @Override - public PipelineBiome fillBiome(ViewPoint viewPoint) { + public PipelineBiome fillBiome(BiomeChunkImpl.ViewPoint viewPoint) { int xMod2 = viewPoint.gridX() % 2; int zMod2 = viewPoint.gridZ() % 2; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java similarity index 90% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java index b814806d6..2587bc792 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators; import java.util.ArrayList; import java.util.HashSet; @@ -14,9 +14,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.vector.Vector2Int; @@ -60,7 +60,7 @@ public class BorderListStage implements Stage { } @Override - public PipelineBiome apply(ViewPoint viewPoint) { + public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) { PipelineBiome center = viewPoint.getBiome(); if(center.getTags().contains(defaultReplace)) { for(Vector2Int point : borderPoints) { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java similarity index 88% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java index 08e6bb366..274ef1ff9 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators; import java.util.ArrayList; import java.util.HashSet; @@ -13,9 +13,9 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.vector.Vector2Int; @@ -44,7 +44,7 @@ public class BorderStage implements Stage { } @Override - public PipelineBiome apply(ViewPoint viewPoint) { + public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) { PipelineBiome center = viewPoint.getBiome(); if(center.getTags().contains(replaceTag)) { for(Vector2Int point : borderPoints) { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java similarity index 88% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java index 79b2c585c..372127546 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java @@ -5,16 +5,16 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.stream.Stream; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; @@ -34,7 +34,7 @@ public class ReplaceListStage implements Stage { } @Override - public PipelineBiome apply(ViewPoint viewPoint) { + public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) { PipelineBiome center = viewPoint.getBiome(); if(replace.containsKey(center)) { PipelineBiome biome = replace.get(center).get(sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed()); diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java similarity index 84% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java index df1c3be1e..b7a2fd684 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java @@ -5,15 +5,15 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators; import java.util.HashSet; import java.util.Set; import java.util.stream.Stream; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; @@ -30,7 +30,7 @@ public class ReplaceStage implements Stage { } @Override - public PipelineBiome apply(ViewPoint viewPoint) { + public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) { if(viewPoint.getBiome().getTags().contains(replaceableTag)) { PipelineBiome biome = replace.get(sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed()); return biome.isSelf() ? viewPoint.getBiome() : biome; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java similarity index 80% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java rename to common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java index 2129ab2fc..92bbee433 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java +++ b/common/addons/biome-provider-pipeline-2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java @@ -5,13 +5,13 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators; import java.util.Objects; -import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint; -import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl; import com.dfsek.terra.api.noise.NoiseSampler; @@ -24,7 +24,7 @@ public class SmoothStage implements Stage { } @Override - public PipelineBiome apply(ViewPoint viewPoint) { + public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) { PipelineBiome top = viewPoint.getRelativeBiome(1, 0); PipelineBiome bottom = viewPoint.getRelativeBiome(-1, 0); PipelineBiome left = viewPoint.getRelativeBiome(0, 1); diff --git a/common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml b/common/addons/biome-provider-pipeline-2/src/main/resources/terra.addon.yml similarity index 72% rename from common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml rename to common/addons/biome-provider-pipeline-2/src/main/resources/terra.addon.yml index abd2555a5..fbb711152 100644 --- a/common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml +++ b/common/addons/biome-provider-pipeline-2/src/main/resources/terra.addon.yml @@ -1,10 +1,10 @@ schema-version: 1 contributors: - Terra contributors -id: biome-provider-pipeline +id: biome-provider-pipeline-2 version: @VERSION@ entrypoints: - - "com.dfsek.terra.addons.biome.pipeline.BiomePipelineAddon" + - "com.dfsek.terra.addons.biome.pipeline.v2.BiomePipelineAddon" website: issues: https://github.com/PolyhedralDev/Terra/issues source: https://github.com/PolyhedralDev/Terra diff --git a/common/addons/biome-provider-pipeline/README.md b/common/addons/biome-provider-pipeline/README.md deleted file mode 100644 index 9e55109a7..000000000 --- a/common/addons/biome-provider-pipeline/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# biome-provider-pipeline - -Implements the Biome Pipeline, a procedural biome provider that uses a series -of "stages" to apply "mutations" to a 2D grid of biomes. - -This addon registers the `PIPELINE` biome provider type, and all associated -configurations. \ No newline at end of file diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeChunk.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeChunk.java deleted file mode 100644 index 4b7d60ae2..000000000 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeChunk.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dfsek.terra.addons.biome.pipeline.api; - - -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; - - -public interface BiomeChunk { - - PipelineBiome get(int xInChunk, int zInChunk); -} diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Source.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Source.java deleted file mode 100644 index 185463786..000000000 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Source.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dfsek.terra.addons.biome.pipeline.api; - - -import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; - - -public interface Source { - PipelineBiome get(long seed, int x, int z); - - Iterable getBiomes(); -} \ No newline at end of file