From 2ce41920801a1f972c83e76f5b4633bb53898c90 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 29 Jan 2024 18:05:42 +0700 Subject: [PATCH] candles --- CHANGELOG.md | 5 +- .../assets/emi/recipe/filters/categories.json | 3 + kubejs/server_scripts/firmaciv/recipes.js | 75 ++++++++++++++++++- kubejs/server_scripts/minecraft/recipes.js | 11 ++- kubejs/server_scripts/tfc/recipes.js | 22 ++++++ kubejs/startup_scripts/minecraft/constants.js | 19 +++++ 6 files changed, 130 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38e0e620b..86b770cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,9 +24,12 @@ - Colorizing of Create valves (in TFC barrels). - Colorizing of Create seats (in TFC barrels). - Heat recipes for many of FirmaCiv items. +- Added assembler recipes for many of FirmaCiv recipes. - Added assembler recipes for many of TFC recipes. +- Removed recipes for vanilla candles (use tfc candles pls) +- Added assembler recipes for TFC brick items. +- Hide EMI repairing recipes, because it's cursed.. # 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/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 36fab4b04..00dad3f3c 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -29,6 +29,9 @@ }, { "category": "emi:fuel" + }, + { + "id": "/emi:/crafting/repairing/[^*]+/" } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/firmaciv/recipes.js b/kubejs/server_scripts/firmaciv/recipes.js index 5d0066c45..c27851c00 100644 --- a/kubejs/server_scripts/firmaciv/recipes.js +++ b/kubejs/server_scripts/firmaciv/recipes.js @@ -2,7 +2,6 @@ const registerFirmaCivRecipes = (event) => { - event.remove({ id: '/firmaciv:quern/' }) event.remove({ id: 'firmaciv:anvil/copper_bolt' }) @@ -14,21 +13,91 @@ const registerFirmaCivRecipes = (event) => { .id(`firmaciv:heating/oarlock`) // Anchor + event.recipes.tfc.heating('firmaciv:anchor', 1535) + .resultFluid(Fluid.of('gtceu:steel', 288)) + .id(`firmaciv:heating/anchor`) + // Cannon Barrel + event.recipes.tfc.heating('firmaciv:cannon_barrel', 1535) + .resultFluid(Fluid.of('gtceu:iron', 288)) + .id(`firmaciv:heating/cannon_barrel`) + // Cannonball + event.recipes.tfc.heating('firmaciv:cannonball', 1535) + .resultFluid(Fluid.of('gtceu:iron', 288)) + .id(`firmaciv:heating/cannonball`) + // Cleat + event.recipes.tfc.heating('firmaciv:cleat', 1535) + .resultFluid(Fluid.of('gtceu:steel', 288)) + .id(`firmaciv:heating/cleat`) //#endregion // Sextant + event.recipes.gtceu.assembler('tfg:firmaciv/sextant') + .itemInputs('2x #forge:plates/brass', '2x #forge:rods/brass') + .circuit(10) + .itemOutputs('firmaciv:sextant') + .duration(75) + .EUt(4) + // Navigator Timepiece + event.recipes.gtceu.assembler('tfg:firmaciv/navigator') + .itemInputs('2x #forge:plates/brass', '2x #forge:rods/brass') + .circuit(11) + .itemOutputs('firmaciv:nav_clock') + .duration(75) + .EUt(4) + // Barometer - // Compass - // Acnhor + event.recipes.gtceu.assembler('tfg:firmaciv/barometer') + .itemInputs('2x #forge:plates/brass', '2x #forge:rods/brass', '#forge:glass') + .inputFluids(Fluid.of('minecraft:water', 1000)) + .circuit(12) + .itemOutputs('firmaciv:barometer') + .duration(75) + .EUt(4) + + // Anchor + event.recipes.gtceu.assembler('tfg:firmaciv/anchor') + .itemInputs('#forge:double_plates/steel') + .circuit(10) + .itemOutputs('firmaciv:anchor') + .duration(75) + .EUt(4) + // Cannon Barrel + event.recipes.gtceu.assembler('tfg:firmaciv/cannon_barrel') + .itemInputs('#forge:double_plates/wrought_iron') + .circuit(11) + .itemOutputs('firmaciv:cannon_barrel') + .duration(75) + .EUt(4) + // Cannonball + event.recipes.gtceu.assembler('tfg:firmaciv/cannonball') + .itemInputs('#forge:double_plates/wrought_iron') + .circuit(12) + .itemOutputs('firmaciv:cannonball') + .duration(75) + .EUt(4) + // Oarlock + event.recipes.gtceu.assembler('tfg:firmaciv/oarlock') + .itemInputs('#forge:double_plates/wrought_iron') + .circuit(13) + .itemOutputs('firmaciv:oarlock') + .duration(75) + .EUt(4) + // Cleat + event.recipes.gtceu.assembler('tfg:firmaciv/cleat') + .itemInputs('#forge:double_plates/steel') + .circuit(14) + .itemOutputs('firmaciv:cleat') + .duration(75) + .EUt(4) // Compass event.recipes.gtceu.canner('tfg:firmaciv/compass') diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 3a01347a1..ad287c146 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2430,8 +2430,17 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Выход: Ковры + //#region Выход: Свечи + event.remove({ id: `minecraft:candle` }) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.remove({ id: `minecraft:${dye}_candle` }) + }) + + //#endregion + + //#region Выход: Ковры global.MINECRAFT_DYE_NAMES.forEach(dye => { diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 785868a4f..7c324b1ff 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2874,4 +2874,26 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Выход: Свечи + + event.recipes.gtceu.chemical_bath(`tfg:tfc/candle_decolor`) + .itemInputs('#tfc:colored_candles') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs('tfc:candle') + .duration(300) + .EUt(4) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + + event.recipes.gtceu.chemical_bath(`tfg:tfc/${dye}_candle`) + .itemInputs('tfc:candle') + .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 36)) + .itemOutputs(`tfc:candle/${dye}`) + .duration(300) + .EUt(4) + + }) + + //#endregion + } \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 9b7cbfed8..f4c48260b 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -515,6 +515,25 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:sentry_armor_trim_smithing_template', 'minecraft:ward_armor_trim_smithing_template', + // Свечи + 'minecraft:candle', + 'minecraft:white_candle', + 'minecraft:light_gray_candle', + 'minecraft:gray_candle', + 'minecraft:black_candle', + 'minecraft:brown_candle', + 'minecraft:red_candle', + 'minecraft:orange_candle', + 'minecraft:yellow_candle', + 'minecraft:lime_candle', + 'minecraft:green_candle', + 'minecraft:cyan_candle', + 'minecraft:light_blue_candle', + 'minecraft:blue_candle', + 'minecraft:purple_candle', + 'minecraft:magenta_candle', + 'minecraft:pink_candle', + // Другое 'minecraft:calcite', 'minecraft:tuff',