From 4b4571f17b7acd326cef03064fd0468ade9e7a16 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 25 Apr 2024 19:26:25 +0700 Subject: [PATCH] fixes --- config/framedblocks-common.toml | 2 +- config/ftbquests/quests/chapters/create.snbt | 23 +++++++ .../quests/chapters/multiblock_dilemma.snbt | 19 ------ .../quests/chapters/primitive_age.snbt | 66 +++++-------------- kubejs/server_scripts/create/recipes.js | 16 +++-- kubejs/server_scripts/gregtech/recipes.js | 7 ++ 6 files changed, 58 insertions(+), 75 deletions(-) diff --git a/config/framedblocks-common.toml b/config/framedblocks-common.toml index f4eab6467..67f5860e0 100644 --- a/config/framedblocks-common.toml +++ b/config/framedblocks-common.toml @@ -1,5 +1,5 @@ [general] #If true, framed blocks are completely fire proof - fireproofBlocks = false + fireproofBlocks = true diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt index 97e10f5c0..0f9432b21 100644 --- a/config/ftbquests/quests/chapters/create.snbt +++ b/config/ftbquests/quests/chapters/create.snbt @@ -550,6 +550,29 @@ x: -6.5d y: 3.5d } + { + dependencies: ["222A4146EF7750E9"] + id: "7B2FADEB296E0820" + tasks: [ + { + id: "6377207F842B2A29" + item: "create:fluid_tank" + type: "item" + } + { + id: "0AD5909D5F6155A1" + item: "create:mechanical_pump" + type: "item" + } + { + id: "3817EE20AC8D41D7" + item: "create:fluid_pipe" + type: "item" + } + ] + x: 0.0d + y: 2.0d + } ] title: "Mechanical Age" } diff --git a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt index 384fb4eb7..5f6d63bbe 100644 --- a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt +++ b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt @@ -209,19 +209,6 @@ x: 1.5d y: 6.0d } - { - id: "20FEF24F801577EF" - linked_quest: "2DAC91AF2EBB68E2" - x: 4.5d - y: 6.0d - } - { - id: "5926D9421E5D2E5D" - linked_quest: "4194EC9F1C6632E4" - shape: "rsquare" - x: 6.0d - y: 6.0d - } { id: "1D2DEC9BC14B9F64" linked_quest: "546CC03435E763CF" @@ -240,12 +227,6 @@ x: 10.5d y: 6.0d } - { - id: "7DF7C035D303B90A" - linked_quest: "1D623D93EEDD3C67" - x: 3.0d - y: 6.0d - } ] quests: [ ] subtitle: ["A handy reference of all the multiblocks"] diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 4689753ae..fe4acd0b7 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -2363,54 +2363,8 @@ item: "gtceu:treated_wood_planks" type: "item" }] - x: 30.5d - y: 11.0d - } - { - dependencies: ["41DBE0B47E760DC4"] - description: [ - "The &bPrimitive Water Pump&r is an easy way to automatically generate water for your boilers. It doesn't physically pump water from the world, instead generating it &einternally&r. Therefore, you don't need access to a &3body of water&r to make use of it. However, the humidity of the biome does apply a negligible bonus to its water production." - "" - "It's a multiblock, so &5consult JEI&r for the structure. Multiblocks can be previewed in-world if you sneak right-click the \"&a&ocontroller&r\" block with an empty hand (in this case, the controller block is the &bPrimitive Water Pump&r itself)." - "" - "&6Small tip for you:&r no need to worry about your base's biome for now, as your boilers will need very little water to keep up." - "{@pagebreak}" - "The &cOutput Hatch&r is where water will be generated. You can make it face up or down to auto-output water into your pipes. When you reach &7LV&r or &bMV&r, you can use an Output Hatch from either tier to further boost the Pump's output." - "" - "&2Reminder:&r Use a Wrench to rotate GregTech blocks (sneak right-click)." - "" - "&l&3Lore:&r&o This Multiblock was ported from GT IMPACT, a classic 1.7.10 GregTech modpack." - ] - id: "1D623D93EEDD3C67" - size: 2.0d - subtitle: "There's no such thing as \"free\" water" - tasks: [ - { - id: "24CCB2BF08C5400A" - item: "gtceu:primitive_pump" - type: "item" - } - { - id: "1EC1919EF0D22F00" - item: "gtceu:pump_hatch" - type: "item" - } - { - count: 10L - id: "4AA6B1931455F656" - item: "gtceu:pump_deck" - type: "item" - } - { - count: 10L - id: "31D4CB90405080DF" - item: "gtceu:treated_wood_frame" - type: "item" - } - ] - title: "Primitive Water Pump" - x: 32.5d - y: 11.0d + x: 28.5d + y: 12.5d } { dependencies: ["4504EBE720145441"] @@ -5120,7 +5074,10 @@ y: 22.0d } { - dependencies: ["2E3F6613C490E9AD"] + dependencies: [ + "2E3F6613C490E9AD" + "09BA130BE1805E05" + ] icon: "create:large_cogwheel" id: "222A4146EF7750E9" shape: "gear" @@ -5162,6 +5119,17 @@ x: 20.5d y: 11.0d } + { + dependencies: ["41DBE0B47E760DC4"] + id: "09BA130BE1805E05" + tasks: [{ + id: "384F4B56E4992764" + item: "gtceu:treated_wood_plate" + type: "item" + }] + x: 20.5d + y: 12.5d + } ] title: "Primitive Age" } diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 61169d4e0..3951d9592 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -143,10 +143,14 @@ const registerCreateRecipes = (event) => { .EUt(2) // Малая шестерня - event.shapeless('create:cogwheel', [ - 'create:shaft', - '#forge:gears/wood' - ]).id('tfg:create/shapeless/cogwheel') + event.shaped('create:cogwheel', [ + ' A ', + 'ABA', + ' A ' + ], { + A: 'gtceu:treated_wood_plate', + B: 'create:shaft' + }).id('tfg:create/shapeless/cogwheel') // Большая шестерня event.shaped('create:large_cogwheel', [ @@ -154,8 +158,8 @@ const registerCreateRecipes = (event) => { 'ABA', ' A ' ], { - A: '#forge:gears/wood', - B: 'create:shaft' + A: 'gtceu:treated_wood_plate', + B: 'create:cogwheel' }).id('tfg:create/shaped/large_cogwheel') // Внутриблочный двигатель цепи diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a0ba2ee6e..542ecd0e4 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1059,6 +1059,13 @@ const registerGTCEURecipes = (event) => { .duration(700) .EUt(2720) + // Creosote-Treated Wood Planks -> Treated Wood Pulp + event.recipes.gtceu.macerator('tfg:gtceu/macerate_treated_wood_planks') + .itemInputs('gtceu:treated_wood_planks') + .itemOutputs('gtceu:treated_wood_dust') + .duration(120) + .EUt(4) + // Empty Wooden Form event.shaped('gtceu:empty_wooden_form', [ ' AA',