Added Snowy Origin Valley biome, tweaked Origin Grass Block model

Glitchfiend · Nov 26, 2023 · 017e427 · 017e427
1 parent 56694b4
commit 017e427
Show file tree

Hide file tree

Showing 20 changed files with 225 additions and 35 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.2	2023-11-26T14:17:11.7868921	Registries
+// 1.20.2	2023-11-26T16:02:56.6910887	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
 b8dc803c8b669f1676bca4cf741dd201cf95119e data/biomesoplenty/worldgen/biome/aspen_forest.json
@@ -53,6 +53,7 @@ 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

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_origin_valley.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/snowy_origin_valley.json
@@ -0,0 +1,136 @@
+{
+  "carvers": {
+    "air": "biomesoplenty:origin_cave"
+  },
+  "downfall": 0.6,
+  "effects": {
+    "fog_color": 12638463,
+    "foliage_color": 3866368,
+    "grass_color": 10157919,
+    "mood_sound": {
+      "block_search_extent": 8,
+      "offset": 2.0,
+      "sound": "minecraft:ambient.cave",
+      "tick_delay": 6000
+    },
+    "music": {
+      "max_delay": 24000,
+      "min_delay": 12000,
+      "replace_current_music": false,
+      "sound": "biomesoplenty:music.overworld.origin_valley"
+    },
+    "sky_color": 8961023,
+    "water_color": 2110207,
+    "water_fog_color": 329011
+  },
+  "features": [
+    [],
+    [],
+    [],
+    [
+      "minecraft:monster_room",
+      "minecraft:monster_room_deep"
+    ],
+    [],
+    [],
+    [
+      "minecraft:ore_dirt",
+      "minecraft:ore_gravel",
+      "minecraft:ore_coal_upper",
+      "minecraft:ore_coal_lower",
+      "minecraft:ore_iron_upper",
+      "minecraft:ore_iron_middle",
+      "minecraft:ore_iron_small",
+      "minecraft:ore_gold",
+      "minecraft:ore_gold_lower",
+      "minecraft:ore_redstone",
+      "minecraft:ore_redstone_lower",
+      "minecraft:ore_diamond",
+      "minecraft:ore_diamond_medium",
+      "minecraft:ore_diamond_large",
+      "minecraft:ore_diamond_buried"
+    ],
+    [],
+    [
+      "minecraft:spring_water",
+      "minecraft:spring_lava"
+    ],
+    [
+      "minecraft:patch_sugar_cane",
+      "biomesoplenty:trees_origin_valley",
+      "biomesoplenty:flower_origin_valley"
+    ],
+    [
+      "minecraft:freeze_top_layer"
+    ]
+  ],
+  "has_precipitation": true,
+  "spawn_costs": {},
+  "spawners": {
+    "ambient": [],
+    "axolotls": [],
+    "creature": [
+      {
+        "type": "minecraft:sheep",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 12
+      },
+      {
+        "type": "minecraft:pig",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:chicken",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:cow",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 8
+      }
+    ],
+    "misc": [],
+    "monster": [
+      {
+        "type": "minecraft:spider",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 100
+      },
+      {
+        "type": "minecraft:zombie",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 95
+      },
+      {
+        "type": "minecraft:skeleton",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 100
+      },
+      {
+        "type": "minecraft:creeper",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 100
+      },
+      {
+        "type": "minecraft:slime",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 100
+      }
+    ],
+    "underground_water_creature": [],
+    "water_ambient": [],
+    "water_creature": []
+  },
+  "temperature": -0.25
+}
diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
@@ -71,6 +71,7 @@ public class BOPBiomes
     public static final ResourceKey<Biome> SNOWY_CONIFEROUS_FOREST = registerOverworld("snowy_coniferous_forest");
     public static final ResourceKey<Biome> SNOWY_FIR_CLEARING = registerOverworld("snowy_fir_clearing");
     public static final ResourceKey<Biome> SNOWY_MAPLE_WOODS = registerOverworld("snowy_maple_woods");
