illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Feature/mars rock layers (#1519)

Browse source 
* moving to real tfc rock layers!

* thanks git

* git pls

* that's a good start for the mars rock layer stuff now

* langs, some desert block height tweaks

* mars water fog color

* forgot to convert back from hex to dec
This commit is contained in:
Pyritie 2025-08-04 11:22:18 +01:00 • committed by GitHub
parent e978f798f7
commit 084c99db07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 829 additions and 1975 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kubejs/assets/minecraft/lang/en_us.json
View file

@ -45,7 +45,18 @@
"block.minecraft.pearlescent_froglight": "Pearlescent Lightbloom",
"block.minecraft.verdant_froglight": "Verdant Lightbloom",
"block.minecraft.ochre_froglight": "Ochre Lightbloom",
"minecraft:nether_wart_block": "Crimson Wart Block",
"block.minecraft.nether_wart_block": "Crimson Wart Block",
"block.minecraft.red_sand": "Hematitic Sand",
"block.minecraft.red_sandstone": "Hematitic Sandstone",
"block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs",
"block.minecraft.red_sandstone_slab": "Hematitic Sandstone Slab",
"block.minecraft.red_sandstone_wall": "Hematitic Sandstone Wall",
"block.minecraft.chiseled_red_sandstone": "Chiseled Hematitic Sandstone",
"block.minecraft.smooth_red_sandstone": "Smooth Hematitic Sandstone",
"block.minecraft.smooth_red_sandstone_stairs": "Smooth Hematitic Sandstone Stairs",
"block.minecraft.smooth_red_sandstone_slab": "Smooth Hematitic Sandstone Slab",
"block.minecraft.cut_red_sandstone": "Cut Hematitic Sandstone",
"block.minecraft.cut_red_sandstone_slab": "Cut Hematitic Sandstone Slab",
"item.minecraft.iron_nugget": "Cast Iron Nugget",
"item.minecraft.iron_ingot": "Cast Iron Ingot",
"item.minecraft.iron_block": "Cast Iron Block",

170
kubejs/data/ad_astra/dimension/mars.json
View file

@ -1,5 +1,5 @@
{
"type": "tfg:mars",
"type": "ad_astra:mars",
"generator": {
"type": "kubejs_tfc:wrapped",
"event_key": "mars",
@ -13,37 +13,95 @@
"continentalness": -0.5,
"rock_layer_settings": {
"rocks": {
"mars": {
"raw": "tfc:rock/raw/chert",
"hardened": "tfc:rock/hardened/chert",
"gravel": "tfc:rock/gravel/chert",
"cobble": "tfc:rock/cobble/chert",
"sand": "tfc:sand/red",
"sandstone": "tfc:raw_sandstone/red"
}
"mars": {
"raw": "ad_astra:mars_stone",
"hardened": "tfg:rock/hardened_mars_stone",
"gravel": "ad_astra:mars_cobblestone",
"cobble": "ad_astra:mars_cobblestone",
"sand": "ad_astra:mars_sand",
"sandstone": "ad_astra:mars_stone",
"spike": "tfg:spike/mars_stone_spike",
"loose": "tfg:loose/mars_stone"
},
"venus": {
"raw": "ad_astra:venus_stone",
"hardened": "tfg:rock/hardened_venus_stone",
"gravel": "ad_astra:venus_cobblestone",
"cobble": "ad_astra:venus_cobblestone",
"sand": "ad_astra:venus_sand",
"sandstone": "ad_astra:venus_sandstone",
"spike": "tfg:spike/venus_stone_spike",
"loose": "tfg:loose/venus_stone"
},
"red_granite": {
"raw": "gtceu:red_granite",
"hardened": "tfg:rock/hardened_red_granite",
"gravel": "gtceu:red_granite_cobblestone",
"cobble": "gtceu:red_granite_cobblestone",
"sand": "minecraft:red_sand",
"sandstone": "minecraft:red_sandstone",
"spike": "tfg:spike/red_granite_spike",
"loose": "tfg:loose/red_granite"
},
"granite": "tfc:granite",
"diorite": "tfc:diorite",
"gabbro": "tfc:gabbro",
"shale": "tfc:shale",
"claystone": "tfc:claystone",
"limestone": "tfc:limestone",
"conglomerate": "tfc:conglomerate",
"dolomite": "tfc:dolomite",
"chert": "tfc:chert",
"chalk": "tfc:chalk",
"basalt": "tfc:basalt",
"dacite": "tfc:dacite"
},
"layers": [
{
"id": "mars",
"id": "mix",
"layers": {
"mars": "bottom"
"mars": "bottom",
"dolomite": "bottom",
"chert": "bottom",
"conglomerate": "bottom",
"red_granite": "bottom",
"basalt": "bottom",
"dacite": "bottom",
"venus": "bottom",
"shale": "bottom"
}
},
{
"id": "sedimentary",
"layers": {
"mars": "mix",
"chalk": "mix",
"shale": "mix",
"dolomite": "mix",
"limestone": "mix",
"claystone": "mix",
"conglomerate": "mix",
"chert": "mix"
}
}
],
"bottom": [
"mars"
"red_granite",
"gabbro",
"diorite",
"granite"
],
"ocean_floor": [
"mars"
"sedimentary"
],
"volcanic": [
"mars"
"sedimentary"
],
"land": [
"mars"
"sedimentary"
],
"uplift": [
"mars"
"sedimentary"
]
}
},
@ -4373,7 +4431,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -4427,7 +4485,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -4454,7 +4512,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -4508,7 +4566,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -4535,7 +4593,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -4589,7 +4647,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -4643,7 +4701,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -13526,7 +13584,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -13607,7 +13665,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -13661,7 +13719,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -13715,7 +13773,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -13769,7 +13827,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -13796,7 +13854,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -13850,7 +13908,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -21788,7 +21846,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -21842,7 +21900,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -21896,7 +21954,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -21950,7 +22008,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -22031,7 +22089,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -29726,7 +29784,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -29807,7 +29865,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -29861,7 +29919,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -29915,7 +29973,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -29969,7 +30027,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -29996,7 +30054,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -30050,7 +30108,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -39014,7 +39072,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -39068,7 +39126,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -39095,7 +39153,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -39149,7 +39207,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.19,
@ -39176,7 +39234,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -39230,7 +39288,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -39284,7 +39342,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -47573,7 +47631,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -47600,7 +47658,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -47627,7 +47685,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -47654,7 +47712,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,
@ -47708,7 +47766,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -47762,7 +47820,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
-0.11,
@ -47789,7 +47847,7 @@
}
},
{
"biome": "tfg:mars/amber_plains",
"biome": "tfg:mars/sangnum_plains",
"parameters": {
"continentalness": [
0.03,

18
kubejs/data/tfg/worldgen/biome/mars/amber_hills.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -37,16 +39,20 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
"tfc:random_empty_hot_spring"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
"#tfg:mars_amber_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

17
kubejs/data/tfg/worldgen/biome/mars/amber_plains.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -36,17 +38,16 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfg:mars/semiheavy_ammoniacal_water"
],
"#tfg:mars_amber_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

8
kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json
View file

@ -19,10 +19,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -38,7 +40,7 @@
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[],
[
],

17
kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
View file

@ -19,10 +19,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -38,11 +40,18 @@
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
[
],
[]
[
"tfc:surface_loose_rocks"
]
],
"has_precipitation": false,
"spawn_costs": {

13
kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
View file

@ -19,10 +19,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -38,11 +40,14 @@
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
[
],
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

18
kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json
View file

@ -22,11 +22,13 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[],
[
"tfc:erosion"
],
"#tfc:feature/volcanoes",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
@ -37,18 +39,20 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
[
],
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

19
kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json
View file

@ -19,10 +19,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -34,18 +36,21 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
"tfc:random_empty_hot_spring"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/semiheavy_ammoniacal_water"
],
[]
"#tfg:mars_sangnum_vegetal_decoration",
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

17
kubejs/data/tfg/worldgen/biome/mars/martian_river.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -37,17 +39,20 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
[]
[
],
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

18
kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -37,18 +39,22 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
[
],
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

18
kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -37,16 +39,20 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
"tfc:random_empty_hot_spring"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
"#tfg:mars_rusticus_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

17
kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -36,17 +38,16 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfg:mars/semiheavy_ammoniacal_water"
],
"#tfg:mars_rusticus_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

