From 9c3b6ea8bdf2bed69690971e32566192c3e7bd69 Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 6 Jul 2021 21:31:34 -0700 Subject: [PATCH] compile biome pipeline addon --- .../dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java | 1 - .../terra/addons/biome/pipeline/StandardBiomeProvider.java | 3 +-- .../addons/biome/pipeline/config/BiomePipelineTemplate.java | 2 +- .../addons/biome/pipeline/config}/BiomeProviderTemplate.java | 2 +- .../addons/biome/pipeline/config/SourceBuilderLoader.java | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) rename common/{implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider => addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config}/BiomeProviderTemplate.java (90%) diff --git a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java index 921ac66b5..3608cb975 100644 --- a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java +++ b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineImpl.java @@ -1,6 +1,5 @@ package com.dfsek.terra.addons.biome.pipeline; -import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; diff --git a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/StandardBiomeProvider.java b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/StandardBiomeProvider.java index aae21832e..387f2917a 100644 --- a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/StandardBiomeProvider.java +++ b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/StandardBiomeProvider.java @@ -1,12 +1,11 @@ package com.dfsek.terra.addons.biome.pipeline; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; -import com.dfsek.terra.api.world.biome.pipeline.BiomePipelineImpl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; 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/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java index da5a5b358..dca3f0c80 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/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java @@ -3,11 +3,11 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.addons.biome.pipeline.BiomePipelineImpl; +import com.dfsek.terra.addons.biome.pipeline.StandardBiomeProvider; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.seeded.SourceSeeded; import com.dfsek.terra.addons.biome.pipeline.StageSeeded; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.api.world.biome.provider.StandardBiomeProvider; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java similarity index 90% rename from common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java rename to common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java index 8befb69b7..e263bb0ff 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java +++ b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.config.loaders.config.biome.templates.provider; +package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; diff --git a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java index fffc5d46c..8b79abd8b 100644 --- a/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java +++ b/common/addons/biome/provider/pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java @@ -5,7 +5,6 @@ import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.util.seeded.SourceSeeded; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; -import com.dfsek.terra.config.loaders.config.biome.templates.source.NoiseSourceTemplate; import java.lang.reflect.Type; import java.util.Map;