minetest-mods/frame-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Many fixes.

Browse Source 
- Makes frames wallmounted and attached.
- Update model to account for direction changes
- Add panes, flowerpot
- Change description to "Item Frame"
- Return itemstack instead of false when rejecting item
This commit is contained in:
Auke Kok 2017-02-11 15:21:29 -08:00
parent 781dae2433
commit 5182fab407
3 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends.txt
View File

@ -11,3 +11,5 @@ flowers?
tnt? tnt?
vessels? vessels?
wool? wool?
xpanes?
flowerpot?

29
init.lua
View File

@ -51,13 +51,13 @@ local function frame_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
local name = clicker:get_player_name() local name = clicker:get_player_name()
if minetest.is_protected(pos, name) then if minetest.is_protected(pos, name) then
minetest.record_protection_violation(pos, name) minetest.record_protection_violation(pos, name)
return false return itemstack
end end
end end
local nodename = itemstack:get_name() local nodename = itemstack:get_name()
if not nodename then if not nodename then
return false return itemstack
end end
local wear = itemstack:get_wear() local wear = itemstack:get_wear()
@ -74,7 +74,10 @@ local function frame_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
local name = "frame:" .. nodename:gsub(":", "_") local name = "frame:" .. nodename:gsub(":", "_")
local def = minetest.registered_nodes[name] local def = minetest.registered_nodes[name]
if not def then if not def then
return false def = minetest.registered_items[name]
if not def then
return itemstack
end
end end
minetest.sound_play(def.sounds.place, {pos = pos}) minetest.sound_play(def.sounds.place, {pos = pos})
minetest.swap_node(pos, {name = name, param2 = node.param2}) minetest.swap_node(pos, {name = name, param2 = node.param2})
@ -145,12 +148,12 @@ function frame.register(name)
local nodename = def.name:gsub(":", "_") local nodename = def.name:gsub(":", "_")
minetest.register_node("frame:" .. nodename, { minetest.register_node("frame:" .. nodename, {
description = "Frame with " .. desc, description = "Item Frame with " .. desc,
drawtype = "mesh", drawtype = "mesh",
mesh = "frame.obj", mesh = "frame.obj",
tiles = tiles, tiles = tiles,
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "wallmounted",
sunlight_propagates = true, sunlight_propagates = true,
collision_box = { collision_box = {
type = "fixed", type = "fixed",
@ -161,7 +164,7 @@ function frame.register(name)
fixed = {-1/2, -1/2, 3/8, 1/2, 1/2, 1/2}, fixed = {-1/2, -1/2, 3/8, 1/2, 1/2, 1/2},
}, },
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
groups = {oddly_breakable_by_hand = 1, snappy = 3, not_in_creative_inventory = 1}, groups = {attached_node = 1, oddly_breakable_by_hand = 1, snappy = 3, not_in_creative_inventory = 1},
frame_contents = name, frame_contents = name,
on_punch = frame_on_punch, on_punch = frame_on_punch,
}) })
@ -169,9 +172,11 @@ end
-- empty frame -- empty frame
minetest.register_node("frame:empty", { minetest.register_node("frame:empty", {
description = "Frame", description = "Item Frame",
drawtype = "mesh", drawtype = "mesh",
mesh = "frame.obj", mesh = "frame.obj",
inventory_image = "frame_frame.png",
wield_image = "frame_frame.png",
tiles = { tiles = {
{name = "frame_frame.png"}, {name = "frame_frame.png"},
{name = "doors_blank.png"}, {name = "doors_blank.png"},
@ -180,7 +185,7 @@ minetest.register_node("frame:empty", {
{name = "doors_blank.png"}, {name = "doors_blank.png"},
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "wallmounted",
sunlight_propagates = true, sunlight_propagates = true,
collision_box = { collision_box = {
type = "fixed", type = "fixed",
@ -191,7 +196,7 @@ minetest.register_node("frame:empty", {
fixed = {-1/2, -1/2, 3/8, 1/2, 1/2, 1/2}, fixed = {-1/2, -1/2, 3/8, 1/2, 1/2, 1/2},
}, },
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
groups = {oddly_breakable_by_hand = 3, cracky = 1}, groups = {attached_node = 1, oddly_breakable_by_hand = 3, cracky = 1},
on_rightclick = frame_on_rightclick, on_rightclick = frame_on_rightclick,
}) })
@ -386,6 +391,8 @@ for _, node in pairs({
"default:clay_brick", "default:clay_brick",
"default:obsidian_shard", "default:obsidian_shard",
"default:flint", "default:flint",
"default:key",
"default:skeleton_key",
"nyancat:nyancat", "nyancat:nyancat",
"nyancat:nyancat_rainbow", "nyancat:nyancat_rainbow",
"vessels:shelf", "vessels:shelf",
@ -401,6 +408,7 @@ for _, node in pairs({
"doors:trapdoor_steel", "doors:trapdoor_steel",
"beds:bed", "beds:bed",
"beds:fancy_bed", "beds:fancy_bed",
"boats:boat",
"carts:cart", "carts:cart",
"carts:rail", "carts:rail",
"carts:powerrail", "carts:powerrail",
@ -442,6 +450,9 @@ for _, node in pairs({
"dye:pink", "dye:pink",
"dye:dark_grey", "dye:dark_grey",
"dye:dark_green", "dye:dark_green",
"xpanes:pane_flat",
"xpanes:bar_flat",
"flowerpot:empty",
}) do }) do
frame.register(node) frame.register(node)
end end

92
models/frame.obj
View File

@ -2,50 +2,50 @@
# www.blender.org # www.blender.org
mtllib frame.mtl mtllib frame.mtl
o Cube o Cube
v 0.437500 -0.437500 0.500000 v 0.437500 -0.500000 -0.437500
v -0.437500 -0.437500 0.500000 v -0.437500 -0.500000 -0.437500
v -0.437500 -0.437500 -0.437500
v 0.437500 -0.437500 -0.437500
v 0.437500 -0.500000 0.437500
v -0.437500 -0.500000 0.437500
v -0.437500 -0.437500 0.437500 v -0.437500 -0.437500 0.437500
v 0.437500 -0.437500 0.437500 v 0.437500 -0.437500 0.437500
v 0.437500 0.437500 0.500000 v -0.437500 -0.500000 0.375000
v -0.437500 0.437500 0.500000 v -0.437500 -0.500000 -0.375000
v -0.437500 0.437500 0.437500 v 0.375000 -0.500000 0.375000
v 0.437500 0.437500 0.437500 v 0.375000 -0.500000 -0.375000
v -0.437500 0.375000 0.500000 v -0.375000 -0.497000 -0.375000
v -0.437500 -0.375000 0.500000 v -0.375000 -0.497000 0.375000
v 0.375000 0.375000 0.500000 v -0.437500 -0.437500 0.375000
v 0.375000 -0.375000 0.500000 v 0.437500 -0.437500 0.375000
v -0.375000 -0.375000 0.497000 v -0.375000 -0.437500 0.375000
v -0.375000 0.375000 0.497000 v -0.375000 -0.437500 -0.375000
v -0.437500 0.375000 0.437500 v 0.375000 -0.437500 -0.375000
v 0.437500 0.375000 0.437500 v 0.375000 -0.437500 0.375000
v -0.375000 0.375000 0.437500 v 0.312500 -0.493750 0.312500
v -0.375000 -0.375000 0.437500 v 0.312500 -0.493750 -0.312500
v 0.375000 -0.375000 0.437500 v -0.312500 -0.493750 -0.312500
v 0.375000 0.375000 0.437500 v -0.312500 -0.493750 0.312500
v 0.312500 0.312500 0.493750 v -0.250000 -0.243125 -0.250000
v 0.312500 -0.312500 0.493750 v -0.250000 -0.243125 0.250000
v -0.312500 -0.312500 0.493750 v 0.250000 -0.243125 -0.250000
v -0.312500 0.312500 0.493750 v 0.250000 -0.243125 0.250000
v -0.250000 -0.250000 0.243125 v 0.250000 -0.493125 -0.250000
v -0.250000 0.250000 0.243125 v 0.250000 -0.493125 0.250000
v 0.250000 -0.250000 0.243125 v -0.250000 -0.493125 -0.250000
v 0.250000 0.250000 0.243125 v -0.250000 -0.493125 0.250000
v 0.250000 -0.250000 0.493125 v 0.437500 -0.500000 0.375000
v 0.250000 0.250000 0.493125 v 0.437500 -0.500000 -0.375000
v -0.250000 -0.250000 0.493125 v -0.437500 -0.437500 -0.375000
v -0.250000 0.250000 0.493125 v 0.437500 -0.437500 -0.375000
v 0.437500 0.375000 0.500000 v 0.375000 -0.500000 0.375000
v 0.437500 -0.375000 0.500000 v 0.375000 -0.497000 0.375000
v -0.437500 -0.375000 0.437500 v 0.375000 -0.500000 -0.375000
v 0.437500 -0.375000 0.437500 v 0.375000 -0.497000 -0.375000
v 0.375000 0.375000 0.500000 v -0.375000 -0.500000 -0.375000
v 0.375000 0.375000 0.497000 v -0.375000 -0.500000 -0.375000
v 0.375000 -0.375000 0.500000 v -0.375000 -0.500000 0.375000
v 0.375000 -0.375000 0.497000 v -0.375000 -0.500000 0.375000
v -0.375000 -0.375000 0.500000
v -0.375000 -0.375000 0.500000
v -0.375000 0.375000 0.500000
v -0.375000 0.375000 0.500000
vt 0.0625 0.1250 vt 0.0625 0.1250
vt 0.1250 0.1250 vt 0.1250 0.1250
vt 0.1250 0.8750 vt 0.1250 0.8750
@ -130,12 +130,12 @@ vt 1.0000 -0.0000
vt 0.5000 -0.0000 vt 0.5000 -0.0000
vt 0.5000 1.0000 vt 0.5000 1.0000
vt 1.0000 1.0000 vt 1.0000 1.0000
vn -1.0000 -0.0000 -0.0000 vn -1.0000 0.0000 -0.0000
vn 1.0000 0.0000 0.0000 vn 1.0000 -0.0000 0.0000
vn -0.0000 0.0000 1.0000
vn 0.0000 -0.0000 -1.0000
vn 0.0000 1.0000 -0.0000 vn 0.0000 1.0000 -0.0000
vn 0.0000 -1.0000 0.0000 vn 0.0000 -1.0000 0.0000
vn 0.0000 -0.0000 -1.0000
vn 0.0000 0.0000 1.0000
g Cube_Cube_frame g Cube_Cube_frame
usemtl frame usemtl frame
s off s off