Import new torches mod by BlockMen and sofar

mods/torches/LICENSE.txt

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. 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 not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the 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
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

mods/torches/README.txt

@@ -1,29 +1,62 @@
 Minetest mod "Torches"
-=======================
+======================
-version: 1.1
 
-License of source code: WTFPL
+(c) Copyright BlockMen (2013-2015)
------------------------------------------
+(C) Copyright sofar <sofar@foo-projects.org> (2016)
-(c) Copyright BlockMen (2013)
 
 
-This program is free software. It comes without any warranty, to
+About this mod:
-the extent permitted by applicable law. You can redistribute it
+~~~~~~~~~~~~~~~
-and/or modify it under the terms of the Do What The Fuck You Want
+This mod changes the default torch drawtype from "torchlike" to "mesh",
-To Public License, Version 2, as published by Sam Hocevar. See
+giving the torch a three dimensional appearance. The mesh contains the
-http://sam.zoy.org/wtfpl/COPYING for more details.
+proper pixel mapping to make the animation appear as a particle above
+the torch, while in fact the animation is just the texture of the mesh.
+
+Originally, this mod created in-game alternatives with several
+draw styles.  The alternatives have been removed and instead of
+providing alternate nodes, this mod now directly modifies the existing
+nodes. Conversion from the wallmounted style is done through an LBM.
+
+The wield light part is inspired, but not copied from "walking light",
+a mod by "echo". After looking at the code I decided to implement
+it from scratch as I found it to be too resource intensive and not
+implemented efficiently enough. Still, echo deserves the credit for
+the excellent idea.
+
+Torches is meant for minetest-0.4.14, and does not directly support
+older minetest releases. You'll need a recent git, or nightly build.
 
 
-Using the mod:
+License:
---------------
+~~~~~~~~
+(c) Copyright BlockMen (2013-2015)
 
-This mod adds 3D torches to Minetest. They also have real flames and look much more realistic.
+Textures and Meshes/Models:
+CC-BY 3.0 BlockMen
+Note that the models were entirely done from scratch by sofar.
 
-Notice: Already placed old torches wont be changed.
+Code:
+Licensed under the GNU LGPL version 2.1 or higher.
+You can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License
+as published by the Free Software Foundation;
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt
+
+
+Github:
+~~~~~~~
+https://github.com/BlockMen/torches
+
+Forum:
+~~~~~~
+https://forum.minetest.net/viewtopic.php?id=6099
 
 
 Changelog:
-----------
+~~~~~~~~~~
-- Torches on wall dont fall when node under it is dug
+see changelog.txt
-- Torches fall directly when not placed on floor or wall
-- fixed different placing bugs

mods/torches/changelog.txt

@@ -0,0 +1,37 @@
+Changelog:
+----------
+1.1 - 1.2.x:
+- Torches on wall dont fall when node under it is dug
+- Torches fall directly when not placed on floor or wall
+- fixed different placing bugs
+
+1.3:
+- Torches only show flames when player is near (13 blocks)
+- Old torches are converted to new, ceiling torches are dropped
+
+1.3.1:
+- fix dropping torches when digging a block next to it
+- all torches attached to a block get droped when dug
+
+1.3.2:
+- fix crashes by unknown nodes
+
+2.0:
+- Use new mesh drawtype to improve wallmounted torches
+- Update particle usage
+- New textures; flame texture fix by Yepoleb
+- Fix for doors, chests, etc (rightclick support)
+
+2.1
+- Fix wallmounted torch mesh
+- Clean up code, use wallmounted paramtype2
+- Fix torches being placeable on ceilings (reported by kilbith)
+
+3.0
+- Minetest style added and used by default
+- style can be changed via settings
+- using Minetest style allows ceiling torches via settings
+- Minetest style supports all texturepacks (as long torch shaped)
+
+3.0.1
+- Fix global variable that caused rarely placing issues (thanks to tchncs for pointing out)

mods/torches/crafting.lua

@@ -1,14 +0,0 @@
-minetest.register_craft({
-	type = "fuel",
-	recipe = "torches:torch",
-	burntime = 4,
-})
-
-minetest.register_craft({
-	output = 'torches:torch 4',
-	recipe = {
-		{'group:coal'},
-		{'default:stick'},
-	}
-})
-

