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

Merge pull request #149 from TerraFirmaGreg-Team/quests

Browse source 
Чутка квестов + Исправление ошибок
This commit is contained in:
Dmitry 2023-12-15 17:26:09 +07:00 • committed by GitHub
commit 55d4858467
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 1271 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/assets/tfg/lang/en_us.json
View file

@ -1,5 +1,5 @@
{
"quests.primitive.start.title": "&aTerraFirmaGreg Modpack!",
"quests.primitive.start.subtitle": "Thank you for choosing our modpack!",
"quests.primitive.start.subtitle": "Thank you for choosing our modpack! &cThe English translation will appear later with the release of 1.0.0.",
"quests.primitive.start.description": "The fun starts right now! May this world be blessed with your existence!"
}

8
kubejs/assets/tfg/lang/ru_ru.json
View file

@ -1,9 +1,5 @@
{
"quests.primitive.start.title": "&aTerraFirmaGreg Modpack!",
"quests.primitive.start.subtitle": "Спасибо, что выбрали наш модпак!",
"quests.primitive.start.description": "Самое интересное начинается прямо сейчас! Да одарит этот мир ваше существование!",
"quests.primitive.first_steps.title": "Первые шаги",
"quests.primitive.first_steps.subtitle": "Важная информация на старте игры",
"quests.primitive.first_steps.description": ""
"quests.primitive.start.subtitle": "Спасибо, что выбрали наш модпак! &cПеревод на английский язык появится позже с релизом 1.0.0.",
"quests.primitive.start.description": "Самое интересное начинается прямо сейчас! Да одарит этот мир ваше существование!"
}

BIN
kubejs/assets/tfg/textures/quests/primitive_charcoal_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 346 KiB

BIN
kubejs/assets/tfg/textures/quests/primitive_charcoal_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 195 KiB

BIN
kubejs/assets/tfg/textures/quests/primitive_charcoal_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 408 KiB

1
kubejs/client_scripts/main_client_script.js
View file

