Merging in mars worldgen branch (#1370)

* red granite is now a real stone type

* starting mars rock layers

* fixed red granite

* flipped the continentalness! thanks stardust
This commit is contained in:
Pyritie 2025-07-18 02:28:21 +01:00 committed by GitHub
parent d1dd3c9e35
commit d1baf88d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
46 changed files with 38755 additions and 136703 deletions

View file

@ -0,0 +1,55 @@
{
"variants": {
"count=1": [
{
"model": "tfg:block/loose/red_granite_1",
"y": 90
},
{
"model": "tfg:block/loose/red_granite_1"
},
{
"model": "tfg:block/loose/red_granite_1",
"y": 180
},
{
"model": "tfg:block/loose/red_granite_1",
"y": 270
}
],
"count=2": [
{
"model": "tfg:block/loose/red_granite_2",
"y": 90
},
{
"model": "tfg:block/loose/red_granite_2"
},
{
"model": "tfg:block/loose/red_granite_2",
"y": 180
},
{
"model": "tfg:block/loose/red_granite_2",
"y": 270
}
],
"count=3": [
{
"model": "tfg:block/loose/red_granite_3",
"y": 90
},
{
"model": "tfg:block/loose/red_granite_3"
},
{
"model": "tfg:block/loose/red_granite_3",
"y": 180
},
{
"model": "tfg:block/loose/red_granite_3",
"y": 270
}
]
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/rock/hardened_red_granite"
}
}
}

View file