mods/torches/description.txt

@@ -0,0 +1 @@
+Mesh-based torches - three dimensional torches for minetest.

mods/torches/init.lua

@@ -1,231 +1,230 @@
-local VIEW_DISTANCE = 13 
 
-local null = {x=0, y=0, z=0}
+--
+-- 3d torch part
+--
 
-local dirs = {{-1,0,-1},{-1,0,0},{0,0,-1},
+minetest.register_node(":default:torch", {
-{1,0,1},{1,0,0},{0,0,1},{0,1,0}}
-
---fire_particles
-local function add_fire(pos)
-	pos.y = pos.y+0.19
-	minetest.add_particle(pos, null, null, 1.1,
-   					1.5, true, "torches_fire"..tostring(math.random(1,2)) ..".png")
-	pos.y = pos.y +0.01
-	minetest.add_particle(pos, null, null, 0.8,
-   					1.5, true, "torches_fire"..tostring(math.random(1,2)) ..".png")
-end
-
---help functions
-function check_attached_node_fdir(p, n)
-	local def = minetest.registered_nodes[n.name]
-	local d = {x=0, y=0, z=0}
-	if def.paramtype2 == "facedir" then
-		if n.param2 == 0 then
-			d.z = 1
-		elseif n.param2 == 1 then
-			d.x = 1
-		elseif n.param2 == 2 then
-			d.z = -1
-		elseif n.param2 == 3 then
-			d.x = -1
-		end
-	end
-	local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z}
-	local nn = minetest.env:get_node(p2).name
-	local def2 = minetest.registered_nodes[nn]
-	if def2 and not def2.walkable then
-		return false
-	end
-	return true
-end
-
-local function is_wall(wallparam)
-	if wallparam == 0 then return false end
-	local para2 = 0
-	if wallparam == 2 then
-		para2 = 1
-	elseif wallparam == 3 then
-		para2 = 3
-	elseif wallparam == 4 then
-		para2 = 0
-	elseif wallparam == 5 then
-		para2 = 2
-	end
-	return para2
-end
-
-local function player_near(pos)
-	for  _,object in ipairs(minetest.env:get_objects_inside_radius(pos, VIEW_DISTANCE)) do
-		if object:is_player() then
-			return true
-		end
-	end
-
-	return false
-end
-
--- abms for flames
-minetest.register_abm({
-	nodenames = {"torches:wand"},
-	interval = 1,
-	chance = 1,
-	action = function(pos)
-		if player_near(pos) then
-			add_fire(pos)
-		end
-	end
-})
-
-minetest.register_abm({
-	nodenames = {"torches:floor"},
-	interval = 1,
-	chance = 1,
-	action = function(pos)
-		if player_near(pos) then
-			add_fire(pos)
-		end
-	end
-})
-
-minetest.register_craftitem("torches:torch", {
 	description = "Torch",
-	inventory_image = "torches_torch.png",
+	drawtype = "mesh",
-	wield_image = "torches_torch.png",
+	mesh = "torch_floor.obj",
-	stack_max = 64,
+	inventory_image = "default_torch_on_floor.png",
-	wield_scale = {x=1,y=1,z=1+1/16},
+	wield_image = "default_torch_on_floor.png",
+	tiles = {{
+		    name = "default_torch_on_floor_animated.png",
+		    animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3}
+	}},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	sunlight_propagates = true,
+	walkable = false,
 	liquids_pointable = false,
+	light_source = 13,
+	groups = {choppy=2, dig_immediate=3, flammable=1, attached_node=1, torch=1},
+	drop = "default:torch",
+	selection_box = {
+		type = "wallmounted",
+		wall_top = {-1/16, -2/16, -1/16, 1/16, 0.5, 1/16},
+		wall_bottom = {-1/16, -0.5, -1/16, 1/16, 2/16, 1/16},
+	},
+	sounds = default.node_sound_wood_defaults(),
 	on_place = function(itemstack, placer, pointed_thing)
-		local pn = placer:get_player_name()
+		if pointed_thing.type ~= "node" then
-		if pointed_thing.type ~= "node" 
+			-- no interaction possible with entities, for now.
-		or string.find(minetest.env:get_node(pointed_thing.above).name, "group:torch") 
-		or string.find(minetest.env:get_node(pointed_thing.above).name, "doors:") then
 			return itemstack
 		end
-		if minetest.is_protected(pointed_thing.above, pn) then
+
-			return itemstack
-		end
-			local above = pointed_thing.above
 		local under = pointed_thing.under
+		local node = minetest.get_node(under)
+		local def = minetest.registered_nodes[node.name]
+		if def and def.on_rightclick then
+			return def.on_rightclick(under, node, placer, itemstack,
+				pointed_thing) or itemstack, false
+		end
+
+		local above = pointed_thing.above
 		local wdir = minetest.dir_to_wallmounted({x = under.x - above.x, y = under.y - above.y, z = under.z - above.z})
-			local pos = {x = above.x, y = above.y, z = above.z}
+		local fakestack = itemstack
-			local u_n = minetest.get_node(under)
+		local retval
-			local udef = minetest.registered_nodes[u_n.name]
+		if wdir <= 1 then
-			if u_n and udef and not udef.walkable then above = under end
+			retval = fakestack:set_name("default:torch")
-			u_n = minetest.get_node(above)
-			udef = minetest.registered_nodes[u_n.name]
-			if u_n and udef and udef.walkable then return itemstack end
-			if wdir == 1 then
-				minetest.env:add_node(above, {name = "torches:floor"})	
-				if minetest.env:get_node(under).name:find("wallet:wall") == 1 then
-					update_wall_global(pos)
-				end
 		else
-				minetest.env:add_node(above, {name = "torches:wand", param2 = is_wall(wdir)})
+			retval = fakestack:set_name("default:torch_wall")
-			end
-			if not wdir == 0 or not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
 		end
+		if not retval then
 			return itemstack
-		
 		end
 
-})
+		itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir)
+		itemstack:set_name("default:torch")
 
