From f773171b7e0609d5f3d7327cc6a405fbc3318bb0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 22 Sep 2025 20:08:42 +0100 Subject: [PATCH] eater meat and reinforced shield --- kubejs/assets/tfg/lang/en_us.json | 3 -- .../assets/wan_ancient_beasts/lang/en_us.json | 5 ++- .../wan_ancient_beasts/recipes.js | 36 +++++++++++++++++++ .../server_scripts/wan_ancient_beasts/tags.js | 6 ++++ kubejs/startup_scripts/tfc/constants.js | 1 + .../wan_ancient_beasts/constants.js | 5 ++- 6 files changed, 49 insertions(+), 7 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3358bab78..0efef4fa0 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3008,9 +3008,6 @@ "quests.steam_age.fuel_sources.title": "More Fuel Sources", "quests.steam_age.fuel_sources.subtitle": "Putting the power in steam power", "quests.steam_age.fuel_sources.desc": "The steam engine can accept more liquid fuels than the High Pressure Liquid Boiler. While Creosote or Lava are the easiest to set up at this point, you might also be interested in various plant-based oils like &eSeed Oil&r from Sunflowers or Canola.\n\nCreosote and Lava also don't scale very well once you get into further tiers, while Biofuel can be upgraded into Diesel and then Cetane-Boosted Diesel, so start setting up a big field for plant oils now if that sounds appealing to you!", - "quests.steam_age.straw.title": "Liquid Fuel Values", - "quests.steam_age.straw.subtitle": "Because the mod is missing a JEI tab", - "quests.steam_age.straw.desc": "Piping liquid fuels will give you roughly the same amount of power as if you used a GregTech steam turbine or combustion generator, but here's the exact numbers since it's not visible in JEI:\n\n- Steam: 128mB per tick\n- Creosote: 25mB per 88 ticks\n- Lava: 1mB per 20 ticks\n\n- Biomass: 5mB per 70 ticks\n- Seed, Soybean, Olive, and Fish Oil: 25mB per 88 ticks\n\n- Heavy Fuel: 2mB per 210 ticks\n- Sulfuric Heavy Fuel: 5mB per 80 ticks\n- Oil: 32mB per 90 ticks\n- Heavy Oil: 5mB per 88 ticks", "quests.steam_age.deployers.title": "Deployers", "quests.steam_age.deployers.subtitle": "Primitive Assembly Line", "quests.steam_age.deployers.desc": "While you could use a single deployer for the rest your time in this chapter, we &3really&r don't recommend it. Setting up a line of deployers along a belt will save heaps of time and sanity, and it's not like you'll be wasting materials either, because you can always reuse them to upgrade your tree farm later.\n\nThese will also make electron tubes significantly cheaper!", diff --git a/kubejs/assets/wan_ancient_beasts/lang/en_us.json b/kubejs/assets/wan_ancient_beasts/lang/en_us.json index cf9439081..0c8c38a9e 100644 --- a/kubejs/assets/wan_ancient_beasts/lang/en_us.json +++ b/kubejs/assets/wan_ancient_beasts/lang/en_us.json @@ -1,4 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.wan_ancient_beasts.quick_red_sand": "Hematitic Quicksand" + "block.wan_ancient_beasts.quick_red_sand": "Hematitic Quicksand", + "item.wan_ancient_beasts.toxlacanth": "Raw Toxlacanth", + "item.wan_ancient_beasts.raw_ancient_meat": "Raw Eater Drumstick", + "item.wan_ancient_beasts.cooked_ancient_meat": "Cooked Eater Drumstick" } \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/recipes.js b/kubejs/server_scripts/wan_ancient_beasts/recipes.js index 143097b65..0f40088b8 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/recipes.js +++ b/kubejs/server_scripts/wan_ancient_beasts/recipes.js @@ -28,6 +28,9 @@ const registerWABRecipes = (event) => { event.recipes.tfc.heating('wan_ancient_beasts:toxlacanth', 200) .resultItem(TFC.isp.of('wan_ancient_beasts:cooked_toxlacanth').copyFood()) + + event.recipes.tfc.heating('wan_ancient_beasts:raw_ancient_meat', 200) + .resultItem(TFC.isp.of('wan_ancient_beasts:cooked_ancient_meat').copyFood()) event.recipes.gtceu.macerator('wan_ancient_beasts:skull_crush') .itemInputs('#wan_ancient_beasts:ancient_skull') @@ -47,6 +50,26 @@ const registerWABRecipes = (event) => { .duration(20) .circuit(4) .EUt(GTValues.VA[GTValues.ULV]) + + event.shaped('wan_ancient_beasts:reinforced_shield', [ + 'BAB', + 'ACA', + 'BAB' + ], { + A: '#forge:plates/bismuth_bronze', + B: 'wan_ancient_beasts:crusher_spike', + C: 'wan_ancient_beasts:eater_tooth' + }).id('tfg:shaped/reinforced_shield') + + event.shaped('wan_ancient_beasts:reinforced_shield', [ + 'BAB', + ' C ', + 'B B' + ], { + A: 'wan_ancient_beasts:eater_tooth', + B: 'wan_ancient_beasts:crusher_spike', + C: 'tfc:metal/shield/bismuth_bronze' + }).id('tfg:shaped/reinforced_shield_from_shield') } const registerWABFoodData = (event) => { @@ -64,4 +87,17 @@ const registerWABFoodData = (event) => { food.decayModifier(2.25) }) + // Eater meat + event.foodItem('wan_ancient_beasts:raw_ancient_meat', food => { + food.hunger(2) + food.protein(2) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_ancient_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(2.25) + }) } \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js index f45d37943..edec34ebb 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/tags.js +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -30,6 +30,12 @@ const registerWABItemTags = (event) => { event.add('firmalife:foods/cooked_fish', 'wan_ancient_beasts:cooked_toxlacanth') event.add('tfc:food/meats', 'wan_ancient_beasts:cooked_toxlacanth') + // Eater meat + event.add('tfc:foods/raw_meats', 'wan_ancient_beasts:raw_ancient_meat') + event.add('tfc:foods/meats', 'wan_ancient_beasts:raw_ancient_meat') + event.add('tfc:foods/cooked_meats', 'wan_ancient_beasts:cooked_ancient_meat') + event.add('tfc:foods/meats', 'wan_ancient_beasts:cooked_ancient_meat') + event.add('wan_ancient_beasts:surfer_food', '#firmalife:foods/raw_fish') event.add('wan_ancient_beasts:eater_food', '#tfg:martian_animal_foods') } diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index b2fc167e9..e0f6cece6 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -923,6 +923,7 @@ global.TFC_MEAT_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "tfg:food/raw_whole_soarer", output: "tfg:food/cooked_whole_soarer", name: "cooked_whole_soarer" }, { input: "tfg:food/raw_crusher_meat", output: "tfg:food/cooked_crusher_meat", name: "cooked_crusher_meat" }, { input: "tfg:food/raw_goober_meat", output: "tfg:food/cooked_goober_meat", name: "cooked_goober_meat" }, + { input: "wan_ancient_beasts:raw_ancient_meat", output: "wan_ancient_beasts:cooked_ancient_meat", name: "cooked_eater_meat" } ]); global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = /** @type {const} */ ([ diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js index 01cc0c9ee..6b17263f5 100644 --- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -26,7 +26,6 @@ global.WAB_DISABLED_ITEMS = [ 'wan_ancient_beasts:ancient_club', //'wan_ancient_beasts:crusher_spike', 'wan_ancient_beasts:ancient_upgrade_smithing_template', - 'wan_ancient_beasts:reinforced_shield', //'wan_ancient_beasts:glider_feather', 'wan_ancient_beasts:hang_glider', //'wan_ancient_beasts:surfer_armor', @@ -37,8 +36,8 @@ global.WAB_DISABLED_ITEMS = [ 'wan_ancient_beasts:soarer_egg', 'wan_ancient_beasts:surfer_egg', 'wan_ancient_beasts:frozen_ancient_meat', - 'wan_ancient_beasts:raw_ancient_meat', - 'wan_ancient_beasts:cooked_ancient_meat', + //'wan_ancient_beasts:raw_ancient_meat', + //'wan_ancient_beasts:cooked_ancient_meat', //'wan_ancient_beasts:sniff_armor_trim_smithing_template', //'wan_ancient_beasts:spike_armor_trim_smithing_template', 'wan_ancient_beasts:jaw_pottery_sherd',