From eb0540c712b425350d208fb53a6fd1101cc80bcf Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Mon, 31 Dec 2018 14:59:02 +0100 Subject: [PATCH] tube recipe bugfixes --- tubelib/blackhole.lua | 2 +- tubelib/distributor.lua | 2 +- tubelib/migrate.lua | 48 ++++++++++++++++++++++++++++++- tubelib/pusher.lua | 2 +- tubelib_addons1/autocrafter.lua | 2 +- tubelib_addons1/chest.lua | 2 +- tubelib_addons1/detector.lua | 2 +- tubelib_addons1/fermenter.lua | 2 +- tubelib_addons1/funnel.lua | 2 +- tubelib_addons1/grinder.lua | 2 +- tubelib_addons1/harvester.lua | 2 +- tubelib_addons1/liquidsampler.lua | 2 +- tubelib_addons1/quarry.lua | 2 +- tubelib_addons1/reformer.lua | 2 +- tubelib_addons3/teleporter.lua | 2 +- 15 files changed, 61 insertions(+), 15 deletions(-) diff --git a/tubelib/blackhole.lua b/tubelib/blackhole.lua index b916c02..77394a2 100644 --- a/tubelib/blackhole.lua +++ b/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"}, }, }) diff --git a/tubelib/distributor.lua b/tubelib/distributor.lua index a170c6a..a65c39d 100644 --- a/tubelib/distributor.lua +++ b/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"}, }, }) diff --git a/tubelib/migrate.lua b/tubelib/migrate.lua index 6769873..0f20583 100644 --- a/tubelib/migrate.lua +++ b/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(), +}) diff --git a/tubelib/pusher.lua b/tubelib/pusher.lua index 58fb4fa..56ac1a3 100644 --- a/tubelib/pusher.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/autocrafter.lua b/tubelib_addons1/autocrafter.lua index 86402cb..b61d52a 100644 --- a/tubelib_addons1/autocrafter.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/chest.lua b/tubelib_addons1/chest.lua index 4dbc6e6..5344d02 100644 --- a/tubelib_addons1/chest.lua +++ b/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", {}, { diff --git a/tubelib_addons1/detector.lua b/tubelib_addons1/detector.lua index 34cdc96..dcf14f7 100644 --- a/tubelib_addons1/detector.lua +++ b/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", ""}, }, }) diff --git a/tubelib_addons1/fermenter.lua b/tubelib_addons1/fermenter.lua index 3defc5a..2ddb7f7 100644 --- a/tubelib_addons1/fermenter.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/funnel.lua b/tubelib_addons1/funnel.lua index 030bba6..ee25f2d 100644 --- a/tubelib_addons1/funnel.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/grinder.lua b/tubelib_addons1/grinder.lua index 8575238..67f4ab3 100644 --- a/tubelib_addons1/grinder.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/harvester.lua b/tubelib_addons1/harvester.lua index 14f5b8a..e976bf7 100644 --- a/tubelib_addons1/harvester.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/liquidsampler.lua b/tubelib_addons1/liquidsampler.lua index 34983d6..695349a 100644 --- a/tubelib_addons1/liquidsampler.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/quarry.lua b/tubelib_addons1/quarry.lua index 421e128..2b8db29 100644 --- a/tubelib_addons1/quarry.lua +++ b/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"}, }, }) diff --git a/tubelib_addons1/reformer.lua b/tubelib_addons1/reformer.lua index a6f9d41..d4fd3b3 100644 --- a/tubelib_addons1/reformer.lua +++ b/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"}, }, }) diff --git a/tubelib_addons3/teleporter.lua b/tubelib_addons3/teleporter.lua index 9cf5894..09aeaa5 100644 --- a/tubelib_addons3/teleporter.lua +++ b/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", ""}, }, })