diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a68649034..6775cccbd 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -366,6 +366,9 @@ "item.tfg.food.cooked_crawlermari": "Cooked Crawlermari", "item.tfg.food.raw_limpet": "Raw Limpet", "item.tfg.food.cooked_limpet": "Cooked Limpet", + "item.tfg.food.raw_moon_rabbit": "Raw Moon Rabbit", + "item.tfg.food.cooked_moon_rabbit": "Cooked Moon Rabbit", + "item.tfg.spawn_egg.moon_rabbit": "Moon Rabbit Spawn Egg", "item.tfg.food.freeze_dried.red_grapes": "Freeze Dried Red Grapes", "item.tfg.food.freeze_dried.white_grapes": "Freeze Dried White Grapes", "item.tfg.food.freeze_dried.glow_berries": "Freeze Dried Glow Berries", diff --git a/kubejs/data/tfg/loot_tables/entities/moon_rabbit.json b/kubejs/data/tfg/loot_tables/entities/moon_rabbit.json index 56fa7911d..ce4d6c020 100644 --- a/kubejs/data/tfg/loot_tables/entities/moon_rabbit.json +++ b/kubejs/data/tfg/loot_tables/entities/moon_rabbit.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "tfc:food/rabbit", + "name": "tfg:food/raw_moon_rabbit", "conditions": [ { "condition": "tfc:not_predated" diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 7c47a671f..54bcb47ae 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -123,10 +123,9 @@ const registerTFGFoodData = (event) => { food.hunger(6) food.saturation(4) food.decayModifier(4.5) - food.grain(0.5) - food.fruit(0.5) - food.vegetables(1) - food.protein(1) + food.grain(0.1) + food.vegetables(0.2) + food.protein(0.2) }) event.foodItem('tfg:food/meal_bag', food => { @@ -143,6 +142,19 @@ const registerTFGFoodData = (event) => { event.foodItem('tfg:sunflower_product', food => { food.decayModifier(0.5) }) + + event.foodItem('tfg:food/raw_moon_rabbit', food => { + food.hunger(4) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_moon_rabbit', food => { + food.hunger(6) + food.saturation(2.5) + food.protein(5) + food.decayModifier(2.25) + }) } const registerTFGFauna = (event) => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 1de8bba46..11ca21082 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -368,7 +368,7 @@ function registerTFGFoodRecipes(event) { global.FOOD_FRUIT.forEach(fruit => { processorRecipeText(`${fruit.name}/drying`, 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 7, - itemInputs: [fruit.id, '#tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: [fruit.id, 'tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: [`tfg:food/freeze_dried/${fruit.name}`], itemOutputProvider: TFC.isp.of(`tfg:food/freeze_dried/${fruit.name}`).copyOldestFood().removeTrait('firmalife:dried').addTrait('tfg:freeze_dried') }) @@ -380,7 +380,7 @@ function registerTFGFoodRecipes(event) { //1 Input processorRecipeText('meal_bag/1', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 10, - itemInputs: ['1x #tfg:foods/usable_in_meal_bag', '2x #tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: ['1x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], itemOutputProvider: TFC.isp.of('2x tfg:food/meal_bag').meal( (food => food.hunger(4).saturation(1.5).decayModifier(4.5)), [ @@ -391,7 +391,7 @@ function registerTFGFoodRecipes(event) { //2 Input processorRecipeText('meal_bag/2', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 11, - itemInputs: ['2x #tfg:foods/usable_in_meal_bag', '2x #tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: ['2x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], itemOutputProvider: TFC.isp.of('2x tfg:food/meal_bag').meal( (food => food.hunger(4).saturation(1.5).decayModifier(4.5)), [ @@ -402,7 +402,7 @@ function registerTFGFoodRecipes(event) { //3 Input processorRecipeText('meal_bag/3', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 12, - itemInputs: ['3x #tfg:foods/usable_in_meal_bag', '2x #tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: ['3x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], itemOutputProvider: TFC.isp.of('2x tfg:food/meal_bag').meal( (food => food.hunger(4).saturation(1.5).decayModifier(4.5)), [ @@ -413,7 +413,7 @@ function registerTFGFoodRecipes(event) { //4 Input processorRecipeText('meal_bag/4', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 13, - itemInputs: ['4x #tfg:foods/usable_in_meal_bag', '2x #tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: ['4x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], itemOutputProvider: TFC.isp.of('2x tfg:food/meal_bag').meal( (food => food.hunger(4).saturation(1.5).decayModifier(4.5)), [ @@ -424,7 +424,7 @@ function registerTFGFoodRecipes(event) { //5 Input processorRecipeText('meal_bag/5', 100, 120, "tfg.food_recipe.freeze_drying", { circuit: 14, - itemInputs: ['5x #tfg:foods/usable_in_meal_bag', '2x #tfg:foil_packs', 'tfg:dry_ice'], + itemInputs: ['5x #tfg:foods/usable_in_meal_bag', '2x tfg:foil_pack', 'tfg:dry_ice'], itemOutputs: ['2x tfg:food/meal_bag'], itemOutputProvider: TFC.isp.of('2x tfg:food/meal_bag').meal( (food => food.hunger(4).saturation(1.5).decayModifier(4.5)), [ @@ -507,7 +507,7 @@ function registerTFGFoodRecipes(event) { processorRecipeText('calorie_paste', 100, 512, "tfg.food_recipe.freeze_drying", { circuit: 8, - itemInputs: ['firmalife:food/soybean_paste', '#tfg:foil_packs', '2x gtceu:small_meat_dust', 'tfg:dry_ice'], + itemInputs: ['firmalife:food/soybean_paste', 'tfg:foil_pack', '2x gtceu:small_meat_dust', 'tfg:dry_ice'], itemOutputs: ['tfg:food/calorie_paste'], fluidInputs: [Fluid.of('gtceu:fermented_biomass', 40)], itemOutputProvider: TFC.isp.of('tfg:food/calorie_paste').copyOldestFood().addTrait('tfg:freeze_dried'), @@ -753,6 +753,9 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:sunflower_product', 200) .resultItem(TFC.isp.of('tfg:roasted_sunflower_seeds').copyFood()) + event.recipes.tfc.heating('tfg:food/raw_moon_rabbit', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_moon_rabbit').copyFood()) + //#endregion // Food processing machine recipes diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 26f15943c..ad116d24a 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -916,7 +916,8 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'tfg:food/raw_birt', output: 'tfg:food/cooked_birt', name: 'cooked_birt' }, { input: 'tfg:food/raw_crawlermari', output: 'tfg:food/cooked_crawlermari', name: 'cooked_crawlermari' }, { input: 'tfg:food/raw_limpet', output: 'tfg:food/cooked_limpet', name: 'cooked_limpet' }, - { input: 'tfg:sunflower_product', output: 'tfg:roasted_sunflower_seeds', name: 'roasted_sunflower_seeds' } + { input: 'tfg:sunflower_product', output: 'tfg:roasted_sunflower_seeds', name: 'roasted_sunflower_seeds' }, + { input: 'tfg:food/raw_moon_rabbit', output: 'tfg:food/cooked_moon_rabbit', name: 'cooked_moon_rabbit' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index 0f53c399d..0fafc8028 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -16,7 +16,8 @@ function registerTFGFoodItems(event) { event.create('tfg:food/raw_limpet') .translationKey('item.tfg.food.raw_limpet') - .food(food => food.hunger(2).saturation(1)) + .food(food => food.hunger(2).saturation(1) + .effect('minecraft:hunger', 100, 0, 1)) event.create('tfg:food/cooked_limpet') .translationKey('item.tfg.food.cooked_limpet') @@ -72,4 +73,19 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(2)) .tag('tfc:foods/grains') .tag('tfc:foods/usable_in_salad') + + event.create('tfg:food/cooked_moon_rabbit') + .translationKey('item.tfg.food.cooked_moon_rabbit') + .texture('tfg:item/food/cooked_moon_rabbit') + .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + event.create('tfg:food/raw_moon_rabbit') + .translationKey('item.tfg.food.raw_moon_rabbit') + .texture('tfg:item/food/raw_moon_rabbit') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') } \ No newline at end of file