Feature: Papermaking Overhaul with Wood

kubejs/assets/gtceu/lang/en_us.json

@@ -1,4 +1,16 @@
 {
+    "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp",
+    "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp",
+    "item.gtceu.wood_dust": "Softwood Pulp",
+
+    "item.gtceu.tiny_hardwood_dust": "Tiny Pile of Hardwood Pulp",
+    "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",
+
     "gtceu.jei.bedrock_fluid.tfc_salt_water_deposit": "Sea Water Deposit",
 
     "block.gtceu.greenhouse": "Electric Greenhouse",

kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg.json

@@ -0,0 +1,6 @@
+{
+    "name": "Changes in TFG",
+    "description": "Differences in TerraFirmaGreg that are different from base TFC.",
+    "icon": "gtceu:basic_electronic_circuit",
+	"sortnum": 200
+}

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/papermaking.json

@@ -0,0 +1,156 @@
+{
+    "name": "Papermaking",
+    "category": "tfc:mechanics",
+    "icon": "tfc:unrefined_paper",
+    "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$()."
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "tfc:crafting/papyrus_strips",
+        "text": "Papyrus must first be cut into strips with a $(thing)Knife$()"
+      },
+      {
+        "type": "tfc:sealed_barrel_recipe",
+        "recipe": "tfc:barrel/soaked_papyrus_strip",
+        "text": "Then, papyrus strips are soaked in a $(l:mechanics/barrels)Barrel$() of $(thing)Water$()."
+      },
+      {
+        "type": "tfc:loom_recipe",
+        "recipe": "tfc:loom/unrefined_paper",
+        "text": "Then, soaked papyrus strips are woven together in a loom to make $(thing)Unrefined Paper$(). Finally, it must be placed on a log and $(l:mechanics/leather_making#scraping)Scraped$() to make $(thing)Paper$()."
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "tfc:crafting/vanilla/map",
+        "recipe2": "tfc:crafting/vanilla/name_tag"
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "minecraft:writable_book",
+        "recipe2": "minecraft:book"
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "tfc:crafting/wood/pine_lectern",
+        "recipe2": "tfc:crafting/wood/kapok_bookshelf"
+      },
+      {
+        "type": "patchouli:text",
+        "text": "Flip to the next page for information on papermaking via the parchment process."
+      },
+      {
+        "type": "patchouli:text",
+        "anchor": "parchment",
+        "text": "$(thing)Parchment Paper$() starts with a scraped hide. Review the $(l:mechanics/leather_making)leather making chapter$() to learn how to make it. Parchment requires treatment with a few different items. First, $(thing)Pumice$() is needed. Pumice is found on the ground near $(l:the_world/geology)Volcanoes$(), or from $(l:mechanics/sluices)Sluicing$() or $(l:mechanics/panning)Panning$() ore deposits with Andesite, Rhyolite, or Dacite in them.",
+        "title": "Parchment"
+      },
+      {
+        "type": "patchouli:multiblock",
+        "multiblock": {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "tfc:groundcover/pumice"
+          }
+        },
+        "name": "Pumice",
+        "text": "A Pumice rock placed on the ground.",
+        "enable_visualize": false
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "tfc:crafting/large_treated_hide",
+        "text": "Crafting pumice, a hammer, and scraped hide gives sections of $(thing)Treated Hide$()."
+      },
+      {
+        "type": "patchouli:crafting",
+        "recipe": "tfc:crafting/parchment",
+        "text": "Treated hide, $(l:mechanics/glassworking#lime)lime powder$(), flour, and a fresh egg will complete the treatment process and yield usable paper."
+      },
+      {
+        "type": "patchouli:text",
+        "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"
+      },
+      {
+        "type": "patchouli:text",
+        "text": "First you need to find Hardwood:$(br2)Acacia$(br)Ash$(br)Aspen$(br)Birch$(br)Blackwood$(br)Chestnut$(br)Hickory$(br)Maple$(br)Oak$(br)Rosewood$(br)Sycamore"
+      },
+      {
+        "type": "patchouli:spotlight",
+        "title": "Stripped Hardwood",
+        "item": {"tag": "tfg:stripped_hardwood"},
+        "text": "The process begins by stripping the $(thing)Hardwood$()'s bark off to expose the internal fibers of the log, You can strip the log by placing it down and right clicking it with an axe"
+      },
+      {
+        "type": "patchouli:crafting",
+        "title": "Hardwood Strip",
+        "recipe": "tfg:crafting/strip_hardwood",
+        "text": "Next, the stripped wood is shaven with an axe to obtain $(item)Hardwood Strips$(). This can be done using an Axe or more sophisticated methods"
+      },
+      {
+        "type": "tfc:sealed_barrel_recipe",
+        "title": "Soaked Hardwood Strip",
+        "recipe": "tfg:barrel/soak_hardwood_strip",
+        "text": "Then, the individual strips are soaked in a $(l:mechanics/barrels)Barrel$() of $(thing)Water$(). This $(thing)debilitates the structural integrity$() of the $(thing)wood$() so it can be $(thing)broken down further$()"
+      },
+      {
+        "type": "tfc:quern_recipe",
+        "recipe": "tfg:quern/soaked_hardwood_strip",
+        "title": "Hardwood Pulp",
+        "text": "Afterwards, utilize the $(l:mechanics/quern)Quern$() to break down the soaked strips into $(item)Hardwood Pulp$()"
+      },
+      {
+        "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$()"
+      },
+      {
+        "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."
+      },
+      {
+        "type": "patchouli:empty"
+      },
+      {
+        "type": "patchouli:spotlight",
+        "item": "tfg:soaked_unrefined_paper",
+        "title": "Pressing the Pulp",
+        "text": "After broken down by boiling it with Lye, the $(item)Thermochemically Treated Hardwood Pulp$() can be pressed down into a sheet of $(item)Soaked Unrefined Paper$()"
+      },
+      {
+        "type": "tfc:anvil_recipe",
+        "recipe": "tfg:anvil/soaked_unrefined_paper",
+        "text": "You can utilize an $(l:mechanics/anvils)Anvil$() to beat down the pulp into a sheet"
+      },
+      {
+        "type": "patchouli:spotlight",
+        "title": "Stomping in Barrel",
+        "item": {"tag": "firmalife:stomping_barrels"},
+        "text": "Alternatively, you can stomp the Thermochemically Treated Hardwood Pulp in a $(l:firmalife/wine)Stomping Barrel$()"
+      },
+      {
+        "type": "tfc:drying_recipe",
+        "recipe": "tfg:drying/unrefined_paper",
+        "text": "The final step is $(l:firmalife/drying)Drying$() the $(item)Soaked Unrefined Paper$() into $(item)Unrefined Paper$(), Which then can be Scraped into $(item)Paper$() as shown before."
+      },
+      {
+        "type": "patchouli:text",
+        "title": "Cutting Steps...?",
+        "text": "Advancing in the Tech-Tree will allow you to create paper from wood with less overall steps, check $(thing)EMI$() for the different approaches you can take for making paper with wood."
+      }
+    ],
+    "read_by_default": true
+  }

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/test_entry.json

