Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restore all!

Browse Source
This commit is contained in:
Dmitry
2024-10-09 10:54:37 +07:00
parent 764842eb2c
commit 1c557771b8
5 changed files with 186 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kubejs/server_scripts/ae2/tags.js
View File

@@ -4,15 +4,15 @@ const registerAE2ItemTags = (event) => {
event.add('c:hidden_from_recipe_viewers', "ae2:facade")
// global.AE2_DISABLED_ITEMS.forEach(item => {
// event.removeAllTagsFrom(item)
// event.add('c:hidden_from_recipe_viewers', item)
// })
global.AE2_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
event.add('c:hidden_from_recipe_viewers', item)
})
}
const registerAE2BlockTags = (event) => {
// global.AE2_DISABLED_ITEMS.forEach(item => {
// event.removeAllTagsFrom(item)
// })
global.AE2_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
})
}

221
kubejs/server_scripts/chisel_and_bits/recipes.js
View File

@@ -2,117 +2,114 @@
const registerChiselAndBitsRecipes = (event) => {
if (Platform.isLoaded('chiselsandbits')) {
event.remove({ not: [
{ id: 'chiselsandbits:quill' }
], mod: 'chiselsandbits' })
// Мешок для кусочков блоков
event.recipes.tfc.knapping('chiselsandbits:bit_bag', 'tfc:leather', [
" X X ",
"X X",
"X X",
"XXXXX"
]).ingredient('#tfc:leather_knapping').id('tfg:chiselsandbits/knapping_leather/bit_bag')
// Лупа
event.shaped('chiselsandbits:magnifying_glass', [
'A',
'C',
'B'
], {
A: '#forge:glass',
B: '#forge:rods/wooden',
C: '#forge:rings/wrought_iron'
}).id('tfg:chiselsandbits/shaped/magnifying_glass')
// Алмазная стамеска
event.shapeless('chiselsandbits:chisel_diamond', [
'#tfc:chisels',
'tfc:powder/diamond',
'tfc:powder/diamond',
'tfc:powder/diamond'
]).id('tfg:chiselsandbits/shapeless/chisel_diamond')
// Хранилище кусочков
event.shaped('chiselsandbits:bit_storage', [
'ABA',
'C C',
'ADA'
], {
A: '#forge:rods/wrought_iron',
B: '#forge:tools/wrench',
C: 'forge:glass_panes',
D: 'minecraft:wooden_slabs',
}).id('tfg:chiselsandbits/shaped/bit_storage')
// Рулетка
event.shaped('chiselsandbits:measuring_tape', [
' AB',
' BA',
'C '
], {
A: '#forge:dyes/yellow',
B: '#forge:string',
C: '#forge:rods/wrought_iron'
}).id('tfg:chiselsandbits/shaped/measuring_tape')
// Герметик
event.shapeless('chiselsandbits:sealant', [
'minecraft:slime_ball',
'firmalife:raw_honey'
]).id('tfg:chiselsandbits/shapeless/sealant_from_slimeballs')
event.shapeless('chiselsandbits:sealant', [
'tfc:glue',
'firmalife:raw_honey'
]).id('tfg:chiselsandbits/shapeless/sealant_from_glue')
// Резной принтер
event.shaped('chiselsandbits:chiseled_printer', [
' A ',
'B B',
'BCB'
], {
A: '#forge:tools/wrench',
B: '#tfc:support_beams',
C: '#forge:smooth_stone_slab'
}).id('tfg:chiselsandbits/shaped/chiseled_printer')
// Стол модификаций
event.shaped('chiselsandbits:modification_table', [
'ABA',
'CDC',
'C C'
], {
A: '#minecraft:wooden_slabs',
B: '#forge:tools/wrench',
C: '#tfc:support_beams',
D: '#tfc:workbenches'
}).id('tfg:chiselsandbits/shaped/modification_table')
// Принтер и сканер шаблонов
event.shaped('chiselsandbits:pattern_scanner', [
' A ',
'B B',
'BCB'
], {
A: '#forge:tools/wrench',
B: '#tfc:lumber',
C: '#forge:smooth_stone_slab'
}).id('tfg:chiselsandbits/shaped/pattern_scanner')
// Удалятель герметика
event.shaped('chiselsandbits:wrench', [
' AB',
' AA',
'A '
], {
A: '#tfc:lumber',
B: 'chiselsandbits:block_bit',
}).id('tfg:chiselsandbits/shaped/wrench')
}
if (!Platform.isLoaded('chiselsandbits')) return;
event.remove({ not: [
{ id: 'chiselsandbits:quill' }
], mod: 'chiselsandbits' })
// Мешок для кусочков блоков
event.recipes.tfc.knapping('chiselsandbits:bit_bag', 'tfc:leather', [
" X X ",
"X X",
"X X",
"XXXXX"
]).ingredient('#tfc:leather_knapping').id('tfg:chiselsandbits/knapping_leather/bit_bag')
// Лупа
event.shaped('chiselsandbits:magnifying_glass', [
'A',
'C',
'B'
], {
A: '#forge:glass',
B: '#forge:rods/wooden',
C: '#forge:rings/wrought_iron'
}).id('tfg:chiselsandbits/shaped/magnifying_glass')
// Алмазная стамеска
event.shapeless('chiselsandbits:chisel_diamond', [
'#tfc:chisels',
'tfc:powder/diamond',
'tfc:powder/diamond',
'tfc:powder/diamond'
]).id('tfg:chiselsandbits/shapeless/chisel_diamond')
// Хранилище кусочков
event.shaped('chiselsandbits:bit_storage', [
'ABA',
'C C',
'ADA'
], {
A: '#forge:rods/wrought_iron',
B: '#forge:tools/wrench',
C: 'forge:glass_panes',
D: 'minecraft:wooden_slabs',
}).id('tfg:chiselsandbits/shaped/bit_storage')
// Рулетка
event.shaped('chiselsandbits:measuring_tape', [
' AB',
' BA',
'C '
], {
A: '#forge:dyes/yellow',
B: '#forge:string',
C: '#forge:rods/wrought_iron'
}).id('tfg:chiselsandbits/shaped/measuring_tape')
// Герметик
event.shapeless('chiselsandbits:sealant', [
'minecraft:slime_ball',
'firmalife:raw_honey'
]).id('tfg:chiselsandbits/shapeless/sealant_from_slimeballs')
event.shapeless('chiselsandbits:sealant', [
'tfc:glue',
'firmalife:raw_honey'
]).id('tfg:chiselsandbits/shapeless/sealant_from_glue')
// Резной принтер
event.shaped('chiselsandbits:chiseled_printer', [
' A ',
'B B',
'BCB'
], {
A: '#forge:tools/wrench',
B: '#tfc:support_beams',
C: '#forge:smooth_stone_slab'
}).id('tfg:chiselsandbits/shaped/chiseled_printer')
// Стол модификаций
event.shaped('chiselsandbits:modification_table', [
'ABA',
'CDC',
'C C'
], {
A: '#minecraft:wooden_slabs',
B: '#forge:tools/wrench',
C: '#tfc:support_beams',
D: '#tfc:workbenches'
}).id('tfg:chiselsandbits/shaped/modification_table')
// Принтер и сканер шаблонов
event.shaped('chiselsandbits:pattern_scanner', [
' A ',
'B B',
'BCB'
], {
A: '#forge:tools/wrench',
B: '#tfc:lumber',
C: '#forge:smooth_stone_slab'
}).id('tfg:chiselsandbits/shaped/pattern_scanner')
// Удалятель герметика
event.shaped('chiselsandbits:wrench', [
' AB',
' AA',
'A '
], {
A: '#tfc:lumber',
B: 'chiselsandbits:block_bit',
}).id('tfg:chiselsandbits/shaped/wrench')
}

