swap surfer entity IDs, fix dino nest structure so it doesn't spawn over water, some other tweaks

config/ftbquests/quests/chapters/space_survival.snbt

@@ -1155,7 +1155,7 @@
 				observe_type: 5
 				timer: 0L
 				title: "{quests.space_survival.surfer.task}"
-				to_observe: "wan_ancient_beasts:surfer"
+				to_observe: "tfg:surfer"
 				type: "observation"
 			}]
 			title: "{quests.space_survival.surfer.title}"

defaultconfigs/createhorsepower-server.toml

@@ -26,7 +26,7 @@
 #Creature Category
 [workers]
 	#Valid "Small" creatures
-	small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "wan_ancient_beasts:surfer"]
+	small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "tfg:surfer"]
 	#Valid "Medium" creatures
 	medium_creatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"]
 	#Valid "Large" creatures

kubejs/data/tfg/loot_tables/chests/cruncher_nest.json

@@ -421,8 +421,8 @@
 			],
 			"rolls": {
 				"type": "minecraft:uniform",
-				"max": 12,
+				"max": 15,
-				"min": 9
+				"min": 12
 			}
 		}
 	]

kubejs/data/tfg/worldgen/biome/mars/amber_edge.json

@@ -165,7 +165,7 @@
 		"water_ambient": [],
 		"water_creature": [
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 3,
 				"minCount": 2,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/amber_hills.json

@@ -30,7 +30,9 @@
 			"tfc:random_empty_hot_spring"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -189,7 +191,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/amber_plains.json

@@ -29,7 +29,9 @@
 			"tfg:mars/terrain/venus_sand_disc"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -190,7 +192,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json

@@ -186,7 +186,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/martian_river.json

@@ -23,12 +23,12 @@
 			"tfc:erosion"
 		],
 		[],
+		[],
+		[],
 		[
-
+			"tfg:mars/terrain/dino_nests"
 		],
 		[],
-		[],
-		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
 		[
@@ -183,7 +183,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 3,
 				"minCount": 2,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json

@@ -163,7 +163,20 @@
 		],
 		"underground_water_creature": [],
 		"water_ambient": [],
-		"water_creature": []
+		"water_creature": [
+			{
+				"type": "wan_ancient_beasts:toxlacanth",
+				"maxCount": 5,
+				"minCount": 2,
+				"weight": 100
+			},
+			{
+				"type": "tfg:surfer",
+				"maxCount": 2,
+				"minCount": 1,
+				"weight": 100
+			}
+		]
 	},
 	"temperature": 0.8
 }

kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json

@@ -30,7 +30,9 @@
 			"tfc:random_empty_hot_spring"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -189,7 +191,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json

@@ -29,7 +29,9 @@
 			"tfg:mars/terrain/venus_sand_disc"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -190,7 +192,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json

@@ -165,7 +165,7 @@
 		"water_ambient": [],
 		"water_creature": [
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 3,
 				"minCount": 2,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json

@@ -30,7 +30,9 @@
 			"tfc:random_empty_hot_spring"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -189,7 +191,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json

@@ -29,7 +29,9 @@
 			"tfg:mars/terrain/venus_sand_disc"
 		],
 		[],
-		[],
+		[
+			"tfg:mars/terrain/dino_nests"
+		],
 		[],
 		"#tfg:mars_veins",
 		"#tfg:mars_underground_decoration",
