From 19ac4a8848e904fd277626618ff83f3101373aca Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 30 Dec 2023 21:20:31 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/create/recipes.js | 28 --------------- kubejs/server_scripts/gregtech/recipes.js | 37 +++++++++++++++++++ kubejs/server_scripts/main_server_script.js | 28 ++++++++++++++- kubejs/server_scripts/minecraft/recipes.js | 39 +++++++++++++++++++++ 4 files changed, 103 insertions(+), 29 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index ee0c3b103..146f97cf4 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -954,32 +954,4 @@ const registerCreateRecipes = (event) => { .duration(300) .EUt(4) }) - - //#endregion - - /* - - // - event.shaped('', [ - 'AAA', - 'AAA', - 'AAA' - ], { - A: '', - B: '', - C: '', - D: '', - E: '', - F: '', - G: '', - }).id('tfg:create/shaped/') - - // - event.shapeless('', [ - - ]).id('tfg:create/shapeless/') - - */ - - } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4e472b7bb..1fac21ec9 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,5 +1,7 @@ // priority: 0 +const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags') + const registerGTCEURecipes = (event) => { //#region Выход: Удобрение @@ -1077,9 +1079,44 @@ const registerGTCEURecipes = (event) => { //#endregion + // Клей из ТФК клея event.recipes.gtceu.centrifuge('glue_from_tfc_glue') .itemInputs('tfc:glue') .outputFluids(Fluid.of('gtceu:glue', 50)) .duration(400) .EUt(5) + + // Прокатка слитков в стержни + GTRegistries.MATERIALS.forEach(material => { + if (material.hasFlag($MaterialFlags.GENERATE_ROD) && material != 'treated_wood') + { + if (material.hasProperty(PropertyKey.INGOT)) + { + event.custom({ + type: "createaddition:rolling", + input: { + 'tag': `forge:ingots/${material}` + }, + result: { + 'item': `gtceu:${material}_rod`, + 'count': 2 + } + }) + } + else + { + event.custom({ + type: "createaddition:rolling", + input: { + 'tag': `forge:gems/${material}` + }, + result: { + 'item': `gtceu:${material}_rod`, + 'count': 2 + } + }) + } + } + }); + } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index b784d8bff..5fa3297c7 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -101,4 +101,30 @@ ServerEvents.recipes(event => { registerExposureRecipes(event) registerFTBQuestsRecipes(event) -}) \ No newline at end of file +}) + +//#endregion + +/* + +// +event.shaped('', [ + 'AAA', + 'AAA', + 'AAA' +], { + A: '', + B: '', + C: '', + D: '', + E: '', + F: '', + G: '', +}).id('tfg:create/shaped/') + +// +event.shapeless('', [ + +]).id('tfg:create/shapeless/') + +*/ \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 824491724..957440f5c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1048,6 +1048,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:white_dye', '1x #tfc:makes_white_dye') + .id('tfg:milling/white_dye') + // Red event.remove({id: 'minecraft:red_dye_from_tulip'}) event.remove({id: 'minecraft:red_dye_from_rose_bush'}) @@ -1064,6 +1067,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:red_dye', '1x #tfc:makes_red_dye') + .id('tfg:milling/red_dye') + // Lime event.remove({id: 'minecraft:lime_dye_from_smelting'}) @@ -1073,6 +1079,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:lime_dye', '1x #tfc:makes_lime_dye') + .id('tfg:milling/lime_dye') + // Light Blue event.remove({id: 'minecraft:light_blue_dye_from_blue_orchid'}) event.remove({id: 'gtceu:extractor/blue_orchid_dye'}) @@ -1083,6 +1092,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:light_blue_dye', '1x #tfc:makes_light_blue_dye') + .id('tfg:milling/light_blue_dye') + // Green event.remove({id: 'minecraft:green_dye'}) @@ -1092,6 +1104,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:green_dye', '1x #tfc:makes_green_dye') + .id('tfg:milling/green_dye') + // Magenta event.remove({id: 'minecraft:magenta_dye_from_lilac'}) event.remove({id: 'minecraft:magenta_dye_from_allium'}) @@ -1104,6 +1119,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:magenta_dye', '1x #tfc:makes_magenta_dye') + .id('tfg:milling/magenta_dye') + // Orange event.remove({id: 'tfc:crafting/vanilla/orange_dye_from_sylvite'}) event.remove({id: 'minecraft:orange_dye_from_torchflower'}) @@ -1116,6 +1134,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:orange_dye', '1x #tfc:makes_orange_dye') + .id('tfg:milling/orange_dye') + // Purple event.recipes.gtceu.extractor('purple_dye') .itemInputs('1x #tfc:makes_purple_dye') @@ -1123,6 +1144,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:purple_dye', '1x #tfc:makes_purple_dye') + .id('tfg:milling/purple_dye') + // Brown event.remove({id: 'minecraft:brown_dye' }) @@ -1132,6 +1156,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:brown_dye', '1x #tfc:makes_brown_dye') + .id('tfg:milling/brown_dye') + // Light Gray event.remove({id: 'minecraft:light_gray_dye_from_white_tulip'}) event.remove({id: 'minecraft:light_gray_dye_from_azure_bluet'}) @@ -1146,6 +1173,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:light_gray_dye', '1x #tfc:makes_light_gray_dye') + .id('tfg:milling/light_gray_dye') + // Yellow event.remove({id: 'minecraft:yellow_dye_from_sunflower'}) event.remove({id: 'minecraft:yellow_dye_from_dandelion'}) @@ -1158,6 +1188,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:yellow_dye', '1x #tfc:makes_yellow_dye') + .id('tfg:milling/yellow_dye') + // Blue event.remove({id: 'minecraft:blue_dye_from_cornflower'}) event.remove({id: 'gtceu:extractor/cornflower_dye'}) @@ -1168,6 +1201,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:blue_dye', '1x #tfc:makes_blue_dye') + .id('tfg:milling/blue_dye') + // Pink event.remove({id: 'minecraft:pink_dye_from_pink_petals'}) event.remove({id: 'minecraft:pink_dye_from_pink_tulip'}) @@ -1181,6 +1217,9 @@ const registerMinecraftRecipes = (event) => { .duration(200) .EUt(2) + event.recipes.createMilling('2x minecraft:pink_dye', '1x #tfc:makes_pink_dye') + .id('tfg:milling/pink_dye') + // Cyan event.remove({id: 'minecraft:cyan_dye_from_pitcher_plant'})