From feda38112dfffded4b3f94f38f0f52707405fdd6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 5 Nov 2025 01:08:18 +0000 Subject: [PATCH] Feature/venus noise (#2165) * initial pass of venus stuff * more * typo * venus mob hp/armor? adjustments * temp biomes to figure out where everything is, starting work on noises * almost there * fix glacio visibility on the menu * more beachy * biome renames * biomes in the constant * had to turn off cheese caves cuz they kept fucking up the terrain * added random y rotation to all cobble/gravel/hardened * ok I think I'm done with noise for now, caves still need work --- config/ad_astra.jsonc | 2 +- .../blockstates/rock/cobble_blackstone.json | 9 +- .../blockstates/rock/cobble_crackrack.json | 20 +- .../blockstates/rock/cobble_dripstone.json | 20 +- .../rock/cobble_moon_deepslate.json | 20 +- .../blockstates/rock/cobble_permafrost.json | 20 +- .../blockstates/rock/gravel_blackstone.json | 20 +- .../blockstates/rock/gravel_crackrack.json | 20 +- .../blockstates/rock/gravel_deepslate.json | 20 +- .../blockstates/rock/gravel_dripstone.json | 20 +- .../tfg/blockstates/rock/gravel_glacio.json | 20 +- .../tfg/blockstates/rock/gravel_mars.json | 20 +- .../tfg/blockstates/rock/gravel_mercury.json | 20 +- .../tfg/blockstates/rock/gravel_moon.json | 20 +- .../rock/gravel_moon_deepslate.json | 20 +- .../blockstates/rock/gravel_permafrost.json | 20 +- .../blockstates/rock/gravel_red_granite.json | 20 +- .../tfg/blockstates/rock/gravel_venus.json | 20 +- .../assets/tfg/blockstates/rock/halite.json | 21 + .../assets/tfg/blockstates/rock/halite2.json | 21 + .../blockstates/rock/hardened_blackstone.json | 20 +- .../blockstates/rock/hardened_deepslate.json | 12 +- .../blockstates/rock/hardened_dripstone.json | 20 +- .../rock/hardened_glacio_stone.json | 20 +- .../blockstates/rock/hardened_mars_stone.json | 20 +- .../rock/hardened_mercury_stone.json | 20 +- .../rock/hardened_moon_deepslate.json | 20 +- .../blockstates/rock/hardened_moon_stone.json | 20 +- .../rock/hardened_red_granite.json | 20 +- .../rock/hardened_venus_stone.json | 20 +- .../assets/tfg/models/block/rock/halite.json | 6 + .../assets/tfg/models/block/rock/halite2.json | 6 + kubejs/assets/tfg/textures/block/halite.png | Bin 0 -> 930 bytes kubejs/data/ad_astra/dimension/glacio.json | 2 +- kubejs/data/ad_astra/dimension/venus.json | 852 ++++++- .../data/ad_astra/planets/glacio_orbit.json | 2 +- .../tfg/worldgen/biome/venus/arachnoids.json | 116 + .../data/tfg/worldgen/biome/venus/beach.json | 116 + .../worldgen/biome/venus/fractured_pools.json | 112 + .../tfg/worldgen/biome/venus/fumaroles.json | 116 + .../tfg/worldgen/biome/venus/geysers.json | 116 + .../biome/venus/jagged_tablelands.json | 116 + .../tfg/worldgen/biome/venus/salt_flats.json | 116 + .../biome/venus/stromatolite_beach.json | 118 + .../worldgen/biome/venus/sulfuric_ravine.json | 116 + .../tfg/worldgen/biome/venus/venus_delta.json | 46 - .../biome/venus/venus_fractured_lands.json | 30 - .../biome/venus/volcanic_mountains.json | 116 + .../venus/terrain/lake_basalt_gravel.json | 35 - .../venus/terrain/lake_basalt_stone.json | 37 - .../venus/terrain/lake_geyserite.json | 38 - .../venus/terrain/lake_orange_sand.json | 39 - .../venus/terrain/lake_yellow_sand.json | 34 - .../venus/terrain/lakes.json | 24 +- .../venus/terrain/lava_delta.json | 2 +- .../venus/terrain/stromatolite_disk.json | 48 +- .../density_function/venus/base_3d_noise.json | 8 + .../venus/caves/entrances.json | 83 + .../density_function/venus/caves/noodle.json | 94 + .../density_function/venus/caves/pillars.json | 50 + .../venus/caves/spaghetti_2d.json | 61 + .../spaghetti_2d_thickness_modulator.json | 17 + .../caves/spaghetti_roughness_function.json | 33 + .../density_function/venus/continents.json | 12 + .../density_function/venus/depth.json | 11 + .../density_function/venus/erosion.json | 12 + .../density_function/venus/factor.json | 185 ++ .../density_function/venus/jaggedness.json | 303 +++ .../density_function/venus/offset.json | 1865 ++++++++++++++ .../density_function/venus/ridges.json | 12 + .../density_function/venus/ridges_folded.json | 19 + .../density_function/venus/sloped_cheese.json | 32 + .../data/tfg/worldgen/noise/venus_salt.json | 11 + .../worldgen/noise_settings/glacio_noise.json | 2 +- .../worldgen/noise_settings/venus_noise.json | 2235 ++++++++++++----- .../venus/terrain/lake_basalt_gravel.json | 34 - .../venus/terrain/lake_basalt_stone.json | 34 - .../venus/terrain/lake_geyserite.json | 34 - .../venus/terrain/lake_orange_sand.json | 38 - .../venus/terrain/lake_yellow_sand.json | 38 - .../venus/underground/loose_rocks.json | 44 + .../underground/noise_cave_stalagmite.json | 51 + .../underground/noise_cave_stalagtite.json | 51 + kubejs/server_scripts/ad_astra/tags.js | 105 +- kubejs/server_scripts/tfg/entities.js | 84 +- kubejs/server_scripts/tfg/events.chunks.js | 47 + kubejs/server_scripts/tfg/recipes.collapse.js | 7 + kubejs/server_scripts/tfg/tags.js | 7 + kubejs/startup_scripts/tfg/blocks.nether.js | 82 +- kubejs/startup_scripts/tfg/blocks.space.js | 33 +- kubejs/startup_scripts/tfg/constants.js | 15 + .../startup_scripts/tfg/register_climates.js | 2 + 92 files changed, 7421 insertions(+), 1254 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/rock/halite.json create mode 100644 kubejs/assets/tfg/blockstates/rock/halite2.json create mode 100644 kubejs/assets/tfg/models/block/rock/halite.json create mode 100644 kubejs/assets/tfg/models/block/rock/halite2.json create mode 100644 kubejs/assets/tfg/textures/block/halite.png create mode 100644 kubejs/data/tfg/worldgen/biome/venus/arachnoids.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/beach.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/fumaroles.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/geysers.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/salt_flats.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json delete mode 100644 kubejs/data/tfg/worldgen/biome/venus/venus_delta.json delete mode 100644 kubejs/data/tfg/worldgen/biome/venus/venus_fractured_lands.json create mode 100644 kubejs/data/tfg/worldgen/biome/venus/volcanic_mountains.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_gravel.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_basalt_stone.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_geyserite.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_orange_sand.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lake_yellow_sand.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/base_3d_noise.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/entrances.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/noodle.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/pillars.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/spaghetti_2d.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/spaghetti_2d_thickness_modulator.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/caves/spaghetti_roughness_function.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/continents.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/depth.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/erosion.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/factor.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/jaggedness.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/offset.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/ridges.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/ridges_folded.json create mode 100644 kubejs/data/tfg/worldgen/density_function/venus/sloped_cheese.json create mode 100644 kubejs/data/tfg/worldgen/noise/venus_salt.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_gravel.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_basalt_stone.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_geyserite.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_orange_sand.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lake_yellow_sand.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/underground/loose_rocks.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/underground/noise_cave_stalagmite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/underground/noise_cave_stalagtite.json diff --git a/config/ad_astra.jsonc b/config/ad_astra.jsonc index 05dfe308f..38ab7b500 100644 --- a/config/ad_astra.jsonc +++ b/config/ad_astra.jsonc @@ -16,7 +16,7 @@ */ "atmosphereLeave": 600, // A comma-separated list of planet IDs that should be hidden from the planets screen. e.g. minecraft:overworld,ad_astra:moon,ad_astra:mars,ad_astra:venus,ad_astra:mercury,ad_astra:glacio - "disabledPlanets": "ad_astra:glacio", + "disabledPlanets": "", // Disables oxygen damage. "disableOxygen": false, // Disables temperature damage. diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json b/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json index 9322f89aa..9b2384d8b 100644 --- a/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json +++ b/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "tfg:block/rock/cobble_blackstone" - } + "": [ + { "model": "tfg:block/rock/cobble_blackstone" }, + { "model": "tfg:block/rock/cobble_blackstone", "y": 90 }, + { "model": "tfg:block/rock/cobble_blackstone", "y": 180 }, + { "model": "tfg:block/rock/cobble_blackstone", "y": 270 } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json b/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json index a8af00981..2128313bc 100644 --- a/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json +++ b/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/cobble_crackrack" - } + "": [ + { + "model": "tfg:block/rock/cobble_crackrack" + }, + { + "model": "tfg:block/rock/cobble_crackrack", + "y": 90 + }, + { + "model": "tfg:block/rock/cobble_crackrack", + "y": 180 + }, + { + "model": "tfg:block/rock/cobble_crackrack", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json b/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json index 7e4bb7c74..a50d1280f 100644 --- a/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json +++ b/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/cobble_dripstone" - } + "": [ + { + "model": "tfg:block/rock/cobble_dripstone" + }, + { + "model": "tfg:block/rock/cobble_dripstone", + "y": 90 + }, + { + "model": "tfg:block/rock/cobble_dripstone", + "y": 180 + }, + { + "model": "tfg:block/rock/cobble_dripstone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json index 4f72b9333..1ea0f8879 100644 --- a/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json +++ b/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/cobble_moon_deepslate" - } + "": [ + { + "model": "tfg:block/rock/cobble_moon_deepslate" + }, + { + "model": "tfg:block/rock/cobble_moon_deepslate", + "y": 90 + }, + { + "model": "tfg:block/rock/cobble_moon_deepslate", + "y": 180 + }, + { + "model": "tfg:block/rock/cobble_moon_deepslate", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json b/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json index 56363869d..2b555c09d 100644 --- a/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json +++ b/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/cobble_permafrost" - } + "": [ + { + "model": "tfg:block/rock/cobble_permafrost" + }, + { + "model": "tfg:block/rock/cobble_permafrost", + "y": 90 + }, + { + "model": "tfg:block/rock/cobble_permafrost", + "y": 180 + }, + { + "model": "tfg:block/rock/cobble_permafrost", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json b/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json index e769228fe..11a7e5568 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_blackstone" - } + "": [ + { + "model": "tfg:block/rock/gravel_blackstone" + }, + { + "model": "tfg:block/rock/gravel_blackstone", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_blackstone", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_blackstone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json b/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json index c10b6e510..bfcb58199 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_crackrack" - } + "": [ + { + "model": "tfg:block/rock/gravel_crackrack" + }, + { + "model": "tfg:block/rock/gravel_crackrack", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_crackrack", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_crackrack", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json b/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json index 640736aee..d4e19d02d 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_deepslate" - } + "": [ + { + "model": "tfg:block/rock/gravel_deepslate" + }, + { + "model": "tfg:block/rock/gravel_deepslate", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_deepslate", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_deepslate", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json b/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json index 7a2db502e..7ad196329 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_dripstone" - } + "": [ + { + "model": "tfg:block/rock/gravel_dripstone" + }, + { + "model": "tfg:block/rock/gravel_dripstone", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_dripstone", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_dripstone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json b/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json index e167ee620..3ab37165c 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_glacio" - } + "": [ + { + "model": "tfg:block/rock/gravel_glacio" + }, + { + "model": "tfg:block/rock/gravel_glacio", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_glacio", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_glacio", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_mars.json b/kubejs/assets/tfg/blockstates/rock/gravel_mars.json index 1185ce5ae..6f59bc48c 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_mars.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_mars.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_mars" - } + "": [ + { + "model": "tfg:block/rock/gravel_mars" + }, + { + "model": "tfg:block/rock/gravel_mars", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_mars", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_mars", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json b/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json index 8c62c0b65..b5fa5b871 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_mercury" - } + "": [ + { + "model": "tfg:block/rock/gravel_mercury" + }, + { + "model": "tfg:block/rock/gravel_mercury", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_mercury", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_mercury", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_moon.json b/kubejs/assets/tfg/blockstates/rock/gravel_moon.json index 9a5fa93f9..e321fda8d 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_moon.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_moon.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_moon" - } + "": [ + { + "model": "tfg:block/rock/gravel_moon" + }, + { + "model": "tfg:block/rock/gravel_moon", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_moon", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_moon", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json index 004ac267c..684c5dc26 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_moon_deepslate" - } + "": [ + { + "model": "tfg:block/rock/gravel_moon_deepslate" + }, + { + "model": "tfg:block/rock/gravel_moon_deepslate", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_moon_deepslate", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_moon_deepslate", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json b/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json index f8718974d..7c4c4ccf2 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_permafrost" - } + "": [ + { + "model": "tfg:block/rock/gravel_permafrost" + }, + { + "model": "tfg:block/rock/gravel_permafrost", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_permafrost", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_permafrost", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json b/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json index 4d87c4591..5f7507c0d 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_red_granite" - } + "": [ + { + "model": "tfg:block/rock/gravel_red_granite" + }, + { + "model": "tfg:block/rock/gravel_red_granite", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_red_granite", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_red_granite", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_venus.json b/kubejs/assets/tfg/blockstates/rock/gravel_venus.json index 6b76d8654..fbee5aaa5 100644 --- a/kubejs/assets/tfg/blockstates/rock/gravel_venus.json +++ b/kubejs/assets/tfg/blockstates/rock/gravel_venus.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/gravel_venus" - } + "": [ + { + "model": "tfg:block/rock/gravel_venus" + }, + { + "model": "tfg:block/rock/gravel_venus", + "y": 90 + }, + { + "model": "tfg:block/rock/gravel_venus", + "y": 180 + }, + { + "model": "tfg:block/rock/gravel_venus", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/halite.json b/kubejs/assets/tfg/blockstates/rock/halite.json new file mode 100644 index 000000000..16caaacf8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/halite.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "tfg:block/rock/halite" + }, + { + "model": "tfg:block/rock/halite", + "y": 90 + }, + { + "model": "tfg:block/rock/halite", + "y": 180 + }, + { + "model": "tfg:block/rock/halite", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/halite2.json b/kubejs/assets/tfg/blockstates/rock/halite2.json new file mode 100644 index 000000000..e488b49d3 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/halite2.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "tfg:block/rock/halite2" + }, + { + "model": "tfg:block/rock/halite2", + "y": 90 + }, + { + "model": "tfg:block/rock/halite2", + "y": 180 + }, + { + "model": "tfg:block/rock/halite2", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_blackstone.json b/kubejs/assets/tfg/blockstates/rock/hardened_blackstone.json index 0153cfc28..ec66ea081 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_blackstone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_blackstone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_blackstone" - } + "": [ + { + "model": "tfg:block/rock/hardened_blackstone" + }, + { + "model": "tfg:block/rock/hardened_blackstone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_blackstone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_blackstone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_deepslate.json b/kubejs/assets/tfg/blockstates/rock/hardened_deepslate.json index 779a6b7dc..8bafc6278 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_deepslate.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_deepslate.json @@ -1,7 +1,13 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_deepslate" - } + "": [ + { + "model": "tfg:block/rock/hardened_deepslate" + }, + { + "model": "tfg:block/rock/hardened_deepslate", + "y": 180 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_dripstone.json b/kubejs/assets/tfg/blockstates/rock/hardened_dripstone.json index 385621096..7f7d85558 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_dripstone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_dripstone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_dripstone" - } + "": [ + { + "model": "tfg:block/rock/hardened_dripstone" + }, + { + "model": "tfg:block/rock/hardened_dripstone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_dripstone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_dripstone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json index 299b79753..892d1df08 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_glacio_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_glacio_stone" - } + "": [ + { + "model": "tfg:block/rock/hardened_glacio_stone" + }, + { + "model": "tfg:block/rock/hardened_glacio_stone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_glacio_stone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_glacio_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json index 195ba8628..26bca5e62 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_mars_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_mars_stone" - } + "": [ + { + "model": "tfg:block/rock/hardened_mars_stone" + }, + { + "model": "tfg:block/rock/hardened_mars_stone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_mars_stone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_mars_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json index 7e73a534b..3f52469ea 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_mercury_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_mercury_stone" - } + "": [ + { + "model": "tfg:block/rock/hardened_mercury_stone" + }, + { + "model": "tfg:block/rock/hardened_mercury_stone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_mercury_stone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_mercury_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json index 7a7e2cfb0..a169dfdfa 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_moon_deepslate.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_moon_deepslate" - } + "": [ + { + "model": "tfg:block/rock/hardened_moon_deepslate" + }, + { + "model": "tfg:block/rock/hardened_moon_deepslate", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_moon_deepslate", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_moon_deepslate", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json index b553dca3e..b10af23d5 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_moon_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_moon_stone" - } + "": [ + { + "model": "tfg:block/rock/hardened_moon_stone" + }, + { + "model": "tfg:block/rock/hardened_moon_stone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_moon_stone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_moon_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_red_granite.json b/kubejs/assets/tfg/blockstates/rock/hardened_red_granite.json index ae062d2ae..cf33b0390 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_red_granite.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_red_granite.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_red_granite" - } + "": [ + { + "model": "tfg:block/rock/hardened_red_granite" + }, + { + "model": "tfg:block/rock/hardened_red_granite", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_red_granite", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_red_granite", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json b/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json index 9c3b52771..fae42973a 100644 --- a/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json +++ b/kubejs/assets/tfg/blockstates/rock/hardened_venus_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "tfg:block/rock/hardened_venus_stone" - } + "": [ + { + "model": "tfg:block/rock/hardened_venus_stone" + }, + { + "model": "tfg:block/rock/hardened_venus_stone", + "y": 90 + }, + { + "model": "tfg:block/rock/hardened_venus_stone", + "y": 180 + }, + { + "model": "tfg:block/rock/hardened_venus_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/halite.json b/kubejs/assets/tfg/models/block/rock/halite.json new file mode 100644 index 000000000..7ebfae8a4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/halite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/halite" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/halite2.json b/kubejs/assets/tfg/models/block/rock/halite2.json new file mode 100644 index 000000000..9aa438c6c --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/halite2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfc:block/ore/halite" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/halite.png b/kubejs/assets/tfg/textures/block/halite.png new file mode 100644 index 0000000000000000000000000000000000000000..2a114b8e2f05f4ad4f655f28b72405c97da5bf5b GIT binary patch literal 930 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7TQi-V13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(OtfRjWx?*$tC@aOB0stu;5z9 z%5E>VnosZCE~_0}O%K>R7EhkMsC&wf{Yx$=9czAEw`ceF9o6g=vqP6j*a|l+npI^b zC|>k4RPh6sJ)7VmfkjHjTT;>txvzgL<>!xopJa3T@16OJCjSp9u+4{?iaX9X_ongVXI27?NhH$+^}F>$_~F`5l$V&P7xN56^om+e2!#U;MC3cIdyl?(Sjy>})nm=v4pnGBavoF`~ z9e>F@Vd=VQ`3=p^32R(#zSevH?(Ms`_l@8Ft7GVsD%$k*p;r+D1LF-(7sn8b-rUK) z>sJ|wxQZ`f$vUhY$Nou(U4`%OfBUEB_H;7OpVlalvp}L_k7Mro_lqxoo3r`*t>qU# zR>Uy$%ssi3!6EzfzF!G1c)YbP-1<~Jm!Y8ENssl|xi5EJ));l3O3^SYV|(!W%7!IP zXVaRsgx0-1@|W|em3q~V#8n<0x3cQF!cJ}92C@qY6?iZQ;Vt41J zDGV!ogv_T~omf{E&2X%4!Okm=W)AkZ3_`PC>-0>k@MQh2zOdkh&xd!a{BsjG-~901 zu*|K(ey2#yTqy>=cG>N>c^eiQFWh-bCCXfe&-z#$gG0s7RUU_qzI>DOG^pUJScB2l z#G>Mrk)nQ)dzPFF-+KE}%&P}m->b2&^0*N$FJWzcLcif&+MDFh2KN_#`S$A~ink4U}0>8$olpS2l! zrW^N5SUE>}g-pEAKdo-do%wtP%fb|U%O@}#`u%n{XK0Q6hgA`W- { event.add('minecraft:animals_spawnable_on', '#tfg:mars_soil') event.add('minecraft:animals_spawnable_on', '#tfg:mars_plants') event.add('minecraft:valid_spawn', '#minecraft:animals_spawnable_on') + + // Venus + event.add('ad_astra:venus_stone_replaceables', 'ad_astra:venus_stone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_venus_stone') + event.add('ad_astra:venus_stone_replaceables', 'gtceu:red_granite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_red_granite') + event.add('ad_astra:venus_stone_replaceables', 'ad_astra:moon_deepslate') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_moon_deepslate') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:deepslate') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_deepslate') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:dripstone_block') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_dripstone') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/granite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/granite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/diorite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/diorite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/gabbro') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/gabbro') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/basalt') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/basalt') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/rhyolite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/andesite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/dacite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/dacite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/slate') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/slate') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/schist') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/schist') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/gneiss') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/gneiss') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/phyllite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/phyllite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/quartzite') + event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/quartzite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/blue') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/blue') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/green') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/green') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/brown') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/brown') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/orange') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/orange') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/white') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/white') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/yellow') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/yellow') + event.add('ad_astra:venus_stone_replaceables', 'tfg:geyser_slurry') + event.add('ad_astra:venus_stone_replaceables', 'tfg:sulfur_fumes') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:lava') + event.add('ad_astra:venus_stone_replaceables', 'create:scoria') + event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') + event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') event.add('tfc:can_carve', '#ad_astra:moon_stone_replaceables') event.add('tfc:can_carve', '#ad_astra:mars_stone_replaceables') + event.add('tfc:can_carve', '#ad_astra:venus_stone_replaceables') event.add('minecraft:rabbits_spawnable_on', '#ad_astra:moon_stone_replaceables') event.add('species:limpet_spawnable_on', '#ad_astra:moon_stone_replaceables') @@ -411,6 +464,11 @@ const registerAdAstraBiomeTags = (event) => { event.add('tfg:mars_biomes', biome) }) + global.VENUS_BIOMES.forEach(biome => { + event.add('tfg:venus_biomes', biome); + event.add('ad_astra:has_acid_rain', biome); + }) + event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_dunes') event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_deep_desert') @@ -488,16 +546,29 @@ const registerAdAstraEntityTypeTags = (event) => { 'endermanoverhaul:snowy_enderman', 'endermanoverhaul:ice_spikes_enderman', 'species:deepfish', - 'species:leaf_hanger', + 'species:leaf_hanger' + ] + + const HOT_ENTITIES = [ + // venus + 'minecraft:enderman', + "endermanoverhaul:desert_enderman", + "endermanoverhaul:savanna_enderman", + "endermanoverhaul:nether_wastes_enderman", + "ad_astra:sulfur_creeper", 'species:cliff_hanger', ] COLD_ENTITIES.forEach(entity => { - event.add('ad_astra:can_survive_extreme_cold', entity) event.add('ad_astra:lives_without_oxygen', entity) }) + HOT_ENTITIES.forEach(entity => { + event.add('ad_astra:can_survive_extreme_heat', entity) + event.add('ad_astra:lives_without_oxygen', entity) + }) + event.add('ad_astra:can_survive_in_space', 'railways:conductor') event.add('tfc:deals_crushing_damage', 'minecraft:enderman') @@ -654,20 +725,26 @@ const registerAdAstraPlacedFeatures = (event) => { //#endregion //#region Venus - event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/geyser_source_patch') - event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_cluster_patch') - event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_tower') + event.add('tfg:venus_beach_surface_features', 'tfg:venus/surface/geyser_source_patch') + event.add('tfg:venus_beach_surface_features', 'tfg:venus/surface/stromatolite_cluster_patch') + event.add('tfg:venus_beach_surface_features', 'tfg:venus/surface/stromatolite_tower') - event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/hot_spring_delta') - event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/lava_delta') - event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/stromatolite_disk') + event.add('tfg:venus_beach_terrain_features', 'tfg:venus/terrain/hot_spring_delta') + //event.add('tfg:venus_beach_terrain_features', 'tfg:venus/terrain/lava_delta') + event.add('tfg:venus_beach_terrain_features', 'tfg:venus/terrain/stromatolite_disk') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lakes') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_basalt_gravel') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_basalt_stone') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_geyserite') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_orange_sand') - event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_yellow_sand') + //event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lakes') + + // Underground decoration + event.add("tfg:venus_underground_decoration", "tfg:glow_lichen") + event.add('tfg:venus_underground_decoration', 'tfg:venus/underground/loose_rocks') + event.add('tfg:venus_underground_decoration', 'tfc:cave_spike') + event.add('tfg:venus_underground_decoration', 'tfc:cave_column') + event.add('tfg:venus_underground_decoration', 'tfc:large_cave_spike') + event.add('tfg:venus_underground_decoration', 'tfg:venus/underground/noise_cave_stalagmite') + event.add('tfg:venus_underground_decoration', 'tfg:venus/underground/noise_cave_stalagtite') + + event.add("tfg:venus_top_layer_modification", "tfc:surface_loose_rocks") //#endregion //#region Glacio diff --git a/kubejs/server_scripts/tfg/entities.js b/kubejs/server_scripts/tfg/entities.js index 88aa8fe1e..491aee336 100644 --- a/kubejs/server_scripts/tfg/entities.js +++ b/kubejs/server_scripts/tfg/entities.js @@ -3,11 +3,12 @@ const NEW_MOB_MAX_HP = { // moon mobs - "endermanoverhaul:end_enderman": 50 , + "endermanoverhaul:end_enderman": 50, "endermanoverhaul:end_islands_enderman": 120, "endermanoverhaul:windswept_hills_enderman": 70, "endermanoverhaul:soulsand_valley_enderman": 80, - // mars mobs -- wan's ancient beasts has its own config for this + + // mars mobs -- wan's ancient beasts has its own config for this (also includes sniffer) "endermanoverhaul:crimson_enderman": 60, "endermanoverhaul:warped_enderman": 60, "endermanoverhaul:badlands_enderman": 65, @@ -15,30 +16,85 @@ const NEW_MOB_MAX_HP = { "ad_astra:martian_raptor": 50, "tfg:glacian_ram": 50, "tfg:wraptor": 60, - // sniffer uses the value in wan's ancient beasts config "species:goober": 100, "species:stackatick": 20, "species:springling": 60, "species:quake": 130, - "species:cruncher": 1200 -} + "species:cruncher": 1200, + + // venus mobs + "endermanoverhaul:savanna_enderman": 65, + "endermanoverhaul:desert_enderman": 70, + "ad_astra:sulfur_creeper": 60, + "species:cliff_hanger": 75, + + // europa mobs + "endermanoverhaul:ice_spikes_enderman": 85, + "endermanoverhaul:snowy_enderman": 80, + "endermanoverhaul:coral_enderman": 80, + "species:leaf_hanger": 85, +}; + +const NEW_MOB_ARMOR = { + // mars + "endermanoverhaul:crimson_enderman": 2, + "endermanoverhaul:warped_enderman": 2, + "endermanoverhaul:badlands_enderman": 2, + "species:quake": 6, + + // venus + "endermanoverhaul:savanna_enderman": 4, + "endermanoverhaul:desert_enderman": 4, + "endermanoverhaul:nether_wastes_enderman": 2, + "ad_astra:sulfur_creeper": 4, + "species:cliff_hanger": 2, +}; + + +// Easier to just keep all entities in here for balancing instead of spreading them around EntityEvents.spawned((event) => { - - // Easier to just keep all entities in here for balancing instead of spreading them around - - let { entity, entity: {type} } = event; + let { entity, entity: { type }, level, level: { dimension } } = event; let newHP = NEW_MOB_MAX_HP[type] ?? 0; + + // Special cases + if (type === "minecraft:enderman") { + switch (dimension) { + // use default for beneath + case "ad_astra:moon": newHP = 45; + case "ad_astra:mars": newHP = 55; + case "ad_astra:venus": newHP = 65; + case "ad_astra:mercury": newHP = 65; + case "ad_astra:glacio": newHP = 75; + } + } + else if (type === "endermanoverhaul:nether_wastes_enderman") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHP = 70; + } + } + if (newHP === 0) return; - let baseHealth = entity.maxHealth; - let missingHealth = newHP - baseHealth; + + let baseHealth = entity.maxHealth; + let missingHealth = newHP - baseHealth; entity.modifyAttribute("minecraft:generic.max_health", "tfg_health_buff_id", missingHealth, "addition"); - if (missingHealth > 0) { - entity.health += missingHealth; - } + if (missingHealth > 0) { + entity.health += missingHealth; + } + + + let newArmor = NEW_MOB_ARMOR[type] ?? 0; + if (newArmor === 0) + return; + + let baseArmor = entity.armor; + let missingArmor = newArmor - baseArmor; + entity.modifyAttribute("minecraft:generic.armor", "tfg_armor_buff_id", missingArmor, "addition"); }) \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index b8cc0d71e..1caa80b20 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -130,6 +130,53 @@ TFCEvents.createChunkDataProvider('mars', event => { }); }) +TFCEvents.createChunkDataProvider('venus', event => { + event.partial((data, chunk) => { + let x = chunk.pos.minBlockX; + let z = chunk.pos.minBlockZ; + + const avgTemp1 = calcAverage(z, global.VENUS_PLANET_SIZE, 0, 100) + const avgTemp2 = calcAverage(z + 15, global.VENUS_PLANET_SIZE, 0, 100) + const avgRain1 = calcAverage(x, global.VENUS_PLANET_SIZE, 0, 100) + const avgRain2 = calcAverage(x + 15, global.VENUS_PLANET_SIZE, 0, 100) + + let rain = TFC.misc.lerpFloatLayer( + avgRain1 + rainLayer.noise(x, z), + avgRain1 + rainLayer.noise(x, z + 15), + avgRain2 + rainLayer.noise(x + 15, z), + avgRain2 + rainLayer.noise(x + 15, z + 15) + ); + let temp = TFC.misc.lerpFloatLayer( + avgTemp1 + tempLayer.noise(x, z), + avgTemp1 + tempLayer.noise(x, z + 15), + avgTemp2 + tempLayer.noise(x + 15, z), + avgTemp2 + tempLayer.noise(x + 15, z + 15) + ); + + data.generatePartial( + rain, + temp, + floatToForestType(forestLayerNoise.noise(x, z)), + forestWeirdnessNoise.noise(x, z), // forest weirdness + forestDensityNoise.noise(x, z) // forest density + ); + }); + + event.full((data, chunk) => { + let heights = []; + for (let z = 0; z < 16; z++) { + for (let x = 0; x < 16; x++) { + heights[x + 16 * z] = chunk.getHeight($HeightMap.Types.OCEAN_FLOOR_WG, x, z); + } + } + data.generateFull(heights, EMPTY_AQUIFER); + }); + + event.rocks((x, y, z, surfaceY, cache, rockSettings) => { + return rockSettings.sampleAtLayer(rockLayer.getAt(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT); + }); +}) + TFCEvents.createChunkDataProvider('glacio', event => { event.partial((data, chunk) => { let x = chunk.pos.minBlockX; diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 707fe1360..a61d69a52 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -112,6 +112,13 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.landslide('tfc:red_kaolin_clay', 'tfg:grass/amber_kaolin_mycelium') event.recipes.tfc.landslide('tfc:red_kaolin_clay', 'tfg:grass/rusticus_kaolin_mycelium') event.recipes.tfc.landslide('tfc:red_kaolin_clay', 'tfg:grass/sangnum_kaolin_mycelium') + + event.recipes.tfc.landslide('tfg:sand/fluorapatite/blue', 'tfg:sand/fluorapatite/blue') + event.recipes.tfc.landslide('tfg:sand/fluorapatite/green', 'tfg:sand/fluorapatite/green') + event.recipes.tfc.landslide('tfg:sand/fluorapatite/brown', 'tfg:sand/fluorapatite/brown') + event.recipes.tfc.landslide('tfg:sand/fluorapatite/orange', 'tfg:sand/fluorapatite/orange') + event.recipes.tfc.landslide('tfg:sand/fluorapatite/white', 'tfg:sand/fluorapatite/white') + event.recipes.tfc.landslide('tfg:sand/fluorapatite/yellow', 'tfg:sand/fluorapatite/yellow') // #endregion // #region Other diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index dcb09bde2..528dd870a 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -652,6 +652,13 @@ const registerTFGBlockTags = (event) => { event.add('minecraft:mineable/shovel', 'tfg:pile/mars_sand_covering') event.add('minecraft:mineable/shovel', 'tfg:pile/venus_sand_covering') event.add('minecraft:mineable/shovel', 'tfg:pile/hematitic_sand_covering') + + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/blue') + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/green') + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/brown') + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/orange') + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/white') + event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/yellow') } //#endregion diff --git a/kubejs/startup_scripts/tfg/blocks.nether.js b/kubejs/startup_scripts/tfg/blocks.nether.js index c5fd2c975..765b3b6e2 100644 --- a/kubejs/startup_scripts/tfg/blocks.nether.js +++ b/kubejs/startup_scripts/tfg/blocks.nether.js @@ -39,7 +39,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // #endregion Raw Stones // #region Hardened Stones @@ -91,12 +91,13 @@ function registerTFGNetherBlocks(event) { .opaque(true) // #endregion Hardened stones - + // #region Spikes event.create('tfg:spike/deepslate_spike', 'tfc:rock_spike') .textureAll('minecraft:block/deepslate') .soundType(global.STONE_CHARACS.deepslate.sound) .tagBoth(`tfc:${global.STONE_CHARACS.deepslate.type}_items`) + .mapColor(global.STONE_CHARACS.deepslate.mapColor) .tagBlock('minecraft:mineable/pickaxe') .hardness(0.8) .resistance(0.8) @@ -106,15 +107,17 @@ function registerTFGNetherBlocks(event) { .textureAll('minecraft:block/blackstone') .soundType(global.STONE_CHARACS.blackstone.sound) .tagBoth(`tfc:${global.STONE_CHARACS.blackstone.type}_items`) + .mapColor(global.STONE_CHARACS.blackstone.mapColor) .tagBlock('minecraft:mineable/pickaxe') .hardness(0.8) .resistance(0.8) - .requiresTool(true) - + .requiresTool(true) + event.create('tfg:spike/dripstone_spike', 'tfc:rock_spike') .textureAll('minecraft:block/dripstone_block') .soundType(global.STONE_CHARACS.dripstone.sound) .tagBoth(`tfc:${global.STONE_CHARACS.dripstone.type}_items`) + .mapColor(global.STONE_CHARACS.dripstone.mapColor) .tagBlock('minecraft:mineable/pickaxe') .hardness(0.8) .resistance(0.8) @@ -122,12 +125,13 @@ function registerTFGNetherBlocks(event) { // #endregion Spikes - // #region Loose Stones + // #region Loose Stones event.create('tfg:loose/deepslate', 'tfc:loose_rock') .soundType(global.STONE_CHARACS.deepslate.sound) .itemTexture('tfg:item/loose/deepslate') .rockTypeModel(global.STONE_CHARACS.deepslate.type) .translationKey("block.tfg.loose.deepslate") + .mapColor(global.STONE_CHARACS.deepslate.mapColor) .tagBlock('tfc:loose_rocks') .tagItem('tfc:any_knapping') .tagItem('tfc:rock_knapping') @@ -136,10 +140,11 @@ function registerTFGNetherBlocks(event) { .tagItem("rnr:loose_rock_items") event.create('tfg:loose/dripstone', 'tfc:loose_rock') - .soundType(global.STONE_CHARACS.dripstone.sound) + .soundType(global.STONE_CHARACS.dripstone.sound) .itemTexture('tfg:item/loose/dripstone') - .rockTypeModel(global.STONE_CHARACS.dripstone.type) + .rockTypeModel(global.STONE_CHARACS.dripstone.type) .translationKey("block.tfg.loose.dripstone") + .mapColor(global.STONE_CHARACS.blackstone.mapColor) .tagBlock('tfc:loose_rocks') .tagItem('tfc:any_knapping') .tagItem('tfc:rock_knapping') @@ -152,17 +157,18 @@ function registerTFGNetherBlocks(event) { .itemTexture('tfg:item/loose/crackrack') .rockTypeModel(global.STONE_CHARACS.crackrack.type) .translationKey("block.tfg.loose.crackrack") + .mapColor(global.STONE_CHARACS.crackrack.mapColor) .tagBlock('tfc:loose_rocks') .tagItem('tfc:any_knapping') .tagItem('tfc:rock_knapping') .tagItem(`tfc:${global.STONE_CHARACS.crackrack.type}_rock`) .tagBoth(`tfc:${global.STONE_CHARACS.crackrack.type}_items`) .tagItem("rnr:loose_rock_items") - + // #endregion Loose rocks - + // #region Cobblestones - + // Deepslate event.create('tfg:rock/mossy_cobble_deepslate') .soundType(global.STONE_CHARACS.deepslate.sound) @@ -185,7 +191,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Blackstone event.create('tfg:rock/cobble_blackstone') .soundType(global.STONE_CHARACS.blackstone.sound) @@ -197,7 +203,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/cobble_blackstone_${shape}`, shape) .soundType(global.STONE_CHARACS.blackstone.sound) @@ -209,7 +215,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + event.create('tfg:rock/mossy_cobble_blackstone') .soundType(global.STONE_CHARACS.blackstone.sound) .tagBoth('forge:cobblestone') @@ -220,7 +226,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_cobble_blackstone_${shape}`, shape) .soundType(global.STONE_CHARACS.blackstone.sound) @@ -231,7 +237,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Dripstone event.create('tfg:rock/cobble_dripstone') .soundType(global.STONE_CHARACS.dripstone.sound) @@ -243,7 +249,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/cobble_dripstone_${shape}`, shape) .soundType(global.STONE_CHARACS.dripstone.sound) @@ -254,7 +260,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + event.create('tfg:rock/mossy_cobble_dripstone') .soundType(global.STONE_CHARACS.dripstone.sound) .tagBoth('forge:cobblestone') @@ -265,7 +271,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_cobble_dripstone_${shape}`, shape) .soundType(global.STONE_CHARACS.dripstone.sound) @@ -276,7 +282,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Crackrack event.create('tfg:rock/cobble_crackrack') .soundType(global.STONE_CHARACS.crackrack.sound) @@ -288,7 +294,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/cobble_crackrack_${shape}`, shape) .soundType(global.STONE_CHARACS.crackrack.sound) @@ -299,7 +305,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + event.create('tfg:rock/mossy_cobble_crackrack') .soundType(global.STONE_CHARACS.crackrack.sound) .tagBoth('forge:cobblestone') @@ -310,7 +316,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_cobble_crackrack_${shape}`, shape) .soundType(global.STONE_CHARACS.crackrack.sound) @@ -321,7 +327,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // #region Smooth (Polished/Cut) Stones event.create('tfg:rock/polished_crackrack') @@ -333,7 +339,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/polished_crackrack_${shape}`, shape) .soundType(global.STONE_CHARACS.crackrack.sound) @@ -344,7 +350,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // #endregion Smooth (Polished/Cut) Stones // #region Gravels @@ -380,7 +386,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + event.create('tfg:rock/gravel_crackrack') .soundType('gravel') .tagBoth('forge:gravel') @@ -391,11 +397,11 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_landslide') .fullBlock(true) .opaque(true) - + // #endregion Gravels - + // #region Bricks / Decorative - + // Deepslate SHAPES.forEach(shape => { event.create(`tfg:rock/cracked_bricks_deepslate_${shape}`, shape) @@ -432,7 +438,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_bricks_deepslate_${shape}`, shape) .soundType(global.STONE_CHARACS.deepslate.sound) @@ -443,7 +449,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Blackstone SHAPES.forEach(shape => { event.create(`tfg:rock/cracked_bricks_blackstone_${shape}`, shape) @@ -468,7 +474,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_bricks_blackstone_${shape}`, shape) .soundType(global.STONE_CHARACS.blackstone.sound) @@ -479,7 +485,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Dripstone event.create('tfg:rock/cracked_bricks_dripstone') .soundType(global.STONE_CHARACS.dripstone.sound) @@ -515,7 +521,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_bricks_dripstone_${shape}`, shape) .soundType(global.STONE_CHARACS.dripstone.sound) @@ -526,7 +532,7 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // Crackrack SHAPES.forEach(shape => { event.create(`tfg:rock/cracked_bricks_nether_${shape}`, shape) @@ -551,7 +557,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - + SHAPES.forEach(shape => { event.create(`tfg:rock/mossy_bricks_nether_${shape}`, shape) .soundType(global.STONE_CHARACS.nether.sound) @@ -562,9 +568,9 @@ function registerTFGNetherBlocks(event) { .fullBlock(true) .opaque(true) }) - + // #endregion Bricks / Decorative - + // #region Plants event.create('tfg:mushroom_roots', 'tfg:decorative_plant') .soundType('nether_wart') diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 93af9988b..d9ce73696 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1491,6 +1491,8 @@ function registerTFGSpaceBlocks(event) { //Fluorapatite const fluorapatite_colors = ['blue', 'green', 'brown', 'orange', 'white', 'yellow']; fluorapatite_colors.forEach(color => { + const mapColor = color === 'white' ? 'quartz' : `color_${color}`; + //Sand event.create(`tfg:sand/fluorapatite/${color}`, 'falling') .textureAll(`tfg:block/planets/venus/sand_fluorapatite_${color}`) @@ -1499,7 +1501,7 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:sand') .tagItem('forge:sand/fluorapatite') .tagBlock('minecraft:mineable/shovel') - .mapColor(`color_${color}`) + .mapColor(mapColor) .fullBlock(true) .opaque(true) //Raw Sandstone @@ -1513,7 +1515,7 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:sandstone') .tagItem('forge:sandstone/fluorapatite') .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) + .mapColor(mapColor) .fullBlock(true) .opaque(true) //Smooth Sandstone @@ -1526,7 +1528,7 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:sandstone') .tagItem('forge:sandstone/fluorapatite') .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) + .mapColor(mapColor) .fullBlock(true) .opaque(true) //Chiseled Sandstone @@ -1541,7 +1543,7 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:sandstone') .tagItem('forge:sandstone/fluorapatite') .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) + .mapColor(mapColor) .fullBlock(true) .opaque(true) //Sandstone @@ -1556,7 +1558,7 @@ function registerTFGSpaceBlocks(event) { .tagBoth('forge:sandstone') .tagItem('forge:sandstone/fluorapatite') .tagBlock('minecraft:mineable/pickaxe') - .mapColor(`color_${color}`) + .mapColor(mapColor) .fullBlock(true) .opaque(true) }) @@ -1590,6 +1592,7 @@ function registerTFGSpaceBlocks(event) { .textureAll('tfg:block/planets/venus/geyserite') .rockTypeTooltip(Text.translatable('tooltip.tfg.sedimentary')) .naturallySupported(true) + .mapColor('quartz') .sedimentary() .soundType('dripstone_block') .requiresTool(true) @@ -1600,9 +1603,29 @@ function registerTFGSpaceBlocks(event) { event.create('tfg:rock/spike/geyserite', 'tfc:rock_spike') .textureAll('tfg:block/planets/venus/geyserite') .soundType('dripstone_block') + .mapColor('quartz') .hardness(0.8) .resistance(0.8) .requiresTool(true) .tagBlock('minecraft:mineable/pickaxe') + // Halite + event.create('tfg:rock/halite') + .mapColor('quartz') + .soundType('deepslate') + .hardness(0.8) + .resistance(0.8) + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + event.create('tfg:rock/halite2') + .mapColor('snow') + .soundType('deepslate') + .hardness(0.8) + .resistance(0.8) + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 195f649da..4a002c08d 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -101,6 +101,21 @@ global.MARS_BIOMES = [ 'tfg:mars/martian_mountains' ] +/** + * @type {string[]} - Biome IDs + */ +global.VENUS_BIOMES = [ + 'tfg:venus/arachnoids', + 'tfg:venus/fractured_pools', + 'tfg:venus/fumaroles', + 'tfg:venus/geysers', + 'tfg:venus/jagged_tablelands', + 'tfg:venus/salt_flats', + 'tfg:venus/stromatolite_beach', + 'tfg:venus/sulfuric_ravine', + 'tfg:venus/volcanic_mountains', +] + /** * @type {string[]} - Block Names */ diff --git a/kubejs/startup_scripts/tfg/register_climates.js b/kubejs/startup_scripts/tfg/register_climates.js index 9c3672087..29a2d82d9 100644 --- a/kubejs/startup_scripts/tfg/register_climates.js +++ b/kubejs/startup_scripts/tfg/register_climates.js @@ -18,6 +18,8 @@ global.MARS_MAX_AVG_TEMP = -15; global.MARS_MIN_AVG_RAIN = -25; global.MARS_MAX_AVG_RAIN = 13; +global.VENUS_PLANET_SIZE = 20000; + global.GLACIO_PLANET_SIZE = 5000; function clamp(val, min, max) {