diff --git a/.gitignore b/.gitignore
index dd87e57..cac7220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,7 +116,7 @@ gradle-app.setting
/run/*
!/run/resourcepacks
/run/resourcepacks/*
-!/run/resourcepacks/lumi
+!/run/resourcepacks/testpack
!/run/saves
/run/saves/*
!/run/saves/New World
diff --git a/build.gradle b/build.gradle
index 60c17cb..a947e32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,28 +6,23 @@ repositories {
maven { url = "https://maven.dblsaiko.net/"; name = "Canvas" }
maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" }
maven { url = "https://minecraft.curseforge.com/api/maven"; name = "CurseForge (for canvas)" }
+ maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" }
}
dependencies {
- //to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
- // Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:0.38.2+1.17"
-
modImplementation "com.terraformersmc:modmenu:2.0.5"
-
+ download("https://gitlab.com/jfmods/LibJF/-/jobs/artifacts/master/raw/latest-dev.jar?job=build_test", "libjf")
+ include modImplementation("com.github.MeteorDevelopment:starscript:0.1.5")
modApi("me.shedaniel.cloth:cloth-config-fabric:5.0.38")
-
modCompileOnly "grondag:frex-mc117:+"
- /*TODO re-enable after canvas works on 1.17.1
modRuntime("grondag:canvas-mc117-1.17:+") {
exclude(group: "me.shedaniel.cloth")
- }*/
-
- download("https://gitlab.com/jfmods/LibJF/-/jobs/artifacts/master/raw/latest-dev.jar?job=build_test", "libjf")
+ }
testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
}
diff --git a/run/resourcepacks/lumi/COPYING b/run/resourcepacks/lumi/COPYING
deleted file mode 100644
index f288702..0000000
--- a/run/resourcepacks/lumi/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- 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
-.
diff --git a/run/resourcepacks/lumi/COPYING.LESSER b/run/resourcepacks/lumi/COPYING.LESSER
deleted file mode 100644
index 0a04128..0000000
--- a/run/resourcepacks/lumi/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER 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.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/run/resourcepacks/lumi/README.md b/run/resourcepacks/lumi/README.md
deleted file mode 100644
index fc265f0..0000000
--- a/run/resourcepacks/lumi/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Lumi Lights
-[Lumi Lights](https://github.com/spiralhalo/LumiLights) by [spiralhalo](https://github.com/spiralhalo/LumiLights) is a shader for canvas.\
-This modified version uses respackopts for configuration instead of forcing the user to edit glsl
\ No newline at end of file
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag
deleted file mode 100644
index c49a71a..0000000
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************
- * Lumi Lights - Shader pack for Canvas *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-#include canvas:shaders/internal/header.glsl
-#include canvas:shaders/internal/varying.glsl
-#include canvas:shaders/internal/diffuse.glsl
-#include canvas:shaders/internal/flags.glsl
-#include canvas:shaders/internal/fog.glsl
-#include canvas:shaders/internal/program.glsl
-#include frex:shaders/api/world.glsl
-#include frex:shaders/api/camera.glsl
-#include frex:shaders/api/player.glsl
-#include frex:shaders/api/material.glsl
-#include frex:shaders/api/fragment.glsl
-#include frex:shaders/api/sampler.glsl
-#include frex:shaders/lib/math.glsl
-#include frex:shaders/lib/color.glsl
-#include respackopts:config_supplier
-#include lumi:shaders/api/pbr_frag.glsl
-#include lumi:shaders/api/context_bump.glsl
-#include lumi:shaders/lib/pbr.glsl
-#include lumi:shaders/internal/varying.glsl
-#include lumi:shaders/internal/main_frag.glsl
-#include lumi:shaders/internal/lightsource.glsl
-#include lumi:shaders/internal/tonemap.glsl
-#include lumi:shaders/internal/pbr_shading.glsl
-#include lumi:shaders/internal/phong_shading.glsl
-#include lumi:shaders/internal/skybloom.glsl
-#include lumi:shaders/internal/debug_shading.glsl
-
-#include canvas:apitarget
-
-/******************************************************
- canvas:shaders/internal/material_main.frag
-******************************************************/
-
-void _cv_startFragment(inout frx_FragmentData data) {
- int cv_programId = _cv_fragmentProgramId();
-#include canvas:startfragment
-}
-
-void main() {
-#ifndef PROGRAM_BY_UNIFORM
- if (_cv_programDiscard()) {
- discard;
- }
-#endif
-
- frx_FragmentData fragData = frx_FragmentData (
- texture2D(frxs_spriteAltas, _cvv_texcoord, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0),
- _cvv_color,
- frx_matEmissive() ? 1.0 : 0.0,
- !frx_matDisableDiffuse(),
- !frx_matDisableAo(),
- _cvv_normal,
- _cvv_lightcoord
- );
-
-#ifdef lumi_pbr
- pbr_roughness = 1.0;
- pbr_metallic = 0.0;
- pbr_f0 = vec3(-1.0);
-#else
- ww_specular = 0.0;
-#endif
-
- _cv_startFragment(fragData);
-
- vec4 a = clamp(fragData.spriteColor * fragData.vertexColor, 0.0, 1.0);
- float bloom = fragData.emissivity; // separate bloom from emissivity
- bool translucent = _cv_getFlag(_CV_FLAG_CUTOUT) == 0.0 && a.a < 0.99;
-
- if(frx_isGui()){
-#if DIFFUSE_SHADING_MODE != DIFFUSE_MODE_NONE
- if(fragData.diffuse){
- float diffuse = mix(_cvv_diffuse, 1, fragData.emissivity);
- vec3 shading = mix(vec3(0.5, 0.4, 0.8) * diffuse * diffuse, vec3(1.0), diffuse);
- a.rgb *= shading;
- }
-#endif
- } else {
-#if lumi_debugMode != lumi_debugMode_none
- debug_shading(a);
-#else
- float userBrightness;
- float brightnessBase = texture2D(frxs_lightmap, vec2(0.03125, 0.03125)).r;
- if(frx_worldHasSkylight()){
- userBrightness = smoothstep(0.053, 0.135, brightnessBase);
- } else {
- // simplified for both nether and the end
- userBrightness = smoothstep(0.15, 0.63, brightnessBase);
- // if(frx_isWorldTheNether()){
- // userBrightness = smoothstep(0.15/*0.207 no true darkness in nether*/, 0.577, brightnessBase);
- // } else if (frx_isWorldTheEnd(){
- // userBrightness = smoothstep(0.18/*0.271 no true darkness in the end*/, 0.685, brightnessBase);
- // }
- }
- #ifdef lumi_pbr
- pbr_shading(fragData, a, bloom, userBrightness, translucent);
- #else
- phong_shading(fragData, a, bloom, userBrightness, translucent);
- #endif
-#endif
- }
-
- // PERF: varyings better here?
- if (_cv_getFlag(_CV_FLAG_CUTOUT) == 1.0) {
- float t = _cv_getFlag(_CV_FLAG_TRANSLUCENT_CUTOUT) == 1.0 ? _CV_TRANSLUCENT_CUTOUT_THRESHOLD : 0.5;
-
- if (a.a < t) {
- discard;
- }
- }
-
- // PERF: varyings better here?
- if (_cv_getFlag(_CV_FLAG_FLASH_OVERLAY) == 1.0) {
- a = a * 0.25 + 0.75;
- } else if (_cv_getFlag(_CV_FLAG_HURT_OVERLAY) == 1.0) {
- a = vec4(0.25 + a.r * 0.75, a.g * 0.75, a.b * 0.75, a.a);
- }
-
- // TODO: need a separate fog pass?
- gl_FragData[TARGET_BASECOLOR] = _cv_fog(a);
- gl_FragDepth = gl_FragCoord.z;
-
-#if TARGET_EMISSIVE > 0
- translucent = translucent && a.a < 0.99;
- gl_FragData[TARGET_EMISSIVE] = vec4(bloom * a.a, 1.0, 0.0, translucent ? step(hdr_skyBloom, bloom) : 1.0);
-#endif
-}
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert b/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert
deleted file mode 100644
index d5b5338..0000000
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************************************
- * Derived from Canvas (https://github.com/grondag/canvas) material_main shader, Apache 2.0 license. *
- * Modified to add PBR varyings and support for texture-based bump map generation. *
- * The modifications are licensed under the GNU Lesser General Public License version 3. *
- ******************************************************************************************************/
-
-#include canvas:shaders/internal/header.glsl
-#include canvas:shaders/internal/varying.glsl
-#include canvas:shaders/internal/vertex.glsl
-#include canvas:shaders/internal/flags.glsl
-#include canvas:shaders/internal/diffuse.glsl
-#include canvas:shaders/internal/program.glsl
-#include frex:shaders/api/context.glsl
-#include frex:shaders/api/vertex.glsl
-#include frex:shaders/api/sampler.glsl
-#include respackopts:config_supplier
-#include lumi:shaders/api/context_bump.glsl
-#include lumi:shaders/internal/varying.glsl
-#include lumi:shaders/internal/main_vert.glsl
-
-#include canvas:apitarget
-
-/******************************************************
- canvas:shaders/internal/material_main.vert
-******************************************************/
-
-void _cv_startVertex(inout frx_VertexData data, in int cv_programId) {
-#include canvas:startvertex
-}
-
-void _cv_endVertex(inout frx_VertexData data, in int cv_programId) {
-#include canvas:endvertex
-}
-
-void main() {
- frx_VertexData data = frx_VertexData(
- gl_Vertex,
- in_uv,
- in_color,
- (in_normal_flags.xyz - 127.0) / 127.0,
- in_lightmap.rg * 0.00390625 + 0.03125
- );
-
- // Adding +0.5 prevents striping or other strangeness in flag-dependent rendering
- // due to FP error on some cards/drivers. Also made varying attribute invariant (rolls eyes at OpenGL)
- _cvv_flags = uint(in_normal_flags.w + 0.5);
-
- // pbrv_roughness = 1.0;
- // pbrv_metallic = 0.0;
-
- _cv_setupProgram();
-
-#ifdef LUMI_BUMP
- startBump();
-#endif
-
- int cv_programId = _cv_vertexProgramId();
- _cv_startVertex(data, cv_programId);
-
-#ifdef LUMI_BUMP
- setupBump(data);
-#endif
-
- if (_cvu_atlas[_CV_SPRITE_INFO_TEXTURE_SIZE] != 0.0) {
- float spriteIndex = in_material.x;
- // for sprite atlas textures, convert from normalized (0-1) to interpolated coordinates
- vec4 spriteBounds = texture2DLod(frxs_spriteInfo, vec2(0, spriteIndex / _cvu_atlas[_CV_SPRITE_INFO_TEXTURE_SIZE]), 0);
-
- float atlasHeight = _cvu_atlas[_CV_ATLAS_HEIGHT];
- float atlasWidth = _cvu_atlas[_CV_ATLAS_WIDTH];
-
- // snap sprite bounds to integer coordinates to correct for floating point error
- spriteBounds *= vec4(atlasWidth, atlasHeight, atlasWidth, atlasHeight);
- spriteBounds += vec4(0.5, 0.5, 0.5, 0.5);
- spriteBounds -= fract(spriteBounds);
- spriteBounds /= vec4(atlasWidth, atlasHeight, atlasWidth, atlasHeight);
-
- data.spriteUV = spriteBounds.xy + data.spriteUV * spriteBounds.zw;
-
- #ifdef LUMI_BUMP
- endBump(spriteBounds);
- #endif
- }
-
- data.spriteUV = _cv_textureCoord(data.spriteUV, 0);
-
- vec4 viewCoord = gl_ModelViewMatrix * data.vertex;
- gl_ClipVertex = viewCoord;
- gl_FogFragCoord = length(viewCoord.xyz);
-
- setVaryings(viewCoord);
-
- //data.normal *= gl_NormalMatrix;
- data.vertex = gl_ModelViewProjectionMatrix * data.vertex;
-
- gl_Position = data.vertex;
-
- _cv_endVertex(data, cv_programId);
-
- _cvv_texcoord = data.spriteUV;
- _cvv_color = data.color;
- _cvv_normal = data.normal;
-
-#if DIFFUSE_SHADING_MODE != DIFFUSE_MODE_NONE
- _cvv_diffuse = _cv_diffuse(_cvv_normal);
-#endif
-
-#if AO_SHADING_MODE != AO_MODE_NONE
- _cvv_ao = in_lightmap.b / 255.0;
-#endif
-
- _cvv_lightcoord = data.light;
-}
diff --git a/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag b/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag
deleted file mode 100644
index cac8772..0000000
--- a/run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Derived from Canvas source code (https://github.com/grondag/canvas/)
- *
- * Changes are made to add bloom to sky fragments.
- */
-
-#include canvas:shaders/internal/process/header.glsl
-#include frex:shaders/lib/color.glsl
-#include frex:shaders/lib/sample.glsl
-#include frex:shaders/lib/math.glsl
-#include lumi:shaders/internal/skybloom.glsl
-
-/******************************************************
- canvas:shaders/internal/process/emissive_color.frag
-******************************************************/
-uniform sampler2D _cvu_base;
-uniform sampler2D _cvu_emissive;
-uniform ivec2 _cvu_size;
-
-varying vec2 _cvv_texcoord;
-
-void main() {
- vec4 e = texture2D(_cvu_emissive, _cvv_texcoord);
-
- bool sky = e.g == 0.0;
- float bloom = sky ? hdr_skyBloom : e.r;
-
- vec4 c = frx_fromGamma(texture2D(_cvu_base, _cvv_texcoord));
-
- gl_FragData[0] = vec4(c.rgb * bloom, e.r);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json b/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json
deleted file mode 100644
index f2f96e8..0000000
--- a/run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "blendMode": "translucent",
- "disableAo": true,
- "vertexSource": "lumi:shaders/material/water.vert",
- "fragmentSource": "lumi:shaders/material/water.frag"
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl
deleted file mode 100644
index 7d9bf25..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#define LUMI_PBR_API 1
-
-// API 0
-float pbr_roughness;
-float pbr_metallic;
-
-// API 1
-vec3 pbr_f0;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl
deleted file mode 100644
index 07daee6..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/debug_shading.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-#if lumi_debugMode != lumi_debugMode_none
-void debug_shading(inout vec4 a) {
-#if lumi_debugMode == lumi_debugMode_viewDir
- vec3 viewDir = normalize(-pbrv_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
- a.rgb = viewDir * 0.5 + 0.5;
-#else
- vec3 normal = fragData.vertexNormal * frx_normalModelMatrix();
- a.rgb = normal * 0.5 + 0.5;
-#endif
-}
-#endif
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl
deleted file mode 100644
index 13fb586..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/lightsource.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-#ifdef lumi_pbr
-const float hdr_sunStr = 5;
-const float hdr_moonStr = 0.4;
-const float hdr_blockMinStr = 2;
-const float hdr_blockMaxStr = 3;
-const float hdr_handHeldStr = 1.5;
-const float hdr_skylessStr = 0.2;
-const float hdr_baseMinStr = 0.01;
-const float hdr_baseMaxStr = 0.8;
-const float hdr_emissiveStr = 1;
-const float hdr_relAmbient = 0.2;
-#else
-const float hdr_sunStr = 2;
-const float hdr_moonStr = 0.4;
-const float hdr_blockMinStr = 1.0;
-const float hdr_blockMaxStr = 1.4;
-const float hdr_handHeldStr = 0.9;
-const float hdr_skylessStr = 0.2;
-const float hdr_baseMinStr = 0.0;
-const float hdr_baseMaxStr = 0.25;
-const float hdr_emissiveStr = 1;
-const float hdr_relAmbient = 0.09;
-#endif
-const float hdr_zWobbleDefault = 0.1;
-const vec3 blockColor = vec3(1.0, 0.875, 0.75);
-#if lumi_tonemap == lumi_tonemap_vibrant
-const vec3 sunColor = vec3(1.0, 1.0, 1.0);
-#else
-const vec3 sunColor = vec3(1.0, 1.0, 0.8);
-#endif
-
-/* BLOCK LIGHT
- *******************************************************/
-
-vec3 l2_blockRadiance(float blockLight, float userBrightness) {
- float bl = l2_clampScale(0.03125, 1.0, blockLight);
- bl *= bl * mix(hdr_blockMinStr, hdr_blockMaxStr, userBrightness);
- return hdr_gammaAdjust(bl * blockColor);
-}
-
-/* HELD LIGHT
- *******************************************************/
-
-#if HANDHELD_LIGHT_RADIUS != 0
-vec3 l2_handHeldRadiance() {
- vec4 held = frx_heldLight();
- float hl = l2_clampScale(held.w * HANDHELD_LIGHT_RADIUS, 0.0, gl_FogFragCoord);
- hl *= hl * hdr_handHeldStr;
- return hdr_gammaAdjust(held.rgb * hl);
-}
-#endif
-
-/* EMISSIVE LIGHT
- *******************************************************/
-
-vec3 l2_emissiveRadiance(float emissivity) {
- return vec3(hdr_gammaAdjust(emissivity) * hdr_emissiveStr);
-}
-
-/* SKY AMBIENT LIGHT
- *******************************************************/
-
-float l2_skyLight(float skyLight, float intensity) {
- float sl = l2_clampScale(0.03125, 1.0, skyLight);
- return hdr_gammaAdjust(sl) * intensity;
-}
-
-vec3 l2_ambientColor(float time) {
- vec3 ambientColor = hdr_gammaAdjust(vec3(0.6, 0.9, 1.0)) * hdr_sunStr * hdr_relAmbient;
- vec3 sunriseAmbient = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr * hdr_relAmbient;
- vec3 sunsetAmbient = hdr_gammaAdjust(vec3(1.0, 0.6, 0.2)) * hdr_sunStr * hdr_relAmbient;
- vec3 nightAmbient = hdr_gammaAdjust(vec3(1.0, 1.0, 2.0)) * hdr_moonStr * hdr_relAmbient;
- if(time > 0.94){
- ambientColor = mix(nightAmbient, sunriseAmbient, l2_clampScale(0.94, 0.98, time));
- } else if(time > 0.52){
- ambientColor = mix(sunsetAmbient, nightAmbient, l2_clampScale(0.52, 0.56, time));
- } else if(time > 0.48){
- ambientColor = mix(ambientColor, sunsetAmbient, l2_clampScale(0.48, 0.5, time));
- } else if(time < 0.02){
- ambientColor = mix(ambientColor, sunriseAmbient, l2_clampScale(0.02, 0, time));
- }
- return ambientColor;
-}
-
-vec3 l2_skyAmbient(float skyLight, float time, float intensity) {
- float sa = l2_skyLight(skyLight, intensity) * 2.5;
- return sa * l2_ambientColor(time);
-}
-
-/* SKYLESS LIGHT
- *******************************************************/
-
-vec3 l2_skylessLightColor() {
- return hdr_gammaAdjust(vec3(1.0));
-}
-
-vec3 l2_dimensionColor() {
- if (frx_isWorldTheNether()) {
- float min_col = min(min(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
- float max_col = max(max(gl_Fog.color.rgb.x, gl_Fog.color.rgb.y), gl_Fog.color.rgb.z);
- float sat = 0.0;
- if (max_col != 0.0) {
- sat = (max_col-min_col)/max_col;
- }
-
- return hdr_gammaAdjust(clamp((gl_Fog.color.rgb*(1/max_col))+pow(sat,2)/2, 0.0, 1.0));
- }
- else {
- return hdr_gammaAdjust(vec3(0.8, 0.7, 1.0));
- }
-}
-
-vec3 l2_skylessDarkenedDir() {
- return vec3(0, -0.977358, 0.211593);
-}
-
-vec3 l2_skylessDir() {
- return vec3(0, 0.977358, 0.211593);
-}
-
-vec3 l2_skylessRadiance(float userBrightness) {
- if (frx_worldHasSkylight()) {
- return vec3(0);
- } else {
- return ( frx_isSkyDarkened() ? 0.5 : 1.0 )
- * hdr_skylessStr
- * l2_skylessLightColor()
- * userBrightness;
- }
-}
-
-/* BASE AMBIENT LIGHT
- *******************************************************/
-
-vec3 l2_baseAmbient(float userBrightness){
- if(frx_worldHasSkylight()){
- return vec3(0.1) * mix(hdr_baseMinStr, hdr_baseMaxStr, userBrightness);
- } else {
- return l2_dimensionColor() * mix(hdr_baseMinStr, hdr_baseMaxStr, userBrightness);
- }
-}
-
-/* SUN LIGHT
- *******************************************************/
-
-vec3 l2_sunColor(float time){
- vec3 sunColor = hdr_gammaAdjust(sunColor) * hdr_sunStr;
- vec3 sunriseColor = hdr_gammaAdjust(vec3(1.0, 0.8, 0.4)) * hdr_sunStr;
- vec3 sunsetColor = hdr_gammaAdjust(vec3(1.0, 0.6, 0.4)) * hdr_sunStr;
- if(time > 0.94){
- sunColor = sunriseColor;
- } else if(time > 0.56){
- sunColor = vec3(0); // pitch black at night
- } else if(time > 0.54){
- sunColor = mix(sunsetColor, vec3(0), l2_clampScale(0.54, 0.56, time));
- } else if(time > 0.5){
- sunColor = sunsetColor;
- } else if(time > 0.48){
- sunColor = mix(sunColor, sunsetColor, l2_clampScale(0.48, 0.5, time));
- } else if(time < 0.02){
- sunColor = mix(sunColor, sunriseColor, l2_clampScale(0.02, 0, time));
- }
- return sunColor;
-}
-
-vec3 l2_vanillaSunDir(in float time, float zWobble){
-
- // wrap time to account for sunrise
- time -= (time >= 0.75) ? 1.0 : 0.0;
-
- // supposed offset of sunset/sunrise from 0/12000 daytime. might get better result with datamining?
- float sunHorizonDur = 0.04;
-
- // angle of sun in radians
- float angleRad = l2_clampScale(-sunHorizonDur, 0.5+sunHorizonDur, time) * PI;
-
- return normalize(vec3(cos(angleRad), sin(angleRad), zWobble));
-}
-
-vec3 l2_sunRadiance(float skyLight, in float time, float intensity, float rainGradient){
-
- // wrap time to account for sunrise
- float customTime = (time >= 0.75) ? (time - 1.0) : time;
-
- float customIntensity = l2_clampScale(-0.08, 0.00, customTime);
-
- if(customTime >= 0.25){
- customIntensity = l2_clampScale(0.58, 0.5, customTime);
- }
-
- customIntensity *= mix(1.0, 0.0, rainGradient);
-
- float sl = l2_skyLight(skyLight, max(customIntensity, intensity));
-
- // direct sun light doesn't reach into dark spot as much as sky ambient
- sl = frx_smootherstep(0.5,1.0,sl);
-
- return sl * l2_sunColor(time);
-}
-
-/* MOON LIGHT
- *******************************************************/
-
-vec3 l2_moonDir(float time){
- float aRad = l2_clampScale(0.56, 0.94, time) * PI;
- return normalize(vec3(cos(aRad), sin(aRad), 0));
-}
-
-vec3 l2_moonRadiance(float skyLight, float time, float intensity){
- float ml = l2_skyLight(skyLight, intensity) * frx_moonSize() * hdr_moonStr;
- if(time < 0.58){
- ml *= l2_clampScale(0.54, 0.58, time);
- } else if(time > 0.92){
- ml *= l2_clampScale(0.96, 0.92, time);
- }
- return vec3(ml);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl
deleted file mode 100644
index 913e5fc..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/main_frag.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-const float hdr_finalMult = 1;
-const float hdr_gamma = 2.2;
-
-float hdr_gammaAdjust(float x){
- return pow(x, hdr_gamma);
-}
-
-vec3 hdr_gammaAdjust(vec3 x){
- return pow(x, vec3(hdr_gamma));
-}
-
-float l2_clampScale(float e0, float e1, float v){
- return clamp((v-e0)/(e1-e0), 0.0, 1.0);
-}
-
-float l2_max3(vec3 vec){
- return max(vec.x, max(vec.y, vec.z));
-}
-
-float l2_ao(frx_FragmentData fragData) {
-#if AO_SHADING_MODE != AO_MODE_NONE
- float ao = fragData.ao ? _cvv_ao : 1.0;
- return hdr_gammaAdjust(min(1.0, ao + fragData.emissivity));
-#else
- return 1.0;
-#endif
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl
deleted file mode 100644
index 1df8b39..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/main_vert.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-#ifdef LUMI_BUMP
-float bump_resolution;
-vec2 uvN;
-vec2 uvT;
-vec2 uvB;
-
-void startBump() {
- bump_resolution = 1.0;
-}
-
-void setupBump(frx_VertexData data) {
- float bumpSample = 0.015625 * bump_resolution;
-
- uvN = clamp(data.spriteUV + vec2(-bumpSample, bumpSample), 0.0, 1.0);
- uvT = clamp(data.spriteUV + vec2(bumpSample, 0), 0.0, 1.0);
- uvB = clamp(data.spriteUV - vec2(0, bumpSample), 0.0, 1.0);
-}
-
-void endBump(vec4 spriteBounds) {
- uvN = spriteBounds.xy + uvN * spriteBounds.zw;
- uvT = spriteBounds.xy + uvT * spriteBounds.zw;
- uvB = spriteBounds.xy + uvB * spriteBounds.zw;
-}
-#endif
-
-void setVaryings(vec4 viewCoord) {
- l2_viewPos = viewCoord.xyz;
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl
deleted file mode 100644
index e1640fe..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/pbr_shading.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-const float pbr_specularBloomStr = 0.01;
-const float pbr_specularAlphaStr = 0.1;
-
-vec3 pbr_specularBRDF(float roughness, vec3 radiance, vec3 halfway, vec3 lightDir, vec3 viewDir, vec3 normal, vec3 fresnel, float NdotL) {
- // cook-torrance brdf
- float distribution = pbr_distributionGGX(normal, halfway, roughness);
- float geometry = pbr_geometrySmith(normal, viewDir, lightDir, roughness);
-
- vec3 num = distribution * geometry * fresnel;
- float denom = 4.0 * pbr_dot(normal, viewDir) * NdotL;
-
- vec3 specular = num / max(denom, 0.001);
- return specular * radiance * NdotL;
-}
-
-vec3 pbr_lightCalc(vec3 albedo, vec3 radiance, vec3 lightDir, vec3 viewDir, vec3 normal, bool diffuseOn, bool isAmbiance, float haloBlur, inout vec3 specularAccu) {
-
- vec3 halfway = normalize(viewDir + lightDir);
- float roughness = pbr_roughness;
-
- // ambiance hack
- if (isAmbiance) {
- roughness = min(1.0, roughness + 0.5 * (1 - pbr_metallic));
- }
-
- // disableDiffuse hack
- if (!diffuseOn) {
- return albedo / PI * radiance * pbr_dot(lightDir, vec3(.0, 1.0, .0));
- }
-
- vec3 specularRadiance;
- vec3 fresnel = pbr_fresnelSchlick(pbr_dot(viewDir, halfway), pbr_f0);
- float NdotL = pbr_dot(normal, lightDir);
-
- if (haloBlur > roughness) {
- // sun halo hack
- specularRadiance = pbr_specularBRDF(roughness, radiance * 0.75, halfway, lightDir, viewDir, normal, fresnel, NdotL);
- specularRadiance += pbr_specularBRDF(haloBlur, radiance * 0.25, halfway, lightDir, viewDir, normal, fresnel, NdotL);
- } else {
- specularRadiance = pbr_specularBRDF(roughness, radiance, halfway, lightDir, viewDir, normal, fresnel, NdotL);
- }
-
- vec3 diffuse = (1.0 - fresnel) * (1.0 - pbr_metallic);
- vec3 diffuseRadiance = albedo * diffuse / PI * radiance * NdotL;
- specularAccu += specularRadiance;
-
- return specularRadiance + diffuseRadiance;
-}
-
-void pbr_shading(in frx_FragmentData fragData, inout vec4 a, inout float bloom, in float userBrightness, in bool translucent) {
-
- vec3 albedo = hdr_gammaAdjust(a.rgb);
- vec3 dielectricF0 = vec3(0.1) * frx_luminance(albedo);
- pbr_roughness = clamp(pbr_roughness, 0.0, 1.0);
- pbr_metallic = clamp(pbr_metallic, 0.0, 1.0);
- pbr_f0 = pbr_f0.r < 0 ? mix(dielectricF0, albedo, pbr_metallic) : clamp(pbr_f0, 0.0, 1.0);
-
- a.rgb = albedo;
-
- float ao = l2_ao(fragData);
- vec3 emissive = l2_emissiveRadiance(fragData.emissivity);
- a.rgb *= emissive;
-
- vec3 viewDir = normalize(-l2_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
-
- vec3 normal = fragData.vertexNormal * frx_normalModelMatrix();
-
- vec3 specularAccu = vec3(0.0);
-
-#if HANDHELD_LIGHT_RADIUS != 0
- if (frx_heldLight().w > 0) {
- vec3 handHeldDir = viewDir;
- vec3 handHeldRadiance = l2_handHeldRadiance();
- if(handHeldRadiance.x * handHeldRadiance.y * handHeldRadiance.z > 0) {
- vec3 adjustedNormal = fragData.diffuse ? normal : viewDir;
- a.rgb += pbr_lightCalc(albedo, handHeldRadiance, handHeldDir, viewDir, adjustedNormal, true, false, 0.0, specularAccu);
- }
- }
-#endif
-
- vec3 blockRadiance = l2_blockRadiance(fragData.light.x, userBrightness);
- vec3 baseAmbientRadiance = l2_baseAmbient(userBrightness);
- vec3 ambientDir = normalize(vec3(0.1, 0.9, 0.1) + normal);
-
- a.rgb += pbr_lightCalc(albedo, blockRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
- a.rgb += pbr_lightCalc(albedo, baseAmbientRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
-
- if (frx_worldHasSkylight()) {
- if (fragData.light.y > 0.03125) {
-
- vec3 moonRadiance = l2_moonRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
- vec3 moonDir = l2_moonDir(frx_worldTime());
- vec3 sunRadiance = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient());
- vec3 sunDir = l2_vanillaSunDir(frx_worldTime(), 0.0);
- vec3 skyRadiance = l2_skyAmbient(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
-
- a.rgb += pbr_lightCalc(albedo, moonRadiance * ao, moonDir, viewDir, normal, fragData.diffuse, false, 0.15, specularAccu);
- a.rgb += pbr_lightCalc(albedo, sunRadiance * ao, sunDir, viewDir, normal, fragData.diffuse, false, 0.15, specularAccu);
- a.rgb += pbr_lightCalc(albedo, skyRadiance * ao, ambientDir, viewDir, normal, fragData.diffuse, true, 0.0, specularAccu);
-
- }
-
- } else {
-
- vec3 skylessRadiance = l2_skylessRadiance(userBrightness);
- vec3 skylessDir = l2_skylessDir();
-
- a.rgb += pbr_lightCalc(albedo, skylessRadiance * ao, skylessDir, viewDir, normal, fragData.diffuse, false, 0.0, specularAccu);
-
- if (frx_isSkyDarkened()) {
-
- vec3 skylessDarkenedDir = l2_skylessDarkenedDir();
- a.rgb += pbr_lightCalc(albedo, skylessRadiance * ao, skylessDarkenedDir, viewDir, normal, fragData.diffuse, false, 0.0, specularAccu);
- }
-
- }
-
- // float skyAccess = smoothstep(0.89, 1.0, fragData.light.y);
-
- float specularLuminance = frx_luminance(specularAccu);
- float smoothness = (1-pbr_roughness);
- bloom += specularLuminance * pbr_specularBloomStr * smoothness * smoothness;
- if (translucent) {
- a.a += specularLuminance * pbr_specularBloomStr;
- }
-
- a.rgb *= hdr_finalMult;
- tonemap(a);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl
deleted file mode 100644
index 5a82f2c..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************
- * lumi:shaders/internal/phong_shading.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-float ww_specular;
-
-float l2_specular(float time, vec3 aNormal, vec3 viewDir, float power)
-{
- // calculate sun position (0 zWobble to make it look accurate with vanilla sun visuals)
- vec3 sunDir = l2_vanillaSunDir(time, 0);
-
- // calculate the specular light
- return pow(max(0.0, dot(reflect(-sunDir, aNormal), viewDir)), power);
-}
-
-void phong_shading(in frx_FragmentData fragData, inout vec4 a, inout float bloom, in float userBrightness, in bool translucent) {
- a.rgb = hdr_gammaAdjust(a.rgb);
-
- float ao = l2_ao(fragData);
- // If diffuse is disabled (e.g. grass) then the normal points up by default
- vec3 diffuseNormal = fragData.diffuse?fragData.vertexNormal * frx_normalModelMatrix():vec3(0,1,0);
- float sunDot = max(0.0, dot(l2_vanillaSunDir(frx_worldTime(), hdr_zWobbleDefault), diffuseNormal));
- float moonDot = max(0.0, dot(l2_moonDir(frx_worldTime()), diffuseNormal));
- float skyLessDot = max(0.0, dot(l2_skylessDir(), diffuseNormal));
- float skyLessDarkenedDot = max(0.0, dot(l2_skylessDarkenedDir(), diffuseNormal));
-#if HANDHELD_LIGHT_RADIUS == 0
- vec3 held = vec3(0);
-#else
- vec3 held = l2_handHeldRadiance();
-#endif
- vec3 block = l2_blockRadiance(fragData.light.x, userBrightness);
- vec3 sun = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient()) * sunDot;
- vec3 moon = l2_moonRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity()) * moonDot;
- vec3 skyAmbient = l2_skyAmbient(fragData.light.y, frx_worldTime(), frx_ambientIntensity());
- vec3 emissive = l2_emissiveRadiance(fragData.emissivity);
- vec3 skylessRadiance = l2_skylessRadiance(userBrightness);
- vec3 skyless = skylessRadiance * skyLessDot + (frx_isSkyDarkened() ? skylessRadiance * skyLessDarkenedDot : vec3(0.0));
- vec3 baseAmbient = l2_baseAmbient(userBrightness);
-
- vec3 light = baseAmbient + held + block + moon + skyAmbient + sun + skyless;
- light *= ao; // AO is supposed to be applied to ambient only, but things look better with AO on everything except for emissive light
- light += emissive;
-
- vec3 specular = vec3(0.0);
- if (ww_specular > 0) {
- vec3 specularNormal = fragData.vertexNormal * frx_normalModelMatrix();
-
- float skyAccess = smoothstep(0.89, 1.0, fragData.light.y);
-
- vec3 sunDir = l2_vanillaSunDir(frx_worldTime(), 0);
- float specSunDot = max(0.0, dot(l2_vanillaSunDir(frx_worldTime(), hdr_zWobbleDefault), specularNormal));
- vec3 viewDir = normalize(-l2_viewPos) * frx_normalModelMatrix() * gl_NormalMatrix;
- vec3 sun = l2_sunRadiance(fragData.light.y, frx_worldTime(), frx_ambientIntensity(), frx_rainGradient()) * specSunDot;
-
- float specularAmount = l2_specular(frx_worldTime(), specularNormal, viewDir, ww_specular);
-
- specular = sun * specularAmount * skyAccess;
-
- float specularLuminance = frx_luminance(specular);
- a.a += specularLuminance;
- bloom += specularLuminance;
- }
-
- a.rgb *= light;
- a.rgb += specular;
-
- a.rgb *= hdr_finalMult;
- tonemap(a);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl
deleted file mode 100644
index 33cb611..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl
+++ /dev/null
@@ -1,5 +0,0 @@
-/***********************************************************
- * lumi:shaders/internal/skybloom.glsl *
- ***********************************************************/
-
-const float hdr_skyBloom = 0.25;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl
deleted file mode 100644
index 5f65734..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-/***********************************************************
- * lumi:shaders/internal/tonemap.glsl *
- ***********************************************************/
-
-vec3 hdr_reinhardJodieTonemap(in vec3 v) {
- float l = frx_luminance(v);
- vec3 tv = v / (1.0f + v);
- return mix(v / (1.0f + l), tv, tv);
-}
-
-#if lumi_tonemap == lumi_tonemap_vibrant
-vec3 hdr_vibrantTonemap(in vec3 hdrColor){
- return hdrColor / (frx_luminance(hdrColor) + vec3(1.0));
-}
-#endif
-
-void tonemap(inout vec4 a) {
-#if lumi_tonemap == lumi_tonemap_film
- a.rgb = frx_toGamma(frx_toneMap(a.rgb));
-#elif lumi_tonemap == lumi_tonemap_vibrant
- a.rgb = pow(hdr_vibrantTonemap(a.rgb), vec3(1.0 / hdr_gamma));
-#else
- a.rgb = pow(hdr_reinhardJodieTonemap(a.rgb), vec3(1.0 / hdr_gamma));
-#endif
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl
deleted file mode 100644
index 9cc8a54..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl
+++ /dev/null
@@ -1,5 +0,0 @@
-/***********************************************************
- * lumi:shaders/internal/varying.glsl *
- ***********************************************************/
-
-varying vec3 l2_viewPos;
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl
deleted file mode 100644
index 6b9ba83..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************
- * lumi:shaders/lib/bump.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-const mat4 _bump_tRotm = mat4(
-0, 0, -1, 0,
-0, 1, 0, 0,
-1, 0, 0, 0,
-0, 0, 0, 1 );
-
-vec3 _bump_tangentMove(vec3 normal)
-{
- vec3 aaNormal = vec3(normal.x + 0.01, 0, normal.z + 0.01);
- aaNormal = normalize(aaNormal);
- return (_bump_tRotm * vec4(aaNormal, 0.0)).xyz;
-}
-
-vec3 _bump_bitangentMove(vec3 normal, vec3 tangent)
-{
- return cross(normal, tangent);
-}
-
-float _bump_height(float raw)
-{
- return frx_smootherstep(0, 1, pow(raw, 1 + raw * raw));
-}
-
-vec3 bump_normal(sampler2D tex, vec3 normal, vec2 uvn, vec2 uvt, vec2 uvb)
-{
- vec3 tangentMove = _bump_tangentMove(normal);
- vec3 bitangentMove = _bump_bitangentMove(normal, tangentMove);
-
- vec4 texel = texture2D(tex, uvn, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
- vec3 origin = _bump_height(frx_luminance(texel.rgb)) * normal;
-
- texel = texture2D(tex, uvt, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
- vec3 tangent = tangentMove + _bump_height(frx_luminance(texel.rgb)) * normal - origin;
-
- texel = texture2D(tex, uvb, _cv_getFlag(_CV_FLAG_UNMIPPED) * -4.0);
- vec3 bitangent = bitangentMove + _bump_height(frx_luminance(texel.rgb)) * normal - origin;
-
- return normalize(cross(tangent, bitangent));
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl
deleted file mode 100644
index 8a45a69..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************
- * lumi:shaders/lib/pbr.glsl *
- *******************************************************/
-
-float pbr_dot(vec3 a, vec3 b)
-{
- return clamp(dot(a, b), 0.0, 1.0);
-}
-
-float pbr_distributionGGX(vec3 N, vec3 H, float roughness)
-{
- float a = roughness*roughness;
- float a2 = a*a;
- float NdotH = pbr_dot(N, H);
- float NdotH2 = NdotH*NdotH;
-
- float num = a2;
- float denom = (NdotH2 * (a2 - 1.0) + 1.0);
- denom = PI * denom * denom;
-
- return num / denom;
-}
-
-float pbr_geometrySchlickGGX(float NdotV, float roughness)
-{
- float r = (roughness + 1.0);
- float k = (r*r) / 8.0;
-
- float num = NdotV;
- float denom = NdotV * (1.0 - k) + k;
-
- return num / denom;
-}
-
-float pbr_geometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
-{
- float NdotV = pbr_dot(N, V);
- float NdotL = pbr_dot(N, L);
- float ggx2 = pbr_geometrySchlickGGX(NdotV, roughness);
- float ggx1 = pbr_geometrySchlickGGX(NdotL, roughness);
-
- return ggx1 * ggx2;
-}
-
-vec3 pbr_fresnelSchlick(float cosTheta, vec3 F0)
-{
- return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl b/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl
deleted file mode 100644
index d3a58d4..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#include lumi:shaders/lib/bump.glsl
-
-/*******************************************************
- * lumi:shaders/lib/water.glsl *
- *******************************************************
- * Copyright (c) 2020 spiralhalo and Contributors. *
- * Released WITHOUT WARRANTY under the terms of the *
- * GNU Lesser General Public License version 3 as *
- * published by the Free Software Foundation, Inc. *
- *******************************************************/
-
-float ww_noise(vec3 pos, vec3 move, float invScale, float amplitude, float stretch)
-{
- vec3 noisePos = vec3(pos.x * invScale * stretch, pos.y * invScale, pos.z * invScale) + move;
- return (snoise(noisePos) * 0.5 + 0.5) * amplitude;
-}
-
-vec3 ww_normals(vec3 up, vec3 samplePos, float waveSpeed, float scale, float amplitude, float stretch, vec3 moveSpeed)
-{
- float microSample = 0.01 * scale;
- float invScale = 1 / scale;
- vec3 waveMove = moveSpeed * frx_renderSeconds() * waveSpeed;
- waveMove.xz *= abs(up.y);
-
- vec3 tmove = _bump_tangentMove(up);
- vec3 bmove = _bump_bitangentMove(up, tmove) * microSample;
- tmove *= microSample;
-
- vec3 origin = ww_noise(samplePos, waveMove, invScale, amplitude, stretch) * up;
- vec3 tangent = tmove + ww_noise(samplePos + tmove, waveMove, invScale, amplitude, stretch) * up - origin;
- vec3 bitangent = bmove + ww_noise(samplePos + bmove, waveMove, invScale, amplitude, stretch) * up - origin;
-
- vec3 noisyNormal = normalize(cross(tangent, bitangent));
- return noisyNormal;
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag
deleted file mode 100644
index 4ce3107..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag
+++ /dev/null
@@ -1,43 +0,0 @@
-#include frex:shaders/api/fragment.glsl
-#include frex:shaders/api/world.glsl
-#include frex:shaders/lib/noise/noise3d.glsl
-#include frex:shaders/lib/color.glsl
-#include lumi:shaders/lib/water.glsl
-
-void frx_startFragment(inout frx_FragmentData fragData) {
-#ifdef lumi_pbr
- /* PBR PARAMS */
- pbr_f0 = vec3(0.02);
- pbr_roughness = 0.05;
-#else
- /* HACK */
- fragData.light.y += 0.077 * smoothstep(1.0, 0.99, fragData.vertexNormal.y);
- fragData.light.y = min(0.96875, fragData.light.y);
-
- /* LUMI PARAMS */
- ww_specular = 500.0;
-#endif
-
- /* WATER RECOLOR */
- vec3 desat = vec3(frx_luminance(fragData.vertexColor.rgb));
- fragData.vertexColor.rgb = mix(fragData.vertexColor.rgb, desat, 0.7);
-
- float maxc = max(fragData.spriteColor.r, max(fragData.spriteColor.g, fragData.spriteColor.b));
- fragData.spriteColor.rgb *= fragData.spriteColor.rgb * fragData.spriteColor.rgb * 2.0;
-
- float l = frx_luminance(fragData.spriteColor.rgb);
- pbr_f0 = mix(pbr_f0, vec3(0.2), l * l);
-
- /* WAVY NORMALS */
- float waveSpeed = 1;
- float scale = 1.5;
- float amplitude = 0.01;
- float stretch = 2;
- // wave movement doesn't necessarily follow flow direction for the time being
- vec3 moveSpeed = vec3(0.5, 1.5, -0.5);
- // const float texAmplitude = 0.005;
- vec3 up = fragData.vertexNormal.xyz;// * (1.0 + texAmplitude);
- vec3 samplePos = frx_var0.xyz;
- // samplePos = floor(samplePos) + floor(fract(samplePos) * 16) / 16;
- fragData.vertexNormal = ww_normals(up, samplePos, waveSpeed, scale, amplitude, stretch, moveSpeed);
-}
diff --git a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert b/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert
deleted file mode 100644
index 92a8585..0000000
--- a/run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert
+++ /dev/null
@@ -1,14 +0,0 @@
-#include frex:shaders/api/vertex.glsl
-#include frex:shaders/api/world.glsl
-#include frex:shaders/lib/noise/noise3d.glsl
-#include lumi:shaders/api/water_param.glsl
-
-// #define WATER_VERTEX_WAVY
-
-void frx_startVertex(inout frx_VertexData data) {
- frx_var0.xyz = data.vertex.xyz + frx_modelOriginWorldPos();
- #ifdef WATER_VERTEX_WAVY
- float amplitude = 0.03;
- data.vertex.y += snoise(vec3(frx_var0.x, frx_renderSeconds(), frx_var0.z)) * amplitude;
- #endif
-}
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json.rpo b/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json.rpo
deleted file mode 100644
index efa055d..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json.rpo
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "conditions": [
- "lumi:subcategoryTest.enableLang",
- {
- "not": [
- "lumi:subcategoryTest.enableLangForceDisable"
- ]
- }
- ],
- "fallbacks": [
- "assets/minecraft/lang/en_us_joke.json"
- ]
-}
\ No newline at end of file
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json
deleted file mode 100644
index 44ed7db..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "intensity": 1.0,
- "red": 1.0,
- "green": 0.875,
- "blue": 0.75,
- "worksInFluid": true
-}
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json
deleted file mode 100644
index 0631f34..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "intensity": 0.93,
- "red": 1.0,
- "green": 0.875,
- "blue": 0.75,
- "worksInFluid": false
-}
-
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json
deleted file mode 100644
index f12840c..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "intensity": 0.93,
- "red": 1.0,
- "green": 0.875,
- "blue": 0.75,
- "worksInFluid": false
-}
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json
deleted file mode 100644
index 4f908b7..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "intensity": 1.0,
- "red": 1.0,
- "green": 0.875,
- "blue": 0.75,
- "worksInFluid": true
-}
-
diff --git a/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json b/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json
deleted file mode 100644
index 0631f34..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "intensity": 0.93,
- "red": 1.0,
- "green": 0.875,
- "blue": 0.75,
- "worksInFluid": false
-}
-
diff --git a/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json b/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json
deleted file mode 100644
index f67c61a..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "defaultMaterial": "fabric:standard"
-}
diff --git a/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/flowing_water.json b/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/flowing_water.json
deleted file mode 100644
index 077e5c9..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/flowing_water.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "defaultMaterial": "lumi:tasty_liquid"
-}
diff --git a/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/water.json b/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/water.json
deleted file mode 100644
index 077e5c9..0000000
--- a/run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/water.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "defaultMaterial": "lumi:tasty_liquid"
-}
diff --git a/run/resourcepacks/lumi/pack.mcmeta b/run/resourcepacks/lumi/pack.mcmeta
deleted file mode 100644
index 837bbfa..0000000
--- a/run/resourcepacks/lumi/pack.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "pack": {
- "pack_format": 6,
- "description": "§3Aesthetic shader pack\n§8by spiralhalo [v0.4]"
- }
-}
diff --git a/run/resourcepacks/lumi/pack.png b/run/resourcepacks/lumi/pack.png
deleted file mode 100644
index e5d7bb2..0000000
Binary files a/run/resourcepacks/lumi/pack.png and /dev/null differ
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/de_de.json.rpo b/run/resourcepacks/testpack/assets/minecraft/lang/de_de.json.rpo
similarity index 100%
rename from run/resourcepacks/lumi/assets/minecraft/lang/de_de.json.rpo
rename to run/resourcepacks/testpack/assets/minecraft/lang/de_de.json.rpo
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json b/run/resourcepacks/testpack/assets/minecraft/lang/en_us.json
similarity index 75%
rename from run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
rename to run/resourcepacks/testpack/assets/minecraft/lang/en_us.json
index f12b0b4..2ee8801 100644
--- a/run/resourcepacks/lumi/assets/minecraft/lang/en_us.json
+++ b/run/resourcepacks/testpack/assets/minecraft/lang/en_us.json
@@ -1,10 +1,10 @@
{
- "rpo.lumi": "Lumi Lights",
+ "rpo.lumi": "${Lumi} ${Lights}",
"rpo.lumi.tonemap": "Tonemap mode",
"rpo.tooltip.lumi.tonemap": "Tooltip test",
"rpo.lumi.pbr": "Enable PBR",
"rpo.lumi.debugMode": "Debug Mode",
- "rpo.lumi.debugMode.normal": "Normal Mode",
+ "rpo.lumi.debugMode.normal": "${Normal} Mode",
"rpo.lumi.waterVertexWavy": "Wavy water model",
"rpo.tooltip.lumi.subcategoryTest.sliderTest": "Yayyy"
}
\ No newline at end of file
diff --git a/run/resourcepacks/testpack/assets/minecraft/lang/en_us.json.rpo b/run/resourcepacks/testpack/assets/minecraft/lang/en_us.json.rpo
new file mode 100644
index 0000000..94026e2
--- /dev/null
+++ b/run/resourcepacks/testpack/assets/minecraft/lang/en_us.json.rpo
@@ -0,0 +1,20 @@
+{
+ "conditions": [
+ "lumi:subcategoryTest.enableLang",
+ {
+ "not": [
+ "lumi:subcategoryTest.enableLangForceDisable"
+ ]
+ }
+ ],
+ "fallbacks": [
+ "assets/minecraft/lang/en_us_joke.json"
+ ],
+ "expansions": {
+ "Lights": "{lumi.subcategoryTest.enableLang}",
+ "Mode": "{lumi.debugMode}",
+ "Normal": "{lumi.numTest * lumi.subcategoryTest.numberInSub}",
+ "Lumi": "model",
+ "Regeneration": "Industrie"
+ }
+}
\ No newline at end of file
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/en_us_joke.json b/run/resourcepacks/testpack/assets/minecraft/lang/en_us_joke.json
similarity index 100%
rename from run/resourcepacks/lumi/assets/minecraft/lang/en_us_joke.json
rename to run/resourcepacks/testpack/assets/minecraft/lang/en_us_joke.json
diff --git a/run/resourcepacks/lumi/assets/minecraft/lang/en_us_joke.json.rpo b/run/resourcepacks/testpack/assets/minecraft/lang/en_us_joke.json.rpo
similarity index 100%
rename from run/resourcepacks/lumi/assets/minecraft/lang/en_us_joke.json.rpo
rename to run/resourcepacks/testpack/assets/minecraft/lang/en_us_joke.json.rpo
diff --git a/run/resourcepacks/lumi/assets/respackopts/conf.json b/run/resourcepacks/testpack/assets/respackopts/conf.json
similarity index 97%
rename from run/resourcepacks/lumi/assets/respackopts/conf.json
rename to run/resourcepacks/testpack/assets/respackopts/conf.json
index f39dc09..d46f773 100644
--- a/run/resourcepacks/lumi/assets/respackopts/conf.json
+++ b/run/resourcepacks/testpack/assets/respackopts/conf.json
@@ -1,6 +1,6 @@
{
"id": "lumi",
- "version": 3,
+ "version": 4,
"conf": {
"tonemap": [
"default",
diff --git a/run/resourcepacks/testpack/icon.png b/run/resourcepacks/testpack/icon.png
new file mode 100644
index 0000000..57ed4b5
Binary files /dev/null and b/run/resourcepacks/testpack/icon.png differ
diff --git a/run/resourcepacks/testpack/pack.mcmeta b/run/resourcepacks/testpack/pack.mcmeta
new file mode 100644
index 0000000..86082ee
--- /dev/null
+++ b/run/resourcepacks/testpack/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+ "pack": {
+ "pack_format": 7,
+ "description": "Example pack for Respackopts"
+ }
+}
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java b/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java
index e1be4a1..c82b042 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java
@@ -48,18 +48,19 @@ public class GuiFactory {
: new LiteralText(name);
}
- public Screen buildGui(ConfigBranch source, String resourcepackid, Screen parent, Runnable onSave) {
+ public Screen buildGui(ConfigBranch source, String resourcepackid, Screen parent) {
try {
ConfigBuilder builder;
builder = ConfigBuilder.create()
.setParentScreen(parent)
- .setTitle(getText(resourcepackid, "respackopts.title"));
+ .setTitle(getText(resourcepackid, source.getVersion() < 4 ? "respackopts.title" : "rpo"));
ConfigEntryBuilder entryBuilder = builder.entryBuilder();
builder.setSavingRunnable(() -> {
Respackopts.save();
- onSave.run();
+ Respackopts.forceRespackReload = true;
+ Respackopts.reloadData();
});
- ConfigCategory config = builder.getOrCreateCategory(getText(resourcepackid, "respackopts.title"));
+ ConfigCategory config = builder.getOrCreateCategory(getText(resourcepackid, source.getVersion() < 4 ? "respackopts.title" : "rpo"));
buildCategory(source, resourcepackid, config::addEntry, entryBuilder, "");
return builder.build();
}
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
index b1e4b13..d605ad1 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
@@ -4,14 +4,17 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.gitlab.jfronny.respackopts.data.entry.*;
import io.gitlab.jfronny.respackopts.filters.FilterProvider;
-import io.gitlab.jfronny.respackopts.gson.BooleanEntrySerializer;
-import io.gitlab.jfronny.respackopts.gson.ConfigBranchSerializer;
-import io.gitlab.jfronny.respackopts.gson.EnumEntrySerializer;
-import io.gitlab.jfronny.respackopts.gson.NumericEntrySerializer;
+import io.gitlab.jfronny.respackopts.gson.*;
+import meteordevelopment.starscript.Script;
+import meteordevelopment.starscript.StandardLib;
+import meteordevelopment.starscript.Starscript;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.gui.FabricGuiEntry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.server.integrated.IntegratedServer;
import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -25,10 +28,11 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
@Environment(EnvType.CLIENT)
public class Respackopts implements ClientModInitializer {
- public static final Integer META_VERSION = 3;
+ public static final Integer META_VERSION = 4;
public static final String ID = "respackopts";
public static final Identifier CONF_ID = new Identifier(ID, "conf.json");
public static final Logger LOGGER = LogManager.getFormatterLogger(ID);
@@ -39,6 +43,8 @@ public class Respackopts implements ClientModInitializer {
public static final Map CONFIG_BRANCH = new HashMap<>();
public static final Map NAME_LOOKUP = new HashMap<>();
+ public static Starscript STAR_SCRIPT;
+
public static final Gson GSON;
public static GuiFactory factory = new GuiFactory();
public static boolean forceRespackReload = false;
@@ -49,8 +55,15 @@ public class Respackopts implements ClientModInitializer {
.registerTypeAdapter(ConfigNumericEntry.class, new NumericEntrySerializer())
.registerTypeAdapter(ConfigBooleanEntry.class, new BooleanEntrySerializer())
.registerTypeAdapter(ConfigBranch.class, new ConfigBranchSerializer())
+ .registerTypeAdapter(Script.class, new ScriptDeserializer())
.setPrettyPrinting()
.create();
+ try {
+ STAR_SCRIPT = new Starscript();
+ } catch (Throwable e) {
+ FabricGuiEntry.displayCriticalError(new Exception("Respackopts could not initialize Starscript. Expect issues with packs that use it", e), false);
+ }
+ StandardLib.init(STAR_SCRIPT);
try {
CONF_DIR = FabricLoader.getInstance().getConfigDir().resolve(ID);
} catch (Throwable e) {
@@ -63,10 +76,15 @@ public class Respackopts implements ClientModInitializer {
try {
Files.createDirectories(CONF_DIR);
} catch (IOException e) {
- Respackopts.LOGGER.error("Could not initialize config directory", e);
+ LOGGER.error("Could not initialize config directory", e);
}
if (FabricLoader.getInstance().isDevelopmentEnvironment())
SAVE_ACTIONS.add(() -> LOGGER.info("Save"));
+ SAVE_ACTIONS.add(() -> {
+ for (Map.Entry e : CONFIG_BRANCH.entrySet()) {
+ STAR_SCRIPT.set(sanitizeString(e.getKey()), () -> e.getValue().buildStarscript());
+ }
+ });
FilterProvider.init();
}
@@ -76,7 +94,7 @@ public class Respackopts implements ClientModInitializer {
GSON.toJson(e.getValue(), writer);
writer.flush();
} catch (IOException ex) {
- Respackopts.LOGGER.error("Could not save config", ex);
+ LOGGER.error("Could not save config", ex);
}
}
for (Runnable action : SAVE_ACTIONS) {
@@ -91,6 +109,7 @@ public class Respackopts implements ClientModInitializer {
ConfigBranch b = GSON.fromJson(reader, ConfigBranch.class);
if (CONFIG_BRANCH.containsKey(id))
CONFIG_BRANCH.get(id).sync(b, SyncMode.CONF_LOAD);
+ STAR_SCRIPT.set(sanitizeString(id), b::buildStarscript);
} catch (IOException e) {
LOGGER.error("Failed to load " + id, e);
}
@@ -108,4 +127,18 @@ public class Respackopts implements ClientModInitializer {
// [^a-zA-Z_] = not character or underscore
return s.replaceAll("[^a-zA-Z_]|^[\\s_]*|[\\s_]*$", "");
}
+
+ public static CompletableFuture forceReloadResources() {
+ return CompletableFuture.allOf(MinecraftClient.getInstance().reloadResources(),
+ reloadData());
+ }
+
+ public static CompletableFuture reloadData() {
+ IntegratedServer is = MinecraftClient.getInstance().getServer();
+ if (is != null) {
+ is.getDataPackManager().scanPacks();
+ return is.reloadResources(is.getDataPackManager().getEnabledNames());
+ }
+ return CompletableFuture.completedFuture(null);
+ }
}
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/Rpo.java b/src/main/java/io/gitlab/jfronny/respackopts/data/Rpo.java
index c197cd2..47c79f6 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/data/Rpo.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/data/Rpo.java
@@ -1,10 +1,13 @@
package io.gitlab.jfronny.respackopts.data;
import com.google.gson.JsonArray;
+import meteordevelopment.starscript.Script;
import java.util.List;
+import java.util.Map;
public class Rpo {
public JsonArray conditions;
public List fallbacks;
+ public Map expansions;
}
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBooleanEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBooleanEntry.java
index 47c3e69..0e2112e 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBooleanEntry.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBooleanEntry.java
@@ -2,6 +2,7 @@ package io.gitlab.jfronny.respackopts.data.entry;
import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import meteordevelopment.starscript.value.Value;
import net.minecraft.text.Text;
import java.util.Optional;
@@ -28,6 +29,11 @@ public class ConfigBooleanEntry extends ConfigEntry {
}
}
+ @Override
+ public Value buildStarscript() {
+ return Value.bool(getValue());
+ }
+
@Override
public AbstractConfigListEntry> buildEntry(ConfigEntryBuilder entryBuilder, Text name, Supplier> tooltipSupplier, String screenId, String entryName, String translationPrefix) {
return entryBuilder.startBooleanToggle(name, getValue())
diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBranch.java b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBranch.java
index cfeece8..7018107 100644
--- a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBranch.java
+++ b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigBranch.java
@@ -6,6 +6,8 @@ import io.gitlab.jfronny.respackopts.data.RpoError;
import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
import me.shedaniel.clothconfig2.impl.builders.SubCategoryBuilder;
+import meteordevelopment.starscript.value.Value;
+import meteordevelopment.starscript.value.ValueMap;
import net.minecraft.text.Text;
import java.util.LinkedHashMap;
@@ -96,6 +98,15 @@ public class ConfigBranch extends ConfigEntry