diff --git a/README.md b/README.md index ccb7fa6..e5076db 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ MoreMesecons is a mod for minetest wich add some mesecons items. * `Adjustable Blinky plant` : Like a mesecons blinky plant, but... adjustable. Right-click to change the interval. * `Craftable Command Block` : A command block with just some commands accepted. The admin can change the accepted command (first line of the init.lua), default "say" and "tell". -* `Dual Delayer` : If it receives a mesecons signal, port 1 turns on immediatly and port 2 turns on 0.4 seconds later. At the end of the signal, port 2 turns off immediatly and port 1 turns off 0.4 secondes later. +* `Dual Delayer` : If it receives a mesecons signal, port 1 turns on immediatly and port 2 turns on 0.4 seconds later. At the end of the signal, port 2 turns off immediatly and port 1 turns off 0.4 secondes later. For example, this is useful for double extenders. * `Player Killer` : This block kills the nearest player (with a maximal distance of 8 blocks by default) (if this player isn't its owner) when it receives a mesecons signal. * `Signal Changer` : If it receives a signal on its pin "F", it turns on. If ti receives a signal on its pin "O", it turns off. * `Switch Torch` : It connects just like Mesecons Torch. If it receives a signal, it turns on, and if it receives a second signal, it turns off. diff --git a/moremesecons_adjustable_blinkyplant/init.lua b/moremesecons_adjustable_blinkyplant/init.lua index 65b73e0..491dc4c 100644 --- a/moremesecons_adjustable_blinkyplant/init.lua +++ b/moremesecons_adjustable_blinkyplant/init.lua @@ -24,7 +24,7 @@ end mesecon.register_node("moremesecons_adjustable_blinkyplant:adjustable_blinky_plant", { description="Adjustable Blinky Plant", drawtype = "plantlike", - inventory_image = "jeija_blinky_plant_off.png", + inventory_image = "moremesecons_blinky_plant_off.png", paramtype = "light", walkable = false, sounds = default.node_sound_leaves_defaults(), @@ -44,11 +44,11 @@ mesecon.register_node("moremesecons_adjustable_blinkyplant:adjustable_blinky_pla toggle_timer(pos, true) end, },{ - tiles = {"jeija_blinky_plant_off.png"}, + tiles = {"moremesecons_blinky_plant_off.png"}, groups = {dig_immediate=3}, mesecons = {receptor = { state = mesecon.state.off }} },{ - tiles = {"jeija_blinky_plant_on.png"}, + tiles = {"moremesecons_blinky_plant_on.png"}, groups = {dig_immediate=3, not_in_creative_inventory=1}, mesecons = {receptor = { state = mesecon.state.on }}, }) diff --git a/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_off.png b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_off.png new file mode 100644 index 0000000..d4cad1e Binary files /dev/null and b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_off.png differ diff --git a/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_on.png b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_on.png new file mode 100644 index 0000000..f6eccf9 Binary files /dev/null and b/moremesecons_adjustable_blinkyplant/textures/moremesecons_blinky_plant_on.png differ diff --git a/moremesecons_commandblock/init.lua b/moremesecons_commandblock/init.lua index 68b571d..de1fe1b 100644 --- a/moremesecons_commandblock/init.lua +++ b/moremesecons_commandblock/init.lua @@ -136,8 +136,7 @@ end minetest.register_node("moremesecons_commandblock:commandblock_off", { description = "Craftable Command Block", - tiles = {"jeija_commandblock_off.png"}, - inventory_image = minetest.inventorycube("jeija_commandblock_off.png"), + tiles = {"moremesecons_commandblock_off.png"}, groups = {cracky=2, mesecon_effector_off=1}, on_construct = construct, after_place_node = after_place, @@ -150,7 +149,7 @@ minetest.register_node("moremesecons_commandblock:commandblock_off", { }) minetest.register_node("moremesecons_commandblock:commandblock_on", { - tiles = {"jeija_commandblock_on.png"}, + tiles = {"moremesecons_commandblock_on.png"}, groups = {cracky=2, mesecon_effector_on=1, not_in_creative_inventory=1}, light_source = 10, drop = "moremesecons_commandblock:commandblock_off", @@ -165,7 +164,7 @@ minetest.register_node("moremesecons_commandblock:commandblock_on", { }) minetest.register_craft({ - output = "moremoremesecons_commandblock:commandblock_off", + output = "moremesecons_commandblock:commandblock_off", recipe = { {"group:mesecon_conductor_craftable","default:mese_crystal","group:mesecon_conductor_craftable"}, {"default:mese_crystal","group:mesecon_conductor_craftable","default:mese_crystal"}, diff --git a/moremesecons_commandblock/textures/moremesecons_commandblock_off.png b/moremesecons_commandblock/textures/moremesecons_commandblock_off.png new file mode 100644 index 0000000..00193d2 Binary files /dev/null and b/moremesecons_commandblock/textures/moremesecons_commandblock_off.png differ diff --git a/moremesecons_commandblock/textures/moremesecons_commandblock_on.png b/moremesecons_commandblock/textures/moremesecons_commandblock_on.png new file mode 100644 index 0000000..a61cd55 Binary files /dev/null and b/moremesecons_commandblock/textures/moremesecons_commandblock_on.png differ diff --git a/moremesecons_dual_delayer/init.lua b/moremesecons_dual_delayer/init.lua index f24f1f3..46f3a99 100644 --- a/moremesecons_dual_delayer/init.lua +++ b/moremesecons_dual_delayer/init.lua @@ -78,5 +78,5 @@ end minetest.register_craft({ type = "shapeless", output = "moremesecons_dual_delayer:dual_delayer_00 2", - recipe = {"mesecons_delayer:delayer_off", "mesecons_delayer:delayer_off"} + recipe = {"mesecons_delayer:delayer_off_1", "mesecons_delayer:delayer_off_1"} }) diff --git a/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_bottom.png b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_bottom.png new file mode 100644 index 0000000..46b4aff Binary files /dev/null and b/moremesecons_dual_delayer/textures/moremesecons_dual_delayer_bottom.png differ diff --git a/moremesecons_playerkiller/init.lua b/moremesecons_playerkiller/init.lua index a05455b..6be67b8 100644 --- a/moremesecons_playerkiller/init.lua +++ b/moremesecons_playerkiller/init.lua @@ -30,7 +30,7 @@ minetest.register_craft({ {"","default:apple",""}} }) minetest.register_node("moremesecons_playerkiller:playerkiller", { - tiles = {"top.png", "top.png", "side.png", "side.png", "side.png", "side.png"}, + tiles = {"moremesecons_playerkiller_top.png", "moremesecons_playerkiller_top.png", "moremesecons_playerkiller_side.png", "moremesecons_playerkiller_side.png", "moremesecons_playerkiller_side.png", "moremesecons_playerkiller_side.png"}, paramtype = "light", walkable = true, groups = {cracky=3}, diff --git a/moremesecons_playerkiller/textures/moremesecons_playerkiller_side.png b/moremesecons_playerkiller/textures/moremesecons_playerkiller_side.png new file mode 100644 index 0000000..a1e57e0 Binary files /dev/null and b/moremesecons_playerkiller/textures/moremesecons_playerkiller_side.png differ diff --git a/moremesecons_playerkiller/textures/moremesecons_playerkiller_top.png b/moremesecons_playerkiller/textures/moremesecons_playerkiller_top.png new file mode 100644 index 0000000..bc22e25 Binary files /dev/null and b/moremesecons_playerkiller/textures/moremesecons_playerkiller_top.png differ diff --git a/moremesecons_switchtorch/init.lua b/moremesecons_switchtorch/init.lua index 7c4c33a..73e7bcb 100644 --- a/moremesecons_switchtorch/init.lua +++ b/moremesecons_switchtorch/init.lua @@ -36,7 +36,7 @@ local torch_get_input_rules = function(node) end minetest.register_craft({ - output = "moremesecons_switchtorch:switchtorch_off 4", + output = "moremesecons_switchtorch:switchtorch_on 4", recipe = { {"default:stick"}, {"group:mesecon_conductor_craftable"},} @@ -52,8 +52,8 @@ local torch_selectionbox = minetest.register_node("moremesecons_switchtorch:switchtorch_off", { drawtype = "torchlike", - tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"}, - inventory_image = "jeija_torches_off.png", + tiles = {"moremesecons_switchtorch_off.png", "moremesecons_switchtorch_off_ceiling.png", "moremesecons_switchtorch_off_side.png"}, + inventory_image = "moremesecons_switchtorch_off.png", paramtype = "light", walkable = false, paramtype2 = "wallmounted", @@ -72,11 +72,11 @@ minetest.register_node("moremesecons_switchtorch:switchtorch_off", { }) minetest.register_node("moremesecons_switchtorch:switchtorch_on", { - descrption = "Switch Torch", + description = "Switch Torch", drawtype = "torchlike", - tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"}, - inventory_image = "jeija_torches_on.png", - wield_image = "jeija_torches_on.png", + tiles = {"moremesecons_switchtorch_on.png", "moremesecons_switchtorch_on_ceiling.png", "moremesecons_switchtorch_on_side.png"}, + inventory_image = "moremesecons_switchtorch_on.png", + wield_image = "moremesecons_switchtorch_on.png", paramtype = "light", sunlight_propagates = true, walkable = false, diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off.png new file mode 100644 index 0000000..6aacca6 Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off.png differ diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_ceiling.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_ceiling.png new file mode 100644 index 0000000..ae3e128 Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_ceiling.png differ diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_side.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_side.png new file mode 100644 index 0000000..9a4fe2a Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_off_side.png differ diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on.png new file mode 100644 index 0000000..002e33f Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on.png differ diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_ceiling.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_ceiling.png new file mode 100644 index 0000000..fbeb97e Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_ceiling.png differ diff --git a/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_side.png b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_side.png new file mode 100644 index 0000000..7bfa75f Binary files /dev/null and b/moremesecons_switchtorch/textures/moremesecons_switchtorch_on_side.png differ diff --git a/moremesecons_teleporter/init.lua b/moremesecons_teleporter/init.lua index 0ada2ff..2dbfea9 100644 --- a/moremesecons_teleporter/init.lua +++ b/moremesecons_teleporter/init.lua @@ -51,7 +51,7 @@ minetest.register_craft({ recipe = {{"default:diamond","default:stick","default:mese"}} }) minetest.register_node("moremesecons_teleporter:teleporter", { - tiles = {"teleporter.png"}, + tiles = {"moremesecons_teleporter.png"}, paramtype = "light", walkable = true, groups = {cracky=3}, diff --git a/moremesecons_teleporter/textures/moremesecons_teleporter.png b/moremesecons_teleporter/textures/moremesecons_teleporter.png new file mode 100644 index 0000000..f038093 Binary files /dev/null and b/moremesecons_teleporter/textures/moremesecons_teleporter.png differ diff --git a/moremesecons_temporarygate/init.lua b/moremesecons_temporarygate/init.lua index 32bf11a..267fa42 100644 --- a/moremesecons_temporarygate/init.lua +++ b/moremesecons_temporarygate/init.lua @@ -103,13 +103,21 @@ mesecon.register_node("moremesecons_temporarygate:temporarygate", { "moremesecons_temporarygate_sides_on.png" }, groups = {bendy=2,snappy=1,dig_immediate=2, not_in_creative_inventory=1}, - mesecons = {receptor = {state = mesecon.state.on, rules = temporarygate_get_output_rules}}, + mesecons = { + receptor = { + state = mesecon.state.on, + rules = temporarygate_get_output_rules + }, + effector = { + rules = temporarygate_get_input_rules, + } + }, }) minetest.register_craft({ output = "moremesecons_temporarygate:temporarygate_off 2", recipe = { - {"group:mesecon_conductor_craftable", "mesecons_delayer:delayer_off", "group:mesecon_conductor_craftable"}, + {"group:mesecon_conductor_craftable", "mesecons_delayer:delayer_off_1", "group:mesecon_conductor_craftable"}, {"default:wood","default:wood", "default:wood"}, } }) diff --git a/moremesecons_wireless/init.lua b/moremesecons_wireless/init.lua index 0e791ad..f36cc7e 100644 --- a/moremesecons_wireless/init.lua +++ b/moremesecons_wireless/init.lua @@ -40,7 +40,7 @@ local wireless_deactivate = function(pos) end minetest.register_node("moremesecons_wireless:wireless", { - tiles = {"wireless.png"}, + tiles = {"moremesecons_wireless.png"}, paramtype = "light", paramtype2 = "facedir", description = "Wireless", @@ -66,7 +66,7 @@ minetest.register_craft({ output = "moremesecons_wireless:wireless 2", recipe = { {"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, - {"", "mesecons_torch:torch_on", ""}, + {"", "mesecons_torch:mesecon_torch_on", ""}, {"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"}, } }) diff --git a/moremesecons_wireless/textures/moremesecons_wireless.png b/moremesecons_wireless/textures/moremesecons_wireless.png new file mode 100644 index 0000000..e16d40c Binary files /dev/null and b/moremesecons_wireless/textures/moremesecons_wireless.png differ