16
kubejs/server_scripts/chisel_and_bits/tags.js
View File

@@ -2,23 +2,21 @@
const registerChiselAndBitsItemTags = (event) => {
if (Platform.isLoaded('chiselsandbits')) {
event.add('c:hidden_from_recipe_viewers', "chiselandbits:block_bit")
if (!Platform.isLoaded('chiselsandbits')) return
event.add('c:hidden_from_recipe_viewers', "chiselandbits:block_bit")
global.CHISEL_AND_BITS_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
event.add('c:hidden_from_recipe_viewers', item)
})
}
}
const registerChiselAndBitsBlockTags = (event) => {
if (Platform.isLoaded('chiselsandbits')) {
global.CHISEL_AND_BITS_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
})
}
if (!Platform.isLoaded('chiselsandbits')) return
global.CHISEL_AND_BITS_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
})
}

51
kubejs/server_scripts/computer_craft/recipes.js
View File

@@ -9,12 +9,11 @@ const registerComputerCraftRecipes = (event) => {
], mod: 'computercraft' });
// Networking Cable
event.recipes.gtceu.assembler('computercraft:cable')
event.recipes.gtceu.assembler('tfg:computercraft/cable')
.itemInputs('ae2:fluix_glass_cable')
.inputFluids(Fluid.of('gtceu:redstone', 288))
.itemOutputs('computercraft:cable')
.duration(80)
.EUt(120)
.EUt(120).duration(80)
// Wireless Modem Normal
event.shaped('computercraft:wireless_modem_normal', [
@@ -26,7 +25,7 @@ const registerComputerCraftRecipes = (event) => {
B: 'ae2:calculation_processor',
C: '#gtceu:circuits/hv',
D: 'computercraft:cable',
}).id('tfg:crafting/wireless_modem_normal')
}).id('tfg:shaped/computercraft/wireless_modem_normal')
// Wireless Modem Advanced
event.shaped('computercraft:wireless_modem_advanced', [
@@ -38,7 +37,7 @@ const registerComputerCraftRecipes = (event) => {
B: 'ae2:calculation_processor',
C: '#gtceu:circuits/hv',
D: 'computercraft:cable',
}).id('tfg:crafting/wireless_modem_advanced')
}).id('tfg:shaped/computercraft/wireless_modem_advanced')
// Monitor Normal
event.shaped('computercraft:monitor_normal', [
@@ -52,7 +51,7 @@ const registerComputerCraftRecipes = (event) => {
D: 'gtceu:mv_machine_casing',
E: 'computercraft:cable',
F: '#gtceu:circuits/mv',
}).id('tfg:crafting/monitor_normal')
}).id('tfg:shaped/computercraft/monitor_normal')
// Monitor Advanced
event.shaped('computercraft:monitor_advanced', [
@@ -66,7 +65,7 @@ const registerComputerCraftRecipes = (event) => {
D: 'gtceu:hv_machine_casing',
E: 'computercraft:cable',
F: '#gtceu:circuits/hv',
}).id('tfg:crafting/monitor_advanced')
}).id('tfg:shaped/computercraft/monitor_advanced')
// Disk Drive
event.shaped('computercraft:disk_drive', [
@@ -79,7 +78,7 @@ const registerComputerCraftRecipes = (event) => {
C: '#gtceu:circuits/hv',
D: 'gtceu:hv_machine_casing',
E: 'gtceu:hv_sensor',
}).id('tfg:crafting/disk_drive')
}).id('tfg:shaped/computercraft/disk_drive')
// Speaker
event.shaped('computercraft:speaker', [
@@ -91,7 +90,7 @@ const registerComputerCraftRecipes = (event) => {
B: 'computercraft:cable',
C: 'gtceu:mv_machine_casing',
D: '#gtceu:circuits/mv',
}).id('tfg:crafting/speaker')
}).id('tfg:shaped/computercraft/speaker')
// Printer
event.shaped('computercraft:printer', [
@@ -105,7 +104,7 @@ const registerComputerCraftRecipes = (event) => {
D: 'computercraft:cable',
E: 'gtceu:mv_machine_casing',
F: 'gtceu:mv_conveyor_module'
}).id('tfg:crafting/printer')
}).id('tfg:shaped/computercraft/printer')
// Wired Modem
event.shaped('computercraft:wired_modem', [
@@ -117,13 +116,13 @@ const registerComputerCraftRecipes = (event) => {
B: 'computercraft:cable',
C: '#gtceu:circuits/mv',
D: 'ae2:calculation_processor',
}).id('tfg:crafting/wired_modem')
}).id('tfg:shaped/computercraft/wired_modem')
event.shapeless('computercraft:wired_modem', ['computercraft:wired_modem_full'])
.id('tfg:crafting/wired_modem_shapeless')
.id('tfg:shapeless/computercraft/wired_modem_shapeless')
event.shapeless('computercraft:wired_modem_full', ['computercraft:wired_modem'])
.id('tfg:crafting/wired_modem_full_shapeless')
.id('tfg:shapeless/computercraft/wired_modem_full_shapeless')
// Computer Normal
event.shaped('computercraft:computer_normal', [
@@ -136,7 +135,7 @@ const registerComputerCraftRecipes = (event) => {
C: '#gtceu:batteries/mv',
D: 'gtceu:mv_machine_casing',
E: '#gtceu:circuits/hv'
}).id('tfg:crafting/computer_normal')
}).id('tfg:shaped/computercraft/computer_normal')
// Computer Advanced
event.shaped('computercraft:computer_advanced', [
@@ -149,7 +148,7 @@ const registerComputerCraftRecipes = (event) => {
C: '#gtceu:batteries/hv',
D: 'gtceu:hv_machine_casing',
E: '#gtceu:circuits/ev'
}).id('tfg:crafting/computer_advanced')
}).id('tfg:shaped/computercraft/computer_advanced')
// Turtle Normal
event.shaped('computercraft:turtle_normal', [
@@ -165,7 +164,7 @@ const registerComputerCraftRecipes = (event) => {
F: 'computercraft:computer_normal',
G: 'gtceu:steel_crate',
H: 'gtceu:hv_electric_piston',
}).id('tfg:crafting/turtle_normal')
}).id('tfg:shaped/computercraft/turtle_normal')
// Turtle Advanced
event.shaped('computercraft:turtle_advanced', [
@@ -181,11 +180,11 @@ const registerComputerCraftRecipes = (event) => {
F: 'computercraft:computer_advanced',
G: 'gtceu:aluminium_crate',
H: 'gtceu:ev_electric_piston',
}).id('tfg:crafting/turtle_advanced')
}).id('tfg:shaped/computercraft/turtle_advanced')
// Disk Crafts
for (let i = 0; i < 16; i++) {
event.recipes.gtceu.chemical_bath('computercraft:disk' + `${global.MINECRAFT_DYE_NAMES[i]}`)
event.recipes.gtceu.chemical_bath('tfg:computercraft/disk' + `${global.MINECRAFT_DYE_NAMES[i]}`)
.itemInputs('ae2:blank_pattern')
.inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 288))
.itemOutputs(Item.of('computercraft:disk', global.COMPUTER_CRAFT_DISCS[i]))
@@ -207,25 +206,25 @@ const registerComputerCraftRecipes = (event) => {
E: 'gtceu:hv_emitter',
F: '#gtceu:circuits/ev',
G: '#forge:plates/titanium'
}).id('tfg:crafting/pocket_computer_normal')
}).id('tfg:shaped/computercraft/pocket_computer_normal')
// Pocket Computer Normal Upgrade : Wireless Modem Advanced
event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [
'computercraft:pocket_computer_normal',
'computercraft:wireless_modem_advanced'
]).id('computercraft:ender_pocket_computer_normal_shapless')
]).id('tfg:shaped/computercraft/ender_pocket_computer_normal_shapless')
// Pocket Computer Normal Upgrade : Wireless Modem Normal
event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_normal"}'), [
'computercraft:pocket_computer_normal',
'computercraft:wireless_modem_normal'
]).id('computercraft:wireless_pocket_computer_normal_shapless')
]).id('tfg:shaped/computercraft/wireless_pocket_computer_normal_shapless')
// Pocket Computer Normal Upgrade : Speaker
event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:speaker"}'), [
'computercraft:pocket_computer_normal',
'computercraft:speaker'
]).id('computercraft:noisy_pocket_computer_normal_shapless')
]).id('tfg:shaped/computercraft/noisy_pocket_computer_normal_shapless')
// Advanced Pocket Computers
// Pocket Computer Advanced
@@ -241,25 +240,25 @@ const registerComputerCraftRecipes = (event) => {
E: 'gtceu:ev_emitter',
F: '#gtceu:circuits/iv',
G: '#forge:plates/tungsten_steel'
}).id('tfg:crafting/pocket_computer_advanced')
}).id('tfg:shaped/computercraft/pocket_computer_advanced')
// Pocket Computer Advanced Upgrade : Wireless Modem Advanced
event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [
'computercraft:pocket_computer_advanced',
'computercraft:wireless_modem_advanced'
]).id('computercraft:ender_pocket_computer_advanced_shapless')
]).id('tfg:shaped/computercraft/ender_pocket_computer_advanced_shapless')
// Pocket Computer Advanced Upgrade : Wireless Modem Normal
event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_normal"}'), [
'computercraft:pocket_computer_advanced',
'computercraft:wireless_modem_normal'
]).id('computercraft:wireless_pocket_computer_advanced_shapless')
]).id('tfg:shaped/computercraft/wireless_pocket_computer_advanced_shapless')
// Pocket Computer Advanced Upgrade : Speaker
event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:speaker"}'), [
'computercraft:pocket_computer_advanced',
'computercraft:speaker'
]).id('computercraft:noisy_pocket_computer_advanced_shapless')
]).id('tfg:shaped/computercraft/noisy_pocket_computer_advanced_shapless')
}

