diff --git a/.luacheckrc b/.luacheckrc
index 3534e853a611e16f861a73ba07c9d1ec10a99d4c..718790bd95168341744ccd80ba848c51d4780406 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -7,4 +7,6 @@ read_globals = {
"default",
"stairs", "doors", "xpanes",
"xdecor", "xbg",
+ table = { fields = { "copy" } },
+ "unpack",
}
diff --git a/LICENSE b/LICENSE
index 7f1e390af05864d74dd91e6bffb89b3523c25ce4..8b744c6d0245326cc547888dc6c82f0b26f30e47 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
┌──────────────────────────────────────────────────────────────────────┐
│ Copyright (c) 2015-2017 kilbith <jeanpatrick.guerrero@gmail.com> │
│ │
-│ Code: GPL version 3 │
+│ Code: BSD │
│ Textures: WTFPL (credits: Gambit, kilbith, Cisoun) │
│ Sounds: │
│ - xdecor_boiling_water.ogg - by Audionautics - CC BY-SA │
@@ -13,677 +13,27 @@
└──────────────────────────────────────────────────────────────────────┘
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- 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 <http://www.gnu.org/licenses/>.
-
-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
-<http://www.gnu.org/licenses/>.
-
- 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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+Copyright (c) 1998, Regents of the University of California
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Neither the name of the University of California, Berkeley nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/depends.txt b/depends.txt
index 3ced54ff8093a1d999ac1e1245674ca649b04499..034f1f7fc5901122b09929ca31b043d6b7e2d514 100644
--- a/depends.txt
+++ b/depends.txt
@@ -6,6 +6,6 @@ homedecor
doors
stairs
xpanes
-3d_armor?
fire?
oresplus?
+moreblocks?
\ No newline at end of file
diff --git a/handlers/helpers.lua b/handlers/helpers.lua
index 13d3ed70a8866a04a9b5db35081983ccf87f9b26..6098c5a580cdcfc16667af9ae21dc3d417e656ea 100644
--- a/handlers/helpers.lua
+++ b/handlers/helpers.lua
@@ -29,3 +29,21 @@ function xdecor.tablecopy(T)
return new
end
+function xdecor.stairs_valid_def(def)
+ return (def.drawtype == "normal" or def.drawtype:sub(1,5) == "glass") and
+ (def.groups.cracky or def.groups.choppy) and
+ not def.on_construct and
+ not def.after_place_node and
+ not def.on_rightclick and
+ not def.on_blast and
+ not def.allow_metadata_inventory_take and
+ not (def.groups.not_in_creative_inventory == 1) and
+ not (def.groups.not_cuttable == 1) and
+ --not def.groups.wool and
+ (def.tiles and type(def.tiles[1]) == "string" and not
+ def.tiles[1]:find("default_mineral")) and
+ not def.mesecons and
+ def.description and
+ def.description ~= "" and
+ def.light_source == 0
+end
diff --git a/handlers/registration.lua b/handlers/registration.lua
index fc6409e5ebcea2c967c9c2a8450525a75f467470..cbeabdb03822c105f22d5c9e3d17abe0343877a0 100644
--- a/handlers/registration.lua
+++ b/handlers/registration.lua
@@ -43,6 +43,39 @@ local default_can_dig = function(pos)
end
function xdecor.register(name, def)
+ local function xdecor_stairs_alternative(nodename, def)
+ local mod, name = nodename:match("(.*):(.*)")
+ for groupname, value in pairs(def.groups) do
+ if groupname ~= "cracky" and groupname ~= "choppy" and
+ groupname ~= "flammable" and groupname ~= "crumbly" and
+ groupname ~= "snappy" then
+ def.groups.groupname = nil
+ end
+ end
+
+ if minetest.get_modpath("moreblocks") then
+ stairsplus:register_all(
+ mod,
+ name,
+ nodename,
+ {
+ description = def.description,
+ tiles = def.tiles,
+ groups = def.groups,
+ sounds = def.sounds,
+ }
+ )
+ elseif minetest.get_modpath("stairs") then
+ stairs.register_stair_and_slab(name,nodename,
+ def.groups,
+ def.tiles,
+ ("%s Stair"):format(def.description),
+ ("%s Slab"):format(def.description),
+ def.sounds
+ )
+ end
+ end
+
def.drawtype = def.drawtype or (def.mesh and "mesh") or (def.node_box and "nodebox")
def.sounds = def.sounds or default.node_sound_defaults()
@@ -88,4 +121,13 @@ function xdecor.register(name, def)
end
minetest.register_node("xdecor:"..name, def)
+
+ local workbench = minetest.settings:get_bool("enable_xdecor_workbench")
+
+ if workbench == false and
+ (minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs")) then
+ if xdecor.stairs_valid_def(def) then
+ xdecor_stairs_alternative("xdecor:"..name, def)
+ end
+ end
end
diff --git a/init.lua b/init.lua
index 629daee3e4d58c7dabc480cc2ab6f9dd7e8c1c35..6509446404bbb74fa88deab44a302dd7de646bcd 100644
--- a/init.lua
+++ b/init.lua
@@ -1,24 +1,47 @@
--local t = os.clock()
+
+local mver_major, mver_minor, mver_patch = 0, 4, 16 -- Minetest 0.4.16 minimum.
+
+local client_version = minetest.get_version().string
+local major, minor, patch = client_version:match("(%d+).(%d+).(%d+)")
+
+if (major and minor and patch) and
+ ((tonumber(major) < mver_major) or
+ (mver_major == tonumber(major) and tonumber(minor) < mver_minor) or
+ (mver_minor == tonumber(minor) and tonumber(patch) < mver_patch)) then
+ minetest.log("error", "[xdecor] Your Minetest client is too old to run this mod. Disabling.")
+ return
+end
+
xdecor = {}
local modpath = minetest.get_modpath("xdecor")
--- Handlers.
dofile(modpath.."/handlers/animations.lua")
dofile(modpath.."/handlers/helpers.lua")
dofile(modpath.."/handlers/nodeboxes.lua")
dofile(modpath.."/handlers/registration.lua")
--- Item files.
-dofile(modpath.."/src/chess.lua")
-dofile(modpath.."/src/cooking.lua")
-dofile(modpath.."/src/craftitems.lua")
-dofile(modpath.."/src/enchanting.lua")
-dofile(modpath.."/src/hive.lua")
-dofile(modpath.."/src/itemframe.lua")
-dofile(modpath.."/src/mailbox.lua")
-dofile(modpath.."/src/mechanisms.lua")
+dofile(modpath.."/src/alias.lua")
dofile(modpath.."/src/nodes.lua")
dofile(modpath.."/src/recipes.lua")
-dofile(modpath.."/src/rope.lua")
-dofile(modpath.."/src/workbench.lua")
+
+local subpart = {
+ "chess",
+ "cooking",
+ "enchanting",
+ "hive",
+ "itemframe",
+ "mailbox",
+ "mechanisms",
+ "rope",
+ "workbench"
+}
+
+for _, name in pairs(subpart) do
+ local enable = minetest.settings:get_bool("enable_xdecor_"..name)
+ if enable or enable == nil then
+ dofile(modpath.."/src/"..name..".lua")
+ end
+end
+
--print(string.format("[xdecor] loaded in %.2f ms", (os.clock()-t)*1000))
diff --git a/settingtypes.txt b/settingtypes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f75d75c626a22112181038b844d65697e8b4ada9
--- /dev/null
+++ b/settingtypes.txt
@@ -0,0 +1,11 @@
+#For enabling a subpart of X-Decor.
+
+enable_xdecor_chess (Enable Chess) bool true
+enable_xdecor_cooking (Enable Cooking) bool true
+enable_xdecor_enchanting (Enable Enchanting) bool true
+enable_xdecor_hive (Enable Hive) bool true
+enable_xdecor_itemframe (Enable Itemframe) bool true
+enable_xdecor_mailbox (Enable Mailbox) bool true
+enable_xdecor_mechanisms (Enable Mechanisms) bool true
+enable_xdecor_rope (Enable Rope) bool true
+enable_xdecor_workbench (Enable Workbench) bool true
\ No newline at end of file
diff --git a/src/alias.lua b/src/alias.lua
new file mode 100644
index 0000000000000000000000000000000000000000..dc957417c5a1ca89b45ecc26f23af9c53c9ae585
--- /dev/null
+++ b/src/alias.lua
@@ -0,0 +1 @@
+minetest.register_alias("xdecor:crafting_guide", "craftguide:book")
diff --git a/src/chess.lua b/src/chess.lua
index 017b1b1a4211bc77b01265678ec2d6db84fbcad9..f037eeedd8a661ec0b58d3aa6987d8fa0f3a86e9 100644
--- a/src/chess.lua
+++ b/src/chess.lua
@@ -12,67 +12,225 @@ local function xy_to_index(x, y)
return x + y * 8 + 1
end
+local function get_square(a, b)
+ return (a * 8) - (8 - b)
+end
+
+local chat_prefix = minetest.colorize("#FFFF00", "[Chess] ")
+local letters = {'A','B','C','D','E','F','G','H'}
+
+local rowDirs = {-1, -1, -1, 0, 0, 1, 1, 1}
+local colDirs = {-1, 0, 1, -1, 1, -1, 0, 1}
+
+local bishopThreats = {true, false, true, false, false, true, false, true}
+local rookThreats = {false, true, false, true, true, false, true, false}
+local queenThreats = {true, true, true, true, true, true, true, true}
+local kingThreats = {true, true, true, true, true, true, true, true}
+
+local function board_to_table(inv)
+ local t = {}
+ for i = 1, 64 do
+ t[#t + 1] = inv:get_stack("board", i):get_name()
+ end
+
+ return t
+end
+
+local function attacked(color, idx, board)
+ local threatDetected = false
+ local kill = color == "white"
+ local pawnThreats = {kill, false, kill, false, false, not kill, false, not kill}
+
+ for dir = 1, 8 do
+ if not threatDetected then
+ local col, row = index_to_xy(idx)
+ col, row = col + 1, row + 1
+
+ for step = 1, 8 do
+ row = row + rowDirs[dir]
+ col = col + colDirs[dir]
+
+ if row >= 1 and row <= 8 and col >= 1 and col <= 8 then
+ local square = get_square(row, col)
+ local square_name = board[square]
+ local piece, pieceColor = square_name:match(":(%w+)_(%w+)")
+
+ if piece then
+ if pieceColor ~= color then
+ if piece == "bishop" and bishopThreats[dir] then
+ threatDetected = true
+ elseif piece == "rook" and rookThreats[dir] then
+ threatDetected = true
+ elseif piece == "queen" and queenThreats[dir] then
+ threatDetected = true
+ else
+ if step == 1 then
+ if piece == "pawn" and pawnThreats[dir] then
+ threatDetected = true
+ end
+ if piece == "king" and kingThreats[dir] then
+ threatDetected = true
+ end
+ end
+ end
+ end
+ break
+ end
+ end
+ end
+ end
+ end
+
+ return threatDetected
+end
+
+local function locate_kings(board)
+ local Bidx, Widx
+ for i = 1, 64 do
+ local piece, color = board[i]:match(":(%w+)_(%w+)")
+ if piece == "king" then
+ if color == "black" then
+ Bidx = i
+ else
+ Widx = i
+ end
+ end
+ end
+
+ return Bidx, Widx
+end
+
+local pieces = {
+ "realchess:rook_black_1",
+ "realchess:knight_black_1",
+ "realchess:bishop_black_1",
+ "realchess:queen_black",
+ "realchess:king_black",
+ "realchess:bishop_black_2",
+ "realchess:knight_black_2",
+ "realchess:rook_black_2",
+ "realchess:pawn_black_1",
+ "realchess:pawn_black_2",
+ "realchess:pawn_black_3",
+ "realchess:pawn_black_4",
+ "realchess:pawn_black_5",
+ "realchess:pawn_black_6",
+ "realchess:pawn_black_7",
+ "realchess:pawn_black_8",
+ '','','','','','','','','','','','','','','','',
+ '','','','','','','','','','','','','','','','',
+ "realchess:pawn_white_1",
+ "realchess:pawn_white_2",
+ "realchess:pawn_white_3",
+ "realchess:pawn_white_4",
+ "realchess:pawn_white_5",
+ "realchess:pawn_white_6",
+ "realchess:pawn_white_7",
+ "realchess:pawn_white_8",
+ "realchess:rook_white_1",
+ "realchess:knight_white_1",
+ "realchess:bishop_white_1",
+ "realchess:queen_white",
+ "realchess:king_white",
+ "realchess:bishop_white_2",
+ "realchess:knight_white_2",
+ "realchess:rook_white_2"
+}
+
+local pieces_str, x = "", 0
+for i = 1, #pieces do
+ local p = pieces[i]:match(":(%w+_%w+)")
+ if pieces[i]:find(":(%w+)_(%w+)") and not pieces_str:find(p) then
+ pieces_str = pieces_str .. x .. "=" .. p .. ".png,"
+ x = x + 1
+ end
+end
+pieces_str = pieces_str .. "69=mailbox_blank16.png"
+
+local fs = [[
+ size[14.7,10;]
+ no_prepend[]
+ bgcolor[#080808BB;true]
+ background[0,0;14.7,10;chess_bg.png]
+ list[context;board;0.3,1;8,8;]
+ listcolors[#00000000;#00000000;#00000000;#30434C;#FFF]
+ tableoptions[background=#00000000;highlight=#00000000;border=false]
+ button[10.5,8.5;2,2;new;New game]
+]] .. "tablecolumns[image," .. pieces_str ..
+ ";text;color;text;color;text;image," .. pieces_str .. "]"
+
+local function get_moves_list(meta, pieceFrom, pieceTo, pieceTo_s, from_x, to_x, from_y, to_y)
+ local moves = meta:get_string("moves")
+ local pieceFrom_s = pieceFrom:match(":(%w+_%w+)")
+ local pieceFrom_si_id = pieces_str:match("(%d+)=" .. pieceFrom_s)
+ local pieceTo_si_id = pieceTo_s ~= "" and pieces_str:match("(%d+)=" .. pieceTo_s) or ""
+
+ local coordFrom = letters[from_x + 1] .. math.abs(from_y - 8)
+ local coordTo = letters[to_x + 1] .. math.abs(to_y - 8)
+
+ local new_moves = pieceFrom_si_id .. "," ..
+ coordFrom .. "," ..
+ (pieceTo ~= "" and "#33FF33" or "#FFFFFF") .. ", > ,#FFFFFF," ..
+ coordTo .. "," ..
+ (pieceTo ~= "" and pieceTo_si_id or "69") .. "," ..
+ moves
+
+ meta:set_string("moves", new_moves)
+end
+
+local function get_eaten_list(meta, pieceTo, pieceTo_s)
+ local eaten = meta:get_string("eaten")
+ if pieceTo ~= "" then
+ eaten = eaten .. pieceTo_s .. ","
+ end
+
+ meta:set_string("eaten", eaten)
+
+ local eaten_t = string.split(eaten, ",")
+ local eaten_img = ""
+
+ local a, b = 0, 0
+ for i = 1, #eaten_t do
+ local is_white = eaten_t[i]:sub(-5,-1) == "white"
+ local X = (is_white and a or b) % 4
+ local Y = ((is_white and a or b) % 16 - X) / 4
+
+ if is_white then
+ a = a + 1
+ else
+ b = b + 1
+ end
+
+ eaten_img = eaten_img ..
+ "image[" .. ((X + (is_white and 11.7 or 8.8)) - (X * 0.45)) .. "," ..
+ ((Y + 5.56) - (Y * 0.2)) .. ";1,1;" .. eaten_t[i] .. ".png]"
+ end
+
+ meta:set_string("eaten_img", eaten_img)
+end
+
function realchess.init(pos)
local meta = minetest.get_meta(pos)
- local inv = meta:get_inventory()
+ local inv = meta:get_inventory()
- local formspec = [[ size[8,8.6;]
- bgcolor[#080808BB;true]
- background[0,0;8,8;chess_bg.png]
- button[3.1,7.8;2,2;new;New game]
- list[context;board;0,0;8,8;]
- listcolors[#00000000;#00000000;#00000000;#30434C;#FFF] ]]
-
- meta:set_string("formspec", formspec)
+ meta:set_string("formspec", fs)
meta:set_string("infotext", "Chess Board")
meta:set_string("playerBlack", "")
meta:set_string("playerWhite", "")
- meta:set_string("lastMove", "")
- meta:set_string("winner", "")
+ meta:set_string("lastMove", "")
+ meta:set_string("blackAttacked", "")
+ meta:set_string("whiteAttacked", "")
- meta:set_int("lastMoveTime", 0)
+ meta:set_int("lastMoveTime", 0)
meta:set_int("castlingBlackL", 1)
meta:set_int("castlingBlackR", 1)
meta:set_int("castlingWhiteL", 1)
meta:set_int("castlingWhiteR", 1)
- inv:set_list("board", {
- "realchess:rook_black_1",
- "realchess:knight_black_1",
- "realchess:bishop_black_1",
- "realchess:queen_black",
- "realchess:king_black",
- "realchess:bishop_black_2",
- "realchess:knight_black_2",
- "realchess:rook_black_2",
- "realchess:pawn_black_1",
- "realchess:pawn_black_2",
- "realchess:pawn_black_3",
- "realchess:pawn_black_4",
- "realchess:pawn_black_5",
- "realchess:pawn_black_6",
- "realchess:pawn_black_7",
- "realchess:pawn_black_8",
- '','','','','','','','','','','','','','','','',
- '','','','','','','','','','','','','','','','',
- "realchess:pawn_white_1",
- "realchess:pawn_white_2",
- "realchess:pawn_white_3",
- "realchess:pawn_white_4",
- "realchess:pawn_white_5",
- "realchess:pawn_white_6",
- "realchess:pawn_white_7",
- "realchess:pawn_white_8",
- "realchess:rook_white_1",
- "realchess:knight_white_1",
- "realchess:bishop_white_1",
- "realchess:queen_white",
- "realchess:king_white",
- "realchess:bishop_white_2",
- "realchess:knight_white_2",
- "realchess:rook_white_2"
- })
+ meta:set_string("moves", "")
+ meta:set_string("eaten", "")
+ inv:set_list("board", pieces)
inv:set_size("board", 64)
end
@@ -81,59 +239,59 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
return 0
end
- local playerName = player:get_player_name()
- local meta = minetest.get_meta(pos)
-
- if meta:get_string("winner") ~= "" then
- minetest.chat_send_player(playerName, "This game is over.")
- return 0
- end
-
- local inv = meta:get_inventory()
- local pieceFrom = inv:get_stack(from_list, from_index):get_name()
- local pieceTo = inv:get_stack(to_list, to_index):get_name()
- local lastMove = meta:get_string("lastMove")
- local thisMove -- will replace lastMove when move is legal
+ local meta = minetest.get_meta(pos)
+ local playerName = player:get_player_name()
+ local inv = meta:get_inventory()
+ local pieceFrom = inv:get_stack(from_list, from_index):get_name()
+ local pieceTo = inv:get_stack(to_list, to_index):get_name()
+ local lastMove = meta:get_string("lastMove")
local playerWhite = meta:get_string("playerWhite")
local playerBlack = meta:get_string("playerBlack")
+ local thisMove -- Will replace lastMove when move is legal
if pieceFrom:find("white") then
if playerWhite ~= "" and playerWhite ~= playerName then
- minetest.chat_send_player(playerName, "Someone else plays white pieces!")
+ minetest.chat_send_player(playerName, chat_prefix .. "Someone else plays white pieces!")
return 0
end
+
if lastMove ~= "" and lastMove ~= "black" then
- minetest.chat_send_player(playerName, "It's not your turn, wait for your opponent to play.")
return 0
end
+
if pieceTo:find("white") then
-- Don't replace pieces of same color
return 0
end
+
playerWhite = playerName
thisMove = "white"
+
elseif pieceFrom:find("black") then
if playerBlack ~= "" and playerBlack ~= playerName then
- minetest.chat_send_player(playerName, "Someone else plays black pieces!")
+ minetest.chat_send_player(playerName, chat_prefix .. "Someone else plays black pieces!")
return 0
end
+
if lastMove ~= "" and lastMove ~= "white" then
- minetest.chat_send_player(playerName, "It's not your turn, wait for your opponent to play.")
return 0
end
+
if pieceTo:find("black") then
-- Don't replace pieces of same color
return 0
end
+
playerBlack = playerName
thisMove = "black"
end
- -- DETERMINISTIC MOVING
+ -- MOVE LOGIC
local from_x, from_y = index_to_xy(from_index)
- local to_x, to_y = index_to_xy(to_index)
+ local to_x, to_y = index_to_xy(to_index)
+ -- PAWN
if pieceFrom:sub(11,14) == "pawn" then
if thisMove == "white" then
local pawnWhiteMove = inv:get_stack(from_list, xy_to_index(from_x, from_y - 1)):get_name()
@@ -161,6 +319,28 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
else
return 0
end
+
+ --[[
+ if x not changed
+ ensure that destination cell is empty
+ elseif x changed one unit left or right
+ ensure the pawn is killing opponent piece
+ else
+ move is not legal - abort
+ ]]
+
+ if from_x == to_x then
+ if pieceTo ~= "" then
+ return 0
+ end
+ elseif from_x - 1 == to_x or from_x + 1 == to_x then
+ if not pieceTo:find("black") then
+ return 0
+ end
+ else
+ return 0
+ end
+
elseif thisMove == "black" then
local pawnBlackMove = inv:get_stack(from_list, xy_to_index(from_x, from_y + 1)):get_name()
-- black pawns can go down only
@@ -188,12 +368,14 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
return 0
end
- -- if x not changed,
- -- ensure that destination cell is empty
- -- elseif x changed one unit left or right
- -- ensure the pawn is killing opponent piece
- -- else
- -- move is not legal - abort
+ --[[
+ if x not changed
+ ensure that destination cell is empty
+ elseif x changed one unit left or right
+ ensure the pawn is killing opponent piece
+ else
+ move is not legal - abort
+ ]]
if from_x == to_x then
if pieceTo ~= "" then
@@ -210,20 +392,21 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
return 0
end
+ -- ROOK
elseif pieceFrom:sub(11,14) == "rook" then
if from_x == to_x then
- -- moving vertically
+ -- Moving vertically
if from_y < to_y then
- -- moving down
- -- ensure that no piece disturbs the way
+ -- Moving down
+ -- Ensure that no piece disturbs the way
for i = from_y + 1, to_y - 1 do
if inv:get_stack(from_list, xy_to_index(from_x, i)):get_name() ~= "" then
return 0
end
end
else
- -- mocing up
- -- ensure that no piece disturbs the way
+ -- Mocing up
+ -- Ensure that no piece disturbs the way
for i = to_y + 1, from_y - 1 do
if inv:get_stack(from_list, xy_to_index(from_x, i)):get_name() ~= "" then
return 0
@@ -231,7 +414,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
elseif from_y == to_y then
- -- mocing horizontally
+ -- Mocing horizontally
if from_x < to_x then
-- mocing right
-- ensure that no piece disturbs the way
@@ -241,8 +424,8 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
else
- -- mocing left
- -- ensure that no piece disturbs the way
+ -- Mocing left
+ -- Ensure that no piece disturbs the way
for i = to_x + 1, from_x - 1 do
if inv:get_stack(from_list, xy_to_index(i, from_y)):get_name() ~= "" then
return 0
@@ -250,7 +433,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
else
- -- attempt to move arbitrarily -> abort
+ -- Attempt to move arbitrarily -> abort
return 0
end
@@ -262,49 +445,51 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
+ -- KNIGHT
elseif pieceFrom:sub(11,16) == "knight" then
- -- get relative pos
+ -- Get relative pos
local dx = from_x - to_x
local dy = from_y - to_y
- -- get absolute values
+ -- Get absolute values
if dx < 0 then dx = -dx end
if dy < 0 then dy = -dy end
- -- sort x and y
+ -- Sort x and y
if dx > dy then dx, dy = dy, dx end
- -- ensure that dx == 1 and dy == 2
+ -- Ensure that dx == 1 and dy == 2
if dx ~= 1 or dy ~= 2 then
return 0
end
- -- just ensure that destination cell does not contain friend piece
- -- ^ it was done already thus everything ok
+ -- Just ensure that destination cell does not contain friend piece
+ -- ^ It was done already thus everything ok
+ -- BISHOP
elseif pieceFrom:sub(11,16) == "bishop" then
- -- get relative pos
+ -- Get relative pos
local dx = from_x - to_x
local dy = from_y - to_y
- -- get absolute values
+ -- Get absolute values
if dx < 0 then dx = -dx end
if dy < 0 then dy = -dy end
- -- ensure dx and dy are equal
+ -- Ensure dx and dy are equal
if dx ~= dy then return 0 end
if from_x < to_x then
if from_y < to_y then
- -- moving right-down
- -- ensure that no piece disturbs the way
+ -- Moving right-down
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x + i, from_y + i)):get_name() ~= "" then
return 0
end
end
else
- -- moving right-up
- -- ensure that no piece disturbs the way
+ -- Moving right-up
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x + i, from_y - i)):get_name() ~= "" then
return 0
@@ -313,15 +498,15 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
else
if from_y < to_y then
- -- moving left-down
- -- ensure that no piece disturbs the way
+ -- Moving left-down
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x - i, from_y + i)):get_name() ~= "" then
return 0
end
end
else
- -- moving left-up
+ -- Moving left-up
-- ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x - i, from_y - i)):get_name() ~= "" then
@@ -331,31 +516,32 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
+ -- QUEEN
elseif pieceFrom:sub(11,15) == "queen" then
local dx = from_x - to_x
local dy = from_y - to_y
- -- get absolute values
+ -- Get absolute values
if dx < 0 then dx = -dx end
if dy < 0 then dy = -dy end
- -- ensure valid relative move
+ -- Ensure valid relative move
if dx ~= 0 and dy ~= 0 and dx ~= dy then
return 0
end
if from_x == to_x then
if from_y < to_y then
- -- goes down
- -- ensure that no piece disturbs the way
+ -- Goes down
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x, from_y + i)):get_name() ~= "" then
return 0
end
end
else
- -- goes up
- -- ensure that no piece disturbs the way
+ -- Goes up
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x, from_y - i)):get_name() ~= "" then
return 0
@@ -364,24 +550,24 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
elseif from_x < to_x then
if from_y == to_y then
- -- goes right
- -- ensure that no piece disturbs the way
+ -- Goes right
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x + i, from_y)):get_name() ~= "" then
return 0
end
end
elseif from_y < to_y then
- -- goes right-down
- -- ensure that no piece disturbs the way
+ -- Goes right-down
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x + i, from_y + i)):get_name() ~= "" then
return 0
end
end
else
- -- goes right-up
- -- ensure that no piece disturbs the way
+ -- Goes right-up
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x + i, from_y - i)):get_name() ~= "" then
return 0
@@ -390,24 +576,24 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
else
if from_y == to_y then
- -- goes left
- -- ensure that no piece disturbs the way and destination cell does
+ -- Goes left
+ -- Ensure that no piece disturbs the way and destination cell does
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x - i, from_y)):get_name() ~= "" then
return 0
end
end
elseif from_y < to_y then
- -- goes left-down
- -- ensure that no piece disturbs the way
+ -- Goes left-down
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x - i, from_y + i)):get_name() ~= "" then
return 0
end
end
else
- -- goes left-up
- -- ensure that no piece disturbs the way
+ -- Goes left-up
+ -- Ensure that no piece disturbs the way
for i = 1, dx - 1 do
if inv:get_stack(from_list, xy_to_index(from_x - i, from_y - i)):get_name() ~= "" then
return 0
@@ -416,6 +602,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
end
+ -- KING
elseif pieceFrom:sub(11,14) == "king" then
local dx = from_x - to_x
local dy = from_y - to_y
@@ -465,6 +652,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
return 0
end
end
+
inv:set_stack(from_list, 1, "")
inv:set_stack(from_list, 3, "realchess:rook_black_1")
check = false
@@ -479,6 +667,7 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
return 0
end
end
+
inv:set_stack(from_list, 6, "realchess:rook_black_2")
inv:set_stack(from_list, 8, "")
check = false
@@ -488,70 +677,139 @@ function realchess.move(pos, from_list, from_index, to_list, to_index, _, player
end
if check then
- if dx < 0 then dx = -dx end
- if dy < 0 then dy = -dy end
- if dx > 1 or dy > 1 then return 0 end
+ if dx < 0 then
+ dx = -dx
+ end
+
+ if dy < 0 then
+ dy = -dy
+ end
+
+ if dx > 1 or dy > 1 then
+ return 0
+ end
end
if thisMove == "white" then
meta:set_int("castlingWhiteL", 0)
meta:set_int("castlingWhiteR", 0)
+
elseif thisMove == "black" then
meta:set_int("castlingBlackL", 0)
meta:set_int("castlingBlackR", 0)
end
end
- meta:set_string("playerWhite", playerWhite)
- meta:set_string("playerBlack", playerBlack)
- lastMove = thisMove
- meta:set_string("lastMove", lastMove)
- meta:set_int("lastMoveTime", minetest.get_gametime())
+ local board = board_to_table(inv)
+ board[to_index] = board[from_index]
+ board[from_index] = ""
+
+ local black_king_idx, white_king_idx = locate_kings(board)
+ local blackAttacked = attacked("black", black_king_idx, board)
+ local whiteAttacked = attacked("white", white_king_idx, board)
- if lastMove == "black" then
- minetest.chat_send_player(playerWhite, "["..os.date("%H:%M:%S").."] "..
- playerName.." moved a "..pieceFrom:match(":(%a+)")..", it's now your turn.")
- elseif lastMove == "white" then
- minetest.chat_send_player(playerBlack, "["..os.date("%H:%M:%S").."] "..
- playerName.." moved a "..pieceFrom:match(":(%a+)")..", it's now your turn.")
+ if blackAttacked then
+ if thisMove == "black" and meta:get_string("blackAttacked") == "true" then
+ return 0
+ else
+ meta:set_string("blackAttacked", "true")
+ end
+ else
+ meta:set_string("blackAttacked", "")
end
- if pieceTo:sub(11,14) == "king" then
- minetest.chat_send_player(playerBlack, playerName.." won the game.")
- minetest.chat_send_player(playerWhite, playerName.." won the game.")
- meta:set_string("winner", thisMove)
+ if whiteAttacked then
+ if thisMove == "white" and meta:get_string("whiteAttacked") == "true" then
+ return 0
+ else
+ meta:set_string("whiteAttacked", "true")
+ end
+ else
+ meta:set_string("whiteAttacked", "")
end
+ lastMove = thisMove
+
+ meta:set_string("lastMove", lastMove)
+ meta:set_int("lastMoveTime", minetest.get_gametime())
+ meta:set_string("playerWhite", playerWhite)
+ meta:set_string("playerBlack", playerBlack)
+
+ local pieceTo_s = pieceTo ~= "" and pieceTo:match(":(%w+_%w+)") or ""
+ get_moves_list(meta, pieceFrom, pieceTo, pieceTo_s, from_x, to_x, from_y, to_y)
+ get_eaten_list(meta, pieceTo, pieceTo_s)
+
return 1
end
+function realchess.on_move(pos, from_list, from_index)
+ local meta = minetest.get_meta(pos)
+ local inv = meta:get_inventory()
+ inv:set_stack(from_list, from_index, '')
+
+ local black_king_attacked = meta:get_string("blackAttacked") == "true"
+ local white_king_attacked = meta:get_string("whiteAttacked") == "true"
+
+ local playerWhite = meta:get_string("playerWhite")
+ local playerBlack = meta:get_string("playerBlack")
+
+ local moves = meta:get_string("moves")
+ local eaten_img = meta:get_string("eaten_img")
+ local lastMove = meta:get_string("lastMove")
+ local turnBlack = minetest.colorize("#000001", (lastMove == "white" and playerBlack ~= "") and
+ playerBlack .. "..." or playerBlack)
+ local turnWhite = minetest.colorize("#000001", (lastMove == "black" and playerWhite ~= "") and
+ playerWhite .. "..." or playerWhite)
+ local check_s = minetest.colorize("#FF0000", "\\[check\\]")
+
+ local formspec = fs ..
+ "label[1.9,0.3;" .. turnBlack .. (black_king_attacked and " " .. check_s or "") .. "]" ..
+ "label[1.9,9.15;" .. turnWhite .. (white_king_attacked and " " .. check_s or "") .. "]" ..
+ "table[8.9,1.05;5.07,3.75;moves;" .. moves:sub(1,-2) .. ";1]" ..
+ eaten_img
+
+ meta:set_string("formspec", formspec)
+
+ return false
+end
+
local function timeout_format(timeout_limit)
local time_remaining = timeout_limit - minetest.get_gametime()
- local minutes = math.floor(time_remaining / 60)
- local seconds = time_remaining % 60
+ local minutes = math.floor(time_remaining / 60)
+ local seconds = time_remaining % 60
+
+ if minutes == 0 then
+ return seconds .. " sec."
+ end
- if minutes == 0 then return seconds.." sec." end
- return minutes.." min. "..seconds.." sec."
+ return minutes .. " min. " .. seconds .. " sec."
end
function realchess.fields(pos, _, fields, sender)
- local playerName = sender:get_player_name()
- local meta = minetest.get_meta(pos)
+ local playerName = sender:get_player_name()
+ local meta = minetest.get_meta(pos)
local timeout_limit = meta:get_int("lastMoveTime") + 300
- local playerWhite = meta:get_string("playerWhite")
- local playerBlack = meta:get_string("playerBlack")
- local lastMoveTime = meta:get_int("lastMoveTime")
+ local playerWhite = meta:get_string("playerWhite")
+ local playerBlack = meta:get_string("playerBlack")
+ local lastMoveTime = meta:get_int("lastMoveTime")
if fields.quit then return end
- -- timeout is 5 min. by default for resetting the game (non-players only)
- if fields.new and (playerWhite == playerName or playerBlack == playerName) then
- realchess.init(pos)
- elseif fields.new and lastMoveTime ~= 0 and minetest.get_gametime() >= timeout_limit and
- (playerWhite ~= playerName or playerBlack ~= playerName) then
- realchess.init(pos)
- else
- minetest.chat_send_player(playerName, "[!] You can't reset the chessboard, a game has been started.\n"..
- "If you are not a current player, try again in "..timeout_format(timeout_limit))
+ -- Timeout is 5 min. by default for resetting the game (non-players only)
+ if fields.new then
+ if (playerWhite == playerName or playerBlack == playerName) then
+ realchess.init(pos)
+
+ elseif lastMoveTime ~= 0 then
+ if minetest.get_gametime() >= timeout_limit and
+ (playerWhite ~= playerName or playerBlack ~= playerName) then
+ realchess.init(pos)
+ else
+ minetest.chat_send_player(playerName, chat_prefix ..
+ "You can't reset the chessboard, a game has been started. " ..
+ "If you aren't a current player, try again in " ..
+ timeout_format(timeout_limit))
+ end
+ end
end
end
@@ -559,21 +817,18 @@ function realchess.dig(pos, player)
if not player then
return false
end
- local meta = minetest.get_meta(pos)
- local playerName = player:get_player_name()
+
+ local meta = minetest.get_meta(pos)
+ local playerName = player:get_player_name()
local timeout_limit = meta:get_int("lastMoveTime") + 300
- local lastMoveTime = meta:get_int("lastMoveTime")
+ local lastMoveTime = meta:get_int("lastMoveTime")
- -- timeout is 5 min. by default for digging the chessboard (non-players only)
+ -- Timeout is 5 min. by default for digging the chessboard (non-players only)
return (lastMoveTime == 0 and minetest.get_gametime() > timeout_limit) or
- minetest.chat_send_player(playerName, "[!] You can't dig the chessboard, a game has been started.\n"..
- "Reset it first if you're a current player, or dig again in "..timeout_format(timeout_limit))
-end
-
-function realchess.on_move(pos, from_list, from_index)
- local inv = minetest.get_meta(pos):get_inventory()
- inv:set_stack(from_list, from_index, '')
- return false
+ minetest.chat_send_player(playerName, chat_prefix ..
+ "You can't dig the chessboard, a game has been started. " ..
+ "Reset it first if you're a current player, or dig it again in " ..
+ timeout_format(timeout_limit))
end
minetest.register_node(":realchess:chessboard", {
@@ -600,17 +855,17 @@ minetest.register_node(":realchess:chessboard", {
local function register_piece(name, count)
for _, color in pairs({"black", "white"}) do
if not count then
- minetest.register_craftitem(":realchess:"..name.."_"..color, {
- description = color:gsub("^%l", string.upper).." "..name:gsub("^%l", string.upper),
- inventory_image = name.."_"..color..".png",
+ minetest.register_craftitem(":realchess:" .. name .. "_" .. color, {
+ description = color:gsub("^%l", string.upper) .. " " .. name:gsub("^%l", string.upper),
+ inventory_image = name .. "_" .. color .. ".png",
stack_max = 1,
groups = {not_in_creative_inventory=1}
})
else
for i = 1, count do
- minetest.register_craftitem(":realchess:"..name.."_"..color.."_"..i, {
- description = color:gsub("^%l", string.upper).." "..name:gsub("^%l", string.upper),
- inventory_image = name.."_"..color..".png",
+ minetest.register_craftitem(":realchess:" .. name .. "_" .. color .. "_" .. i, {
+ description = color:gsub("^%l", string.upper) .. " " .. name:gsub("^%l", string.upper),
+ inventory_image = name .. "_" .. color .. ".png",
stack_max = 1,
groups = {not_in_creative_inventory=1}
})
@@ -626,3 +881,12 @@ register_piece("bishop", 2)
register_piece("queen")
register_piece("king")
+-- Recipes
+
+minetest.register_craft({
+ output = "realchess:chessboard",
+ recipe = {
+ {"dye:black", "dye:white", "dye:black"},
+ {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
+ }
+})
diff --git a/src/cooking.lua b/src/cooking.lua
index aaeae79c2fd6e73ef05079b1eea7d4f6af17c07f..8cc2d386ed73840a150f42bc0dcd9dbe1e654127 100644
--- a/src/cooking.lua
+++ b/src/cooking.lua
@@ -198,3 +198,39 @@ xdecor.register("cauldron_soup", {
end
})
+-- Craft items
+
+minetest.register_craftitem("xdecor:bowl", {
+ description = "Bowl",
+ inventory_image = "xdecor_bowl.png",
+ wield_image = "xdecor_bowl.png",
+ groups = {food_bowl = 1, flammable = 2},
+})
+
+minetest.register_craftitem("xdecor:bowl_soup", {
+ description = "Bowl of soup",
+ inventory_image = "xdecor_bowl_soup.png",
+ wield_image = "xdecor_bowl_soup.png",
+ groups = {not_in_creative_inventory=1},
+ stack_max = 1,
+ on_use = minetest.item_eat(30, "xdecor:bowl")
+})
+
+-- Recipes
+
+minetest.register_craft({
+ output = "xdecor:bowl 3",
+ recipe = {
+ {"group:wood", "", "group:wood"},
+ {"", "group:wood", ""}
+ }
+})
+
+minetest.register_craft({
+ output = "xdecor:cauldron_empty",
+ recipe = {
+ {"default:iron_lump", "", "default:iron_lump"},
+ {"default:iron_lump", "", "default:iron_lump"},
+ {"default:iron_lump", "default:iron_lump", "default:iron_lump"}
+ }
+})
diff --git a/src/enchanting.lua b/src/enchanting.lua
index 409e1786aa2cb1cfadf99c8635084601d4f0896c..e3323841393b6d8f1e7f90dc2fbe557cd4654e6e 100644
--- a/src/enchanting.lua
+++ b/src/enchanting.lua
@@ -9,9 +9,6 @@ local enchanting = {
uses = 1.2, -- Durability
times = 0.1, -- Efficiency
damages = 1, -- Sharpness
- strength = 1.2, -- Armor strength (3d_armor only)
- speed = 0.2, -- Player speed (3d_armor only)
- jump = 0.2 -- Player jumping (3d_armor only)
}
local function cap(S) return S:gsub("^%l", string.upper) end
@@ -39,8 +36,6 @@ function enchanting:get_tooltip(enchant, orig_caps, fleshy)
durable = {"#00baff", " (+"..bonus.durable.."%)"},
fast = {"#74ff49", " (+"..bonus.efficiency.."%)"},
sharp = {"#ffff00", " (+"..bonus.damages.."%)"},
- strong = {"#ff3d3d", ""},
- speed = {"#fd5eff", ""}
}
return minetest.colorize and minetest.colorize(specs[enchant][1],
"\n"..cap(enchant)..specs[enchant][2]) or
@@ -50,10 +45,7 @@ end
local enchant_buttons = {
[[ image_button[3.9,0.85;4,0.92;bg_btn.png;fast;Efficiency]
image_button[3.9,1.77;4,1.12;bg_btn.png;durable;Durability] ]],
- "image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]",
"image_button[3.9,2.9;4,0.92;bg_btn.png;sharp;Sharpness]",
- [[ image_button[3.9,0.85;4,0.92;bg_btn.png;strong;Strength]
- image_button[3.9,1.77;4,1.12;bg_btn.png;speed;Speed] ]]
}
function enchanting.formspec(pos, num)
@@ -71,9 +63,7 @@ function enchanting.formspec(pos, num)
image[2,2.9;1,1;mese_layout.png]
tooltip[sharp;Your weapon inflicts more damages]
tooltip[durable;Your tool last longer]
- tooltip[fast;Your tool digs faster]
- tooltip[strong;Your armor is more resistant]
- tooltip[speed;Your speed is increased] ]]
+ tooltip[fast;Your tool digs faster] ]]
..default.gui_slots..default.get_hotbar_bg(0.5,4.5)
formspec = formspec..(enchant_buttons[num] or "")
@@ -85,8 +75,7 @@ function enchanting.on_put(pos, listname, _, stack)
local stackname = stack:get_name()
local tool_groups = {
"axe, pick, shovel",
- "chestplate, leggings, helmet",
- "sword", "boots"
+ "sword",
}
for idx, tools in pairs(tool_groups) do
@@ -155,7 +144,7 @@ function enchanting.construct(pos)
minetest.add_entity({x=pos.x, y=pos.y+0.85, z=pos.z}, "xdecor:book_open")
local timer = minetest.get_node_timer(pos)
- timer:start(5.0)
+ timer:start(0.5)
end
function enchanting.destruct(pos)
@@ -190,7 +179,8 @@ function enchanting.timer(pos)
velocity = {x=x, y=2-y, z=z},
acceleration = {x=0, y=-2.2, z=0},
expirationtime = 1,
- size = 2,
+ size = 1.5,
+ glow = 5,
texture = "xdecor_glyph"..random(1,18)..".png"
})
end
@@ -203,6 +193,7 @@ xdecor.register("enchantment_table", {
"xdecor_enchantment_side.png", "xdecor_enchantment_side.png",
"xdecor_enchantment_side.png", "xdecor_enchantment_side.png"},
groups = {cracky=1, level=1},
+ light_source = 6,
sounds = default.node_sound_stone_defaults(),
on_rotate = screwdriver.rotate_simple,
can_dig = enchanting.dig,
@@ -273,32 +264,6 @@ function enchanting:register_tools(mod, def)
}
})
end
-
- if mod == "3d_armor" then
- local original_armor_groups = original_tool.groups
- local armorcaps = {}
- armorcaps.not_in_creative_inventory = 1
-
- for armor_group, value in pairs(original_armor_groups) do
- if enchant == "strong" then
- armorcaps[armor_group] = ceil(value * enchanting.strength)
- elseif enchant == "speed" then
- armorcaps[armor_group] = value
- armorcaps.physics_speed = enchanting.speed
- armorcaps.physics_jump = enchanting.jump
- end
- end
-
- minetest.register_tool(":"..mod..":enchanted_"..tool.."_"..material.."_"..enchant, {
- description = "Enchanted "..cap(material).." "..cap(tool)..
- self:get_tooltip(enchant),
- inventory_image = original_tool.inventory_image,
- texture = "3d_armor_"..tool.."_"..material,
- wield_image = original_tool.wield_image,
- groups = armorcaps,
- wear = 0
- })
- end
end
end
end
@@ -314,13 +279,13 @@ enchanting:register_tools("default", {
}
})
-enchanting:register_tools("3d_armor", {
- materials = "steel, bronze, gold, diamond",
- tools = {
- boots = {enchants = "strong, speed"},
- chestplate = {enchants = "strong"},
- helmet = {enchants = "strong"},
- leggings = {enchants = "strong"}
+-- Recipes
+--[[
+minetest.register_craft({
+ output = "xdecor:enchantment_table",
+ recipe = {
+ {"", "default:book", ""},
+ {"default:diamond", "default:obsidian", "default:diamond"},
+ {"default:obsidian", "default:obsidian", "default:obsidian"}
}
-})
-
+})]]
diff --git a/src/hive.lua b/src/hive.lua
index e453259c3efa16119843840c5a86c9af48ae9382..a162d4266d5c10f09330c72fbe271565419ef21c 100644
--- a/src/hive.lua
+++ b/src/hive.lua
@@ -10,7 +10,9 @@ function hive.construct(pos)
image[6,0;1,1;hive_bee.png]
image[5,0;1,1;hive_layout.png]
list[context;honey;5,0;1,1;]
- list[current_player;main;0,1.35;8,4;] ]]
+ list[current_player;main;0,1.35;8,4;]
+ listring[current_player;main]
+ listring[context;honey] ]]
..xbg..default.get_hotbar_bg(0,1.35)
meta:set_string("formspec", formspec)
@@ -73,3 +75,23 @@ xdecor.register("hive", {
end
})
+-- Craft items
+
+minetest.register_craftitem("xdecor:honey", {
+ description = "Honey",
+ inventory_image = "xdecor_honey.png",
+ wield_image = "xdecor_honey.png",
+ groups = {food_honey = 1, food_sugar = 1, flammable = 2, not_in_creative_inventory=1},
+ on_use = minetest.item_eat(2)
+})
+
+-- Recipes
+
+minetest.register_craft({
+ output = "xdecor:hive",
+ recipe = {
+ {"group:stick", "group:stick", "group:stick"},
+ {"default:paper", "default:paper", "default:paper"},
+ {"group:stick", "group:stick", "group:stick"}
+ }
+})
diff --git a/src/itemframe.lua b/src/itemframe.lua
index 02d83d6fe7992a4bf104ce933f4bf5ec6871939b..8dd81145a3418ca7f5a4502ff18935ccf396bdfd 100644
--- a/src/itemframe.lua
+++ b/src/itemframe.lua
@@ -69,9 +69,11 @@ end
function itemframe.rightclick(pos, node, clicker, itemstack)
local meta = minetest.get_meta(pos)
- local player = clicker:get_player_name()
+ local player_name = clicker:get_player_name()
local owner = meta:get_string("owner")
- if player ~= owner or not itemstack then
+ local admin = minetest.check_player_privs(player_name, "protection_bypass")
+
+ if not admin and (player_name ~= owner or not itemstack) then
return itemstack
end
@@ -85,19 +87,22 @@ end
function itemframe.punch(pos, node, puncher)
local meta = minetest.get_meta(pos)
- local player = puncher:get_player_name()
+ local player_name = puncher:get_player_name()
local owner = meta:get_string("owner")
+ local admin = minetest.check_player_privs(player_name, "protection_bypass")
- if player ~= owner then return end
+ if not admin and player_name ~= owner then return end
drop_item(pos, node)
end
function itemframe.dig(pos, player)
+ if not player then return end
local meta = minetest.get_meta(pos)
- local pname = player and player:get_player_name()
+ local player_name = player and player:get_player_name()
local owner = meta:get_string("owner")
+ local admin = minetest.check_player_privs(player_name, "protection_bypass")
- return pname == owner
+ return admin or player_name == owner
end
xdecor.register("itemframe", {
@@ -154,3 +159,13 @@ minetest.register_entity("xdecor:f_item", {
end
})
+-- Recipes
+--[[
+minetest.register_craft({
+ output = "xdecor:itemframe",
+ recipe = {
+ {"group:stick", "group:stick", "group:stick"},
+ {"group:stick", "default:paper", "group:stick"},
+ {"group:stick", "group:stick", "group:stick"}
+ }
+})]]
diff --git a/src/mailbox.lua b/src/mailbox.lua
index 7f27af0d28c51c4ce75597dbc46e4bc608e2455a..5c2dcd291df015ab50c0f28f3fbda65ec4ae148d 100644
--- a/src/mailbox.lua
+++ b/src/mailbox.lua
@@ -161,3 +161,14 @@ xdecor.register("mailbox", {
allow_metadata_inventory_put = mailbox.put,
after_place_node = mailbox.after_place_node
})
+
+-- Recipes
+
+minetest.register_craft({
+ output = "xdecor:mailbox",
+ recipe = {
+ {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+ {"dye:red", "default:paper", "dye:red"},
+ {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}
+ }
+})
\ No newline at end of file
diff --git a/src/mechanisms.lua b/src/mechanisms.lua
index 258bce29b424de95e381c2bec5917a0d5ebcb4de..d505b966bfdc7a4ecec5265d9ea4c8aacd8acb85 100644
--- a/src/mechanisms.lua
+++ b/src/mechanisms.lua
@@ -6,6 +6,7 @@ local plate = {}
screwdriver = screwdriver or {}
local function door_toggle(pos_actuator, pos_door, player)
+ local player_name = player:get_player_name()
local actuator = minetest.get_node(pos_actuator)
local door = doors.get(pos_door)
@@ -20,7 +21,9 @@ local function door_toggle(pos_actuator, pos_door, player)
minetest.set_node(pos_actuator,
{name=actuator.name, param2=actuator.param2})
end
- door:close(player)
+ -- Re-get player object (or nil) because 'player' could
+ -- be an invalid object at this time (player left)
+ door:close(minetest.get_player_by_name(player_name))
end)
end
@@ -115,3 +118,24 @@ xdecor.register("lever_on", {
drop = "xdecor:lever_off"
})
+-- Recipes
+
+minetest.register_craft({
+ output = "xdecor:pressure_stone_off",
+ type = "shapeless",
+ recipe = {"group:stone", "group:stone"}
+})
+
+minetest.register_craft({
+ output = "xdecor:pressure_wood_off",
+ type = "shapeless",
+ recipe = {"group:wood", "group:wood"}
+})
+
+minetest.register_craft({
+ output = "xdecor:lever_off",
+ recipe = {
+ {"group:stick"},
+ {"group:stone"}
+ }
+})
\ No newline at end of file
diff --git a/src/nodes.lua b/src/nodes.lua
index f56bf500e63e9108cb2a9fe83aac68851b866b3c..72600aea34d001b7b40c901089729376b5a2c9f2 100644
--- a/src/nodes.lua
+++ b/src/nodes.lua
@@ -149,17 +149,39 @@ xdecor.register("chair", {
return itemstack
end
})
+--[[
+xdecor.register("cobweb", {
+ description = "Cobweb",
+ drawtype = "plantlike",
+ tiles = {"xdecor_cobweb.png"},
+ inventory_image = "xdecor_cobweb.png",
+ liquid_viscosity = 8,
+ liquidtype = "source",
+ liquid_alternative_flowing = "xdecor:cobweb",
+ liquid_alternative_source = "xdecor:cobweb",
+ liquid_renewable = false,
+ liquid_range = 0,
+ walkable = false,
+ selection_box = {type = "regular"},
+ groups = {snappy=3, liquid=3, flammable=3},
+ sounds = default.node_sound_leaves_defaults()
+})
+]]
+local curtain_colors = {
+ "red",
+}
-for _, c in pairs({"red"}) do -- Add more curtains colors simply here
+for _, c in pairs(curtain_colors) do
xdecor.register("curtain_"..c, {
description = c:gsub("^%l", string.upper).." Curtain",
walkable = false,
- tiles = {"wool_white.png^[colorize:"..c..":170"},
+ tiles = {"wool_white.png"},
+ color = c,
inventory_image = "wool_white.png^[colorize:"..c..
":170^xdecor_curtain_open_overlay.png^[makealpha:255,126,126",
wield_image = "wool_white.png^[colorize:"..c..":170",
drawtype = "signlike",
- paramtype2 = "wallmounted",
+ paramtype2 = "colorwallmounted",
groups = {dig_immediate=3, flammable=3},
selection_box = {type="wallmounted"},
on_rightclick = function(pos, node, _, itemstack)
@@ -169,10 +191,10 @@ for _, c in pairs({"red"}) do -- Add more curtains colors simply here
})
xdecor.register("curtain_open_"..c, {
- tiles = {"wool_white.png^[colorize:"..c..
- ":170^xdecor_curtain_open_overlay.png^[makealpha:255,126,126"},
+ tiles = {"wool_white.png^xdecor_curtain_open_overlay.png^[makealpha:255,126,126"},
+ color = c,
drawtype = "signlike",
- paramtype2 = "wallmounted",
+ paramtype2 = "colorwallmounted",
walkable = false,
groups = {dig_immediate=3, flammable=3, not_in_creative_inventory=1},
selection_box = {type="wallmounted"},
@@ -415,7 +437,7 @@ register_hard_node("moonbrick", "Moon Brick")
register_hard_node("stone_tile", "Stone Tile")
register_hard_node("stone_rune", "Runestone")
register_hard_node("packed_ice", "Packed Ice", {
- groups = {cracky=1, puts_out_fire=1},
+ groups = {cracky=1, puts_out_fire=1, slippery=3},
sounds = default.node_sound_glass_defaults()
})
register_hard_node("wood_tile", "Wooden Tile", {
diff --git a/src/recipes.lua b/src/recipes.lua
index 18923e1505689bd0d2f401bdd9cd3aeab0f89734..79ca17867102189cea84342a4f296f42f4c04a6c 100644
--- a/src/recipes.lua
+++ b/src/recipes.lua
@@ -16,14 +16,6 @@ minetest.register_craft({
}
})
-minetest.register_craft({
- output = "xdecor:bowl 3",
- recipe = {
- {"group:wood", "", "group:wood"},
- {"", "group:wood", ""}
- }
-})
-
minetest.register_craft({
output = "xdecor:candle",
recipe = {
@@ -54,23 +46,6 @@ minetest.register_craft({
}
})
-minetest.register_craft({
- output = "xdecor:cauldron_empty",
- recipe = {
- {"default:iron_lump", "", "default:iron_lump"},
- {"default:iron_lump", "", "default:iron_lump"},
- {"default:iron_lump", "default:iron_lump", "default:iron_lump"}
- }
-})
-
-minetest.register_craft({
- output = "realchess:chessboard",
- recipe = {
- {"dye:black", "dye:white", "dye:black"},
- {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood"}
- }
-})
-
minetest.register_craft({
output = "xdecor:chair",
recipe = {
@@ -172,15 +147,6 @@ minetest.register_craft({
}
})
-minetest.register_craft({
- output = "xdecor:hive",
- recipe = {
- {"group:stick", "group:stick", "group:stick"},
- {"default:paper", "default:paper", "default:paper"},
- {"group:stick", "group:stick", "group:stick"}
- }
-})
-
minetest.register_craft({
output = "xdecor:iron_lightbox",
recipe = {
@@ -207,23 +173,6 @@ minetest.register_craft({
}
})
-minetest.register_craft({
- output = "xdecor:lever_off",
- recipe = {
- {"group:stick"},
- {"group:stone"}
- }
-})
-
-minetest.register_craft({
- output = "xdecor:mailbox",
- recipe = {
- {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
- {"dye:red", "default:paper", "dye:red"},
- {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}
- }
-})
-
minetest.register_craft({
output = "xdecor:moonbrick",
recipe = {
@@ -256,27 +205,6 @@ minetest.register_craft({
}
})
---minetest.register_craft({
--- output = "xdecor:pressure_stone_off",
--- type = "shapeless",
--- recipe = {"group:stone", "group:stone"}
---})
-
---minetest.register_craft({
--- output = "xdecor:pressure_wood_off",
--- type = "shapeless",
--- recipe = {"group:wood", "group:wood"}
---})
-
-minetest.register_craft({
- output = "xdecor:rope",
- recipe = {
- {"farming:string"},
- {"farming:string"},
- {"farming:string"}
- }
-})
-
minetest.register_craft({
output = "xdecor:stone_tile 2",
recipe = {
diff --git a/src/rope.lua b/src/rope.lua
index 1627fd8133982522421a36460bb1f758b00b645c..b6d945291e66dd59087e82658ce048a272c5f2e8 100644
--- a/src/rope.lua
+++ b/src/rope.lua
@@ -55,3 +55,14 @@ xdecor.register("rope", {
end
end
})
+
+-- Recipes
+
+minetest.register_craft({
+ output = "xdecor:rope",
+ recipe = {
+ {"farming:string"},
+ {"farming:string"},
+ {"farming:string"}
+ }
+})
\ No newline at end of file
diff --git a/src/workbench.lua b/src/workbench.lua
index fd953d3a6faf931b58a920f74a9508cbed04255a..b2a1fb5d910df4ef5f7da4191f97667dce2bee29 100644
--- a/src/workbench.lua
+++ b/src/workbench.lua
@@ -8,23 +8,7 @@ local registered_nodes = minetest.registered_nodes
-- Only the regular, solid blocks without metas or explosivity can be cut
local nodes = {}
for node, def in pairs(registered_nodes) do
- if (def.drawtype == "normal" or def.drawtype:sub(1,5) == "glass") and
- (def.groups.cracky or def.groups.choppy) and
- not def.on_construct and
- not def.after_place_node and
- not def.on_rightclick and
- not def.on_blast and
- not def.allow_metadata_inventory_take and
- not (def.groups.not_in_creative_inventory == 1) and
- not (def.groups.not_cuttable == 1) and
- --not def.groups.wool and
- (def.tiles and type(def.tiles[1]) == "string" and not
- def.tiles[1]:find("default_mineral")) and
- not def.mesecons and
- def.description and
- def.description ~= "" and
- def.light_source == 0
- then
+ if xdecor.stairs_valid_def(def) then
nodes[#nodes+1] = node
end
end
@@ -86,6 +70,7 @@ function workbench:get_output(inv, input, name)
item = nbox[3] and item or "stairs:"..nbox[1].."_"..name:match(":(.*)")
output[#output+1] = item.." "..count
end
+
inv:set_list("forms", output)
end
@@ -150,9 +135,11 @@ end
function workbench.fields(pos, _, fields)
if fields.quit then return end
local meta = minetest.get_meta(pos)
- workbench:set_formspec(meta, fields.back and 1 or
- fields.craft and 2 or
- fields.storage and 3)
+ local id = fields.back and 1 or
+ fields.craft and 2 or
+ fields.storage and 3
+ if not id then return end
+ workbench:set_formspec(meta, id)
end
function workbench.dig(pos)
@@ -215,7 +202,7 @@ function workbench.on_take(pos, listname, index, stack, player)
local stackname = stack:get_name()
if listname == "input" then
- if stackname == inputname then
+ if stackname == inputname and registered_nodes[inputname.."_cube"] then
workbench:get_output(inv, input, stackname)
else
inv:set_list("forms", {})
@@ -301,3 +288,22 @@ for i=1, #nodes do
end
end
end
+
+-- Craft items
+
+minetest.register_tool("xdecor:hammer", {
+ description = "Hammer",
+ inventory_image = "xdecor_hammer.png",
+ wield_image = "xdecor_hammer.png",
+ on_use = function() do return end end
+})
+
+-- Recipes
+--[[
+minetest.register_craft({
+ output = "xdecor:hammer",
+ recipe = {
+ {"default:steel_ingot", "group:stick", "default:steel_ingot"},
+ {"", "group:stick", ""}
+ }
+})]]
diff --git a/textures/bg_btn.png b/textures/bg_btn.png
index 990a788415948c7558847c102e4de262ff256c17..5815572042d0dd1c9b83bb05d05c796129705210 100644
Binary files a/textures/bg_btn.png and b/textures/bg_btn.png differ
diff --git a/textures/bishop_black.png b/textures/bishop_black.png
index b9d0670f9754bfa39060a363bc41a4cb8c3743b8..388a622e812243d5c10b877cde9eb4f9084f474b 100644
Binary files a/textures/bishop_black.png and b/textures/bishop_black.png differ
diff --git a/textures/bishop_white.png b/textures/bishop_white.png
index c474e7edcfcf288d1a2f0e2dfc10d71f0ef8c420..2819a58679cc84cdf41f47389336dea07431bd8e 100644
Binary files a/textures/bishop_white.png and b/textures/bishop_white.png differ
diff --git a/textures/chess_bg.png b/textures/chess_bg.png
index fe9374513908841ce63077420b39153b6e060302..41ee603d2ea813dd31f85053a16f0db1e0235c4c 100644
Binary files a/textures/chess_bg.png and b/textures/chess_bg.png differ
diff --git a/textures/chessboard_sides.png b/textures/chessboard_sides.png
index bb6e8efb2de192a352ed84a5ce2b3af0c0cc8d12..1498b1db3066ffd01b84a188ee4d7da21ddd302c 100644
Binary files a/textures/chessboard_sides.png and b/textures/chessboard_sides.png differ
diff --git a/textures/chessboard_top.png b/textures/chessboard_top.png
index 9dcbf5de8c2af5d23855e32e80d6d794eed9e9c4..d6db0513ccad3c0da6144118dbe01b8019445376 100644
Binary files a/textures/chessboard_top.png and b/textures/chessboard_top.png differ
diff --git a/textures/ench_ui.png b/textures/ench_ui.png
index a67291db161fb46f1f58f0fe9480f97b81dbb003..8a2f4a008f27cb4bb1427d06ec056dbc7b3e3b37 100644
Binary files a/textures/ench_ui.png and b/textures/ench_ui.png differ
diff --git a/textures/hammer_layout.png b/textures/hammer_layout.png
index ec888ff6297a9041cd223700964db4014a718bc7..355ceabfbafb32c498a14c6e017f200dcd9db399 100644
Binary files a/textures/hammer_layout.png and b/textures/hammer_layout.png differ
diff --git a/textures/hive_bee.png b/textures/hive_bee.png
index da674145e2e12aa2af36c327d37f61cf36dd4c2b..e221f1f27d49646ce469597517bc4a263857cc86 100644
Binary files a/textures/hive_bee.png and b/textures/hive_bee.png differ
diff --git a/textures/hive_layout.png b/textures/hive_layout.png
index 95b5d2d0bb9f3fbffa0a73d1dad020f2ce8d0165..27794f42db7b05f7013efacb1dd1560d0de8df3c 100644
Binary files a/textures/hive_layout.png and b/textures/hive_layout.png differ
diff --git a/textures/king_black.png b/textures/king_black.png
index 7a1c2772a2ea9a22857ce9e9d9cef6034345ddf2..06cfc30c919a6d51715c76b8ab8a834b06b3c187 100644
Binary files a/textures/king_black.png and b/textures/king_black.png differ
diff --git a/textures/king_white.png b/textures/king_white.png
index d0b1aeb89bd564fa93f878dc2fd66631100c68a5..60621c41d2d848bf34649dedc0686987330860e3 100644
Binary files a/textures/king_white.png and b/textures/king_white.png differ
diff --git a/textures/knight_black.png b/textures/knight_black.png
index db229aa012c3d6c0736df6c0f3b803d6145f1f90..44de5f1c4d52500aafe761b503b53c25ef7dda22 100644
Binary files a/textures/knight_black.png and b/textures/knight_black.png differ
diff --git a/textures/knight_white.png b/textures/knight_white.png
index d6c01a1f54da3a62e4090a6190563d0094e1978d..1de460f3be2a916c3f684a85eba26e509e954591 100644
Binary files a/textures/knight_white.png and b/textures/knight_white.png differ
diff --git a/textures/mailbox_blank16.png b/textures/mailbox_blank16.png
index 849e622c21d5ce13642a012f6388f3b71e3684b1..017d4f9383e683b2f47e1f010d25d080dee14c74 100644
Binary files a/textures/mailbox_blank16.png and b/textures/mailbox_blank16.png differ
diff --git a/textures/mese_layout.png b/textures/mese_layout.png
index ef6cfafd915564e558f06ccf2d9d7712e9c96151..154a6bc3a08c4dd3ca157438cb0c0ac1e38e37af 100644
Binary files a/textures/mese_layout.png and b/textures/mese_layout.png differ
diff --git a/textures/pawn_black.png b/textures/pawn_black.png
index 9f6554582d7ab8b2ccef7dd4305341c3d8a6c6a5..7cb5fc85b861c3ec10022f2230413c558feae585 100644
Binary files a/textures/pawn_black.png and b/textures/pawn_black.png differ
diff --git a/textures/pawn_white.png b/textures/pawn_white.png
index 3b35a78e893d1a559bae36d55e7a2071b7f3df38..f7a8dec0edfee969a07386c17f25ba9f5b9f299a 100644
Binary files a/textures/pawn_white.png and b/textures/pawn_white.png differ
diff --git a/textures/queen_black.png b/textures/queen_black.png
index d9a80d610c5e1d97d53af88cc8dbb3cb10aba1a5..d59e312e03799847b0a0f39ce58fed498af79047 100644
Binary files a/textures/queen_black.png and b/textures/queen_black.png differ
diff --git a/textures/queen_white.png b/textures/queen_white.png
index db2947ad6c29495598db75a890e8ab44313ef8a8..d923f058b6ccfe488d082e7483de5596ff50eee8 100644
Binary files a/textures/queen_white.png and b/textures/queen_white.png differ
diff --git a/textures/rook_black.png b/textures/rook_black.png
index c0c5f86c3cbe40f91d1b67caeb38f3380623ab36..fa87141c63940b7c71c2f644bbb8e1d3e61a8e58 100644
Binary files a/textures/rook_black.png and b/textures/rook_black.png differ
diff --git a/textures/rook_white.png b/textures/rook_white.png
index e76ff59019931f92f8e025642d7d06c29dbee993..6703452693ecaabd257cead130f881e38f759bb3 100644
Binary files a/textures/rook_white.png and b/textures/rook_white.png differ
diff --git a/textures/worktable_anvil.png b/textures/worktable_anvil.png
index 4a3021d18ebab624867fc989c40c93cf2bb08f02..afca15ecf032761ce9868087923fdb11c744dcbf 100644
Binary files a/textures/worktable_anvil.png and b/textures/worktable_anvil.png differ
diff --git a/textures/worktable_saw.png b/textures/worktable_saw.png
index 56de7a1ab3cb53e4ffd55814396b9fbbacddbd1d..73246ca82d1ffc8b8e5c445f90f64eb91b2ace36 100644
Binary files a/textures/worktable_saw.png and b/textures/worktable_saw.png differ
diff --git a/textures/xdecor_bamboo_frame.png b/textures/xdecor_bamboo_frame.png
index 37a3bbb31cb38704e9204a8102c9b649c7686110..6a0d863e75dcb25fc97677bb8f6259c875e98ffc 100644
Binary files a/textures/xdecor_bamboo_frame.png and b/textures/xdecor_bamboo_frame.png differ
diff --git a/textures/xdecor_baricade.png b/textures/xdecor_baricade.png
index 76688c4aafa60ba957c9435801308369cc73526c..87109bb5c1523b54869a2b991c0f0b2fa3cdd5f4 100644
Binary files a/textures/xdecor_baricade.png and b/textures/xdecor_baricade.png differ
diff --git a/textures/xdecor_barrel_sides.png b/textures/xdecor_barrel_sides.png
index 49b689c8d5b0e2a9c9abe3d5fbcba77d2bc48527..4172b81fd3a3ebf6ae23495c53b3e8d0151c34c1 100644
Binary files a/textures/xdecor_barrel_sides.png and b/textures/xdecor_barrel_sides.png differ
diff --git a/textures/xdecor_barrel_top.png b/textures/xdecor_barrel_top.png
index 5ce717849eb309b6788df18ac71702afa57af53b..014b00ac9f5834cf8d5ebcc9c4bcf8b02db7dbe4 100644
Binary files a/textures/xdecor_barrel_top.png and b/textures/xdecor_barrel_top.png differ
diff --git a/textures/xdecor_book_open.png b/textures/xdecor_book_open.png
index c6321322744b3a693e118ea4d0e1e7bfbb7d2507..206b11cbef6c72d237398d8b995ded5c2b4f9571 100644
Binary files a/textures/xdecor_book_open.png and b/textures/xdecor_book_open.png differ
diff --git a/textures/xdecor_bowl.png b/textures/xdecor_bowl.png
index 02aa990327a34662ca352f0b6483ebe44426dabe..9197da9726753b80d8a24340f35c988567202be6 100644
Binary files a/textures/xdecor_bowl.png and b/textures/xdecor_bowl.png differ
diff --git a/textures/xdecor_bowl_soup.png b/textures/xdecor_bowl_soup.png
index 57ed76376d28618e93c5feead1f4d49c0ed56ec6..54d87ae07df66a2c8696a4720a2e8770c5cef279 100644
Binary files a/textures/xdecor_bowl_soup.png and b/textures/xdecor_bowl_soup.png differ
diff --git a/textures/xdecor_cabinet_front.png b/textures/xdecor_cabinet_front.png
index dedc4ea56427025f0dbf6bf6f1dbacae9d1fe76b..638096801e2facf222270e03698a46f030a1ef40 100644
Binary files a/textures/xdecor_cabinet_front.png and b/textures/xdecor_cabinet_front.png differ
diff --git a/textures/xdecor_cabinet_sides.png b/textures/xdecor_cabinet_sides.png
index 2cb0538ba5e681b35203eb2ef8ef38a7c6f3c5de..32ab2579eac5afa625c23941f8877aa2ada3e683 100644
Binary files a/textures/xdecor_cabinet_sides.png and b/textures/xdecor_cabinet_sides.png differ
diff --git a/textures/xdecor_cactusbrick.png b/textures/xdecor_cactusbrick.png
index 92ebfb5efd841f311a49278d8cbf5e427c46ab2a..4856f09a0332a5cdc4db575ee6052c8618cfc95e 100644
Binary files a/textures/xdecor_cactusbrick.png and b/textures/xdecor_cactusbrick.png differ
diff --git a/textures/xdecor_candle_floor.png b/textures/xdecor_candle_floor.png
index aea8cee48c4f8003bae600fa5268f71b2096d40a..c1bc4e3f5eeb8f6702c65e95215a8ab15f66b3f8 100644
Binary files a/textures/xdecor_candle_floor.png and b/textures/xdecor_candle_floor.png differ
diff --git a/textures/xdecor_candle_inv.png b/textures/xdecor_candle_inv.png
index 22e998f2aa174fdfc171fba024fd80c1150380a4..90a479e1150176c73fb5f45a5ecdbedfaed3f626 100644
Binary files a/textures/xdecor_candle_inv.png and b/textures/xdecor_candle_inv.png differ
diff --git a/textures/xdecor_candle_wall.png b/textures/xdecor_candle_wall.png
index 8ed8d953d3f28e81c1b989d3d26c58f4a1b34377..b8a4b50268801bbba92ed148ad292f9d518ff2e1 100644
Binary files a/textures/xdecor_candle_wall.png and b/textures/xdecor_candle_wall.png differ
diff --git a/textures/xdecor_candle_wield.png b/textures/xdecor_candle_wield.png
index f923fa4bb4649de9cd9bd14366737c934c2f0685..60bdeded5c52475ce5a11ba99ac2b89be8eb3c8d 100644
Binary files a/textures/xdecor_candle_wield.png and b/textures/xdecor_candle_wield.png differ
diff --git a/textures/xdecor_cauldron_sides.png b/textures/xdecor_cauldron_sides.png
index 21f0e5ebf76f4fdb9ef68c1a77b8f16a2662d1b7..6644edb3194b83229f6ba36915d138cb74841b1f 100644
Binary files a/textures/xdecor_cauldron_sides.png and b/textures/xdecor_cauldron_sides.png differ
diff --git a/textures/xdecor_cauldron_top_anim_boiling_water.png b/textures/xdecor_cauldron_top_anim_boiling_water.png
index 7b2f37bb07990d12a1f95491d71cf478e787e7aa..48584d5f857fc071a5eb786f24b932dc4c8271ee 100644
Binary files a/textures/xdecor_cauldron_top_anim_boiling_water.png and b/textures/xdecor_cauldron_top_anim_boiling_water.png differ
diff --git a/textures/xdecor_cauldron_top_anim_soup.png b/textures/xdecor_cauldron_top_anim_soup.png
index a224fe6488981de14e7040d42a2f843526fe9c25..f6d5258cca94f0ce6e7972cee8739b85b1aeb1fc 100644
Binary files a/textures/xdecor_cauldron_top_anim_soup.png and b/textures/xdecor_cauldron_top_anim_soup.png differ
diff --git a/textures/xdecor_cauldron_top_empty.png b/textures/xdecor_cauldron_top_empty.png
index c0dc495c301b876ed790e32beae52d1c26e8ac6e..5cdf5fdd3fe280eeb1731e4db5e05328b53eadd0 100644
Binary files a/textures/xdecor_cauldron_top_empty.png and b/textures/xdecor_cauldron_top_empty.png differ
diff --git a/textures/xdecor_cauldron_top_idle.png b/textures/xdecor_cauldron_top_idle.png
index d8315e8e9769da853a13466ed5d3e2dbf45e2859..69ec2ab0024f082defefe05b9c7a6521f476c4f9 100644
Binary files a/textures/xdecor_cauldron_top_idle.png and b/textures/xdecor_cauldron_top_idle.png differ
diff --git a/textures/xdecor_chainlink.png b/textures/xdecor_chainlink.png
index 85fab4ef25c35aff39c9a167b46169bf88fdb303..1aba3c09e919d36b6083e91217747dda94d16e64 100644
Binary files a/textures/xdecor_chainlink.png and b/textures/xdecor_chainlink.png differ
diff --git a/textures/xdecor_coalstone_tile.png b/textures/xdecor_coalstone_tile.png
index 79a9a24072c0f83f0b59e8a63cae7cd8089d9ea5..3122db0d8c1642e4251366a4d4bdd3d0a8425382 100644
Binary files a/textures/xdecor_coalstone_tile.png and b/textures/xdecor_coalstone_tile.png differ
diff --git a/textures/xdecor_cobweb.png b/textures/xdecor_cobweb.png
index c67cf300ae06b7123eb313e8851c8b95814fea38..bb1eceaf7dce0e5786745a260e37b7bf5b3403d9 100644
Binary files a/textures/xdecor_cobweb.png and b/textures/xdecor_cobweb.png differ
diff --git a/textures/xdecor_curtain_open_overlay.png b/textures/xdecor_curtain_open_overlay.png
index 1f9dc0f781e2ce3a2e7373068f061f58c8ba627b..e6eea416fea51e6ff20fb5221f060b3263699e3d 100644
Binary files a/textures/xdecor_curtain_open_overlay.png and b/textures/xdecor_curtain_open_overlay.png differ
diff --git a/textures/xdecor_cushion.png b/textures/xdecor_cushion.png
index 272d6271141f5dd244a9083d80c995b500a0b41b..ad4674c4ede176496a352cabea5721c32f99939f 100644
Binary files a/textures/xdecor_cushion.png and b/textures/xdecor_cushion.png differ
diff --git a/textures/xdecor_dandelion_white_pot.png b/textures/xdecor_dandelion_white_pot.png
index 9f21a84b1359360406fb1761198163e7da80341f..ccb91ee59be152a0c6cf404746068bb093a422f0 100644
Binary files a/textures/xdecor_dandelion_white_pot.png and b/textures/xdecor_dandelion_white_pot.png differ
diff --git a/textures/xdecor_dandelion_yellow_pot.png b/textures/xdecor_dandelion_yellow_pot.png
index 847b210773edfe86a6dd24837c4a1b54d484051c..f3034750cff90f2ba47b3feb0c87751c73bc41c6 100644
Binary files a/textures/xdecor_dandelion_yellow_pot.png and b/textures/xdecor_dandelion_yellow_pot.png differ
diff --git a/textures/xdecor_desertstone_tile.png b/textures/xdecor_desertstone_tile.png
index 39a5bcc33197f6b66eb03eea3f36ebe3c44c080f..094437fc0165fb5fa51a90b884d2ffc524e0285e 100644
Binary files a/textures/xdecor_desertstone_tile.png and b/textures/xdecor_desertstone_tile.png differ
diff --git a/textures/xdecor_empty_shelf.png b/textures/xdecor_empty_shelf.png
index 98398967b48ee624dbf25fbf54d643e13c6432a9..a8363c0f49cd01de7eb3b8a2fd3ec657e95738de 100644
Binary files a/textures/xdecor_empty_shelf.png and b/textures/xdecor_empty_shelf.png differ
diff --git a/textures/xdecor_enchantment_bottom.png b/textures/xdecor_enchantment_bottom.png
index b83ec332a50bc1ce9bf605ecaf8897a68d6211b5..65a86393293bb9c2927af0f6e99f70541e42da7c 100644
Binary files a/textures/xdecor_enchantment_bottom.png and b/textures/xdecor_enchantment_bottom.png differ
diff --git a/textures/xdecor_enchantment_side.png b/textures/xdecor_enchantment_side.png
index 39fae6bbab7e27308396deeece8b937119c7657b..9bbd5a2525339813efb73bc5df0546d974990985 100644
Binary files a/textures/xdecor_enchantment_side.png and b/textures/xdecor_enchantment_side.png differ
diff --git a/textures/xdecor_enchantment_top.png b/textures/xdecor_enchantment_top.png
index 6b67af869d44d537c0bf07e1c3783f74f843f62c..cc79b353ae7584b651c27113194906243aa24705 100644
Binary files a/textures/xdecor_enchantment_top.png and b/textures/xdecor_enchantment_top.png differ
diff --git a/textures/xdecor_enderchest_front.png b/textures/xdecor_enderchest_front.png
index f41a228a11cd5ab0dbc205cceb5d1371dcf688ab..e7286ce621053a1792a4712302cec12695c73aaf 100644
Binary files a/textures/xdecor_enderchest_front.png and b/textures/xdecor_enderchest_front.png differ
diff --git a/textures/xdecor_enderchest_side.png b/textures/xdecor_enderchest_side.png
index f43322592c3ec7faad64f62a680241453e92f7ff..4691247686ccbf737d14ae26f74085da1a34a324 100644
Binary files a/textures/xdecor_enderchest_side.png and b/textures/xdecor_enderchest_side.png differ
diff --git a/textures/xdecor_enderchest_top.png b/textures/xdecor_enderchest_top.png
index ea0638a1bd902b6e2f53d01c85ec400ee44d8495..1f6676cee5413e128063ca98eb6960d53cd183d3 100644
Binary files a/textures/xdecor_enderchest_top.png and b/textures/xdecor_enderchest_top.png differ
diff --git a/textures/xdecor_geranium_pot.png b/textures/xdecor_geranium_pot.png
index 696ea48344fceee715257fc50408bfdbebeaffc2..0a68204cc20c7f3a98a5c01a6d0666e28c469d11 100644
Binary files a/textures/xdecor_geranium_pot.png and b/textures/xdecor_geranium_pot.png differ
diff --git a/textures/xdecor_glyph1.png b/textures/xdecor_glyph1.png
index a5ac3f553eac90a663283dbbd7071ba4e2296426..645abacde438723dcbb330dbf1453b291afb84ac 100644
Binary files a/textures/xdecor_glyph1.png and b/textures/xdecor_glyph1.png differ
diff --git a/textures/xdecor_glyph10.png b/textures/xdecor_glyph10.png
index d002147f50c9623f1e7db05d3d933a475f0e2c8a..06bd07432b6d871322a1479f2e6c27d48a2b4169 100644
Binary files a/textures/xdecor_glyph10.png and b/textures/xdecor_glyph10.png differ
diff --git a/textures/xdecor_glyph11.png b/textures/xdecor_glyph11.png
index c9cd9ff5cca8445e032e15f37902c225867a0b23..532d25c41f541e99c4d6e49511f3d01470d8b8bd 100644
Binary files a/textures/xdecor_glyph11.png and b/textures/xdecor_glyph11.png differ
diff --git a/textures/xdecor_glyph12.png b/textures/xdecor_glyph12.png
index dc5dd1d2020d45f601c6c35d85d3544f1c545eda..1f6be218becbec9e5963087a8d63e053c6b007a6 100644
Binary files a/textures/xdecor_glyph12.png and b/textures/xdecor_glyph12.png differ
diff --git a/textures/xdecor_glyph13.png b/textures/xdecor_glyph13.png
index 45c6d5a638c7400da787ccb7fd9a6e35b940879d..4678f7f1c0f35a7c9d719e57f730202c683672c7 100644
Binary files a/textures/xdecor_glyph13.png and b/textures/xdecor_glyph13.png differ
diff --git a/textures/xdecor_glyph14.png b/textures/xdecor_glyph14.png
index 68623878a089023b3da3a4fa6f2e27d51190cccd..bf095bbf489ca0ae608c6a22e6774408aa1f02cd 100644
Binary files a/textures/xdecor_glyph14.png and b/textures/xdecor_glyph14.png differ
diff --git a/textures/xdecor_glyph15.png b/textures/xdecor_glyph15.png
index 0db3a9ea2739d4e4e685eab827b48de850773799..27199bb213ea60559251e492c24f7cb8339259d4 100644
Binary files a/textures/xdecor_glyph15.png and b/textures/xdecor_glyph15.png differ
diff --git a/textures/xdecor_glyph16.png b/textures/xdecor_glyph16.png
index e62062cc5e594bd8ba7d3396e871464edce49691..27e18072878bd135e73f124ce3b843123ab71e44 100644
Binary files a/textures/xdecor_glyph16.png and b/textures/xdecor_glyph16.png differ
diff --git a/textures/xdecor_glyph17.png b/textures/xdecor_glyph17.png
index 2b374e881679f09485473f69066efd0522e7986e..7ed2bd43be8df8f2a152ffa2efde8314ad731ea2 100644
Binary files a/textures/xdecor_glyph17.png and b/textures/xdecor_glyph17.png differ
diff --git a/textures/xdecor_glyph18.png b/textures/xdecor_glyph18.png
index e762e350b826875d96c2f909fd36fd9d1dc94e6c..f03b73a6a079945e3cf3001d5f85a3ea71721339 100644
Binary files a/textures/xdecor_glyph18.png and b/textures/xdecor_glyph18.png differ
diff --git a/textures/xdecor_glyph2.png b/textures/xdecor_glyph2.png
index eb1e74fbcb8e6fca93aaf269e1d5cefa7672a43e..81b20619664acc9b2a13d32a2d5ddd290962b038 100644
Binary files a/textures/xdecor_glyph2.png and b/textures/xdecor_glyph2.png differ
diff --git a/textures/xdecor_glyph3.png b/textures/xdecor_glyph3.png
index e82145e5c27dfbe25ae08937e6d8534a88b4a4f6..24b8cf40f541d9d3f76dc2d7caa5b8f021abf075 100644
Binary files a/textures/xdecor_glyph3.png and b/textures/xdecor_glyph3.png differ
diff --git a/textures/xdecor_glyph4.png b/textures/xdecor_glyph4.png
index e93f2383071de536b4692bf350c7b4ff49118968..dc1909b6a337f47aa43e81c2f861a3da3c4c5ad3 100644
Binary files a/textures/xdecor_glyph4.png and b/textures/xdecor_glyph4.png differ
diff --git a/textures/xdecor_glyph5.png b/textures/xdecor_glyph5.png
index 49f92ff620584ee655561d99dc4ef769d60610a3..1473ea41d1809a857b372bd402053a51f0c1e740 100644
Binary files a/textures/xdecor_glyph5.png and b/textures/xdecor_glyph5.png differ
diff --git a/textures/xdecor_glyph6.png b/textures/xdecor_glyph6.png
index c93976cfba6fd5ce800ea5a08a0b0cd39daeddfc..45c0c9a64bf56d873d97fc7fc84712e5e52a160f 100644
Binary files a/textures/xdecor_glyph6.png and b/textures/xdecor_glyph6.png differ
diff --git a/textures/xdecor_glyph7.png b/textures/xdecor_glyph7.png
index 1e4ff024898eb70b7e3d7ee370ee36ad456f7e53..57086232e76c0e04fb7f59f471d85d1f2c26f23b 100644
Binary files a/textures/xdecor_glyph7.png and b/textures/xdecor_glyph7.png differ
diff --git a/textures/xdecor_glyph8.png b/textures/xdecor_glyph8.png
index 2f2b86c16525bd26662ac61021db2bb0fb7d7656..c5ae1c3b7b5f8a39756eadff3767f188d6b27eb5 100644
Binary files a/textures/xdecor_glyph8.png and b/textures/xdecor_glyph8.png differ
diff --git a/textures/xdecor_glyph9.png b/textures/xdecor_glyph9.png
index 4b3e366d97b6dfae280e7fd05f2a269855300305..148b03d0b3b190fe3b368c83cad65bf176976293 100644
Binary files a/textures/xdecor_glyph9.png and b/textures/xdecor_glyph9.png differ
diff --git a/textures/xdecor_half_cabinet_front.png b/textures/xdecor_half_cabinet_front.png
index e866a9b52d0db6e36cad8a5df0c89bbdc4c52f5e..ea9c38926ac3d12b3a6c3724aa0778e88813cd1f 100644
Binary files a/textures/xdecor_half_cabinet_front.png and b/textures/xdecor_half_cabinet_front.png differ
diff --git a/textures/xdecor_half_cabinet_sides.png b/textures/xdecor_half_cabinet_sides.png
index 701cc47acae632e6d1f0bad7065bf283e2e55a03..6f274b8bc75745a6953c9701c461411c2c076e26 100644
Binary files a/textures/xdecor_half_cabinet_sides.png and b/textures/xdecor_half_cabinet_sides.png differ
diff --git a/textures/xdecor_hammer.png b/textures/xdecor_hammer.png
index f80fcef21264e895f0b4e2bd832171262d4c977d..17b98561eadc7d3252961755d1ddd8555b6c7487 100644
Binary files a/textures/xdecor_hammer.png and b/textures/xdecor_hammer.png differ
diff --git a/textures/xdecor_hard_clay.png b/textures/xdecor_hard_clay.png
index 89c2b23e86c7cd33a433e350b0a8edd57e7c6b66..8abe6666db3808fadb28d80dd8b6428c6f911a44 100644
Binary files a/textures/xdecor_hard_clay.png and b/textures/xdecor_hard_clay.png differ
diff --git a/textures/xdecor_hive_front.png b/textures/xdecor_hive_front.png
index a00cd92d763d491823e8629ddafbf53eddff826e..451555152f96e83dcc5e1031493da61bb1837b19 100644
Binary files a/textures/xdecor_hive_front.png and b/textures/xdecor_hive_front.png differ
diff --git a/textures/xdecor_hive_side.png b/textures/xdecor_hive_side.png
index f84961250114ec006c64f1ca19095df975031166..7fd26ad725d9af6ff69787a237c93986a4a684e8 100644
Binary files a/textures/xdecor_hive_side.png and b/textures/xdecor_hive_side.png differ
diff --git a/textures/xdecor_hive_top.png b/textures/xdecor_hive_top.png
index 8654c4b95a7e61438328e8f1604bbfaa84bfb2e3..43203e14a3b75657648f30299525b82039852d00 100644
Binary files a/textures/xdecor_hive_top.png and b/textures/xdecor_hive_top.png differ
diff --git a/textures/xdecor_honey.png b/textures/xdecor_honey.png
index 4e8bb3bfbdc9d3c4f08b014aebb4c485b7b369fb..04c404cb0abb56c4133af00a05988d9db13aaa98 100644
Binary files a/textures/xdecor_honey.png and b/textures/xdecor_honey.png differ
diff --git a/textures/xdecor_iron_lightbox.png b/textures/xdecor_iron_lightbox.png
index 90d5f3b221533811f70dd955d03e930369378927..45146f9375e747fd3071b8618c59acc73d9026db 100644
Binary files a/textures/xdecor_iron_lightbox.png and b/textures/xdecor_iron_lightbox.png differ
diff --git a/textures/xdecor_itemframe.png b/textures/xdecor_itemframe.png
index 526c95af7a9400af66a2dc8bb8451c1167316527..088ba152950ee0957f06f8e97c2da36573e614f6 100644
Binary files a/textures/xdecor_itemframe.png and b/textures/xdecor_itemframe.png differ
diff --git a/textures/xdecor_ivy.png b/textures/xdecor_ivy.png
index 02162a34a091da8327110e94a4f704ff236ea63a..b85e112fa695a510dcd182f8c7c704c5695486ab 100644
Binary files a/textures/xdecor_ivy.png and b/textures/xdecor_ivy.png differ
diff --git a/textures/xdecor_japanese_door.png b/textures/xdecor_japanese_door.png
index e9f9fdfed0bd947164beb90f6d6e229bb50c20ff..35f77ec791746fb5d009da77ee0d0e3695a15097 100644
Binary files a/textures/xdecor_japanese_door.png and b/textures/xdecor_japanese_door.png differ
diff --git a/textures/xdecor_japanese_door_inv.png b/textures/xdecor_japanese_door_inv.png
index bda0137bf3a842442e318dbb85fb90b7010e0e65..4d3ec649712d84415586f426f42d3e38d551c89e 100644
Binary files a/textures/xdecor_japanese_door_inv.png and b/textures/xdecor_japanese_door_inv.png differ
diff --git a/textures/xdecor_lantern.png b/textures/xdecor_lantern.png
index 6771758076792d9e0145dc712eb003bf13cda7ff..18c9ce2ff824e0e0b665b5069c33d805e77fc990 100644
Binary files a/textures/xdecor_lantern.png and b/textures/xdecor_lantern.png differ
diff --git a/textures/xdecor_lantern_inv.png b/textures/xdecor_lantern_inv.png
index ea6610180956d0568b397687648519dce8e732dd..71cef66d43c3ce58f6e3a338f4bf5a9eb0785c79 100644
Binary files a/textures/xdecor_lantern_inv.png and b/textures/xdecor_lantern_inv.png differ
diff --git a/textures/xdecor_lever_off.png b/textures/xdecor_lever_off.png
index 34870201fd3ff1893abb298de02a5ee63114d133..6d8bb493ff20cbbef6e7e0f4f543c60c5379503a 100644
Binary files a/textures/xdecor_lever_off.png and b/textures/xdecor_lever_off.png differ
diff --git a/textures/xdecor_lever_on.png b/textures/xdecor_lever_on.png
index 86870bdf2301c60ec6692cd81d679f14d5ca4913..c64d27f56e66839462abe49b47e8037c7b5789f4 100644
Binary files a/textures/xdecor_lever_on.png and b/textures/xdecor_lever_on.png differ
diff --git a/textures/xdecor_mailbox.png b/textures/xdecor_mailbox.png
index f94cc36e708b960a419efcd0025b289e7e8926f0..82898840a7d1fed16d85c9a02333fb126549357f 100644
Binary files a/textures/xdecor_mailbox.png and b/textures/xdecor_mailbox.png differ
diff --git a/textures/xdecor_mailbox_bottom.png b/textures/xdecor_mailbox_bottom.png
index 7b879d9418d81c64c33cd6a9a7f24dcffd02b01a..b613863aa7d9e9be30a5b269ecf967795f9d750a 100644
Binary files a/textures/xdecor_mailbox_bottom.png and b/textures/xdecor_mailbox_bottom.png differ
diff --git a/textures/xdecor_mailbox_side.png b/textures/xdecor_mailbox_side.png
index 61df62b67094e80b3a5421ce8ed801fe5d59d5e0..44b2a2f60b75659ff576b943e71ae4710794606d 100644
Binary files a/textures/xdecor_mailbox_side.png and b/textures/xdecor_mailbox_side.png differ
diff --git a/textures/xdecor_mailbox_top.png b/textures/xdecor_mailbox_top.png
index 2b54fb1280689822c7da98a0fbacf5710963d0f2..3584c53b8017f186a01a08ab99f631f1340dea20 100644
Binary files a/textures/xdecor_mailbox_top.png and b/textures/xdecor_mailbox_top.png differ
diff --git a/textures/xdecor_moonbrick.png b/textures/xdecor_moonbrick.png
index 6e4f1355ffb944d6e41da6c2b753dad9dab18548..efdac14c6362313779d37f547c279cd1296f610c 100644
Binary files a/textures/xdecor_moonbrick.png and b/textures/xdecor_moonbrick.png differ
diff --git a/textures/xdecor_multishelf.png b/textures/xdecor_multishelf.png
index 1c6c43f0381206b96d9a6c1e6d002aec05dd2a18..0a5e10e42bc40fd9ad2e82b73c8a1854f647296b 100644
Binary files a/textures/xdecor_multishelf.png and b/textures/xdecor_multishelf.png differ
diff --git a/textures/xdecor_packed_ice.png b/textures/xdecor_packed_ice.png
index 762103f045b4223b1996b1c1d59692e634e7bca5..8c44eafd185a5b598288cbd064c605bbca839c77 100644
Binary files a/textures/xdecor_packed_ice.png and b/textures/xdecor_packed_ice.png differ
diff --git a/textures/xdecor_painting_1.png b/textures/xdecor_painting_1.png
index 6ba2cb694186e9ac86c882e1292429b28ae456c0..7609c2b5033a518df7ce745e4e124ad607c06476 100644
Binary files a/textures/xdecor_painting_1.png and b/textures/xdecor_painting_1.png differ
diff --git a/textures/xdecor_painting_2.png b/textures/xdecor_painting_2.png
index 9646ce55c6eab417253063d6800de9b0d8d2213a..8a9cf4a521c828c52256075eddbcd829e6b1cd40 100644
Binary files a/textures/xdecor_painting_2.png and b/textures/xdecor_painting_2.png differ
diff --git a/textures/xdecor_painting_3.png b/textures/xdecor_painting_3.png
index f3343db343efb71a0f2cdfaabaa0085359925877..d094d3d00f8c3365a88684753ba3c2c4b0160758 100644
Binary files a/textures/xdecor_painting_3.png and b/textures/xdecor_painting_3.png differ
diff --git a/textures/xdecor_painting_4.png b/textures/xdecor_painting_4.png
index bced6c4ed0eba217b2bcb62de2ac575c091b32e9..5ccb14192930df339414a25bac2105cd04cc8cbc 100644
Binary files a/textures/xdecor_painting_4.png and b/textures/xdecor_painting_4.png differ
diff --git a/textures/xdecor_painting_empty.png b/textures/xdecor_painting_empty.png
index 39ca15af52e6e92d5b422e60bb640d52dc353b2f..216429a42f6bd36bf6b160ae4e1fcc0589cb74e0 100644
Binary files a/textures/xdecor_painting_empty.png and b/textures/xdecor_painting_empty.png differ
diff --git a/textures/xdecor_pressure_stone.png b/textures/xdecor_pressure_stone.png
index 4d2c0eceeb088a7bd45c5989fc03f757d4eb647f..faf3ae0eb5a7e06baf73ca77add40cfc67251cc1 100644
Binary files a/textures/xdecor_pressure_stone.png and b/textures/xdecor_pressure_stone.png differ
diff --git a/textures/xdecor_pressure_wood.png b/textures/xdecor_pressure_wood.png
index deca4b67d9e0b0d0e8af5a249af92bcf2a55d8e2..504113a9311de34d5f92f2b1af59e83f20a47563 100644
Binary files a/textures/xdecor_pressure_wood.png and b/textures/xdecor_pressure_wood.png differ
diff --git a/textures/xdecor_prison_door.png b/textures/xdecor_prison_door.png
index 90cdf14ebf4c32e6a86930af48f5a52534d675d8..2f7e66f1f291a29b3c87d25c0fa0e54d9df94ff6 100644
Binary files a/textures/xdecor_prison_door.png and b/textures/xdecor_prison_door.png differ
diff --git a/textures/xdecor_prison_door_inv.png b/textures/xdecor_prison_door_inv.png
index 1828c2461b9d3a12edc123968bfff1ff3a664581..0751caf1ded75290470c45fb2de131e0dfe2dde7 100644
Binary files a/textures/xdecor_prison_door_inv.png and b/textures/xdecor_prison_door_inv.png differ
diff --git a/textures/xdecor_rope.png b/textures/xdecor_rope.png
index f55bae95075a495b42bcd9be7a6df34630ead7b7..bcfaba26547e2dca72a13d4aefdcbcb8af759f9b 100644
Binary files a/textures/xdecor_rope.png and b/textures/xdecor_rope.png differ
diff --git a/textures/xdecor_rope_inv.png b/textures/xdecor_rope_inv.png
index 53d8aefff1cf419f382b8779815359cf4f6b650c..51a24a89714ae118d9640247d30b8b658edd4c56 100644
Binary files a/textures/xdecor_rope_inv.png and b/textures/xdecor_rope_inv.png differ
diff --git a/textures/xdecor_rope_wield.png b/textures/xdecor_rope_wield.png
index 1f8105d06726669a6d6b5171c68ee572f7cf8563..3ca8fef3143aaef1e7502362959eca2984545004 100644
Binary files a/textures/xdecor_rope_wield.png and b/textures/xdecor_rope_wield.png differ
diff --git a/textures/xdecor_rose_pot.png b/textures/xdecor_rose_pot.png
index 3d63f53fd9ac58b02f4aa4a33ba9230bca2928f4..12923acf2985b82a5a5b803dbb145ce9dd66cab1 100644
Binary files a/textures/xdecor_rose_pot.png and b/textures/xdecor_rose_pot.png differ
diff --git a/textures/xdecor_rusty_bar.png b/textures/xdecor_rusty_bar.png
index b721a67a894446a5eb3bb5e805b7c45b5fd1159c..d2d5866937c01a91cebaf31aecd7df6af1b46674 100644
Binary files a/textures/xdecor_rusty_bar.png and b/textures/xdecor_rusty_bar.png differ
diff --git a/textures/xdecor_rusty_prison_door.png b/textures/xdecor_rusty_prison_door.png
index 805c006b54c69e3fdd12ba8de12b84b8eecbb300..3b1dd1a5fd1c5281dd9cb8067ad929fb05b9ae8b 100644
Binary files a/textures/xdecor_rusty_prison_door.png and b/textures/xdecor_rusty_prison_door.png differ
diff --git a/textures/xdecor_rusty_prison_door_inv.png b/textures/xdecor_rusty_prison_door_inv.png
index e2431f1551e8ba59de4b95db9f6f30347356a706..486486b25e1eb74182a7a816a67a12e5b391a430 100644
Binary files a/textures/xdecor_rusty_prison_door_inv.png and b/textures/xdecor_rusty_prison_door_inv.png differ
diff --git a/textures/xdecor_screen_door.png b/textures/xdecor_screen_door.png
index 7f7ae732396cd1ce83d367beee4881323200f11b..a00ebb3bf6c917f017f1b4941d53fe22c5b3e11b 100644
Binary files a/textures/xdecor_screen_door.png and b/textures/xdecor_screen_door.png differ
diff --git a/textures/xdecor_screen_door_inv.png b/textures/xdecor_screen_door_inv.png
index 377a97cfc65c36e23037fe65339e77ffc3c33bec..6c9633e1a8bdff055b50360ba1f57b24ba6b9b42 100644
Binary files a/textures/xdecor_screen_door_inv.png and b/textures/xdecor_screen_door_inv.png differ
diff --git a/textures/xdecor_slide_door.png b/textures/xdecor_slide_door.png
index fa9078c087fed95f5ce5e7aa062652c799ceadd0..1810ccddebfe4fc0842c1d75d9154b41b751cedf 100644
Binary files a/textures/xdecor_slide_door.png and b/textures/xdecor_slide_door.png differ
diff --git a/textures/xdecor_slide_door_inv.png b/textures/xdecor_slide_door_inv.png
index 8c3497828cd1e9064b527e3cccc4c69d7bad32d3..4ea2154484c2ef512bd611bd0a315650c628d38f 100644
Binary files a/textures/xdecor_slide_door_inv.png and b/textures/xdecor_slide_door_inv.png differ
diff --git a/textures/xdecor_stone_rune.png b/textures/xdecor_stone_rune.png
index 76e34d296a6b3e3ac99582afda02a775f386e9cc..319a2df6b372cdd7fd30bac868f353c791e01803 100644
Binary files a/textures/xdecor_stone_rune.png and b/textures/xdecor_stone_rune.png differ
diff --git a/textures/xdecor_stone_tile.png b/textures/xdecor_stone_tile.png
index a058cf70661648d5ad4b21bdf16ef8de07df618c..434678374a51f6b8b7b6bb81fddc9745b430a0c9 100644
Binary files a/textures/xdecor_stone_tile.png and b/textures/xdecor_stone_tile.png differ
diff --git a/textures/xdecor_tatami.png b/textures/xdecor_tatami.png
index 53e5c855726276c04764aa03f6d55fb89482a241..e1998f7a846d224cd55b7371800a45ae51f0aefa 100644
Binary files a/textures/xdecor_tatami.png and b/textures/xdecor_tatami.png differ
diff --git a/textures/xdecor_television_back.png b/textures/xdecor_television_back.png
index 3599ad01ba3d9158920e4b07d70f563aa6e58943..761b1c72c8b85dabf6bff04bea32980ce05618e9 100644
Binary files a/textures/xdecor_television_back.png and b/textures/xdecor_television_back.png differ
diff --git a/textures/xdecor_television_front_animated.png b/textures/xdecor_television_front_animated.png
index 49865d860ad893508b92e0881893d1caf2cea969..ae5df4ff736c9b1addba6e5bdf76a0b656624def 100644
Binary files a/textures/xdecor_television_front_animated.png and b/textures/xdecor_television_front_animated.png differ
diff --git a/textures/xdecor_television_left.png b/textures/xdecor_television_left.png
index 177d8c039588de3a549e0f33799d968b768222a0..65444fb83dacce485c86697872cb694a18a572ac 100644
Binary files a/textures/xdecor_television_left.png and b/textures/xdecor_television_left.png differ
diff --git a/textures/xdecor_trampoline.png b/textures/xdecor_trampoline.png
index 9347a60e6ed5409c8ffff6b9fa59629b012feac3..a8536c2185d9f452afac58d4df7548d4142cf0f0 100644
Binary files a/textures/xdecor_trampoline.png and b/textures/xdecor_trampoline.png differ
diff --git a/textures/xdecor_trampoline_sides.png b/textures/xdecor_trampoline_sides.png
index 9df79a58af2e2c5cab5a5c92d196ebe0307cf709..497a86a59329a5f820cfc3cfd1ad02cfefcdf8e7 100644
Binary files a/textures/xdecor_trampoline_sides.png and b/textures/xdecor_trampoline_sides.png differ
diff --git a/textures/xdecor_tulip_pot.png b/textures/xdecor_tulip_pot.png
index 44acdb8a7ee2998cd807d48384fffc43e8df2925..d339ef6d9d3ed2b95ef4718e67991fb1d3fc821f 100644
Binary files a/textures/xdecor_tulip_pot.png and b/textures/xdecor_tulip_pot.png differ
diff --git a/textures/xdecor_viola_pot.png b/textures/xdecor_viola_pot.png
index 95499b525e07a07dc9a7e01755a9a5ef66f1dffd..7549c4ce8c98e7ee25ff3017203b955f38fd9dee 100644
Binary files a/textures/xdecor_viola_pot.png and b/textures/xdecor_viola_pot.png differ
diff --git a/textures/xdecor_wood.png b/textures/xdecor_wood.png
index 2f0023ee6fb122b67234c4e8227f138d3e225eb2..426e5bf741652b96d66e442b097169b18d6c7269 100644
Binary files a/textures/xdecor_wood.png and b/textures/xdecor_wood.png differ
diff --git a/textures/xdecor_wood_frame.png b/textures/xdecor_wood_frame.png
index ebb90aea62dd08addde0bff537f0e98d0bb77fdb..f528f5ada041a74affdbc74408b044cf7495f695 100644
Binary files a/textures/xdecor_wood_frame.png and b/textures/xdecor_wood_frame.png differ
diff --git a/textures/xdecor_wood_tile.png b/textures/xdecor_wood_tile.png
index f7de1d55f36dc65909de5fad31363b18dc180210..272df2c41cca0f052fc6222dbc8b94edc9f7c9e9 100644
Binary files a/textures/xdecor_wood_tile.png and b/textures/xdecor_wood_tile.png differ
diff --git a/textures/xdecor_wooden_lightbox.png b/textures/xdecor_wooden_lightbox.png
index 6974db5307593b169352e9782dea6a0165a7e80c..c5a6b526534bb95b5a858a9142e3f845ebe1317f 100644
Binary files a/textures/xdecor_wooden_lightbox.png and b/textures/xdecor_wooden_lightbox.png differ
diff --git a/textures/xdecor_woodframed_glass.png b/textures/xdecor_woodframed_glass.png
index 137b679a0795f95ed0a0740c22ea4984167ab411..9fd6ea8e90f685f82eca6dddd8a616fe9835b2aa 100644
Binary files a/textures/xdecor_woodframed_glass.png and b/textures/xdecor_woodframed_glass.png differ
diff --git a/textures/xdecor_woodframed_glass_detail.png b/textures/xdecor_woodframed_glass_detail.png
index 0ca309cfd15e652b9eee8d7a3b1fff3b29d8bcf6..9b5d1413e767938ed97ecf8ade06fbc68e33b602 100644
Binary files a/textures/xdecor_woodframed_glass_detail.png and b/textures/xdecor_woodframed_glass_detail.png differ
diff --git a/textures/xdecor_woodglass_door.png b/textures/xdecor_woodglass_door.png
index c752b4eb31373834cdedb0d271b3b0e34e94237f..51209e2edda965a79f399433d4994b503aa0a250 100644
Binary files a/textures/xdecor_woodglass_door.png and b/textures/xdecor_woodglass_door.png differ
diff --git a/textures/xdecor_woodglass_door_inv.png b/textures/xdecor_woodglass_door_inv.png
index 0bc15e5e3505dc11515cc2dfd9a2920c034d8eb5..e5b329339d01c44f5b96d259a6403ce364132f7c 100644
Binary files a/textures/xdecor_woodglass_door_inv.png and b/textures/xdecor_woodglass_door_inv.png differ
diff --git a/textures/xdecor_workbench_front.png b/textures/xdecor_workbench_front.png
index cc2142d2e0b2e849cf92d99a9750ec3979fd255e..3ef72368e4216cb52be5b0c9fc657e325f8a1530 100644
Binary files a/textures/xdecor_workbench_front.png and b/textures/xdecor_workbench_front.png differ
diff --git a/textures/xdecor_workbench_sides.png b/textures/xdecor_workbench_sides.png
index 29c4b3b2d4ab6227c794b48deba33ed62a74fd86..24521adb15922c505540294b0c915f5d69ae6e47 100644
Binary files a/textures/xdecor_workbench_sides.png and b/textures/xdecor_workbench_sides.png differ
diff --git a/textures/xdecor_workbench_top.png b/textures/xdecor_workbench_top.png
index f9a36cf8296061206906bc462e80b97a9e395423..852a83da126dd3dfad15239eea9912bb59206aca 100644
Binary files a/textures/xdecor_workbench_top.png and b/textures/xdecor_workbench_top.png differ