diff --git a/mods/CORE/mcl_enchanting/LICENSE b/mods/CORE/mcl_enchanting/LICENSE new file mode 100644 index 00000000..9cecc1d4 --- /dev/null +++ b/mods/CORE/mcl_enchanting/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, 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 +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/mods/CORE/mcl_enchanting/README b/mods/CORE/mcl_enchanting/README new file mode 100644 index 00000000..4d1d5af9 --- /dev/null +++ b/mods/CORE/mcl_enchanting/README @@ -0,0 +1,5 @@ +Enchanting for MineClone2 +-------------------------- + +This is a rewrite of the mtg enchanting mod. Beta Version, more features coming soon. +The textures look absolutely shit, but as far as I know I have to use the textures from Pixel Perfection so I dont get trouble with Mocrisoft. There is a version with original textures and sounds, but I can't publish that one. If you'd like to advice me how I can somehow do that anyway, please open an issue or contact me via email (eliasfleckenstein@web.de). diff --git a/mods/CORE/mcl_enchanting/book.lua b/mods/CORE/mcl_enchanting/book.lua new file mode 100644 index 00000000..132fb880 --- /dev/null +++ b/mods/CORE/mcl_enchanting/book.lua @@ -0,0 +1,87 @@ +local book_animations = {["close"] = 1, ["opening"] = 2, ["open"] = 3, ["closing"] = 4} +local book_animation_steps = {0, 640, 680, 700, 740} +local book_animation_speed = 40 + +function mcl_enchanting.schedule_book_animation(self, anim) + self.scheduled_anim = {timer = self.anim_length, anim = anim} +end + +function mcl_enchanting.set_book_animation(self, anim) + local anim_index = book_animations[anim] + local start, stop = book_animation_steps[anim_index], book_animation_steps[anim_index + 1] + self.object:set_animation({x = start, y = stop}, book_animation_speed) + self.scheduled_anim = nil + self.anim_length = (stop - start) / 40 +end + +function mcl_enchanting.check_animation_schedule(self, dtime) + local schedanim = self.scheduled_anim + if schedanim then + schedanim.timer = schedanim.timer - dtime + if schedanim.timer <= 0 then + mcl_enchanting.set_book_animation(self, schedanim.anim)local pos1=self.object:get_pos() + end + end +end + +function mcl_enchanting.look_at(self, pos2) + local pos1 = self.object:get_pos() + local vec = vector.subtract(pos1, pos2) + local yaw = math.atan(vec.z / vec.x) - math.pi/2 + yaw = yaw + (pos1.x >= pos2.x and math.pi or 0) + self.object:set_yaw(yaw + math.pi) +end + +function mcl_enchanting.check_book(pos) + local obj_pos = vector.add(pos, mcl_enchanting.book_offset) + for _, obj in pairs(minetest.get_objects_inside_radius(obj_pos, 0.1)) do + local luaentity = obj:get_luaentity() + if luaentity and luaentity.name == "mcl_enchanting:book" then + if minetest.get_node(pos).name ~= "mcl_enchanting:table" then + obj:remove() + end + return + end + end + minetest.add_entity(obj_pos, "mcl_enchanting:book") +end + +minetest.register_entity("mcl_enchanting:book", { + initial_properties = { + visual = "mesh", + mesh = "mcl_enchanting_book.b3d", + visual_size = {x = 12.5, y = 12.5}, + collisionbox = {0, 0, 0}, + physical = false, + textures = {"mcl_enchanting_book_entity.png"}, + }, + player_near = false, + on_activate = function(self) + self.object:set_armor_groups({immortal = 1}) + mcl_enchanting.set_book_animation(self, "close") + mcl_enchanting.check_book(vector.subtract(self.object:get_pos(), mcl_enchanting.book_offset)) + end, + on_step = function(self, dtime) + local old_player_near = self.player_near + local player_near = false + local player + for _, obj in pairs(minetest.get_objects_inside_radius(self.object:get_pos(), 2.5)) do + if obj:is_player() then + player_near = true + player = obj + end + end + if player_near and not old_player_near then + mcl_enchanting.set_book_animation(self, "opening") + mcl_enchanting.schedule_book_animation(self, "open") + elseif old_player_near and not player_near then + mcl_enchanting.set_book_animation(self, "closing") + mcl_enchanting.schedule_book_animation(self, "close") + end + if player then + mcl_enchanting.look_at(self, player:get_pos()) + end + self.player_near = player_near + mcl_enchanting.check_animation_schedule(self, dtime) + end, +}) diff --git a/mods/CORE/mcl_enchanting/command.lua b/mods/CORE/mcl_enchanting/command.lua new file mode 100644 index 00000000..28b0cadc --- /dev/null +++ b/mods/CORE/mcl_enchanting/command.lua @@ -0,0 +1,40 @@ +minetest.register_chatcommand("enchant", { + description = "Enchant an item." + params = " []", + privs = {give = true}, + func = function(_, param) + local sparam = param:split(" ") + local target_name = sparam[1] + local enchantment = sparam[2] + local level_str = sparam[3] + local level = tonumber(level_str or "1") + if not name or not enchantment then + return false, "Usage: /enchant []" + end + local target = minetest.get_player_by_name(name) + if not target then + return false, "Player '" .. target_name .. "' cannot be found" + end + local itemstack = target:get_wielded_item() + local can_enchant, errorstring, extra_info = mcl_enchanting.can_enchant(itemstack, enchantment, level) + if not can_enchant then + if errorstring == "enchantment invalid" then + return false, "There is no such enchantment '" .. enchantment .. "'" + elseif errorstring == "item missing" then + return false, "The target doesn't hold an item" + elseif errorstring == "item not supported" then + return false, "The selected enchantment can't be added to the target item" + elseif errorstring == "level invalid" then + return false, "'" .. level_str .. "' is not a valid number" + elseif errorstring == "level too high" + return false, "The number you have entered (" .. level_str .. ") is too big, it must be at most " .. extra_info + elseif errorstring == "level too small" + return false, "The number you have entered (" .. level_str .. ") is too small, it must be at least " .. extra_info + elseif errorstring == "incompatible" then + return false, mcl_enchanting.get_enchantment_description(enchantment, level) .. " can't be combined with " .. extra_info + end + else + target:set_wielded_item(mcl_enchanting.enchant(itemstack, enchantment, level)) + end + end +}) diff --git a/mods/CORE/mcl_enchanting/core.lua b/mods/CORE/mcl_enchanting/core.lua new file mode 100644 index 00000000..e9fa523f --- /dev/null +++ b/mods/CORE/mcl_enchanting/core.lua @@ -0,0 +1,169 @@ +mcl_enchanting.total_weight = 0 +mcl_enchanting.all_item_groups = {} + +for enchantment, enchantment_def in pairs(mcl_enchanting.enchantments) do + local all_item_groups = {} + for primary in pairs(enchantment_def.primary) do + all_item_groups[primary] = true + mcl_enchanting.all_item_groups[primary] = true + end + for secondary in pairs(enchantment_def.secondary) do + all_item_groups[secondary] = true + mcl_enchanting.all_item_groups[secondary] = true + end + enchantment_def.all = all_item_groups + mcl_enchanting.total_weight = mcl_enchanting.total_weight + enchantment_def.weight +end + +--[[ +minetest.register_on_mods_loaded(function() + for toolname, tooldef in pairs(minetest.registered_tools) do + for _, material in pairs(tooldef.materials) do + local full_name = toolname .. ((material == "") and "" or "_" .. material) + local old_def = minetest.registered_tools[full_name] + if not old_def then break end + mcl_enchanting.all_tools[full_name] = toolname + for _, enchantment in pairs(tooldef.enchantments) do + local enchantment_def = mcl_enchanting.enchantments[enchantment] + for lvl = 1, enchantment_def.max_level do + local new_def = table.copy(old_def) + new_def.description = minetest.colorize("#54FCFC", old_def.description) .. "\n" .. mcl_enchanting.get_enchantment_description(enchantment, lvl) + new_def.inventory_image = old_def.inventory_image .. "^[colorize:violet:50" + new_def.groups.not_in_creative_inventory = 1 + new_def.texture = old_def.texture or full_name:gsub("%:", "_") + new_def._original_tool = full_name + enchantment_def.create_itemdef(new_def, lvl) + minetest.register_tool(":" .. full_name .. "_enchanted_" .. enchantment .. "_" .. lvl, new_def) + end + end + end + end +end) +--]] + +minetest.register_on_mods_loaded(function() + for toolname, tooldef in pairs(minetest.registered_tools) do + -- quick test + local has_enchantment = false + for group, groupv in pairs(tooldef.groups) do + if groupv > 0 and mcl_enchanting.all_item_groups[group] then + has_enchantment = true + break + end + end + if not has_enchantment then + break + end + -- expensive test + has_enchantment = false + for enchantment in pairs(mcl_enchanting.enchantments) do + if mcl_enchanting.item_supports_enchantment(itemname, enchantment) then + has_enchantment = true + break + end + end + if not has_enchantment then + break + end + local new_name = toolname .. "_enchanted" + tooldef._mcl_enchanting_enchanted_tool = new_name + local new_def = table.copy(tooldef) + new_def.inventory_image = old_def.inventory_image .. "^[colorize:violet:50" + new_def.groups.not_in_creative_inventory = 1 + new_def.groups.enchanted = 1 + new_def.texture = old_def.texture or toolname:gsub("%:", "_") + new_def._mcl_enchanting_enchanted_tool = new_name + minetest.register_tool(":" .. new_name, new_def) + end +end) + +function mcl_enchanting.get_enchantments(itemstack) + return minetest.deserialize(itemstack:get_meta():get_string("mcl_enchanting:enchantments")) or {} +end + +function mcl_enchanting.set_enchantments(itemstack, enchantments, data) + return itemstack:get_meta():set_string("mcl_enchanting:enchantments", minetest.serialize(enchantments)) +end + +function mcl_enchanting.get_enchantment(itemstack, enchantment, data) + return (data or mcl_enchanting.get_enchantments(itemstack))[enchantment] or 0 +end + +function mcl_enchanting.get_enchantment_description(enchantment, level) + local enchantment_def = mcl_enchanting.enchantments[enchantment] + return enchantment_def.name .. " " .. (enchantment_def.max_level == 1 and "" or mcl_enchanting.roman_numerals.toRoman(level)) +end + +function mcl_enchanting.get_enchanted_itemstring(itemname) + return minetest.registered_items[itemname]._mcl_enchanting_enchanted_tool +end + +function mcl_enchanting.item_supports_enchantment(itemname, enchantment) + if not mcl_enchanting.get_enchanted_itemstring(itemname) then + return false + end + local enchantment_def = mcl_enchanting.enchantments[enchantment] + for disallow in pairs(enchantment_def.disallow) do + if minetest.get_item_group(itemname, disallow) > 0 then + return false + end + end + for group in pairs(enchantment_def.all) do + if minetest.get_item_group(itemname, group) then + return true + end + end + return false +end + +function mcl_enchanting.can_enchant(itemstack, enchantment, level) + local enchantment_def = mcl_enchanting.enchantments[enchantment] + if not enchantment_def then + return false, "enchantment invalid" + end + if itemstack:get_name() == "" then + return false, "item missing" + end + if not mcl_enchanting.item_supports_enchantment(itemdef.name, enchantment) then + return false, "item not supported" + end + if not level then + return false, "level invalid" + end + if level > enchantment_def.max_level then + return false, "level too high", enchantment_def.max_level + elseif level < 1 then + return false, "level too small", 1 + end + local item_enchantments = mcl_enchanting.get_enchantments(itemstack) + local enchantment_level = item_enchantments[enchantment] + if enchantment_level then + return false, "incompatible", mcl_enchanting.get_enchantment_description(enchantment, enchantment_level) + end + for incompatible in pairs(enchantment_def.incompatible) do + local incompatible_level = item_enchantments[incompatible] + if incompatible_level then + return false, "incompatible", mcl_enchanting.get_enchantment_description(incompatible, incompatible_level) + end + end +end + +function mcl_enchanting.enchant(itemstack, enchantment, level) + local enchanted_itemstack = ItemStack(mcl_enchanting.get_enchanted_itemstring(itemstack:get_name())) + enchanted_itemstack:add_wear(itemstack:get_wear()) + enchanted_itemstack:set_meta(itemstack:get_meta()) + local enchantments = mcl_enchanting.get_enchantments(enchanted_itemstack) + enchantments[enchantment] = level + mcl_enchanting.set_enchantments(enchanted_itemstack, enchantments) + mcl_enchanting.reload_enchantments(enchanted_itemstack, enchantments) +end + +function mcl_enchanting.reload_enchantments(itemstack, echantments) + local itemdef = itemstack:get_definition() + for enchantment, level in pairs(enchantments) do + local func = mcl_enchanting.features[enchantment] + if func then + func(itemstack, level, itemdef) + end + end +end diff --git a/mods/CORE/mcl_enchanting/enchantments.lua b/mods/CORE/mcl_enchanting/enchantments.lua new file mode 100644 index 00000000..04783a67 --- /dev/null +++ b/mods/CORE/mcl_enchanting/enchantments.lua @@ -0,0 +1,323 @@ +-- Taken from https://minecraft.gamepedia.com/Enchanting + +mcl_enchantments.enchantments = { + -- unimplemented + aqua_affinity = { + name = "Aqua Affinity", + max_level = 1, + primary = {armor_head = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {}, + weight = 2, + description = "Increases underwater mining speed." + }, + -- unimplemented + bane_of_anthropods = { + name = "Bane of Anthropods", + max_level = 5, + primary = {sword = true}, + secondary = {axe = true}, + disallow = {}, + incompatible = {smite = true, shaprness = true}, + weight = 5, + description = "Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites)." + }, + -- unimplemented + blast_protection = { + name = "Blast Protection", + max_level = 4, + primary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {fire_protection = true, protection = true, projectile_protection = true}, + weight = 2, + description = "Reduces explosion damage and knockback." + }, + -- unimplemented + curse_of_binding = { + name = "Curse of Binding", + max_level = 1, + primary = {}, + secondary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true}, + disallow = {}, + incompatible = {}, + weight = 1, + description = "Except when in creative mode, items cannot be removed from armor slots except due to death or breaking." + }, + -- unimplemented + curse_of_vanishing = { + name = "Curse of Vanishing", + max_level = 1, + primary = {}, + secondary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true, tool = true, weapon = true}, + disallow = {clock = true}, + incompatible = {}, + weight = 1, + description = "Except when in creative mode, items cannot be removed from armor slots except due to death or breaking." + }, + -- unimplemented + depth_strider = { + name = "Depth Strider", + max_level = 3, + primary = {}, + secondary = {armor_feet = true}, + disallow = {non_combat_armor = true}, + incompatible = {frost_walker = true}, + weight = 2, + description = "Increases underwater movement speed." + }, + -- unimplemented + efficiency = { + name = "Efficiency", + max_level = 5, + primary = {pickaxe = true, shovel = true, axe = true, hoe = true}, + secondary = {shears = true}, + disallow = {}, + incompatible = {}, + weight = 10, + description = "Increases mining speed." + }, + -- unimplemented + feather_falling = { + name = "Feather Falling", + max_level = 4, + primary = {armor_feet = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {}, + weight = 5, + description = "Reduces fall damage." + }, + -- unimplemented + fire_protection = { + name = "Fire Protection", + max_level = 4, + primary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {blast_protection = true, protection = true, projectile_protection = true}, + weight = 5, + description = "Reduces fire damage." + }, + -- unimplemented + fortune = { + name = "Fortune", + max_level = 4, + primary = {pickaxe = true, shovel = true, axe = true, hoe = true}, + secondary = {}, + disallow = {}, + incompatible = {silk_touch = true}, + weight = 2, + description = "Increases certain block drops." + }, + -- unimplemented + frost_walker = { + name = "Frost Walker", + max_level = 2, + primary = {}, + secondary = {armor_feet = true}, + disallow = {non_combat_armor = true}, + incompatible = {depth_strider = true}, + weight = 2, + description = "Turns water beneath the player into frosted ice and prevents the damage the player would take from standing on magma blocks." + }, + -- unimplemented + infinity = { + name = "Infinity", + max_level = 1, + primary = {bow = true}, + secondary = {}, + disallow = {}, + incompatible = {mending = true}, + weight = 1, + description = "Shooting consumes no regular arrows." + }, + -- unimplemented + knockback = { + name = "Knockback", + max_level = 2, + primary = {sword = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 5, + description = "Increases knockback." + }, + -- unimplemented + looting = { + name = "Looting", + max_level = 3, + primary = {sword = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Increases mob loot." + }, + -- unimplemented + luck_of_the_sea = { + name = "Luck of the Sea", + max_level = 3, + primary = {fishing_rod = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Increases rate of good loot (enchanting books, etc.)" + }, + -- unimplemented + lure = { + name = "Lure", + max_level = 3, + primary = {fishing_rod = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Decreases wait time until fish/junk/loot \"bites\"." + }, + -- unimplemented + mending = { + name = "Mending", + max_level = 1, + primary = {}, + secondary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true, tool = true, weapon = true}, + disallow = {non_combat_armor = true, compass = true, clock = true}, + incompatible = {infinity = true}, + weight = 2, + description = "Repair the item while gaining XP orbs." + }, + -- unimplemented + power = { + name = "Power", + max_level = 5, + primary = {}, + secondary = {bow = true}, + disallow = {}, + incompatible = {}, + weight = 10, + description = "Increases arrow damage." + }, + -- unimplemented + projectile_protection = { + name = "Projectile Protection", + max_level = 4, + primary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {blast_protection = true, fire_protection = true, protection = true}, + weight = 5, + description = "Reduces projectile damage." + }, + -- unimplemented + protection = { + name = "Protection", + max_level = 4, + primary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {blast_protection = true, fire_protection = true, projectile_protection = true}, + weight = 10, + description = "Reduces most types of damage by 4% for each level." + }, + -- unimplemented + punch = { + name = "Punch", + max_level = 2, + primary = {}, + secondary = {bow = true}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Increases arrow knockback." + }, + -- unimplemented + respiration = { + name = "Respiration", + max_level = 3, + primary = {armor_head = true}, + secondary = {}, + disallow = {non_combat_armor = true}, + incompatible = {}, + weight = 2, + description = "Extends underwater breathing time." + }, + -- unimplemented + sharpness = { + name = "Sharpness", + max_level = 5, + primary = {sword = true}, + secondary = {axe = true}, + disallow = {}, + incompatible = {bane_of_anthropods = true, smite = true}, + weight = 5, + description = "Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites)." + }, + -- unimplemented + silk_touch = { + name = "Silk Touch", + max_level = 1, + primary = {pickaxe = true, shovel = true, axe = true, hoe = true}, + secondary = {shears = true}, + disallow = {}, + incompatible = {fortune = true}, + weight = 1, + description = "Mined blocks drop themselves." + }, + -- unimplemented + smite = { + name = "Sharpness", + max_level = 5, + primary = {sword = true}, + secondary = {axe = true}, + disallow = {}, + incompatible = {sharpness = true, smite = true}, + weight = 5, + description = "Increases damage to undead mobs." + }, + -- unimplemented + soul_speed = { + name = "Soul Speed", + max_level = 3, + primary = {}, + secondary = {armor_feet = true}, + disallow = {non_combat_armor = true}, + incompatible = {frost_walker = true}, + weight = 2, + description = "Incerases walking speed on soul sand." + }, + -- unimplemented + sweeping_edge = { + name = "Sweeping Edge", + max_level = 3, + primary = {sword = true}, + secondary = {axe = true}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Increases sweeping attack damage." + }, + -- unimplemented + thorns = { + name = "Thorns", + max_level = 3, + primary = {armor_head = true}, + secondary = {armor_torso = true, armor_legs = true, armor_feet = true}, + disallow = {non_combat_armor = true}, + incompatible = {blast_protection = true, fire_protection = true, projectile_protection = true}, + weight = 1, + description = "Reflects some of the damage taken when hit, at the cost of reducing durability with each proc." + }, + -- unimplemented + unbreaking = { + name = "Unbreaking", + max_level = 3, + primary = {armor_head = true, armor_torso = true, armor_legs = true, armor_feet = true, pickaxe = true, shovel = true, axe = true, hoe = true, sword = true, fishing_rod = true, bow = true}, + secondary = {tool = true}, + disallow = {non_combat_armor = true}, + incompatible = {}, + weight = 5, + description = "Increases item durability." + }, +} diff --git a/mods/CORE/mcl_enchanting/features.lua b/mods/CORE/mcl_enchanting/features.lua new file mode 100644 index 00000000..793ff85f --- /dev/null +++ b/mods/CORE/mcl_enchanting/features.lua @@ -0,0 +1,120 @@ +--[[ +local pickaxes = {"mcl_tools:pick_wood", "mcl_tools:pick_stone", "mcl_tools:pick_gold", "mcl_tools:pick_iron", "mcl_tools:pick_diamond"} +local pickaxes_better_than_iron = {"mcl_tools:pick_iron", "mcl_tools:pick_diamond"} +local pickaxes_better_than_stone = {"mcl_tools:pick_stone", "mcl_tools:pick_gold", "mcl_tools:pick_iron", "mcl_tools:pick_diamond"} +local shovels = {"mcl_tools:shovel_wood", "mcl_tools:shovel_stone", "mcl_tools:shovel_gold", "mcl_tools:shovel_iron", "mcl_tools:shovel_diamond"} + +local silk_touch_tool_lists = { + ["mcl_books:bookshelf"] = true, + ["mcl_core:clay"] = true, + ["mcl_core:stone_with_coal"] = pickaxes, + ["group:coral_block"] = pickaxes, + ["group:coral"] = true, + ["group:coral_fan"] = true, + ["mcl_core:stone_with_diamond"] = pickaxes_better_than_iron, + ["mcl_core:stone_with_emerald"] = pickaxes_better_than_iron, + ["mcl_chests:ender_chest"] = pickaxes, + ["group:glass"] = true, + ["mcl_nether:glowstone"] = true, + ["mcl_core:dirt_with_grass"] = true, + ["mcl_core:gravel"] = true, + ["mcl_core:ice"] = true, + ["mcl_core:stone_with_lapis"] = pickaxes_better_than_stone, + ["group:leaves"] = true, + ["mcl_farming:melon"] = true, + ["group:huge_mushroom"] = true, + ["mcl_core:mycelium"] = true, + ["mcl_nether:quartz_ore"] = pickaxes, + ["mcl_core:packed_ice"] = true, + ["mcl_core:podzol"] = true, + ["mcl_core:stone_with_redstone"] = pickaxes_better_than_iron, + ["mcl_ocean:sea_lantern"] = true, + ["group:top_snow"] = shovels, + ["mcl_core:snowblock"] = shovels, + ["mcl_core:stone"] = pickaxes, +} + +minetest.register_on_mods_loaded(function() + local old_handle_node_drops = minetest.handle_node_drops + function minetest.handle_node_drops(pos, drops, digger) + if digger and digger:is_player() then + local wielditem = digger:get_wielded_item() + local tooldef = wielditem:get_definition() + if tooldef._silk_touch then + local nodename = minetest.get_node(pos).name + local nodedef = minetest.registered_nodes[nodename] + local silk_touch_spec = silk_touch_tool_lists[nodename] + local suitable_tool = false + local tool_list + if silk_touch_spec == true then + suitable_tool = true + elseif silk_touch_spec then + tool_list = silk_touch_spec + else + for k, v in pairs(nodedef.groups) do + if v > 0 then + local group_spec = silk_touch_tool_lists["group:" .. k] + if group_spec == true then + suitable_tool = true + elseif group_spec then + toollist = group_spec + break + end + end + end + end + if tool_list and not suitable_tool then + suitable_tool = (table.indexof(tool_list, tooldef._original_tool) ~= -1) + end + if suitable_tool then + drops = {nodename} + end + end + end + old_handle_node_drops(pos, drops, digger) + end +end) +--]] + + +--[[ + sharpness = { + name = "Sharpness", + max_level = 5, + create_itemdef = function(def, level) + def.tool_capabilities.damage_groups.fleshy = def.tool_capabilities.damage_groups.fleshy + (level + 1) / 2 + end, + }, + efficiency = { + name = "Efficiency", + max_level = 5, + create_itemdef = function(def, level) + local groupcaps = def.tool_capabilities.groupcaps + for _, groupcap in pairs(groupcaps) do + for i, t in pairs(groupcap.times) do + local m = 1 / t + m = m + math.pow(level, 2) + 1 + groupcap.times[i] = 1 / m + end + end + end, + }, + unbreaking = { + name = "Unbreaking", + max_level = 3, + create_itemdef = function(def, level) + local toolcaps = def.tool_capabilities + local armor_uses = def.groups.mcl_armor_uses + local factor = 0.5 + if toolcaps then + local groupcaps = toolcaps.groupcaps + for _, groupcap in pairs(groupcaps) do + groupcap.uses = math.floor(groupcap.uses * (1 + level)) + end + def.tool_capabilities.punch_attack_uses = math.floor(def.tool_capabilities.punch_attack_uses * (1 + level)) + elseif armor_uses then + def.groups.mcl_armor_uses = math.floor(armor_uses / (0.6 + (0.4 / (level + 1)))) + end + end + }, + },--]] diff --git a/mods/CORE/mcl_enchanting/init.lua b/mods/CORE/mcl_enchanting/init.lua new file mode 100644 index 00000000..8489ff2d --- /dev/null +++ b/mods/CORE/mcl_enchanting/init.lua @@ -0,0 +1,15 @@ +local modpath = minetest.get_modpath("mcl_enchanting") + +mcl_enchanting = { + lapis_itemstring = "mcl_dye:blue", + book_offset = vector.new(0, 0.75, 0), + roman_numerals = dofile(modpath .. "/roman_numerals.lua"), -- https://exercism.io/tracks/lua/exercises/roman-numerals/solutions/73c2fb7521e347209312d115f872fa49 +} + +dofile(modpath .. "/enchantments.lua") +dofile(modpath .. "/features.lua") +dofile(modpath .. "/core.lua") +-- dofile(modpath .. "/ui.lua") +-- dofile(modpath .. "/fx.lua") +-- dofile(modpath .. "/book.lua") +-- dofile(modpath .. "/table.lua") diff --git a/mods/CORE/mcl_enchanting/mod.conf b/mods/CORE/mcl_enchanting/mod.conf new file mode 100644 index 00000000..2ec29e52 --- /dev/null +++ b/mods/CORE/mcl_enchanting/mod.conf @@ -0,0 +1,5 @@ +name = mcl_enchanting +description = The rewrite of the Enchanting mod for MineClone2 +depends = mcl_sounds, mcl_formspec, mcl_dye +optional_depends = screwdriver +author = Fleckenstein diff --git a/mods/CORE/mcl_enchanting/models/mcl_enchanting_book.b3d b/mods/CORE/mcl_enchanting/models/mcl_enchanting_book.b3d new file mode 100644 index 00000000..ecc8d91e Binary files /dev/null and b/mods/CORE/mcl_enchanting/models/mcl_enchanting_book.b3d differ diff --git a/mods/CORE/mcl_enchanting/models/mcl_enchanting_book_entity.png b/mods/CORE/mcl_enchanting/models/mcl_enchanting_book_entity.png new file mode 100644 index 00000000..fe6acf60 Binary files /dev/null and b/mods/CORE/mcl_enchanting/models/mcl_enchanting_book_entity.png differ diff --git a/mods/CORE/mcl_enchanting/roman_numerals.lua b/mods/CORE/mcl_enchanting/roman_numerals.lua new file mode 100644 index 00000000..f40c6540 --- /dev/null +++ b/mods/CORE/mcl_enchanting/roman_numerals.lua @@ -0,0 +1,34 @@ +-------------------------------------------------------------------- +--! @file +--! @brief Convert from normal numbers to Roman Numerals +--------------------------------------------------------------------- +local conversionTable = { + { number = 1000, symbol = "M" }, + { number = 900, symbol = "CM" }, + { number = 500, symbol = "D" }, + { number = 400, symbol = "CD" }, + { number = 100, symbol = "C" }, + { number = 90, symbol = "XC" }, + { number = 50, symbol = "L" }, + { number = 40, symbol = "XL" }, + { number = 10, symbol = "X" }, + { number = 9, symbol = "IX" }, + { number = 5, symbol = "V" }, + { number = 4, symbol = "IV" }, + { number = 1, symbol = "I" } +} + +return{ + toRoman = function(number) + local romanNumeral = "" + + for _,table in pairs (conversionTable) do + while(number >= table.number) do + romanNumeral = romanNumeral .. table.symbol + number = number - table.number + end + end + + return romanNumeral + end +} diff --git a/mods/CORE/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg b/mods/CORE/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg new file mode 100644 index 00000000..882e9ee2 Binary files /dev/null and b/mods/CORE/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg differ diff --git a/mods/CORE/mcl_enchanting/table.lua b/mods/CORE/mcl_enchanting/table.lua new file mode 100644 index 00000000..fde16f84 --- /dev/null +++ b/mods/CORE/mcl_enchanting/table.lua @@ -0,0 +1,189 @@ +local enchanting_table_formspec = "" + .. "size[9.07,8.6;]" + .. "formspec_version[3]" + .. "label[0,0;" .. minetest.formspec_escape(minetest.colorize("#313131", "Enchant")) .. "]" + .. mcl_formspec.get_itemslot_bg(1.1, 2.4, 1, 1) + .. "image[1.1,2.4;1,1;mcl_enchanting_lapis_background.png]" + .. "list[context;lapis;1.1,2.4;1,1;]" + .. mcl_formspec.get_itemslot_bg(0.2, 2.4, 1, 1) + .. "list[context;tool;0.2,2.4;1,1;]" + .. "label[0,4;" .. minetest.formspec_escape(minetest.colorize("#313131", "Inventory")) .. "]" + .. mcl_formspec.get_itemslot_bg(0,4.5,9,3) + .. mcl_formspec.get_itemslot_bg(0,7.74,9,1) + .. "list[current_player;main;0,4.5;9,3;9]" + .. "listring[]" + .. "list[current_player;main;0,7.74;9,1;]" + .. "real_coordinates[true]" + .. "image[3.15,0.6;7.6,4.1;mcl_enchanting_button_background.png]" + +local bookshelf_positions = {{x = 1}, {x = -1}, {z = 1}, {z = -1}} + +for _, p in pairs(bookshelf_positions) do + for _, d in pairs({"x", "y", "z"}) do + p[d] = p[d] or 0 + end +end + +minetest.register_abm({ + name = "Enchanting table bookshelf particles", + interval = 0.1, + chance = 1, + nodenames = "mcl_books:bookshelf", + action = function(pos) + for _, relative_pos in pairs(bookshelf_positions) do + if minetest.get_node(vector.add(pos, vector.multiply(relative_pos, 2))).name == "mcl_enchanting:table" and minetest.get_node(vector.add(pos, relative_pos, 2)).name == "air" then + minetest.add_particle({ + pos = pos, + velocity = vector.subtract(relative_pos, vector.new(0, -2, 0)), + acceleration = {x = 0, y = -2, z = 0}, + expirationtime = 2, + size = 2, + texture = "mcl_enchanting_glyph_" .. math.random(18) .. ".png" + }) + end + end + end +}) + + +function mcl_enchanting.update_formspec(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local full_tool_name = inv:get_stack("tool", 1):get_name() + local shortened_tool_name = mcl_enchanting.all_tools[full_tool_name] + local supported_enchantments = (shortened_tool_name and mcl_enchanting.tools[shortened_tool_name].enchantments or {}) + local sup_ench = false + local formspec = enchanting_table_formspec + local e_list = minetest.deserialize(meta:get_string("enchantments")) + local y = 0.65 + for i, e in pairs(e_list) do + local enchantment_supported = table.indexof(supported_enchantments, e.enchantment) ~= -1 + sup_ench = sup_ench or enchantment_supported + local enough_lapis = inv:contains_item("lapis", ItemStack(mcl_enchanting.lapis_itemstring .. " " .. e.cost)) + local ending = (enough_lapis and enchantment_supported and "" or "_off") + local hover_ending = (enough_lapis and enchantment_supported and "_hovered" or "_off") + formspec = formspec + .. "container[3.2," .. y .. "]" + .. (enchantment_supported and "tooltip[button_" .. i .. ";" .. C("#818181") .. mcl_enchanting.get_enchantment_description(e.enchantment, e.level) .. " " .. C("#FFFFFF") .. " . . . ?\n\n" .. C(enough_lapis and "#818181" or "#FC5454") .. e.cost .. " Lapis Lazuli" .. "]" or "") + .. "style[button_" .. i .. ";bgimg=mcl_enchanting_button" .. ending .. ".png;bgimg_hovered=mcl_enchanting_button" .. hover_ending .. ".png;bgimg_pressed=mcl_enchanting_button" .. hover_ending .. ".png]" + .. "button[0,0;7.5,1.3;button_" .. i .. ";]" + .. (enchantment_supported and "image[0,0;1.3,1.3;mcl_enchanting_number_" .. i .. ending .. ".png]" or "") + .. (enchantment_supported and e.glyphs or "") + .. "container_end[]" + y = y + 1.35 + end + formspec = formspec + .. "image[" .. (sup_ench and 0.58 or 1.15) .. ",1.2;" .. (sup_ench and 2 or 0.87) .. ",1.43;mcl_enchanting_book_" .. (sup_ench and "open" or "closed") .. ".png]" + meta:set_string("formspec", formspec) +end + +function mcl_enchanting.progress_formspec_input(pos, _, fields, player) + if fields.quit then + return + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local e_list = minetest.deserialize(meta:get_string("enchantments")) + local button_pressed + for i = 1, 3 do + if fields["button_" .. i] then + button_pressed = i + end + end + if not button_pressed then return end + local e = e_list[button_pressed] + local lapis_cost = ItemStack(mcl_enchanting.lapis_itemstring .. " " .. e.cost) + if not inv:contains_item("lapis", lapis_cost) then return end + local tool_stack = inv:get_stack("tool", 1) + local full_tool_name = tool_stack:get_name() + local shortened_tool_name = mcl_enchanting.all_tools[full_tool_name] + if not shortened_tool_name then return end + if table.indexof(mcl_enchanting.tools[shortened_tool_name].enchantments, e.enchantment) == -1 then return end + local wear = tool_stack:get_wear() + inv:remove_item("lapis", lapis_cost) + local enchanted_tool_stack = ItemStack(full_tool_name .. "_enchanted_" .. e.enchantment .. "_" .. e.level) + enchanted_tool_stack:add_wear(tool_stack:get_wear()) + inv:set_stack("tool", 1, enchanted_tool_stack) + minetest.sound_play("mcl_enchanting_enchant", {to_player = player:get_player_name(), gain = 5.0}) + mcl_enchanting.add_enchantments(pos) +end + + +function mcl_enchanting.drop_inventory(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + for _, listname in ipairs({"tool", "lapis"}) do + local stack = inv:get_stack(listname, 1) + if not stack:is_empty() then + minetest.add_item(vector.add(pos, {x = math.random(0, 10) / 10 - 0.5, y = 0, z = math.random(0, 10) / 10 - 0.5}), stack) + end + end +end + +function mcl_enchanting.init_table(pos) + local inv = minetest.get_meta(pos):get_inventory() + inv:set_size("tool", 1) + inv:set_size("lapis", 1) + mcl_enchanting.add_enchantments(pos) + minetest.add_entity(vector.add(pos, mcl_enchanting.book_offset), "mcl_enchanting:book") +end + +function mcl_enchanting.add_enchantments_to_table(pos) + local meta = minetest.get_meta(pos) + local e_list = {} + for i = 1, 3 do + local e = {} + e.cost = math.random(mcl_enchanting.max_cost) + e.enchantment = mcl_enchanting.enchantment_name_list[math.random(#mcl_enchanting.enchantment_name_list)] + local max_level = mcl_enchanting.enchantments[e.enchantment].max_level + e.level = max_level + 1 - math.ceil(math.pow(math.random(math.pow(max_level, mcl_enchanting.level_rarity_grade)), 1 / mcl_enchanting.level_rarity_grade)) + e.glyphs = "" + local x = 1.3 + for i = 1, 9 do + e.glyphs = e.glyphs .. "image[".. x .. ",0.1;0.5,0.5;mcl_enchanting_glyph_" .. math.random(18) .. ".png^[colorize:#675D49:255]" + x = x + 0.6 + end + e_list[i] = e + end + meta:set_string("enchantments", minetest.serialize(e_list)) + mcl_enchanting.update_formspec(pos) +end + +minetest.register_node("mcl_enchanting:table", { + description = "Enchanting Table", + drawtype = "nodebox", + tiles = {"mcl_enchanting_table_top.png", "mcl_enchanting_table_bottom.png", "mcl_enchanting_table_side.png", "mcl_enchanting_table_side.png", "mcl_enchanting_table_side.png", "mcl_enchanting_table_side.png"}, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 0.25, 0.5}, + }, + sounds = mcl_sounds.node_sound_stone_defaults(), + groups = {pickaxey = 2}, + _mcl_blast_resistance = 1200, + _mcl_hardness = 5, + on_rotate = (screwdriver or {}).rotate_simple, + on_construct = mcl_enchanting.init_table, + on_destruct = mcl_enchanting.drop_inventory, + after_destruct = mcl_enchanting.check_book, + on_receive_fields = mcl_enchanting.progress_formspec_input, + on_metadata_inventory_put = mcl_enchanting.update_formspec, + on_metadata_inventory_take = mcl_enchanting.update_formspec, + allow_metadata_inventory_put = function(_, listname, _, stack) + if listname == "lapis" then + return (stack:get_name() == mcl_enchanting.lapis_itemstring) and stack:get_count() or 0 + end + return 1 + end, + allow_metadata_inventory_move = function() + return 0 + end, +}) + +minetest.register_craft({ + output = "mcl_enchanting:table", + recipe = { + {"", "mcl_books:book", ""}, + {"mcl_core:diamond", "mcl_core:obsidian", "mcl_core:diamond"}, + {"mcl_core:obsidian", "mcl_core:obsidian", "mcl_core:obsidian"} + } +}) diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_closed.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_closed.png new file mode 100644 index 00000000..7defcbc6 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_closed.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_open.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_open.png new file mode 100644 index 00000000..7059db5f Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_open.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button.png new file mode 100644 index 00000000..92674cae Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_background.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_background.png new file mode 100644 index 00000000..a9ddf6cb Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_background.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_hovered.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_hovered.png new file mode 100644 index 00000000..d733e4e5 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_hovered.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_off.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_off.png new file mode 100644 index 00000000..11b71696 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_off.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_1.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_1.png new file mode 100644 index 00000000..a5ac3f55 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_1.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_10.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_10.png new file mode 100644 index 00000000..d002147f Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_10.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_11.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_11.png new file mode 100644 index 00000000..c9cd9ff5 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_11.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_12.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_12.png new file mode 100644 index 00000000..dc5dd1d2 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_12.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_13.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_13.png new file mode 100644 index 00000000..45c6d5a6 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_13.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_14.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_14.png new file mode 100644 index 00000000..68623878 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_14.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_15.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_15.png new file mode 100644 index 00000000..0db3a9ea Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_15.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_16.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_16.png new file mode 100644 index 00000000..d10a72b7 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_16.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_17.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_17.png new file mode 100644 index 00000000..2b374e88 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_17.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_18.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_18.png new file mode 100644 index 00000000..e762e350 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_18.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_2.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_2.png new file mode 100644 index 00000000..eb1e74fb Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_2.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_3.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_3.png new file mode 100644 index 00000000..e82145e5 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_3.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_4.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_4.png new file mode 100644 index 00000000..e93f2383 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_4.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_5.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_5.png new file mode 100644 index 00000000..f0635bf2 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_5.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_6.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_6.png new file mode 100644 index 00000000..c93976cf Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_6.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_7.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_7.png new file mode 100644 index 00000000..1e4ff024 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_7.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_8.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_8.png new file mode 100644 index 00000000..2f2b86c1 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_8.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_9.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_9.png new file mode 100644 index 00000000..4b3e366d Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_9.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_lapis_background.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_lapis_background.png new file mode 100644 index 00000000..1a224f35 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_lapis_background.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1.png new file mode 100644 index 00000000..ecd6b112 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1_off.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1_off.png new file mode 100644 index 00000000..60d755e9 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1_off.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2.png new file mode 100644 index 00000000..a90100f1 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2_off.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2_off.png new file mode 100644 index 00000000..9ba41bd5 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2_off.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3.png new file mode 100644 index 00000000..8dd37a8b Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3_off.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3_off.png new file mode 100644 index 00000000..ddcc98f9 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3_off.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_bottom.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_bottom.png new file mode 100644 index 00000000..ef4cc8a1 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_bottom.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_side.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_side.png new file mode 100644 index 00000000..858b9e3d Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_side.png differ diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_top.png b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_top.png new file mode 100644 index 00000000..95b45c70 Binary files /dev/null and b/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_top.png differ diff --git a/mods/ITEMS/mcl_bows/bow.lua b/mods/ITEMS/mcl_bows/bow.lua index 9f49eb15..8231c8ed 100644 --- a/mods/ITEMS/mcl_bows/bow.lua +++ b/mods/ITEMS/mcl_bows/bow.lua @@ -119,7 +119,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula range = 1, -- Trick to disable digging as well on_use = function() end, - groups = {weapon=1,weapon_ranged=1}, + groups = {weapon=1,weapon_ranged=1,bow=1}, }) -- Iterates through player inventory and resets all the bows in "charging" state back to their original stage diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index d019289d..a05a0b77 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -312,7 +312,7 @@ minetest.register_tool("mcl_fishing:fishing_rod", { _tt_help = S("Catches fish in water"), _doc_items_longdesc = S("Fishing rods can be used to catch fish."), _doc_items_usagehelp = S("Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?"), - groups = { tool=1 }, + groups = { tool=1, fishing_rod=1 }, inventory_image = "mcl_fishing_fishing_rod.png", wield_image = "mcl_fishing_fishing_rod.png^[transformR270", wield_scale = { x = 1.5, y = 1.5, z = 1 },