diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json index e184c89ee..6695ef740 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json @@ -3,165 +3,22 @@ "config": { "feature": { "feature": { - "type": "tfc:if_then", + "type": "tfg:tall_decorative_plant", "config": { - "if": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:lanceleaf", - "Properties": { - "height": "0" - } - } - } - } - }, - "placement": [] - }, - "then": { - "feature": { - "type": "tfc:multiple", - "config": { - "features": [ - { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:lanceleaf", - "Properties": { - "height": "1" - } - } - } - } - }, - "placement": [ - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 1 - } - ] - }, - { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:lanceleaf", - "Properties": { - "height": "2" - } - } - } - } - }, - "placement": [ - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 2 - } - ] - }, - { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:lanceleaf", - "Properties": { - "height": "3" - } - } - } - } - }, - "placement": [ - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 3 - } - ] - }, - { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:lanceleaf", - "Properties": { - "height": "4" - } - } - } - } - }, - "placement": [ - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 4 - } - ] - } - ] - } - }, - "placement": [] - } + "block": "betterend:lanceleaf", + "plantHeight": 5, + "minHeight": 4, + "maxHeight": 7, + "middle": 2 } }, "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 1, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 2, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 3, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 4, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" - } - ] + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" } } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json index 7db2957e7..807df6037 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json @@ -3,95 +3,22 @@ "config": { "feature": { "feature": { - "type": "tfc:if_then", + "type": "tfg:tall_decorative_plant", "config": { - "if": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:large_amaranita_mushroom", - "Properties": { - "height": "0" - } - } - } - } - }, - "placement": [] - }, - "then": { - "feature": { - "type": "tfc:if_then", - "config": { - "if": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:large_amaranita_mushroom", - "Properties": { - "height": "1" - } - } - } - } - }, - "placement": [] - }, - "then": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "betterend:large_amaranita_mushroom", - "Properties": { - "height": "2" - } - } - } - } - }, - "placement": [] - } - } - }, - "placement": [] - } + "block": "betterend:large_amaranita_mushroom", + "plantHeight": 3, + "minHeight": 2, + "maxHeight": 6, + "middle": 1 } }, "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 1, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_blocks", - "offset": [ 0, 2, 0 ], - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" - } - ] + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" } } ]