Merge pull request 'bug/5-fix_cypress_trees' (#7) from bug/5-fix_cypress_trees into 1.20.1

Reviewed-on: #7
This commit is contained in:
2025-06-03 19:53:58 +00:00
13 changed files with 17 additions and 653 deletions

View File

@ -27,10 +27,13 @@ COMMON_NAME="../$MOD_ID-$MC_VERSION-$MOD_VERSION"
COMMON_CONTENTS="data/ pack.mcmeta pack.png"
# Datapack
rm $COMMON_NAME.zip
zip -r $COMMON_NAME.zip $COMMON_CONTENTS
# Forge mod
rm $COMMON_NAME-forge.jar
zip -r $COMMON_NAME-forge.jar $COMMON_CONTENTS META-INF/
# Fabric mod
rm $COMMON_NAME-fabric.jar
zip -r $COMMON_NAME-fabric.jar $COMMON_CONTENTS fabric.mod.json

View File

@ -19,90 +19,8 @@
],
"wythers:snowy_fen": "wythers:vegetation/configured_tree/taiga_spruce",
"wythers:pine_barrens": "wythers:vegetation/configured_tree/pine_with_podzol",
"wythers:mediterranean_island_thermal_springs": [
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:3258261492379685107",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:-3285617133756825680",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:9155356187767246314",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:778685321004512628",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8802703971160829237",
"weight": 800
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:4799484851036609594",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:12433795313025251",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8050803079610331712",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:75110086947501090",
"weight": 4000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8084330056071052958",
"weight": 4000
}
],
"wythers:mediterranean_island": [
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:3258261492379685107",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:-3285617133756825680",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:9155356187767246314",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:778685321004512628",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8802703971160829237",
"weight": 800
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:4799484851036609594",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:12433795313025251",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8050803079610331712",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:75110086947501090",
"weight": 4000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8084330056071052958",
"weight": 4000
}
],
"wythers:mediterranean_island_thermal_springs": "wythers:vegetation/configured_tree/mediterranean_cypress",
"wythers:mediterranean_island": "wythers:vegetation/configured_tree/mediterranean_cypress",
"wythers:maple_mountains": "wythers:vegetation/configured_tree/pine",
"wythers:larch_taiga": [
{
@ -122,44 +40,8 @@
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:3258261492379685107",
"weight": 4000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:-3285617133756825680",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:9155356187767246314",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:778685321004512628",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8802703971160829237",
"weight": 1600
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:4799484851036609594",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:12433795313025251",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8050803079610331712",
"weight": 2000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:75110086947501090",
"weight": 8000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:8084330056071052958",
"weight": 8000
"feature": "wythers:vegetation/configured_tree/mediterranean_cypress",
"weight": 10000
}
],
"wythers:forested_highlands": [
@ -174,16 +56,7 @@
],
"wythers:flooded_temperate_rainforest": "wythers:vegetation/configured_tree/douglas_fir_small",
"wythers:fen": "wythers:vegetation/configured_tree/pine",
"wythers:desert_island": [
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:3258261492379685107",
"weight": 1000
},
{
"feature": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:-3285617133756825680",
"weight": 1000
}
],
"wythers:desert_island": "treeplacer_x_expanded_ecosphere-1.20.1-3.2.4:mediterranean_cypress_11",
"wythers:crimson_tundra": "wythers:vegetation/configured_tree/tundra_spruce",
"wythers:cool_forest_edge": "wythers:vegetation/configured_tree/tundra_spruce",
"wythers:cool_forest": "wythers:vegetation/configured_tree/pine",

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 5,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 0,
"offset": 5,
"height": 6
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 8,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 1,
"offset": 1,
"height": 9
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 5,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 1,
"offset": 1,
"height": 6
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 7,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 0,
"offset": 6,
"height": 7
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 6,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 1,
"offset": 1,
"height": 7
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 7,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 1,
"offset": 1,
"height": 8
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 8,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 0,
"offset": 6,
"height": 7
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 6,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 0,
"offset": 6,
"height": 7
},
"decorators": []
}
}

View File

@ -1,53 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 3,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:random_spread_foliage_placer",
"radius": 2,
"offset": 0,
"foliage_height": 2,
"leaf_placement_attempts": 100
},
"decorators": []
}
}

View File

@ -1,52 +0,0 @@
{
"type": "minecraft:tree",
"config": {
"ignore_vines": true,
"force_dirt": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 1,
"upper_size": 1
},
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:stripped_spruce_log",
"Properties": {
"axis": "y"
}
}
},
"foliage_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:spruce_leaves",
"Properties": {
"distance": "6",
"persistent": "false",
"waterlogged": "false"
}
}
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 5,
"height_rand_a": 0,
"height_rand_b": 0
},
"foliage_placer": {
"type": "minecraft:fancy_foliage_placer",
"radius": 0,
"offset": 6,
"height": 7
},
"decorators": []
}
}

View File

@ -0,0 +1,9 @@
{
"type": "minecraft:simple_random_selector",
"config": {
"features": [
"wythers:vegetation/placed_tree/mediterranean_cypress_11"
]
}
}