@@ -190,7 +192,7 @@
 				"weight": 100
 			},
 			{
-				"type": "wan_ancient_beasts:surfer",
+				"type": "tfg:surfer",
 				"maxCount": 2,
 				"minCount": 1,
 				"weight": 100

kubejs/data/tfg/worldgen/configured_feature/mars/terrain/dino_nests.json

@@ -0,0 +1,182 @@
+{
+	"type": "lithostitched:select",
+	"config": {
+		"features": [
+			{
+				"predicate": {
+					"type": "minecraft:matching_blocks",
+					"offset": [ 0, -1, 0 ],
+					"blocks": "ad_astra:venus_sand"
+				},
+				"feature": {
+					"feature": {
+						"type": "lithostitched:structure_template",
+						"config": {
+							"template": "tfg:dino_nests/surfer",
+							"projection": "terrain_matching",
+							"processors": "minecraft:empty"
+						}
+					},
+					"placement": []
+				}
+			},
+			{
+				"predicate": {
+					"type": "minecraft:matching_block_tag",
+					"offset": [ 0, -1, 0 ],
+					"tag": "tfg:mars_soil"
+				},
+				"feature": {
+					"feature": {
+						"type": "lithostitched:weighted_selector",
+						"config": {
+							"features": [
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/cruncher",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/crusher",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/eater",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/glider",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/goober",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/sniffer",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/soarer",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/springling",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/walker",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								},
+								{
+									"weight": 1,
+									"data": {
+										"feature": {
+											"type": "lithostitched:structure_template",
+											"config": {
+												"template": "tfg:dino_nests/wraptor",
+												"projection": "terrain_matching",
+												"processors": "minecraft:empty"
+											}
+										},
+										"placement": []
+									}
+								}
+							]
+						}
+					},
+					"placement": []
+				}
+			}
+		]
+	}
+}

kubejs/data/tfg/worldgen/placed_feature/mars/terrain/dino_nests.json

@@ -0,0 +1,23 @@
+{
+	"feature": "tfg:mars/terrain/dino_nests",
+	"placement": [
+		{
+			"type": "minecraft:rarity_filter",
+			"chance": 150
+		},
+		{
+			"type": "tfc:climate",
+			"min_temperature": -105
+		},
+		{
+			"type": "minecraft:in_square"
+		},
+		{
+			"type": "minecraft:heightmap",
+			"heightmap": "OCEAN_FLOOR_WG"
+		},
+		{
+			"type": "minecraft:biome"
+		}
+	]
+}

kubejs/data/tfg/worldgen/structure/mars/dino_nests.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:jigsaw",
-	"biomes": "#tfg:has_structure/dino_nests",
-	"max_distance_from_center": 1,
-	"project_start_to_heightmap": "OCEAN_FLOOR",
-	"size": 1,
-	"spawn_overrides": {},
-	"start_height": {
-		"absolute": 0
-	},
-	"start_pool": "tfg:mars/dino_nests",
-	"step": "surface_structures",
-	"terrain_adaptation": "none",
-	"use_expansion_hack": false
-}

kubejs/data/tfg/worldgen/structure/mars/surfer_nest.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:jigsaw",
-	"biomes": "#tfg:has_structure/surfer_nest",
-	"max_distance_from_center": 1,
-	"project_start_to_heightmap": "OCEAN_FLOOR",
-	"size": 1,
-	"spawn_overrides": {},
-	"start_height": {
-		"absolute": 0
-	},
-	"start_pool": "tfg:mars/surfer_nest",
-	"step": "surface_structures",
-	"terrain_adaptation": "none",
-	"use_expansion_hack": false
-}

kubejs/data/tfg/worldgen/structure_set/mars/dino_nests.json

@@ -1,17 +0,0 @@
-{
-	"structures": [
-		{
-			"structure": "tfg:mars/dino_nests",
-			"weight": 1
-		}
-	],
-	"placement": {
-		"type": "tfc:climate",
-		"salt": 25635345,
-		"spacing": 10,
-		"separation": 7,
-		"climate": {
-			"min_temperature": -105
-		}
-	}
-}

kubejs/data/tfg/worldgen/structure_set/mars/surfer_nest.json

@@ -1,17 +0,0 @@
-{
-	"structures": [
-		{
-			"structure": "tfg:mars/surfer_nest",
-			"weight": 1
-		}
-	],
-	"placement": {
-		"type": "tfc:climate",
-		"salt": 25635345,
-		"spacing": 25,
-		"separation": 18,
-		"climate": {
-			"min_temperature": -105
-		}
-	}
-}

kubejs/data/tfg/worldgen/template_pool/mars/dino_nests.json

@@ -1,96 +0,0 @@
-{
-	"name": "tfg:mars/dino_nests",
-	"fallback": "minecraft:empty",
-	"elements": [
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/cruncher",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/crusher",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/eater",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/glider",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/goober",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/sniffer",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/soarer",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/springling",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/walker",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		},
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/wraptor",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		}
-	]
-}