@ -0,0 +1,13 @@
{
"variants": {
"part=base": {
"model": "tfg:block/spike/red_granite_base"
},
"part=middle": {
"model": "tfg:block/spike/red_granite_middle"
},
"part=tip": {
"model": "tfg:block/spike/red_granite_tip"
}
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "tfc:block/rock/loose_igneous_intrusive_1",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "tfc:block/rock/loose_igneous_intrusive_2",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "tfc:block/rock/loose_igneous_intrusive_3",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "tfc:block/rock/spike_base",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone",
"particle": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "tfc:block/rock/spike_middle",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone",
"particle": "gtceu:block/stones/red_granite/stone"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "tfc:block/rock/spike_tip",
"textures": {
"texture": "gtceu:block/stones/red_granite/stone",
"particle": "gtceu:block/stones/red_granite/stone"
}
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,75 @@
{
"carvers": {
"air": [
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
"effects": {
"fog_color": 15117444,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "minecraft:ambient.cave",
"tick_delay": 6000
},
"particle": {
"options": {
"type": "minecraft:crimson_spore"
},
"probability": 0.014
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
"ad_astra:martian_raptor": {
"charge": 0.2,
"energy_budget": 0.015
}
},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": 0.8
}

View file

@ -0,0 +1,75 @@
{
"carvers": {
"air": [
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
"effects": {
"fog_color": 15117444,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "minecraft:ambient.cave",
"tick_delay": 6000
},
"particle": {
"options": {
"type": "minecraft:crimson_spore"
},
"probability": 0.014
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
"ad_astra:martian_raptor": {
"charge": 0.2,
"energy_budget": 0.015
}
},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": 0.8
}

View file

@ -0,0 +1,75 @@
{
"carvers": {
"air": [
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
"effects": {
"fog_color": 15117444,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "minecraft:ambient.cave",
"tick_delay": 6000
},
"particle": {
"options": {
"type": "minecraft:crimson_spore"
},
"probability": 0.014
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
"ad_astra:martian_raptor": {
"charge": 0.2,
"energy_budget": 0.015
}
},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": 0.8
}

View file

@ -0,0 +1,75 @@
{
"carvers": {
"air": [
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
"effects": {
"fog_color": 15117444,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "minecraft:ambient.cave",
"tick_delay": 6000
},
"particle": {
"options": {
"type": "minecraft:crimson_spore"
},
"probability": 0.014
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
"ad_astra:martian_raptor": {
"charge": 0.2,
"energy_budget": 0.015
}
},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": 0.8
}

View file

@ -1,9 +1,8 @@
{
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
@ -27,17 +26,31 @@
},
"features": [
[],
[],
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
@ -52,12 +65,7 @@
"creature": [],
"misc": [],
"monster": [
{
"type": "ad_astra:martian_raptor",
"maxCount": 3,
"minCount": 1,
"weight": 100
}
],
"underground_water_creature": [],
"water_ambient": [],

View file

@ -0,0 +1,75 @@
{
"carvers": {
"air": [
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
"effects": {
"fog_color": 15117444,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "minecraft:ambient.cave",
"tick_delay": 6000
},
"particle": {
"options": {
"type": "minecraft:crimson_spore"
},
"probability": 0.014
},
"sky_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
"ad_astra:martian_raptor": {
"charge": 0.2,
"energy_budget": 0.015
}
},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": 0.8
}

View file

@ -1,9 +1,8 @@
{
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
@ -27,17 +26,31 @@
},
"features": [
[],
[],
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
@ -52,12 +65,7 @@
"creature": [],
"misc": [],
"monster": [
{
"type": "ad_astra:martian_raptor",
"maxCount": 3,
"minCount": 1,
"weight": 100
}
],
"underground_water_creature": [],
"water_ambient": [],

View file

@ -1,9 +1,8 @@
{
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
"tfg:mars_cave",
"tfg:mars_canyon"
]
},
"downfall": 0.0,
@ -27,17 +26,31 @@
},
"features": [
[],
"#tfg:mars_craters",
[
"tfg:earth/geode/amethyst",
"tfg:earth/geode/barite",
"tfg:earth/geode/calcite",
"tfg:earth/geode/gypsum",
"tfg:earth/geode/opal",
"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_veins",
[]
"tfg:mars/hardening"
]
],
"has_precipitation": false,
"spawn_costs": {
@ -52,12 +65,7 @@
"creature": [],
"misc": [],
"monster": [
{
"type": "ad_astra:martian_raptor",
"maxCount": 3,
"minCount": 1,
"weight": 100
}
],
"underground_water_creature": [],
"water_ambient": [],

View file

@ -0,0 +1,55 @@
{
"type": "minecraft:canyon",
"config": {
"probability": 0.015,
"y": {
"type": "uniform",
"min_inclusive": {
"absolute": -10
},
"max_inclusive": {
"absolute": 126
}
},
"yScale": 1,
"lava_level": {
"above_bottom": -2032
},
"aquifers_enabled": false,
"vertical_rotation": {
"type": "uniform",
"value": {
"min_inclusive": -0.25,
"max_exclusive": 0.25
}
},
"shape": {
"distance_factor": {
"type": "uniform",
"value": {
"min_inclusive": 2.0,
"max_exclusive": 10.0
}
},
"thickness": {
"type": "trapezoid",
"value": {
"min": 0.0,
"max": 6.0,
"plateau": 2.0
}
},
"width_smoothness": 10,
"horizontal_radius_factor": {
"type": "uniform",
"value": {
"min_inclusive": 0.5,
"max_exclusive": 1.25
}
},
"vertical_radius_default_factor": 1.0,
"vertical_radius_center_factor": 0.0
},
"replaceable": "#tfc:can_carve"
}
}

View file

@ -0,0 +1,48 @@
{
"type": "minecraft:cave",
"config": {
"probability": 0.025,
"y": {
"type": "uniform",
"min_inclusive": {
"absolute": -10
},
"max_inclusive": {
"absolute": 126
}
},
"yScale": {
"type": "uniform",
"value": {
"min_inclusive": 0.1,
"max_exclusive": 0.9
}
},
"lava_level": {
"above_bottom": -2032
},
"aquifers_enabled": false,
"horizontal_radius_multiplier": {
"type": "uniform",
"value": {
"min_inclusive": 1.2,
"max_exclusive": 2.0
}
},
"vertical_radius_multiplier": {
"type": "uniform",
"value": {
"min_inclusive": 1.3,
"max_exclusive": 2.0
}
},
"floor_level": {
"type": "uniform",
"value": {
"min_inclusive": -1,
"max_exclusive": -0.4
}
},
"replaceable": "#tfc:can_carve"
}
}

View file

@ -0,0 +1,8 @@
{
"type": "minecraft:old_blended_noise",
"smear_scale_multiplier": 8.0,
"xz_factor": 80.0,
"xz_scale": 0.25,
"y_factor": 160.0,
"y_scale": 0.125
}

View file

@ -0,0 +1,83 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:min",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:add",
"argument1": 0.37,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:cave_entrance",
"xz_scale": 0.75,
"y_scale": 0.5
}
},
"argument2": {
"type": "minecraft:y_clamped_gradient",
"from_value": 0.3,
"from_y": -10,
"to_value": 0.0,
"to_y": 30
}
},
"argument2": {
"type": "minecraft:add",
"argument1": "tfg:mars/caves/spaghetti_roughness_function",
"argument2": {
"type": "minecraft:clamp",
"input": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_3d_rarity",
"xz_scale": 2.0,
"y_scale": 1.0
}
},
"noise": "minecraft:spaghetti_3d_1",
"rarity_value_mapper": "type_1"
},
"argument2": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_3d_rarity",
"xz_scale": 2.0,
"y_scale": 1.0
}
},
"noise": "minecraft:spaghetti_3d_2",
"rarity_value_mapper": "type_1"
}
},
"argument2": {
"type": "minecraft:add",
"argument1": -0.0765,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.011499999999999996,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_3d_thickness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
},
"max": 1.0,
"min": -1.0
}
}
}
}

