Default: Rename tree nodes and textures to underscore versions

Also rename jungle grass
Cleanup and add missing spaces to tree section of nodes.lua

mods/default/aliases.lua

@@ -14,8 +14,8 @@ minetest.register_alias("sandstone", "default:sandstone")
 minetest.register_alias("clay", "default:clay")
 minetest.register_alias("brick", "default:brick")
 minetest.register_alias("tree", "default:tree")
-minetest.register_alias("jungletree", "default:jungletree")
+minetest.register_alias("jungletree", "default:jungle_tree")
-minetest.register_alias("junglegrass", "default:junglegrass")
+minetest.register_alias("junglegrass", "default:jungle_grass")
 minetest.register_alias("leaves", "default:leaves")
 minetest.register_alias("cactus", "default:cactus")
 minetest.register_alias("papyrus", "default:papyrus")
@@ -70,3 +70,12 @@ minetest.register_alias("snow", "default:snow")
 
 -- Mese now comes in the form of blocks, ore, crystal and fragments
 minetest.register_alias("default:mese_block", "default:mese")
+
+-- Aliases for correction of jungle tree, pine tree and jungle grass node names
+minetest.register_alias("default:junglegrass", "default:jungle_grass")
+minetest.register_alias("default:jungletree", "default:jungle_tree")
+minetest.register_alias("default:junglewood", "default:jungle_wood")
+minetest.register_alias("default:jungleleaves", "default:jungle_leaves")
+minetest.register_alias("default:junglesapling", "default:jungle_sapling")
+minetest.register_alias("default:pinetree", "default:pine_tree")
+minetest.register_alias("default:pinewood", "default:pine_wood")

mods/default/crafting.lua

@@ -8,16 +8,16 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:junglewood 4',
+	output = 'default:jungle_wood 4',
 	recipe = {
-		{'default:jungletree'},
+		{'default:jungle_tree'},
 	}
 })
 
 minetest.register_craft({
-	output = 'default:pinewood 4',
+	output = 'default:pine_wood 4',
 	recipe = {
-		{'default:pinetree'},
+		{'default:pine_tree'},
 	}
 })
 
@@ -713,7 +713,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:junglegrass",
+	recipe = "default:jungle_grass",
 	burntime = 2,
 })
 

mods/default/mapgen.lua

@@ -23,10 +23,10 @@ minetest.register_alias("mapgen_sandstone", "default:sandstone")
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
 minetest.register_alias("mapgen_apple", "default:apple")
-minetest.register_alias("mapgen_jungletree", "default:jungletree")
+minetest.register_alias("mapgen_jungle_tree", "default:jungle_tree")
-minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
+minetest.register_alias("mapgen_jungle_leaves", "default:jungle_leaves")
-minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
+minetest.register_alias("mapgen_jungle_grass", "default:jungle_grass")
-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

mods/default/nodes.lua

@@ -53,13 +53,13 @@ default:leaves
 default:sapling
 default:apple
 
-default:jungletree
+default:jungle_tree
-default:junglewood
+default:jungle_wood
-default:jungleleaves
+default:jungle_leaves
-default:junglesapling
+default:jungle_sapling
 
-default:pinetree
+default:pine_tree
-default:pinewood
+default:pine_wood
 default:pine_needles
 default:pine_sapling
 
