Skip to content

Rework drops to use loot tables #706

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 18 commits into from
Aug 27, 2022
Merged

Rework drops to use loot tables #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
db61a79
Switch drops to use loot tables
Harleyoc1 Jun 29, 2022
acc8f35
Minor cleanup and fixes
Harleyoc1 Jul 4, 2022
e33cf2b
Merge branch 'develop/1.16.5' into feature/1.16.5/drops-rework
Harleyoc1 Aug 7, 2022
c3dbd87
Change name of `wood` drops to `branches`
Harleyoc1 Aug 7, 2022
36f0f3c
Add item by species loot entry for branches drops
Harleyoc1 Aug 8, 2022
e544824
Add IsSpecies loot condition and MultiplyCount loot function
Harleyoc1 Aug 8, 2022
6722e5f
Move leaves drop handling to LeavesProperties
Harleyoc1 Aug 9, 2022
07f08d9
Change IsSpecies condition to SpeciesMatches and use regex instead of…
Harleyoc1 Aug 9, 2022
d6a1c1d
Update default seed drop chances
Harleyoc1 Aug 10, 2022
a59fc8f
Prevent fruit trees from dropping seeds by default
Harleyoc1 Aug 13, 2022
9130877
Only generate leaves tables for selected mod ID
Harleyoc1 Aug 13, 2022
eea4a2b
Fix growth substance
Harleyoc1 Aug 13, 2022
67aafcf
Add data generators for fruit and pod blocks
Harleyoc1 Aug 13, 2022
1b714a8
Add palm leaves drop generators
Harleyoc1 Aug 14, 2022
2eb97d9
Add universal seed drop rate config option
Harleyoc1 Aug 21, 2022
8b70411
Add species override tables
Harleyoc1 Aug 21, 2022
81723a8
Add weighted item loot entry
Harleyoc1 Aug 24, 2022
ac42921
Fix branch harvest tool block property being overriden by Family class
Harleyoc1 Aug 27, 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
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
modName=DynamicTrees
modId=dynamictrees
modVersion=0.10.0-Beta33.3
modVersion=0.10.0-Beta-LR14
group=com.ferreusveritas.dynamictrees

mcVersion=1.16.5
forgeVersion=36.2.30
forgeVersion=36.2.34
mappingsVersion=2022.03.06

