From 3831ac0594ae0b63c3377e681a68bedbfa18b195 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 24 Aug 2021 17:42:46 +0200 Subject: [PATCH] Implement expansion. Closes #8 --- .gitignore | 2 +- build.gradle | 13 +- run/resourcepacks/lumi/COPYING | 674 ------------------ run/resourcepacks/lumi/COPYING.LESSER | 165 ----- run/resourcepacks/lumi/README.md | 3 - .../shaders/internal/material_main.frag | 136 ---- .../shaders/internal/material_main.vert | 113 --- .../internal/process/emissive_color.frag | 31 - .../assets/lumi/materials/tasty_liquid.json | 6 - .../assets/lumi/shaders/api/pbr_frag.glsl | 8 - .../lumi/shaders/internal/debug_shading.glsl | 20 - .../lumi/shaders/internal/lightsource.glsl | 226 ------ .../lumi/shaders/internal/main_frag.glsl | 36 - .../lumi/shaders/internal/main_vert.glsl | 37 - .../lumi/shaders/internal/pbr_shading.glsl | 138 ---- .../lumi/shaders/internal/phong_shading.glsl | 74 -- .../lumi/shaders/internal/skybloom.glsl | 5 - .../assets/lumi/shaders/internal/tonemap.glsl | 25 - .../assets/lumi/shaders/internal/varying.glsl | 5 - .../lumi/assets/lumi/shaders/lib/bump.glsl | 48 -- .../lumi/assets/lumi/shaders/lib/pbr.glsl | 48 -- .../lumi/assets/lumi/shaders/lib/water.glsl | 35 - .../assets/lumi/shaders/material/water.frag | 43 -- .../assets/lumi/shaders/material/water.vert | 14 - .../lumi/assets/minecraft/lang/en_us.json.rpo | 13 - .../minecraft/lights/item/glowstone.json | 7 - .../minecraft/lights/item/jack_o_lantern.json | 8 - .../assets/minecraft/lights/item/lantern.json | 7 - .../minecraft/lights/item/shroomlight.json | 8 - .../assets/minecraft/lights/item/torch.json | 8 - .../minecraft/materialmaps/block/ladder.json | 3 - .../materialmaps/fluid/flowing_water.json | 3 - .../minecraft/materialmaps/fluid/water.json | 3 - run/resourcepacks/lumi/pack.mcmeta | 6 - run/resourcepacks/lumi/pack.png | Bin 1282 -> 0 bytes .../assets/minecraft/lang/de_de.json.rpo | 0 .../assets/minecraft/lang/en_us.json | 4 +- .../assets/minecraft/lang/en_us.json.rpo | 20 + .../assets/minecraft/lang/en_us_joke.json | 0 .../assets/minecraft/lang/en_us_joke.json.rpo | 0 .../assets/respackopts/conf.json | 2 +- run/resourcepacks/testpack/icon.png | Bin 0 -> 55424 bytes run/resourcepacks/testpack/pack.mcmeta | 6 + .../jfronny/respackopts/GuiFactory.java | 9 +- .../jfronny/respackopts/Respackopts.java | 47 +- .../gitlab/jfronny/respackopts/data/Rpo.java | 3 + .../data/entry/ConfigBooleanEntry.java | 6 + .../respackopts/data/entry/ConfigBranch.java | 11 + .../respackopts/data/entry/ConfigEntry.java | 4 + .../data/entry/ConfigEnumEntry.java | 6 + .../data/entry/ConfigNumericEntry.java | 6 + .../respackopts/filters/FilterProvider.java | 8 +- .../conditions/ConditionEvaluator.java | 6 + .../filters/expansion/DataExpander.java | 45 ++ .../respackopts/gson/ScriptDeserializer.java | 41 ++ .../integration/ModMenuCompat.java | 9 +- .../mixin/ResourcePackEntryMixin.java | 2 +- .../resources/assets/respackopts/icon.png | Bin 0 -> 55424 bytes 58 files changed, 215 insertions(+), 1991 deletions(-) delete mode 100644 run/resourcepacks/lumi/COPYING delete mode 100644 run/resourcepacks/lumi/COPYING.LESSER delete mode 100644 run/resourcepacks/lumi/README.md delete mode 100644 run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.frag delete mode 100644 run/resourcepacks/lumi/assets/canvas/shaders/internal/material_main.vert delete mode 100644 run/resourcepacks/lumi/assets/canvas/shaders/internal/process/emissive_color.frag delete mode 100644 run/resourcepacks/lumi/assets/lumi/materials/tasty_liquid.json delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/api/pbr_frag.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/debug_shading.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/lightsource.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/main_frag.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/main_vert.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/pbr_shading.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/phong_shading.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/skybloom.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/tonemap.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/internal/varying.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/bump.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/pbr.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/lib/water.glsl delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/material/water.frag delete mode 100644 run/resourcepacks/lumi/assets/lumi/shaders/material/water.vert delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lang/en_us.json.rpo delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/glowstone.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/jack_o_lantern.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/lantern.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/shroomlight.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/lights/item/torch.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/materialmaps/block/ladder.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/flowing_water.json delete mode 100644 run/resourcepacks/lumi/assets/minecraft/materialmaps/fluid/water.json delete mode 100644 run/resourcepacks/lumi/pack.mcmeta delete mode 100644 run/resourcepacks/lumi/pack.png rename run/resourcepacks/{lumi => testpack}/assets/minecraft/lang/de_de.json.rpo (100%) rename run/resourcepacks/{lumi => testpack}/assets/minecraft/lang/en_us.json (75%) create mode 100644 run/resourcepacks/testpack/assets/minecraft/lang/en_us.json.rpo rename run/resourcepacks/{lumi => testpack}/assets/minecraft/lang/en_us_joke.json (100%) rename run/resourcepacks/{lumi => testpack}/assets/minecraft/lang/en_us_joke.json.rpo (100%) rename run/resourcepacks/{lumi => testpack}/assets/respackopts/conf.json (97%) create mode 100644 run/resourcepacks/testpack/icon.png create mode 100644 run/resourcepacks/testpack/pack.mcmeta create mode 100644 src/main/java/io/gitlab/jfronny/respackopts/filters/expansion/DataExpander.java create mode 100644 src/main/java/io/gitlab/jfronny/respackopts/gson/ScriptDeserializer.java create mode 100644 src/main/resources/assets/respackopts/icon.png 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 e5d7bb225b60df30d555c8297c06ff48c579b086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmZvceNfVO9LK*u9uz1{I6-quky)weq^xe{Lx>2NO+_7=PvO)uD|=EgEu)`Mx-_wK z!!{(%$1F4(rKYC1xgNOUNAn@mteh3iS)``6tj+dcce{JNKkxtEckjE;y$eEvc|?LO z0RTV@o@cZ~%4+3DJ{V1rlWY;7B7)>C@FCt4hsq_gR3AK{B z3mmOVVX}Z`sJ%&$*M5D5c04( zcRKf_{;kXS@*HpFs}=hDdpk1ri>Ej=SNH5!z_sca$-4B1@rF15a(!@To{rEI!m_rg=}!X{`*b&)YVaZO36USQE&N zS#878XBfn?L)tH7I!FePl^3tTsgNtyJ)x4)hZp&z=RRY2H=h;?bM-h0CSdiL0C@*Y|t&EI~pxtjJ6 zjwVd{mmavHIYwQ>V?_cf|M=S73vNJ-sLoe5(f7#CJ%Rx#j2CLqA0OO{XYA4In&# zc5j$K<+e)+kPY?NO)ewqvq^FThHn@l2zl+&XvoG*{Ww7rRBuhI;W5VJ3!5!{OV&VT z57eRW2+CDk2=cJY6gpO4W-Yn3N0#21-`WvrdOGPpFRB}>g&d!0*b%WCB$#NwRfS-w zqYXJ2Ffk~M`G4H_9-Qo4arog+1q{e0pSfaiH5`UFy$Sg(8O^VtB=z9BS+K(s4DhG1 z_Qf8>Y3?d|#rxmZ>E?Rl(I}^+Z%n#kg(ZY?N^qTN&Nz@P0p+*wxeqh1#~m%ZVuvxZ z&LcqpvJGR*w^jLKQ4zJzQXV;Gan<0)iRWWer9}_=TGaH$q{WQPOS;TmKM&8>o76N_5a*=bf0wMf$5$iEZXv z)=8wjLL|Ss#~<}s8xP(Y&|!>vvELVP@9_6$n{TWlzg?s|P*q+#c5ey@V-O;>=1 z9kXkno0WL=IzI;FVQ7^i;I?Vrq8Ci?#MZ&8+5`whZDON@6N^7@bqM zV*++!-LxL57?Jl?_$m_KhnIibNm*yEucu0y`v_Ea$QlRMcLTypRPV%K!1ZTD5q)|u z0%vuM*56dP1SQ;eEH g|K5{_hT#8Y+FEcFnM-pbb}Wt>2n-13G_pnTzYo(Rb^rhX 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 0000000000000000000000000000000000000000..57ed4b58315ef60ce5e3ebd69d2aa545b850210e GIT binary patch literal 55424 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 z zu6avvl;8pQQ8135iJGLCzBGfE9&qZ#rt2~*ThSG2!X>`v!~utERRv)_Q{oMQDuWFb z0jK3b(^|po!2_G$5A?<`(kw|K!PTVS z_mtE7*3RPT4xBcH^@G}f%Fk(nSHjq2`!||Hvb}9^ycj(#M2A)t?Bffp<+`zQwu*ibZC!U#!628Y;+7{+kn8cE zI2A@#n$omVnHV!yO)gk**kw+8>214~TfRGP=~&IY!zQB_c1_pgaFJb=^w)X0ELf*& ze5+pVzVzs4js!!w6yeXRyh8(J+CN_OO3~WGVfJY0{Qq1O&-i>`W(f;OX z`lGewU>jhu7miKiHoFOxSzMc#$!^~qf8s{Ve6|!lSHOj#?VMxDwNN5;$3@=jCZBIm zQYg6u-lXh~XsRogeCmbz))O#aS|df5_xrG&Zfw%%r| z#(T_kX0ha_z#_p; zfI;C{)odb945O`?fNSW#TVzxLfSF||tkPk~Y4BMnN*e2>Pv-B|jnC=Un{m##B@^t} z3A3ir@gys2ekZT53R|B)B+X=w;4&4jL1dXkOmP_Uj}vUE$?bQ|+=Z{5F+p%dE|FC! zD@gofgs0e*wyzDR zguL&Nxe-K}6v?RM zXK2#L0PWe98t>`DMEFi;E{l)?aY^mXxKTH*hpb;~%56datKYL${XYsM|S+dh-g*=X(2wiW?eV6AOXoSmEbc1357Jf;Xwcn-;VOD{SWZ0Dw)qXQGPXkU9=YR~!4FbIf zFsPi;aBR8YeG|(XiH+Xhn>sEXlE%m~9P%4~EzE(8`_7B;xJTtPk)0k*f|4SUtM-Pq zIJ5LB#5J|h${R`^m7{UaQ%je9OETFbZEo(hL~{Iuj`3GCankb zEmi5W{q4td1;B%BGfn|;(8@&Vc$eU3v%k!0##QW|quu4rD~|s^h~5Dxw{`D05sJI& zjDoPi?Ncd`igD^WQ)a0nXVz{ODr4kyikqr)S|6BeW`G6mh1q)!<1Ofzvh*5P1DNG! zeAs~Qy{hvUnuy)t&glXzvEF{7fvPj<*yVKRVc$h1@yTg#31^$>dOc0VTzf9^C*8aAS3+E>Bm~`kc--MY(}jYOMx+tX=09x7YWuv z1&%m0Y4@xzr$uthcpj}gOF?kiNwMgTAD0d)tL*-~nLf4vP@AGf>EXBIfy7v=0;!Wj zP}pAmFQSbACkT2xnX!-E3K1`bkmH|CcYsMmPvu1nj)wo$X(RCJ0EDHapN*IkvkCT! zVCp!rlGTGc?mP?_aH=JLd-*ziob!KK4NUXjFqjGnV~FT>p3rICj9?gzfGAl>tYH`H z2WjQX<4ss!@*RnIf%bDux5abYcb_Oa<~HaQXc>2~K|0+FY-M z;Li+xRzb#_+O|c(Kc1STHva}uA_iJNTOUze+ftWcN2w6ak4H*&_1nxl3gBKFX0Qx%Q3!Bl*ApL7OS{r?x{T*Lht63gp47>cs{L-PQ z)4A%SY$wK;qkT{g17StXsrN?FtJBIM+dL$ zIV$(>(e|$GqkBo&L@4_ABG6)P#8>+8jRHg|YW9EvLX4k(E>4lAsbwjve~05-RR`1s zW$iQ9h{m5gb2V(j4+N#!uN5xo4b1L&VNkv(?=v>We7XY zgz;~A+V?ZU2`8MLA&Iaos+n96RH@|AG4b`2^RZ=HSO~&|&1`ECn>MENi@xFIDQ#=a zuJAC2bjR+QuB9bRN)~bGO$uen!86A;Z?rDJXL%jr`_v-7_EZ#{M#X&pOt59lw=!lu zk>kB54cPXvC(=Xt2xt(Ly4za%3B4$0_2bjsNZbd0g<(rk3;FG~?og?FBEsOPSxD8o zsa*~ycA0C$^aFyHr511PdJ+w^(wz$Qe};8#-RSe3C}%+|=jinF@f_ENiPq&%YkP@QnVBSe8zF>*QFH+U zR`XandB<%-6HbAS_x*TxhpM8}Wq-aY{2lPzrdY9hFpz$WBwm#_BFf}y+LK?HM)#?# zp9tsN)ZNYmP50`()62v_1s48nAc8X5F;<$7Z5ibaQ<`_d*!cf>H0g8K(}&=T;5PkXF#JA?vn<0t~ui#dF*V<`F zXX9s=ztNl@LX2|2%!Hmx!SI zxm$-@(MF+D)G)cz9i;JjE2J-;6&uKa7${p->pY_nzn%^r%MjPn91XXz<%>5Z|CgGx zH_xl+0-u?Pt&}w(3uz5}oZD_5pEnb=`0-KhuJ%@*Kn0_ z8b^r}@V`8X12X8xZr=)Z-%cT(L>FN*>*;`hcZ!oO^1s7@2PhSZkavYEui^e5Zt`fyJj*SDlV2l@u4z zo^X-g@SbELhdF^DE9QvM+Ij0bNobSO4~MSO!qNqI{6q@25>L5m*_O)~LWf3okpYPC z5m+G=BWkg{0Vq7Tv*snRFB9RL_1#YB@Zy2{{8>zMj^Ie5YNJd+-bAwuAv%~ZDeO_= zNChVuddW)Smcdhkn$k z4D?x!OcgDo2W>mO!E%w|)}k)5yCjL!C^>KczWfgcOCn>fn)GWBQ7ckFKJ1SC7aaUa zj5brx7evj<;~lG&u{PU@9aDj|2z$to%3Ej2k>iPdffExO%#MZ#9)W*n&CER3(|;?4 zC~Sa}KOb^>^>cK&jbi%v6$tcmwu4%bsbWV~nZ0sgGpl|>z|SEtI%X3)jdbW*k5zp*Fcweo(fmp#6YCko z_L7X;+^cVt>&c+>%k!lsx3cVQvGUAsdzug#T3+2_DQnE|ljZIys0rP69LVH`k(k#3 z+~+D4inmyMimVfF6j_*%BwY~*p9%oL{;5udP#m=&|4U+7&_59H*(@4(NDdkf0zfID zYLz)wES#00EicEyyk}10kXu_%^`i%&r9(!$EE%cI>r+)ya^!{NK3GZNH!rr$q9+`?+pMS8M602E1?kqQKD#!>bAQA0EWD9HoXo zGqwXLau=b$(r*+`WL;(ys1U~S7Ves`2q@sKU!i&oJpnU@j}#Qmj)`m*gg{yE{$zf{ znidFNc$tjz0CN+>Ij~gxOYgUoTUfuP{>xq$Jgy@Tpj>YMliaH5Amy6a0I^`X^3k*u zF`#iSOk|H0dWvB%3%9~3k;AS~d_WqKjtd%; za|jUdZKa#2Cz+y+<=s!l$wgMdNyY&-#=W1myM)n6G+N?sIN-)vkHS2DDe}Q+ek6AR zC!annw8X$~rFoKsde{2!kCttjWmW_~;8H)0J0h_kHgoPnxB+f_d}%;zn3*PTwOZ?5 z7~UsTH@LJv>TJu*wt#iL1K4Eq(di{AoUk1?9Y~w~k+!25R2u7{% z7e`GcFPv5z2CG?77e(u}JoI3JMikI#KsJYeCy|a7v^N$a?gxmZXHNB-Ddg`gqujWr zXF%JtX{ExqC?z*c6o@r0l78QrBl=55jd1u&xd*}oAS6~vNi=X}J?qAuWTIIroBLB^ zpC|cOLo7Gx$E3LHqP&{9Jh!#v_H7-^`n**nEnrF++iHYZ z2zR4Ak(guG)qPU*m$#P%*ElkM>fKXuNKX%=>q-SfyG>kOq)|MN;ASMpRt%#~BIztK z<6j+58DUza+()=~%jYCplPqx=p$fA@L29&hsI_Dsg?onZ2PB|Ev3Q{}(iv&E87U!} zf{;+}gP!H|1~g0-f%vr>g)z6OY-lsYy8t5Um|jKjzbHi%FaU{+=@27;d?MFRiHXuO zAB~n3*GC%4&WCvyFi@sS422_mwyvoS!)OY8Q1;_Bi4}Fy z8i;nnLol4)(D+GaOAZSwo>V6z_Z$HrDi=4>F7-B4dzKgwWWo~TQu#{-Nc$n|L0nf$jS!qAa}99_|~_u%h-=v9g-%qG}j9=TM%t*PU8C^r7*J?T#5 z8R|V4kSx)$??I_npVFk^$8AnMVJy|l2!;?yBc6oakgH%nYn} z@R}}!d*)PACV37IHl_3=36du#Ht!@{(;2;tErJLVAlB3lACR$A5*$+wN?R-HO&%|K-i23KeVyAr&7I??6l0$|_+A%H}k-SR~ToRkwA7YfI0 z#|hA7nw}vBYl3z)D*j+G_}Xe90uKKoSta0ZZ6PS8Z^BaB5Z?3YKc#rdFRn%(g%8fd zY$<$uuaB6Y?-L%=!tB4-iSM%rFww$isvpBVdd-851k0Ff?{n*S;lmOxC4IFJ#uBso z4e{EHvt!l67#yCrEmQ^G2<^=*rVYbu+l2@Ii>Dk3#b;^lYkM>(y$W;?Kvc~rNKAYw z!b3~lGC&zQr;|2dmn(IQlXgs#Nn)g{!L>_OGLcfF^}P}`=fkj*VimUIf6!=EK*-j| zGK-9PT2&d7QqK7fg@?}OY+P2p+g^z=wtM1Ma*Ta9P2G>^e7kvtPZo?lu>l+*(Lh{K zVd_mWv`kOYVk2^VT7cOV=PR{kNL_tQN#SDq_B%x;QP6~BljK!x|GqlpeoP{8d(}w~ z4P6Yu={;T|bB|XzAH7pjiDDJpQe%O&?~YFpuBfR;(`ZX}Z$Sszn2RXHpR~`_9lhRY z2&waN`eZo!o!7&%4j!1 z6aXUh!!VXw{u8jnar`W%Op|=PhlTXvMpOF}LzdQCQMH?6tDc^j7&2_37^7q@Pz-MC zra2j^1jy9ya|{&&G|`2NSai~Im7>g?3(xP+vkk$u6&IrB%7vrqAyRORQ6i-Ys#IUF zg{EkNL1cr?INNm*$sK2wjwzHX$S`9It+#X^o6qMOU_;sD%a0P z=1tdwe?h*x6)rd$1ow)Q9lL{ARSQKf0GQ+MZypA}Sbcqy|q(9T|XGETbqXETs z0}W()BQX?SjYFum+Rq`RKe6k`f4uafb2iYq^b4lCAj9VVYq3n;j|;g^{2*@9)5y$- z0bm1)D;iFLY6cdkgHhveKB(0USqqtpm(6rtVyvWtJ%f6m zgA4k{0zVho5atsUydCwIzrI{MIeHWrMkfae?MbD^@!%Ie3wXzYH|TuJA?HJIs4q|; zT|`0=zT(dr@JTPoJjy7@yVLleVP5<$*IUss$6hB~u|538pNnrr)M7>G30qwg+~DzNq*g-l$|HF$w9 zs4W0`qGk&Uox@r@b=NZ;%CCVh3z|&Jk5OtKcnW03siIxYg0x+-qh(m+U2c$RIqX~u zoqL*`^fUFUtm-cdxgDdLojy6wU9vo?Q`}8ZWaQ5bNCcPP8xFZe1IdpKzUHb&TpJW= ze_%k_nr>`RwNyl`deKI8AlK&WP@gagN4300iA2c|b%v*8iQ3&OfK|}04K8`H76KD1 zvX(yV->r6@@|J2KoJwCt4JNLp$gNM39hsL*!P)bm?2*8;Ig z94!rT{8-{`<<{EExSrJIlgJjm7^M1L_c`}iM05Znz|y1tJVNDd(v$DGY#)s|Nh`OH z>FvEwhA$Pr4h{mEc!vj3&qV;No<7lXK#z=uG87`y#4ao-$W{5^sPgR)EjHBBn z7e1AuxF+Jy1tcPxmEw;b##V0Q21*goxya4(8FQAF_v!IFKGo8d+eU_?Gvd9NqzNw& z{J8d}FFkh?4D1My-b@6$wcN3Dt~*B4UCSI0K=my*Pi&s=S5HaOX66QnHXhe`Pf@eT zh*STV3ynsVqzxS}6_y+w=$wzQlojmcO6saCrtv)XDx|fC9f%efpkPUgA%~P?<*zS}4#cP}=tdGmn#B;oIP}u^gd1H{ z-p?^DZ~K)2p{RLurn!LNfJE5%-c!a6n7h*Y;z(FTS?jOYy!~JcRABxPEX9B$E=456 z9y@vybq}`tLlB0$4?Lw?LBZrIRF8d6*7Hk0J=VM*=L%}#QFTgWJ7;KLLfa^DF`KT0 z#yyTK?wI;b6QExgN6MZxBMXT{nVh9Nr&v)HJMuetIOKWi*_)SN7fH7VQvDs#T0krp z&ExohQxO)bUeyT|_;piG(2kbp;E$V5Rwm0F+(Eg-E&$qF2>fZtXXuB|RNWPZ1fByFM zVxMeJQ2t-%H;)yNZu;LemEWdtxax>}-WAl6#WVgyYE1m@ql#w~faLKl`xQ58K6?J< zkF=jM6F^GR%b6FFf>G#vW&XQfP=3AAwjQ*v*S*YXx)_~ywnb6i9(Z&ouEAQoC(2HH zQ8hPM;ibs$|IA_ znHnBYV`)*C0bHcSOwGqi){M)~eR=yKlHKD$G_D3ZBe}vKwcS5bf%=sRaAnFrvi5pW zQNRKkYf>3D;u3D}yXpMjoBab0C-Kt^;5r5ysl)~W zJ5@5Ks;wu(9>tHp?xw#`k^ElJ()}Nqpwgyfxb65JHf#5fzxEYXy(jxd;p!fG+394& z#oz%`;#v?FT+eH2hAvkXlDG4YFCQcsa#k zFjrSFAVO0Qq(g6)z^;bE4{8$2KctMHlQ7QjJgTDh6%5MZ%YsU6m}}=h9`i{a;V^xQ zaggN)K;wCxFghI+^bF=MZ$;48c7h~zFbwP*xN98>hikzpu0gYQhdT3GP7{vwH-_Er zP1`)bfcb|W-EHz>^C)-Wts`v>)>D!|0*>>*<5&Dn%=Mfv?Vb;jdN!M%UWPn+0u6nh zaO-3ST2IC}jU3nQqhl2d*cxC$3YeiQdy!1_RUCEU9FO8movyHt;soQ42|olB-aqy; zI^QO82t}PdfrMb+A*2;EcYRr*cnWOUk*WN; z>)({3@iVXs5Bht7<3s13F+2Zl_CQs#P4wk=yS?BO4ouP7hs3|1%Y6rp3TxXjvVH3l z92H`$^Y@SSJU4ag&k?SJ=u)}=^K>G05u-Qup3tD{ck~h9>sYL4%gzk1Kt$keH6Hx; z^Jh|o8=_X+=6RiNHhaduUr^_Dos#bLMC9;OR7`TB$la-7nw|!ewk{}8**o79{;eDu`gv7+p+yEwQJ`is`&qqWrO zzo4qBD)r9~Lw&$v%KZX$Zq|oq=F%oZ1Ws&=zMaaLPI%fc+R@z_!EtdUK;C>f2u~r`f7%% z#yySgso#-73ofSN>(V{VbkUSY`Z3!ZUNf4O6yHAg{rW#b3pccxre)ScF&Xrh9S7VeNbNicbEBpW{0$@2f~Y{`oIhEE>P`&NCedx6t8u9beB*-m&STq(lJ$L|}IU$fo1X|Bi7XM6PoN9dk3_o(hWbp#fR z8Jc>SQ0rPj`7n)Fm&o@~m~5ydF=P^UKblK74Zs7WuvPp%%JNR?LmlmHem;_gJ0aBrN2KL*0vlT2CL%x8&=hUq{U3K1NFfnA;jlhQ9jrS^wFN^ z`d$DiQ44`aSnTP|Ef*$W@PP;&YH=b~i)Y(sw%LQr~wwl0C4&3Xx`yhH1e>fclW@fRyW+5iLXYOI9V4Q-{X z+&c_HobHzg)`$dO$Opu%Lbhi(ScN_qS`kxPMOsq)AX67xQEOgT-P? zev;CcZn{ndJZ0#(L(L6YX!ZuWP#6ow8z?I`<98b=QoPxrdE*8<3w+%d;py2hJ`$LE z1)YDTL~9C3wM6jH(xs&G42D_!`yq?r_8wY(xSKe1F%ElzGtd&g(B&+SAJB@85i3e?=Zyu88qhqI+`LZKVGJ-RUj|;Z(DXqR zG8*NzZ8w3LPjy5G11{jgiANKZKnK+oRb{)oXM3oNtrvFI zZFb=G>?fm{?udvuLb-V5oZS%;k=U2VM(qa?w>%quA4d|tK4c!<9r<0h5C}a2lf+H! z29ZVLYApJPz|AdFHi|e)UA#i1lvEeV3qkLI{ctis1bkjjM1mGhym&SnED>R&R+@EB zxBj3=%WENw$WwI!6fKIvUFb1>Oq=UXdjruoz1mQq`tIBs*gs5QF$|HClA_15-)ePl zXsB{S5*(Uu>k{_BD7^{FXR^bsw5}b5PfZ=dc;2Cv+4@a#P`xwhu*hP=R_SN!xW5SG zc#WYvS_dgWzE5cuW0OJo+LRj3i?iyB~Tg{A5_`SEzSCeHRnid^d7q}D0x^~Ve! zRq*}+sW8v^SW>F+6Pk+Maf|nIBiN`7uzu#!FeYdX+rl1MD}ExX^LBapD7Iwi{z_Ox z7m2u7`hrh3wOd$Jm|_$L^0Yn@SZM|Ek#|BDx)_a(YGJ|iwf_!b_7Hma#RT_m>!W2B zEby;~W(O}oFLJjRG>wZ>yyV=FGNI#25^~9 zKzl^GA!LNKe;ww(6rv#{blc~SW_PV9pe;p0WK{@>n>K#wSe@iFNQM|7wGT^qT3*xn z9#IZM%3?Rjfj?}t!cs%lf+H?j`h7)Dh(tAwX(x(FW%|%WG9seMRUNdFcpACc7c8**w4tyKpCpGg{|LCu0ylxklg{!gjr})rKpxU?KD4S8s~ATysQC-xzSa{AkAbC z6e8lqv>Nb3s-$dDvZ*aFSZ`hFT*A9aR+0(fy?Kp(ECjTdKGl3pGiBV@APhDU7`Q2u zo76Q+KJmn=<6bX<(zewh2JF1_N1J{?m@!P`lIK%?o)f>jN_(d8tL!uwpfnD&m)$QK zye+Dzq_jbTfu-ejU0vFcqfLSIt(6-9SE9vA(5(>r$|gpKg$8qV$~qP@CAE&5Zj|a8 zqyYy$Dg{|uZK~cVn-I`dp?JkgYVNDxmLyp~ub^Ulx*#~4?Ru`ZL(eSP#kxdGIU~Ky z;8O{Z*ldd;7uXJKq{*SWq+54FiZ4I#9c#Y1cmCcnj_cZG33nP3J-zv#Tg1nh6kV?o zRMpgZ*6zp&c0gT-(#dl9>bqB2DT5%cQgkx)(Xlh$#qC9ZSwW29uZ0TNcm%2}HU;S% z>*?#w{W9Zw+-$t!hI~oQn@yHF>OfGijS|;L06X=Vz2&}{oMLs@?&IOU8egC1>VvP@>CiYy}s{NS7d_uj4QZrl1qusDJxe>um@&6_9C~ClWq$OWnN&N1=kg+lD=Q0 z!46^scv*sns1ylQG}s+6bsV!PRZ6d~4?n<09IJoGFmkCudAupm+#7E%Xvh4_@N*MW zESOSq`o7<4DQfWQG^1(X<4_YXC2JM+WGTuaBcS-5aZcG&E46_a?q*y4g=LdZa~!$pF;TbPw6G{}5IC=*2wGnHp^sK5w~rZ|tvb;zg#=xu zq&Fv|1Y6R?y z8(lk&bs87Vm0#G>k$hm3iw_C@M>(~tsUG_p;Q8CmoUw2IVgZ;Ol-fZqu)aQ&!%x-+ ze;Oils$n2F-xRv4E$HZjs}>VTVDrfm?kps6{wen-J|;6`XSJ-H#SW zteaYjsyhbz^}9>?VmnMtRn;=>kTGJc71y~( z28ZImS!re#+(Gp>?^^x)>O))6k#E|(qB4UDYa#khhE`7I>{MQ0ZI4bGepbYk6Sy(O z%zmy*D$qpV@x6TVSVrthVQTQT4Y}ppf_Sqtt-eYKBTHVUQuTy=isg$#W@hQjE$fqX z7F00O+TrRggXX8O#hn zt*^pu48h&0zx(&y#Vt=|!|yzlFN<$x3=5gX;;j+-ma2?wBzJF6Yk1uuBmF)WVxi4$1Se|TIBW|3{Cj6kW!98R=~47E~vNp`V2J9X%MAaAvx_ z%9+sXzxpiM%5CD#zZbOx9reN5eZrA|(p=q%nN5O{!au%+hieEwTA`70TAX~9JX`I~ z=?`1%i2`*HboAEt=9J5yO$$jNC$)qraa77-Q^@yq(sHwR!R6(mx5Z2i>;0a=((}fc z^Ok*alNlTb7SjZ^TLHp~-LsWO-kLa1MwCP2uvJ5LW72=vGK_(=0N0(9Q`?&A-{M6G zXt20+LSW~;?4kL9hCOD25<3X{ydGp_m}4XVL-&!pca-E^jqd`znP_MUMIgSuh3Dbr z{XxpnczjJPz2yEc=(s6j+`-cf~1^OI4pcQ5_3uM2z0^C;v5^y zF|qRujSLXmiH7IICGND<*M=V_Xl-}rjMgN6AaSag7H-0p%5S(!F$D09 zZ4+`~eIQ737b7BO(QLs+KAHc=AB>85hABxsgmsk^9Uzi%LMB~4U%>EWhStU4f_eEt z=C9#I7Muykg^L!2S>(Jew}_z9kz!`uzRzWSoET-exL208uK0Z8Lvorhrt|aH!m=$# z%W!nsuuy04OmOby5ey=svjZf_|rQ^19>kptt>OkCqTsyELxhBZs7l z-l+#qX87M5^xT|Saihh_3!D-XdJRXAMQvy7!!m!Ox;%JNP&oNywJ|YwZafR&PN#7} z!q{C&R!9ol@OKg-+j5()NmuFWMOBp9(Q6WO-J>D`D4bCl-Tr{Pl&( zzWo|Q>^qNvnTl-rN=1dHL082iR=#VERtaS3NQ8A^vIKWc;#-=EX&fViogK;#bqWJnst9c$YuI(6N=ijBTVxJ?l-<9Mb?Z=;3rbp!u|h_zkaUn zAkh_L(K*Af@UQ|*vLEaP_%+}#yKmUeLg4-W?JyGLMO*`EKMI8VH?=unXpu#SGP7r$ z9wQ_VSlMcF^WLQ%cTD;}!o{=m#>=j;EZHcyO(cms+1S=4|2;0&<{SwMp`7&aEIWb~ z2+O9b;*s|39J=RZO|6Zb!CsPeKOh*3h$&~l6LVeRz#=3g=PV5On-aQO_! zpK=GjqN(=a^+*2ElybylY}b(2L^)=+~V`Uh(8`3JC_~yC?66h)dK4L*kMsPL4zLy1P^%rKQ;XiV)92O XD$oZ@5H`{~0^oE0tOd5r1b_d(1%qf2 literal 0 HcmV?d00001 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>> { } } + @Override + public Value buildStarscript() { + ValueMap vm = new ValueMap(); + for (Map.Entry> e : super.getValue().entrySet()) { + vm.set(Respackopts.sanitizeString(e.getKey()), () -> e.getValue().buildStarscript()); + } + return Value.map(vm); + } + @Override public AbstractConfigListEntry buildEntry(ConfigEntryBuilder entryBuilder, Text name, Supplier> tooltipSupplier, String screenId, String entryName, String translationPrefix) { SubCategoryBuilder sc = entryBuilder.startSubCategory(name); diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEntry.java index 73e22c4..67bddf1 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEntry.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEntry.java @@ -3,8 +3,10 @@ package io.gitlab.jfronny.respackopts.data.entry; import io.gitlab.jfronny.respackopts.Respackopts; 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.Map; import java.util.Optional; import java.util.function.Supplier; @@ -81,6 +83,8 @@ public abstract class ConfigEntry { public abstract void buildShader(StringBuilder sb, String valueName); + public abstract Value buildStarscript(); + public abstract AbstractConfigListEntry buildEntry(ConfigEntryBuilder entryBuilder, Text name, Supplier> tooltipSupplier, String screenId, String entryName, String translationPrefix); public String getEntryType() { diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEnumEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEnumEntry.java index 124dae6..2a52fe8 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEnumEntry.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigEnumEntry.java @@ -6,6 +6,7 @@ import me.shedaniel.clothconfig2.api.AbstractConfigListEntry; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import me.shedaniel.clothconfig2.gui.entries.DropdownBoxEntry; import me.shedaniel.clothconfig2.impl.builders.DropdownMenuBuilder; +import meteordevelopment.starscript.value.Value; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; @@ -113,6 +114,11 @@ public class ConfigEnumEntry extends ConfigEntry { } } + @Override + public Value buildStarscript() { + return Value.string(getValue()); + } + @Override public AbstractConfigListEntry buildEntry(ConfigEntryBuilder entryBuilder, Text name, Supplier> tooltipSupplier, String screenId, String entryName, String translationPrefix) { Function entryText = s -> GuiFactory.getText(s, ("".equals(translationPrefix) ? "" : translationPrefix + ".") + entryName); diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigNumericEntry.java b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigNumericEntry.java index a6fa704..9e235d4 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigNumericEntry.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/data/entry/ConfigNumericEntry.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; @@ -57,6 +58,11 @@ public class ConfigNumericEntry extends ConfigEntry { sb.append(getValue().toString()); } + @Override + public Value buildStarscript() { + return Value.number(getValue()); + } + @Override public AbstractConfigListEntry buildEntry(ConfigEntryBuilder entryBuilder, Text name, Supplier> tooltipSupplier, String screenId, String entryName, String translationPrefix) { if (min != null && max != null) { diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/FilterProvider.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/FilterProvider.java index bcb8d4a..b29ca06 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/filters/FilterProvider.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/FilterProvider.java @@ -4,11 +4,13 @@ import io.gitlab.jfronny.libjf.data.ResourcePath; import io.gitlab.jfronny.libjf.data.UserResourceEvents; import io.gitlab.jfronny.libjf.data.WrappedPack; import io.gitlab.jfronny.respackopts.filters.conditions.ResourcePackFilter; +import io.gitlab.jfronny.respackopts.filters.expansion.DataExpander; import io.gitlab.jfronny.respackopts.filters.fallback.FallbackFilter; import net.minecraft.resource.AbstractFileResourcePack; import net.minecraft.util.Identifier; import java.io.FileNotFoundException; +import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; public class FilterProvider { @@ -16,10 +18,12 @@ public class FilterProvider { AtomicBoolean containsFileWasFallback = new AtomicBoolean(false); UserResourceEvents.OPEN.register((type, id, previous, pack) -> { if (skip(pack)) return previous; + String name = new ResourcePath(type, id).getName(); + IOException ex = new FileNotFoundException(); if (pack.contains(type, id) && containsFileWasFallback.get()) { - return FallbackFilter.getReplacement(pack, new ResourcePath(type, id).getName(), new FileNotFoundException()); + return FallbackFilter.getReplacement(pack, name, ex); } - return previous; + return DataExpander.replace(previous, pack, name, ex); }); UserResourceEvents.FIND_RESOURCE.register((type, namespace, prefix, maxDepth, pathFilter, previous, pack) -> { // Warning: the Identifiers here DON'T CONTAIN THE TYPE! Therefore, it needs to be added when calling a method that generates a ResourcePath! diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/conditions/ConditionEvaluator.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/conditions/ConditionEvaluator.java index e0617ec..afbf5ac 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/filters/conditions/ConditionEvaluator.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/conditions/ConditionEvaluator.java @@ -48,6 +48,12 @@ public class ConditionEvaluator { if (condition == null) { throw new RpoError("Condition must not be null"); } + + if ("true".equals(condition)) + return true; + if ("false".equals(condition)) + return false; + if (!condition.contains(":")) { throw new RpoError("You must include you resource pack ID in conditions (format: pack:some.key)"); } diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/expansion/DataExpander.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/expansion/DataExpander.java new file mode 100644 index 0000000..69e7e07 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/expansion/DataExpander.java @@ -0,0 +1,45 @@ +package io.gitlab.jfronny.respackopts.filters.expansion; + +import io.gitlab.jfronny.libjf.data.ResourcePath; +import io.gitlab.jfronny.libjf.data.WrappedPack; +import io.gitlab.jfronny.respackopts.Respackopts; +import io.gitlab.jfronny.respackopts.data.Rpo; +import meteordevelopment.starscript.Script; + +import java.io.*; +import java.util.Map; + +public class DataExpander { + public static synchronized InputStream replace(InputStream is, Map expansions) throws IOException { + String s = new String(is.readAllBytes()); + for (Map.Entry entry : expansions.entrySet()) { + s = s.replace("${" + entry.getKey() + "}", Respackopts.STAR_SCRIPT.run(entry.getValue())); + } + return new ByteArrayInputStream(s.getBytes()); + } + + //TODO move check to see if file has rpo (and parse it if it does) to shared location + public static InputStream replace(InputStream inputStream, WrappedPack pack, String name, IOException ex) throws IOException { + if (name.endsWith(Respackopts.FILE_EXTENSION)) + return inputStream; + ResourcePath rpoPath; + try { + rpoPath = new ResourcePath(name + Respackopts.FILE_EXTENSION); + if (!pack.contains(rpoPath.getType(), rpoPath.getId())) + return inputStream; + } catch (Throwable e) { + Respackopts.LOGGER.error("Could not check file filter status", e); + return inputStream; + } + try (InputStream stream = pack.open(rpoPath.getType(), rpoPath.getId()); Reader w = new InputStreamReader(stream)) { + Rpo rpo = Respackopts.GSON.fromJson(w, Rpo.class); + if (rpo.expansions == null || rpo.expansions.isEmpty()) + return inputStream; + return replace(inputStream, rpo.expansions); + } + catch (Exception e) { + Respackopts.LOGGER.error("Could not generate replacement for " + name + " in " + pack.getName(), e); + } + throw ex; + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/gson/ScriptDeserializer.java b/src/main/java/io/gitlab/jfronny/respackopts/gson/ScriptDeserializer.java new file mode 100644 index 0000000..dae3409 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/gson/ScriptDeserializer.java @@ -0,0 +1,41 @@ +package io.gitlab.jfronny.respackopts.gson; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import io.gitlab.jfronny.respackopts.Respackopts; +import meteordevelopment.starscript.Script; +import meteordevelopment.starscript.compiler.Compiler; +import meteordevelopment.starscript.compiler.Parser; +import meteordevelopment.starscript.utils.Error; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; + +public class ScriptDeserializer implements JsonDeserializer