Re-added Gravel Beaches

Glitchfiend · Nov 28, 2023 · 2b22b05 · 2b22b05
1 parent c7ca7f3
commit 2b22b05
Show file tree

Hide file tree

Showing 15 changed files with 243 additions and 11 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.2	2023-11-27T18:37:14.4728628	Registries
+// 1.20.2	2023-11-27T22:19:35.2465614	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
 b8dc803c8b669f1676bca4cf741dd201cf95119e data/biomesoplenty/worldgen/biome/aspen_forest.json
@@ -21,6 +21,7 @@ a9636d9d8c3cbbb4afcf2f57615b9762318e87e1 data/biomesoplenty/worldgen/biome/fores
 b50746f2c174b41608eaf7b9a4ea927ed2ac0a03 data/biomesoplenty/worldgen/biome/fungal_jungle.json
 d9000040ce4407e603b2089bb386181a6f4c4427 data/biomesoplenty/worldgen/biome/glowing_grotto.json
 7a1c57597ceed578a6a9ad29bb5475d766eeb4ed data/biomesoplenty/worldgen/biome/grassland.json
+72776c2315490fac1ed59c279df1a47b09ab6130 data/biomesoplenty/worldgen/biome/gravel_beach.json
 c60852465ebacbddccba4c8a3ecc7fc7c958ece2 data/biomesoplenty/worldgen/biome/highland.json
 95bfe311c5f232012863d1047022f609d6c26cee data/biomesoplenty/worldgen/biome/hot_springs.json
 4154a4e77331837da4b3db36a98c5c017d279853 data/biomesoplenty/worldgen/biome/jacaranda_forest.json

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/gravel_beach.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/gravel_beach.json
@@ -0,0 +1,154 @@
+{
+  "carvers": {
+    "air": [
+      "minecraft:cave",
+      "minecraft:cave_extra_underground",
+      "minecraft:canyon"
+    ]
+  },
+  "downfall": 0.5,
+  "effects": {
+    "fog_color": 12638463,
+    "mood_sound": {
+      "block_search_extent": 8,
+      "offset": 2.0,
+      "sound": "minecraft:ambient.cave",
+      "tick_delay": 6000
+    },
+    "sky_color": 8037887,
+    "water_color": 4020182,
+    "water_fog_color": 329011
+  },
+  "features": [
+    [],
+    [
+      "minecraft:lake_lava_underground",
+      "minecraft:lake_lava_surface"
+    ],
+    [
+      "minecraft:amethyst_geode"
+    ],
+    [
+      "minecraft:monster_room",
+      "minecraft:monster_room_deep"
+    ],
+    [],
+    [],
+    [
+      "minecraft:ore_dirt",
+      "minecraft:ore_gravel",
+      "minecraft:ore_granite_upper",
+      "minecraft:ore_granite_lower",
+      "minecraft:ore_diorite_upper",
+      "minecraft:ore_diorite_lower",
+      "minecraft:ore_andesite_upper",
+      "minecraft:ore_andesite_lower",
+      "minecraft:ore_tuff",
+      "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:ore_lapis",
+      "minecraft:ore_lapis_buried",
+      "minecraft:ore_copper",
+      "minecraft:underwater_magma",
+      "minecraft:disk_clay"
+    ],
+    [],
+    [
+      "minecraft:spring_water",
+      "minecraft:spring_lava"
+    ],
+    [
+      "minecraft:glow_lichen"
+    ],
+    [
+      "minecraft:freeze_top_layer"
+    ]
+  ],
+  "has_precipitation": true,
+  "spawn_costs": {},
+  "spawners": {
+    "ambient": [
+      {
+        "type": "minecraft:bat",
+        "maxCount": 8,
+        "minCount": 8,
+        "weight": 10
+      }
+    ],
+    "axolotls": [],
+    "creature": [],
+    "misc": [],
+    "monster": [
+      {
+        "type": "minecraft:spider",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 100
+      },
+      {
+        "type": "minecraft:zombie",
+        "maxCount": 4,
+        "minCount": 4,
+        "weight": 95
+      },
+      {
+        "type": "minecraft:zombie_villager",
+        "maxCount": 1,
+        "minCount": 1,
+        "weight": 5
+      },
+      {
+        "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
+      },
+      {
+        "type": "minecraft:enderman",
+        "maxCount": 4,
+        "minCount": 1,
+        "weight": 10
+      },
+      {
+        "type": "minecraft:witch",
+        "maxCount": 1,
+        "minCount": 1,
+        "weight": 5
+      }
+    ],
+    "underground_water_creature": [
+      {
+        "type": "minecraft:glow_squid",
+        "maxCount": 6,
+        "minCount": 4,
+        "weight": 10
+      }
+    ],
+    "water_ambient": [],
+    "water_creature": []
+  },
+  "temperature": 0.6
+}
diff --git a/src/main/java/biomesoplenty/api/biome/BOPBiomes.java b/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
@@ -39,6 +39,7 @@ public class BOPBiomes
     public static final ResourceKey<Biome> FUNGAL_JUNGLE = registerOverworld("fungal_jungle");
     public static final ResourceKey<Biome> GLOWING_GROTTO = register("glowing_grotto");
     public static final ResourceKey<Biome> GRASSLAND = registerOverworld("grassland");
