diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index e17810375..d1551b0f9 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -136,6 +136,7 @@ ServerEvents.highPriorityData(event => { * Срабатывает до инициализации рецептов, но после тегов. */ TFCEvents.data(event => { + registerTFCDataForAdAstra(event); registerTFCDataForArborFirmaCraft(event) registerTFCDataForChalk(event); registerTFCDataForGTCEU(event) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 6363b026b..176298a32 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -29,11 +29,13 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:foods', 'minecraft:brown_mushroom') event.add('tfc:foods', 'minecraft:glow_berries') event.add('tfc:foods', 'minecraft:chorus_fruit') + event.add('tfc:foods', 'minecraft:popped_chorus_fruit') event.add('tfc:foods/vegetables', 'minecraft:red_mushroom') event.add('tfc:foods/vegetables', 'minecraft:brown_mushroom') event.add('tfc:foods/fruits', 'minecraft:glow_berries') event.add('tfc:foods/fruits', 'minecraft:chorus_fruit') + event.add('tfc:foods/fruits', 'minecraft:popped_chorus_fruit') event.add('beneath:usable_in_juicer', 'minecraft:glow_berries') event.add('beneath:usable_in_juicer', 'minecraft:chorus_fruit') @@ -44,11 +46,13 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:foods/usable_in_soup', 'minecraft:brown_mushroom') event.add('tfc:foods/usable_in_soup', 'minecraft:glow_berries') event.add('tfc:foods/usable_in_soup', 'minecraft:chorus_fruit') + event.add('tfc:foods/usable_in_soup', 'minecraft:popped_chorus_fruit') event.add('tfc:foods/usable_in_salad', 'minecraft:red_mushroom') event.add('tfc:foods/usable_in_salad', 'minecraft:brown_mushroom') event.add('tfc:foods/usable_in_salad', 'minecraft:glow_berries') event.add('tfc:foods/usable_in_salad', 'minecraft:chorus_fruit') + event.add('tfc:foods/usable_in_salad', 'minecraft:popped_chorus_fruit') event.add('tfc:rock/raw', 'minecraft:deepslate') event.add('tfc:rock/raw', 'minecraft:blackstone') diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index a363a9d44..227a3fe7b 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -251,10 +251,15 @@ const registerTFCFoodData = (event) => { event.foodItem('minecraft:chorus_fruit', food => { food.hunger(1.5) - food.fruit(1) + food.fruit(2) food.water(5) }) + event.foodItem('minecraft:popped_chorus_fruit', food => { + food.hunger(2) + food.fruit(3) + food.decayModifier(0.5) + }) event.foodItem('minecraft:red_mushroom', food => { food.hunger(1.5) diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 30f9910aa..70415afb0 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -279,10 +279,9 @@ const registerTFGBlockTags = (event) => { // #region Space blocks (TODO: undo these when merging space into dev!) - event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_roots') - event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_sprouts') - event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_plant') - event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_flower') + event.add('tfc:plants', 'tfg:lunar_roots') + event.add('tfc:plants', 'tfg:lunar_sprouts') + event.add('tfc:plants', 'tfg:lunar_chorus_flower') // #endregion } diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 8757518ca..514ed3530 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -617,7 +617,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:honey_bottle', 'minecraft:honeycomb_block', 'minecraft:honey_block', - 'minecraft:popped_chorus_fruit', 'minecraft:purpur_pillar', 'minecraft:purpur_block', 'minecraft:purpur_stairs',