diff --git a/build.gradle.kts b/build.gradle.kts index 04b38f7..a09d8c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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")}")) } diff --git a/gradle.properties b/gradle.properties index b42df58..8ef9da1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1e6d9ea..1073be4 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -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 diff --git a/src/generated/resources/data/dttraverse/loot_tables/blocks/brown_autumnal_leaves.json b/src/generated/resources/data/dttraverse/loot_tables/blocks/brown_autumnal_leaves.json new file mode 100644 index 0000000..ec5df6e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/blocks/brown_autumnal_leaves.json @@ -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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/blocks/fir_leaves.json b/src/generated/resources/data/dttraverse/loot_tables/blocks/fir_leaves.json new file mode 100644 index 0000000..a8990a0 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/blocks/fir_leaves.json @@ -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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/blocks/orange_autumnal_leaves.json b/src/generated/resources/data/dttraverse/loot_tables/blocks/orange_autumnal_leaves.json new file mode 100644 index 0000000..d2ff5c8 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/blocks/orange_autumnal_leaves.json @@ -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:orange_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/blocks/red_autumnal_leaves.json b/src/generated/resources/data/dttraverse/loot_tables/blocks/red_autumnal_leaves.json new file mode 100644 index 0000000..5ccd4b9 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/blocks/red_autumnal_leaves.json @@ -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:red_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/blocks/yellow_autumnal_leaves.json b/src/generated/resources/data/dttraverse/loot_tables/blocks/yellow_autumnal_leaves.json new file mode 100644 index 0000000..96db0e2 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/blocks/yellow_autumnal_leaves.json @@ -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:yellow_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/branches/fir.json b/src/generated/resources/data/dttraverse/loot_tables/trees/branches/fir.json new file mode 100644 index 0000000..b4ee09d --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/branches/fir.json @@ -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": "traverse:fir_log" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/branches/stripped_fir.json b/src/generated/resources/data/dttraverse/loot_tables/trees/branches/stripped_fir.json new file mode 100644 index 0000000..728fac3 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/branches/stripped_fir.json @@ -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": "traverse:stripped_fir_log" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/brown_autumnal.json b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/brown_autumnal.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/brown_autumnal.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/fir.json b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/fir.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/fir.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/orange_autumnal.json b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/orange_autumnal.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/orange_autumnal.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/red_autumnal.json b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/red_autumnal.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/red_autumnal.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/yellow_autumnal.json b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/yellow_autumnal.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/leaves/yellow_autumnal.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/brown_autumnal_oak.json b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/brown_autumnal_oak.json new file mode 100644 index 0000000..5c1215c --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/brown_autumnal_oak.json @@ -0,0 +1,20 @@ +{ + "type": "dynamictrees:voluntary", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dttraverse:brown_autumnal_oak_seed" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/fir.json b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/fir.json new file mode 100644 index 0000000..56eebdc --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/fir.json @@ -0,0 +1,20 @@ +{ + "type": "dynamictrees:voluntary", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dttraverse:fir_seed" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/orange_autumnal_oak.json b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/orange_autumnal_oak.json new file mode 100644 index 0000000..6317da6 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/orange_autumnal_oak.json @@ -0,0 +1,20 @@ +{ + "type": "dynamictrees:voluntary", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dttraverse:orange_autumnal_oak_seed" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/red_autumnal_oak.json b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/red_autumnal_oak.json new file mode 100644 index 0000000..1595731 --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/red_autumnal_oak.json @@ -0,0 +1,20 @@ +{ + "type": "dynamictrees:voluntary", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dttraverse:red_autumnal_oak_seed" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/yellow_autumnal_birch.json b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/yellow_autumnal_birch.json new file mode 100644 index 0000000..723e63a --- /dev/null +++ b/src/generated/resources/data/dttraverse/loot_tables/trees/voluntary/yellow_autumnal_birch.json @@ -0,0 +1,20 @@ +{ + "type": "dynamictrees:voluntary", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dttraverse:yellow_autumnal_birch_seed" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/acacia_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/acacia_leaves.json new file mode 100644 index 0000000..9022a87 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/acacia_leaves.json @@ -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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/birch_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/birch_leaves.json new file mode 100644 index 0000000..428af67 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/birch_leaves.json @@ -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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/crimson_wart.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/crimson_wart.json new file mode 100644 index 0000000..2a09e33 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/crimson_wart.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:nether_wart_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/dark_oak_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/dark_oak_leaves.json new file mode 100644 index 0000000..28a1057 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/dark_oak_leaves.json @@ -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:dark_oak_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/jungle_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/jungle_leaves.json new file mode 100644 index 0000000..7a2ebe5 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/jungle_leaves.json @@ -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:jungle_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/oak_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/oak_leaves.json new file mode 100644 index 0000000..59ad55a --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/oak_leaves.json @@ -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:oak_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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/spruce_leaves.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/spruce_leaves.json new file mode 100644 index 0000000..e269437 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/spruce_leaves.json @@ -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: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 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/blocks/warped_wart.json b/src/generated/resources/data/dynamictrees/loot_tables/blocks/warped_wart.json new file mode 100644 index 0000000..01e80b4 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/blocks/warped_wart.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:warped_wart_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/acacia.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/acacia.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/acacia.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/birch.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/birch.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/birch.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/crimson.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/crimson.json new file mode 100644 index 0000000..6292edd --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/crimson.json @@ -0,0 +1,28 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:nether_wart_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.1333333, + 0.1666666, + 0.2 + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/dark_oak.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/dark_oak.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/dark_oak.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/jungle.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/jungle.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/jungle.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/oak.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/oak.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/oak.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/spruce.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/spruce.json new file mode 100644 index 0000000..7590d0e --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/spruce.json @@ -0,0 +1,66 @@ +{ + "type": "dynamictrees:leaves", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/warped.json b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/warped.json new file mode 100644 index 0000000..3ac4f45 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/loot_tables/trees/leaves/warped.json @@ -0,0 +1,28 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:warped_wart_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.1333333, + 0.1666666, + 0.2 + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json index 1704511..22f54c4 100644 --- a/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json @@ -1,10 +1,10 @@ { "replace": false, "values": [ + "dttraverse:yellow_autumnal_leaves", "dttraverse:fir_leaves", - "dttraverse:red_autumnal_leaves", "dttraverse:brown_autumnal_leaves", "dttraverse:orange_autumnal_leaves", - "dttraverse:yellow_autumnal_leaves" + "dttraverse:red_autumnal_leaves" ] } \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json index ce5979b..85395c9 100644 --- a/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json @@ -2,9 +2,9 @@ "replace": false, "values": [ "dttraverse:orange_autumnal_oak_sapling", - "dttraverse:brown_autumnal_oak_sapling", - "dttraverse:red_autumnal_oak_sapling", "dttraverse:fir_sapling", - "dttraverse:yellow_autumnal_birch_sapling" + "dttraverse:yellow_autumnal_birch_sapling", + "dttraverse:red_autumnal_oak_sapling", + "dttraverse:brown_autumnal_oak_sapling" ] } \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json new file mode 100644 index 0000000..d9651c2 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "dttraverse:fir_branch" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/seeds.json b/src/generated/resources/data/dynamictrees/tags/items/seeds.json index f72fa29..edfcda4 100644 --- a/src/generated/resources/data/dynamictrees/tags/items/seeds.json +++ b/src/generated/resources/data/dynamictrees/tags/items/seeds.json @@ -2,9 +2,9 @@ "replace": false, "values": [ "dttraverse:orange_autumnal_oak_seed", - "dttraverse:brown_autumnal_oak_seed", - "dttraverse:red_autumnal_oak_seed", "dttraverse:fir_seed", - "dttraverse:yellow_autumnal_birch_seed" + "dttraverse:yellow_autumnal_birch_seed", + "dttraverse:red_autumnal_oak_seed", + "dttraverse:brown_autumnal_oak_seed" ] } \ No newline at end of file diff --git a/src/main/java/dttraverse/DynamicTreesTraverse.java b/src/main/java/dttraverse/DynamicTreesTraverse.java index 81ce72a..69417ae 100644 --- a/src/main/java/dttraverse/DynamicTreesTraverse.java +++ b/src/main/java/dttraverse/DynamicTreesTraverse.java @@ -1,8 +1,7 @@ package dttraverse; -import com.ferreusveritas.dynamictrees.DynamicTrees; +import com.ferreusveritas.dynamictrees.api.GatherDataHelper; import com.ferreusveritas.dynamictrees.api.registry.RegistryHandler; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -18,7 +17,8 @@ public DynamicTreesTraverse() { } private void gatherData(final GatherDataEvent event) { - DynamicTrees.gatherTagGenerators(MOD_ID, event); + GatherDataHelper.gatherTagData(MOD_ID, event); + GatherDataHelper.gatherLootData(MOD_ID, event); } }