18
kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -37,16 +39,20 @@
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
"tfc:random_empty_hot_spring"
],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfc:raw_boulder",
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch"
],
"#tfg:mars_sangnum_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

17
kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json
View file

@ -22,10 +22,12 @@
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
"water_fog_color": 1069623
},
"features": [
[],
[
"tfc:erosion"
],
[],
[
"tfg:earth/geode/amethyst",
@ -36,17 +38,16 @@
"tfg:earth/geode/pyrite",
"tfg:earth/geode/quartzite"
],
[
"tfc:vein/gabbro_dike",
"tfc:vein/diorite_dike"
],
[],
[],
[],
"#tfg:mars_veins",
[],
"#tfg:mars_small_rock_features",
[
"tfg:mars/semiheavy_ammoniacal_water"
],
"#tfg:mars_sangnum_vegetal_decoration",
[]
"#tfg:mars_top_layer_modification"
],
"has_precipitation": false,
"spawn_costs": {

42
kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json Normal file
View file

@ -0,0 +1,42 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "betterend:amber_root_wild"
}
}
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:amber_root_wild"
}
}
}
]
},
"tries": 16,
"xz_spread": 10,
"y_spread": 2
}
}

42
kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json Normal file
View file

@ -0,0 +1,42 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "betterend:blossom_berry_wild"
}
}
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:blossom_berry_wild"
}
}
}
]
},
"tries": 16,
"xz_spread": 10,
"y_spread": 2
}
}

