Illuna-Minetest/minetest_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mergeconflicts

Browse Source
This commit is contained in:
tchncs 2016-04-11 12:39:33 +02:00
commit 31c58164d8
13 changed files with 413 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/beds/api.lua
View File

@ -59,6 +59,11 @@ function beds.register_bed(name, def)
return itemstack return itemstack
end end
local def = minetest.registered_nodes[minetest.get_node(pos).name]
if not def or not def.buildable_to then
return itemstack
end
local dir = minetest.dir_to_facedir(placer:get_look_dir()) local dir = minetest.dir_to_facedir(placer:get_look_dir())
local botpos = vector.add(pos, minetest.facedir_to_dir(dir)) local botpos = vector.add(pos, minetest.facedir_to_dir(dir))
@ -68,7 +73,8 @@ function beds.register_bed(name, def)
return itemstack return itemstack
end end
if not minetest.registered_nodes[minetest.get_node(botpos).name].buildable_to then local botdef = minetest.registered_nodes[minetest.get_node(botpos).name]
if not botdef or not botdef.buildable_to then
return itemstack return itemstack
end end

1
mods/boats

@ -1 +0,0 @@
Subproject commit ffaf921ce4a5644c62eced2754bffe1a41950e73

358
mods/boats/models/boats_boat.obj Normal file
View File

