From f8b6cfe365dc9a8c61d4bb96c4812c801374522d Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sun, 20 Mar 2016 11:48:48 +0100 Subject: [PATCH] Phase-out some aliases --- cooking.lua | 1 - mechanisms.lua | 4 ++-- nodes.lua | 10 +--------- workbench.lua | 8 -------- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/cooking.lua b/cooking.lua index 8231fb9..f3f4715 100644 --- a/cooking.lua +++ b/cooking.lua @@ -163,7 +163,6 @@ xdecor.register("cauldron_boiling", { on_construct = cauldron.boiling_construct, on_timer = cauldron.boiling_timer }) -minetest.register_alias("xdecor:cauldron_boiling_water", "xdecor:cauldron_boiling") xdecor.register("cauldron_soup", { groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1}, diff --git a/mechanisms.lua b/mechanisms.lua index a3a4937..36e0ef8 100644 --- a/mechanisms.lua +++ b/mechanisms.lua @@ -75,12 +75,12 @@ end plate.register("wood", "Wooden", { sounds = default.node_sound_wood_defaults(), - groups = {choppy=3, flammable=2} + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2} }) plate.register("stone", "Stone", { sounds = default.node_sound_stone_defaults(), - groups = {cracky=3} + groups = {cracky=3, oddly_breakable_by_hand=2} }) xdecor.register("lever_off", { diff --git a/nodes.lua b/nodes.lua index 81e4074..4c7384a 100644 --- a/nodes.lua +++ b/nodes.lua @@ -196,8 +196,6 @@ for _, c in pairs({"red"}) do -- Add more curtains colors simply here. }) end -minetest.register_alias("xdecor:crate", "default:chest") - xdecor.register("cushion", { description = "Cushion", tiles = {"xdecor_cushion.png"}, @@ -286,7 +284,7 @@ xdecor.register("enderchest", { tiles = {"xdecor_enderchest_top.png", "xdecor_enderchest_top.png", "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", "xdecor_enderchest_front.png"}, - groups = {cracky=1, choppy=1, oddly_breakable_by_hand=1}, + groups = {cracky=1, choppy=1}, sounds = default.node_sound_stone_defaults(), on_rotate = screwdriver.rotate_simple, on_construct = function(pos) @@ -348,7 +346,6 @@ for _, l in pairs({"iron", "wooden"}) do sounds = default.node_sound_glass_defaults() }) end -minetest.register_alias("xdecor:lightbox", "xdecor:wooden_lightbox") for _, f in pairs({"dandelion_white", "dandelion_yellow", "geranium", "rose", "tulip", "viola"}) do @@ -408,11 +405,6 @@ for i = 2, 4 do }) end -minetest.register_alias("xpanes:rust_bar", "xpanes:rusty_bar") -for i = 1, 15 do - minetest.register_alias("xpanes:rust_bar_"..i, "xpanes:rusty_bar_"..i) -end - xdecor.register("stonepath", { description = "Garden Stone Path", tiles = {"default_stone.png"}, diff --git a/workbench.lua b/workbench.lua index 405f1c6..2e564b1 100644 --- a/workbench.lua +++ b/workbench.lua @@ -257,14 +257,6 @@ for node in pairs(minetest.registered_nodes) do on_place = minetest.rotate_node }) end - if node:match(":mese") then - if d[3] then minetest.register_alias(node.."_"..d[1], "default:glass_"..d[1]) - else minetest.register_alias("stairs:"..d[1].."_"..node:match(":(.*)"), "stairs:"..d[1].."_glass") end - elseif workbench:nodes(def) and not d[3] then - minetest.register_alias(node.."_"..d[1], "stairs:"..d[1].."_"..node:match(":(.*)")) - end end end -minetest.register_alias("xdecor:worktable", "xdecor:workbench") -