From 1c22a4c288db46cc6662a9389645b94b35c0b3ee Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 09:03:17 +0700 Subject: [PATCH] minor fixes --- kubejs/server_scripts/gregtech/recipes.js | 21 ++++++++++++++------- kubejs/server_scripts/minecraft/recipes.js | 6 ++++++ kubejs/server_scripts/tfc/recipes.js | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index cef9a3e25..233ff05ba 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1382,6 +1382,7 @@ const registerGTCEURecipes = (event) => { if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood) { let plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1) + let blockStack = ChemicalHelper.get(TagPrefix.block, material, 1) if (material.hasProperty(PropertyKey.INGOT)) { @@ -1389,16 +1390,22 @@ const registerGTCEURecipes = (event) => { event.recipes.createPressing(plateStack.withChance(0.97), ingotStack) .id(`tfg:pressing/${material.getName()}_plate`) - // 9х Слиток -> Блок - event.recipes.createCompacting(Item.of(`#forge:storage_blocks/${material.getName()}`), ingotStack.withCount(9)) - .heated() - .id(`tfg:compacting/${material.getName()}_block`) + if (!blockStack.isEmpty()) { + // 9х Слиток -> Блок + event.recipes.createCompacting(blockStack, ingotStack.withCount(9)) + .heated() + .id(`tfg:compacting/${material.getName()}_block`) + } + } else { - // Блок из гемов -> 9 Пластин - event.recipes.createCutting(Item.of(plateStack.withCount(9)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`) - .id(`tfg:cutting/${material.getName()}_plate`) + if (!blockStack.isEmpty()) { + // Блок из гемов -> 9 Пластин + event.recipes.createCutting(Item.of(plateStack.withCount(9)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`) + .id(`tfg:cutting/${material.getName()}_plate`) + } + } } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 74680b48f..ee6b830bc 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1259,6 +1259,12 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Древесный уголь + + event.remove({ id: 'minecraft:charcoal' }) + + //#endregion + //#region Выход: Высушенные водросли блок event.remove({ id: 'minecraft:dried_kelp_block' }) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a61fabe1a..f2c856f9f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2519,7 +2519,7 @@ const registerTFCRecipes = (event) => { .EUt(4) event.recipes.gtceu.chemical_bath(`fired_large_vessel_decolor`) - .itemInputs('#tfg:colorized_large_vessels') + .itemInputs('#tfg:colorized_fired_large_vessels') .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) .itemOutputs('tfc:ceramic/large_vessel') .duration(300)