Skip to content

Update for drops rework #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2022
Merged

Update for drops rework #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e03946
Update for drops rework
Harleyoc1 Aug 9, 2022
e6caa9d
Re-gen for new seed drop chances
Harleyoc1 Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mcVersion=1.16.5
forgeVersion=36.2.34
mappingsVersion=2022.03.06

dynamicTreesVersion=0.10.0-Beta-LR4
dynamicTreesVersion=0.10.0-Beta-LR6
hwylaVersion=1.10.11-B78_1.16.2
jeiVersion=7.7.1.152
vampirismVersion=1.8.0-beta.3
Expand Down
27 changes: 25 additions & 2 deletions src/generated/resources/.cache/cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
da87d34503f68b32a62dfa715f87286876427af1 data/dtvampirism/loot_tables/blocks/bloody_spruce_leaves.json
eb03f1b5f88d7a7a8cc6524e0bf6e468d8712f6f data/dtvampirism/loot_tables/blocks/vampire_spruce_leaves.json
de333f877971eaff16b46ec5d7956cbd1b406225 data/dtvampirism/loot_tables/trees/branches/bloody_spruce.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dtvampirism/loot_tables/trees/leaves/bloody_spruce.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dtvampirism/loot_tables/trees/leaves/vampire_spruce.json
408ba920d051c423f6dff9be198f7542731fed7c data/dtvampirism/loot_tables/trees/voluntary/bloody_spruce.json
8ec8548bf39e74c89bd1af35ac15ed1f61df60e0 data/dynamictrees/loot_tables/blocks/acacia_leaves.json
bd755992edc0863661049241755d6d2d918d4254 data/dynamictrees/loot_tables/blocks/birch_leaves.json
2a9c0717ddf89f86514ef3e161f9679ccc7bee29 data/dynamictrees/loot_tables/blocks/crimson_wart.json
ce5c5f799db7d83f546fee5351bd44670b160645 data/dynamictrees/loot_tables/blocks/dark_oak_leaves.json
c2b3626fa1216775e5ca487a5d5249c204de8916 data/dynamictrees/loot_tables/blocks/jungle_leaves.json
535fc0acf78658ba6e26050247c7b82eedfa7959 data/dynamictrees/loot_tables/blocks/oak_leaves.json
f6e27d06751389a868918c1d7755df5d2d45a475 data/dynamictrees/loot_tables/blocks/spruce_leaves.json
3b375ed7e64d3d6d18499bbc1af30e5cd931e134 data/dynamictrees/loot_tables/blocks/warped_wart.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/acacia.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/birch.json
1fa0122268c45577f8d382b8d8f54eab235c52cb data/dynamictrees/loot_tables/trees/leaves/crimson.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/dark_oak.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/jungle.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/oak.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dynamictrees/loot_tables/trees/leaves/spruce.json
ade396476908421578ad8a9d9136de4da8608e7f data/dynamictrees/loot_tables/trees/leaves/warped.json
84b6889d68e4856d8bcb5f645443f74583a13dff data/dynamictrees/tags/blocks/branches_that_burn.json
267465cc80c9aa2605b7c826733253e24f366ab6 data/dynamictrees/tags/blocks/leaves.json
e13c4115ca8d97b20d2c6050fb98ac2f1bdb350b data/dynamictrees/tags/blocks/saplings.json
27103f4b5e0dac8e55c364397b4f05b782c9117e data/dynamictrees/tags/blocks/leaves.json
b5fdc94c5f950273aa79287ee123170421419a87 data/dynamictrees/tags/blocks/saplings.json
84b6889d68e4856d8bcb5f645443f74583a13dff data/dynamictrees/tags/items/branches_that_burn.json
a39d9654f7421b3c860c443c1ff164f53f0948db data/dynamictrees/tags/items/seeds.json
130 changes: 130 additions & 0 deletions src/generated/resources/data/dtvampirism/loot_tables/blocks/bloody_spruce_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "vampirism:bloody_spruce_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
]
}
],
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1.0,
"max": 2.0,
"type": "minecraft:uniform"
}
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"conditions": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
}
]
}
]
}
130 changes: 130 additions & 0 deletions src/generated/resources/data/dtvampirism/loot_tables/blocks/vampire_spruce_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "vampirism:vampire_spruce_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
]
}
],
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1.0,
"max": 2.0,
"type": "minecraft:uniform"
}
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"conditions": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
}
]
}
]
}
39 changes: 39 additions & 0 deletions src/generated/resources/data/dtvampirism/loot_tables/trees/branches/bloody_spruce.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "dynamictrees:branches",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_logs_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "vampirism:bloody_spruce_log"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_sticks_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
]
}
]
}
Loading