diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 2d034321e..61aab90fe 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/aeronos.json b/kubejs/assets/tfg/blockstates/saplings/aeronos.json new file mode 100644 index 000000000..1ec4995be --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/aeronos.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "ad_astra:block/alphacene_mushroom" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/alphacene.json b/kubejs/assets/tfg/blockstates/saplings/alphacene.json new file mode 100644 index 000000000..86dbb9df9 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/alphacene.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "species:block/alphacene_mushroom" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/crimson.json b/kubejs/assets/tfg/blockstates/saplings/crimson.json new file mode 100644 index 000000000..d65643dda --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/crimson.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "minecraft:block/crimson_fungus" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/strophar.json b/kubejs/assets/tfg/blockstates/saplings/strophar.json new file mode 100644 index 000000000..2a714f2ca --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/strophar.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "ad_astra:block/strophar" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/warped.json b/kubejs/assets/tfg/blockstates/saplings/warped.json new file mode 100644 index 000000000..818135dbd --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/warped.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "minecraft:block/warped_fungus" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/aeronos.json b/kubejs/assets/tfg/models/item/saplings/aeronos.json new file mode 100644 index 000000000..c3e30f531 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/aeronos.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:item/aeronos_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/alphacene.json b/kubejs/assets/tfg/models/item/saplings/alphacene.json new file mode 100644 index 000000000..5149099ce --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/alphacene.json @@ -0,0 +1,3 @@ +{ + "parent": "species:item/alphacene_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/crimson.json b/kubejs/assets/tfg/models/item/saplings/crimson.json new file mode 100644 index 000000000..aa1e76d4c --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/crimson.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/crimson_fungus" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/strophar.json b/kubejs/assets/tfg/models/item/saplings/strophar.json new file mode 100644 index 000000000..1063ad2d8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/strophar.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:item/strophar_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/warped.json b/kubejs/assets/tfg/models/item/saplings/warped.json new file mode 100644 index 000000000..91d8ae6c2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/warped.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/warped_fungus" +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 1a55f6e36..b22f94060 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 6a4d9eaf1..5dc37ca8c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -44,6 +44,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_amber_vegetal_decoration", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 2cb57e6e9..7bf61a392 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -43,6 +43,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index f06783c25..924aaa4d3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 87a52cb71..9ee67959f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 52a762b02..664b6f5c0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -44,7 +44,8 @@ "#tfg:mars_veins", [], [ - "tfg:mars/semiheavy_ammoniacal_water" + "tfg:mars_forest", + "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index e0087f4a6..c35dadb41 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 2dc4101e8..49e9656fd 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -44,6 +44,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_sangnum_vegetal_decoration", diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json deleted file mode 100644 index 06887a969..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:huge_fungus", - "config": { - "decor_state": { - "Name": "minecraft:shroomlight" - }, - "hat_state": { - "Name": "ad_astra:aeronos_cap" - }, - "planted": false, - "replaceable_blocks": { - "type": "minecraft:solid" - }, - "stem_state": { - "Name": "ad_astra:aeronos_stem", - "Properties": { - "axis": "y" - } - }, - "valid_base_block": { - "Name": "tfc:rock/gravel/gabbro" - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json deleted file mode 100644 index 7a49ca69d..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "ad_astra:aeronos_mushroom" - } - } - } - }, - "placement": [ - { - "type": "minecraft: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" - } - ] - } - } - ] - }, - "tries": 48, - "xz_spread": 10, - "y_spread": 3 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json deleted file mode 100644 index 9ebda4926..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "ad_astra:strophar_mushroom" - } - } - } - }, - "placement": [ - { - "type": "minecraft: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" - } - ] - } - } - ] - }, - "tries": 64, - "xz_spread": 16, - "y_spread": 3 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json new file mode 100644 index 000000000..9bfbcf030 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json @@ -0,0 +1,99 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "offset": 4, + "height": 6, + "radius": 4 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 8 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 1, + "mangrove_root_placement": { + "max_root_width": 1, + "max_root_length": 2, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json new file mode 100644 index 000000000..d82d9c8ed --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json @@ -0,0 +1,96 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 0, + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 8 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 1, + "mangrove_root_placement": { + "max_root_width": 1, + "max_root_length": 2, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "Name": "ad_astra:aeronos_stem" + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json new file mode 100644 index 000000000..beab02448 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json @@ -0,0 +1,93 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "offset": 6, + "height": 8, + "radius": 6 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": 3, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 12, + "max_inclusive": 16 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 3, + "mangrove_root_placement": { + "max_root_width": 2, + "max_root_length": 3, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json similarity index 64% rename from kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json rename to kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json index f8d93c8a0..03b78d1d1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json @@ -5,40 +5,42 @@ "dirt_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_stem" + "Name": "tfg:mars_dirt" } }, "foliage_placer": { - "type": "minecraft:acacia_foliage_placer", + "type": "minecraft:blob_foliage_placer", + "height": 0, "offset": 0, - "radius": 2 + "radius": 0 }, "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_cap" + "Name": "minecraft:air" } }, "force_dirt": false, "ignore_vines": true, "minimum_size": { "type": "minecraft:two_layers_feature_size", - "limit": 1, + "limit": 0, "lower_size": 0, - "upper_size": 2 + "upper_size": 0 }, "trunk_placer": { - "type": "minecraft:forking_trunk_placer", - "base_height": 5, - "height_rand_a": 2, + "type": "minecraft:straight_trunk_placer", + "base_height": 7, + "height_rand_a": 4, "height_rand_b": 2 }, "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_stem", + "Name": "minecraft:mushroom_stem", "Properties": { - "axis": "y" + "down": "false", + "up": "false" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json new file mode 100644 index 000000000..75d79598c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json @@ -0,0 +1,79 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 1, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 5 + } + } + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:forking_trunk_placer", + "base_height": 5, + "height_rand_a": 2, + "height_rand_b": 5 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 4, + "mangrove_root_placement": { + "max_root_width": 8, + "max_root_length": 8, + "random_skew_chance": 0.2, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json new file mode 100644 index 000000000..fe1c3a625 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json @@ -0,0 +1,73 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:forking_trunk_placer", + "base_height": 5, + "height_rand_a": 2, + "height_rand_b": 5 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 4, + "mangrove_root_placement": { + "max_root_width": 6, + "max_root_length": 6, + "random_skew_chance": 0.8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json new file mode 100644 index 000000000..ce6e15b66 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json @@ -0,0 +1,95 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 1, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 5, + "max_inclusive": 7 + } + } + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:upwards_branching_trunk_placer", + "base_height": 2, + "height_rand_a": 2, + "height_rand_b": 8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "extra_branch_steps": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 5 + } + }, + "extra_branch_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 12 + } + }, + "place_branch_per_log_probability": 0.25 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 7, + "mangrove_root_placement": { + "max_root_width": 12, + "max_root_length": 12, + "random_skew_chance": 0.8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json deleted file mode 100644 index 7290dc6a9..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/aeronos_huge", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "normal" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json deleted file mode 100644 index 11e36935f..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/aeronos_patch", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 8 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "sparse" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json index 003ab78db..3f6047989 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 2 + "chance": 1 }, { "type": "minecraft:in_square" @@ -14,6 +14,13 @@ { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" + }, + { + "type": "tfc:near_fluid", + "radius": 6, + "fluids": [ + "tfg:semiheavy_ammoniacal_water" + ] } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json deleted file mode 100644 index e0235e74d..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/strophar_huge", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "normal" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json deleted file mode 100644 index 9fe5bec6b..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/strophar_patch", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 5 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "sparse" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json new file mode 100644 index 000000000..40ddda9f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json new file mode 100644 index 000000000..3612b1f27 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json new file mode 100644 index 000000000..b9d75a7b2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos_old_growth", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json new file mode 100644 index 000000000..b39477429 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/alphacene_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json new file mode 100644 index 000000000..23e1b2a1e --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json new file mode 100644 index 000000000..61b9aa682 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json new file mode 100644 index 000000000..1f6452a24 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar_old_growth", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 625382592..ca80b01df 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -919,13 +919,14 @@ const registerAdAstraRecipes = (event) => { }).id('tfg:shaped/strophar_ladder') - generateGreenHouseRecipe(event, '8x ad_astra:strophar_mushroom', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/strophar', 'tfg:semiheavy_ammoniacal_water', 16000, '64x ad_astra:strophar_stem', 'tfg:green_house/strophar_mushroom', 'ad_astra:mars', 8, '16x ad_astra:strophar_cap', GTValues.VA[GTValues.MV]) - generateGreenHouseRecipe(event, '8x ad_astra:aeronos_mushroom', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/aeronos', 'tfg:semiheavy_ammoniacal_water', 16000, '64x ad_astra:aeronos_stem', 'tfg:green_house/aeronos_mushroom', 'ad_astra:mars', 8, '16x ad_astra:aeronos_cap', GTValues.VA[GTValues.MV]) - // TODO: needs a sapling - //generateGreenHouseRecipe(event, '8x ___', 16000, '64x ad_astra:glacian_log', 'tfg:green_house/glacian_tree', 'ad_astra:mars', 8, '8x species:alphacene_moss_block', GTValues.VA[GTValues.MV]) + generateGreenHouseRecipe(event, '8x tfg:saplings/glacian', 'tfg:semiheavy_ammoniacal_water', 16000, + '64x ad_astra:glacian_log', 'tfg:green_house/glacian_tree', 'ad_astra:mars', 8, + '8x species:alphacene_moss_block', GTValues.VA[GTValues.MV]) //#endregion } diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 7868e9169..40a689ee7 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -446,15 +446,12 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") - event.add("tfg:mars_amber_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 56bc7f415..c28c32fbd 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -68,10 +68,10 @@ const registerBeneathRecipes = (event) => { event.recipes.tfc.landslide('beneath:soul_clay', 'beneath:soul_clay') - generateGreenHouseRecipe(event, '8x minecraft:warped_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/warped', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/warped', 'tfg:green_house/warped_fungus', 'ad_astra:mars', 8, '32x minecraft:warped_wart_block', GTValues.VA[GTValues.MV]) - generateGreenHouseRecipe(event, '8x minecraft:crimson_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/crimson', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/crimson', 'tfg:green_house/crimson_fungus', 'ad_astra:mars', 8, '32x minecraft:nether_wart_block', GTValues.VA[GTValues.MV]) diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index fcc33d8c4..2f3a5fa2e 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -66,5 +66,7 @@ function registerSpeciesRecipes(event) { B: 'firmaciv:rope_coil' }).id('tfg:shaped/harpoon') - // TODO: birtday cake + generateGreenHouseRecipe(event, '8x tfg:saplings/alphacene', 'tfg:semiheavy_ammoniacal_water', 16000, + '64x species:alphacene_mushroom_block', 'tfg:green_house/alphacene_mushroom', 'ad_astra:mars', 8, + '8x minecraft:mushroom_stem', GTValues.VA[GTValues.MV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index b7a3a61a3..e4045d179 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -55,9 +55,66 @@ TFCEvents.worldgenData(event => { null, null, null, null, null, null, placement => {} ) + + event.forestEntry('tfg:mars/aeronos_forest_entry', + climate => {}, + 'ad_astra:aeronos_stem', + 'ad_astra:aeronos_cap', + 'ad_astra:aeronos_stem', + null, + [ + "ad_astra:aeronos_mushroom", + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'tfg:mars/tree/aeronos', + 'tfg:mars/tree/aeronos_dead', + 'tfg:mars/tree/aeronos_old_growth', + null, null, null, null, null, null, + placement => {} + ) + + event.forestEntry('tfg:mars/strophar_forest_entry', + climate => {}, + 'ad_astra:strophar_stem', + 'ad_astra:strophar_cap', + null, + null, + [ + "ad_astra:strophar_mushroom", + 'beneath:wood/fallen_leaves/warped', + 'beneath:wood/twig/warped' + ], + 'tfg:mars/tree/strophar', + 'tfg:mars/tree/strophar_dead', + 'tfg:mars/tree/strophar_old_growth', + null, null, null, null, null, null, + placement => {} + ) + + event.forestEntry('tfg:mars/alphacene_forest_entry', + climate => {}, + 'minecraft:mushroom_stem', + 'species:alphacene_mushroom_block', + 'minecraft:mushroom_stem', + null, + [ + "species:alphacene_mushroom", + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'species:alphacene_mushroom', + 'tfg:mars/tree/alphacene_dead', + 'species:alphacene_mushroom', + null, null, null, null, null, null, + placement => {} + ) }) function registerTFGForestConfiguredFeatures(event) { event.add('tfg:mars_forest_entries', 'tfg:mars/crimson_forest_entry') event.add('tfg:mars_forest_entries', 'tfg:mars/warped_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/aeronos_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/strophar_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/alphacene_forest_entry') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index e24b762bb..0e1b496aa 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -3,7 +3,7 @@ const registerTFGCrops = (event) => { - // Earth + // Earth Crops event.create('tfg:sunflower', 'tfc:double_crop') .translationKey('block.tfg.sunflower') @@ -60,7 +60,7 @@ const registerTFGCrops = (event) => { .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') - // Mars + // Mars Crops event.create('betterend:amber_root', 'tfc:crop') .soundType('crop') @@ -251,4 +251,35 @@ const registerTFGCrops = (event) => { .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') + + // Mars Saplings + + event.create('tfg:saplings/crimson', 'tfc:sapling') + .features('tfg:mars/tree/crimson') + .translationKey('minecraft.block.crimson_fungus') + .growthDays(6) + + event.create('tfg:saplings/warped', 'tfc:sapling') + .features('tfg:mars/tree/warped') + .translationKey('minecraft.block.warped_fungus') + .growthDays(6) + + event.create('tfg:saplings/alphacene', 'tfc:sapling') + .features('species:alphacene_mushroom') + .translationKey('species.block.alphacene_mushroom') + .growthDays(3) + + event.create('tfg:saplings/strophar', 'tfc:sapling') + .features('tfg:mars/tree/strophar') + .translationKey('ad_astra.block.strophar_mushroom') + .growthDays(7) + + event.create('tfg:saplings/aeronos', 'tfc:sapling') + .features('tfg:mars/tree/aeronos') + .translationKey('ad_astra.block.strophar_mushroom') + .growthDays(9) + + event.create('tfg:saplings/glacian', 'tfc:sapling') + .features('tfg:mars/tree/glacian') + .growthDays(9) } \ No newline at end of file