From b18d2ab9394d92384e7a52c4ae5bb641f3db5b45 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 2 Sep 2025 00:16:29 +0100 Subject: [PATCH] lanceleaf, large amaranita mushroom, and some fixes --- .../betterend/blockstates/lanceleaf.json | 28 +-- .../betterend/blockstates/lanceleaf_seed.json | 8 - .../blockstates/lanceleaf_small.json | 10 ++ .../blockstates/large_amaranita_mushroom.json | 8 +- .../models/block/lanceleaf_seed_0.json | 2 +- .../models/block/lanceleaf_seed_1.json | 2 +- .../models/block/lanceleaf_seed_2.json | 2 +- .../models/block/lanceleaf_seed_3.json | 2 +- .../betterend/models/item/lanceleaf.json | 6 + .../models/item/lanceleaf_small.json | 6 + .../models/item/large_amaranita_mushroom.json | 6 + .../blockstates/corallium_arenicolus_0.json | 13 +- .../biome/mars/martian_dune_edge.json | 6 +- .../biome/mars/martian_mountains.json | 11 +- ...r_patch.json => feather_patch_glider.json} | 2 +- .../mars/surface/feather_patch_wraptor.json | 40 +++++ .../mars/surface/lanceleaf.json | 163 ++++++++++++++++++ .../mars/surface/lanceleaf_small.json | 40 +++++ .../surface/large_amaranita_mushroom.json | 103 +++++++++++ .../mars/surface/lucernia_outer_leaves.json | 40 +++++ .../surface/small_amaranita_mushroom.json | 2 +- ...r_patch.json => feather_patch_glider.json} | 4 +- .../mars/surface/feather_patch_wraptor.json | 19 ++ .../mars/surface/lanceleaf.json | 23 +++ .../mars/surface/lanceleaf_small.json | 23 +++ .../surface/large_amaranita_mushroom.json | 23 +++ .../mars/surface/lucernia_outer_leaves.json | 23 +++ .../surface/small_amaranita_mushroom.json | 7 +- kubejs/server_scripts/ad_astra/tags.js | 92 +++++----- kubejs/server_scripts/tfg/events.forests.js | 4 +- kubejs/startup_scripts/betterend/blocks.js | 21 ++- kubejs/startup_scripts/tfg/blocks.space.js | 3 +- 32 files changed, 638 insertions(+), 104 deletions(-) delete mode 100644 kubejs/assets/betterend/blockstates/lanceleaf_seed.json create mode 100644 kubejs/assets/betterend/blockstates/lanceleaf_small.json create mode 100644 kubejs/assets/betterend/models/item/lanceleaf.json create mode 100644 kubejs/assets/betterend/models/item/lanceleaf_small.json create mode 100644 kubejs/assets/betterend/models/item/large_amaranita_mushroom.json rename kubejs/data/tfg/worldgen/configured_feature/mars/surface/{feather_patch.json => feather_patch_glider.json} (93%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf_small.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/lucernia_outer_leaves.json rename kubejs/data/tfg/worldgen/placed_feature/mars/surface/{feather_patch.json => feather_patch_glider.json} (76%) create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_wraptor.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf_small.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_amaranita_mushroom.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/lucernia_outer_leaves.json diff --git a/kubejs/assets/betterend/blockstates/lanceleaf.json b/kubejs/assets/betterend/blockstates/lanceleaf.json index 223cd09cf..35c30c34b 100644 --- a/kubejs/assets/betterend/blockstates/lanceleaf.json +++ b/kubejs/assets/betterend/blockstates/lanceleaf.json @@ -1,27 +1,9 @@ { "variants": { - "rotation=0,shape=top": { "model": "betterend:block/lanceleaf_leaf_top" }, - "rotation=0,shape=pre_top": { "model": "betterend:block/lanceleaf_leaf_pre_top" }, - "rotation=0,shape=middle": { "model": "betterend:block/lanceleaf_leaf_middle" }, - "rotation=0,shape=pre_bottom": { "model": "betterend:block/lanceleaf_leaf_pre_bottom" }, - "rotation=0,shape=bottom": { "model": "betterend:block/lanceleaf_leaf_bottom" }, - - "rotation=1,shape=top": { "model": "betterend:block/lanceleaf_leaf_top", "y": 90 }, - "rotation=1,shape=pre_top": { "model": "betterend:block/lanceleaf_leaf_pre_top", "y": 90 }, - "rotation=1,shape=middle": { "model": "betterend:block/lanceleaf_leaf_middle", "y": 90 }, - "rotation=1,shape=pre_bottom": { "model": "betterend:block/lanceleaf_leaf_pre_bottom", "y": 90 }, - "rotation=1,shape=bottom": { "model": "betterend:block/lanceleaf_leaf_bottom", "y": 90 }, - - "rotation=2,shape=top": { "model": "betterend:block/lanceleaf_leaf_top", "y": 180 }, - "rotation=2,shape=pre_top": { "model": "betterend:block/lanceleaf_leaf_pre_top", "y": 180 }, - "rotation=2,shape=middle": { "model": "betterend:block/lanceleaf_leaf_middle", "y": 180 }, - "rotation=2,shape=pre_bottom": { "model": "betterend:block/lanceleaf_leaf_pre_bottom", "y": 180 }, - "rotation=2,shape=bottom": { "model": "betterend:block/lanceleaf_leaf_bottom", "y": 180 }, - - "rotation=3,shape=top": { "model": "betterend:block/lanceleaf_leaf_top", "y": 270 }, - "rotation=3,shape=pre_top": { "model": "betterend:block/lanceleaf_leaf_pre_top", "y": 270 }, - "rotation=3,shape=middle": { "model": "betterend:block/lanceleaf_leaf_middle", "y": 270 }, - "rotation=3,shape=pre_bottom": { "model": "betterend:block/lanceleaf_leaf_pre_bottom", "y": 270 }, - "rotation=3,shape=bottom": { "model": "betterend:block/lanceleaf_leaf_bottom", "y": 270 } + "height=0": { "model": "betterend:block/lanceleaf_leaf_bottom" }, + "height=1": { "model": "betterend:block/lanceleaf_leaf_pre_bottom" }, + "height=2": { "model": "betterend:block/lanceleaf_leaf_middle" }, + "height=3": { "model": "betterend:block/lanceleaf_leaf_pre_top" }, + "height=4": { "model": "betterend:block/lanceleaf_leaf_top" } } } diff --git a/kubejs/assets/betterend/blockstates/lanceleaf_seed.json b/kubejs/assets/betterend/blockstates/lanceleaf_seed.json deleted file mode 100644 index 59db3a5d2..000000000 --- a/kubejs/assets/betterend/blockstates/lanceleaf_seed.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "age=0": { "model": "betterend:block/lanceleaf_seed_0" }, - "age=1": { "model": "betterend:block/lanceleaf_seed_1" }, - "age=2": { "model": "betterend:block/lanceleaf_seed_2" }, - "age=3": { "model": "betterend:block/lanceleaf_seed_3" } - } -} diff --git a/kubejs/assets/betterend/blockstates/lanceleaf_small.json b/kubejs/assets/betterend/blockstates/lanceleaf_small.json new file mode 100644 index 000000000..9a95704b6 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lanceleaf_small.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lanceleaf_seed_0" }, + { "model": "betterend:block/lanceleaf_seed_1" }, + { "model": "betterend:block/lanceleaf_seed_2" }, + { "model": "betterend:block/lanceleaf_seed_3" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/large_amaranita_mushroom.json b/kubejs/assets/betterend/blockstates/large_amaranita_mushroom.json index 6fbef92b0..a169a659d 100644 --- a/kubejs/assets/betterend/blockstates/large_amaranita_mushroom.json +++ b/kubejs/assets/betterend/blockstates/large_amaranita_mushroom.json @@ -1,7 +1,9 @@ { "variants": { - "shape=top": { "model": "betterend:block/large_amaranita_cap" }, - "shape=middle": { "model": "betterend:block/large_amaranita_stem" }, - "shape=bottom": { "model": "betterend:block/large_amaranita_roots" } + "height=0": { "model": "betterend:block/large_amaranita_roots" }, + "height=1": { "model": "betterend:block/large_amaranita_stem" }, + "height=2": { "model": "betterend:block/large_amaranita_cap" }, + "height=3": { "model": "" }, + "height=4": { "model": "" } } } diff --git a/kubejs/assets/betterend/models/block/lanceleaf_seed_0.json b/kubejs/assets/betterend/models/block/lanceleaf_seed_0.json index 4ca789a35..7b9518807 100644 --- a/kubejs/assets/betterend/models/block/lanceleaf_seed_0.json +++ b/kubejs/assets/betterend/models/block/lanceleaf_seed_0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/lanceleaf_seed_0" + "cross": "betterend:block/lanceleaf_seed_0" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lanceleaf_seed_1.json b/kubejs/assets/betterend/models/block/lanceleaf_seed_1.json index 342f6cbf6..6e83b3114 100644 --- a/kubejs/assets/betterend/models/block/lanceleaf_seed_1.json +++ b/kubejs/assets/betterend/models/block/lanceleaf_seed_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/lanceleaf_seed_1" + "cross": "betterend:block/lanceleaf_seed_1" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lanceleaf_seed_2.json b/kubejs/assets/betterend/models/block/lanceleaf_seed_2.json index 10ca2a8a8..d81890c46 100644 --- a/kubejs/assets/betterend/models/block/lanceleaf_seed_2.json +++ b/kubejs/assets/betterend/models/block/lanceleaf_seed_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/lanceleaf_seed_2" + "cross": "betterend:block/lanceleaf_seed_2" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lanceleaf_seed_3.json b/kubejs/assets/betterend/models/block/lanceleaf_seed_3.json index faae17be0..2f70d6dd9 100644 --- a/kubejs/assets/betterend/models/block/lanceleaf_seed_3.json +++ b/kubejs/assets/betterend/models/block/lanceleaf_seed_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "texture": "betterend:block/lanceleaf_seed_3" + "cross": "betterend:block/lanceleaf_seed_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/lanceleaf.json b/kubejs/assets/betterend/models/item/lanceleaf.json new file mode 100644 index 000000000..05ee66024 --- /dev/null +++ b/kubejs/assets/betterend/models/item/lanceleaf.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lanceleaf_seed_3" + } +} diff --git a/kubejs/assets/betterend/models/item/lanceleaf_small.json b/kubejs/assets/betterend/models/item/lanceleaf_small.json new file mode 100644 index 000000000..54bd97b03 --- /dev/null +++ b/kubejs/assets/betterend/models/item/lanceleaf_small.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lanceleaf_seed_0" + } +} diff --git a/kubejs/assets/betterend/models/item/large_amaranita_mushroom.json b/kubejs/assets/betterend/models/item/large_amaranita_mushroom.json new file mode 100644 index 000000000..c3933abf8 --- /dev/null +++ b/kubejs/assets/betterend/models/item/large_amaranita_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/large_amaranita_cap_side" + } +} diff --git a/kubejs/assets/tfg/blockstates/corallium_arenicolus_0.json b/kubejs/assets/tfg/blockstates/corallium_arenicolus_0.json index ee10f45fa..39cbc2d9b 100644 --- a/kubejs/assets/tfg/blockstates/corallium_arenicolus_0.json +++ b/kubejs/assets/tfg/blockstates/corallium_arenicolus_0.json @@ -1,10 +1,9 @@ { - "variants": { - "half=lower": { - "model": "tfg:block/corallium_arenicolus_0_bottom" - }, - "half=upper": { - "model": "tfg:block/corallium_arenicolus_0_top" + "variants": { + "height=0": { "model": "tfg:block/corallium_arenicolus_0_bottom" }, + "height=1": { "model": "tfg:block/corallium_arenicolus_0_top" }, + "height=2": { "model": "" }, + "height=3": { "model": "" }, + "height=4": { "model": "" } } - } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 09444b7bb..ab7497657 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -43,11 +43,11 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch", - "tfg:mars/surface/feather_patch" + "tfg:mars/surface/rotten_flesh_patch" ], [ - + "tfg:mars/surface/feather_patch_wraptor", + "tfg:mars/surface/feather_patch_glider" ], "#tfg:mars_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index c3a4d8b02..2e26ac47d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -50,15 +50,18 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch", - "tfg:mars/surface/feather_patch" + "tfg:mars/surface/rotten_flesh_patch" ], [ "tfg:mars/surface/charnia", + "tfg:mars/surface/flamaea", + "tfg:mars/surface/aeridium", "tfg:mars/surface/clawfern", - "tfg:mars/surface/flamaea", - "tfg:mars/surface/flammalix" + "tfg:mars/surface/flammalix", + + "tfg:mars/surface/feather_patch_wraptor", + "tfg:mars/surface/feather_patch_glider" ], "#tfg:mars_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json similarity index 93% rename from kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch.json rename to kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json index ec736fca2..d9fbac8a6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfc:groundcover/feather" + "Name": "tfc:groundcover/glider_feather" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json new file mode 100644 index 000000000..88b8492c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.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": "tfc:groundcover/wraptor_feather" + } + } + } + }, + "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": "ad_astra:mars_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 3, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json new file mode 100644 index 000000000..a740671ae --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf.json @@ -0,0 +1,163 @@ +{ + "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": "betterend:lanceleaf", + "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:lanceleaf", + "Properties": { + "height": "1" + } + } + } + } + }, + "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:lanceleaf", + "Properties": { + "height": "2" + } + } + } + } + }, + "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:lanceleaf", + "Properties": { + "height": "3" + } + } + } + } + }, + "placement": [] + }, + "then": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:lanceleaf", + "Properties": { + "height": "4" + } + } + } + } + }, + "placement": [] + } + } + }, + "placement": [] + } + } + }, + "placement": [] + } + } + }, + "placement": [] + } + } + }, + "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" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf_small.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf_small.json new file mode 100644 index 000000000..c758a819c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lanceleaf_small.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": "betterend:lanceleaf_small" + } + } + } + }, + "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": 16, + "xz_spread": 7, + "y_spread": 2 + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..7db2957e7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_amaranita_mushroom.json @@ -0,0 +1,103 @@ +{ + "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": "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": [] + } + } + }, + "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" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 10, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lucernia_outer_leaves.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lucernia_outer_leaves.json new file mode 100644 index 000000000..98b334cf0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/lucernia_outer_leaves.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": "betterend:lucernia_outer_leaves" + } + } + } + }, + "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": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_amaranita_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_amaranita_mushroom.json index 61bae0e72..8224982e9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_amaranita_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_amaranita_mushroom.json @@ -35,6 +35,6 @@ }, "tries": 8, "xz_spread": 10, - "y_spread": 3 + "y_spread": 2 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_glider.json similarity index 76% rename from kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch.json rename to kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_glider.json index ac7aa9958..9d8b87084 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_glider.json @@ -1,9 +1,9 @@ { - "feature": "tfg:mars/surface/feather_patch", + "feature": "tfg:mars/surface/feather_patch_glider", "placement": [ { "type": "minecraft:rarity_filter", - "chance": 10 + "chance": 20 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_wraptor.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_wraptor.json new file mode 100644 index 000000000..df8341b9b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/feather_patch_wraptor.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/feather_patch_wraptor", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 20 + }, + { + "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/lanceleaf.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf.json new file mode 100644 index 000000000..c9c3c9566 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/surface/lanceleaf", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "tfc:climate", + "max_forest": "sparse" + }, + { + "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/lanceleaf_small.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf_small.json new file mode 100644 index 000000000..6367f0a5d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lanceleaf_small.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/surface/lanceleaf_small", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "tfc:climate", + "max_forest": "edge" + }, + { + "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/large_amaranita_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_amaranita_mushroom.json new file mode 100644 index 000000000..a2b8fbfca --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_amaranita_mushroom.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/surface/large_amaranita_mushroom", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "tfc:climate", + "min_forest": "edge" + }, + { + "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/lucernia_outer_leaves.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lucernia_outer_leaves.json new file mode 100644 index 000000000..a6678f3bb --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lucernia_outer_leaves.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/surface/lucernia_outer_leaves", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "tfc:climate", + "min_forest": "sparse" + }, + { + "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/small_amaranita_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json index d9c1589d4..3f9664d77 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json @@ -3,7 +3,12 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 3 + "chance": 2 + }, + { + "type": "tfc:climate", + "min_forest": "none", + "max_forest": "normal" }, { "type": "minecraft:in_square" diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 5383a46ce..e72e48f80 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -446,53 +446,59 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:mars_veins', 'tfg:mars/terrain/ochrum_blob') // Vegetation - event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/amber_root") - event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/blossom_berry") - event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/bolux_mushroom") - event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/cave_pumpkin") - event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/chorus_mushroom") - event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/amber_grass") - event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flamaea") - 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_rusticus_small_plants", "tfg:mars/crop/amber_root") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/bolux_mushroom") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/chorus_mushroom") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/shadow_berry") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/aeridium") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flamaea") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flammalix") - 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/ruscus") - - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/cave_pumpkin") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/chorus_mushroom") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/shadow_berry") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/cave_grass") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/clawfern") - 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/ruscus") - - event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/charnia") - + event.add("tfg:mars_global_small_plants", "tfg:mars/surface/flamaea") + event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") + + + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/crop/amber_root") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/crop/cave_pumpkin") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/crop/chorus_mushroom") + + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/lanceleaf") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/lanceleaf_small") + + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/amber_grass") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/flammalix") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/lutebus") + event.add("tfg:mars_amber_vegetal_decoration", "tfg:mars/surface/orango") + + + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/crop/amber_root") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/crop/chorus_mushroom") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/crop/shadow_berry") + + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/lucernia_outer_leaves") + + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/aeridium") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/flammalix") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/lamellarium") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/lutebus") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/orango") + event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/ruscus") + + + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/crop/cave_pumpkin") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/crop/chorus_mushroom") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/crop/shadow_berry") + + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/small_amaranita_mushroom") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/large_amaranita_mushroom") + + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/cave_grass") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/clawfern") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/globulagus") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/lamellarium") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/ruscus") // Top layer event.add("tfg:mars_top_layer_modification", "tfg:glow_lichen") diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index 04017cc60..a7e8ecc4e 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -65,7 +65,7 @@ TFCEvents.worldgenData(event => { 'ad_astra:aeronos_stem', 'ad_astra:aeronos_cap', 'betterend:cave_bush', - 'betterend:cave_bush', + 'betterend:cave_bush_fallen', [ "ad_astra:aeronos_mushroom", 'betterend:cave_bush', @@ -86,7 +86,7 @@ TFCEvents.worldgenData(event => { 'ad_astra:strophar_stem', 'ad_astra:strophar_cap', 'betterend:lucernia_leaves', - 'betterend:lucernia_leaves', + 'betterend:lucernia_leaves_fallen', [ "ad_astra:strophar_mushroom", 'betterend:lucernia_leaves', diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index c3d242708..49f5fe49c 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -61,6 +61,9 @@ function registerBetterEndBlocks(event) { .box(3, 0, 3, 13, 8, 13) createPlant(event, 'lucernia_outer_leaves', 'mars') // TODO: needs a feature + createPlant(event, 'lanceleaf_small', 'mars') + .box(4, 0, 4, 12, 8, 12) + // TODO: needs a feature // 1 block tall waterlogged @@ -83,6 +86,7 @@ function registerBetterEndBlocks(event) { .tagBlock('minecraft:mineable/hoe') .mapColor('fire') .seasonalColors(false) + .tagItem('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -105,6 +109,7 @@ function registerBetterEndBlocks(event) { .tagBlock('minecraft:mineable/hoe') .mapColor('color_orange') .seasonalColors(false) + .tagItem('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -130,8 +135,22 @@ function registerBetterEndBlocks(event) { // end lotus // lanceleaf + event.create('betterend:large_amaranita_mushroom', 'tfg:tall_decorative_plant') + .height(3) + .soundType('nether_wart') + .tagBlock('minecraft:mineable/hoe') + .tagItem('tfg:mars_plants') + .tagItem('forge:mushrooms') + .mapColor('fire') - // ?? + event.create('betterend:lanceleaf', 'tfg:tall_decorative_plant') + .height(5) + .soundType('crop') + .tagBlock('minecraft:mineable/hoe') + .tagItem('tfg:mars_plants') + .mapColor('color_orange') + + // europa...? createPlant(event, 'crystal_grass', 'unused') .box(3, 0, 3, 13, 12, 13) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 32ef5f312..3afbf7b1c 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -265,7 +265,8 @@ function registerTFGSpaceBlocks(event) { .tagItem('tfg:moon_plants') .tagBlock('minecraft:replaceable') - event.create('tfg:corallium_arenicolus_0', 'tfg:double_decorative_plant') + event.create('tfg:corallium_arenicolus_0', 'tfg:tall_decorative_plant') + .height(2) .soundType('nether_wart') .tagItem('tfg:venus_plants') .lightLevel(0.4)