diff --git a/kubejs/assets/beneath/lang/en_us.json b/kubejs/assets/beneath/lang/en_us.json index 2b58fe4cc..059b62dfe 100644 --- a/kubejs/assets/beneath/lang/en_us.json +++ b/kubejs/assets/beneath/lang/en_us.json @@ -10,7 +10,9 @@ "block.beneath.crackrack": "Keratophyre", "block.beneath.soul_clay": "Muddy Clay", "block.beneath.wood.fallen_leaves.crimson": "Fallen Crimson Lamella", + "block.beneath.wood.leaves.crimson": "Crimson Lamella", "block.beneath.wood.fallen_leaves.warped": "Fallen Warped Lamella", + "block.beneath.wood.leaves.warped": "Warped Lamella", "item.beneath.cursed_hide": "Lavaproof Hide", "item.beneath.blackstone_brick": "Pyroxenite Brick", "item.beneath.cursecoal": "Anthracite", 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/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json new file mode 100644 index 000000000..058c49e57 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json @@ -0,0 +1,68 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:pitcher_plant", + "Properties": { + "half": "lower" + } + } + } + } + }, + "placement": [] + }, + "then": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:pitcher_plant", + "Properties": { + "half": "upper" + } + } + } + } + }, + "placement": [] + } + } + }, + "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": 8, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json new file mode 100644 index 000000000..4c58a4854 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:torchflower" + } + } + } + }, + "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": 8, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json new file mode 100644 index 000000000..40b85088f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json @@ -0,0 +1,10 @@ +{ + "type": "tfc:multiple", + "config": { + "features": [ + "tfg:mars/tree/crimson_amber", + "tfg:mars/tree/crimson_rusticus", + "tfg:mars/tree/crimson_sangnum" + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json new file mode 100644 index 000000000..db306261e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/amber_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json new file mode 100644 index 000000000..57a31b85e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:mars_dirt" + } + }, + "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": 2, + "lower_size": 0, + "upper_size": 2 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 6, + "height_rand_a": 4, + "height_rand_b": 0 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json new file mode 100644 index 000000000..6ae00d9e9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/rusticus_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json new file mode 100644 index 000000000..3556eb889 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/sangnum_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json new file mode 100644 index 000000000..ae09354ad --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json @@ -0,0 +1,10 @@ +{ + "type": "tfc:multiple", + "config": { + "features": [ + "tfg:mars/tree/warped_amber", + "tfg:mars/tree/warped_rusticus", + "tfg:mars/tree/warped_sangnum" + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json new file mode 100644 index 000000000..4e373bad3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/amber_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json new file mode 100644 index 000000000..f32baa7d2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:mars_dirt" + } + }, + "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": 2, + "lower_size": 0, + "upper_size": 2 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 6, + "height_rand_a": 4, + "height_rand_b": 0 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json new file mode 100644 index 000000000..5d8dae140 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/rusticus_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json new file mode 100644 index 000000000..d06c69b7e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/sangnum_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json index 758d5e645..d9f0a1579 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 8 + "count": 10 }, { "type": "minecraft:in_square" 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 new file mode 100644 index 000000000..003ab78db --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pitcher_plant", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json new file mode 100644 index 000000000..19d41518f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/torchflower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json new file mode 100644 index 000000000..cdec23129 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json new file mode 100644 index 000000000..c85334354 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_amber", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json new file mode 100644 index 000000000..60068ade0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json new file mode 100644 index 000000000..bde3f73d5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_rusticus", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json new file mode 100644 index 000000000..d0c16ec7e --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_sangnum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json new file mode 100644 index 000000000..cdec23129 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json new file mode 100644 index 000000000..349608694 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_amber", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json new file mode 100644 index 000000000..041047393 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json new file mode 100644 index 000000000..5a4466843 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_rusticus", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json new file mode 100644 index 000000000..c873e114b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_sangnum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index a48b9fbb9..5588103bc 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -113,7 +113,7 @@ const registerAdAstraItemTags = (event) => { // these are log tags event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') - + global.AD_ASTRA_WOOD.forEach(wood => { if (wood.log) { @@ -400,6 +400,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flammalix") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/orango") + event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/amber_root") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry") @@ -412,7 +413,9 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lamellarium") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/orango") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/ruscus") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom") @@ -424,26 +427,25 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/flamaea") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/globulagus") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/lamellarium") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/ruscus") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") // TODO - event.add("tfg:mars_trees", "tfg:mars/surface/strophar_huge") - event.add("tfg:mars_trees", "tfg:mars/surface/aeronos_huge") - event.add("tfg:mars_trees", "species:alphacene_mushroom") + //event.add("tfg:mars_trees", "species:alphacene_mushroom") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/aeronos_patch") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/strophar_patch") - event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_trees") + 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_trees") + 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_trees") + 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/tags.js b/kubejs/server_scripts/beneath/tags.js index 71c0b81c5..df455effa 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -20,6 +20,11 @@ const registerBeneathBlockTags = (event) => { event.add('beneath:blackstone_decor', 'minecraft:blackstone'); event.remove('beneath:blackstone') + + event.remove('minecraft:leaves', 'beneath:wood/leaves/crimson') + event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/crimson') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/warped') } const registerBeneathItemTags = (event) => { @@ -37,4 +42,9 @@ const registerBeneathItemTags = (event) => { event.add('forge:mushrooms', '#beneath:mushrooms') event.remove('beneath:sparks_on_sulfur') + + event.remove('minecraft:leaves', 'beneath:wood/leaves/crimson') + event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/crimson') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/warped') } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 919180713..6fd203e17 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -103,6 +103,10 @@ ServerEvents.tags('fluid', event => { registerVintageImprovementsFluidTags(event) }) +ServerEvents.tags('worldgen/configured_feature', event => { + registerTFGConfiguredFeatures(event) +}) + /** * Событие регистрации тегов структур. */ diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js new file mode 100644 index 000000000..e663e10b4 --- /dev/null +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -0,0 +1,62 @@ +// priority: 0 +"use strict"; + +TFCEvents.worldgenData(event => { + + event.forest('tfg:mars_forest', '#tfg:mars_forest_entries', + [ + event.forestTypesMapEntry('none', 0, 0, 0, 0, false, false, 0), + event.forestTypesMapEntry('sparse', [1, 3], 6, 0.08, 0, true, false, null), + event.forestTypesMapEntry('edge', 2, 10, null, 1, false, false, [0, 1]), + event.forestTypesMapEntry('normal', 5, 25, null, 1, true, false, null), + event.forestTypesMapEntry('old_growth', 7, 40, null, 1, false, true, [0, 1]) + ], + true, + placement => {} + ) + + event.forestEntry('tfg:mars/crimson_forest_entry', + climate => {}, // TODO: climate variation? + 'beneath:wood/wood/crimson', // bush log + 'beneath:wood/leaves/crimson', // bush leaves + 'beneath:wood/log/crimson', // fallen log + 'beneath:wood/fallen_leaves/crimson', // fallen leaves + [ // ground cover + 'minecraft:crimson_fungus', + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'tfg:mars/tree/crimson', // tree feature + 'tfg:mars/tree/crimson_dead', // dead tree feature + null, // old growth tree feature + null, // krummholz + null, // chance for old growth + null, // chance for old growth in non-old growth forests + null, // chance for a fallen tree + null, // chance for a dead tree + null, // true to spawn on ocean floor, false for world surface + placement => {} + ) + + event.forestEntry('tfg:mars/warped_forest_entry', + climate => {}, + 'beneath:wood/wood/warped', + 'beneath:wood/leaves/warped', + 'beneath:wood/log/warped', + 'beneath:wood/fallen_leaves/warped', + [ + 'minecraft:warped_fungus', + 'beneath:wood/fallen_leaves/warped', + 'beneath:wood/twig/warped' + ], + 'tfg:mars/tree/warped', + 'tfg:mars/tree/warped_dead', + null, 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') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9070ccfa0..2bf19e011 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -590,6 +590,10 @@ const registerTFGBiomeTags = (event) => { // #endregion } +function registerTFGConfiguredFeatures(event) { + registerTFGForestConfiguredFeatures(event) +} + // Other space decoration is in ad_astra/tags.js const registerTFGPlacedFeatures = (event) => { diff --git a/kubejs/startup_scripts/beneath/constants.js b/kubejs/startup_scripts/beneath/constants.js index 9cb489194..86a0d999d 100644 --- a/kubejs/startup_scripts/beneath/constants.js +++ b/kubejs/startup_scripts/beneath/constants.js @@ -47,10 +47,6 @@ global.BENEATH_DISABLED_ITEMS = [ "beneath:wood/windmill/warped", "beneath:wood/boat/warped", - "beneath:wood/leaves/crimson", - "beneath:wood/fallen_leaves/crimson", "beneath:wood/sapling/crimson", - "beneath:wood/leaves/warped", - "beneath:wood/fallen_leaves/warped", "beneath:wood/sapling/warped" ]; \ No newline at end of file