View file

@ -0,0 +1,94 @@
{
"type": "minecraft:range_choice",
"input": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -30.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle",
"xz_scale": 1.0,
"y_scale": 1.0
},
"when_out_of_range": -1.0
}
},
"max_exclusive": 0.0,
"min_inclusive": -1000000.0,
"when_in_range": 64.0,
"when_out_of_range": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:add",
"argument1": -0.07500000000000001,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.025,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_thickness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
},
"when_out_of_range": 0.0
}
},
"argument2": {
"type": "minecraft:mul",
"argument1": 1.5,
"argument2": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_ridge_a",
"xz_scale": 2.6666666666666665,
"y_scale": 2.6666666666666665
},
"when_out_of_range": 0.0
}
}
},
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:interpolated",
"argument": {
"type": "minecraft:range_choice",
"input": "minecraft:y",
"max_exclusive": 321.0,
"min_inclusive": -60.0,
"when_in_range": {
"type": "minecraft:noise",
"noise": "minecraft:noodle_ridge_b",
"xz_scale": 2.6666666666666665,
"y_scale": 2.6666666666666665
},
"when_out_of_range": 0.0
}
}
}
}
}
}
}

View file

@ -0,0 +1,50 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:mul",
"argument1": 2.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar",
"xz_scale": 25.0,
"y_scale": 0.3
}
},
"argument2": {
"type": "minecraft:add",
"argument1": -1.0,
"argument2": {
"type": "minecraft:mul",
"argument1": -1.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar_rareness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
},
"argument2": {
"type": "minecraft:cube",
"argument": {
"type": "minecraft:add",
"argument1": 0.55,
"argument2": {
"type": "minecraft:mul",
"argument1": 0.55,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:pillar_thickness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
}
}
}

View file

@ -0,0 +1,61 @@
{
"type": "minecraft:clamp",
"input": {
"type": "minecraft:max",
"argument1": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:weird_scaled_sampler",
"input": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_modulator",
"xz_scale": 2.0,
"y_scale": 1.0
},
"noise": "minecraft:spaghetti_2d",
"rarity_value_mapper": "type_2"
},
"argument2": {
"type": "minecraft:mul",
"argument1": 0.083,
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
}
},
"argument2": {
"type": "minecraft:cube",
"argument": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:add",
"argument1": {
"type": "minecraft:add",
"argument1": 0.0,
"argument2": {
"type": "minecraft:mul",
"argument1": 8.0,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_elevation",
"xz_scale": 1.0,
"y_scale": 0.0
}
}
},
"argument2": {
"type": "minecraft:y_clamped_gradient",
"from_value": 8.0,
"from_y": -32,
"to_value": -20.0,
"to_y": 320
}
}
},
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
}
}
},
"max": 1.0,
"min": -1.0
}

View file

@ -0,0 +1,17 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:add",
"argument1": -0.95,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.35000000000000003,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_2d_thickness",
"xz_scale": 2.0,
"y_scale": 1.0
}
}
}
}

View file

@ -0,0 +1,33 @@
{
"type": "minecraft:cache_once",
"argument": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:add",
"argument1": -0.05,
"argument2": {
"type": "minecraft:mul",
"argument1": -0.05,
"argument2": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_roughness_modulator",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
},
"argument2": {
"type": "minecraft:add",
"argument1": -0.4,
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:spaghetti_roughness",
"xz_scale": 1.0,
"y_scale": 1.0
}
}
}
}
}

View file