@ -26,5 +26,6 @@ REIEvents.removeCategories(event => {
REIEvents.hide('fluid', event => {
hideTFCFluids(event)
hideFirmaLifeFluids(event)
})

21
kubejs/client_scripts/mods/firmalife.js Normal file
View file

@ -0,0 +1,21 @@
// priority: 0
const hideFirmaLifeStuff = (event) => {
global.TFC_STONE_TYPES.forEach(stoneTypeName => {
global.TFC_ORE_TYPES.forEach(oreTypeName => {
global.FIRMALIFE_ORE_MATERIALS.forEach(oreMaterialName => {
event.hide(`firmalife:ore/${oreTypeName}_${oreMaterialName}/${stoneTypeName}`)
})
})
})
global.FIRMALIFE_DISABLED_ITEMS.forEach(item => {
event.hide(item)
})
}
const hideFirmaLifeFluids = (event) => {
event.hide('firmalife:metal/chromium')
event.hide('firmalife:metal/stainless_steel')
}

38
kubejs/server_scripts/tfc/data.js
View file

@ -21,29 +21,29 @@ const registerTFCDataForTFC = (event) => {
)
*/
const registerTFCMetals = (event) => {
event.metal('gtceu:tin', 230, 0.02143, null, null, null, 1, 'tfc:tin')
event.metal('gtceu:bismuth', 270, 0.02143, null, null, null, 1, 'tfc:bismuth')
event.metal('gtceu:zinc', 420, 0.01429, null, null, null, 1, 'tfc:zinc')
event.metal('gtceu:sterling_silver', 950, 0.00857, null, null, null, 1, 'tfc:sterling_silver')
event.metal('gtceu:rose_gold', 960, 0.00857, null, null, null, 1, 'tfc:rose_gold')
event.metal('gtceu:silver', 961, 0.00625, null, null, null, 1, 'tfc:silver')
event.metal('gtceu:gold', 1060, 0.005, null, null, null, 1, 'tfc:gold')
event.metal('gtceu:copper', 1080, 0.00857, null, null, null, 1, 'tfc:copper')
event.metal('gtceu:nickel', 1453, 0.00625, null, null, null, 1, 'tfc:nickel')
event.metal('gtceu:tin', 230, 0.02143, '#forge:ingots/tin', '#forge:double_ingots/tin', '#forge:plates/tin', 1, 'tfc:tin')
event.metal('gtceu:bismuth', 270, 0.02143, '#forge:ingots/bismuth', '#forge:double_ingots/bismuth', '#forge:plates/bismuth', 1, 'tfc:bismuth')
event.metal('gtceu:zinc', 420, 0.01429, '#forge:ingots/zinc', '#forge:double_ingots/zinc', '#forge:plates/zinc', 1, 'tfc:zinc')
event.metal('gtceu:sterling_silver', 950, 0.00857, '#forge:ingots/sterling_silver', '#forge:double_ingots/sterling_silver', '#forge:plates/sterling_silver', 1, 'tfc:sterling_silver')
event.metal('gtceu:rose_gold', 960, 0.00857, '#forge:ingots/rose_gold', '#forge:double_ingots/rose_gold', '#forge:plates/rose_gold', 1, 'tfc:rose_gold')
event.metal('gtceu:silver', 961, 0.00625, '#forge:ingots/silver', '#forge:double_ingots/silver', '#forge:plates/silver', 1, 'tfc:silver')
event.metal('gtceu:gold', 1060, 0.005, '#forge:ingots/gold', '#forge:double_ingots/gold', '#forge:plates/gold', 1, 'tfc:gold')
event.metal('gtceu:copper', 1080, 0.00857, '#forge:ingots/copper', '#forge:double_ingots/copper', '#forge:plates/copper', 1, 'tfc:copper')
event.metal('gtceu:nickel', 1453, 0.00625, '#forge:ingots/nickel', '#forge:double_ingots/nickel', '#forge:plates/nickel', 1, 'tfc:nickel')
event.metal('gtceu:brass', 930, 0.00857, null, null, null, 2, 'tfc:brass')
event.metal('gtceu:bronze', 950, 0.00857, null, null, null, 2, 'tfc:bronze')
event.metal('gtceu:bismuth_bronze', 985, 0.00857, null, null, null, 2, 'tfc:bismuth_bronze')
event.metal('gtceu:black_bronze', 1070, 0.00857, null, null, null, 2, 'tfc:black_bronze')
event.metal('gtceu:brass', 930, 0.00857, '#forge:ingots/brass', '#forge:double_ingots/brass', '#forge:plates/brass', 2, 'tfc:brass')
event.metal('gtceu:bronze', 950, 0.00857, '#forge:ingots/bronze', '#forge:double_ingots/bronze', '#forge:plates/bronze', 2, 'tfc:bronze')
event.metal('gtceu:bismuth_bronze', 985, 0.00857, '#forge:ingots/bismuth_bronze', '#forge:double_ingots/bismuth_bronze', '#forge:plates/bismuth_bronze', 2, 'tfc:bismuth_bronze')
event.metal('gtceu:black_bronze', 1070, 0.00857, '#forge:ingots/black_bronze', '#forge:double_ingots/black_bronze', '#forge:plates/black_bronze', 2, 'tfc:black_bronze')
event.metal('gtceu:iron', 1535, 0.00857, null, null, null, 3, 'tfg:iron')
event.metal('gtceu:wrought_iron', 1535, 0.00857, null, null, null, 3, 'tfc:wrought_iron')
// event.metal('gtceu:iron', 1535, 0.00857, '#forge:ingots/iron', '#forge:double_ingots/iron', '#forge:plates/iron', 3, 'tfg:iron')
event.metal('gtceu:wrought_iron', 1535, 0.00857, '#forge:ingots/wrought_iron', '#forge:double_ingots/wrought_iron', '#forge:plates/wrought_iron', 3, 'tfc:wrought_iron')
event.metal('gtceu:steel', 1540, 0.00857, null, null, null, 4, 'tfc:steel')
event.metal('gtceu:steel', 1540, 0.00857, '#forge:ingots/steel', '#forge:double_ingots/steel', '#forge:plates/steel', 4, 'tfc:steel')
event.metal('gtceu:black_steel', 1485, 0.00857, null, null, null, 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, null, null, null, 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, null, null, null, 6, 'tfc:red_steel')
event.metal('gtceu:black_steel', 1485, 0.00857, '#forge:ingots/black_steel', '#forge:double_ingots/black_steel', '#forge:plates/black_steel', 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
}
/**

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

@ -489,7 +489,7 @@ const registerTFCRecipes = (event) => {
.id(`tfc:heating/metal/${metal}_sword`)
// Крафт оголовья
event.recipes.tfc.anvil(`gtceu:${metal}_sword_head`, `#forge:ingots/double/${metal}`, ['punch_last', 'bend_not_last', 'draw_not_last'])
event.recipes.tfc.anvil(`gtceu:${metal}_sword_head`, `#forge:double_ingots/${metal}`, ['punch_last', 'bend_not_last', 'draw_not_last'])
.tier(metalSpecs.tier)
.bonus(true)
.id(`tfc:anvil/${metal}_sword_blade`)
@ -873,6 +873,16 @@ const registerTFCRecipes = (event) => {
.resultFluid(Fluid.of('tfc:metal/cast_iron', 288))
.id(`tfc:heating/grill`)
// Ванильная дверь
event.recipes.tfc.heating('minecraft:iron_door', 1535)
.resultFluid(Fluid.of('tfc:metal/cast_iron', 288))
.id(`tfc:heating/iron_door`)
event.recipes.tfc.anvil('minecraft:iron_door', '#forge:plates/wrought_iron', ['hit_last', 'draw_not_last', 'punch_not_last'])
.tier(3)
.id(`tfc:anvil/iron_door`)
// Bloom -> Wrought Iron Ingot
event.recipes.tfc.anvil('gtceu:wrought_iron_ingot', 'tfc:refined_iron_bloom', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(2)
.id('tfc:anvil/wrought_iron_from_bloom')

49
kubejs/server_scripts/tfc/tags.js
View file

@ -8,7 +8,6 @@ const registerTFCItemTags = (event) => {
})
// Теги для соответствия инструментов TFC и GT
event.add('tfc:usable_on_tool_rack', '#forge:tools')
event.add('tfc:axes', '#forge:tools/tree_felling')
event.add('tfc:hammers', '#forge:tools/hammers')
event.add('tfc:hoes', '#minecraft:hoes')
@ -19,6 +18,33 @@ const registerTFCItemTags = (event) => {
event.add('tfc:shovels', '#minecraft:shovels')
event.add('tfc:swords', '#minecraft:swords')
event.add('tfc:usable_on_tool_rack', '#tfc:axes')
event.add('tfc:usable_on_tool_rack', '#tfc:hammers')
event.add('tfc:usable_on_tool_rack', '#tfc:hoes')
event.add('tfc:usable_on_tool_rack', '#tfc:knives')
event.add('tfc:usable_on_tool_rack', '#tfc:pickaxes')
event.add('tfc:usable_on_tool_rack', '#tfc:saws')
event.add('tfc:usable_on_tool_rack', '#tfc:scythes')
event.add('tfc:usable_on_tool_rack', '#tfc:shovels')
event.add('tfc:usable_on_tool_rack', '#tfc:swords')
event.add('tfc:usable_on_tool_rack', '#forge:tools/mining_hammers')
event.add('tfc:usable_on_tool_rack', '#forge:tools/wrenches')
event.add('tfc:usable_on_tool_rack', '#forge:tools/files')
event.add('tfc:usable_on_tool_rack', '#forge:tools/crowbars')
event.add('tfc:usable_on_tool_rack', '#forge:tools/screwdrivers')
event.add('tfc:usable_on_tool_rack', '#forge:tools/wire_cutters')
event.add('tfc:usable_on_tool_rack', '#forge:tools/butchery_knives')
event.add('tfc:usable_on_tool_rack', '#forge:tools/plungers')
event.add('tfc:usable_on_tool_rack', '#forge:tools/mortars')
event.add('tfc:usable_on_tool_rack', '#forge:tools/mallets')
event.add('forge:tools/aoe', '#forge:tools/mining_hammers')
// Для складывания
event.add('tfc:pileable_ingots', '#forge:ingots')
event.add('tfc:pileable_sheets', '#forge:plates')
// Определеяет какое оружие может появиться у зомбя в руках
// Мечи
event.add('tfc:mob_mainhand_weapons', 'gtceu:bismuth_bronze_sword')
@ -48,27 +74,6 @@ const registerTFCItemTags = (event) => {
event.add('tfg:bladed_axles', `tfc:wood/bladed_axle/${woodType}`)
})
// Теги для двойных слитков тфк
event.add('forge:ingots/double/bismuth', 'tfc:metal/double_ingot/bismuth')
event.add('forge:ingots/double/bismuth_bronze', 'tfc:metal/double_ingot/bismuth_bronze')
event.add('forge:ingots/double/black_bronze', 'tfc:metal/double_ingot/black_bronze')
event.add('forge:ingots/double/bronze', 'tfc:metal/double_ingot/bronze')
event.add('forge:ingots/double/brass', 'tfc:metal/double_ingot/brass')
event.add('forge:ingots/double/copper', 'tfc:metal/double_ingot/copper')
event.add('forge:ingots/double/gold', 'tfc:metal/double_ingot/gold')
event.add('forge:ingots/double/nickel', 'tfc:metal/double_ingot/nickel')
event.add('forge:ingots/double/rose_gold', 'tfc:metal/double_ingot/rose_gold')
event.add('forge:ingots/double/silver', 'tfc:metal/double_ingot/silver')
event.add('forge:ingots/double/tin', 'tfc:metal/double_ingot/tin')
event.add('forge:ingots/double/zinc', 'tfc:metal/double_ingot/zinc')
event.add('forge:ingots/double/sterling_silver', 'tfc:metal/double_ingot/sterling_silver')
event.add('forge:ingots/double/iron', 'tfc:metal/double_ingot/cast_iron')
event.add('forge:ingots/double/wrought_iron', 'tfc:metal/double_ingot/wrought_iron')
event.add('forge:ingots/double/steel', 'tfc:metal/double_ingot/steel')
event.add('forge:ingots/double/black_steel', 'tfc:metal/double_ingot/black_steel')
event.add('forge:ingots/double/blue_steel', 'tfc:metal/double_ingot/blue_steel')
event.add('forge:ingots/double/red_steel', 'tfc:metal/double_ingot/red_steel')
// Теги для объединения наковален
event.add('tfc:red_or_blue_anvil', 'tfc:metal/anvil/blue_steel')
event.add('tfc:red_or_blue_anvil', 'tfc:metal/anvil/red_steel')

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

@ -200,6 +200,8 @@ global.MINECRAFT_DISABLED_ITEMS = [
"minecraft:lantern",
"minecraft:soul_torch",
"minecraft:soul_lantern",
"minecraft:copper_ingot",
"minecraft:gold_ingot",
// Seeds
"minecraft:wheat_seeds",

4
kubejs/startup_scripts/tfc/constants.js
View file

@ -877,8 +877,8 @@ global.TFC_DISABLED_ITEMS = [
"tfc:metal/ingot/red_steel",
"tfc:metal/ingot/blue_steel",
"tfc:metal/ingot/brass",
"tfc:metal/ingot/copper",
"tfc:metal/ingot/gold",
// "tfc:metal/ingot/copper",
// "tfc:metal/ingot/gold",
"tfc:metal/ingot/nickel",
"tfc:metal/ingot/silver",
"tfc:metal/ingot/tin",