Skip to content

Commit be4dd64

Browse files
paramatparamat
committedAug 10, 2015
Default: Rename pine tree nodes, textures and mapgen aliases
·
5.8.00.4.13
1 parent 7066a6a commit be4dd64

File tree

10 files changed

+41
-42
lines changed

10 files changed

+41
-42
lines changed
 

Diff for: ‎mods/default/aliases.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,9 @@ minetest.register_alias("steel_ingot", "default:steel_ingot")
6868
minetest.register_alias("clay_brick", "default:clay_brick")
6969
minetest.register_alias("snow", "default:snow")
7070

71-
-- Mese now comes in the form of blocks, ore, crystal and fragments
71+
-- 'mese_block' was used for a while for the block form of mese
7272
minetest.register_alias("default:mese_block", "default:mese")
73+
74+
-- Aliases for corrected pine node names
75+
minetest.register_alias("default:pinetree", "default:pine_tree")
76+
minetest.register_alias("default:pinewood", "default:pine_wood")

Diff for: ‎mods/default/crafting.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ minetest.register_craft({
1515
})
1616

1717
minetest.register_craft({
18-
output = 'default:pinewood 4',
18+
output = 'default:pine_wood 4',
1919
recipe = {
20-
{'default:pinetree'},
20+
{'default:pine_tree'},
2121
}
2222
})
2323

Diff for: ‎mods/default/mapgen.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ minetest.register_alias("mapgen_apple", "default:apple")
2626
minetest.register_alias("mapgen_jungletree", "default:jungletree")
2727
minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
2828
minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
29-
minetest.register_alias("mapgen_pinetree", "default:pinetree")
29+
minetest.register_alias("mapgen_pine_tree", "default:pine_tree")
3030
minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
3131

3232
-- Dungeons

Diff for: ‎mods/default/nodes.lua

+24-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
-- mods/default/nodes.lua
22

3+
4+
--[[ Node name convention:
5+
6+
Although many node names are in combined-word form, the required form for new
7+
node names is words separated by underscores. If both forms are used in written
8+
language (for example pinewood and pine wood) the underscore form should be used.
9+
10+
--]]
11+
12+
313
--[[ Index:
414
515
Stone
@@ -58,8 +68,8 @@ default:junglewood
5868
default:jungleleaves
5969
default:junglesapling
6070
61-
default:pinetree
62-
default:pinewood
71+
default:pine_tree
72+
default:pine_wood
6373
default:pine_needles
6474
default:pine_sapling
6575
@@ -562,13 +572,10 @@ minetest.register_node("default:junglesapling", {
562572

563573

564574

565-
minetest.register_node("default:pinetree", {
575+
minetest.register_node("default:pine_tree", {
566576
description = "Pine Tree",
567-
tiles = {
568-
"default_pinetree_top.png",
569-
"default_pinetree_top.png",
570-
"default_pinetree.png"
571-
},
577+
tiles = {"default_pine_tree_top.png", "default_pine_tree_top.png",
578+
"default_pine_tree.png"},
572579
paramtype2 = "facedir",
573580
is_ground_content = false,
574581
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
@@ -577,9 +584,9 @@ minetest.register_node("default:pinetree", {
577584
on_place = minetest.rotate_node
578585
})
579586

580-
minetest.register_node("default:pinewood", {
581-
description = "Pinewood Planks",
582-
tiles = {"default_pinewood.png"},
587+
minetest.register_node("default:pine_wood", {
588+
description = "Pine Wood Planks",
589+
tiles = {"default_pine_wood.png"},
583590
is_ground_content = false,
584591
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
585592
sounds = default.node_sound_wood_defaults(),
@@ -620,23 +627,15 @@ minetest.register_node("default:pine_sapling", {
620627
type = "fixed",
621628
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
622629
},
623-
groups = {
624-
snappy = 2,
625-
dig_immediate = 3,
626-
flammable = 2,
627-
attached_node = 1,
628-
sapling = 1
629-
},
630+
groups = {snappy = 2, dig_immediate = 3, flammable = 2,
631+
attached_node = 1, sapling = 1},
630632
sounds = default.node_sound_leaves_defaults(),
631633
})
632634

633635
minetest.register_node("default:acacia_tree", {
634636
description = "Acacia Tree",
635-
tiles = {
636-
"default_acacia_tree_top.png",
637-
"default_acacia_tree_top.png",
638-
"default_acacia_tree.png"
639-
},
637+
tiles = {"default_acacia_tree_top.png", "default_acacia_tree_top.png",
638+
"default_acacia_tree.png"},
640639
paramtype2 = "facedir",
641640
is_ground_content = false,
642641
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
@@ -687,13 +686,8 @@ minetest.register_node("default:acacia_sapling", {
687686
type = "fixed",
688687
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
689688
},
690-
groups = {
691-
snappy = 2,
692-
dig_immediate = 3,
693-
flammable = 2,
694-
attached_node = 1,
695-
sapling = 1
696-
},
689+
groups = {snappy = 2, dig_immediate = 3, flammable = 2,
690+
attached_node = 1, sapling = 1},
697691
sounds = default.node_sound_leaves_defaults(),
698692
})
699693

Diff for: ‎mods/default/schematics/pine_tree.mts

1 Byte
Binary file not shown.

Diff for: ‎mods/default/trees.lua

+5-4
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ function default.grow_pine_tree(pos)
237237

238238
local c_air = minetest.get_content_id("air")
239239
local c_ignore = minetest.get_content_id("ignore")
240-
local c_pinetree = minetest.get_content_id("default:pinetree")
240+
local c_pine_tree = minetest.get_content_id("default:pine_tree")
241241
local c_pine_needles = minetest.get_content_id("default:pine_needles")
242242
local c_snow = minetest.get_content_id("default:snow")
243243
local c_snowblock = minetest.get_content_id("default:snowblock")
@@ -341,12 +341,13 @@ function default.grow_pine_tree(pos)
341341
end
342342

343343
-- Trunk
344-
data[a:index(x, y, z)] = c_pinetree -- Force-place lowest trunk node to replace sapling
344+
data[a:index(x, y, z)] = c_pine_tree -- Force-place lowest trunk node to replace sapling
345345
for yy = y + 1, maxy do
346346
local vi = a:index(x, yy, z)
347347
local node_id = data[vi]
348-
if node_id == c_air or node_id == c_ignore or node_id == c_pine_needles then
349-
data[vi] = c_pinetree
348+
if node_id == c_air or node_id == c_ignore or
349+
node_id == c_pine_needles or node_id == c_snow then
350+
data[vi] = c_pine_tree
350351
end
351352
end
352353

Diff for: ‎mods/stairs/init.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ stairs.register_stair_and_slab("junglewood", "default:junglewood",
234234
"Junglewood Slab",
235235
default.node_sound_wood_defaults())
236236

237-
stairs.register_stair_and_slab("pinewood", "default:pinewood",
237+
stairs.register_stair_and_slab("pine_wood", "default:pine_wood",
238238
{snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
239-
{"default_pinewood.png"},
240-
"Pinewood Stair",
241-
"Pinewood Slab",
239+
{"default_pine_wood.png"},
240+
"Pine Wood Stair",
241+
"Pine Wood Slab",
242242
default.node_sound_wood_defaults())
243243

244244
stairs.register_stair_and_slab("acacia_wood", "default:acacia_wood",

0 commit comments

Comments
 (0)
Please sign in to comment.