diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java index 75d84cad0..2d824596a 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.biome.image; +import com.dfsek.terra.api.world.biome.Biome; import net.jafama.FastMath; import java.awt.Color; @@ -15,17 +16,16 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class ImageBiomeProvider implements BiomeProvider { - private final Map colorBiomeMap = new HashMap<>(); + private final Map colorBiomeMap = new HashMap<>(); private final BufferedImage image; private final int resolution; private final Align align; - public ImageBiomeProvider(Set registry, BufferedImage image, int resolution, Align align) { + public ImageBiomeProvider(Set registry, BufferedImage image, int resolution, Align align) { this.image = image; this.resolution = resolution; this.align = align; @@ -37,7 +37,7 @@ public class ImageBiomeProvider implements BiomeProvider { } @Override - public TerraBiome getBiome(int x, int z, long seed) { + public Biome getBiome(int x, int z, long seed) { x /= resolution; z /= resolution; Color color = align.getColor(image, x, z); @@ -52,7 +52,7 @@ public class ImageBiomeProvider implements BiomeProvider { } @Override - public Iterable getBiomes() { + public Iterable getBiomes() { return colorBiomeMap.values(); } diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index 2e49633c6..f8e4056c5 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -19,7 +19,7 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -41,7 +41,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> providerRegistry = event.getPack().getOrCreateRegistry( PROVIDER_REGISTRY_KEY); - providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.class))); + providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class))); }) .failThrough(); } diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java index 3f7fa694b..816dfbc2c 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java @@ -15,13 +15,13 @@ import java.awt.image.BufferedImage; import java.util.HashSet; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @SuppressWarnings("FieldMayBeFinal") public class ImageProviderTemplate implements ObjectTemplate { - private final Registry biomes; + private final Registry biomes; @Value("resolution") @Default private int resolution = 1; @@ -30,7 +30,7 @@ public class ImageProviderTemplate implements ObjectTemplate { @Value("image.align") private ImageBiomeProvider.Align align; - public ImageProviderTemplate(Registry set) { + public ImageProviderTemplate(Registry set) { this.biomes = set; } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java index cfa1ad884..8b4f50015 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java @@ -12,24 +12,24 @@ import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.api.util.vector.Vector2; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class BiomeHolderImpl implements BiomeHolder { private final Vector2 origin; private final int width; private final int offset; - private TerraBiome[][] biomes; + private Biome[][] biomes; public BiomeHolderImpl(int width, Vector2 origin) { width += 4; this.width = width; - biomes = new TerraBiome[width][width]; + biomes = new Biome[width][width]; this.origin = origin; this.offset = 2; } - private BiomeHolderImpl(TerraBiome[][] biomes, Vector2 origin, int width, int offset) { + private BiomeHolderImpl(Biome[][] biomes, Vector2 origin, int width, int offset) { this.biomes = biomes; this.origin = origin; this.width = width; @@ -38,10 +38,10 @@ public class BiomeHolderImpl implements BiomeHolder { @Override public BiomeHolder expand(BiomeExpander expander, long seed) { - TerraBiome[][] old = biomes; + Biome[][] old = biomes; int newWidth = width * 2 - 1; - biomes = new TerraBiome[newWidth][newWidth]; + biomes = new Biome[newWidth][newWidth]; for(int x = 0; x < width; x++) { for(int z = 0; z < width; z++) { @@ -80,14 +80,14 @@ public class BiomeHolderImpl implements BiomeHolder { } @Override - public TerraBiome getBiome(int x, int z) { + public Biome getBiome(int x, int z) { x += offset; z += offset; return getBiomeRaw(x, z); } @Override - public TerraBiome getBiomeRaw(int x, int z) { + public Biome getBiomeRaw(int x, int z) { if(x >= width || z >= width || x < 0 || z < 0) return null; return biomes[x][z]; } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java index a76193358..93f2112d4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java @@ -9,6 +9,8 @@ package com.dfsek.terra.addons.biome.pipeline; import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.api.world.biome.Biome; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -18,7 +20,6 @@ import org.jetbrains.annotations.NotNull; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import java.util.HashSet; @@ -50,7 +51,7 @@ public class BiomePipelineProvider implements BiomeProvider { } @Override - public TerraBiome getBiome(int x, int z, long seed) { + public Biome getBiome(int x, int z, long seed) { x += mutator.noise(seed + 1, x, z) * noiseAmp; z += mutator.noise(seed + 2, x, z) * noiseAmp; @@ -66,10 +67,10 @@ public class BiomePipelineProvider implements BiomeProvider { } @Override - public Iterable getBiomes() { - Set biomeSet = new HashSet<>(); + public Iterable getBiomes() { + Set biomeSet = new HashSet<>(); pipeline.getSource().getBiomes().forEach(biomeSet::add); - Iterable result = biomeSet; + Iterable result = biomeSet; for(Stage stage : pipeline.getStages()) { result = stage.getBiomes(result); // pass through all stages } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java index ac2be431e..dbb784a3f 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java @@ -7,9 +7,9 @@ package com.dfsek.terra.addons.biome.pipeline.api; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface BiomeExpander { - TerraBiome getBetween(double x, double z, long seed, TerraBiome... others); + Biome getBetween(double x, double z, long seed, Biome... others); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java index d81e8f736..a15224db1 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java @@ -8,7 +8,7 @@ package com.dfsek.terra.addons.biome.pipeline.api; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface BiomeHolder { @@ -18,7 +18,7 @@ public interface BiomeHolder { void fill(BiomeSource source, long seed); - TerraBiome getBiome(int x, int z); + Biome getBiome(int x, int z); - TerraBiome getBiomeRaw(int x, int z); + Biome getBiomeRaw(int x, int z); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java index 9ad856e19..c9f6793f3 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java @@ -7,13 +7,13 @@ package com.dfsek.terra.addons.biome.pipeline.api; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface BiomeMutator { - TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed); + Biome mutate(ViewPoint viewPoint, double x, double z, long seed); - default Iterable getBiomes(Iterable biomes) { + default Iterable getBiomes(Iterable biomes) { return biomes; } @@ -29,7 +29,7 @@ public interface BiomeMutator { } - public TerraBiome getBiome(int x, int z) { + public Biome getBiome(int x, int z) { return biomes.getBiomeRaw(x + offX, z + offZ); } } 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/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java index bd00ac420..0bfc572df 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/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java @@ -7,7 +7,7 @@ package com.dfsek.terra.addons.biome.pipeline.api; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface Stage { @@ -15,5 +15,5 @@ public interface Stage { boolean isExpansion(); - Iterable getBiomes(Iterable biomes); + Iterable getBiomes(Iterable biomes); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java index ba3b6dd09..57034c43d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java @@ -14,7 +14,7 @@ import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class NoiseSourceTemplate extends SourceTemplate { @@ -22,7 +22,7 @@ public class NoiseSourceTemplate extends SourceTemplate { private @Meta NoiseSampler noise; @Value("biomes") - private @Meta ProbabilityCollection<@Meta TerraBiome> biomes; + private @Meta ProbabilityCollection<@Meta Biome> biomes; @Override public BiomeSource get() { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java index 5b1a95bbe..2bd1ef5ec 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java @@ -17,7 +17,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator; import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @SuppressWarnings("unused") @@ -29,10 +29,10 @@ public class BorderListMutatorTemplate extends StageTemplate { private @Meta String defaultReplace; @Value("default-to") - private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo; + private @Meta ProbabilityCollection<@Meta Biome> defaultTo; @Value("replace") - private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace; + private @Meta Map<@Meta Biome, @Meta ProbabilityCollection<@Meta Biome>> replace; @Override diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java index 9cc08137a..ff9ba33b2 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java @@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator; import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @SuppressWarnings("unused") @@ -27,7 +27,7 @@ public class BorderMutatorTemplate extends StageTemplate { private @Meta String replace; @Value("to") - private @Meta ProbabilityCollection<@Meta TerraBiome> to; + private @Meta ProbabilityCollection<@Meta Biome> to; @Override public Stage get() { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java index 3a340dd7e..23e0b1acd 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java @@ -17,7 +17,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator; import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @SuppressWarnings("unused") @@ -26,10 +26,10 @@ public class ReplaceListMutatorTemplate extends StageTemplate { private @Meta String defaultFrom; @Value("default-to") - private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo; + private @Meta ProbabilityCollection<@Meta Biome> defaultTo; @Value("to") - private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace; + private @Meta Map<@Meta Biome, @Meta ProbabilityCollection<@Meta Biome>> replace; @Override public Stage get() { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java index 0d476a5db..e611eea64 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java @@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator; import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @SuppressWarnings("unused") @@ -24,7 +24,7 @@ public class ReplaceMutatorTemplate extends StageTemplate { private @Meta String from; @Value("to") - private @Meta ProbabilityCollection<@Meta TerraBiome> to; + private @Meta ProbabilityCollection<@Meta Biome> to; @Override public Stage get() { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java index 0aaeaf8b1..8d0123239 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.expand; import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.MathUtil; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class FractalExpander implements BiomeExpander { @@ -21,7 +21,7 @@ public class FractalExpander implements BiomeExpander { } @Override - public TerraBiome getBetween(double x, double z, long seed, TerraBiome... others) { + public Biome getBetween(double x, double z, long seed, Biome... others) { return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)]; } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java index 21f3a542e..917484e59 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java @@ -15,18 +15,18 @@ import java.util.Set; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class BorderListMutator implements BiomeMutator { private final String border; private final NoiseSampler noiseSampler; - private final ProbabilityCollection replaceDefault; + private final ProbabilityCollection replaceDefault; private final String defaultReplace; - private final Map> replace; + private final Map> replace; - public BorderListMutator(Map> replace, String border, String defaultReplace, - NoiseSampler noiseSampler, ProbabilityCollection replaceDefault) { + public BorderListMutator(Map> replace, String border, String defaultReplace, + NoiseSampler noiseSampler, ProbabilityCollection replaceDefault) { this.border = border; this.noiseSampler = noiseSampler; this.replaceDefault = replaceDefault; @@ -35,20 +35,20 @@ public class BorderListMutator implements BiomeMutator { } @Override - public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) { - TerraBiome origin = viewPoint.getBiome(0, 0); + public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) { + Biome origin = viewPoint.getBiome(0, 0); if(origin.getTags().contains(defaultReplace)) { for(int xi = -1; xi <= 1; xi++) { for(int zi = -1; zi <= 1; zi++) { if(xi == 0 && zi == 0) continue; - TerraBiome current = viewPoint.getBiome(xi, zi); + Biome current = viewPoint.getBiome(xi, zi); if(current == null) continue; if(current.getTags().contains(border)) { if(replace.containsKey(origin)) { - TerraBiome biome = replace.get(origin).get(noiseSampler, x, z, seed); + Biome biome = replace.get(origin).get(noiseSampler, x, z, seed); return biome == null ? origin : biome; } - TerraBiome biome = replaceDefault.get(noiseSampler, x, z, seed); + Biome biome = replaceDefault.get(noiseSampler, x, z, seed); return biome == null ? origin : biome; } } @@ -58,8 +58,8 @@ public class BorderListMutator implements BiomeMutator { } @Override - public Iterable getBiomes(Iterable biomes) { - Set biomeSet = new HashSet<>(); + public Iterable getBiomes(Iterable biomes) { + Set biomeSet = new HashSet<>(); biomes.forEach(biomeSet::add); biomeSet.addAll(replaceDefault.getContents().stream().filter(Objects::nonNull).toList()); replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents())); diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java index 974089e48..d3c70c3b8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.mutator; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import java.util.HashSet; import java.util.Objects; @@ -20,10 +20,10 @@ import java.util.Set; public class BorderMutator implements BiomeMutator { private final String border; private final NoiseSampler noiseSampler; - private final ProbabilityCollection replace; + private final ProbabilityCollection replace; private final String replaceTag; - public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection replace) { + public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection replace) { this.border = border; this.noiseSampler = noiseSampler; this.replace = replace; @@ -31,16 +31,16 @@ public class BorderMutator implements BiomeMutator { } @Override - public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) { - TerraBiome origin = viewPoint.getBiome(0, 0); + public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) { + Biome origin = viewPoint.getBiome(0, 0); if(origin.getTags().contains(replaceTag)) { for(int xi = -1; xi <= 1; xi++) { for(int zi = -1; zi <= 1; zi++) { if(xi == 0 && zi == 0) continue; - TerraBiome current = viewPoint.getBiome(xi, zi); + Biome current = viewPoint.getBiome(xi, zi); if(current == null) continue; if(current.getTags().contains(border)) { - TerraBiome biome = replace.get(noiseSampler, x, z, seed); + Biome biome = replace.get(noiseSampler, x, z, seed); return biome == null ? origin : biome; } } @@ -50,8 +50,8 @@ public class BorderMutator implements BiomeMutator { } @Override - public Iterable getBiomes(Iterable biomes) { - Set biomeSet = new HashSet<>(); + public Iterable getBiomes(Iterable biomes) { + Set biomeSet = new HashSet<>(); biomes.forEach(biomeSet::add); biomeSet.addAll(replace.getContents().stream().filter(Objects::nonNull).toList()); return biomeSet; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java index 7d34f72a1..076cf1b32 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java @@ -15,17 +15,17 @@ import java.util.stream.Stream; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class ReplaceListMutator implements BiomeMutator { - private final Map> replace; + private final Map> replace; private final NoiseSampler sampler; - private final ProbabilityCollection replaceDefault; + private final ProbabilityCollection replaceDefault; private final String defaultTag; - public ReplaceListMutator(Map> replace, String defaultTag, - ProbabilityCollection replaceDefault, NoiseSampler sampler) { + public ReplaceListMutator(Map> replace, String defaultTag, + ProbabilityCollection replaceDefault, NoiseSampler sampler) { this.replace = replace; this.sampler = sampler; this.defaultTag = defaultTag; @@ -33,24 +33,24 @@ public class ReplaceListMutator implements BiomeMutator { } @Override - public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) { - TerraBiome center = viewPoint.getBiome(0, 0); + public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) { + Biome center = viewPoint.getBiome(0, 0); if(replace.containsKey(center)) { - TerraBiome biome = replace.get(center).get(sampler, x, z, seed); + Biome biome = replace.get(center).get(sampler, x, z, seed); return biome == null ? viewPoint.getBiome(0, 0) : biome; } if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) { - TerraBiome biome = replaceDefault.get(sampler, x, z, seed); + Biome biome = replaceDefault.get(sampler, x, z, seed); return biome == null ? viewPoint.getBiome(0, 0) : biome; } return center; } @Override - public Iterable getBiomes(Iterable biomes) { - Set biomeSet = new HashSet<>(); + public Iterable getBiomes(Iterable biomes) { + Set biomeSet = new HashSet<>(); - Set reject = new HashSet<>(); + Set reject = new HashSet<>(); biomes.forEach(biome -> { if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java index 69bfea162..43ac8747e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.mutator; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import java.util.HashSet; import java.util.Set; @@ -19,28 +19,28 @@ import java.util.stream.Stream; public class ReplaceMutator implements BiomeMutator { private final String replaceableTag; - private final ProbabilityCollection replace; + private final ProbabilityCollection replace; private final NoiseSampler sampler; - public ReplaceMutator(String replaceable, ProbabilityCollection replace, NoiseSampler sampler) { + public ReplaceMutator(String replaceable, ProbabilityCollection replace, NoiseSampler sampler) { this.replaceableTag = replaceable; this.replace = replace; this.sampler = sampler; } @Override - public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) { + public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) { if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) { - TerraBiome biome = replace.get(sampler, x, z, seed); + Biome biome = replace.get(sampler, x, z, seed); return biome == null ? viewPoint.getBiome(0, 0) : biome; } return viewPoint.getBiome(0, 0); } @Override - public Iterable getBiomes(Iterable biomes) { - Set biomeSet = new HashSet<>(); - Set reject = new HashSet<>(); + public Iterable getBiomes(Iterable biomes) { + Set biomeSet = new HashSet<>(); + Set reject = new HashSet<>(); biomes.forEach(biome -> { if(!biome.getTags().contains(replaceableTag)) { biomeSet.add(biome); diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java index 13d41d141..e843532bb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java @@ -12,7 +12,7 @@ import java.util.Objects; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.MathUtil; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class SmoothMutator implements BiomeMutator { @@ -24,11 +24,11 @@ public class SmoothMutator implements BiomeMutator { } @Override - public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) { - TerraBiome top = viewPoint.getBiome(1, 0); - TerraBiome bottom = viewPoint.getBiome(-1, 0); - TerraBiome left = viewPoint.getBiome(0, 1); - TerraBiome right = viewPoint.getBiome(0, -1); + public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) { + Biome top = viewPoint.getBiome(1, 0); + Biome bottom = viewPoint.getBiome(-1, 0); + Biome left = viewPoint.getBiome(0, 1); + Biome right = viewPoint.getBiome(0, -1); boolean vert = Objects.equals(top, bottom) && top != null; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java index 0423c1c43..c966ea8b7 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.biome.pipeline.source; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface BiomeSource { - TerraBiome getBiome(double x, double z, long seed); + Biome getBiome(double x, double z, long seed); - Iterable getBiomes(); + Iterable getBiomes(); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java index e4acc9d8d..c11566023 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java @@ -9,25 +9,25 @@ package com.dfsek.terra.addons.biome.pipeline.source; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class NoiseSource implements BiomeSource { - private final ProbabilityCollection biomes; + private final ProbabilityCollection biomes; private final NoiseSampler sampler; - public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { + public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { this.biomes = biomes; this.sampler = sampler; } @Override - public TerraBiome getBiome(double x, double z, long seed) { + public Biome getBiome(double x, double z, long seed) { return biomes.get(sampler, x, z, seed); } @Override - public Iterable getBiomes() { + public Iterable getBiomes() { return biomes.getContents(); } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java index 06319ce15..cffa9b5d9 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java @@ -10,9 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.stages; import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.api.world.biome.TerraBiome; - -import java.util.Collections; +import com.dfsek.terra.api.world.biome.Biome; public class ExpanderStage implements Stage { @@ -33,7 +31,7 @@ public class ExpanderStage implements Stage { } @Override - public Iterable getBiomes(Iterable biomes) { + public Iterable getBiomes(Iterable biomes) { return biomes; } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java index 3f7ba2595..2853695d9 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.stages; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class MutatorStage implements Stage { @@ -32,7 +32,7 @@ public class MutatorStage implements Stage { } @Override - public Iterable getBiomes(Iterable biomes) { + public Iterable getBiomes(Iterable biomes) { return mutator.getBiomes(biomes); } diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java index ba6f9e1f5..fa9f9f0eb 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java @@ -7,26 +7,26 @@ package com.dfsek.terra.addons.biome.single; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import java.util.Collections; public class SingleBiomeProvider implements BiomeProvider { - private final TerraBiome biome; + private final Biome biome; - public SingleBiomeProvider(TerraBiome biome) { + public SingleBiomeProvider(Biome biome) { this.biome = biome; } @Override - public TerraBiome getBiome(int x, int z, long seed) { + public Biome getBiome(int x, int z, long seed) { return biome; } @Override - public Iterable getBiomes() { + public Iterable getBiomes() { return Collections.singleton(biome); } } diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java index 671dd7a3f..944ca578b 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java @@ -11,13 +11,13 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class SingleBiomeProviderTemplate implements ObjectTemplate { @Value("biome") - private @Meta TerraBiome biome; + private @Meta Biome biome; @Override public BiomeProvider get() { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java index 1dc472a97..1c9e2c7e1 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java @@ -20,7 +20,7 @@ import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider; @@ -54,8 +54,8 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigurationLoadEvent.class) .then(event -> { - if(event.is(TerraBiome.class)) { - event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomePaletteTemplate()).get()); + if(event.is(Biome.class)) { + event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomePaletteTemplate()).get()); } }) .failThrough(); diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index 42b4b8b08..d696f1921 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -8,6 +8,8 @@ package com.dfsek.terra.addons.chunkgenerator.generation.generators; +import com.dfsek.terra.api.world.biome.Biome; + import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; @@ -25,7 +27,6 @@ import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.biome.GenerationSettings; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; @@ -70,7 +71,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { int cx = xOrig + x; int cz = zOrig + z; - TerraBiome biome = grid.getBiome(cx, cz, seed); + Biome biome = grid.getBiome(cx, cz, seed); PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class); @@ -107,7 +108,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { @Override public BlockState getBlock(ServerWorld world, int x, int y, int z) { BiomeProvider provider = world.getBiomeProvider(); - TerraBiome biome = provider.getBiome(x, z, world.getSeed()); + Biome biome = provider.getBiome(x, z, world.getSeed()); Sampler sampler = samplerCache.get(x, z, world); PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class); diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index 8f2046a69..0d5f67550 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -18,11 +18,11 @@ import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigType; import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; -public class BiomeConfigType implements ConfigType { - public static final TypeKey BIOME_TYPE_TOKEN = new TypeKey<>() { +public class BiomeConfigType implements ConfigType { + public static final TypeKey BIOME_TYPE_TOKEN = new TypeKey<>() { }; private final BiomeFactory factory; @@ -31,8 +31,8 @@ public class BiomeConfigType implements ConfigType { } @Override - public Supplier> registrySupplier(ConfigPack pack) { - return () -> pack.getRegistryFactory().create(registry -> (TypeLoader) (t, c, loader) -> { + public Supplier> registrySupplier(ConfigPack pack) { + return () -> pack.getRegistryFactory().create(registry -> (TypeLoader) (t, c, loader) -> { if(c.equals("SELF")) return null; return registry.get((String) c).orElseThrow(() -> new LoadException( "No such " + t.getType().getTypeName() + " matching \"" + c + "\" was found in this registry.")); @@ -45,12 +45,12 @@ public class BiomeConfigType implements ConfigType { } @Override - public ConfigFactory getFactory() { + public ConfigFactory getFactory() { return factory; } @Override - public TypeKey getTypeKey() { + public TypeKey getTypeKey() { return BIOME_TYPE_TOKEN; } } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java index 10eea9486..81ff62468 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java @@ -10,10 +10,10 @@ package com.dfsek.terra.addons.biome; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; -public class BiomeFactory implements ConfigFactory { +public class BiomeFactory implements ConfigFactory { private final ConfigPack pack; public BiomeFactory(ConfigPack pack) { @@ -21,7 +21,7 @@ public class BiomeFactory implements ConfigFactory { } @Override - public TerraBiome build(BiomeTemplate template, Platform platform) { + public Biome build(BiomeTemplate template, Platform platform) { UserDefinedGenerationSettings generator = new UserDefinedGenerationSettings(template.getNoiseEquation(), template.getElevationEquation(), template.getCarvingEquation(), template.getBiomeNoise(), diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java index 1991affea..1e4d514e2 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java @@ -11,15 +11,15 @@ import java.util.Set; import com.dfsek.terra.api.properties.Context; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.api.world.biome.GenerationSettings; -import com.dfsek.terra.api.world.biome.TerraBiome; /** * Class representing a config-defined biome */ -public class UserDefinedBiome implements TerraBiome { +public class UserDefinedBiome implements Biome { private final UserDefinedGenerationSettings gen; private final ProbabilityCollection vanilla; private final String id; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java index e49a53dc6..4a5038928 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java @@ -9,13 +9,13 @@ package com.dfsek.terra.addons.biome.command.biome; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.biome.Biome; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -25,7 +25,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class AsyncBiomeFinder implements Runnable { protected final BiomeProvider provider; - protected final TerraBiome target; + protected final Biome target; protected final int startRadius; protected final int maxRadius; protected final int centerX; @@ -35,7 +35,7 @@ public class AsyncBiomeFinder implements Runnable { private final Consumer callback; protected int searchSize = 1; - public AsyncBiomeFinder(BiomeProvider provider, TerraBiome target, @NotNull Vector3 origin, ServerWorld world, int startRadius, int maxRadius, + public AsyncBiomeFinder(BiomeProvider provider, Biome target, @NotNull Vector3 origin, ServerWorld world, int startRadius, int maxRadius, Consumer callback, Platform platform) { this.provider = provider; this.target = target; @@ -97,12 +97,12 @@ public class AsyncBiomeFinder implements Runnable { * * @return TerraBiome at coordinates */ - public boolean isValid(int x, int z, TerraBiome target) { + public boolean isValid(int x, int z, Biome target) { int res = platform.getTerraConfig().getBiomeSearchResolution(); return getProvider().getBiome(x * res, z * res, world.getSeed()).equals(target); } - public TerraBiome getTarget() { + public Biome getTarget() { return target; } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java index ea07ca2aa..2a6cd9406 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java @@ -16,7 +16,7 @@ import com.dfsek.terra.api.command.annotation.Argument; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @Command(arguments = @Argument( @@ -26,7 +26,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome; )) public class BiomeInfoCommand implements CommandTemplate { @ArgumentTarget("biome") - private TerraBiome biome; + private Biome biome; @Override public void execute(CommandSender sender) { diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java index 6e5f6c40d..31b5d014d 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java @@ -25,7 +25,7 @@ import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; @PlayerCommand @@ -52,7 +52,7 @@ public class BiomeLocateCommand implements CommandTemplate { private Integer radius; @ArgumentTarget("biome") - private TerraBiome biome; + private Biome biome; @SwitchTarget("teleport") private boolean teleport; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java index cc4bf6fda..df38907f1 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java @@ -12,16 +12,16 @@ import com.dfsek.terra.api.command.arg.ArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; -public class BiomeArgumentParser implements ArgumentParser { +public class BiomeArgumentParser implements ArgumentParser { @Inject private Platform platform; @Override - public TerraBiome parse(CommandSender sender, String arg) { + public Biome parse(CommandSender sender, String arg) { Player player = (Player) sender; - return player.world().getPack().getRegistry(TerraBiome.class).get(arg).orElse(null); + return player.world().getPack().getRegistry(Biome.class).get(arg).orElse(null); } } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java index 071534fc2..5c3e339a1 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java @@ -15,7 +15,7 @@ import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public class BiomeTabCompleter implements TabCompleter { @@ -25,7 +25,7 @@ public class BiomeTabCompleter implements TabCompleter { @Override public List complete(CommandSender sender) { Player player = (Player) sender; - return player.world().getPack().getRegistry(TerraBiome.class).entries().stream().map(TerraBiome::getID).collect( + return player.world().getPack().getRegistry(Biome.class).entries().stream().map(Biome::getID).collect( Collectors.toList()); } } diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java index 7bfcb3ea6..c607e99ef 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java @@ -15,7 +15,7 @@ import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider; @@ -40,8 +40,8 @@ public class FeatureGenerationAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigurationLoadEvent.class) .then(event -> { - if(event.is(TerraBiome.class)) { - event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomeFeaturesTemplate()).get()); + if(event.is(Biome.class)) { + event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomeFeaturesTemplate()).get()); } }) .failThrough(); diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java index a120dccfe..c95359f30 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider; @@ -33,8 +33,8 @@ public class StructureGenerationAddon implements AddonInitializer { .getHandler(FunctionalEventHandler.class) .register(addon, ConfigurationLoadEvent.class) .then(event -> { - if(event.is(TerraBiome.class)) { - event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomeStructuresTemplate()).get()); + if(event.is(Biome.class)) { + event.getLoadedObject(Biome.class).getContext().put(event.load(new BiomeStructuresTemplate()).get()); } }) .failThrough(); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/Biome.java similarity index 94% rename from common/api/core/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/Biome.java index 3de7b1ca6..07b29afb4 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/Biome.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection; /** * Represents a custom biome */ -public interface TerraBiome extends PropertyHolder { +public interface Biome extends PropertyHolder { /** * Gets the Vanilla biome to represent the custom biome. diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java index 7f09b6f3e..7c2b93c48 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java @@ -9,19 +9,19 @@ package com.dfsek.terra.api.world.biome.generation; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.Biome; public interface BiomeProvider { - TerraBiome getBiome(int x, int z, long seed); + Biome getBiome(int x, int z, long seed); - default TerraBiome getBiome(Vector2 vector2, long seed) { + default Biome getBiome(Vector2 vector2, long seed) { return getBiome(vector2.getBlockX(), vector2.getBlockZ(), seed); } - default TerraBiome getBiome(Vector3 vector3, long seed) { + default Biome getBiome(Vector3 vector3, long seed) { return getBiome(vector3.getBlockX(), vector3.getBlockZ(), seed); } - Iterable getBiomes(); + Iterable getBiomes(); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java index d64243b2c..9c3b98102 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java @@ -1,6 +1,7 @@ package com.dfsek.terra.bukkit.generator; -import org.bukkit.block.Biome; +import com.dfsek.terra.api.world.biome.Biome; + import org.bukkit.generator.BiomeProvider; import org.bukkit.generator.WorldInfo; import org.jetbrains.annotations.NotNull; @@ -10,7 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.dfsek.terra.api.Handle; -import com.dfsek.terra.api.world.biome.TerraBiome; public class BukkitBiomeProvider extends BiomeProvider implements Handle { @@ -19,18 +19,18 @@ public class BukkitBiomeProvider extends BiomeProvider implements Handle { public BukkitBiomeProvider(com.dfsek.terra.api.world.biome.generation.BiomeProvider delegate) { this.delegate = delegate; } @Override - public @NotNull Biome getBiome(@NotNull WorldInfo worldInfo, int x, int y, int z) { - TerraBiome terraBiome = delegate.getBiome(x, z, worldInfo.getSeed()); - return (Biome) terraBiome.getVanillaBiomes().get(terraBiome.getGenerator().getBiomeNoise(), x, y, z).getHandle(); + public @NotNull org.bukkit.block.Biome getBiome(@NotNull WorldInfo worldInfo, int x, int y, int z) { + Biome biome = delegate.getBiome(x, z, worldInfo.getSeed()); + return (org.bukkit.block.Biome) biome.getVanillaBiomes().get(biome.getGenerator().getBiomeNoise(), x, y, z).getHandle(); } @Override - public @NotNull List getBiomes(@NotNull WorldInfo worldInfo) { + public @NotNull List getBiomes(@NotNull WorldInfo worldInfo) { return StreamSupport.stream(delegate.getBiomes().spliterator(), false) .flatMap(terraBiome -> terraBiome.getVanillaBiomes() .getContents() .stream() - .map(biome -> (Biome) biome.getHandle())) + .map(biome -> (org.bukkit.block.Biome) biome.getHandle())) .collect(Collectors.toList()); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java index 61e4eed8d..ed622fe72 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java @@ -20,9 +20,11 @@ package com.dfsek.terra.fabric; import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; import com.dfsek.tectonic.exception.ConfigException; + +import com.dfsek.terra.api.world.biome.Biome; + import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import net.minecraft.world.biome.Biome; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +37,6 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions; import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions; import com.dfsek.terra.fabric.event.BiomeRegistrationEvent; @@ -87,12 +88,12 @@ public final class FabricAddon implements BaseAddon { .then(event -> { logger.info("Registering biomes..."); - Registry biomeRegistry = event.getRegistryManager().get(Registry.BIOME_KEY); + Registry biomeRegistry = event.getRegistryManager().get(Registry.BIOME_KEY); terraFabricPlugin.getConfigRegistry().forEach(pack -> { // Register all Terra biomes. - pack.getCheckedRegistry(TerraBiome.class) + pack.getCheckedRegistry(Biome.class) .forEach((id, biome) -> { Identifier identifier = new Identifier("terra", FabricUtil.createBiomeID(pack, id)); - Biome fabricBiome = FabricUtil.createBiome(biome, pack, event.getRegistryManager()); + net.minecraft.world.biome.Biome fabricBiome = FabricUtil.createBiome(biome, pack, event.getRegistryManager()); FabricUtil.registerOrOverwrite(biomeRegistry, Registry.BIOME_KEY, identifier, fabricBiome); }); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java index 344cf4bf6..de77c93f3 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java @@ -20,30 +20,31 @@ package com.dfsek.terra.fabric.config; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ConfigTemplate; + +import com.dfsek.terra.api.world.biome.Biome; + import net.minecraft.util.Identifier; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.dfsek.terra.api.world.biome.TerraBiome; - @SuppressWarnings("FieldMayBeFinal") public class PostLoadCompatibilityOptions implements ConfigTemplate { @Value("structures.inject-biome.exclude-biomes") @Default - private Map> excludedPerBiomeStructures = new HashMap<>(); + private Map> excludedPerBiomeStructures = new HashMap<>(); @Value("features.inject-biome.exclude-biomes") @Default - private Map> excludedPerBiomeFeatures = new HashMap<>(); + private Map> excludedPerBiomeFeatures = new HashMap<>(); - public Map> getExcludedPerBiomeFeatures() { + public Map> getExcludedPerBiomeFeatures() { return excludedPerBiomeFeatures; } - public Map> getExcludedPerBiomeStructures() { + public Map> getExcludedPerBiomeStructures() { return excludedPerBiomeStructures; } } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index e989df91e..a08d96751 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -17,12 +17,13 @@ package com.dfsek.terra.fabric.generation; +import com.dfsek.terra.api.world.biome.Biome; + import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.util.Identifier; import net.minecraft.util.dynamic.RegistryLookupCodec; import net.minecraft.util.registry.Registry; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.BiomeSource; import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler; @@ -30,7 +31,6 @@ import java.util.Objects; import java.util.stream.Collectors; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.util.FabricUtil; @@ -55,11 +55,11 @@ public class TerraBiomeSource extends BiomeSource { .apply(instance, instance.stable( TerraBiomeSource::new))); - private final Registry biomeRegistry; + private final Registry biomeRegistry; private final long seed; private ConfigPack pack; - public TerraBiomeSource(Registry biomes, long seed, ConfigPack pack) { + public TerraBiomeSource(Registry biomes, long seed, ConfigPack pack) { super(biomes.stream() .filter(biome -> Objects.requireNonNull(biomes.getId(biome)) .getNamespace() @@ -85,8 +85,8 @@ public class TerraBiomeSource extends BiomeSource { } @Override - public Biome getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) { - TerraBiome biome = pack.getBiomeProvider().getBiome(biomeX << 2, biomeZ << 2, seed); + public net.minecraft.world.biome.Biome getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) { + Biome biome = pack.getBiomeProvider().getBiome(biomeX << 2, biomeZ << 2, seed); return biomeRegistry.get(new Identifier("terra", FabricUtil.createBiomeID(pack, biome.getID()))); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index bf229af08..82e7ad8c6 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -17,6 +17,8 @@ package com.dfsek.terra.fabric.util; +import com.dfsek.terra.api.world.biome.Biome; + import com.mojang.serialization.Lifecycle; import net.minecraft.block.entity.LootableContainerBlockEntity; import net.minecraft.block.entity.MobSpawnerBlockEntity; @@ -28,7 +30,6 @@ import net.minecraft.util.registry.MutableRegistry; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.WorldAccess; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.gen.GenerationStep; @@ -45,7 +46,6 @@ import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.block.entity.MobSpawner; import com.dfsek.terra.api.block.entity.Sign; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor; @@ -62,14 +62,14 @@ public final class FabricUtil { * * @return The Minecraft delegate biome. */ - public static Biome createBiome(TerraBiome biome, ConfigPack pack, DynamicRegistryManager registryManager) { + public static net.minecraft.world.biome.Biome createBiome(Biome biome, ConfigPack pack, DynamicRegistryManager registryManager) { // BiomeTemplate template = biome.getTemplate(); Map colors = new HashMap<>(); // template.getColors(); //TerraFabricPlugin.FabricAddon fabricAddon = TerraFabricPlugin.getInstance().getFabricAddon(); - Registry biomeRegistry = registryManager.get(Registry.BIOME_KEY); - Biome vanilla = ((ProtoPlatformBiome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0))).get(biomeRegistry); + Registry biomeRegistry = registryManager.get(Registry.BIOME_KEY); + net.minecraft.world.biome.Biome vanilla = ((ProtoPlatformBiome) (new ArrayList<>(biome.getVanillaBiomes().getContents()).get(0))).get(biomeRegistry); GenerationSettings.Builder generationSettings = new GenerationSettings.Builder(); @@ -135,7 +135,7 @@ public final class FabricUtil { accessor.getFoliageColor().ifPresent(effects::foliageColor); } - return new Biome.Builder() + return new net.minecraft.world.biome.Biome.Builder() .precipitation(vanilla.getPrecipitation()) .category(vanilla.getCategory()) .temperature(vanilla.getTemperature())