kubejs/data/tfg/worldgen/template_pool/mars/surfer_nest.json

@@ -1,15 +0,0 @@
-{
-	"name": "tfg:mars/surfer_nest",
-	"fallback": "minecraft:empty",
-	"elements": [
-		{
-			"weight": 1,
-			"element": {
-				"location": "tfg:dino_nests/surfer",
-				"projection": "terrain_matching",
-				"processors": "minecraft:empty",
-				"element_type": "minecraft:single_pool_element"
-			}
-		}
-	]
-}

kubejs/server_scripts/ad_astra/tags.js

@@ -414,14 +414,6 @@ const registerAdAstraBiomeTags = (event) => {
 	event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_dunes')
 	event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_deep_desert')
 
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/amber_plains')
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/rusticus_plains')
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/sangnum_plains')
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/amber_hills')
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/rusticus_hills')
-	event.add('tfg:has_structure/dino_nests', 'tfg:mars/sangnum_hills')
-	event.add('tfg:has_structure/surfer_nest', 'tfg:mars/martian_river')
-
 	event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_dunes')
 	event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_deep_desert')
 	event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_mountains')
@@ -489,7 +481,7 @@ const registerAdAstraEntityTypeTags = (event) => {
 		'wan_ancient_beasts:soarer',
 		'wan_ancient_beasts:glider',
 		'wan_ancient_beasts:toxlacanth',
-		'wan_ancient_beasts:surfer'
+		'tfg:surfer'
 	]
 
 	COLD_ENTITIES.forEach(entity => {
@@ -520,7 +512,7 @@ const registerAdAstraEntityTypeTags = (event) => {
 	event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer')
 	event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider')
 	// swimming mobs
-	event.add('tfg:ignores_gravity', 'wan_ancient_beasts:surfer')
+	event.add('tfg:ignores_gravity', 'tfg:surfer')
 	event.add('tfg:ignores_gravity', 'wan_ancient_beasts:toxlacanth')
 }
 

kubejs/server_scripts/wan_ancient_beasts/loot.js

@@ -57,12 +57,12 @@ function registerWansAncientBeastsLoots(event) {
 		.addWeightedLoot([5, 7], ['wan_ancient_beasts:raw_ancient_meat'])
 
 		
-	event.addEntityLootModifier('wan_ancient_beasts:surfer')
+	event.addEntityLootModifier('tfg:surfer')
 		.addLoot('tfc:medium_raw_hide')
 		.addWeightedLoot([1, 3], ['minecraft:bone'])
 		.addWeightedLoot([6, 8], ['tfg:food/raw_surfer_steak'])
 
-	event.addEntityLootModifier('wan_ancient_beasts:surfer')
+	event.addEntityLootModifier('tfg:surfer')
 		.matchMainHand('#forge:tools/butchery_knives')
 		.addWeightedLoot([3, 4], ['tfg:food/raw_surfer_steak'])
 }

kubejs/startup_scripts/wan_ancient_beasts/constants.js

@@ -22,18 +22,11 @@ global.WAB_DISABLED_ITEMS = [
 	'wan_ancient_beasts:suspicious_red_sand',
 	'wan_ancient_beasts:suspicious_ice',
 	'wan_ancient_beasts:chisel',
-	//'wan_ancient_beasts:eater_tooth',
 	'wan_ancient_beasts:ancient_club',
-	//'wan_ancient_beasts:crusher_spike',
 	'wan_ancient_beasts:ancient_upgrade_smithing_template',
-	//'wan_ancient_beasts:glider_feather',
 	'wan_ancient_beasts:hang_glider',
 	//'wan_ancient_beasts:surfer_armor',
 	'wan_ancient_beasts:frozen_ancient_meat',
-	//'wan_ancient_beasts:raw_ancient_meat',
-	//'wan_ancient_beasts:cooked_ancient_meat',
-	//'wan_ancient_beasts:sniff_armor_trim_smithing_template',
-	//'wan_ancient_beasts:spike_armor_trim_smithing_template',
 	'wan_ancient_beasts:jaw_pottery_sherd',
 	'wan_ancient_beasts:spike_pottery_sherd',
 	'wan_ancient_beasts:stroll_pottery_sherd',