clean-up the new wall-lever models

better UV-mapping, less distortion
redid textures to match

LICENSE.txt

@@ -0,0 +1,532 @@
+The LGPLv3 applies to all code in this project.
+The CC-BY-SA-3.0 license applies to textures and any other content in this project which is not source code.
+
+=================================================================
+
+GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+=================================================================
+
+Creative Commons Legal Code
+
+Attribution-ShareAlike 3.0 Unported
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined below) for the purposes of this
+    License.
+ c. "Creative Commons Compatible License" means a license that is listed
+    at http://creativecommons.org/compatiblelicenses that has been
+    approved by Creative Commons as being essentially equivalent to this
+    License, including, at a minimum, because that license: (i) contains
+    terms that have the same purpose, meaning and effect as the License
+    Elements of this License; and, (ii) explicitly permits the relicensing
+    of adaptations of works made available under that license under this
+    License or a Creative Commons jurisdiction license with the same
+    License Elements as this License.
+ d. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ e. "License Elements" means the following high-level license attributes
+    as selected by Licensor and indicated in the title of this License:
+    Attribution, ShareAlike.
+ f. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ g. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ h. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ i. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ j. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ k. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+ e. For the avoidance of doubt:
+
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor waives the
+        exclusive right to collect such royalties for any exercise by You
+        of the rights granted under this License; and,
+   iii. Voluntary License Schemes. The Licensor waives the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(c), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(c), as requested.
+ b. You may Distribute or Publicly Perform an Adaptation only under the
+    terms of: (i) this License; (ii) a later version of this License with
+    the same License Elements as this License; (iii) a Creative Commons
+    jurisdiction license (either this or a later license version) that
+    contains the same License Elements as this License (e.g.,
+    Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
+    License. If you license the Adaptation under one of the licenses
+    mentioned in (iv), you must comply with the terms of that license. If
+    you license the Adaptation under the terms of any of the licenses
+    mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
+    comply with the terms of the Applicable License generally and the
+    following provisions: (I) You must include a copy of, or the URI for,
+    the Applicable License with every copy of each Adaptation You
+    Distribute or Publicly Perform; (II) You may not offer or impose any
+    terms on the Adaptation that restrict the terms of the Applicable
+    License or the ability of the recipient of the Adaptation to exercise
+    the rights granted to that recipient under the terms of the Applicable
+    License; (III) You must keep intact all notices that refer to the
+    Applicable License and to the disclaimer of warranties with every copy
+    of the Work as included in the Adaptation You Distribute or Publicly
+    Perform; (IV) when You Distribute or Publicly Perform the Adaptation,
+    You may not impose any effective technological measures on the
+    Adaptation that restrict the ability of a recipient of the Adaptation
+    from You to exercise the rights granted to that recipient under the
+    terms of the Applicable License. This Section 4(b) applies to the
+    Adaptation as incorporated in a Collection, but this does not require
+    the Collection apart from the Adaptation itself to be made subject to
+    the terms of the Applicable License.
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and (iv) , consistent with Ssection 3(b), in the case of an
+    Adaptation, a credit identifying the use of the Work in the Adaptation
+    (e.g., "French translation of the Work by Original Author," or
+    "Screenplay based on original Work by Original Author"). The credit
+    required by this Section 4(c) may be implemented in any reasonable
+    manner; provided, however, that in the case of a Adaptation or
+    Collection, at a minimum such credit will appear, if a credit for all
+    contributing authors of the Adaptation or Collection appears, then as
+    part of these credits and in a manner at least as prominent as the
+    credits for the other contributing authors. For the avoidance of
+    doubt, You may only use the credit required by this Section for the
+    purpose of attribution in the manner set out above and, by exercising
+    Your rights under this License, You may not implicitly or explicitly
+    assert or imply any connection with, sponsorship or endorsement by the
+    Original Author, Licensor and/or Attribution Parties, as appropriate,
+    of You or Your use of the Work, without the separate, express prior
+    written permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ d. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+
+
+Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of the License.
+
+    Creative Commons may be contacted at http://creativecommons.org/.

README

@@ -1,24 +0,0 @@
--- |\    /| ____ ____  ____ _____   ____         _____
--- | \  / | |    |     |    |      |    | |\   | |
--- |  \/  | |___ ____  |___ |      |    | | \  | |____
--- |      | |        | |    |      |    | |  \ |     |
--- |      | |___ ____| |___ |____  |____| |   \| ____|
--- by Jeija and contributors
-
-Credits:
-Jeija: main developer
-VanessaE: Awesome textures & design, coding
-sfan5: coding, textures
-temperest: coding, textures
-Jordach: Sounds for the noteblock
-minerd247: Some textures
-...other contributors
-
-This is a mod for minetest-c55.
-Copy the minetest-mod-mesecons directory into you game's mod folder 
-(e.g. games/minetest_game/mods/minetest-mod-mesecons)
-
-You can remove modules of this mod by deleting the mesecons_*
-folders in the minetest-mod-mesecons directory.
-
-Mod dependencies: none

README.md

@@ -0,0 +1,78 @@
+    ########################################################################
+    ##  __    __   _____   _____   _____   _____   _____   _   _   _____  ##
+    ## |  \  /  | |  ___| |  ___| |  ___| |  ___| |  _  | | \ | | |  ___| ##
+    ## |   \/   | | |___  | |___  | |___  | |     | | | | |  \| | | |___  ##
+    ## | |\__/| | |  ___| |___  | |  ___| | |     | | | | |     | |___  | ##
+    ## | |    | | | |___   ___| | | |___  | |___  | |_| | | |\  |  ___| | ##
+    ## |_|    |_| |_____| |_____| |_____| |_____| |_____| |_| \_| |_____| ##
+    ##                                                                    ##
+    ########################################################################
+
+MESECONS by Jeija and contributors
+
+Mezzee-what?
+------------
+[Mesecons](http://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay.
+
+Mesecons is a mod for [Minetest](http://minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks.
+
+Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics.
+
+OK, I want in.
+--------------
+Go get it!
+
+[DOWNLOADS PAGE](http://mesecons.net/downloads.php)
+
+Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary:
+
+1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer.
+2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one.
+3. Open up the Minetest mods folder - usually `/mods/`. If you see the `minetest` or folder inside of that, that is your mod folder instead.
+4. Copy the Mesecons folder into the mods folder.
+
+Don't like some parts of Mesecons? Open up the Mesecons folder and delete the subfolder containing the mod you don't want. If you didn't want movestones, for example, all you have to do is delete the `mesecons_movestones` folder and they will no longer be available.
+
+There are no dependencies - it will work right after installing!
+
+How do I use this thing?
+------------------------
+How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)?
+
+Or maybe a [comprehensive reference](http://mesecons.net/items.php) is your style?
+
+An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look?
+
+Want to get more into building? Why not check out the [Mesecons Laboratory](http://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders?
+
+Want to contribute to Mesecons itself? Check out the [source code](https://github.com/Jeija/minetest-mod-mesecons)!
+
+Who wrote it anyways?
+---------------------
+These awesome people made Mesecons possible!
+
+| Contributor     | Contribution                     |
+| --------------- | -------------------------------- |
+| Jat15           | Various tweaks.                  |
+| Jeija           | **Main developer! Everything.**  |
+| Jordach         | Noteblock sounds.                |
+| khonkhortistan  | Code, recipes, textures.         |
+| Kotolegokot     | Nodeboxes for items.             |
+| minerd247       | Textures.                        |
+| Nore/Novatux    | Code.                            |
+| RealBadAngel    | Fixes, improvements.             |
+| sfan5           | Code, recipes, textures.         |
+| suzenako        | Piston sounds.                   |
+| Uberi/Temperest | Code, textures, documentation.   |
+| VanessaE        | Code, recipes, textures, design. |
+| Whiskers75      | Logic gates implementation.      |
+
+There are also a whole bunch of other people helping with everything from code to testing and feedback. Mesecons would also not be possible without their help!
+
+Alright, how can I use it?
+--------------------------
+All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic). That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one.
+
+All code in this project is licensed under the LGPL version 3 or later. That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license.
+
+No warranty is provided, express or implied, for any part of the project.

mesecons/actionqueue.lua

@@ -0,0 +1,118 @@
+mesecon.queue.actions={} -- contains all ActionQueue actions
+
+function mesecon.queue:add_function(name, func)
+	mesecon.queue.funcs[name] = func
+end
+
+-- If add_action with twice the same overwritecheck and same position are called, the first one is overwritten
+-- use overwritecheck nil to never overwrite, but just add the event to the queue
+-- priority specifies the order actions are executed within one globalstep, highest first
+-- should be between 0 and 1
+function mesecon.queue:add_action(pos, func, params, time, overwritecheck, priority)
+	-- Create Action Table:
+	time = time or 0 -- time <= 0 --> execute, time > 0 --> wait time until execution
+	priority = priority or 1
+	local action = {	pos=mesecon.tablecopy(pos),
+				func=func,
+				params=mesecon.tablecopy(params or {}),
+				time=time,
+				owcheck=(overwritecheck and mesecon.tablecopy(overwritecheck)) or nil,
+				priority=priority}
+
+	local toremove = nil
+	-- Otherwise, add the action to the queue
+	if overwritecheck then -- check if old action has to be overwritten / removed:
+		for i, ac in ipairs(mesecon.queue.actions) do
+			if(mesecon.cmpPos(pos, ac.pos)
+			and mesecon.cmpAny(overwritecheck, ac.owcheck)) then
+				toremove = i
+				break
+			end
+		end
+	end
+
+	if (toremove ~= nil) then
+		table.remove(mesecon.queue.actions, toremove)
+	end
+
+	table.insert(mesecon.queue.actions, action)
+end
+
+-- execute the stored functions on a globalstep
+-- if however, the pos of a function is not loaded (get_node_or_nil == nil), do NOT execute the function
+-- this makes sure that resuming mesecons circuits when restarting minetest works fine
+-- However, even that does not work in some cases, that's why we delay the time the globalsteps
+-- start to be execute by 5 seconds
+local get_highest_priority = function (actions)
+	local highestp = -1
+	local highesti
+	for i, ac in ipairs(actions) do
+		if ac.priority > highestp then
+			highestp = ac.priority
+			highesti = i
+		end
+	end
+
+	return highesti
+end
+
+local m_time = 0
+local resumetime = mesecon.setting("resumetime", 4)
+minetest.register_globalstep(function (dtime)
+	m_time = m_time + dtime
+	-- don't even try if server has not been running for XY seconds; resumetime = time to wait
+	-- after starting the server before processing the ActionQueue, don't set this too low
+	if (m_time < resumetime) then return end
+	local actions = mesecon.tablecopy(mesecon.queue.actions)
+	local actions_now={}
+
+	mesecon.queue.actions = {}
+
+	-- sort actions into two categories:
+	-- those toexecute now (actions_now) and those to execute later (mesecon.queue.actions)
+	for i, ac in ipairs(actions) do
+		if ac.time > 0 then
+			ac.time = ac.time - dtime -- executed later
+			table.insert(mesecon.queue.actions, ac)
+		else
+			table.insert(actions_now, ac)
+		end
+	end
+
+	while(#actions_now > 0) do -- execute highest priorities first, until all are executed
+		local hp = get_highest_priority(actions_now)
+		mesecon.queue:execute(actions_now[hp])
+		table.remove(actions_now, hp)
+	end
+end)
+
+function mesecon.queue:execute(action)
+	mesecon.queue.funcs[action.func](action.pos, unpack(action.params))
+end
+
+
+-- Store and read the ActionQueue to / from a file
+-- so that upcoming actions are remembered when the game
+-- is restarted
+
+local wpath = minetest.get_worldpath()
+local function file2table(filename)
+	local f = io.open(filename, "r")
+	if f==nil then return {} end
+	local t = f:read("*all")
+	f:close()
+	if t=="" or t==nil then return {} end
+	return minetest.deserialize(t)
+end
+
+local function table2file(filename, table)
+	local f = io.open(filename, "w")
+	f:write(minetest.serialize(table))
+	f:close()
+end
+
+mesecon.queue.actions = file2table(wpath.."/mesecon_actionqueue")
+
+minetest.register_on_shutdown(function()
+	mesecon.queue.actions = table2file(wpath.."/mesecon_actionqueue", mesecon.queue.actions)
+end)

mesecons/init.lua

@@ -39,28 +39,26 @@
 --	}
 --}
 
-
 -- PUBLIC VARIABLES
 mesecon={} -- contains all functions and all global variables
-mesecon.actions_on={} -- Saves registered function callbacks for mesecon on | DEPRECATED
+mesecon.queue={} -- contains the ActionQueue
-mesecon.actions_off={} -- Saves registered function callbacks for mesecon off | DEPRECATED
+mesecon.queue.funcs={} -- contains all ActionQueue functions
-mesecon.actions_change={} -- Saves registered function callbacks for mesecon change | DEPRECATED
-mesecon.receptors={} --  saves all information about receptors  | DEPRECATED
-mesecon.effectors={} --  saves all information about effectors  | DEPRECATED
-mesecon.conductors={} -- saves all information about conductors | DEPRECATED
 
 -- Settings
 dofile(minetest.get_modpath("mesecons").."/settings.lua")
 
--- Presets (eg default rules)
-dofile(minetest.get_modpath("mesecons").."/presets.lua");
-
-
 -- Utilities like comparing positions,
 -- adding positions and rules,
 -- mostly things that make the source look cleaner
 dofile(minetest.get_modpath("mesecons").."/util.lua");
 
+-- Presets (eg default rules)
+dofile(minetest.get_modpath("mesecons").."/presets.lua");
+
+-- The ActionQueue
+-- Saves all the actions that have to be execute in the future
+dofile(minetest.get_modpath("mesecons").."/actionqueue.lua");
+
 -- Internal stuff
 -- This is the most important file
 -- it handles signal transmission and basically everything else
@@ -68,45 +66,72 @@ dofile(minetest.get_modpath("mesecons").."/util.lua");
 -- like calling action_on/off/change
 dofile(minetest.get_modpath("mesecons").."/internal.lua");
 
--- Deprecated stuff
--- To be removed in future releases
--- Currently there is nothing here
-dofile(minetest.get_modpath("mesecons").."/legacy.lua");
-
 -- API
 -- these are the only functions you need to remember
 
-function mesecon:receptor_on(pos, rules)
+mesecon.queue:add_function("receptor_on", function (pos, rules)
 	rules = rules or mesecon.rules.default
 
-	for _, rule in ipairs(rules) do
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
-		local np = mesecon:addPosRule(pos, rule)
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local link, rulename = mesecon:rules_link(pos, np, rules)
+		local np = mesecon.addPosRule(pos, rule)
-		if link then
+		-- if area is not loaded, keep trying
-			mesecon:turnon(np, rulename)
+		if minetest.get_node_or_nil(np) == nil then
+			mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+			return
 		end
 	end
+
+	-- execute action
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
+		for _, rulename in ipairs(rulenames) do
+			mesecon.turnon(np, rulename)
+		end
+	end
+end)
+
+function mesecon.receptor_on(pos, rules)
+	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
 end
 
-function mesecon:receptor_off(pos, rules)
+mesecon.queue:add_function("receptor_off", function (pos, rules)
 	rules = rules or mesecon.rules.default
 
-	for _, rule in ipairs(rules) do
+	-- if area (any of the rule targets) is not loaded, keep trying and call this again later
-		local np = mesecon:addPosRule(pos, rule)
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
-		local link, rulename = mesecon:rules_link(pos, np, rules)
+		local np = mesecon.addPosRule(pos, rule)
-		if link then
+		if minetest.get_node_or_nil(np) == nil then
-			if not mesecon:connected_to_receptor(np) then
+			mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
-				mesecon:turnoff(np, rulename)
+			return
+		end
+	end
+
+	for _, rule in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, rule)
+		local rulenames = mesecon.rules_link_rule_all(pos, rule)
+		for _, rulename in ipairs(rulenames) do
+			if not mesecon.connected_to_receptor(np, mesecon.invertRule(rule)) then
+				mesecon.turnoff(np, rulename)
 			else
-				mesecon:changesignal(np, minetest.env:get_node(np), rulename, mesecon.state.off)
+				mesecon.changesignal(np, minetest.get_node(np), rulename, mesecon.state.off, 2)
 			end
 		end
 	end
+end)
+
+function mesecon.receptor_off(pos, rules)
+	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
 end
 
 
 print("[OK] Mesecons")
 
+-- Deprecated stuff
+-- To be removed in future releases
+dofile(minetest.get_modpath("mesecons").."/legacy.lua");
+
 --The actual wires
 dofile(minetest.get_modpath("mesecons").."/wires.lua");
 

mesecons/internal.lua

@@ -1,62 +1,58 @@
 -- Internal.lua - The core of mesecons
 --
--- For more practical developer resources see mesecons.tk
+-- For more practical developer resources see http://mesecons.net/developers.php
 --
 -- Function overview
--- mesecon:get_effector(nodename)     --> Returns the mesecons.effector -specifictation in the nodedef by the nodename
+-- mesecon.get_effector(nodename)	--> Returns the mesecons.effector -specifictation in the nodedef by the nodename
--- mesecon:get_receptor(nodename)     --> Returns the mesecons.receptor -specifictation in the nodedef by the nodename
+-- mesecon.get_receptor(nodename)	--> Returns the mesecons.receptor -specifictation in the nodedef by the nodename
--- mesecon:get_conductor(nodename)    --> Returns the mesecons.conductor-specifictation in the nodedef by the nodename
+-- mesecon.get_conductor(nodename)	--> Returns the mesecons.conductor-specifictation in the nodedef by the nodename
--- mesecon:get_any_inputrules (node)  --> Returns the rules of a node if it is a conductor or an effector
+-- mesecon.get_any_inputrules (node)	--> Returns the rules of a node if it is a conductor or an effector
--- mesecon:get_any_outputrules (node) --> Returns the rules of a node if it is a conductor or a receptor
+-- mesecon.get_any_outputrules (node)	--> Returns the rules of a node if it is a conductor or a receptor
 
 -- RECEPTORS
--- mesecon:is_receptor(nodename)     --> Returns true if nodename is a receptor
+-- mesecon.is_receptor(nodename)	--> Returns true if nodename is a receptor
--- mesecon:is_receptor_on(nodename)  --> Returns true if nodename is an receptor with state = mesecon.state.on
+-- mesecon.is_receptor_on(nodename	--> Returns true if nodename is an receptor with state = mesecon.state.on
--- mesecon:is_receptor_off(nodename) --> Returns true if nodename is an receptor with state = mesecon.state.off
+-- mesecon.is_receptor_off(nodename)	--> Returns true if nodename is an receptor with state = mesecon.state.off
--- mesecon:receptor_get_rules(node)  --> Returns the rules of the receptor (mesecon.rules.default if none specified)
+-- mesecon.receptor_get_rules(node)	--> Returns the rules of the receptor (mesecon.rules.default if none specified)
 
 -- EFFECTORS
--- mesecon:is_effector(nodename)     --> Returns true if nodename is an effector
+-- mesecon.is_effector(nodename)	--> Returns true if nodename is an effector
--- mesecon:is_effector_on(nodename)  --> Returns true if nodename is an effector with nodedef.mesecons.effector.action_off
+-- mesecon.is_effector_on(nodename)	--> Returns true if nodename is an effector with nodedef.mesecons.effector.action_off
--- mesecon:is_effector_off(nodename) --> Returns true if nodename is an effector with nodedef.mesecons.effector.action_on
+-- mesecon.is_effector_off(nodename)	--> Returns true if nodename is an effector with nodedef.mesecons.effector.action_on
--- mesecon:effector_get_rules(node)  --> Returns the input rules of the effector (mesecon.rules.default if none specified)
+-- mesecon.effector_get_rules(node)	--> Returns the input rules of the effector (mesecon.rules.default if none specified)
 
 -- SIGNALS
--- mesecon:activate(pos, node)     --> Activates   the effector node at the specific pos (calls nodedef.mesecons.effector.action_on)
+-- mesecon.activate(pos, node, depth)				--> Activates   the effector node at the specific pos (calls nodedef.mesecons.effector.action_on), higher depths are executed later
--- mesecon:deactivate(pos, node)   --> Deactivates the effector node at the specific pos (calls nodedef.mesecons.effector.action_off)
+-- mesecon.deactivate(pos, node, depth)				--> Deactivates the effector node at the specific pos (calls nodedef.mesecons.effector.action_off), higher depths are executed later
--- mesecon:changesignal(pos, node, rulename, newstate) --> Changes     the effector node at the specific pos (calls nodedef.mesecons.effector.action_change)
+-- mesecon.changesignal(pos, node, rulename, newstate, depth)	--> Changes     the effector node at the specific pos (calls nodedef.mesecons.effector.action_change), higher depths are executed later
-
--- RULES
--- mesecon:add_rules(name, rules) | deprecated? --> Saves rules table by name
--- mesecon:get_rules(name, rules) | deprecated? --> Loads rules table with name
 
 -- CONDUCTORS
--- mesecon:is_conductor(nodename)     --> Returns true if nodename is a conductor
+-- mesecon.is_conductor(nodename)	--> Returns true if nodename is a conductor
--- mesecon:is_conductor_on(nodename)  --> Returns true if nodename is a conductor with state = mesecon.state.on
+-- mesecon.is_conductor_on(node		--> Returns true if node is a conductor with state = mesecon.state.on
--- mesecon:is_conductor_off(nodename) --> Returns true if nodename is a conductor with state = mesecon.state.off
+-- mesecon.is_conductor_off(node)	--> Returns true if node is a conductor with state = mesecon.state.off
--- mesecon:get_conductor_on(offstate) --> Returns the onstate  nodename of the conductor with the name offstate
+-- mesecon.get_conductor_on(node_off)	--> Returns the onstate  nodename of the conductor
--- mesecon:get_conductor_off(onstate) --> Returns the offstate nodename of the conductor with the name onstate
+-- mesecon.get_conductor_off(node_on)	--> Returns the offstate nodename of the conductor
--- mesecon:conductor_get_rules(node)  --> Returns the input+output rules of a conductor (mesecon.rules.default if none specified)
+-- mesecon.conductor_get_rules(node)	--> Returns the input+output rules of a conductor (mesecon.rules.default if none specified)
 
 -- HIGH-LEVEL Internals
--- mesecon:is_power_on(pos)             --> Returns true if pos emits power in any way
+-- mesecon.is_power_on(pos)				--> Returns true if pos emits power in any way
--- mesecon:is_power_off(pos)            --> Returns true if pos does not emit power in any way
+-- mesecon.is_power_off(pos)				--> Returns true if pos does not emit power in any way
--- mesecon:turnon(pos, rulename)        --> Returns true  whatever there is at pos. Calls itself for connected nodes (if pos is a conductor) --> recursive, the rulename is the name of the input rule that caused calling turnon
+-- mesecon.turnon(pos, link) 				--> link is the input rule that caused calling turnon, turns on every connected node, iterative
--- mesecon:turnoff(pos, rulename)       --> Turns off whatever there is at pos. Calls itself for connected nodes (if pos is a conductor) --> recursive, the rulename is the name of the input rule that caused calling turnoff
+-- mesecon.turnoff(pos, link)				--> link is the input rule that caused calling turnoff, turns off every connected node, iterative
--- mesecon:connected_to_receptor(pos)   --> Returns true if pos is connected to a receptor directly or via conductors; calls itself if pos is a conductor --> recursive
+-- mesecon.connected_to_receptor(pos, link)		--> Returns true if pos is connected to a receptor directly or via conductors, iterative
--- mesecon:rules_link(output, input, dug_outputrules) --> Returns true if outputposition + outputrules = inputposition and inputposition + inputrules = outputposition (if the two positions connect)
+-- mesecon.rules_link(output, input, dug_outputrules)	--> Returns true if outputposition + outputrules = inputposition and inputposition + inputrules = outputposition (if the two positions connect)
--- mesecon:rules_link_anydir(outp., inp., d_outpr.)   --> Same as rules mesecon:rules_link but also returns true if output and input are swapped
+-- mesecon.rules_link_anydir(outp., inp., d_outpr.)	--> Same as rules mesecon.rules_link but also returns true if output and input are swapped
--- mesecon:is_powered(pos)              --> Returns true if pos is powered by a receptor or a conductor
+-- mesecon.is_powered(pos)				--> Returns true if pos is powered by a receptor or a conductor
 
--- RULES ROTATION helpsers
+-- RULES ROTATION helpers
--- mesecon:rotate_rules_right(rules)
+-- mesecon.rotate_rules_right(rules)
--- mesecon:rotate_rules_left(rules)
+-- mesecon.rotate_rules_left(rules)
--- mesecon:rotate_rules_up(rules)
+-- mesecon.rotate_rules_up(rules)
--- mesecon:rotate_rules_down(rules)
+-- mesecon.rotate_rules_down(rules)
 -- These functions return rules that have been rotated in the specific direction
 
 -- General
-function mesecon:get_effector(nodename)
+function mesecon.get_effector(nodename)
 	if  minetest.registered_nodes[nodename]
 	and minetest.registered_nodes[nodename].mesecons
 	and minetest.registered_nodes[nodename].mesecons.effector then
@@ -64,7 +60,7 @@ function mesecon:get_effector(nodename)
 	end
 end
 
-function mesecon:get_receptor(nodename)
+function mesecon.get_receptor(nodename)
 	if  minetest.registered_nodes[nodename]
 	and minetest.registered_nodes[nodename].mesecons
 	and minetest.registered_nodes[nodename].mesecons.receptor then
@@ -72,7 +68,7 @@ function mesecon:get_receptor(nodename)
 	end
 end
 
-function mesecon:get_conductor(nodename)
+function mesecon.get_conductor(nodename)
 	if  minetest.registered_nodes[nodename]
 	and minetest.registered_nodes[nodename].mesecons
 	and minetest.registered_nodes[nodename].mesecons.conductor then
@@ -80,52 +76,55 @@ function mesecon:get_conductor(nodename)
 	end
 end
 
-function mesecon:get_any_outputrules (node)
+function mesecon.get_any_outputrules (node)
-	if mesecon:is_conductor(node.name) then
+	if mesecon.is_conductor(node.name) then
-		return mesecon:conductor_get_rules(node)
+		return mesecon.conductor_get_rules(node)
-	elseif mesecon:is_receptor(node.name) then
+	elseif mesecon.is_receptor(node.name) then
-		return mesecon:receptor_get_rules(node)
+		return mesecon.receptor_get_rules(node)
 	end
-	return false
 end
 
-function mesecon:get_any_inputrules (node)
+function mesecon.get_any_inputrules (node)
-	if mesecon:is_conductor(node.name) then
+	if mesecon.is_conductor(node.name) then
-		return mesecon:conductor_get_rules(node)
+		return mesecon.conductor_get_rules(node)
-	elseif mesecon:is_effector(node.name) then
+	elseif mesecon.is_effector(node.name) then
-		return mesecon:effector_get_rules(node)
+		return mesecon.effector_get_rules(node)
 	end
-	return false
+end
+
+function mesecon.get_any_rules (node)
+	return mesecon.mergetable(mesecon.get_any_inputrules(node) or {},
+		mesecon.get_any_outputrules(node) or {})
 end
 
 -- Receptors
 -- Nodes that can power mesecons
-function mesecon:is_receptor_on(nodename)
+function mesecon.is_receptor_on(nodename)
-	local receptor = mesecon:get_receptor(nodename)
+	local receptor = mesecon.get_receptor(nodename)
 	if receptor and receptor.state == mesecon.state.on then
 		return true
 	end
 	return false
 end
 
-function mesecon:is_receptor_off(nodename)
+function mesecon.is_receptor_off(nodename)
-	local receptor = mesecon:get_receptor(nodename)
+	local receptor = mesecon.get_receptor(nodename)
 	if receptor and receptor.state == mesecon.state.off then
 		return true
 	end
 	return false
 end
 
-function mesecon:is_receptor(nodename)
+function mesecon.is_receptor(nodename)
-	local receptor = mesecon:get_receptor(nodename)
+	local receptor = mesecon.get_receptor(nodename)
 	if receptor then
 		return true
 	end
 	return false
 end
 
-function mesecon:receptor_get_rules(node)
+function mesecon.receptor_get_rules(node)
-	local receptor = mesecon:get_receptor(node.name)
+	local receptor = mesecon.get_receptor(node.name)
 	if receptor then
 		local rules = receptor.rules
 		if type(rules) == 'function' then
@@ -140,32 +139,32 @@ end
 
 -- Effectors
 -- Nodes that can be powered by mesecons
-function mesecon:is_effector_on(nodename)
+function mesecon.is_effector_on(nodename)
-	local effector = mesecon:get_effector(nodename)
+	local effector = mesecon.get_effector(nodename)
 	if effector and effector.action_off then
 		return true
 	end
 	return false
 end
 
-function mesecon:is_effector_off(nodename)
+function mesecon.is_effector_off(nodename)
-	local effector = mesecon:get_effector(nodename)
+	local effector = mesecon.get_effector(nodename)
 	if effector and effector.action_on then
 		return true
 	end
 	return false
 end
 
-function mesecon:is_effector(nodename)
+function mesecon.is_effector(nodename)
-	local effector = mesecon:get_effector(nodename)
+	local effector = mesecon.get_effector(nodename)
 	if effector then
 		return true
 	end
 	return false
 end
 
-function mesecon:effector_get_rules(node)
+function mesecon.effector_get_rules(node)
-	local effector = mesecon:get_effector(node.name)
+	local effector = mesecon.get_effector(node.name)
 	if effector then
 		local rules = effector.rules
 		if type(rules) == 'function' then
@@ -177,83 +176,156 @@ function mesecon:effector_get_rules(node)
 	return mesecon.rules.default
 end
 
---Signals
+-- #######################
+-- # Signals (effectors) #
+-- #######################
+
+-- Activation:
+mesecon.queue:add_function("activate", function (pos, rulename)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
 
-function mesecon:activate(pos, node, rulename)
-	local effector = mesecon:get_effector(node.name)
 	if effector and effector.action_on then
-		effector.action_on (pos, node, rulename)
+		effector.action_on(pos, node, rulename)
 	end
+end)
+
+function mesecon.activate(pos, node, rulename, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.activate(pos, node, rule, depth + 1)
+		end
+		return
+	end
+	mesecon.queue:add_action(pos, "activate", {rulename}, nil, rulename, 1 / depth)
 end
 
-function mesecon:deactivate(pos, node, rulename)
+
-	local effector = mesecon:get_effector(node.name)
+-- Deactivation
+mesecon.queue:add_function("deactivate", function (pos, rulename)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
+
 	if effector and effector.action_off then
-		effector.action_off (pos, node, rulename)
+		effector.action_off(pos, node, rulename)
 	end
+end)
+
+function mesecon.deactivate(pos, node, rulename, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.deactivate(pos, node, rule, depth + 1)
+		end
+		return
+	end
+	mesecon.queue:add_action(pos, "deactivate", {rulename}, nil, rulename, 1 / depth)
 end
 
-function mesecon:changesignal(pos, node, rulename, newstate)
+
-	local effector = mesecon:get_effector(node.name)
+-- Change
+mesecon.queue:add_function("change", function (pos, rulename, changetype)
+	local node = minetest.get_node(pos)
+	local effector = mesecon.get_effector(node.name)
+
 	if effector and effector.action_change then
-		effector.action_change (pos, node, rulename, newstate)
+		effector.action_change(pos, node, rulename, changetype)
 	end
-end
+end)
 
---Rules
+function mesecon.changesignal(pos, node, rulename, newstate, depth)
+	if rulename == nil then
+		for _,rule in ipairs(mesecon.effector_get_rules(node)) do
+			mesecon.changesignal(pos, node, rule, newstate, depth + 1)
+		end
+		return
+	end
 
-function mesecon:add_rules(name, rules)
+	-- Include "change" in overwritecheck so that it cannot be overwritten
-	mesecon.rules[name] = rules
+	-- by "active" / "deactivate" that will be called upon the node at the same time.
-end
+	local overwritecheck = {"change", rulename}
-
+	mesecon.queue:add_action(pos, "change", {rulename, newstate}, nil, overwritecheck, 1 / depth)
-function mesecon:get_rules(name)
-	return mesecon.rules[name]
 end
 
 -- Conductors
 
-function mesecon:is_conductor_on(nodename)
+function mesecon.is_conductor_on(node, rulename)
-	local conductor = mesecon:get_conductor(nodename)
+	local conductor = mesecon.get_conductor(node.name)
-	if conductor and conductor.state == mesecon.state.on then
+	if conductor then
-		return true
+		if conductor.state then
+			return conductor.state == mesecon.state.on
+		end
+		if conductor.states then
+			if not rulename then
+				return mesecon.getstate(node.name, conductor.states) ~= 1
+			end
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node))
+			local binstate = mesecon.getbinstate(node.name, conductor.states)
+			return mesecon.get_bit(binstate, bit)
+		end
 	end
 	return false
 end
 
-function mesecon:is_conductor_off(nodename)
+function mesecon.is_conductor_off(node, rulename)
-	local conductor = mesecon:get_conductor(nodename)
+	local conductor = mesecon.get_conductor(node.name)
-	if conductor and conductor.state == mesecon.state.off then
+	if conductor then
-		return true
+		if conductor.state then
+			return conductor.state == mesecon.state.off
+		end
+		if conductor.states then
+			if not rulename then
+				return mesecon.getstate(node.name, conductor.states) == 1
+			end
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node))
+			local binstate = mesecon.getbinstate(node.name, conductor.states)
+			return not mesecon.get_bit(binstate, bit)
+		end
 	end
 	return false
 end
 
-function mesecon:is_conductor(nodename)
+function mesecon.is_conductor(nodename)
-	local conductor = mesecon:get_conductor(nodename)
+	local conductor = mesecon.get_conductor(nodename)
 	if conductor then
 		return true
 	end
 	return false
 end
 
-function mesecon:get_conductor_on(offstate)
+function mesecon.get_conductor_on(node_off, rulename)
-	local conductor = mesecon:get_conductor(offstate)
+	local conductor = mesecon.get_conductor(node_off.name)
 	if conductor then
-		return conductor.onstate
+		if conductor.onstate then
+			return conductor.onstate
+		end
+		if conductor.states then
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node_off))
+			local binstate = mesecon.getbinstate(node_off.name, conductor.states)
+			binstate = mesecon.set_bit(binstate, bit, "1")
+			return conductor.states[tonumber(binstate,2)+1]
+		end
 	end
-	return false
+	return offstate
 end
 
-function mesecon:get_conductor_off(onstate)
+function mesecon.get_conductor_off(node_on, rulename)
-	local conductor = mesecon:get_conductor(onstate)
+	local conductor = mesecon.get_conductor(node_on.name)
 	if conductor then
-		return conductor.offstate
+		if conductor.offstate then
+			return conductor.offstate
+		end
+		if conductor.states then
+			local bit = mesecon.rule2bit(rulename, mesecon.conductor_get_rules(node_on))
+			local binstate = mesecon.getbinstate(node_on.name, conductor.states)
+			binstate = mesecon.set_bit(binstate, bit, "0")
+			return conductor.states[tonumber(binstate,2)+1]
+		end
 	end
-	return false
+	return onstate
 end
 
-function mesecon:conductor_get_rules(node)
+function mesecon.conductor_get_rules(node)
-	local conductor = mesecon:get_conductor(node.name)
+	local conductor = mesecon.get_conductor(node.name)
 	if conductor then
 		local rules = conductor.rules
 		if type(rules) == 'function' then
@@ -267,81 +339,127 @@ end
 
 -- some more general high-level stuff
 
-function mesecon:is_power_on(pos)
+function mesecon.is_power_on(pos, rulename)
-	local node = minetest.env:get_node(pos)
+	local node = minetest.get_node(pos)
-	if mesecon:is_conductor_on(node.name) or mesecon:is_receptor_on(node.name) then
+	if mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name) then
 		return true
 	end
 	return false
 end
 
