fix crafts to only register when their respective tubes are enabled

also add the one-way tube recipe back

4 files changed, 118 insertions, 108 deletions

diff --git a/routing_tubes.lua b/routing_tubes.lua
index 3533bad..ebd451f 100644
--- a/routing_tubes.lua
+++ b/routing_tubes.lua
@@ -26,6 +26,16 @@ if pipeworks.enable_accelerator_tube then
 						 return pipeworks.notvel(pipeworks.meseadjlist, velocity)
 					end}
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:accelerator_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
+
 end
 
 if pipeworks.enable_crossing_tube then
@@ -44,6 +54,15 @@ if pipeworks.enable_crossing_tube then
 						 return {velocity}
 					end}
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:crossing_tube_1 5",
+		recipe = {
+			{ "", "pipeworks:tube_1", "" },
+			{ "pipeworks:tube_1", "pipeworks:tube_1", "pipeworks:tube_1" },
+			{ "", "pipeworks:tube_1", "" }
+		},
+	})
 end
 
 if pipeworks.enable_one_way_tube then
@@ -71,23 +90,12 @@ if pipeworks.enable_one_way_tube then
 			priority = 75 -- Higher than normal tubes, but lower than receivers
 		},
 	})
-
+	minetest.register_craft({
+		output = "pipeworks:one_way_tube 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "group:stick", "default:mese_crystal", "homedecor:plastic_sheeting" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 end
-
-minetest.register_craft( {
-	output = "pipeworks:accelerator_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:crossing_tube_1 5",
-	recipe = {
-	        { "", "pipeworks:tube_1", "" },
-	        { "pipeworks:tube_1", "pipeworks:tube_1", "pipeworks:tube_1" },
-	        { "", "pipeworks:tube_1", "" }
-	},
-})
diff --git a/signal_tubes.lua b/signal_tubes.lua
index aff486f..44605c8 100644
--- a/signal_tubes.lua
+++ b/signal_tubes.lua
@@ -53,6 +53,15 @@ if pipeworks.enable_detector_tube then
 				 mesecons = {receptor = {state = "off",
 							 rules = pipeworks.mesecons_rules}}
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:conductor_tube_off_1 6",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "mesecons:mesecon", "mesecons:mesecon", "mesecons:mesecon" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 end
 
 if pipeworks.enable_conductor_tube then
@@ -88,22 +97,15 @@ if pipeworks.enable_conductor_tube then
 							  rules = pipeworks.mesecons_rules,
 							  offstate = "pipeworks:conductor_tube_off_#id"}}
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:detector_tube_off_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "mesecons:mesecon", "mesecons_materials:silicon", "mesecons:mesecon" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 end
 
-minetest.register_craft( {
-	output = "pipeworks:conductor_tube_off_1 6",
-	recipe = {
-		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-		{ "mesecons:mesecon", "mesecons:mesecon", "mesecons:mesecon" },
-		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
 
-minetest.register_craft( {
-	output = "pipeworks:detector_tube_off_1 2",
-	recipe = {
-		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-		{ "mesecons:mesecon", "mesecons_materials:silicon", "mesecons:mesecon" },
-		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
diff --git a/sorting_tubes.lua b/sorting_tubes.lua
index 933ecf2..92e9446 100644
--- a/sorting_tubes.lua
+++ b/sorting_tubes.lua
@@ -110,25 +110,25 @@ if pipeworks.enable_mese_tube then
 					return 0
 				end,
 				}, true) -- Must use old tubes, since the textures are rotated with 6d ones
-end
 
-minetest.register_craft( {
-	output = "pipeworks:mese_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "", "default:mese_crystal", "" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
+	minetest.register_craft( {
+		output = "pipeworks:mese_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "", "default:mese_crystal", "" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 
-minetest.register_craft( {
-	type = "shapeless",
-	output = "pipeworks:mese_tube_000000",
-	recipe = {
-	    "pipeworks:tube_1",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment"
-	},
-})
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_tube_000000",
+		recipe = {
+			"pipeworks:tube_1",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment"
+		},
+	})
+end
diff --git a/vacuum_tubes.lua b/vacuum_tubes.lua
index 35fc063..c1560cb 100644
--- a/vacuum_tubes.lua
+++ b/vacuum_tubes.lua
@@ -27,6 +27,31 @@ if pipeworks.enable_sand_tube then
 				       end
 			       end
 	})
+
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "default:sand", "default:sand", "default:sand" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
+
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "default:desert_sand", "default:desert_sand", "default:desert_sand" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
+
+	minetest.register_craft( {
+		output = "pipeworks:sand_tube_1",
+		recipe = {
+			{ "default:desert_sand", "pipeworks:tube_1", "default:desert_sand" },
+		},
+	})
 end
 
 if pipeworks.enable_mese_sand_tube then
@@ -87,59 +112,34 @@ if pipeworks.enable_mese_sand_tube then
 				       end
 			       end
 	})
-end
 
-minetest.register_craft( {
-	output = "pipeworks:sand_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:sand", "default:sand", "default:sand" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:sand_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:desert_sand", "default:desert_sand", "default:desert_sand" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:sand_tube_1",
-	recipe = {
-	        { "default:desert_sand", "pipeworks:tube_1", "default:desert_sand" },
-	},
-})
-
-minetest.register_craft( {
-	output = "pipeworks:mese_sand_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:sand", "default:mese_crystal", "default:sand" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
+	minetest.register_craft( {
+		output = "pipeworks:mese_sand_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "default:sand", "default:mese_crystal", "default:sand" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 
-minetest.register_craft( {
-	output = "pipeworks:mese_sand_tube_1 2",
-	recipe = {
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
-	        { "default:desert_sand", "default:mese_crystal", "default:desert_sand" },
-	        { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
-	},
-})
+	minetest.register_craft( {
+		output = "pipeworks:mese_sand_tube_1 2",
+		recipe = {
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+			{ "default:desert_sand", "default:mese_crystal", "default:desert_sand" },
+			{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
+		},
+	})
 
-minetest.register_craft( {
-	type = "shapeless",
-	output = "pipeworks:mese_sand_tube_1",
-	recipe = {
-  "pipeworks:sand_tube_1",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment",
-		"default:mese_crystal_fragment"
-	},
-})
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_sand_tube_1",
+		recipe = {
+	  "pipeworks:sand_tube_1",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment",
+			"default:mese_crystal_fragment"
+		},
+	})
+end