diff --git a/kubejs/server_scripts/asticor_carts/recipes.js b/kubejs/server_scripts/asticor_carts/recipes.js new file mode 100644 index 000000000..98cbdebb7 --- /dev/null +++ b/kubejs/server_scripts/asticor_carts/recipes.js @@ -0,0 +1,8 @@ +// priority: 0 + +const registerAsticorCartsRecipes = (event) => { + event.remove({ id: 'astikorcarts:animal_cart' }) + event.remove({ id: 'astikorcarts:supply_cart' }) + event.remove({ id: 'astikorcarts:plow' }) + event.remove({ id: 'astikorcarts:wheel' }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/asticor_carts/tags.js b/kubejs/server_scripts/asticor_carts/tags.js new file mode 100644 index 000000000..8ca6d3010 --- /dev/null +++ b/kubejs/server_scripts/asticor_carts/tags.js @@ -0,0 +1,16 @@ +// priority: 0 + +const registerAsticorCartsItemTags = (event) => { + + global.ASTICOR_CARTS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) +} + +const registerAsticorCartsBlockTags = (event) => { + + global.ASTICOR_CARTS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 83cd0731b..4033c020c 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -316,6 +316,7 @@ const registerGTCEURecipes = (event) => { ['2x #tfg:stone_dusts', 'gtceu:marble_dust', 'gtceu:gypsum_dust'], Fluid.of('minecraft:water', 1000), [], + null, Fluid.of('gtceu:concrete', 1152), 40, 16, @@ -328,6 +329,7 @@ const registerGTCEURecipes = (event) => { ['3x #tfg:stone_dusts', 'gtceu:clay_dust'], Fluid.of('minecraft:water', 500), [], + null, Fluid.of('gtceu:concrete', 576), 20, 16, @@ -340,6 +342,7 @@ const registerGTCEURecipes = (event) => { ['3x #tfg:stone_dusts', 'gtceu:calcite_dust', 'gtceu:gypsum_dust'], Fluid.of('minecraft:water', 1000), [], + null, Fluid.of('gtceu:concrete', 1152), 40, 16, @@ -356,6 +359,7 @@ const registerGTCEURecipes = (event) => { ['2x #tfg:stone_dusts'], [Fluid.of('gtceu:lubricant', 20), Fluid.of('minecraft:water', 4000)], [], + null, Fluid.of('gtceu:drilling_fluid', 5000), 40, 16, @@ -478,10 +482,10 @@ const registerGTCEURecipes = (event) => { 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_bamboo_planks'}) // TODO + event.remove({id: 'gtceu:macerator/macerate_bamboo_fence_gate'}) // TODO + event.remove({id: 'gtceu:macerator/macerate_bamboo_fence'}) // TODO + event.remove({id: 'gtceu:macerator/macerate_bamboo_door'}) // TODO 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'}) @@ -1044,6 +1048,7 @@ const registerGTCEURecipes = (event) => { //#region Вырезка из резины + // TODO: Не работает из-за магического бага // event.recipes.tfc.knapping('gtceu:rubber_ring', 'tfg:rubber', ['XXX', 'X X', 'XXX']) // .ingredient('gtceu:rubber_plate') @@ -1071,8 +1076,9 @@ const registerGTCEURecipes = (event) => { // Удалить после фикса GTCEu event.remove({id: 'gtceu:extractor/extract_raw_rubber_dust'}) - // Пыль звезды незера (удалить после имплементации ада) - event.recipes.gtceu.chemical_reactor('tfg:nether_star_dust') + // Пыль звезды незера + // TODO: удалить после имплементации ада + event.recipes.gtceu.chemical_reactor('tfg:gtceu/nether_star_dust') .itemInputs('2x #forge:dusts/iridium', '#forge:dusts/diamond') .circuit(10) .itemOutputs('gtceu:nether_star_dust') @@ -1174,7 +1180,18 @@ const registerGTCEURecipes = (event) => { D: 'gtceu:tin_single_cable' }).id('gtceu:shaped/electric_blast_furnace') - // LV Casing + // Клей из ТФК клея + event.recipes.gtceu.centrifuge('glue_from_tfc_glue') + .itemInputs('tfc:glue') + .outputFluids(Fluid.of('gtceu:glue', 50)) + .duration(400) + .EUt(5) + + // Исправление рецепта пыли серебра стерлинга + generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/silver'], [], '5x gtceu:sterling_silver_dust', 1, [], 500, 24, 64, 'sterling_silver') + + //#region LV Casing + event.shaped('gtceu:lv_machine_casing', [ 'ABA', 'BCB', @@ -1204,14 +1221,10 @@ const registerGTCEURecipes = (event) => { .duration(448) .EUt(8) - // Клей из ТФК клея - event.recipes.gtceu.centrifuge('glue_from_tfc_glue') - .itemInputs('tfc:glue') - .outputFluids(Fluid.of('gtceu:glue', 50)) - .duration(400) - .EUt(5) + //#endregion + + //#region Рецепт ULV микросхемы - // Рецепт ULV микросхемы event.remove({ id: 'gtceu:shaped/vacuum_tube' }) event.recipes.createSequencedAssembly([ @@ -1222,7 +1235,10 @@ const registerGTCEURecipes = (event) => { event.recipes.createDeploying('tfg:unfinished_vacuum_tube', ['tfg:unfinished_vacuum_tube', 'gtceu:copper_single_wire']), ]).transitionalItem('tfg:unfinished_vacuum_tube').loops(2).id('tfg:gtceu/sequenced_assembly/vacuum_tube') - // Рецепт LV микросхемы + //#endregion + + //#region Рецепт LV микросхемы + event.remove({ id: 'gtceu:shaped/electronic_circuit_lv' }) event.recipes.createSequencedAssembly([ @@ -1234,6 +1250,8 @@ const registerGTCEURecipes = (event) => { event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', 'gtceu:red_alloy_single_cable']), ]).transitionalItem('tfg:unfinished_basic_electronic_circuit').loops(2).id('tfg:gtceu/sequenced_assembly/basic_electronic_circuit') + //#endregion + //#region Рецепты электрического генератора event.recipes.gtceu.alternator('32_rpm_to_32_eu') @@ -1268,13 +1286,14 @@ const registerGTCEURecipes = (event) => { //#region Выход: Фикс выработки пара на ведре лавы - event.remove({ id: 'minecraft:large_boiler/lava_bucket' }) - event.recipes.gtceu.large_boiler('lava_bucket') - .itemInputs('minecraft:lava_bucket') - .duration(25) + //event.remove({ id: 'minecraft:large_boiler/lava_bucket' }) + //event.recipes.gtceu.large_boiler('lava_bucket') + // .itemInputs('minecraft:lava_bucket') + // .duration(25) //#endregion + //#region Рецепты, которые итерируются по всем материалам GTMaterialRegistry.getRegisteredMaterials().forEach(material => { diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 3a01a2e2d..2cdec29a8 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -1,7 +1,7 @@ // priority: 0 -const generateMixerRecipe = (event, input, fluid_input, output, fluid_output, duration, EUt, rpm, id) => { - event.recipes.gtceu.mixer(id) +const generateMixerRecipe = (event, input, fluid_input, output, circuit, fluid_output, duration, EUt, rpm, id) => { + const recipe1 = event.recipes.gtceu.mixer(id) .itemInputs(input) .inputFluids(fluid_input) .itemOutputs(output) @@ -9,7 +9,7 @@ const generateMixerRecipe = (event, input, fluid_input, output, fluid_output, du .duration(duration) .EUt(EUt) - event.recipes.gtceu.create_mixer(id) + const recipe2 = event.recipes.gtceu.create_mixer(id) .itemInputs(input) .inputFluids(fluid_input) .itemOutputs(output) @@ -17,6 +17,11 @@ const generateMixerRecipe = (event, input, fluid_input, output, fluid_output, du .duration(duration) .EUt(EUt) .rpm(rpm) + + if (circuit != null) { + recipe1.circuit(circuit) + recipe2.circuit(circuit) + } } const generateCutterRecipe = (event, input, circuit, output, duration, EUt, id) => { diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 829bbc4b2..c73f82953 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -8,6 +8,7 @@ const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelp */ ServerEvents.tags('item', event => { registerAE2ItemTags(event) + registerAsticorCartsItemTags(event) registerChiselAndBitsItemTags(event) registerComputerCraftItemTags(event) registerCreateItemTags(event) @@ -28,6 +29,7 @@ ServerEvents.tags('item', event => { */ ServerEvents.tags('block', event => { registerAE2BlockTags(event) + registerAsticorCartsBlockTags(event) registerChiselAndBitsBlockTags(event) registerComputerCraftBlockTags(event) registerCreateBlockTags(event) @@ -102,6 +104,7 @@ GTCEuServerEvents.oreVeins(event => { */ ServerEvents.recipes(event => { registerAE2Recipes(event) + registerAsticorCartsRecipes(event) registerAE2WTLibRecipes(event) registerChiselAndBitsRecipes(event) registerComputerCraftRecipes(event) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index ab7b622a1..af14e3b89 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2984,7 +2984,7 @@ const registerTFCRecipes = (event) => { .EUt(4) // Jute Fiber - generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', [], 100, 4, 16, 'tfg:tfc/jute_fiber') + generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', null, [], 100, 4, 16, 'tfg:tfc/jute_fiber') // Soda Ash event.smelting('3x tfc:powder/soda_ash', 'tfc:food/dried_seaweed').id('tfg:smelting/dried_seaweed_to_soda') diff --git a/kubejs/startup_scripts/asticor_carts/constants.js b/kubejs/startup_scripts/asticor_carts/constants.js new file mode 100644 index 000000000..9139b2c02 --- /dev/null +++ b/kubejs/startup_scripts/asticor_carts/constants.js @@ -0,0 +1,8 @@ +// priority: 0 + +global.ASTICOR_CARTS_DISABLED_ITEMS = [ + 'astikorcarts:animal_cart', + 'astikorcarts:supply_cart', + 'astikorcarts:plow', + 'astikorcarts:wheel' +]; \ No newline at end of file