Drop and alias flint-and-steel (merged in Minetest Game)

diff --git a/craftitems.lua b/craftitems.lua
index f4e31003521a110edcada63c41693284f38685fa..e189a66aa80a01c0a35340f2802276abbccef89a 100644 (file)
--- a/craftitems.lua
+++ b/craftitems.lua
@@ -21,27 +21,7 @@ minetest.register_craftitem("xdecor:bowl_soup", {
        end
 })
 
-if rawget(_G, "fire") then
-       minetest.register_tool("xdecor:flint_steel", {
-               description = "Flint & Steel",
-               inventory_image = "xdecor_flint_steel.png",
-               on_use = function(itemstack, user, pointed_thing)
-                       local player = user:get_player_name()
-                       local pt = pointed_thing
-
-                       if pt.type == "node" and minetest.get_node(pt.above).name == "air" then
-                               if not minetest.is_protected(pt.above, player) then
-                                       minetest.set_node(pt.above, {name="fire:basic_flame"})
-                               else
-                                       minetest.chat_send_player(player, "[!] This area is protected")
-                               end
-                       end
-
-                       itemstack:add_wear(2000)
-                       return itemstack
-               end
-       })
-end
+minetest.register_alias("xdecor:flint_steel", "fire:flint_and_steel")
 
 minetest.register_tool("xdecor:hammer", {
        description = "Hammer",

diff --git a/recipes.lua b/recipes.lua
index 36ec58d262a9ecbcec2cb865dfeb8fd8c7cdbffc..d30d5213ba1f4ccf22799c1db2fc974765755141 100644 (file)
--- a/recipes.lua
+++ b/recipes.lua
@@ -145,13 +145,6 @@ minetest.register_craft({
        }
 })
 
-minetest.register_craft({
-       output = "xdecor:flint_steel",
-       recipe = {
-               {"default:obsidian_shard", "default:steel_ingot"}
-       }
-})
-
 minetest.register_craft({
        output = "xdecor:frame",
        recipe = {

diff --git a/textures/xdecor_flint_steel.png b/textures/xdecor_flint_steel.png
deleted file mode 100644 (file)
index ce7fabc..0000000
Binary files a/textures/xdecor_flint_steel.png and /dev/null differ