From: Perttu Ahola Date: Sat, 3 Dec 2011 20:31:12 +0000 (+0200) Subject: Rename lump_of_* to *_lump X-Git-Tag: 0.4.dev-20111204-1~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=03074cd23e8820f7b8b12cce889a93c6c6b9b7b7;p=oweals%2Fminetest.git Rename lump_of_* to *_lump --- diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index 552d78c8c..4acf8d83f 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -553,7 +553,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'node "default:torch" 4', recipe = { - {'craft "default:lump_of_coal"'}, + {'craft "default:coal_lump"'}, {'craft "default:stick"'}, } }) @@ -731,8 +731,8 @@ minetest.register_craft({ minetest.register_craft({ output = 'node "default:clay" 1', recipe = { - {'craft "default:lump_of_clay"', 'craft "default:lump_of_clay"'}, - {'craft "default:lump_of_clay"', 'craft "default:lump_of_clay"'}, + {'craft "default:clay_lump"', 'craft "default:clay_lump"'}, + {'craft "default:clay_lump"', 'craft "default:clay_lump"'}, } }) @@ -843,7 +843,7 @@ minetest.register_node("default:clay", { inventory_image = minetest.inventorycube("default_clay.png"), is_ground_content = true, material = minetest.digprop_dirtlike(1.0), - dug_item = 'craft "default:lump_of_clay" 4', + dug_item = 'craft "default:clay_lump" 4', }) minetest.register_node("default:brick", { @@ -859,7 +859,7 @@ minetest.register_node("default:tree", { inventory_image = minetest.inventorycube("default_tree_top.png", "default_tree.png", "default_tree.png"), is_ground_content = true, material = minetest.digprop_woodlike(1.0), - cookresult_itemstring = 'craft "default:lump_of_coal" 1', + cookresult_itemstring = 'craft "default:coal_lump" 1', furnace_burntime = 30, }) @@ -868,7 +868,7 @@ minetest.register_node("default:jungletree", { inventory_image = minetest.inventorycube("default_jungletree_top.png", "default_jungletree.png", "default_jungletree.png"), is_ground_content = true, material = minetest.digprop_woodlike(1.0), - cookresult_itemstring = 'craft "default:lump_of_coal" 1', + cookresult_itemstring = 'craft "default:coal_lump" 1', furnace_burntime = 30, }) @@ -1252,20 +1252,20 @@ minetest.register_craftitem("default:book", { on_place_on_ground = minetest.craftitem_place_item, }) -minetest.register_craftitem("default:lump_of_coal", { - image = "default_lump_of_coal.png", +minetest.register_craftitem("default:coal_lump", { + image = "default_coal_lump.png", furnace_burntime = 40; on_place_on_ground = minetest.craftitem_place_item, }) -minetest.register_craftitem("default:lump_of_iron", { - image = "default_lump_of_iron.png", +minetest.register_craftitem("default:iron_lump", { + image = "default_iron_lump.png", cookresult_itemstring = 'craft "default:steel_ingot" 1', on_place_on_ground = minetest.craftitem_place_item, }) -minetest.register_craftitem("default:lump_of_clay", { - image = "default_lump_of_clay.png", +minetest.register_craftitem("default:clay_lump", { + image = "default_clay_lump.png", cookresult_itemstring = 'craft "default:clay_brick" 1', on_place_on_ground = minetest.craftitem_place_item, }) diff --git a/data/mods/default/textures/default_clay_lump.png b/data/mods/default/textures/default_clay_lump.png new file mode 100644 index 000000000..be0bab9d7 Binary files /dev/null and b/data/mods/default/textures/default_clay_lump.png differ diff --git a/data/mods/default/textures/default_coal_lump.png b/data/mods/default/textures/default_coal_lump.png new file mode 100644 index 000000000..bad901efa Binary files /dev/null and b/data/mods/default/textures/default_coal_lump.png differ diff --git a/data/mods/default/textures/default_iron_lump.png b/data/mods/default/textures/default_iron_lump.png new file mode 100644 index 000000000..edb931018 Binary files /dev/null and b/data/mods/default/textures/default_iron_lump.png differ diff --git a/data/mods/default/textures/default_lump_of_clay.png b/data/mods/default/textures/default_lump_of_clay.png deleted file mode 100644 index be0bab9d7..000000000 Binary files a/data/mods/default/textures/default_lump_of_clay.png and /dev/null differ diff --git a/data/mods/default/textures/default_lump_of_coal.png b/data/mods/default/textures/default_lump_of_coal.png deleted file mode 100644 index bad901efa..000000000 Binary files a/data/mods/default/textures/default_lump_of_coal.png and /dev/null differ diff --git a/data/mods/default/textures/default_lump_of_iron.png b/data/mods/default/textures/default_lump_of_iron.png deleted file mode 100644 index edb931018..000000000 Binary files a/data/mods/default/textures/default_lump_of_iron.png and /dev/null differ diff --git a/data/mods/experimental/init.lua b/data/mods/experimental/init.lua index 2c3c67f82..15c4b0342 100644 --- a/data/mods/experimental/init.lua +++ b/data/mods/experimental/init.lua @@ -149,7 +149,7 @@ minetest.register_craft({ output = 'node "experimental:tnt" 4', recipe = { {'node "default:wood" 1'}, - {'craft "default:lump_of_coal" 1'}, + {'craft "default:coal_lump" 1'}, {'node "default:wood" 1'} } }) diff --git a/data/mods/legacy/init.lua b/data/mods/legacy/init.lua index 61d78fd61..c50cfb6a2 100644 --- a/data/mods/legacy/init.lua +++ b/data/mods/legacy/init.lua @@ -526,7 +526,7 @@ minetest.register_node(":tree", { inventory_image = minetest.inventorycube("default_tree_top.png", "default_tree.png", "default_tree.png"), is_ground_content = true, material = minetest.digprop_woodlike(1.0), - cookresult_itemstring = 'craft "default:lump_of_coal" 1', + cookresult_itemstring = 'craft "default:coal_lump" 1', furnace_burntime = 30, }) @@ -535,7 +535,7 @@ minetest.register_node(":jungletree", { inventory_image = minetest.inventorycube("default_jungletree_top.png", "default_jungletree.png", "default_jungletree.png"), is_ground_content = true, material = minetest.digprop_woodlike(1.0), - cookresult_itemstring = 'craft "default:lump_of_coal" 1', + cookresult_itemstring = 'craft "default:coal_lump" 1', furnace_burntime = 30, }) @@ -928,19 +928,19 @@ minetest.register_craftitem(":book", { }) minetest.register_craftitem(":lump_of_coal", { - image = "default_lump_of_coal.png", + image = "default_coal_lump.png", furnace_burntime = 40; on_place_on_ground = minetest.craftitem_place_item, }) minetest.register_craftitem(":lump_of_iron", { - image = "default_lump_of_iron.png", + image = "default_iron_lump.png", cookresult_itemstring = 'craft "default:steel_ingot" 1', on_place_on_ground = minetest.craftitem_place_item, }) minetest.register_craftitem(":lump_of_clay", { - image = "default_lump_of_clay.png", + image = "default_clay_lump.png", cookresult_itemstring = 'craft "default:clay_brick" 1', on_place_on_ground = minetest.craftitem_place_item, })