diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 90f2cf8c8..24b00d036 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -122,14 +122,14 @@ const registerGTCEURecipes = (event) => { //#region Выход: Каменный стержень // Из сырого камня - event.recipes.gtceu.macerator('stone_rod_from_stone') + event.recipes.gtceu.lathe('stone_rod_from_stone') .itemInputs('#tfc:rock/raw') .itemOutputs('gtceu:stone_rod', 'gtceu:stone_small_dust') .duration(15) .EUt(2) // Из булыжника - event.recipes.gtceu.macerator('stone_rod_from_cobblestone') + event.recipes.gtceu.lathe('stone_rod_from_cobblestone') .itemInputs('#forge:cobblestone') .itemOutputs('gtceu:stone_rod', 'gtceu:stone_small_dust') .duration(15) @@ -306,7 +306,7 @@ const registerGTCEURecipes = (event) => { //#endregion - //#region Раскрафт ТФК рыбы в масло + //#region Выход: Рыбье масло /* event.remove({ id: 'gtceu:extractor/fish_oil_from_tropical_fish' }) @@ -322,7 +322,7 @@ const registerGTCEURecipes = (event) => { //#endregion - //#region Раскрафт ТФК семян + //#region Выход: Семянное масло /* event.remove({ id: 'gtceu:extractor/seed_oil_from_tag_seeds' }) @@ -338,6 +338,62 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Выход: Цемент + + generateMixerRecipe( + event, + ['2x #tfg:stone_dusts', 'gtceu:marble_dust', 'gtceu:gypsum_dust'], + Fluid.of('minecraft:water', 1000), + [], + Fluid.of('gtceu:concrete', 1152), + 40, + 16, + 64, + 'concrete_from_marble' + ) + + generateMixerRecipe( + event, + ['3x #tfg:stone_dusts', 'gtceu:clay_dust'], + Fluid.of('minecraft:water', 500), + [], + Fluid.of('gtceu:concrete', 576), + 20, + 16, + 64, + 'concrete_from_clay' + ) + + generateMixerRecipe( + event, + ['3x #tfg:stone_dusts', 'gtceu:calcite_dust', 'gtceu:gypsum_dust'], + Fluid.of('minecraft:water', 1000), + [], + Fluid.of('gtceu:concrete', 1152), + 40, + 16, + 64, + 'concrete_from_calcite' + ) + + //#endregion + + //#region Выход: Бурильная жидкость + + generateMixerRecipe( + event, + ['2x #tfg:stone_dusts'], + [Fluid.of('gtceu:lubricant', 20), Fluid.of('minecraft:water', 4000)], + [], + Fluid.of('gtceu:drilling_fluid', 5000), + 40, + 16, + 64, + 'drilling_fluid' + ) + + //#endregion + // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) @@ -653,4 +709,29 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.large_boiler('lava_bucket') .itemInputs('minecraft:lava_bucket') .duration(25) +} + +const generateMixerRecipe = (event, input, fluid_input, output, fluid_output, duration, EUt, rpm, id) => { + event.recipes.gtceu.mixer(id) + .itemInputs(input) + .inputFluids(fluid_input) + .itemOutputs(output) + .outputFluids(fluid_output) + .duration(duration) + .EUt(EUt) + + event.recipes.gtceu.create_mixer(id) + .itemInputs(input) + .inputFluids(fluid_input) + .itemOutputs(output) + .outputFluids(fluid_output) + .duration(duration) + .EUt(EUt) + .rpm(rpm) +} + +const generateCutterRecipe = () => { + // Вот зачем я, скажете вы, делаю тут всякие костыли, + // потому что блядский разработчик GTCEu не может исправить баги своего мода + // Я так устал.. } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 4760c2192..8acfd2c58 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -6,4 +6,32 @@ const registerGTCEUItemTags = (event) => { global.GTCEU_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) }) + + //#region Пыли стоунтайпов в один тэг + + event.add('tfg:stone_dusts', 'gtceu:gabbro_dust') + event.add('tfg:stone_dusts', 'gtceu:shale_dust') + event.add('tfg:stone_dusts', 'gtceu:claystone_dust') + event.add('tfg:stone_dusts', 'gtceu:limestone_dust') + event.add('tfg:stone_dusts', 'gtceu:conglomerate_dust') + event.add('tfg:stone_dusts', 'gtceu:dolomite_dust') + event.add('tfg:stone_dusts', 'gtceu:chert_dust') + event.add('tfg:stone_dusts', 'gtceu:chalk_dust') + event.add('tfg:stone_dusts', 'gtceu:rhyolite_dust') + event.add('tfg:stone_dusts', 'gtceu:dacite_dust') + event.add('tfg:stone_dusts', 'gtceu:quartzite_dust') + event.add('tfg:stone_dusts', 'gtceu:slate_dust') + event.add('tfg:stone_dusts', 'gtceu:phyllite_dust') + event.add('tfg:stone_dusts', 'gtceu:schist_dust') + event.add('tfg:stone_dusts', 'gtceu:gneiss_dust') + event.add('tfg:stone_dusts', 'gtceu:marble_dust') + event.add('tfg:stone_dusts', 'gtceu:basalt_dust') + event.add('tfg:stone_dusts', 'gtceu:diorite_dust') + event.add('tfg:stone_dusts', 'gtceu:andesite_dust') + event.add('tfg:stone_dusts', 'gtceu:granite_dust') + + event.add('tfg:stone_dusts', 'gtceu:stone_dust') + + //#endregion + } diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 9b6df288b..2c49c9030 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -8,7 +8,7 @@ ServerEvents.tags('item', event => { // registerFirmaLifeItemTags(event) // registerSmallShipsItemTags(event) registerMinecraftItemTags(event) - // registerGTCEUItemTags(event) + registerGTCEUItemTags(event) // registerAE2ItemTags(event) // registerCreateItemTags(event) registerAdAstraItemTags(event) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index a643fb6ac..14ea02666 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -53,6 +53,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Булыжник + event.remove({ id: 'gtceu:shaped/cobblestone_hammer' }) event.remove({ id: 'ae2:entropy/cool/stone_cobblestone' }) event.remove({ id: 'gtceu:forge_hammer/stone_to_cobblestone' }) event.remove({ id: 'gtceu:rock_breaker/cobblestone' }) @@ -991,13 +992,43 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Кремний + + event.shapeless('minecraft:flint', [ + '#tfc:rock/gravel', + '#forge:tools/mortars' + ]).id('gtceu:shapeless/gravel_to_flint') + + event.recipes.gtceu.sifter('gravel_sifting') + .itemInputs('#tfc:rock/gravel') + .itemOutputs('minecraft:flint') + .chancedOutput('minecraft:flint', 9000, 0) + .chancedOutput('minecraft:flint', 8000, 0) + .chancedOutput('minecraft:flint', 6000, 0) + .chancedOutput('minecraft:flint', 3300, 0) + .chancedOutput('minecraft:flint', 2500, 0) + .duration(100) + .EUt(16) + + //#endregion + + //#region Выход: Блок глины + + event.remove({ id: 'gtceu:fluid_heater/mud_to_clay' }) + + //#endregion + + //#region Выход: Мангровые корни в грязи + + event.remove({ id: 'minecraft:muddy_mangrove_roots' }) + + //#endregion - - + //#region Выход: // event.remove({ id: '' }) @@ -1009,7 +1040,7 @@ const registerMinecraftRecipes = (event) => { //#region Рецепты где на выходе булыга // Камень -> Булыга (Верстак) - event.remove({ id: 'gtceu:shaped/cobblestone_hammer' }) + //#endregion diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index fbd8d145d..91976422d 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -328,7 +328,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_planks", "minecraft:mangrove_propagule", "minecraft:mangrove_log", - // "minecraft:mangrove_roots", + "minecraft:mangrove_roots", "minecraft:muddy_mangrove_roots", "minecraft:stripped_mangrove_log", "minecraft:stripped_mangrove_wood",