32
kubejs/data/tfg/worldgen/configured_feature/mars/surface/bolux_mushroom.json → kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json
View file

@ -15,26 +15,28 @@
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "minecraft:all_of",
"predicates": [
{
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
},
{
"type": "minecraft:matching_block_tag",
"offset": [ 0, -1, 0 ],
"tag": "tfg:mars_soil"
}
]
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:bolux_mushroom_wild"
}
}
}
]
},
"tries": 8,
"tries": 16,
"xz_spread": 10,
"y_spread": 3
"y_spread": 2
}
}

37
kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json Normal file
View file

@ -0,0 +1,37 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "tfc:spreading_crop",
"config": {
"block": "betterend:cave_pumpkin_wild"
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:cave_pumpkin_wild"
}
}
}
]
},
"tries": 16,
"xz_spread": 10,
"y_spread": 2
}
}

42
kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json Normal file
View file

@ -0,0 +1,42 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "betterend:chorus_mushroom_wild"
}
}
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:chorus_mushroom_wild"
}
}
}
]
},
"tries": 16,
"xz_spread": 10,
"y_spread": 2
}
}

42
kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json Normal file
View file

@ -0,0 +1,42 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "betterend:shadow_berry_wild"
}
}
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE_WG"
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "tfc:replaceable"
}
},
{
"type": "block_predicate_filter",
"predicate": {
"type": "would_survive",
"state": {
"Name": "betterend:shadow_berry_wild"
}
}
}
]
},
"tries": 16,
"xz_spread": 10,
"y_spread": 2
}
}

8
kubejs/data/tfg/worldgen/density_function/mars/offset.json
View file

@ -122,22 +122,22 @@
{
"derivative": 0.0,
"location": -1.1,
"value": 0
"value": -0.4
},
{
"derivative": 0.0,
"location": -1.02,
"value": 1
"value": 0.4
},
{
"derivative": 0.0,
"location": -0.26,
"value": 1
"value": 0.4
},
{
"derivative": 0.0,
"location": -0.18,
"value": 0
"value": -0.4
}
]
}

1970
kubejs/data/tfg/worldgen/noise_settings/mars_noise.json
View file

File diff suppressed because it is too large Load diff

19
kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/crop/amber_root",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 50
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"
}
]
}

19
kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/crop/blossom_berry",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 50
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"
}
]
}

4
kubejs/data/tfg/worldgen/placed_feature/mars/surface/bolux_mushroom.json → kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json
View file

@ -1,9 +1,9 @@
{
"feature": "tfg:mars/surface/bolux_mushroom",
"feature": "tfg:mars/crop/bolux_mushroom",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 2
"chance": 50
},
{
"type": "minecraft:in_square"

19
kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/crop/cave_pumpkin",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 50
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"
}
]
}

19
kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/crop/chorus_mushroom",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 50
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"
}
]
}

19
kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/crop/shadow_berry",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 50
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"
}
]
}

7
kubejs/data/tfg/worldgen/placed_feature/mars/no_op.json
View file

@ -1,7 +0,0 @@
{
"feature": {
"type": "minecraft:no_op",
"config": {}
},
"placement": []
}

4
kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json
View file

