merge
This commit is contained in:
Pyritie
commit
b7cc04f188
26 changed files with 544 additions and 275 deletions
|
|
@ -5,46 +5,46 @@
|
|||
*/
|
||||
ServerEvents.tags('item', event => {
|
||||
registerAdAstraItemTags(event)
|
||||
registerAdvancedPeripheralsItemTags(event)
|
||||
registerAE2ItemTags(event)
|
||||
registerAFCItemTags(event)
|
||||
registerAlekiroofsItemTags(event)
|
||||
registerAlekishipsItemTags(event)
|
||||
registerAsticorCartsItemTags(event)
|
||||
registerBeneathItemTags(event)
|
||||
registerChalkItemTags(event);
|
||||
registerChiselAndBitsItemTags(event)
|
||||
registerComputerCraftItemTags(event)
|
||||
registerConstructionWandItemTags(event)
|
||||
registerCreateItemTags(event)
|
||||
registerCreateAdditionsItemTags(event)
|
||||
registerCreateConnectedItemTags(event)
|
||||
registerCreateDecoItemTags(event)
|
||||
registerDiggerHelmetItemTags(event)
|
||||
registerEndermanOverhaulItemTags(event)
|
||||
registerEveryCompatItemTags(event)
|
||||
registerExposureItemTags(event)
|
||||
registerExtendedAE2ItemTags(event)
|
||||
registerFirmaCivItemTags(event)
|
||||
registerFirmaLifeItemTags(event)
|
||||
registerFramedBlocksItemTags(event)
|
||||
registerFTBQuestsItemTags(event)
|
||||
registerGrapplemodItemTags(event)
|
||||
registerGreateItemTags(event)
|
||||
registerGTCEUItemTags(event)
|
||||
registerMegaCellsItemTags(event)
|
||||
registerMinecraftItemTags(event)
|
||||
registerMoreRedItemTags(event)
|
||||
registerHotOrNotItemTags(event)
|
||||
registerRailWaysItemTags(event)
|
||||
registerRnrItemTags(event)
|
||||
registerSophisticatedBackpacksItemTags(event)
|
||||
registerSpeciesItemTags(event)
|
||||
registerTFCAmbientalItemTags(event)
|
||||
registerTFCItemTags(event)
|
||||
registerTFCTextileItemTags(event)
|
||||
registerTFGItemTags(event)
|
||||
registerVintageImprovementsItemTags(event)
|
||||
registerAdvancedPeripheralsItemTags(event)
|
||||
registerAE2ItemTags(event)
|
||||
registerAFCItemTags(event)
|
||||
registerAlekiroofsItemTags(event)
|
||||
registerAlekishipsItemTags(event)
|
||||
registerAsticorCartsItemTags(event)
|
||||
registerBeneathItemTags(event)
|
||||
registerChalkItemTags(event);
|
||||
registerChiselAndBitsItemTags(event)
|
||||
registerComputerCraftItemTags(event)
|
||||
registerConstructionWandItemTags(event)
|
||||
registerCreateItemTags(event)
|
||||
registerCreateAdditionsItemTags(event)
|
||||
registerCreateConnectedItemTags(event)
|
||||
registerCreateDecoItemTags(event)
|
||||
registerDiggerHelmetItemTags(event)
|
||||
registerEndermanOverhaulItemTags(event)
|
||||
registerEveryCompatItemTags(event)
|
||||
registerExposureItemTags(event)
|
||||
registerExtendedAE2ItemTags(event)
|
||||
registerFirmaCivItemTags(event)
|
||||
registerFirmaLifeItemTags(event)
|
||||
registerFramedBlocksItemTags(event)
|
||||
registerFTBQuestsItemTags(event)
|
||||
registerGrapplemodItemTags(event)
|
||||
registerGreateItemTags(event)
|
||||
registerGTCEUItemTags(event)
|
||||
registerMegaCellsItemTags(event)
|
||||
registerMinecraftItemTags(event)
|
||||
registerMoreRedItemTags(event)
|
||||
registerHotOrNotItemTags(event)
|
||||
registerRailWaysItemTags(event)
|
||||
registerRnrItemTags(event)
|
||||
registerSophisticatedBackpacksItemTags(event)
|
||||
registerSpeciesItemTags(event)
|
||||
registerTFCAmbientalItemTags(event)
|
||||
registerTFCItemTags(event)
|
||||
registerTFCTextileItemTags(event)
|
||||
registerTFGItemTags(event)
|
||||
registerVintageImprovementsItemTags(event)
|
||||
})
|
||||
|
||||
/**
|
||||
|
|
@ -52,67 +52,67 @@ ServerEvents.tags('item', event => {
|
|||
*/
|
||||
ServerEvents.tags('block', event => {
|
||||
registerAdAstraBlockTags(event)
|
||||
registerAE2BlockTags(event)
|
||||
registerAFCBlockTags(event)
|
||||
registerAsticorCartsBlockTags(event)
|
||||
registerBeneathBlockTags(event)
|
||||
registerChiselAndBitsBlockTags(event)
|
||||
registerComputerCraftBlockTags(event)
|
||||
registerCreateBlockTags(event)
|
||||
registerCreateAdditionsBlockTags(event)
|
||||
registerCreateDecoBlockTags(event)
|
||||
registerDomumOrnamentumBlockTags(event)
|
||||
registerEndermanOverhaulBlockTags(event)
|
||||
registerExtendedAE2BlockTags(event)
|
||||
registerFirmaCivBlockTags(event)
|
||||
registerFirmaLifeBlockTags(event)
|
||||
registerFramedBlocksBlockTags(event)
|
||||
registerFTBQuestsBlockTags(event)
|
||||
registerGreateBlockTags(event)
|
||||
registerGTCEUBlockTags(event)
|
||||
registerMegaCellsBlockTags(event)
|
||||
registerMinecraftBlockTags(event)
|
||||
registerMoreRedBlockTags(event)
|
||||
registerHotOrNotBlockTags(event)
|
||||
registerRailWaysBlockTags(event)
|
||||
registerSophisticatedBackpacksBlockTags(event)
|
||||
registerSpeciesBlockTags(event)
|
||||
registerTFCBlockTags(event)
|
||||
registerTFGBlockTags(event)
|
||||
registerVintageImprovementsBlockTags(event)
|
||||
registerAE2BlockTags(event)
|
||||
registerAFCBlockTags(event)
|
||||
registerAsticorCartsBlockTags(event)
|
||||
registerBeneathBlockTags(event)
|
||||
registerChiselAndBitsBlockTags(event)
|
||||
registerComputerCraftBlockTags(event)
|
||||
registerCreateBlockTags(event)
|
||||
registerCreateAdditionsBlockTags(event)
|
||||
registerCreateDecoBlockTags(event)
|
||||
registerDomumOrnamentumBlockTags(event)
|
||||
registerEndermanOverhaulBlockTags(event)
|
||||
registerExtendedAE2BlockTags(event)
|
||||
registerFirmaCivBlockTags(event)
|
||||
registerFirmaLifeBlockTags(event)
|
||||
registerFramedBlocksBlockTags(event)
|
||||
registerFTBQuestsBlockTags(event)
|
||||
registerGreateBlockTags(event)
|
||||
registerGTCEUBlockTags(event)
|
||||
registerMegaCellsBlockTags(event)
|
||||
registerMinecraftBlockTags(event)
|
||||
registerMoreRedBlockTags(event)
|
||||
registerHotOrNotBlockTags(event)
|
||||
registerRailWaysBlockTags(event)
|
||||
registerSophisticatedBackpacksBlockTags(event)
|
||||
registerSpeciesBlockTags(event)
|
||||
registerTFCBlockTags(event)
|
||||
registerTFGBlockTags(event)
|
||||
registerVintageImprovementsBlockTags(event)
|
||||
})
|
||||
|
||||
/**
|
||||
* Событие регистрации жидкость-тэгов.
|
||||
*/
|
||||
ServerEvents.tags('fluid', event => {
|
||||
registerAFCFluidTags(event)
|
||||
registerAFCFluidTags(event)
|
||||
registerAdAstraFluidTags(event)
|
||||
registerCreateFluidTags(event)
|
||||
registerCreateAdditionsFluidTags(event)
|
||||
registerGTCEUFluidTags(event)
|
||||
registerGreateFluidTags(event)
|
||||
registerFirmaLifeFluidTags(event)
|
||||
registerTFCFluidTags(event)
|
||||
registerTFGFluidTags(event)
|
||||
registerVintageImprovementsFluidTags(event)
|
||||
registerCreateFluidTags(event)
|
||||
registerCreateAdditionsFluidTags(event)
|
||||
registerGTCEUFluidTags(event)
|
||||
registerGreateFluidTags(event)
|
||||
registerFirmaLifeFluidTags(event)
|
||||
registerTFCFluidTags(event)
|
||||
registerTFGFluidTags(event)
|
||||
registerVintageImprovementsFluidTags(event)
|
||||
})
|
||||
|
||||
/**
|
||||
* Событие регистрации тегов структур.
|
||||
*/
|
||||
ServerEvents.tags('worldgen/placed_feature', event => {
|
||||
// Remove default veins
|
||||
event.removeAll('tfc:in_biome/veins')
|
||||
// Remove default veins
|
||||
event.removeAll('tfc:in_biome/veins')
|
||||
|
||||
registerAdAstraPlacedFeatures(event)
|
||||
registerTFCPlacedFeatures(event)
|
||||
registerTFGPlacedFeatures(event)
|
||||
registerAdAstraPlacedFeatures(event)
|
||||
registerTFCPlacedFeatures(event)
|
||||
registerTFGPlacedFeatures(event)
|
||||
})
|
||||
|
||||
ServerEvents.tags('worldgen/biome', event => {
|
||||
registerTFCBiomeTags(event)
|
||||
registerTFGBiomeTags(event)
|
||||
registerTFCBiomeTags(event)
|
||||
registerTFGBiomeTags(event)
|
||||
})
|
||||
|
||||
ServerEvents.tags('worldgen/biome', event => {
|
||||
|
|
@ -128,7 +128,7 @@ ServerEvents.tags('entity_type', event => {
|
|||
* Срабатывает до инициализации рецептов, но после тегов.
|
||||
*/
|
||||
ServerEvents.highPriorityData(event => {
|
||||
registerComputerCraftData(event)
|
||||
registerComputerCraftData(event)
|
||||
})
|
||||
|
||||
/**
|
||||
|
|
@ -136,15 +136,17 @@ ServerEvents.highPriorityData(event => {
|
|||
* Срабатывает до инициализации рецептов, но после тегов.
|
||||
*/
|
||||
TFCEvents.data(event => {
|
||||
registerTFCDataForAdAstra(event);
|
||||
registerTFCDataForArborFirmaCraft(event)
|
||||
registerTFCDataForChalk(event);
|
||||
registerTFCDataForGTCEU(event)
|
||||
registerTFCDataForImmersiveAircraft(event);
|
||||
registerTFCDataForTFC(event)
|
||||
registerTFCDataForTFCBetterBF(event)
|
||||
registerTFCDataForWaterFlasks(event)
|
||||
registerTFCDataForFirmalife(event)
|
||||
registerTFCDataForAdAstra(event);
|
||||
registerTFCDataForArborFirmaCraft(event)
|
||||
registerTFCDataForChalk(event);
|
||||
registerTFCDataForGTCEU(event)
|
||||
registerTFCDataForImmersiveAircraft(event);
|
||||
registerTFCDataForSophisticatedBackpacks(event)
|
||||
registerTFCDataForTFC(event)
|
||||
registerTFCDataForTFCBetterBF(event)
|
||||
registerTFCDataForTFCLunchbox(event)
|
||||
registerTFCDataForWaterFlasks(event)
|
||||
registerTFCDataForFirmalife(event)
|
||||
})
|
||||
|
||||
/**
|
||||
|
|
@ -152,11 +154,11 @@ TFCEvents.data(event => {
|
|||
* Срабатывает до инициализации рецептов, но после датапаков и тегов.
|
||||
*/
|
||||
LootJS.modifiers((event) => {
|
||||
registerGTCEULoots(event)
|
||||
registerLootrLoots(event)
|
||||
registerPrimitiveCreatesLoots(event)
|
||||
registerTFCLoots(event)
|
||||
registerTFGLoots(event)
|
||||
registerGTCEULoots(event)
|
||||
registerLootrLoots(event)
|
||||
registerPrimitiveCreatesLoots(event)
|
||||
registerTFCLoots(event)
|
||||
registerTFGLoots(event)
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
@ -164,11 +166,11 @@ LootJS.modifiers((event) => {
|
|||
* Не представляю когда срабатывает, но явно после тегов и датапаков.
|
||||
*/
|
||||
GTCEuServerEvents.oreVeins(event => {
|
||||
event.removeAll()
|
||||
event.removeAll()
|
||||
})
|
||||
|
||||
GTCEuServerEvents.bedrockOreVeins(event => {
|
||||
registerGTCEUBedrockOreVeins(event)
|
||||
registerGTCEUBedrockOreVeins(event)
|
||||
})
|
||||
|
||||
/**
|
||||
|
|
@ -177,61 +179,62 @@ GTCEuServerEvents.bedrockOreVeins(event => {
|
|||
*/
|
||||
ServerEvents.recipes(event => {
|
||||
registerAdAstraRecipes(event)
|
||||
registerAdvancedPeripheralsRecipes(event)
|
||||
registerAlekishipsRecipes(event)
|
||||
registerAE2Recipes(event)
|
||||
registerAFCRecipes(event)
|
||||
registerAsticorCartsRecipes(event)
|
||||
registerAE2InsertExportCardRecipes(event)
|
||||
registerAE2NetworkAnalyzerRecipes(event)
|
||||
registerAE2WTLibRecipes(event)
|
||||
registerBeneathRecipes(event)
|
||||
registerBuildingGadgetsRecipes(event)
|
||||
registerChalkRecipes(event);
|
||||
registerChiselAndBitsRecipes(event)
|
||||
registerComfortsRecipes(event);
|
||||
registerComputerCraftRecipes(event)
|
||||
registerCccBridgeRecipes(event)
|
||||
registerConstructionwandRecipes(event)
|
||||
registerCreateRecipes(event)
|
||||
registerCreateAdditionsRecipes(event)
|
||||
registerCreateConnectedRecipes(event)
|
||||
registerCreatedecoRecipes(event)
|
||||
registerCreateHorsePowerBlockRecipes(event)
|
||||
registerDiggerHelmetRecipes(event)
|
||||
registerDomumOrnamentumRecipes(event)
|
||||
registerEndermanOverhaulRecipes(event)
|
||||
registerEveryCompatRecipes(event)
|
||||
registerExtendedAE2Recipes(event)
|
||||
registerExposureRecipes(event)
|
||||
registerEtchedRecipes(event)
|
||||
registerFirmaCivRecipes(event)
|
||||
registerFirmaLifeRecipes(event)
|
||||
registerFramedBlocksRecipes(event)
|
||||
registerFTBQuestsRecipes(event)
|
||||
registerGrapplingHookRecipes(event);
|
||||
registerGreateRecipes(event)
|
||||
registerGTCEURecipes(event);
|
||||
registerHandGliderRecipes(event)
|
||||
registerHotOrNotRecipes(event)
|
||||
registerImmersiveAircraftRecipes(event)
|
||||
registerMeasurementsRecipes(event)
|
||||
registerMegaCellsRecipes(event)
|
||||
registerMERequesterRecipes(event)
|
||||
registerMinecraftRecipes(event)
|
||||
registerMoreRedRecipes(event)
|
||||
registerRailWaysRecipes(event)
|
||||
registerRnrRecipes(event)
|
||||
registerSophisticatedBackpacksRecipes(event)
|
||||
registerSimplylightRecipes(event)
|
||||
registerTfceaRecipes(event)
|
||||
registerTFCRecipes(event)
|
||||
registerTFCBetterBFRecipes(event)
|
||||
registerTFCGroomingStationRecipes(event)
|
||||
registerTFGRecipes(event)
|
||||
registerTFCTextileRecipes(event)
|
||||
registerToolBeltRecipes(event)
|
||||
registerTreeTapRecipes(event)
|
||||
registerVintageImprovementsRecipes(event)
|
||||
registerWaterFlasksRecipes(event)
|
||||
registerAdvancedPeripheralsRecipes(event)
|
||||
registerAlekishipsRecipes(event)
|
||||
registerAE2Recipes(event)
|
||||
registerAFCRecipes(event)
|
||||
registerAsticorCartsRecipes(event)
|
||||
registerAE2InsertExportCardRecipes(event)
|
||||
registerAE2NetworkAnalyzerRecipes(event)
|
||||
registerAE2WTLibRecipes(event)
|
||||
registerBeneathRecipes(event)
|
||||
registerBuildingGadgetsRecipes(event)
|
||||
registerChalkRecipes(event);
|
||||
registerChiselAndBitsRecipes(event)
|
||||
registerComfortsRecipes(event);
|
||||
registerComputerCraftRecipes(event)
|
||||
registerCccBridgeRecipes(event)
|
||||
registerConstructionwandRecipes(event)
|
||||
registerCreateRecipes(event)
|
||||
registerCreateAdditionsRecipes(event)
|
||||
registerCreateConnectedRecipes(event)
|
||||
registerCreatedecoRecipes(event)
|
||||
registerCreateHorsePowerBlockRecipes(event)
|
||||
registerDiggerHelmetRecipes(event)
|
||||
registerDomumOrnamentumRecipes(event)
|
||||
registerEndermanOverhaulRecipes(event)
|
||||
registerEveryCompatRecipes(event)
|
||||
registerExtendedAE2Recipes(event)
|
||||
registerExposureRecipes(event)
|
||||
registerEtchedRecipes(event)
|
||||
registerFirmaCivRecipes(event)
|
||||
registerFirmaLifeRecipes(event)
|
||||
registerFramedBlocksRecipes(event)
|
||||
registerFTBQuestsRecipes(event)
|
||||
registerGrapplingHookRecipes(event);
|
||||
registerGreateRecipes(event)
|
||||
registerGTCEURecipes(event);
|
||||
registerHandGliderRecipes(event)
|
||||
registerHotOrNotRecipes(event)
|
||||
registerImmersiveAircraftRecipes(event)
|
||||
registerMeasurementsRecipes(event)
|
||||
registerMegaCellsRecipes(event)
|
||||
registerMERequesterRecipes(event)
|
||||
registerMinecraftRecipes(event)
|
||||
registerMoreRedRecipes(event)
|
||||
registerRailWaysRecipes(event)
|
||||
registerRnrRecipes(event)
|
||||
registerSophisticatedBackpacksRecipes(event)
|
||||
registerSimplylightRecipes(event)
|
||||
registerTfceaRecipes(event)
|
||||
registerTFCRecipes(event)
|
||||
registerTFCBetterBFRecipes(event)
|
||||
registerTFCLunchBoxRecipes(event)
|
||||
registerTFCGroomingStationRecipes(event)
|
||||
registerTFGRecipes(event)
|
||||
registerTFCTextileRecipes(event)
|
||||
registerToolBeltRecipes(event)
|
||||
registerTreeTapRecipes(event)
|
||||
registerVintageImprovementsRecipes(event)
|
||||
registerWaterFlasksRecipes(event)
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue