diff --git a/CHANGELOG.md b/CHANGELOG.md index c7a7061ac..38e0e620b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,12 @@ - GTCEu bolts now can be used in FirmaCiv boats (Fix for new FirmaCiv ver). - Hided for now nether items. - Added recipe for Elytra. -# Wip for now (required for update) - Colorizing of Create valves (in TFC barrels). - Colorizing of Create seats (in TFC barrels). -- Added assembler recipes for a lot of TFC recipes. -- Added assembler recipes for a lot of FirmaCiv items. +- Heat recipes for many of FirmaCiv items. +- Added assembler recipes for many of TFC recipes. +# Wip for now (required for update) +- Added assembler recipes for many of FirmaCiv items. - Vanilla glass bottles has been replaced with TFC bottles. - Recipes for plates, sticks, and others through Create mechanisms have been redistributed once again (an attempt to fix a crash). - The primitive pump from GTCEu has been removed, so at the beginning of the game, you will have to pump water using a pump from Create. diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 6c9525d3b..61169d4e0 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1098,6 +1098,11 @@ const registerCreateRecipes = (event) => { //#region Покраска ручек от люка + event.recipes.tfc.barrel_sealed(1000) + .inputs('#tfg:colored_valve_handles', Fluid.of(`tfc:lye`, 25)) + .outputItem(`create:copper_valve_handle`) + .id(`barrel/create/valve_handle_decolor`) + event.recipes.gtceu.chemical_bath(`create/valve_handle_decolor`) .itemInputs('#tfg:colored_valve_handles') .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) @@ -1106,6 +1111,11 @@ const registerCreateRecipes = (event) => { .EUt(4) global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.tfc.barrel_sealed(1000) + .inputs('create:copper_valve_handle', Fluid.of(`tfc:${dye}_dye`, 25)) + .outputItem(`create:${dye}_valve_handle`) + .id(`barrel/create/${dye}_valve_handle`) + event.recipes.gtceu.chemical_bath(`create/${dye}_valve_handle`) .itemInputs('create:copper_valve_handle') .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 144)) @@ -1119,19 +1129,33 @@ const registerCreateRecipes = (event) => { //#region Покраска тулбоксов global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != 'brown') + if (dye != 'brown') { + event.remove({ id: `create:create.toolbox.color.block.create.${dye}_toolbox` }) + + event.recipes.tfc.barrel_sealed(1000) + .inputs('create:brown_toolbox', Fluid.of(`tfc:${dye}_dye`, 50)) + .outputItem(`create:${dye}_toolbox`) + .id(`barrel/create/${dye}_toolbox`) + event.recipes.gtceu.chemical_bath(`create/${dye}_toolbox`) .itemInputs('create:brown_toolbox') .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 96)) .itemOutputs(`create:${dye}_toolbox`) .duration(200) .EUt(4) + } + }) //#endregion //#region Покраска сидушек + event.recipes.tfc.barrel_sealed(1000) + .inputs('#tfg:colored_seats', Fluid.of(`tfc:lye`, 25)) + .outputItem(`create:white_seat`) + .id(`barrel/create/seat_decolor`) + event.recipes.gtceu.chemical_bath(`create/seat_decolor`) .itemInputs('#tfg:colored_seats') .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) @@ -1140,13 +1164,20 @@ const registerCreateRecipes = (event) => { .EUt(4) global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != "white") + if (dye != "white") { + + event.recipes.tfc.barrel_sealed(1000) + .inputs(`create:white_seat`, Fluid.of(`tfc:${dye}_dye`, 50)) + .outputItem(`create:${dye}_seat`) + .id(`barrel/create/${dye}_seat`) + event.recipes.gtceu.chemical_bath(`create/${dye}_seat`) .itemInputs(`create:white_seat`) .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 144)) .itemOutputs(`create:${dye}_seat`) .duration(300) .EUt(4) + } }) //#endregion diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 217d03cd2..3a01347a1 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2551,7 +2551,6 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Веревка - event.remove({ id: 'minecraft:lead' }) event.remove({ id: 'gtceu:assembler/lead' }) event.shaped('minecraft:lead', [ @@ -2561,7 +2560,7 @@ const registerMinecraftRecipes = (event) => { ], { A: '#forge:string', B: '#forge:rings/wrought_iron' - }) + }).id('minecraft:lead') //#endregion @@ -2596,7 +2595,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Элитра // Ну и херь я придумал - event.recipes.gtceu.assembler('detector_rail') + event.recipes.gtceu.assembler('tfg:elytra') .itemInputs('6x #forge:plates/polyvinyl_butyral', '2x #forge:rings/titanium', '2x #forge:rods/titanium', '4x #forge:single_cables/aluminium') .circuit(32) .itemOutputs(Item.of('minecraft:elytra', "{Damage:0,display:{Name:'{\"text\":\"Божественные крылья\",\"italic\":true}'}}"))