hwylaVersion=1.10.11-B78_1.16.2
Expand Down
43 changes: 43 additions & 0 deletions src/generated/resources/.cache/cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,49 @@ e93499abbe31d9e789e29af06798a9caddc88e80 assets/dynamictrees/models/item/spruce_
0a004b585c1035911f357ecaefec8799388a6d11 assets/dynamictrees/models/item/spruce_seed.json
f19f3fb00967e33d24bce3ac224ebe952e5d3cd4 assets/dynamictrees/models/item/warped_branch.json
6f06586da567331dbe6251acb1aa1a554de5cfa6 assets/dynamictrees/models/item/warped_seed.json
8ec8548bf39e74c89bd1af35ac15ed1f61df60e0 data/dynamictrees/loot_tables/blocks/acacia_leaves.json
308ad8fa0721389bbe9aa6c2cc472582f0ec38ba data/dynamictrees/loot_tables/blocks/apple_fruit.json
bd755992edc0863661049241755d6d2d918d4254 data/dynamictrees/loot_tables/blocks/birch_leaves.json
1ef3c41711d46b5076f9871b5434eb45d0f9b745 data/dynamictrees/loot_tables/blocks/cocoa.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
f6d16a6825ddeaecdd0ddb2c2b1886f60ea82944 data/dynamictrees/loot_tables/trees/branches/acacia.json
8f45ffe7eebe4d5b164e23d5481a7b6af801655e data/dynamictrees/loot_tables/trees/branches/birch.json
4f635405004638f0d061aff5762b4bb2555fca29 data/dynamictrees/loot_tables/trees/branches/crimson.json
edd89ec38c627114870dfea712a15a9c438f65cb data/dynamictrees/loot_tables/trees/branches/dark_oak.json
4d96df594c88f936bf605bf709945542306d625e data/dynamictrees/loot_tables/trees/branches/jungle.json
20d0b6c635fcc53c9d29124ed1c48b7b1e9ac119 data/dynamictrees/loot_tables/trees/branches/oak.json
cfe795a6b3e491c0b9b3ff9f53fc637e1507c702 data/dynamictrees/loot_tables/trees/branches/spruce.json
36f2641ce96884c71914d9ee309d3ce2cff36b74 data/dynamictrees/loot_tables/trees/branches/stripped_acacia.json
2ec30f11e3a3165006abb231c56e261960be8a53 data/dynamictrees/loot_tables/trees/branches/stripped_birch.json
3d22b9c7a4dc3c37c8ad1498c3a133888db28de3 data/dynamictrees/loot_tables/trees/branches/stripped_crimson.json
7da549bf3dae26accbb0720bea07195f88a17777 data/dynamictrees/loot_tables/trees/branches/stripped_dark_oak.json
6a64834cdd6605a2cf9df87df808351b103a81e6 data/dynamictrees/loot_tables/trees/branches/stripped_jungle.json
bca98cb1ec99edd9eb9f05bc0b2945a05b42899f data/dynamictrees/loot_tables/trees/branches/stripped_oak.json
1c6d89c3fb1339f881e4e32cfae3b47f2504fd35 data/dynamictrees/loot_tables/trees/branches/stripped_spruce.json
9a3b714da894635be7b9a53d94c639652033b33c data/dynamictrees/loot_tables/trees/branches/stripped_warped.json
05f6da26478527e105eca41987455f402c95c913 data/dynamictrees/loot_tables/trees/branches/warped.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
1afd145bc713c49a951b1aae9e958436c1e01fad data/dynamictrees/loot_tables/trees/voluntary/acacia.json
f7155cfadea4513beea11b7af3a8b16595fc5966 data/dynamictrees/loot_tables/trees/voluntary/apple_oak.json
b1186b2561105d575573fe3e1f497d69e71bd203 data/dynamictrees/loot_tables/trees/voluntary/birch.json
23ea3e615349be1d7b98960270522ddbfa8726eb data/dynamictrees/loot_tables/trees/voluntary/crimson.json
0044b94fd9d64f48f71cb98bc5842fac4b965191 data/dynamictrees/loot_tables/trees/voluntary/dark_oak.json
fa15a74c9f4c6ef2938b746034851a694f447392 data/dynamictrees/loot_tables/trees/voluntary/jungle.json
07f2393576fd7a50b338e5b32a399d8915b6852d data/dynamictrees/loot_tables/trees/voluntary/oak.json
d9e9232eafa5e036c1377e88fef0531dadcf7b42 data/dynamictrees/loot_tables/trees/voluntary/spruce.json
a5e8677a389e452305c3cc65e80c68a2339055ac data/dynamictrees/loot_tables/trees/voluntary/warped.json
00f1155e3e23759f5c41ff23363ddabd828373eb data/dynamictrees/tags/blocks/branches.json
9cde27364783c31821c51da5ae452b6f642c8c06 data/dynamictrees/tags/blocks/branches_that_burn.json
f0827e9841f3f418505af50a01fef5a1be47e0ec data/dynamictrees/tags/blocks/foliage.json
Expand Down
Empty file modified src/generated/resources/assets/dynamictrees/lang/it_it.json
100644 → 100755
View file
Open in desktop
Empty file.
130 changes: 130 additions & 0 deletions src/generated/resources/data/dynamictrees/loot_tables/blocks/acacia_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": "minecraft:acacia_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
}
}
]
}
}
]
}
}
]
}
]
}
0 ...trees/loot_tables/blocks/apple_fruit.json → ...trees/loot_tables/blocks/apple_fruit.json
View file
Open in desktop
File renamed without changes.
130 changes: 130 additions & 0 deletions src/generated/resources/data/dynamictrees/loot_tables/blocks/birch_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": "minecraft:birch_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
}
}
]
}
}
]
}
}
]
}
]
}
0 ...ynamictrees/loot_tables/blocks/cocoa.json → ...ynamictrees/loot_tables/blocks/cocoa.json
View file
Open in desktop
File renamed without changes.
18 changes: 18 additions & 0 deletions src/generated/resources/data/dynamictrees/loot_tables/blocks/crimson_wart.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:nether_wart_block"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Loading