From b1c83b8697102edd9470788ad683e1b50f124a7a Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Fri, 15 Apr 2016 22:38:42 +0200 Subject: [PATCH] [columnia & moreblocks & moreores] Update --- mods/columnia/LICENSE | 504 +++++++++++++++++++ mods/columnia/README.md | 34 ++ mods/columnia/depends.txt | 1 + mods/columnia/init.lua | 92 +++- mods/columnia/{README.txt => readme.txt} | 4 +- mods/moreblocks/circular_saw.lua | 22 +- mods/moreblocks/description.txt | 1 + mods/moreblocks/mod.conf | 1 + mods/moreblocks/stairsplus/registrations.lua | 8 +- mods/moreores/_config.txt | 27 + mods/moreores/description.txt | 1 + mods/moreores/init.lua | 115 +++-- mods/moreores/mod.conf | 1 + mods/moreores/ores.lua | 33 -- 14 files changed, 733 insertions(+), 111 deletions(-) create mode 100644 mods/columnia/LICENSE create mode 100644 mods/columnia/README.md rename mods/columnia/{README.txt => readme.txt} (93%) mode change 100755 => 100644 create mode 100644 mods/moreblocks/description.txt create mode 100644 mods/moreblocks/mod.conf create mode 100644 mods/moreores/_config.txt create mode 100644 mods/moreores/description.txt create mode 100644 mods/moreores/mod.conf diff --git a/mods/columnia/LICENSE b/mods/columnia/LICENSE new file mode 100644 index 0000000..7205d6f --- /dev/null +++ b/mods/columnia/LICENSE @@ -0,0 +1,504 @@ +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. + + {description} + Copyright (C) {year} {fullname} + + 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! diff --git a/mods/columnia/README.md b/mods/columnia/README.md new file mode 100644 index 0000000..163fb3a --- /dev/null +++ b/mods/columnia/README.md @@ -0,0 +1,34 @@ +columnia +======== + +Simple Pillar Mod for Minetest + +Licences: +Columnia (2014 by Glunggi) is a fork of stairs ..in principle is its stairs with other nodes. +So i will to keep the old stairs- Licenses for this chanced Mode.. include all of my chances. + + +Minetest 0.4 mod: stairs +========================= + +License of source code: +----------------------- +Copyright (C) 2011-2012 Kahrl +Copyright (C) 2011-2012 celeron55, Perttu Ahola + +This program 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 of the License, or +(at your option) any later version. + +http://www.gnu.org/licenses/lgpl-2.1.html + +License of media (textures and sounds) +-------------------------------------- +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by-sa/3.0/ + +Authors of media files +----------------------- +Everything not listed in here: +Copyright (C) 2010-2012 celeron55, Perttu Ahola diff --git a/mods/columnia/depends.txt b/mods/columnia/depends.txt index 4ad96d5..1246684 100755 --- a/mods/columnia/depends.txt +++ b/mods/columnia/depends.txt @@ -1 +1,2 @@ default +moretrees? diff --git a/mods/columnia/init.lua b/mods/columnia/init.lua index 3822dda..164b0f8 100755 --- a/mods/columnia/init.lua +++ b/mods/columnia/init.lua @@ -533,7 +533,8 @@ columnia.register_column_ia("rusty_block", "columnia:rusty_block", "Rusty Column Crosslink", "Rusty Column Link", "Rusty Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("stone", "default:stone", {cracky=3}, @@ -544,8 +545,9 @@ columnia.register_column_ia("stone", "default:stone", "Stone Column Crosslink", "Stone Column Link", "Stone Column Linkdown", - default.node_sound_stone_defaults()) - + default.node_sound_stone_defaults() + ) + columnia.register_column_ia("stonebrick", "default:stonebrick", {cracky=3}, {"default_stone_brick.png"}, @@ -555,7 +557,8 @@ columnia.register_column_ia("stonebrick", "default:stonebrick", "Stone Brick Column Crosslink", "Stone Brick Column Link", "Stone Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("desert_stonebrick", "default:desert_stonebrick", {cracky=3}, @@ -566,7 +569,8 @@ columnia.register_column_ia("desert_stonebrick", "default:desert_stonebrick", "Desert Stone Brick Column Crosslink", "Desert Stone Brick Column Link", "Desert Stone Brick Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("desert_stone", "default:desert_stone", {cracky=3}, @@ -577,8 +581,9 @@ columnia.register_column_ia("desert_stone", "default:desert_stone", "Desert Stone Column Crosslink", "Desert Stone Column Link", "Desert Stone Column Linkdown", - default.node_sound_stone_defaults()) - + default.node_sound_stone_defaults() + ) + columnia.register_column_ia("cobble", "default:cobble", {cracky=3}, {"default_cobble.png"}, @@ -588,7 +593,8 @@ columnia.register_column_ia("cobble", "default:cobble", "Cobble Column Crosslink", "Cobble Column Link", "Cobble Column Linkdown", - default.node_sound_stone_defaults()) + default.node_sound_stone_defaults() + ) columnia.register_column_ia("brick", "default:brick", {cracky=3}, @@ -599,8 +605,9 @@ columnia.register_column_ia("brick", "default:brick", "Brick Column Crosslink", "Brick Column Link", "Brick Column Linkdown", - default.node_sound_stone_defaults()) - + default.node_sound_stone_defaults() + ) + columnia.register_column_ia("sandstone", "default:sandstone", {crumbly=2,cracky=2}, {"default_sandstone.png"}, @@ -610,8 +617,9 @@ columnia.register_column_ia("sandstone", "default:sandstone", "Sandstone Column Crosslink", "Sandstone Column Link", "Sandstone Column Linkdown", - default.node_sound_stone_defaults()) - + default.node_sound_stone_defaults() + ) + columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", {crumbly=2,cracky=2}, {"default_sandstone_brick.png"}, @@ -621,8 +629,9 @@ columnia.register_column_ia("sandstonebrick", "default:sandstonebrick", "Sandstone Brick Column Crosslink", "Sandstone Brick Column Link", "Sandstone Brick Column Linkdown", - default.node_sound_stone_defaults()) - + default.node_sound_stone_defaults() + ) + columnia.register_column_ia("wood", "default:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, {"default_wood.png"}, @@ -656,3 +665,58 @@ columnia.register_column_ia("junglewood", "default:junglewood", "Junglewood Column Linkdown", default.node_sound_wood_defaults()) +columnia.register_column_ia("pinewood", "default:pine_wood", + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + {"default_pine_wood.png"}, + "Pinewood Column", + "Pineewood Column Top", + "Pineewood Column Bottom", + "Pineewood Column Crosslink", + "Pineewood Column Link", + "Pineewood Column Linkdown", + default.node_sound_wood_defaults()) + +if core.get_modpath( 'moretrees' ) then + local morewood = { + { name='beech', description='Beech Tree' }, + { name='apple_tree', description='Apple Tree' }, + { name='oak', description='Oak Tree' }, + { name='sequoia', description='Giant Sequoia' }, + { name='birch', description='Birch Tree' }, + { name='palm', description='Palm Tree', }, + { name='spruce', description='Spruce Tree' }, + { name='willow', description='Willow Tree' }, + { name='acacia', description='Acacia Tree' }, + { name='rubber_tree', description='Rubber Tree' }, + { name='fir', description='Douglas Fir' } + } + for _,t in pairs( morewood ) do + print('register: '.. t.name) + columnia.register_column_ia( t.name, 'moretrees:' .. t.name ..'_planks', + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + { 'moretrees_' .. t.name .. '_wood.png' }, + t.description .. ' Column', + t.description .. ' Column Top', + t.description .. ' Column Bottom', + t.description .. ' Column Crosslink', + t.description .. ' Column Link', + t.description .. ' Column Linkdown', + default.node_sound_wood_defaults()) + end +end + +if core.get_modpath('moreblocks') then + stairsplus:register_all( + 'columnia', + 'rusty_block', + 'columnia:rusty_block', + { + description = 'Rusty Block', + tiles = { + 'columnia_rusty_block.png' + }, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + } + ) +end diff --git a/mods/columnia/README.txt b/mods/columnia/readme.txt old mode 100755 new mode 100644 similarity index 93% rename from mods/columnia/README.txt rename to mods/columnia/readme.txt index 062de2b..145fb05 --- a/mods/columnia/README.txt +++ b/mods/columnia/readme.txt @@ -1,5 +1,5 @@ Columnia (2014 by Glunggi) is a Fork of Stairs ..in principle is its Stairs with other Nodes. -So i will to keep the old Stairs- Licences for this chanced Mode.. include all of my Chances. +So i will to keep the old Stairs- Licenses for this chanced Mode.. include all of my Chances. Minetest 0.4 mod: stairs ========================= @@ -25,5 +25,3 @@ Authors of media files ----------------------- Everything not listed in here: Copyright (C) 2010-2012 celeron55, Perttu Ahola - - diff --git a/mods/moreblocks/circular_saw.lua b/mods/moreblocks/circular_saw.lua index 2440f01..d676c3b 100755 --- a/mods/moreblocks/circular_saw.lua +++ b/mods/moreblocks/circular_saw.lua @@ -283,12 +283,32 @@ function circular_saw.on_metadata_inventory_put( elseif listname == "recycle" then -- Lets look which shape this represents: local cost = circular_saw:get_cost(inv, stackname) - circular_saw:update_inventory(pos, cost * count) + local input_stack = inv:get_stack("input", 1) + -- check if this would not exceed input itemstack max_stacks + if input_stack:get_count() + ((cost * count) / 8) <= input_stack:get_stack_max() then + circular_saw:update_inventory(pos, cost * count) + end end end function circular_saw.on_metadata_inventory_take( pos, listname, index, stack, player) + + -- Prevent (inbuilt) swapping between inventories with different blocks + -- corrupting player inventory or Saw with 'unknown' items. + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local input_stack = inv:get_stack(listname, index) + if not input_stack:is_empty() and input_stack:get_name()~=stack:get_name() then + local player_inv = player:get_inventory() + if player_inv:room_for_item("main", input_stack) then + player_inv:add_item("main", input_stack) + end + + circular_saw:reset(pos) + return + end + -- If it is one of the offered stairs: find out how many -- microblocks have to be substracted: if listname == "output" then diff --git a/mods/moreblocks/description.txt b/mods/moreblocks/description.txt new file mode 100644 index 0000000..95d7a92 --- /dev/null +++ b/mods/moreblocks/description.txt @@ -0,0 +1 @@ +Adds various miscellaneous blocks to the game. diff --git a/mods/moreblocks/mod.conf b/mods/moreblocks/mod.conf new file mode 100644 index 0000000..b634ba9 --- /dev/null +++ b/mods/moreblocks/mod.conf @@ -0,0 +1 @@ +name = moreblocks diff --git a/mods/moreblocks/stairsplus/registrations.lua b/mods/moreblocks/stairsplus/registrations.lua index ac5d7b0..15ea47c 100755 --- a/mods/moreblocks/stairsplus/registrations.lua +++ b/mods/moreblocks/stairsplus/registrations.lua @@ -46,12 +46,18 @@ for _, name in pairs(default_nodes) do if type(ndef.drop) == "string" then drop = ndef.drop:split(" ")[1]:sub(9) end + + local tiles = ndef.tiles + if #ndef.tiles > 1 and ndef.drawtype:find("glass") then + tiles = { ndef.tiles[1] } + end + stairsplus:register_all("moreblocks", name, nodename, { description = ndef.description, drop = drop, groups = ndef.groups, sounds = ndef.sounds, - tiles = ndef.tiles, + tiles = tiles, sunlight_propagates = true, light_source = ndef.light_source }) diff --git a/mods/moreores/_config.txt b/mods/moreores/_config.txt new file mode 100644 index 0000000..7581de9 --- /dev/null +++ b/mods/moreores/_config.txt @@ -0,0 +1,27 @@ +------------------------------------------------------------------------------ +------------------------------ CONFIGURATION --------------------------------- +------------------------------------------------------------------------------ + +------------------------------------------------------------------------------ +-------- Change settings by changing the values after the "=". --------------- +------------------------------------------------------------------------------ + +-- Chunk sizes for ore generation (bigger = ore deposits are more scattered around) +moreores_tin_chunk_size = 7 +moreores_silver_chunk_size = 11 +moreores_mithril_chunk_size = 11 + +-- Amount of ore per chunk (higher = bigger ore deposits) +moreores_tin_ore_per_chunk = 3 +moreores_silver_ore_per_chunk = 4 +moreores_mithril_ore_per_chunk = 1 + +-- Minimal depths of ore generation (Y coordinate, 0 being sea level by default) +moreores_tin_min_depth = -31000 +moreores_silver_min_depth = -31000 +moreores_mithril_min_depth = -31000 + +-- Maximal depths of ore generation (Y coordinate, 0 being sea level by default) +moreores_tin_max_depth = 12 +moreores_silver_max_depth = -12 +moreores_mithril_max_depth = -1024 diff --git a/mods/moreores/description.txt b/mods/moreores/description.txt new file mode 100644 index 0000000..6bd1c7c --- /dev/null +++ b/mods/moreores/description.txt @@ -0,0 +1 @@ +Adds new Ore types. diff --git a/mods/moreores/init.lua b/mods/moreores/init.lua index e0ddf51..3d24b73 100755 --- a/mods/moreores/init.lua +++ b/mods/moreores/init.lua @@ -17,6 +17,8 @@ end local modpath = minetest.get_modpath("moreores") +dofile(modpath .. "/_config.txt") + -- `mg` support: if minetest.get_modpath("mg") then dofile(modpath .. "/mg.lua") @@ -163,37 +165,43 @@ local function add_ore(modname, description, mineral_name, oredef) }) end + oredef.oredef.ore_type = "scatter" + oredef.oredef.ore = modname .. ":mineral_" .. mineral_name + oredef.oredef.wherein = "default:stone" + + minetest.register_ore(oredef.oredef) + for tool_name, tooldef in pairs(oredef.tools) do local tdef = { description = "", inventory_image = toolimg_base .. tool_name .. ".png", tool_capabilities = { max_drop_level = 3, - groupcaps = tooldef.groupcaps + groupcaps = tooldef } } if tool_name == "sword" then - tdef.tool_capabilities.full_punch_interval = tooldef.full_punch_interval - tdef.tool_capabilities.damage_groups = tooldef.damage_groups + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Sword"):format(S(description)) end if tool_name == "pick" then - tdef.tool_capabilities.full_punch_interval = tooldef.full_punch_interval - tdef.tool_capabilities.damage_groups = tooldef.damage_groups + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Pickaxe"):format(S(description)) end if tool_name == "axe" then - tdef.tool_capabilities.full_punch_interval = tooldef.full_punch_interval - tdef.tool_capabilities.damage_groups = tooldef.damage_groups + tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Axe"):format(S(description)) end if tool_name == "shovel" then - tdef.tool_capabilities.full_punch_interval = tooldef.full_punch_interval - tdef.tool_capabilities.damage_groups = tooldef.damage_groups + tdef.full_punch_interval = oredef.full_punch_interval + tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.description = S("%s Shovel"):format(S(description)) end @@ -205,6 +213,7 @@ local function add_ore(modname, description, mineral_name, oredef) return hoe_on_use(itemstack, user, pointed_thing, uses) end end + local fulltool_name = tool_base .. tool_name .. tool_post minetest.register_tool(fulltool_name, tdef) minetest.register_alias(tool_name .. tool_post, fulltool_name) @@ -224,89 +233,77 @@ local oredefs = { silver = { description = "Silver", makes = {ore = true, block = true, lump = true, ingot = true, chest = true}, + oredef = {clust_scarcity = moreores_silver_chunk_size * moreores_silver_chunk_size * moreores_silver_chunk_size, + clust_num_ores = moreores_silver_ore_per_chunk, + clust_size = moreores_silver_chunk_size, + y_min = moreores_silver_min_depth, + y_max = moreores_silver_max_depth + }, tools = { pick = { - groupcaps = { - cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}, - crumbly = {times = {[1] = 1.75, [2] = 0.80, [3] = 0.65}, uses = 90, maxlevel= 2} - }, - damage_groups = {fleshy = 3}, - full_punch_interval = 0.8, + cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel= 1} }, hoe = { uses = 300 }, shovel = { - groupcaps = { - crumbly = {times = {[1] = 1.50, [2] = 0.60, [3] = 0.35}, uses = 90, maxlevel= 2} - }, - damage_groups = {fleshy = 3}, - full_punch_interval = 0.8, + crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel= 1} }, axe = { - groupcaps = { - choppy = {times = {[1] = 3.30, [2] = 1.32, [3] = 0.77}, uses = 90, maxlevel= 2}, - fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1} - }, - damage_groups = {fleshy = 3}, - full_punch_interval = 0.8, + choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel= 1}, + fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel= 1} }, sword = { - groupcaps = { - fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, - snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, - choppy = {times = {[3] = 0.80}, uses = 40, maxlevel= 0} - }, - damage_groups = {fleshy = 5}, - full_punch_interval = 0.85, - } + fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, + snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1}, + choppy = {times = {[3] = 0.80}, uses = 100, maxlevel= 0} + }, }, + full_punch_interval = 1.0, + damage_groups = {fleshy = 6}, }, tin = { description = "Tin", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, - tools = {} + oredef = {clust_scarcity = moreores_tin_chunk_size * moreores_tin_chunk_size * moreores_tin_chunk_size, + clust_num_ores = moreores_tin_ore_per_chunk, + clust_size = moreores_tin_chunk_size, + y_min = moreores_tin_min_depth, + y_max = moreores_tin_max_depth + }, + tools = {}, }, mithril = { description = "Mithril", makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, + oredef = {clust_scarcity = moreores_mithril_chunk_size * moreores_mithril_chunk_size * moreores_mithril_chunk_size, + clust_num_ores = moreores_mithril_ore_per_chunk, + clust_size = moreores_mithril_chunk_size, + y_min = moreores_mithril_min_depth, + y_max = moreores_mithril_max_depth + }, tools = { pick = { - groupcaps = { - cracky = {times = {[1] = 1.50, [2] = 0.80, [3] = 0.35}, uses = 200, maxlevel= 3}, - crumbly = {times = {[1] = 1.00, [2] = 0.60, [3] = 0.25}, uses = 200, maxlevel= 3} - }, - damage_groups = {fleshy = 5}, - full_punch_interval = 0.5, + cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel= 1} }, hoe = { uses = 1000 }, shovel = { - groupcaps = { - crumbly = {times = {[1] = 0.75, [2] = 0.4, [3] = 0.17}, uses = 200, maxlevel= 3} - }, - damage_groups = {fleshy = 5}, - full_punch_interval = 0.5, + crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1} }, axe = { - groupcaps = { - choppy = {times = {[1] = 1.65, [2] = 0.88, [3] = 0.39}, uses = 200, maxlevel= 3}, - fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} - }, - damage_groups = {fleshy = 5}, - full_punch_interval = 0.5, + choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 1}, + fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} }, sword = { - groupcaps = { - fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1}, - snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1}, - choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} - }, - damage_groups = {fleshy = 9}, - full_punch_interval = 0.5, + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1}, + snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1}, + choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} } }, + full_punch_interval = 0.45, + damage_groups = {fleshy = 9}, } } diff --git a/mods/moreores/mod.conf b/mods/moreores/mod.conf new file mode 100644 index 0000000..5a9f1e2 --- /dev/null +++ b/mods/moreores/mod.conf @@ -0,0 +1 @@ +name = moreores diff --git a/mods/moreores/ores.lua b/mods/moreores/ores.lua index 124efcb..84c5650 100755 --- a/mods/moreores/ores.lua +++ b/mods/moreores/ores.lua @@ -1,38 +1,5 @@ -- Register ores -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_silver", - wherein = "default:stone", - clust_scarcity = 11 * 11 * 11, - clust_num_ores = 4, - clust_size = 11, - y_min = -31000, - y_max = -12, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_tin", - wherein = "default:stone", - clust_scarcity = 7 * 7 * 7, - clust_num_ores = 3, - clust_size = 7, - y_min = -31000, - y_max = 12, -}) - -minetest.register_ore({ - ore_type = "scatter", - ore = "moreores:mineral_mithril", - wherein = "default:stone", - clust_scarcity = 11 * 11 * 11, - clust_num_ores = 1, - clust_size = 1, - y_min = -31000, - y_max = -1024, -}) - minetest.register_ore({ ore_type = "scatter", ore = "moreores:mineral_mithril",