From 6bc6af4641de8b2ca2ada89d8a288c79efae2100 Mon Sep 17 00:00:00 2001 From: Nebby_G Date: Mon, 20 Jan 2025 20:57:32 -0300 Subject: [PATCH] Comply with Initial Review --- kubejs/assets/gtceu/lang/en_us.json | 6 +- .../field_guide/en_us/categories/tfg.json | 6 -- .../en_us/entries/mechanics/papermaking.json | 7 +- .../field_guide/en_us/entries/test_entry.json | 11 --- .../field_guide/ru_ru/mechanics/bloomery.json | 80 ------------------- kubejs/server_scripts/tfg/recipes.js | 28 ++++++- 6 files changed, 31 insertions(+), 107 deletions(-) delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/test_entry.json delete mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/mechanics/bloomery.json diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index ad836a083..45a950aed 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -7,9 +7,9 @@ "item.gtceu.small_hardwood_dust": "Small Pile of Hardwood Pulp", "item.gtceu.hardwood_dust": "Hardwood Pulp", - "item.gtceu.tiny_thermochemically_treated_hardwood_dust": "Tiny Pile of Thermochemicall Treated Hardwood Pulp", - "item.gtceu.small_thermochemically_treated_hardwood_dust": "Small Pile of Thermochemicall Treated Hardwood Pulp", - "item.gtceu.thermochemically_treated_hardwood_dust": "Thermochemically Treated Hardwood Pulp", + "item.gtceu.tiny_thermochemically_treated_hardwood_dust": "Tiny Pile of Thermochemically Treated Hardwood Pulp", + "item.gtceu.small_thermochemically_treated_hardwood_dust": "Small Pile of Thermochemically Treated Hardwood Pulp", + "item.gtceu.thermochemically_treated_hardwood_dust": "Thermochemicallyy Treated Hardwood Pulp", "gtceu.jei.bedrock_fluid.tfc_salt_water_deposit": "Sea Water Deposit", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg.json deleted file mode 100644 index 551f335c2..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Changes in TFG", - "description": "Differences in TerraFirmaGreg that are different from base TFC.", - "icon": "gtceu:basic_electronic_circuit", - "sortnum": 200 -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/papermaking.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/papermaking.json index fd2fb32d6..b0b7f17e0 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/papermaking.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/papermaking.json @@ -5,7 +5,7 @@ "pages": [ { "type": "patchouli:text", - "text": "$(thing)Paper$() is either made from the processed stalk of the $(l:mechanics/crops#papyrus)Papyrus$() crop, from $(l:mechanics/papermaking#parchment)Animal Hides$(), or from a lengthy process using specific types of Wood. Paper is useful for written materials like $(thing)Books$() and $(thing)Maps$()." + "text": "$(thing)Paper$() is either made from the processed stalk of the $(l:mechanics/crops#papyrus)Papyrus$() crop, from $(l:mechanics/papermaking#parchment)Animal Hides$(), or $(l:mechanics/papermaking/paperfromwood)from a lengthy process using specific types of Wood$(). Paper is useful for written materials like $(thing)Books$() and $(thing)Maps$()." }, { "type": "patchouli:crafting", @@ -78,6 +78,7 @@ }, { "type": "patchouli:text", + "anchor": "paperfromwood", "text": "$(thing)Creating Paper from Wood$() is an ancient process that requires processing of sturdy types of wood into sheets, which are broken down into a pulp, and then pressed, dried and scraped to make paper.$(br2)Note that softer types of wood are not suitable for making paper", "title": "Paper from Wood" }, @@ -113,13 +114,13 @@ "type": "patchouli:crafting", "recipe": "gtceu:shaped/small_dust_assembling_hardwood", "title": "Piling up the Pulp", - "text": "While the quern gives you small piles of pulp, you'll want to combine them together in a $(thing)Workbench. $(bold)More sophisticated methods of crushing the strips yield higher amounts of pulp$()" + "text": "While the quern gives you small piles of pulp, you'll want to combine them together in a $(thing)Workbench$(). More sophisticated methods of crushing the strips yield higher amounts of pulp" }, { "type": "patchouli:spotlight", "item": "gtceu:thermochemically_treated_hardwood_dust", "title": "Breaking down the Pulp", - "text": "Before the pulp can be processed further into paper, it needs to be broken down further by $(l:firmalife/oven_appliances#vat)Boiling it with Lye in a Vat$(). At least 200 Milibuckets of Lye must be present in the vat for the process to complete." + "text": "Before the pulp can be processed further into paper, it needs to be broken down further by $(thing)Boiling it with Lye$() in a $(l:firmalife/oven_appliances#vat)Vat$() or a $(l:mechanics/pot)Pot$()." }, { "type": "patchouli:empty" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/test_entry.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/test_entry.json deleted file mode 100644 index 5a90e2893..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/test_entry.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Placeholder", - "icon": "firmaciv:canoe_paddle", - "category": "tfc:tfg", - "pages": [ - { - "type": "patchouli:text", - "text": "Let me know of any ideas for what can go in this section! I'm looking for things that people often ask questions about and need some help with" - } - ] -} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/mechanics/bloomery.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/mechanics/bloomery.json deleted file mode 100644 index f25be2c1a..000000000 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/mechanics/bloomery.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "name": "Доменная печь", - "category": "tfc:mechanics", - "icon": "tfc:bloomery", - "pages": [ - { - "type": "patchouli:text", - "text": "$(thing)Доменная печь$() используется для плавки $(thing)Железной руды$() в $(thing)Железные слитки$(), которые могут быть обработаны в $(thing)Кованое железо$(). Железные руды это $(l:the_world/ores_and_minerals#hematite)гематит$(), $(l:the_world/ores_and_minerals#limonite)лимонит$() и $(l:the_world/ores_and_minerals#magnetite)магнетит$(). Эти руды плавятся в $(thing)Чугун$(), а не в $(thing)Кованое железо$(). Все предметы, содержащие железо, плавятся в чугун. Чтобы превратить их в используемое железо, необходима доменная печь. Любой железный предмет может быть использован в доменной печи, включая железные инструменты и чугунные слитки!" - }, - { - "type": "patchouli:crafting", - "recipe": "tfc:crafting/bloomery", - "text": "Доменная печь сделана из 8 $(thing)Бронзовых двойных листов$()." - }, - { - "type": "patchouli:multiblock", - "multiblock_id": "tfc:bloomery", - "name": "Сыродутный горн", - "text": "Доменная печь минимального размера. Блок доменной печи открывается и закрывается с помощью $(item)$(k:key.use)$().", - "enable_visualize": true - }, - { - "type": "patchouli:text", - "text": "Сыродутный горн может содержать до 48 $(thing)входящих предметов$(), с 16 предметами каждого типа на слой трубы. Чтобы добавить слои к трубе, сложите два дополнительных слоя каменных блоков.$(br2)Чтобы добавить предметы в горн, поднимитесь наверх и бросьте предметы внутрь. Должна сформироваться башня из серой руды." - }, - { - "type": "patchouli:image", - "images": [ - "tfc:textures/gui/book/tutorial/bloomery_hole.png" - ], - "text": "Добавление предметов в сыродутный горн.", - "border": true - }, - { - "type": "patchouli:text", - "text": "Сыродутный горн потребляет $(thing)1 угля$() и $(thing)144 мБ чугуна$(), чтобы произвести одну $(thing)крица$(). После заполнения горна комбинацией $(thing)угля$() и $(thing)руды$(), зажгите блок горна и подождите 15 часов, пока руда плавится. Когда горн погаснет, он оставит блок $(thing)крицы$(). Он содержит $(thing)сырую железную крицу$(), которую можно добыть, дробя $(thing)крицу$() киркой." - }, - { - "type": "patchouli:multiblock", - "multiblock": { - "pattern": [ - [ - "X" - ], - [ - "0" - ] - ], - "mapping": { - "X": "tfc:bloom[layers=8]" - } - }, - "name": "Блок слитка", - "text": "Большая $(thing)крица$().", - "enable_visualize": false - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/refined_iron_bloom", - "text": "$(thing)Сырой железный слиток$() должен быть обработан на $(l:mechanics/anvils)наковальне$(), чтобы сделать $(thing)Очищенный железный слиток$()." - }, - { - "type": "tfc:anvil_recipe", - "recipe": "tfc:anvil/metal/ingot/wrought_iron", - "text": "$(thing)Очищенный железный слиток$() должен быть обработан на $(l:mechanics/anvils)наковальне$(), чтобы сделать $(thing)Кованые железные слитки$()." - }, - { - "type": "patchouli:text", - "text": "$(li)Если в сыродутном горне окажется больше предметов, чем он может вместить на основе своего дымохода, он попытается вытолкнуть их наружу.$()$(li)Чтобы забрать свои предметы из незажженного горна, не ломайте башню из расплавленных блоков. Сломайте блок сыродутного горна.$()$(li)Слитки будут плавиться только в чугун, а не в кованое железо. Их нужно обрабатывать!$()", - "title": "Заметки кузнеца" - } - ], - "read_by_default": true, - "extra_recipe_mappings": { - "tfc:bloom": 6, - "tfc:raw_iron_bloom": 7, - "tfc:refined_iron_bloom": 8 - } -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 62212eaa9..765c43999 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -1,7 +1,7 @@ const registerTFGRecipes = (event) => { - var registerVatRecipe = (id, inputItem, fluid, fluidAmount, output) => + var generateVatRecipe = (id, inputItem, fluid, fluidAmount, output) => { event.custom({ "type": "firmalife:vat", @@ -19,6 +19,23 @@ const registerTFGRecipes = (event) => } }).id(id) } + + var generatePotRecipe = (id, maxAmountOfInputItems, inputItem, inputFluid, inputFluidAmount, outputItem, ticks, temperature) => + { + for(let i = 0; i < maxAmountOfInputItems; i++) + { + var iPlusOne = i + 1 + let inputsArray = new Array(iPlusOne) + for(let j = 0; j < iPlusOne; j++) + { + inputsArray[j] = inputItem + } + + event.recipes.tfc.pot(inputsArray, Fluid.of(inputFluid, inputFluidAmount * iPlusOne), ticks, temperature) + .itemOutput(`${iPlusOne}x ${outputItem}`) + .id(`tfg:pot/${iPlusOne}x_${id}`) + } + } //remove chemical bath recipe event.remove({id: 'gtceu:chemical_bath/paper_from_wood_dust'}) event.remove({id: 'gtceu:chemical_bath/paper_from_wood_dust_distilled'}) @@ -87,9 +104,12 @@ const registerTFGRecipes = (event) => .id('tfg:quern/soaked_hardwood_strip') //Cook hardwood dust in lye - registerVatRecipe('tfg:vat/thermochemically_treat_hardwood_dust', 'gtceu:hardwood_dust', 'tfc:lye', 300, 'gtceu:thermochemically_treated_hardwood_dust') - registerVatRecipe('tfg:vat/thermochemically_treat_small_hardwood_dust', 'gtceu:small_hardwood_dust', 'tfc:lye', 75, 'gtceu:small_thermochemically_treated_hardwood_dust') - registerVatRecipe('tfg:vat/thermochemically_treat_tiny_hardwood_dust', 'gtceu:tiny_hardwood_dust', 'tfc:lye', 33, 'gtceu:tiny_thermochemically_treated_hardwood_dust') + generateVatRecipe('tfg:vat/thermochemically_treat_hardwood_dust', 'gtceu:hardwood_dust', 'tfc:lye', 300, 'gtceu:thermochemically_treated_hardwood_dust') + generateVatRecipe('tfg:vat/thermochemically_treat_small_hardwood_dust', 'gtceu:small_hardwood_dust', 'tfc:lye', 75, 'gtceu:small_thermochemically_treated_hardwood_dust') + generateVatRecipe('tfg:vat/thermochemically_treat_tiny_hardwood_dust', 'gtceu:tiny_hardwood_dust', 'tfc:lye', 33, 'gtceu:tiny_thermochemically_treated_hardwood_dust') + generatePotRecipe('thermochemically_treat_hardwood_dust', 3, 'gtceu:hardwood_dust', 'tfc:lye', 300, 'gtceu:thermochemically_treated_hardwood_dust', 600, 300) + generatePotRecipe('thermochemically_treat_small_hardwood_dust', 5, 'gtceu:small_hardwood_dust', 'tfc:lye', 75, 'gtceu:small_thermochemically_treated_hardwood_dust', 600, 300) + generatePotRecipe('thermochemically_treat_tiny_hardwood_dust', 5, 'gtceu:tiny_hardwood_dust', 'tfc:lye', 33, 'gtceu:tiny_thermochemically_treated_hardwood_dust', 600, 300) generateMixerRecipe(event, 'gtceu:hardwood_dust', Fluid.of('tfc:lye', 150), 'gtceu:thermochemically_treated_hardwood_dust', null, [], 150, 4, 64, 'tfg:mixer/mix_hardwood_dust_with_lye') generateMixerRecipe(event, 'gtceu:small_hardwood_dust', Fluid.of('tfc:lye', 37), 'gtceu:small_thermochemically_treated_hardwood_dust', null, [], 100, 3, 64, 'tfg:mixer/mix_small_hardwood_dust_with_lye') generateMixerRecipe(event, 'gtceu:tiny_hardwood_dust', Fluid.of('tfc:lye', 16), 'gtceu:tiny_thermochemically_treated_hardwood_dust', null, [], 50, 2, 64, 'tfg:mixer/mix_tiny_hardwood_dust_with_lye')