diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index 9ea5bed0e..04fc3e666 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -30,10 +30,14 @@ const registerBeneathItemTags = (event) => { event.add('tfg:softwood', 'beneath:wood/log/crimson') event.add('tfg:softwood', 'beneath:wood/wood/crimson') + event.add('tfg:softwood', 'beneath:wood/stripped_log/crimson') + event.add('tfg:softwood', 'beneath:wood/stripped_wood/crimson') event.add('tfg:stripped_softwood', 'beneath:wood/stripped_log/crimson') event.add('tfg:stripped_softwood', 'beneath:wood/stripped_wood/crimson') event.add('tfg:hardwood', 'beneath:wood/log/warped') event.add('tfg:hardwood', 'beneath:wood/wood/warped') + event.add('tfg:hardwood', 'beneath:wood/stripped_log/warped') + event.add('tfg:hardwood', 'beneath:wood/stripped_wood/warped') event.add('tfg:stripped_hardwood', 'beneath:wood/stripped_log/warped') event.add('tfg:stripped_hardwood', 'beneath:wood/stripped_wood/warped') diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index e4d2a6778..07c37d491 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -109,6 +109,11 @@ function registerTFGMarsItemTags(event) { event.add('tfg:charnia', 'betterend:charnia_red') event.add('tfg:mars_plants', 'minecraft:weeping_vines') + event.add('tfg:mars_plants', 'minecraft:pitcher_plant') + event.add('tfg:mars_plants', 'minecraft:torchflower') + + event.add('tfc:makes_cyan_dye', 'minecraft:pitcher_plant') + event.add('tfc:makes_orange_dye', 'minecraft:torchflower') event.add('tfc:compost_greens_low', 'beneath:wood/leaves/crimson') event.add('tfc:compost_greens_low', 'beneath:wood/leaves/warped') @@ -284,11 +289,13 @@ function registerTFGMarsBlockTags(event) { event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_farmland') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_path') - - event.remove('ad_astra:destroyed_in_space', 'minecraft:pitcher_plant') - event.remove('ad_astra:destroyed_in_space', 'minecraft:torchflower') - event.remove('ad_astra:destroyed_in_space', 'tfg:blossom_berry') - event.remove('ad_astra:destroyed_in_space', 'tfg:blossom_berry_wild') + event.add('tfg:do_not_destroy_in_space', 'minecraft:pitcher_plant') + event.add('tfg:do_not_destroy_in_space', 'minecraft:torchflower') + + event.remove('minecraft:tall_flowers', 'minecraft:pitcher_plant') + event.remove('minecraft:small_flowers', 'minecraft:torchflower') + event.remove('minecraft:flowers', 'minecraft:pitcher_plant') + event.remove('minecraft:flowers', 'minecraft:torchflower') event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') event.add('tfc:can_landslide', 'tfg:grass/mars_clay_dirt') diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 64cbd334d..700f6610d 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -139,8 +139,6 @@ const registerTFGCrops = (event) => { .stages(3) .hardness(0.4) .tagBlock('minecraft:mineable/hoe') - .tagBlock('minecraft:flowers') - .tagBlock('tfg:do_not_destroy_in_space') .productItem(product => { product.food(food => { food.hunger(5) @@ -163,8 +161,6 @@ const registerTFGCrops = (event) => { .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') .tagBlock('tfc:can_be_snow_piled') - .tagBlock('minecraft:flowers') - .tagBlock('tfg:do_not_destroy_in_space') .tagItem('c:hidden_from_recipe_viewers')