@ -0,0 +1,358 @@
# Blender v2.76 (sub 11) OBJ File: 'boat.blend'
# www.blender.org
mtllib boat.mtl
o boats_boat
v -6.786140 -3.033999 -9.415440
v -6.786140 -1.967150 -9.415440
v -6.786140 -1.967150 8.793510
v -6.786140 -3.033999 8.793510
v 5.732520 -1.967150 -9.415440
v 5.732520 -3.033999 -9.415440
v 5.732520 -3.033999 8.793510
v 5.732520 -1.967150 8.793510
v -2.233900 -3.033999 -9.415440
v -2.233900 -1.967150 -9.415440
v -2.233900 -1.967150 8.793510
v -2.233900 -3.033999 8.793510
v 2.318340 -3.033999 -9.415440
v 2.318340 -1.967150 -9.415440
v 2.318340 -1.967150 8.793510
v 2.318340 -3.033999 8.793510
v -3.371960 -3.033999 8.793510
v -3.371960 -1.967150 8.793510
v -3.371960 -1.967150 -9.415440
v -3.371960 -3.033999 -9.415440
v 2.318340 0.276645 8.793510
v 1.180280 -1.967150 8.793510
v 5.732520 0.276645 8.793510
v 5.732520 1.039180 8.793510
v 6.870580 0.276645 8.793510
v 6.870580 -1.967150 8.793510
v 2.318340 1.039180 8.793510
v 1.180280 0.276645 8.793510
v 1.180280 1.039180 8.793510
v 1.180280 -3.033999 8.793510
v -2.233900 0.276645 8.793510
v -3.371960 0.276645 8.793510
v -2.233900 1.039180 8.793510
v -3.371960 1.039180 8.793510
v -6.786140 0.276645 8.793510
v -7.786200 0.276645 8.793510
v -7.786200 -1.967150 8.793510
v -6.786140 1.039180 8.793510
v 1.180280 -1.967150 -9.415440
v 1.180280 -3.033999 -9.415440
v 2.318340 0.276645 -9.415440
v 1.180280 0.276645 -9.415440
v 2.318340 1.039180 -9.415440
v 5.732520 0.276645 -9.415440
v 6.870580 -1.967150 -9.415440
v 5.732520 1.039180 -9.415440
v 6.870580 0.276645 -9.415440
v 0.042220 1.039180 -9.415440
v 1.180280 1.039180 -9.415440
v 0.042220 -1.967150 -9.415440
v -1.095840 -1.967150 -9.415440
v -2.233900 0.276645 -9.415440
v -3.371960 0.276645 -9.415440
v -2.233900 1.039180 -9.415440
v -1.095840 1.039180 -9.415440
v -3.371960 1.039180 -9.415440
v -6.786140 0.276645 -9.415440
v -6.786140 1.039180 -9.415440
v -7.786200 -1.967150 -9.415440
v -7.786200 0.276645 -9.415440
v -1.095840 0.156645 -12.044100
v -1.095840 -4.601110 -9.415440
v -1.095840 1.039181 -10.802900
v -1.095840 2.868579 -10.802900
v -1.095840 2.868580 -7.883420
v -1.095840 3.746069 -12.034100
v -1.095840 3.746070 -7.883420
v -1.095840 0.156645 -14.294900
v -1.095840 -4.601110 -14.284900
v 0.042220 -4.601110 -14.284900
v 0.042220 -4.601110 -9.415440
v 0.042220 1.039181 -10.802900
v 0.042220 0.156645 -12.044100
v 0.042220 2.868579 -10.802900
v 0.042220 0.156645 -14.294900
v 0.042220 3.746069 -12.034100
v 0.042220 3.746070 -7.883420
v 0.042220 2.868580 -7.883420
v -1.096322 -3.033999 -9.415440
v 0.044046 -3.035397 -9.415440
vt 1.000000 0.187500
vt -1.000000 0.312500
vt 1.000000 0.312500
vt 0.687500 1.000000
vt 0.500000 0.875000
vt 0.500000 0.625000
vt -1.000000 0.062500
vt 1.000000 0.062500
vt 1.000000 -0.000000
vt -1.000000 0.125000
vt 1.000000 0.125000
vt 0.437500 0.125000
vt 0.312500 0.500000
vt 0.312500 0.125000
vt 1.000000 0.625000
vt -1.000000 0.500000
vt 1.000000 0.500000
vt 0.187500 0.687500
vt -0.187500 0.687500
vt -0.187500 0.312500
vt 1.000000 0.812500
vt -1.000000 0.937500
vt -1.000000 0.812500
vt 0.812500 0.687500
vt 1.187500 0.687500
vt 0.812500 0.312500
vt 1.000000 0.562500
vt 0.312500 0.437500
vt 1.000000 0.437500
vt 1.000000 0.750000
vt -1.000000 0.875000
vt -1.000000 0.750000
vt -1.000000 1.000000
vt 1.000000 1.000000
vt 0.437500 0.625000
vt 0.562500 0.437500
vt 0.562500 0.625000
vt -1.000000 0.437500
vt -1.000000 0.000000
vt 0.500000 0.062500
vt 0.375000 0.750000
vt 0.500000 0.750000
vt -1.000000 0.250000
vt -1.000000 0.687500
vt 1.000000 0.687500
vt 0.625000 0.375000
vt 1.000000 0.375000
vt 1.000000 0.250000
vt 1.000000 0.937500
vt 0.437500 0.812500
vt 0.312500 0.312500
vt 0.312500 0.812500
vt 0.437500 0.312500
vt 0.437500 0.437500
vt 0.687500 0.812500
vt 0.000000 0.687500
vt 0.000000 0.812500
vt -1.000000 0.562500
vt 0.875000 0.812500
vt 0.875000 0.687500
vt 0.250000 0.312500
vt 0.562500 0.187500
vt 0.250000 0.187500
vt -1.000000 0.187500
vt 0.312500 0.625000
vt 0.312500 0.187500
vt 0.312500 -0.187500
vt 1.000000 -0.187500
vt 0.687500 0.500000
vt -0.000000 1.000000
vt 0.000000 0.875000
vt 0.437500 0.500000
vt -1.000000 0.625000
vt 0.812500 0.187500
vt 1.187500 0.187500
vt 1.187500 0.312500
vt 1.312500 0.312500
vt 1.312500 0.687500
vt 0.687500 0.187500
vt 0.687500 0.312500
vt 1.187500 0.812500
vt 0.812500 0.812500
vt 0.187500 0.312500
vt 0.312500 0.687500
vt 0.687500 0.687500
vt -0.187500 0.187500
vt 0.187500 0.187500
vt -0.312500 0.687500
vt -0.312500 0.312500
vt 0.187500 0.812500
vt -0.187500 0.812500
vt 0.437500 0.687500
vt 0.437500 0.187500
vt 0.562500 0.812500
vt 0.562500 0.687500
vt 0.312500 0.562500
vt 1.000000 0.875000
vt 0.375000 0.062500
vt -1.000000 0.375000
vt 0.625000 0.500000
vt 0.875000 0.562500
vt 0.937500 0.812500
vt 0.937500 0.687500
vt 0.875000 0.937500
vt 0.562500 0.312500
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 0.000000
vn 0.000000 1.000000 0.000000
vn 0.000000 -0.002100 -1.000000
vn 0.001200 -1.000000 0.000000
vn 0.000000 0.002800 -1.000000
vn -0.001200 -1.000000 0.000200
g boats_boat_boats_boat_None
usemtl None
s off
f 41/1/1 27/2/1 43/3/1
f 76/4/2 74/5/2 72/6/2
f 8/7/2 6/1/2 5/8/2
f 15/9/1 13/10/1 16/11/1
f 51/12/3 71/13/3 50/14/3
f 56/15/2 32/16/2 53/17/2
f 15/18/3 8/19/3 23/20/3
f 22/21/2 40/22/2 39/23/2
f 19/24/4 2/25/4 53/26/4
f 70/27/5 62/28/5 69/29/5
f 11/30/5 19/31/5 10/32/5
f 4/15/5 20/33/5 17/34/5
f 72/35/3 64/36/3 63/37/3
f 13/8/5 7/38/5 16/7/5
f 23/39/6 47/11/6 44/9/6
f 68/40/7 70/41/7 69/42/7
f 80/43/8 40/10/8 30/11/8
f 3/15/1 1/32/1 4/30/1
f 20/44/2 18/27/2 17/45/2
f 74/17/5 65/46/5 64/47/5
f 31/43/1 54/47/1 52/48/1
f 22/47/5 14/43/5 15/48/5
f 46/1/2 23/7/2 44/8/2
f 57/21/1 38/22/1 58/49/1
f 61/50/9 76/51/9 73/52/9
f 37/45/5 2/23/5 3/21/5
f 78/28/3 67/53/3 65/54/3
f 64/5/1 66/4/1 63/6/1
f 76/55/6 67/56/6 77/57/6
f 47/17/2 26/10/2 45/11/2
f 5/16/5 26/47/5 8/17/5
f 33/58/6 48/59/6 55/60/6
f 29/38/2 42/3/2 49/29/2
f 32/44/6 52/21/6 53/45/6
f 58/15/6 34/33/6 56/34/6
f 27/7/6 46/29/6 43/8/6
f 73/61/6 68/62/6 61/63/6
f 21/58/6 42/29/6 28/38/6
f 11/29/1 9/58/1 12/27/1
f 59/45/1 36/2/1 60/3/1
f 60/9/6 35/10/6 57/11/6
f 41/1/1 21/64/1 27/2/1
f 72/6/2 48/65/2 50/66/2
f 50/66/2 71/67/2 70/68/2
f 70/68/2 75/17/2 73/69/2
f 76/4/2 77/70/2 74/5/2
f 77/70/2 78/71/2 74/5/2
f 50/66/2 70/68/2 73/69/2
f 73/69/2 76/4/2 72/6/2
f 72/6/2 50/66/2 73/69/2
f 8/7/2 7/64/2 6/1/2
f 15/9/1 14/39/1 13/10/1
f 51/12/3 62/72/3 71/13/3
f 56/15/2 34/73/2 32/16/2
f 32/26/3 34/74/3 38/75/3
f 35/76/3 36/77/3 37/78/3
f 32/26/3 38/75/3 35/76/3
f 29/66/3 33/79/3 31/80/3
f 32/26/3 35/76/3 3/25/3
f 28/51/3 29/66/3 31/80/3
f 31/80/3 32/26/3 18/24/3
f 3/25/3 4/81/3 17/82/3
f 35/76/3 37/78/3 3/25/3
f 21/83/3 28/51/3 22/84/3
f 3/25/3 17/82/3 18/24/3
f 11/85/3 12/55/3 30/52/3
f 32/26/3 3/25/3 18/24/3
f 11/85/3 30/52/3 22/84/3
f 31/80/3 18/24/3 11/85/3
f 24/86/3 27/87/3 21/83/3
f 28/51/3 31/80/3 11/85/3
f 11/85/3 22/84/3 28/51/3
f 24/86/3 21/83/3 23/20/3
f 26/88/3 25/89/3 23/20/3
f 23/20/3 21/83/3 15/18/3
f 15/18/3 16/90/3 7/91/3
f 21/83/3 22/84/3 15/18/3
f 8/19/3 26/88/3 23/20/3
f 15/18/3 7/91/3 8/19/3
f 22/21/2 30/49/2 40/22/2
f 47/89/4 45/88/4 5/19/4
f 5/19/4 6/91/4 13/90/4
f 5/19/4 13/90/4 14/18/4
f 44/20/4 47/89/4 5/19/4
f 43/87/4 46/86/4 44/20/4
f 41/83/4 43/87/4 44/20/4
f 44/20/4 5/19/4 14/18/4
f 39/84/4 40/52/4 80/50/4
f 44/20/4 14/18/4 41/83/4
f 42/51/4 41/83/4 39/84/4
f 39/84/4 80/50/4 50/92/4
f 41/83/4 14/18/4 39/84/4
f 48/93/4 49/66/4 42/51/4
f 50/92/4 48/93/4 42/51/4
f 80/50/4 79/94/4 50/92/4
f 50/92/4 42/51/4 39/84/4
f 54/79/4 55/62/4 52/80/4
f 50/92/4 79/94/4 51/95/4
f 52/80/4 55/62/4 51/95/4
f 51/95/4 79/94/4 10/85/4
f 79/94/4 9/55/4 10/85/4
f 53/26/4 52/80/4 10/85/4
f 58/75/4 56/74/4 53/26/4
f 59/78/4 60/77/4 57/76/4
f 57/76/4 58/75/4 53/26/4
f 52/80/4 51/95/4 10/85/4
f 19/24/4 20/82/4 1/81/4
f 53/26/4 10/85/4 19/24/4
f 59/78/4 57/76/4 2/25/4
f 19/24/4 1/81/4 2/25/4
f 2/25/4 57/76/4 53/26/4
f 70/27/5 71/96/5 62/28/5
f 11/30/5 18/97/5 19/31/5
f 4/15/5 1/73/5 20/33/5
f 72/35/3 74/54/3 64/36/3
f 13/8/5 6/29/5 7/38/5
f 23/39/6 25/10/6 47/11/6
f 68/40/7 75/98/7 70/41/7
f 30/11/5 12/17/5 79/99/5
f 79/99/10 80/43/10 30/11/10
f 12/17/5 9/16/5 79/99/5
f 3/15/1 2/73/1 1/32/1
f 20/44/2 19/58/2 18/27/2
f 74/17/5 78/100/5 65/46/5
f 31/43/1 33/99/1 54/47/1
f 22/47/5 39/99/5 14/43/5
f 46/1/2 24/64/2 23/7/2
f 57/21/1 35/23/1 38/22/1
f 61/50/9 66/53/9 76/51/9
f 37/45/5 59/44/5 2/23/5
f 78/28/3 77/51/3 67/53/3
f 62/67/1 51/66/1 69/68/1
f 51/66/1 55/65/1 63/6/1
f 68/17/1 69/68/1 61/69/1
f 61/69/1 69/68/1 51/66/1
f 61/69/1 51/66/1 63/6/1
f 65/71/1 67/70/1 64/5/1
f 61/69/1 63/6/1 66/4/1
f 64/5/1 67/70/1 66/4/1
f 76/55/6 66/85/6 67/56/6
f 47/17/2 25/16/2 26/10/2
f 5/16/5 45/99/5 26/47/5
f 55/60/6 54/101/6 33/58/6
f 33/58/6 29/22/6 48/59/6
f 48/59/6 72/102/6 63/103/6
f 29/22/6 49/104/6 48/59/6
f 48/59/6 63/103/6 55/60/6
f 29/38/2 28/2/2 42/3/2
f 32/44/6 31/23/6 52/21/6
f 58/15/6 38/73/6 34/33/6
f 27/7/6 24/38/6 46/29/6
f 73/61/6 75/105/6 68/62/6
f 21/58/6 41/27/6 42/29/6
f 11/29/1 10/38/1 9/58/1
f 59/45/1 37/44/1 36/2/1
f 60/9/6 36/39/6 35/10/6

