illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

work

Browse source
This commit is contained in:
Dmitry 2024-02-04 18:21:01 +07:00
parent d793be5f81
commit 2012904ccf
5 changed files with 89 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kubejs/assets/emi/recipe/filters/categories.json
View file

@ -35,6 +35,9 @@
},
{
"id": "/emi:/grindstone/repairing/minecraft/[^*]+/"
},
{
"id": "/emi:/crafting/shulker_box_dying/minecraft/[^*]+/"
}
]
}

28
kubejs/server_scripts/minecraft/recipes.js
View file

@ -1034,12 +1034,6 @@ const registerMinecraftRecipes = (event) => {
//#endregion
//#region Выход: Плот с сундуком
event.remove({ id: 'minecraft:bamboo_chest_raft' })
//#endregion
//#region Выход: Бамбуковые доски
event.shapeless('2x minecraft:bamboo_planks', [
@ -1049,6 +1043,12 @@ const registerMinecraftRecipes = (event) => {
//#endregion
//#region Выход: Плот с сундуком
event.remove({ id: 'minecraft:bamboo_chest_raft' })
//#endregion
//#region Красители
// White
@ -1629,6 +1629,14 @@ const registerMinecraftRecipes = (event) => {
//#endregion
//#region Выход: Сухая губка
event.recipes.tfc.heating('minecraft:wet_sponge', 790)
.resultItem('minecraft:sponge')
.id('tfg:minecraft/heating/sponge')
//#endregion
//#region Выход: Прожаренный фрукт хоруса
event.remove({ id: 'minecraft:popped_chorus_fruit' })
@ -2447,8 +2455,12 @@ const registerMinecraftRecipes = (event) => {
event.remove({ id: `minecraft:dye_${dye}_carpet` })
if (dye != 'white')
{
event.shapeless(`2x minecraft:${dye}_carpet`, [
'#tfc:saws',
`minecraft:${dye}_wool`
]).id(`minecraft:${dye}_carpet`)
if (dye != 'white') {
event.recipes.gtceu.chemical_bath(`tfg:${dye}_carpet`)
.itemInputs(`minecraft:white_carpet`)
.inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72))

4
kubejs/server_scripts/tfc/recipes.js
View file

@ -2086,6 +2086,8 @@ const registerTFCRecipes = (event) => {
//#region Песок
// Песок душ -> Желтый песок
// TODO: Включить после добавления ада
/*
event.recipes.gtceu.centrifuge('soul_sand_separation')
.itemInputs('minecraft:soul_sand')
.chancedOutput('tfc:sand/yellow', 9000, 130)
@ -2093,7 +2095,7 @@ const registerTFCRecipes = (event) => {
.chancedOutput('gtceu:tiny_coal_dust', 2000, 340)
.outputFluids(Fluid.of('gtceu:oil', 80))
.duration(200)
.EUt(80)
.EUt(80)*/
// Нефтеносный -> Желтый песок
event.recipes.gtceu.centrifuge('oilsands_ore_separation')

37
kubejs/server_scripts/water_flasks/recipes.js
View file

@ -17,5 +17,40 @@ const registerWaterFlasksRecipes = (event) => {
.resultFluid(Fluid.of('gtceu:iron', 144))
.useDurability(true)
.id(`waterflasks:heating/wrought_iron_iron_flask`)
//#region Кожанная фласка
event.recipes.gtceu.assembler('tfg:water_flasks/leather_flask')
.itemInputs('3x #forge:leather', '2x #forge:string')
.circuit(1)
.itemOutputs('waterflasks:leather_flask')
.duration(250)
.EUt(16)
event.recipes.gtceu.assembler('tfg:water_flasks/leather_flask_repair')
.itemInputs('waterflasks:broken_leather_flask', '#forge:leather', '2x #forge:string')
.circuit(2)
.itemOutputs('waterflasks:leather_flask')
.duration(250)
.EUt(16)
//#endregion
//#region Железная фласка
event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask')
.itemInputs('tfc:burlap_cloth', '#forge:string', '#forge:leather', '#forge:plates/wrought_iron')
.circuit(1)
.itemOutputs('waterflasks:iron_flask')
.duration(250)
.EUt(16)
event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask_repair')
.itemInputs('waterflasks:broken_iron_flask', 'tfc:burlap_cloth', '#forge:string', '#forge:leather')
.circuit(2)
.itemOutputs('waterflasks:iron_flask')
.duration(250)
.EUt(16)
//#endregion
}

45
kubejs/startup_scripts/minecraft/constants.js
View file

@ -732,11 +732,9 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:raw_copper_block',
'minecraft:compass',
'minecraft:iron_bars',
];
global.MINECRAFT_HIDED_ITEMS = [
'/spawn_egg/',
// Кримзон незер дерево
// TODO: Разблокировать после добавления ада
'minecraft:crimson_stem',
'minecraft:crimson_hyphae',
'minecraft:stripped_crimson_stem',
@ -751,6 +749,8 @@ global.MINECRAFT_HIDED_ITEMS = [
'minecraft:crimson_pressure_plate',
'minecraft:crimson_button',
// Варпед незер дерево
// TODO: Разблокировать после добавления ада
'minecraft:warped_stem',
'minecraft:warped_hyphae',
'minecraft:stripped_warped_stem',
@ -765,6 +765,8 @@ global.MINECRAFT_HIDED_ITEMS = [
'minecraft:warped_pressure_plate',
'minecraft:warped_button',
// Куча незер блоков
// TODO: Разблокировать после добавления ада
'minecraft:polished_blackstone_bricks',
'minecraft:cracked_polished_blackstone_bricks',
'minecraft:polished_blackstone_brick_stairs',
@ -798,19 +800,8 @@ global.MINECRAFT_HIDED_ITEMS = [
'minecraft:polished_blackstone_pressure_plate',
'minecraft:polished_blackstone_button',
'minecraft:exposed_copper',
'minecraft:exposed_cut_copper',
'minecraft:exposed_cut_copper_stairs',
'minecraft:exposed_cut_copper_slab',
'minecraft:weathered_copper',
'minecraft:weathered_cut_copper',
'minecraft:weathered_cut_copper_stairs',
'minecraft:weathered_cut_copper_slab',
'minecraft:oxidized_copper',
'minecraft:oxidized_cut_copper',
'minecraft:oxidized_cut_copper_stairs',
'minecraft:oxidized_cut_copper_slab',
// И еще куча незер блоков
// TODO: Разблокировать после добавления ада
'minecraft:crying_obsidian',
'minecraft:crimson_nylium',
'minecraft:warped_nylium',
@ -837,6 +828,23 @@ global.MINECRAFT_HIDED_ITEMS = [
'minecraft:respawn_anchor',
];
global.MINECRAFT_HIDED_ITEMS = [
'/spawn_egg/',
'minecraft:exposed_copper',
'minecraft:exposed_cut_copper',
'minecraft:exposed_cut_copper_stairs',
'minecraft:exposed_cut_copper_slab',
'minecraft:weathered_copper',
'minecraft:weathered_cut_copper',
'minecraft:weathered_cut_copper_stairs',
'minecraft:weathered_cut_copper_slab',
'minecraft:oxidized_copper',
'minecraft:oxidized_cut_copper',
'minecraft:oxidized_cut_copper_stairs',
'minecraft:oxidized_cut_copper_slab',
];
global.VANILLA_WOOD_TYPES = [
"oak",
"spruce",
@ -846,7 +854,8 @@ global.VANILLA_WOOD_TYPES = [
"cherry",
"dark_oak",
"mangrove",
"bamboo",
"crimson", // TODO: Разблокировать когда появится АД
"warped" // TODO: Разблокировать когда появится АД
];
global.VANILLA_STONE_TYPES = [