-minetest.register_node("torches:floor", {
+		return itemstack
-	inventory_image = "default_torch.png",
-	wield_image = "torches_torch.png",
-	wield_scale = {x=1,y=1,z=1+2/16},
-	drawtype = "nodebox",
-	tiles = {"torches_torch.png^[transformfy", "default_wood.png", "torches_torch.png",
-		"torches_torch.png^[transformfx", "torches_torch.png", "torches_torch.png"},
-	paramtype = "light",
-	paramtype2 = "none",
-	is_ground_content = false,
-	sunlight_propagates = true,
-	drop = "default:torch",
-	walkable = false,
-	light_source = 13,
-	groups = {choppy=2,dig_immediate=3,flammable=1,not_in_creative_inventory=1,torch=1,attached_node=1,dig_by_water=1},
-	legacy_wallmounted = true,
-	node_box = {
-		type = "fixed",
-		fixed = {-1/16, -0.5, -1/16, 1/16, 2/16, 1/16},
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {-1/16, -0.5, -1/16, 1/16, 2/16, 1/16},
-	},
-	--after_dig_node = function(pos, oldnode, oldmetadata, digger)
-	--	if not digger:is_player() then minetest.add_item(pos, {name="default:torch"}) end
-	--end,
-	
-	update = function(pos,node, pos2)
-		if pos2.y < pos.y then
-			minetest.dig_node(pos)
 	end
-	end,
 })
 
