Skip to content

Commit

Permalink
NCN fixed server tag crashing, so we can add it to the regex again
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePansmith committed Nov 10, 2024
1 parent f4cb076 commit a99829e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions kubejs/startup_scripts/_initial.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ const placeHolder = (registry, name) => {
// MODS TO FIX: (cool line name tbd), THERMAL SERIES, NUCLEARCRAFT
global.manualUnification = ['hammerlib:gears/netherite', 'hammerlib:gears/wooden', 'hammerlib:gears/stone', 'hammerlib:gears/copper', 'hammerlib:gears/iron', 'hammerlib:gears/gold', 'hammerlib:gears/diamond', 'kubejs:cryolobus_ingot', 'kubejs:cryolobus_nugget', 'kubejs:cryolobus_dust', 'kubejs:cryococcus_ingot', 'kubejs:cryococcus_nugget', 'kubejs:cryococcus_dust', 'hammerlib:gears/stone', 'hammerlib:gears/wooden', 'extendedcrafting:the_ultimate_nugget', 'extendedcrafting:the_ultimate_ingot', 'extendedcrafting:the_ultimate_block']
global.UnificationExcludedItems = ['nuclearcraft:hard_carbon_ingot', 'nuclearcraft:ferroboron_ingot', 'nuclearcraft:tough_alloy_ingot', 'enderio:wood_gear', 'enderio:stone_gear', 'enderio:iron_gear', 'enderio:energized_gear', 'enderio:vibrant_gear', 'enderio:dark_bimetal_gear']
//DO NOT ADD NUCLEARCRAFT TO THIS REGEX OR IT WILL CRASH MULTIPLAYER SERVERS. Singleplayer will load in fine but it will crash anyone trying to join MP
global.unificationPattern = new RegExp(`^(?!(${global.UnificationExcludedItems.join('|')})).*(thermal|enderio):(powdered_.*|.*(_block|_plate|_ingot|_nugget|_gear|_dust))`, 'i')
global.unificationPattern = new RegExp(`^(?!(${global.UnificationExcludedItems.join('|')})).*(nuclearcraft|thermal|enderio):(powdered_.*|.*(_block|_plate|_ingot|_nugget|_gear|_dust))`, 'i')

global.NuclearCraftUnificationExcludedItems = ['nuclearcraft:depleted_fuel_curium_hecm_245', 'nuclearcraft:fuel_curium_hecm_245', 'nuclearcraft:fuel_plutonium_hep_239', 'nuclearcraft:fuel_thorium_tbu', 'nuclearcraft:depleted_fuel_thorium_tbu', 'nuclearcraft:fuel_uranium_leu_233', 'nuclearcraft:depleted_fuel_uranium_leu_233', 'nuclearcraft:fuel_uranium_heu_233', 'nuclearcraft:depleted_fuel_uranium_heu_233', 'nuclearcraft:fuel_uranium_leu_235', 'nuclearcraft:depleted_fuel_uranium_leu_235', 'nuclearcraft:fuel_uranium_heu_235', 'nuclearcraft:depleted_fuel_uranium_heu_235', 'nuclearcraft:fuel_neptunium_len_236', 'nuclearcraft:depleted_fuel_neptunium_len_236', 'nuclearcraft:fuel_americium_hea_242', 'nuclearcraft:depleted_fuel_americium_hea_242', 'nuclearcraft:fuel_americium_lea_242', 'nuclearcraft:depleted_fuel_americium_lea_242', 'nuclearcraft:fuel_plutonium_hep_241', 'nuclearcraft:depleted_fuel_plutonium_hep_241', 'nuclearcraft:fuel_plutonium_lep_241', 'nuclearcraft:depleted_fuel_plutonium_lep_241', '2x nuclearcraft:fuel_plutonium_hep_239', 'nuclearcraft:depleted_fuel_plutonium_hep_239', 'nuclearcraft:fuel_plutonium_lep_239', 'nuclearcraft:depleted_fuel_plutonium_lep_239', 'nuclearcraft:fuel_neptunium_hen_236', 'nuclearcraft:depleted_fuel_neptunium_hen_236', 'nuclearcraft:fuel_curium_lecm_243', 'nuclearcraft:depleted_fuel_curium_lecm_243', 'nuclearcraft:fuel_curium_hecm_243', 'nuclearcraft:depleted_fuel_curium_hecm_243', 'nuclearcraft:fuel_curium_lecm_245', 'nuclearcraft:depleted_fuel_curium_lecm_245', 'nuclearcraft:fuel_curium_lecm_247', 'nuclearcraft:depleted_fuel_curium_lecm_247', 'nuclearcraft:fuel_curium_hecm_247', 'nuclearcraft:depleted_fuel_curium_hecm_247', 'nuclearcraft:fuel_berkelium_leb_248', 'nuclearcraft:depleted_fuel_berkelium_leb_248', 'nuclearcraft:fuel_californium_hecf_251', 'nuclearcraft:depleted_fuel_californium_hecf_251', 'nuclearcraft:fuel_californium_lecf_251', 'nuclearcraft:depleted_fuel_californium_lecf_251', 'nuclearcraft:fuel_californium_hecf_249', 'nuclearcraft:depleted_fuel_californium_hecf_249', 'nuclearcraft:fuel_californium_lecf_249', 'nuclearcraft:depleted_fuel_californium_lecf_249', 'nuclearcraft:fuel_berkelium_heb_248', 'nuclearcraft:depleted_fuel_berkelium_heb_248']
global.nuclearcraftFuelPattern = new RegExp(`^(?!(?:${global.NuclearCraftUnificationExcludedItems.join('|')})$).*nuclearcraft:(fuel|depleted_fuel).*`, 'i')
Expand Down

0 comments on commit a99829e

Please sign in to comment.