diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index b808da582..0b8d1c86b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -105,7 +105,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Каменные кирпичи стена event.remove({ id: 'minecraft:stone_brick_wall' }) - event.remove({ id: 'minecraft:stone_brick_wall_from_stone_stonecutting' }) + event.remove({ id: 'minecraft:stone_brick_walls_from_stone_stonecutting' }) event.remove({ id: 'minecraft:stone_brick_wall_from_stone_bricks_stonecutting' }) //#endregion diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 52ac65f22..37d711264 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -968,7 +968,7 @@ const registerTFCRecipes = (event) => { .duration(250) .EUt(30) - // Декрафт песчанных блоков в песок + // Рецепты где нужно итерироваться по всем цветам global.SAND_COLORS.forEach(sandColor => { // Песчанник -> Песок event.recipes.gtceu.forge_hammer(`raw_${sandColor}_sandstone_to_sand`) @@ -991,28 +991,104 @@ const registerTFCRecipes = (event) => { .duration(400) .EUt(2) - // Sand -> Raw SandStone - event.recipes.gtceu.compressor(`${sandColor}_sandstone`) - .itemInputs(`4x tfc:sand/${sandColor}`) - .itemOutputs(`tfc:raw_sandstone/${sandColor}`) - .duration(300) - .EUt(2) - - // Raw SandStone -> Smooth SandStone - event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_smooth`) + // Песчанник -> Ступень + event.stonecutting(`tfc:raw_sandstone/${sandColor}_stairs`, `tfc:raw_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_sandstone_to_stairs`) + + event.recipes.gtceu.cutter(`${sandColor}_sandstone_to_stairs`) .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .notConsumable('gtceu:magenta_glass_lens') - .itemOutputs(`tfc:smooth_sandstone/${sandColor}`) - .duration(60) - .EUt(32) + .circuit(0) + .itemOutputs(`tfc:raw_sandstone/${sandColor}_stairs`) + .duration(100) + .EUt(8) - // Raw SandStone -> Cut SandStone - event.recipes.gtceu.laser_engraver(`raw_${sandColor}_sandstone_to_cut`) + // Песчанник -> Плита + event.stonecutting(`2x tfc:raw_sandstone/${sandColor}_slab`, `tfc:raw_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_sandstone_to_slabs`) + + event.recipes.gtceu.cutter(`${sandColor}_sandstone_to_slab`) .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .notConsumable('gtceu:orange_glass_lens') - .itemOutputs(`tfc:cut_sandstone/${sandColor}`) - .duration(60) - .EUt(32) + .circuit(1) + .itemOutputs(`2x tfc:raw_sandstone/${sandColor}_slab`) + .duration(100) + .EUt(8) + + // Песчанник -> Стена + event.stonecutting(`tfc:raw_sandstone/${sandColor}_stairs`, `tfc:raw_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_sandstone_to_wall`) + + event.recipes.gtceu.cutter(`${sandColor}_sandstone_to_wall`) + .itemInputs(`tfc:raw_sandstone/${sandColor}`) + .circuit(2) + .itemOutputs(`tfc:raw_sandstone/${sandColor}_wall`) + .duration(100) + .EUt(8) + + // Гладкий песчанник -> Ступень + event.stonecutting(`tfc:smooth_sandstone/${sandColor}_stairs`, `tfc:smooth_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_smooth_sandstone_to_stairs`) + + event.recipes.gtceu.cutter(`${sandColor}_smooth_sandstone_to_stairs`) + .itemInputs(`tfc:smooth_sandstone/${sandColor}`) + .circuit(0) + .itemOutputs(`tfc:smooth_sandstone/${sandColor}_stairs`) + .duration(100) + .EUt(8) + + // Гладкий песчанник -> Плита + event.stonecutting(`2x tfc:smooth_sandstone/${sandColor}_slab`, `tfc:smooth_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_smooth_sandstone_to_slab`) + + event.recipes.gtceu.cutter(`${sandColor}_smooth_sandstone_to_slab`) + .itemInputs(`tfc:smooth_sandstone/${sandColor}`) + .circuit(1) + .itemOutputs(`2x tfc:smooth_sandstone/${sandColor}_slab`) + .duration(100) + .EUt(8) + + // Гладкий песчанник -> Стена + event.stonecutting(`tfc:smooth_sandstone/${sandColor}_wall`, `tfc:smooth_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_smooth_sandstone_to_wall`) + + event.recipes.gtceu.cutter(`${sandColor}_smooth_sandstone_to_wall`) + .itemInputs(`tfc:smooth_sandstone/${sandColor}`) + .circuit(2) + .itemOutputs(`tfc:smooth_sandstone/${sandColor}_wall`) + .duration(100) + .EUt(8) + + // Обрезанный песчанник -> Ступень + event.stonecutting(`tfc:cut_sandstone/${sandColor}_stairs`, `tfc:cut_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_cut_sandstone_to_stairs`) + + event.recipes.gtceu.cutter(`${sandColor}_cut_sandstone_to_stairs`) + .itemInputs(`tfc:cut_sandstone/${sandColor}`) + .circuit(0) + .itemOutputs(`tfc:cut_sandstone/${sandColor}_stairs`) + .duration(100) + .EUt(8) + + // Обрезанный песчанник -> Плита + event.stonecutting(`2x tfc:cut_sandstone/${sandColor}_slab`, `tfc:cut_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_cut_sandstone_to_slab`) + + event.recipes.gtceu.cutter(`${sandColor}_cut_sandstone_to_slab`) + .itemInputs(`tfc:cut_sandstone/${sandColor}`) + .circuit(1) + .itemOutputs(`2x tfc:cut_sandstone/${sandColor}_slab`) + .duration(100) + .EUt(8) + + // Обрезанный песчанник -> Стена + event.stonecutting(`tfc:cut_sandstone/${sandColor}_wall`, `tfc:cut_sandstone/${sandColor}`) + .id(`tfg:stonecutting/${sandColor}_cut_sandstone_to_wall`) + + event.recipes.gtceu.cutter(`${sandColor}_cut_sandstone_to_wall`) + .itemInputs(`tfc:cut_sandstone/${sandColor}`) + .circuit(2) + .itemOutputs(`tfc:cut_sandstone/${sandColor}_wall`) + .duration(100) + .EUt(8) }) // Коричневый гравий -> Песок @@ -1068,8 +1144,6 @@ const registerTFCRecipes = (event) => { //#region Дерево - //#endregion - global.TFC_WOOD_TYPES.forEach(wood => { event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) event.remove({ id: `tfc:crafting/wood/${wood}_bladed_axle` }) @@ -1080,6 +1154,10 @@ const registerTFCRecipes = (event) => { event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` }) }) + //#endregion + + + event.remove({ id: `tfc:crafting/trip_hammer` }) event.remove({ id: `tfc:crafting/windmill_blade` }) event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) @@ -1260,6 +1338,7 @@ const registerTFCRecipes = (event) => { //#endregion + /* // Доменная печь event.shaped('tfc:blast_furnace', [ 'AAA', @@ -1495,7 +1574,7 @@ const registerTFCRecipes = (event) => { .EUt(30) // Удобрение в create миксере - /* + event.recipes.gtceu.create_mixer('fertilizer') .itemInputs( '#tfc:dirt', @@ -1506,7 +1585,7 @@ const registerTFCRecipes = (event) => { .itemOutputs('4x gtceu:fertilizer') .duration(300) .EUt(30) - .rpm(96)*/ + .rpm(96) //#endregion @@ -1620,6 +1699,6 @@ const registerTFCRecipes = (event) => { .id(`tfg:smelting/mold_${i}`) } - // + */ } diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js deleted file mode 100644 index 7dfcf1b60..000000000 --- a/kubejs/startup_scripts/gtceu/machines.js +++ /dev/null @@ -1,3 +0,0 @@ -// priority: 0 - - diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js deleted file mode 100644 index 21b163601..000000000 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ /dev/null @@ -1,2 +0,0 @@ -// priority: 0 - diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index a6818ef3e..bb4aae85a 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -15,28 +15,4 @@ StartupEvents.registry('block', (event) => {}) /** * Событие регистрации жидкостей. */ -StartupEvents.registry('fluid', (event) => {}) - -/** - * Событие регистрации типов рецептов GTCEu. - */ -GTCEuStartupEvents.registry('gtceu:recipe_type', event => { - event.create('saw_mill') - .category('tfg') // Used in the GTlib / LDlib ui editor - .setEUIO('in') - .setMaxIOSize(2, 2, 0, 0) // Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs - .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY) - .setSlotOverlay(true, false, false, GuiTextures.PIPE_OVERLAY_2) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_LATHE, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.CUT) -}) - -/** - * Событие регистрации машин GTCEu. - */ -GTCEuStartupEvents.registry('gtceu:machine', event => { - event.create('saw_mill', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV) - .editableUI($SimpleTieredMachine.EDITABLE_UI_CREATOR.apply(new ResourceLocation("gtceu"), GTRecipeTypes.get('saw_mill'))) - .recipeType('saw_mill') -}) \ No newline at end of file +StartupEvents.registry('fluid', (event) => {}) \ No newline at end of file