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

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-07-19 18:03:00 +01:00
commit d2ec89f2b8
6 changed files with 407 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

41
kubejs/server_scripts/firmalife/tags.js
View file

@ -19,6 +19,8 @@ const registerFirmaLifeItemTags = (event) => {
// Удаление тегов у руд
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
}
const registerFirmaLifeBlockTags = (event) => {
@ -31,6 +33,43 @@ const registerFirmaLifeBlockTags = (event) => {
// Удаление тегов у руд
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
// Удаление тегов у отключенных предметов
global.FIRMALIFE_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
})
// Удаление тегов у руд
event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/")
//greenhouse wall fixes
event.remove('firmalife:always_valid_greenhouse_wall', '#minecraft:doors')
event.remove('firmalife:always_valid_greenhouse_wall', '#minecraft:trapdoors')
const greenhouse_tiers = [
'treated_wood',
'weathered_treated_wood',
'copper',
'exposed_copper',
'weathered_copper',
'oxidized_copper',
'iron',
'rusted_iron',
'stainless_steel'
]
greenhouse_tiers.forEach(tier => {
event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_door')
event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_trapdoor')
})
//Allows any block with the word "brick" in its id to be used as oven insulation.
//Add blacklisted words to the const with | between.
const brick_blacklist = ('drying|additionalplacements');
event.add('firmalife:oven_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`);
event.add('firmalife:oven_insulation', 'firmalife:stovetop_pot');
event.add('firmalife:oven_insulation', 'firmalife:vat');
//Allows any block with the word "brick" in its id to be used as oven insulation.
//Add blacklisted words to the const with | between.
const brick_blacklist = ('drying|additionalplacements');
@ -52,4 +91,4 @@ const registerFirmaLifeFluidTags = (event) => {
event.add('firmalife:mixable', 'tfcchannelcasting:dark_chocolate')
event.add('firmalife:mixable', 'afc:maple_syrup')
event.add('firmalife:mixable', 'afc:birch_syrup')
}
}

2
kubejs/startup_scripts/gtceu/materials.js
View file

@ -321,6 +321,8 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Platinum.setMaterialSecondaryARGB(0x59563a)
GTMaterials.Nickel.setMaterialARGB(0xfff4ba)
GTMaterials.Nickel.setMaterialSecondaryARGB(0x8d8d71)
GTMaterials.Thorium.setMaterialARGB(0xf8a8c0)
GTMaterials.Thorium.setMaterialSecondaryARGB(0xcd8dbc)
global.MINECRAFT_DYE_NAMES.forEach(colorName =>

9
kubejs/startup_scripts/gtceu/tag_prefixes.js
View file

@ -52,13 +52,6 @@ const registerGTCEuTagPrefixes = (event) => {
TagPrefix.pipeNonupleFluid.defaultTagPath("nonuple_fluid_pipes/%s")
TagPrefix.pipeNonupleFluid.unformattedTagPath("nonuple_fluid_pipes")
// FirmaLife Shit
TagPrefix.pipeTinyFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
TagPrefix.pipeSmallFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
TagPrefix.pipeNormalFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
TagPrefix.pipeLargeFluid.customTagPath("", (prefix, mat) => createBlockTag("firmalife:always_valid_greenhouse_wall"))
// FirmaLife Shit
TagPrefix.pipeSmallItem.defaultTagPath("small_item_pipes/%s")
TagPrefix.pipeSmallItem.unformattedTagPath("small_item_pipes")
TagPrefix.pipeNormalItem.defaultTagPath("normal_item_pipes/%s")
@ -99,4 +92,4 @@ const registerGTCEuTagPrefixes = (event) => {
TagPrefix.rawOreBlock.unformattedTagPath("raw_ore_blocks")
TagPrefix.rawOre.setIgnored(GTMaterials.Iron);
}
}