-function mesecon:is_power_off(pos)
+function mesecon.is_power_off(pos, rulename)
-	local node = minetest.env:get_node(pos)
+	local node = minetest.get_node(pos)
-	if mesecon:is_conductor_off(node.name) or mesecon:is_receptor_off(node.name) then
+	if mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name) then
 		return true
 	end
 	return false
 end
 
-function mesecon:turnon(pos, rulename)
+function mesecon.turnon(pos, link)
-	local node = minetest.env:get_node(pos)
+	local frontiers = {{pos = pos, link = link}}
 
-	if mesecon:is_conductor_off(node.name) then
+	local depth = 1
-		local rules = mesecon:conductor_get_rules(node)
+	while frontiers[depth] do
-		minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name), param2 = node.param2})
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
 
-		for _, rule in ipairs(rules) do
+		-- area not loaded, postpone action
-			local np = mesecon:addPosRule(pos, rule)
+		if not node then
-			local link, rulename = mesecon:rules_link(pos, np)
+			mesecon.queue:add_action(f.pos, "turnon", {link}, nil, true)
+		elseif mesecon.is_conductor_off(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
 
-			if link then
+			minetest.swap_node(f.pos, {name = mesecon.get_conductor_on(node, f.link),
-				mesecon:turnon(np, rulename)
+				param2 = node.param2})
+
+			-- call turnon on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = mesecon.addPosRule(f.pos, r)
+
+				-- area not loaded, postpone action
+				if not minetest.get_node_or_nil(np) then
+					mesecon.queue:add_action(np, "turnon", {rulename},
+						nil, true)
+				else
+					local links = mesecon.rules_link_rule_all(f.pos, r)
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = np, link = l})
+					end
+				end
+			end
+		elseif mesecon.is_effector(node.name) then
+			mesecon.changesignal(f.pos, node, f.link, mesecon.state.on, depth)
+			if mesecon.is_effector_off(node.name) then
+				mesecon.activate(f.pos, node, f.link, depth)
 			end
 		end
-	elseif mesecon:is_effector(node.name) then
+		depth = depth + 1
-		mesecon:changesignal(pos, node, rulename, mesecon.state.on)
-		if mesecon:is_effector_off(node.name) then
-			mesecon:activate(pos, node, rulename)
-		end
 	end
 end
 
-function mesecon:turnoff(pos, rulename)
+mesecon.queue:add_function("turnon", function (pos, rulename, recdepth)
-	local node = minetest.env:get_node(pos)
+	mesecon.turnon(pos, rulename, recdepth)
+end)
 
-	if mesecon:is_conductor_on(node.name) then
+function mesecon.turnoff(pos, link)
-		local rules = mesecon:conductor_get_rules(node)
+	local frontiers = {{pos = pos, link = link}}
-		minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name), param2 = node.param2})
 
-		for _, rule in ipairs(rules) do
+	local depth = 1
-			local np = mesecon:addPosRule(pos, rule)
+	while frontiers[depth] do
-			local link, rulename = mesecon:rules_link(pos, np)
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
 
-			if link then
+		-- area not loaded, postpone action
-				mesecon:turnoff(np, rulename)
+		if not node then
+			mesecon.queue:add_action(f.pos, "turnoff", {link}, nil, true)
+		elseif mesecon.is_conductor_on(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
+
+			minetest.swap_node(f.pos, {name = mesecon.get_conductor_off(node, f.link),
+				param2 = node.param2})
+
+			-- call turnoff on neighbors: normal rules
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
+				local np = mesecon.addPosRule(f.pos, r)
+
+				-- area not loaded, postpone action
+				if not minetest.get_node_or_nil(np) then
+					mesecon.queue:add_action(np, "turnoff", {rulename},
+						nil, true)
+				else
+					local links = mesecon.rules_link_rule_all(f.pos, r)
+					for _, l in ipairs(links) do
+						table.insert(frontiers, {pos = np, link = l})
+					end
+				end
+			end
+		elseif mesecon.is_effector(node.name) then
+			mesecon.changesignal(f.pos, node, f.link, mesecon.state.off, depth)
+			if mesecon.is_effector_on(node.name) and not mesecon.is_powered(f.pos) then
+				mesecon.deactivate(f.pos, node, f.link, depth)
 			end
 		end
-	elseif mesecon:is_effector(node.name) then
+		depth = depth + 1
-		mesecon:changesignal(pos, node, rulename, mesecon.state.off)
-		if mesecon:is_effector_on(node.name)
-		and not mesecon:is_powered(pos) then
-			mesecon:deactivate(pos, node, rulename)
-		end
 	end
 end
 
+mesecon.queue:add_function("turnoff", function (pos, rulename, recdepth)
+	mesecon.turnoff(pos, rulename, recdepth)
+end)
 
-function mesecon:connected_to_receptor(pos)
+
-	local node = minetest.env:get_node(pos)
+function mesecon.connected_to_receptor(pos, link)
+	local node = minetest.get_node(pos)
 
 	-- Check if conductors around are connected
-	local rules = mesecon:get_any_inputrules(node)
+	local rules = mesecon.get_any_inputrules(node)
 	if not rules then return false end
 
-	for _, rule in ipairs(rules) do
+	for _, rule in ipairs(mesecon.rule2meta(link, rules)) do
-		local np = mesecon:addPosRule(pos, rule)
+		local links = mesecon.rules_link_rule_all_inverted(pos, rule)
-		if mesecon:rules_link(np, pos) then
+		for _, l in ipairs(links) do
-			if mesecon:find_receptor_on(np, {}) then
+			local np = mesecon.addPosRule(pos, l)
+			if mesecon.find_receptor_on(np, mesecon.invertRule(l)) then
 				return true
 			end
 		end
@@ -350,53 +468,56 @@ function mesecon:connected_to_receptor(pos)
 	return false
 end
 
-function mesecon:find_receptor_on(pos, checked)
+function mesecon.find_receptor_on(pos, link)
-	-- find out if node has already been checked (to prevent from endless loop)
+	local frontiers = {{pos = pos, link = link}}
-	for _, cp in ipairs(checked) do
+	local checked = {}
-		if mesecon:cmpPos(cp, pos) then
-			return false, checked
-		end
-	end
 
-	-- add current position to checked
+	-- List of positions that have been searched for onstate receptors
-	table.insert(checked, {x=pos.x, y=pos.y, z=pos.z})
+	local depth = 1
-	local node = minetest.env:get_node(pos)
+	while frontiers[depth] do
+		local f = frontiers[depth]
+		local node = minetest.get_node_or_nil(f.pos)
 
-	if mesecon:is_receptor_on(node.name) then
+		if not node then return false end
-		return true
+		if mesecon.is_receptor_on(node.name) then return true end
-	end
+		if mesecon.is_conductor_on(node, f.link) then
+			local rules = mesecon.conductor_get_rules(node)
 
-	if mesecon:is_conductor(node.name) then
+			-- call turnoff on neighbors: normal rules
-		local rules = mesecon:conductor_get_rules(node)
+			for _, r in ipairs(mesecon.rule2meta(f.link, rules)) do
-		for _, rule in ipairs(rules) do
+				local np = mesecon.addPosRule(f.pos, r)
-			local np = mesecon:addPosRule(pos, rule)
+
-			if mesecon:rules_link(np, pos) then
+				local links = mesecon.rules_link_rule_all_inverted(f.pos, r)
-				if mesecon:find_receptor_on(np, checked) then
+				for _, l in ipairs(links) do
-					return true
+					local checkedstring = np.x..np.y..np.z..l.x..l.y..l.z
+					if not checked[checkedstring] then
+						table.insert(frontiers, {pos = np, link = l})
+						checked[checkedstring] = true
+					end
 				end
 			end
+			
 		end
+		depth = depth + 1
 	end
-
-	return false
 end
 
-function mesecon:rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
+function mesecon.rules_link(output, input, dug_outputrules) --output/input are positions (outputrules optional, used if node has been dug), second return value: the name of the affected input rule
-	local outputnode = minetest.env:get_node(output)
+	local outputnode = minetest.get_node(output)
-	local inputnode = minetest.env:get_node(input)
+	local inputnode = minetest.get_node(input)
-	local outputrules = dug_outputrules or mesecon:get_any_outputrules (outputnode)
+	local outputrules = dug_outputrules or mesecon.get_any_outputrules (outputnode)
-	local inputrules = mesecon:get_any_inputrules (inputnode)
+	local inputrules = mesecon.get_any_inputrules (inputnode)
 	if not outputrules or not inputrules then
 		return
 	end
 
-	for _, outputrule in ipairs(outputrules) do
+	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
 		-- Check if output sends to input
-		if mesecon:cmpPos(mesecon:addPosRule(output, outputrule), input) then
+		if mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
-			for _, inputrule in ipairs(inputrules) do
+			for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
 				-- Check if input accepts from output
-				if  mesecon:cmpPos(mesecon:addPosRule(input, inputrule), output) then
+				if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
-					return true, inputrule.name
+					return true, inputrule
 				end
 			end
 		end
@@ -404,69 +525,128 @@ function mesecon:rules_link(output, input, dug_outputrules) --output/input are p
 	return false
 end
 
-function mesecon:rules_link_anydir(pos1, pos2)
+function mesecon.rules_link_rule_all(output, rule)
-	return mesecon:rules_link(pos1, pos2) or mesecon:rules_link(pos2, pos1)
+	local input = mesecon.addPosRule(output, rule)
-end
+	local inputnode = minetest.get_node(input)
-
+	local inputrules = mesecon.get_any_inputrules (inputnode)
-function mesecon:is_powered(pos)
+	if not inputrules then
-	local node = minetest.env:get_node(pos)
+		return {}
-	local rules = mesecon:get_any_inputrules(node)
+	end
-	if not rules then return false end
+	local rules = {}
-
+	
-	for _, rule in ipairs(rules) do
+	for _, inputrule in ipairs(mesecon.flattenrules(inputrules)) do
-		local np = mesecon:addPosRule(pos, rule)
+		-- Check if input accepts from output
-		local nn = minetest.env:get_node(np)
+		if  mesecon.cmpPos(mesecon.addPosRule(input, inputrule), output) then
-
+			table.insert(rules, inputrule)
-		if (mesecon:is_conductor_on (nn.name) or mesecon:is_receptor_on (nn.name))
-		and mesecon:rules_link(np, pos) then
-			return true
 		end
 	end
+	return rules
+end
+
+function mesecon.rules_link_rule_all_inverted(input, rule)
+	--local irule = mesecon.invertRule(rule)
+	local output = mesecon.addPosRule(input, rule)
+	local outputnode = minetest.get_node(output)
+	local outputrules = mesecon.get_any_outputrules (outputnode)
+	if not outputrules then
+		return {}
+	end
+	local rules = {}
 	
-	return false
+	for _, outputrule in ipairs(mesecon.flattenrules(outputrules)) do
+		if  mesecon.cmpPos(mesecon.addPosRule(output, outputrule), input) then
+			table.insert(rules, mesecon.invertRule(outputrule))
+		end
+	end
+	return rules
+end
+
+function mesecon.rules_link_anydir(pos1, pos2)
+	return mesecon.rules_link(pos1, pos2) or mesecon.rules_link(pos2, pos1)
+end
+
+function mesecon.is_powered(pos, rule)
+	local node = minetest.get_node(pos)
+	local rules = mesecon.get_any_inputrules(node)
+	if not rules then return false end
+
+	-- List of nodes that send out power to pos
+	local sourcepos = {}
+
+	if not rule then
+		for _, rule in ipairs(mesecon.flattenrules(rules)) do
+			local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
+			for _, rname in ipairs(rulenames) do
+				local np = mesecon.addPosRule(pos, rname)
+				local nn = minetest.get_node(np)
+				if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname))
+				or mesecon.is_receptor_on (nn.name)) then
+					table.insert(sourcepos, np)
+				end
+			end
+		end
+	else
+		local rulenames = mesecon.rules_link_rule_all_inverted(pos, rule)
+		for _, rname in ipairs(rulenames) do
+			local np = mesecon.addPosRule(pos, rname)
+			local nn = minetest.get_node(np)
+			if (mesecon.is_conductor_on (nn, mesecon.invertRule(rname))
+			or mesecon.is_receptor_on (nn.name)) then
+				table.insert(sourcepos, np)
+			end
+		end
+	end
+
+	-- Return FALSE if not powered, return list of sources if is powered
+	if (#sourcepos == 0) then return false
+	else return sourcepos end
 end
 
 --Rules rotation Functions:
-function mesecon:rotate_rules_right(rules)
+function mesecon.rotate_rules_right(rules)
 	local nr = {}
 	for i, rule in ipairs(rules) do
 		table.insert(nr, {
 			x = -rule.z, 
 			y =  rule.y, 
-			z =  rule.x})
+			z =  rule.x,
+			name = rule.name})
 	end
 	return nr
 end
 
-function mesecon:rotate_rules_left(rules)
+function mesecon.rotate_rules_left(rules)
 	local nr = {}
 	for i, rule in ipairs(rules) do
 		table.insert(nr, {
 			x =  rule.z, 
 			y =  rule.y, 
-			z = -rule.x})
+			z = -rule.x,
+			name = rule.name})
 	end
 	return nr
 end
 
-function mesecon:rotate_rules_down(rules)
+function mesecon.rotate_rules_down(rules)
 	local nr = {}
 	for i, rule in ipairs(rules) do
 		table.insert(nr, {
 			x = -rule.y, 
 			y =  rule.x, 
-			z =  rule.z})
+			z =  rule.z,
+			name = rule.name})
 	end
 	return nr
 end
 
-function mesecon:rotate_rules_up(rules)
+function mesecon.rotate_rules_up(rules)
 	local nr = {}
 	for i, rule in ipairs(rules) do
 		table.insert(nr, {
 			x =  rule.y, 
 			y = -rule.x, 
-			z =  rule.z})
+			z =  rule.z,
+			name = rule.name})
 	end
 	return nr
 end

mesecons/legacy.lua

