diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index be10049fe..f74c9d807 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -1,104 +1,124 @@ { - "disableCrouchMining": false, - "disableExtraToolDamage": false, - "disableExtraFoodExhaustion": false, - "treeLifetimeLength": 4.0, - "dynamicMiningSpeed": { - "disable": false, - "speedMultiplication": 0.05, - "maxSpeedMultiplication": 16.0 - }, - "trees": { - "standardTree": { - "algorithm": { - "maxLeavesRadius": 15, - "maxLogAmount": 512, - "shouldFallOnMaxLogAmount": true, - "shouldIgnorePersistentLeaves": true - }, - "logFilter": { - "whitelistedTags": [ - "minecraft:logs" - ], - "whitelist": [], - "blacklist": [] - }, - "leavesFilter": { - "whitelistedTags": [ - "minecraft:leaves" - ], - "whitelist": [], - "blacklist": [] - }, - "extraBlockFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:vine", - "minecraft:bee_nest", - "minecraft:cocoa" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [ - "minecraft:axes" - ], - "whitelist": [], - "blacklist": [] - } + "disableCrouchMining": false, + "disableExtraToolDamage": false, + "disableExtraFoodExhaustion": false, + "treeLifetimeLength": 4.0, + "dynamicMiningSpeed": { + "disable": false, + "speedMultiplication": 0.05, + "maxSpeedMultiplication": 16.0 }, - "verticalTree": { - "filter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:cactus", - "minecraft:bamboo" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "chorusTree": { - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "mushroomTree": { - "stemFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:mushroom_stem" - ], - "blacklist": [] - }, - "capFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:red_mushroom_block", - "minecraft:brown_mushroom_block", - "minecraft:shroomlight" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } + "trees": { + "standardTree": { + "algorithm": { + "maxLeavesRadius": 22, + "maxLogAmount": 512, + "shouldFallOnMaxLogAmount": true, + "shouldIgnorePersistentLeaves": true + }, + "logFilter": { + "whitelistedTags": [ + "minecraft:logs" + ], + "whitelist": [ + "minecraft:mushroom_stem", + "beneath:wood/log/crimson", + "beneath:wood/stripped_log/crimson", + "beneath:wood/wood/crimson", + "beneath:wood/stripped_wood/crimson", + "beneath:wood/log/warped", + "beneath:wood/stripped_log/warped", + "beneath:wood/wood/warped", + "beneath:wood/stripped_wood/warped", + "ad_astra:aeronos_stem", + "ad_astra:strophar_stem" + ], + "blacklist": [] + }, + "leavesFilter": { + "whitelistedTags": [ + "minecraft:leaves" + ], + "whitelist": [ + "minecraft:red_mushroom_block", + "minecraft:brown_mushroom_block", + "minecraft:shroomlight", + "species:alphacene_mushroom_block", + "species:alphacene_mushroom_growth", + "minecraft:nether_wart_block", + "minecraft:warped_wart_block", + "beneath:wood/leaves/crimson", + "beneath:wood/leaves/warped", + "ad_astra:aeronos_cap", + "ad_astra:strophar_cap" + ], + "blacklist": [] + }, + "extraBlockFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:vine", + "minecraft:bee_nest", + "minecraft:cocoa" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [ + "minecraft:axes" + ], + "whitelist": [], + "blacklist": [] + } + }, + "verticalTree": { + "filter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:cactus", + "minecraft:bamboo" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [ + "minecraft:axes" + ], + "whitelist": [], + "blacklist": [] + } + }, + "chorusTree": { + "enabled": false, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "mushroomTree": { + "stemFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + }, + "capFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + } } - } } \ No newline at end of file diff --git a/kubejs/data/ad_astra/loot_tables/blocks/aeronos_cap.json b/kubejs/data/ad_astra/loot_tables/blocks/aeronos_cap.json new file mode 100644 index 000000000..3a21a4629 --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/aeronos_cap.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:aeronos_cap", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/aeronos", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/ad_astra/loot_tables/blocks/strophar_cap.json b/kubejs/data/ad_astra/loot_tables/blocks/strophar_cap.json new file mode 100644 index 000000000..93ca06cb2 --- /dev/null +++ b/kubejs/data/ad_astra/loot_tables/blocks/strophar_cap.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "ad_astra:strophar_cap", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/strophar", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/mushroom_stem.json b/kubejs/data/minecraft/loot_tables/blocks/mushroom_stem.json new file mode 100644 index 000000000..4abbd0479 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/mushroom_stem.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:mushroom_stem" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/nether_wart_block.json b/kubejs/data/minecraft/loot_tables/blocks/nether_wart_block.json new file mode 100644 index 000000000..926d59d8a --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/nether_wart_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:nether_wart_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/crimson", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/warped_wart_block.json b/kubejs/data/minecraft/loot_tables/blocks/warped_wart_block.json new file mode 100644 index 000000000..b4060a7ff --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/warped_wart_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:warped_wart_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/warped", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.013 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/species/loot_tables/blocks/alphacene_moss_block.json b/kubejs/data/species/loot_tables/blocks/alphacene_moss_block.json new file mode 100644 index 000000000..ea82c3b85 --- /dev/null +++ b/kubejs/data/species/loot_tables/blocks/alphacene_moss_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "species:alphacene_moss_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/glacian", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.004 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/species/loot_tables/blocks/alphacene_mushroom_block.json b/kubejs/data/species/loot_tables/blocks/alphacene_mushroom_block.json new file mode 100644 index 000000000..2ab6a1a31 --- /dev/null +++ b/kubejs/data/species/loot_tables/blocks/alphacene_mushroom_block.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "species:alphacene_mushroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:saplings/alphacene", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.02 + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 3afc79885..c724fef7d 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -131,6 +131,8 @@ const registerAdAstraItemTags = (event) => { // these are log tags event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') + event.add('minecraft:wart_blocks', 'ad_astra:aeronos_cap') + event.add('minecraft:wart_blocks', 'ad_astra:strophar_cap') event.add('tfc:makes_tannin', '#ad_astra:glacian_logs') event.add('tfc:makes_tannin', '#tfc:crimson_logs') diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a499bbd83..e384730ad 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -209,6 +209,12 @@ const registerGTCEURecipes = (event) => { .duration(300) .EUt(2) + event.recipes.gtceu.compressor('plant_ball_from_wart_blocks') + .itemInputs('4x #minecraft:wart_blocks') + .itemOutputs('gtceu:plant_ball') + .duration(300) + .EUt(2) + //#endregion //#region Выход: Биомасса @@ -285,6 +291,13 @@ const registerGTCEURecipes = (event) => { .duration(100) .EUt(3) + event.recipes.gtceu.brewery('biomass_from_wart_blocks') + .itemInputs('#minecraft:wart_blocks') + .inputFluids("#tfc:any_water 20") + .outputFluids(Fluid.of('gtceu:biomass', 50)) + .duration(100) + .EUt(3) + //#endregion //#region Выход: Рыбье масло diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index bb13dbd39..e0bf9a18a 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -94,6 +94,8 @@ const registerMinecraftItemTags = (event) => { event.add('create:blaze_burner_fuel/regular', 'minecraft:coal') event.add('create:blaze_burner_fuel/regular', 'minecraft:charcoal') + + event.add('minecraft:wart_blocks', 'minecraft:mushroom_stem') } const registerMinecraftBlockTags = (event) => { diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 16869de8f..84a2816c6 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -28,4 +28,6 @@ const registerSpeciesItemTags = (event) => { event.add('tfc:compost_greens', 'species:alphacene_mushroom_block') event.add('tfc:compost_greens_low', 'species:alphacene_mushroom_growth') event.add('tfc:compost_greens', 'species:alphacene_moss_block') + + event.add('minecraft:wart_blocks', 'species:alphacene_mushroom_block') }