diff options
34 files changed, 65 insertions, 42 deletions
diff --git a/mesecons_blinkyplant/init.lua b/mesecons_blinkyplant/init.lua index 8cc67c6..b8abac7 100644 --- a/mesecons_blinkyplant/init.lua +++ b/mesecons_blinkyplant/init.lua @@ -38,8 +38,8 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", { minetest.register_craft({ output = '"mesecons_blinkyplant:blinky_plant_off" 1', recipe = { - {'','"mesecons:mesecon_off"',''}, - {'','"mesecons:mesecon_off"',''}, + {'','"group:mesecon_conductor_craftable"',''}, + {'','"group:mesecon_conductor_craftable"',''}, {'"default:junglegrass"','"default:junglegrass"','"default:junglegrass"'}, } }) diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua index 70a634d..7ea2210 100644 --- a/mesecons_button/init.lua +++ b/mesecons_button/init.lua @@ -95,7 +95,7 @@ end minetest.register_craft({ output = '"mesecons_button:button_off" 2', recipe = { - {'"mesecons:mesecon_off"','"default:stone"'}, + {'"group:mesecon_conductor_craftable"','"default:stone"'}, } }) diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index cd1cd92..cb6d0af 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -6,23 +6,39 @@ else groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1, mesecon = 2} end +boxes = {{ -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 }, -- the main slab + + { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 }, -- the jeweled "on" indicator + { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 }, + { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 }, + { -3/16, -7/16, 2/16, 3/16, -26/64, 3/16 }, + { -2/16, -7/16, 3/16, 2/16, -26/64, 4/16 }, + + { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 }, -- the timer indicator + { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 }, -- the two wire stubs + { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 }} + minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), { description = "Delayer", drawtype = "nodebox", tiles = { "mesecons_delayer_off_"..tostring(i)..".png", - "mesecons_delayer_sides.png" + "mesecons_delayer_bottom.png", + "mesecons_delayer_ends_off.png", + "mesecons_delayer_ends_off.png", + "mesecons_delayer_sides_off.png", + "mesecons_delayer_sides_off.png" }, inventory_image = "mesecons_delayer_off_1.png", wield_image = "mesecons_delayer_off_1.png", walkable = true, selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, }, node_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, + fixed = boxes }, groups = groups, paramtype = "light", @@ -38,16 +54,20 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), { drawtype = "nodebox", tiles = { "mesecons_delayer_on_"..tostring(i)..".png", - "mesecons_delayer_sides.png" + "mesecons_delayer_bottom.png", + "mesecons_delayer_ends_on.png", + "mesecons_delayer_ends_on.png", + "mesecons_delayer_sides_on.png", + "mesecons_delayer_sides_on.png" }, walkable = true, selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, }, node_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, + fixed = boxes }, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1, mesecon = 2}, paramtype = "light", diff --git a/mesecons_delayer/textures/mesecons_delayer_sides.png b/mesecons_delayer/textures/mesecons_delayer_bottom.png Binary files differindex 3e21e53..2e49d31 100644 --- a/mesecons_delayer/textures/mesecons_delayer_sides.png +++ b/mesecons_delayer/textures/mesecons_delayer_bottom.png diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mesecons_delayer/textures/mesecons_delayer_ends_off.png Binary files differnew file mode 100644 index 0000000..0242deb --- /dev/null +++ b/mesecons_delayer/textures/mesecons_delayer_ends_off.png diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mesecons_delayer/textures/mesecons_delayer_ends_on.png Binary files differnew file mode 100644 index 0000000..19ae0cb --- /dev/null +++ b/mesecons_delayer/textures/mesecons_delayer_ends_on.png diff --git a/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons_delayer/textures/mesecons_delayer_off_1.png Binary files differindex 42344b2..7372b37 100644 --- a/mesecons_delayer/textures/mesecons_delayer_off_1.png +++ b/mesecons_delayer/textures/mesecons_delayer_off_1.png diff --git a/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons_delayer/textures/mesecons_delayer_off_2.png Binary files differindex e560a55..e34f0ac 100644 --- a/mesecons_delayer/textures/mesecons_delayer_off_2.png +++ b/mesecons_delayer/textures/mesecons_delayer_off_2.png diff --git a/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mesecons_delayer/textures/mesecons_delayer_off_3.png Binary files differindex 01a7503..091adbc 100644 --- a/mesecons_delayer/textures/mesecons_delayer_off_3.png +++ b/mesecons_delayer/textures/mesecons_delayer_off_3.png diff --git a/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mesecons_delayer/textures/mesecons_delayer_off_4.png Binary files differindex deed284..7ecc9b6 100644 --- a/mesecons_delayer/textures/mesecons_delayer_off_4.png +++ b/mesecons_delayer/textures/mesecons_delayer_off_4.png diff --git a/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mesecons_delayer/textures/mesecons_delayer_on_1.png Binary files differindex cb1b364..61f52f2 100644 --- a/mesecons_delayer/textures/mesecons_delayer_on_1.png +++ b/mesecons_delayer/textures/mesecons_delayer_on_1.png diff --git a/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons_delayer/textures/mesecons_delayer_on_2.png Binary files differindex 2174891..7bd363f 100644 --- a/mesecons_delayer/textures/mesecons_delayer_on_2.png +++ b/mesecons_delayer/textures/mesecons_delayer_on_2.png diff --git a/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mesecons_delayer/textures/mesecons_delayer_on_3.png Binary files differindex 5602df0..b93f725 100644 --- a/mesecons_delayer/textures/mesecons_delayer_on_3.png +++ b/mesecons_delayer/textures/mesecons_delayer_on_3.png diff --git a/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons_delayer/textures/mesecons_delayer_on_4.png Binary files differindex 2a14de7..ca90a1e 100644 --- a/mesecons_delayer/textures/mesecons_delayer_on_4.png +++ b/mesecons_delayer/textures/mesecons_delayer_on_4.png diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mesecons_delayer/textures/mesecons_delayer_sides_off.png Binary files differnew file mode 100644 index 0000000..79f3d59 --- /dev/null +++ b/mesecons_delayer/textures/mesecons_delayer_sides_off.png diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mesecons_delayer/textures/mesecons_delayer_sides_on.png Binary files differnew file mode 100644 index 0000000..1c8edaa --- /dev/null +++ b/mesecons_delayer/textures/mesecons_delayer_sides_on.png diff --git a/mesecons_detector/init.lua b/mesecons_detector/init.lua index c23aa80..3ac0a4f 100644 --- a/mesecons_detector/init.lua +++ b/mesecons_detector/init.lua @@ -23,8 +23,8 @@ minetest.register_craft({ output = 'mesecons_detector:object_detector_off', recipe = { {"default:steelblock", '', "default:steelblock"}, - {"default:steelblock", "mesecons_materials:ic", "default:steelblock"}, - {"default:steelblock", "mesecons:mesecon_off", "default:steelblock"}, + {"default:steelblock", "mesecons_microcontroller:microcontroller0000", "default:steelblock"}, + {"default:steelblock", "group:mesecon_conductor_craftable", "default:steelblock"}, } }) diff --git a/mesecons_dev/mesecons_wireless/init.lua b/mesecons_dev/mesecons_wireless/init.lua index 0a752e5..b024499 100644 --- a/mesecons_dev/mesecons_wireless/init.lua +++ b/mesecons_dev/mesecons_wireless/init.lua @@ -176,8 +176,8 @@ minetest.register_node("mesecons_wireless:wireless_receiver_on", { minetest.register_craft({ output = '"mesecons_wireless:wireless_receiver_off" 2', recipe = { - {'', "mesecons:mesecon_off", ''}, - {'', "mesecons:mesecon_off", ''}, + {'', "group:mesecon_conductor_craftable", ''}, + {'', "group:mesecon_conductor_craftable", ''}, {'', "mesecons_materials:ic", ''}, } }) @@ -242,8 +242,8 @@ minetest.register_craft({ output = '"mesecons_wireless:wireless_inverter_off" 2', recipe = { {'', 'default:steel_ingot', ''}, - {'mesecons_materials:ic', 'mesecons:mesecon_off', 'mesecons_materials:ic'}, - {'', 'mesecons:mesecon_off', ''}, + {'mesecons_materials:ic', 'group:mesecon_conductor_craftable', 'mesecons_materials:ic'}, + {'', 'group:mesecon_conductor_craftable', ''}, } }) @@ -284,8 +284,8 @@ minetest.register_node("mesecons_wireless:wireless_transmitter_off", { minetest.register_craft({ output = '"mesecons_wireless:wireless_transmitter_off" 2', recipe = { - {'default:steel_ingot', 'mesecons:mesecon_off', 'default:steel_ingot'}, - {'', 'mesecons:mesecon_off', ''}, + {'default:steel_ingot', 'group:mesecon_conductor_craftable', 'default:steel_ingot'}, + {'', 'group:mesecon_conductor_craftable', ''}, {'', 'mesecons_materials:ic', ''}, } }) diff --git a/mesecons_lamp/init.lua b/mesecons_lamp/init.lua index 1ae9e79..21a6882 100644 --- a/mesecons_lamp/init.lua +++ b/mesecons_lamp/init.lua @@ -53,7 +53,7 @@ minetest.register_craft({ output = '"mesecons_lamp:lamp_off" 1', recipe = { {'', '"default:glass"', ''}, - {'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'}, {'', '"default:glass"', ''}, } }) diff --git a/mesecons_lightstone/init.lua b/mesecons_lightstone/init.lua index 414c7e7..4fdf275 100644 --- a/mesecons_lightstone/init.lua +++ b/mesecons_lightstone/init.lua @@ -29,8 +29,8 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on) output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1", recipe = { {'',base_item,''}, - {base_item,'node default:torch 1',base_item}, - {'','node mesecons:mesecon_off 1',''}, + {base_item,'default:torch',base_item}, + {'','group:mesecon_conductor_craftable',''}, } }) end diff --git a/mesecons_microcontroller/init.lua b/mesecons_microcontroller/init.lua index 88f7905..1b0f5ee 100644 --- a/mesecons_microcontroller/init.lua +++ b/mesecons_microcontroller/init.lua @@ -27,14 +27,14 @@ minetest.register_node(nodename, { drop = '"mesecons_microcontroller:microcontroller0000" 1', selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 }, }, node_box = { type = "fixed", fixed = { - { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, -- bottom slab - { -5/16, -6/16, -5/16, 5/16, -5/16, 5/16 }, -- circuit board - { -3/16, -5/16, -3/16, 3/16, -4/16, 3/16 }, -- IC + { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab + { -5/16, -7/16, -5/16, 5/16, -6/16, 5/16 }, -- circuit board + { -3/16, -6/16, -3/16, 3/16, -5/16, 3/16 }, -- IC } }, on_construct = function(pos) @@ -107,9 +107,9 @@ end minetest.register_craft({ output = 'craft "mesecons_microcontroller:microcontroller0000" 2', recipe = { - {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'mesecons:mesecon_off'}, - {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'mesecons:mesecon_off'}, - {'mesecons:mesecon_off', 'mesecons:mesecon_off', ''}, + {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'}, + {'mesecons_materials:silicon', 'mesecons_materials:silicon', 'group:mesecon_conductor_craftable'}, + {'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''}, } }) diff --git a/mesecons_movestones/init.lua b/mesecons_movestones/init.lua index 891e248..0cf0010 100644 --- a/mesecons_movestones/init.lua +++ b/mesecons_movestones/init.lua @@ -79,7 +79,7 @@ minetest.register_craft({ output = '"mesecons_movestones:movestone" 2', recipe = { {'"default:stone"', '"default:stone"', '"default:stone"'}, - {'"mesecons:mesecon_off"', '"mesecons:mesecon_off"', '"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"'}, {'"default:stone"', '"default:stone"', '"default:stone"'}, } }) diff --git a/mesecons_noteblock/init.lua b/mesecons_noteblock/init.lua index 64c7195..ddd1f82 100644 --- a/mesecons_noteblock/init.lua +++ b/mesecons_noteblock/init.lua @@ -14,7 +14,7 @@ minetest.register_craft({ output = '"mesecons_noteblock:noteblock" 1', recipe = { {"default:wood", "default:wood", "default:wood"}, - {"mesecons:mesecon_off", "default:steel_ingot", "mesecons:mesecon_off"}, + {"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"}, {"default:wood", "default:wood", "default:wood"}, } }) diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 15cf0a9..7e0b984 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -44,7 +44,7 @@ minetest.register_craft({ recipe = { {"default:wood", "default:wood", "default:wood"}, {"default:cobble", "default:steel_ingot", "default:cobble"}, - {"default:cobble", "mesecons:mesecon_off", "default:cobble"}, + {"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"}, } }) diff --git a/mesecons_powerplant/init.lua b/mesecons_powerplant/init.lua index f564416..d32e838 100644 --- a/mesecons_powerplant/init.lua +++ b/mesecons_powerplant/init.lua @@ -25,8 +25,8 @@ minetest.register_node("mesecons_powerplant:power_plant", { minetest.register_craft({ output = '"mesecons_powerplant:power_plant" 1', recipe = { - {'"mesecons:mesecon_off"'}, - {'"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"'}, + {'"group:mesecon_conductor_craftable"'}, {'"default:junglegrass"'}, } }) diff --git a/mesecons_random/init.lua b/mesecons_random/init.lua index 6d068ed..be0ab19 100644 --- a/mesecons_random/init.lua +++ b/mesecons_random/init.lua @@ -12,7 +12,7 @@ minetest.register_craft({ output = '"mesecons_random:removestone" 4', recipe = { {'', '"default:cobble"',''}, - {'"default:cobble"', '"mesecons:mesecon_off"', '"default:cobble"'}, + {'"default:cobble"', '"group:mesecon_conductor_craftable"', '"default:cobble"'}, {'', '"default:cobble"',''}, } }) diff --git a/mesecons_solarpanel/init.lua b/mesecons_solarpanel/init.lua index 5c6f78d..7ec24af 100644 --- a/mesecons_solarpanel/init.lua +++ b/mesecons_solarpanel/init.lua @@ -1,7 +1,10 @@ -- Solar Panel minetest.register_node("mesecons_solarpanel:solar_panel", { drawtype = "nodebox", - tile_images = {"jeija_solar_panel.png"}, + tile_images = { + "jeija_solar_panel.png", + "jeija_solar_panel_sides.png" + }, inventory_image = "jeija_solar_panel.png", wield_image = "jeija_solar_panel.png", paramtype = "light", diff --git a/mesecons_switch/init.lua b/mesecons_switch/init.lua index 4bbdbb1..7282e61 100644 --- a/mesecons_switch/init.lua +++ b/mesecons_switch/init.lua @@ -38,6 +38,6 @@ minetest.register_craft({ output = '"mesecons_switch:mesecon_switch_off" 2', recipe = { {'"default:steel_ingot"', '"default:cobble"', '"default:steel_ingot"'}, - {'"mesecons:mesecon_off"','', '"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"','', '"group:mesecon_conductor_craftable"'}, } }) diff --git a/mesecons_temperest/init.lua b/mesecons_temperest/init.lua index 9e8516c..f087ad4 100644 --- a/mesecons_temperest/init.lua +++ b/mesecons_temperest/init.lua @@ -123,9 +123,9 @@ minetest.register_node("mesecons_temperest:mesecon_plug", { minetest.register_craft({ output = '"mesecons_temperest:mesecon_plug" 2', recipe = { - {'', '"mesecons:mesecon_off"', ''}, - {'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, - {'', '"mesecons:mesecon_off"', ''}, + {'', '"group:mesecon_conductor_craftable"', ''}, + {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'}, + {'', '"group:mesecon_conductor_craftable"', ''}, } }) @@ -236,9 +236,9 @@ if ENABLE_TEMPEREST then minetest.register_craft({ output = '"mesecons_temperest:mesecon_inverter_on" 2', recipe = { - {'"mesecons_temperest:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, + {'"mesecons_temperest:mesecon_off"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'}, {'"default:steel_ingot"', '', '"default:steel_ingot"'}, - {'"mesecons:mesecon_off"', '"default:steel_ingot"', '"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'}, } }) end diff --git a/mesecons_textures/textures/jeija_microcontroller_sides.png b/mesecons_textures/textures/jeija_microcontroller_sides.png Binary files differindex 8561567..b367644 100644 --- a/mesecons_textures/textures/jeija_microcontroller_sides.png +++ b/mesecons_textures/textures/jeija_microcontroller_sides.png diff --git a/mesecons_textures/textures/jeija_solar_panel.png b/mesecons_textures/textures/jeija_solar_panel.png Binary files differindex 30bab6f..5ff0640 100644 --- a/mesecons_textures/textures/jeija_solar_panel.png +++ b/mesecons_textures/textures/jeija_solar_panel.png diff --git a/mesecons_textures/textures/jeija_solar_panel_sides.png b/mesecons_textures/textures/jeija_solar_panel_sides.png Binary files differnew file mode 100644 index 0000000..c5fac85 --- /dev/null +++ b/mesecons_textures/textures/jeija_solar_panel_sides.png diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua index 5512e89..ad2eeed 100644 --- a/mesecons_torch/init.lua +++ b/mesecons_torch/init.lua @@ -3,7 +3,7 @@ minetest.register_craft({ output = '"mesecons_torch:mesecon_torch_on" 4', recipe = { - {"mesecons:mesecon_off"}, + {"group:mesecon_conductor_craftable"}, {"default:stick"}, } }) diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua index a4ed254..6270e5e 100644 --- a/mesecons_walllever/init.lua +++ b/mesecons_walllever/init.lua @@ -78,7 +78,7 @@ end) minetest.register_craft({ output = '"mesecons_walllever:wall_lever_off" 2', recipe = { - {'"mesecons:mesecon_off"'}, + {'"group:mesecon_conductor_craftable"'}, {'"default:stone"'}, {'"default:stick"'}, } |
