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

kubejs/server_scripts/railways/recipes.js

@@ -85,6 +85,46 @@ const registerRailWaysRecipes = (event) => {
 
 	//#endregion
 
+	//#region conductor
+	event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`)
+		.itemInputs('#gtceu:circuits/lv','#gtceu:electric_motors','2x #forge:string','#tfc:high_quality_cloth')
+		.circuit(15)
+		.itemOutputs('railways:white_conductor_cap')
+		.duration(80)
+		.inputFluids(Fluid.of('gtceu:glue', 200))
+		.EUt(16)
+		
+	event.recipes.tfc.barrel_sealed(1000)
+		.inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288))
+		.outputItem(`railways:white_conductor_cap`)
+		.id(`railways:barrel/cap_decolor`)
+
+	global.MINECRAFT_DYE_NAMES.forEach(dye => {
+	event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`)
+				.itemInputs('railways:white_conductor_cap')
+				.inputFluids(Fluid.of(`tfc:${dye}_dye`, 288))
+				.itemOutputs(`railways:${dye}_conductor_cap`)
+				.duration(200)
+				.EUt(4)
+				.category(GTRecipeCategories.CHEM_DYES)
+		if (dye != "white") {
+	event.recipes.tfc.barrel_sealed(1000)
+				.inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288))
+				.outputItem(`railways:${dye}_conductor_cap`)
+				.id(`railways:barrel/dyeing/${dye}_conductor_cap`)
+
+	event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`)
+				.itemInputs('#tfg:colored_caps')
+				.inputFluids(Fluid.of('gtceu:chlorine',20))
+				.itemOutputs('railways:white_conductor_cap')
+				.duration(80)
+				.EUt(4)
+				.category(GTRecipeCategories.CHEM_DYES)
+		}
+	})
+		
+	//#endregion
+
 	// Переключатель пути поезда из андезита
 	event.shaped('railways:track_switch_andesite', [
 		'BAB',

kubejs/server_scripts/railways/tags.js

@@ -7,8 +7,12 @@ const registerRailWaysItemTags = (event) => {
         event.removeAllTagsFrom(item)
         event.add('c:hidden_from_recipe_viewers', item)
     })
+    // Adding Conductor tags
+    global.MINECRAFT_DYE_NAMES.forEach(dye => {
+		if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`)
+		event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`)
+	})
 }
-
 const registerRailWaysBlockTags = (event) => {
     
     // Удаление тегов у отключенных предметов

kubejs/startup_scripts/railways/constants.js

@@ -100,24 +100,6 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
     'railways:track_incomplete_tieless_narrow',
     'railways:track_incomplete_tieless_wide',
 
-    // Caps
-    'railways:white_conductor_cap',
-    'railways:orange_conductor_cap',
-    'railways:magenta_conductor_cap',
-    'railways:light_blue_conductor_cap',
-    'railways:yellow_conductor_cap',
-    'railways:lime_conductor_cap',
-    'railways:pink_conductor_cap',
-    'railways:gray_conductor_cap',
-    'railways:light_gray_conductor_cap',
-    'railways:cyan_conductor_cap',
-    'railways:purple_conductor_cap',
-    'railways:blue_conductor_cap',
-    'railways:brown_conductor_cap',
-    'railways:green_conductor_cap',
-    'railways:red_conductor_cap',
-    'railways:black_conductor_cap',
-
     // Incomplete Caps
     'railways:white_incomplete_conductor_cap',
     'railways:orange_incomplete_conductor_cap',