@ -0,0 +1,34 @@
{
"type": "minecraft:flat_cache",
"argument": {
"type": "minecraft:spline",
"spline": {
"coordinate": {
"type": "minecraft:shifted_noise",
"noise": "minecraft:continentalness",
"shift_x": "minecraft:shift_x",
"shift_y": 0,
"shift_z": "minecraft:shift_z",
"xz_scale": 0.25,
"y_scale": 0
},
"points": [
{
"location": -1,
"derivative": 1,
"value": -1
},
{
"location": 0.19,
"derivative": 1,
"value": -0.19
},
{
"location": 1,
"derivative": 1,
"value": 1
}
]
}
}
}

View file

@ -0,0 +1,11 @@
{
"type": "minecraft:add",
"argument1": {
"type": "minecraft:y_clamped_gradient",
"from_value": 1.5,
"from_y": -32,
"to_value": -1.5,
"to_y": 320
},
"argument2": "tfg:mars/offset"
}

View file

@ -0,0 +1,12 @@
{
"type": "minecraft:flat_cache",
"argument": {
"type": "minecraft:shifted_noise",
"noise": "minecraft:erosion",
"shift_x": "minecraft:shift_x",
"shift_y": 0.0,
"shift_z": "minecraft:shift_z",
"xz_scale": 0.25,
"y_scale": 0.0
}
}

View file

@ -0,0 +1,890 @@
{
"type": "minecraft:flat_cache",
"argument": {
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:add",
"argument1": 10.0,
"argument2": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:blend_alpha"
},
"argument2": {
"type": "minecraft:add",
"argument1": -10.0,
"argument2": {
"type": "minecraft:spline",
"spline": {
"coordinate": "tfg:mars/continents",
"points": [
{
"derivative": 0.0,
"location": -0.19,
"value": 3.95
},
{
"derivative": 0.0,
"location": -0.15,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -0.6,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 6.25
}
]
}
},
{
"derivative": 0.0,
"location": -0.5,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.05,
"value": 2.67
}
]
}
},
{
"derivative": 0.0,
"location": -0.35,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 6.25
}
]
}
},
{
"derivative": 0.0,
"location": -0.25,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 6.25
}
]
}
},
{
"derivative": 0.0,
"location": -0.1,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 2.67
},
{
"derivative": 0.0,
"location": 0.05,
"value": 6.3
}
]
}
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 6.25
}
]
}
},
{
"derivative": 0.0,
"location": 0.35,
"value": 6.25
},
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 6.25
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 6.25
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.55,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 6.25
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 6.25
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.62,
"value": 6.25
}
]
}
},
{
"derivative": 0.0,
"location": -0.1,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -0.6,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.47
}
]
}
},
{
"derivative": 0.0,
"location": -0.5,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.05,
"value": 2.67
}
]
}
},
{
"derivative": 0.0,
"location": -0.35,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.47
}
]
}
},
{
"derivative": 0.0,
"location": -0.25,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.47
}
]
}
},
{
"derivative": 0.0,
"location": -0.1,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 2.67
},
{
"derivative": 0.0,
"location": 0.05,
"value": 6.3
}
]
}
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.47
}
]
}
},
{
"derivative": 0.0,
"location": 0.35,
"value": 5.47
},
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 5.47
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 5.47
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.55,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 5.47
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 5.47
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.62,
"value": 5.47
}
]
}
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -0.6,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.08
}
]
}
},
{
"derivative": 0.0,
"location": -0.5,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.05,
"value": 2.67
}
]
}
},
{
"derivative": 0.0,
"location": -0.35,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.08
}
]
}
},
{
"derivative": 0.0,
"location": -0.25,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.08
}
]
}
},
{
"derivative": 0.0,
"location": -0.1,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 2.67
},
{
"derivative": 0.0,
"location": 0.05,
"value": 6.3
}
]
}
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 5.08
}
]
}
},
{
"derivative": 0.0,
"location": 0.35,
"value": 5.08
},
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 5.08
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 5.08
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.55,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.9,
"value": 5.08
},
{
"derivative": 0.0,
"location": -0.69,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": 0.0,
"value": 5.08
},
{
"derivative": 0.0,
"location": 0.1,
"value": 0.625
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": 0.62,
"value": 5.08
}
]
}
},
{
"derivative": 0.0,
"location": 0.06,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -0.6,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": -0.5,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.05,
"value": 2.67
}
]
}
},
{
"derivative": 0.0,
"location": -0.35,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": -0.25,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": -0.1,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.05,
"value": 2.67
},
{
"derivative": 0.0,
"location": 0.05,
"value": 6.3
}
]
}
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": 0.05,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": 0.7,
"value": 1.56
}
]
}
},
{
"derivative": 0.0,
"location": 0.4,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": 0.7,
"value": 1.56
}
]
}
},
{
"derivative": 0.0,
"location": 0.45,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.7,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": -0.15,
"value": 1.37
}
]
}
},
{
"derivative": 0.0,
"location": 0.55,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": -0.7,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.2,
"value": 6.3
},
{
"derivative": 0.0,
"location": 0.2,
"value": 4.69
}
]
}
},
{
"derivative": 0.0,
"location": -0.15,
"value": 1.37
}
]
}
},
{
"derivative": 0.0,
"location": 0.58,
"value": 4.69
}
]
}
}
]
}
}
}
}
}
}
}

