diff --git a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java index dc31dd78..bbc32dca 100644 --- a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java +++ b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java @@ -26,8 +26,8 @@ public class OldBulbisGardens extends EndBiome { SoundEvent mood = biome.getMoodSound().get().getSound(); BiomeDefinition def = new BiomeDefinition("old_bulbis_gardens") - .setFogColor(132, 0, 202) - .setFogDensity(2F) + .setFogColor(215, 132, 182) + .setFogDensity(1.8F) .setWaterAndFogColor(40, 0, 56) .setFoliageColor(122, 17, 155) .setParticles(ParticleTypes.REVERSE_PORTAL, 0.002F) diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index b8686d2e..28af2e9d 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -50,6 +50,7 @@ public class EndBiomes { private static final HashMap ID_MAP = Maps.newHashMap(); private static final HashMap CLIENT = Maps.newHashMap(); public static final Set FABRIC_VOID = Sets.newHashSet(); + private static final Set SUBBIOMES_UNMUTABLES = Sets.newHashSet(); public static final BiomePicker LAND_BIOMES = new BiomePicker(); public static final BiomePicker VOID_BIOMES = new BiomePicker(); @@ -103,7 +104,7 @@ public class EndBiomes { if (biome.getCategory() == Category.THEEND) { Identifier id = biomeRegistry.getId(biome); if (Configs.BIOME_CONFIG.getBoolean(id, "enabled", true)) { - if (!LAND_BIOMES.containsImmutable(id) && !VOID_BIOMES.containsImmutable(id)) { + if (!LAND_BIOMES.containsImmutable(id) && !VOID_BIOMES.containsImmutable(id) && !SUBBIOMES_UNMUTABLES.contains(id)) { JsonObject config = configs.get(id.getNamespace()); if (config == null) { config = loadJsonConfig(id.getNamespace()); @@ -252,6 +253,7 @@ public class EndBiomes { if (Configs.BIOME_CONFIG.getBoolean(endBiome.getID(), "enabled", true)) { parent.addSubBiome(endBiome); SUBBIOMES.add(endBiome); + SUBBIOMES_UNMUTABLES.add(endBiome.getID()); ID_MAP.put(endBiome.getID(), endBiome); } return endBiome; @@ -268,6 +270,7 @@ public class EndBiomes { if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) { parent.addSubBiome(biome); SUBBIOMES.add(biome); + SUBBIOMES_UNMUTABLES.add(biome.getID()); ID_MAP.put(biome.getID(), biome); addLandBiomeToFabricApi(biome); } diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt new file mode 100644 index 00000000..96425c4a Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt differ diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_2.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_2.nbt new file mode 100644 index 00000000..24f7bb59 Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_2.nbt differ diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_3.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_3.nbt new file mode 100644 index 00000000..a94894a4 Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_3.nbt differ diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json new file mode 100644 index 00000000..3265de94 --- /dev/null +++ b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json @@ -0,0 +1,10 @@ +{ + "structures": [ + { "nbt": "fallen_tree_1", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "fallen_tree_2", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "fallen_tree_3", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "tree_stump_1", "offsetY": 0, "terrainMerge": "surface" }, + { "nbt": "tree_stump_2", "offsetY": 0, "terrainMerge": "surface" }, + { "nbt": "tree_stump_3", "offsetY": 0, "terrainMerge": "surface" } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt new file mode 100644 index 00000000..888b4855 Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt differ diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt new file mode 100644 index 00000000..c9d9c450 Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt differ diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt new file mode 100644 index 00000000..a344b126 Binary files /dev/null and b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt differ