76
kubejs/server_scripts/main_server_script.js
View File

@@ -6,23 +6,23 @@
ServerEvents.tags('item', event => {
registerAE2ItemTags(event)
registerAlekiRoofsItemTags(event)
// registerAsticorCartsItemTags(event)
registerAsticorCartsItemTags(event)
registerBeneathItemTags(event)
// registerChiselAndBitsItemTags(event)
// registerComputerCraftItemTags(event)
// registerCreateItemTags(event)
// registerCreateAdditionsItemTags(event)
// registerExtendedAE2ItemTags(event)
// registerFirmaCivItemTags(event)
registerChiselAndBitsItemTags(event)
registerComputerCraftItemTags(event)
registerCreateItemTags(event)
registerCreateAdditionsItemTags(event)
registerExtendedAE2ItemTags(event)
registerFirmaCivItemTags(event)
registerFirmaLifeItemTags(event)
// registerFramedBlocksItemTags(event)
// registerFTBQuestsItemTags(event)
registerFramedBlocksItemTags(event)
registerFTBQuestsItemTags(event)
registerGregTechItemTags(event)
// registerMegaCellsItemTags(event)
registerMegaCellsItemTags(event)
registerMinecraftItemTags(event)
registerMoreRedItemTags(event)
// registerHotOrNotItemTags(event)
// registerRailWaysItemTags(event)
registerRailWaysItemTags(event)
registerSophisticatedBackpacksItemTags(event)
registerTFCItemTags(event)
})
@@ -31,24 +31,24 @@ ServerEvents.tags('item', event => {
* Событие регистрации блок-тэгов.
*/
ServerEvents.tags('block', event => {
// registerAE2BlockTags(event)
// registerAsticorCartsBlockTags(event)
registerAE2BlockTags(event)
registerAsticorCartsBlockTags(event)
registerBeneathBlockTags(event)
// registerChiselAndBitsBlockTags(event)
// registerComputerCraftBlockTags(event)
// registerCreateBlockTags(event)
// registerCreateAdditionsBlockTags(event)
// registerExtendedAE2BlockTags(event)
// registerFirmaCivBlockTags(event)
registerChiselAndBitsBlockTags(event)
registerComputerCraftBlockTags(event)
registerCreateBlockTags(event)
registerCreateAdditionsBlockTags(event)
registerExtendedAE2BlockTags(event)
registerFirmaCivBlockTags(event)
registerFirmaLifeBlockTags(event)
// registerFramedBlocksBlockTags(event)
// registerFTBQuestsBlockTags(event)
registerFramedBlocksBlockTags(event)
registerFTBQuestsBlockTags(event)
registerGregTechBlockTags(event)
// registerMegaCellsBlockTags(event)
registerMegaCellsBlockTags(event)
registerMinecraftBlockTags(event)
registerMoreRedBlockTags(event)
// registerHotOrNotBlockTags(event)
// registerRailWaysBlockTags(event)
registerRailWaysBlockTags(event)
registerSophisticatedBackpacksBlockTags(event)
registerTFCBlockTags(event)
})
@@ -57,8 +57,8 @@ ServerEvents.tags('block', event => {
* Событие регистрации жидкость-тэгов.
*/
ServerEvents.tags('fluid', event => {
// registerCreateFluidTags(event)
// registerCreateAdditionsFluidTags(event)
registerCreateFluidTags(event)
registerCreateAdditionsFluidTags(event)
registerFirmaLifeBlockTags(event)
registerTFCFluidTags(event)
})
@@ -103,24 +103,24 @@ TFCEvents.data(event => {
* Срабатывает после инициализации датапаков и тегов.
*/
ServerEvents.recipes(event => {
// registerAE2Recipes(event)
registerAE2Recipes(event)
registerAdvancedPeripheralsRecipes(event)
registerAlekiRoofsRecipes(event)
// registerAsticorCartsRecipes(event)
// registerAE2InsertExportCardRecipes(event)
// registerAE2NetworkAnalyzerRecipes(event)
// registerAE2WTLibRecipes(event)
// registerChiselAndBitsRecipes(event)
// registerComputerCraftRecipes(event)
registerAsticorCartsRecipes(event)
registerAE2InsertExportCardRecipes(event)
registerAE2NetworkAnalyzerRecipes(event)
registerAE2WTLibRecipes(event)
registerChiselAndBitsRecipes(event)
registerComputerCraftRecipes(event)
registerCreateRecipes(event)
registerCreateAdditionsRecipes(event)
registerCreateLowHeatedRecipes(event)
// registerCreateConnectedRecipes(event)
// registerExtendedAE2Recipes(event)
// registerExposureRecipes(event)
// registerEtchedRecipes(event)
// registerFirmaCivRecipes(event)
// registerFirmaLifeRecipes(event)
registerCreateConnectedRecipes(event)
registerExtendedAE2Recipes(event)
registerExposureRecipes(event)
registerEtchedRecipes(event)
registerFirmaCivRecipes(event)
registerFirmaLifeRecipes(event)
registerFramedBlocksRecipes(event)
registerFTBQuestsRecipes(event)
registerGregTechRecipes(event)