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

Merge branch 'dev' into feature/create-6

Browse source
This commit is contained in:
Pyritie 2025-05-05 16:10:07 +01:00
commit fdebad6f76
799 changed files with 48367 additions and 35818 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kubejs/startup_scripts/ae2/constants.js
View file

@ -23,6 +23,7 @@ global.AE2_DISABLED_ITEMS = [
'ae2:entropy_manipulator',
'ae2:charged_staff',
'ae2:name_press',
'ae2:charger',
// Блоки
'ae2:vibration_chamber',

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

@ -11,7 +11,7 @@ const registerAE2Materials = (event) => {
GTMaterialFlags.DISABLE_DECOMPOSITION,
GTMaterialFlags.FORCE_GENERATE_BLOCK
)
.components('1x silicon', '2x oxygen')
.components('1x nether_quartz', '1x certus_quartz', '1x ruby')
.color(0x6D5BB6)
.secondaryColor(0x1E1932)
}

3
kubejs/startup_scripts/create/constants.js
View file

@ -292,5 +292,6 @@ global.CREATE_DISABLED_ITEMS = [
'create:chest_minecart_contraption',
'create:mechanical_pump',
'create:peculiar_bell',
'create:haunted_bell'
'create:haunted_bell',
'create:adjustable_chain_gearshift'
];

16
kubejs/startup_scripts/create_connected/constants.js Normal file
View file

@ -0,0 +1,16 @@
// priority: 0
global.CREATE_CONNECTED_DISABLED_ITEMS = [
'create_connected:encased_chain_cogwheel',
'create_connected:parallel_gearbox',
'create_connected:vertical_parallel_gearbox',
'create_connected:six_way_gearbox',
'create_connected:vertical_six_way_gearbox',
'create_connected:brass_gearbox',
'create_connected:vertical_brass_gearbox',
'create_connected:shear_pin',
'create_connected:control_chip',
'create_connected:incomplete_control_chip',
'create_connected:crank_wheel',
'create_connected:large_crank_wheel'
]

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