+    public static final ResourceKey<Biome> GRAVEL_BEACH = registerOverworld("gravel_beach");
     public static final ResourceKey<Biome> HIGHLAND = registerOverworld("highland");
     public static final ResourceKey<Biome> HOT_SPRINGS = registerOverworld("hot_springs");
     public static final ResourceKey<Biome> JACARANDA_FOREST = registerOverworld("jacaranda_forest");

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java
@@ -218,11 +218,11 @@ public class BOPOverworldBiomeBuilder
     };
 
     protected final ResourceKey<Biome>[][] BEACH_BIOMES_BOP = new ResourceKey[][]{
-            {Biomes.SNOWY_BEACH,   Biomes.SNOWY_BEACH,   Biomes.SNOWY_BEACH,    Biomes.SNOWY_BEACH,    Biomes.SNOWY_BEACH},
-            {Biomes.BEACH,         Biomes.BEACH,         Biomes.BEACH,          Biomes.BEACH,          Biomes.BEACH},
-            {BOPBiomes.DUNE_BEACH, BOPBiomes.DUNE_BEACH, BOPBiomes.DUNE_BEACH,  Biomes.BEACH,          Biomes.BEACH},
-            {Biomes.BEACH,         Biomes.BEACH,         Biomes.BEACH,          BOPBiomes.FLOODPLAIN,  BOPBiomes.FLOODPLAIN},
-            {BOPBiomes.DRYLAND,    BOPBiomes.DRYLAND,    BOPBiomes.LUSH_DESERT, BOPBiomes.LUSH_DESERT, BOPBiomes.LUSH_DESERT}
+            {Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH},
+            {BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH},
+            {BOPBiomes.DUNE_BEACH,   BOPBiomes.DUNE_BEACH,   BOPBiomes.DUNE_BEACH,   Biomes.BEACH,           Biomes.BEACH},
+            {Biomes.BEACH,           Biomes.BEACH,           Biomes.BEACH,           BOPBiomes.FLOODPLAIN,   BOPBiomes.FLOODPLAIN},
+            {BOPBiomes.DRYLAND,      BOPBiomes.DRYLAND,      BOPBiomes.LUSH_DESERT,  BOPBiomes.LUSH_DESERT,  BOPBiomes.LUSH_DESERT}
     };
 
     protected final ResourceKey<Biome>[][] STONY_SHORES_BIOMES_BOP = new ResourceKey[][]{

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java
@@ -548,6 +548,21 @@ public static Biome grassland(HolderGetter<PlacedFeature> placedFeatureGetter, H
         return biomeWithColorOverrides(true, 0.6F, 0.9F, 0x5EBF6A, 0x55BC71, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
     }
 
+    public static Biome gravelBeach(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
+    {
+        // Mob spawns
+        MobSpawnSettings.Builder spawnBuilder = new MobSpawnSettings.Builder();
+        BiomeDefaultFeatures.commonSpawns(spawnBuilder);
+
+        // Biome features
+        BiomeGenerationSettings.Builder biomeBuilder = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
+        globalOverworldGeneration(biomeBuilder);
+        BiomeDefaultFeatures.addDefaultOres(biomeBuilder);
+        addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY);
+
+        return biome(true, 0.6F, 0.5F, 4020182, 329011, spawnBuilder, biomeBuilder, NORMAL_MUSIC);
+    }
+
     public static Biome highland(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)
     {
         // Mob spawns

diff --git a/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPSecondaryOverworldBiomeBuilder.java
@@ -63,11 +63,11 @@ public class BOPSecondaryOverworldBiomeBuilder extends BOPOverworldBiomeBuilder
     };
 
     private final ResourceKey<Biome>[][] BEACH_BIOMES_BOP = new ResourceKey[][]{
-            {Biomes.SNOWY_BEACH,             Biomes.SNOWY_BEACH,             Biomes.SNOWY_BEACH,   Biomes.SNOWY_BEACH,   Biomes.BEACH},
-            {Biomes.BEACH,                   Biomes.BEACH,                   Biomes.BEACH,         Biomes.BEACH,         Biomes.BEACH},
-            {BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH, Biomes.BEACH,         Biomes.BEACH},
-            {BOPBiomes.MEDITERRANEAN_FOREST, BOPBiomes.MEDITERRANEAN_FOREST, Biomes.BEACH,         BOPBiomes.FLOODPLAIN, BOPBiomes.VOLCANIC_PLAINS},
-            {BOPBiomes.WASTELAND,            BOPBiomes.WASTELAND,            BOPBiomes.WASTELAND,  BOPBiomes.WASTELAND,  BOPBiomes.WASTELAND}
+            {BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH,         Biomes.SNOWY_BEACH,     Biomes.SNOWY_BEACH,     BOPBiomes.GRAVEL_BEACH},
+            {BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH,         BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH, BOPBiomes.GRAVEL_BEACH},
+            {BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH,           BOPBiomes.DUNE_BEACH,   Biomes.BEACH,           Biomes.BEACH},
+            {BOPBiomes.MEDITERRANEAN_FOREST, BOPBiomes.MEDITERRANEAN_FOREST, Biomes.BEACH,           BOPBiomes.FLOODPLAIN,   BOPBiomes.VOLCANIC_PLAINS},
+            {BOPBiomes.WASTELAND,            BOPBiomes.WASTELAND,            BOPBiomes.WASTELAND,    BOPBiomes.WASTELAND,    BOPBiomes.WASTELAND}
     };
 
     private final ResourceKey<Biome>[][] STONY_SHORES_BIOMES_BOP = new ResourceKey[][]{

diff --git a/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java b/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java
@@ -383,6 +383,11 @@ private static SurfaceRules.RuleSource makeBOPRules()
                 SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, STONE)
         );
 
+        SurfaceRules.RuleSource gravelBeachSurface = SurfaceRules.sequence(
+                SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(isAbove63, AIR), SurfaceRules.sequence(SurfaceRules.ifTrue(isAbove62, WATER), GRAVEL))),
+                SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, GRAVEL)
+        );
+
         SurfaceRules.RuleSource mixedLushDesertSurface = SurfaceRules.sequence(
             SurfaceRules.ifTrue(surfaceNoiseAbove(1.9D), ORANGE_SANDSTONE),
             ORANGE_SAND
@@ -514,6 +519,7 @@ private static SurfaceRules.RuleSource makeBOPRules()
                     volcanoSurface
                 )
             ),