+    public static final ResourceKey<Biome> SNOWY_ORIGIN_VALLEY = registerOverworld("snowy_origin_valley");
     public static final ResourceKey<Biome> SPIDER_NEST = register("spider_nest");
     public static final ResourceKey<Biome> TROPICS = registerOverworld("tropics");
     public static final ResourceKey<Biome> TUNDRA = registerOverworld("tundra");

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java
@@ -84,11 +84,11 @@ public class BOPOverworldBiomeBuilder
     };
 
     private final ResourceKey<Biome>[][] ISLAND_BIOMES_BOP = new ResourceKey[][]{
-            {null,                            null,                            null,                    null,                    null},
-            {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}
+            {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},
+            {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<Biome>[][] MIDDLE_BIOMES = new ResourceKey[][]{

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java
@@ -946,7 +946,7 @@ public static Biome orchard(HolderGetter<PlacedFeature> placedFeatureGetter, Hol
         return biomeWithColorOverrides(true, 0.8F, 0.4F, 0xA9DB69, 0xC9F75D, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
     }
 
-    public static Biome originValley(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
+    public static Biome originValley(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter, boolean snowy)
     {
         // Mob spawns
         MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
@@ -982,7 +982,14 @@ public static Biome originValley(HolderGetter<PlacedFeature> placedFeatureGetter
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_ORIGIN_VALLEY);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_ORIGIN_VALLEY);
 
-        return biomeWithColorOverrides(true, 0.6F, 0.6F, 0x2032FF, 0x050533, 0xC0D8FF, 0x9AFF5F, 0x3AFF00, 0x88BBFF, spawnBuilder, biomeBuilder, Musics.createGameMusic(BOPSounds.MUSIC_BIOME_ORIGIN_VALLEY.getHolder().orElseThrow()));
+        if (!snowy)
+        {
+            return biomeWithColorOverrides(true, 0.6F, 0.6F, 0x2032FF, 0x050533, 0xC0D8FF, 0x9AFF5F, 0x3AFF00, 0x88BBFF, spawnBuilder, biomeBuilder, Musics.createGameMusic(BOPSounds.MUSIC_BIOME_ORIGIN_VALLEY.getHolder().orElseThrow()));
+        }
+        else
+        {
+            return biomeWithColorOverrides(true, -0.25F, 0.6F, 0x2032FF, 0x050533, 0xC0D8FF, 0x9AFF5F, 0x3AFF00, 0x88BBFF, spawnBuilder, biomeBuilder, Musics.createGameMusic(BOPSounds.MUSIC_BIOME_ORIGIN_VALLEY.getHolder().orElseThrow()));
+        }
     }
 
     public static Biome pasture(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)

diff --git 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), ORIGIN_GRASS),
+                            SurfaceRules.ifTrue(SurfaceRules.isBiome(BOPBiomes.ORIGIN_VALLEY, BOPBiomes.SNOWY_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
@@ -81,7 +81,7 @@ public static void bootstrapBiomes(BootstapContext<Biome> context)
         register(context, BOPBiomes.OLD_GROWTH_WOODLAND, BOPOverworldBiomes.woodland(placedFeatureGetter, carverGetter, true));
         register(context, BOPBiomes.OMINOUS_WOODS, BOPOverworldBiomes.ominousWoods(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.ORCHARD, BOPOverworldBiomes.orchard(placedFeatureGetter, carverGetter));
-        register(context, BOPBiomes.ORIGIN_VALLEY, BOPOverworldBiomes.originValley(placedFeatureGetter, carverGetter));
+        register(context, BOPBiomes.ORIGIN_VALLEY, BOPOverworldBiomes.originValley(placedFeatureGetter, carverGetter, false));
         register(context, BOPBiomes.PASTURE, BOPOverworldBiomes.pasture(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.PRAIRIE, BOPOverworldBiomes.prairie(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.PUMPKIN_PATCH, BOPOverworldBiomes.pumpkinPatch(placedFeatureGetter, carverGetter));
@@ -96,6 +96,7 @@ public static void bootstrapBiomes(BootstapContext<Biome> 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));
@@ -168,6 +169,7 @@ 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);

diff --git a/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json
@@ -1,24 +1,6 @@
 {
   "variants": {
-    "snowy=false": [
-      {
-        "model": "biomesoplenty:block/origin_grass_block"
-      },
-      {
-        "model": "biomesoplenty:block/origin_grass_block",
-        "y": 90
-      },
-      {
-        "model": "biomesoplenty:block/origin_grass_block",
-        "y": 180
-      },
-      {
-        "model": "biomesoplenty:block/origin_grass_block",
-        "y": 270
-      }
-    ],
-    "snowy=true": {
-      "model": "biomesoplenty:block/origin_grass_block_snow"
-    }
+    "snowy=false": { "model": "biomesoplenty:block/origin_grass_block" },
+    "snowy=true": { "model": "biomesoplenty:block/origin_grass_block_snow" }
   }
 }
diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json
@@ -60,6 +60,7 @@
   "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",

diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json
@@ -3,7 +3,7 @@
   "textures": {
     "top": "biomesoplenty:block/origin_grass_block_top",
     "bottom": "minecraft:block/dirt",
-    "side": "minecraft:block/grass_block_snow",
+    "side": "biomesoplenty:block/origin_grass_block_snow",
     "particle": "minecraft:block/dirt"
   }
 }
diff --git a/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_snow.png b/src/main/resources/assets/biomesoplenty/textures/block/origin_grass_block_snow.png
diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json
@@ -847,6 +847,22 @@
 			]
 		  }
         },
+		"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": {
@@ -1198,6 +1214,9 @@
 		"snowy_maple_woods"
 		],
 		[
+		"snowy_origin_valley"
+		],
+		[
 		"spider_nest"
 		],
 		[

diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json
@@ -846,6 +846,22 @@
 			]
 		  }
         },
+		"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": {
@@ -1093,6 +1109,7 @@
 		"snowy_coniferous_forest",
 		"snowy_fir_clearing",
 		"snowy_maple_woods",
+		"snowy_origin_valley",
 		"spider_nest",
 		"tropics",
 		"tundra",

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
@@ -41,6 +41,10 @@
             "id": "biomesoplenty:snowblossom_grove",
             "required": false
         },
+        {
+            "id": "biomesoplenty:snowy_origin_valley",
+            "required": false
+        },
         {
             "id": "biomesoplenty:tropics",
             "required": false

diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/has_closer_water_fog.json b/src/main/resources/data/minecraft/tags/worldgen/biome/has_closer_water_fog.json
@@ -27,10 +27,6 @@
     {
       "id": "biomesoplenty:ominous_woods",
       "required": false
-    },
-	{
-      "id": "biomesoplenty:origin_valley",
-      "required": false
     },
     {
       "id": "biomesoplenty:rainforest",

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
@@ -200,6 +200,10 @@
       "id": "biomesoplenty:snowy_maple_woods",
       "required": false
     },
+    {
+      "id": "biomesoplenty:snowy_origin_valley",
+      "required": false
+    },
     {
       "id": "biomesoplenty:spider_nest",
       "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
@@ -3,6 +3,10 @@
     {
       "id": "biomesoplenty:origin_valley",
       "required": false
+    },
+    {
+      "id": "biomesoplenty:snowy_origin_valley",
+      "required": false
     }
   ]
 }