From be4dd6479d86a4dbaaab48f8b67bd16de7084abe Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 9 Aug 2015 08:50:57 +0100 Subject: [PATCH] Default: Rename pine tree nodes, textures and mapgen aliases --- mods/default/aliases.lua | 6 +- mods/default/crafting.lua | 4 +- mods/default/mapgen.lua | 2 +- mods/default/nodes.lua | 54 ++++++++---------- mods/default/schematics/pine_tree.mts | Bin 174 -> 175 bytes ...ult_pinetree.png => default_pine_tree.png} | Bin ...tree_top.png => default_pine_tree_top.png} | Bin ...ult_pinewood.png => default_pine_wood.png} | Bin mods/default/trees.lua | 9 +-- mods/stairs/init.lua | 8 +-- 10 files changed, 41 insertions(+), 42 deletions(-) rename mods/default/textures/{default_pinetree.png => default_pine_tree.png} (100%) rename mods/default/textures/{default_pinetree_top.png => default_pine_tree_top.png} (100%) rename mods/default/textures/{default_pinewood.png => default_pine_wood.png} (100%) diff --git a/mods/default/aliases.lua b/mods/default/aliases.lua index 203cd616..64e6ebba 100644 --- a/mods/default/aliases.lua +++ b/mods/default/aliases.lua @@ -68,5 +68,9 @@ minetest.register_alias("steel_ingot", "default:steel_ingot") minetest.register_alias("clay_brick", "default:clay_brick") minetest.register_alias("snow", "default:snow") --- Mese now comes in the form of blocks, ore, crystal and fragments +-- 'mese_block' was used for a while for the block form of mese minetest.register_alias("default:mese_block", "default:mese") + +-- Aliases for corrected pine node names +minetest.register_alias("default:pinetree", "default:pine_tree") +minetest.register_alias("default:pinewood", "default:pine_wood") diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 304b2032..fa8df2d6 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -15,9 +15,9 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:pinewood 4', + output = 'default:pine_wood 4', recipe = { - {'default:pinetree'}, + {'default:pine_tree'}, } }) diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 661c8a0c..c40f2204 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -26,7 +26,7 @@ minetest.register_alias("mapgen_apple", "default:apple") minetest.register_alias("mapgen_jungletree", "default:jungletree") minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves") minetest.register_alias("mapgen_junglegrass", "default:junglegrass") -minetest.register_alias("mapgen_pinetree", "default:pinetree") +minetest.register_alias("mapgen_pine_tree", "default:pine_tree") minetest.register_alias("mapgen_pine_needles", "default:pine_needles") -- Dungeons diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 2b70fff1..f70e6b64 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1,5 +1,15 @@ -- mods/default/nodes.lua + +--[[ Node name convention: + +Although many node names are in combined-word form, the required form for new +node names is words separated by underscores. If both forms are used in written +language (for example pinewood and pine wood) the underscore form should be used. + +--]] + + --[[ Index: Stone @@ -58,8 +68,8 @@ default:junglewood default:jungleleaves default:junglesapling -default:pinetree -default:pinewood +default:pine_tree +default:pine_wood default:pine_needles default:pine_sapling @@ -562,13 +572,10 @@ minetest.register_node("default:junglesapling", { -minetest.register_node("default:pinetree", { +minetest.register_node("default:pine_tree", { description = "Pine Tree", - tiles = { - "default_pinetree_top.png", - "default_pinetree_top.png", - "default_pinetree.png" - }, + tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png", + "default_pine_tree.png"}, paramtype2 = "facedir", is_ground_content = false, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, @@ -577,9 +584,9 @@ minetest.register_node("default:pinetree", { on_place = minetest.rotate_node }) -minetest.register_node("default:pinewood", { - description = "Pinewood Planks", - tiles = {"default_pinewood.png"}, +minetest.register_node("default:pine_wood", { + description = "Pine Wood Planks", + tiles = {"default_pine_wood.png"}, is_ground_content = false, groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, sounds = default.node_sound_wood_defaults(), @@ -620,23 +627,15 @@ minetest.register_node("default:pine_sapling", { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} }, - groups = { - snappy = 2, - dig_immediate = 3, - flammable = 2, - attached_node = 1, - sapling = 1 - }, + groups = {snappy = 2, dig_immediate = 3, flammable = 2, + attached_node = 1, sapling = 1}, sounds = default.node_sound_leaves_defaults(), }) minetest.register_node("default:acacia_tree", { description = "Acacia Tree", - tiles = { - "default_acacia_tree_top.png", - "default_acacia_tree_top.png", - "default_acacia_tree.png" - }, + tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png", + "default_acacia_tree.png"}, paramtype2 = "facedir", is_ground_content = false, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, @@ -687,13 +686,8 @@ minetest.register_node("default:acacia_sapling", { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} }, - groups = { - snappy = 2, - dig_immediate = 3, - flammable = 2, - attached_node = 1, - sapling = 1 - }, + groups = {snappy = 2, dig_immediate = 3, flammable = 2, + attached_node = 1, sapling = 1}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/mods/default/schematics/pine_tree.mts b/mods/default/schematics/pine_tree.mts index 3f4eeb09bbcbf27fbd7be5d60d03fd2cd6d8fa66..9eb6302762d0c766a423ae46d3df5b7662b80629 100644 GIT binary patch delta 24 fcmZ3-xSnx>1)pF_YFc7xPKi}PW?pLiMAu9JXO9T5 delta 23 ecmZ3_xQ=mx1+PF#YFc7xPKi}PW?t$