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 1 commit 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
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,21 @@ sourceSets.main.get().resources {
}

dependencies {
// Not sure if we need this one, what is a "forge" anyway?
minecraft("net.minecraftforge:forge:${mcVersion}-${property("forgeVersion")}")

// Compile Hwyla API, but don"t include in runtime.
compileOnly(fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}:api"))
// At runtime, use the full Hwyla mod.
runtimeOnly(fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}"))
// Temp as TehNut Maven is down.
implementation(fg.deobf("curse.maven:hwyla-253449:3033593"))
// compileOnly(fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}:api"))
// runtimeOnly(fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}"))

// Compile JEI API, but don"t include in runtime.
compileOnly(fg.deobf("mezz.jei:jei-${mcVersion}:${property("jeiVersion")}:api"))
// At runtime, use the full JEI mod.
runtimeOnly(fg.deobf("mezz.jei:jei-${mcVersion}:${property("jeiVersion")}"))

// Compile full Dynamic Trees mod.
implementation(fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-${mcVersion}:${property("dynamicTreesVersion")}"))
// At runtime, use full Dynamic Trees + mod for cacti.
runtimeOnly(fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-${mcVersion}:${property("dynamicTreesPlusVersion")}"))

// Compile full Traverse mod.
implementation(fg.deobf("curse.maven:Traverse-267769:3157857"))

// At runtime, use suggestion provider fix mod.
runtimeOnly(fg.deobf("com.harleyoconnor.suggestionproviderfix:SuggestionProviderFix:${mcVersion}-${property("suggestionProviderFixVersion")}"))
}

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ modVersion=2.2.3
group=com.harleyoconnor.dttraverse

mcVersion=1.16.5
forgeVersion=36.2.0
forgeVersion=36.2.34
mappingsVersion=20210309

dynamicTreesVersion=0.10.0-Beta23
dynamicTreesPlusVersion=0.1.0-Beta10
dynamicTreesVersion=0.10.0-Beta-LR6
dynamicTreesPlusVersion=0.1.0-Beta-LR1
hwylaVersion=1.10.11-B78_1.16.2
jeiVersion=7.7.1.111
jeiVersion=7.7.1.152
suggestionProviderFixVersion=1.0.0

curseFileType=release
Expand Down
40 changes: 37 additions & 3 deletions src/generated/resources/.cache/cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
027170d47fd10c581b4b43c2a6d5d87bd084752c data/dttraverse/loot_tables/blocks/brown_autumnal_leaves.json
81e936e18fb584fd568e92128fe12a0da786e2ce data/dttraverse/loot_tables/blocks/fir_leaves.json
3d1cf7abac3aa82be1ee60b0387c97934ed0d528 data/dttraverse/loot_tables/blocks/orange_autumnal_leaves.json
835f62f834288e5dcd14fdf3de2afe8cba466140 data/dttraverse/loot_tables/blocks/red_autumnal_leaves.json
419c1d55c2dc68cb817cbb204e5329c0aba1195a data/dttraverse/loot_tables/blocks/yellow_autumnal_leaves.json
5972010592d849d4d570203c7a832b1a4b6d0b5c data/dttraverse/loot_tables/trees/branches/fir.json
2c3847510d86d0ec6d79e88ba2f43515ddc9516d data/dttraverse/loot_tables/trees/branches/stripped_fir.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dttraverse/loot_tables/trees/leaves/brown_autumnal.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dttraverse/loot_tables/trees/leaves/fir.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dttraverse/loot_tables/trees/leaves/orange_autumnal.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dttraverse/loot_tables/trees/leaves/red_autumnal.json
18fb82213e5bed379c7bc6fe55ee1149fb7979b8 data/dttraverse/loot_tables/trees/leaves/yellow_autumnal.json
29340fd3a565479191c3b2783ee3c82157f29c3b data/dttraverse/loot_tables/trees/voluntary/brown_autumnal_oak.json
8b9b034380e7eac7d6dff69057882a973b033406 data/dttraverse/loot_tables/trees/voluntary/fir.json
094c93d70bfb7643d8a7845e39b17ed0460e1f77 data/dttraverse/loot_tables/trees/voluntary/orange_autumnal_oak.json
f49d37aa1eee183acc8971e5e0e6ae46ee6c4e11 data/dttraverse/loot_tables/trees/voluntary/red_autumnal_oak.json
77888af476ef94b2ce0bc8044468f92d13cd4564 data/dttraverse/loot_tables/trees/voluntary/yellow_autumnal_birch.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
8ca7039400b1ee842b47a0efd88ea7eab0debc20 data/dynamictrees/tags/blocks/branches_that_burn.json
7152a7da94ce24301589b8f5a488b56f8771d0a7 data/dynamictrees/tags/blocks/leaves.json
4401aba854c54102fc057a87ab51171dadc5d7ed data/dynamictrees/tags/blocks/saplings.json
c95e00b01b446d0425828ce01b17b2996064c8d2 data/dynamictrees/tags/blocks/leaves.json
6b6c37a2f3ab6ab17fea4ac46c7339b1e75ae9d3 data/dynamictrees/tags/blocks/saplings.json
96c7226e4e0b7fe149f6ada532f3549dd0c641c6 data/dynamictrees/tags/blocks/stripped_branches_that_burn.json
c41839508d463c693b603b8c5d96832123cfeb73 data/dynamictrees/tags/items/seeds.json
8ca7039400b1ee842b47a0efd88ea7eab0debc20 data/dynamictrees/tags/items/branches_that_burn.json
f4c345e1ab43419991aa2dcd75e924818c488eee data/dynamictrees/tags/items/seeds.json
130 changes: 130 additions & 0 deletions src/generated/resources/data/dttraverse/loot_tables/blocks/brown_autumnal_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": "traverse:brown_autumnal_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/dttraverse/loot_tables/blocks/fir_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": "traverse:fir_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
}
}
]
}
}
]
}
}
]
}
]
}
Loading