@@ -0,0 +1,30 @@
+-- Ugly hack to prevent breaking compatibility with other mods
+-- Just remove the following two functions to delete the hack, to be done when other mods have updated
+function mesecon.receptor_on(self, pos, rules)
+	if (self.receptor_on) then
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_on.")
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
+		print("[Mesecons]          to use mesecon.receptor_on instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
+	end
+	mesecon.queue:add_action(pos, "receptor_on", {rules}, nil, rules)
+end
+
+function mesecon.receptor_off(self, pos, rules)
+	if (self.receptor_off) then
+		print("[Mesecons] Warning: A mod with mesecon support called mesecon:receptor_off.")
+		print("[Mesecons]          If you are the programmer of this mod, please update it ")
+		print("[Mesecons]          to use mesecon.receptor_off instead. mesecon:* is deprecated")
+		print("[Mesecons]          Otherwise, please make sure you're running the latest version")
+		print("[Mesecons]          of that mod and inform the mod creator.")
+	else
+		rules = pos
+		pos = self
+	end
+	mesecon.queue:add_action(pos, "receptor_off", {rules}, nil, rules)
+end
+

mesecons/oldwires.lua

@@ -29,7 +29,7 @@ minetest.register_node("mesecons:mesecon_on", {
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
 	},
 	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
-	drop = '"mesecons:mesecon_off" 1',
+	drop = "mesecons:mesecon_off 1",
 	light_source = LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,

mesecons/presets.lua

@@ -15,6 +15,8 @@ mesecon.rules.default =
  {x=0,  y=1,  z=-1},
  {x=0,  y=-1, z=-1}}
 
+mesecon.rules.pplate = mesecon.mergetable(mesecon.rules.default, {{x=0, y=-2, z=0}})
+
 mesecon.rules.buttonlike =
 {{x = 1,  y = 0, z = 0},
  {x = 1,  y = 1, z = 0},
@@ -32,11 +34,11 @@ mesecon.rules.flat =
 mesecon.rules.buttonlike_get = function(node)
 	local rules = mesecon.rules.buttonlike
 	if node.param2 == 2 then
-		rules=mesecon:rotate_rules_left(rules)
+		rules=mesecon.rotate_rules_left(rules)
 	elseif node.param2 == 3 then
-		rules=mesecon:rotate_rules_right(mesecon:rotate_rules_right(rules))
+		rules=mesecon.rotate_rules_right(mesecon.rotate_rules_right(rules))
 	elseif node.param2 == 0 then
-		rules=mesecon:rotate_rules_right(rules)
+		rules=mesecon.rotate_rules_right(rules)
 	end
 	return rules
 end

mesecons/services.lua

@@ -1,28 +1,94 @@
+-- Dig and place services
+
 mesecon.on_placenode = function (pos, node)
-	if mesecon:is_receptor_on(node.name) then
+	mesecon.update_autoconnect(pos, node)
-		mesecon:receptor_on(pos, mesecon:receptor_get_rules(node))
+
-	elseif mesecon:is_powered(pos) then
+	-- Receptors: Send on signal when active
-		if mesecon:is_conductor(node.name) then
+	if mesecon.is_receptor_on(node.name) then
-			mesecon:turnon (pos)
+		mesecon.receptor_on(pos, mesecon.receptor_get_rules(node))
-			mesecon:receptor_on (pos, mesecon:conductor_get_rules(node))
+	end
-		else
+
-			mesecon:changesignal(pos, node)
+	-- Conductors: Send turnon signal when powered or replace by respective offstate conductor
-			mesecon:activate(pos, node)
+	-- if placed conductor is an onstate one
+	if mesecon.is_conductor(node.name) then
+		local sources = mesecon.is_powered(pos)
+		if sources then
+			-- also call receptor_on if itself is powered already, so that neighboring
+			-- conductors will be activated (when pushing an on-conductor with a piston)
+			for _, s in ipairs(sources) do
+				local rule = {x = pos.x - s.x, y = pos.y - s.y, z = pos.z - s.z}
+				mesecon.turnon(pos, rule)
+			end
+			--mesecon.receptor_on (pos, mesecon.conductor_get_rules(node))
+		elseif mesecon.is_conductor_on(node) then
+			minetest.swap_node(pos, {name = mesecon.get_conductor_off(node)})
+		end
+	end
+
+	-- Effectors: Send changesignal and activate or deactivate
+	if mesecon.is_effector(node.name) then
+		local powered_rules = {}
+
+		-- for each input rule, check if powered
+		for _, r in ipairs(mesecon.effector_get_rules(node)) do
+			local powered = mesecon.is_powered(pos, r)
+			if powered then table.insert(powered_rules, r) end
+
+			local state = powered and mesecon.state.on or mesecon.state.off
+			mesecon.changesignal(pos, node, r, state, 1)
+		end
+
+		if (#powered_rules > 0) then
+			for _, r in ipairs(powered_rules) do
+				mesecon.activate(pos, node, r, 1)
+			end
 		end
-	elseif mesecon:is_conductor_on(node.name) then
-		mesecon:swap_node(pos, mesecon:get_conductor_off(node.name))
-	elseif mesecon:is_effector_on (node.name) then
-		mesecon:deactivate(pos, node)
 	end
 end
 
 mesecon.on_dignode = function (pos, node)
-	if mesecon:is_conductor_on(node.name) then
+	if mesecon.is_conductor_on(node) then
-		mesecon:receptor_off(pos, mesecon:conductor_get_rules(node))
+		mesecon.receptor_off(pos, mesecon.conductor_get_rules(node))
-	elseif mesecon:is_receptor_on(node.name) then
+	elseif mesecon.is_receptor_on(node.name) then
-		mesecon:receptor_off(pos, mesecon:receptor_get_rules(node))
+		mesecon.receptor_off(pos, mesecon.receptor_get_rules(node))
 	end
+	mesecon.queue:add_action(pos, "update_autoconnect", {node})
 end
 
+mesecon.queue:add_function("update_autoconnect", mesecon.update_autoconnect)
+
 minetest.register_on_placenode(mesecon.on_placenode)
 minetest.register_on_dignode(mesecon.on_dignode)
+
+-- Overheating service for fast circuits
+
+-- returns true if heat is too high
+mesecon.do_overheat = function(pos)
+	local meta = minetest.get_meta(pos)
+	local heat = meta:get_int("heat") or 0
+
+	heat = heat + 1
+	meta:set_int("heat", heat)
+
+	if heat < mesecon.setting("overheat_max", 20) then
+		mesecon.queue:add_action(pos, "cooldown", {}, 1, nil, 0)
+	else
+		return true
+	end
+
+	return false
+end
+
+
+mesecon.queue:add_function("cooldown", function (pos)
+	if minetest.get_item_group(minetest.get_node(pos).name, "overheat") == 0 then
+		return -- node has been moved, this one does not use overheating - ignore
+	end
+
+	local meta = minetest.get_meta(pos)
+	local heat = meta:get_int("heat")
+
+	if (heat > 0) then
+		meta:set_int("heat", heat - 1)
+	end
+end)

mesecons/settings.lua

@@ -1,7 +1,10 @@
 -- SETTINGS
-BLINKY_PLANT_INTERVAL = 3
+function mesecon.setting(setting, default)
-NEW_STYLE_WIRES  = true  -- true = new nodebox wires, false = old raillike wires
+	if type(default) == "bool" then
-PRESSURE_PLATE_INTERVAL = 0.1
+		return minetest.setting_getbool("mesecon."..setting) or default
-OBJECT_DETECTOR_RADIUS = 6
+	elseif type(default) == "string" then
-PISTON_MAXIMUM_PUSH = 15
+		return minetest.setting_get("mesecon."..setting) or default
-MOVESTONE_MAXIMUM_PUSH = 100
+	elseif type(default) == "number" then
+		return tonumber(minetest.setting_get("mesecon."..setting) or default)
+	end
+end

mesecons/util.lua

@@ -1,24 +1,211 @@
-function mesecon:swap_node(pos, name)
+function mesecon.move_node(pos, newpos)
-	local node = minetest.env:get_node(pos)
+	local node = minetest.get_node(pos)
-	local data = minetest.env:get_meta(pos):to_table()
+	local meta = minetest.get_meta(pos):to_table()
-	node.name = name
+	minetest.remove_node(pos)
-	minetest.env:add_node(pos, node)
+	minetest.add_node(newpos, node)
-	minetest.env:get_meta(pos):from_table(data)
+	minetest.get_meta(pos):from_table(meta)
 end
 
-function mesecon:move_node(pos, newpos)
+function mesecon.flattenrules(allrules)
-	local node = minetest.env:get_node(pos)
+--[[
-	local meta = minetest.env:get_meta(pos):to_table()
+	{
-	minetest.env:remove_node(pos)
+		{
-	minetest.env:add_node(newpos, node)
+			{xyz},
-	minetest.env:get_meta(pos):from_table(meta)
+			{xyz},
+		},
+		{
+			{xyz},
+			{xyz},
+		},
+	}
+--]]
+	if allrules[1] and
+	   allrules[1].x then
+		return allrules
+	end
+
+	local shallowrules = {}
+	for _, metarule in ipairs( allrules) do
+	for _,     rule in ipairs(metarule ) do
+		table.insert(shallowrules, rule)
+	end
+	end
+	return shallowrules
+--[[
+	{
+		{xyz},
+		{xyz},
+		{xyz},
+		{xyz},
+	}
+--]]
 end
 
+function mesecon.rule2bit(findrule, allrules)
+	--get the bit of the metarule the rule is in, or bit 1
+	if (allrules[1] and
+	    allrules[1].x) or
+	    not findrule then
+		return 1
+	end
+	for m,metarule in ipairs( allrules) do
+	for _,    rule in ipairs(metarule ) do
+		if mesecon.cmpPos(findrule, rule) then
+			return m
+		end
+	end
+	end
+end
 
-function mesecon:addPosRule(p, r)
+function mesecon.rule2metaindex(findrule, allrules)
+	--get the metarule the rule is in, or allrules
+	if allrules[1].x then
+		return nil
+	end
+
+	if not(findrule) then
+		return mesecon.flattenrules(allrules)
+	end
+
+	for m, metarule in ipairs( allrules) do
+	for _,     rule in ipairs(metarule ) do
+		if mesecon.cmpPos(findrule, rule) then
+			return m
+		end
+	end
+	end
+end
+
+function mesecon.rule2meta(findrule, allrules)
+	if #allrules == 0 then return {} end
+
+	local index = mesecon.rule2metaindex(findrule, allrules)
+	if index == nil then
+		if allrules[1].x then
+			return allrules
+		else
+			return {}
+		end
+	end
+	return allrules[index]
+end
+
+function mesecon.dec2bin(n)
+	local x, y = math.floor(n / 2), n % 2
+	if (n > 1) then
+		return mesecon.dec2bin(x)..y
+	else
+		return ""..y
+	end
+end
+
+function mesecon.getstate(nodename, states)
+	for state, name in ipairs(states) do
+		if name == nodename then
+			return state
+		end
+	end
+	error(nodename.." doesn't mention itself in "..dump(states))
+end
+
+function mesecon.getbinstate(nodename, states)
+	return mesecon.dec2bin(mesecon.getstate(nodename, states)-1)
+end
+
+function mesecon.get_bit(binary,bit)
+	bit = bit or 1
+	local c = binary:len()-(bit-1)
+	return binary:sub(c,c) == "1"
+end
+
+function mesecon.set_bit(binary,bit,value)
+	if value == "1" then
+		if not mesecon.get_bit(binary,bit) then
+			return mesecon.dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
+		end
+	elseif value == "0" then
+		if mesecon.get_bit(binary,bit) then
+			return mesecon.dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
+		end
+	end
+	return binary
+	
+end
+
+function mesecon.invertRule(r)
+	return {x = -r.x, y = -r.y, z = -r.z}
+end
+
+function mesecon.addPosRule(p, r)
 	return {x = p.x + r.x, y = p.y + r.y, z = p.z + r.z}
 end
 
-function mesecon:cmpPos(p1, p2)
+function mesecon.cmpPos(p1, p2)
 	return (p1.x == p2.x and p1.y == p2.y and p1.z == p2.z)
 end
+
+function mesecon.tablecopy(table) -- deep table copy
+	if type(table) ~= "table" then return table end -- no need to copy
+	local newtable = {}
+
+	for idx, item in pairs(table) do
+		if type(item) == "table" then
+			newtable[idx] = mesecon.tablecopy(item)
+		else
+			newtable[idx] = item
+		end
+	end
+
+	return newtable
+end
+
+function mesecon.cmpAny(t1, t2)
+	if type(t1) ~= type(t2) then return false end
+	if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end
+
+	for i, e in pairs(t1) do
+		if not mesecon.cmpAny(e, t2[i]) then return false end
+	end
+
+	return true
+end
+
+-- does not overwrite values; number keys (ipairs) are appended, not overwritten
+function mesecon.mergetable(source, dest)
+	local rval = mesecon.tablecopy(dest)
+
+	for k, v in pairs(source) do
+		rval[k] = dest[k] or mesecon.tablecopy(v)
+	end
+	for i, v in ipairs(source) do
+		table.insert(rval, mesecon.tablecopy(v))
+	end
+
+	return rval
+end
+
+function mesecon.register_node(name, spec_common, spec_off, spec_on)
+	spec_common.drop = spec_common.drop or name .. "_off"
+	spec_common.__mesecon_basename = name
+	spec_on.__mesecon_state = "on"
+	spec_off.__mesecon_state = "off"
+
+	spec_on = mesecon.mergetable(spec_common, spec_on);
+	spec_off = mesecon.mergetable(spec_common, spec_off);
+
+	minetest.register_node(name .. "_on", spec_on)
+	minetest.register_node(name .. "_off", spec_off)
+end
+
+-- swap onstate and offstate nodes, returns new state
+function mesecon.flipstate(pos, node)
+	local nodedef = minetest.registered_nodes[node.name]
+	local newstate
+	if (nodedef.__mesecon_state == "on") then newstate = "off" end
+	if (nodedef.__mesecon_state == "off") then newstate = "on" end
+		
+	minetest.swap_node(pos, {name = nodedef.__mesecon_basename .. "_" .. newstate,
+		param2 = node.param2})
+
+	return newstate
+end

mesecons/wires.lua

@@ -1,281 +1,250 @@
--- naming scheme: wire:(xp)(zp)(xm)(zm)_on/off
+-- naming scheme: wire:(xp)(zp)(xm)(zm)(xpyp)(zpyp)(xmyp)(zmyp)_on/off
--- The conditions in brackets define whether there is a mesecon at that place or not
+-- where x= x direction, z= z direction, y= y direction, p = +1, m = -1, e.g. xpym = {x=1, y=-1, z=0}
--- 1 = there is one; 0 = there is none
+-- The (xp)/(zpyp)/.. statements shall be replaced by either 0 or 1
--- y always means y+
+-- Where 0 means the wire has no visual connection to that direction and
+-- 1 means that the wire visually connects to that other node.
 
-box_center = {-1/16, -.5, -1/16, 1/16, -.5+1/16, 1/16}
+-- #######################
-box_bump1 =  { -2/16, -8/16,  -2/16, 2/16, -13/32, 2/16 }
+-- ## Update wire looks ##
+-- #######################
 
-box_xp = {1/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
+-- self_pos = pos of any mesecon node, from_pos = pos of conductor to getconnect for
-box_zp = {-1/16, -.5, 1/16, 1/16, -.5+1/16, 8/16}
+local wire_getconnect = function (from_pos, self_pos)
-box_xm = {-8/16, -.5, -1/16, -1/16, -.5+1/16, 1/16}
+	local node = minetest.get_node(self_pos)
-box_zm = {-1/16, -.5, -8/16, 1/16, -.5+1/16, -1/16}
+	if minetest.registered_nodes[node.name]
+	and minetest.registered_nodes[node.name].mesecons then
+		-- rules of node to possibly connect to
+		local rules = {}
+		if (minetest.registered_nodes[node.name].mesecon_wire) then
+			rules = mesecon.rules.default
+		else
+			rules = mesecon.get_any_rules(node)
+		end
 
-box_xpy = {.5-1/16, -.5+1/16, -1/16, .5, .4999+1/16, 1/16}
+		for _, r in ipairs(mesecon.flattenrules(rules)) do
-box_zpy = {-1/16, -.5+1/16, .5-1/16, 1/16, .4999+1/16, .5}
+			if (mesecon.cmpPos(mesecon.addPosRule(self_pos, r), from_pos)) then
-box_xmy = {-.5, -.5+1/16, -1/16, -.5+1/16, .4999+1/16, 1/16}
+				return true
-box_zmy = {-1/16, -.5+1/16, -.5, 1/16, .4999+1/16, -.5+1/16}
+			end
+		end
+	end
+	return false
+end
 
--- Registering the wires
+-- Update this node
+local wire_updateconnect = function (pos)
+	local connections = {}
 
-for xp=0, 1 do
+	for _, r in ipairs(mesecon.rules.default) do
-for zp=0, 1 do
+		if wire_getconnect(pos, mesecon.addPosRule(pos, r)) then
-for xm=0, 1 do
+			table.insert(connections, r)
-for zm=0, 1 do
+		end
-for xpy=0, 1 do
+	end
-for zpy=0, 1 do
-for xmy=0, 1 do
-for zmy=0, 1 do
-	if (xpy == 1 and xp == 0) or (zpy == 1 and zp == 0) 
-	or (xmy == 1 and xm == 0) or (zmy == 1 and zm == 0) then break end
 
-	local groups
+	local nid = {}
-	local nodeid = 	tostring(xp )..tostring(zp )..tostring(xm )..tostring(zm )..
+	for _, vec in ipairs(connections) do
-			tostring(xpy)..tostring(zpy)..tostring(xmy)..tostring(zmy)
+		-- flat component
+		if vec.x ==  1 then nid[0] = "1" end
+		if vec.z ==  1 then nid[1] = "1" end
+		if vec.x == -1 then nid[2] = "1" end
+		if vec.z == -1 then nid[3] = "1"  end
 
-	if nodeid == "00000000" then
+		-- slopy component
-		groups = {dig_immediate = 3, mesecon_conductor_craftable=1}
+		if vec.y == 1 then
-		wiredesc = "Mesecon"
+			if vec.x ==  1 then nid[4] = "1" end
+			if vec.z ==  1 then nid[5] = "1" end
+			if vec.x == -1 then nid[6] = "1" end
+			if vec.z == -1 then nid[7] = "1" end
+		end
+	end
+
+	local nodeid = 	  (nid[0] or "0")..(nid[1] or "0")..(nid[2] or "0")..(nid[3] or "0")
+			..(nid[4] or "0")..(nid[5] or "0")..(nid[6] or "0")..(nid[7] or "0")
+
+	local state_suffix = string.find(minetest.get_node(pos).name, "_off") and "_off" or "_on"
+	minetest.set_node(pos, {name = "mesecons:wire_"..nodeid..state_suffix})
+end
+
+local update_on_place_dig = function (pos, node)
+	-- Update placed node (get_node again as it may have been dug)
+	local nn = minetest.get_node(pos)
+	if (minetest.registered_nodes[nn.name])
+	and (minetest.registered_nodes[nn.name].mesecon_wire) then
+		wire_updateconnect(pos)
+	end
+
+	-- Update nodes around it
+	local rules = {}
+	if minetest.registered_nodes[node.name]
+	and minetest.registered_nodes[node.name].mesecon_wire then
+		rules = mesecon.rules.default
 	else
-		groups = {dig_immediate = 3, not_in_creative_inventory = 1}
+		rules = mesecon.get_any_rules(node)
-		wiredesc = "Mesecons Wire (ID: "..nodeid..")"
+	end
+	if (not rules) then return end
+
+	for _, r in ipairs(mesecon.flattenrules(rules)) do
+		local np = mesecon.addPosRule(pos, r)
+		if minetest.registered_nodes[minetest.get_node(np).name]
+		and minetest.registered_nodes[minetest.get_node(np).name].mesecon_wire then
+			wire_updateconnect(np)
+		end
+	end
+end
+
+function mesecon.update_autoconnect(pos, node)
+	if (not node) then node = minetest.get_node(pos) end
+	update_on_place_dig(pos, node)
+end
+
+-- ############################
+-- ## Wire node registration ##
+-- ############################
+-- Nodeboxes:
+local box_center = {-1/16, -.5, -1/16, 1/16, -.5+1/16, 1/16}
+local box_bump1 =  { -2/16, -8/16,  -2/16, 2/16, -13/32, 2/16 }
+
+local nbox_nid =
+{
+	[0] = {1/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}, -- x positive
+	[1] = {-1/16, -.5, 1/16, 1/16, -.5+1/16, 8/16}, -- z positive
+	[2] = {-8/16, -.5, -1/16, -1/16, -.5+1/16, 1/16}, -- x negative
+	[3] = {-1/16, -.5, -8/16, 1/16, -.5+1/16, -1/16}, -- z negative
+
+	[4] = {.5-1/16, -.5+1/16, -1/16, .5, .4999+1/16, 1/16}, -- x positive up
+	[5] = {-1/16, -.5+1/16, .5-1/16, 1/16, .4999+1/16, .5}, -- z positive up
+	[6] = {-.5, -.5+1/16, -1/16, -.5+1/16, .4999+1/16, 1/16}, -- x negative up
+	[7] = {-1/16, -.5+1/16, -.5, 1/16, .4999+1/16, -.5+1/16}  -- z negative up
+}
+
+local tiles_off = { "mesecons_wire_off.png" }
+local tiles_on = { "mesecons_wire_on.png" }
+
+local selectionbox =
+{
+	type = "fixed",
+	fixed = {-.5, -.5, -.5, .5, -.5+4/16, .5}
+}
+
+-- go to the next nodeid (ex.: 01000011 --> 01000100)
+local nid_inc = function() end
+nid_inc = function (nid)
+	local i = 0
+	while nid[i-1] ~= 1 do
+		nid[i] = (nid[i] ~= 1) and 1 or 0
+		i = i + 1
 	end
 
-	local nodebox = {}
+	-- BUT: Skip impossible nodeids:
-	local adjx = false
+	if ((nid[0] == 0 and nid[4] == 1) or (nid[1] == 0 and nid[5] == 1) 
-	local adjz = false
+	or (nid[2] == 0 and nid[6] == 1) or (nid[3] == 0 and nid[7] == 1)) then
-	if xp == 1 then table.insert(nodebox, box_xp) adjx = true end
+		return nid_inc(nid)
-	if zp == 1 then table.insert(nodebox, box_zp) adjz = true end
-	if xm == 1 then table.insert(nodebox, box_xm) adjx = true end
-	if zm == 1 then table.insert(nodebox, box_zm) adjz = true end
-	if xpy == 1 then table.insert(nodebox, box_xpy) end
-	if zpy == 1 then table.insert(nodebox, box_zpy) end
-	if xmy == 1 then table.insert(nodebox, box_xmy) end
-	if zmy == 1 then table.insert(nodebox, box_zmy) end
-
-	if adjx and adjz and (xp + zp + xm + zm > 2) then
-		table.insert(nodebox, box_bump1)
-		tiles_off = {
-			"wires_bump_off.png",
-			"wires_bump_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png"
-		}
-		tiles_on = {
-			"wires_bump_on.png",
-			"wires_bump_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png"
-		}
-	else
-		table.insert(nodebox, box_center)
-		tiles_off = {
-			"wires_off.png",
-			"wires_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
-			"wires_vertical_off.png"
-		}
-		tiles_on = {
-			"wires_on.png",
-			"wires_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
-			"wires_vertical_on.png"
-		}
 	end
 
-	if nodeid == "00000000" then
+	return i <= 8
-		nodebox = {-8/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
+end
-	end
 
-	minetest.register_node("mesecons:wire_"..nodeid.."_off", {
+register_wires = function()
-		description = wiredesc,
+	local nid = {}
-		drawtype = "nodebox",
+	while true do
-		tiles = tiles_off,
+		-- Create group specifiction and nodeid string (see note above for details)
---		inventory_image = "wires_inv.png",
+		local nodeid = 	  (nid[0] or "0")..(nid[1] or "0")..(nid[2] or "0")..(nid[3] or "0")
---		wield_image = "wires_inv.png",
+				..(nid[4] or "0")..(nid[5] or "0")..(nid[6] or "0")..(nid[7] or "0")
-		inventory_image = "jeija_mesecon_off.png",
+
-		wield_image = "jeija_mesecon_off.png",
+		-- Calculate nodebox
-		paramtype = "light",
+		local nodebox = {type = "fixed", fixed={box_center}}
-		paramtype2 = "facedir",
+		for i=0,7 do
-		sunlight_propagates = true,
+			if nid[i] == 1 then
-		selection_box = {
+				table.insert(nodebox.fixed, nbox_nid[i])
-              		type = "fixed",
+			end
-			fixed = {-.5, -.5, -.5, .5, -.5+1/16, .5}
+		end
-		},
+
-		node_box = {
+		-- Add bump to nodebox if curved
-			type = "fixed",
+		if (nid[0] == 1 and nid[1] == 1) or (nid[1] == 1 and nid[2] == 1)
-			fixed = nodebox
+		or (nid[2] == 1 and nid[3] == 1) or (nid[3] == 1 and nid[0] == 1) then
-		},
+			table.insert(nodebox.fixed, box_bump1)
-		groups = groups,
+		end
-		walkable = false,
+
-		stack_max = 99,
+		-- If nothing to connect to, still make a nodebox of a straight wire
-		drop = "mesecons:wire_00000000_off",
+		if nodeid == "00000000" then
-		mesecons = {conductor={
+			nodebox.fixed = {-8/16, -.5, -1/16, 8/16, -.5+1/16, 1/16}
+		end
+
+		local rules = {}
+		if (nid[0] == 1) then table.insert(rules, vector.new( 1,  0,  0)) end
+		if (nid[1] == 1) then table.insert(rules, vector.new( 0,  0,  1)) end
+		if (nid[2] == 1) then table.insert(rules, vector.new(-1,  0,  0)) end
+		if (nid[3] == 1) then table.insert(rules, vector.new( 0,  0, -1)) end
+
+		if (nid[0] == 1) then table.insert(rules, vector.new( 1, -1,  0)) end
+		if (nid[1] == 1) then table.insert(rules, vector.new( 0, -1,  1)) end
+		if (nid[2] == 1) then table.insert(rules, vector.new(-1, -1,  0)) end
+		if (nid[3] == 1) then table.insert(rules, vector.new( 0, -1, -1)) end
+
+		if (nid[4] == 1) then table.insert(rules, vector.new( 1,  1,  0)) end
+		if (nid[5] == 1) then table.insert(rules, vector.new( 0,  1,  1)) end
+		if (nid[6] == 1) then table.insert(rules, vector.new(-1,  1,  0)) end
+		if (nid[7] == 1) then table.insert(rules, vector.new( 0,  1, -1)) end
+
+		local meseconspec_off = { conductor = {
+			rules = rules,
 			state = mesecon.state.off,
 			onstate = "mesecons:wire_"..nodeid.."_on"
 		}}
-	})
 
-	minetest.register_node("mesecons:wire_"..nodeid.."_on", {
+		local meseconspec_on = { conductor = {
-		description = "Wire ID:"..nodeid,
+			rules = rules,
-		drawtype = "nodebox",
-		tiles = tiles_on,
---		inventory_image = "wires_inv.png",
---		wield_image = "wires_inv.png",
-		inventory_image = "jeija_mesecon_off.png",
-		wield_image = "jeija_mesecon_off.png",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		sunlight_propagates = true,
-		selection_box = {
-              		type = "fixed",
-			fixed = {-.5, -.5, -.5, .5, -.5+1/16, .5}
-		},
-		node_box = {
-			type = "fixed",
-			fixed = nodebox
-		},
-		groups = {dig_immediate = 3, mesecon = 2, not_in_creative_inventory = 1},
-		walkable = false,
-		stack_max = 99,
-		drop = "mesecons:wire_00000000_off",
-		mesecons = {conductor={
 			state = mesecon.state.on,
 			offstate = "mesecons:wire_"..nodeid.."_off"
 		}}
-	})
-end
-end
-end
-end
-end
-end
-end
-end
 
--- Updating the wires:
+		local groups_on = {dig_immediate = 3, mesecon_conductor_craftable = 1,
--- Place the right connection wire
+			not_in_creative_inventory = 1}
+		local groups_off = {dig_immediate = 3, mesecon_conductor_craftable = 1}
+		if nodeid ~= "00000000" then
+			groups_off["not_in_creative_inventory"] = 1
+		end
 
-local update_on_place_dig = function (pos, node)
+		mesecon.register_node("mesecons:wire_"..nodeid, {
-	if minetest.registered_nodes[node.name]
+			description = "Mesecon",
-	and minetest.registered_nodes[node.name].mesecons then
+			drawtype = "nodebox",
-		mesecon:update_autoconnect(pos)
+			inventory_image = "mesecons_wire_inv.png",
+			wield_image = "mesecons_wire_inv.png",
+			paramtype = "light",
+			paramtype2 = "facedir",
+			sunlight_propagates = true,
+			selection_box = selectionbox,
+			node_box = nodebox,
+			walkable = false,
+			drop = "mesecons:wire_00000000_off",
+			mesecon_wire = true
+		}, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off},
+		{tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})
+
+		if (nid_inc(nid) == false) then return end
 	end
 end
+register_wires()
 
-minetest.register_on_placenode(update_on_place_dig)
+-- ##############
-minetest.register_on_dignode(update_on_place_dig)
+-- ## Crafting ##
-
+-- ##############
-function mesecon:update_autoconnect(pos, secondcall, replace_old)
+minetest.register_craft({
-	local xppos = {x=pos.x+1, y=pos.y, z=pos.z}
+	type = "cooking",
-	local zppos = {x=pos.x, y=pos.y, z=pos.z+1}
+	output = "mesecons:wire_00000000_off 2",
-	local xmpos = {x=pos.x-1, y=pos.y, z=pos.z}
+	recipe = "default:mese_crystal_fragment",
-	local zmpos = {x=pos.x, y=pos.y, z=pos.z-1}
+	cooktime = 3,
-
+})
-	local xpympos = {x=pos.x+1, y=pos.y-1, z=pos.z}
-	local zpympos = {x=pos.x, y=pos.y-1, z=pos.z+1}
-	local xmympos = {x=pos.x-1, y=pos.y-1, z=pos.z}
-	local zmympos = {x=pos.x, y=pos.y-1, z=pos.z-1}
-
-	local xpypos = {x=pos.x+1, y=pos.y+1, z=pos.z}
-	local zpypos = {x=pos.x, y=pos.y+1, z=pos.z+1}
-	local xmypos = {x=pos.x-1, y=pos.y+1, z=pos.z}
-	local zmypos = {x=pos.x, y=pos.y+1, z=pos.z-1}
-
-	if secondcall == nil then
-		mesecon:update_autoconnect(xppos, true)
-		mesecon:update_autoconnect(zppos, true)
-		mesecon:update_autoconnect(xmpos, true)
-		mesecon:update_autoconnect(zmpos, true)
-
-		mesecon:update_autoconnect(xpypos, true)
-		mesecon:update_autoconnect(zpypos, true)
-		mesecon:update_autoconnect(xmypos, true)
-		mesecon:update_autoconnect(zmypos, true)
-
-		mesecon:update_autoconnect(xpympos, true)
-		mesecon:update_autoconnect(zpympos, true)
-		mesecon:update_autoconnect(xmympos, true)
-		mesecon:update_autoconnect(zmympos, true)
-	end
-
-	nodename = minetest.env:get_node(pos).name
-	if string.find(nodename, "mesecons:wire_") == nil and not replace_old then return nil end
-
-	if mesecon:rules_link_anydir(pos, xppos) then xp = 1 else xp = 0 end
-	if mesecon:rules_link_anydir(pos, xmpos) then xm = 1 else xm = 0 end
-	if mesecon:rules_link_anydir(pos, zppos) then zp = 1 else zp = 0 end
-	if mesecon:rules_link_anydir(pos, zmpos) then zm = 1 else zm = 0 end
-
-	if mesecon:rules_link_anydir(pos, xpympos) then xp = 1 end
-	if mesecon:rules_link_anydir(pos, xmympos) then xm = 1 end
-	if mesecon:rules_link_anydir(pos, zpympos) then zp = 1 end
-	if mesecon:rules_link_anydir(pos, zmympos) then zm = 1 end
-
-	if mesecon:rules_link_anydir(pos, xpypos) then xpy = 1 else xpy = 0 end
-	if mesecon:rules_link_anydir(pos, zpypos) then zpy = 1 else zpy = 0 end
-	if mesecon:rules_link_anydir(pos, xmypos) then xmy = 1 else xmy = 0 end
-	if mesecon:rules_link_anydir(pos, zmypos) then zmy = 1 else zmy = 0 end
-
-	if xpy == 1 then xp = 1 end
-	if zpy == 1 then zp = 1 end
-	if xmy == 1 then xm = 1 end
-	if zmy == 1 then zm = 1 end
-
-	local nodeid = 	tostring(xp )..tostring(zp )..tostring(xm )..tostring(zm )..
-			tostring(xpy)..tostring(zpy)..tostring(xmy)..tostring(zmy)
-
-	
-	if string.find(nodename, "_off") ~= nil then
-		minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_off"})
-	else
-		minetest.env:set_node(pos, {name = "mesecons:wire_"..nodeid.."_on" })
-	end
-end
-
-if minetest.registered_nodes["default:stone_with_mese"] == nil then
-
-	minetest.register_craft({
-		output = "mesecons:wire_00000000_off 18",
-		recipe = {
-			{"default:mese"},
-		}
-	})
-else
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 2",
-		recipe = "default:mese_crystal_fragment",
-		cooktime = 3,
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 18",
-		recipe = "default:mese_crystal",
-		cooktime = 15,
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "mesecons:wire_00000000_off 162",
-		recipe = "default:mese",
-		cooktime = 30,
-	})
-
-end
 
 minetest.register_craft({
 	type = "cooking",
-	output = '"mesecons:wire_00000000_off" 16',
+	output = "mesecons:wire_00000000_off 18",
 	recipe = "default:mese_crystal",
+	cooktime = 15,
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "mesecons:wire_00000000_off 162",
+	recipe = "default:mese",
+	cooktime = 30,
 })

mesecons_blinkyplant/init.lua

@@ -1,74 +1,51 @@
 -- The BLINKY_PLANT
 
-minetest.register_node("mesecons_blinkyplant:blinky_plant_off", {
+local toggle_timer = function (pos)
-	drawtype = "plantlike",
+	local timer = minetest.get_node_timer(pos)
-	visual_scale = 1,
+	if timer:is_started() then
-	tiles = {"jeija_blinky_plant_off.png"},
+		timer:stop()
-	inventory_image = "jeija_blinky_plant_off.png",
+	else
-	paramtype = "light",
+		timer:start(mesecon.setting("blinky_plant_interval", 3))
-	walkable = false,
+	end
-	groups = {dig_immediate=3, mesecon = 2},
+end
-    	description="Blinky Plant",
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
-	},
-	mesecons = {receptor = {
-		state = mesecon.state.off
-	}}
-})
 
-minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
+local on_timer = function (pos)
+	local node = minetest.get_node(pos)
+	if(mesecon.flipstate(pos, node) == "on") then
+		mesecon.receptor_on(pos)
+	else
+		mesecon.receptor_off(pos)
+	end
+	toggle_timer(pos)
+end
+
+mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
+	description="Blinky Plant",
 	drawtype = "plantlike",
-	visual_scale = 1,
-	tiles = {"jeija_blinky_plant_on.png"},
 	inventory_image = "jeija_blinky_plant_off.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {dig_immediate=3, not_in_creative_inventory=1, mesecon = 2},
-	drop='"mesecons_blinkyplant:blinky_plant_off" 1',
-	light_source = LIGHT_MAX-7,
-	description = "Blinky Plant",
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
+		fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},
 	},
-	mesecons = {receptor = {
+	on_timer = on_timer,
-		state = mesecon.state.on
+	on_rightclick = toggle_timer,
-	}}
+	on_construct = toggle_timer
+},{
+	tiles = {"jeija_blinky_plant_off.png"},
+	groups = {dig_immediate=3},
+	mesecons = {receptor = { state = mesecon.state.off }}
+},{
+	tiles = {"jeija_blinky_plant_on.png"},
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
+	mesecons = {receptor = { state = mesecon.state.on }}
 })
 
 minetest.register_craft({
-	output = '"mesecons_blinkyplant:blinky_plant_off" 1',
+	output = "mesecons_blinkyplant:blinky_plant_off 1",
-	recipe = {
+	recipe = {	{"","group:mesecon_conductor_craftable",""},
-	{'','"group:mesecon_conductor_craftable"',''},
+			{"","group:mesecon_conductor_craftable",""},
-	{'','"group:mesecon_conductor_craftable"',''},
+			{"group:sapling","group:sapling","group:sapling"}}
-	{'"default:sapling"','"default:sapling"','"default:sapling"'},
-	}
-})
-
-minetest.register_abm(
-	{nodenames = {"mesecons_blinkyplant:blinky_plant_off"},
-	interval = BLINKY_PLANT_INTERVAL,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		--minetest.env:remove_node(pos)
-		minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_on"})
-		nodeupdate(pos)	
-		mesecon:receptor_on(pos)
-	end,
-})
-
-minetest.register_abm({
-	nodenames = {"mesecons_blinkyplant:blinky_plant_on"},
-	interval = BLINKY_PLANT_INTERVAL,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		--minetest.env:remove_node(pos)
-		minetest.env:add_node(pos, {name="mesecons_blinkyplant:blinky_plant_off"})
-		nodeupdate(pos)	
-		mesecon:receptor_off(pos)
-	end,
 })

mesecons_button/init.lua

@@ -3,12 +3,12 @@
 -- and then turns off again
 
 mesecon.button_turnoff = function (pos)
-	local node = minetest.env:get_node(pos)
+	local node = minetest.get_node(pos)
 	if node.name=="mesecons_button:button_on" then --has not been dug
-		mesecon:swap_node(pos, "mesecons_button:button_off")
+		minetest.swap_node(pos, {name = "mesecons_button:button_off", param2=node.param2})
 		minetest.sound_play("mesecons_button_pop", {pos=pos})
 		local rules = mesecon.rules.buttonlike_get(node)
-		mesecon:receptor_off(pos, rules)
+		mesecon.receptor_off(pos, rules)
 	end
 end
 
@@ -41,8 +41,8 @@ minetest.register_node("mesecons_button:button_off", {
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
 	description = "Button",
 	on_punch = function (pos, node)
-		mesecon:swap_node(pos, "mesecons_button:button_on")
+		minetest.swap_node(pos, {name = "mesecons_button:button_on", param2=node.param2})
-		mesecon:receptor_on(pos, mesecon.rules.buttonlike_get(node))
+		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
 		minetest.sound_play("mesecons_button_push", {pos=pos})
 		minetest.after(1, mesecon.button_turnoff, pos)
 	end,
@@ -91,8 +91,8 @@ minetest.register_node("mesecons_button:button_on", {
 })
 
 minetest.register_craft({
-	output = '"mesecons_button:button_off" 2',
+	output = "mesecons_button:button_off 2",
 	recipe = {
-		{'"group:mesecon_conductor_craftable"','"default:stone"'},
+		{"group:mesecon_conductor_craftable","default:stone"},
 	}
 })

mesecons_commandblock/init.lua

@@ -16,7 +16,10 @@ minetest.register_chatcommand("tell", {
 			minetest.chat_send_player(name, "Invalid usage: " .. param)
 			return
 		end
-		minetest.chat_send_player(target, name .. " whispers: " .. message)
+		if not minetest.get_player_by_name(target) then
+			minetest.chat_send_player(name, "Invalid target: " .. target)
+		end
+		minetest.chat_send_player(target, name .. " whispers: " .. message, false)
 	end
 })
 
@@ -30,20 +33,22 @@ minetest.register_chatcommand("hp", {
 			minetest.chat_send_player(name, "Invalid usage: " .. param)
 			return
 		end
-		minetest.get_player_by_name(target):set_hp(value)
+		local player = minetest.get_player_by_name(target)
+		if player then
+			player:set_hp(value)
+		else
+			minetest.chat_send_player(name, "Invalid target: " .. target)
+		end
 	end
 })
 
-local initialize_data = function(meta, player, command, param)
+local function initialize_data(meta)
+	local commands = meta:get_string("commands")
 	meta:set_string("formspec",
-		"invsize[9,6;]" ..
+		"invsize[9,5;]" ..
-		"field[1,1;7.5,1;player;Player;" .. player .. "]" ..
+		"textarea[0.5,0.5;8.5,4;commands;Commands;"..commands.."]" ..
-		"button[1.3,2;2,1;nearest;Nearest]" ..
+		"label[1,3.8;@nearest, @farthest, and @random are replaced by the respective player names]" ..
-		"button[3.3,2;2,1;farthest;Farthest]" ..
+		"button_exit[3.3,4.5;2,1;submit;Submit]")
-		"button[5.3,2;2,1;random;Random]" ..
-		"field[1,4;2,1;command;Command;" .. command .. "]" ..
-		"field[3,4;5.5,1;param;Parameter;" .. param .. "]" ..
-		"button_exit[3.3,5;2,1;submit;Submit]")
 	local owner = meta:get_string("owner")
 	if owner == "" then
 		owner = "not owned"
@@ -52,108 +57,113 @@ local initialize_data = function(meta, player, command, param)
 	end
 	meta:set_string("infotext", "Command Block\n" ..
 		"(" .. owner .. ")\n" ..
-		"Command: /" .. command .. " " .. param)
+		"Commands: "..commands)
 end
 
-local construct = function(pos)
+local function construct(pos)
-	local meta = minetest.env:get_meta(pos)
+	local meta = minetest.get_meta(pos)
 
-	meta:set_string("player", "@nearest")
+	meta:set_string("commands", "tell @nearest Commandblock unconfigured")
-	meta:set_string("command", "time")
-	meta:set_string("param", "7000")
 
 	meta:set_string("owner", "")
 
-	initialize_data(meta, "@nearest", "time", "7000")
+	initialize_data(meta)
 end
 
-local after_place = function(pos, placer)
+local function after_place(pos, placer)
 	if placer then
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name())
-		initialize_data(meta, "@nearest", "time", "7000")
+		initialize_data(meta)
 	end
 end
 
-local receive_fields = function(pos, formname, fields, sender)
+local function receive_fields(pos, formname, fields, sender)
-	local meta = minetest.env:get_meta(pos)
+	if not fields.submit then
-	if fields.nearest then
+		return
-		initialize_data(meta, "@nearest", fields.command, fields.param)
-	elseif fields.farthest then
-		initialize_data(meta, "@farthest", fields.command, fields.param)
-	elseif fields.random then
-		initialize_data(meta, "@random", fields.command, fields.param)
-	else --fields.submit or pressed enter
-		meta:set_string("player", fields.player)
-		meta:set_string("command", fields.command)
-		meta:set_string("param", fields.param)
-
-		initialize_data(meta, fields.player, fields.command, fields.param)
 	end
+	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+	if owner ~= "" and sender:get_player_name() ~= owner then
+		return
+	end
+	meta:set_string("commands", fields.commands)
+
+	initialize_data(meta)
 end
 
-local resolve_player = function(name, pos)
+local function resolve_commands(commands, pos)
-	local get_distance = function(pos1, pos2)
+	local nearest, farthest = nil, nil
-		return math.sqrt((pos1.x - pos2.x) ^ 2 + (pos1.y - pos2.y) ^ 2 + (pos1.z - pos2.z) ^ 2)
+	local min_distance, max_distance = math.huge, -1
-	end
+	local players = minetest.get_connected_players()
-
+	for index, player in pairs(players) do
-	if name == "@nearest" then
+		local distance = vector.distance(pos, player:getpos())
-		local min_distance = math.huge
+		if distance < min_distance then
-		for index, player in ipairs(minetest.get_connected_players()) do
+			min_distance = distance
-			local distance = get_distance(pos, player:getpos())
+			nearest = player:get_player_name()
-			if distance < min_distance then
-				min_distance = distance
-				name = player:get_player_name()
-			end
 		end
-	elseif name == "@farthest" then
+		if distance > max_distance then
-		local max_distance = -1
+			max_distance = distance
-		for index, player in ipairs(minetest.get_connected_players()) do
+			farthest = player:get_player_name()
-			local distance = get_distance(pos, player:getpos())
-			if distance > max_distance then
-				max_distance = distance
-				name = player:get_player_name()
-			end
 		end
-	elseif name == "@random" then
-		local players = minetest.get_connected_players()
-		local player = players[math.random(#players)]
-		name = player:get_player_name()
 	end
-	return name
+	local random = players[math.random(#players)]:get_player_name()
+	commands = commands:gsub("@nearest", nearest)
+	commands = commands:gsub("@farthest", farthest)
+	commands = commands:gsub("@random", random)
+	return commands
 end
 
-local commandblock_action_on = function(pos, node)
+local function commandblock_action_on(pos, node)
 	if node.name ~= "mesecons_commandblock:commandblock_off" then
 		return
 	end
 
-	mesecon:swap_node(pos, "mesecons_commandblock:commandblock_on")
+	minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_on"})
 
-	local meta = minetest.env:get_meta(pos)
+	local meta = minetest.get_meta(pos)
-	local command = minetest.chatcommands[meta:get_string("command")]
-	if command == nil then
-		return
-	end
 	local owner = meta:get_string("owner")
 	if owner == "" then
 		return
 	end
-	local has_privs, missing_privs = minetest.check_player_privs(owner, command.privs)
+
-	if not has_privs then
+	local commands = resolve_commands(meta:get_string("commands"), pos)
-		minetest.chat_send_player(owner, "You don't have permission to run this command (missing privileges: "..table.concat(missing_privs, ", ")..")")
+	for _, command in pairs(commands:split("\n")) do
-		return
+		local pos = command:find(" ")
+		local cmd, param = command, ""
+		if pos then
+			cmd = command:sub(1, pos - 1)
+			param = command:sub(pos + 1)
+		end
+		local cmddef = minetest.chatcommands[cmd]
+		if not cmddef then
+			minetest.chat_send_player(owner, "The command "..cmd.." does not exist")
+			return
+		end
+		local has_privs, missing_privs = minetest.check_player_privs(owner, cmddef.privs)
+		if not has_privs then
+			minetest.chat_send_player(owner, "You don't have permission "
+					.."to run "..cmd
+					.." (missing privileges: "
+					..table.concat(missing_privs, ", ")..")")
+			return
+		end
+		cmddef.func(owner, param)
 	end
-	local player = resolve_player(meta:get_string("player"), pos)
-	command.func(player, meta:get_string("param"))
 end
 
-local commandblock_action_off = function(pos, node)
+local function commandblock_action_off(pos, node)
 	if node.name == "mesecons_commandblock:commandblock_on" then
-		mesecon:swap_node(pos, "mesecons_commandblock:commandblock_off")
+		minetest.swap_node(pos, {name = "mesecons_commandblock:commandblock_off"})
 	end
 end
 
+local function can_dig(pos, player)
+	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+	return owner == "" or owner == player:get_player_name()
+end
+
 minetest.register_node("mesecons_commandblock:commandblock_off", {
 	description = "Command Block",
 	tiles = {"jeija_commandblock_off.png"},
@@ -162,10 +172,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
 	on_construct = construct,
 	after_place_node = after_place,
 	on_receive_fields = receive_fields,
-	can_dig = function(pos,player)
+	can_dig = can_dig,
-		local owner = minetest.env:get_meta(pos):get_string("owner")
-		return owner == "" or owner == player:get_player_name()
-	end,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_on = commandblock_action_on
@@ -180,10 +187,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
 	on_construct = construct,
 	after_place_node = after_place,
 	on_receive_fields = receive_fields,
-	can_dig = function(pos,player)
+	can_dig = can_dig,
-		local owner = minetest.env:get_meta(pos):get_string("owner")
-		return owner == "" or owner == player:get_player_name()
-	end,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_off = commandblock_action_off

mesecons_compatibility/init.lua

@@ -1,167 +0,0 @@
-doors = {}
-
--- Registers a door - REDEFINITION ONLY | DOORS MOD MUST HAVE BEEN LOADED BEFORE
---  name: The name of the door
---  def: a table with the folowing fields:
---    description
---    inventory_image
---    groups
---    tiles_bottom: the tiles of the bottom part of the door {front, side}
---    tiles_top: the tiles of the bottom part of the door {front, side}
---    If the following fields are not defined the default values are used
---    node_box_bottom
---    node_box_top
---    selection_box_bottom
---    selection_box_top
---    only_placer_can_open: if true only the player who placed the door can
---                          open it
-
-function doors:register_door(name, def)
-	def.groups.not_in_creative_inventory = 1
-	
-	local box = {{-0.5, -0.5, -0.5,   0.5, 0.5, -0.5+1.5/16}}
-	
-	if not def.node_box_bottom then
-		def.node_box_bottom = box
-	end
-	if not def.node_box_top then
-		def.node_box_top = box
-	end
-	if not def.selection_box_bottom then
-		def.selection_box_bottom= box
-	end
-	if not def.selection_box_top then
-		def.selection_box_top = box
-	end
-	
-	local tt = def.tiles_top
-	local tb = def.tiles_bottom
-	
-	local function after_dig_node(pos, name)
-		if minetest.env:get_node(pos).name == name then
-			minetest.env:remove_node(pos)
-		end
-	end
-
-	local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
-		pos.y = pos.y+dir
-		if not minetest.env:get_node(pos).name == check_name then
-			return
-		end
-		local p2 = minetest.env:get_node(pos).param2
-		p2 = params[p2+1]
-		
-		local meta = minetest.env:get_meta(pos):to_table()
-		minetest.env:set_node(pos, {name=replace_dir, param2=p2})
-		minetest.env:get_meta(pos):from_table(meta)
-		
-		pos.y = pos.y-dir
-		meta = minetest.env:get_meta(pos):to_table()
-		minetest.env:set_node(pos, {name=replace, param2=p2})
-		minetest.env:get_meta(pos):from_table(meta)
-	end
-
-	local function on_mesecons_signal_open (pos, node)
-		on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
-	end
-
-	local function on_mesecons_signal_close (pos, node)
-		on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
-	end
-	
-	local function check_player_priv(pos, player)
-		if not def.only_placer_can_open then
-			return true
-		end
-		local meta = minetest.env:get_meta(pos)
-		local pn = player:get_player_name()
-		return meta:get_string("doors_owner") == pn
-	end
-	
-	minetest.register_node(":"..name.."_b_1", {
-		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		drop = name,
-		drawtype = "nodebox",
-		node_box = {
-			type = "fixed",
-			fixed = def.node_box_bottom
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = def.selection_box_bottom
-		},
-		groups = def.groups,
-		
-		after_dig_node = function(pos, oldnode, oldmetadata, digger)
-			pos.y = pos.y+1
-			after_dig_node(pos, name.."_t_1")
-		end,
-		
-		on_rightclick = function(pos, node, puncher)
-			if check_player_priv(pos, puncher) then
-				on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
-			end
-		end,
-
-		mesecons = {effector = {
-			action_on  = on_mesecons_signal_open
-		}},
-		
-		can_dig = check_player_priv,
-	})
-	
-	minetest.register_node(":"..name.."_b_2", {
-		tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		drop = name,
-		drawtype = "nodebox",
-		node_box = {
-			type = "fixed",
-			fixed = def.node_box_bottom
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = def.selection_box_bottom
-		},
-		groups = def.groups,
-		
-		after_dig_node = function(pos, oldnode, oldmetadata, digger)
-			pos.y = pos.y+1
-			after_dig_node(pos, name.."_t_2")
-		end,
-		
-		on_rightclick = function(pos, node, puncher)
-			if check_player_priv(pos, puncher) then
-				on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
-			end
-		end,
-
-		mesecons = {effector = {
-			action_off = on_mesecons_signal_close
-		}},
-		
-		can_dig = check_player_priv,
-	})
-end
-
-doors:register_door("doors:door_wood", {
-	description = "Wooden Door",
-	inventory_image = "door_wood.png",
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
-	tiles_bottom = {"door_wood_b.png", "door_brown.png"},
-	tiles_top = {"door_wood_a.png", "door_brown.png"},
-	sounds = default.node_sound_wood_defaults(),
-})
-
-doors:register_door("doors:door_steel", {
-	description = "Steel Door",
-	inventory_image = "door_steel.png",
-	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
-	tiles_bottom = {"door_steel_b.png", "door_grey.png"},
-	tiles_top = {"door_steel_a.png", "door_grey.png"},
-	only_placer_can_open = true,
-	sounds = default.node_sound_stone_defaults(),
-})

mesecons_delayer/init.lua

@@ -2,7 +2,7 @@
 local delayer_get_output_rules = function(node)
 	local rules = {{x = 0, y = 0, z = 1}}
 	for i = 0, node.param2 do
-		rules = mesecon:rotate_rules_left(rules)
+		rules = mesecon.rotate_rules_left(rules)
 	end
 	return rules
 end
@@ -10,35 +10,25 @@ end
 local delayer_get_input_rules = function(node)
 	local rules = {{x = 0, y = 0, z = -1}}
 	for i = 0, node.param2 do
-		rules = mesecon:rotate_rules_left(rules)
+		rules = mesecon.rotate_rules_left(rules)
 	end
 	return rules
 end
 
 -- Functions that are called after the delay time
 
-local delayer_turnon = function(params)
-	local rules = delayer_get_output_rules(params.node)
-	mesecon:receptor_on(params.pos, rules)
-end
-
-local delayer_turnoff = function(params)
-	local rules = delayer_get_output_rules(params.node)
-	mesecon:receptor_off(params.pos, rules)
-end
-
 local delayer_activate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
 	local time = def.delayer_time
-	mesecon:swap_node(pos, def.delayer_onstate)
+	minetest.swap_node(pos, {name = def.delayer_onstate, param2=node.param2})
-	minetest.after(time, delayer_turnon , {pos = pos, node = node})
+	mesecon.queue:add_action(pos, "receptor_on", {delayer_get_output_rules(node)}, time, nil)
 end
 
 local delayer_deactivate = function(pos, node)
 	local def = minetest.registered_nodes[node.name]
 	local time = def.delayer_time
-	mesecon:swap_node(pos, def.delayer_offstate)
+	minetest.swap_node(pos, {name = def.delayer_offstate, param2=node.param2})
-	minetest.after(time, delayer_turnoff, {pos = pos, node = node})
+	mesecon.queue:add_action(pos, "receptor_off", {delayer_get_output_rules(node)}, time, nil)
 end
 
 -- Register the 2 (states) x 4 (delay times) delayers
@@ -99,13 +89,13 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
 	drop = 'mesecons_delayer:delayer_off_1',
 	on_punch = function (pos, node)
 		if node.name=="mesecons_delayer:delayer_off_1" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_off_2")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_2", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_off_2" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_off_3")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_3", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_off_3" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_off_4")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_4", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_off_4" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_off_1")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_off_1", param2=node.param2})
 		end
 	end,
 	delayer_time = delaytime,
@@ -154,13 +144,13 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
 	drop = 'mesecons_delayer:delayer_off_1',
 	on_punch = function (pos, node)
 		if node.name=="mesecons_delayer:delayer_on_1" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_on_2")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_2", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_on_2" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_on_3")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_3", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_on_3" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_on_4")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_4", param2=node.param2})
 		elseif node.name=="mesecons_delayer:delayer_on_4" then
-			mesecon:swap_node(pos,"mesecons_delayer:delayer_on_1")
+			minetest.swap_node(pos, {name = "mesecons_delayer:delayer_on_1", param2=node.param2})
 		end
 	end,
 	delayer_time = delaytime,

mesecons_detector/init.lua

@@ -1,16 +1,21 @@
+local GET_COMMAND = "GET"
+
 -- Object detector
 -- Detects players in a certain radius
 -- The radius can be specified in mesecons/settings.lua
 
 local object_detector_make_formspec = function (pos)
-	local meta = minetest.env:get_meta(pos)
+	local meta = minetest.get_meta(pos)
 	meta:set_string("formspec", "size[9,2.5]" ..
 		"field[0.3,  0;9,2;scanname;Name of player to scan for (empty for any):;${scanname}]"..
-		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]")
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
+		"button_exit[7,0.75;2,3;;Save]")
 end
 
