diff --git a/README.md b/README.md index 7ddd29ac..9808518a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas]) * [elevator][] ([WTFPL][lic.elevator]) * [fort_spikes][] ([MIT][lic.fort_spikes] / [CC0][lic.cc0]) -- version: [3b98b46 Git][ver.fort_spikes] *2018-06-05* - * [glass][] ([LGPL][lic.lgpl2.1]) -- version: [1.0][ver.glass] *2021-04-19* + * [glass][] ([LGPL][lic.lgpl2.1]) -- version: [1.1][ver.glass] *2021-05-26* * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [3b97ea5 Git][ver.moreblocks] *2021-03-19* * [windmill][] ([WTFPL][lic.windmill]) -- version: [47b029d Git][ver.windmill] *2014-08-21* ([patched][patch.windmill]) * chat/ @@ -550,7 +550,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.fort_spikes]: https://github.com/xeranas/fort_spikes/tree/3b98b46 [ver.gems_encrustable]: https://github.com/wowiamdiamonds/gems/tree/81d513d [ver.gems_tools]: https://github.com/captainLAD/gems/tree/b375432 -[ver.glass]: https://github.com/AntumMT/mod-glass/releases/tag/v1.0 +[ver.glass]: https://github.com/AntumMT/mod-glass/releases/tag/v1.1 [ver.glow]: https://github.com/bdjnk/glow/tree/4c015a0 [ver.hbarmor]: http://repo.or.cz/minetest_hbarmor.git/tree/93d994c [ver.hbsprint]: https://github.com/tacotexmex/hbsprint/tree/f566d0f diff --git a/mods/buildings/glass/LICENSE.md b/mods/buildings/glass/LICENSE.md deleted file mode 100644 index f931fa29..00000000 --- a/mods/buildings/glass/LICENSE.md +++ /dev/null @@ -1,11 +0,0 @@ -## Licensing for Glass Mod - - ---- -### **Code:** - -Originally by celeron55, Perttu Ahola ([LGPL 2.1][lic.lgpl]) -Various Minetest developers and contributors ([LGPL 2.1][lic.lgpl]) - - -[lic.lgpl]: docs/license-LGPL-2.1.txt diff --git a/mods/buildings/glass/LICENSE.txt b/mods/buildings/glass/LICENSE.txt new file mode 100644 index 00000000..357bcd0f --- /dev/null +++ b/mods/buildings/glass/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright © 2021 Jordan Irwin (AntumDeluge) + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/mods/buildings/glass/README.md b/mods/buildings/glass/README.md index df4c4876..16174e28 100644 --- a/mods/buildings/glass/README.md +++ b/mods/buildings/glass/README.md @@ -1,35 +1,36 @@ -## Glass Mod for [Minetest][] - +## Glass Mod for Minetest --- -### **Description:** +### Description: -Minetest mod that replaces glass nodes from the [default][] mod in [minetest_game][] & adds colored glass & other enhancements. +[Minetest][] mod that makes [default glass nodes][default] colorable. -***NOTE:*** *This mod is a **work-in-progress**. Not all glass nodes have been yet added.* +***NOTE:*** *This mod is a **work-in-progress**. Not all glass node types have been added.* -![Screenshot](screenshot.png) +![screenshot](screenshot.png) ---- -### **Features:** +-------------- +### Licensing: -- Creates glass-like nodes. -- If *[unifieddyes][]* is present, nodes can be colored with `unifieddyes:airbrush`. -- Compatible with *[default][]* mod. +- [MIT](LICENSE.txt) +----------------- +### Dependencies: ---- -### ***Licensing:*** +Required: +- [default][] +- [unifieddyes][] -- LGPL -- CC BY-SA -- See: [LICENSE.md](LICENSE.md) +---------- +### Links: +- [Forum](https://forum.minetest.net/viewtopic.php?t=18307) +- [Git repo](https://github.com/AntumMT/mod-glass) +- [Changelog](changelog.txt) +- [TODO](TODO.txt) [Minetest]: http://www.minetest.net/ -[node coloring]: https://github.com/minetest/minetest/pull/4986 [default]: https://github.com/minetest/minetest_game/blob/master/mods/default -[minetest_game]: https://github.com/minetest/minetest_game [unifieddyes]: https://forum.minetest.net/viewtopic.php?t=2178 diff --git a/mods/buildings/glass/TODO.txt b/mods/buildings/glass/TODO.txt new file mode 100644 index 00000000..8a473a67 --- /dev/null +++ b/mods/buildings/glass/TODO.txt @@ -0,0 +1,4 @@ + +TODO: +- add option to override nodes to "glass:" namespace +- add some currently unsupported nodes diff --git a/mods/buildings/glass/changelog.txt b/mods/buildings/glass/changelog.txt new file mode 100644 index 00000000..23ee4304 --- /dev/null +++ b/mods/buildings/glass/changelog.txt @@ -0,0 +1,19 @@ + +v1.1 +---- +- preserve old node name instead of registering new ones +- simplified overriding method +- changed to MIT license + +v1.0 +---- +- switched to Minetest built-in localization engine +- updated for compatibility with unifieddyes version 2021-03-26-1 +- added Spanish translation +- made obidian glass colorable +- uses textures & sounds from default mod + +v0.1 +---- +- overrode glass nodes to be colorable using unifieddyes methods +- added localization support with intllib diff --git a/mods/buildings/glass/crafting.lua b/mods/buildings/glass/crafting.lua index 0db7a953..8ff4fa4e 100644 --- a/mods/buildings/glass/crafting.lua +++ b/mods/buildings/glass/crafting.lua @@ -26,9 +26,9 @@ -- @output 1 -- @input group:sand core.register_craft({ - type = 'cooking', - output = 'glass:plain', - recipe = 'group:sand', + type = "cooking", + output = "glass:plain", + recipe = "group:sand", }) @@ -39,7 +39,7 @@ core.register_craft({ -- @output 1 -- @input default:obsidian_shard core.register_craft({ - type = 'cooking', - output = 'glass:obsidian', - recipe = 'default:obsidian_shard', + type = "cooking", + output = "glass:obsidian", + recipe = "default:obsidian_shard", }) diff --git a/mods/buildings/glass/docs/config.ld b/mods/buildings/glass/docs/config.ld new file mode 100644 index 00000000..ae86f126 --- /dev/null +++ b/mods/buildings/glass/docs/config.ld @@ -0,0 +1,22 @@ +title = 'Glass' +project = 'Glass Mod for Minetest mods' +format = 'discount' +not_luadoc = true + +local function italic(value) + return '' .. value .. '' +end + +new_type('node', 'Nodes') +new_type('recipe', 'Craft Recipes') +custom_tags = { + {'rtype', + title = 'Recipe type', + }, + {'output', + title = 'Output', + }, + {'input', + title = 'Input', + }, +} diff --git a/mods/buildings/glass/docs/gendoc.sh b/mods/buildings/glass/docs/gendoc.sh new file mode 100644 index 00000000..16458805 --- /dev/null +++ b/mods/buildings/glass/docs/gendoc.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +DOCS="$(dirname $(readlink -f $0))" +ROOT="$(dirname ${DOCS})" + +CONFIG="${DOCS}/config.ld" + +cd "${ROOT}" +rm -rf "${DOCS}/reference" +ldoc -B -c "${CONFIG}" -d "${DOCS}/reference" ./ diff --git a/mods/buildings/glass/docs/license-LGPL-2.1.txt b/mods/buildings/glass/docs/license-LGPL-2.1.txt new file mode 100644 index 00000000..e5ab03e1 --- /dev/null +++ b/mods/buildings/glass/docs/license-LGPL-2.1.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. + + + Copyright (C) + + 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. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/mods/buildings/glass/docs/reference/index.html b/mods/buildings/glass/docs/reference/index.html new file mode 100644 index 00000000..d2ae1dd1 --- /dev/null +++ b/mods/buildings/glass/docs/reference/index.html @@ -0,0 +1,74 @@ + + + + + Glass + + + + +
+ +
+ +
+
+
+ + +
+ + + + + + +
+ + + +

