From 886eb3a05c783d0484a76fc6299024220b4ed033 Mon Sep 17 00:00:00 2001 From: Forstride Date: Sun, 26 Nov 2023 18:08:53 -0500 Subject: [PATCH] Added support for custom river biomes in our regions, renamed Snowy Origin Valley to Wintry Origin Valley --- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 4 +- ..._valley.json => wintry_origin_valley.json} | 0 .../biomesoplenty/api/biome/BOPBiomes.java | 2 +- .../biome/BOPOverworldBiomeBuilder.java | 45 ++++++++++++++----- .../BOPSecondaryOverworldBiomeBuilder.java | 15 +++++++ .../common/worldgen/BOPSurfaceRuleData.java | 2 +- .../java/biomesoplenty/init/ModBiomes.java | 4 +- .../assets/biomesoplenty/lang/en_us.json | 2 +- .../biomesoplenty/all_biomes.json | 38 ++++++++-------- .../advancements/biomesoplenty/root.json | 34 +++++++------- .../forge/tags/worldgen/biome/is_rare.json | 8 ++-- .../tags/worldgen/biome/is_overworld.json | 8 ++-- .../worldgen/biome/mineshaft_blocking.json | 2 +- .../worldgen/biome/without_patrol_spawns.json | 2 +- .../worldgen/biome/without_zombie_sieges.json | 2 +- .../worldgen/biome/blacklisted_biomes.json | 2 +- 16 files changed, 105 insertions(+), 65 deletions(-) rename src/generated/resources/data/biomesoplenty/worldgen/biome/{snowy_origin_valley.json => wintry_origin_valley.json} (100%) diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 1c5c9ce40..f8b811138 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.20.2 2023-11-26T16:02:56.6910887 Registries +// 1.20.2 2023-11-26T17:50:48.2431845 Registries a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json b8dc803c8b669f1676bca4cf741dd201cf95119e data/biomesoplenty/worldgen/biome/aspen_forest.json @@ -53,7 +53,6 @@ c8fa4838e950832b19ba66266866ea61b005223f data/biomesoplenty/worldgen/biome/snowb da1e2ca3e9713a52d9ed243d551fd3d7c40c7ab1 data/biomesoplenty/worldgen/biome/snowy_coniferous_forest.json b3b83857ff6b14727aa1601f28548eebdc7d4c74 data/biomesoplenty/worldgen/biome/snowy_fir_clearing.json 395105efa433bd42df952ed7ad1a22947f90a65b data/biomesoplenty/worldgen/biome/snowy_maple_woods.json -0a702d4b7e9b0ddbb6a52b528141cec3b077c93e data/biomesoplenty/worldgen/biome/snowy_origin_valley.json 82f90b4ed424d588a7af087fa323a82f71f3bb08 data/biomesoplenty/worldgen/biome/spider_nest.json 02be395480aaa328ec75b2adc7df1692cd2d13a4 data/biomesoplenty/worldgen/biome/tropics.json 89b2556e41798476db1a083ad49d046d3dd2babf data/biomesoplenty/worldgen/biome/tundra.json @@ -64,6 +63,7 @@ b3b83857ff6b14727aa1601f28548eebdc7d4c74 data/biomesoplenty/worldgen/biome/snowy 660cd9538a3ed2b681731e238d4742fb6cc9d96a data/biomesoplenty/worldgen/biome/wasteland.json 24dce7dbd2a39b6aa990fe00ddba94576849144d data/biomesoplenty/worldgen/biome/wasteland_steppe.json 60881c39a86b83d0a6bec725bff78f3cd43b1b3a data/biomesoplenty/worldgen/biome/wetland.json +0a702d4b7e9b0ddbb6a52b528141cec3b077c93e data/biomesoplenty/worldgen/biome/wintry_origin_valley.json 37400e95af1d490848d4ddd1ac2744f75615938e data/biomesoplenty/worldgen/biome/withered_abyss.json 42b8a814841ea7cda61ec115c8264ca9322fc060 data/biomesoplenty/worldgen/biome/woodland.json a4d5101a19a38da4f42164b672b74766edb26bc9 data/biomesoplenty/worldgen/configured_carver/origin_cave.json diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_origin_valley.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/wintry_origin_valley.json similarity index 100% rename from src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_origin_valley.json rename to src/generated/resources/data/biomesoplenty/worldgen/biome/wintry_origin_valley.json diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java index 397eaaf83..baaf6beac 100644 --- a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java +++ b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java @@ -71,7 +71,6 @@ public class BOPBiomes public static final ResourceKey SNOWY_CONIFEROUS_FOREST = registerOverworld("snowy_coniferous_forest"); public static final ResourceKey SNOWY_FIR_CLEARING = registerOverworld("snowy_fir_clearing"); public static final ResourceKey SNOWY_MAPLE_WOODS = registerOverworld("snowy_maple_woods"); - public static final ResourceKey SNOWY_ORIGIN_VALLEY = registerOverworld("snowy_origin_valley"); public static final ResourceKey SPIDER_NEST = register("spider_nest"); public static final ResourceKey TROPICS = registerOverworld("tropics"); public static final ResourceKey TUNDRA = registerOverworld("tundra"); @@ -82,6 +81,7 @@ public class BOPBiomes public static final ResourceKey WASTELAND = registerOverworld("wasteland"); public static final ResourceKey WASTELAND_STEPPE = registerOverworld("wasteland_steppe"); public static final ResourceKey WETLAND = registerOverworld("wetland"); + public static final ResourceKey WINTRY_ORIGIN_VALLEY = registerOverworld("wintry_origin_valley"); public static final ResourceKey WITHERED_ABYSS = register("withered_abyss"); public static final ResourceKey WOODLAND = registerOverworld("woodland"); diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java index 75b8fc209..334800e82 100644 --- a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java +++ b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java @@ -83,12 +83,20 @@ public class BOPOverworldBiomeBuilder {Biomes.FROZEN_OCEAN, Biomes.COLD_OCEAN, Biomes.OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.WARM_OCEAN} }; - private final ResourceKey[][] ISLAND_BIOMES_BOP = new ResourceKey[][]{ - {BOPBiomes.SNOWY_ORIGIN_VALLEY, BOPBiomes.SNOWY_ORIGIN_VALLEY, BOPBiomes.SNOWY_ORIGIN_VALLEY, BOPBiomes.SNOWY_ORIGIN_VALLEY, BOPBiomes.SNOWY_ORIGIN_VALLEY}, - {BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY}, + private final ResourceKey[][] RIVER_BIOMES_BOP = new ResourceKey[][]{ + {null, null, null, null, null}, + {null, null, null, null, null}, {null, null, null, null, null}, - {BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS}, - {BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS} + {null, null, null, BOPBiomes.FLOODPLAIN, BOPBiomes.FLOODPLAIN}, + {null, null, null, null, null} + }; + + private final ResourceKey[][] ISLAND_BIOMES_BOP = new ResourceKey[][]{ + {BOPBiomes.WINTRY_ORIGIN_VALLEY, BOPBiomes.WINTRY_ORIGIN_VALLEY, BOPBiomes.WINTRY_ORIGIN_VALLEY, BOPBiomes.WINTRY_ORIGIN_VALLEY, BOPBiomes.WINTRY_ORIGIN_VALLEY}, + {BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY, BOPBiomes.ORIGIN_VALLEY}, + {null, null, null, null, null}, + {BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS}, + {BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS, BOPBiomes.TROPICS} }; protected final ResourceKey[][] MIDDLE_BIOMES = new ResourceKey[][]{ @@ -419,21 +427,33 @@ protected void addLowSlice(Registry biomeRegistry, Consumer biomeRegistry, Consumer>> mapper, Climate.Parameter weirdness) { this.addSurfaceBiome(mapper, this.FROZEN_RANGE, this.FULL_RANGE, this.coastContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, weirdness.max() < 0L ? Biomes.STONY_SHORE : Biomes.FROZEN_RIVER); - this.addSurfaceBiome(mapper, this.UNFROZEN_RANGE, this.FULL_RANGE, this.coastContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, weirdness.max() < 0L ? Biomes.STONY_SHORE : Biomes.RIVER); this.addSurfaceBiome(mapper, this.FROZEN_RANGE, this.FULL_RANGE, this.nearInlandContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, Biomes.FROZEN_RIVER); - this.addSurfaceBiome(mapper, this.UNFROZEN_RANGE, this.FULL_RANGE, this.nearInlandContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, Biomes.RIVER); this.addSurfaceBiome(mapper, this.FROZEN_RANGE, this.FULL_RANGE, Climate.Parameter.span(this.coastContinentalness, this.farInlandContinentalness), Climate.Parameter.span(this.erosions[2], this.erosions[5]), weirdness, 0.0F, Biomes.FROZEN_RIVER); - this.addSurfaceBiome(mapper, this.UNFROZEN_RANGE, this.FULL_RANGE, Climate.Parameter.span(this.coastContinentalness, this.farInlandContinentalness), Climate.Parameter.span(this.erosions[2], this.erosions[5]), weirdness, 0.0F, Biomes.RIVER); // Coastal watery valleys this.addSurfaceBiome(mapper, this.FROZEN_RANGE, this.FULL_RANGE, this.coastContinentalness, this.erosions[6], weirdness, 0.0F, Biomes.FROZEN_RIVER); - this.addSurfaceBiome(mapper, this.UNFROZEN_RANGE, this.FULL_RANGE, this.coastContinentalness, this.erosions[6], weirdness, 0.0F, Biomes.RIVER); // Inland watery valleys - //Disabled so the Frozen River doesn't cut into the Muskeg/Hot Springs //this.addSurfaceBiome(mapper, this.FROZEN_RANGE, this.FULL_RANGE, Climate.Parameter.span(this.inlandContinentalness, this.farInlandContinentalness), this.erosions[6], weirdness, 0.0F, Biomes.FROZEN_RIVER); + // BOP River biomes + for (int i = 1; i < this.temperatures.length; ++i) + { + Climate.Parameter temperature = this.temperatures[i]; + + for (int j = 0; j < this.humidities.length; ++j) + { + Climate.Parameter humidity = this.humidities[j]; + ResourceKey riverBiomeBOP = this.pickRiverBiomeBOP(biomeRegistry, i, j); + + this.addSurfaceBiome(mapper, temperature, humidity, this.coastContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, weirdness.max() < 0L ? Biomes.STONY_SHORE : riverBiomeBOP); + this.addSurfaceBiome(mapper, temperature, humidity, this.nearInlandContinentalness, Climate.Parameter.span(this.erosions[0], this.erosions[1]), weirdness, 0.0F, riverBiomeBOP); + this.addSurfaceBiome(mapper, temperature, humidity, Climate.Parameter.span(this.coastContinentalness, this.farInlandContinentalness), Climate.Parameter.span(this.erosions[2], this.erosions[5]), weirdness, 0.0F, riverBiomeBOP); + this.addSurfaceBiome(mapper, temperature, humidity, this.coastContinentalness, this.erosions[6], weirdness, 0.0F, riverBiomeBOP); + } + } + for (int i = 0; i < this.temperatures.length; ++i) { Climate.Parameter temperature = this.temperatures[i]; @@ -458,6 +478,11 @@ protected void addUndergroundBiomes(Registry biomeRegistry, Consumer pickRiverBiomeBOP(Registry biomeRegistry, int temperatureIndex, int humidityIndex) + { + return temperatureIndex > 0 ? BiomeUtil.biomeOrFallback(biomeRegistry, this.RIVER_BIOMES_BOP[temperatureIndex][humidityIndex], Biomes.RIVER) : Biomes.FROZEN_RIVER; + } + protected ResourceKey pickIslandBiomeBOP(Registry biomeRegistry, int temperatureIndex, int humidityIndex) { return BiomeUtil.biomeOrFallback(biomeRegistry, this.ISLAND_BIOMES_BOP[temperatureIndex][humidityIndex], Biomes.MUSHROOM_FIELDS); diff --git a/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java index 92ff4b826..179e235d0 100644 --- a/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java +++ b/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java @@ -9,6 +9,7 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Climate; public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder @@ -45,6 +46,14 @@ public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder {null, null, null, null, null} }; + private final ResourceKey[][] RIVER_BIOMES_BOP = new ResourceKey[][]{ + {null, null, null, null, null}, + {null, null, null, null, null}, + {null, null, null, null, null}, + {null, null, null, null, null}, + {BOPBiomes.WASTELAND, BOPBiomes.WASTELAND, BOPBiomes.WASTELAND, BOPBiomes.WASTELAND, BOPBiomes.WASTELAND} + }; + @Override protected ResourceKey pickMiddleBiomeBOP(Registry biomeRegistry, int temperatureIndex, int humidityIndex, Climate.Parameter weirdness) { @@ -63,4 +72,10 @@ protected ResourceKey pickPlateauBiomeBOP(Registry biomeRegistry, if (weirdness.max() < 0L) return BiomeUtil.biomeOrFallback(biomeRegistry, this.PLATEAU_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES[temperatureIndex][humidityIndex]); else return BiomeUtil.biomeOrFallback(biomeRegistry, this.PLATEAU_BIOMES_VARIANT_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES[temperatureIndex][humidityIndex]); } + + @Override + protected ResourceKey pickRiverBiomeBOP(Registry biomeRegistry, int temperatureIndex, int humidityIndex) + { + return BiomeUtil.biomeOrFallback(biomeRegistry, this.RIVER_BIOMES_BOP[temperatureIndex][humidityIndex], Biomes.RIVER); + } } diff --git a/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java b/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java index b8a8c4455..ae3fef163 100644 --- a/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java +++ b/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java @@ -483,7 +483,7 @@ private static SurfaceRules.RuleSource makeBOPRules() SurfaceRules.isBiome(BOPBiomes.MEDITERRANEAN_FOREST), SurfaceRules.ifTrue(surfaceNoiseAbove(1.9D), PODZOL) ), - SurfaceRules.ifTrue(SurfaceRules.isBiome(BOPBiomes.ORIGIN_VALLEY, BOPBiomes.SNOWY_ORIGIN_VALLEY), ORIGIN_GRASS), + SurfaceRules.ifTrue(SurfaceRules.isBiome(BOPBiomes.ORIGIN_VALLEY, BOPBiomes.WINTRY_ORIGIN_VALLEY), ORIGIN_GRASS), SurfaceRules.ifTrue(SurfaceRules.isBiome(BOPBiomes.REDWOOD_FOREST), PODZOL) ) ), diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java index fe471198f..48604249c 100644 --- a/src/main/java/biomesoplenty/init/ModBiomes.java +++ b/src/main/java/biomesoplenty/init/ModBiomes.java @@ -96,7 +96,6 @@ public static void bootstrapBiomes(BootstapContext context) register(context, BOPBiomes.SNOWY_CONIFEROUS_FOREST, BOPOverworldBiomes.coniferousForest(placedFeatureGetter, carverGetter, true)); register(context, BOPBiomes.SNOWY_FIR_CLEARING, BOPOverworldBiomes.firClearing(placedFeatureGetter, carverGetter, true)); register(context, BOPBiomes.SNOWY_MAPLE_WOODS, BOPOverworldBiomes.mapleWoods(placedFeatureGetter, carverGetter, true)); - register(context, BOPBiomes.SNOWY_ORIGIN_VALLEY, BOPOverworldBiomes.originValley(placedFeatureGetter, carverGetter, true)); register(context, BOPBiomes.TROPICS, BOPOverworldBiomes.tropics(placedFeatureGetter, carverGetter)); register(context, BOPBiomes.TUNDRA, BOPOverworldBiomes.tundra(placedFeatureGetter, carverGetter)); register(context, BOPBiomes.VOLCANIC_PLAINS, BOPOverworldBiomes.volcanicPlains(placedFeatureGetter, carverGetter)); @@ -104,6 +103,7 @@ public static void bootstrapBiomes(BootstapContext context) register(context, BOPBiomes.WASTELAND, BOPOverworldBiomes.wasteland(placedFeatureGetter, carverGetter)); register(context, BOPBiomes.WASTELAND_STEPPE, BOPOverworldBiomes.wastelandSteppe(placedFeatureGetter, carverGetter)); register(context, BOPBiomes.WETLAND, BOPOverworldBiomes.wetland(placedFeatureGetter, carverGetter)); + register(context, BOPBiomes.WINTRY_ORIGIN_VALLEY, BOPOverworldBiomes.originValley(placedFeatureGetter, carverGetter, true)); register(context, BOPBiomes.WOODLAND, BOPOverworldBiomes.woodland(placedFeatureGetter, carverGetter, false)); // Cave biomes @@ -169,7 +169,6 @@ private static void registerVillagerTypes() registerVillagerType(BOPBiomes.SNOWY_CONIFEROUS_FOREST, VillagerType.TAIGA); registerVillagerType(BOPBiomes.SNOWY_FIR_CLEARING, VillagerType.TAIGA); registerVillagerType(BOPBiomes.SNOWY_MAPLE_WOODS, VillagerType.TAIGA); - registerVillagerType(BOPBiomes.SNOWY_ORIGIN_VALLEY, VillagerType.PLAINS); registerVillagerType(BOPBiomes.TROPICS, VillagerType.JUNGLE); registerVillagerType(BOPBiomes.TUNDRA, VillagerType.TAIGA); registerVillagerType(BOPBiomes.VOLCANIC_PLAINS, VillagerType.PLAINS); @@ -177,6 +176,7 @@ private static void registerVillagerTypes() registerVillagerType(BOPBiomes.WASTELAND, VillagerType.DESERT); registerVillagerType(BOPBiomes.WASTELAND_STEPPE, VillagerType.DESERT); registerVillagerType(BOPBiomes.WETLAND, VillagerType.SWAMP); + registerVillagerType(BOPBiomes.WINTRY_ORIGIN_VALLEY, VillagerType.PLAINS); registerVillagerType(BOPBiomes.WOODLAND, VillagerType.PLAINS); } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index ea07a72f7..d35a5f1c8 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -60,7 +60,6 @@ "biome.biomesoplenty.snowy_coniferous_forest": "Snowy Coniferous Forest", "biome.biomesoplenty.snowy_fir_clearing": "Snowy Fir Clearing", "biome.biomesoplenty.snowy_maple_woods": "Snowy Maple Woods", - "biome.biomesoplenty.snowy_origin_valley": "Snowy Origin Valley", "biome.biomesoplenty.spider_nest": "Spider Nest", "biome.biomesoplenty.tropics": "Tropics", "biome.biomesoplenty.tundra": "Tundra", @@ -71,6 +70,7 @@ "biome.biomesoplenty.wasteland": "Wasteland", "biome.biomesoplenty.wasteland_steppe": "Wasteland Steppe", "biome.biomesoplenty.wetland": "Wetland", + "biome.biomesoplenty.wintry_origin_valley": "Wintry Origin Valley", "biome.biomesoplenty.withered_abyss": "Withered Abyss", "biome.biomesoplenty.woodland": "Woodland", 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 a7ca7aa65..fd7218660 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json @@ -847,22 +847,6 @@ ] } }, - "snowy_origin_valley": { - "trigger": "minecraft:location", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "location": { - "biome": "biomesoplenty:snowy_origin_valley" - } - } - } - ] - } - }, "spider_nest": { "trigger": "minecraft:location", "conditions": { @@ -1023,6 +1007,22 @@ ] } }, + "wintry_origin_valley": { + "trigger": "minecraft:location", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "biomesoplenty:wintry_origin_valley" + } + } + } + ] + } + }, "withered_abyss": { "trigger": "minecraft:location", "conditions": { @@ -1214,9 +1214,6 @@ "snowy_maple_woods" ], [ - "snowy_origin_valley" - ], - [ "spider_nest" ], [ @@ -1247,6 +1244,9 @@ "wetland" ], [ + "wintry_origin_valley" + ], + [ "withered_abyss" ], [ diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json index 515be6f47..955d5d0a3 100644 --- a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json +++ b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json @@ -846,22 +846,6 @@ ] } }, - "snowy_origin_valley": { - "trigger": "minecraft:location", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "location": { - "biome": "biomesoplenty:snowy_origin_valley" - } - } - } - ] - } - }, "spider_nest": { "trigger": "minecraft:location", "conditions": { @@ -1022,6 +1006,22 @@ ] } }, + "wintry_origin_valley": { + "trigger": "minecraft:location", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "biomesoplenty:wintry_origin_valley" + } + } + } + ] + } + }, "withered_abyss": { "trigger": "minecraft:location", "conditions": { @@ -1109,7 +1109,6 @@ "snowy_coniferous_forest", "snowy_fir_clearing", "snowy_maple_woods", - "snowy_origin_valley", "spider_nest", "tropics", "tundra", @@ -1120,6 +1119,7 @@ "wasteland", "wasteland_steppe", "wetland", + "wintry_origin_valley", "withered_abyss", "woodland" ] diff --git a/src/main/resources/data/forge/tags/worldgen/biome/is_rare.json b/src/main/resources/data/forge/tags/worldgen/biome/is_rare.json index 01592dfbc..00a90fa3b 100644 --- a/src/main/resources/data/forge/tags/worldgen/biome/is_rare.json +++ b/src/main/resources/data/forge/tags/worldgen/biome/is_rare.json @@ -41,10 +41,6 @@ "id": "biomesoplenty:snowblossom_grove", "required": false }, - { - "id": "biomesoplenty:snowy_origin_valley", - "required": false - }, { "id": "biomesoplenty:tropics", "required": false @@ -57,6 +53,10 @@ "id": "biomesoplenty:volcano", "required": false }, + { + "id": "biomesoplenty:wintry_origin_valley", + "required": false + }, { "id": "biomesoplenty:glowing_grotto", "required": false diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/is_overworld.json b/src/main/resources/data/minecraft/tags/worldgen/biome/is_overworld.json index 2bcce331b..37d877878 100644 --- a/src/main/resources/data/minecraft/tags/worldgen/biome/is_overworld.json +++ b/src/main/resources/data/minecraft/tags/worldgen/biome/is_overworld.json @@ -200,10 +200,6 @@ "id": "biomesoplenty:snowy_maple_woods", "required": false }, - { - "id": "biomesoplenty:snowy_origin_valley", - "required": false - }, { "id": "biomesoplenty:spider_nest", "required": false @@ -236,6 +232,10 @@ "id": "biomesoplenty:wetland", "required": false }, + { + "id": "biomesoplenty:wintry_origin_valley", + "required": false + }, { "id": "biomesoplenty:woodland", "required": false diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/mineshaft_blocking.json b/src/main/resources/data/minecraft/tags/worldgen/biome/mineshaft_blocking.json index 2496a2dbd..af3b5c10f 100644 --- a/src/main/resources/data/minecraft/tags/worldgen/biome/mineshaft_blocking.json +++ b/src/main/resources/data/minecraft/tags/worldgen/biome/mineshaft_blocking.json @@ -5,7 +5,7 @@ "required": false }, { - "id": "biomesoplenty:snowy_origin_valley", + "id": "biomesoplenty:wintry_origin_valley", "required": false } ] diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/without_patrol_spawns.json b/src/main/resources/data/minecraft/tags/worldgen/biome/without_patrol_spawns.json index d41fe7429..26e83c458 100644 --- a/src/main/resources/data/minecraft/tags/worldgen/biome/without_patrol_spawns.json +++ b/src/main/resources/data/minecraft/tags/worldgen/biome/without_patrol_spawns.json @@ -5,7 +5,7 @@ "required": false }, { - "id": "biomesoplenty:snowy_origin_valley", + "id": "biomesoplenty:wintry_origin_valley", "required": false }, { diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/without_zombie_sieges.json b/src/main/resources/data/minecraft/tags/worldgen/biome/without_zombie_sieges.json index d41fe7429..26e83c458 100644 --- a/src/main/resources/data/minecraft/tags/worldgen/biome/without_zombie_sieges.json +++ b/src/main/resources/data/minecraft/tags/worldgen/biome/without_zombie_sieges.json @@ -5,7 +5,7 @@ "required": false }, { - "id": "biomesoplenty:snowy_origin_valley", + "id": "biomesoplenty:wintry_origin_valley", "required": false }, { diff --git a/src/main/resources/data/sereneseasons/tags/worldgen/biome/blacklisted_biomes.json b/src/main/resources/data/sereneseasons/tags/worldgen/biome/blacklisted_biomes.json index 6b8a979a2..83495430a 100644 --- a/src/main/resources/data/sereneseasons/tags/worldgen/biome/blacklisted_biomes.json +++ b/src/main/resources/data/sereneseasons/tags/worldgen/biome/blacklisted_biomes.json @@ -17,7 +17,7 @@ "required": false }, { - "id": "biomesoplenty:snowy_origin_valley", + "id": "biomesoplenty:wintry_origin_valley", "required": false } ]