-local object_detector_on_receive_fields = function (pos, formname, fields)
+local object_detector_on_receive_fields = function(pos, formname, fields)
-	local meta = minetest.env:get_meta(pos)
+	if not fields.scanname or not fields.digiline_channel then return end;
+
+	local meta = minetest.get_meta(pos)
 	meta:set_string("scanname", fields.scanname)
 	meta:set_string("digiline_channel", fields.digiline_channel)
 	object_detector_make_formspec(pos)
@@ -18,10 +23,10 @@ end
 
 -- returns true if player was found, false if not
 local object_detector_scan = function (pos)
-	local objs = minetest.env:get_objects_inside_radius(pos, OBJECT_DETECTOR_RADIUS)
+	local objs = minetest.get_objects_inside_radius(pos, mesecon.setting("detector_radius", 6))
 	for k, obj in pairs(objs) do
 		local isname = obj:get_player_name() -- "" is returned if it is not a player; "" ~= nil!
-		local scanname = minetest.env:get_meta(pos):get_string("scanname")
+		local scanname = minetest.get_meta(pos):get_string("scanname")
 		if (isname == scanname and isname ~= "") or (isname  ~= "" and scanname == "") then -- player with scanname found or not scanname specified
 			return true
 		end
@@ -30,10 +35,10 @@ local object_detector_scan = function (pos)
 end
 
 -- set player name when receiving a digiline signal on a specific channel
-object_detector_digiline = {
+local object_detector_digiline = {
 	effector = {
 		action = function (pos, node, channel, msg)
-			local meta = minetest.env:get_meta(pos)
+			local meta = minetest.get_meta(pos)
 			local active_channel = meta:get_string("digiline_channel")
 			if channel == active_channel then
 				meta:set_string("scanname", msg)
@@ -50,7 +55,8 @@ minetest.register_node("mesecons_detector:object_detector_off", {
 	groups = {cracky=3},
 	description="Player Detector",
 	mesecons = {receptor = {
-		state = mesecon.state.off
+		state = mesecon.state.off,
+		rules = mesecon.rules.pplate
 	}},
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
@@ -65,7 +71,8 @@ minetest.register_node("mesecons_detector:object_detector_on", {
 	groups = {cracky=3,not_in_creative_inventory=1},
 	drop = 'mesecons_detector:object_detector_off',
 	mesecons = {receptor = {
-		state = mesecon.state.on
+		state = mesecon.state.on,
+		rules = mesecon.rules.pplate
 	}},
 	on_construct = object_detector_make_formspec,
 	on_receive_fields = object_detector_on_receive_fields,
@@ -88,8 +95,8 @@ minetest.register_abm(
 	chance = 1,
 	action = function(pos)
 		if object_detector_scan(pos) then
-			mesecon:swap_node(pos, "mesecons_detector:object_detector_on")
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_on"})
-			mesecon:receptor_on(pos)
+			mesecon.receptor_on(pos, mesecon.rules.pplate)
 		end
 	end,
 })
@@ -100,8 +107,162 @@ minetest.register_abm(
 	chance = 1,
 	action = function(pos)
 		if not object_detector_scan(pos) then
-			mesecon:swap_node(pos, "mesecons_detector:object_detector_off")
+			minetest.swap_node(pos, {name = "mesecons_detector:object_detector_off"})
-			mesecon:receptor_off(pos)
+			mesecon.receptor_off(pos, mesecon.rules.pplate)
+		end
+	end,
+})
+
+-- Node detector
+-- Detects the node in front of it
+
+local node_detector_make_formspec = function (pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec", "size[9,2.5]" ..
+		"field[0.3,  0;9,2;scanname;Name of node to scan for (empty for any):;${scanname}]"..
+		"field[0.3,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
+		"button_exit[7,0.75;2,3;;Save]")
+end
+
+local node_detector_on_receive_fields = function(pos, formname, fields)
+	if not fields.scanname or not fields.digiline_channel then return end;
+
+	local meta = minetest.get_meta(pos)
+	meta:set_string("scanname", fields.scanname)
+	meta:set_string("digiline_channel", fields.digiline_channel)
+	node_detector_make_formspec(pos)
+end
+
+-- returns true if player was found, false if not
+local node_detector_scan = function (pos)
+	local node = minetest.get_node(pos)
+	local frontpos = vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+	local frontnode = minetest.get_node(frontpos)
+	local meta = minetest.get_meta(pos)
+	return (frontnode.name == meta:get_string("scanname")) or
+		(frontnode.name ~= "air" and frontnode.name ~= "ignore" and meta:get_string("scanname") == "")
+end
+
+-- set player name when receiving a digiline signal on a specific channel
+local node_detector_digiline = {
+	effector = {
+		action = function (pos, node, channel, msg)
+			local meta = minetest.get_meta(pos)
+			local active_channel = meta:get_string("digiline_channel")
+			if channel == active_channel then
+				if msg == GET_COMMAND then
+					local frontpos = vector.subtract(pos, minetest.facedir_to_dir(node.param2))
+					local name = minetest.get_node(frontpos).name
+					digiline:receptor_send(pos, digiline.rules.default, channel, name)
+				else
+					meta:set_string("scanname", msg)
+					node_detector_make_formspec(pos)
+				end
+			end
+		end,
+	},
+	receptor = {}
+}
+
+minetest.register_node("mesecons_detector:node_detector_off", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = {cracky=3},
+	description="Node Detector",
+	mesecons = {receptor = {
+		state = mesecon.state.off
+	}},
+	on_construct = node_detector_make_formspec,
+	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = function (pos, placer)
+		local placer_pos = placer:getpos()
+		
+		--correct for the player's height
+		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
+		
+		--correct for 6d facedir
+		if placer_pos then
+			local dir = {
+				x = pos.x - placer_pos.x,
+				y = pos.y - placer_pos.y,
+				z = pos.z - placer_pos.z
+			}
+			local node = minetest.get_node(pos)
+			node.param2 = minetest.dir_to_facedir(dir, true)
+			minetest.set_node(pos, node)
+			minetest.log("action", "real (6d) facedir: " .. node.param2)
+		end
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = node_detector_digiline
+})
+
+minetest.register_node("mesecons_detector:node_detector_on", {
+	tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_on.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = {cracky=3,not_in_creative_inventory=1},
+	drop = 'mesecons_detector:node_detector_off',
+	mesecons = {receptor = {
+		state = mesecon.state.on
+	}},
+	on_construct = node_detector_make_formspec,
+	on_receive_fields = node_detector_on_receive_fields,
+	after_place_node = function (pos, placer)
+		local placer_pos = placer:getpos()
+		
+		--correct for the player's height
+		if placer:is_player() then placer_pos.y = placer_pos.y + 1.5 end
+		
+		--correct for 6d facedir
+		if placer_pos then
+			local dir = {
+				x = pos.x - placer_pos.x,
+				y = pos.y - placer_pos.y,
+				z = pos.z - placer_pos.z
+			}
+			local node = minetest.get_node(pos)
+			node.param2 = minetest.dir_to_facedir(dir, true)
+			minetest.set_node(pos, node)
+			minetest.log("action", "real (6d) facedir: " .. node.param2)
+		end
+	end,
+	sounds = default.node_sound_stone_defaults(),
+	digiline = node_detector_digiline
+})
+
+minetest.register_craft({
+	output = 'mesecons_detector:node_detector_off',
+	recipe = {
+		{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
+		{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+	}
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:node_detector_off"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node)
+		if node_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_on", param2 = node.param2})
+			mesecon.receptor_on(pos)
+		end
+	end,
+})
+
+minetest.register_abm(
+	{nodenames = {"mesecons_detector:node_detector_on"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node)
+		if not node_detector_scan(pos) then
+			minetest.swap_node(pos, {name = "mesecons_detector:node_detector_off", param2 = node.param2})
+			mesecon.receptor_off(pos)
 		end
 	end,
 })

mesecons_doors/init.lua

@@ -0,0 +1,80 @@
+-- Modified, from minetest_game/mods/doors/init.lua
+local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
+	pos.y = pos.y + dir
+	if not minetest.get_node(pos).name == check_name then
+		return
+	end
+	local p2 = minetest.get_node(pos).param2
+	p2 = params[p2 + 1]
+
+	minetest.swap_node(pos, {name = replace_dir, param2 = p2})
+
+	pos.y = pos.y - dir
+	minetest.swap_node(pos, {name = replace, param2 = p2})
+
+	if (minetest.get_meta(pos):get_int("right") ~= 0) == (params[1] ~= 3) then
+		minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+	else
+		minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+	end
+end
+
+local function meseconify_door(name)
+	local function toggle_state1 (pos, node)
+		on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
+	end
+
+	local function toggle_state2 (pos, node)
+		on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
+	end
+
+	minetest.override_item(name.."_b_1", {
+		mesecons = {effector = {
+			action_on = toggle_state1,
+			action_off = toggle_state1,
+			rules = mesecon.rules.pplate
+		}},
+	})
+
+	minetest.override_item(name.."_b_2", {
+		mesecons = {effector = {
+			action_on = toggle_state2,
+			action_off = toggle_state2,
+			rules = mesecon.rules.pplate
+		}},
+	})
+end
+
+meseconify_door("doors:door_wood")
+meseconify_door("doors:door_steel")
+meseconify_door("doors:door_glass")
+meseconify_door("doors:door_obsidian_glass")
+
+-- Trapdoor
+local function trapdoor_switch(pos, node)
+	local state = minetest.get_meta(pos):get_int("state")
+
+	if state == 1 then
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
+	else
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
+	end
+
+	minetest.get_meta(pos):set_int("state", state == 1 and 0 or 1)
+end
+
+minetest.override_item("doors:trapdoor", {
+	mesecons = {effector = {
+		action_on = trapdoor_switch,
+		action_off = trapdoor_switch
+	}},
+})
+
+minetest.override_item("doors:trapdoor_open", {
+	mesecons = {effector = {
+		action_on = trapdoor_switch,
+		action_off = trapdoor_switch
+	}},
+})

mesecons_extrawires/corner.lua

@@ -15,7 +15,7 @@ local corner_get_rules = function (node)
 	 {x = 0,  y = 0,  z = -1}}
 
 	for i = 0, node.param2 do
-		rules = mesecon:rotate_rules_left(rules)
+		rules = mesecon.rotate_rules_left(rules)
 	end
 
 	return rules
@@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
 })
 
 minetest.register_craft({
-	output = '"mesecons_extrawires:corner_off" 3',
+	output = "mesecons_extrawires:corner_off 3",
 	recipe = {
 		{"", "", ""},
 		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""},

mesecons_extrawires/crossing.lua

@@ -1,49 +0,0 @@
--- CODE NOT ACTIVE
-
-local crossing_get_rules = function(node)
-	--TODO: calculate the real port states and use rules to link to them only if 
-end
-
-minetest.register_node("mesecons_extrawires:crossing_on", {
-	drawtype = "nodebox",
-	tiles = {"jeija_insulated_wire_sides_on.png"},
-	paramtype = "light",
-	walkable = false,
-	stack_max = 99,
-	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
-			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
-			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
-			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
-			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
-			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
-		},
-	},
-	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1, not_in_creative_inventory=1},
-	mesecons = {
-		receptor = {
-			state = mesecon.state.on,
-			rules = crossing_get_rules,
-		}
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "mesecons_extrawires:crossing",
-	recipe = {
-		"mesecons_insulated:insulated_off",
-		"mesecons_insulated:insulated_off",
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "mesecons_insulated:insulated_off 2",
-	recipe = {
-		"mesecons_extrawires:crossing",
-	},
-})

mesecons_extrawires/crossover.lua

@@ -0,0 +1,176 @@
+function crossover_get_rules(node)
+	return {
+		{--first wire
+			{x=-1,y=0,z=0},
+			{x=1,y=0,z=0},
+		},
+		{--second wire
+			{x=0,y=0,z=-1},
+			{x=0,y=0,z=1},
+		},
+	}
+end
+
+local crossover_states = {
+	"mesecons_extrawires:crossover_off",
+	"mesecons_extrawires:crossover_01",
+	"mesecons_extrawires:crossover_10",
+	"mesecons_extrawires:crossover_on",
+}
+
+minetest.register_node("mesecons_extrawires:crossover_off", {
+	description = "Insulated Crossover",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_off.png",
+		"jeija_insulated_wire_crossing_tb_off.png",
+		"jeija_insulated_wire_ends_off.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_01", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_01.png",
+		"jeija_insulated_wire_crossing_tb_01.png",
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01x.png",
+		"jeija_insulated_wire_ends_01z.png",
+		"jeija_insulated_wire_ends_01z.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_10", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_10.png",
+		"jeija_insulated_wire_crossing_tb_10.png",
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10x.png",
+		"jeija_insulated_wire_ends_10z.png",
+		"jeija_insulated_wire_ends_10z.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_node("mesecons_extrawires:crossover_on", {
+	description = "You hacker you!",
+	drop = "mesecons_extrawires:crossover_off",
+	drawtype = "nodebox",
+	tiles = {
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_crossing_tb_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png",
+		"jeija_insulated_wire_ends_on.png"
+	},
+	paramtype = "light",
+	walkable = false,
+	stack_max = 99,
+	selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 },
+			{ -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 },
+			{ -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 },
+			{ -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 },
+			{ -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 },
+		},
+	},
+	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
+	mesecons = {
+		conductor = {
+			states = crossover_states,
+			rules = crossover_get_rules(),
+		}
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "mesecons_extrawires:crossover_off",
+	recipe = {
+		"mesecons_insulated:insulated_off",
+		"mesecons_insulated:insulated_off",
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "mesecons_insulated:insulated_off 2",
+	recipe = {
+		"mesecons_extrawires:crossover_off",
+	},
+})

mesecons_extrawires/depends.txt

@@ -1 +1,2 @@
+default
 mesecons

mesecons_extrawires/init.lua

@@ -1,5 +1,4 @@
--- dofile(minetest.get_modpath("mesecons_extrawires").."/crossing.lua");
+dofile(minetest.get_modpath("mesecons_extrawires").."/crossover.lua");
--- The crossing code is not active right now because it is hard to maintain
 dofile(minetest.get_modpath("mesecons_extrawires").."/tjunction.lua");
 dofile(minetest.get_modpath("mesecons_extrawires").."/corner.lua");
 dofile(minetest.get_modpath("mesecons_extrawires").."/vertical.lua");

mesecons_extrawires/mesewire.lua

@@ -8,12 +8,7 @@ local mesewire_rules =
 	{x = 0, y = 0, z =-1},
 }
 
-minetest.register_node(":default:mese", {
+minetest.override_item("default:mese", {
-	description = "Mese Block",
-	tiles = {minetest.registered_nodes["default:mese"].tiles[1]},
-	is_ground_content = true,
-	groups = {cracky=1},
-	sounds = default.node_sound_stone_defaults(),
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:mese_powered",

mesecons_extrawires/tjunction.lua

@@ -16,7 +16,7 @@ local tjunction_get_rules = function (node)
 	 {x = 0,  y = 0,  z = -1}}
 
 	for i = 0, node.param2 do
-		rules = mesecon:rotate_rules_left(rules)
+		rules = mesecon.rotate_rules_left(rules)
 	end
 
 	return rules
@@ -38,7 +38,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
 	sunlight_propagates = true,
 	selection_box = tjunction_selectionbox,
 	node_box = tjunction_nodebox,
-	groups = {dig_immediate = 3, mesecon_conductor_craftable=1, not_in_creative_inventory = 1},
+	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:tjunction_off",
 	mesecons = {conductor = 
 	{
@@ -75,7 +75,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
 })
 
 minetest.register_craft({
-	output = '"mesecons_extrawires:tjunction_off" 3',
+	output = "mesecons_extrawires:tjunction_off 3",
 	recipe = {
 		{"", "", ""},
 		{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"},

mesecons_extrawires/vertical.lua

@@ -1,205 +1,171 @@
-local vbox = {
+local vertical_box = {
 	type = "fixed",
-	fixed = {-1/16, -.5, -1/16, 1/16, .5, 1/16}
+	fixed = {-1/16, -8/16, -1/16, 1/16, 8/16, 1/16}
 }
 
-local tbox = {
+local top_box = {
 	type = "fixed",
-	fixed = {{-.5, -.5, -.5, .5, -.5 + 1/16, .5}}
+	fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16}}
 }
 
-local bbox = {
+local bottom_box = {
 	type = "fixed",
-	fixed = {{  -.5, -.5     ,   -.5,   .5, -.5+1/16,   .5},
+	fixed = {
-		 {-1/16, -.5+1/16, -1/16, 1/16,  .5     , 1/16}}
+		{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16},
+		{-1/16, -7/16, -1/16, 1/16, 8/16, 1/16},
+	}
 }
 
-local vrules =
+local vertical_rules = {
-{{x = 0, y = 1, z = 0},
+	{x=0, y=1, z=0},
- {x = 0, y =-1, z = 0}}
+	{x=0, y=-1, z=0}
+}
 
-local trules = 
+local top_rules = {
-{{x = 1, y = 0, z = 0},
+	{x=1,y=0, z=0},
- {x =-1, y = 0, z = 0},
+	{x=-1,y=0, z=0},
- {x = 0, y = 0, z = 1},
+	{x=0,y=0, z=1},
- {x = 0, y = 0, z =-1},
+	{x=0,y=0, z=-1},
- {x = 0, y =-1, z = 0}}
+	{x=0,y=-1, z=0}
+}
 
-local brules = 
+local bottom_rules = {
-{{x = 1, y = 0, z = 0},
+	{x=1, y=0, z=0},
- {x =-1, y = 0, z = 0},
+	{x=-1, y=0, z=0},
- {x = 0, y = 0, z = 1},
+	{x=0, y=0, z=1},
- {x = 0, y = 0, z =-1},
+	{x=0, y=0, z=-1},
- {x = 0, y = 1, z = 0}}
+	{x=0, y=1, z=0},
+	{x=0, y=2, z=0} -- receive power from pressure plate / detector / ... 2 nodes above
+}
 
 local vertical_updatepos = function (pos)
-	local node = minetest.env:get_node(pos)
+	local node = minetest.get_node(pos)
-	if minetest.registered_nodes[node.name].is_vertical_conductor then
+	if minetest.registered_nodes[node.name]
-		local node_above = minetest.env:get_node(mesecon:addPosRule(pos, vrules[1]))
+	and minetest.registered_nodes[node.name].is_vertical_conductor then
-		local node_below = minetest.env:get_node(mesecon:addPosRule(pos, vrules[2]))
+		local node_above = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[1]))
+		local node_below = minetest.get_node(mesecon.addPosRule(pos, vertical_rules[2]))
 		local namestate = minetest.registered_nodes[node.name].vertical_conductor_state
 
-		-- above and below: vertical mesecon
+		local above = minetest.registered_nodes[node_above.name]
-		if 	minetest.registered_nodes[node_above.name].is_vertical_conductor
+			and minetest.registered_nodes[node_above.name].is_vertical_conductor
-		and	minetest.registered_nodes[node_below.name].is_vertical_conductor then
+		local below = minetest.registered_nodes[node_below.name]
-			minetest.env:add_node (pos, 
+			and minetest.registered_nodes[node_below.name].is_vertical_conductor
-			{name = "mesecons_extrawires:vertical_"..namestate})
 
-		-- above only: bottom
+		local basename = "mesecons_extrawires:vertical_"
-		elseif 		minetest.registered_nodes[node_above.name].is_vertical_conductor
+		if above and below then -- above and below: vertical mesecon
-		and 	not 	minetest.registered_nodes[node_below.name].is_vertical_conductor then
+			minetest.add_node(pos, {name = basename .. namestate})
-			minetest.env:add_node (pos, 
+		elseif above and not below then -- above only: bottom
-			{name = "mesecons_extrawires:vertical_bottom_"..namestate})
+			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
-
+		elseif not above and below then -- below only: top
-		-- below only: top
+			minetest.add_node(pos, {name = basename .. "top_" .. namestate})
-		elseif 	not 	minetest.registered_nodes[node_above.name].is_vertical_conductor
+		else -- no vertical wire above, no vertical wire below: use bottom
-		and		minetest.registered_nodes[node_below.name].is_vertical_conductor then
+			minetest.add_node(pos, {name = basename .. "bottom_" .. namestate})
-			minetest.env:add_node (pos, 
-			{name = "mesecons_extrawires:vertical_top_"..namestate})
-		else -- no vertical wire above, no vertical wire below: use default wire
-			minetest.env:add_node (pos, 
-			{name = "mesecons_extrawires:vertical_"..namestate})
 		end
+		mesecon.update_autoconnect(pos)
 	end
 end
 
 local vertical_update = function (pos, node)
 	vertical_updatepos(pos) -- this one
-	vertical_updatepos(mesecon:addPosRule(pos, vrules[1])) -- above
+	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[1])) -- above
-	vertical_updatepos(mesecon:addPosRule(pos, vrules[2])) -- below
+	vertical_updatepos(mesecon.addPosRule(pos, vertical_rules[2])) -- below
 end
 
 -- Vertical wire
-minetest.register_node("mesecons_extrawires:vertical_on", {
+mesecon.register_node("mesecons_extrawires:vertical", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
-	tiles = {"wires_vertical_on.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	selection_box = vertical_box,
-	selection_box = vbox,
+	node_box = vertical_box,
-	node_box = vbox,
-	is_vertical_conductor = true,
-	vertical_conductor_state = "on",
-	mesecons = {conductor = {
-		state = mesecon.state.on,
-		offstate = "mesecons_extrawires:vertical_off",
-		rules = vrules
-	}},
-	drop = {"mesecons_extrawires:vertical_off"},
-	after_place_node	= vertical_update,
-	after_dig_node 		= vertical_update
-})
-
-minetest.register_node("mesecons_extrawires:vertical_off", {
-	description = "Vertical mesecon",
-	drawtype = "nodebox",
-	tiles = {"wires_vertical_off.png"},
-	walkable = false,
-	paramtype = "light",
-	sunlight_propagates = true,
-	groups = {dig_immediate = 3},
-	selection_box = vbox,
-	node_box = vbox,
 	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
+	groups = {dig_immediate=3},
 	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_on",
-		rules = vrules
+		rules = vertical_rules,
-	}},
+	}}
-	after_place_node	= vertical_update,
+},{
-	after_dig_node 		= vertical_update
+	tiles = {"mesecons_wire_on.png"},
-})
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
-
--- Vertical wire top
-minetest.register_node("mesecons_extrawires:vertical_top_on", {
-	description = "Vertical mesecon",
-	drawtype = "nodebox",
-	tiles = {"wires_full_on.png"},
-	walkable = false,
-	paramtype = "light",
-	sunlight_propagates = true,
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
-	selection_box = tbox,
-	node_box = tbox,
-	is_vertical_conductor = true,
 	vertical_conductor_state = "on",
 	mesecons = {conductor = {
 		state = mesecon.state.on,
-		offstate = "mesecons_extrawires:vertical_top_off",
+		offstate = "mesecons_extrawires:vertical_off",
-		rules = trules
+		rules = vertical_rules,
-	}},
+	}}
-	drop = {"mesecons_extrawires:vertical_off"},
-	after_place_node	= vertical_update,
-	after_dig_node 		= vertical_update
 })
 
-minetest.register_node("mesecons_extrawires:vertical_top_off", {
+-- Vertical wire top
+mesecon.register_node("mesecons_extrawires:vertical_top", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
-	tiles = {"wires_full_off.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
+	groups = {dig_immediate=3, not_in_creative_inventory=1},
-	selection_box = tbox,
+	selection_box = top_box,
-	node_box = tbox,
+	node_box = top_box,
 	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
 	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_top_on",
-		rules = trules
+		rules = top_rules,
-	}},
+	}}
-	drop = {"mesecons_extrawires:vertical_off"},
+},{
-	after_place_node	= vertical_update,
+	tiles = {"mesecons_wire_on.png"},
-	after_dig_node 		= vertical_update
+	vertical_conductor_state = "on",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_top_off",
+		rules = top_rules,
+	}}
 })
 
 -- Vertical wire bottom
-minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
+mesecon.register_node("mesecons_extrawires:vertical_bottom", {
 	description = "Vertical mesecon",
 	drawtype = "nodebox",
-	tiles = {"wires_full_on.png"},
-	walkable = false,
-	paramtype = "light",
-	sunlight_propagates = true,
-	vertical_conductor_state = "on",
-	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
-	selection_box = bbox,
-	node_box = bbox,
-	mesecons = {conductor = {
-		state = mesecon.state.on,
-		offstate = "mesecons_extrawires:vertical_bottom_off",
-		rules = brules
-	}},
-	drop = {"mesecons_extrawires:vertical_off"},
-	after_place_node	= vertical_update,
-	after_dig_node 		= vertical_update
-})
-
-minetest.register_node("mesecons_extrawires:vertical_bottom_off", {
-	description = "Vertical mesecon",
-	drawtype = "nodebox",
-	tiles = {"wires_full_off.png"},
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
-	selection_box = bbox,
+	selection_box = bottom_box,
-	node_box = bbox,
+	node_box = bottom_box,
 	is_vertical_conductor = true,
+	drop = "mesecons_extrawires:vertical_off",
+	after_place_node = vertical_update,
+	after_dig_node = vertical_update
+},{
+	tiles = {"mesecons_wire_off.png"},
 	vertical_conductor_state = "off",
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:vertical_bottom_on",
-		rules = brules
+		rules = bottom_rules,
-	}},
+	}}
-	drop = {"mesecons_extrawires:vertical_off"},
+},{
-	after_place_node	= vertical_update,
+	tiles = {"mesecons_wire_on.png"},
-	after_dig_node 		= vertical_update
+	vertical_conductor_state = "on",
+	mesecons = {conductor = {
+		state = mesecon.state.on,
+		offstate = "mesecons_extrawires:vertical_bottom_off",
+		rules = bottom_rules,
+	}}
 })
 
 minetest.register_craft({

mesecons_gates/init.lua

@@ -1,222 +1,124 @@
-function gate_rotate_rules(node)
+local nodebox = {
+	type = "fixed",
+	fixed = {{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }},
+}
+
+local function gate_rotate_rules(node, rules)
 	for rotations = 0, node.param2 - 1 do
-		rules = mesecon:rotate_rules_left(rules)
+		rules = mesecon.rotate_rules_left(rules)
 	end
 	return rules
 end
 
-function gate_get_output_rules(node)
+local function gate_get_output_rules(node)
-	rules = {{x=1, y=0, z=0}}
+	return gate_rotate_rules(node, {{x=1, y=0, z=0}})
-	return gate_rotate_rules(node)
 end
 
-function gate_get_input_rules_oneinput(node)
+local function gate_get_input_rules_oneinput(node)
-	rules = {{x=-1, y=0, z=0}, {x=1, y=0, z=0}}
+	return gate_rotate_rules(node, {{x=-1, y=0, z=0}})
-	return gate_rotate_rules(node)
 end
 
-function gate_get_input_rules_twoinputs(node)
+local function gate_get_input_rules_twoinputs(node)
-	rules = {
+	return gate_rotate_rules(node, {{x=0, y=0, z=1, name="input1"},
-	{x=0, y=0, z=1},
+		{x=0, y=0, z=-1, name="input2"}})
-	{x=0, y=0, z=-1},
-	{x=1, y=0, z=0}}
-	return gate_rotate_rules(node)
 end
 
-function update_gate(pos)
+local function set_gate(pos, node, state)
-	gate = get_gate(pos)
+	local gate = minetest.registered_nodes[node.name]
-	L = rotate_ports(
+
-		yc_get_real_portstates(pos),
+	if mesecon.do_overheat(pos) then
-		minetest.env:get_node(pos).param2
+		minetest.remove_node(pos)
-	)
+		mesecon.receptor_off(pos, gate_get_output_rules(node))
-	if gate == "diode" then
+		minetest.add_item(pos, gate.drop)
-		set_gate(pos, L.a)
+	elseif state then
-	elseif gate == "not" then
+		minetest.swap_node(pos, {name = gate.onstate, param2=node.param2})
-		set_gate(pos, not L.a)
+		mesecon.receptor_on(pos, gate_get_output_rules(node))
-	elseif gate == "nand" then
+	else
-		set_gate(pos, not(L.b and L.d))
+		minetest.swap_node(pos, {name = gate.offstate, param2=node.param2})
-	elseif gate == "and" then
+		mesecon.receptor_off(pos, gate_get_output_rules(node))
-		set_gate(pos, L.b and L.d)
-	elseif gate == "xor" then
-		set_gate(pos, (L.b and not L.d) or (not L.b and L.d))
 	end
 end
 
-function set_gate(pos, on)
+local function update_gate(pos, node, link, newstate)
-	gate = get_gate(pos)
+	local gate = minetest.registered_nodes[node.name]
-	local meta = minetest.env:get_meta(pos)
-	if on ~= gate_state(pos) then
-		yc_heat(meta)
-		minetest.after(0.5, yc_cool, meta)
-		if yc_overheat(meta) then
-			pop_gate(pos)
-		else
-			if on then
-				mesecon:swap_node(pos, "mesecons_gates:"..gate.."_on")
-				mesecon:receptor_on(pos,
-				gate_get_output_rules(minetest.env:get_node(pos)))
-			else
-				mesecon:swap_node(pos, "mesecons_gates:"..gate.."_off")
-				mesecon:receptor_off(pos,
-				gate_get_output_rules(minetest.env:get_node(pos)))
-			end
-		end
-	end
-end
 
-function get_gate(pos)
-	return minetest.registered_nodes[minetest.env:get_node(pos).name].mesecons_gate
-end
-
-function gate_state(pos)
-	name = minetest.env:get_node(pos).name
-	return string.find(name, "_on") ~= nil
-end
-
-function pop_gate(pos)
-	gate = get_gate(pos)
-	minetest.env:remove_node(pos)
-	minetest.after(0.2, yc_overheat_off, pos)
-	minetest.env:add_item(pos, "mesecons_gates:"..gate.."_off")
-end
-
-function rotate_ports(L, param2)
-	for rotations=0, param2-1 do
-		port = L.a
-		L.a = L.b
-		L.b = L.c
-		L.c = L.d
-		L.d = port
-	end
-	return L
-end
-
-gates = {
-{name = "diode", inputnumber = 1}, 
-{name = "not"  , inputnumber = 1}, 
-{name = "nand" , inputnumber = 2},
-{name = "and"  , inputnumber = 2},
-{name = "xor"  , inputnumber = 2}}
-
-local onoff, drop, nodename, description, groups
-for _, gate in ipairs(gates) do
 	if gate.inputnumber == 1 then
-		get_rules = gate_get_input_rules_oneinput
+		set_gate(pos, node, gate.assess(newstate == "on"))
 	elseif gate.inputnumber == 2 then
-		get_rules = gate_get_input_rules_twoinputs
+		local meta = minetest.get_meta(pos)
-	end
+		meta:set_int(link.name, newstate == "on" and 1 or 0)
-	for on = 0, 1 do
-		nodename = "mesecons_gates:"..gate.name
-		if on == 1 then
-			onoff = "on"
-			drop = nodename.."_off"
-			nodename = nodename.."_"..onoff
-			description = "You hacker you!"
-			groups = {dig_immediate=2, not_in_creative_inventory=1}
-		else
-			onoff = "off"
-			drop = nil
-			nodename = nodename.."_"..onoff
-			description = gate.name.." Gate"
-			groups = {dig_immediate=2}
-		end
 
-		tiles = "jeija_microcontroller_bottom.png^"..
+		local val1 = meta:get_int("input1") == 1
-			"jeija_gate_"..onoff..".png^"..
+		local val2 = meta:get_int("input2") == 1
-			"jeija_gate_"..gate.name..".png"
+		set_gate(pos, node, gate.assess(val1, val2))
-
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{-8/16, -8/16, -8/16, 8/16, -7/16, 8/16 },
-			},
-		}
-
-		local mesecon_state
-		if on == 1 then
-			mesecon_state = mesecon.state.on
-		else
-			mesecon_state = mesecon.state.off
-		end
-
-		minetest.register_node(nodename, {
-			description = description,
-			paramtype = "light",
-			paramtype2 = "facedir",
-			drawtype = "nodebox",
-			tiles = {tiles},
-			inventory_image = tiles,
-			selection_box = node_box,
-			node_box = node_box,
-			walkable = true,
-			on_construct = function(pos)
-				local meta = minetest.env:get_meta(pos)
-				meta:set_int("heat", 0)
-				update_gate(pos)
-			end,
-			groups = groups,
-			drop = drop,
-			sounds = default.node_sound_stone_defaults(),
-			mesecons_gate = gate.name,
-			mesecons =
-			{
-				receptor =
-				{
-					state = mesecon_state,
-					rules = gate_get_output_rules
-				},
-				effector =
-				{
-					rules = get_rules,
-					action_change = update_gate
-				}
-			}
-		})
 	end
 end
 
-minetest.register_craft({
+function register_gate(name, inputnumber, assess, recipe)
-	output = 'mesecons_gates:diode_off',
+	local get_inputrules = inputnumber == 2 and gate_get_input_rules_twoinputs or
-	recipe = {
+		gate_get_input_rules_oneinput
-		{'', '', ''},
+	local description = "Mesecons Logic Gate: "..name
-		{'mesecons:mesecon', 'mesecons_torch:mesecon_torch_on', 'mesecons_torch:mesecon_torch_on'},
-		{'', '', ''},
-	},
-})
 
-minetest.register_craft({
+	local basename = "mesecons_gates:"..name
-	output = 'mesecons_gates:not_off',
+	mesecon.register_node(basename, {
-	recipe = {
+		description = description,
-		{'', '', ''},
+		inventory_image = "jeija_gate_off.png^jeija_gate_"..name..".png",
-		{'mesecons:mesecon', 'mesecons_torch:mesecon_torch_on', 'mesecons:mesecon'},
+		paramtype = "light",
-		{'', '', ''},
+		paramtype2 = "facedir",
-	},
+		drawtype = "nodebox",
-})
+		drop = basename.."_off",
+		selection_box = nodebox,
+		node_box = nodebox,
+		walkable = true,
+		sounds = default.node_sound_stone_defaults(),
+		assess = assess,
+		onstate = basename.."_on",
+		offstate = basename.."_off",
+		inputnumber = inputnumber
+	},{
+		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_off.png^"..
+			"jeija_gate_"..name..".png"},
+		groups = {dig_immediate = 2, overheat = 1},
+		mesecons = { receptor = {
+			state = "off",
+			rules = gate_get_output_rules
+		}, effector = {
+			rules = get_inputrules,
+			action_change = update_gate
+		}}
+	},{
+		tiles = {"jeija_microcontroller_bottom.png^".."jeija_gate_on.png^"..
+			"jeija_gate_"..name..".png"},
+		groups = {dig_immediate = 2, not_in_creative_inventory = 1, overheat = 1},
+		mesecons = { receptor = {
+			state = "on",
+			rules = gate_get_output_rules
+		}, effector = {
+			rules = get_inputrules,
+			action_change = update_gate
+		}}
+	})
 
-minetest.register_craft({
+	minetest.register_craft({output = basename.."_off", recipe = recipe})
-	output = 'mesecons_gates:and_off',
+end
-	recipe = {
-		{'mesecons:mesecon', '', ''},
-		{'', 'mesecons_materials:silicon', 'mesecons:mesecon'},
-		{'mesecons:mesecon', '', ''},
-	},
-})
 
-minetest.register_craft({
+register_gate("diode", 1, function (input) return input end,
-	output = 'mesecons_gates:nand_off',
+	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons_torch:mesecon_torch_on"}})
-	recipe = {
-		{'mesecons:mesecon', '', ''},
-		{'', 'mesecons_materials:silicon', 'mesecons_torch:mesecon_torch_on'},
-		{'mesecons:mesecon', '', ''},
-	},
-})
 
-minetest.register_craft({
+register_gate("not", 1, function (input) return not input end,
-	output = 'mesecons_gates:xor_off',
+	{{"mesecons:mesecon", "mesecons_torch:mesecon_torch_on", "mesecons:mesecon"}})
-	recipe = {
-		{'mesecons:mesecon', '', ''},
-		{'', 'mesecons_materials:silicon', 'mesecons_materials:silicon'},
-		{'mesecons:mesecon', '', ''},
-	},
-})
 
+register_gate("and", 2, function (val1, val2) return val1 and val2 end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons:mesecon"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("nand", 2, function (val1, val2) return not (val1 and val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons_torch:mesecon_torch_on"},
+	 {"mesecons:mesecon", "", ""}})
+
+register_gate("xor", 2, function (val1, val2) return (val1 or val2) and not (val1 and val2) end,
+	{{"mesecons:mesecon", "", ""},
+	 {"", "mesecons_materials:silicon", "mesecons_materials:silicon"},
+	 {"mesecons:mesecon", "", ""}})

mesecons_hydroturbine/init.lua

@@ -4,24 +4,17 @@
 -- (does not work with other liquids)
 
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
-	drawtype = "nodebox",
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
 	tiles = {"jeija_hydro_turbine_off.png"},
+	inventory_image = "jeija_hydro_turbine_inv.png",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
 	groups = {dig_immediate=2},
     	description="Water Turbine",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.45, 1.15, -0.1, 0.45, 1.45, 0.1},
-			{-0.1, 1.15, -0.45, 0.1, 1.45, 0.45}},
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.45, 1.15, -0.1, 0.45, 1.45, 0.1},
-			{-0.1, 1.15, -0.45, 0.1, 1.45, 0.45}},
 	},
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
@@ -30,25 +23,18 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
 })
 
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
-	drawtype = "nodebox",
+	drawtype = "mesh",
+	mesh = "jeija_hydro_turbine.obj",
+	wield_scale = {x=0.75, y=0.75, z=0.75},
 	tiles = {"jeija_hydro_turbine_on.png"},
-	drop = '"mesecons_hydroturbine:hydro_turbine_off" 1',
+	inventory_image = "jeija_hydro_turbine_inv.png",
+	drop = "mesecons_hydroturbine:hydro_turbine_off 1",
 	groups = {dig_immediate=2,not_in_creative_inventory=1},
 	description="Water Turbine",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.5, 1.15, -0.1, 0.5, 1.45, 0.1},
-			{-0.1, 1.15, -0.5, 0.1, 1.45, 0.5}},
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, 0.5, -0.15, 0.15, 1.45, 0.15},
-			{-0.5, 1.15, -0.1, 0.5, 1.45, 0.1},
-			{-0.1, 1.15, -0.5, 0.1, 1.45, 0.5}},
 	},
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {receptor = {
@@ -63,10 +49,10 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_off"},
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
-		if minetest.env:get_node(waterpos).name=="default:water_flowing" then
+		if minetest.get_node(waterpos).name=="default:water_flowing" then
-			minetest.env:add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"})
+			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_on"})
 			nodeupdate(pos)
-			mesecon:receptor_on(pos)
+			mesecon.receptor_on(pos)
 		end
 	end,
 })
@@ -77,20 +63,20 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_on"},
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		local waterpos={x=pos.x, y=pos.y+1, z=pos.z}
-		if minetest.env:get_node(waterpos).name~="default:water_flowing" then
+		if minetest.get_node(waterpos).name~="default:water_flowing" then
-			minetest.env:add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"})
+			minetest.add_node(pos, {name="mesecons_hydroturbine:hydro_turbine_off"})
 			nodeupdate(pos)
-			mesecon:receptor_off(pos)
+			mesecon.receptor_off(pos)
 		end
 	end,
 })
 
 minetest.register_craft({
-	output = '"mesecons_hydroturbine:hydro_turbine_off" 2',
+	output = "mesecons_hydroturbine:hydro_turbine_off 2",
 	recipe = {
-	{'','"default:stick"', ''},
+	{"","default:stick", ""},
-	{'"default:stick"', '"default:steel_ingot"', '"default:stick"'},
+	{"default:stick", "default:steel_ingot", "default:stick"},
-	{'','"default:stick"', ''},
+	{"","default:stick", ""},
 	}
 })
 

mesecons_hydroturbine/models/jeija_hydro_turbine.obj