@ -29,6 +29,10 @@ global.GREATE_DISABLED_ITEMS = [
'greate:stainless_steel_millstone',
'greate:titanium_millstone',
// Disabled because they don't respect the cleanroom requirement of some recipes
'greate:stainless_steel_mechanical_saw',
'greate:titanium_mechanical_saw',
// Disable these until it's possible to disable spring recipes in them
'greate:andesite_alloy_mechanical_press',
'greate:steel_mechanical_press',

16
kubejs/startup_scripts/gtceu/constants.js
View file

@ -34,6 +34,10 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:flint_knife',
'gtceu:firebrick',
'gtceu:firebricks',
'gtceu:fireclay_dust',
'gtceu:small_fireclay_dust',
'gtceu:tiny_fireclay_dust',
'gtceu:compressed_fireclay',
'gtceu:wood_drum',
'gtceu:primitive_blast_furnace',
'gtceu:iron_pickaxe',
@ -50,6 +54,9 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:stone_wrench_tip',
'gtceu:treated_wood_hanging_sign',
'gtceu:treated_wood_boat',
'gtceu:treated_wood_chest_boat',
'gtceu:treated_wood_sign',
'gtceu:rubber_sapling',
'gtceu:rubber_log',
@ -71,6 +78,14 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:rubber_boat',
'gtceu:rubber_chest_boat',
'gtceu:mv_solar_panel',
'gtceu:hv_solar_panel',
'gtceu:ev_solar_panel',
'gtceu:iv_solar_panel',
'gtceu:luv_solar_panel',
'gtceu:zpm_solar_panel',
'gtceu:uv_solar_panel',
// Sculk
'gtceu:tiny_echo_shard_dust',
'gtceu:small_echo_shard_dust',
@ -175,3 +190,4 @@ global.ORE_BEARING_STONES = [
'pyroxenite',
'dripstone'
];

31
kubejs/startup_scripts/gtceu/items.js
View file

@ -1,4 +1,35 @@
// priority: 0
const registerGTCEuItems = (event) => {
event.create('tfg:ulv_universal_circuit')
.translationKey('item.ulv_universal_circuit')
event.create('tfg:lv_universal_circuit')
.translationKey('item.lv_universal_circuit')
event.create('tfg:mv_universal_circuit')
.translationKey('item.mv_universal_circuit')
event.create('tfg:hv_universal_circuit')
.translationKey('item.hv_universal_circuit')
event.create('tfg:ev_universal_circuit')
.translationKey('item.ev_universal_circuit')
event.create('tfg:iv_universal_circuit')
.translationKey('item.iv_universal_circuit')
event.create('tfg:luv_universal_circuit')
.translationKey('item.luv_universal_circuit')
event.create('tfg:zpm_universal_circuit')
.translationKey('item.zpm_universal_circuit')
event.create('tfg:uv_universal_circuit')
.translationKey('item.uv_universal_circuit')
event.create('tfg:uhv_universal_circuit')
.translationKey('item.uhv_universal_circuit')
}

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

@ -36,6 +36,7 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_GEAR,
GENERATE_FRAME,
GENERATE_PLATE,
GENERATE_DENSE,
GENERATE_RING
} = $MATERIAL_FLAGS
@ -167,7 +168,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Silver.addFlags(HAS_SMALL_NATIVE_TFC_ORE);
//
// /* Имеют двойные слитки */
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR);
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
//
// /* Другое */
@ -187,7 +188,8 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Wood.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR, GENERATE_RING);
GTMaterials.BismuthBronze.addFlags(GENERATE_GEAR);
GTMaterials.BlackBronze.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD);
GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SMALL_GEAR);
@ -199,7 +201,16 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.DamascusSteel.addFlags(GENERATE_BOLT_SCREW);
GTMaterials.Duranium.addFlags(GENERATE_BOLT_SCREW);
GTMaterials.Cupronickel.addFlags(GENERATE_BOLT_SCREW, GENERATE_RING);
GTMaterials.Invar.addFlags(GENERATE_RING);
GTMaterials.Magnalium.addFlags(GENERATE_RING);
GTMaterials.TinAlloy.addFlags(GENERATE_RING);
GTMaterials.SterlingSilver.addFlags(GENERATE_RING);
GTMaterials.IronMagnetic.addFlags(GENERATE_PLATE)
GTMaterials.Silicon.addFlags(GENERATE_DENSE);
GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD);
@ -281,6 +292,10 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.TungstenSteel.setMaterialSecondaryARGB(0x03192f)
GTMaterials.RoseGold.setMaterialARGB(0xFCE4D8)
GTMaterials.RoseGold.setMaterialSecondaryARGB(0xAB675A)
GTMaterials.Platinum.setMaterialARGB(0xccdff5)
GTMaterials.Platinum.setMaterialSecondaryARGB(0x59563a)
GTMaterials.Nickel.setMaterialARGB(0xfff4ba)
GTMaterials.Nickel.setMaterialSecondaryARGB(0x8d8d71)
global.MINECRAFT_DYE_NAMES.forEach(colorName =>

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

@ -95,4 +95,6 @@ const registerGTCEuTagPrefixes = (event) => {
TagPrefix.turbineBlade.defaultTagPath("turbine_blades/%s")
TagPrefix.turbineBlade.unformattedTagPath("turbine_blades")
TagPrefix.rawOreBlock.defaultTagPath("raw_ore_blocks/%s")
TagPrefix.rawOreBlock.unformattedTagPath("raw_ore_blocks")
}

28
kubejs/startup_scripts/horornot/constants.js
View file

@ -1,32 +1,4 @@
// priority: 0
global.HOT_OR_NOT_DISABLED_ITEMS = [
];
// Can't just use the #tfchotornot:insulating tag here because tags don't exist at startup
global.HOT_OR_NOT_ITEMS = [
'tfchotornot:mittens',
'tfchotornot:burlap_potholder',
'tfchotornot:silk_potholder',
'tfchotornot:wool_potholder',
'tfchotornot:tongs/wood',
'tfchotornot:tongs/bismuth',
'tfchotornot:tongs/bismuth_bronze',
'tfchotornot:tongs/black_bronze',
'tfchotornot:tongs/bronze',
'tfchotornot:tongs/brass',
'tfchotornot:tongs/copper',
'tfchotornot:tongs/gold',
'tfchotornot:tongs/nickel',
'tfchotornot:tongs/rose_gold',
'tfchotornot:tongs/silver',
'tfchotornot:tongs/tin',
'tfchotornot:tongs/zinc',
'tfchotornot:tongs/sterling_silver',
'tfchotornot:tongs/wrought_iron',
'tfchotornot:tongs/cast_iron',
'tfchotornot:tongs/steel',
'tfchotornot:tongs/black_steel',
'tfchotornot:tongs/red_steel',
'tfchotornot:tongs/blue_steel',
];

10
kubejs/startup_scripts/horornot/modifications.js
View file

@ -1,10 +0,0 @@
// priority: 0
function registerHotOrNotItemModifications(event) {
global.HOT_OR_NOT_ITEMS.forEach(i => {
event.modify(i, item => {
item.maxDamage = item.maxDamage * 3
})
})
}

1
kubejs/startup_scripts/main_startup_script.js
View file

@ -27,7 +27,6 @@ BlockEvents.modification(event => {
*/
ItemEvents.modification(event => {
registerBeneathItemModifications(event)
registerHotOrNotItemModifications(event)
registerMinecraftItemModifications(event)
})

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

@ -595,7 +595,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:frogspawn',
'minecraft:cactus',
'minecraft:sweet_berries',
'minecraft:campfire',
'minecraft:soul_campfire',
'minecraft:bee_nest',
'minecraft:fletching_table',

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

@ -1017,6 +1017,18 @@ global.TFC_MILKS = [
{id: 'firmalife:coconut_milk'},
];
global.TFC_ALCOHOL = [
{id: 'tfc:beer'},
{id: 'tfc:cider'},
{id: 'tfc:rum'},
{id: 'tfc:sake'},
{id: 'tfc:vodka'},
{id: 'tfc:whiskey'},
{id: 'tfc:corn_whiskey'},
{id: 'tfc:rye_whiskey'},
{id: 'firmalife:mead'},
];
global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/granite',
'tfc:rock/magma/diorite',

2
kubejs/startup_scripts/tfc/icon_sets.js
View file

@ -18,7 +18,7 @@ function registerTFCIconSets(event) {
event.create('tfc_ruby').parent('ruby')
event.create('tfc_sapphire').parent('gem_horizontal')
event.create('tfc_topaz').parent('gem_vertical')
event.create('tfc_realgar').parent('fine')
event.create('tfc_realgar').parent('emerald')
event.create('tfc_bismuth').parent('bright')
event.create('tfc_cassiterite').parent('bright')

8
kubejs/startup_scripts/tfc/materials.js
View file

@ -85,10 +85,10 @@ const registerTFCMaterials = (event) => {
GTMaterials.Almandine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_realgar'))
GTMaterials.Beryllium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper'))
GTMaterials.Cobalt.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sphalerite'))
GTMaterials.Cobaltite.setMaterialIconSet(GTMaterialIconSet.LAPIS)
GTMaterials.Cobaltite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax'))
GTMaterials.Lead.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_magnetite'))
GTMaterials.Lazurite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_ruby'))
GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_lapis'))
GTMaterials.Asbestos.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_graphite'))
GTMaterials.Lithium.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_hematite'))
GTMaterials.Galena.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_copper'))
GTMaterials.Grossular.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sapphire'))
@ -107,8 +107,8 @@ const registerTFCMaterials = (event) => {
GTMaterials.Apatite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_opal'))
GTMaterials.Pyrope.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_opal'))
GTMaterials.Scheelite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_saltpeter'))
GTMaterials.Tantalite.setMaterialIconSet(GTMaterialIconSet.LIGNITE)
GTMaterials.Stibnite.setMaterialIconSet(GTMaterialIconSet.LAPIS)
GTMaterials.Tantalite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_saltpeter'))
GTMaterials.Stibnite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_sulfur'))
GTMaterials.Tungstate.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax'))
GTMaterials.Uraninite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_limonite'))
GTMaterials.Pitchblende.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_magnetite'))

2
kubejs/startup_scripts/tfc/tag_prefixes.js
View file

@ -2,7 +2,7 @@
const registerTFCTagPrefixes = (event) => {
TagPrefix.ORES.remove(TagPrefix.ore)
TagPrefix.ORES.remove(TagPrefix.oreDeepslate)
TagPrefix.ORES.remove(TagPrefix.oreTuff)
TagPrefix.ORES.remove(TagPrefix.oreSand)

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

@ -17,4 +17,6 @@ global.AIRCRAFT_UPGRADES = [
"aluminium_hull_reinforcement",
"stainless_steel_hull_reinforcement",
"titanium_hull_reinforcement"
]
]
global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"];

69
kubejs/startup_scripts/tfg/items.js
View file

@ -133,19 +133,82 @@ const registerTFGItems = (event) => {
//#endregion
//#region Wax
event.create(`tfg:paraffin_wax`)
.translationKey(`item.tfg.paraffin_wax`)
event.create('tfg:paraffin_wax')
.translationKey('item.tfg.paraffin_wax')
event.create('tfg:conifer_rosin')
.translationKey('item.tfg.conifer_rosin')
//#endregion
//#region Arrow Parts
//#region Cloth & String
event.create('tfg:polycaprolactam_fabric')
.translationKey('item.tfg.polycaprolactam_fabric')
event.create('tfg:polycaprolactam_string')
.translationKey('item.tfg.polycaprolactam_string')
event.create('tfg:phantom_silk')
.translationKey('item.tfg.phantom_silk')
event.create('tfg:phantom_thread')
.translationKey('item.tfg.phantom_thread')
//#endregion
//#region Tools
event.create('tfg:flint_arrow_head')
.translationKey('item.tfg.flint_arrow_head')
event.create('tfg:fletching')
.translationKey('item.tfg.fletching')
event.create('tfg:fishing_net/wood')
.translationKey('item.tfg.fishing_net.wood')
.parentModel('tfg:item/fishing_nets/wood_fishing_net')
.texture('tfg:item/fishing_nets/wood_fishing_net')
.maxDamage(112)
event.create('tfg:fishing_net/brass')
.translationKey('item.tfg.fishing_net.brass')
.parentModel('tfg:item/fishing_nets/brass_fishing_net')
.texture('tfg:item/fishing_nets/brass_fishing_net')
.maxDamage(326)
event.create('tfg:fishing_net/rose_gold')
.translationKey('item.tfg.fishing_net.rose_gold')
.parentModel('tfg:item/fishing_nets/rose_gold_fishing_net')
.texture('tfg:item/fishing_nets/rose_gold_fishing_net')
.maxDamage(380)
event.create('tfg:fishing_net/sterling_silver')
.translationKey('item.tfg.fishing_net.sterling_silver')
.parentModel('tfg:item/fishing_nets/sterling_silver_fishing_net')
.texture('tfg:item/fishing_nets/sterling_silver_fishing_net')
.maxDamage(380)
event.create('tfg:fishing_net/invar')
.translationKey('item.tfg.fishing_net.invar')
.parentModel('tfg:item/fishing_nets/invar_fishing_net')
.texture('tfg:item/fishing_nets/invar_fishing_net')
.maxDamage(740)
event.create('tfg:fishing_net/tin_alloy')
.translationKey('item.tfg.fishing_net.tin_alloy')
.parentModel('tfg:item/fishing_nets/tin_alloy_fishing_net')
.texture('tfg:item/fishing_nets/tin_alloy_fishing_net')
.maxDamage(710)
event.create('tfg:fishing_net/cupronickel')
.translationKey('item.tfg.fishing_net.cupronickel')
.parentModel('tfg:item/fishing_nets/cupronickel_fishing_net')
.texture('tfg:item/fishing_nets/cupronickel_fishing_net')
.maxDamage(560)
event.create('tfg:fishing_net/magnalium')
.translationKey('item.tfg.fishing_net.magnalium')
.parentModel('tfg:item/fishing_nets/magnalium_fishing_net')
.texture('tfg:item/fishing_nets/magnalium_fishing_net')
.maxDamage(1830)
//#endregion
//#region Immersive Aircraft Impl

1
kubejs/startup_scripts/tfg/materials.js
View file

@ -37,4 +37,5 @@ const registerTFGMaterials = (event) => {
.iconSet(GTMaterialIconSet.FINE)
.color('0xede8da')
.secondaryColor('0xeddcad')
.components('12x carbon', '22x hydrogen', '11x oxygen')
}

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

@ -1,7 +1,7 @@
// priority: 0
global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 1.5;
global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 2;
global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [
@ -13,6 +13,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [
'vintageimprovements:v_shaped_curving_head',
'vintageimprovements:grinder_belt',
'vintageimprovements:spring_coiling_machine_wheel',
'vintageimprovements:laser',
'vintageimprovements:laser_item',
'vintageimprovements:sulfur_chunk',
'vintageimprovements:sulfur',
@ -57,6 +58,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [
'vintageimprovements:hepatizon_rod',
'vintageimprovements:invar_rod',
'vintageimprovements:lead_rod',
'vintageimprovements:zinc_rod',
'vintageimprovements:lumium_rod',
'vintageimprovements:manyullyn_rod',
'vintageimprovements:nickel_rod',