diff --git a/src/main/java/ru/betterend/config/MainConfig.java b/src/main/java/ru/betterend/config/MainConfig.java index 2fb316a8..b60cde29 100644 --- a/src/main/java/ru/betterend/config/MainConfig.java +++ b/src/main/java/ru/betterend/config/MainConfig.java @@ -1,8 +1,5 @@ package ru.betterend.config; -import com.google.gson.JsonObject; -import ru.betterend.config.ConfigKeeper.*; - public class MainConfig extends Config { private static MainConfig instance; diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index 8e38d7f3..63ea561a 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -25,6 +25,7 @@ import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.biome.BiomeKeys; import ru.betterend.BetterEnd; import ru.betterend.util.JsonFactory; +import ru.betterend.world.biome.BiomeAmberLand; import ru.betterend.world.biome.BiomeChorusForest; import ru.betterend.world.biome.BiomeCrystalMountains; import ru.betterend.world.biome.BiomeDustWastelands; @@ -33,6 +34,7 @@ import ru.betterend.world.biome.BiomeMegalake; import ru.betterend.world.biome.BiomeMegalakeGrove; import ru.betterend.world.biome.BiomePaintedMountains; import ru.betterend.world.biome.BiomeShadowForest; +import ru.betterend.world.biome.BlossomingSpires; import ru.betterend.world.biome.EndBiome; import ru.betterend.world.generator.BiomePicker; import ru.betterend.world.generator.BiomeType; @@ -68,6 +70,8 @@ public class EndBiomes { public static final EndBiome CRYSTAL_MOUNTAINS = registerBiome(new BiomeCrystalMountains(), BiomeType.LAND); public static final EndBiome PAINTED_MOUNTAINS = registerSubBiome(new BiomePaintedMountains(), DUST_WASTELANDS); public static final EndBiome SHADOW_FOREST = registerBiome(new BiomeShadowForest(), BiomeType.LAND); + public static final EndBiome AMBER_LAND = registerBiome(new BiomeAmberLand(), BiomeType.LAND); + public static final EndBiome BLOSSOMING_SPIRES = registerBiome(new BlossomingSpires(), BiomeType.LAND); public static void register() {} diff --git a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java new file mode 100644 index 00000000..4b58cd45 --- /dev/null +++ b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java @@ -0,0 +1,37 @@ +package ru.betterend.world.biome; + +import net.minecraft.entity.EntityType; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.world.gen.GenerationStep.Feature; +import net.minecraft.world.gen.feature.ConfiguredFeatures; +import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndEntities; +import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; + +public class BiomeAmberLand extends EndBiome { + public BiomeAmberLand() { + super(new BiomeDefinition("amber_land") + .setFogColor(87, 26, 87) + .setFogDensity(1.5F) + .setPlantsColor(122, 45, 122) + .setSurface(EndBlocks.CHORUS_NYLIUM) + .setParticles(ParticleTypes.PORTAL, 0.01F) + .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) + .setMusic(EndSounds.MUSIC_CHORUS_FOREST) + .addFeature(EndFeatures.VIOLECITE_LAYER) + .addFeature(EndFeatures.END_LAKE_RARE) + .addFeature(EndFeatures.PYTHADENDRON_TREE) + .addFeature(EndFeatures.PYTHADENDRON_BUSH) + .addFeature(EndFeatures.PURPLE_POLYPORE_DENSE) + .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) + .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) + .addFeature(EndFeatures.CHORUS_GRASS) + .addFeature(EndFeatures.TAIL_MOSS) + .addFeature(EndFeatures.TAIL_MOSS_WOOD) + .addStructureFeature(ConfiguredStructureFeatures.END_CITY) + .addMobSpawn(EndEntities.END_SLIME, 5, 1, 2) + .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); + } +} diff --git a/src/main/java/ru/betterend/world/biome/BiomeConfig.java b/src/main/java/ru/betterend/world/biome/BiomeConfig.java index 3830cb65..5f718d6a 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeConfig.java +++ b/src/main/java/ru/betterend/world/biome/BiomeConfig.java @@ -2,10 +2,7 @@ package ru.betterend.world.biome; import java.nio.file.Path; -import com.google.gson.JsonObject; - import net.minecraft.util.Identifier; - import ru.betterend.config.Config; import ru.betterend.config.ConfigWriter; diff --git a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java new file mode 100644 index 00000000..8a9e7778 --- /dev/null +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -0,0 +1,37 @@ +package ru.betterend.world.biome; + +import net.minecraft.entity.EntityType; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.world.gen.GenerationStep.Feature; +import net.minecraft.world.gen.feature.ConfiguredFeatures; +import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndEntities; +import ru.betterend.registry.EndFeatures; +import ru.betterend.registry.EndSounds; + +public class BlossomingSpires extends EndBiome { + public BlossomingSpires() { + super(new BiomeDefinition("blossoming_spires") + .setFogColor(87, 26, 87) + .setFogDensity(1.5F) + .setPlantsColor(122, 45, 122) + .setSurface(EndBlocks.CHORUS_NYLIUM) + .setParticles(ParticleTypes.PORTAL, 0.01F) + .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) + .setMusic(EndSounds.MUSIC_CHORUS_FOREST) + .addFeature(EndFeatures.VIOLECITE_LAYER) + .addFeature(EndFeatures.END_LAKE_RARE) + .addFeature(EndFeatures.PYTHADENDRON_TREE) + .addFeature(EndFeatures.PYTHADENDRON_BUSH) + .addFeature(EndFeatures.PURPLE_POLYPORE_DENSE) + .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) + .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) + .addFeature(EndFeatures.CHORUS_GRASS) + .addFeature(EndFeatures.TAIL_MOSS) + .addFeature(EndFeatures.TAIL_MOSS_WOOD) + .addStructureFeature(ConfiguredStructureFeatures.END_CITY) + .addMobSpawn(EndEntities.END_SLIME, 5, 1, 2) + .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); + } +}