-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #163 from Hojosa/trees
add cork tree & apple tree improvements
- Loading branch information
Showing
70 changed files
with
1,002 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/growthcraft_apples/forge/biome_modifier/add_apple_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#growthcraft_apples:has_apple_tree", | ||
| "features": "growthcraft_apples:apple_tree_placed", | ||
| "step": "vegetal_decoration" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/growthcraft_apples/tags/worldgen/biome/has_apple_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:forest", | ||
| "minecraft:plains" | ||
| ] | ||
| } |
91 changes: 91 additions & 0 deletions
91
src/generated/resources/data/growthcraft_apples/worldgen/configured_feature/apple_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "type": "minecraft:tree", | ||
| "config": { | ||
| "decorators": [], | ||
| "dirt_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "minecraft:dirt" | ||
| } | ||
| }, | ||
| "foliage_placer": { | ||
| "type": "minecraft:cherry_foliage_placer", | ||
| "corner_hole_chance": 0.25, | ||
| "hanging_leaves_chance": 0.0, | ||
| "hanging_leaves_extension_chance": 0.0, | ||
| "height": 5, | ||
| "offset": 0, | ||
| "radius": 4, | ||
| "wide_bottom_layer_hole_chance": 0.25 | ||
| }, | ||
| "foliage_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "growthcraft_apples:apple_tree_leaves", | ||
| "Properties": { | ||
| "distance": "7", | ||
| "persistent": "false", | ||
| "waterlogged": "false" | ||
| } | ||
| } | ||
| }, | ||
| "force_dirt": false, | ||
| "ignore_vines": false, | ||
| "minimum_size": { | ||
| "type": "minecraft:two_layers_feature_size", | ||
| "limit": 1, | ||
| "lower_size": 0, | ||
| "upper_size": 2 | ||
| }, | ||
| "trunk_placer": { | ||
| "type": "minecraft:cherry_trunk_placer", | ||
| "base_height": 6, | ||
| "branch_count": { | ||
| "type": "minecraft:weighted_list", | ||
| "distribution": [ | ||
| { | ||
| "data": 1, | ||
| "weight": 1 | ||
| }, | ||
| { | ||
| "data": 2, | ||
| "weight": 1 | ||
| }, | ||
| { | ||
| "data": 3, | ||
| "weight": 1 | ||
| } | ||
| ] | ||
| }, | ||
| "branch_end_offset_from_top": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 0, | ||
| "min_inclusive": -1 | ||
| } | ||
| }, | ||
| "branch_horizontal_length": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 4, | ||
| "min_inclusive": 2 | ||
| } | ||
| }, | ||
| "branch_start_offset_from_top": { | ||
| "max_inclusive": -3, | ||
| "min_inclusive": -4 | ||
| }, | ||
| "height_rand_a": 1, | ||
| "height_rand_b": 0 | ||
| }, | ||
| "trunk_provider": { | ||
| "type": "minecraft:simple_state_provider", | ||
| "state": { | ||
| "Name": "growthcraft_apples:apple_wood_log", | ||
| "Properties": { | ||
| "axis": "y" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/growthcraft_cellar/forge/biome_modifier/add_cork_tree.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "type": "forge:add_features", | ||
| "biomes": "#growthcraft_cellar:has_cork_tree", | ||
| "features": "growthcraft_cellar:cork_tree_placed", | ||
| "step": "vegetal_decoration" | ||
| } |
136 changes: 136 additions & 0 deletions
136
src/generated/resources/data/growthcraft_cellar/loot_tables/blocks/cork_tree_leaves.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:alternatives", | ||
| "children": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:any_of", | ||
| "terms": [ | ||
| { | ||
| "condition": "minecraft:match_tool", | ||
| "predicate": { | ||
| "items": [ | ||
| "minecraft:shears" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "condition": "minecraft:match_tool", | ||
| "predicate": { | ||
| "enchantments": [ | ||
| { | ||
| "enchantment": "minecraft:silk_touch", | ||
| "levels": { | ||
| "min": 1 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "name": "growthcraft_cellar:cork_tree_leaves" | ||
| }, | ||
| { | ||
| "type": "minecraft:item", | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| }, | ||
| { | ||
| "chances": [ | ||
| 0.05, | ||
| 0.0625, | ||
| 0.083333336, | ||
| 0.1 | ||
| ], | ||
| "condition": "minecraft:table_bonus", | ||
| "enchantment": "minecraft:fortune" | ||
| } | ||
| ], | ||
| "name": "growthcraft_cellar:cork_tree_sapling" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| }, | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:inverted", | ||
| "term": { | ||
| "condition": "minecraft:any_of", | ||
| "terms": [ | ||
| { | ||
| "condition": "minecraft:match_tool", | ||
| "predicate": { | ||
| "items": [ | ||
| "minecraft:shears" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "condition": "minecraft:match_tool", | ||
| "predicate": { | ||
| "enchantments": [ | ||
| { | ||
| "enchantment": "minecraft:silk_touch", | ||
| "levels": { | ||
| "min": 1 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "conditions": [ | ||
| { | ||
| "chances": [ | ||
| 0.02, | ||
| 0.022222223, | ||
| 0.025, | ||
| 0.033333335, | ||
| 0.1 | ||
| ], | ||
| "condition": "minecraft:table_bonus", | ||
| "enchantment": "minecraft:fortune" | ||
| } | ||
| ], | ||
| "functions": [ | ||
| { | ||
| "add": false, | ||
| "count": { | ||
| "type": "minecraft:uniform", | ||
| "max": 2.0, | ||
| "min": 1.0 | ||
| }, | ||
| "function": "minecraft:set_count" | ||
| }, | ||
| { | ||
| "function": "minecraft:explosion_decay" | ||
| } | ||
| ], | ||
| "name": "minecraft:stick" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "growthcraft_cellar:blocks/cork_tree_leaves" | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/growthcraft_cellar/loot_tables/blocks/cork_tree_sapling.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "growthcraft_cellar:cork_tree_sapling" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "growthcraft_cellar:blocks/cork_tree_sapling" | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/growthcraft_cellar/loot_tables/blocks/cork_wood.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "growthcraft_cellar:cork_wood" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "growthcraft_cellar:blocks/cork_wood" | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/growthcraft_cellar/loot_tables/blocks/cork_wood_log.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "growthcraft_cellar:cork_wood_log" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "growthcraft_cellar:blocks/cork_wood_log" | ||
| } |
21 changes: 21 additions & 0 deletions
21
...enerated/resources/data/growthcraft_cellar/loot_tables/blocks/cork_wood_log_stripped.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "growthcraft_cellar:cork_wood_log_stripped" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "growthcraft_cellar:blocks/cork_wood_log_stripped" | ||
| } |
Oops, something went wrong.