MultiCraft/MultiCraft_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Itemframes: Optimization and Improvement

Browse Source
This commit is contained in:
MoNTE48 2019-10-15 16:34:35 +02:00
parent 77bbdedfb0
commit e9fcb67038
1 changed files with 93 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
files/itemframes/init.lua
View File

@ -1,76 +1,51 @@
local tmp = {} local tmp = {}
minetest.register_entity("itemframes:item",{ minetest.register_entity("itemframes:item",{
hp_max = 1,
visual = "wielditem", visual = "wielditem",
visual_size = {x = 0.33, y = 0.33}, visual_size = {x = 0.33, y = 0.33},
collisionbox = {0, 0, 0, 0, 0, 0}, collisionbox = {0},
physical = false, physical = false,
textures = {"air"}, textures = {"blank.png"},
on_activate = function(self, staticdata) on_activate = function(self, staticdata)
if tmp.nodename ~= nil and tmp.texture ~= nil then if tmp.nodename and tmp.texture then
self.nodename = tmp.nodename self.nodename = tmp.nodename
tmp.nodename = nil tmp.nodename = nil
self.texture = tmp.texture self.texture = tmp.texture
tmp.texture = nil tmp.texture = nil
else elseif staticdata and staticdata ~= "" then
if staticdata ~= nil and staticdata ~= "" then
local data = staticdata:split(";") local data = staticdata:split(";")
if data and data[1] and data[2] then if data and data[1] and data[2] then
self.nodename = data[1] self.nodename = data[1]
self.texture = data[2] self.texture = data[2]
end end
end end
end if self.texture then
if self.texture ~= nil then
self.object:set_properties({textures = {self.texture}}) self.object:set_properties({textures = {self.texture}})
end end
if self.texture ~= nil and self.nodename ~= nil then
local entity_pos = vector.round(self.object:get_pos())
local objs = minetest.get_objects_inside_radius(entity_pos, 0.5)
for _, obj in ipairs(objs) do
if obj ~= self.object and
obj:get_luaentity() and
obj:get_luaentity().name == "itemframes:item" and
obj:get_luaentity().nodename == self.nodename and
obj:get_properties() and
obj:get_properties().textures and
obj:get_properties().textures[1] == self.texture then
minetest.log("action","[itemframes] Removing extra " ..
self.texture .. " found in " .. self.nodename .. " at " ..
minetest.pos_to_string(entity_pos))
self.object:remove()
break
end
end
end
end, end,
get_staticdata = function(self) get_staticdata = function(self)
if self.nodename ~= nil and self.texture ~= nil then if self.nodename and self.texture then
return self.nodename .. ";" .. self.texture return self.nodename .. ";" .. self.texture
end end
return "" return ""
end end
}) })
local facedir = {} local facedir = {
facedir[2] = {x = 1, y = 0, z = 0} [2] = {x = 1, y = 0, z = 0},
facedir[3] = {x = -1, y = 0, z = 0} [3] = {x = -1, y = 0, z = 0},
facedir[4] = {x = 0, y = 0, z = 1} [4] = {x = 0, y = 0, z = 1},
facedir[5] = {x = 0, y = 0, z = -1} [5] = {x = 0, y = 0, z = -1}
}
local remove_item = function(pos, node) local remove_item = function(pos, node)
local objs = nil for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do
if node.name == "itemframes:frame" then local ent = obj:get_luaentity()
objs = minetest.get_objects_inside_radius(pos, 0.5) if ent and ent.name == "itemframes:item" then
end
if objs then
for _, obj in ipairs(objs) do
if obj and obj:get_luaentity() and obj:get_luaentity().name == "itemframes:item" then
obj:remove() obj:remove()
end break
end end
end end
end end
@ -78,33 +53,58 @@ end
local update_item = function(pos, node) local update_item = function(pos, node)
remove_item(pos, node) remove_item(pos, node)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if meta:get_string("item") ~= "" then local itemstring = meta:get_string("item")
local posad = facedir[node.param2] local posad = facedir[node.param2]
if not posad then return end if not posad or itemstring == "" then return end
pos.x = pos.x + posad.x * 6.5 / 16
pos.y = pos.y + posad.y * 6.5 / 16 pos = vector.add(pos, vector.multiply(posad, 6.5/16))
pos.z = pos.z + posad.z * 6.5 / 16
tmp.nodename = node.name tmp.nodename = node.name
tmp.texture = ItemStack(meta:get_string("item")):get_name() tmp.texture = ItemStack(itemstring):get_name()
local e = minetest.add_entity(pos, "itemframes:item")
local entity = minetest.add_entity(pos, "itemframes:item")
if node.param2 == 2 or node.param2 == 3 then if node.param2 == 2 or node.param2 == 3 then
local yaw = math.pi / 2 - node.param2 * math.pi * 2 local yaw = math.pi / 2 - node.param2 * math.pi * 2
e:setyaw(yaw) entity:set_yaw(yaw)
end
end end
end end
local drop_item = function(pos, node) local drop_item = function(pos, node)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if meta:get_string("item") ~= "" then local item = meta:get_string("item")
if node.name == "itemframes:frame" then if item == "" then return end
minetest.add_item(pos, meta:get_string("item"))
end minetest.add_item(pos, item)
meta:set_string("item", "") meta:set_string("item", "")
end
remove_item(pos, node) remove_item(pos, node)
end end
local function check_item(pos, node)
local meta = minetest.get_meta(pos)
local item = meta:get_string("item")
if item == "" then return end
local found = false
for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do
local ent = obj:get_luaentity()
if ent and ent.name == "itemframes:item" then
found = true
break
end
end
if not found then
update_item(pos, node)
end
end
local function after_dig_node(pos, node)
local meta = minetest.get_meta(pos)
local item = meta:get_string("item")
if item == "" then return end
if not node then
local node = minetest.get_node(pos)
end
drop_item(pos, node)
end
minetest.register_node("itemframes:frame",{ minetest.register_node("itemframes:frame",{
description = "Item frame", description = "Item frame",
drawtype = "nodebox", drawtype = "nodebox",
@ -118,7 +118,6 @@ minetest.register_node("itemframes:frame",{
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
sunlight_propagates = true, sunlight_propagates = true,
groups = {choppy = 2, dig_immediate = 2, attached_node = 1}, groups = {choppy = 2, dig_immediate = 2, attached_node = 1},
legacy_wallmounted = false,
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
@ -137,47 +136,44 @@ minetest.register_node("itemframes:frame",{
after_place_node = function(pos, placer, itemstack) after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("owner",placer:get_player_name()) local pn = placer:get_player_name()
meta:set_string("infotext","Item frame (owned by " .. placer:get_player_name() .. ")") meta:set_string("owner", pn)
meta:set_string("infotext", Sl("Item frame") .. "\n" .. Sl("Owned by @1", pn))
end, end,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end if not itemstack then return end
local meta = minetest.get_meta(pos) if clicker and not default.can_interact_with_node(clicker, pos) then
local name = clicker and clicker:get_player_name() return false
if name == meta:get_string("owner") or
minetest.check_player_privs(name, "protection_bypass") then
drop_item(pos, node)
local string = itemstack:take_item()
meta:set_string("item", string:to_string())
update_item(pos, node)
end end
local meta = minetest.get_meta(pos)
drop_item(pos, node)
local item = itemstack:take_item()
meta:set_string("item", item:to_string())
update_item(pos, node)
return itemstack return itemstack
end, end,
on_punch = function(pos, node, puncher) on_punch = check_item,
local meta = minetest.get_meta(pos)
local name = puncher and puncher:get_player_name() can_dig = function(pos, player)
if name == meta:get_string("owner") or if player and not default.can_interact_with_node(player, pos) then
minetest.check_player_privs(name, "protection_bypass") then return false
drop_item(pos, node)
end end
return true
end, end,
can_dig = function(pos,player) after_dig_node = after_dig_node,
if not player then return end on_destruct = after_dig_node
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) minetest.register_lbm({
local meta = minetest.get_meta(pos) label = "Check Itemframe item",
local node = minetest.get_node(pos) name = "itemframes:item",
if meta:get_string("item") ~= "" then nodenames = {"itemframes:frame"},
drop_item(pos, node) run_at_every_load = true,
end action = function(pos, node)
check_item(pos, node)
end end
}) })