diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 3a20804c4..56eb05712 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -3,5 +3,8 @@ "gtceu.jei.bedrock_fluid.salt_water_deposit": "Concentrated Salt Water Deposit", "block.gtceu.greenhouse": "Electric Greenhouse", - "gtceu.greenhouse": "Electric Greenhouse" + "gtceu.greenhouse": "Electric Greenhouse", + + "block.gtceu.alternator": "Alternator", + "gtceu.alternator": "Alternator" } \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 94178f7bd..4b5497d1d 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -5,6 +5,9 @@ "block.gtceu.greenhouse": "Электрическая теплица", "gtceu.greenhouse": "Электрическая теплица", + "block.gtceu.alternator": "Генератор переменного тока", + "gtceu.alternator": "Генератор переменного тока", + "behavior.item_magnet.disabled": "§cМагнитное поле выключено", "behavior.item_magnet.enabled": "§aМагнитное поле включено", "behavior.prospector.not_enough_energy": "Не достаточно энергии!", diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png new file mode 100644 index 000000000..e4edb9e4b Binary files /dev/null and b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta new file mode 100644 index 000000000..fc2ebfe89 --- /dev/null +++ b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "terrafirmagreg:block/copper_coil_block_ctm" + } +} diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png new file mode 100644 index 000000000..07177b317 Binary files /dev/null and b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta new file mode 100644 index 000000000..df6100a46 --- /dev/null +++ b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta @@ -0,0 +1,6 @@ +{ + "ldlib": { + "connection": "terrafirmagreg:block/copper_coil_block_bloom_ctm", + "emissive": true + } +} \ No newline at end of file diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png new file mode 100644 index 000000000..b58e4f54a Binary files /dev/null and b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png new file mode 100644 index 000000000..74e65ef6e Binary files /dev/null and b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png differ diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 87ebd7a94..dfcad1e96 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -5,32 +5,6 @@ const registerCreateAdditionsRecipes = (event) => { // Удаление рецептов мода railways event.remove({ mod: 'createaddition' }); - // Электрический мотор - event.shaped('createaddition:electric_motor', [ - 'ABA', - 'CDC', - 'CEC' - ], { - A: '#forge:plates/brass', - B: 'create:shaft', - C: 'createaddition:copper_spool', - D: 'create:cogwheel', - E: '#forge:gears/wrought_iron', - }).id('tfg:create_additions/shaped/electric_motor') - - // Конвертер энергии в механику - event.shaped('createaddition:alternator', [ - 'CEC', - 'CDC', - 'ABA', - ], { - A: '#forge:plates/wrought_iron', - B: 'create:shaft', - C: 'createaddition:copper_spool', - D: 'create:cogwheel', - E: '#forge:gears/wrought_iron', - }).id('tfg:create_additions/shaped/alternator') - // Прокатный стан event.shaped('createaddition:rolling_mill', [ 'ABA', @@ -75,71 +49,6 @@ const registerCreateAdditionsRecipes = (event) => { .duration(400) .EUt(512) - // Коннектор обычный - event.shaped('createaddition:connector', [ - 'ABA', - 'CBC' - ], { - A: 'tfc:glue', - B: '#forge:cables/double/copper', - C: '#forge:plates/wrought_iron', - }).id('tfg:create_additions/shaped/connector') - - // Коннектор большой - /* - event.shaped('createaddition:large_connector', [ - 'ABA', - 'CBC', - 'CBC' - ], { - A: 'tfc:glue', - B: '#forge:cables/double/copper', - C: '#forge:plates/wrought_iron', - }).id('tfg:create_additions/shaped/large_connector') - */ - - // Редстоун реле - event.shaped('createaddition:redstone_relay', [ - ' D ', - 'BCB', - 'AAA' - ], { - A: '#tfc:rock/raw', - B: 'createaddition:connector', - C: 'create:electron_tube', - D: '#forge:dusts/redstone' - }).id('tfg:create_additions/shaped/redstone_relay') - - // Катушка - event.shaped('8x createaddition:spool', [ - 'A', - 'B', - 'A' - ], { - A: '#forge:screws/wood', - B: '#forge:rods/long/wood' - }).id('tfg:create_additions/shaped/spool') - - // Катушка с медными проводами - event.shaped('createaddition:copper_spool', [ - ' A ', - 'ABA', - ' A ' - ], { - A: '#forge:fine_wires/copper', - B: 'createaddition:spool' - }).id('tfg:create_additions/shaped/copper_spool') - - // Катушка с праздничными проводами - event.shaped('createaddition:festive_spool', [ - ' A ', - 'ABA', - ' A ' - ], { - A: 'gtceu:plant_ball', - B: 'createaddition:spool' - }).id('tfg:create_additions/shaped/festive_spool') - // Колючая проволка event.shapeless('4x createaddition:barbed_wire', [ '#forge:rods/wrought_iron', @@ -159,10 +68,4 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) - - // Коннектор со светом - event.shapeless('createaddition:small_light_connector', [ - 'createaddition:connector', - 'minecraft:glass_pane' - ]).id('tfg:create_additions/shapeless/small_light_connector') } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index e529b9688..b3d864a9a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -993,6 +993,19 @@ const registerGTCEURecipes = (event) => { D: 'gtceu:solid_machine_casing' }).id('tfg:shaped/greenhouse') + // Контроллер электрического генератора + event.shaped('gtceu:alternator', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: '#gtceu:resistors', + B: '#forge:circuits/lv', + C: 'gtceu:lv_voltage_coil', + D: 'gtceu:solid_machine_casing', + E: '#forge:cables/single/copper' + }).id('tfg:shaped/alternator') + // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', @@ -1112,6 +1125,37 @@ const registerGTCEURecipes = (event) => { event.recipes.createDeploying('terrafirmagreg:unfinished_basic_electronic_circuit', ['terrafirmagreg:unfinished_basic_electronic_circuit', '#forge:cables/single/red_alloy']), ]).transitionalItem('terrafirmagreg:unfinished_basic_electronic_circuit').loops(2).id('tfg:gtceu/sequenced_assembly/basic_electronic_circuit') + //#region Рецепты электрического генератора + + event.recipes.gtceu.alternator('32_rpm_to_32_eu') + .inputStress(256) + .circuit(0) + .rpm(32) + .duration(2) + .EUt(-32) + + event.recipes.gtceu.alternator('64_rpm_to_48_eu') + .inputStress(256) + .circuit(1) + .rpm(64) + .duration(2) + .EUt(-48) + + event.recipes.gtceu.alternator('128_rpm_to_64_eu') + .inputStress(256) + .circuit(2) + .rpm(128) + .duration(2) + .EUt(-64) + + event.recipes.gtceu.alternator('256_rpm_to_96_eu') + .inputStress(256) + .circuit(3) + .rpm(256) + .duration(2) + .EUt(-96) + + //#endregion //#region Выход: Фикс выработки пара на ведре лавы diff --git a/kubejs/startup_scripts/gtceu/blocks.js b/kubejs/startup_scripts/gtceu/blocks.js new file mode 100644 index 000000000..35624b24d --- /dev/null +++ b/kubejs/startup_scripts/gtceu/blocks.js @@ -0,0 +1,16 @@ +// priority: 0 + +const registerGTCEuBlocks = (event) => { + event.create('terrafirmagreg:copper_coil_block', 'gtceu:coil') + .temperature(1100) + .level(0) + .energyDiscount(1) + .tier(0) + .coilMaterial(GTMaterials.get('copper')) + .texture('terrafirmagreg:block/copper_coil_block') + .hardness(4) + .requiresTool(true) + .tagBlock('mineable/pickaxe') + .mapColor('metal') + .soundType('metal') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 0a2c4767d..1209e5558 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -23,4 +23,25 @@ const registerGTCEuMachines = (event) => { .build() ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) + + event.create('alternator', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('alternator') + .pattern(definition => FactoryBlockPattern.start() + .aisle("CWC", "CWC", "#W#") + .aisle("CWC", "K#E", "CWC") + .aisle("CWI", "CWA", "#W#") + .where('A', Predicates.controller(Predicates.blocks(definition.get()))) + .where('W', Predicates.blocks('terrafirmagreg:copper_coil_block')) + .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) + .where('#', Predicates.any()) + .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1)) + .where('E', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)) + .where('I', Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1)) + .build() + ) + .workableCasingRenderer( + "gtceu:block/casings/solid/machine_casing_solid_steel", + "gtceu:block/multiblock/implosion_compressor", false + ) } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 50edee843..eb4144c95 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -7,4 +7,13 @@ const registerGTCEuRecipeTypes = (event) => { .setMaxIOSize(3, 4, 1, 0) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) -} \ No newline at end of file + + event.create('alternator') + .category('alternator') + .setEUIO('out') + .setMaxIOSize(1, 0, 0, 0) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.ARC) + .setMaxTooltips(6) +} + diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index bd4ad0820..98f98dc45 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -10,7 +10,9 @@ StartupEvents.registry('item', (event) => { /** * Событие регистрации блоков. */ -StartupEvents.registry('block', (event) => {}) +StartupEvents.registry('block', (event) => { + registerGTCEuBlocks(event) +}) /** * Событие регистрации жидкостей.