diff --git a/LICENSE b/LICENSE
index 1625c17..e72bfdd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,121 +1,674 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
- PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
- THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
- HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
- i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
- v. rights protecting the extraction, dissemination, use and reuse of data
- in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation
- thereof, including any amended or successor version of such
- directive); and
-vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national
- implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied,
- statutory or otherwise, including without limitation warranties of
- title, merchantability, fitness for a particular purpose, non
- infringement, or the absence of latent or other defects, accuracy, or
- the present or absence of errors, whether or not discoverable, all to
- the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without
- limitation any person's Copyright and Related Rights in the Work.
- Further, Affirmer disclaims responsibility for obtaining any necessary
- consents, permissions or other rights required for any use of the
- Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to
- this CC0 or use of the Work.
\ No newline at end of file
+ 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.
+
+
+ Copyright (C)
+
+ 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:
+
+ Copyright (C)
+ 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
+.
\ No newline at end of file
diff --git a/src/main/java/net/limit/cubliminal/CubliminalClient.java b/src/main/java/net/limit/cubliminal/CubliminalClient.java
index 653ada2..69d8758 100644
--- a/src/main/java/net/limit/cubliminal/CubliminalClient.java
+++ b/src/main/java/net/limit/cubliminal/CubliminalClient.java
@@ -7,8 +7,10 @@
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.limit.cubliminal.client.CubliminalRenderLayers;
import net.limit.cubliminal.client.hud.NoClippingHudOverlay;
import net.limit.cubliminal.client.hud.SanityBarHudOverlay;
+import net.limit.cubliminal.client.render.FluxCapacitorRenderer;
import net.limit.cubliminal.client.render.ManilaGatewayRenderer;
import net.limit.cubliminal.entity.client.SeatRenderer;
import net.limit.cubliminal.event.KeyInputHandler;
@@ -23,22 +25,6 @@
@Environment(EnvType.CLIENT)
public class CubliminalClient implements ClientModInitializer {
- public static final ShaderProgramKey RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX = ShaderProgramKeys.register("rendertype_cubliminal_manila_skybox", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL);
-
- public static final RenderPhase.ShaderProgram MANILA_PROGRAM = new RenderPhase.ShaderProgram(RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX);
-
- public static final RenderLayer MANILA = RenderLayer.of("manila", VertexFormats.POSITION,
- VertexFormat.DrawMode.QUADS, 1536, false, false,
- RenderLayer.MultiPhaseParameters.builder().program(MANILA_PROGRAM).texture(
- RenderPhase.Textures.create()
- .add(Cubliminal.id("textures/sky/manila_" + 0 + ".png"), false, false)
- .add(Cubliminal.id("textures/sky/manila_" + 1 + ".png"), false, false)
- .add(Cubliminal.id("textures/sky/manila_" + 2 + ".png"), false, false)
- .add(Cubliminal.id("textures/sky/manila_" + 3 + ".png"), false, false)
- .add(Cubliminal.id("textures/sky/manila_" + 4 + ".png"), false, false)
- .add(Cubliminal.id("textures/sky/manila_" + 5 + ".png"), false, false)
- .build()).build(false));
-
@Override
public void onInitializeClient() {
BlockRenderLayerMap.INSTANCE.putBlock(CubliminalBlocks.THE_LOBBY_GATEWAY_BLOCK, RenderLayer.getCutout());
@@ -48,15 +34,19 @@ public void onInitializeClient() {
CubliminalBlocks.MOLD,
CubliminalBlocks.JUMBLED_DOCUMENTS,
CubliminalBlocks.EXIT_SIGN,
- CubliminalBlocks.SMOKE_DETECTOR);
+ CubliminalBlocks.SMOKE_DETECTOR,
+ CubliminalBlocks.FLUX_CAPACITOR);
BlockEntityRendererFactories.register(CubliminalBlockEntities.THE_LOBBY_GATEWAY_BLOCK_ENTITY, ManilaGatewayRenderer::new);
+ BlockEntityRendererFactories.register(CubliminalBlockEntities.FLUX_CAPACITOR_BLOCK_ENTITY, FluxCapacitorRenderer::new);
KeyInputHandler.register();
EntityRendererRegistry
.register(CubliminalEntities.SEAT_ENTITY, SeatRenderer::new);
+ CubliminalRenderLayers.init();
+
ClientPlayNetworking.registerGlobalReceiver(CubliminalPackets.NoClipSyncPayload.ID, (payload, context) -> {
ClientPlayerEntity player = context.player();
diff --git a/src/main/java/net/limit/cubliminal/block/custom/FluxCapacitorBlock.java b/src/main/java/net/limit/cubliminal/block/custom/FluxCapacitorBlock.java
new file mode 100644
index 0000000..a0b39c1
--- /dev/null
+++ b/src/main/java/net/limit/cubliminal/block/custom/FluxCapacitorBlock.java
@@ -0,0 +1,86 @@
+package net.limit.cubliminal.block.custom;
+
+import com.mojang.serialization.MapCodec;
+import net.limit.cubliminal.block.entity.FluxCapacitorBlockEntity;
+import net.limit.cubliminal.init.CubliminalBlockEntities;
+import net.limit.cubliminal.init.CubliminalSounds;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityTicker;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.block.WireOrientation;
+import org.jetbrains.annotations.Nullable;
+
+public class FluxCapacitorBlock extends BlockWithEntity implements BlockEntityProvider {
+ public static final MapCodec CODEC = FluxCapacitorBlock.createCodec(FluxCapacitorBlock::new);
+ public static final BooleanProperty POWERED = Properties.POWERED;
+ public static final EnumProperty FACING = HorizontalFacingBlock.FACING;
+ public FluxCapacitorBlock(Settings settings) {
+ super(settings);
+ this.setDefaultState(this.stateManager.getDefaultState().with(POWERED, false).with(FACING, Direction.NORTH));
+ }
+
+ @Override
+ protected MapCodec extends BlockWithEntity> getCodec() {
+ return CODEC;
+ }
+
+ @Nullable
+ @Override
+ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+ return new FluxCapacitorBlockEntity(pos, state);
+ }
+
+ @Override
+ public BlockRenderType getRenderType(BlockState state) {
+ return BlockRenderType.MODEL;
+ }
+
+ @Nullable
+ @Override
+ public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) {
+ return validateTicker(type, CubliminalBlockEntities.FLUX_CAPACITOR_BLOCK_ENTITY, FluxCapacitorBlockEntity::tick);
+ }
+
+ @Override
+ protected void appendProperties(StateManager.Builder builder) {
+ builder.add(POWERED, FACING);
+ }
+
+ @Nullable
+ @Override
+ public BlockState getPlacementState(ItemPlacementContext ctx) {
+ return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite())
+ .with(POWERED, shouldBePowered(ctx.getWorld(), ctx.getBlockPos()));
+ }
+
+ @Override
+ protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable WireOrientation wireOrientation, boolean notify) {
+ if (shouldBePowered(world, pos)) {
+ world.setBlockState(pos, state.with(POWERED, true));
+ }
+ }
+
+ protected boolean shouldBePowered(World world, BlockPos pos) {
+ return world.isReceivingRedstonePower(pos) && world.getBlockState(pos.up())
+ .equals(Blocks.LIGHTNING_ROD.getDefaultState().with(LightningRodBlock.POWERED, true));
+ }
+
+ @Override
+ public void onBroken(WorldAccess world, BlockPos pos, BlockState state) {
+ if (!world.isClient()) {
+ CubliminalSounds.clientStopSound(world.getServer().getOverworld().getPlayers(),
+ SoundCategory.BLOCKS, CubliminalSounds.FLUX_CAPACITOR.value().id());
+ }
+ }
+}
diff --git a/src/main/java/net/limit/cubliminal/block/custom/SinkBlock.java b/src/main/java/net/limit/cubliminal/block/custom/SinkBlock.java
index 009ecb2..0186ca8 100644
--- a/src/main/java/net/limit/cubliminal/block/custom/SinkBlock.java
+++ b/src/main/java/net/limit/cubliminal/block/custom/SinkBlock.java
@@ -11,7 +11,6 @@
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.particle.ParticleTypes;
-import net.minecraft.sound.SoundCategory;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.EnumProperty;
@@ -27,7 +26,6 @@
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
-import net.minecraft.world.WorldAccess;
import net.minecraft.world.WorldView;
import net.minecraft.world.tick.ScheduledTickView;
import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/net/limit/cubliminal/block/entity/FluxCapacitorBlockEntity.java b/src/main/java/net/limit/cubliminal/block/entity/FluxCapacitorBlockEntity.java
new file mode 100644
index 0000000..db0f2c6
--- /dev/null
+++ b/src/main/java/net/limit/cubliminal/block/entity/FluxCapacitorBlockEntity.java
@@ -0,0 +1,100 @@
+package net.limit.cubliminal.block.entity;
+
+import net.limit.cubliminal.block.custom.FluxCapacitorBlock;
+import net.limit.cubliminal.client.hud.NoClippingHudOverlay;
+import net.limit.cubliminal.init.CubliminalBlockEntities;
+import net.limit.cubliminal.init.CubliminalSounds;
+import net.limit.cubliminal.util.NoClipEngine;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.predicate.entity.EntityPredicates;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+import java.util.function.Predicate;
+
+public class FluxCapacitorBlockEntity extends BlockEntity {
+
+ public FluxCapacitorBlockEntity(BlockPos pos, BlockState state) {
+ super(CubliminalBlockEntities.FLUX_CAPACITOR_BLOCK_ENTITY, pos, state);
+ }
+
+ private boolean canBreakReality;
+ private int realityTicks;
+
+
+ @Override
+ protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
+ super.writeNbt(nbt, registryLookup);
+ nbt.putInt("RealityTicks", this.realityTicks);
+ }
+
+ @Override
+ protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
+ super.readNbt(nbt, registryLookup);
+ this.realityTicks = nbt.getInt("RealityTicks");
+ }
+
+
+ public static void tick(World world, BlockPos pos, BlockState state, FluxCapacitorBlockEntity entity) {
+ if (state.get(FluxCapacitorBlock.POWERED) && !entity.canBreakReality) {
+ entity.canBreakReality = true;
+ world.playSoundAtBlockCenter(pos, CubliminalSounds.FLUX_CAPACITOR.value(),
+ SoundCategory.BLOCKS, 1.0f, 1.0f, false);
+ }
+ if (entity.canBreakReality) {
+ entity.breakReality(world, state);
+ }
+ }
+
+
+ @Override
+ public boolean onSyncedBlockEvent(int type, int data) {
+ if (type == 1) {
+ return true;
+ } else return super.onSyncedBlockEvent(type, data);
+ }
+
+ public void breakReality(World world, BlockState state) {
+ if (this.realityTicks > 279) {
+ world.setBlockState(pos, state.with(FluxCapacitorBlock.POWERED, false));
+ this.canBreakReality = false;
+ this.realityTicks = 0;
+ } else {
+ ++this.realityTicks;
+ if (this.realityTicks == 220) {
+ if (world.isClient) {
+ NoClippingHudOverlay.INSTANCE.setAux_renderOverlay(false);
+ } else {
+ for (PlayerEntity player : world.getPlayers().stream().filter(Predicate.not(PlayerEntity::isSpectator)).toList()) {
+ NoClipEngine.noClip(player);
+ }
+ }
+ } else if (world.isClient && this.realityTicks == 100 &&
+ !MinecraftClient.getInstance().player.isSpectator()) {
+ NoClippingHudOverlay.INSTANCE.setAux_renderOverlay(true);
+ }
+ }
+ }
+
+ public int getRealityTicks() {
+ return this.realityTicks;
+ }
+
+ public boolean canBreakReality() {
+ return this.canBreakReality;
+ }
+
+ @Override
+ public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registryLookup) {
+ return this.createNbt(registryLookup);
+ }
+}
diff --git a/src/main/java/net/limit/cubliminal/client/CubliminalRenderLayers.java b/src/main/java/net/limit/cubliminal/client/CubliminalRenderLayers.java
new file mode 100644
index 0000000..3595ae0
--- /dev/null
+++ b/src/main/java/net/limit/cubliminal/client/CubliminalRenderLayers.java
@@ -0,0 +1,43 @@
+package net.limit.cubliminal.client;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.limit.cubliminal.Cubliminal;
+import net.minecraft.client.gl.ShaderProgramKey;
+import net.minecraft.client.gl.ShaderProgramKeys;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormats;
+
+@Environment(EnvType.CLIENT)
+public class CubliminalRenderLayers {
+ public static final ShaderProgramKey RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX = ShaderProgramKeys.register("rendertype_cubliminal_manila_skybox", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL);
+
+ public static final RenderPhase.ShaderProgram MANILA_PROGRAM = new RenderPhase.ShaderProgram(RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX);
+
+ public static final RenderLayer MANILA = RenderLayer.of("manila", VertexFormats.POSITION,
+ VertexFormat.DrawMode.QUADS, 1536, false, false,
+ RenderLayer.MultiPhaseParameters.builder().program(MANILA_PROGRAM).texture(
+ RenderPhase.Textures.create()
+ .add(Cubliminal.id("textures/sky/manila_" + 0 + ".png"), false, false)
+ .add(Cubliminal.id("textures/sky/manila_" + 1 + ".png"), false, false)
+ .add(Cubliminal.id("textures/sky/manila_" + 2 + ".png"), false, false)
+ .add(Cubliminal.id("textures/sky/manila_" + 3 + ".png"), false, false)
+ .add(Cubliminal.id("textures/sky/manila_" + 4 + ".png"), false, false)
+ .add(Cubliminal.id("textures/sky/manila_" + 5 + ".png"), false, false)
+ .build()).build(false));
+
+
+ public static final ShaderProgramKey RENDERTYPE_BLOOM_DOT = ShaderProgramKeys.register("rendertype_bloom_dot", VertexFormats.POSITION_COLOR);
+
+ public static final RenderPhase.ShaderProgram BLOOM_PROGRAM = new RenderPhase.ShaderProgram(RENDERTYPE_BLOOM_DOT);
+
+ public static final RenderLayer BLOOM = RenderLayer.of("bloom", VertexFormats.POSITION_COLOR_LIGHT,
+ VertexFormat.DrawMode.QUADS, 1536, false, false,
+ RenderLayer.MultiPhaseParameters.builder().program(BLOOM_PROGRAM).build(false));
+
+
+ public static void init() {
+ }
+}
diff --git a/src/main/java/net/limit/cubliminal/client/hud/NoClippingHudOverlay.java b/src/main/java/net/limit/cubliminal/client/hud/NoClippingHudOverlay.java
index baf038c..568a9d6 100644
--- a/src/main/java/net/limit/cubliminal/client/hud/NoClippingHudOverlay.java
+++ b/src/main/java/net/limit/cubliminal/client/hud/NoClippingHudOverlay.java
@@ -21,6 +21,7 @@ public class NoClippingHudOverlay implements HudRenderCallback {
public static NoClippingHudOverlay INSTANCE = new NoClippingHudOverlay();
private boolean clippingIntoWall = false;
+ private boolean aux_renderOverlay = false;
private static final Identifier GLITCH_OVERLAY_1 = Cubliminal.id("textures/hud/noclip/glitch_overlay_1.png");
private static final Identifier GLITCH_OVERLAY_2 = Cubliminal.id("textures/hud/noclip/glitch_overlay_2.png");
@@ -48,7 +49,7 @@ public void onHudRender(DrawContext drawContext, RenderTickCounter tickCounter)
break;
}
}
- } else if (this.clippingIntoWall) {
+ } else if (this.clippingIntoWall || this.aux_renderOverlay) {
for (int i = 0; i < 2; i++) {
if ((player.getWorld().getTime() + i) % 6 == 0) {
Random random = player.getRandom();
@@ -96,4 +97,8 @@ public boolean isClippingIntoWall() {
public void setClippingIntoWall(boolean clippingIntoWall) {
this.clippingIntoWall = clippingIntoWall;
}
+
+ public void setAux_renderOverlay(boolean aux_renderOverlay) {
+ this.aux_renderOverlay = aux_renderOverlay;
+ }
}
diff --git a/src/main/java/net/limit/cubliminal/client/render/FluxCapacitorRenderer.java b/src/main/java/net/limit/cubliminal/client/render/FluxCapacitorRenderer.java
new file mode 100644
index 0000000..1abd866
--- /dev/null
+++ b/src/main/java/net/limit/cubliminal/client/render/FluxCapacitorRenderer.java
@@ -0,0 +1,119 @@
+package net.limit.cubliminal.client.render;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.limit.cubliminal.block.custom.FluxCapacitorBlock;
+import net.limit.cubliminal.block.entity.FluxCapacitorBlockEntity;
+import net.limit.cubliminal.client.CubliminalRenderLayers;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Direction;
+import org.joml.Matrix4f;
+
+@Environment(EnvType.CLIENT)
+public class FluxCapacitorRenderer implements BlockEntityRenderer {
+
+ public FluxCapacitorRenderer(BlockEntityRendererFactory.Context ctx) {
+ }
+
+ @Override
+ public void render(FluxCapacitorBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+ if (entity.getCachedState().get(FluxCapacitorBlock.POWERED)) {
+ matrices.push();
+
+ Direction direction = entity.getCachedState().get(FluxCapacitorBlock.FACING);
+ float x1 = 0.5f;
+ float z1 = switch (direction) {
+ case NORTH -> {
+ x1 = 0.0f;
+ yield -0.5f;
+ }
+ case SOUTH -> {
+ x1 = 0.0f;
+ yield 0.5f;
+ }
+ case WEST -> {
+ x1 = -0.5f;
+ yield 0.0F;
+ }
+ default -> 0.0f;
+ };
+
+ float progress = (float) Math.max(entity.getRealityTicks() - 100, 0) / 100f;
+ float offset = 0.1f - (float) Math.max(entity.getRealityTicks() - 100, 0) / 1000f;
+ if (entity.getRealityTicks() > 200) {
+ progress -= 400f / entity.getRealityTicks();
+ if (entity.getRealityTicks() > 250) progress = 0;
+ }
+ matrices.translate(0.5f, 0.5f, 0.5f);
+ matrices.translate(x1, 0.0f, z1);
+ if (direction.getAxis().equals(Direction.Axis.X)) {
+ matrices.scale(1.0f, progress, progress);
+ } else {
+ matrices.scale(progress, progress, 1.0f);
+ }
+
+ VertexConsumer vertexConsumer = vertexConsumers.getBuffer(CubliminalRenderLayers.BLOOM);
+ switch (direction) {
+ case NORTH -> renderNorth(matrices, vertexConsumer, offset, light);
+ case WEST -> renderWest(matrices, vertexConsumer, offset, light);
+ case EAST -> renderEast(matrices, vertexConsumer, offset, light);
+ default -> renderSouth(matrices, vertexConsumer, offset, light);
+ }
+
+ matrices.pop();
+ }
+
+ }
+
+ private void renderNorth(MatrixStack matrices, VertexConsumer vertexConsumer, float offset, int light) {
+ Matrix4f positionMatrix = matrices.peek().getPositionMatrix();
+ vertexConsumer.vertex(positionMatrix, 0.1f, -0.1f + offset, 0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.1f, -0.1f + offset, 0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.1f, 0.1f + offset, 0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.1f, 0.1f + offset, 0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ }
+
+ private void renderWest(MatrixStack matrices, VertexConsumer vertexConsumer, float offset, int light) {
+ Matrix4f positionMatrix = matrices.peek().getPositionMatrix();
+ vertexConsumer.vertex(positionMatrix, 0.12f, -0.1f + offset, -0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.12f, -0.1f + offset, 0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.12f, 0.1f + offset, 0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.12f, 0.1f + offset, -0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ }
+
+ private void renderEast(MatrixStack matrices, VertexConsumer vertexConsumer, float offset, int light) {
+ Matrix4f positionMatrix = matrices.peek().getPositionMatrix();
+ vertexConsumer.vertex(positionMatrix, -0.12f, -0.1f + offset, 0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.12f, -0.1f + offset, -0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.12f, 0.1f + offset, -0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.12f, 0.1f + offset, 0.1f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ }
+
+ private void renderSouth(MatrixStack matrices, VertexConsumer vertexConsumer, float offset, int light) {
+ Matrix4f positionMatrix = matrices.peek().getPositionMatrix();
+ vertexConsumer.vertex(positionMatrix, -0.1f, -0.1f + offset, -0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.1f, -0.1f + offset, -0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, 0.1f, 0.1f + offset, -0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ vertexConsumer.vertex(positionMatrix, -0.1f, 0.1f + offset, -0.12f)
+ .color(1.0f, 1.0f, 1.0f, 1.0f).light(light);
+ }
+}
diff --git a/src/main/java/net/limit/cubliminal/client/render/ManilaGatewayRenderer.java b/src/main/java/net/limit/cubliminal/client/render/ManilaGatewayRenderer.java
index 4973791..58b3ff6 100644
--- a/src/main/java/net/limit/cubliminal/client/render/ManilaGatewayRenderer.java
+++ b/src/main/java/net/limit/cubliminal/client/render/ManilaGatewayRenderer.java
@@ -3,9 +3,9 @@
import com.mojang.blaze3d.systems.RenderSystem;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
-import net.limit.cubliminal.CubliminalClient;
import net.limit.cubliminal.block.custom.TheLobbyGatewayBlock;
import net.limit.cubliminal.block.entity.TheLobbyGatewayBlockEntity;
+import net.limit.cubliminal.client.CubliminalRenderLayers;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.render.*;
@@ -31,7 +31,7 @@ public void render(TheLobbyGatewayBlockEntity entity, float tickDelta, MatrixSta
MinecraftClient client = MinecraftClient.getInstance();
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(getLayer());
- ShaderProgram shader = RenderSystem.setShader(CubliminalClient.RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX);
+ ShaderProgram shader = RenderSystem.setShader(CubliminalRenderLayers.RENDERTYPE_CUBLIMINAL_MANILA_SKYBOX);
Matrix4f positionMatrix = matrices.peek().getPositionMatrix();
@@ -65,6 +65,6 @@ private void renderSide(TheLobbyGatewayBlockEntity entity, Matrix4f model, Verte
}
public RenderLayer getLayer() {
- return CubliminalClient.MANILA;
+ return CubliminalRenderLayers.MANILA;
}
}
diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalBlockEntities.java b/src/main/java/net/limit/cubliminal/init/CubliminalBlockEntities.java
index 445416b..0c99867 100644
--- a/src/main/java/net/limit/cubliminal/init/CubliminalBlockEntities.java
+++ b/src/main/java/net/limit/cubliminal/init/CubliminalBlockEntities.java
@@ -6,7 +6,6 @@
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
-import net.minecraft.util.Identifier;
public class CubliminalBlockEntities {
@@ -17,6 +16,9 @@ public static > T register(String id, T blockEntity
public static final BlockEntityType THE_LOBBY_GATEWAY_BLOCK_ENTITY =
register("the_lobby_gateway_block", FabricBlockEntityTypeBuilder.create(TheLobbyGatewayBlockEntity::new, CubliminalBlocks.THE_LOBBY_GATEWAY_BLOCK).build());
+ public static final BlockEntityType FLUX_CAPACITOR_BLOCK_ENTITY =
+ register("flux_capacitor", FabricBlockEntityTypeBuilder.create(FluxCapacitorBlockEntity::new, CubliminalBlocks.FLUX_CAPACITOR).build());
+
public static final BlockEntityType SINK_BLOCK_ENTITY =
register("sink", FabricBlockEntityTypeBuilder.create(SinkBlockEntity::new, CubliminalBlocks.SINK).build());
diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java b/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java
index 15851e1..eeb8c85 100644
--- a/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java
+++ b/src/main/java/net/limit/cubliminal/init/CubliminalBlocks.java
@@ -268,6 +268,11 @@ private static Block register(String id, Function
.noBlockBreakParticles()
.luminance(createLightLevelFromLitBlockState(9)));
+ public static final Block FLUX_CAPACITOR = register("flux_capacitor", FluxCapacitorBlock::new,
+ AbstractBlock.Settings.copy(Blocks.OBSIDIAN)
+ .mapColor(MapColor.GRAY)
+ .luminance(isPowered(10)));
+
public static final Block GABBRO = register("gabbro", Block::new,
AbstractBlock.Settings.copy(Blocks.STONE)
.mapColor(MapColor.BLACK)
@@ -307,6 +312,10 @@ public static ToIntFunction shouldBeRed(int defaultLevel, int redLev
};
}
+ public static ToIntFunction isPowered(int litLevel) {
+ return (state) -> state.get(Properties.POWERED) ? litLevel : 0;
+ }
+
public static void init() {
diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java b/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java
index ba16be3..acb7e62 100644
--- a/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java
+++ b/src/main/java/net/limit/cubliminal/init/CubliminalItemGroups.java
@@ -46,6 +46,7 @@ public class CubliminalItemGroups {
entries.add(CubliminalBlocks.SHOWER);
entries.add(CubliminalItems.WOODEN_PLANK);
entries.add(CubliminalItems.NAILED_BAT);
+ entries.add(CubliminalBlocks.FLUX_CAPACITOR);
}).build());
diff --git a/src/main/java/net/limit/cubliminal/init/CubliminalSounds.java b/src/main/java/net/limit/cubliminal/init/CubliminalSounds.java
index e399f1b..f6877c5 100644
--- a/src/main/java/net/limit/cubliminal/init/CubliminalSounds.java
+++ b/src/main/java/net/limit/cubliminal/init/CubliminalSounds.java
@@ -33,6 +33,7 @@ private static RegistryEntry.Reference registerSoundEvent(String id)
public static final RegistryEntry.Reference WALL_CLIPPING = registerSoundEvent("wall_clipping");
public static final RegistryEntry.Reference OPEN_SINK = registerSoundEvent("block.sink_open");
public static final RegistryEntry.Reference SINK_AMBIENT = registerSoundEvent("block.sink.ambient");
+ public static final RegistryEntry.Reference FLUX_CAPACITOR = registerSoundEvent("block.flux_capacitor");
public static void clientPlaySoundSingle(ServerPlayerEntity target, RegistryEntry sound, SoundCategory category, double x, double y, double z, float volume, float pitch, long seed) {
diff --git a/src/main/java/net/limit/cubliminal/mixin/client/LightningEntityRendererMixin.java b/src/main/java/net/limit/cubliminal/mixin/client/LightningEntityRendererMixin.java
deleted file mode 100644
index fa783ee..0000000
--- a/src/main/java/net/limit/cubliminal/mixin/client/LightningEntityRendererMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.limit.cubliminal.mixin.client;
-
-import net.minecraft.client.render.entity.LightningEntityRenderer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-@Mixin(LightningEntityRenderer.class)
-public class LightningEntityRendererMixin {
-
- @ModifyVariable(method = "drawBranch", at = @At("HEAD"), ordinal = 4, argsOnly = true)
- private static float red(float value) {
- return 0.435f;
- }
-
- @ModifyVariable(method = "drawBranch", at = @At("HEAD"), ordinal = 5, argsOnly = true)
- private static float green(float value) {
- return 0.012f;
- }
-
- @ModifyVariable(method = "drawBranch", at = @At("HEAD"), ordinal = 6, argsOnly = true)
- private static float blue(float value) {
- return 0.988f;
- }
-
-}
diff --git a/src/main/java/net/limit/cubliminal/util/SanityManager.java b/src/main/java/net/limit/cubliminal/util/SanityManager.java
index 8074caf..dff0665 100644
--- a/src/main/java/net/limit/cubliminal/util/SanityManager.java
+++ b/src/main/java/net/limit/cubliminal/util/SanityManager.java
@@ -1,7 +1,6 @@
package net.limit.cubliminal.util;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.limit.cubliminal.Cubliminal;
import net.limit.cubliminal.init.CubliminalBiomes;
import net.limit.cubliminal.init.CubliminalEffects;
import net.limit.cubliminal.init.CubliminalPackets;
diff --git a/src/main/resources/assets/cubliminal/blockstates/flux_capacitor.json b/src/main/resources/assets/cubliminal/blockstates/flux_capacitor.json
new file mode 100644
index 0000000..92c86e9
--- /dev/null
+++ b/src/main/resources/assets/cubliminal/blockstates/flux_capacitor.json
@@ -0,0 +1,34 @@
+{
+ "variants": {
+ "powered=true,facing=north": {
+ "model": "cubliminal:block/flux_capacitor_on"
+ },
+ "powered=true,facing=east": {
+ "model": "cubliminal:block/flux_capacitor_on",
+ "y": 90
+ },
+ "powered=true,facing=west": {
+ "model": "cubliminal:block/flux_capacitor_on",
+ "y": 270
+ },
+ "powered=true,facing=south": {
+ "model": "cubliminal:block/flux_capacitor_on",
+ "y": 180
+ },
+ "powered=false,facing=north": {
+ "model": "cubliminal:block/flux_capacitor_off"
+ },
+ "powered=false,facing=east": {
+ "model": "cubliminal:block/flux_capacitor_off",
+ "y": 90
+ },
+ "powered=false,facing=west": {
+ "model": "cubliminal:block/flux_capacitor_off",
+ "y": 270
+ },
+ "powered=false,facing=south": {
+ "model": "cubliminal:block/flux_capacitor_off",
+ "y": 180
+ }
+ }
+}
diff --git a/src/main/resources/assets/cubliminal/lang/en_us.json b/src/main/resources/assets/cubliminal/lang/en_us.json
index 23a41b2..7867d88 100644
--- a/src/main/resources/assets/cubliminal/lang/en_us.json
+++ b/src/main/resources/assets/cubliminal/lang/en_us.json
@@ -34,6 +34,7 @@
"item.cubliminal.pool_tile_slab": "Pool Tile Slab",
"item.cubliminal.pool_tile_wall": "Pool Tile Wall",
"item.cubliminal.the_lobby_gateway_block": "The Lobby Gateway Block",
+ "item.cubliminal.flux_capacitor": "Flux Capacitor",
"item.cubliminal.emergency_exit_door_0": "Emergency Exit Door (0)",
"item.cubliminal.exit_sign": "Exit Sign",
"commands.noclip.success.multiple": "Noclipping %s players",
@@ -57,6 +58,7 @@
"subtitle.noclipping": "Null",
"subtitle.block.sink_open": "Squeak",
"subtitle.block.sink_ambient": "Open water source",
+ "subtitle.block.flux_capacitor": "Energy accumulates",
"text.autoconfig.cubliminal.title": "Cubliminal",
"text.autoconfig.cubliminal.option.disableAggressiveGraphics": "Disable abrupt changes in graphics"
}
diff --git a/src/main/resources/assets/cubliminal/models/block/flux_capacitor_off.json b/src/main/resources/assets/cubliminal/models/block/flux_capacitor_off.json
new file mode 100644
index 0000000..61fbba4
--- /dev/null
+++ b/src/main/resources/assets/cubliminal/models/block/flux_capacitor_off.json
@@ -0,0 +1,102 @@
+{
+ "parent": "block/cube_all",
+ "texture_size": [64, 64],
+ "textures": {
+ "0": "cubliminal:block/flux_capacitor_off",
+ "2": "cubliminal:block/flux_capacitor_in_off",
+ "particle": "cubliminal:block/flux_capacitor_off"
+ },
+ "elements": [
+ {
+ "from": [0, 0, 0],
+ "to": [16, 16, 16],
+ "faces": {
+ "north": {"uv": [0, 0, 4, 4], "texture": "#0"},
+ "east": {"uv": [0, 4, 4, 8], "texture": "#0"},
+ "south": {"uv": [4, 0, 8, 4], "texture": "#0"},
+ "west": {"uv": [4, 4, 8, 8], "texture": "#0"},
+ "up": {"uv": [4, 12, 0, 8], "texture": "#0"},
+ "down": {"uv": [12, 0, 8, 4], "texture": "#0"}
+ }
+ },
+ {
+ "from": [13, 2, 0.1],
+ "to": [14, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 0]},
+ "faces": {
+ "north": {"uv": [5.5, 1.5, 5.75, 4.5], "texture": "#2"},
+ "east": {"uv": [3, 5, 3.5, 8], "texture": "#2"},
+ "south": {"uv": [5, 5.5, 5.25, 8.5], "texture": "#2"},
+ "west": {"uv": [3.5, 5, 4, 8], "texture": "#2"},
+ "up": {"uv": [6.25, 3.25, 6, 2.75], "texture": "#2"},
+ "down": {"uv": [6.25, 3.25, 6, 3.75], "texture": "#2"}
+ }
+ },
+ {
+ "from": [2, 2, 0.1],
+ "to": [3, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 0]},
+ "faces": {
+ "north": {"uv": [5.25, 5.5, 5.5, 8.5], "texture": "#2"},
+ "east": {"uv": [4, 5, 4.5, 8], "texture": "#2"},
+ "south": {"uv": [5.5, 5.5, 5.75, 8.5], "texture": "#2"},
+ "west": {"uv": [4.5, 5, 5, 8], "texture": "#2"},
+ "up": {"uv": [6.25, 4.25, 6, 3.75], "texture": "#2"},
+ "down": {"uv": [6.25, 5.5, 6, 6], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 2, 0.1],
+ "to": [13, 3, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 1, 0]},
+ "faces": {
+ "north": {"uv": [0, 6, 2.5, 6.25], "texture": "#2"},
+ "east": {"uv": [6, 4.25, 6.5, 4.5], "texture": "#2"},
+ "south": {"uv": [6, 1.5, 8.5, 1.75], "texture": "#2"},
+ "west": {"uv": [6, 6, 6.5, 6.25], "texture": "#2"},
+ "up": {"uv": [7.5, 5.5, 5, 5], "texture": "#2"},
+ "down": {"uv": [8, 0, 5.5, 0.5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 13, 0.1],
+ "to": [13, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 0]},
+ "faces": {
+ "north": {"uv": [6, 1.75, 8.5, 2], "texture": "#2"},
+ "east": {"uv": [0, 6.25, 0.5, 6.5], "texture": "#2"},
+ "south": {"uv": [6, 2, 8.5, 2.25], "texture": "#2"},
+ "west": {"uv": [0.5, 6.25, 1, 6.5], "texture": "#2"},
+ "up": {"uv": [8, 1, 5.5, 0.5], "texture": "#2"},
+ "down": {"uv": [8, 1, 5.5, 1.5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [2, 2, 2],
+ "to": [14, 14, 3],
+ "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 2]},
+ "faces": {
+ "north": {"uv": [0, 0, 3, 3], "texture": "#2"},
+ "east": {"uv": [5.75, 1.5, 6, 4.5], "texture": "#2"},
+ "south": {"uv": [0, 3, 3, 6], "texture": "#2"},
+ "west": {"uv": [5.75, 5.5, 6, 8.5], "texture": "#2"},
+ "up": {"uv": [8.5, 4.75, 5.5, 4.5], "texture": "#2"},
+ "down": {"uv": [8.5, 4.75, 5.5, 5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 3, 1.9],
+ "to": [13, 13, 2.9],
+ "light_emission": 15,
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 3, 0.9]},
+ "faces": {
+ "north": {"uv": [3, 0, 5.5, 2.5], "texture": "#2"},
+ "east": {"uv": [2.5, 6, 2.75, 8.5], "texture": "#2"},
+ "south": {"uv": [3, 2.5, 5.5, 5], "texture": "#2"},
+ "west": {"uv": [2.75, 6, 3, 8.5], "texture": "#2"},
+ "up": {"uv": [8.5, 2.5, 6, 2.25], "texture": "#2"},
+ "down": {"uv": [8.5, 2.5, 6, 2.75], "texture": "#2"}
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/cubliminal/models/block/flux_capacitor_on.json b/src/main/resources/assets/cubliminal/models/block/flux_capacitor_on.json
new file mode 100644
index 0000000..c500002
--- /dev/null
+++ b/src/main/resources/assets/cubliminal/models/block/flux_capacitor_on.json
@@ -0,0 +1,101 @@
+{
+ "texture_size": [64, 64],
+ "textures": {
+ "0": "cubliminal:block/flux_capacitor_on",
+ "2": "cubliminal:block/flux_capacitor_in_on",
+ "particle": "cubliminal:block/flux_capacitor_on"
+ },
+ "elements": [
+ {
+ "from": [0, 0, 0],
+ "to": [16, 16, 16],
+ "faces": {
+ "north": {"uv": [0, 0, 4, 4], "texture": "#0"},
+ "east": {"uv": [0, 4, 4, 8], "texture": "#0"},
+ "south": {"uv": [4, 0, 8, 4], "texture": "#0"},
+ "west": {"uv": [4, 4, 8, 8], "texture": "#0"},
+ "up": {"uv": [4, 12, 0, 8], "texture": "#0"},
+ "down": {"uv": [12, 0, 8, 4], "texture": "#0"}
+ }
+ },
+ {
+ "from": [13, 2, 0.1],
+ "to": [14, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 0]},
+ "faces": {
+ "north": {"uv": [5.5, 1.5, 5.75, 4.5], "texture": "#2"},
+ "east": {"uv": [3, 5, 3.5, 8], "texture": "#2"},
+ "south": {"uv": [5, 5.5, 5.25, 8.5], "texture": "#2"},
+ "west": {"uv": [3.5, 5, 4, 8], "texture": "#2"},
+ "up": {"uv": [6.25, 3.25, 6, 2.75], "texture": "#2"},
+ "down": {"uv": [6.25, 3.25, 6, 3.75], "texture": "#2"}
+ }
+ },
+ {
+ "from": [2, 2, 0.1],
+ "to": [3, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [1, 3, 0]},
+ "faces": {
+ "north": {"uv": [5.25, 5.5, 5.5, 8.5], "texture": "#2"},
+ "east": {"uv": [4, 5, 4.5, 8], "texture": "#2"},
+ "south": {"uv": [5.5, 5.5, 5.75, 8.5], "texture": "#2"},
+ "west": {"uv": [4.5, 5, 5, 8], "texture": "#2"},
+ "up": {"uv": [6.25, 4.25, 6, 3.75], "texture": "#2"},
+ "down": {"uv": [6.25, 5.5, 6, 6], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 2, 0.1],
+ "to": [13, 3, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 1, 0]},
+ "faces": {
+ "north": {"uv": [0, 6, 2.5, 6.25], "texture": "#2"},
+ "east": {"uv": [6, 4.25, 6.5, 4.5], "texture": "#2"},
+ "south": {"uv": [6, 1.5, 8.5, 1.75], "texture": "#2"},
+ "west": {"uv": [6, 6, 6.5, 6.25], "texture": "#2"},
+ "up": {"uv": [7.5, 5.5, 5, 5], "texture": "#2"},
+ "down": {"uv": [8, 0, 5.5, 0.5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 13, 0.1],
+ "to": [13, 14, 2],
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 0]},
+ "faces": {
+ "north": {"uv": [6, 1.75, 8.5, 2], "texture": "#2"},
+ "east": {"uv": [0, 6.25, 0.5, 6.5], "texture": "#2"},
+ "south": {"uv": [6, 2, 8.5, 2.25], "texture": "#2"},
+ "west": {"uv": [0.5, 6.25, 1, 6.5], "texture": "#2"},
+ "up": {"uv": [8, 1, 5.5, 0.5], "texture": "#2"},
+ "down": {"uv": [8, 1, 5.5, 1.5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [2, 2, 2],
+ "to": [14, 14, 3],
+ "rotation": {"angle": 0, "axis": "y", "origin": [2, 2, 2]},
+ "faces": {
+ "north": {"uv": [0, 0, 3, 3], "texture": "#2"},
+ "east": {"uv": [5.75, 1.5, 6, 4.5], "texture": "#2"},
+ "south": {"uv": [0, 3, 3, 6], "texture": "#2"},
+ "west": {"uv": [5.75, 5.5, 6, 8.5], "texture": "#2"},
+ "up": {"uv": [8.5, 4.75, 5.5, 4.5], "texture": "#2"},
+ "down": {"uv": [8.5, 4.75, 5.5, 5], "texture": "#2"}
+ }
+ },
+ {
+ "from": [3, 3, 1.9],
+ "to": [13, 13, 2.9],
+ "light_emission": 15,
+ "rotation": {"angle": 0, "axis": "y", "origin": [11, 3, 0.9]},
+ "faces": {
+ "north": {"uv": [3, 0, 5.5, 2.5], "texture": "#2"},
+ "east": {"uv": [2.5, 6, 2.75, 8.5], "texture": "#2"},
+ "south": {"uv": [3, 2.5, 5.5, 5], "texture": "#2"},
+ "west": {"uv": [2.75, 6, 3, 8.5], "texture": "#2"},
+ "up": {"uv": [8.5, 2.5, 6, 2.25], "texture": "#2"},
+ "down": {"uv": [8.5, 2.5, 6, 2.75], "texture": "#2"}
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/cubliminal/models/item/flux_capacitor.json b/src/main/resources/assets/cubliminal/models/item/flux_capacitor.json
new file mode 100644
index 0000000..37a9068
--- /dev/null
+++ b/src/main/resources/assets/cubliminal/models/item/flux_capacitor.json
@@ -0,0 +1,3 @@
+{
+ "parent": "cubliminal:block/flux_capacitor_off"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/cubliminal/sounds.json b/src/main/resources/assets/cubliminal/sounds.json
index 6e79f72..5eb96f4 100644
--- a/src/main/resources/assets/cubliminal/sounds.json
+++ b/src/main/resources/assets/cubliminal/sounds.json
@@ -69,5 +69,14 @@
}
],
"subtitle": "subtitle.block.sink_ambient"
+ },
+ "block.flux_capacitor": {
+ "category": "blocks",
+ "sounds": [
+ {
+ "name": "cubliminal:block/flux_capacitor"
+ }
+ ],
+ "subtitle": "subtitle.block.flux_capacitor"
}
}
diff --git a/src/main/resources/assets/cubliminal/sounds/block/flux_capacitor.ogg b/src/main/resources/assets/cubliminal/sounds/block/flux_capacitor.ogg
new file mode 100644
index 0000000..6a10bda
Binary files /dev/null and b/src/main/resources/assets/cubliminal/sounds/block/flux_capacitor.ogg differ
diff --git a/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_off.png b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_off.png
new file mode 100644
index 0000000..b6270a0
Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_off.png differ
diff --git a/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png
new file mode 100644
index 0000000..ebdb4c0
Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png differ
diff --git a/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png.mcmeta b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png.mcmeta
new file mode 100644
index 0000000..78df88c
--- /dev/null
+++ b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_in_on.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 1
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_off.png b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_off.png
new file mode 100644
index 0000000..9c2b204
Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_off.png differ
diff --git a/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_on.png b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_on.png
new file mode 100644
index 0000000..33adfd3
Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/flux_capacitor_on.png differ
diff --git a/src/main/resources/assets/minecraft/shaders/core/bloom_dot.fsh b/src/main/resources/assets/minecraft/shaders/core/bloom_dot.fsh
new file mode 100644
index 0000000..9c11b87
--- /dev/null
+++ b/src/main/resources/assets/minecraft/shaders/core/bloom_dot.fsh
@@ -0,0 +1,67 @@
+#version 150
+
+uniform sampler2D Sampler0;
+uniform sampler2D Sampler1;
+uniform sampler2D Sampler2;
+uniform sampler2D Sampler3;
+uniform sampler2D Sampler4;
+uniform sampler2D Sampler5;
+
+uniform float FogStart;
+uniform float FogEnd;
+uniform vec4 FogColor;
+
+uniform mat4 ProjMat;
+uniform mat4 ModelViewMat;
+
+
+in float vertexDistance;
+in vec4 vertexColor;
+in vec2 texCoord0;
+
+out vec4 fragColor;
+
+void main() {
+ //*********** Basic setup **********
+
+ // Normalized pixel coordinates (from 0 to 1)
+ vec2 uv = gl_FragCoord.xy/vertexDistance/10.0;
+ // Position of fragment relative to centre of screen
+ vec2 pos = 0.5 - uv;
+ // Adjust y by aspect for uniform transforms
+ pos.y /= vertexDistance/vertexDistance;
+
+ //********** Glow **********
+
+ // Equation 1/x gives a hyperbola which is a nice shape to use for drawing glow as
+ // it is intense near 0 followed by a rapid fall off and an eventual slow fade
+ float dist = 1.0/length(pos);
+
+ //********** Radius **********
+
+ // Dampen the glow to control the radius
+ dist *= 300;
+
+ //********** Intensity **********
+
+ // Raising the result to a power allows us to change the glow fade behaviour
+ // See https://www.desmos.com/calculator/eecd6kmwy9 for an illustration
+ // (Move the slider of m to see different fade rates)
+ dist = pow(dist, 0.8);
+
+ // Knowing the distance from a fragment to the source of the glow, the above can be
+ // written compactly as:
+ // float getGlow(float dist, float radius, float intensity){
+ // return pow(radius/dist, intensity);
+ // }
+ // The returned value can then be multiplied with a colour to get the final result
+
+ // Add colour
+ vec3 col = dist * vec3(1.0);
+
+ // Tonemapping. See comment by P_Malin
+ col = 1.0 - exp( -col );
+
+ // Output to screen
+ fragColor = vec4(col, 1.0);
+}
diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_bloom_dot.json b/src/main/resources/assets/minecraft/shaders/core/rendertype_bloom_dot.json
new file mode 100644
index 0000000..fad1abd
--- /dev/null
+++ b/src/main/resources/assets/minecraft/shaders/core/rendertype_bloom_dot.json
@@ -0,0 +1,26 @@
+{
+ "vertex": "minecraft:core/terrain",
+ "fragment": "minecraft:core/bloom_dot",
+ "attributes": [
+ "Position",
+ "Color"
+ ],
+ "samplers": [
+ { "name": "Sampler0" },
+ { "name": "Sampler1" },
+ { "name": "Sampler2" },
+ { "name": "Sampler3" },
+ { "name": "Sampler4" },
+ { "name": "Sampler5" }
+ ],
+ "uniforms": [
+ { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
+ { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
+ { "name": "ModelOffset", "type": "float", "count": 3, "values": [ 0.0, 0.0, 0.0 ] },
+ { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
+ { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
+ { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
+ { "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+ { "name": "FogShape", "type": "int", "count": 1, "values": [ 0 ] }
+ ]
+}
diff --git a/src/main/resources/cubliminal.mixins.json b/src/main/resources/cubliminal.mixins.json
index 7ad21a5..68f4ca2 100644
--- a/src/main/resources/cubliminal.mixins.json
+++ b/src/main/resources/cubliminal.mixins.json
@@ -11,8 +11,7 @@
"client.ClientPlayerEntityMixin",
"client.EntityRenderDispatcherMixin",
"client.GameRendererMixin",
- "client.ItemRendererMixin",
- "client.LightningEntityRendererMixin",
+ "client.ItemRendererMixin"
],
"injectors": {
"defaultRequire": 1