From 5f793789ad38179aff7aaddcc262eec64cc9f087 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 3 May 2019 02:22:32 -0400 Subject: update homedecor and simple_streetlights --- homedecor_bathroom/sounds/homedecor_shower.ogg | Bin 0 -> 29317 bytes .../sounds/homedecor_toilet_flush.ogg | Bin 0 -> 31972 bytes homedecor_common/sounds/homedecor_faucet.ogg | Bin 0 -> 19961 bytes .../sounds/homedecor_book_close.ogg | Bin 0 -> 4132 bytes .../sounds/homedecor_door_close.ogg | Bin 0 -> 8901 bytes .../sounds/homedecor_door_open.ogg | Bin 0 -> 10164 bytes .../sounds/homedecor_gate_open_close.ogg | Bin 0 -> 6894 bytes homedecor_gastronomy/sounds/insert_coin.ogg | Bin 0 -> 9497 bytes homedecor_gastronomy/sounds/toaster.ogg | Bin 0 -> 5820 bytes homedecor_lighting/init.lua | 24 ++-- homedecor_misc/sounds/homedecor_book_close.ogg | Bin 4132 -> 0 bytes homedecor_misc/sounds/homedecor_door_close.ogg | Bin 8901 -> 0 bytes homedecor_misc/sounds/homedecor_door_open.ogg | Bin 10164 -> 0 bytes homedecor_misc/sounds/homedecor_faucet.ogg | Bin 19961 -> 0 bytes .../sounds/homedecor_gate_open_close.ogg | Bin 6894 -> 0 bytes homedecor_misc/sounds/homedecor_shower.ogg | Bin 29317 -> 0 bytes homedecor_misc/sounds/homedecor_toilet_flush.ogg | Bin 31972 -> 0 bytes homedecor_misc/sounds/homedecor_trash_all.ogg | Bin 32753 -> 0 bytes homedecor_misc/sounds/insert_coin.ogg | Bin 9497 -> 0 bytes homedecor_misc/sounds/toaster.ogg | Bin 5820 -> 0 bytes .../sounds/homedecor_trash_all.ogg | Bin 0 -> 32753 bytes simple_streetlights/depends.txt | 4 +- simple_streetlights/init.lua | 6 +- simple_streetlights/minedot.lua | 15 ++- simple_streetlights/simple.lua | 121 ++++++++++++--------- ...treetlights_inv_light_source_glowlight_cube.png | Bin 0 -> 192 bytes ...simple_streetlights_inv_light_source_ilight.png | Bin 0 -> 203 bytes ...mple_streetlights_inv_light_source_meselamp.png | Bin 0 -> 513 bytes .../simple_streetlights_inv_pole_brass.png | Bin 0 -> 787 bytes .../simple_streetlights_inv_pole_junglewood.png | Bin 0 -> 700 bytes .../simple_streetlights_inv_pole_steel.png | Bin 0 -> 757 bytes .../textures/simple_streetlights_inv_pole_wood.png | Bin 0 -> 644 bytes .../simple_streetlights_inv_pole_wrought_iron.png | Bin 0 -> 716 bytes .../simple_streetlights_spawner_brass_white.png | Bin 1850 -> 0 bytes .../simple_streetlights_spawner_steel_white.png | Bin 1599 -> 0 bytes .../simple_streetlights_spawner_wood_meselamp.png | Bin 1700 -> 0 bytes .../simple_streetlights_spawner_wood_white.png | Bin 1691 -> 0 bytes ...ple_streetlights_spawner_wrought_iron_white.png | Bin 1630 -> 0 bytes 38 files changed, 102 insertions(+), 68 deletions(-) create mode 100644 homedecor_bathroom/sounds/homedecor_shower.ogg create mode 100644 homedecor_bathroom/sounds/homedecor_toilet_flush.ogg create mode 100644 homedecor_common/sounds/homedecor_faucet.ogg create mode 100644 homedecor_doors_and_gates/sounds/homedecor_book_close.ogg create mode 100644 homedecor_doors_and_gates/sounds/homedecor_door_close.ogg create mode 100644 homedecor_doors_and_gates/sounds/homedecor_door_open.ogg create mode 100644 homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg create mode 100644 homedecor_gastronomy/sounds/insert_coin.ogg create mode 100644 homedecor_gastronomy/sounds/toaster.ogg delete mode 100644 homedecor_misc/sounds/homedecor_book_close.ogg delete mode 100644 homedecor_misc/sounds/homedecor_door_close.ogg delete mode 100644 homedecor_misc/sounds/homedecor_door_open.ogg delete mode 100644 homedecor_misc/sounds/homedecor_faucet.ogg delete mode 100644 homedecor_misc/sounds/homedecor_gate_open_close.ogg delete mode 100644 homedecor_misc/sounds/homedecor_shower.ogg delete mode 100644 homedecor_misc/sounds/homedecor_toilet_flush.ogg delete mode 100644 homedecor_misc/sounds/homedecor_trash_all.ogg delete mode 100644 homedecor_misc/sounds/insert_coin.ogg delete mode 100644 homedecor_misc/sounds/toaster.ogg create mode 100644 homedecor_trash_cans/sounds/homedecor_trash_all.ogg create mode 100644 simple_streetlights/textures/simple_streetlights_inv_light_source_glowlight_cube.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_light_source_ilight.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_light_source_meselamp.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_pole_brass.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_pole_junglewood.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_pole_steel.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_pole_wood.png create mode 100644 simple_streetlights/textures/simple_streetlights_inv_pole_wrought_iron.png delete mode 100644 simple_streetlights/textures/simple_streetlights_spawner_brass_white.png delete mode 100644 simple_streetlights/textures/simple_streetlights_spawner_steel_white.png delete mode 100644 simple_streetlights/textures/simple_streetlights_spawner_wood_meselamp.png delete mode 100644 simple_streetlights/textures/simple_streetlights_spawner_wood_white.png delete mode 100644 simple_streetlights/textures/simple_streetlights_spawner_wrought_iron_white.png diff --git a/homedecor_bathroom/sounds/homedecor_shower.ogg b/homedecor_bathroom/sounds/homedecor_shower.ogg new file mode 100644 index 0000000..4675b79 Binary files /dev/null and b/homedecor_bathroom/sounds/homedecor_shower.ogg differ diff --git a/homedecor_bathroom/sounds/homedecor_toilet_flush.ogg b/homedecor_bathroom/sounds/homedecor_toilet_flush.ogg new file mode 100644 index 0000000..e15a583 Binary files /dev/null and b/homedecor_bathroom/sounds/homedecor_toilet_flush.ogg differ diff --git a/homedecor_common/sounds/homedecor_faucet.ogg b/homedecor_common/sounds/homedecor_faucet.ogg new file mode 100644 index 0000000..8c79074 Binary files /dev/null and b/homedecor_common/sounds/homedecor_faucet.ogg differ diff --git a/homedecor_doors_and_gates/sounds/homedecor_book_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_book_close.ogg new file mode 100644 index 0000000..22116a3 Binary files /dev/null and b/homedecor_doors_and_gates/sounds/homedecor_book_close.ogg differ diff --git a/homedecor_doors_and_gates/sounds/homedecor_door_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_door_close.ogg new file mode 100644 index 0000000..c85b915 Binary files /dev/null and b/homedecor_doors_and_gates/sounds/homedecor_door_close.ogg differ diff --git a/homedecor_doors_and_gates/sounds/homedecor_door_open.ogg b/homedecor_doors_and_gates/sounds/homedecor_door_open.ogg new file mode 100644 index 0000000..16198d9 Binary files /dev/null and b/homedecor_doors_and_gates/sounds/homedecor_door_open.ogg differ diff --git a/homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg b/homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg new file mode 100644 index 0000000..d5f1d96 Binary files /dev/null and b/homedecor_doors_and_gates/sounds/homedecor_gate_open_close.ogg differ diff --git a/homedecor_gastronomy/sounds/insert_coin.ogg b/homedecor_gastronomy/sounds/insert_coin.ogg new file mode 100644 index 0000000..2ee99d5 Binary files /dev/null and b/homedecor_gastronomy/sounds/insert_coin.ogg differ diff --git a/homedecor_gastronomy/sounds/toaster.ogg b/homedecor_gastronomy/sounds/toaster.ogg new file mode 100644 index 0000000..c3d5a80 Binary files /dev/null and b/homedecor_gastronomy/sounds/toaster.ogg differ diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index e5e0df7..53cd52c 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -126,7 +126,7 @@ minetest.register_node(":homedecor:glowlight_small_cube", { }) homedecor.register("plasma_lamp", { - description = S("Plasma Lamp"), + description = S("Plasma Lamp/Light"), drawtype = "mesh", mesh = "plasma_lamp.obj", tiles = { @@ -273,7 +273,7 @@ local ol_cbox = { } homedecor.register("oil_lamp", { - description = S("Oil lamp (hurricane)"), + description = S("Oil lamp/Light (hurricane)"), mesh = "homedecor_oil_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", @@ -293,7 +293,7 @@ homedecor.register("oil_lamp", { }) homedecor.register("oil_lamp_tabletop", { - description = S("Oil Lamp (tabletop)"), + description = S("Oil Lamp/Light (tabletop)"), mesh = "homedecor_oil_lamp_tabletop.obj", tiles = {"homedecor_oil_lamp_tabletop.png"}, inventory_image = "homedecor_oil_lamp_tabletop_inv.png", @@ -312,7 +312,7 @@ local gl_cbox = { minetest.register_alias("homedecor:wall_lantern", "homedecor:ground_lantern") homedecor.register("ground_lantern", { - description = S("Ground Lantern"), + description = S("Ground Lantern/Light"), mesh = "homedecor_ground_lantern.obj", tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" }, use_texture_alpha = true, @@ -330,7 +330,7 @@ local hl_cbox = { } homedecor.register("hanging_lantern", { - description = S("Hanging Lantern"), + description = S("Hanging Lantern/Light"), mesh = "homedecor_hanging_lantern.obj", tiles = { "homedecor_generic_metal_wrought_iron.png", "homedecor_light.png" }, use_texture_alpha = true, @@ -353,7 +353,7 @@ homedecor.register("ceiling_lantern", { tiles = { "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png" }, use_texture_alpha = true, inventory_image = "homedecor_ceiling_lantern_inv.png", - description = S("Ceiling Lantern"), + description = S("Ceiling Lantern/Light"), groups = {snappy=3}, light_source = 11, selection_box = cl_cbox, @@ -367,7 +367,7 @@ if minetest.get_modpath("darkage") then sm_light = default.LIGHT_MAX-5 else homedecor.register("lattice_lantern_large", { - description = S("Lattice lantern (large)"), + description = S("Lattice lantern/Light (large)"), tiles = { 'homedecor_lattice_lantern_large.png' }, groups = { snappy = 3 }, light_source = default.LIGHT_MAX, @@ -438,7 +438,7 @@ local function reg_lamp(suffix, nxt, light, brightness) local wool_brighten = (light or 0) * 15 homedecor.register("table_lamp_"..suffix, { - description = S("Table Lamp"), + description = S("Table Lamp/Light"), mesh = "homedecor_table_lamp.obj", tiles = { "wool_grey.png^[colorize:#ffffff:"..wool_brighten, @@ -471,7 +471,7 @@ local function reg_lamp(suffix, nxt, light, brightness) }) homedecor.register("standing_lamp_"..suffix, { - description = S("Standing Lamp"), + description = S("Standing Lamp/Light"), mesh = "homedecor_standing_lamp.obj", tiles = { "wool_grey.png^[colorize:#ffffff:"..wool_brighten, @@ -522,7 +522,7 @@ local dlamp_cbox = { } homedecor.register("desk_lamp", { - description = S("Desk Lamp"), + description = S("Desk Lamp/Light"), mesh = "homedecor_desk_lamp.obj", tiles = { "homedecor_generic_metal.png", @@ -547,7 +547,7 @@ homedecor.register("desk_lamp", { -- "kitchen"/"dining room" ceiling lamp homedecor.register("ceiling_lamp", { - description = S("Ceiling Lamp"), + description = S("Ceiling Lamp/Light"), mesh = "homedecor_ceiling_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", @@ -565,7 +565,7 @@ homedecor.register("ceiling_lamp", { }) homedecor.register("ceiling_lamp_off", { - description = S("Ceiling Lamp (off)"), + description = S("Ceiling Lamp/Light (off)"), mesh = "homedecor_ceiling_lamp.obj", tiles = { "homedecor_generic_metal_brass.png", diff --git a/homedecor_misc/sounds/homedecor_book_close.ogg b/homedecor_misc/sounds/homedecor_book_close.ogg deleted file mode 100644 index 22116a3..0000000 Binary files a/homedecor_misc/sounds/homedecor_book_close.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_door_close.ogg b/homedecor_misc/sounds/homedecor_door_close.ogg deleted file mode 100644 index c85b915..0000000 Binary files a/homedecor_misc/sounds/homedecor_door_close.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_door_open.ogg b/homedecor_misc/sounds/homedecor_door_open.ogg deleted file mode 100644 index 16198d9..0000000 Binary files a/homedecor_misc/sounds/homedecor_door_open.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_faucet.ogg b/homedecor_misc/sounds/homedecor_faucet.ogg deleted file mode 100644 index 8c79074..0000000 Binary files a/homedecor_misc/sounds/homedecor_faucet.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_gate_open_close.ogg b/homedecor_misc/sounds/homedecor_gate_open_close.ogg deleted file mode 100644 index d5f1d96..0000000 Binary files a/homedecor_misc/sounds/homedecor_gate_open_close.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_shower.ogg b/homedecor_misc/sounds/homedecor_shower.ogg deleted file mode 100644 index 4675b79..0000000 Binary files a/homedecor_misc/sounds/homedecor_shower.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_toilet_flush.ogg b/homedecor_misc/sounds/homedecor_toilet_flush.ogg deleted file mode 100644 index e15a583..0000000 Binary files a/homedecor_misc/sounds/homedecor_toilet_flush.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/homedecor_trash_all.ogg b/homedecor_misc/sounds/homedecor_trash_all.ogg deleted file mode 100644 index 85c3f66..0000000 Binary files a/homedecor_misc/sounds/homedecor_trash_all.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/insert_coin.ogg b/homedecor_misc/sounds/insert_coin.ogg deleted file mode 100644 index 2ee99d5..0000000 Binary files a/homedecor_misc/sounds/insert_coin.ogg and /dev/null differ diff --git a/homedecor_misc/sounds/toaster.ogg b/homedecor_misc/sounds/toaster.ogg deleted file mode 100644 index c3d5a80..0000000 Binary files a/homedecor_misc/sounds/toaster.ogg and /dev/null differ diff --git a/homedecor_trash_cans/sounds/homedecor_trash_all.ogg b/homedecor_trash_cans/sounds/homedecor_trash_all.ogg new file mode 100644 index 0000000..85c3f66 Binary files /dev/null and b/homedecor_trash_cans/sounds/homedecor_trash_all.ogg differ diff --git a/simple_streetlights/depends.txt b/simple_streetlights/depends.txt index 191f064..26a770c 100644 --- a/simple_streetlights/depends.txt +++ b/simple_streetlights/depends.txt @@ -1,6 +1,8 @@ default +basic_materials? creative? ilights? gloopblocks? -homedecor? +homedecor_fences? +homedecor_lighting? streetspoles? diff --git a/simple_streetlights/init.lua b/simple_streetlights/init.lua index 50310b6..e18ba8a 100644 --- a/simple_streetlights/init.lua +++ b/simple_streetlights/init.lua @@ -2,7 +2,11 @@ local modpath = minetest.get_modpath("simple_streetlights") +streetlights = {} +streetlights.basic_materials = minetest.get_modpath("basic_materials") +streetlights.concrete = "basic_materials:concrete_block" + dofile(modpath.."/simple.lua") -if minetest.get_modpath("homedecor") and minetest.get_modpath("streetspoles") then +if minetest.get_modpath("homedecor_lighting") and minetest.get_modpath("streetspoles") then dofile(modpath.."/minedot.lua") end diff --git a/simple_streetlights/minedot.lua b/simple_streetlights/minedot.lua index 7521deb..e8f8141 100644 --- a/simple_streetlights/minedot.lua +++ b/simple_streetlights/minedot.lua @@ -31,7 +31,7 @@ local offsets = { }, } -local function takeMaterials(player,materials) +local function takeMaterials(player, sneak, materials) local name = player:get_player_name() if creative and creative.is_enabled_for(name) then return true end local inv = minetest.get_inventory({type = "player",name = name}) @@ -39,8 +39,14 @@ local function takeMaterials(player,materials) for _,i in ipairs(materials) do if not inv:contains_item("main",i) then hasMaterials = false end end + if sneak and streetlights.basic_materials and not inv:contains_item("main", streetlights.concrete) then + hasMaterials = false + end if hasMaterials then for _,i in ipairs(materials) do inv:remove_item("main",i) end + if sneak then + inv:remove_item("main", streetlights.concrete) + end return true else minetest.chat_send_player(name,"You don't have the necessary materials to do that!") @@ -50,6 +56,7 @@ end local function place(itemstack,player,pointed) if not player then return end + local sneak = player:get_player_control().sneak local name = player:get_player_name() if not minetest.check_player_privs(name,{streetlight = true}) then minetest.chat_send_player(name,"*** You don't have permission to use a streetlight spawner.") @@ -58,9 +65,10 @@ local function place(itemstack,player,pointed) local pos = pointed.above if minetest.is_protected(pos,name) and not minetest.check_player_privs(name,{protection_bypass = true}) then minetest.record_protection_violation(pos,name) + return end local isDouble = string.sub(itemstack:get_name(),-6,-1) == "double" - if not takeMaterials(player,isDouble and doubleMaterials or singleMaterials) then return end + if not takeMaterials(player, sneak, isDouble and doubleMaterials or singleMaterials) then return end local facedir = minetest.facedir_to_dir(minetest.dir_to_facedir(player:get_look_dir())) local schemDir = 0 if facedir.x == 1 then schemDir = 180 @@ -69,6 +77,9 @@ local function place(itemstack,player,pointed) local offset = offsets[isDouble and "double" or "single"][schemDir] local pos = vector.add(pos,offset) minetest.place_schematic(pos,isDouble and schems.double or schems.single,schemDir,nil,false) + if sneak and streetlights.basic_materials then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z}, {name = streetlights.concrete}) + end end minetest.register_tool(":minedot_streetlights:spawner_single",{ diff --git a/simple_streetlights/simple.lua b/simple_streetlights/simple.lua index 5d2518e..aaf5575 100644 --- a/simple_streetlights/simple.lua +++ b/simple_streetlights/simple.lua @@ -11,7 +11,8 @@ minetest.register_privilege("streetlight", { give_to_singleplayer = true }) -local function check_and_place(itemstack, placer, pointed_thing, pole, light) +local function check_and_place(itemstack, placer, pointed_thing, pole, light, param2) + local sneak = placer:get_player_control().sneak if not placer then return end if not minetest.check_player_privs(placer, "streetlight") then minetest.chat_send_player(placer:get_player_name(), "*** You don't have permission to use a streetlight spawner.") @@ -57,9 +58,17 @@ local function check_and_place(itemstack, placer, pointed_thing, pole, light) def4 = minetest.registered_items[node4.name] if minetest.is_protected(pos4, player_name) or not (def3 and def4.buildable_to) then return end + if sneak and minetest.is_protected(pos1, player_name) then return end + if not creative or not creative.is_enabled_for(player_name) then local inv = placer:get_inventory() if not inv:contains_item("main", pole.." 5") or not inv:contains_item("main", light) then return end + if sneak and inv:contains_item("main", streetlights.concrete) then + inv:remove_item("main", streetlights.concrete) + else + return + end + inv:remove_item("main", pole.." 5") inv:remove_item("main", light) end @@ -69,61 +78,69 @@ local function check_and_place(itemstack, placer, pointed_thing, pole, light) minetest.set_node(pos2, {name = pole }) end minetest.set_node(pos3, { name = pole }) - minetest.set_node(pos4, { name = light, param2 = 0 }) + minetest.set_node(pos4, { name = light, param2 = param2 }) + if sneak then + minetest.set_node(pos1, { name = streetlights.concrete }) + end end -minetest.register_tool("simple_streetlights:spawner_wood_meselamp", { - description = "Streetlight spawner (wooden pole, Mese lamp cube)", - inventory_image = "simple_streetlights_spawner_wood_meselamp.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "default:meselamp") - end -}) +local poles_tab = { +-- material name, mod name, node name + { "wood", "default", "default:fence_wood" }, + { "junglewood", "default", "default:fence_junglewood" }, + { "brass", "homedecor_fences", "homedecor:fence_brass" }, + { "wrought_iron", "homedecor_fences", "homedecor:fence_wrought_iron" }, + { "steel", "gloopblocks", "gloopblocks:fence_steel" } +} -if minetest.get_modpath("ilights") then - minetest.register_tool("simple_streetlights:spawner_wood_white", { - description = "Streetlight spawner (wooden pole, white light)", - inventory_image = "simple_streetlights_spawner_wood_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "default:fence_wood", "ilights:light") - end - }) - - if minetest.get_modpath("gloopblocks") then - minetest.register_tool("simple_streetlights:spawner_steel_white", { - description = "Streetlight spawner (steel pole, white light)", - inventory_image = "simple_streetlights_spawner_steel_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "gloopblocks:fence_steel", "ilights:light") - end - }) - end +local lights_tab = { +-- light name, mod name, node name, optional param2 + { "meselamp", "default", "default:meselamp" }, + { "ilight", "ilights", "ilights:light" }, + { "glowlight_cube", "homedecor_lighting", "homedecor:glowlight_small_cube" } +} + +for _, pole in ipairs(poles_tab) do + local matname = pole[1] + local matmod = pole[2] + local matnode = pole[3] + + if minetest.get_modpath(matmod) then + + for _, light in ipairs(lights_tab) do + local lightname = light[1] + local lightmod = light[2] + local lightnode = light[3] + local lightparam2 = light[4] or 0 + + if minetest.get_modpath(lightmod) then + + minetest.register_tool("simple_streetlights:spawner_"..matname.."_"..lightname, { + description = "Streetlight spawner ("..matname.." pole, "..lightname..")", + inventory_image = "simple_streetlights_inv_pole_"..matname..".png".. + "^simple_streetlights_inv_light_source_"..lightname..".png", + use_texture_alpha = true, + tool_capabilities = { full_punch_interval=0.1 }, + on_place = function(itemstack, placer, pointed_thing) + check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2) + end + }) + + minetest.register_craft({ + output = "simple_streetlights:spawner_"..matname.."_"..lightname, + type = "shapeless", + recipe = { + matnode, + matnode, + matnode, + matnode, + matnode, + matnode, + lightnode + } + }) - if minetest.get_modpath("homedecor") then - minetest.register_tool("simple_streetlights:spawner_wrought_iron_white", { - description = "Streetlight spawner (wrought iron pole, white light)", - inventory_image = "simple_streetlights_spawner_wrought_iron_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_wrought_iron", "ilights:light") - end - }) - - minetest.register_tool("simple_streetlights:spawner_brass_white", { - description = "Streetlight spawner (brass pole, white light)", - inventory_image = "simple_streetlights_spawner_brass_white.png", - use_texture_alpha = true, - tool_capabilities = { full_punch_interval=0.1 }, - on_place = function(itemstack, placer, pointed_thing) - check_and_place(itemstack, placer, pointed_thing, "homedecor:fence_brass", "ilights:light") end - }) + end end end diff --git a/simple_streetlights/textures/simple_streetlights_inv_light_source_glowlight_cube.png b/simple_streetlights/textures/simple_streetlights_inv_light_source_glowlight_cube.png new file mode 100644 index 0000000..386b6d2 Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_light_source_glowlight_cube.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_light_source_ilight.png b/simple_streetlights/textures/simple_streetlights_inv_light_source_ilight.png new file mode 100644 index 0000000..cb7cfdb Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_light_source_ilight.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_light_source_meselamp.png b/simple_streetlights/textures/simple_streetlights_inv_light_source_meselamp.png new file mode 100644 index 0000000..d30515f Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_light_source_meselamp.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_pole_brass.png b/simple_streetlights/textures/simple_streetlights_inv_pole_brass.png new file mode 100644 index 0000000..e97853e Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_pole_brass.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_pole_junglewood.png b/simple_streetlights/textures/simple_streetlights_inv_pole_junglewood.png new file mode 100644 index 0000000..ccced10 Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_pole_junglewood.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_pole_steel.png b/simple_streetlights/textures/simple_streetlights_inv_pole_steel.png new file mode 100644 index 0000000..c3d1261 Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_pole_steel.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_pole_wood.png b/simple_streetlights/textures/simple_streetlights_inv_pole_wood.png new file mode 100644 index 0000000..227e0f5 Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_pole_wood.png differ diff --git a/simple_streetlights/textures/simple_streetlights_inv_pole_wrought_iron.png b/simple_streetlights/textures/simple_streetlights_inv_pole_wrought_iron.png new file mode 100644 index 0000000..a0fa09f Binary files /dev/null and b/simple_streetlights/textures/simple_streetlights_inv_pole_wrought_iron.png differ diff --git a/simple_streetlights/textures/simple_streetlights_spawner_brass_white.png b/simple_streetlights/textures/simple_streetlights_spawner_brass_white.png deleted file mode 100644 index 10bbf38..0000000 Binary files a/simple_streetlights/textures/simple_streetlights_spawner_brass_white.png and /dev/null differ diff --git a/simple_streetlights/textures/simple_streetlights_spawner_steel_white.png b/simple_streetlights/textures/simple_streetlights_spawner_steel_white.png deleted file mode 100644 index df9c34f..0000000 Binary files a/simple_streetlights/textures/simple_streetlights_spawner_steel_white.png and /dev/null differ diff --git a/simple_streetlights/textures/simple_streetlights_spawner_wood_meselamp.png b/simple_streetlights/textures/simple_streetlights_spawner_wood_meselamp.png deleted file mode 100644 index 1bf5910..0000000 Binary files a/simple_streetlights/textures/simple_streetlights_spawner_wood_meselamp.png and /dev/null differ diff --git a/simple_streetlights/textures/simple_streetlights_spawner_wood_white.png b/simple_streetlights/textures/simple_streetlights_spawner_wood_white.png deleted file mode 100644 index 4ba28f1..0000000 Binary files a/simple_streetlights/textures/simple_streetlights_spawner_wood_white.png and /dev/null differ diff --git a/simple_streetlights/textures/simple_streetlights_spawner_wrought_iron_white.png b/simple_streetlights/textures/simple_streetlights_spawner_wrought_iron_white.png deleted file mode 100644 index 2025424..0000000 Binary files a/simple_streetlights/textures/simple_streetlights_spawner_wrought_iron_white.png and /dev/null differ -- cgit v1.2.3