1
mods/creative/README.txt
View File

@ -13,6 +13,7 @@ are added to the creative inventory.
License of source code and media files: License of source code and media files:
--------------------------------------- ---------------------------------------
Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com> Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
Copyright (C) 2016 Jean-Patrick G. (kilbith) <jeanpatrick.guerrero@gmail.com>
This program is free software. It comes without any warranty, to This program is free software. It comes without any warranty, to
the extent permitted by applicable law. You can redistribute it the extent permitted by applicable law. You can redistribute it

7
mods/default/crafting.lua
View File

@ -507,6 +507,13 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({
output = 'default:clay_lump 4',
recipe = {
{'default:clay'},
}
})
minetest.register_craft({ minetest.register_craft({
output = 'default:brick', output = 'default:brick',
recipe = { recipe = {

4
mods/default/furnace.lua
View File

@ -108,8 +108,8 @@ minetest.register_node("default:furnace", {
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
can_dig = can_dig, can_dig = can_dig,
allow_metadata_inventory_put = allow_metadata_inventory_put, allow_metadata_inventory_put = allow_metadata_inventory_put,
allow_metadata_inventory_move = allow_metadata_inventory_move, allow_metadata_inventory_move = allow_metadata_inventory_move,
allow_metadata_inventory_take = allow_metadata_inventory_take, allow_metadata_inventory_take = allow_metadata_inventory_take,
}) })

4
mods/default/mapgen.lua
View File

@ -1044,7 +1044,7 @@ function default.register_decorations()
deco_type = "schematic", deco_type = "schematic",
place_on = {"default:dirt_with_grass", "default:dirt"}, place_on = {"default:dirt_with_grass", "default:dirt"},
sidelen = 80, sidelen = 80,
fill_ratio = 0.09, fill_ratio = 0.1,
biomes = {"rainforest", "rainforest_swamp"}, biomes = {"rainforest", "rainforest_swamp"},
y_min = 0, y_min = 0,
y_max = 31000, y_max = 31000,
@ -1057,7 +1057,7 @@ function default.register_decorations()
deco_type = "schematic", deco_type = "schematic",
place_on = {"default:dirt_with_grass", "default:dirt"}, place_on = {"default:dirt_with_grass", "default:dirt"},
sidelen = 80, sidelen = 80,
fill_ratio = 0.01, fill_ratio = 0.005,
biomes = {"rainforest", "rainforest_swamp"}, biomes = {"rainforest", "rainforest_swamp"},
y_min = 1, y_min = 1,
y_max = 31000, y_max = 31000,

40
mods/default/nodes.lua
View File

@ -382,6 +382,7 @@ minetest.register_node("default:snow", {
wield_image = "default_snowball.png", wield_image = "default_snowball.png",
paramtype = "light", paramtype = "light",
buildable_to = true, buildable_to = true,
floodable = true,
drawtype = "nodebox", drawtype = "nodebox",
node_box = { node_box = {
type = "fixed", type = "fixed",
@ -1574,43 +1575,16 @@ minetest.register_node("default:bookshelf", {
inv:set_size("books", 8 * 2) inv:set_size("books", 8 * 2)
end, end,
can_dig = function(pos,player) can_dig = function(pos,player)
local meta = minetest.get_meta(pos); local inv = minetest.get_meta(pos):get_inventory()
local inv = meta:get_inventory()
return inv:is_empty("books") return inv:is_empty("books")
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack)
allow_metadata_inventory_put = function(pos, listname, index, stack, player) if minetest.get_item_group(stack:get_name(), "book") ~= 0 then
local meta = minetest.get_meta(pos) return stack:get_count()
local inv = meta:get_inventory()
local to_stack = inv:get_stack(listname, index)
if listname == "books" then
if minetest.get_item_group(stack:get_name(), "book") ~= 0
and to_stack:is_empty() then
return 1
else
return 0
end
end end
return 0
end, end,
on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
allow_metadata_inventory_move = function(pos, from_list, from_index,
to_list, to_index, count, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack(from_list, from_index)
local to_stack = inv:get_stack(to_list, to_index)
if to_list == "books" then
if minetest.get_item_group(stack:get_name(), "book") ~= 0
and to_stack:is_empty() then
return 1
else
return 0
end
end
end,
on_metadata_inventory_move = function(pos, from_list, from_index,
to_list, to_index, count, player)
minetest.log("action", player:get_player_name() .. minetest.log("action", player:get_player_name() ..
" moves stuff in bookshelf at " .. minetest.pos_to_string(pos)) " moves stuff in bookshelf at " .. minetest.pos_to_string(pos))
end, end,

2
mods/doors/init.lua
View File

@ -394,7 +394,6 @@ function doors.register(name, def)
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
use_texture_alpha = true,
walkable = true, walkable = true,
is_ground_content = false, is_ground_content = false,
buildable_to = false, buildable_to = false,
@ -427,7 +426,6 @@ function doors.register(name, def)
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
use_texture_alpha = true,
walkable = true, walkable = true,
is_ground_content = false, is_ground_content = false,
buildable_to = false, buildable_to = false,

13
mods/farming/nodes.lua
View File

@ -1,5 +1,5 @@
minetest.override_item("default:dirt", { minetest.override_item("default:dirt", {
groups = {crumbly=3,soil=1}, groups = {crumbly=3, soil=1},
soil = { soil = {
base = "default:dirt", base = "default:dirt",
dry = "farming:soil", dry = "farming:soil",
@ -8,7 +8,7 @@ minetest.override_item("default:dirt", {
}) })
minetest.override_item("default:dirt_with_grass", { minetest.override_item("default:dirt_with_grass", {
groups = {crumbly=3,soil=1}, groups = {crumbly=3, soil=1},
soil = { soil = {
base = "default:dirt_with_grass", base = "default:dirt_with_grass",
dry = "farming:soil", dry = "farming:soil",
@ -16,6 +16,15 @@ minetest.override_item("default:dirt_with_grass", {
} }
}) })
minetest.override_item("default:dirt_with_dry_grass", {
groups = {crumbly=3, soil=1},
soil = {
base = "default:dirt_with_dry_grass",
dry = "farming:soil",
wet = "farming:soil_wet"
}
})
minetest.register_node("farming:soil", { minetest.register_node("farming:soil", {
description = "Soil", description = "Soil",
tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"}, tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"},

2
mods/fire/init.lua
View File

@ -81,7 +81,7 @@ minetest.register_tool("fire:flint_and_steel", {
itemstack:add_wear(1000) itemstack:add_wear(1000)
local node_under = minetest.get_node(pt.under).name local node_under = minetest.get_node(pt.under).name
if minetest.get_node_group(node_under, "flammable") >= 1 then if minetest.get_item_group(node_under, "flammable") >= 1 then
if not minetest.is_protected(pt.above, player_name) then if not minetest.is_protected(pt.above, player_name) then
minetest.set_node(pt.above, {name = "fire:basic_flame"}) minetest.set_node(pt.above, {name = "fire:basic_flame"})
else else

21
mods/flowers/init.lua
View File

@ -217,6 +217,7 @@ minetest.register_node("flowers:waterlily", {
liquids_pointable = true, liquids_pointable = true,
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
sunlight_propagates = true,
groups = {snappy = 3, flower = 1}, groups = {snappy = 3, flower = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
node_box = { node_box = {
@ -228,22 +229,12 @@ minetest.register_node("flowers:waterlily", {
fixed = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5} fixed = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}
}, },
after_place_node = function(pos, placer, itemstack, pointed_thing) on_place = function(_, _, pointed_thing)
local find_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1}, local pos = pointed_thing.above
{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:water_source") local node = minetest.get_node(pointed_thing.under).name
local find_river_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1}, local def = minetest.registered_nodes[node]
{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:river_water_source") if def and def.liquidtype == "source" and minetest.get_item_group(node, "water") > 0 then
if #find_water ~= 0 then
minetest.set_node(pos, {name = "default:water_source"})
pos.y = pos.y + 1
minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)}) minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
elseif #find_river_water ~= 0 then
minetest.set_node(pos, {name = "default:river_water_source"})
pos.y = pos.y + 1
minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
else
minetest.remove_node(pos)
return true
end end
end end
}) })

47
mods/vessels/init.lua
View File

@ -24,54 +24,29 @@ minetest.register_node("vessels:shelf", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("formspec", vessels_shelf_formspec) meta:set_string("formspec", vessels_shelf_formspec)
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size("vessels", 8*2) inv:set_size("vessels", 8 * 2)
end, end,
can_dig = function(pos,player) can_dig = function(pos,player)
local meta = minetest.get_meta(pos); local inv = minetest.get_meta(pos):get_inventory()
local inv = meta:get_inventory()
return inv:is_empty("vessels") return inv:is_empty("vessels")
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack, player)
local meta = minetest.get_meta(pos) if minetest.get_item_group(stack:get_name(), "vessel") ~= 0 then
local inv = meta:get_inventory() return stack:get_count()
local to_stack = inv:get_stack(listname, index)
if listname == "vessels" then
if minetest.get_item_group(stack:get_name(), "vessel") ~= 0
and to_stack:is_empty() then
return 1
else
return 0
end
end end
return 0
end, end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack(from_list, from_index)
local to_stack = inv:get_stack(to_list, to_index)
if to_list == "vessels" then
if minetest.get_item_group(stack:get_name(), "vessel") ~= 0
and to_stack:is_empty() then
return 1
else
return 0
end
end
end,
on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
minetest.log("action", player:get_player_name().. minetest.log("action", player:get_player_name() ..
" moves stuff in vessels shelf at "..minetest.pos_to_string(pos)) " moves stuff in vessels shelf at ".. minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_put = function(pos, listname, index, stack, player) on_metadata_inventory_put = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name().. minetest.log("action", player:get_player_name() ..
" moves stuff to vessels shelf at "..minetest.pos_to_string(pos)) " moves stuff to vessels shelf at ".. minetest.pos_to_string(pos))
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname, index, stack, player)
minetest.log("action", player:get_player_name().. minetest.log("action", player:get_player_name() ..
" takes stuff from vessels shelf at "..minetest.pos_to_string(pos)) " takes stuff from vessels shelf at ".. minetest.pos_to_string(pos))
end, end,
}) })