Drop wrought iron fence and metal cabinet (with aliases)

diff --git a/aliases.lua b/aliases.lua
new file mode 100644 (file)
index 0000000..fdc5d1d
--- /dev/null
+++ b/aliases.lua
@@ -0,0 +1,2 @@
+minetest.register_alias("xdecor:fence_wrought_iron", "default:fence_wood")
+minetest.register_alias("xdecor:metal_cabinet", "xdecor:cabinet")

diff --git a/init.lua b/init.lua
index b4af0a900faad10a3bf74bcfed480ba4d6d01032..1f703e287b40fc243a60925e14fb946c8d47985d 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -3,6 +3,7 @@ local modpath = minetest.get_modpath("xdecor")
 
 dofile(modpath.."/handlers/nodeboxes.lua")
 dofile(modpath.."/handlers/registration.lua")
+dofile(modpath.."/aliases.lua")
 dofile(modpath.."/crafts.lua")
 dofile(modpath.."/enchanting.lua")
 dofile(modpath.."/hive.lua")

diff --git a/nodes.lua b/nodes.lua
index 35ddc6e4d90db5b6f5553f677c66064098a1f5fe..cd279d43358b2a6d2cca7ab13b50508fd8a11cbb 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -294,17 +294,6 @@ minetest.register_on_joinplayer(function(player)
        inv:set_size("enderchest", 8*4)
 end)
 
-xdecor.register("fence_wrought_iron", {
-       description = "Wrought Iron Fence",
-       drawtype = "fencelike",
-       groups = {cracky=2},
-       tiles = {"xdecor_wrought_iron.png"},
-       selection_box = {
-               type = "fixed", fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
-       },
-       inventory_image = "default_fence_overlay.png^xdecor_wrought_iron.png^default_fence_overlay.png^[makealpha:255,126,126"
-})
-
 xdecor.register("fire", {
        description = "Fancy Fire",
        drawtype = "plantlike",
@@ -449,18 +438,6 @@ xdecor.register("plant_pot", {
        sounds = default.node_sound_stone_defaults()
 })
 
-xdecor.register("metal_cabinet", {
-       description = "Metal Cabinet",
-       inventory = {size=24},
-       groups = {snappy=3},
-       infotext = "Metal Cabinet",
-       tiles = {
-               "xdecor_metal_cabinet_sides.png", "xdecor_metal_cabinet_sides.png",
-               "xdecor_metal_cabinet_sides.png", "xdecor_metal_cabinet_sides.png",
-               "xdecor_metal_cabinet_sides.png", "xdecor_metal_cabinet_front.png"
-       }
-})
-
 xdecor.register("moonbrick", {
        drawtype = "normal",
        description = "Moon Brick",

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

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

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