1 files changed, 19 insertions, 12 deletions
diff --git a/data/mods/experimental/init.lua b/data/mods/experimental/init.lua
index 4b95a5fd5..207b38cbf 100644
--- a/data/mods/experimental/init.lua
+++ b/data/mods/experimental/init.lua
@@ -4,7 +4,7 @@
 
 -- An example furnace-thing implemented in Lua
 
-minetest.register_node("luafurnace", {
+minetest.register_node("experimental_luafurnace", {
 	tile_images = {"lava.png", "furnace_side.png", "furnace_side.png",
 		"furnace_side.png", "furnace_side.png", "furnace_front.png"},
 	--inventory_image = "furnace_front.png",
@@ -15,7 +15,7 @@ minetest.register_node("luafurnace", {
 })
 
 minetest.register_on_placenode(function(pos, newnode, placer)
-	if newnode.name == "luafurnace" then
+	if newnode.name == "experimental_luafurnace" then
 		print("get_meta");
 		local meta = minetest.env:get_meta(pos)
 		print("inventory_set_list");
@@ -42,7 +42,7 @@ minetest.register_on_placenode(function(pos, newnode, placer)
 end)
 
 minetest.register_abm({
-	nodenames = {"luafurnace"},
+	nodenames = {"experimental_luafurnace"},
 	interval = 1.0,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -97,7 +97,7 @@ minetest.register_abm({
 })
 
 minetest.register_craft({
-	output = 'node "luafurnace" 1',
+	output = 'node "experimental_luafurnace" 1',
 	recipe = {
 		{'node "cobble"', 'node "cobble"', 'node "cobble"'},
 		{'node "cobble"', 'node "cobble"', 'node "cobble"'},
@@ -132,7 +132,7 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_node("somenode", {
+minetest.register_node("experimental_somenode", {
 	tile_images = {"lava.png", "mese.png", "stone.png", "grass.png", "cobble.png", "tree_top.png"},
 	inventory_image = "treeprop.png",
 	material = {
@@ -151,7 +151,7 @@ minetest.register_node("somenode", {
 --
 
 minetest.register_craft({
-	output = 'node "TNT" 4',
+	output = 'node "experimental_tnt" 4',
 	recipe = {
 		{'node "wood" 1'},
 		{'craft "lump_of_coal" 1'},
@@ -159,7 +159,7 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_node("TNT", {
+minetest.register_node("experimental_tnt", {
 	tile_images = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png", "tnt_side.png", "tnt_side.png", "tnt_side.png"},
 	inventory_image = "tnt_side.png",
 	dug_item = '', -- Get nothing
@@ -168,6 +168,14 @@ minetest.register_node("TNT", {
 	},
 })
 
+minetest.register_on_punchnode(function(p, node)
+	if node.name == "experimental_tnt" then
+		minetest.env:remove_node(p)
+		minetest.env:add_luaentity(p, "experimental_tnt")
+		nodeupdate(p)
+	end
+end)
+
 local TNT = {
 	-- Static definition
 	physical = true, -- Collides with things
@@ -225,16 +233,15 @@ function TNT:on_rightclick(clicker)
 	--self.object:moveto(pos, false)
 end
 
-print("TNT dump: "..dump(TNT))
-
-print("Registering TNT");
-minetest.register_entity("TNT", TNT)
+--print("TNT dump: "..dump(TNT))
+--print("Registering TNT");
+minetest.register_entity("experimental_tnt", TNT)
 
 --
 -- A test entity for testing animated and yaw-modulated sprites
 --
 
-minetest.register_entity("testentity", {
+minetest.register_entity("experimental_testentity", {
 	-- Static definition
 	physical = true, -- Collides with things
 	-- weight = 5,