diff --git a/LICENSE b/LICENSE
index 6b156fe1d..4b9ce551c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,675 +1,3 @@
-GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
+ALL RIGHTS RESERVED.
+For more Information, check the README.md file.
diff --git a/README.md b/README.md
index 237429b8a..43d0c7d31 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,28 @@
It's a Minecraft Mod!
-For more information, visit the main Minecraft Forum Thread at http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2374910-actually-additions-a-bunch-of-awesome-gadgets
\ No newline at end of file
+For more information, visit the main Minecraft Forum Thread at http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2374910-actually-additions-a-bunch-of-awesome-gadgets
+
+
+
+### LICENSE:
+All Rights Reserved
+
+What that means? I can decide what I want to do with the License myself.
+
+
+### YOU MAY
+- Fork and modify the Code
+- Submit Pull Requests
+- Copy Parts of the Code for other Projects
+- Make a Review/Spotlight of the Mod or use it in a Modpack
+
+
+### YOU CAN NOT
+- Copy the entire Code or claim it is yours.
+- Reupload the Code or Mod to another website or claim you made it.
+
+
+### YOU HAVE TO
+- Always credit me. Don't be a jerk and copy entire portions of the code and claim they're yours.
+- When it comes to the code, always link back to this Repository.
+- When it comes to the Mod, always link back to the the Forum Thread linked above.
diff --git a/build.gradle b/build.gradle
index 421f07bbd..00c492554 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
apply plugin: 'forge'
-version = "1.7.10-0.0.1.4"
+version = "1.7.10-0.0.2.1"
group = "ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions"
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java
index 96be5e889..456298e26 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java
@@ -137,8 +137,8 @@ public class BlockGrinder extends BlockContainerBase implements IName{
}
@Override
- public int getMetadata(int damage){
- return damage;
+ public int getMetadata(int meta){
+ return meta;
}
}
}
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java
index 9940358ca..106c62e3c 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java
@@ -3,7 +3,6 @@ package ellpeck.actuallyadditions.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
-import ellpeck.actuallyadditions.creative.CreativeTab;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.tile.TileEntityInputter;
import ellpeck.actuallyadditions.util.IName;
@@ -30,16 +29,12 @@ public class BlockInputter extends BlockContainerBase implements IName{
public static final int NAME_FLAVOUR_AMOUNTS = 12;
- private long lastSysTime;
- private int toPick;
-
public BlockInputter(){
super(Material.rock);
this.setHarvestLevel("pickaxe", 0);
this.setHardness(1.0F);
this.setStepSound(soundTypeStone);
this.setTickRandomly(true);
- this.setCreativeTab(CreativeTab.instance);
}
@Override
@@ -72,21 +67,6 @@ public class BlockInputter extends BlockContainerBase implements IName{
if (rotation == 3) world.setBlockMetadataWithNotify(x, y, z, 2, 2);
}
- @Override
- public String getUnlocalizedName(){
- String norm = "tile." + Util.MOD_ID_LOWER + "." + this.getName();
-
- Random rand = new Random();
- long sysTime = System.currentTimeMillis();
-
- if(this.lastSysTime+5000 < sysTime){
- this.lastSysTime = sysTime;
- this.toPick = rand.nextInt(NAME_FLAVOUR_AMOUNTS+1);
- }
-
- return norm + "." + this.toPick;
- }
-
@Override
public TileEntity createNewTileEntity(World world, int par2){
return new TileEntityInputter();
@@ -133,6 +113,9 @@ public class BlockInputter extends BlockContainerBase implements IName{
private Block theBlock;
+ private long lastSysTime;
+ private int toPick;
+
public TheItemBlock(Block block){
super(block);
this.theBlock = block;
@@ -145,6 +128,19 @@ public class BlockInputter extends BlockContainerBase implements IName{
return EnumRarity.rare;
}
+ @Override
+ public String getItemStackDisplayName(ItemStack stack){
+ Random rand = new Random();
+ long sysTime = System.currentTimeMillis();
+
+ if(this.lastSysTime+5000 < sysTime){
+ this.lastSysTime = sysTime;
+ this.toPick = rand.nextInt(NAME_FLAVOUR_AMOUNTS+1);
+ }
+
+ return StatCollector.translateToLocal(this.getUnlocalizedName() + ".name") + " (" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".add." + this.toPick + ".name") + ")";
+ }
+
@Override
public String getUnlocalizedName(ItemStack stack){
return this.getUnlocalizedName();
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
index a8d4e73e4..37db62ef2 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
@@ -1,7 +1,5 @@
package ellpeck.actuallyadditions.blocks;
-import cpw.mods.fml.common.registry.GameRegistry;
-import ellpeck.actuallyadditions.util.IName;
import ellpeck.actuallyadditions.util.Util;
import net.minecraft.block.Block;
@@ -42,6 +40,6 @@ public class InitBlocks{
Util.register(blockFurnaceDouble, BlockFurnaceDouble.TheItemBlock.class);
blockInputter = new BlockInputter();
- GameRegistry.registerBlock(blockInputter, BlockInputter.TheItemBlock.class, ((IName)blockInputter).getName());
+ Util.register(blockInputter, BlockInputter.TheItemBlock.class);
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java b/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java
index 7d87fd0a1..240d76c82 100644
--- a/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java
+++ b/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java
@@ -16,6 +16,7 @@ public class ConfigValues{
public static boolean enableGiantChestRecipe;
public static boolean enableFeederRecipe;
public static boolean enableCrafterRecipe;
+ public static boolean enableInputterRecipe;
public static int tileEntityCompostAmountNeededToConvert;
public static int tileEntityCompostConversionTimeNeeded;
@@ -87,6 +88,7 @@ public class ConfigValues{
enableCrusherRecipe = config.getBoolean("Crusher", ConfigurationHandler.CATEGORY_BLOCKS_CRAFTING, true, "If the Crafting Recipe for the Crusher is Enabled");
enableFurnaceDoubleRecipe = config.getBoolean("Double Furnace", ConfigurationHandler.CATEGORY_BLOCKS_CRAFTING, true, "If the Crafting Recipe for the Double Furnace is Enabled");
enableGiantChestRecipe = config.getBoolean("Giant Chest", ConfigurationHandler.CATEGORY_BLOCKS_CRAFTING, true, "If the Crafting Recipe for the Giant Chest is Enabled");
+ enableInputterRecipe = config.getBoolean("ESD", ConfigurationHandler.CATEGORY_BLOCKS_CRAFTING, true, "If the Crafting Recipe for the ESD is Enabled");
enableFeederRecipe = config.getBoolean("Feeder", ConfigurationHandler.CATEGORY_BLOCKS_CRAFTING, true, "If the Crafting Recipe for the Feeder is Enabled");
enableCrafterRecipe = config.getBoolean("Crafting Table On A Stick", ConfigurationHandler.CATEGORY_ITEMS_CRAFTING, true, "If the Crafting Recipe for the Crafting Table On A Stick is Enabled");
diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java
index dfd6092c8..1e2a96f48 100644
--- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java
+++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java
@@ -21,6 +21,13 @@ public class BlockCrafting{
'W', new ItemStack(Blocks.planks, 1, Util.WILDCARD),
'F', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.MASHED_FOOD.ordinal()));
+ //Inputter
+ if(ConfigValues.enableInputterRecipe)
+ GameRegistry.addRecipe(new ItemStack(InitBlocks.blockInputter),
+ "WWW", "WHW", "WWW",
+ 'W', new ItemStack(Blocks.planks, 1, Util.WILDCARD),
+ 'H', new ItemStack(Blocks.hopper));
+
//Crusher
if(ConfigValues.enableCrusherRecipe)
GameRegistry.addRecipe(new ItemStack(InitBlocks.blockGrinder),
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
index 2b8c8f933..e33ea433d 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
@@ -67,6 +67,39 @@ public class ContainerFeeder extends Container{
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){
+ final int inventoryStart = 1;
+ final int inventoryEnd = inventoryStart+26;
+ final int hotbarStart = inventoryEnd+1;
+ final int hotbarEnd = hotbarStart+8;
+
+ Slot theSlot = (Slot)this.inventorySlots.get(slot);
+ if(theSlot.getHasStack()){
+ ItemStack currentStack = theSlot.getStack();
+ ItemStack newStack = currentStack.copy();
+
+ if(slot <= hotbarEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, 0, 1, false);
+ }
+
+ if(slot <= hotbarEnd && slot >= hotbarStart){
+ this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false);
+ }
+
+ else if(slot <= inventoryEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false);
+ }
+
+ else if(slot < inventoryStart){
+ this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false);
+ }
+
+ if(newStack.stackSize == 0) theSlot.putStack(null);
+ else theSlot.onSlotChanged();
+ if(newStack.stackSize == currentStack.stackSize) return null;
+ theSlot.onPickupFromSlot(player, newStack);
+
+ return currentStack;
+ }
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
index 34060b20a..d923304b1 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
@@ -11,6 +11,8 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.tileentity.TileEntityFurnace;
public class ContainerFurnaceDouble extends Container{
@@ -27,8 +29,8 @@ public class ContainerFurnaceDouble extends Container{
this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_COAL, 80, 21));
this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_1, 51, 21));
- this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21));
this.addSlotToContainer(new SlotOutput(this.tileFurnace, TileEntityFurnaceDouble.SLOT_OUTPUT_1, 51, 69));
+ this.addSlotToContainer(new Slot(this.tileFurnace, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21));
this.addSlotToContainer(new SlotOutput(this.tileFurnace, TileEntityFurnaceDouble.SLOT_OUTPUT_2, 108, 69));
for (int i = 0; i < 3; i++){
@@ -84,6 +86,46 @@ public class ContainerFurnaceDouble extends Container{
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){
+ final int inventoryStart = 5;
+ final int inventoryEnd = inventoryStart+26;
+ final int hotbarStart = inventoryEnd+1;
+ final int hotbarEnd = hotbarStart+8;
+
+ Slot theSlot = (Slot)this.inventorySlots.get(slot);
+ if(theSlot.getHasStack()){
+ ItemStack currentStack = theSlot.getStack();
+ ItemStack newStack = currentStack.copy();
+
+ if(slot <= hotbarEnd && slot >= inventoryStart){
+ if(FurnaceRecipes.smelting().getSmeltingResult(currentStack) != null){
+ this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_INPUT_1, TileEntityFurnaceDouble.SLOT_INPUT_1+1, false);
+ this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_INPUT_2, TileEntityFurnaceDouble.SLOT_INPUT_2+2, false);
+ }
+
+ if(TileEntityFurnace.getItemBurnTime(currentStack) > 0){
+ this.mergeItemStack(newStack, TileEntityFurnaceDouble.SLOT_COAL, TileEntityFurnaceDouble.SLOT_COAL+1, false);
+ }
+ }
+
+ if(slot <= hotbarEnd && slot >= hotbarStart){
+ this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false);
+ }
+
+ else if(slot <= inventoryEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false);
+ }
+
+ else if(slot < inventoryStart){
+ this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false);
+ }
+
+ if(newStack.stackSize == 0) theSlot.putStack(null);
+ else theSlot.onSlotChanged();
+ if(newStack.stackSize == currentStack.stackSize) return null;
+ theSlot.onPickupFromSlot(player, newStack);
+
+ return currentStack;
+ }
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
index 6ddf263dd..27ee0269b 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
@@ -38,6 +38,39 @@ public class ContainerGiantChest extends Container{
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){
+ final int inventoryStart = 117;
+ final int inventoryEnd = inventoryStart+26;
+ final int hotbarStart = inventoryEnd+1;
+ final int hotbarEnd = hotbarStart+8;
+
+ Slot theSlot = (Slot)this.inventorySlots.get(slot);
+ if(theSlot.getHasStack()){
+ ItemStack currentStack = theSlot.getStack();
+ ItemStack newStack = currentStack.copy();
+
+ if(slot <= hotbarEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, 0, 117, false);
+ }
+
+ if(slot <= hotbarEnd && slot >= hotbarStart){
+ this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false);
+ }
+
+ else if(slot <= inventoryEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false);
+ }
+
+ else if(slot < inventoryStart){
+ this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false);
+ }
+
+ if(newStack.stackSize == 0) theSlot.putStack(null);
+ else theSlot.onSlotChanged();
+ if(newStack.stackSize == currentStack.stackSize) return null;
+ theSlot.onPickupFromSlot(player, newStack);
+
+ return currentStack;
+ }
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
index 9185bcc14..2718c0dc2 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
@@ -3,6 +3,7 @@ package ellpeck.actuallyadditions.inventory;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.inventory.slot.SlotOutput;
+import ellpeck.actuallyadditions.recipe.GrinderRecipes;
import ellpeck.actuallyadditions.tile.TileEntityBase;
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,6 +12,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityFurnace;
public class ContainerGrinder extends Container{
@@ -90,6 +92,46 @@ public class ContainerGrinder extends Container{
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){
+ final int inventoryStart = this.isDouble ? 7 : 4;
+ final int inventoryEnd = inventoryStart+26;
+ final int hotbarStart = inventoryEnd+1;
+ final int hotbarEnd = hotbarStart+8;
+
+ Slot theSlot = (Slot)this.inventorySlots.get(slot);
+ if(theSlot.getHasStack()){
+ ItemStack currentStack = theSlot.getStack();
+ ItemStack newStack = currentStack.copy();
+
+ if(slot <= hotbarEnd && slot >= inventoryStart){
+ if(GrinderRecipes.instance().getOutput(currentStack, false) != null){
+ this.mergeItemStack(newStack, TileEntityGrinder.SLOT_INPUT_1, TileEntityGrinder.SLOT_INPUT_1+1, false);
+ if(this.isDouble) this.mergeItemStack(newStack, TileEntityGrinder.SLOT_INPUT_2, TileEntityGrinder.SLOT_INPUT_2+1, false);
+ }
+
+ if(TileEntityFurnace.getItemBurnTime(currentStack) > 0){
+ this.mergeItemStack(newStack, TileEntityGrinder.SLOT_COAL, TileEntityGrinder.SLOT_COAL+1, false);
+ }
+ }
+
+ if(slot <= hotbarEnd && slot >= hotbarStart){
+ this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false);
+ }
+
+ else if(slot <= inventoryEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false);
+ }
+
+ else if(slot < inventoryStart){
+ this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false);
+ }
+
+ if(newStack.stackSize == 0) theSlot.putStack(null);
+ else theSlot.onSlotChanged();
+ if(newStack.stackSize == currentStack.stackSize) return null;
+ theSlot.onPickupFromSlot(player, newStack);
+
+ return currentStack;
+ }
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
index cd969c79a..f71db1cc6 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
@@ -87,6 +87,39 @@ public class ContainerInputter extends Container{
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot){
+ final int inventoryStart = 1;
+ final int inventoryEnd = inventoryStart+26;
+ final int hotbarStart = inventoryEnd+1;
+ final int hotbarEnd = hotbarStart+8;
+
+ Slot theSlot = (Slot)this.inventorySlots.get(slot);
+ if(theSlot.getHasStack()){
+ ItemStack currentStack = theSlot.getStack();
+ ItemStack newStack = currentStack.copy();
+
+ if(slot <= hotbarEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, 0, 1, false);
+ }
+
+ if(slot <= hotbarEnd && slot >= hotbarStart){
+ this.mergeItemStack(newStack, inventoryStart, inventoryEnd, false);
+ }
+
+ else if(slot <= inventoryEnd && slot >= inventoryStart){
+ this.mergeItemStack(newStack, hotbarStart, hotbarEnd, false);
+ }
+
+ else if(slot < inventoryStart){
+ this.mergeItemStack(newStack, inventoryStart, hotbarEnd, false);
+ }
+
+ if(newStack.stackSize == 0) theSlot.putStack(null);
+ else theSlot.onSlotChanged();
+ if(newStack.stackSize == currentStack.stackSize) return null;
+ theSlot.onPickupFromSlot(player, newStack);
+
+ return currentStack;
+ }
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java
index 8d99ee171..e82771d7d 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiInputter.java
@@ -92,11 +92,11 @@ public class GuiInputter extends GuiContainer{
this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.put"), guiLeft + 22 + 3, guiTop + 32, 4210752);
this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.pull"), guiLeft + 107 + 3, guiTop + 32, 4210752);
- this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft + 24 + 3, guiTop + 45 + 1, 4210752);
- this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPut == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPut).toString(), guiLeft + 24, guiTop + 66 + 1, 4210752);
+ this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft + 24 + 1, guiTop + 45 + 3, 4210752);
+ this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPut == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPut).toString(), guiLeft + 24 + 3, guiTop + 66 + 3, 4210752);
- this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft + 109 + 3, guiTop + 45 + 1, 4210752);
- this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPull == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPull).toString(), guiLeft + 109, guiTop + 66 + 1, 4210752);
+ this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft + 109 + 1, guiTop + 45 + 3, 4210752);
+ this.fontRendererObj.drawString(StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.slot") + " " + (tileInputter.slotToPull == -1 ? StatCollector.translateToLocal("info." + Util.MOD_ID_LOWER + ".gui.all") : tileInputter.slotToPull).toString(), guiLeft + 109 + 3, guiTop + 66 + 3, 4210752);
}
@Override
@@ -142,7 +142,7 @@ public class GuiInputter extends GuiContainer{
else if (!this.enabled) color = 10526880;
else if (this.field_146123_n) color = 16777120;
- this.drawCenteredString(renderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height-3) / 2, color);
+ this.drawCenteredString(renderer, this.displayString, this.xPosition + this.width / 2, this.yPosition + (this.height-8) / 2, color);
}
}
}
diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java
index 1e338ee24..8faa77f34 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java
@@ -12,7 +12,6 @@ public enum TheSpecialDrops implements IName{
SOLIDIFIED_EXPERIENCE("SolidifiedExperience", 70, 3, EntityCreature.class, EnumRarity.uncommon, ConfigValues.enableExperienceDrop),
BLOOD_FRAGMENT("BloodFragment", 30, 1, EntityCreature.class, EnumRarity.uncommon, ConfigValues.enableBloodDrop),
- //Change this into a Heart Fragment that is later crafted into a heart used to revive Villagers
HEART_PART("HeartPart", 10, 1, EntityCreature.class, EnumRarity.rare, ConfigValues.enableHeartDrop),
UNKNOWN_SUBSTANCE("UnknownSubstance", 5, 1, EntitySkeleton.class, EnumRarity.epic, ConfigValues.enableSubstanceDrop),
PEARL_SHARD("PearlShard", 20, 3, EntityEnderman.class, EnumRarity.epic, ConfigValues.enablePearlShardDrop),
diff --git a/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java b/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java
index 1a0990e3f..1ad55b481 100644
--- a/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java
+++ b/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java
@@ -10,7 +10,7 @@ public class PacketHandler{
public static SimpleNetworkWrapper theNetwork;
public static void init(){
- theNetwork = NetworkRegistry.INSTANCE.newSimpleChannel(Util.MOD_ID + "Channel");
+ theNetwork = NetworkRegistry.INSTANCE.newSimpleChannel(Util.MOD_ID_LOWER);
theNetwork.registerMessage(PacketTileEntityFeeder.Handler.class, PacketTileEntityFeeder.class, 0, Side.CLIENT);
theNetwork.registerMessage(PacketInputterButton.Handler.class, PacketInputterButton.class, 1, Side.SERVER);
diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
index 848ec16db..45f7e2e7f 100644
--- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
+++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
@@ -64,8 +64,11 @@ public class TileEntityInputter extends TileEntityInventoryBase{
}
}
else{
- this.setInventorySlotContents(0, theStack.copy());
- theInventory.setInventorySlotContents(theSlotToPull, null);
+ ItemStack toBePut = theStack.copy();
+ if(theInventory.getInventoryStackLimit() < toBePut.stackSize) toBePut.stackSize = theInventory.getInventoryStackLimit();
+ this.setInventorySlotContents(0, toBePut);
+ if(theStack.stackSize == toBePut.stackSize) theInventory.setInventorySlotContents(theSlotToPull, null);
+ else theStack.stackSize -= toBePut.stackSize;
}
}
}
@@ -103,8 +106,11 @@ public class TileEntityInputter extends TileEntityInventoryBase{
}
}
else{
- theInventory.setInventorySlotContents(theSlotToPut, this.slots[0].copy());
- this.slots[0] = null;
+ ItemStack toBePut = this.slots[0].copy();
+ if(theInventory.getInventoryStackLimit() < toBePut.stackSize) toBePut.stackSize = theInventory.getInventoryStackLimit();
+ theInventory.setInventorySlotContents(theSlotToPut, toBePut);
+ if(this.slots[0].stackSize == toBePut.stackSize) this.slots[0] = null;
+ else this.slots[0].stackSize -= toBePut.stackSize;
}
}
}
diff --git a/src/main/java/ellpeck/actuallyadditions/util/Util.java b/src/main/java/ellpeck/actuallyadditions/util/Util.java
index 4f7dde362..92fab8d98 100644
--- a/src/main/java/ellpeck/actuallyadditions/util/Util.java
+++ b/src/main/java/ellpeck/actuallyadditions/util/Util.java
@@ -18,7 +18,7 @@ import org.lwjgl.input.Keyboard;
@SuppressWarnings("unused")
public class Util{
- public static final String VERSION = "1.7.10-0.0.1.4";
+ public static final String VERSION = "1.7.10-0.0.2.1";
public static final String MOD_ID = "ActuallyAdditions";
public static final String NAME = "Actually Additions";
@@ -48,8 +48,8 @@ public class Util{
public static final String BOLD = (char)167 + "l";
public static final String UNDERLINE = (char)167 + "n";
public static final String ITALIC = (char)167 + "o";
- public static final String OBFUSCATED = (char) 167 + "k";
- public static final String RESET = (char) 167 + "r";
+ public static final String OBFUSCATED = (char)167 + "k";
+ public static final String RESET = (char)167 + "r";
public static final String[] ROMAN_NUMERALS = new String[]{"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X"};
diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
index 8230b2dfb..4fef29b52 100644
--- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang
+++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang
@@ -12,19 +12,20 @@ tile.actuallyadditions.blockGrinder.name=Crusher
tile.actuallyadditions.blockGrinderDouble.name=Double Crusher
tile.actuallyadditions.blockFurnaceDouble.name=Double Furnace
-tile.actuallyadditions.blockInputter.0.name=ESD (Ellpeck's Slot Device)
-tile.actuallyadditions.blockInputter.1.name=ESD (Energetic Solo Dancer)
-tile.actuallyadditions.blockInputter.2.name=ESD (Ethereal System Dude)
-tile.actuallyadditions.blockInputter.3.name=ESD (Energy Stuff Distributor)
-tile.actuallyadditions.blockInputter.4.name=ESD (Existing Stuff Donator)
-tile.actuallyadditions.blockInputter.5.name=ESD (ExtraUtils Stealing Device)
-tile.actuallyadditions.blockInputter.6.name=ESD (Experienced Sauce Deriver)
-tile.actuallyadditions.blockInputter.7.name=ESD (Excellent Spaghetti Dessert)
-tile.actuallyadditions.blockInputter.8.name=ESD (Extraordinary Sample Deliverer)
-tile.actuallyadditions.blockInputter.9.name=ESD (Express Sending Doughnut)
-tile.actuallyadditions.blockInputter.10.name=ESD (Expelling Sugar Dagger)
-tile.actuallyadditions.blockInputter.11.name=ESD (Extra-Long Solidifying Dissociation)
-tile.actuallyadditions.blockInputter.12.name=ESD (Extravagant Supreme Dirt)
+tile.actuallyadditions.blockInputter.name=ESD
+tile.actuallyadditions.blockInputter.add.0.name=Ellpeck's Slot Device
+tile.actuallyadditions.blockInputter.add.1.name=Energetic Solo Dancer
+tile.actuallyadditions.blockInputter.add.2.name=Ethereal System Dude
+tile.actuallyadditions.blockInputter.add.3.name=Energy Stuff Distributor
+tile.actuallyadditions.blockInputter.add.4.name=Existing Stuff Donator
+tile.actuallyadditions.blockInputter.add.5.name=ExtraUtils Stealing Device
+tile.actuallyadditions.blockInputter.add.6.name=Experienced Sauce Deriver
+tile.actuallyadditions.blockInputter.add.7.name=Excellent Spaghetti Dessert
+tile.actuallyadditions.blockInputter.add.8.name=Extraordinary Sample Deliverer
+tile.actuallyadditions.blockInputter.add.9.name=Express Sending Doughnut
+tile.actuallyadditions.blockInputter.add.10.name=Expelling Sugar Dagger
+tile.actuallyadditions.blockInputter.add.11.name=Extra-Long Solidifying Dissociation
+tile.actuallyadditions.blockInputter.add.12.name=Extravagant Supreme Dirt
item.actuallyadditions.itemMiscMashedFood.name=Mashed Food
item.actuallyadditions.itemFertilizer.name=Fertilizer
@@ -100,6 +101,7 @@ tooltip.actuallyadditions.blockGrinder.desc.4=build the Double Crusher!
tooltip.actuallyadditions.blockGrinderDouble.desc.1=Crushes Ores into Dusts!
tooltip.actuallyadditions.blockGrinderDouble.desc.2=You get two Dusts per Ore and Extras!
tooltip.actuallyadditions.blockGrinderDouble.desc.3=Can crush two Ores simultaneously!
+tooltip.actuallyadditions.blockFurnaceDouble.desc=Smelts two things simultaneously!
tooltip.actuallyadditions.blockInputter.desc.1=Its real name is %sObfuscated%s!
tooltip.actuallyadditions.blockInputter.desc.2=Acts like a more advanced Hopper
tooltip.actuallyadditions.blockInputter.desc.3=Configurable:
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png b/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png
deleted file mode 100644
index b726e96d8..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialSolidifiedExperience.png b/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialSolidifiedExperience.png
deleted file mode 100644
index 481bee9f9..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialSolidifiedExperience.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png
index fec125b91..2851f3894 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png
index 7559422df..68e490b82 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png
index 2ced8770d..8f0419c6a 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png
index 151e7f612..b02269b06 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png
index fcd882dab..16807d009 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png
index 5f1e91f50..f1ea5b795 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png
index 019cb6be4..7e1bb9635 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png
index b99441550..c6284f2fe 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShard.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShard.png
new file mode 100644
index 000000000..abde59bd9
Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShard.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialSolidifiedExperience.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialSolidifiedExperience.png
new file mode 100644
index 000000000..7a0eb094f
Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialSolidifiedExperience.png differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png
index ea44f7d0f..c6e62d13e 100644
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png and b/src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png differ
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 43eb6a5c1..b963953be 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
"modid": "ActuallyAdditions",
"name": "Actually Additions",
"description": "A bunch of random stuff added to your Game to make it even more fun, exciting and add some more variety!",
- "version": "0.0.1.4",
+ "version": "0.0.2.1",
"mcversion": "1.7.10",
"url": "https://github.com/Ellpeck/ActuallyAdditions",
"updateUrl": "",