+            SurfaceRules.ifTrue(SurfaceRules.isBiome(BOPBiomes.GRAVEL_BEACH), gravelBeachSurface),
             SurfaceRules.ifTrue(
                 SurfaceRules.isBiome(BOPBiomes.ROCKY_SHRUBLAND),
                 SurfaceRules.ifTrue(surfaceNoiseAbove(1.7D), STONE)

diff --git a/src/main/java/biomesoplenty/init/ModBiomes.java b/src/main/java/biomesoplenty/init/ModBiomes.java
@@ -64,6 +64,7 @@ public static void bootstrapBiomes(BootstapContext<Biome> context)
         register(context, BOPBiomes.FORESTED_FIELD, BOPOverworldBiomes.field(placedFeatureGetter, carverGetter, true));
         register(context, BOPBiomes.FUNGAL_JUNGLE, BOPOverworldBiomes.fungalJungle(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.GRASSLAND, BOPOverworldBiomes.grassland(placedFeatureGetter, carverGetter));
+        register(context, BOPBiomes.GRAVEL_BEACH, BOPOverworldBiomes.gravelBeach(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.HIGHLAND, BOPOverworldBiomes.highland(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.HOT_SPRINGS, BOPOverworldBiomes.hotSprings(placedFeatureGetter, carverGetter));
         register(context, BOPBiomes.JACARANDA_FOREST, BOPOverworldBiomes.jacarandaForest(placedFeatureGetter, carverGetter));
@@ -137,6 +138,7 @@ private static void registerVillagerTypes()
         registerVillagerType(BOPBiomes.FORESTED_FIELD, VillagerType.TAIGA);
         registerVillagerType(BOPBiomes.FUNGAL_JUNGLE, VillagerType.JUNGLE);
         registerVillagerType(BOPBiomes.GRASSLAND, VillagerType.PLAINS);
+        registerVillagerType(BOPBiomes.GRAVEL_BEACH, VillagerType.PLAINS);
         registerVillagerType(BOPBiomes.HIGHLAND, VillagerType.PLAINS);
         registerVillagerType(BOPBiomes.HOT_SPRINGS, VillagerType.TAIGA);
         registerVillagerType(BOPBiomes.JACARANDA_FOREST, VillagerType.PLAINS);

diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json
@@ -28,6 +28,7 @@
   "biome.biomesoplenty.fungal_jungle": "Fungal Jungle",
   "biome.biomesoplenty.glowing_grotto": "Glowing Grotto",
   "biome.biomesoplenty.grassland": "Grassland",
+  "biome.biomesoplenty.gravel_beach": "Gravel Beach",
   "biome.biomesoplenty.highland": "Highland",
   "biome.biomesoplenty.hot_springs": "Hot Springs",
   "biome.biomesoplenty.jacaranda_forest": "Jacaranda Forest",

diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/all_biomes.json
@@ -335,6 +335,22 @@
 			]
 		  }
         },
+		"gravel_beach": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"player": [
+					{
+						"condition": "minecraft:entity_properties",
+						"entity": "this",
+						"predicate": {
+							"location": {
+								"biome": "biomesoplenty:gravel_beach"
+							}
+						}
+					}
+				]
+			}
+		},
 		"highland": {
             "trigger": "minecraft:location",
             "conditions": {
@@ -1118,6 +1134,9 @@
 		"grassland"
 		],
 		[
+		"gravel_beach"
+		],
+		[
 		"highland"
 		],
 		[

diff --git a/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json b/src/main/resources/data/biomesoplenty/advancements/biomesoplenty/root.json
@@ -334,6 +334,22 @@
 			]
 		  }
         },