@@ -404,7 +404,7 @@ minetest.register_node("default:tree", {
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
-	groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 
 	on_place = minetest.rotate_node
@@ -414,7 +414,7 @@ minetest.register_node("default:wood", {
 	description = "Wooden Planks",
 	tiles = {"default_wood.png"},
 	is_ground_content = false,
-	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
 	sounds = default.node_sound_wood_defaults(),
 })
 
@@ -432,7 +432,8 @@ minetest.register_node("default: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(),
 })
 
@@ -445,7 +446,7 @@ minetest.register_node("default:leaves", {
 	special_tiles = {"default_leaves_simple.png"},
 	paramtype = "light",
 	is_ground_content = false,
-	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -480,95 +481,24 @@ minetest.register_node("default:apple", {
 		type = "fixed",
 		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
 	},
-	groups = {fleshy=3,dig_immediate=3,flammable=2,leafdecay=3,leafdecay_drop=1},
+	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
+		leafdecay = 3, leafdecay_drop = 1},
 	on_use = minetest.item_eat(2),
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = function(pos, placer, itemstack)
 		if placer:is_player() then
-			minetest.set_node(pos, {name="default:apple", param2=1})
+			minetest.set_node(pos, {name="default:apple", param2 = 1})
 		end
 	end,
 })
 
 
 
-minetest.register_node("default:jungletree", {
+minetest.register_node("default:jungle_tree", {
 	description = "Jungle Tree",
-	tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+	tiles = {"default_jungle_tree_top.png", "default_jungle_tree_top.png",
-	paramtype2 = "facedir",
+		"default_jungle_tree.png"},
-	is_ground_content = false,
-	groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
-	sounds = default.node_sound_wood_defaults(),
-
-	on_place = minetest.rotate_node
-})
-
-minetest.register_node("default:junglewood", {
-	description = "Junglewood Planks",
-	tiles = {"default_junglewood.png"},
-	is_ground_content = false,
-	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
-	sounds = default.node_sound_wood_defaults(),
-})
-
-minetest.register_node("default:jungleleaves", {
-	description = "Jungle Leaves",
-	drawtype = "allfaces_optional",
-	waving = 1,
-	visual_scale = 1.3,
-	tiles = {"default_jungleleaves.png"},
-	special_tiles = {"default_jungleleaves_simple.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
-	drop = {
-		max_items = 1,
-		items = {
-			{
-				-- player will get sapling with 1/20 chance
-				items = {'default:junglesapling'},
-				rarity = 20,
-			},
-			{
-				-- player will get leaves only if he get no saplings,
-				-- this is because max_items is 1
-				items = {'default:jungleleaves'},
-			}
-		}
-	},
-	sounds = default.node_sound_leaves_defaults(),
-
-	after_place_node = default.after_place_leaves,
-})
-
-minetest.register_node("default:junglesapling", {
-	description = "Jungle Sapling",
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"default_junglesapling.png"},
-	inventory_image = "default_junglesapling.png",
-	wield_image = "default_junglesapling.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		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},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-
-
-minetest.register_node("default:pinetree", {
-	description = "Pine Tree",
-	tiles = {
-		"default_pinetree_top.png",
-		"default_pinetree_top.png",
-		"default_pinetree.png"
-	},
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
@@ -577,9 +507,72 @@ minetest.register_node("default:pinetree", {
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node("default:pinewood", {
+minetest.register_node("default:jungle_wood", {
-	description = "Pinewood Planks",
+	description = "Jungle Wood Planks",
-	tiles = {"default_pinewood.png"},
+	tiles = {"default_jungle_wood.png"},
+	is_ground_content = false,
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:jungle_leaves", {
+	description = "Jungle Leaves",
+	drawtype = "allfaces_optional",
+	waving = 1,
+	visual_scale = 1.3,
+	tiles = {"default_jungle_leaves.png"},
+	special_tiles = {"default_jungle_leaves_simple.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {'default:jungle_sapling'}, rarity = 20,},
+			{items = {'default:jungle_leaves'}}
+		}
+	},
+	sounds = default.node_sound_leaves_defaults(),
+
+	after_place_node = default.after_place_leaves,
+})
+
+minetest.register_node("default:jungle_sapling", {
+	description = "Jungle Sapling",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tiles = {"default_jungle_sapling.png"},
+	inventory_image = "default_jungle_sapling.png",
+	wield_image = "default_jungle_sapling.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		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},
+	sounds = default.node_sound_leaves_defaults(),
+})
+
+
+
+minetest.register_node("default:pine_tree", {
+	description = "Pine Tree",
+	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},
+	sounds = default.node_sound_wood_defaults(),
+
+	on_place = minetest.rotate_node
+})
+
+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 +613,15 @@ minetest.register_node("default:pine_sapling", {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
 	},
-	groups = {
+	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
-		snappy = 2,
+		attached_node = 1, sapling = 1},
-		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 = {
+	tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
-		"default_acacia_tree_top.png",
+		"default_acacia_tree.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 +672,8 @@ minetest.register_node("default:acacia_sapling", {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
 	},
-	groups = {
+	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
-		snappy = 2,
+		attached_node = 1, sapling = 1},
-		dig_immediate = 3,
-		flammable = 2,
-		attached_node = 1,
-		sapling = 1
-	},
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -877,14 +857,14 @@ minetest.register_node("default:dry_shrub", {
 	},
 })
 
-minetest.register_node("default:junglegrass", {
+minetest.register_node("default:jungle_grass", {
 	description = "Jungle Grass",
 	drawtype = "plantlike",
 	waving = 1,
 	visual_scale = 1.3,
-	tiles = {"default_junglegrass.png"},
+	tiles = {"default_jungle_grass.png"},
-	inventory_image = "default_junglegrass.png",
+	inventory_image = "default_jungle_grass.png",
-	wield_image = "default_junglegrass.png",
+	wield_image = "default_jungle_grass.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,

mods/default/trees.lua

@@ -23,7 +23,7 @@ end
 -- Sapling ABM
 
 minetest.register_abm({
-	nodenames = {"default:sapling", "default:junglesapling",
+	nodenames = {"default:sapling", "default:jungle_sapling",
 		"default:pine_sapling", "default:acacia_sapling"},
 	interval = 10,
 	chance = 50,
@@ -41,7 +41,7 @@ minetest.register_abm({
 			else
 				default.grow_new_apple_tree(pos)
 			end
-		elseif node.name == "default:junglesapling" then
+		elseif node.name == "default:jungle_sapling" then
 			minetest.log("action", "A jungle sapling grows into a tree at "..
 				minetest.pos_to_string(pos))
 			if mapgen == "v6" then
@@ -179,8 +179,8 @@ function default.grow_jungle_tree(pos, bad)
 	local height = random(8, 12)
 	local c_air = minetest.get_content_id("air")
 	local c_ignore = minetest.get_content_id("ignore")
-	local c_jungletree = minetest.get_content_id("default:jungletree")
+	local c_jungletree = minetest.get_content_id("default:jungle_tree")
-	local c_jungleleaves = minetest.get_content_id("default:jungleleaves")
+	local c_jungleleaves = minetest.get_content_id("default:jungle_leaves")
 
 	local vm = minetest.get_voxel_manip()
 	local minp, maxp = vm:read_from_map(
@@ -237,7 +237,7 @@ function default.grow_pine_tree(pos)
 
 	local c_air = minetest.get_content_id("air")
 	local c_ignore = minetest.get_content_id("ignore")
-	local c_pinetree = minetest.get_content_id("default:pinetree")
+	local c_pinetree = minetest.get_content_id("default:pine_tree")
 	local c_pine_needles  = minetest.get_content_id("default:pine_needles")
 	local c_snow = minetest.get_content_id("default:snow")
 	local c_snowblock = minetest.get_content_id("default:snowblock")