forked from MineClone5/MineClone5
#363 Flush transitional merge (might be overwritten)
This commit is contained in:
parent
f1a7e951af
commit
c061e7cc6a
|
@ -1,8 +1,3 @@
|
||||||
mods/ITEMS/mcl_itemframes/init.lua
|
|
||||||
mods/ITEMS/mcl_lanterns/init.lua
|
|
||||||
mods/ITEMS/mcl_lanterns/mod.conf
|
|
||||||
mods/ITEMS/mcl_lanterns/register.lua
|
|
||||||
mods/ITEMS/mcl_maps/init.lua
|
|
||||||
mods/ITEMS/mcl_mobitems/init.lua
|
mods/ITEMS/mcl_mobitems/init.lua
|
||||||
mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
|
mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
|
||||||
mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr
|
mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr
|
||||||
|
|
|
@ -120,337 +120,269 @@ for v = 1, #vari do
|
||||||
return self.id
|
return self.id
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
=======
|
|
||||||
minetest.register_entity("mcl_itemframes:map", {
|
|
||||||
initial_properties = {
|
|
||||||
visual = "upright_sprite",
|
|
||||||
visual_size = {x = 1, y = 1},
|
|
||||||
pointable = false,
|
|
||||||
physical = false,
|
|
||||||
collide_with_objects = false,
|
|
||||||
textures = {"blank.png"},
|
|
||||||
},
|
|
||||||
on_activate = function(self, staticdata)
|
|
||||||
self.id = staticdata
|
|
||||||
mcl_maps.load_map(self.id, function(texture)
|
|
||||||
-- will not crash even if self.object is invalid by now
|
|
||||||
self.object:set_properties({textures = {texture}})
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
get_staticdata = function(self)
|
|
||||||
return self.id
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
>>>>>>> mcl2/master
|
|
||||||
|
|
||||||
|
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 = {}
|
local remove_item_entity = function(pos, node)
|
||||||
facedir[0] = {x=0,y=0,z=1}
|
if node.name == var[3] then
|
||||||
facedir[1] = {x=1,y=0,z=0}
|
for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do
|
||||||
facedir[2] = {x=0,y=0,z=-1}
|
local entity = obj:get_luaentity()
|
||||||
facedir[3] = {x=-1,y=0,z=0}
|
if entity and (entity.name == var[1] or entity.name == var[2]) then
|
||||||
|
obj:remove()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local remove_item_entity = function(pos, node)
|
local update_item_entity = function(pos, node, param2)
|
||||||
if node.name == var[3] then
|
remove_item_entity(pos, node)
|
||||||
for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do
|
|
||||||
local entity = obj:get_luaentity()
|
|
||||||
if entity and (entity.name == var[1] or entity.name == var[2]) then
|
|
||||||
obj:remove()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local update_item_entity = function(pos, node, param2)
|
|
||||||
remove_item_entity(pos, node)
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
local item = inv:get_stack("main", 1)
|
|
||||||
if not item:is_empty() then
|
|
||||||
if not param2 then
|
|
||||||
param2 = node.param2
|
|
||||||
end
|
|
||||||
if node.name == var[3] then
|
|
||||||
local posad = facedir[param2]
|
|
||||||
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
|
|
||||||
end
|
|
||||||
local yaw = math.pi*2 - param2 * math.pi/2
|
|
||||||
local map_id = item:get_meta():get_string("mcl_maps:id")
|
|
||||||
if map_id == "" then
|
|
||||||
local e = minetest.add_entity(pos, var[1])
|
|
||||||
local lua = e:get_luaentity()
|
|
||||||
lua._nodename = node.name
|
|
||||||
local itemname = item:get_name()
|
|
||||||
if itemname == "" or itemname == nil then
|
|
||||||
lua._texture = "blank.png"
|
|
||||||
lua._scale = 1
|
|
||||||
else
|
|
||||||
lua._texture = itemname
|
|
||||||
local def = minetest.registered_items[itemname]
|
|
||||||
lua._scale = def and def.wield_scale and def.wield_scale.x or 1
|
|
||||||
end
|
|
||||||
lua:_update_texture()
|
|
||||||
if node.name == var[3] then
|
|
||||||
e:set_yaw(yaw)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
local e = minetest.add_entity(pos, var[2], map_id)
|
|
||||||
e:set_yaw(yaw)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local drop_item = function(pos, node, meta, clicker)
|
|
||||||
local cname = ""
|
|
||||||
if clicker and clicker:is_player() then
|
|
||||||
cname = clicker:get_player_name()
|
|
||||||
end
|
|
||||||
if node.name == var[3] and not minetest.is_creative_enabled(cname) then
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
local item = inv:get_stack("main", 1)
|
|
||||||
if not item:is_empty() then
|
|
||||||
minetest.add_item(pos, item)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
meta:set_string("infotext", "")
|
|
||||||
remove_item_entity(pos, node)
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.register_node(var[3],{
|
|
||||||
description = var[4],
|
|
||||||
_tt_help = var[5],
|
|
||||||
_doc_items_longdesc = var[6],
|
|
||||||
_doc_items_usagehelp = S("Just place any item on the item frame. Use the item frame again to retrieve the item."),
|
|
||||||
drawtype = "mesh",
|
|
||||||
is_ground_content = false,
|
|
||||||
mesh = var[7],
|
|
||||||
selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
|
|
||||||
collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
|
|
||||||
tiles = {var[8], var[8], var[8], var[8], var[9], var[8]},
|
|
||||||
inventory_image = var[10],
|
|
||||||
wield_image = var[11],
|
|
||||||
paramtype = "light",
|
|
||||||
paramtype2 = "facedir",
|
|
||||||
|
|
||||||
--FIXME: should only be glowing, no light source. How is that possible with a node?
|
|
||||||
light_source = v-1,
|
|
||||||
|
|
||||||
sunlight_propagates = true,
|
|
||||||
groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 },
|
|
||||||
sounds = mcl_sounds.node_sound_defaults(),
|
|
||||||
node_placement_prediction = "",
|
|
||||||
on_timer = function(pos)
|
|
||||||
local inv = minetest.get_meta(pos):get_inventory()
|
|
||||||
local stack = inv:get_stack("main", 1)
|
|
||||||
local itemname = stack:get_name()
|
|
||||||
if minetest.get_item_group(itemname, "clock") > 0 then
|
|
||||||
local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame)
|
|
||||||
if itemname ~= new_name then
|
|
||||||
stack:set_name(new_name)
|
|
||||||
inv:set_stack("main", 1, stack)
|
|
||||||
local node = minetest.get_node(pos)
|
|
||||||
update_item_entity(pos, node, node.param2)
|
|
||||||
end
|
|
||||||
minetest.get_node_timer(pos):start(1.0)
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
|
||||||
if pointed_thing.type ~= "node" then
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Use pointed node's on_rightclick function first, if present
|
|
||||||
local node = minetest.get_node(pointed_thing.under)
|
|
||||||
if placer and not placer:get_player_control().sneak then
|
|
||||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
|
||||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under)))
|
|
||||||
end,
|
|
||||||
on_construct = function(pos)
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
inv:set_size("main", 1)
|
|
||||||
end,
|
|
||||||
on_rightclick = function(pos, node, clicker, itemstack)
|
|
||||||
if not itemstack then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local pname = clicker:get_player_name()
|
|
||||||
if minetest.is_protected(pos, pname) then
|
|
||||||
minetest.record_protection_violation(pos, pname)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
drop_item(pos, node, meta, clicker)
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
if itemstack:is_empty() then
|
|
||||||
remove_item_entity(pos, node)
|
|
||||||
meta:set_string("infotext", "")
|
|
||||||
inv:set_stack("main", 1, "")
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
local put_itemstack = ItemStack(itemstack)
|
|
||||||
put_itemstack:set_count(1)
|
|
||||||
local itemname = put_itemstack:get_name()
|
|
||||||
if minetest.get_item_group(itemname, "compass") > 0 then
|
|
||||||
put_itemstack:set_name("mcl_compass:" .. mcl_compass.get_compass_image(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2))))
|
|
||||||
end
|
|
||||||
if minetest.get_item_group(itemname, "clock") > 0 then
|
|
||||||
minetest.get_node_timer(pos):start(1.0)
|
|
||||||
end
|
|
||||||
inv:set_stack("main", 1, put_itemstack)
|
|
||||||
update_item_entity(pos, node)
|
|
||||||
-- Add node infotext when item has been named
|
|
||||||
local imeta = itemstack:get_meta()
|
|
||||||
local iname = imeta:get_string("name")
|
|
||||||
if iname then
|
|
||||||
meta:set_string("infotext", iname)
|
|
||||||
end
|
|
||||||
|
|
||||||
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
|
||||||
itemstack:take_item()
|
|
||||||
end
|
|
||||||
return itemstack
|
|
||||||
end,
|
|
||||||
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
|
|
||||||
local name = player:get_player_name()
|
|
||||||
if minetest.is_protected(pos, name) then
|
|
||||||
minetest.record_protection_violation(pos, name)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return count
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
|
|
||||||
local name = player:get_player_name()
|
|
||||||
if minetest.is_protected(pos, name) then
|
|
||||||
minetest.record_protection_violation(pos, name)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return stack:get_count()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
|
|
||||||
local name = player:get_player_name()
|
|
||||||
if minetest.is_protected(pos, name) then
|
|
||||||
minetest.record_protection_violation(pos, name)
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
return stack:get_count()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
on_destruct = function(pos)
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
local node = minetest.get_node(pos)
|
|
||||||
drop_item(pos, node, meta)
|
|
||||||
end,
|
|
||||||
on_rotate = function(pos, node, user, mode, param2)
|
|
||||||
if mode == screwdriver.ROTATE_FACE then
|
|
||||||
-- Rotate face
|
|
||||||
--local meta = minetest.get_meta(pos)
|
|
||||||
local node = minetest.get_node(pos)
|
|
||||||
|
|
||||||
local objs = nil
|
|
||||||
if node.name == var[3] then
|
|
||||||
objs = minetest.get_objects_inside_radius(pos, 0.5)
|
|
||||||
end
|
|
||||||
if objs then
|
|
||||||
for _, obj in ipairs(objs) do
|
|
||||||
if obj and obj:get_luaentity() and obj:get_luaentity().name == var[1] then
|
|
||||||
update_item_entity(pos, node, (node.param2+1) % 4)
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return
|
|
||||||
elseif mode == screwdriver.ROTATE_AXIS then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
=======
|
|
||||||
return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under)))
|
|
||||||
end,
|
|
||||||
on_construct = function(pos)
|
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
inv:set_size("main", 1)
|
local item = inv:get_stack("main", 1)
|
||||||
end,
|
if not item:is_empty() then
|
||||||
on_rightclick = function(pos, node, clicker, itemstack)
|
if not param2 then
|
||||||
if not itemstack then
|
param2 = node.param2
|
||||||
return
|
end
|
||||||
|
if node.name == var[3] then
|
||||||
|
local posad = facedir[param2]
|
||||||
|
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
|
||||||
|
end
|
||||||
|
local yaw = math.pi*2 - param2 * math.pi/2
|
||||||
|
local map_id = item:get_meta():get_string("mcl_maps:id")
|
||||||
|
if map_id == "" then
|
||||||
|
local e = minetest.add_entity(pos, var[1])
|
||||||
|
local lua = e:get_luaentity()
|
||||||
|
lua._nodename = node.name
|
||||||
|
local itemname = item:get_name()
|
||||||
|
if itemname == "" or itemname == nil then
|
||||||
|
lua._texture = "blank.png"
|
||||||
|
lua._scale = 1
|
||||||
|
else
|
||||||
|
lua._texture = itemname
|
||||||
|
local def = minetest.registered_items[itemname]
|
||||||
|
lua._scale = def and def.wield_scale and def.wield_scale.x or 1
|
||||||
|
end
|
||||||
|
lua:_update_texture()
|
||||||
|
if node.name == var[3] then
|
||||||
|
e:set_yaw(yaw)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
local e = minetest.add_entity(pos, var[2], map_id)
|
||||||
|
e:set_yaw(yaw)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
local pname = clicker:get_player_name()
|
end
|
||||||
if minetest.is_protected(pos, pname) then
|
|
||||||
minetest.record_protection_violation(pos, pname)
|
local drop_item = function(pos, node, meta, clicker)
|
||||||
return
|
local cname = ""
|
||||||
|
if clicker and clicker:is_player() then
|
||||||
|
cname = clicker:get_player_name()
|
||||||
end
|
end
|
||||||
local meta = minetest.get_meta(pos)
|
if node.name == var[3] and not minetest.is_creative_enabled(cname) then
|
||||||
drop_item(pos, node, meta, clicker)
|
local inv = meta:get_inventory()
|
||||||
local inv = meta:get_inventory()
|
local item = inv:get_stack("main", 1)
|
||||||
if itemstack:is_empty() then
|
if not item:is_empty() then
|
||||||
remove_item_entity(pos, node)
|
minetest.add_item(pos, item)
|
||||||
meta:set_string("infotext", "")
|
end
|
||||||
inv:set_stack("main", 1, "")
|
end
|
||||||
|
meta:set_string("infotext", "")
|
||||||
|
remove_item_entity(pos, node)
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_node(var[3],{
|
||||||
|
description = var[4],
|
||||||
|
_tt_help = var[5],
|
||||||
|
_doc_items_longdesc = var[6],
|
||||||
|
_doc_items_usagehelp = S("Just place any item on the item frame. Use the item frame again to retrieve the item."),
|
||||||
|
drawtype = "mesh",
|
||||||
|
is_ground_content = false,
|
||||||
|
mesh = var[7],
|
||||||
|
selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
|
||||||
|
collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
|
||||||
|
tiles = {var[8], var[8], var[8], var[8], var[9], var[8]},
|
||||||
|
inventory_image = var[10],
|
||||||
|
wield_image = var[11],
|
||||||
|
paramtype = "light",
|
||||||
|
paramtype2 = "facedir",
|
||||||
|
|
||||||
|
--FIXME: should only be glowing, no light source. How is that possible with a node?
|
||||||
|
light_source = v-1,
|
||||||
|
|
||||||
|
sunlight_propagates = true,
|
||||||
|
groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 },
|
||||||
|
sounds = mcl_sounds.node_sound_defaults(),
|
||||||
|
node_placement_prediction = "",
|
||||||
|
on_timer = function(pos)
|
||||||
|
local inv = minetest.get_meta(pos):get_inventory()
|
||||||
|
local stack = inv:get_stack("main", 1)
|
||||||
|
local itemname = stack:get_name()
|
||||||
|
if minetest.get_item_group(itemname, "clock") > 0 then
|
||||||
|
local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame)
|
||||||
|
if itemname ~= new_name then
|
||||||
|
stack:set_name(new_name)
|
||||||
|
inv:set_stack("main", 1, stack)
|
||||||
|
local node = minetest.get_node(pos)
|
||||||
|
update_item_entity(pos, node, node.param2)
|
||||||
|
end
|
||||||
|
minetest.get_node_timer(pos):start(1.0)
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
|
if pointed_thing.type ~= "node" then
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Use pointed node's on_rightclick function first, if present
|
||||||
|
local node = minetest.get_node(pointed_thing.under)
|
||||||
|
if placer and not placer:get_player_control().sneak then
|
||||||
|
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||||
|
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under)))
|
||||||
|
end,
|
||||||
|
on_construct = function(pos)
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
inv:set_size("main", 1)
|
||||||
|
end,
|
||||||
|
on_rightclick = function(pos, node, clicker, itemstack)
|
||||||
|
if not itemstack then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local pname = clicker:get_player_name()
|
||||||
|
if minetest.is_protected(pos, pname) then
|
||||||
|
minetest.record_protection_violation(pos, pname)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
|
drop_item(pos, node, meta, clicker)
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
if itemstack:is_empty() then
|
||||||
|
remove_item_entity(pos, node)
|
||||||
|
meta:set_string("infotext", "")
|
||||||
|
inv:set_stack("main", 1, "")
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
local put_itemstack = ItemStack(itemstack)
|
||||||
|
put_itemstack:set_count(1)
|
||||||
|
local itemname = put_itemstack:get_name()
|
||||||
|
if minetest.get_item_group(itemname, "compass") > 0 then
|
||||||
|
put_itemstack:set_name(mcl_compass.get_compass_itemname(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)), put_itemstack))
|
||||||
|
end
|
||||||
|
if minetest.get_item_group(itemname, "clock") > 0 then
|
||||||
|
minetest.get_node_timer(pos):start(1.0)
|
||||||
|
end
|
||||||
|
inv:set_stack("main", 1, put_itemstack)
|
||||||
|
update_item_entity(pos, node)
|
||||||
|
-- Add node infotext when item has been named
|
||||||
|
local imeta = itemstack:get_meta()
|
||||||
|
local iname = imeta:get_string("name")
|
||||||
|
if iname then
|
||||||
|
meta:set_string("infotext", iname)
|
||||||
|
end
|
||||||
|
|
||||||
|
if not minetest.is_creative_enabled(clicker:get_player_name()) then
|
||||||
|
itemstack:take_item()
|
||||||
|
end
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end,
|
||||||
local put_itemstack = ItemStack(itemstack)
|
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
|
||||||
put_itemstack:set_count(1)
|
local name = player:get_player_name()
|
||||||
local itemname = put_itemstack:get_name()
|
if minetest.is_protected(pos, name) then
|
||||||
if minetest.get_item_group(itemname, "compass") > 0 then
|
minetest.record_protection_violation(pos, name)
|
||||||
put_itemstack:set_name(mcl_compass.get_compass_itemname(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)), put_itemstack))
|
return 0
|
||||||
end
|
else
|
||||||
if minetest.get_item_group(itemname, "clock") > 0 then
|
return count
|
||||||
minetest.get_node_timer(pos):start(1.0)
|
end
|
||||||
end
|
end,
|
||||||
inv:set_stack("main", 1, put_itemstack)
|
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
|
||||||
update_item_entity(pos, node)
|
local name = player:get_player_name()
|
||||||
-- Add node infotext when item has been named
|
if minetest.is_protected(pos, name) then
|
||||||
local imeta = itemstack:get_meta()
|
minetest.record_protection_violation(pos, name)
|
||||||
local iname = imeta:get_string("name")
|
return 0
|
||||||
if iname then
|
else
|
||||||
meta:set_string("infotext", iname)
|
return stack:get_count()
|
||||||
end
|
end
|
||||||
>>>>>>> mcl2/master
|
end,
|
||||||
|
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
|
||||||
|
local name = player:get_player_name()
|
||||||
|
if minetest.is_protected(pos, name) then
|
||||||
|
minetest.record_protection_violation(pos, name)
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return stack:get_count()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
on_destruct = function(pos)
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
|
local node = minetest.get_node(pos)
|
||||||
|
drop_item(pos, node, meta)
|
||||||
|
end,
|
||||||
|
on_rotate = function(pos, node, user, mode, param2)
|
||||||
|
if mode == screwdriver.ROTATE_FACE then
|
||||||
|
-- Rotate face
|
||||||
|
--local meta = minetest.get_meta(pos)
|
||||||
|
local node = minetest.get_node(pos)
|
||||||
|
|
||||||
minetest.register_lbm({
|
local objs = nil
|
||||||
label = "Update legacy item frames",
|
if node.name == var[3] then
|
||||||
name = "mcl_itemframes:update_legacy_item_frames",
|
objs = minetest.get_objects_inside_radius(pos, 0.5)
|
||||||
nodenames = var[12],
|
end
|
||||||
action = function(pos, node)
|
if objs then
|
||||||
-- Swap legacy node, then respawn entity
|
for _, obj in ipairs(objs) do
|
||||||
node.name = var[3]
|
if obj and obj:get_luaentity() and obj:get_luaentity().name == var[1] then
|
||||||
local meta = minetest.get_meta(pos)
|
update_item_entity(pos, node, (node.param2+1) % 4)
|
||||||
local item = meta:get_string("item")
|
break
|
||||||
minetest.swap_node(pos, node)
|
end
|
||||||
if item ~= "" then
|
end
|
||||||
local itemstack = ItemStack(minetest.deserialize(meta:get_string("itemdata")))
|
end
|
||||||
local inv = meta:get_inventory()
|
return
|
||||||
inv:set_size("main", 1)
|
elseif mode == screwdriver.ROTATE_AXIS then
|
||||||
if not itemstack:is_empty() then
|
return false
|
||||||
inv:set_stack("main", 1, itemstack)
|
end
|
||||||
end
|
end,
|
||||||
end
|
})
|
||||||
update_item_entity(pos, node)
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- FIXME: Item entities can get destroyed by /clearobjects
|
minetest.register_lbm({
|
||||||
minetest.register_lbm({
|
label = "Update legacy item frames",
|
||||||
label = "Respawn item frame item entities",
|
name = "mcl_itemframes:update_legacy_item_frames",
|
||||||
name = "mcl_itemframes:respawn_entities",
|
nodenames = var[12],
|
||||||
nodenames = {var[3]},
|
action = function(pos, node)
|
||||||
run_at_every_load = true,
|
-- Swap legacy node, then respawn entity
|
||||||
action = function(pos, node)
|
node.name = var[3]
|
||||||
update_item_entity(pos, node)
|
local meta = minetest.get_meta(pos)
|
||||||
end,
|
local item = meta:get_string("item")
|
||||||
})
|
minetest.swap_node(pos, node)
|
||||||
|
if item ~= "" then
|
||||||
|
local itemstack = ItemStack(minetest.deserialize(meta:get_string("itemdata")))
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
inv:set_size("main", 1)
|
||||||
|
if not itemstack:is_empty() then
|
||||||
|
inv:set_stack("main", 1, itemstack)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
update_item_entity(pos, node)
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- FIXME: Item entities can get destroyed by /clearobjects
|
||||||
|
minetest.register_lbm({
|
||||||
|
label = "Respawn item frame item entities",
|
||||||
|
name = "mcl_itemframes:respawn_entities",
|
||||||
|
nodenames = {var[3]},
|
||||||
|
run_at_every_load = true,
|
||||||
|
action = function(pos, node)
|
||||||
|
update_item_entity(pos, node)
|
||||||
|
end,
|
||||||
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
@ -463,7 +395,7 @@ minetest.register_craft({
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "shapeless",
|
type = "shapeless",
|
||||||
output = 'mcl_itemframes:glow_item_frame',
|
output = 'mcl_itemframes:glow_item_frame',
|
||||||
recipe = {'mcl_itemframes:item_frame', 'extra_mobs:glow_ink_sac'},
|
recipe = {'mcl_itemframes:item_frame', 'extra_mobs:glow_ink_sac'},
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
local S = minetest.get_translator(minetest.get_current_modname())
|
|
||||||
local modpath = minetest.get_modpath(minetest.get_current_modname())
|
|
||||||
=======
|
|
||||||
local S = minetest.get_translator("mcl_lanterns")
|
local S = minetest.get_translator("mcl_lanterns")
|
||||||
local modpath = minetest.get_modpath("mcl_lanterns")
|
local modpath = minetest.get_modpath("mcl_lanterns")
|
||||||
>>>>>>> mcl2/master
|
|
||||||
|
|
||||||
mcl_lanterns = {}
|
mcl_lanterns = {}
|
||||||
|
|
||||||
|
@ -14,8 +9,6 @@ TODO:
|
||||||
- remove the hack arround walmounted nodes
|
- remove the hack arround walmounted nodes
|
||||||
]]
|
]]
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
local allowed_non_solid_nodes_floor = {
|
local allowed_non_solid_nodes_floor = {
|
||||||
"mcl_core:ice",
|
"mcl_core:ice",
|
||||||
"mcl_nether:soul_sand",
|
"mcl_nether:soul_sand",
|
||||||
|
@ -91,7 +84,6 @@ local function check_placement(node, wdir)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
>>>>>>> mcl2/master
|
|
||||||
function mcl_lanterns.register_lantern(name, def)
|
function mcl_lanterns.register_lantern(name, def)
|
||||||
local itemstring_floor = "mcl_lanterns:"..name.."_floor"
|
local itemstring_floor = "mcl_lanterns:"..name.."_floor"
|
||||||
local itemstring_ceiling = "mcl_lanterns:"..name.."_ceiling"
|
local itemstring_ceiling = "mcl_lanterns:"..name.."_ceiling"
|
||||||
|
@ -144,11 +136,6 @@ function mcl_lanterns.register_lantern(name, def)
|
||||||
|
|
||||||
local under = pointed_thing.under
|
local under = pointed_thing.under
|
||||||
local above = pointed_thing.above
|
local above = pointed_thing.above
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above))
|
|
||||||
local fakestack = itemstack
|
|
||||||
=======
|
|
||||||
local node = minetest.get_node(under)
|
local node = minetest.get_node(under)
|
||||||
|
|
||||||
local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above))
|
local wdir = minetest.dir_to_wallmounted(vector.subtract(under, above))
|
||||||
|
@ -158,7 +145,6 @@ function mcl_lanterns.register_lantern(name, def)
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
>>>>>>> mcl2/master
|
|
||||||
if wdir == 0 then
|
if wdir == 0 then
|
||||||
fakestack:set_name(itemstring_ceiling)
|
fakestack:set_name(itemstring_ceiling)
|
||||||
elseif wdir == 1 then
|
elseif wdir == 1 then
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
# textdomain: mcl_lanterns
|
|
||||||
Chain=Chaine
|
|
||||||
Chains are metallic decoration blocks.=Les chaines sont des blocs de décoration métalliques.
|
|
||||||
Lantern=Lanterne
|
|
||||||
Lanterns are light sources which can be placed on the top or the bottom of most blocks.=Les lanternes sont des sources de lumières qui peuvent être placées au sommet ou en-dessous de la plupart des blocs.
|
|
||||||
Soul Lantern=Lanterne des âmes
|
|
|
@ -1,6 +0,0 @@
|
||||||
# textdomain: mcl_lanterns
|
|
||||||
Chain=
|
|
||||||
Chains are metallic decoration blocks.=
|
|
||||||
Lantern=
|
|
||||||
Lanterns are light sources which can be placed on the top or the bottom of most blocks.=
|
|
||||||
Soul Lantern=
|
|
|
@ -1,12 +1,6 @@
|
||||||
name = mcl_lanterns
|
name = mcl_lanterns
|
||||||
description = Add lanterns and chains to MineClone2
|
description = Add lanterns and chains to MineClone2
|
||||||
<<<<<<< HEAD
|
|
||||||
depends = mcl_sounds, mcl_blackstone
|
|
||||||
optional_depends =
|
|
||||||
author = AFCMS
|
|
||||||
=======
|
|
||||||
depends = mcl_sounds
|
depends = mcl_sounds
|
||||||
optional_depends =
|
optional_depends =
|
||||||
author = AFCMS
|
author = AFCMS
|
||||||
title = MineClone2 Lanterns
|
title = MineClone2 Lanterns
|
||||||
>>>>>>> mcl2/master
|
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
local S = minetest.get_translator(minetest.get_current_modname())
|
|
||||||
=======
|
|
||||||
local S = minetest.get_translator("mcl_lanterns")
|
local S = minetest.get_translator("mcl_lanterns")
|
||||||
>>>>>>> mcl2/master
|
|
||||||
|
|
||||||
mcl_lanterns.register_lantern("lantern", {
|
mcl_lanterns.register_lantern("lantern", {
|
||||||
description = S("Lantern"),
|
description = S("Lantern"),
|
||||||
|
@ -12,18 +8,6 @@ mcl_lanterns.register_lantern("lantern", {
|
||||||
light_level = 14,
|
light_level = 14,
|
||||||
})
|
})
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
minetest.register_craft({
|
|
||||||
output = "mcl_lanterns:lantern_floor",
|
|
||||||
recipe = {
|
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
|
||||||
{"mcl_core:iron_nugget", "mcl_torches:torch" , "mcl_core:iron_nugget"},
|
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> mcl2/master
|
|
||||||
mcl_lanterns.register_lantern("soul_lantern", {
|
mcl_lanterns.register_lantern("soul_lantern", {
|
||||||
description = S("Soul Lantern"),
|
description = S("Soul Lantern"),
|
||||||
longdesc = S("Lanterns are light sources which can be placed on the top or the bottom of most blocks."),
|
longdesc = S("Lanterns are light sources which can be placed on the top or the bottom of most blocks."),
|
||||||
|
@ -33,17 +17,6 @@ mcl_lanterns.register_lantern("soul_lantern", {
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
<<<<<<< HEAD
|
|
||||||
output = "mcl_lanterns:soul_lantern_floor",
|
|
||||||
recipe = {
|
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
|
||||||
{"mcl_core:iron_nugget", "mcl_blackstone:soul_torch", "mcl_core:iron_nugget"},
|
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
minetest.register_alias("mcl_blackstone:soul_lantern", "mcl_lanterns:soul_lantern_floor")
|
|
||||||
=======
|
|
||||||
output = "mcl_lanterns:lantern_floor",
|
output = "mcl_lanterns:lantern_floor",
|
||||||
recipe = {
|
recipe = {
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
||||||
|
@ -51,4 +24,3 @@ minetest.register_alias("mcl_blackstone:soul_lantern", "mcl_lanterns:soul_lanter
|
||||||
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
{"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
>>>>>>> mcl2/master
|
|
||||||
|
|
|
@ -147,15 +147,8 @@ function mcl_maps.create_map(pos)
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
--local loading_maps = {}
|
|
||||||
|
|
||||||
function mcl_maps.load_map(id, callback)
|
|
||||||
if id == "" or creating_maps[id] then--or loading_maps[id] then
|
|
||||||
=======
|
|
||||||
function mcl_maps.load_map(id, callback)
|
function mcl_maps.load_map(id, callback)
|
||||||
if id == "" or creating_maps[id] then
|
if id == "" or creating_maps[id] then
|
||||||
>>>>>>> mcl2/master
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -163,31 +156,6 @@ function mcl_maps.load_map(id, callback)
|
||||||
local texture = "mcl_maps_map_texture_" .. id .. ".tga"
|
local texture = "mcl_maps_map_texture_" .. id .. ".tga"
|
||||||
|
|
||||||
if not loaded_maps[id] then
|
if not loaded_maps[id] then
|
||||||
<<<<<<< HEAD
|
|
||||||
--loading_maps[id] = true
|
|
||||||
if not minetest.features.dynamic_add_media_table then
|
|
||||||
-- minetest.dynamic_add_media() blocks in
|
|
||||||
-- Minetest 5.3 and 5.4 until media loads
|
|
||||||
dynamic_add_media(map_textures_path .. texture, function(player_name) end)
|
|
||||||
loaded_maps[id] = true
|
|
||||||
if callback then callback(texture) end
|
|
||||||
--loading_maps[id] = nil
|
|
||||||
else
|
|
||||||
-- minetest.dynamic_add_media() never blocks
|
|
||||||
-- in Minetest 5.5, callback runs after load
|
|
||||||
dynamic_add_media(map_textures_path .. texture, function(player_name)
|
|
||||||
loaded_maps[id] = true
|
|
||||||
if callback then callback(texture) end
|
|
||||||
--loading_maps[id] = nil
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if loaded_maps[id] then
|
|
||||||
if callback then callback(texture) end
|
|
||||||
return texture
|
|
||||||
end
|
|
||||||
=======
|
|
||||||
if not minetest.features.dynamic_add_media_table then
|
if not minetest.features.dynamic_add_media_table then
|
||||||
-- minetest.dynamic_add_media() blocks in
|
-- minetest.dynamic_add_media() blocks in
|
||||||
-- Minetest 5.3 and 5.4 until media loads
|
-- Minetest 5.3 and 5.4 until media loads
|
||||||
|
@ -208,7 +176,6 @@ function mcl_maps.load_map(id, callback)
|
||||||
if callback then callback(texture) end
|
if callback then callback(texture) end
|
||||||
return texture
|
return texture
|
||||||
end
|
end
|
||||||
>>>>>>> mcl2/master
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function mcl_maps.load_map_item(itemstack)
|
function mcl_maps.load_map_item(itemstack)
|
||||||
|
|
Loading…
Reference in New Issue