From 7967a121c82412d35d741f03ae473bc87b364e94 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 19 Dec 2023 20:08:25 +0700 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=82=D0=B8=D1=80=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=B7=D0=B0=20=D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D0=B3=D1=80=D0=B5=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/gregtech/recipes.js | 155 +++++++++++++++++- kubejs/server_scripts/minecraft/recipes.js | 14 +- kubejs/server_scripts/tfc/recipes.js | 3 +- kubejs/startup_scripts/minecraft/constants.js | 6 +- kubejs/startup_scripts/tfc/constants.js | 16 +- 5 files changed, 172 insertions(+), 22 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 43636bd8b..b0ad71cc2 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -383,6 +383,150 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Выход: Крошечная кучка дерева + + event.remove({ id: 'gtceu:macerator/macerate_warped_button' }) + event.remove({ id: 'gtceu:macerator/macerate_spruce_button' }) + event.remove({ id: 'gtceu:macerator/macerate_oak_button' }) + event.remove({ id: 'gtceu:macerator/macerate_mangrove_button' }) + event.remove({ id: 'gtceu:macerator/macerate_jungle_button' }) + event.remove({ id: 'gtceu:macerator/macerate_dark_oak_button' }) + event.remove({ id: 'gtceu:macerator/macerate_crimson_button' }) + event.remove({ id: 'gtceu:macerator/macerate_cherry_button' }) + event.remove({ id: 'gtceu:macerator/macerate_birch_button' }) + event.remove({ id: 'gtceu:macerator/macerate_bamboo_button' }) + event.remove({ id: 'gtceu:macerator/macerate_acacia_button' }) + + //#endregion + + //#region Выход: Маленькая кучка дерева + + event.remove({ id: 'gtceu:macerator/macerate_wooden_sword' }) + event.remove({ id: 'gtceu:macerator/macerate_wooden_shovel' }) + event.remove({ id: 'gtceu:macerator/macerate_wooden_pickaxe' }) + event.remove({ id: 'gtceu:macerator/macerate_wooden_hoe' }) + event.remove({ id: 'gtceu:macerator/macerate_wooden_axe' }) + event.remove({ id: 'gtceu:macerator/macerate_warped_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_warped_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_spruce_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_spruce_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_oak_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_oak_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_mangrove_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_mangrove_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_jungle_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_jungle_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_iron_sword' }) + event.remove({ id: 'gtceu:macerator/macerate_iron_shovel' }) + event.remove({ id: 'gtceu:macerator/macerate_iron_pickaxe' }) + event.remove({ id: 'gtceu:macerator/macerate_iron_hoe' }) + event.remove({ id: 'gtceu:macerator/macerate_iron_axe' }) + event.remove({ id: 'gtceu:macerator/macerate_golden_sword' }) + event.remove({ id: 'gtceu:macerator/macerate_golden_shovel' }) + event.remove({ id: 'gtceu:macerator/macerate_golden_pickaxe' }) + event.remove({ id: 'gtceu:macerator/macerate_golden_hoe' }) + event.remove({ id: 'gtceu:macerator/macerate_golden_axe' }) + event.remove({ id: 'gtceu:macerator/macerate_diamond_sword' }) + event.remove({ id: 'gtceu:macerator/macerate_diamond_shovel' }) + event.remove({ id: 'gtceu:macerator/macerate_diamond_pickaxe' }) + event.remove({ id: 'gtceu:macerator/macerate_diamond_hoe' }) + event.remove({ id: 'gtceu:macerator/macerate_diamond_axe' }) + event.remove({ id: 'gtceu:macerator/macerate_dark_oak_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_dark_oak_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_crimson_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_crimson_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_cherry_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_cherry_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_birch_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_birch_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_bamboo_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_bamboo_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_bamboo_mosaic_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_bamboo_mosaic_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_acacia_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_acacia_slab' }) + + //#endregion + + //#region Выход: Деревянная пыль + + event.remove({id: 'gtceu:macerator/macerate_trapped_chest'}) + event.remove({id: 'gtceu:macerator/macerate_spruce_planks'}) + event.remove({id: 'gtceu:macerator/macerate_spruce_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_spruce_fence'}) + event.remove({id: 'gtceu:macerator/macerate_spruce_door'}) + event.remove({id: 'gtceu:macerator/macerate_spruce_boat'}) + event.remove({id: 'gtceu:macerator/macerate_oak_planks'}) + event.remove({id: 'gtceu:macerator/macerate_oak_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_oak_fence'}) + event.remove({id: 'gtceu:macerator/macerate_oak_door'}) + event.remove({id: 'gtceu:macerator/macerate_oak_boat'}) + event.remove({id: 'gtceu:macerator/macerate_mangrove_planks'}) + event.remove({id: 'gtceu:macerator/macerate_mangrove_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_mangrove_fence'}) + event.remove({id: 'gtceu:macerator/macerate_mangrove_door'}) + event.remove({id: 'gtceu:macerator/macerate_mangrove_boat'}) + event.remove({id: 'gtceu:macerator/macerate_jungle_planks'}) + event.remove({id: 'gtceu:macerator/macerate_jungle_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_jungle_fence'}) + event.remove({id: 'gtceu:macerator/macerate_jungle_door'}) + event.remove({id: 'gtceu:macerator/macerate_jungle_boat'}) + event.remove({id: 'gtceu:macerator/macerate_dark_oak_planks'}) + event.remove({id: 'gtceu:macerator/macerate_dark_oak_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_dark_oak_fence'}) + event.remove({id: 'gtceu:macerator/macerate_dark_oak_door'}) + event.remove({id: 'gtceu:macerator/macerate_dark_oak_boat'}) + event.remove({id: 'gtceu:macerator/macerate_crafting_table'}) + event.remove({id: 'gtceu:macerator/macerate_chest'}) + event.remove({id: 'gtceu:macerator/macerate_chest_minecart'}) + event.remove({id: 'gtceu:macerator/macerate_cherry_planks'}) + event.remove({id: 'gtceu:macerator/macerate_cherry_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_cherry_fence'}) + event.remove({id: 'gtceu:macerator/macerate_cherry_door'}) + event.remove({id: 'gtceu:macerator/macerate_cherry_boat'}) + event.remove({id: 'gtceu:macerator/macerate_bookshelf'}) + event.remove({id: 'gtceu:macerator/macerate_birch_planks'}) + event.remove({id: 'gtceu:macerator/macerate_birch_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_birch_fence'}) + event.remove({id: 'gtceu:macerator/macerate_birch_door'}) + event.remove({id: 'gtceu:macerator/macerate_birch_boat'}) + event.remove({id: 'gtceu:macerator/macerate_acacia_planks'}) + event.remove({id: 'gtceu:macerator/macerate_acacia_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_acacia_fence'}) + event.remove({id: 'gtceu:macerator/macerate_acacia_door'}) + event.remove({id: 'gtceu:macerator/macerate_acacia_boat'}) + event.remove({id: 'gtceu:macerator/macerate_bamboo_raft'}) + event.remove({id: 'gtceu:macerator/macerate_bamboo_planks'}) + event.remove({id: 'gtceu:macerator/macerate_bamboo_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_bamboo_fence'}) + event.remove({id: 'gtceu:macerator/macerate_bamboo_door'}) + event.remove({id: 'gtceu:macerator/macerate_crimson_door'}) + event.remove({id: 'gtceu:macerator/macerate_crimson_fence'}) + event.remove({id: 'gtceu:macerator/macerate_crimson_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_crimson_planks'}) + event.remove({id: 'gtceu:macerator/macerate_warped_door'}) + event.remove({id: 'gtceu:macerator/macerate_warped_fence'}) + event.remove({id: 'gtceu:macerator/macerate_warped_fence_gate'}) + event.remove({id: 'gtceu:macerator/macerate_warped_planks'}) + + //#endregion + + // Compressed Coke Clay + event.shaped('gtceu:compressed_coke_clay', [ + 'AAA', + 'BCB', + 'BBB' + ], { + A: 'minecraft:clay_ball', + B: '#minecraft:sand', + C: 'gtceu:brick_wooden_form' + }).replaceIngredient("gtceu:brick_wooden_form", Item.empty).id('gtceu:shaped/compressed_coke_clay') + + // Compressed Coke Clay -> Coke Oven Brick + event.recipes.tfc.heating('gtceu:compressed_coke_clay', 1399) + .resultItem('gtceu:coke_oven_brick') + .id('tfg:heating/coke_oven_bricks') + // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) @@ -525,11 +669,6 @@ const registerGTCEURecipes = (event) => { .duration(15) .EUt(2) - // Compressed Coke Clay -> Coke Oven Brick - event.recipes.tfc.heating('gtceu:compressed_coke_clay', 1399) - .resultItem('gtceu:coke_oven_brick') - .id('tfg:heating/coke_oven_bricks') - // Pump Deck event.shaped('gtceu:pump_deck', [ 'ABA', @@ -538,7 +677,7 @@ const registerGTCEURecipes = (event) => { A: '#forge:screws/wrought_iron', B: 'gtceu:treated_wood_planks', C: '#forge:tools/hammers', - D: '#tfc:rock_slabs', + D: '#tfg:rock_slabs', E: '#forge:tools/screwdrivers' }).id('gtceu:shaped/pump_deck') @@ -553,7 +692,7 @@ const registerGTCEURecipes = (event) => { C: '#forge:tools/screwdrivers', D: 'gtceu:treated_wood_planks', E: 'gtceu:wood_large_fluid_pipe', - F: '#tfc:rock_slabs' + F: '#tfg:rock_slabs' }).id('gtceu:shaped/pump_hatch') @@ -569,7 +708,7 @@ const registerGTCEURecipes = (event) => { D: '#forge:rotors/wrought_iron', E: 'gtceu:treated_wood_planks', F: '#forge:tools/screwdrivers', - G: '#tfc:rock_slabs', + G: '#tfg:rock_slabs', H: 'gtceu:wood_large_fluid_pipe' }).id('gtceu:shaped/primitive_pump') diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 14ea02666..789327db3 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1024,11 +1024,19 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Ковер из мха + + event.remove({ id: 'minecraft:moss_carpet' }) + + //#endregion + + //#region Выход: Плот с сундуком + + event.remove({ id: 'minecraft:bamboo_chest_raft' }) + + //#endregion - - - //#region Выход: // event.remove({ id: '' }) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index adf4d25fd..636099112 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1939,7 +1939,6 @@ const registerTFCRecipes = (event) => { //#region Дерево // Декрафт деревянной херни в деревянную пыль - /* Object.entries(global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST).forEach(pair => { let typeName = pair[1].name @@ -1950,7 +1949,7 @@ const registerTFCRecipes = (event) => { .itemOutputs(typeOutput) .duration(600) .EUt(2) - })*/ + }) global.TFC_WOOD_TYPES.forEach(wood => { event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 91976422d..4ef7fd2e4 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -362,7 +362,11 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:stonecutter', 'minecraft:gravel', 'minecraft:gold_ingot', - 'minecraft:copper_ingot' + 'minecraft:copper_ingot', + 'minecraft:moss_block', + 'minecraft:moss_carpet', + 'minecraft:bamboo_raft', + 'minecraft:bamboo_chest_raft', /* // Other diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 665d37e11..25be65bb7 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -641,7 +641,7 @@ global.TFC_MUD_TYPES = [ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:lumber': { name: 'lumber', output: ['1x gtceu:wood_dust'] }, '#tfc:support_beams': { name: 'support_beams', output: ['2x gtceu:wood_dust'] }, - '#minecraft:boats': { name: 'boats', output: ['5x gtceu:wood_dust'] }, + // '#minecraft:boats': { name: 'boats', output: ['5x gtceu:wood_dust'] }, '#tfc:minecarts': { name: 'minecarts', output: ['5x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, '#minecraft:signs': { name: 'signs', output: ['1x gtceu:wood_dust'] }, '#minecraft:hanging_signs': { name: 'hanging_signs', output: ['1x gtceu:wood_dust'] }, @@ -659,19 +659,19 @@ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:tool_racks': { name: 'tool_racks', output: ['1x gtceu:wood_dust'] }, '#tfc:twigs': { name: 'twigs', output: ['1x gtceu:wood_dust'] }, '#tfc:workbenches': { name: 'workbenches', output: ['1x gtceu:wood_dust'] }, - '#tfg:only_default_wooden_chests': { name: 'wooden_chests', output: ['8x gtceu:wood_dust'] }, - '#tfg:only_trapped_wooden_chests': { name: 'trapped_wooden_chests', output: ['8x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, + '#forge:chests/wooden': { name: 'wooden_chests', output: ['8x gtceu:wood_dust'] }, + // '#tfg:only_trapped_wooden_chests': { name: 'trapped_wooden_chests', output: ['8x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, '#tfc:looms': { name: 'looms', output: ['2x gtceu:wood_dust'] }, '#tfc:sluices': { name: 'sluices', output: ['4x gtceu:wood_dust'] }, '#tfc:barrels': { name: 'barrels', output: ['2x gtceu:wood_dust'] }, '#tfc:lecterns': { name: 'lecterns', output: ['4x gtceu:wood_dust'] }, '#tfc:scribing_tables': { name: 'scribing_tables', output: ['1x gtceu:wood_dust'] }, '#tfc:jar_shelves': { name: 'jar_shelves', output: ['1x gtceu:wood_dust'] }, - '#tfc:axles': { name: 'axles', output: ['1x gtceu:wood_dust'] }, - '#tfg:bladed_axles': { name: 'bladed_axles', output: ['1x gtceu:wood_dust'] }, - '#tfc:clutches': { name: 'clutches', output: ['1x gtceu:wood_dust'] }, - '#tfc:gear_boxes': { name: 'gear_boxes', output: ['3x gtceu:wood_dust'] }, - '#tfc:water_wheels': { name: 'water_wheels', output: ['4x gtceu:wood_dust'] }, + // '#tfc:axles': { name: 'axles', output: ['1x gtceu:wood_dust'] }, + // '#tfg:bladed_axles': { name: 'bladed_axles', output: ['1x gtceu:wood_dust'] }, + // '#tfc:clutches': { name: 'clutches', output: ['1x gtceu:wood_dust'] }, + // '#tfc:gear_boxes': { name: 'gear_boxes', output: ['3x gtceu:wood_dust'] }, + // '#tfc:water_wheels': { name: 'water_wheels', output: ['4x gtceu:wood_dust'] }, '#tfcastikorcarts:cart_wheel': { name: '', output: ['1x gtceu:wood_dust'] }, '#tfcastikorcarts:plow': { name: 'plow', output: ['2x gtceu:wood_dust'] }, '#tfcastikorcarts:animal_cart': { name: 'animal_cart', output: ['2x gtceu:wood_dust'] },