-local wall_ndbx = {
+minetest.register_node(":default:torch_wall", {
-			{-1/16,-6/16, 6/16, 1/16, -5/16, 0.5},
+	drawtype = "mesh",
-			{-1/16,-5/16, 5/16, 1/16, -4/16, 7/16},
+	mesh = "torch_wall.obj",
-			{-1/16,-4/16, 4/16, 1/16, -3/16, 6/16},
+	tiles = {{
-			{-1/16,-3/16, 3/16, 1/16, -2/16, 5/16},
+		    name = "default_torch_on_floor_animated.png",
-			{-1/16,-2/16, 2/16, 1/16, -1/16, 4/16},
+		    animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3}
-			{-1/16,-1/16, 1/16, 1/16, 0, 3/16},
+	}},
-			{-1/16,0, 1/16, 1/16, 1/16, 2/16},
-			{-1/16, 0, -1/16, 1/16, 2/16, 1/16},
-}
-
-minetest.register_node("torches:wand", {
-	inventory_image = "default_torch.png",
-	wield_image = "torches_torch.png",
-	wield_scale = {x=1,y=1,z=1+1/16},
-	drawtype = "nodebox",
-	tiles = {"torches_torch.png^[transformfy", "default_wood.png", "torches_side.png",
-		"torches_side.png^[transformfx", "default_wood.png", "torches_torch.png"},
-
 	paramtype = "light",
-	paramtype2 = "facedir",
+	paramtype2 = "wallmounted",
-	is_ground_content = false,
 	sunlight_propagates = true,
 	walkable = false,
 	light_source = 13,
-	groups = {choppy=2,dig_immediate=3,flammable=1,not_in_creative_inventory=1,torch=1,attached_node=1,dig_by_water=1},
+	groups = {choppy=2, dig_immediate=3, flammable=1, not_in_creative_inventory=1, attached_node=1, torch=1},
-	legacy_wallmounted = true,
 	drop = "default:torch",
-	node_box = {
-		type = "fixed",
-		fixed =	wall_ndbx
-	},
 	selection_box = {
-		type = "fixed",
+		type = "wallmounted",
-		fixed =	{-1/16, -6/16, 7/16, 1/16, 2/16, 2/16},
+		wall_top = {-0.1, -0.1, -0.1, 0.1, 0.5, 0.1},
+		wall_bottom = {-0.1, -0.5, -0.1, 0.1, 0.1, 0.1},
+		wall_side = {-0.5, -0.3, -0.1, -0.2, 0.3, 0.1},
 	},
-	update = function(pos,node)
+	sounds = default.node_sound_wood_defaults(),
-		if not check_attached_node_fdir(pos, node) then
-			minetest.add_item(pos, {name="torches:torch"})
-		end
-	end,
-
-
 })
 
-minetest.register_on_dignode(function(pos, oldnode, digger)
+minetest.register_lbm({
-	if minetest.find_node_near(pos, 1, {"group:torch"}) == nil then return end
+	name = "torches:convert_wallmounted",
-	for i=1,#dirs do
+	nodenames = {"default:torch", "torches:floor", "torches:wall"},
-		local v = dirs[i]
+	action = function(pos, node)
-		local p = {x=pos.x+v[1],y=pos.y+v[2],z=pos.z+v[3]}
+		if node.param2 >= 2 then
-		local n = minetest.get_node_or_nil(p)
+			minetest.set_node(pos, {name = "default:torch_wall",
-		if n and n.name then
+				param2 = node.param2})
-			local def = minetest.registered_nodes[n.name]
+		else
-			if def and def.update then
+			minetest.set_node(pos, {name = "default:torch",
-				def.update(p, n, pos)
+				param2 = node.param2})
 		end
 	end
+})
+
+--
+-- torch wield light
+--
+
+if not minetest.is_yes(minetest.setting_get("torches_wieldlight_enable") or true) then
+	return
+end
+local torchlight_update_interval = minetest.setting_get("torches_wieldlight_interval") or 0.25
+
+minetest.register_node("torches:torchlight", {
+	drawtype = "airlike",
+	groups = {not_in_creative_inventory = 1},
+	walkable = false,
+	paramtype = "light",
+	sunlight_propagates = true,
+	light_source = 11,
+	pointable = false,
+	buildable_to = true,
+	drops = {},
+})
+
+-- state tables
+local torchlight = {}
+local playerlist = {}
+
+local function wields_torch(player)
+	if not player then
+		return false
+	end
+	local item = player:get_wielded_item()
+	if not item then
+		return false
+	end
+	return item:get_name() == "default:torch"
+end
+
+local function wielded_torch(name)
+	if not torchlight[name] then
+		return false
+	end
+	return true
+end
+
+local function is_torchlight(pos)
+	local node = minetest.get_node(pos)
+	return node.name == "torches:torchlight"
+end
+
+local function remove_torchlight(pos)
+	if is_torchlight(pos) then
+		minetest.swap_node(pos, {name = "air"})
+	end
+end
+
+local function place_torchlight(pos)
+	local name = minetest.get_node(pos).name
+	if name == "torches:torchlight" then
+		return true
+	end
+	if (minetest.get_node_light(pos) or 0) > 11 then
+		-- no reason to place torch here, so save a bunch
+		-- of node updates this way
+		return false
+	end
+	if name == "air" then
+		minetest.swap_node(pos, {name = "torches:torchlight"})
+		return true
+	end
+	return false
+end
+
+local function get_torchpos(player)
+	return vector.add({x = 0, y = 1, z = 0}, vector.round(player:getpos()))
+end
+
+minetest.register_on_joinplayer(function(player)
+	local name = player:get_player_name()
+	playerlist[name] = true
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	-- don't look at wielded() here, it's likely invalid
+	if torchlight[name] then
+		remove_torchlight(torchlight[name])
+		torchlight[name] = nil
+	end
+	playerlist[name] = nil
+end)
+
+minetest.register_on_shutdown(function()
+	for i, _ in pairs(torchlight) do
+		remove_torchlight(torchlight[i])
 	end
 end)
 
-dofile(minetest.get_modpath("torches") .. "/crafting.lua")
+local function update_torchlight(dtime)
+	for name, _ in pairs(playerlist) do
+		local player = minetest.get_player_by_name(name)
+		local wielded = wielded_torch(name)
+		local wields = wields_torch(player)
+
+		if not wielded and wields then
+			local torchpos = get_torchpos(player)
+			if place_torchlight(torchpos) then
+				torchlight[name] = vector.new(torchpos)
+			end
+		elseif wielded and not wields then
+			remove_torchlight(torchlight[name])
+			torchlight[name] = nil
+		elseif wielded and wields then
+			local torchpos = get_torchpos(player)
+			if not vector.equals(torchpos, torchlight[name]) or
+					not is_torchlight(torchpos) then
+				if place_torchlight(torchpos) then
+					remove_torchlight(torchlight[name])
+					torchlight[name] = vector.new(torchpos)
+				elseif vector.distance(torchlight[name], torchpos) > 2 then
+					-- player went into some node
+					remove_torchlight(torchlight[name])
+					torchlight[name] = nil
+				end
+			end
+		end
+	end
+	minetest.after(torchlight_update_interval, update_torchlight)
+end
+
+minetest.after(torchlight_update_interval, update_torchlight)
 
-minetest.register_alias("default:torch", "torches:torch")

mods/torches/mod.conf

@@ -0,0 +1 @@
+name = torches

mods/torches/models/torch_floor.obj

@@ -0,0 +1,50 @@
+# Blender v2.76 (sub 11) OBJ File: 'torch_floor.blend'
+# www.blender.org
+mtllib torch_floor.mtl
+o Cube_Cube.001
+v 0.062500 0.062500 -0.062500
+v 0.062500 -0.500000 -0.062500
+v 0.062500 0.062500 0.062500
+v 0.062500 -0.500000 0.062500
+v -0.062500 0.062500 -0.062500
+v -0.062500 -0.500000 -0.062500
+v -0.062500 0.062500 0.062500
+v -0.062500 -0.500000 0.062500
+v -0.353553 -0.500000 0.353553
+v -0.353553 0.500000 0.353553
+v 0.353553 -0.500000 -0.353553
+v 0.353553 0.500000 -0.353553
+v -0.353553 -0.500000 -0.353553
+v 0.353553 -0.500000 0.353553
+v -0.353553 0.500000 -0.353553
+v 0.353553 0.500000 0.353553
+vt 0.562500 0.500000
+vt 0.562500 0.625000
+vt 0.437500 0.625000
+vt 0.437500 0.500000
+vt 0.437500 0.000000
+vt 0.562500 0.000000
+vt 0.562500 0.125000
+vt 0.437500 0.125000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn -0.707100 0.000000 -0.707100
+vn -0.707100 -0.000000 0.707100
+g Cube_Cube.001_Cube_Cube.001_Material.001
+usemtl Material.001
+s off
+f 3/1/1 1/2/1 5/3/1 7/4/1
+f 8/5/1 4/6/1 2/7/1 6/8/1
+f 3/2/2 4/6/2 8/5/2 7/3/2
+f 1/3/3 3/2/3 4/6/3 2/5/3
+f 5/2/2 1/3/2 2/5/2 6/6/2
+f 7/3/3 8/5/3 6/6/3 5/2/3
+g Cube_Cube.001_Cube_Cube.001_Material.002
+usemtl Material.002
+f 9/9/4 10/10/4 12/11/4 11/12/4
+f 13/12/5 14/9/5 16/10/5 15/11/5

mods/torches/models/torch_wall.obj

@@ -0,0 +1,64 @@
+# Blender v2.76 (sub 11) OBJ File: 'torch_wall.blend'
+# www.blender.org
+mtllib torch_wall.mtl
+o Cube_Cube.001
+v 0.062469 -0.195248 0.023570
+v 0.062469 -0.476498 -0.463570
+v 0.062469 -0.303502 0.086070
+v 0.062469 -0.584752 -0.401070
+v -0.062531 -0.195248 0.023570
+v -0.062531 -0.476498 -0.463570
+v -0.062531 -0.303502 0.086070
+v -0.062531 -0.584752 -0.401070
+v -0.353584 -0.613553 0.022500
+v -0.353584 -0.613553 0.460000
+v 0.353522 0.093553 0.022500
+v 0.353522 0.093553 0.460000
+v -0.353584 0.093553 0.022500
+v 0.353522 -0.613553 0.022500
+v -0.353584 0.093553 0.460000
+v 0.353522 -0.613553 0.460000
+v 0.353553 0.056811 -0.121957
+v 0.353553 -0.224439 -0.609096
+v -0.353553 -0.555561 0.231596
+v -0.353553 -0.836811 -0.255543
+v -0.353553 0.056811 -0.121957
+v -0.353553 -0.224439 -0.609096
+v 0.353553 -0.555561 0.231596
+v 0.353553 -0.836811 -0.255543
+vt 0.562500 0.500000
+vt 0.562500 0.625000
+vt 0.437500 0.625000
+vt 0.437500 0.500000
+vt 0.437500 0.000000
+vt 0.562500 0.000000
+vt 0.562500 0.125000
+vt 0.437500 0.125000
+vt 0.000000 0.562500
+vt 0.000000 -0.000000
+vt 1.000000 0.000000
+vt 1.000000 0.562500
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vn -0.000000 0.500000 0.866000
+vn -0.000000 0.866000 -0.500000
+vn 1.000000 0.000000 0.000000
+vn -0.707100 0.612400 -0.353600
+vn -0.707100 -0.612400 0.353600
+vn -0.707100 0.707100 -0.000000
+vn -0.707100 -0.707100 -0.000000
+g Cube_Cube.001_Cube_Cube.001_Material.001
+usemtl Material.001
+s off
+f 3/1/1 1/2/1 5/3/1 7/4/1
+f 8/5/1 4/6/1 2/7/1 6/8/1
+f 3/2/2 4/6/2 8/5/2 7/3/2
+f 1/3/3 3/2/3 4/6/3 2/5/3
+f 5/2/2 1/3/2 2/5/2 6/6/2
+f 7/3/3 8/5/3 6/6/3 5/2/3
+f 17/9/4 18/10/4 20/11/4 19/12/4
+f 21/9/5 22/10/5 24/11/5 23/12/5
+g Cube_Cube.001_Cube_Cube.001_Material.002
+usemtl Material.002
+f 9/12/6 10/13/6 12/14/6 11/9/6
+f 13/9/7 14/12/7 16/13/7 15/14/7

mods/torches/settingtypes.txt

@@ -0,0 +1,9 @@
+
+# Enable wielded torches to light the area around it as the player moves. This is
+# somewhat resource intensive and may be disabled to reduce lag.
+torches_wieldlight_enable (Enable held torch to emit light) bool false
+
+# How often the wieldlight should be moved if the player moves with a torch in their
+# hand. Reducing this makes it feel more laggy, but reduces the amount of network
+# packets sent to clients.
+torches_wieldlight_interval (Torch light from held torch update interval) float 0.25