merged from upstream

kubejs/server_scripts/main_server_script.js

@@ -22,6 +22,7 @@ ServerEvents.tags('item', event => {
 	registerCreateConnectedItemTags(event)
 	registerCreateDecoItemTags(event)
 	registerCreateFactoryLogisticsItemTags(event)
+	registerCreateHypertubeItemTags(event)
 	registerDeaFissionItemTags(event)
 	registerDomumOrnamentumItemTags(event)
 	registerDiggerHelmetItemTags(event)
@@ -37,6 +38,7 @@ ServerEvents.tags('item', event => {
 	registerGreateItemTags(event)
 	registerGTCEUItemTags(event)
 	registerImmersiveAircraftItemTags(event)
+	registerMacawsForTFCItemTags(event)
 	registerMegaCellsItemTags(event)
 	registerMinecraftItemTags(event)
 	registerModernMarkingsItemTags(event)
@@ -53,7 +55,7 @@ ServerEvents.tags('item', event => {
 	registerTFCItemTags(event)
 	registerTFCTextileItemTags(event)
 	registerTFGItemTags(event)
-	registerTFGItemTagsNuclear(event)
+	registerTFGNuclearItemTags(event)
     registerTFCLunchboxItemTags(event)
 	registerVintageImprovementsItemTags(event)
 	registerWABItemTags(event)
@@ -68,6 +70,7 @@ ServerEvents.tags('block', event => {
 	registerAFCBlockTags(event)
 	registerAsticorCartsBlockTags(event)
 	registerBeneathBlockTags(event)
+	registerBlockRunnerBlockTags(event)
 	registerComputerCraftBlockTags(event)
 	registerCreateBlockTags(event)
 	registerCreateAdditionsBlockTags(event)
@@ -86,6 +89,7 @@ ServerEvents.tags('block', event => {
 	registerMoreRedBlockTags(event)
 	registerHotOrNotBlockTags(event)
 	registerRailWaysBlockTags(event)
+	registerRnrBlockTags(event)
 	registerSophisticatedBackpacksBlockTags(event)
 	registerSpeciesBlockTags(event)
 	registerTACZBlockTags(event)
@@ -132,6 +136,7 @@ ServerEvents.tags('worldgen/biome', event => {
 	registerAdAstraBiomeTags(event)
 	registerCreatePickyWheelsBiomeTags(event)
 	registerTFGBiomeTags(event)
+	registerWansAncientBeastsBiomeTags(event)
 })
 
 ServerEvents.tags('entity_type', event => {
@@ -155,6 +160,7 @@ TFCEvents.data(event => {
 	registerTFCDataForAdAstra(event);
 	registerTFCDataForArborFirmaCraft(event)
 	registerTFCDataForChalk(event);
+	registerTFCDataForChimes(event);
 	registerTFCDataForCreateAddition(event);
 	registerTFCDataForFirmalife(event)
 	registerTFCDataForGTCEU(event)
@@ -177,6 +183,8 @@ TFCEvents.data(event => {
  */
 LootJS.modifiers((event) => {
 	registerAdAstraLoots(event)
+	registerBeneathLoots(event)
+	registerTFGRockLoots(event)
 	registerTFGOreLoots(event)
 	registerLootrLoots(event)
 	registerPrimitiveCreaturesLoots(event)
@@ -198,6 +206,13 @@ GTCEuServerEvents.fluidVeins(event => {
 	registerGTCEUBedrockFluidVeins(event)
 })
 
+
+/** Correct recipe IDs to replace invalid characters */
+function linuxUnfucker(value) {
+	const str = (value === undefined || value === null) ? "" : value.toString();
+	return str.replace(/[/:\s]/g, "_");
+};
+
 /**
  * Событие регистрации рецептов.
  * Срабатывает после инициализации датапаков и тегов.
@@ -216,6 +231,7 @@ ServerEvents.recipes(event => {
 	registerBeneathRecipes(event)
 	registerBuildingGadgetsRecipes(event)
 	registerChalkRecipes(event);
+	registerChimesRecipes(event);
 	registerComfortsRecipes(event);
 	registerComputerCraftRecipes(event)
 	//registerCccBridgeRecipes(event)
@@ -227,6 +243,8 @@ ServerEvents.recipes(event => {
 	registerCreateFactoryLogisticsRecipes(event)
 	registerCreateHorsePowerBlockRecipes(event)
 	registerCreateHypertubeRecipes(event)
+	registerCreateSoundOfSteamRecipes(event)
+	//registerCreateStockBridgeRecipes(event)
 	registerDeaFissionRecipes(event)
 	registerDiggerHelmetRecipes(event)
 	registerDomumOrnamentumRecipes(event)
@@ -242,6 +260,7 @@ ServerEvents.recipes(event => {
 	registerGrapplingHookRecipes(event);
 	registerGreateRecipes(event)
 	registerGTCEURecipes(event);
+	registerGTCEUTerminalRecipes(event)
 	registerHandGliderRecipes(event)
 	registerHotOrNotRecipes(event)
 	registerImmersiveAircraftRecipes(event)
@@ -266,11 +285,11 @@ ServerEvents.recipes(event => {
 	registerTFCAmbientalRecipes(event)
 	registerTFCBetterBFRecipes(event)
 	registerTFCLunchBoxRecipes(event)
-	registerTFCScrapingRecipes(event)
 	registerTFCGroomingStationRecipes(event)
 	registerTFCGurmanRecipes(event)
 	registerTFGRecipes(event)
 	registerTFCTextileRecipes(event)
+	registerTFCScrapingKnivesRecipes(event)
 	registerToolBeltRecipes(event)
 	registerVintageImprovementsRecipes(event)
 	registerWaterFlasksRecipes(event)