diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index a1f1c261b..72fb03828 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -81,7 +81,7 @@ public class BOPBiomes public static Optional xeric_shrubland = Optional.empty(); public static Optional crystalline_chasm = Optional.empty(); - public static Optional shadowlands = Optional.empty(); - public static Optional undergarden = Optional.empty(); + public static Optional undergrowth = Optional.empty(); public static Optional visceral_heap = Optional.empty(); + public static Optional withered_abyss = Optional.empty(); } diff --git a/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java b/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java similarity index 98% rename from src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java rename to src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java index d4d67399e..059fba71f 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/UndergardenBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java @@ -20,9 +20,9 @@ import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.placement.*; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class UndergardenBiome extends NetherBiomeBOP +public class UndergrowthBiome extends NetherBiomeBOP { - public UndergardenBiome() + public UndergrowthBiome() { super((new Biome.Builder()).surfaceBuilder(SurfaceBuilder.NETHER, SurfaceBuilder.CONFIG_HELL).precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F).specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x1C2109).ambientParticle(new ParticleEffectAmbience(ParticleTypes.MYCELIUM, 0.00714F)).ambientLoopSound(SoundEvents.AMBIENT_WARPED_FOREST_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new SoundAdditionsAmbience(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS, 0.0111D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_NETHER_WASTES)).build()).parent((String)null).optimalParameters(ImmutableList.of(new Biome.Attributes(0.0F, 1.0F, 0.0F, 0.0F, 0.0F)))); diff --git a/src/main/java/biomesoplenty/common/biome/nether/ShadowlandsBiome.java b/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java similarity index 71% rename from src/main/java/biomesoplenty/common/biome/nether/ShadowlandsBiome.java rename to src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java index deed2ccb1..db56a6576 100644 --- a/src/main/java/biomesoplenty/common/biome/nether/ShadowlandsBiome.java +++ b/src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java @@ -25,11 +25,11 @@ import net.minecraft.world.gen.placement.FrequencyConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -public class ShadowlandsBiome extends NetherBiomeBOP +public class WitheredAbyssBiome extends NetherBiomeBOP { - public ShadowlandsBiome() + public WitheredAbyssBiome() { - super((new Builder()).surfaceBuilder(BOPBiomeFeatures.SHADOWLANDS_SURFACE_BUILDER, BOPBiomeFeatures.BLACKSTONE_SURFACE).precipitation(RainType.NONE).biomeCategory(Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F).specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x09060F).ambientParticle(new ParticleEffectAmbience(ParticleTypes.SMOKE, 0.00357F)).ambientLoopSound(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_BASALT_DELTAS)).build()).parent((String)null).optimalParameters(ImmutableList.of(new Attributes(0.0F, 1.0F, 0.0F, 0.0F, 0.0F)))); + super((new Builder()).surfaceBuilder(BOPBiomeFeatures.WITHERED_ABYSS_SURFACE_BUILDER, BOPBiomeFeatures.BLACKSTONE_SURFACE).precipitation(RainType.NONE).biomeCategory(Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F).specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x09060F).ambientParticle(new ParticleEffectAmbience(ParticleTypes.SMOKE, 0.00357F)).ambientLoopSound(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_BASALT_DELTAS)).build()).parent((String)null).optimalParameters(ImmutableList.of(new Attributes(0.0F, 1.0F, 0.0F, 0.0F, 0.0F)))); //Terrain this.addStructureStart(DefaultBiomeFeatures.RUINED_PORTAL_NETHER); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java index cb7536571..d3f8e5a9c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java @@ -176,7 +176,7 @@ public class BOPBiomeFeatures public static final SurfaceBuilder VOLCANO_EDGE_SURFACE_BUILDER = new VolcanoEdgeSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilder DEEP_TOP_LAYER = new DeepTopLayerSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilder POPPY_FIELD_SURFACE_BUILDER = new PoppyFieldSurfaceBuilder(SurfaceBuilderConfig.CODEC); - public static final SurfaceBuilder SHADOWLANDS_SURFACE_BUILDER = new ShadowlandsSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder WITHERED_ABYSS_SURFACE_BUILDER = new WitheredAbyssSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilder FLESH_SURFACE_BUILDER = new FleshSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilderConfig BLACKSTONE_SURFACE = new SurfaceBuilderConfig(Blocks.BLACKSTONE.defaultBlockState(), Blocks.BLACKSTONE.defaultBlockState(), Blocks.BLACKSTONE.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ShadowlandsSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/WitheredAbyssSurfaceBuilder.java similarity index 90% rename from src/main/java/biomesoplenty/common/world/gen/feature/ShadowlandsSurfaceBuilder.java rename to src/main/java/biomesoplenty/common/world/gen/feature/WitheredAbyssSurfaceBuilder.java index 76fab81af..ff3adf32f 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ShadowlandsSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WitheredAbyssSurfaceBuilder.java @@ -20,12 +20,12 @@ import net.minecraft.world.gen.surfacebuilders.ValleySurfaceBuilder; import java.util.Random; -public class ShadowlandsSurfaceBuilder extends ValleySurfaceBuilder { +public class WitheredAbyssSurfaceBuilder extends ValleySurfaceBuilder { private static final BlockState BLACKSTONE = Blocks.BLACKSTONE.defaultBlockState(); private static final BlockState OBSIDIAN = Blocks.OBSIDIAN.defaultBlockState(); private static final ImmutableList BLOCK_STATES = ImmutableList.of(BLACKSTONE); - public ShadowlandsSurfaceBuilder(Codec p_i232135_1_) { + public WitheredAbyssSurfaceBuilder(Codec p_i232135_1_) { super(p_i232135_1_); } diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index 5d7aa358e..35a99d9ca 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -137,9 +137,9 @@ public class ModBiomes //Nether Biomes registerBiome(new CrystallineChasmBiome(), "crystalline_chasm"); - registerBiome(new ShadowlandsBiome(), "shadowlands"); - registerBiome(new UndergardenBiome(), "undergarden"); + registerBiome(new UndergrowthBiome(), "undergrowth"); registerBiome(new VisceralHeapBiome(), "visceral_heap"); + registerBiome(new WitheredAbyssBiome(), "withered_abyss"); BiomeRegistry.configureStandardBiomes(); BiomeRegistry.finalizeRegistrations(BiomeRegistry.RegistrationType.STANDARD_BIOME); @@ -279,9 +279,9 @@ public class ModBiomes //Nether Biomes registerBiomeToDictionary(crystalline_chasm, Type.NETHER, Type.HOT); - registerBiomeToDictionary(shadowlands, Type.NETHER, Type.HOT); - registerBiomeToDictionary(undergarden, Type.NETHER, Type.HOT); + registerBiomeToDictionary(undergrowth, Type.NETHER, Type.HOT); registerBiomeToDictionary(visceral_heap, Type.NETHER, Type.HOT); + registerBiomeToDictionary(withered_abyss, Type.NETHER, Type.HOT); } private static void registerVillagerTypes() diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 834a845d6..eb380ad74 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -55,7 +55,6 @@ "biome.biomesoplenty.redwood_forest_edge": "Redwood Forest Edge", "biome.biomesoplenty.scrubland": "Scrubland", "biome.biomesoplenty.seasonal_forest": "Seasonal Forest", - "biome.biomesoplenty.shadowlands": "Shadowlands", "biome.biomesoplenty.shield": "Shield", "biome.biomesoplenty.shrubland": "Shrubland", "biome.biomesoplenty.silkglade": "Silkglade", @@ -69,12 +68,13 @@ "biome.biomesoplenty.tropic_beach": "Tropic Beach", "biome.biomesoplenty.tropics": "Tropics", "biome.biomesoplenty.tundra": "Tundra", - "biome.biomesoplenty.undergarden": "Undergarden", + "biome.biomesoplenty.undergrowth": "Undergrowth", "biome.biomesoplenty.visceral_heap": "Visceral Heap", "biome.biomesoplenty.volcano": "Volcano", "biome.biomesoplenty.volcano_edge": "Volcano Edge", "biome.biomesoplenty.wasteland": "Wasteland", "biome.biomesoplenty.wetland": "Wetland", + "biome.biomesoplenty.withered_abyss": "Withered Abyss", "biome.biomesoplenty.woodland": "Woodland", "biome.biomesoplenty.xeric_shrubland": "Xeric Shrubland", diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json index efd87424a..824277214 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json @@ -302,12 +302,6 @@ "conditions": { "biome": "biomesoplenty:seasonal_forest" } - }, - "shadowlands": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:shadowlands" - } }, "shield": { "trigger": "minecraft:location", @@ -387,10 +381,10 @@ "biome": "biomesoplenty:tundra" } }, - "undergarden": { + "undergrowth": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:undergarden" + "biome": "biomesoplenty:undergrowth" } }, "visceral_heap": { @@ -422,6 +416,12 @@ "conditions": { "biome": "biomesoplenty:wetland" } + }, + "withered_abyss": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:withered_abyss" + } }, "woodland": { "trigger": "minecraft:location", diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json index 9852a67c6..bd851745f 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json @@ -301,12 +301,6 @@ "conditions": { "biome": "biomesoplenty:seasonal_forest" } - }, - "shadowlands": { - "trigger": "minecraft:location", - "conditions": { - "biome": "biomesoplenty:shadowlands" - } }, "shield": { "trigger": "minecraft:location", @@ -386,10 +380,10 @@ "biome": "biomesoplenty:tundra" } }, - "undergarden": { + "undergrowth": { "trigger": "minecraft:location", "conditions": { - "biome": "biomesoplenty:undergarden" + "biome": "biomesoplenty:undergrowth" } }, "visceral_heap": { @@ -421,6 +415,12 @@ "conditions": { "biome": "biomesoplenty:wetland" } + }, + "withered_abyss": { + "trigger": "minecraft:location", + "conditions": { + "biome": "biomesoplenty:withered_abyss" + } }, "woodland": { "trigger": "minecraft:location", @@ -485,7 +485,6 @@ "redwood_forest_edge", "scrubland", "seasonal_forest", - "shadowlands", "shield", "shrubland", "silkglade", @@ -499,12 +498,13 @@ "tropic_beach", "tropics", "tundra", - "undergarden", + "undergrowth", "visceral_heap", "volcano", "volcano_edge", "wasteland", "wetland", + "withered_abyss", "woodland", "xeric_shrubland" ]