Style updates.

There's no actual code changes here.
This commit is contained in:
Auke Kok 2016-04-12 10:07:58 -07:00
parent 9a4a0e934c
commit 16ae960520

View File

@ -4,10 +4,10 @@ screwdriver = screwdriver or {}
minetest.register_entity("itemframes:item",{ minetest.register_entity("itemframes:item",{
hp_max = 1, hp_max = 1,
visual="wielditem", visual="wielditem",
visual_size={x=.33,y=.33}, visual_size={x = 0.33, y = 0.33},
collisionbox = {0,0,0,0,0,0}, collisionbox = {0, 0, 0, 0, 0, 0},
physical=false, physical = false,
textures={"air"}, textures = {"air"},
on_activate = function(self, staticdata) on_activate = function(self, staticdata)
if tmp.nodename ~= nil and tmp.texture ~= nil then if tmp.nodename ~= nil and tmp.texture ~= nil then
self.nodename = tmp.nodename self.nodename = tmp.nodename
@ -24,10 +24,10 @@ minetest.register_entity("itemframes:item",{
end end
end end
if self.texture ~= nil then if self.texture ~= nil then
self.object:set_properties({textures={self.texture}}) self.object:set_properties({textures = {self.texture}})
end end
if self.nodename == "itemframes:pedestal" then if self.nodename == "itemframes:pedestal" then
self.object:set_properties({automatic_rotate=1}) self.object:set_properties({automatic_rotate = 1})
end end
end, end,
get_staticdata = function(self) get_staticdata = function(self)
@ -38,12 +38,12 @@ minetest.register_entity("itemframes:item",{
end, end,
}) })
local facedir = {} local facedir = {}
facedir[0] = {x=0,y=0,z=1}
facedir[1] = {x=1,y=0,z=0} facedir[0] = {x = 0, y = 0, z = 1}
facedir[2] = {x=0,y=0,z=-1} facedir[1] = {x = 1, y = 0, z = 0}
facedir[3] = {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 remove_item = function(pos, node)
local objs = nil local objs = nil
@ -68,17 +68,17 @@ local update_item = function(pos, node)
if node.name == "itemframes:frame" then if node.name == "itemframes:frame" then
local posad = facedir[node.param2] local posad = facedir[node.param2]
if not posad then return end if not posad then return end
pos.x = pos.x + posad.x*6.5/16 pos.x = pos.x + posad.x * 6.5 / 16
pos.y = pos.y + posad.y*6.5/16 pos.y = pos.y + posad.y * 6.5 / 16
pos.z = pos.z + posad.z*6.5/16 pos.z = pos.z + posad.z * 6.5 / 16
elseif node.name == "itemframes:pedestal" then elseif node.name == "itemframes:pedestal" then
pos.y = pos.y + 12/16+.33 pos.y = pos.y + 12 / 16 + 0.33
end end
tmp.nodename = node.name tmp.nodename = node.name
tmp.texture = ItemStack(meta:get_string("item")):get_name() tmp.texture = ItemStack(meta:get_string("item")):get_name()
local e = minetest.add_entity(pos,"itemframes:item") local e = minetest.add_entity(pos,"itemframes:item")
if node.name == "itemframes:frame" then 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) e:setyaw(yaw)
end end
end end
@ -100,15 +100,21 @@ end
minetest.register_node("itemframes:frame",{ minetest.register_node("itemframes:frame",{
description = "Item frame", description = "Item frame",
drawtype = "nodebox", drawtype = "nodebox",
node_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} }, node_box = {
selection_box = { type = "fixed", fixed = {-0.5, -0.5, 7/16, 0.5, 0.5, 0.5} }, 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"}, tiles = {"itemframes_frame.png"},
inventory_image = "itemframes_frame.png", inventory_image = "itemframes_frame.png",
wield_image = "itemframes_frame.png", wield_image = "itemframes_frame.png",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
groups = { choppy=2,dig_immediate=2 }, groups = {choppy = 2, dig_immediate = 2},
legacy_wallmounted = true, legacy_wallmounted = true,
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
on_rotate = screwdriver.disallow, on_rotate = screwdriver.disallow,
@ -152,16 +158,21 @@ minetest.register_node("itemframes:frame",{
minetest.register_node("itemframes:pedestal",{ minetest.register_node("itemframes:pedestal",{
description = "Pedestal", description = "Pedestal",
drawtype = "nodebox", drawtype = "nodebox",
node_box = { type = "fixed", fixed = { node_box = {
{-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate type = "fixed", fixed = {
{-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper) {-7/16, -8/16, -7/16, 7/16, -7/16, 7/16}, -- bottom plate
{-0.25, -6/16, -0.25, 0.25, 11/16, 0.25}, -- pillar {-6/16, -7/16, -6/16, 6/16, -6/16, 6/16}, -- bottom plate (upper)
{-7/16, 11/16, -7/16, 7/16, 12/16, 7/16}, -- top plate {-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} }, }
},
--selection_box = {
-- type = "fixed",
-- fixed = {-7/16, -0.5, -7/16, 7/16, 12/16, 7/16}
--},
tiles = {"itemframes_pedestal.png"}, tiles = {"itemframes_pedestal.png"},
paramtype = "light", paramtype = "light",
groups = { cracky=3 }, groups = {cracky = 3},
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
on_rotate = screwdriver.disallow, on_rotate = screwdriver.disallow,
after_place_node = function(pos, placer, itemstack) after_place_node = function(pos, placer, itemstack)
@ -204,7 +215,7 @@ minetest.register_node("itemframes:pedestal",{
-- due to /clearobjects or similar -- due to /clearobjects or similar
minetest.register_abm({ minetest.register_abm({
nodenames = { "itemframes:frame", "itemframes:pedestal" }, nodenames = {"itemframes:frame", "itemframes:pedestal"},
interval = 15, interval = 15,
chance = 1, chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
@ -233,6 +244,7 @@ minetest.register_craft({
{'group:stick', 'group:stick', 'group:stick'}, {'group:stick', 'group:stick', 'group:stick'},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = 'itemframes:pedestal', output = 'itemframes:pedestal',
recipe = { recipe = {