View file

@ -0,0 +1,303 @@
{
"type": "minecraft:flat_cache",
"argument": {
"type": "minecraft:cache_2d",
"argument": {
"type": "minecraft:add",
"argument1": 0.0,
"argument2": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:blend_alpha"
},
"argument2": {
"type": "minecraft:add",
"argument1": -0.0,
"argument2": {
"type": "minecraft:spline",
"spline": {
"coordinate": "tfg:mars/continents",
"points": [
{
"derivative": 0.0,
"location": -0.11,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.03,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -1.0,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": 0.0
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.63
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.3
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.78,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": 0.0
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.315
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.15
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.5775,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": 0.0
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.315
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.15
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.375,
"value": 0.0
}
]
}
},
{
"derivative": 0.0,
"location": 0.65,
"value": {
"coordinate": "tfg:mars/erosion",
"points": [
{
"derivative": 0.0,
"location": -1.0,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.63
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.3
}
]
}
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.63
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.3
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.78,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": 0.0
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.63
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.3
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.5775,
"value": {
"coordinate": "tfg:mars/ridges_folded",
"points": [
{
"derivative": 0.0,
"location": 0.19999999,
"value": 0.0
},
{
"derivative": 0.0,
"location": 0.44999996,
"value": 0.0
},
{
"derivative": 0.0,
"location": 1.0,
"value": {
"coordinate": "tfg:mars/ridges",
"points": [
{
"derivative": 0.0,
"location": -0.01,
"value": 0.63
},
{
"derivative": 0.0,
"location": 0.01,
"value": 0.3
}
]
}
}
]
}
},
{
"derivative": 0.0,
"location": -0.375,
"value": 0.0
}
]
}
}
]
}
}
}
}
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,12 @@
{
"type": "minecraft:flat_cache",
"argument": {
"type": "minecraft:shifted_noise",
"noise": "minecraft:ridge",
"shift_x": "minecraft:shift_x",
"shift_y": 0.0,
"shift_z": "minecraft:shift_z",
"xz_scale": 0.25,
"y_scale": 0.0
}
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:mul",
"argument1": -3.0,
"argument2": {
"type": "minecraft:add",
"argument1": -0.3333333333333333,
"argument2": {
"type": "minecraft:abs",
"argument": {
"type": "minecraft:add",
"argument1": -0.6666666666666666,
"argument2": {
"type": "minecraft:abs",
"argument": "tfg:mars/ridges"
}
}
}
}
}

View file

@ -0,0 +1,32 @@
{
"type": "minecraft:add",
"argument1": {
"type": "minecraft:mul",
"argument1": 4.0,
"argument2": {
"type": "minecraft:quarter_negative",
"argument": {
"type": "minecraft:mul",
"argument1": {
"type": "minecraft:add",
"argument1": "tfg:mars/depth",
"argument2": {
"type": "minecraft:mul",
"argument1": "tfg:mars/jaggedness",
"argument2": {
"type": "minecraft:half_negative",
"argument": {
"type": "minecraft:noise",
"noise": "minecraft:jagged",
"xz_scale": 1500.0,
"y_scale": 0.0
}
}
}
},
"argument2": "tfg:mars/factor"
}
}
},
"argument2": "tfg:mars/base_3d_noise"
}

View file

