diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 0b20e09a8..6b5ec9584 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -525,11 +525,18 @@ id: "42FB276AB16258D9" size: 1.0d subtitle: "{quests.high_voltage.fluorine.subtitle}" - tasks: [{ - id: "4EF4F33BEB714485" - item: "gtceu:fluorine_bucket" - type: "item" - }] + tasks: [ + { + id: "4EF4F33BEB714485" + item: "gtceu:fluorine_bucket" + optional_task: true + type: "item" + } + { + id: "7245625D6C687E3A" + type: "checkmark" + } + ] title: "{quests.high_voltage.fluorine.title}" x: 1.0d y: 4.5d @@ -568,14 +575,22 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.nitrobenzene.desc}"] + icon: "gtceu:nitrobenzene_bucket" id: "56E7A3A0CC690C8A" shape: "square" size: 1.0d - tasks: [{ - id: "33CF24B0A19D2F25" - item: "gtceu:nitrobenzene_bucket" - type: "item" - }] + tasks: [ + { + id: "33CF24B0A19D2F25" + item: "gtceu:nitrobenzene_bucket" + optional_task: true + type: "item" + } + { + id: "70D29F223E0CC5CB" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitrobenzene.title}" x: -1.0d y: 9.5d @@ -723,11 +738,18 @@ id: "5BACED5AE350EAB1" size: 1.0d subtitle: "{quests.high_voltage.nitric_acid.subtitle}" - tasks: [{ - id: "5F8F684990622DE1" - item: "gtceu:nitric_acid_bucket" - type: "item" - }] + tasks: [ + { + id: "5F8F684990622DE1" + item: "gtceu:nitric_acid_bucket" + optional_task: true + type: "item" + } + { + id: "24520333587F2436" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitric_acid.title}" x: 0.0d y: 9.5d @@ -735,15 +757,23 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.cetane_diesel.desc}"] + icon: "gtceu:cetane_boosted_diesel_bucket" id: "04F6E968CEEC3D49" shape: "square" size: 1.0d subtitle: "{quests.high_voltage.cetane_diesel.subtitle}" - tasks: [{ - id: "51D904AA29256F8D" - item: "gtceu:cetane_boosted_diesel_bucket" - type: "item" - }] + tasks: [ + { + id: "51D904AA29256F8D" + item: "gtceu:cetane_boosted_diesel_bucket" + optional_task: true + type: "item" + } + { + id: "6BFCFA5257BE071F" + type: "checkmark" + } + ] title: "{quests.high_voltage.cetane_diesel.title}" x: 1.0d y: 9.5d @@ -831,11 +861,18 @@ icon: "gtceu:ammonia_bucket" id: "4343746E706264E6" size: 1.0d - tasks: [{ - id: "1C3EBA2535471DB6" - item: "gtceu:ammonia_bucket" - type: "item" - }] + tasks: [ + { + id: "1C3EBA2535471DB6" + item: "gtceu:ammonia_bucket" + optional_task: true + type: "item" + } + { + id: "6445F5DC9728583A" + type: "checkmark" + } + ] title: "{quests.high_voltage.ammonia.title}" x: -3.0d y: 6.0d @@ -973,6 +1010,8 @@ "{@pagebreak}" "{quests.high_voltage.space_alloy.desc.2}" ] + hide_details_until_startable: false + icon: "gtceu:rocket_alloy_t1_ingot" id: "56D337E264A4154F" subtitle: "{quests.high_voltage.space_alloy.subtitle}" tasks: [ @@ -1199,23 +1238,6 @@ x: 0.0d y: 11.0d } - { - dependencies: ["14D277A164202FF8"] - description: [ - "{quests.high_voltage.bedrock_miner.desc.1}" - "{@pagebreak}" - "{quests.high_voltage.bedrock_miner.desc.2}" - ] - id: "2878C147D273F774" - subtitle: "{quests.high_voltage.bedrock_miner.subtitle}" - tasks: [{ - id: "55981710612D21D7" - item: "gtceu:mv_bedrock_ore_miner" - type: "item" - }] - x: 2.5d - y: -10.5d - } { description: ["{quests.high_voltage.kaolinite_powder.desc}"] disable_toast: true @@ -1315,40 +1337,185 @@ y: 1.5d } { - dependencies: ["396E85A39FF414CF"] - description: ["{quests.high_voltage.hypertubes.desc}"] - icon: "create_hypertube:hypertube_entrance" - id: "194AB090A96CBC26" - optional: true - shape: "heart" - subtitle: "{quests.high_voltage.hypertubes.subtitle}" + dependencies: ["00A2566109144D7F"] + description: ["{quests.high_voltage.moon_harvester.desc}"] + id: "6A21CCAEB1FDF38E" + shape: "octagon" + size: 2.0d + subtitle: "{quests.high_voltage.moon_harvester.subtitle}" + tasks: [{ + id: "445320F445BA829F" + item: "gtceu:moon_dust_harvester" + type: "item" + }] + title: "{quests.high_voltage.moon_harvester.title}" + x: 16.0d + y: -2.0d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_vapor.desc}"] + icon: "gtceu:regolith_vapor_bucket" + id: "578ECB10B30A77C7" + subtitle: "{quests.high_voltage.regolith_vapor.subtitle}" tasks: [ { - id: "284047DB1B1C022E" - item: "create_hypertube:hypertube_entrance" - type: "item" - } - { - disable_toast: true - id: "794148B8FFC9B001" - item: "create_hypertube:hypertube" + id: "0FF209271DB58067" + item: "gtceu:regolith_vapor_bucket" optional_task: true type: "item" } + { + id: "32E19F49E3A2D54B" + title: "{quests.high_voltage.regolith_vapor.task}" + type: "checkmark" + } ] - title: "{quests.high_voltage.hypertubes.title}" - x: 11.5d - y: -7.5d + title: "{quests.high_voltage.regolith_vapor.title}" + x: 17.5d + y: -2.5d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_dust.desc}"] + id: "0527DF6A8567FED9" + subtitle: "{quests.high_voltage.regolith_dust.subtitle}" + tasks: [ + { + id: "567BAEEB6120F6CE" + item: "tfg:certus_regolith_dust" + type: "item" + } + { + id: "5507A8B1561AC3C3" + item: "tfg:cassiterite_regolith_dust" + type: "item" + } + { + id: "13C520F021B2E085" + item: "tfg:bright_regolith_dust" + type: "item" + } + { + id: "3565544FF49B9F50" + item: "tfg:goethe_regolith_dust" + type: "item" + } + ] + title: "{quests.high_voltage.regolith_dust.title}" + x: 17.5d + y: -1.5d + } + { + dependencies: [ + "0527DF6A8567FED9" + "578ECB10B30A77C7" + ] + description: ["{quests.high_voltage.dusty_ores.desc}"] + id: "5807400FD1F0998A" + subtitle: "{quests.high_voltage.dusty_ores.subtitle}" + tasks: [{ + id: "131B1D5F37FAC1F3" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:dusty_raw_goethite)item(gtceu:dusty_raw_cassiterite)item(gtceu:dusty_raw_certus_quartz)item(gtceu:dusty_raw_gold)item(gtceu:dusty_raw_diamond))" + } + } + title: "{quests.high_voltage.dusty_ores.task}" + type: "item" + }] + title: "{quests.high_voltage.dusty_ores.title}" + x: 18.5d + y: -2.0d + } + { + dependencies: ["5807400FD1F0998A"] + description: ["{quests.high_voltage.final_dust.desc}"] + id: "36FE3DDBCB535639" + subtitle: "{quests.high_voltage.final_dust.subtitle}" + tasks: [ + { + id: "1ABCC8007A69EF81" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:iron_dust" + } + type: "item" + } + { + id: "3AB1A3B8E6EB4291" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:copper_dust" + } + type: "item" + } + { + id: "1D38FECBB23C3E24" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:tin_dust" + } + type: "item" + } + { + id: "6C9C5498495F330C" + item: "ae2:certus_quartz_dust" + type: "item" + } + { + id: "0AF375FA38D44C32" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:gold_dust" + } + type: "item" + } + { + id: "6896A082D722EECB" + item: "gtceu:diamond_dust" + type: "item" + } + ] + title: "{quests.high_voltage.final_dust.title}" + x: 19.5d + y: -2.0d } { dependencies: ["396E85A39FF414CF"] description: ["{quests.high_voltage.wand.desc}"] - id: "6E370A161895A91B" + id: "22FD785F84E9D10D" optional: true shape: "heart" subtitle: "{quests.high_voltage.wand.subtitle}" tasks: [{ - id: "2311849F50A36265" + id: "525F329DD5F16E1F" item: { Count: 1 id: "constructionwand:infinity_wand" @@ -1362,6 +1529,28 @@ x: 13.0d y: -8.0d } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.hypertubes.desc}"] + id: "159A0DAEE55DCAC0" + optional: true + subtitle: "{quests.high_voltage.hypertubes.subtitle}" + tasks: [ + { + id: "033B6A5EC2C17485" + item: "create_hypertube:hypertube_entrance" + type: "item" + } + { + id: "2EBA07A9A9B6D1EB" + item: "create_hypertube:hypertube" + type: "item" + } + ] + title: "{quests.high_voltage.hypertubes.title}" + x: 11.5d + y: -7.5d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 0d57e51d7..7b2886226 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -409,8 +409,8 @@ type: "item" }] title: "{quests.steam_age.crushing_wheel.title}" - x: -19.5d - y: 18.0d + x: -21.5d + y: 10.5d } { dependencies: ["7DB7AB5349218605"] @@ -436,13 +436,13 @@ ] title: "{quests.steam_age.treated_planks.title}" x: -19.5d - y: 12.0d + y: 10.5d } { dependencies: [ - "246D2C5989E3E907" "233B414B4F189140" "781C6AD30194CB45" + "3E175E20C91F168B" ] description: ["{quests.steam_age.electron_tube.desc}"] id: "033E74BC588E7EAD" @@ -564,8 +564,8 @@ type: "item" }] title: "{quests.steam_age.mech_crafter.title}" - x: -19.5d - y: 17.0d + x: -20.5d + y: 12.0d } { dependencies: ["46FA9DD4755A5548"] @@ -828,9 +828,9 @@ } { dependencies: [ - "033E74BC588E7EAD" "5917B0D4708BF534" "6100B3C732E379AA" + "246D2C5989E3E907" ] description: ["{quests.steam_age.centrifuge.desc}"] id: "19A1D52A7F550478" @@ -842,8 +842,8 @@ type: "item" }] title: "{quests.steam_age.centrifuge.title}" - x: -18.0d - y: 17.0d + x: -20.5d + y: 10.5d } { dependencies: [ @@ -1593,7 +1593,7 @@ type: "checkmark" }] title: "{quests.steam_age.packager.title}" - x: -22.0d + x: -19.5d y: 17.0d } { diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 57b015c45..8f72f42c9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -90,11 +90,7 @@ "item.gtceu.osmium_credit": "§732,768 Credits", "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", - "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", - "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", - "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", - "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png b/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png new file mode 100644 index 000000000..061ecfa39 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png differ diff --git a/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png b/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png new file mode 100644 index 000000000..cf3386024 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png differ diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 5d42d6a85..017305501 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -922,7 +922,7 @@ const registerCreateRecipes = (event) => { ], { A: 'gtceu:glass_tube', B: '#forge:bolts/steel', - C: 'gtceu:treated_wood_plate', + C: 'gtceu:wood_plate', D: 'gtceu:red_alloy_single_wire', E: '#forge:plates/wrought_iron', F: '#forge:tools/screwdrivers', @@ -931,7 +931,7 @@ const registerCreateRecipes = (event) => { event.recipes.createSequencedAssembly([ '2x create:electron_tube', - ], 'gtceu:treated_wood_plate', [ + ], 'gtceu:wood_plate', [ event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', '#forge:plates/wrought_iron']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 03055afe0..2b09e8271 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -128,8 +128,9 @@ const registerGTCEURecipes = (event) => { event.recipes.tfc.barrel_sealed(2000) .outputItem('gtceu:treated_wood_dust') - .inputs('tfg:chipboard_composite', TFC.fluidStackIngredient('#forge:creosote', 50)) - .id('tfg:barrel/treated_chipboard_composite') + .inputs('#tfg:wood_dusts', TFC.fluidStackIngredient('#forge:creosote', 50)) + .id('tfg:barrel/treated_wood_dust') + //#endregion //#region Выход: Капля резины @@ -1426,5 +1427,9 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + + //# Circuit Board + + event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index e65392484..5e418a2f5 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -895,25 +895,45 @@ function registerGTCEuMachineRecipes(event) { .duration(10) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') - .itemInputs('1x tfg:chipboard_composite') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('gtceu:treated_wood_dust') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:wood_mdf') .itemInputs('1x tfg:chipboard_composite') .itemOutputs('gtceu:wood_plate') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:treated_wood_mdf') - .itemInputs('1x gtceu:treated_wood_dust') - .itemOutputs('gtceu:treated_wood_plate') + event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') + .itemInputs('1x tfg:chipboard_composite') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.compressor('tfg:chemical_treated_wood') + .itemInputs('#tfg:wood_dusts') + .itemOutputs('gtceu:treated_wood_dust') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') + .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') + .itemOutputs('gtceu:resin_circuit_board') + .duration(20*10) + .EUt(GTValues.VA[GTValues.ULV]) + //#region New Casings event.recipes.gtceu.assembler('basic_solar_casing') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 895467739..b668b69c1 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -642,17 +642,6 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_brick_wall') removeMaceratorRecipe(event, 'macerate_flower_pot') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence_gate') - removeMaceratorRecipe(event, 'macerate_long_treated_wood_rod') - removeMaceratorRecipe(event, 'macerate_treated_wood_normal_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_large_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_small_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_door') - removeMaceratorRecipe(event, 'macerate_treated_wood_frame') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence') - removeMaceratorRecipe(event, 'macerate_treated_wood_boat') - removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') - removeMaceratorRecipe(event, 'macerate_marble') event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) @@ -725,7 +714,6 @@ function removeGTCEURecipes(event) { // Remove old treated plank and wood plank recipe event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' }) - event.remove({ id: 'gtceu:compressor/compress_plate_dust_treated_wood'}) // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index f62501506..5831cf73a 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -56,6 +56,8 @@ const registerGTCEUItemTags = (event) => { event.remove('minecraft:planks', 'gtceu:treated_wood_planks') event.remove('minecraft:planks', 'gtceu:treated_wood_plate') + event.remove('minecraft:planks', 'gtceu:wood_plate') + event.add('tfg:sugars', 'minecraft:sugar') event.add('tfg:sugars', 'afc:birch_sugar') event.add('tfg:sugars', 'afc:maple_sugar') diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index b595c4f20..6b29ca59f 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -36,4 +36,10 @@ const registerGTCEuItems = (event) => { event.create('tfg:chipboard_composite') .translationKey('item.chipboard_composite') + event.create('tfg:treated_chipboard_composite') + .translationKey('item.treated_chipboard_composite') + + event.create('tfg:high_density_treated_fiberboard') + .translationKey('item.high_density_treated_fiberboard') + }