nalc/stained_glass
1
0
Fork 0
forked from minetest-mods/stained_glass
Code Issues Pull Requests Projects Releases Wiki Activity

set the full color spec in the metadata

Browse Source 
during LBM conversion, not just the hue

Also, updated to use the revised UD API
This commit is contained in:
Vanessa Ezekowitz 2017-01-28 08:01:18 -05:00
parent 99eee07f0a
commit bae9f7bd34
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
init.lua
View File

@ -54,8 +54,8 @@ minetest.register_node("stained_glass:stained_glass", {
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
drop = "moreblocks:super_glow_glass", drop = "moreblocks:super_glow_glass",
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local name = itemstack:get_name() local name = itemstack:get_name()
@ -92,8 +92,8 @@ minetest.register_node("stained_glass:pastel_stained_glass", {
walkable = true, walkable = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local name = itemstack:get_name() local name = itemstack:get_name()
@ -121,8 +121,8 @@ minetest.register_node("stained_glass:faint_stained_glass", {
walkable = true, walkable = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
unifieddyes.on_rightclick(pos, node, clicker, unifieddyes.on_rightclick(pos, node, clicker,
@ -155,8 +155,8 @@ minetest.register_node("stained_glass:stained_trap_glass", {
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
drop = "moreblocks:trap_super_glow_glass", drop = "moreblocks:trap_super_glow_glass",
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local name = itemstack:get_name() local name = itemstack:get_name()
@ -186,8 +186,8 @@ minetest.register_node("stained_glass:pastel_stained_trap_glass", {
walkable = true, walkable = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local name = itemstack:get_name() local name = itemstack:get_name()
@ -215,8 +215,8 @@ minetest.register_node("stained_glass:faint_stained_trap_glass", {
walkable = true, walkable = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
on_destruct = function(pos) after_dig_node = function(pos, oldnode, oldmetadata, digger)
unifieddyes.on_destruct(pos) unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
unifieddyes.on_rightclick(pos, node, clicker, unifieddyes.on_rightclick(pos, node, clicker,
@ -490,6 +490,7 @@ minetest.register_lbm({
local name = node.name local name = node.name
local n = string.find(name, ":") local n = string.find(name, ":")
local color = string.sub(name, n + 1) local color = string.sub(name, n + 1)
local h,s,v = unifieddyes.get_hsv(name)
if string.find(name, "trap") then if string.find(name, "trap") then
n = string.find(color, "_") n = string.find(color, "_")
@ -501,19 +502,19 @@ minetest.register_lbm({
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:pastel_stained_trap_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:pastel_stained_trap_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
elseif string.find(color, "faint") then elseif string.find(color, "faint") then
n = string.find(color, "_") n = string.find(color, "_")
color = string.sub(color, n + 1) color = string.sub(color, n + 1)
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:faint_stained_trap_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:faint_stained_trap_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
else else
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:stained_trap_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:stained_trap_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
end end
else else
if string.find(color, "pastel") then if string.find(color, "pastel") then
@ -522,19 +523,19 @@ minetest.register_lbm({
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:pastel_stained_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:pastel_stained_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
elseif string.find(color, "faint") then elseif string.find(color, "faint") then
n = string.find(color, "_") n = string.find(color, "_")
color = string.sub(color, n + 1) color = string.sub(color, n + 1)
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:faint_stained_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:faint_stained_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
else else
local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color) local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color)
minetest.set_node(pos, { name = "stained_glass:stained_glass", param2 = paletteidx }) minetest.set_node(pos, { name = "stained_glass:stained_glass", param2 = paletteidx })
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..v..h..s)
end end
end end
end end