@ -1,130 +0,0 @@
{
"rocks": {
"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",
"rhyolite": "tfc:rhyolite",
"basalt": "tfc:basalt",
"andesite": "tfc:andesite",
"dacite": "tfc:dacite",
"mars_stone": {
"raw": "ad_astra:mars_stone",
"hardened": "tfg:rock/hardened_mars_stone",
"gravel": "ad_astra:mars_sand",
"cobble": "ad_astra:mars_cobblestone",
"sand": "ad_astra:mars_sand",
"sandstone": "ad_astra:mars_stone"
},
"red_granite": {
"raw": "TODO",
"hardened": "TODO",
"gravel": "TODO",
"cobble": "TODO",
"sand": "tfc:sand/red",
"sandstone": "tfc:raw_sandstone/red"
}
},
"bottom": [
"granite",
"gabbro",
"rhyolite",
"basalt",
"andesite",
"dacite",
"mars_stone",
"red_granite"
],
"layers": [
{
"id": "felsic",
"layers": {
"granite": "bottom",
"red_granite": "bottom"
}
},
{
"id": "intermediate",
"layers": {
"mars_stone": "bottom"
}
},
{
"id": "mafic",
"layers": {
"gabbro": "bottom"
}
},
{
"id": "igneous_extrusive",
"layers": {
"rhyolite": "felsic",
"andesite": "intermediate",
"dacite": "intermediate",
"basalt": "mafic"
}
},
{
"id": "igneous_extrusive_x2",
"layers": {
"rhyolite": "igneous_extrusive",
"andesite": "igneous_extrusive",
"dacite": "igneous_extrusive",
"basalt": "igneous_extrusive"
}
},
{
"id": "land_sedimentary",
"layers": {
"claystone": "igneous_extrusive",
"conglomerate": "igneous_extrusive",
"dolomite": "igneous_extrusive",
"chert": "igneous_extrusive",
"chalk": "igneous_extrusive"
}
},
{
"id": "water_sedimentary",
"layers": {
"shale": "bottom",
"claystone": "bottom",
"dolomite": "bottom",
"limestone": "bottom",
"chert": "bottom"
}
},
{
"id": "uplift",
"layers": {
"red_granite": "land_sedimentary",
"granite": "land_sedimentary",
"gabbro": "land_sedimentary",
"mars_stone": "land_sedimentary"
}
}
],
"ocean_floor": [
"water_sedimentary"
],
"volcanic": [
"igneous_extrusive",
"igneous_extrusive_x2"
],
"land": [
"land_sedimentary",
"igneous_extrusive"
],
"uplift": [
"uplift"
]
}

View file

@ -10,5 +10,5 @@
1,
1
],
"firstOctave": -10
"firstOctave": -11
}

View file

@ -10,5 +10,5 @@
1,
1
],
"firstOctave": -10
"firstOctave": -11
}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,186 @@
{
"feature": {
"type": "minecraft:replace_single_block",
"config": {
"targets": [
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "ad_astra:mars_stone"
},
"state": {
"Name": "tfg:rock/hardened_mars_stone"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "ad_astra:venus_stone"
},
"state": {
"Name": "tfg:rock/hardened_venus_stone"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "gtceu:red_granite"
},
"state": {
"Name": "tfg:rock/hardened_red_granite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/gabbro"
},
"state": {
"Name": "tfc:rock/hardened/gabbro"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/rhyolite"
},
"state": {
"Name": "tfc:rock/hardened/rhyolite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/basalt"
},
"state": {
"Name": "tfc:rock/hardened/basalt"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/andesite"
},
"state": {
"Name": "tfc:rock/hardened/andesite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/dacite"
},
"state": {
"Name": "tfc:rock/hardened/dacite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/diorite"
},
"state": {
"Name": "tfc:rock/hardened/diorite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/shale"
},
"state": {
"Name": "tfc:rock/hardened/shale"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/dolomite"
},
"state": {
"Name": "tfc:rock/hardened/dolomite"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/limestone"
},
"state": {
"Name": "tfc:rock/hardened/limestone"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/claystone"
},
"state": {
"Name": "tfc:rock/hardened/claystone"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/conglomerate"
},
"state": {
"Name": "tfc:rock/hardened/conglomerate"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/chert"
},
"state": {
"Name": "tfc:rock/hardened/chert"
}
},
{
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:dripstone_block"
},
"state": {
"Name": "tfg:rock/hardened_dripstone"
}
},
{
"target": {
"predicate_type": "minecraft:tag_match",
"tag": "tfc:can_landslide"
},
"state": {
"Name": "tfg:rock/hardened_mars_stone"
}
}
]
}
},
"placement": [
{
"type": "minecraft:carving_mask",
"step": "air"
},
{
"type": "minecraft:environment_scan",
"direction_of_search": "up",
"max_steps": 1,
"target_condition": {
"type": "minecraft:any_of",
"predicates": [
{
"type": "minecraft:matching_block_tag",
"tag": "ad_astra:mars_stone_replaceables"
},
{
"type": "minecraft:matching_block_tag",
"tag": "tfc:can_landslide"
}
]
}
}
]
}