+		"gravel_beach": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"player": [
+					{
+						"condition": "minecraft:entity_properties",
+						"entity": "this",
+						"predicate": {
+							"location": {
+								"biome": "biomesoplenty:gravel_beach"
+							}
+						}
+					}
+				]
+			}
+		},
 		"highland": {
             "trigger": "minecraft:location",
             "conditions": {
@@ -1077,6 +1093,7 @@
 		"fungal_jungle",
 		"glowing_grotto",
 		"grassland",
+		"gravel_beach",
 		"highland",
 		"hot_springs",
 		"jacaranda_forest",

diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json b/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json
@@ -4,6 +4,10 @@
     {
       "id": "biomesoplenty:dune_beach",
       "required": false
+    },
+    {
+      "id": "biomesoplenty:gravel_beach",
+      "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
@@ -72,6 +72,10 @@
       "id": "biomesoplenty:grassland",
       "required": false
     },
+    {
+      "id": "biomesoplenty:gravel_beach",
+      "required": false
+    },
     {
       "id": "biomesoplenty:highland",
       "required": false

diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/stronghold_biased_to.json b/src/main/resources/data/minecraft/tags/worldgen/biome/stronghold_biased_to.json
@@ -72,6 +72,10 @@
       "id": "biomesoplenty:grassland",
       "required": false
     },
+    {
+      "id": "biomesoplenty:gravel_beach",
+      "required": false
+    },
     {
       "id": "biomesoplenty:highland",
       "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
@@ -11,6 +11,10 @@
 	{
       "id": "biomesoplenty:dune_beach",
       "required": false
+    },
+    {
+      "id": "biomesoplenty:gravel_beach",
+      "required": false
     },
 	{
       "id": "biomesoplenty:origin_valley",