diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index 1f9ff41ac..b99de52cf 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -1,5 +1,5 @@ { - "type": "ad_astra:mars", + "type": "tfg:mars", "generator": { "type": "kubejs_tfc:wrapped", "event_key": "mars", diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index de25ba301..2600b4020 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -1,5 +1,5 @@ { - "type": "ad_astra:venus", + "type": "tfg:venus", "generator": { "type": "minecraft:noise", "settings": "tfg:venus_noise", diff --git a/kubejs/data/tfg/dimension_type/mars.json b/kubejs/data/tfg/dimension_type/mars.json index 77b975cc5..a87932a6b 100644 --- a/kubejs/data/tfg/dimension_type/mars.json +++ b/kubejs/data/tfg/dimension_type/mars.json @@ -9,7 +9,7 @@ "height": 384, "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, - "min_y": -64, + "min_y": -32, "monster_spawn_block_light_limit": 0, "monster_spawn_light_level": { "type": "minecraft:uniform", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 555239dc9..f8a400b2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -62,10 +62,46 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 3, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index ffce07547..cf11f53bf 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -65,10 +65,52 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 555239dc9..39fceacc2 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -62,10 +62,40 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "species:wraptor", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 4, + "minCount": 2, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 3dca99a4a..1da76f314 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -62,7 +62,30 @@ "creature": [], "misc": [], "monster": [ - + { + "type": "species:quake", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 20 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 50 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 5078d11a8..69e0e53c0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -61,10 +61,46 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 2, + "minCount": 1, + "weight": 75 + }, + { + "type": "species:wraptor", + "maxCount": 2, + "minCount": 1, + "weight": 75 + }, + { + "type": "species:goober", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index 555239dc9..a7e2e6ae5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -62,10 +62,46 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 1, + "minCount": 1, + "weight": 50 + }, + { + "type": "species:wraptor", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "species:goober", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 555239dc9..f8a400b2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -62,10 +62,46 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 3, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index ffce07547..cf11f53bf 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -65,10 +65,52 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 555239dc9..f8a400b2f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -62,10 +62,46 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 3, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index ffce07547..cf11f53bf 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -65,10 +65,52 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "minecraft:sniffer", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:wraptor", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "species:springling", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } + ], "misc": [], "monster": [ - + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:badlands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + } ], "underground_water_creature": [], "water_ambient": [], diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 410408400..d7290c722 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -295,8 +295,8 @@ const registerAdAstraBiomeTags = (event) => { const registerAdAstraEntityTypeTags = (event) => { - // moon - const MOON_ENTITIES = [ + const COLD_ENTITIES = [ + // moon 'tfc:rat', 'tfg:moon_rabbit', 'minecraft:enderman', @@ -311,16 +311,26 @@ const registerAdAstraEntityTypeTags = (event) => { 'endermanoverhaul:spirit', 'endermanoverhaul:end_enderman', 'endermanoverhaul:end_islands_enderman', + + 'minecraft:sniffer', + 'species:wraptor', + 'species:goober', + 'species:cruncher', + 'species:springling', + 'species:quake', + 'endermanoverhaul:crimson_forest_enderman', + 'endermanoverhaul:warped_forest_enderman', + 'endermanoverhaul:badlands_enderman' ] - MOON_ENTITIES.forEach(entity => { + COLD_ENTITIES.forEach(entity => { event.add('ad_astra:can_survive_extreme_cold', entity) event.add('ad_astra:lives_without_oxygen', entity) }) event.add('tfc:deals_crushing_damage', 'minecraft:enderman') - event.add('tfc:deals_crushing_damage', 'minecraft:skeleton') + event.add('tfc:deals_crushing_damage', 'minecraft:stray') event.add('tfc:deals_crushing_damage', 'endermanoverhaul:windswept_hills_enderman') event.add('tfc:deals_crushing_damage', 'endermanoverhaul:soulsand_valley_enderman') event.add('tfc:deals_piercing_damage', 'endermanoverhaul:end_enderman') diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 7f06e70f8..ead489dd8 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -152,4 +152,6 @@ const registerMinecraftBlockTags = (event) => { event.add('tfg:brick_walls', 'minecraft:blackstone_wall') //#region + + event.removeAll('minecraft:sniffer_diggable_block') } \ No newline at end of file diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 3b710f52c..7fa969ebb 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -5,6 +5,8 @@ const registerSpeciesBlockTags = (event) => { event.removeAllTagsFrom(block) event.add('c:hidden_from_recipe_viewers', block) }) + + event.removeAll('species:wraptor_nesting_blocks') } const registerSpeciesItemTags = (event) => {