View file

@ -173,6 +173,41 @@ const registerAdAstraBlockTags = (event) => {
event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/dacite')
event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/dacite')
// Mars
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/dacite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/dacite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/basalt')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/basalt')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/gabbro')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/gabbro')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/diorite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/diorite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/rhyolite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/rhyolite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/andesite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/andesite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/chert')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/chert')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/conglomerate')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/conglomerate')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/claystone')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/claystone')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/limestone')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/limestone')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/dolomite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/dolomite')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/raw/shale')
event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/shale')
event.add('ad_astra:mars_stone_replaceables', 'ad_astra:mars_stone')
event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_mars_stone')
event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_stone')
event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_venus_stone')
event.add('ad_astra:mars_stone_replaceables', 'gtceu:red_granite')
event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_red_granite')
event.add('ad_astra:mars_stone_replaceables', 'minecraft:dripstone_block')
event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_dripstone')
event.add('minecraft:rabbits_spawnable_on', '#ad_astra:moon_stone_replaceables')
event.add('species:limpet_spawnable_on', '#ad_astra:moon_stone_replaceables')

View file

@ -124,6 +124,20 @@ function registerTFGSpaceBlocks(event) {
.fullBlock(true)
.opaque(true)
event.create('tfg:rock/hardened_red_granite')
.stoneSoundType()
.requiresTool(true)
.item(item => {
item.modelJson({ parent: 'gtceu:item/red_granite' })
})
.tagBlock('tfc:can_carve')
.tagBoth('forge:stone')
.tagBoth('tfc:rock/hardened')
.tagBlock('minecraft:mineable/pickaxe')
.mapColor('terracotta_red')
.fullBlock(true)
.opaque(true)
// Loose stones
event.create('tfg:loose/moon_stone', 'tfc:loose_rock')
@ -182,6 +196,14 @@ function registerTFGSpaceBlocks(event) {
.tagItem('tfc:rock_knapping')
.tagItem('tfc:metamorphic_rock')
event.create('tfg:loose/red_granite', 'tfc:loose_rock')
.stoneSoundType()
.itemTexture('tfg:item/loose/red_granite')
.tagBlock('tfc:loose_rocks')
.tagItem('tfc:any_knapping')
.tagItem('tfc:rock_knapping')
.tagItem('tfc:igneous_intrusive_rock')
// Spikes
event.create('tfg:spike/moon_stone_spike', 'tfc:rock_spike')
@ -212,6 +234,10 @@ function registerTFGSpaceBlocks(event) {
.stoneSoundType()
.noItem()
event.create('tfg:spike/red_granite_spike', 'tfc:rock_spike')
.stoneSoundType()
.noItem()
// #region Plants
/*

View file

@ -25,7 +25,8 @@ global.EXTRATERRESTRIAL_RAW_ROCKS = [
'ad_astra:mars_stone',
'ad_astra:venus_stone',
'ad_astra:mercury_stone',
'ad_astra:glacio_stone'
'ad_astra:glacio_stone',
'gtceu:red_granite'
]
global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
@ -35,6 +36,7 @@ global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
'tfg:rock/hardened_venus_stone',
'tfg:rock/hardened_mercury_stone',
'tfg:rock/hardened_glacio_stone',
'tfg:rock/hardened_red_granite'
]
global.MOON_STONE_TYPES = [

View file

@ -30,6 +30,16 @@ const registerTFGFluids = (event) => {
.luminosity(2)
.noBlock()
//#region Mars
event.create('tfg:semiheavy_ammoniacal_water')
.thinTexture(0x704f786c)
.color(0x4f786c)
.viscosity(0)
.density(0)
.temperature(213)
.renderType('translucent')
//#endregion
//#region Venus
event.create('tfg:sulfur_fumes')
.stillTexture('tfg:block/planets/venus/sulfur_fumes_still')