@ -2,8 +2,8 @@
"feature": "tfg:mars/semiheavy_ammoniacal_water",
"placement": [
{
"type": "minecraft:count",
"count": 1
"type": "minecraft:rarity_filter",
"chance": 30
},
{
"type": "minecraft:in_square"

3
kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json
View file

@ -8,6 +8,9 @@
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"

3
kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json
View file

@ -8,6 +8,9 @@
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"

3
kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json
View file

@ -8,6 +8,9 @@
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"

3
kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json
View file

@ -8,6 +8,9 @@
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"

3
kubejs/data/tfg/worldgen/placed_feature/mars/surface/ruscus.json
View file

@ -8,6 +8,9 @@
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "WORLD_SURFACE"

39
kubejs/server_scripts/ad_astra/tags.js
View file

@ -382,14 +382,26 @@ const registerAdAstraPlacedFeatures = (event) => {
event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_white_sand')
event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_black_sand')
// Mars
//#region Mars
// Vegetation
event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/amber_root")
event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/blossom_berry")
event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/bolux_mushroom")
event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/cave_pumpkin")
event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/chorus_mushroom")
event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/amber_grass")
event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flamaea")
event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flammalix")
event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/lutebus")
event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/orango")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/amber_root")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/bolux_mushroom")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/chorus_mushroom")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/shadow_berry")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/aeridium")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flamaea")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flammalix")
@ -397,7 +409,12 @@ const registerAdAstraPlacedFeatures = (event) => {
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lutebus")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/orango")
event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/ruscus")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/cave_pumpkin")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/chorus_mushroom")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/shadow_berry")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/cave_grass")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/clawfern")
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/flamaea")
@ -406,7 +423,6 @@ const registerAdAstraPlacedFeatures = (event) => {
event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/ruscus")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom")
//event.add("tfg:mars_global_small_plants", "tfg:mars/surface/bolux_mushroom")
// TODO
event.add("tfg:mars_trees", "tfg:mars/surface/strophar_huge")
@ -414,11 +430,7 @@ const registerAdAstraPlacedFeatures = (event) => {
event.add("tfg:mars_trees", "species:alphacene_mushroom")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/aeronos_patch")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/strophar_patch")
// Temp
event.add('tfg:mars_small_rock_features', 'tfg:mars/no_op')
event.add('tfg:mars_veins', 'tfg:mars/no_op')
event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_trees")
event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants")
event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants")
@ -430,9 +442,13 @@ const registerAdAstraPlacedFeatures = (event) => {
event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_trees")
event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants")
event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants")
// Venus
// Top layer
event.add("tfg:mars_top_layer_modification", "tfc:surface_loose_rocks")
//#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')
@ -447,4 +463,5 @@ const registerAdAstraPlacedFeatures = (event) => {
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')
//#endregion
}

27
kubejs/server_scripts/tfg/events.chunks.js
View file

@ -1,6 +1,10 @@
// priority: 0
"use strict";
const $HeightMap = Java.loadClass("net.minecraft.world.level.levelgen.Heightmap")
const ROCK_LAYER_HEIGHT = 40;
TFCEvents.createChunkDataProvider('mars', event => {
const rain = TFC.misc.lerpFloatLayer(0, 0, 0, 0);
@ -14,15 +18,14 @@ TFCEvents.createChunkDataProvider('mars', event => {
.affine(6, 12)
.scaled(6, 18, 0, 1)
// Precompute the surface & aquifer heights as constants as this is nether and does not realistically change
let heights = [];
const rockNoise = TFC.misc.newOpenSimplex2D(event.worldSeed + 8008135)
.octaves(3)
.scaled(0x80000000, 0x7fffffff) // Integer.MIN_VALUE to Integer.MAX_VALUE
.spread(0.00001) // spread it out so the vaiance is small
// Precompute the aquifer heights as constants as this is not used
var aquifer = [];
let i = 0;
while (i < 256) {
heights.push(127);
i++;
}
let aquifer = [];
i = 0;
while (i < 16) {
aquifer.push(32);
i++;
@ -49,10 +52,16 @@ TFCEvents.createChunkDataProvider('mars', event => {
});
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, aquifer);
});
event.rocks((x, y, z, surfaceY, cache, rockLayers) => {
return rockLayers.sampleAtLayer(0, 0);
return rockLayers.sampleAtLayer(rockNoise.noise(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT);
});
})