From c099daf52bbae51b1e485e9df4fdd6d58b5f1b8e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 19 Jul 2025 16:20:15 +0100 Subject: [PATCH] added back vanilla red sand, started work on some tags, added mars deep desert biome --- kubejs/data/ad_astra/dimension/mars.json | 188 ++--- .../biome/mars/martian_deep_desert.json | 75 ++ .../mars/caves/entrances.json | 135 ++-- .../caves/spaghetti_roughness_function.json | 54 +- .../worldgen/noise_settings/mars_noise.json | 656 +++++++++++++++++- kubejs/server_scripts/ad_astra/tags.js | 8 + kubejs/server_scripts/tfg/recipes.collapse.js | 8 +- kubejs/startup_scripts/minecraft/constants.js | 28 - 8 files changed, 896 insertions(+), 256 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index f53850403..49a87e22f 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -33,7 +33,7 @@ } }, { - "biome": "tfg:mars/martian_dunes", + "biome": "tfg:mars/martian_deep_desert", "parameters": { "continentalness": [ -1.05, @@ -87,7 +87,7 @@ } }, { - "biome": "tfg:mars/martian_dunes", + "biome": "tfg:mars/martian_deep_desert", "parameters": { "continentalness": [ -1.05, @@ -141,7 +141,7 @@ } }, { - "biome": "tfg:mars/martian_dunes", + "biome": "tfg:mars/martian_deep_desert", "parameters": { "continentalness": [ -1.05, @@ -195,7 +195,7 @@ } }, { - "biome": "tfg:mars/martian_dunes", + "biome": "tfg:mars/martian_deep_desert", "parameters": { "continentalness": [ -1.05, @@ -2463,7 +2463,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -2544,7 +2544,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -2841,7 +2841,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -2922,7 +2922,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -4353,7 +4353,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -4434,7 +4434,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -4731,7 +4731,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -4812,7 +4812,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -5109,7 +5109,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -5190,7 +5190,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -5487,7 +5487,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -5568,7 +5568,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -11886,7 +11886,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -11940,7 +11940,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -12237,7 +12237,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -12291,7 +12291,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -13641,7 +13641,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -13695,7 +13695,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -13992,7 +13992,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -14046,7 +14046,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -14343,7 +14343,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -14397,7 +14397,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -14694,7 +14694,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -14748,7 +14748,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -20337,7 +20337,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -20391,7 +20391,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -20634,7 +20634,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -20688,7 +20688,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -21822,7 +21822,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -21876,7 +21876,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -22119,7 +22119,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -22173,7 +22173,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -22416,7 +22416,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -22470,7 +22470,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -22713,7 +22713,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -22767,7 +22767,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -28086,7 +28086,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -28140,7 +28140,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -28437,7 +28437,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -28491,7 +28491,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -29841,7 +29841,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -29895,7 +29895,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -30192,7 +30192,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -30246,7 +30246,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -30543,7 +30543,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -30597,7 +30597,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -30894,7 +30894,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -30948,7 +30948,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -37104,7 +37104,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -37185,7 +37185,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -37482,7 +37482,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -37563,7 +37563,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -38994,7 +38994,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -39075,7 +39075,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -39372,7 +39372,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -39453,7 +39453,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -39750,7 +39750,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -39831,7 +39831,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -40128,7 +40128,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -40209,7 +40209,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -61890,7 +61890,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -61971,7 +61971,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -62241,7 +62241,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -62322,7 +62322,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -62592,7 +62592,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -62673,7 +62673,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -70773,7 +70773,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -70827,7 +70827,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -71124,7 +71124,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -71178,7 +71178,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -71475,7 +71475,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -71529,7 +71529,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -79170,7 +79170,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -79224,7 +79224,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -79467,7 +79467,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -79521,7 +79521,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -79764,7 +79764,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -79818,7 +79818,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -86973,7 +86973,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -87027,7 +87027,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -87324,7 +87324,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -87378,7 +87378,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -87675,7 +87675,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.03, @@ -87729,7 +87729,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -95856,7 +95856,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -95937,7 +95937,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -96207,7 +96207,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -96288,7 +96288,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -96558,7 +96558,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, @@ -96639,7 +96639,7 @@ } }, { - "biome": "tfg:mars/martian_plains", + "biome": "tfg:mars/martian_hills", "parameters": { "continentalness": [ 0.3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json new file mode 100644 index 000000000..555239dc9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -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 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json index c5f5337a3..4bd9b81c4 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json @@ -1,83 +1,70 @@ { - "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", + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:min", + "argument1": { + "type": "minecraft:add", "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 + "type": "minecraft:add", + "argument1": 0.37, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:cave_entrance", + "xz_scale": 0.5, + "y_scale": 0.25 } - }, - "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" + "type": "minecraft:y_clamped_gradient", + "from_value": 0.2, + "from_y": -10, + "to_value": 0, + "to_y": 30 } - }, - "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 - } + "argument2": { + "type": "minecraft:add", + "argument1": "minecraft:overworld/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, + "y_scale": 1 + } + }, + "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, + "y_scale": 1 + } + }, + "noise": "minecraft:spaghetti_3d_2", + "rarity_value_mapper": "type_1" + } + }, + "argument2": 0 + }, + "max": 1, + "min": -1 + } + } } - } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json index 549344e25..80d9fcefb 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json @@ -1,33 +1,33 @@ { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": -0.05, - "argument2": { + "type": "minecraft:cache_once", + "argument": { "type": "minecraft:mul", - "argument1": -0.05, + "argument1": { + "type": "minecraft:add", + "argument1": -0.05, + "argument2": { + "type": "minecraft:mul", + "argument1": -0.02, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:spaghetti_roughness_modulator", + "xz_scale": 1, + "y_scale": 1 + } + } + }, "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_roughness_modulator", - "xz_scale": 1.0, - "y_scale": 1.0 + "type": "minecraft:add", + "argument1": -0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:noise", + "noise": "minecraft:spaghetti_roughness", + "xz_scale": 0.4, + "y_scale": 0.4 + } + } } - } - }, - "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 - } - } } - } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 4a3263a45..432e9cd9c 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -8,13 +8,13 @@ "Name": "ad_astra:mars_stone" }, "default_fluid": { - "Name": "tfg:semiheavy_ammoniacal_water" + "Name": "minecraft:air" }, "noise": { "min_y": -32, "height": 384, "size_horizontal": 1, - "size_vertical": 4 + "size_vertical": 2 }, "noise_router": { "barrier": { @@ -467,7 +467,7 @@ "if_true": { "type": "minecraft:biome", "biome_is": [ - "tfg:mars/martian_oasis" + "tfg:mars/martian_deep_desert" ] }, "then_run": { @@ -487,6 +487,31 @@ } } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "tfg:mars/martian_oasis" + ] + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:magenta_concrete" + } + } + } + }, @@ -496,10 +521,10 @@ "type": "minecraft:vertical_gradient", "random_name": "tfg:mars_bottom_rock_layer", "false_at_and_above": { - "absolute": 4 + "absolute": 8 }, "true_at_and_below": { - "absolute": -4 + "absolute": 0 } }, "then_run": { @@ -511,7 +536,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -522,7 +547,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -593,7 +618,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -611,14 +636,14 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfc:rock/hardened/rhyolite" + "Name": "tfc:rock/hardened/diorite" } } }, { "type": "minecraft:block", "result_state": { - "Name": "tfc:rock/raw/rhyolite" + "Name": "tfc:rock/raw/diorite" } } ] @@ -644,7 +669,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -661,14 +686,14 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfc:rock/hardened/basalt" + "Name": "tfc:rock/hardened/granite" } } }, { "type": "minecraft:block", "result_state": { - "Name": "tfc:rock/raw/basalt" + "Name": "tfc:rock/raw/granite" } } ] @@ -697,14 +722,14 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfg:rock/hardened_mars_stone" + "Name": "tfg:rock/hardened_venus_stone" } } }, { "type": "minecraft:block", "result_state": { - "Name": "ad_astra:mars_stone" + "Name": "ad_astra:venus_stone" } } ] @@ -715,7 +740,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -754,7 +779,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -766,7 +791,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -837,7 +862,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -874,8 +899,577 @@ ] } }, - - + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:vertical_gradient", + "random_name": "tfg:mars_middle_rock_layer", + "false_at_and_above": { + "absolute": 50 + }, + "true_at_and_below": { + "absolute": 42 + } + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_1", + "min_threshold": -1.0, + "max_threshold": -0.25 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -1.0, + "max_threshold": -0.25 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/hardened_mars_stone" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:mars_stone" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -0.2, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/dolomite" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/dolomite" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": 0.25, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/chert" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/chert" + } + } + ] + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_1", + "min_threshold": -0.2, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -1.0, + "max_threshold": -0.25 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/conglomerate" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/conglomerate" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -0.2, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/hardened_red_granite" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "gtceu:red_granite" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": 0.25, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/basalt" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/basalt" + } + } + ] + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_1", + "min_threshold": 0.25, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -1.0, + "max_threshold": -0.25 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/dacite" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/dacite" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -0.2, + "max_threshold": 0.2 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/hardened_venus_stone" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_stone" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": 0.25, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/shale" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/shale" + } + } + ] + } + } + ] + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "tfg:mars/martian_mountains", + "tfg:mars/martian_hills" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_1", + "min_threshold": -1.0, + "max_threshold": 0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -1.0, + "max_threshold": 0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/hardened_red_granite" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "gtceu:red_granite" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": 0, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/basalt" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/basalt" + } + } + ] + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_1", + "min_threshold": 0, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": -1.0, + "max_threshold": 0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/hardened/gabbro" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:rock/raw/gabbro" + } + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:stone_layer_mars_2", + "min_threshold": 0, + "max_threshold": 1.0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "ceiling", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/hardened_red_granite" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "gtceu:red_granite" + } + } + ] + } + } + ] + } + } + ] + } + }, { "type": "minecraft:sequence", "sequence": [ @@ -885,7 +1479,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -896,7 +1490,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -913,14 +1507,14 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfg:rock/hardened_venus_stone" + "Name": "tfc:rock/hardened/chalk" } } }, { "type": "minecraft:block", "result_state": { - "Name": "ad_astra:venus_stone" + "Name": "tfc:rock/raw/chalk" } } ] @@ -967,7 +1561,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -1018,7 +1612,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -1089,7 +1683,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -1128,7 +1722,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { @@ -1140,7 +1734,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.2 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:sequence", @@ -1211,7 +1805,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.2, + "min_threshold": 0.25, "max_threshold": 1.0 }, "then_run": { diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 1c19d877b..8e0fbbb2c 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -206,6 +206,12 @@ const registerAdAstraBlockTags = (event) => { 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('ad_astra:mars_stone_replaceables', 'minecraft:red_sand') + event.add('ad_astra:mars_stone_replaceables', 'ad_astra:mars_sand') + event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_sand') + event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/black') + event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/red') + event.add('ad_astra:mars_stone_replaceables', 'tfc:sand/pink') event.add('minecraft:rabbits_spawnable_on', '#ad_astra:moon_stone_replaceables') @@ -214,12 +220,14 @@ const registerAdAstraBlockTags = (event) => { event.add('tfc:can_landslide', 'ad_astra:moon_sand') event.add('tfc:can_landslide', 'ad_astra:mars_sand') event.add('tfc:can_landslide', 'ad_astra:venus_sand') + event.add('tfc:can_landslide', 'minecraft:red_sand') event.add('tfc:can_landslide', 'ad_astra:moon_cobblestone') event.add('tfc:can_landslide', 'ad_astra:mars_cobblestone') event.add('tfc:can_landslide', 'ad_astra:venus_cobblestone') event.add('tfc:can_landslide', 'ad_astra:mercury_cobblestone') event.add('tfc:can_landslide', 'ad_astra:glacio_cobblestone') + event.add('tfc:can_landslide', 'gtceu:red_granite_cobblestone') event.add('forge:cobblestone', 'ad_astra:moon_cobblestone') event.add('forge:cobblestone', 'ad_astra:mars_cobblestone') diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index d762221da..b955fbe40 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -46,12 +46,16 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'tfg:rock/hardened_mercury_stone') event.recipes.tfc.landslide('ad_astra:mercury_cobblestone', 'ad_astra:mercury_cobblestone') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', '#forge:ores_in_ground/mercury_stone') - event.recipes.tfc.landslide('ad_astra:mercury_sand', 'ad_astra:mercury_sand') event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'ad_astra:glacio_stone') event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'tfg:rock/hardened_glacio_stone') event.recipes.tfc.landslide('ad_astra:glacio_cobblestone', 'ad_astra:glacio_cobblestone') event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', '#forge:ores_in_ground/glacio_stone') - event.recipes.tfc.landslide('ad_astra:glacio_sand', 'ad_astra:glacio_sand') + + event.recipes.tfc.landslide('minecraft:red_sand', 'minecraft:red_sand') + event.recipes.tfc.landslide('gtceu:red_granite_cobblestone', 'gtceu:red_granite_cobblestone') + event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'gtceu:red_granite') + event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'tfg:rock/hardened_red_granite') + event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', '#forge:ores_in_ground/red_granite') // #endregion } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 0c1c6b7ac..2aabf4dbb 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -136,19 +136,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:sand', 'minecraft:suspicious_sand', - // Красный песок - 'minecraft:red_sandstone', - 'minecraft:red_sandstone_stairs', - 'minecraft:red_sandstone_slab', - 'minecraft:red_sandstone_wall', - 'minecraft:smooth_red_sandstone', - 'minecraft:smooth_red_sandstone_stairs', - 'minecraft:smooth_red_sandstone_slab', - 'minecraft:cut_red_sandstone', - 'minecraft:cut_red_sandstone_slab', - 'minecraft:chiseled_red_sandstone', - 'minecraft:red_sand', - // Кораллы 'minecraft:horn_coral', 'minecraft:horn_coral_fan', @@ -776,21 +763,6 @@ global.VANILLA_WOOD_TYPES = [ "warped" // TODO: Разблокировать когда появится АД ]; -global.VANILLA_STONE_TYPES = [ - "sand", - "red_sand", - "gravel", - "ore", - "deepslate", - "basalt", - "endstone", - "netherrack", - "andesite", - "diorite", - "granite", - "tuff" -]; - global.MINECRAFT_DYE_NAMES = [ 'white', 'orange',