@@ -0,0 +1,11 @@
+{
+    "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"
+        }
+    ]
+}

kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/mechanics/bloomery.json

@@ -0,0 +1,80 @@
+{
+  "__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
+  }
+}

kubejs/assets/tfg/lang/en_us.json

@@ -1,6 +1,12 @@
 {
     "material.tfg.latex": "Latex",
     "material.tfg.fluix": "Fluix",
+
+    "material.gtceu.thermochemically_treated_hardwood": "Thermochemically Treated Hardwood",
+    "material.gtceu.hardwood": "Hardwood",
+    "item.tfg.hardwood_strip": "Hardwood Strip",
+    "item.tfg.soaked_hardwood_strip": "Soaked Hardwood Strip",
+
     "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",
 
     "quests.naming-1": "t - Title",

kubejs/server_scripts/gregtech/recipes.js

@@ -2,12 +2,11 @@
 
 const registerGTCEURecipes = (event) => {
     //#region Выход: Удобрение
-
     // В обычном миксере
     event.recipes.gtceu.mixer('fertilizer')             
         .itemInputs(
             '#tfc:dirt',
-            '2x #forge:dusts/wood',
+            '2x #tfg:wood_dusts',
             '4x #forge:sand'
         )
         .circuit(1)
@@ -20,7 +19,7 @@ const registerGTCEURecipes = (event) => {
     event.recipes.gtceu.create_mixer('fertilizer')             
         .itemInputs(
             '#tfc:dirt',
-            '2x #forge:dusts/wood',
+            '2x #tfg:wood_dusts',
             '4x #forge:sand'
         )
         .circuit(1)

kubejs/server_scripts/main_server_script.js

@@ -26,6 +26,7 @@ ServerEvents.tags('item', event => {
     registerSophisticatedBackpacksItemTags(event)
     registerTFCAmbientalItemTags(event)
     registerTFCItemTags(event)
+    registerTFGItemTags(event)
 })
 
 /**
@@ -140,6 +141,7 @@ ServerEvents.recipes(event => {
     registerSophisticatedBackpacksRecipes(event)
     registerTfceaRecipes(event)
     registerTFCRecipes(event)
+    registerTFGRecipes(event)
     registerTFCGroomingStationRecipes(event)
     registerToolBeltRecipes(event)
     registerTreeTapRecipes(event)

kubejs/server_scripts/tfc/recipes.js

@@ -2460,7 +2460,7 @@ const registerTFCRecipes = (event) => {
         event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` })
 
         // Бревна -> Пиломатериалы
-        generateCutterRecipe(event, `#tfc:${wood}_logs`, null, `16x tfc:wood/lumber/${wood}`, 400, 10, `${wood}_lumber_from_log`)
+        generateCutterRecipe(event, `#tfc:${wood}_logs`, 1, `16x tfc:wood/lumber/${wood}`, 400, 10, `${wood}_lumber_from_log`)
 
         // Доски -> Пиломатериалы
         generateCutterRecipe(event, `tfc:wood/planks/${wood}`, null, `4x tfc:wood/lumber/${wood}`, 400, 10, `${wood}_lumber_from_planks`)
@@ -3579,6 +3579,15 @@ const registerTFCRecipes = (event) => {
         .duration(20)
         .EUt(7)
     }
-
     //#endregion
+
+    //More accesible solar drier
+    event.replaceInput({id: 'firmalife:crafting/solar_drier'}, 'gtceu:stainless_steel_rod', 'gtceu:silver_rod')
+
+    //Wood ash
+    event.blasting('tfc:powder/wood_ash', 'tfc:powder/charcoal')
+        .id('blast_charcoal_powder')
+
+    //Lye in mixer
+    generateMixerRecipe(event, 'tfc:powder/wood_ash', Fluid.of('minecraft:water', 200), [], null, Fluid.of('tfc:lye', 200), 100, 2, 64, 'lye_in_mixer')
 }

kubejs/server_scripts/tfc/tags.js

@@ -86,6 +86,20 @@ const registerTFCItemTags = (event) => {
         event.add('tfg:bladed_axles', `tfc:wood/bladed_axle/${woodType}`)
     })
 
+    //Hardwood Tags
+    global.TFC_HARDWOOD_TYPES.forEach(woodType => {
+        event.add('tfg:hardwood', `#tfc:${woodType}_logs`)
+        event.add('tfg:stripped_hardwood', `tfc:wood/stripped_log/${woodType}`)
+        event.add('tfg:stripped_hardwood', `tfc:wood/stripped_wood/${woodType}`)
+    });
+
+    //Softwood Tags
+    global.TFC_SOFTWOOD_TYPES.forEach(woodType =>{
+        event.add('tfg:softwood', `#tfc:${woodType}_logs`)
+        event.add('tfg:stripped_softwood', `tfc:wood/stripped_log/${woodType}`)
+        event.add('tfg:stripped_softwood', `tfc:wood/stripped_wood/${woodType}`)
+    })
+
     // Теги для сосудов по цветам
     global.MINECRAFT_DYE_NAMES.forEach(dye => {
         event.add('tfg:colorized_unfired_vessels', `tfc:ceramic/${dye}_unfired_vessel`)