From 4aee3b2f519bfc63c6e8c6f6b017fdbcf4a9f0fc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 13 May 2025 10:53:11 +0100 Subject: [PATCH] added proper loose rock, rock pile, and rock delta features for all the moon rock types, added coral features, retextured warped vines --- .../textures/block/twisting_vines.png | Bin 0 -> 277 bytes .../textures/block/twisting_vines_plant.png | Bin 0 -> 293 bytes kubejs/data/ad_astra/dimension/moon.json | 36 +++++------ .../biome/moon/lunar_asurine_dense.json | 7 +-- .../biome/moon/lunar_asurine_sparse.json | 8 +-- .../biome/moon/lunar_chorus_dense.json | 4 +- .../biome/moon/lunar_chorus_sparse.json | 6 +- .../biome/moon/lunar_corals_dense.json | 6 +- .../biome/moon/lunar_corals_sparse.json | 5 +- .../biome/moon/lunar_lights_dense.json | 4 +- .../biome/moon/lunar_lights_sparse.json | 6 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 8 +-- .../moon/surface/dead_coral_blocks.json | 28 +++++++++ .../moon/surface/delta/andesite.json | 25 ++++++++ .../{basalt_delta.json => delta/basalt.json} | 0 .../moon/surface/delta/dacite.json | 25 ++++++++ .../moon/surface/delta/diorite.json | 25 ++++++++ .../moon/surface/delta/gabbro.json | 25 ++++++++ .../moon/surface/delta/glacio_stone.json | 25 ++++++++ .../moon/surface/delta/moon_deepslate.json | 25 ++++++++ .../moon/surface/delta/moon_stone.json | 25 ++++++++ .../moon/surface/delta/rhyolite.json | 25 ++++++++ .../moon/surface/loose/andesite.json | 22 +++++++ .../basalt.json} | 0 .../moon/surface/loose/dacite.json | 22 +++++++ .../diorite.json} | 0 .../gabbro.json} | 0 .../moon/surface/loose/glacio_stone.json | 22 +++++++ .../moon/surface/loose/moon_deepslate.json | 22 +++++++ .../moon_stone.json} | 0 .../moon/surface/loose/rhyolite.json | 22 +++++++ .../moon/surface/pile/andesite.json | 34 ++++++++++ .../moon/surface/pile/basalt.json | 34 ++++++++++ .../moon/surface/pile/dacite.json | 34 ++++++++++ .../moon/surface/pile/diorite.json | 34 ++++++++++ .../gabbro.json} | 0 .../moon/surface/pile/glacio_stone.json | 34 ++++++++++ .../moon/surface/pile/moon_deepslate.json | 34 ++++++++++ .../moon/surface/pile/moon_stone.json | 34 ++++++++++ .../moon/surface/pile/rhyolite.json | 34 ++++++++++ .../moon/surface/spike/basalt.json | 8 +++ .../moon/surface/basalt_delta.json | 19 ------ .../moon/surface/dead_coral.json | 2 +- .../moon/surface/dead_coral_blocks.json | 19 ++++++ .../moon/surface/delta/andesite.json | 28 +++++++++ .../moon/surface/delta/basalt.json | 28 +++++++++ .../moon/surface/delta/dacite.json | 28 +++++++++ .../moon/surface/delta/diorite.json | 28 +++++++++ .../moon/surface/delta/gabbro.json | 28 +++++++++ .../moon/surface/delta/glacio_stone.json | 28 +++++++++ .../moon/surface/delta/moon_deepslate.json | 27 ++++++++ .../moon/surface/delta/moon_stone.json | 28 +++++++++ .../moon/surface/delta/rhyolite.json | 28 +++++++++ .../moon/surface/gabbro_rock_pile.json | 19 ------ .../moon/surface/loose/andesite.json | 35 +++++++++++ .../moon/surface/loose/basalt.json | 35 +++++++++++ .../moon/surface/loose/dacite.json | 35 +++++++++++ .../moon/surface/loose/diorite.json | 35 +++++++++++ .../moon/surface/loose/gabbro.json | 35 +++++++++++ .../moon/surface/loose/glacio_stone.json | 35 +++++++++++ .../moon/surface/loose/moon_deepslate.json | 34 ++++++++++ .../moon/surface/loose/moon_stone.json | 35 +++++++++++ .../moon/surface/loose/rhyolite.json | 35 +++++++++++ .../moon/surface/loose_basalt_rocks.json | 16 ----- .../moon/surface/loose_diorite_rocks.json | 16 ----- .../moon/surface/loose_gabbro_rocks.json | 16 ----- .../moon/surface/loose_moon_stone_rocks.json | 16 ----- .../moon/surface/pile/andesite.json | 35 +++++++++++ .../moon/surface/pile/basalt.json | 35 +++++++++++ .../moon/surface/pile/dacite.json | 35 +++++++++++ .../moon/surface/pile/diorite.json | 35 +++++++++++ .../moon/surface/pile/gabbro.json | 35 +++++++++++ .../moon/surface/pile/glacio_stone.json | 35 +++++++++++ .../moon/surface/pile/moon_deepslate.json | 34 ++++++++++ .../moon/surface/pile/moon_stone.json | 35 +++++++++++ .../moon/surface/pile/rhyolite.json | 35 +++++++++++ .../moon/surface/spike/basalt.json | 58 ++++++++++++++++++ kubejs/server_scripts/ad_astra/tags.js | 9 +++ kubejs/server_scripts/tfg/tags.js | 2 +- kubejs/startup_scripts/tfg/constants.js | 12 ++++ 80 files changed, 1634 insertions(+), 157 deletions(-) create mode 100644 kubejs/assets/minecraft/textures/block/twisting_vines.png create mode 100644 kubejs/assets/minecraft/textures/block/twisting_vines_plant.png create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/dead_coral_blocks.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/andesite.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{basalt_delta.json => delta/basalt.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/dacite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/diorite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/gabbro.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_stone.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/rhyolite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/andesite.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{loose_basalt_rocks.json => loose/basalt.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/dacite.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{loose_diorite_rocks.json => loose/diorite.json} (100%) rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{loose_gabbro_rocks.json => loose/gabbro.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_deepslate.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{loose_moon_stone_rocks.json => loose/moon_stone.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/rhyolite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/andesite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/basalt.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/dacite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/diorite.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{gabbro_rock_pile.json => pile/gabbro.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/rhyolite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/spike/basalt.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/basalt_delta.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/andesite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/basalt.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/dacite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/diorite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/gabbro.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/rhyolite.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/gabbro_rock_pile.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/andesite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/basalt.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/dacite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/diorite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/gabbro.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/rhyolite.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_basalt_rocks.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_diorite_rocks.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_gabbro_rocks.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/andesite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/basalt.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/dacite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/diorite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/gabbro.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/rhyolite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json diff --git a/kubejs/assets/minecraft/textures/block/twisting_vines.png b/kubejs/assets/minecraft/textures/block/twisting_vines.png new file mode 100644 index 0000000000000000000000000000000000000000..f979113920e412d864ac45e10f7f90498eab2ff5 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_p-Xo-U3d7QI_1E#y07Akg-It;8f%;o^!r-?;WL2sv(JpEcY4n&QMgOq`pH4Vvc6 zcJN)>uAr^*<(8tw)o(@j|Eq>SxGyR$deqf5#{LU0f94~e0;V<-#~Hc|41t%9_fg&V6+ dzGV2o^54Yn*e7+VZww3!44$rjF6*2UngDA{X!ZaA literal 0 HcmV?d00001 diff --git a/kubejs/assets/minecraft/textures/block/twisting_vines_plant.png b/kubejs/assets/minecraft/textures/block/twisting_vines_plant.png new file mode 100644 index 0000000000000000000000000000000000000000..b58ffb3b698b1dac5cd82e84ad2d7714d9772b5e GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_p-fo-U3d7QIs^E#y07AmZw;$#$59ubds@Pf##FyiK7{ zI5^ngit@sjuMd^hzO>%CeLI``#j5*zr)e|f#5qS_TGCngzLV|U0#D)O{BVZ2&z;+r zGrO3rXM9m+IQ#eF-`p3LbS~80|GYR*Fqc2B??a1;3b#3ns+*@Zb>#JUu-MaNr&$>Kvof#My7(8A5T-G@yGywo46LAy( literal 0 HcmV?d00001 diff --git a/kubejs/data/ad_astra/dimension/moon.json b/kubejs/data/ad_astra/dimension/moon.json index 8838c88b8..6ab2ae0f6 100644 --- a/kubejs/data/ad_astra/dimension/moon.json +++ b/kubejs/data/ad_astra/dimension/moon.json @@ -11,9 +11,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.3, 1 ], + "continentalness": [ 0.4, 1 ], "erosion": 0, - "weirdness": [ 0.3, 1 ], + "weirdness": [ 0.4, 1 ], "depth": 0, "offset": 0 } @@ -23,9 +23,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.15, 0.3 ], + "continentalness": [ 0.2, 0.4 ], "erosion": 0, - "weirdness": [ 0.15, 0.3 ], + "weirdness": [ 0.2, 0.4 ], "depth": 0, "offset": 0 } @@ -35,9 +35,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.3, 1 ], + "continentalness": [ 0.4, 1 ], "erosion": 0, - "weirdness": [ -1, -0.3 ], + "weirdness": [ -1, -0.4 ], "depth": 0, "offset": 0 } @@ -47,9 +47,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.15, 0.3 ], + "continentalness": [ 0.2, 0.4 ], "erosion": 0, - "weirdness": [ -0.3, -0.15 ], + "weirdness": [ -0.4, -0.2 ], "depth": 0, "offset": 0 } @@ -59,9 +59,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -0.15, 0.15 ], + "continentalness": [ -0.2, 0.2 ], "erosion": 0, - "weirdness": [ -0.15, 0.15 ], + "weirdness": [ -0.2, 0.2 ], "depth": 0, "offset": 0 } @@ -71,9 +71,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -0.3, -0.15 ], + "continentalness": [ -0.4, -0.2 ], "erosion": 0, - "weirdness": [ -0.3, -0.15 ], + "weirdness": [ -0.4, -0.2 ], "depth": 0, "offset": 0 } @@ -83,9 +83,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -1, -0.3 ], + "continentalness": [ -1, -0.4 ], "erosion": 0, - "weirdness": [ -1, -0.3 ], + "weirdness": [ -1, -0.4 ], "depth": 0, "offset": 0 } @@ -95,9 +95,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -0.3, -0.15 ], + "continentalness": [ -0.4, -0.2 ], "erosion": 0, - "weirdness": [ 0.15, 0.3 ], + "weirdness": [ 0.2, 0.4 ], "depth": 0, "offset": 0 } @@ -107,9 +107,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -1, -0.3 ], + "continentalness": [ -1, -0.4 ], "erosion": 0, - "weirdness": [ 0.3, 1 ], + "weirdness": [ 0.4, 1 ], "depth": 0, "offset": 0 } diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index 222432f08..a87bfa04e 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -40,13 +40,12 @@ [], "#tfg:moon_veins", [], - [], + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/basalt_delta", - "tfg:moon/surface/loose_basalt_rocks" + ], [ - "tfg:moon/hardening" + "tfg:moon/hardening" ] ], "has_precipitation": false, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index faa1fadfc..c31ecb66b 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -39,15 +39,13 @@ ], [], "#tfg:moon_veins", - [], - [], + "#tfg:moon_large_rock_features", + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/basalt_delta", - "tfg:moon/surface/loose_basalt_rocks", "tfg:moon/surface/warped_sprouts_patch" ], [ - "tfg:moon/hardening" + "tfg:moon/hardening" ] ], "has_precipitation": false, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index b77d87fca..1f3785005 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -39,10 +39,8 @@ [], "#tfg:moon_veins", [], - [], + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/gabbro_rock_pile", - "tfg:moon/surface/loose_gabbro_rocks", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/chorus_plant_common" ], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index ad4299cbc..e768bec2a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -39,11 +39,9 @@ ], [], "#tfg:moon_veins", - [], - [], + "#tfg:moon_large_rock_features", + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/gabbro_rock_pile", - "tfg:moon/surface/loose_gabbro_rocks", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/chorus_plant_rare" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 461067915..4559a072c 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -39,11 +39,11 @@ [], "#tfg:moon_veins", [], - [], + "#tfg:moon_small_rock_features", [ + "tfg:moon/surface/dead_coral_blocks", "tfg:moon/surface/dead_coral", - "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/loose_diorite_rocks" + "tfg:moon/surface/dead_coral_fans" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index ba7135a58..5316958a0 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -39,12 +39,11 @@ ], [], "#tfg:moon_veins", - [], - [], + "#tfg:moon_large_rock_features", + "#tfg:moon_small_rock_features", [ "tfg:moon/surface/dead_coral", "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/loose_diorite_rocks", "tfg:moon/surface/warped_sprouts_patch" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index b5d84980f..191656f96 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -39,10 +39,8 @@ [], "#tfg:moon_veins", [], - [], + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_moon_stone_rocks", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/warped_vine" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index f8ff81544..dafbf26e9 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -39,11 +39,9 @@ ], [], "#tfg:moon_veins", - [], - [], + "#tfg:moon_large_rock_features", + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/moon_rock_pile", - "tfg:moon/surface/loose_moon_stone_rocks", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch" ], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index 9e9664a26..dd7b6e452 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -40,17 +40,13 @@ [], "#tfg:moon_veins", [], - [], + "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/basalt_delta", - "tfg:moon/surface/moon_rock_pile", "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/loose_moon_stone_rocks", - "tfg:moon/surface/loose_basalt_rocks", "tfg:moon/surface/warped_sprouts_patch" ], [ - "tfg:moon/hardening" + "tfg:moon/hardening" ] ], "has_precipitation": false, diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/dead_coral_blocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/dead_coral_blocks.json new file mode 100644 index 000000000..c100eea61 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/dead_coral_blocks.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:simple_random_selector", + "config": { + "features": [ + { + "feature": { + "type": "tfg:dead_coral_claw", + "config": {} + }, + "placement": [] + }, + { + "feature": { + "type": "tfg:dead_coral_mushroom", + "config": {} + }, + "placement": [] + }, + { + "feature": { + "type": "tfg:dead_coral_tree", + "config": {} + }, + "placement": [] + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/andesite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/andesite.json new file mode 100644 index 000000000..db63405d5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/andesite.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/andesite_slab" + }, + "rim": { + "Name": "tfc:rock/hardened/andesite" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/basalt_delta.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/basalt.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/basalt_delta.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/basalt.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/dacite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/dacite.json new file mode 100644 index 000000000..a3363bbd6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/dacite.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/dacite_slab" + }, + "rim": { + "Name": "tfc:rock/hardened/dacite" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/diorite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/diorite.json new file mode 100644 index 000000000..ab77fb4a1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/diorite.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/diorite_slab" + }, + "rim": { + "Name": "tfc:rock/hardened/diorite" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/gabbro.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/gabbro.json new file mode 100644 index 000000000..cd6155b18 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/gabbro.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/gabbro_slab" + }, + "rim": { + "Name": "tfc:rock/hardened/gabbro" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/glacio_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/glacio_stone.json new file mode 100644 index 000000000..f8b2b723c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/glacio_stone.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "ad_astra:glacio_cobblestone_slab" + }, + "rim": { + "Name": "tfg:rock/hardened_glacio_stone" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json new file mode 100644 index 000000000..cfb93fe3b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_deepslate.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/basalt_slab" + }, + "rim": { + "Name": "tfg:rock/hardened_moon_deepslate" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_stone.json new file mode 100644 index 000000000..770dd78a1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/moon_stone.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "ad_astra:moon_cobblestone_slab" + }, + "rim": { + "Name": "tfg:rock/hardened_moon_stone" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/rhyolite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/rhyolite.json new file mode 100644 index 000000000..a2c54b4f1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/delta/rhyolite.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:delta_feature", + "config": { + "contents": { + "Name": "tfc:rock/cobble/rhyolite_slab" + }, + "rim": { + "Name": "tfc:rock/hardened/rhyolite" + }, + "rim_size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 1 + } + }, + "size": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 3 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/andesite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/andesite.json new file mode 100644 index 000000000..eaa70ced8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/andesite.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:rock/loose/andesite" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_basalt_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/basalt.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_basalt_rocks.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/basalt.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/dacite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/dacite.json new file mode 100644 index 000000000..ed758fe5e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/dacite.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:rock/loose/dacite" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_diorite_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/diorite.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_diorite_rocks.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/diorite.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_gabbro_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/gabbro.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_gabbro_rocks.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/gabbro.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/glacio_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/glacio_stone.json new file mode 100644 index 000000000..60405d103 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/glacio_stone.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/glacio_stone" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_deepslate.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_deepslate.json new file mode 100644 index 000000000..3e15de7e0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_deepslate.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/moon_deepslate" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_moon_stone_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_stone.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_moon_stone_rocks.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/moon_stone.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/rhyolite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/rhyolite.json new file mode 100644 index 000000000..22516ad82 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose/rhyolite.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:rock/loose/rhyolite" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/andesite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/andesite.json new file mode 100644 index 000000000..2436b86b8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/andesite.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfc:rock/hardened/andesite" + } + }, + { + "weight": 25, + "data": { + "Name": "tfc:rock/cobble/andesite" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/raw/andesite_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/cobble/andesite_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/basalt.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/basalt.json new file mode 100644 index 000000000..d47906980 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/basalt.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfc:rock/hardened/basalt" + } + }, + { + "weight": 25, + "data": { + "Name": "tfc:rock/cobble/basalt" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/raw/basalt_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/cobble/basalt_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/dacite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/dacite.json new file mode 100644 index 000000000..bb441f910 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/dacite.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfc:rock/hardened/dacite" + } + }, + { + "weight": 25, + "data": { + "Name": "tfc:rock/cobble/dacite" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/raw/dacite_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/cobble/dacite_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/diorite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/diorite.json new file mode 100644 index 000000000..5c731ad31 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/diorite.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfc:rock/hardened/diorite" + } + }, + { + "weight": 25, + "data": { + "Name": "tfc:rock/cobble/diorite" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/raw/diorite_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/cobble/diorite_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/gabbro_rock_pile.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/gabbro.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/gabbro_rock_pile.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/gabbro.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json new file mode 100644 index 000000000..d7b754a9a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/glacio_stone.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfg:rock/hardened_glacio_stone" + } + }, + { + "weight": 25, + "data": { + "Name": "ad_astra:glacio_cobblestone" + } + }, + { + "weight": 20, + "data": { + "Name": "ad_astra:glacio_stone_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "ad_astra:glacio_cobblestone_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json new file mode 100644 index 000000000..490c9b7d4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_deepslate.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfg:rock/hardened_moon_deepslate" + } + }, + { + "weight": 25, + "data": { + "Name": "ad_astra:moon_deepslate" + } + }, + { + "weight": 10, + "data": { + "Name": "ad_astra:moon_cobblestone" + } + }, + { + "weight": 10, + "data": { + "Name": "ad_astra:moon_cobblestone_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json new file mode 100644 index 000000000..977879c19 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/moon_stone.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfg:rock/hardened_moon_stone" + } + }, + { + "weight": 25, + "data": { + "Name": "ad_astra:moon_cobblestone" + } + }, + { + "weight": 20, + "data": { + "Name": "ad_astra:moon_stone_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "ad_astra:moon_cobblestone_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/rhyolite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/rhyolite.json new file mode 100644 index 000000000..fcf450e54 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile/rhyolite.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block_pile", + "config": { + "state_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 35, + "data": { + "Name": "tfc:rock/hardened/rhyolite" + } + }, + { + "weight": 25, + "data": { + "Name": "tfc:rock/cobble/rhyolite" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/raw/rhyolite_slab" + } + }, + { + "weight": 20, + "data": { + "Name": "tfc:rock/cobble/rhyolite_slab" + } + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/spike/basalt.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/spike/basalt.json new file mode 100644 index 000000000..8bd47adc4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/spike/basalt.json @@ -0,0 +1,8 @@ +{ + "type": "beneath:nether_spikes", + "config": { + "raw": "minecraft:basalt", + "spike": "tfc:rock/spike/basalt", + "anchor_blocks": "ad_astra:moon_stone_replaceables" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/basalt_delta.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/basalt_delta.json deleted file mode 100644 index e110d39c4..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/basalt_delta.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "tfg:moon/surface/basalt_delta", - "placement": [ - { - "type": "minecraft:count", - "count": 25 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral.json index e9169b40b..3a86faf8f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 5 + "chance": 8 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json new file mode 100644 index 000000000..04bd5e70f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/dead_coral_blocks", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/andesite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/andesite.json new file mode 100644 index 000000000..f29dc5202 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/andesite.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/andesite", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/andesite", + "tfc:rock/hardened/andesite", + "tfc:rock/gravel/andesite" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/basalt.json new file mode 100644 index 000000000..a73fe11cd --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/basalt.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/basalt", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/hardened/basalt", + "tfc:rock/gravel/basalt" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/dacite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/dacite.json new file mode 100644 index 000000000..aad3edab9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/dacite.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/dacite", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/dacite", + "tfc:rock/hardened/dacite", + "tfc:rock/gravel/dacite" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/diorite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/diorite.json new file mode 100644 index 000000000..58a48ef24 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/diorite.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/diorite", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/diorite", + "tfc:rock/hardened/diorite", + "tfc:rock/gravel/diorite" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/gabbro.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/gabbro.json new file mode 100644 index 000000000..a0eb05887 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/gabbro.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/gabbro", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/gabbro", + "tfc:rock/hardened/gabbro", + "tfc:rock/gravel/gabbro" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json new file mode 100644 index 000000000..783e67d06 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/glacio_stone.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/glacio_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:glacio_stone", + "tfg:rock/hardened_glacio_stone", + "ad_astra:glacio_cobblestone" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json new file mode 100644 index 000000000..4c66c82ad --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json @@ -0,0 +1,27 @@ +{ + "feature": "tfg:moon/surface/delta/moon_deepslate", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_deepslate", + "tfg:rock/hardened_moon_deepslate" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json new file mode 100644 index 000000000..559c6bf67 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_stone.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/moon_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_stone", + "tfg:rock/hardened_moon_stone", + "ad_astra:moon_sand" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/rhyolite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/rhyolite.json new file mode 100644 index 000000000..d097e09e7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/rhyolite.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:moon/surface/delta/rhyolite", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/rhyolite", + "tfc:rock/hardened/rhyolite", + "tfc:rock/gravel/rhyolite" + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/gabbro_rock_pile.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/gabbro_rock_pile.json deleted file mode 100644 index 1b84801d8..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/gabbro_rock_pile.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "tfg:moon/surface/gabbro_rock_pile", - "placement": [ - { - "type": "minecraft:count", - "count": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/andesite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/andesite.json new file mode 100644 index 000000000..9f84074a7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/andesite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/andesite", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/andesite", + "tfc:rock/hardened/andesite", + "tfc:rock/gravel/andesite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/basalt.json new file mode 100644 index 000000000..219c52079 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/basalt.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/basalt", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/hardened/basalt", + "tfc:rock/gravel/basalt" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/dacite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/dacite.json new file mode 100644 index 000000000..21f50b4bd --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/dacite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/dacite", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/dacite", + "tfc:rock/hardened/dacite", + "tfc:rock/gravel/dacite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/diorite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/diorite.json new file mode 100644 index 000000000..46b662eb0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/diorite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/diorite", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/diorite", + "tfc:rock/hardened/diorite", + "tfc:rock/gravel/diorite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/gabbro.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/gabbro.json new file mode 100644 index 000000000..a1edd7d28 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/gabbro.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/gabbro", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/gabbro", + "tfc:rock/hardened/gabbro", + "tfc:rock/gravel/gabbro" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json new file mode 100644 index 000000000..0cfac2c35 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/glacio_stone.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/glacio_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:glacio_stone", + "tfg:rock/hardened_glacio_stone", + "ad_astra:glacio_cobblestone" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json new file mode 100644 index 000000000..f9ba19b5f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json @@ -0,0 +1,34 @@ +{ + "feature": "tfg:moon/surface/loose/moon_deepslate", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_deepslate", + "tfg:rock/hardened_moon_deepslate" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json new file mode 100644 index 000000000..5e267969f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_stone.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/moon_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_stone", + "tfg:rock/hardened_moon_stone", + "ad_astra:moon_sand" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/rhyolite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/rhyolite.json new file mode 100644 index 000000000..00e5b3645 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/rhyolite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/loose/rhyolite", + "placement": [ + { + "type": "minecraft:count", + "count": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/rhyolite", + "tfc:rock/hardened/rhyolite", + "tfc:rock/gravel/rhyolite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_basalt_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_basalt_rocks.json deleted file mode 100644 index 43d0c10ad..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_basalt_rocks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfg:moon/surface/loose_basalt_rocks", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_diorite_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_diorite_rocks.json deleted file mode 100644 index 86fdc68cc..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_diorite_rocks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfg:moon/surface/loose_diorite_rocks", - "placement": [ - { - "type": "minecraft:count", - "count": 4 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_gabbro_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_gabbro_rocks.json deleted file mode 100644 index fae5ffc08..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_gabbro_rocks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfg:moon/surface/loose_gabbro_rocks", - "placement": [ - { - "type": "minecraft:count", - "count": 16 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json deleted file mode 100644 index b98187645..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose_moon_stone_rocks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfg:moon/surface/loose_moon_stone_rocks", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/andesite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/andesite.json new file mode 100644 index 000000000..4b71a4169 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/andesite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/andesite", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/andesite", + "tfc:rock/hardened/andesite", + "tfc:rock/gravel/andesite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/basalt.json new file mode 100644 index 000000000..042eeebfb --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/basalt.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/basalt", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/hardened/basalt", + "tfc:rock/gravel/basalt" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/dacite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/dacite.json new file mode 100644 index 000000000..62947dfa8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/dacite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/dacite", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/dacite", + "tfc:rock/hardened/dacite", + "tfc:rock/gravel/dacite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/diorite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/diorite.json new file mode 100644 index 000000000..77e2126f4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/diorite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/diorite", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/diorite", + "tfc:rock/hardened/diorite", + "tfc:rock/gravel/diorite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/gabbro.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/gabbro.json new file mode 100644 index 000000000..fb78a0b73 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/gabbro.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/gabbro", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/gabbro", + "tfc:rock/hardened/gabbro", + "tfc:rock/gravel/gabbro" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json new file mode 100644 index 000000000..bde0f3510 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/glacio_stone.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/glacio_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:glacio_stone", + "tfg:rock/hardened_glacio_stone", + "ad_astra:glacio_cobblestone" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json new file mode 100644 index 000000000..59f5b2038 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json @@ -0,0 +1,34 @@ +{ + "feature": "tfg:moon/surface/pile/moon_deepslate", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_deepslate", + "tfg:rock/hardened_moon_deepslate" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json new file mode 100644 index 000000000..c5d9986b7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_stone.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/moon_stone", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "ad_astra:moon_stone", + "tfg:rock/hardened_moon_stone", + "ad_astra:moon_sand" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/rhyolite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/rhyolite.json new file mode 100644 index 000000000..9a6d57813 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/rhyolite.json @@ -0,0 +1,35 @@ +{ + "feature": "tfg:moon/surface/pile/rhyolite", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/rhyolite", + "tfc:rock/hardened/rhyolite", + "tfc:rock/gravel/rhyolite" + ] + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json new file mode 100644 index 000000000..b968d4224 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json @@ -0,0 +1,58 @@ +{ + "feature": "tfg:moon/surface/spike/basalt", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 95 + }, + "min_inclusive": { + "above_bottom": 15 + } + } + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 32, + "target_condition": { + "type": "minecraft:solid" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "offset": [ 0, 1, 0 ], + "blocks": "minecraft:air" + } + ] + }, + { + "type": "minecraft:matching_block_tag", + "tag": "ad_astra:moon_stone_replaceables" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index e358cbc48..a8efec42a 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -202,7 +202,16 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfc:deals_crushing_damage', 'ad_astra:star_crawler') } +// All space veins go in tfg/tags.js const registerAdAstraPlacedFeatures = (event) => { + global.MOON_STONE_TYPES.forEach(stone => { + // only in the sparse ones + event.add('tfg:moon_large_rock_features', `tfg:moon/surface/delta/${stone}`) + // in all moon biomes + event.add('tfg:moon_small_rock_features', `tfg:moon/surface/pile/${stone}`) + event.add('tfg:moon_small_rock_features', `tfg:moon/surface/loose/${stone}`) + }) + event.add('tfg:moon_small_rock_features', `tfg:moon/surface/spike/basalt`) } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index d6cf1015e..838327788 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -333,7 +333,7 @@ const registerTFGBiomeTags = (event) => { // #endregion } - +// Other space decoration is in ad_astra/tags.js const registerTFGPlacedFeatures = (event) => { // #region Nether ores diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index caffd8b0a..051ee4389 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -37,6 +37,18 @@ global.EXTRATERRESTRIAL_HARDENED_ROCKS = [ 'tfg:rock/hardened_glacio_stone', ] +global.MOON_STONE_TYPES = [ + "andesite", + "basalt", + "dacite", + "diorite", + "gabbro", + "glacio_stone", + "moon_deepslate", + "moon_stone", + "rhyolite" +] + global.MOON_BIOMES = [ 'tfg:moon/lunar_plains', 'tfg:moon/lunar_asurine_dense',