Version MFF.

This commit is contained in:
sys4-fr
2018-09-07 22:32:38 +02:00
parent 2d0363f3ac
commit a11527ed63
1027 changed files with 8090 additions and 37753 deletions

2
itemframes/depends.txt Normal file → Executable file
View File

@ -1,3 +1 @@
default
homedecor_i18n
mesecons_mvps?

258
itemframes/init.lua Normal file → Executable file
View File

@ -1,16 +1,14 @@
local S = homedecor_i18n.gettext
local tmp = {}
itemframes = {}
screwdriver = screwdriver or {}
minetest.register_entity("itemframes:item",{
hp_max = 1,
visual="wielditem",
visual_size={x = 0.33, y = 0.33},
collisionbox = {0, 0, 0, 0, 0, 0},
physical = false,
textures = {"air"},
visual_size={x=.33,y=.33},
collisionbox = {0,0,0,0,0,0},
physical=false,
textures={"air"},
on_activate = function(self, staticdata)
if tmp.nodename ~= nil and tmp.texture ~= nil then
self.nodename = tmp.nodename
@ -27,10 +25,10 @@ minetest.register_entity("itemframes:item",{
end
end
if self.texture ~= nil then
self.object:set_properties({textures = {self.texture}})
self.object:set_properties({textures={self.texture}})
end
if self.nodename == "itemframes:pedestal" then
self.object:set_properties({automatic_rotate = 1})
if self.nodename ~= "itemframes:frame" then
self.object:set_properties({automatic_rotate=1})
end
end,
get_staticdata = function(self)
@ -41,18 +39,18 @@ minetest.register_entity("itemframes:item",{
end,
})
local facedir = {}
facedir[0] = {x = 0, y = 0, z = 1}
facedir[1] = {x = 1, y = 0, z = 0}
facedir[2] = {x = 0, y = 0, z = -1}
facedir[3] = {x = -1, y = 0, z = 0}
local facedir = {}
facedir[0] = {x=0,y=0,z=1}
facedir[1] = {x=1,y=0,z=0}
facedir[2] = {x=0,y=0,z=-1}
facedir[3] = {x=-1,y=0,z=0}
local remove_item = function(pos, node)
local objs = nil
if node.name == "itemframes:frame" then
objs = minetest.get_objects_inside_radius(pos, .5)
elseif node.name == "itemframes:pedestal" then
elseif minetest.get_item_group(node.name, "group:pedestal") then
objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5)
end
if objs then
@ -71,17 +69,17 @@ local update_item = function(pos, node)
if node.name == "itemframes:frame" then
local posad = facedir[node.param2]
if not posad then return end
pos.x = pos.x + posad.x * 6.5 / 16
pos.y = pos.y + posad.y * 6.5 / 16
pos.z = pos.z + posad.z * 6.5 / 16
elseif node.name == "itemframes:pedestal" then
pos.y = pos.y + 12 / 16 + 0.33
pos.x = pos.x + posad.x*6.5/16
pos.y = pos.y + posad.y*6.5/16
pos.z = pos.z + posad.z*6.5/16
elseif minetest.get_item_group(node.name, "group:pedestal") then
pos.y = pos.y + 12/16+.33
end
tmp.nodename = node.name
tmp.texture = ItemStack(meta:get_string("item")):get_name()
local e = minetest.add_entity(pos,"itemframes:item")
if node.name == "itemframes:frame" then
local yaw = math.pi * 2 - node.param2 * math.pi / 2
local yaw = math.pi*2 - node.param2 * math.pi/2
e:setyaw(yaw)
end
end
@ -92,7 +90,7 @@ local drop_item = function(pos, node)
if meta:get_string("item") ~= "" then
if node.name == "itemframes:frame" then
minetest.add_item(pos, meta:get_string("item"))
elseif node.name == "itemframes:pedestal" then
elseif minetest.get_item_group(node.name, "group:pedestal") then
minetest.add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item"))
end
meta:set_string("item","")
@ -101,37 +99,29 @@ local drop_item = function(pos, node)
end
minetest.register_node("itemframes:frame",{
description = S("Item frame"),
description = "Item frame",
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5}
},
node_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
selection_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} },
tiles = {"itemframes_frame.png"},
inventory_image = "itemframes_frame.png",
wield_image = "itemframes_frame.png",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {choppy = 2, dig_immediate = 2},
groups = { choppy=2,dig_immediate=2 },
legacy_wallmounted = true,
sounds = default.node_sound_defaults(),
on_rotate = screwdriver.disallow,
after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos)
meta:set_string("owner",placer:get_player_name())
meta:set_string("infotext", S("Item frame (owned by @1)", placer:get_player_name()))
meta:set_string("infotext","Item frame (owned by "..placer:get_player_name()..")")
end,
on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end
local meta = minetest.get_meta(pos)
local name = clicker and clicker:get_player_name()
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
if clicker:get_player_name() == meta:get_string("owner") then
drop_item(pos,node)
local s = itemstack:take_item()
meta:set_string("item",s:to_string())
@ -141,60 +131,46 @@ minetest.register_node("itemframes:frame",{
end,
on_punch = function(pos,node,puncher)
local meta = minetest.get_meta(pos)
local name = puncher and puncher:get_player_name()
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
if puncher:get_player_name() == meta:get_string("owner") then
drop_item(pos, node)
end
end,
can_dig = function(pos,player)
if not player then return end
local name = player and player:get_player_name()
local meta = minetest.get_meta(pos)
return name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass")
end,
on_destruct = function(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
if meta:get_string("item") ~= "" then
drop_item(pos, node)
end
return player:get_player_name() == meta:get_string("owner")
end,
after_destruct = remove_item,
})
minetest.register_node("itemframes:pedestal",{
description = S("Pedestal"),
function itemframes.register_pedestal(subname, recipeitem, groups, images, description, sounds)
minetest.register_node("itemframes:pedestal_" .. subname, {
description = description,
drawtype = "nodebox",
node_box = {
type = "fixed", fixed = {
{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
}
},
--selection_box = {
-- type = "fixed",
-- fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16}
--},
tiles = {"itemframes_pedestal.png"},
tiles = images,
node_box = { type = "fixed", fixed = {
{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar
{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate
}},
--selection_box = { type = "fixed", fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16} },
groups = groups,
sounds = sounds,
paramtype = "light",
groups = {cracky = 3},
groups = { cracky=3 },
sounds = default.node_sound_defaults(),
on_rotate = screwdriver.disallow,
after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos)
meta:set_string("owner",placer:get_player_name())
meta:set_string("infotext", S("Pedestal (owned by @1)", placer:get_player_name()))
meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")")
end,
on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end
local meta = minetest.get_meta(pos)
local name = clicker and clicker:get_player_name()
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
if clicker:get_player_name() == meta:get_string("owner") then
drop_item(pos,node)
local s = itemstack:take_item()
meta:set_string("item",s:to_string())
@ -204,47 +180,114 @@ minetest.register_node("itemframes:pedestal",{
end,
on_punch = function(pos,node,puncher)
local meta = minetest.get_meta(pos)
local name = puncher and puncher:get_player_name()
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
if puncher:get_player_name() == meta:get_string("owner") then
drop_item(pos,node)
end
end,
can_dig = function(pos,player)
if not player then return end
local name = player and player:get_player_name()
local meta = minetest.get_meta(pos)
return name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass")
end,
on_destruct = function(pos)
local meta = minetest.get_meta(pos)
local node = minetest.get_node(pos)
if meta:get_string("item") ~= "" then
drop_item(pos, node)
end
return player:get_player_name() == meta:get_string("owner")
end,
after_destruct = remove_item,
})
-- automatically restore entities lost from frames/pedestals
-- due to /clearobjects or similar
minetest.register_craft({
output = 'itemframes:pedestal_' .. subname,
recipe = {
{recipeitem, recipeitem, recipeitem},
{'', recipeitem, ''},
{recipeitem, recipeitem, recipeitem},
}
})
end
itemframes.register_pedestal("wood", "default:wood",
{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,pedestal=1},
{"default_wood.png"},
"Wooden Pedestal",
default.node_sound_wood_defaults()
)
itemframes.register_pedestal("junglewood", "default:junglewood",
{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,pedestal=1},
{"default_junglewood.png"},
"Jungle wood Pedestal",
default.node_sound_wood_defaults()
)
itemframes.register_pedestal("obsidian", "default:obsidian",
{cracky=1,level=2,pedestal=1},
{"default_obsidian.png"},
"Obsidian Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("cloud", "default:cloud",
{cracky=1,level=2,not_in_creative_inventory=1,pedestal=1},
{"default_cloud.png"},
"Cloud Pedestal",
default.node_sound_defaults()
)
itemframes.register_pedestal("stone", "default:stone",
{cracky=3,pedestal=1},
{"default_stone.png"},
"Stone Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("cobble", "default:cobble",
{cracky=3,pedestal=1},
{"default_cobble.png"},
"Cobblestone Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("desert_stone", "default:desert_stone",
{cracky=3,pedestal=1},
{"default_desert_stone.png"},
"Desert Stone Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("desert_cobble", "default:desert_cobble",
{cracky=3,pedestal=1},
{"default_desert_cobble.png"},
"Desert Cobblestone Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("desert_stonebrick", "default:desert_stonebrick",
{cracky=3,pedestal=1},
{"default_desert_stone_brick.png"},
"Desert Stone Brick Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("brick", "default:brick",
{cracky=3,pedestal=1},
{"default_brick.png"},
"Brick Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("sandstone", "default:sandstone",
{crumbly=2,cracky=2,pedestal=1},
{"default_sandstone.png"},
"Sandstone Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("sandstonebrick", "default:sandstonebrick",
{crumbly=2,cracky=2,pedestal=1},
{"default_sandstone_brick.png"},
"Sandstone Brick Pedestal",
default.node_sound_stone_defaults()
)
itemframes.register_pedestal("stonebrick", "default:stonebrick",
{cracky=3,pedestal=1},
{"default_stone_brick.png"},
"Stone Brick Pedestal",
default.node_sound_stone_defaults()
)
-- automatically restore entities lost from
-- frames/pedestals due to /clearobjects or similar
minetest.register_abm({
nodenames = {"itemframes:frame", "itemframes:pedestal"},
nodenames = {"itemframes:frame", "group:pedestal"},
interval = 15,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
local num
if node.name == "itemframes:frame" then
num = #minetest.get_objects_inside_radius(pos, 0.5)
elseif node.name == "itemframes:pedestal" then
pos.y = pos.y + 1
num = #minetest.get_objects_inside_radius(pos, 0.5)
pos.y = pos.y - 1
end
if num > 0 then return end
if #minetest.get_objects_inside_radius(pos, 0.5) > 0 then return end
update_item(pos, node)
end
})
@ -254,12 +297,11 @@ minetest.register_abm({
minetest.register_craft({
output = 'itemframes:frame',
recipe = {
{'group:stick', 'group:stick', 'group:stick'},
{'group:stick', 'default:paper', 'default:stick'},
{'group:stick', 'group:stick', 'group:stick'},
{'default:stick', 'default:stick', 'default:stick'},
{'default:stick', 'default:paper', 'default:stick'},
{'default:stick', 'default:stick', 'default:stick'},
}
})
minetest.register_craft({
output = 'itemframes:pedestal',
recipe = {
@ -269,8 +311,8 @@ minetest.register_craft({
}
})
-- stop mesecon pistons from pushing itemframes and pedestals
if minetest.get_modpath("mesecons_mvps") then
mesecon.register_mvps_stopper("itemframes:frame")
mesecon.register_mvps_stopper("itemframes:pedestal")
end
-- homedecor/itemframes -> itemframes::stone
-- minetest.register_alias("itemframes:pedestal","itemframes:pedestal_stone")
-- itemframes::stone -> homedecor/itemframes
minetest.register_alias("itemframes:pedestal_stone","itemframes:pedestal")

0
itemframes/textures/itemframes_frame.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 104 B

After

Width:  |  Height:  |  Size: 104 B

0
itemframes/textures/itemframes_pedestal.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B