Rename two wood types

mods/columnia/register.lua

@@ -25,8 +25,8 @@ columnia.register_all("hades_core:obsidianbrick")
 columnia.register_all("hades_core:sandstonebrick")
 columnia.register_all("hades_core:stonebrick")
 
-columnia.register_all("hades_trees:wood", S("Common Wood"))
-columnia.register_all("hades_trees:jungle_wood", S("Jungle Wood"))
+columnia.register_all("hades_trees:wood", S("Temperate Wood"))
+columnia.register_all("hades_trees:jungle_wood", S("Tropical Wood"))
 columnia.register_all("hades_trees:pale_wood", S("Pale Wood"))
 columnia.register_all("hades_trees:cream_wood", S("Cream Wood"))
 columnia.register_all("hades_trees:lush_wood", S("Lush Wood"))

mods/doors/register.lua

@@ -1,7 +1,7 @@
 local S = minetest.get_translator("doors")
 
 doors.register_door("doors:door_wood", {
-	description = S("Common Wood Door"),
+	description = S("Temperate Wood Door"),
 	inventory_image = "doors_wood.png",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
 	tiles = {{name="doors_door_wood.png", backface_culling=true}},
@@ -39,7 +39,7 @@ minetest.register_craft({
 
 
 doors.register_door("doors:door_wood_jungle", {
-	description = S("Jungle Wood Door"),
+	description = S("Tropical Wood Door"),
 	inventory_image = "doors_wood_jungle.png",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
 	tiles = {{name="doors_door_wood_jungle.png", backface_culling=true}},
@@ -225,7 +225,7 @@ minetest.register_craft({
 
 
 doors.register_trapdoor("doors:trapdoor", {
-	description = S("Common Wood Trapdoor"),
+	description = S("Temperate Wood Trapdoor"),
 	inventory_image = "doors_trapdoor.png",
 	wield_image = "doors_trapdoor.png",
 	tile_front = "doors_trapdoor.png",
@@ -245,7 +245,7 @@ minetest.register_craft({
 })
 
 doors.register_trapdoor("doors:trapdoor_jungle", {
-	description = S("Jungle Wood Trapdoor"),
+	description = S("Tropical Wood Trapdoor"),
 	inventory_image = "doors_trapdoor_jungle.png",
 	wield_image = "doors_trapdoor_jungle.png",
 	tile_front = "doors_trapdoor_jungle.png",
@@ -347,14 +347,14 @@ minetest.register_craft({
 })
 
 doors.register_fencegate("doors:gate_wood", {
-	description = S("Common Wood Fence Gate"),
+	description = S("Temperate Wood Fence Gate"),
 	texture = "default_wood.png",
 	material = "hades_trees:wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("doors:gate_jungle_wood", {
-	description = S("Jungle Wood Fence Gate"),
+	description = S("Tropical Wood Fence Gate"),
 	texture = "default_junglewood.png",
 	material = "hades_trees:jungle_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}

mods/flowerpots/nodes.lua

@@ -10,12 +10,12 @@ local flowers = {
 
 -- TODO: Maybe add these later?
 --	{"grass", "hades_core:grass_1", S("Grass")},
---	{"junglegrass", "hades_core:junglegrass", S("Jungle Grass")},
+--	{"junglegrass", "hades_core:junglegrass", S("Tropical Grass")},
 --	{"dry_shrub", "hades_core:dry_shrub", S("Dry Shrub")},
 
-	{"sapling", "hades_trees:sapling", S("Common Tree Sapling")},
-	{"jungle_sapling", "hades_trees:jungle_sapling", S("Common Jungle Tree Sapling")},
-	{"cultivated_jungle_sapling", "hades_trees:cultivated_jungle_sapling", S("Cultivated Jungle Tree Sapling")},
+	{"sapling", "hades_trees:sapling", S("Temperate Tree Sapling")},
+	{"jungle_sapling", "hades_trees:jungle_sapling", S("Common Tropical Tree Sapling")},
+	{"cultivated_jungle_sapling", "hades_trees:cultivated_jungle_sapling", S("Cultivated Tropical Tree Sapling")},
 	{"olive_sapling", "hades_trees:olive_sapling", S("Olive Tree Sapling")},
 	{"pale_sapling", "hades_trees:pale_sapling", S("Pale Tree Sapling")},
 	{"birch_sapling", "hades_trees:birch_sapling", S("Birch Tree Sapling")},
@@ -28,9 +28,9 @@ local flowers = {
 local cubes = {
 	{"cactus", "hades_core:cactus", S("Cactus")},
 
-	{"leaves", "hades_trees:leaves", S("Common Leaves")},
-	{"jungle_leaves", "hades_trees:jungle_leaves", S("Common Jungle Leaves")},
-	{"cultivated_jungle_leaves", "hades_trees:cultivated_jungle_leaves", S("Cultivated Jungle Leaves")},
+	{"leaves", "hades_trees:leaves", S("Temperate Leaves")},
+	{"jungle_leaves", "hades_trees:jungle_leaves", S("Common Tropical Leaves")},
+	{"cultivated_jungle_leaves", "hades_trees:cultivated_jungle_leaves", S("Cultivated Tropical Leaves")},
 	{"olive_leaves", "hades_trees:olive_leaves", S("Olive Leaves")},
 	{"birch_leaves", "hades_trees:birch_leaves", S("Birch Leaves")},
 	{"pale_leaves", "hades_trees:pale_leaves", S("Pale Leaves")},

mods/hades_core/plants.lua

@@ -73,7 +73,7 @@ for i=2,5 do
 end
 
 minetest.register_node("hades_core:junglegrass", {
-	description = S("Jungle Grass"),
+	description = S("Tropical Grass"),
 	drawtype = "plantlike",
 	visual_scale = 1.3,
 	tiles = {"default_junglegrass.png"},

mods/hades_fences/init.lua

@@ -66,9 +66,9 @@ end
 
 local fences = {
 	{ "rusty", S("Rusty Fence"), "default_rusty.png", {cracky=3, fence_metal=1}, {"group:fence_metal", "columnia:rusty_block"}, hades_sounds.node_sound_metal_defaults() },
-	{ "wood", S("Common Wood Fence"), "default_wood.png" },
+	{ "wood", S("Temperate Wood Fence"), "default_wood.png" },
 	{ "pale_wood", S("Pale Wood Fence"), "hades_trees_pale_wood.png" },
-	{ "jungle_wood", S("Jungle Wood Fence"), "default_junglewood.png" },
+	{ "jungle_wood", S("Tropical Wood Fence"), "default_junglewood.png" },
 	{ "cream_wood", S("Cream Wood Fence"), "hades_trees_cream_wood.png" },
 	{ "lush_wood", S("Lush Wood Fence"), "hades_trees_lush_wood.png" },
 

mods/hades_trees/apple.lua

@@ -1,22 +1,7 @@
 local S = minetest.get_translator("hades_trees")
 
-hades_trees.register_trunk("tree", {
-	description = S("Common Tree Trunk"),
-	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
-})
-hades_trees.register_bark("bark", {
-	description = S("Common Bark"),
-	image = "default_tree.png",
-})
-hades_trees.register_leaves("leaves", {
-	description = S("Common Leaves"),
-	image = "default_leaves.png",
-	ash_fertilizer = 3,
-	drop_item = "hades_trees:sapling",
-	drop_rarity = 20,
-})
 hades_trees.register_sapling("sapling", {
-	description = S("Common Tree Sapling"),
+	description = S("Apple Tree Sapling"),
 	image = "default_sapling.png",
 	selbox = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3},
 })
@@ -29,7 +14,7 @@ hades_trees.register_fruit("apple", {
 })
 
 minetest.register_abm({
-	label = "Grow sapling to apple tree",
+	label = "Grow apple tree sapling to apple tree",
 	nodenames = {"hades_trees:sapling"},
 	interval = 20,
 	chance = 50,

mods/hades_trees/cjtree.lua

@@ -1,14 +1,14 @@
 local S = minetest.get_translator("hades_trees")
 
 hades_trees.register_leaves("cultivated_jungle_leaves", {
-	description = S("Cultivated Jungle Leaves"),
+	description = S("Cultivated Tropical Leaves"),
 	image = "hades_trees_cultivated_jungle_leaves.png",
 	ash_fertilizer = 3,
 	drop_item = "hades_trees:cultivated_jungle_sapling",
 	drop_rarity = 25,
 })
 hades_trees.register_sapling("cultivated_jungle_sapling", {
-	description = S("Cultivated Jungle Tree Sapling"),
+	description = S("Cultivated Tropical Tree Sapling"),
 	image = "hades_trees_cultivated_jungle_sapling.png",
 	selbox = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3},
 })

mods/hades_trees/generator.lua

@@ -36,7 +36,7 @@ local function check_node_light(pos, minlight, check)
 	return true
 end
 
--- Common Tree
+-- Apple Tree
 function hades_trees.generate_tree(pos, check_light, trunk, leaves, underground, replacements)
 	if not trunk then
 		trunk = "hades_trees:tree"
@@ -396,7 +396,7 @@ function hades_trees.generate_birchtree(pos, check_light, trunk, leaves, undergr
 end
 
 
--- Cultivated Jungle Tree
+-- Cultivated Tropical Tree
 function hades_trees.generate_cjtree(pos, check_light, trunk, leaves, underground)
 	if not trunk then
 		trunk = "hades_trees:jungle_tree"

mods/hades_trees/init.lua

@@ -3,7 +3,9 @@ hades_trees = {}
 
 dofile(minetest.get_modpath("hades_trees").."/api.lua")
 
-dofile(minetest.get_modpath("hades_trees").."/common.lua")
+dofile(minetest.get_modpath("hades_trees").."/temperate.lua")
+
+dofile(minetest.get_modpath("hades_trees").."/apple.lua")
 dofile(minetest.get_modpath("hades_trees").."/olive.lua")
 dofile(minetest.get_modpath("hades_trees").."/paletree.lua")
 dofile(minetest.get_modpath("hades_trees").."/birch.lua")

mods/hades_trees/jungle.lua

@@ -2,22 +2,22 @@ local S = minetest.get_translator("hades_trees")
 local pr
 
 hades_trees.register_trunk("jungle_tree", {
-	description = S("Jungle Tree Trunk"),
+	description = S("Tropical Tree Trunk"),
 	tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
 })
 hades_trees.register_bark("jungle_bark", {
-	description = S("Jungle Bark"),
+	description = S("Tropical Bark"),
 	image = "default_jungletree.png",
 })
 hades_trees.register_leaves("jungle_leaves", {
-	description = S("Common Jungle Leaves"),
+	description = S("Common Tropical Leaves"),
 	image = "default_jungleleaves.png",
 	ash_fertilizer = 3,
 	drop_item = "hades_trees:jungle_sapling",
 	drop_rarity = 25,
 })
 hades_trees.register_sapling("jungle_sapling", {
-	description = S("Common Jungle Tree Sapling"),
+	description = S("Common Tropical Tree Sapling"),
 	image = "default_junglesapling.png",
 	selbox = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3},
 })

mods/hades_trees/temperate.lua

@@ -0,0 +1,17 @@
+local S = minetest.get_translator("hades_trees")
+
+hades_trees.register_trunk("tree", {
+	description = S("Temperate Tree Trunk"),
+	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
+})
+hades_trees.register_bark("bark", {
+	description = S("Temperate Bark"),
+	image = "default_tree.png",
+})
+hades_trees.register_leaves("leaves", {
+	description = S("Temperate Leaves"),
+	image = "default_leaves.png",
+	ash_fertilizer = 3,
+	drop_item = "hades_trees:sapling",
+	drop_rarity = 20,
+})

mods/hades_trees/wood.lua

@@ -4,9 +4,9 @@ local S = minetest.get_translator("hades_trees")
 local planks = {
 	{ "pale_wood", S("Pale Wood Planks"), "hades_trees_pale_wood.png" },
 	{ "cream_wood", S("Cream Wood Planks"), "hades_trees_cream_wood.png" },
-	{ "wood", S("Common Wood Planks"), "default_wood.png" },
+	{ "wood", S("Temperate Wood Planks"), "default_wood.png" },
 	{ "lush_wood", S("Lush Wood Planks"), "hades_trees_lush_wood.png" },
-	{ "jungle_wood", S("Jungle Wood Planks"), "default_junglewood.png" },
+	{ "jungle_wood", S("Tropical Wood Planks"), "default_junglewood.png" },
 	{ "charred_wood", S("Charred Wood Planks"), "hades_trees_charred_wood.png" },
 
 -- Canvas wood: Colored wooden planks
@@ -46,7 +46,7 @@ end
 
 -- Tiles
 minetest.register_node("hades_trees:floor_wood_jungle", {
-	description = S("Common Wood/Jungle Wood Tile"),
+	description = S("Temperate Wood/Tropical Wood Tile"),
 	tiles = {
 		"hades_trees_floor_wood_jungle.png",
 		"hades_trees_floor_wood_jungle.png",
@@ -59,7 +59,7 @@ minetest.register_node("hades_trees:floor_wood_jungle", {
 })
 
 minetest.register_node("hades_trees:floor_wood_pale", {
-	description = S("Common Wood/Pale Wood Tile"),
+	description = S("Temperate Wood/Pale Wood Tile"),
 	tiles = {
 		"hades_trees_floor_wood_pale.png",
 		"hades_trees_floor_wood_pale.png",
@@ -72,7 +72,7 @@ minetest.register_node("hades_trees:floor_wood_pale", {
 })
 
 minetest.register_node("hades_trees:floor_pale_jungle", {
-	description = S("Jungle Wood/Pale Wood Tile"),
+	description = S("Tropical Wood/Pale Wood Tile"),
 	tiles = {
 		"hades_trees_floor_pale_jungle.png",
 		"hades_trees_floor_pale_jungle.png",

mods/refruit/init.lua

@@ -185,9 +185,9 @@ refruit.add_refruit("banana", {
 refruit.add_refruit("cocoa", {
 	fruit_itemstring = "hades_trees:cocoa_pod",
 	bud_description = S("Cocoa Bud"),
-	bud_tt = S("Grows to a Cocoa Flower").."\n"..surv.."\n"..S("Needs Common Jungle Leaves to grow"),
+	bud_tt = S("Grows to a Cocoa Flower").."\n"..surv.."\n"..S("Needs Common Tropical Leaves to grow"),
 	flower_description = S("Cocoa Flower"),
-	flower_tt = S("Grows to Cocoa").."\n"..surv.."\n"..S("Needs Common Jungle Leaves to grow"),
+	flower_tt = S("Grows to Cocoa").."\n"..surv.."\n"..S("Needs Common Tropical Leaves to grow"),
 	bud_interval = 35,
 	bud_chance = 10,
 	flower_interval = 34,
@@ -200,9 +200,9 @@ refruit.add_refruit("cocoa", {
 refruit.add_refruit("coconut", {
 	fruit_itemstring = "hades_trees:coconut",
 	bud_description = S("Coconut Bud"),
-	bud_tt = S("Grows to a Coconut Flower").."\n"..surv.."\n"..S("Needs Common Jungle Leaves to grow"),
+	bud_tt = S("Grows to a Coconut Flower").."\n"..surv.."\n"..S("Needs Common Tropical Leaves to grow"),
 	flower_description = S("Coconut Flower"),
-	flower_tt = S("Grows to a Coconut").."\n"..surv.."\n"..S("Needs Common Jungle Leaves to grow"),
+	flower_tt = S("Grows to a Coconut").."\n"..surv.."\n"..S("Needs Common Tropical Leaves to grow"),
 	bud_interval = 35,
 	bud_chance = 10,
 	flower_interval = 34,

mods/stairs/init.lua

@@ -367,10 +367,10 @@ end
 stairs.register_stair_and_slab("wood", "hades_trees:wood",
 		{choppy=3,oddly_breakable_by_hand=2,flammable=3},
 		{"default_wood.png"},
-		S("Common Wood Stair"),
-		S("Outer Common Wood Stair"),
-		S("Inner Common Wood Stair"),
-		S("Common Wood Slab"),
+		S("Temperate Wood Stair"),
+		S("Outer Temperate Wood Stair"),
+		S("Inner Temperate Wood Stair"),
+		S("Temperate Wood Slab"),
 		hades_sounds.node_sound_wood_defaults())
 
 stairs.register_stair_and_slab("pale_wood", "hades_trees:pale_wood",
@@ -385,10 +385,10 @@ stairs.register_stair_and_slab("pale_wood", "hades_trees:pale_wood",
 stairs.register_stair_and_slab("jungle_wood", "hades_trees:jungle_wood",
 		{choppy=3,oddly_breakable_by_hand=2,flammable=3},
 		{"default_junglewood.png"},
-		S("Jungle Wood Stair"),
-		S("Outer Jungle Wood Stair"),
-		S("Innter Jungle Wood Stair"),
-		S("Jungle Wood Slab"),
+		S("Tropical Wood Stair"),
+		S("Outer Tropical Wood Stair"),
+		S("Innter Tropical Wood Stair"),
+		S("Tropical Wood Slab"),
 		hades_sounds.node_sound_wood_defaults())
 
 stairs.register_stair_and_slab("lush_wood", "hades_trees:lush_wood",
@@ -423,10 +423,10 @@ stairs.register_stair_and_slab("bark", "hades_trees:bark",
 stairs.register_stair_and_slab("jungle_bark", "hades_trees:jungle_bark",
 		{choppy=3,oddly_breakable_by_hand=1,flammable=3},
 		{"default_jungletree.png"},
-		S("Jungle Bark Stair"),
-		S("Outer Jungle Bark Stair"),
-		S("Inner Jungle Bark Stair"),
-		S("Jungle Bark Slab"),
+		S("Tropical Bark Stair"),
+		S("Outer Tropical Bark Stair"),
+		S("Inner Tropical Bark Stair"),
+		S("Tropical Bark Slab"),
 		hades_sounds.node_sound_wood_defaults())
 
 stairs.register_stair_and_slab("pale_bark", "hades_trees:pale_bark",

mods/vines/init.lua

@@ -226,8 +226,8 @@ end
 
 register_vine("side", {
 	vines_type = "side",
-	description_normal = S("Jungle Vine"),
-	description_rotten = S("Rotten Jungle Vine"),
+	description_normal = S("Tropical Vine"),
+	description_rotten = S("Rotten Tropical Vine"),
 	groups = vines_group_side,
 })
 

mods/windows/init.lua

@@ -55,13 +55,13 @@ windows.register_window = function(id, def)
 end
 
 windows.register_window("windows:windows_wood", {
-	description = S("Common Wood Window"),
+	description = S("Temperate Wood Window"),
 	texture_seam = "windows_windows_wood_seam.png",
 	texture_front = "windows_windows_wood_front.png",
 	is_wood = true,
 })
 windows.register_window("windows:windows_jungle_wood", {
-	description = S("Jungle Wood Window"),
+	description = S("Tropical Wood Window"),
 	texture_seam = "windows_windows_jwood_seam.png",
 	texture_front = "windows_windows_jwood_front.png",
 	is_wood = true,