Modules

+ + + + + + + + + + + + + + + + + +
craftingGlass craft recipes.
functionsGlass functions.
initGlass initialization script.
nodesGlass nodes.
+ +
+
+
+generated by LDoc 1.4.6-antum-dev +Last updated 2017-08-15 21:17:44 +
+
+ + diff --git a/mods/buildings/glass/docs/reference/ldoc.css b/mods/buildings/glass/docs/reference/ldoc.css new file mode 100644 index 00000000..52c4ad2b --- /dev/null +++ b/mods/buildings/glass/docs/reference/ldoc.css @@ -0,0 +1,303 @@ +/* BEGIN RESET + +Copyright (c) 2010, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.com/yui/license.html +version: 2.8.2r1 +*/ +html { + color: #000; + background: #FFF; +} +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td { + margin: 0; + padding: 0; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +fieldset,img { + border: 0; +} +address,caption,cite,code,dfn,em,strong,th,var,optgroup { + font-style: inherit; + font-weight: inherit; +} +del,ins { + text-decoration: none; +} +li { + margin-left: 20px; +} +caption,th { + text-align: left; +} +h1,h2,h3,h4,h5,h6 { + font-size: 100%; + font-weight: bold; +} +q:before,q:after { + content: ''; +} +abbr,acronym { + border: 0; + font-variant: normal; +} +sup { + vertical-align: baseline; +} +sub { + vertical-align: baseline; +} +legend { + color: #000; +} +input,button,textarea,select,optgroup,option { + font-family: inherit; + font-size: inherit; + font-style: inherit; + font-weight: inherit; +} +input,button,textarea,select {*font-size:100%; +} +/* END RESET */ + +body { + margin-left: 1em; + margin-right: 1em; + font-family: arial, helvetica, geneva, sans-serif; + background-color: #ffffff; margin: 0px; +} + +code, tt { font-family: monospace; font-size: 1.1em; } +span.parameter { font-family:monospace; } +span.parameter:after { content:":"; } +span.types:before { content:"("; } +span.types:after { content:")"; } +.type { font-weight: bold; font-style:italic } + +body, p, td, th { font-size: .95em; line-height: 1.2em;} + +p, ul { margin: 10px 0 0 0px;} + +strong { font-weight: bold;} + +em { font-style: italic;} + +h1 { + font-size: 1.5em; + margin: 20px 0 20px 0; +} +h2, h3, h4 { margin: 15px 0 10px 0; } +h2 { font-size: 1.25em; } +h3 { font-size: 1.15em; } +h4 { font-size: 1.06em; } + +a:link { font-weight: bold; color: #004080; text-decoration: none; } +a:visited { font-weight: bold; color: #006699; text-decoration: none; } +a:link:hover { text-decoration: underline; } + +hr { + color:#cccccc; + background: #00007f; + height: 1px; +} + +blockquote { margin-left: 3em; } + +ul { list-style-type: disc; } + +p.name { + font-family: "Andale Mono", monospace; + padding-top: 1em; +} + +pre { + background-color: rgb(245, 245, 245); + border: 1px solid #C0C0C0; /* silver */ + padding: 10px; + margin: 10px 0 10px 0; + overflow: auto; + font-family: "Andale Mono", monospace; +} + +pre.example { + font-size: .85em; +} + +table.index { border: 1px #00007f; } +table.index td { text-align: left; vertical-align: top; } + +#container { + margin-left: 1em; + margin-right: 1em; + background-color: #f0f0f0; +} + +#product { + text-align: center; + border-bottom: 1px solid #cccccc; + background-color: #ffffff; +} + +#product big { + font-size: 2em; +} + +#main { + background-color: #f0f0f0; + border-left: 2px solid #cccccc; +} + +#navigation { + float: left; + width: 14em; + vertical-align: top; + background-color: #f0f0f0; + overflow: visible; +} + +#navigation h2 { + background-color:#e7e7e7; + font-size:1.1em; + color:#000000; + text-align: left; + padding:0.2em; + border-top:1px solid #dddddd; + border-bottom:1px solid #dddddd; +} + +#navigation ul +{ + font-size:1em; + list-style-type: none; + margin: 1px 1px 10px 1px; +} + +#navigation li { + text-indent: -1em; + display: block; + margin: 3px 0px 0px 22px; +} + +#navigation li li a { + margin: 0px 3px 0px -1em; +} + +#content { + margin-left: 14em; + padding: 1em; + width: 700px; + border-left: 2px solid #cccccc; + border-right: 2px solid #cccccc; + background-color: #ffffff; +} + +#about { + clear: both; + padding: 5px; + border-top: 2px solid #cccccc; + background-color: #ffffff; +} + +@media print { + body { + font: 12pt "Times New Roman", "TimeNR", Times, serif; + } + a { font-weight: bold; color: #004080; text-decoration: underline; } + + #main { + background-color: #ffffff; + border-left: 0px; + } + + #container { + margin-left: 2%; + margin-right: 2%; + background-color: #ffffff; + } + + #content { + padding: 1em; + background-color: #ffffff; + } + + #navigation { + display: none; + } + pre.example { + font-family: "Andale Mono", monospace; + font-size: 10pt; + page-break-inside: avoid; + } +} + +table.module_list { + border-width: 1px; + border-style: solid; + border-color: #cccccc; + border-collapse: collapse; +} +table.module_list td { + border-width: 1px; + padding: 3px; + border-style: solid; + border-color: #cccccc; +} +table.module_list td.name { background-color: #f0f0f0; min-width: 200px; } +table.module_list td.summary { width: 100%; } + + +table.function_list { + border-width: 1px; + border-style: solid; + border-color: #cccccc; + border-collapse: collapse; +} +table.function_list td { + border-width: 1px; + padding: 3px; + border-style: solid; + border-color: #cccccc; +} +table.function_list td.name { background-color: #f0f0f0; min-width: 200px; } +table.function_list td.summary { width: 100%; } + +ul.nowrap { + overflow:auto; + white-space:nowrap; +} + +dl.table dt, dl.function dt {border-top: 1px solid #ccc; padding-top: 1em;} +dl.table dd, dl.function dd {padding-bottom: 1em; margin: 10px 0 0 20px;} +dl.table h3, dl.function h3 {font-size: .95em;} + +/* stop sublists from having initial vertical space */ +ul ul { margin-top: 0px; } +ol ul { margin-top: 0px; } +ol ol { margin-top: 0px; } +ul ol { margin-top: 0px; } + +/* make the target distinct; helps when we're navigating to a function */ +a:target + * { + background-color: #FF9; +} + + +/* styles for prettification of source */ +pre .comment { color: #558817; } +pre .constant { color: #a8660d; } +pre .escape { color: #844631; } +pre .keyword { color: #aa5050; font-weight: bold; } +pre .library { color: #0e7c6b; } +pre .marker { color: #512b1e; background: #fedc56; font-weight: bold; } +pre .string { color: #8080ff; } +pre .number { color: #f8660d; } +pre .operator { color: #2239a8; font-weight: bold; } +pre .preprocessor, pre .prepro { color: #a33243; } +pre .global { color: #800080; } +pre .user-keyword { color: #800080; } +pre .prompt { color: #558817; } +pre .url { color: #272fc2; text-decoration: underline; } + diff --git a/mods/buildings/glass/docs/reference/modules/crafting.html b/mods/buildings/glass/docs/reference/modules/crafting.html new file mode 100644 index 00000000..4a35bd75 --- /dev/null +++ b/mods/buildings/glass/docs/reference/modules/crafting.html @@ -0,0 +1,138 @@ + + + + + Glass + + + + +
+ +
+ +
+
+
+ + +
+ + + + + + +
+ +

Module crafting

+

Glass craft recipes.

+

+ + +

Cooking Recipes

+ + + + + + + + + +
glass:plainGlass recipe.
glass:obsidianObsidian glass recipe.
+ +
+
+ + +

Cooking Recipes

+ +
+
+ + glass:plain +
+
+ Glass recipe. + +

Recipe type:

+
    + cooking +
+

Output:

+
    + 1 +
+

Input:

+
    + group:sand +
+ + + + + + +
+
+ + glass:obsidian +
+
+ Obsidian glass recipe. + +

Recipe type:

+
    + cooking +
+

Output:

+
    + 1 +
+

Input:

+
    + default:obsidian_shard +
+ + + + + + +
+
+ + +
+
+
+generated by LDoc 1.4.6-antum-dev +Last updated 2017-08-15 21:17:44 +
+
+ + diff --git a/mods/buildings/glass/docs/reference/modules/functions.html b/mods/buildings/glass/docs/reference/modules/functions.html new file mode 100644 index 00000000..9b26b146 --- /dev/null +++ b/mods/buildings/glass/docs/reference/modules/functions.html @@ -0,0 +1,106 @@ + + + + + Glass + + + + +
+ +
+ +
+
+
+ + +
+ + + + + + +
+ +

Module functions

+

Glass functions.

+

+ + +

Sounds

+ + + + + +
glass.node_sounds (table)Retrieves sounds for glass nodes.
+ +
+
+ + +

Sounds

+ +
+
+ + glass.node_sounds (table) +
+
+ Retrieves sounds for glass nodes. + + + + + +

Parameters:

+ + + + + + +
+
+ + +
+
+
+generated by LDoc 1.4.6-antum-dev +Last updated 2017-08-15 21:17:44 +
+
+ + diff --git a/mods/buildings/glass/docs/reference/modules/init.html b/mods/buildings/glass/docs/reference/modules/init.html new file mode 100644 index 00000000..0c0518ae --- /dev/null +++ b/mods/buildings/glass/docs/reference/modules/init.html @@ -0,0 +1,67 @@ + + + + + Glass + + + + +
+ +
+ +
+
+
+ + +
+ + + + + + +
+ +

Module init

+

Glass initialization script.

+

+ + + +
+
+ + + + +
+
+
+generated by LDoc 1.4.6-antum-dev +Last updated 2017-08-15 21:17:44 +
+
+ + diff --git a/mods/buildings/glass/docs/reference/modules/nodes.html b/mods/buildings/glass/docs/reference/modules/nodes.html new file mode 100644 index 00000000..33991fc1 --- /dev/null +++ b/mods/buildings/glass/docs/reference/modules/nodes.html @@ -0,0 +1,120 @@ + + + + + Glass + + + + +
+ +
+ +
+
+
+ + +
+ + + + + + +
+ +

Module nodes

+

Glass nodes.

+

+ + +

Nodes

+ + + + + + + + + +
glass:plainPlain glass.
glass:obsidianObsidian glass.
+ +
+
+ + +

Nodes

+ +
+
+ + glass:plain +
+
+ Plain glass. + + + + + + + + + + +
+
+ + glass:obsidian +
+
+ Obsidian glass. + + + + + + + + + + +
+
+ + +
+
+
+generated by LDoc 1.4.6-antum-dev +Last updated 2017-08-15 21:17:44 +
+
+ + diff --git a/mods/buildings/glass/functions.lua b/mods/buildings/glass/functions.lua index 60b694d7..c072fbe4 100644 --- a/mods/buildings/glass/functions.lua +++ b/mods/buildings/glass/functions.lua @@ -25,9 +25,9 @@ -- @tparam tbl table function glass.node_sounds(tbl) tbl = tbl or {} - tbl.footstep = tbl.footstep or {name='glass_footstep', gain=0.3} - tbl.dig = tbl.dig or {name='glass_footstep', gain=0.5} - tbl.dug = tbl.dug or {name='glass_break', gain=1.0} + tbl.footstep = tbl.footstep or {name="glass_footstep", gain=0.3} + tbl.dig = tbl.dig or {name="glass_footstep", gain=0.5} + tbl.dug = tbl.dug or {name="glass_break", gain=1.0} default.node_sound_defaults(tbl) return tbl diff --git a/mods/buildings/glass/init.lua b/mods/buildings/glass/init.lua index 0a327e4a..88861cfa 100644 --- a/mods/buildings/glass/init.lua +++ b/mods/buildings/glass/init.lua @@ -14,16 +14,30 @@ glass = {} -glass.name = core.get_current_modname() -glass.path = core.get_modpath(glass.name) +glass.modname = core.get_current_modname() +glass.modpath = core.get_modpath(glass.modname) + +function glass.log(lvl, msg) + if not msg then + msg = lvl + lvl = nil + end + + msg = "[" .. glass.modname .. "] " .. msg + if not lvl then + core.log(msg) + else + core.log(lvl, msg) + end +end local scripts = { - 'functions', - 'nodes', - 'crafting', + --"functions", + "nodes", + --"crafting", } for _, s in ipairs(scripts) do - dofile(glass.path .. '/' .. s .. '.lua') + dofile(glass.modpath .. "/" .. s .. ".lua") end diff --git a/mods/buildings/glass/mod.conf b/mods/buildings/glass/mod.conf index db26ab52..2cee0c75 100644 --- a/mods/buildings/glass/mod.conf +++ b/mods/buildings/glass/mod.conf @@ -1,6 +1,5 @@ name = glass description = Enhances default glass to make it colorable. -version = 1.0 +version = 1.1 author = Jordan Irwin (AntumDeluge) -depends = default -optional_depends = unifieddyes +depends = default, unifieddyes diff --git a/mods/buildings/glass/nodes.lua b/mods/buildings/glass/nodes.lua index d6189bdb..430dc2da 100644 --- a/mods/buildings/glass/nodes.lua +++ b/mods/buildings/glass/nodes.lua @@ -17,75 +17,56 @@ local S = core.get_translator() -local enable_colors = core.global_exists('unifieddyes') or core.get_modpath('unifieddyes') +local to_color = { + "default:glass", + "default:glass_cube", + "default:glass_doublepanel", + "default:glass_halfstair", + "default:glass_innerstair", + "default:glass_micropanel", + "default:glass_microslab", + "default:glass_nanoslab", + "default:glass_outerstair", + "default:glass_panel", + "default:glass_thinstair", + "default:obsidian_glass", + "default:obsidian_glass_cube", + "default:obsidian_glass_doublepanel", + "default:obsidian_glass_halfstair", + "default:obsidian_glass_innerstair", + "default:obsidian_glass_micropanel", + "default:obsidian_glass_microslab", + "default:obsidian_glass_nanoslab", + "default:obsidian_glass_outerstair", + "default:obsidian_glass_panel", + "default:obsidian_glass_thinstair", +} +local next = next +for _, glass_name in ipairs(to_color) do + local node = core.registered_nodes[glass_name] ---- Extracts glass type from string. --- --- @function get_glass_type --- @local --- @param g string to be parsed --- @return string representing glass type or `nil` -local function get_glass_type(g) - local glass_type = nil - local idx = g:find(':') - if idx then - glass_type = g:sub(idx+1) - end + if not node then + glass.log("warning", "\"" .. glass_name .. "\" not registered, skipping ...") + else + glass.log("info", "overriding node \"" .. glass_name .. "\" to be colorable") - idx = glass_type:find('_glass') - if idx then - glass_type = glass_type:sub(1, idx-1) - end + local groups = node.groups + groups["ud_param2_colorable"] = 1 - if glass_type == 'glass' then - glass_type = 'plain' - end - - return glass_type -end - - -if enable_colors then - local to_color = { - 'default:glass', - 'default:obsidian_glass', - } - - for _, old_glass in ipairs(to_color) do - local glass_type = get_glass_type(old_glass) - if not glass_type then goto continue end - local new_glass = 'glass:' .. glass_type - - local glass_def = {} - for k, v in pairs(core.registered_nodes[old_glass]) do - glass_def[k] = v - end - - glass_def.paramtype2 = 'color' - glass_def.palette = 'unifieddyes_palette_extended.png' - glass_def.groups['ud_param2_colorable'] = 1 - glass_def.on_dig = unifieddyes.on_dig - - -- register new node - core.register_node(new_glass, glass_def) - - -- unregister old node - core.unregister_item(old_glass) - core.registered_nodes[old_glass] = nil - core.registered_aliases[old_glass] = nil - core.register_alias(old_glass, new_glass) - - ::continue:: - end - - -- misc. aliases - if core.registered_nodes['glass:plain'] then - core.register_alias('glass', 'glass:plain') - core.register_alias('glass:glass', 'glass:plain') - end - - if core.registered_nodes['glass:obsidian'] then - core.register_alias('obsidian_glass', 'glass:obsidian') + core.override_item(glass_name, { + paramtype2 = "color", + palette = "unifieddyes_palette_extended.png", + groups = groups, + on_dig = unifieddyes.on_dig, + }) end end + +-- backward compat (1.0) +if core.registered_nodes["default:glass"] then + core.register_alias("glass:plain", "default:glass") +end +if core.registered_nodes["default:obsidian_glass"] then + core.register_alias("glass:obsidian", "default:obsidian_glass") +end diff --git a/mods/buildings/glass/screenshot.png b/mods/buildings/glass/screenshot.png index de07312b..216dbb5c 100644 Binary files a/mods/buildings/glass/screenshot.png and b/mods/buildings/glass/screenshot.png differ