tube recipe bugfixes

tubelib/blackhole.lua

@@ -64,7 +64,7 @@ minetest.register_craft({
 	output = "tubelib:blackhole 2",
 	recipe = {
 		{"group:wood",    "",                   "group:wood"},
-		{"tubelib:tube1", "default:coal_lump",  "default:coal_lump"},
+		{"tubelib:tubeS", "default:coal_lump",  "default:coal_lump"},
 		{"group:wood",    "",                   "group:wood"},
 	},
 })

tubelib/distributor.lua

@@ -468,7 +468,7 @@ minetest.register_craft({
 	output = "tubelib:distributor 2",
 	recipe = {
 		{"group:wood", 		"default:steel_ingot",  "group:wood"},
-		{"tubelib:tube1", 	"default:mese_crystal",	"tubelib:tube1"},
+		{"tubelib:tubeS", 	"default:mese_crystal",	"tubelib:tubeS"},
 		{"group:wood", 		"default:steel_ingot",  "group:wood"},
 	},
 })

tubelib/migrate.lua

@@ -73,4 +73,50 @@ minetest.register_lbm({
 	end
 })
 
-minetest.register_node("tubelib:tube1", minetest.registered_nodes["tubelib:tubeS"])
+-- legacy tube, to be converted after placed
+minetest.register_node("tubelib:tube1", {
+	description = "Tubelib Tube",
+	tiles = { -- Top, base, right, left, front, back
+		"tubelib_tube.png^[transformR90",
+		"tubelib_tube.png^[transformR90",
+		"tubelib_tube.png",
+		"tubelib_tube.png",
+		"tubelib_hole.png",
+		"tubelib_hole.png",
+	},
+	
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		if not Tube:after_place_tube(pos, placer, pointed_thing) then
+			minetest.remove_node(pos)
+			return true
+		end
+		return false
+	end,
+	
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		Tube:after_dig_tube(pos, oldnode, oldmetadata)
+	end,
+	
+	paramtype2 = "facedir",
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-2/8, -2/8, -4/8,  2/8, 2/8, 4/8},
+		},
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = { -1/4, -1/4, -1/2,  1/4, 1/4, 1/2 },
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = { -1/4, -1/4, -1/2,  1/4, 1/4, 1/2 },
+	},
+	on_rotate = screwdriver.disallow,
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {choppy=2, cracky=3, stone=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_wood_defaults(),
+})

tubelib/pusher.lua

@@ -219,7 +219,7 @@ minetest.register_craft({
 	output = "tubelib:pusher 2",
 	recipe = {
 		{"group:wood", 		"wool:dark_green",   	"group:wood"},
-		{"tubelib:tube1", 	"default:mese_crystal",	"tubelib:tube1"},
+		{"tubelib:tubeS", 	"default:mese_crystal",	"tubelib:tubeS"},
 		{"group:wood", 		"wool:dark_green",   	"group:wood"},
 	},
 })

tubelib_addons1/autocrafter.lua

@@ -411,7 +411,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:autocrafter",
 	recipe = {
 		{"group:wood", 			"default:steel_ingot",  "group:wood"},
-		{"tubelib:tube1", 		"default:mese_crystal",	"tubelib:tube1"},
+		{"tubelib:tubeS", 		"default:mese_crystal",	"tubelib:tubeS"},
 		{"default:steel_ingot", "default:steel_ingot",  "default:steel_ingot"},
 	},
 })

tubelib_addons1/chest.lua

@@ -129,7 +129,7 @@ minetest.register_node("tubelib_addons1:chest", {
 minetest.register_craft({
 	type = "shapeless",
 	output = "tubelib_addons1:chest",
-	recipe = {"default:chest", "tubelib:tube1", "default:steel_ingot"}
+	recipe = {"default:chest", "tubelib:tubeS", "default:steel_ingot"}
 })
 
 tubelib.register_node("tubelib_addons1:chest", {}, {

tubelib_addons1/detector.lua

@@ -111,7 +111,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:detector",
 	recipe = {
 		{"", "group:wood", ""},
-		{"tubelib:tube1", "tubelib:wlanchip", "tubelib:tube1"},
+		{"tubelib:tubeS", "tubelib:wlanchip", "tubelib:tubeS"},
 		{"", "group:wood", ""},
 	},
 })

tubelib_addons1/fermenter.lua

@@ -333,7 +333,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:fermenter",
 	recipe = {
 		{"default:steel_ingot", "default:dirt", "default:steel_ingot"},
-		{"tubelib:tube1", "default:mese_crystal", "tubelib:tube1"},
+		{"tubelib:tubeS", "default:mese_crystal", "tubelib:tubeS"},
 		{"default:steel_ingot", "group:wood", "default:steel_ingot"},
 	},
 })

tubelib_addons1/funnel.lua

@@ -130,7 +130,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:funnel 2",
 	recipe = {
 		{"group:wood", "", "group:wood"},
-		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tube1"},
+		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tubeS"},
 		{"group:wood", "", "group:wood"},
 	},
 })

tubelib_addons1/grinder.lua

@@ -253,7 +253,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:grinder",
 	recipe = {
 		{"group:wood", "default:tin_ingot", "group:wood"},
-		{"tubelib:tube1", "default:mese_crystal", "tubelib:tube1"},
+		{"tubelib:tubeS", "default:mese_crystal", "tubelib:tubeS"},
 		{"group:wood", "default:tin_ingot", "group:wood"},
 	},
 })

tubelib_addons1/harvester.lua

@@ -419,7 +419,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:harvester_base",
 	recipe = {
 		{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"},
-		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tube1"},
+		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tubeS"},
 		{"group:wood", 			"default:mese_crystal", "group:wood"},
 	},
 })

tubelib_addons1/liquidsampler.lua

@@ -265,7 +265,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:liquidsampler",
 	recipe = {
 		{"group:wood", "default:steel_ingot", "group:wood"},
-		{"default:mese_crystal", "bucket:bucket_empty", "tubelib:tube1"},
+		{"default:mese_crystal", "bucket:bucket_empty", "tubelib:tubeS"},
 		{"group:wood", "default:steel_ingot", "group:wood"},
 	},
 })

tubelib_addons1/quarry.lua

@@ -430,7 +430,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:quarry",
 	recipe = {
 		{"group:wood", 			"default:mese_crystal", "group:wood"},
-		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tube1"},
+		{"default:steel_ingot", "default:mese_crystal",	"tubelib:tubeS"},
 		{"group:wood", 			"default:mese_crystal", "group:wood"},
 	},
 })

tubelib_addons1/reformer.lua

@@ -299,7 +299,7 @@ minetest.register_craft({
 	output = "tubelib_addons1:reformer",
 	recipe = {
 		{"default:steel_ingot", "default:clay", "default:steel_ingot"},
-		{"tubelib:tube1", "default:mese_crystal", "tubelib:tube1"},
+		{"tubelib:tubeS", "default:mese_crystal", "tubelib:tubeS"},
 		{"default:steel_ingot", "group:wood", "default:steel_ingot"},
 	},
 })

tubelib_addons3/teleporter.lua

@@ -66,7 +66,7 @@ minetest.register_craft({
 	output = "tubelib_addons3:teleporter 2",
 	recipe = {
 		{"default:gold_ingot", "group:wood", ""},
-		{"default:mese_crystal", "default:mese_crystal", "tubelib:tube1"},
+		{"default:mese_crystal", "default:mese_crystal", "tubelib:tubeS"},
 		{"default:gold_ingot", "group:wood", ""},
 	},
 })