@@ -0,0 +1,416 @@
+# Blender v2.69 (sub 0) OBJ File: 'mesecons-water-turbine.blend'
+# www.blender.org
+o Cylinder.002_Cylinder.003
+v 0.000000 0.500000 -0.150000
+v 0.000000 0.562500 -0.150000
+v 0.106066 0.500000 -0.106066
+v 0.106066 0.562500 -0.106066
+v 0.150000 0.500000 0.000000
+v 0.150000 0.562500 0.000000
+v 0.106066 0.500000 0.106066
+v 0.106066 0.562500 0.106066
+v -0.000000 0.500000 0.150000
+v -0.000000 0.562500 0.150000
+v -0.106066 0.500000 0.106066
+v -0.106066 0.562500 0.106066
+v -0.150000 0.500000 -0.000000
+v -0.150000 0.562500 -0.000000
+v -0.106066 0.500000 -0.106066
+v -0.106066 0.562500 -0.106066
+v 0.097545 0.625000 -0.490393
+v -0.097545 0.625000 -0.490393
+v -0.277785 0.625000 -0.415735
+v -0.415735 0.625000 -0.277785
+v -0.490393 0.625000 -0.097545
+v -0.490393 0.625000 0.097545
+v -0.415735 0.625000 0.277785
+v -0.277785 0.625000 0.415735
+v -0.097545 0.625000 0.490393
+v 0.097545 0.625000 0.490393
+v 0.277785 0.625000 0.415735
+v 0.415735 0.625000 0.277785
+v 0.490393 0.625000 0.097545
+v 0.490393 0.625000 -0.097545
+v 0.415735 0.625000 -0.277785
+v 0.277785 0.625000 -0.415735
+v 0.097545 0.656250 -0.490393
+v -0.097545 0.656250 -0.490393
+v -0.277785 0.656250 -0.415735
+v -0.415735 0.656250 -0.277785
+v -0.490393 0.656250 -0.097545
+v -0.490393 0.656250 0.097545
+v -0.415735 0.656250 0.277785
+v -0.277785 0.656250 0.415735
+v -0.097545 0.656250 0.490393
+v 0.097545 0.656250 0.490393
+v 0.277785 0.656250 0.415735
+v 0.415735 0.656250 0.277785
+v 0.490393 0.656250 0.097545
+v 0.490393 0.656250 -0.097545
+v 0.415735 0.656250 -0.277785
+v 0.277785 0.656250 -0.415735
+v 0.116233 0.634645 -0.436100
+v 0.116233 1.482640 -0.436100
+v 0.299524 0.634645 -0.186124
+v 0.299524 1.482640 -0.186124
+v 0.343405 0.634645 0.080186
+v 0.343405 1.482640 0.080186
+v 0.186124 0.634645 0.299524
+v 0.186124 1.482640 0.299524
+v -0.080186 0.634645 0.343405
+v -0.080186 1.482640 0.343405
+v -0.299524 0.634645 0.186124
+v -0.299524 1.482640 0.186124
+v -0.343405 0.634645 -0.080186
+v -0.343405 1.482640 -0.080186
+v -0.186124 0.634645 -0.299524
+v -0.186124 1.482640 -0.299524
+v 0.080186 0.634645 -0.343405
+v 0.080186 1.482640 -0.343405
+v 0.390559 1.482640 -0.226180
+v 0.390559 0.634645 -0.226180
+v 0.436100 1.482640 0.116233
+v 0.436100 0.634645 0.116233
+v 0.226180 1.482640 0.390559
+v 0.226180 0.634645 0.390559
+v -0.116233 1.482640 0.436100
+v -0.116233 0.634645 0.436100
+v -0.390559 1.482640 0.226180
+v -0.390559 0.634645 0.226180
+v -0.436100 1.482640 -0.116233
+v -0.436100 0.634645 -0.116233
+v -0.226180 1.482640 -0.390559
+v -0.226180 0.634645 -0.390559
+v 0.108975 0.634645 -0.430778
+v 0.292266 0.634645 -0.180802
+v 0.292266 1.482640 -0.180802
+v 0.108975 1.482640 -0.430778
+v 0.381664 0.634645 -0.227549
+v 0.334509 0.634645 0.078817
+v 0.334509 1.482640 0.078817
+v 0.381664 1.482640 -0.227549
+v 0.430778 0.634645 0.108975
+v 0.180802 0.634645 0.292266
+v 0.180802 1.482640 0.292266
+v 0.430778 1.482640 0.108975
+v 0.227549 0.634645 0.381664
+v -0.078817 0.634645 0.334509
+v -0.078817 1.482640 0.334509
+v 0.227549 1.482640 0.381664
+v -0.108975 0.634645 0.430778
+v -0.292266 0.634645 0.180802
+v -0.292266 1.482640 0.180802
+v -0.108975 1.482640 0.430778
+v -0.381664 0.634645 0.227549
+v -0.334509 0.634645 -0.078817
+v -0.334509 1.482640 -0.078817
+v -0.381664 1.482640 0.227549
+v -0.227549 0.634645 -0.381663
+v 0.078817 0.634645 -0.334509
+v 0.078817 1.482640 -0.334509
+v -0.227549 1.482640 -0.381663
+v -0.430779 0.634645 -0.108975
+v -0.180802 0.634645 -0.292266
+v -0.180802 1.482640 -0.292266
+v -0.430779 1.482640 -0.108975
+v 0.097545 1.500000 -0.490393
+v -0.097545 1.500000 -0.490393
+v -0.277785 1.500000 -0.415735
+v -0.415735 1.500000 -0.277785
+v -0.490393 1.500000 -0.097545
+v -0.490393 1.500000 0.097545
+v -0.415735 1.500000 0.277785
+v -0.277785 1.500000 0.415735
+v -0.097545 1.500000 0.490393
+v 0.097545 1.500000 0.490393
+v 0.277785 1.500000 0.415735
+v 0.415735 1.500000 0.277785
+v 0.490393 1.500000 0.097545
+v 0.490393 1.500000 -0.097545
+v 0.415735 1.500000 -0.277785
+v 0.277785 1.500000 -0.415735
+v 0.097545 1.468750 -0.490393
+v -0.097545 1.468750 -0.490393
+v -0.277785 1.468750 -0.415735
+v -0.415735 1.468750 -0.277785
+v -0.490393 1.468750 -0.097545
+v -0.490393 1.468750 0.097545
+v -0.415735 1.468750 0.277785
+v -0.277785 1.468750 0.415735
+v -0.097545 1.468750 0.490393
+v 0.097545 1.468750 0.490393
+v 0.277785 1.468750 0.415735
+v 0.415735 1.468750 0.277785
+v 0.490393 1.468750 0.097545
+v 0.490393 1.468750 -0.097545
+v 0.415735 1.468750 -0.277785
+v 0.277785 1.468750 -0.415735
+v 0.025624 0.559630 -0.061863
+v 0.025624 1.481372 -0.061863
+v 0.061863 0.559630 -0.025624
+v 0.061863 1.481372 -0.025624
+v 0.061863 0.559630 0.025624
+v 0.061863 1.481372 0.025624
+v 0.025624 0.559630 0.061863
+v 0.025624 1.481372 0.061863
+v -0.025624 0.559630 0.061863
+v -0.025624 1.481372 0.061863
+v -0.061863 0.559630 0.025624
+v -0.061863 1.481372 0.025624
+v -0.061863 0.559630 -0.025624
+v -0.061863 1.481372 -0.025624
+v -0.025624 0.559630 -0.061863
+v -0.025624 1.481372 -0.061863
+v 0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.500000
+vt 0.416667 0.625000
+vt 0.416667 0.645833
+vt 0.395833 0.645833
+vt 0.395833 0.625000
+vt 0.375000 0.645833
+vt 0.375000 0.625000
+vt 0.291667 0.625000
+vt 0.291667 0.645833
+vt 0.312500 0.645833
+vt 0.312500 0.625000
+vt 0.333333 0.645833
+vt 0.333333 0.625000
+vt 0.354167 0.645833
+vt 0.354167 0.625000
+vt 0.708333 0.645833
+vt 0.729167 0.625000
+vt 0.750000 0.625000
+vt 0.770833 0.645833
+vt 0.770833 0.666667
+vt 0.750000 0.687500
+vt 0.729167 0.687500
+vt 0.708333 0.666667
+vt 0.437500 0.625000
+vt 0.437500 0.645833
+vt 0.458333 0.625000
+vt 0.458333 0.645833
+vt 0.656250 0.953125
+vt 0.593750 0.980469
+vt 0.531250 0.980469
+vt 0.468750 0.953125
+vt 0.421875 0.906250
+vt 0.394531 0.843750
+vt 0.394531 0.781250
+vt 0.421875 0.718750
+vt 0.468750 0.671875
+vt 0.531250 0.644531
+vt 0.593750 0.644531
+vt 0.656250 0.671875
+vt 0.703125 0.718750
+vt 0.730469 0.781250
+vt 0.730469 0.843750
+vt 0.703125 0.906250
+vt 0.019531 0.843750
+vt 0.019531 0.781250
+vt 0.046875 0.718750
+vt 0.093750 0.671875
+vt 0.156250 0.644531
+vt 0.218750 0.644531
+vt 0.281250 0.671875
+vt 0.328125 0.718750
+vt 0.355469 0.781250
+vt 0.355469 0.843750
+vt 0.328125 0.906250
+vt 0.281250 0.953125
+vt 0.218750 0.980469
+vt 0.156250 0.980469
+vt 0.093750 0.953125
+vt 0.046875 0.906250
+vt 0.187500 0.041667
+vt 0.104167 0.041667
+vt 0.104167 0.020833
+vt 0.187500 0.020833
+vt 0.270833 0.041667
+vt 0.270833 0.020833
+vt 0.354167 0.041667
+vt 0.354167 0.020833
+vt 0.437500 0.041667
+vt 0.437500 0.020833
+vt 0.520833 0.041667
+vt 0.520833 0.020833
+vt 0.354167 0.104167
+vt 0.270833 0.104167
+vt 0.270833 0.083333
+vt 0.354167 0.083333
+vt 0.604167 0.041667
+vt 0.604167 0.020833
+vt 0.687500 0.041667
+vt 0.687500 0.020833
+vt 0.437500 0.104167
+vt 0.437500 0.083333
+vt 0.104167 0.104167
+vt 0.020833 0.104167
+vt 0.020833 0.083333
+vt 0.104167 0.083333
+vt 0.520833 0.104167
+vt 0.520833 0.083333
+vt 0.187500 0.104167
+vt 0.187500 0.083333
+vt 0.604167 0.104167
+vt 0.604167 0.083333
+vt 0.687500 0.104167
+vt 0.687500 0.083333
+vt 0.020833 0.041667
+vt 0.020833 0.020833
+vt 0.979167 0.020833
+vt 0.979167 0.270833
+vt 0.895833 0.270833
+vt 0.895833 0.020833
+vt 0.875000 0.020833
+vt 0.875000 0.270833
+vt 0.791667 0.270833
+vt 0.791667 0.020833
+vt 0.687500 0.208333
+vt 0.687500 0.229167
+vt 0.604167 0.229167
+vt 0.604167 0.208333
+vt 0.104167 0.145833
+vt 0.104167 0.166667
+vt 0.020833 0.166667
+vt 0.020833 0.145833
+vt 0.187500 0.145833
+vt 0.187500 0.166667
+vt 0.270833 0.145833
+vt 0.270833 0.166667
+vt 0.354167 0.145833
+vt 0.354167 0.166667
+vt 0.187500 0.208333
+vt 0.187500 0.229167
+vt 0.104167 0.229167
+vt 0.104167 0.208333
+vt 0.437500 0.145833
+vt 0.437500 0.166667
+vt 0.520833 0.145833
+vt 0.520833 0.166667
+vt 0.270833 0.208333
+vt 0.270833 0.229167
+vt 0.604167 0.145833
+vt 0.604167 0.166667
+vt 0.354167 0.208333
+vt 0.354167 0.229167
+vt 0.687500 0.145833
+vt 0.687500 0.166667
+vt 0.437500 0.208333
+vt 0.437500 0.229167
+vt 0.020833 0.229167
+vt 0.020833 0.208333
+vt 0.520833 0.208333
+vt 0.520833 0.229167
+vt 0.854167 0.645833
+vt 0.854167 0.979167
+vt 0.812500 0.979167
+vt 0.812500 0.645833
+vt 0.979167 0.312500
+vt 0.979167 0.645833
+vt 0.937500 0.645833
+vt 0.937500 0.312500
+vt 0.895833 0.645833
+vt 0.895833 0.312500
+vt 0.854167 0.312500
+vt 0.812500 0.312500
+vt 0.979167 0.979167
+vt 0.937500 0.979167
+vt 0.895833 0.979167
+vt 0.020833 0.604167
+vt 0.020833 0.270833
+vt 0.354167 0.270833
+vt 0.354167 0.604167
+vt 0.729167 0.270833
+vt 0.729167 0.604167
+vt 0.395833 0.604167
+vt 0.395833 0.270833
+s off
+f 1/1 2/2 4/3 3/4
+f 3/4 4/3 6/5 5/6
+f 5/7 6/8 8/9 7/10
+f 7/10 8/9 10/11 9/12
+f 9/12 10/11 12/13 11/14
+f 11/14 12/13 14/5 13/6
+f 4/15 2/16 16/17 14/18 12/19 10/20 8/21 6/22
+f 15/23 16/24 2/2 1/1
+f 13/25 14/26 16/24 15/23
+f 130/27 129/28 144/29 143/30 142/31 141/32 140/33 139/34 138/35 137/36 136/37 135/38 134/39 133/40 132/41 131/42
+f 18/43 17/44 32/45 31/46 30/47 29/48 28/49 27/50 26/51 25/52 24/53 23/54 22/55 21/56 20/57 19/58
+f 27/59 28/60 44/61 43/62
+f 26/63 27/59 43/62 42/64
+f 25/65 26/63 42/64 41/66
+f 24/67 25/65 41/66 40/68
+f 23/69 24/67 40/68 39/70
+f 17/71 18/72 34/73 33/74
+f 22/75 23/69 39/70 38/76
+f 21/77 22/75 38/76 37/78
+f 32/79 17/71 33/74 48/80
+f 20/81 21/82 37/83 36/84
+f 31/85 32/79 48/80 47/86
+f 19/87 20/81 36/84 35/88
+f 30/89 31/85 47/86 46/90
+f 18/72 19/87 35/88 34/73
+f 29/91 30/89 46/90 45/92
+f 28/60 29/93 45/94 44/61
+f 49/95 50/96 52/97 51/98
+f 68/98 67/95 54/96 53/97
+f 70/95 69/96 56/97 55/98
+f 72/96 71/97 58/98 57/95
+f 74/95 73/96 60/97 59/98
+f 76/95 75/96 62/97 61/98
+f 80/96 79/97 66/98 65/95
+f 78/95 77/96 64/97 63/98
+f 81/99 82/100 83/101 84/102
+f 85/100 86/101 87/102 88/99
+f 89/101 90/102 91/99 92/100
+f 93/102 94/99 95/100 96/101
+f 97/102 98/99 99/100 100/101
+f 101/99 102/100 103/101 104/102
+f 105/102 106/99 107/100 108/101
+f 109/101 110/102 111/99 112/100
+f 75/100 76/99 101/98 104/97
+f 71/100 72/99 93/98 96/97
+f 67/98 68/97 85/100 88/99
+f 79/98 80/97 105/100 108/99
+f 77/100 78/99 109/98 112/97
+f 73/100 74/99 97/98 100/97
+f 69/98 70/97 89/100 92/99
+f 50/98 49/97 81/100 84/99
+f 33/51 34/52 35/53 36/54 37/55 38/56 39/57 40/58 41/43 42/44 43/45 44/46 45/47 46/48 47/49 48/50
+f 123/103 139/104 140/105 124/106
+f 122/107 138/108 139/109 123/110
+f 121/111 137/112 138/108 122/107
+f 120/113 136/114 137/112 121/111
+f 119/115 135/116 136/114 120/113
+f 113/117 129/118 130/119 114/120
+f 118/121 134/122 135/116 119/115
+f 117/123 133/124 134/122 118/121
+f 128/125 144/126 129/118 113/117
+f 116/127 132/128 133/124 117/123
+f 127/129 143/130 144/126 128/125
+f 115/131 131/132 132/128 116/127
+f 126/133 142/134 143/130 127/129
+f 114/120 130/119 131/135 115/136
+f 125/137 141/138 142/134 126/133
+f 124/106 140/105 141/138 125/137
+f 145/139 146/140 148/141 147/142
+f 147/143 148/144 150/145 149/146
+f 149/146 150/145 152/147 151/148
+f 151/148 152/147 154/139 153/149
+f 153/149 154/139 156/142 155/150
+f 155/144 156/151 158/152 157/145
+f 159/147 160/153 146/140 145/139
+f 157/145 158/152 160/153 159/147
+f 161/154 162/155 163/156 164/157
+f 165/155 168/156 167/157 166/154
+f 161/158 165/159 166/160 162/161
+f 162/158 166/159 167/160 163/161
+f 163/158 167/159 168/160 164/161
+f 165/160 161/161 164/158 168/159
+f 113/40 114/41 115/42 116/27 117/28 118/29 119/30 120/31 121/32 122/33 123/34 124/35 125/36 126/37 127/38 128/39

mesecons_insulated/init.lua

@@ -2,7 +2,7 @@ function insulated_wire_get_rules(node)
 	local rules = 	{{x = 1,  y = 0,  z = 0},
 			 {x =-1,  y = 0,  z = 0}}
 	if node.param2 == 1 or node.param2 == 3 then
-		return mesecon:rotate_rules_right(rules)
+		return mesecon.rotate_rules_right(rules)
 	end
 	return rules
 end
@@ -41,7 +41,7 @@ minetest.register_node("mesecons_insulated:insulated_on", {
 
 minetest.register_node("mesecons_insulated:insulated_off", {
 	drawtype = "nodebox",
-	description = "insulated mesecons",
+	description = "Insulated Mesecon",
 	tiles = {
 		"jeija_insulated_wire_sides_off.png",
 		"jeija_insulated_wire_sides_off.png",
@@ -71,14 +71,10 @@ minetest.register_node("mesecons_insulated:insulated_off", {
 })
 
 minetest.register_craft({
-	output = '"mesecons_insulated:insulated_off" 3',
+	output = "mesecons_insulated:insulated_off 3",
 	recipe = {
 		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
 		{"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"},
 		{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
 	}
 })
-
-mesecon:add_rules("insulated", {
-{x = 1,  y = 0,  z = 0},
-{x =-1,  y = 0,  z = 0}})

mesecons_lamp/init.lua

@@ -21,11 +21,11 @@ minetest.register_node("mesecons_lamp:lamp_on", {
 	node_box = mesecon_lamp_box,
 	selection_box = mesecon_lamp_box,
 	groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},
-	drop='"mesecons_lamp:lamp_off" 1',
+	drop="mesecons_lamp:lamp_off 1",
 	sounds = default.node_sound_glass_defaults(),
 	mesecons = {effector = {
 		action_off = function (pos, node)
-			mesecon:swap_node(pos, "mesecons_lamp:lamp_off")
+			minetest.swap_node(pos, {name = "mesecons_lamp:lamp_off", param2 = node.param2})
 		end
 	}}
 })
@@ -46,16 +46,16 @@ minetest.register_node("mesecons_lamp:lamp_off", {
 	sounds = default.node_sound_glass_defaults(),
 	mesecons = {effector = {
 		action_on = function (pos, node)
-			mesecon:swap_node(pos, "mesecons_lamp:lamp_on")
+			minetest.swap_node(pos, {name = "mesecons_lamp:lamp_on", param2 = node.param2})
 		end
 	}}
 })
 
 minetest.register_craft({
-	output = '"mesecons_lamp:lamp_off" 1',
+	output = "mesecons_lamp:lamp_off 1",
 	recipe = {
-		{'', '"default:glass"', ''},
+		{"", "default:glass", ""},
-		{'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
+		{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
-		{'', '"default:glass"', ''},
+		{"", "default:glass", ""},
 	}
 })

mesecons_lightstone/depends.txt

@@ -1 +1,2 @@
 mesecons
+dye

mesecons_lightstone/init.lua

@@ -1,43 +1,60 @@
-function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
+local lightstone_rules = {
+	{x=0,  y=0,  z=-1},
+	{x=1,  y=0,  z=0},
+	{x=-1, y=0,  z=0},
+	{x=0,  y=0,  z=1},
+	{x=1,  y=1,  z=0},
+	{x=1,  y=-1, z=0},
+	{x=-1, y=1,  z=0},
+	{x=-1, y=-1, z=0},
+	{x=0,  y=1,  z=1},
+	{x=0,  y=-1, z=1},
+	{x=0,  y=1,  z=-1},
+	{x=0,  y=-1, z=-1},
+	{x=0,  y=-1, z=0},
+}
+
+function mesecon.lightstone_add(name, base_item, texture_off, texture_on)
 	minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_off", {
-	tiles = {texture_off},
+		tiles = {texture_off},
-	inventory_image = minetest.inventorycube(texture_off),
+		groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2},
-	groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2},
+		description=name.." Lightstone",
-	description=name.." Lightstone",
+		sounds = default.node_sound_stone_defaults(),
-	sounds = default.node_sound_stone_defaults(),
+		mesecons = {effector = {
-	mesecons = {effector = {
+			rules = lightstone_rules,
-		action_on = function (pos, node)
+			action_on = function (pos, node)
-			mesecon:swap_node(pos, "mesecons_lightstone:lightstone_" .. name .. "_on")
+				minetest.swap_node(pos, {name = "mesecons_lightstone:lightstone_" .. name .. "_on", param2 = node.param2})
-		end
+			end,
-	}}
+		}}
-    })
+	})
 	minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
 	tiles = {texture_on},
-	inventory_image = minetest.inventorycube(texture_on),
 	groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
-	drop = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
+	drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
 	light_source = LIGHT_MAX-2,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
+		rules = lightstone_rules,
 		action_off = function (pos, node)
-			mesecon:swap_node(pos, "mesecons_lightstone:lightstone_" .. name .. "_off")
+			minetest.swap_node(pos, {name = "mesecons_lightstone:lightstone_" .. name .. "_off", param2 = node.param2})
-		end
+		end,
 	}}
-    })
+	})
 
-    minetest.register_craft({
+	minetest.register_craft({
-	    output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
+		output = "mesecons_lightstone:lightstone_" .. name .. "_off",
-	    recipe = {
+		recipe = {
-		    {'',base_item,''},
+			{"",base_item,""},
-		    {base_item,'default:torch',base_item},
+			{base_item,"default:torch",base_item},
-		    {'','group:mesecon_conductor_craftable',''},
+			{"","group:mesecon_conductor_craftable",""}
-	    }
+		}
-    })
+	})
 end
 
 
