From 192f07f8b179d929b217433da77105aa9805975a Mon Sep 17 00:00:00 2001
From: unknown <24964441+wsor4035@users.noreply.github.com>
Date: Fri, 11 Mar 2022 20:29:07 -0500
Subject: [PATCH] fix last of non mesecon crafts

---
 crafts.lua        | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 sorting_tubes.lua | 21 -----------------
 teleport_tube.lua |  8 -------
 vacuum_tubes.lua  | 21 -----------------
 4 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/crafts.lua b/crafts.lua
index 4e6fb35..420ac02 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -1,6 +1,7 @@
 local materials = {
 	dirt = "default:dirt",
 	sand = "default:sand",
+	desert_stone = "default:desert_stone",
 	gravel = "default:gravel",
 	copper_ingot = "default:copper_ingot",
 	steel_ingot = "default:steel_ingot",
@@ -48,6 +49,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
 	materials = {
 		dirt = "fl_topsoil:dirt",
 		sand = "fl_stone:sand",
+		desert_stone = "fl_stone:desert_stone",
 		gravel = "fl_topsoil:gravel",
 		steel_ingot = "fl_ores:iron_ingot",
 		gold_ingot = "fl_ores:gold_ingot",
@@ -262,6 +264,15 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craft( {
+	output = "pipeworks:teleport_tube_1 2",
+	recipe = {
+	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+	        { materials.desert_stone, materials.mese, materials.desert_stone },
+	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+	},
+})
+
 if pipeworks.enable_priority_tube then
 	minetest.register_craft( {
 		output = "pipeworks:priority_tube_1 6",
@@ -304,4 +315,50 @@ if pipeworks.enable_one_way_tube then
 			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
 		},
 	})
+end
+
+if pipeworks.enable_mese_tube then
+	minetest.register_craft( {
+		output = "pipeworks:mese_tube_000000 2",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ "", materials.mese_crystal, "" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_tube_000000",
+		recipe = {
+			"pipeworks:tube_1",
+			materials.mese_crystal,
+			materials.mese_crystal,
+			materials.mese_crystal,
+			materials.mese_crystal,
+		},
+	})
+end
+
+if pipeworks.enable_mese_sand_tube then
+	minetest.register_craft( {
+		output = "pipeworks:mese_sand_tube_1 2",
+		recipe = {
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{"group:sand",                 materials.mese_crystal,       "group:sand" },
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
+
+	minetest.register_craft( {
+		type = "shapeless",
+		output = "pipeworks:mese_sand_tube_1",
+		recipe = {
+			"pipeworks:sand_tube_1",
+			materials.mese_crystal_fragment,
+			materials.mese_crystal_fragment,
+			materials.mese_crystal_fragment,
+			materials.mese_crystal_fragment,
+		},
+	})
 end
\ No newline at end of file
diff --git a/sorting_tubes.lua b/sorting_tubes.lua
index 10a81a6..0168fad 100644
--- a/sorting_tubes.lua
+++ b/sorting_tubes.lua
@@ -163,25 +163,4 @@ if pipeworks.enable_mese_tube then
 				end,
 			},
 	})
-
-	minetest.register_craft( {
-		output = "pipeworks:mese_tube_000000 2",
-		recipe = {
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{ "", "default:mese_crystal", "" },
-			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-
-	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/teleport_tube.lua b/teleport_tube.lua
index 9ad7f20..b41d525 100644
--- a/teleport_tube.lua
+++ b/teleport_tube.lua
@@ -260,14 +260,6 @@ pipeworks.register_tube("pipeworks:teleport_tube", {
 		end
 	},
 })
-minetest.register_craft( {
-	output = "pipeworks:teleport_tube_1 2",
-	recipe = {
-	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-	        { "default:desert_stone", "default:mese", "default:desert_stone" },
-	        { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-	},
-})
 
 if minetest.get_modpath("mesecons_mvps") ~= nil then
 	mesecon.register_on_mvps_move(function(moved_nodes)
diff --git a/vacuum_tubes.lua b/vacuum_tubes.lua
index 5e44a9a..f6a3546 100644
--- a/vacuum_tubes.lua
+++ b/vacuum_tubes.lua
@@ -67,27 +67,6 @@ if pipeworks.enable_mese_sand_tube then
 				end,
 			},
 	})
-
-	minetest.register_craft( {
-		output = "pipeworks:mese_sand_tube_1 2",
-		recipe = {
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-			{"group:sand",                 "default:mese_crystal",       "group:sand" },
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-		},
-	})
-
-	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
 
 local function vacuum(pos, radius)