-mesecon:lightstone_add("red", "craft default:clay_brick 1", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
+mesecon.lightstone_add("red", "dye:red", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
-mesecon:lightstone_add("green", "node default:cactus 1", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
+mesecon.lightstone_add("green", "dye:green", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
-mesecon:lightstone_add("blue", "node mesecons_materials:fiber 1", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
+mesecon.lightstone_add("blue", "dye:blue", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
-mesecon:lightstone_add("gray", "node default:cobble 1", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
+mesecon.lightstone_add("gray", "dye:grey", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
-mesecon:lightstone_add("darkgray", "node default:gravel 1", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")
+mesecon.lightstone_add("darkgray", "dye:dark_grey", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")
+mesecon.lightstone_add("yellow", "dye:yellow", "jeija_lightstone_yellow_off.png", "jeija_lightstone_yellow_on.png")

mesecons_luacontroller/init.lua

@@ -1,11 +1,21 @@
+--        ______
+--       |
+--       |
+--       |        __       ___  _   __         _  _
+-- |   | |       |  | |\ |  |  |_| |  | |  |  |_ |_|
+-- |___| |______ |__| | \|  |  | \ |__| |_ |_ |_ |\
+-- |
+-- |
+--
+
 -- Reference
--- ports = get_real_portstates(pos): gets if inputs are powered from outside
+-- ports = get_real_port_states(pos): gets if inputs are powered from outside
--- newport = merge_portstates(state1, state2): just does result = state1 or state2 for every port
+-- newport = merge_port_states(state1, state2): just does result = state1 or state2 for every port
--- action_setports(pos, ports, vports): activates/deactivates the mesecons according to the portstates (helper for action)
+-- set_port(pos, rule, state): activates/deactivates the mesecons according to the port states
--- action(pos, ports): Applies new portstates to a luacontroller at pos
+-- set_port_states(pos, ports): Applies new port states to a LuaController at pos
--- lc_update(pos): updates the controller at pos by executing the code
+-- run(pos): runs the code in the controller at pos
--- reset_meta (pos, code, errmsg): performs a software-reset, installs new code and prints error messages
+-- reset_meta(pos, code, errmsg): performs a software-reset, installs new code and prints error messages
--- reset (pos): performs a hardware reset, turns off all ports
+-- resetn(pos): performs a hardware reset, turns off all ports
 --
 -- The Sandbox
 -- The whole code of the controller runs in a sandbox,
@@ -20,331 +30,405 @@
 
 local BASENAME = "mesecons_luacontroller:luacontroller"
 
-local rules = {}
+local rules = {
-rules.a = {x = -1, y = 0, z =  0, name="A"}
+	a = {x = -1, y = 0, z =  0, name="A"},
-rules.b = {x =  0, y = 0, z =  1, name="B"}
+	b = {x =  0, y = 0, z =  1, name="B"},
-rules.c = {x =  1, y = 0, z =  0, name="C"}
+	c = {x =  1, y = 0, z =  0, name="C"},
-rules.d = {x =  0, y = 0, z = -1, name="D"}
+	d = {x =  0, y = 0, z = -1, name="D"},
+}
+
 
 ------------------
 -- Action stuff --
 ------------------
--- These helpers are required to set the portstates of the luacontroller
+-- These helpers are required to set the port states of the luacontroller
 
-local get_real_portstates = function(pos) -- determine if ports are powered (by itself or from outside)
+local function update_real_port_states(pos, rule_name, new_state)
-	ports = {
+	local meta = minetest.get_meta(pos)
-		a = mesecon:is_power_on(mesecon:addPosRule(pos, rules.a))
+	if rule_name == nil then
-			and mesecon:rules_link(mesecon:addPosRule(pos, rules.a), pos),
+		meta:set_int("real_portstates", 1)
-		b = mesecon:is_power_on(mesecon:addPosRule(pos, rules.b))
+		return
-			and mesecon:rules_link(mesecon:addPosRule(pos, rules.b), pos),
+	end
-		c = mesecon:is_power_on(mesecon:addPosRule(pos, rules.c))
+	local n = meta:get_int("real_portstates") - 1
-			and mesecon:rules_link(mesecon:addPosRule(pos, rules.c), pos),
+	local L = {}
-		d = mesecon:is_power_on(mesecon:addPosRule(pos, rules.d))
+	for i = 1, 4 do
-			and mesecon:rules_link(mesecon:addPosRule(pos, rules.d), pos),
+		L[i] = n % 2
+		n = math.floor(n / 2)
+	end
+	--                   (0,-1) (-1,0)      (1,0) (0,1)
+	local pos_to_side = {  4,     1,   nil,   3,    2 }
+	if rule_name.x == nil then
+		for _, rname in ipairs(rule_name) do
+			local port = pos_to_side[rname.x + (2 * rname.z) + 3]
+			L[port] = (newstate == "on") and 1 or 0
+		end
+	else
+		local port = pos_to_side[rule_name.x + (2 * rule_name.z) + 3]
+		L[port] = (new_state == "on") and 1 or 0
+	end
+	meta:set_int("real_portstates",
+		1 +
+		1 * L[1] +
+		2 * L[2] +
+		4 * L[3] +
+		8 * L[4])
+end
+
+
+local port_names = {"a", "b", "c", "d"}
+
+local function get_real_port_states(pos)
+	-- Determine if ports are powered (by itself or from outside)
+	local meta = minetest.get_meta(pos)
+	local L = {}
+	local n = meta:get_int("real_portstates") - 1
+	for _, name in ipairs(port_names) do
+		L[name] = ((n % 2) == 1)
+		n = math.floor(n / 2)
+	end
+	return L
+end
+
+
+local function merge_port_states(ports, vports)
+	return {
+		a = ports.a or vports.a,
+		b = ports.b or vports.b,
+		c = ports.c or vports.c,
+		d = ports.d or vports.d,
 	}
-	return ports
 end
 
-local merge_portstates = function (ports, vports)
+local function generate_name(ports)
-	local npo = {a=false, b=false, c=false, d=false}
+	local d = ports.d and 1 or 0
-	npo.a = vports.a or ports.a
+	local c = ports.c and 1 or 0
-	npo.b = vports.b or ports.b
+	local b = ports.b and 1 or 0
-	npo.c = vports.c or ports.c
+	local a = ports.a and 1 or 0
-	npo.d = vports.d or ports.d
-	return npo
-end
-
-local generate_name = function (ports, overwrite)
-	local overwrite = overwrite or {}
-	local d = overwrite.d or (ports.d and 1 or 0)
-	local c = overwrite.c or (ports.c and 1 or 0)
-	local b = overwrite.b or (ports.b and 1 or 0)
-	local a = overwrite.a or (ports.a and 1 or 0)
 	return BASENAME..d..c..b..a
 end
 
-local setport = function (pos, rule, ignore, state, ports)
+
-	local ignorename = generate_name(ports, ignore)
+local function set_port(pos, rule, state)
-	mesecon:swap_node(pos, ignorename)
 	if state then
-		mesecon:receptor_on(pos, {rule})
+		mesecon.receptor_on(pos, {rule})
 	else
-		mesecon:receptor_off(pos, {rule})
+		mesecon.receptor_off(pos, {rule})
 	end
-	if minetest.env:get_node(pos).name ~= ignorename then
-		return true -- overridden by second process
-	end
-	return false -- success
 end
 
-local action = function (pos, ports, forcereset)
+
-	local name = minetest.env:get_node(pos).name
+local function clean_port_states(ports)
+	ports.a = ports.a and true or false
+	ports.b = ports.b and true or false
+	ports.c = ports.c and true or false
+	ports.d = ports.d and true or false
+end
+
+
+local function set_port_states(pos, ports)
+	local node = minetest.get_node(pos)
+	local name = node.name
+	clean_port_states(ports)
 	local vports = minetest.registered_nodes[name].virtual_portstates
-	local newname = generate_name(ports)
+	local new_name = generate_name(ports)
 
-	if name ~= newname and vports then
+	if name ~= new_name and vports then
-		local rules_on  = {}
+		-- Problem:
-		local rules_off = {}
+		-- We need to place the new node first so that when turning
-		local ignore = {}
+		-- off some port, it won't stay on because the rules indicate
+		-- there is an onstate output port there.
+		-- When turning the output off then, it will however cause feedback
+		-- so that the luacontroller will receive an "off" event by turning
+		-- its output off.
+		-- Solution / Workaround:
+		-- Remember which output was turned off and ignore next "off" event.
+		local meta = minetest.get_meta(pos)
+		local ign = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+		if ports.a and not vports.a and not mesecon.is_powered(pos, rules.a) then ign.A = true end
+		if ports.b and not vports.b and not mesecon.is_powered(pos, rules.b) then ign.B = true end
+		if ports.c and not vports.c and not mesecon.is_powered(pos, rules.c) then ign.C = true end
+		if ports.d and not vports.d and not mesecon.is_powered(pos, rules.d) then ign.D = true end
+		meta:set_string("ignore_offevents", minetest.serialize(ign))
 
-		local interrupted
+		minetest.swap_node(pos, {name = new_name, param2 = node.param2})
-		if ports.a ~= vports.a then interrupted = setport(pos, rules.a, {a = 2}, ports.a, ports) end
-		if interrupted and not forcereset then return end
-		if ports.b ~= vports.b then interrupted = setport(pos, rules.b, {b = 2}, ports.b, ports) end
-		if interrupted and not forcereset then return end
-		if ports.c ~= vports.c then interrupted = setport(pos, rules.c, {c = 2}, ports.c, ports) end
-		if interrupted and not forcereset then return end
-		if ports.d ~= vports.d then interrupted = setport(pos, rules.d, {d = 2}, ports.d, ports) end
-		if interrupted and not forcereset then return end
 
-		mesecon:swap_node(pos, newname)
+		if ports.a ~= vports.a then set_port(pos, rules.a, ports.a) end
+		if ports.b ~= vports.b then set_port(pos, rules.b, ports.b) end
+		if ports.c ~= vports.c then set_port(pos, rules.c, ports.c) end
+		if ports.d ~= vports.d then set_port(pos, rules.d, ports.d) end
 	end
 end
 
-local delayedaction = function (params)
+
-	action(params.pos, params.ports)
+-----------------
+-- Overheating --
+-----------------
+
+local function overheat_off(pos)
+	mesecon.receptor_off(pos, mesecon.rules.flat)
 end
 
---------------------
--- Overheat stuff --
---------------------
 
-local heat = function (meta) -- warm up
+local function overheat(pos, meta)
-	h = meta:get_int("heat")
+	if mesecon.do_overheat(pos) then -- If too hot
-	if h ~= nil then
+		local node = minetest.get_node(pos)
-		meta:set_int("heat", h + 1)
+		node.name = BASENAME.."_burnt"
-	end
+		minetest.swap_node(pos, node)
-end
+		-- Wait for pending operations
-
+		minetest.after(0.2, overheat_off, pos)
-local cool = function (meta) -- cool down after a while
-	h = meta:get_int("heat")
-	if h ~= nil then
-		meta:set_int("heat", h - 1)
-	end
-end
-
-local overheat = function (meta) -- determine if too hot
-	h = meta:get_int("heat")
-	if h == nil then return true end -- if nil then overheat
-	if h > 20 then 
 		return true
-	else 
-		return false 
 	end
 end
 
-local overheat_off = function(pos)
+------------------------
-	mesecon:receptor_off(pos, mesecon.rules.flat)
+-- Ignored off events --
+------------------------
+
+local function ignore_event(event, meta)
+	if event.type ~= "off" then return false end
+	local ignore_offevents = minetest.deserialize(meta:get_string("ignore_offevents")) or {}
+	if ignore_offevents[event.pin.name] then
+		ignore_offevents[event.pin.name] = nil
+		meta:set_string("ignore_offevents", minetest.serialize(ignore_offevents))
+		return true
+	end
 end
 
--------------------
+-------------------------
--- Parsing stuff --
+-- Parsing and running --
--------------------
+-------------------------
 
-local code_prohibited = function(code)
+local function safe_print(param)
-	-- Clean code
+	print(dump(param))
-	local prohibited = {"while", "for", "repeat", "until", "function"}
+end
+
+local function remove_functions(x)
+	local tp = type(x)
+	if tp == "table" then
+		for key, value in pairs(x) do
+			local key_t, val_t = type(key), type(value)
+			if key_t == "function" or val_t == "function" then
+				x[key] = nil
+			else
+				if key_t == "table" then
+					remove_functions(key)
+				end
+				if val_t == "table" then
+					remove_functions(value)
+				end
+			end
+		end
+	elseif tp == "function" then
+		return nil
+	end
+	return x
+end
+
+local function get_interrupt(pos)
+	-- iid = interrupt id
+	local function interrupt(time, iid)
+		if type(time) ~= "number" then return end
+		local luac_id = minetest.get_meta(pos):get_int("luac_id")
+		mesecon.queue:add_action(pos, "lc_interrupt", {luac_id, iid}, time, iid, 1)
+	end
+	return interrupt
+end
+
+
+local function get_digiline_send(pos)
+	if not digiline then return end
+	return function(channel, msg)
+		minetest.after(0, function()
+			digiline:receptor_send(pos, digiline.rules.default, channel, msg)
+		end)
+	end
+end
+
+
+local safe_globals = {
+	"assert", "error", "ipairs", "next", "pairs", "pcall", "select",
+	"tonumber", "tostring", "type", "unpack", "_VERSION", "xpcall", 
+}
+local function create_environment(pos, mem, event)
+	-- Gather variables for the environment
+	local vports = minetest.registered_nodes[minetest.get_node(pos).name].virtual_portstates
+	local vports_copy = {}
+	for k, v in pairs(vports) do vports_copy[k] = v end
+	local rports = get_real_port_states(pos)
+
+	-- Create new library tables on each call to prevent one LuaController
+	-- from breaking a library and messing up other LuaControllers.
+	local env = {
+		pin = merge_port_states(vports, rports),
+		port = vports_copy,
+		event = event,
+		mem = mem,
+		heat = minetest.get_meta(pos):get_int("heat"),
+		heat_max = mesecon.setting("overheat_max", 20),
+		print = safe_print,
+		interrupt = get_interrupt(pos),
+		digiline_send = get_digiline_send(pos),
+		string = {
+			byte = string.byte,
+			char = string.char,
+			format = string.format,
+			gsub = string.gsub,
+			len = string.len,
+			lower = string.lower,
+			upper = string.upper,
+			rep = string.rep,
+			reverse = string.reverse,
+			sub = string.sub,
+		},
+		math = {
+			abs = math.abs,
+			acos = math.acos,
+			asin = math.asin,
+			atan = math.atan,
+			atan2 = math.atan2,
+			ceil = math.ceil,
+			cos = math.cos,
+			cosh = math.cosh,
+			deg = math.deg,
+			exp = math.exp,
+			floor = math.floor,
+			fmod = math.fmod,
+			frexp = math.frexp,
+			huge = math.huge,
+			ldexp = math.ldexp,
+			log = math.log,
+			log10 = math.log10,
+			max = math.max,
+			min = math.min,
+			modf = math.modf,
+			pi = math.pi,
+			pow = math.pow,
+			rad = math.rad,
+			random = math.random,
+			sin = math.sin,
+			sinh = math.sinh,
+			sqrt = math.sqrt,
+			tan = math.tan,
+			tanh = math.tanh,
+		},
+		table = {
+			concat = table.concat,
+			insert = table.insert,
+			maxn = table.maxn,
+			remove = table.remove,
+			sort = table.sort,
+		},
+		os = {
+			clock = os.clock,
+			difftime = os.difftime,
+			time = os.time,
+		},
+	}
+	env._G = env
+
+	for _, name in pairs(safe_globals) do
+		env[name] = _G[name]
+	end
+
+	return env
+end
+
+
+local function timeout()
+	debug.sethook()  -- Clear hook
+	error("Code timed out!")
+end
+
+
+local function code_prohibited(code)
+	-- LuaJIT doesn't increment the instruction counter when running
+	-- loops, so we have to sanitize inputs if we're using LuaJIT.
+	if not jit then
+		return false
+	end
+	local prohibited = {"while", "for", "do", "repeat", "until", "goto"}
+	code = " "..code.." "
 	for _, p in ipairs(prohibited) do
-		if string.find(code, p) then
+		if string.find(code, "[^%w_]"..p.."[^%w_]") then
 			return "Prohibited command: "..p
 		end
 	end
 end
 
-local safeprint = function(param)
-	print(dump(param))
-end
 
-local interrupt = function(params)
+local function create_sandbox(code, env)
-	lc_update(params.pos, {type="interrupt", iid = params.iid})
-end
-
-local getinterrupt = function(pos)
-	local interrupt = function (time, iid) -- iid = interrupt id
-		if type(time) ~= "number" then return end
-		local iid = iid or math.random()
-		local meta = minetest.env:get_meta(pos)
-		local interrupts = minetest.deserialize(meta:get_string("lc_interrupts")) or {}
-		table.insert (interrupts, iid)
-		meta:set_string("lc_interrupts", minetest.serialize(interrupts))
-		minetest.after(time, interrupt, {pos=pos, iid = iid})
-	end
-	return interrupt
-end
-
-local getdigiline_send = function (pos)
-	local digiline_send = function (channel, msg)
-		if digiline then
-			digiline:receptor_send(pos, digiline.rules.default, channel, msg)
-		end
-	end
-	return digiline_send
-end
-
-local create_environment = function(pos, mem, event)
-	-- Gather variables for the environment
-	local vports = minetest.registered_nodes[minetest.env:get_node(pos).name].virtual_portstates
-	vports = {a = vports.a, b = vports.b, c = vports.c, d = vports.d}
-	local rports = get_real_portstates(pos)
-
-	return {
-			print = safeprint,
-			pin = merge_portstates(vports, rports),
-			port = vports,
-			interrupt = getinterrupt(pos),
-			digiline_send = getdigiline_send(pos),
-			mem = mem,
-			tostring = tostring,
-			tonumber = tonumber,
-			string = {
-				byte = string.byte,
-				char = string.char,
-				find = string.find,
-				format = string.format,
-				gmatch = string.gmatch,
-				gsub = string.gsub,
-				len = string.len,
-				lower = string.lower,
-				match = string.match,
-				rep = string.rep,
-				reverse = string.reverse,
-				sub = string.sub,
-			},
-			math = {
-				abs = math.abs,
-				acos = math.acos,
-				asin = math.asin,
-				atan = math.atan,
-				atan2 = math.atan2,
-				ceil = math.ceil,
-				cos = math.cos,
-				cosh = math.cosh,
-				deg = math.deg,
-				exp = math.exp,
-				floor = math.floor,
-				fmod = math.fmod,
-				frexp = math.frexp,
-				huge = math.huge,
-				ldexp = math.ldexp,
-				log = math.log,
-				log10 = math.log10,
-				max = math.max,
-				min = math.min,
-				modf = math.modf,
-				pi = math.pi,
-				pow = math.pow,
-				rad = math.rad,
-				random = math.random,
-				sin = math.sin,
-				sinh = math.sinh,
-				sqrt = math.sqrt,
-				tan = math.tan,
-				tanh = math.tanh,
-			},
-			table = {
-				insert = table.insert,
-				maxn = table.maxn,
-				remove = table.remove,
-				sort = table.sort
-			},
-			event = event,
-	}
-end
-
-local create_sandbox = function (code, env)
-	-- Create Sandbox
 	if code:byte(1) == 27 then
-		return _, "You Hacker You! Don't use binary code!"
+		return nil, "Binary code prohibited."
 	end
-	f, msg = loadstring(code)
+	local f, msg = loadstring(code)
-	if not f then return _, msg end
+	if not f then return nil, msg end
 	setfenv(f, env)
-	return f
-end
 
-local do_overheat = function (pos, meta)
+	return function(...)
-	-- Overheat protection
+		debug.sethook(timeout, "", 10000)
-	heat(meta)
+		local ok, ret = pcall(f, ...)
-	minetest.after(0.5, cool, meta)
+		debug.sethook()  -- Clear hook
-	if overheat(meta) then
+		if not ok then error(ret) end
-		minetest.env:remove_node(pos)
+		return ret
-		minetest.after(0.2, overheat_off, pos) -- wait for pending operations
-		minetest.env:add_item(pos, BASENAME.."0000")
-		return true
 	end
 end
 
-local load_memory = function(meta)
+
+local function load_memory(meta)
 	return minetest.deserialize(meta:get_string("lc_memory")) or {}
 end
 
-local save_memory = function(meta, mem)
+
-	meta:set_string("lc_memory", minetest.serialize(mem))
+local function save_memory(meta, mem)
+	meta:set_string("lc_memory",
+		minetest.serialize(
+			remove_functions(mem)
+		)
+	)
 end
 
-local interrupt_allow = function (meta, event)
-	if event.type ~= "interrupt" then return true end
 
-	local interrupts = minetest.deserialize(meta:get_string("lc_interrupts")) or {}
+local function run(pos, event)
-	for _, i in ipairs(interrupts) do
+	local meta = minetest.get_meta(pos)
-		if minetest.serialize(i) == minetest.serialize(event.iid) then
+	if overheat(pos) then return end
-			return true
+	if ignore_event(event, meta) then return end
-		end
-	end
 
-	return false
+	-- Load code & mem from meta
-end
-
-local ports_invalid = function (var)
-	if type(var) == "table" then
-		return false
-	end
-	return "The ports you set are invalid"
-end
-
-----------------------
--- Parsing function --
-----------------------
-
-lc_update = function (pos, event)
-	local meta = minetest.env:get_meta(pos)
-	if not interrupt_allow(meta, event) then return end
-	if do_overheat(pos, meta) then return end
-
-	-- load code & mem from memory
 	local mem  = load_memory(meta)
 	local code = meta:get_string("code")
 
-	-- make sure code is ok and create environment
+	local err = code_prohibited(code)
-	local prohibited = code_prohibited(code)
+	if err then return err end
-	if 	prohibited then return prohibited end
+
+	-- Create environment
 	local env = create_environment(pos, mem, event)
 
-	-- create the sandbox and execute code
+	-- Create the sandbox and execute code
-	local chunk, msg = create_sandbox (code, env)
+	local f, msg = create_sandbox(code, env)
-	if not chunk then return msg end
+	if not f then return msg end
 	local success, msg = pcall(f)
 	if not success then return msg end
-	if ports_invalid(env.port) then return ports_invalid(env.port) end
+	if type(env.port) ~= "table" then
+		return "Ports set are invalid."
+	end
 
-	save_memory(meta, mem)
+	save_memory(meta, env.mem)
 
 	-- Actually set the ports
-	minetest.after(0, delayedaction, {pos = pos, ports = env.port})
+	set_port_states(pos, env.port)
 end
 
-local reset_meta = function(pos, code, errmsg)
+mesecon.queue:add_function("lc_interrupt", function (pos, luac_id, iid)
-	local meta = minetest.env:get_meta(pos)
+	-- There is no luacontroller anymore / it has been reprogrammed / replaced
+	if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end
+	run(pos, {type="interrupt", iid = iid})
+end)
+
+local function reset_meta(pos, code, errmsg)
+	local meta = minetest.get_meta(pos)
 	meta:set_string("code", code)
-	if minetest.formspec_escape then
+	code = minetest.formspec_escape(code or "")
-		code = minetest.formspec_escape(code or "")
+	errmsg = minetest.formspec_escape(errmsg or "")
-		errmsg = minetest.formspec_escape(errmsg or "")
-	else
-		code = string.gsub(code or "", "%[", "(") -- would otherwise
-		code = string.gsub(code, "%]", ")") -- corrupt formspec
-		errmsg = string.gsub(errmsg or "", "%[", "(") -- would otherwise
-		errmsg = string.gsub(errmsg, "%]", ")") -- corrupt formspec
-	end
 	meta:set_string("formspec", "size[10,8]"..
 		"background[-0.2,-0.25;10.4,8.75;jeija_luac_background.png]"..
 		"textarea[0.2,0.6;10.2,5;code;;"..code.."]"..
@@ -352,148 +436,184 @@ local reset_meta = function(pos, code, errmsg)
 		"image_button_exit[9.72,-0.25;0.425,0.4;jeija_close_window.png;exit;]"..
 		"label[0.1,5;"..errmsg.."]")
 	meta:set_int("heat", 0)
+	meta:set_int("luac_id", math.random(1, 65535))
 end
 
-local reset = function (pos)
+local function reset(pos)
-	minetest.env:get_meta(pos):set_string("lc_interrupts", "")
+	set_port_states(pos, {a=false, b=false, c=false, d=false})
-	action(pos, {a=false, b=false, c=false, d=false}, true)
 end
 
---        ______
---       |
--- |   | |
--- |___| |        __       ___  _   __         _  _
--- |     |       |  | |\ |  |  |_| |  | |  |  |_ |_|
--- |     |______ |__| | \|  |  | \ |__| |_ |_ |_ |\
---
 
 -----------------------
 -- Node Registration --
 -----------------------
 
-local output_rules={}
+local output_rules = {}
-local input_rules={}
+local input_rules = {}
 
-local nodebox = {
+local node_box = {
-		type = "fixed",
+	type = "fixed",
-		fixed = {
+	fixed = {
-			{ -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab
+		{-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
+		{-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
+		{-3/16, -6/16, -3/16, 3/16, -5/16, 3/16}, -- IC
-		}
 	}
+}
 
-local selectionbox = {
+local selection_box = {
-		type = "fixed",
+	type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
+	fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },
-	}
+}
 
 local digiline = {
 	receptor = {},
 	effector = {
-		action = function (pos, node, channel, msg)
+		action = function(pos, node, channel, msg)
-			lc_update (pos, {type = "digiline", channel = channel, msg = msg})
+			run(pos, {type = "digiline", channel = channel, msg = msg})
 		end
 	}
 }
-
+local function on_receive_fields(pos, form_name, fields)
-for a = 0, 2 do -- 0 = off; 1 = on; 2 = ignore
+	if not fields.program then
-for b = 0, 2 do
+		return
-for c = 0, 2 do
+	end
-for d = 0, 2 do
+	reset(pos)
-
+	reset_meta(pos, fields.code)
-local cid = tostring(d)..tostring(c)..tostring(b)..tostring(a)
+	local err = run(pos, {type="program"})
-local nodename = BASENAME..cid
+	if err then
-local top = "jeija_luacontroller_top.png"
+		print(err)
-if a == 1 then
+		reset_meta(pos, fields.code, err)
-	top = top.."^jeija_luacontroller_LED_A.png"
+	end
-end
-if b == 1 then
-	top = top.."^jeija_luacontroller_LED_B.png"
-end
-if c == 1 then
-	top = top.."^jeija_luacontroller_LED_C.png"
-end
-if d == 1 then
-	top = top.."^jeija_luacontroller_LED_D.png"
 end
 
-if a + b + c + d ~= 0 then
+for a = 0, 1 do -- 0 = off  1 = on
-	groups = {dig_immediate=2, not_in_creative_inventory=1}
+for b = 0, 1 do
-else
+for c = 0, 1 do
-	groups = {dig_immediate=2}
+for d = 0, 1 do
-end
+	local cid = tostring(d)..tostring(c)..tostring(b)..tostring(a)
+	local node_name = BASENAME..cid
+	local top = "jeija_luacontroller_top.png"
+	if a == 1 then
+		top = top.."^jeija_luacontroller_LED_A.png"
+	end
+	if b == 1 then
+		top = top.."^jeija_luacontroller_LED_B.png"
+	end
+	if c == 1 then
+		top = top.."^jeija_luacontroller_LED_C.png"
+	end
+	if d == 1 then
+		top = top.."^jeija_luacontroller_LED_D.png"
+	end
 
-output_rules[cid] = {}
+	local groups
-input_rules[cid] = {}
+	if a + b + c + d ~= 0 then
-if (a == 1) then table.insert(output_rules[cid], rules.a) end
+		groups = {dig_immediate=2, not_in_creative_inventory=1, overheat = 1}
-if (b == 1) then table.insert(output_rules[cid], rules.b) end
+	else
-if (c == 1) then table.insert(output_rules[cid], rules.c) end
+		groups = {dig_immediate=2, overheat = 1}
-if (d == 1) then table.insert(output_rules[cid], rules.d) end
+	end
 
-if (a == 0) then table.insert(input_rules[cid], rules.a) end
+	output_rules[cid] = {}
-if (b == 0) then table.insert(input_rules[cid], rules.b) end
+	input_rules[cid] = {}
-if (c == 0) then table.insert(input_rules[cid], rules.c) end
+	if a == 1 then table.insert(output_rules[cid], rules.a) end
-if (d == 0) then table.insert(input_rules[cid], rules.d) end
+	if b == 1 then table.insert(output_rules[cid], rules.b) end
+	if c == 1 then table.insert(output_rules[cid], rules.c) end
+	if d == 1 then table.insert(output_rules[cid], rules.d) end
 
-local mesecons = {
+	if a == 0 then table.insert( input_rules[cid], rules.a) end
-	effector =
+	if b == 0 then table.insert( input_rules[cid], rules.b) end
-	{
+	if c == 0 then table.insert( input_rules[cid], rules.c) end
-		rules = input_rules[cid],
+	if d == 0 then table.insert( input_rules[cid], rules.d) end
-		action_change = function (pos, _, rulename, newstate)
+
-			lc_update(pos, {type=newstate,  pin=rulename})
+	local mesecons = {
-		end,
+		effector = {
-	},
+			rules = input_rules[cid],
-	receptor =
+			action_change = function (pos, _, rule_name, new_state)
-	{
+				update_real_port_states(pos, rule_name, new_state)
-		state = mesecon.state.on,
+				run(pos, {type=new_state, pin=rule_name})
-		rules = output_rules[cid]
+			end,
+		},
+		receptor = {
+			state = mesecon.state.on,
+			rules = output_rules[cid]
+		}
 	}
-}
 
-minetest.register_node(nodename, {
+	minetest.register_node(node_name, {
-	description = "Luacontroller",
+		description = "LuaController",
+		drawtype = "nodebox",
+		tiles = {
+			top,
+			"jeija_microcontroller_bottom.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png",
+			"jeija_microcontroller_sides.png"
+		},
+		inventory_image = top,
+		paramtype = "light",
+		groups = groups,
+		drop = BASENAME.."0000",
+		sunlight_propagates = true,
+		selection_box = selection_box,
+		node_box = node_box,
+		on_construct = reset_meta,
+		on_receive_fields = on_receive_fields,
+		sounds = default.node_sound_stone_defaults(),
+		mesecons = mesecons,
+		digiline = digiline,
+		-- Virtual portstates are the ports that
+		-- the node shows as powered up (light up).
+		virtual_portstates = {
+			a = a == 1,
+			b = b == 1,
+			c = c == 1,
+			d = d == 1,
+		},
+		after_dig_node = function (pos, node)
+			mesecon.receptor_off(pos, output_rules)
+		end,
+		is_luacontroller = true,
+	})
+end
+end
+end
+end
+
+------------------------------
+-- Overheated LuaController --
+------------------------------
+
+minetest.register_node(BASENAME .. "_burnt", {
 	drawtype = "nodebox",
 	tiles = {
-		top,
+		"jeija_luacontroller_burnt_top.png",
 		"jeija_microcontroller_bottom.png",
 		"jeija_microcontroller_sides.png",
 		"jeija_microcontroller_sides.png",
 		"jeija_microcontroller_sides.png",
 		"jeija_microcontroller_sides.png"
-		},
+	},
-
+	inventory_image = "jeija_luacontroller_burnt_top.png",
-	inventory_image = top,
 	paramtype = "light",
-	groups = groups,
+	groups = {dig_immediate=2, not_in_creative_inventory=1},
 	drop = BASENAME.."0000",
 	sunlight_propagates = true,
-	selection_box = selectionbox,
+	selection_box = selection_box,
-	node_box = nodebox,
+	node_box = node_box,
 	on_construct = reset_meta,
-	on_receive_fields = function(pos, formname, fields)
+	on_receive_fields = on_receive_fields,
-		reset(pos)
-		reset_meta(pos, fields.code)
-		local err = lc_update(pos, {type="program"})
-		if err then print(err) end
-		reset_meta(pos, fields.code, err)
-	end,
 	sounds = default.node_sound_stone_defaults(),
-	mesecons = mesecons,
+	virtual_portstates = {a = false, b = false, c = false, d = false},
-	digiline = digiline,
+	mesecons = {
-	is_luacontroller = true,
+		effector = {
-	virtual_portstates = {	a = a == 1, -- virtual portstates are
+			rules = mesecon.rules.flat,
-					b = b == 1, -- the ports the the
+			action_change = function(pos, _, rule_name, new_state)
-					c = c == 1, -- controller powers itself
+				update_real_port_states(pos, rule_name, new_state)
-					d = d == 1},-- so those that light up
+			end,
-	after_dig_node = function (pos, node)
+		},
-		mesecon:receptor_off(pos, output_rules)
+	},
-	end,
 })
-end
-end
-end
-end
 
 ------------------------
 -- Craft Registration --