chore(deps): update dependency io.papermc.paperweight.userdev to v1.7.1

* feat: Add LegacyUtils methods to check if a string contains legacy characters

* chore: Rename to #mapLegacyOrElse

.github/workflows/build.yml

@@ -8,26 +8,24 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
         cache: 'gradle'
 
     - name: Build with Gradle
-      uses: nick-invision/retry@v2
+      uses: nick-invision/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 2
         command: gradle build
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: MiniPlaceholders
-        path: |-
-          build/libs/MiniPlaceholders-*.jar
-          fabric/build/libs/MiniPlaceholders-Fabric-mc*.jar
+        path: jar/MiniPlaceholders-*.jar

.gitignore

@@ -2,6 +2,7 @@
 /.idea/
 build/
 bin/
+jar/
 
 # Visual Studio Code
 

LICENSE

@@ -1,674 +1,201 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2023 4drian3d
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -5,14 +5,14 @@
 ![Modrinth Downloads](https://img.shields.io/modrinth/dt/HQyibRsN?logo=Modrinth&style=flat-square)
 ![GitHub Downloads](https://img.shields.io/github/downloads/MiniPlaceholders/MiniPlaceholders/total?logo=GitHub&style=flat-square)
 
-MiniMessage Component-based Placeholders for PaperMC, Folia, Fabric, Krypton and Velocity platforms
+MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms
 
 ## Compatibility
-- Paper 1.19.4+
-- Folia 1.19.4
+- Paper 1.19.3, 1.19.4+
+- Folia 1.19.4+
 - Velocity 3.1.2+
-- Fabric
-- Krypton
+- Fabric 1.19.4+
+- Sponge API 8+
 
 ## Commands
 

api/build.gradle.kts

@@ -1,28 +1,22 @@
 plugins {
+    id("miniplaceholders.base")
     alias(libs.plugins.jmh)
     id("miniplaceholders.publish")
-
 }
 
 dependencies {
     compileOnly(libs.adventure.api)
     compileOnly(libs.adventure.minimesssage)
-    compileOnly("net.kyori:adventure-text-serializer-legacy:4.13.1")
+    compileOnly(libs.adventure.serializer.legacy)
     compileOnly(projects.miniplaceholdersConnect)
-    testImplementation(platform("org.junit:junit-bom:5.9.2"))
+
+    testImplementation(platform(libs.junit.bom))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation(libs.adventure.api)
     testImplementation(libs.adventure.minimesssage)
-    testImplementation("net.kyori:adventure-text-serializer-plain:4.13.1")
-}
-
-tasks {
-    test {
-        useJUnitPlatform()
-        testLogging {
-            events("passed", "failed")
-        }
-    }
+    testImplementation(libs.adventure.serializer.plain)
+    testImplementation(libs.adventure.serializer.legacy)
 }
 
 jmh {
@@ -33,14 +27,9 @@ jmh {
 
 java {
     withJavadocJar()
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 tasks {
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
-    }
     processResources {
         filteringCharset = Charsets.UTF_8.name()
     }
@@ -51,4 +40,13 @@ tasks {
             "https://jd.advntr.dev/text-minimessage/${libs.versions.adventure.get()}/"
         )
     }
+    compileTestJava {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    test {
+        useJUnitPlatform()
+        testLogging {
+            events("passed", "failed")
+        }
+    }
 }

api/src/main/java/io/github/miniplaceholders/api/Expansion.java

@@ -35,7 +35,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
  * 
  * @since 1.0.0
  */
-public interface Expansion {
+public sealed interface Expansion permits ExpansionImpl {
     /**
      * Get the expansion name
      * @return the expansion name
@@ -43,6 +43,20 @@ public interface Expansion {
      */
     @NotNull String name();
 
+    /**
+     * Get the author of this expansion
+     * @return the author or null
+     * @since 2.3.0
+     */
+    @Nullable String author();
+
+    /**
+     * Get the version of this expansion
+     * @return the version or null
+     * @since 2.3.0
+     */
+    @Nullable String version();
+
     /**
      * Get the {@link TagResolver} of the desired {@link Audience}
      * @param audience the audience
@@ -134,6 +148,7 @@ public interface Expansion {
          *
          * <p>The content of this Placeholder is cached
          * and can mutate depending on when it is invoked</p>
+         *
          * @param key the placeholder key, cannot be an empty or black string
          * @param audiencePlaceholder the single placeholder
          * @return the {@link Builder} itself
@@ -152,6 +167,7 @@ public interface Expansion {
          *
          * <p>The content of this Placeholder is cached
          * and can mutate depending on when it is invoked</p>
+         *
          * @param key the placeholder key, cannot be an empty or black string
          * @param relationalPlaceholder the relational placeholder
          * @return the {@link Builder} itself
@@ -191,6 +207,7 @@ public interface Expansion {
          *
          * <p>This eliminates the need to perform a manual
          * <pre>if(!(audience instanceof Player)) return TagResolver.empty();</pre>
+         *
          * @param clazz the class to filter
          * @return the {@link Builder} itself
          * @since 1.0.0
@@ -202,15 +219,37 @@ public interface Expansion {
          * Filters the audiences that this expansion can receive through a Predicate
          * <p>Example:</p>
          * <pre>
-         *  Expansion.builder("example").filter(Player.class).filter(aud -> isInProtectedServer((Player)aud))
+         *  Expansion.builder("example")
+         *      .filter(aud -> aud instanceof Player player{@literal &&} isInProtectedServer(player)
          *      .audiencePlaceholder("hello", (aud, queue, ctx) -> Tag.selfInsertingClosing(Component.text("you are in protected server")))
          *      .build();
          * </pre>
+         *
          * @param predicate the check to realize
          * @return the {@link Builder} itself
          * @since 1.0.0
          */
         @Contract("_ -> this")
-        @NotNull Builder filter(final @Nullable Predicate<Audience> predicate);
+        @NotNull Builder filter(final @Nullable Predicate<@NotNull Audience> predicate);
+
+        /**
+         * Sets the author of this expansion
+         *
+         * @param author the author of this expansion
+         * @return the {@link Builder} itself
+         * @since 2.3.0
+         */
+        @Contract("_ -> this")
+        @NotNull Builder author(final @Nullable String author);
+
+        /**
+         * Sets the version of this expansion
+         *
+         * @param version the version of this expansion
+         * @return the {@link Builder} itself
+         * @since 2.3.0
+         */
+        @Contract("_ -> this")
+        @NotNull Builder version(final @Nullable String version);
     }
 }

api/src/main/java/io/github/miniplaceholders/api/ExpansionImpl.java

@@ -1,33 +1,34 @@
 package io.github.miniplaceholders.api;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Set;
-
 import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
 import io.github.miniplaceholders.api.placeholder.RelationalPlaceholder;
-import io.github.miniplaceholders.api.utils.Conditions;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
-
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.audience.ForwardingAudience;
 import net.kyori.adventure.text.minimessage.Context;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+
+import static io.github.miniplaceholders.api.utils.Conditions.nonNullOrEmptyString;
+import static java.util.Objects.requireNonNull;
 
 final class ExpansionImpl implements Expansion {
+    private static final Tags.Single[] EMPTY_SINGLE_AUDIENCE = new Tags.Single[0];
+    private static final Tags.Relational[] EMPTY_RELATIONAL_AUDIENCE = new Tags.Relational[0];
     private final String name;
     private final Tags.Single[] audiencePlaceholders;
     private final Tags.Relational[] relationalPlaceholders;
     private final TagResolver globalPlaceholders;
     private final Class<? extends Audience> filterClass;
     private final Predicate<Audience> predicateFilter;
+    private final String author;
+    private final String version;
 
     ExpansionImpl(
         @NotNull final String expansionName,
@@ -35,19 +36,22 @@ final class ExpansionImpl implements Expansion {
         @Nullable final Collection<Tags.Relational> relationalPlaceholders,
         @Nullable final TagResolver globalPlaceholders,
         @Nullable final Class<? extends Audience> filterClass,
-        @Nullable final Predicate<Audience> predicateFilter){
+        @Nullable final Predicate<Audience> predicateFilter,
+        @Nullable final String author,
+        @Nullable final String version
+        ) {
             this.name = expansionName+"-";
             this.audiencePlaceholders = audiencePlaceholders != null
-                ? audiencePlaceholders.toArray(Tags.Single[]::new)
-                : new Tags.Single[0];
+                ? audiencePlaceholders.toArray(EMPTY_SINGLE_AUDIENCE)
+                : EMPTY_SINGLE_AUDIENCE;
             this.relationalPlaceholders = relationalPlaceholders != null
-                ? relationalPlaceholders.toArray(Tags.Relational[]::new)
-                : new Tags.Relational[0];
-            this.globalPlaceholders = globalPlaceholders == null
-                ? TagResolver.empty()
-                : globalPlaceholders;
+                ? relationalPlaceholders.toArray(EMPTY_RELATIONAL_AUDIENCE)
+                : EMPTY_RELATIONAL_AUDIENCE;
+            this.globalPlaceholders = globalPlaceholders;
             this.filterClass = filterClass;
             this.predicateFilter = predicateFilter;
+            this.author = author;
+            this.version = version;
     }
 
     @Override
@@ -56,46 +60,66 @@ final class ExpansionImpl implements Expansion {
     }
 
     @Override
-    public @NotNull TagResolver audiencePlaceholders(@NotNull final Audience audience){
-        if(audiencePlaceholders.length == 0) return TagResolver.empty();
+    public @Nullable String author(){
+        return this.author;
+    }
 
-        Objects.requireNonNull(audience, "the audience cannot be null");
+    @Override
+    public @Nullable String version(){
+        return this.version;
+    }
 
-        if(this.singleFilter(audience)) return TagResolver.empty();
+    @Override
+    public @NotNull TagResolver audiencePlaceholders(@NotNull Audience audience) {
+        if (audiencePlaceholders.length == 0) return TagResolver.empty();
+
+        requireNonNull(audience, "the audience cannot be null");
+
+        if ((audience = expansionFilter(audience)) == null) return TagResolver.empty();
 
         final TagResolver.Builder placeholders = TagResolver.builder();
-        for(final Tags.Single pl : this.audiencePlaceholders){
+        for (final Tags.Single pl : this.audiencePlaceholders) {
             placeholders.resolver(pl.of(audience));
         }
         return placeholders.build();
     }
 
-    private boolean singleFilter(final Audience audience){
-        return filterClass != null && !filterClass.isInstance(audience)
-            || predicateFilter != null && predicateFilter.test(audience);
+    @SuppressWarnings("OverrideOnly")
+    private Audience expansionFilter(final Audience audience) {
+        if (audience == null || filterClass == null && predicateFilter == null) {
+            return audience;
+        }
+        final boolean eligible = filterClass != null && filterClass.isInstance(audience)
+                || predicateFilter != null && predicateFilter.test(audience);
+        if (eligible) {
+            return audience;
+        }
+        if (audience instanceof final ForwardingAudience.Single forward) {
+            return expansionFilter(forward.audience());
+        }
+        return null;
     }
 
     @Override
-    public @NotNull TagResolver relationalPlaceholders(@NotNull final Audience audience, @NotNull final Audience otherAudience){
-        if(relationalPlaceholders.length == 0) return TagResolver.empty();
+    public @NotNull TagResolver relationalPlaceholders(@NotNull Audience audience, @NotNull Audience otherAudience){
+        if (relationalPlaceholders.length == 0) return TagResolver.empty();
 
-        Objects.requireNonNull(audience, "the audience cannot be null");
-        Objects.requireNonNull(otherAudience, "the other audience cannot be null");
+        requireNonNull(audience, "the audience cannot be null");
+        requireNonNull(otherAudience, "the other audience cannot be null");
 
-        if (this.relationalFilter(audience, otherAudience)) return TagResolver.empty();
+        audience = expansionFilter(audience);
+        otherAudience = expansionFilter(otherAudience);
+        if (audience == null || otherAudience == null) {
+            return TagResolver.empty();
+        }
 
         final TagResolver.Builder placeholders = TagResolver.builder();
-        for (final Tags.Relational pl : this.relationalPlaceholders){
+        for (final Tags.Relational pl : this.relationalPlaceholders) {
             placeholders.resolver(pl.of(audience, otherAudience));
         }
         return placeholders.build();
     }
 
-    private boolean relationalFilter(final Audience audience, final Audience otherAudience){
-        return filterClass != null && (!filterClass.isInstance(audience) || !filterClass.isInstance(otherAudience))
-            || predicateFilter != null && (!predicateFilter.test(audience) || !predicateFilter.test(otherAudience));
-    }
-
     @Override
     public @NotNull TagResolver globalPlaceholders(){
         return this.globalPlaceholders;
@@ -129,18 +153,20 @@ final class ExpansionImpl implements Expansion {
         private TagResolver.Builder globalPlaceholders;
         private Class<? extends Audience> filterClass;
         private Predicate<Audience> predicateFilter;
+        private String author;
+        private String version;
 
         Builder(@NotNull final String name){
-            this.expansionName = Conditions.nonNullOrEmptyString(name, () -> "expansion name")
+            this.expansionName = nonNullOrEmptyString(name, "Expansion name")
                 .toLowerCase(Locale.ROOT).concat("_");
         }
 
         @Override
         public @NotNull Builder audiencePlaceholder(@NotNull final String key, @NotNull final AudiencePlaceholder audiencePlaceholder){
-            Conditions.nonNullOrEmptyString(key, () -> "placeholder key");
-            Objects.requireNonNull(audiencePlaceholder, "the audience placeholder cannot be null");
+            nonNullOrEmptyString(key, "Placeholder key");
+            requireNonNull(audiencePlaceholder, "the audience placeholder cannot be null");
 
-            if (this.audiencePlaceholders == null) this.audiencePlaceholders = new HashSet<>(5);
+            if (this.audiencePlaceholders == null) this.audiencePlaceholders = new HashSet<>();
 
             this.audiencePlaceholders.add(Tags.single(expansionName+key, audiencePlaceholder));
             return this;
@@ -148,10 +174,10 @@ final class ExpansionImpl implements Expansion {
 
         @Override
         public @NotNull Builder relationalPlaceholder(@NotNull final String key, @NotNull final RelationalPlaceholder relationalPlaceholder){
-            Conditions.nonNullOrEmptyString(key, () -> "placeholder key");
-            Objects.requireNonNull(relationalPlaceholder, "the relational placeholder cannot be null");
+            nonNullOrEmptyString(key, "Placeholder key");
+            requireNonNull(relationalPlaceholder, "the relational placeholder cannot be null");
 
-            if (this.relationalPlaceholders == null) this.relationalPlaceholders = new HashSet<>(4);
+            if (this.relationalPlaceholders == null) this.relationalPlaceholders = new HashSet<>();
 
             this.relationalPlaceholders.add(Tags.relational(expansionName+"rel_"+key, relationalPlaceholder));
             return this;
@@ -159,10 +185,10 @@ final class ExpansionImpl implements Expansion {
 
         @Override
         public @NotNull Builder globalPlaceholder(@NotNull final String key, @NotNull final BiFunction<ArgumentQueue, Context, Tag> function){
-            Conditions.nonNullOrEmptyString(key, () -> "placeholder key");
-            Objects.requireNonNull(function, "the global placeholder cannot be null");
+            nonNullOrEmptyString(key, "Placeholder key");
+            requireNonNull(function, "the global placeholder cannot be null");
 
-            if(this.globalPlaceholders == null) this.globalPlaceholders = TagResolver.builder();
+            if (this.globalPlaceholders == null) this.globalPlaceholders = TagResolver.builder();
 
             this.globalPlaceholders.tag(expansionName+key, function);
             return this;
@@ -170,10 +196,10 @@ final class ExpansionImpl implements Expansion {
 
         @Override
         public @NotNull Builder globalPlaceholder(@NotNull final String key, @NotNull final Tag tag){
-            Conditions.nonNullOrEmptyString(key, () -> "placeholder key");
-            Objects.requireNonNull(tag, "the tag cannot be null");
+            nonNullOrEmptyString(key, "Placeholder key");
+            requireNonNull(tag, "the tag cannot be null");
 
-            if(this.globalPlaceholders == null) this.globalPlaceholders = TagResolver.builder();
+            if (this.globalPlaceholders == null) this.globalPlaceholders = TagResolver.builder();
 
             this.globalPlaceholders.tag(expansionName+key, tag);
             return this;
@@ -191,24 +217,39 @@ final class ExpansionImpl implements Expansion {
             return this;
         }
 
+        @Override
+        public Expansion.@NotNull Builder author(@Nullable final String author) {
+            this.author = author;
+            return this;
+        }
+
+        @Override
+        public Expansion.@NotNull Builder version(@Nullable final String version) {
+            this.version = version;
+            return this;
+        }
+
         @Override
         public @NotNull Expansion build(){
             return new ExpansionImpl(
                 this.expansionName,
                 this.audiencePlaceholders,
                 this.relationalPlaceholders,
-                this.globalPlaceholders != null ? this.globalPlaceholders.build() : null,
+                this.globalPlaceholders != null ? this.globalPlaceholders.build() : TagResolver.empty(),
                 this.filterClass,
-                this.predicateFilter
+                this.predicateFilter,
+                this.version,
+                this.author
             );
         }
     }
 
     @Override
-    public boolean equals(Object o){
-        if (this==o) return true;
-        if (o == null || o.getClass() != ExpansionImpl.class) return false;
-        return ((ExpansionImpl)o).name.equals(this.name);
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Expansion that)) return false;
+
+        return that.name().equalsIgnoreCase(this.name());
     }
 
     @Override

api/src/main/java/io/github/miniplaceholders/api/MiniPlaceholders.java

@@ -1,17 +1,16 @@
 package io.github.miniplaceholders.api;
 
+import io.github.miniplaceholders.api.enums.Platform;
+import io.github.miniplaceholders.connect.InternalPlatform;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.github.miniplaceholders.api.enums.Platform;
-import org.jetbrains.annotations.NotNull;
-
-import io.github.miniplaceholders.connect.InternalPlatform;
-import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-import org.jetbrains.annotations.Nullable;
-
 import static io.github.miniplaceholders.api.utils.Resolvers.applyIfNotEmpty;
 import static java.util.Objects.requireNonNull;
 
@@ -42,6 +41,7 @@ public final class MiniPlaceholders {
             case VELOCITY -> Platform.VELOCITY;
             case KRYPTON -> Platform.KRYPTON;
             case FABRIC -> Platform.FABRIC;
+            case SPONGE -> Platform.SPONGE;
         };
     }
 
@@ -200,7 +200,7 @@ public final class MiniPlaceholders {
      * @see Expansion#builder(String)
      * @since 2.1.0
      */
-    public @Nullable Expansion getExpansionByName(final @NotNull String name) {
+    public static @Nullable Expansion getExpansionByName(final @NotNull String name) {
         for (final Expansion expansion : expansions) {
             if (Objects.equals(expansion.name(), name)) {
                 return expansion;

api/src/main/java/io/github/miniplaceholders/api/Tags.java

@@ -15,7 +15,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 
 final class Tags {
-    private Tags(){}
+    private Tags() {}
 
     static Relational relational(@NotNull final String name, @NotNull final RelationalPlaceholder relationalPlaceholder){
         return new Tags.Relational(name, relationalPlaceholder);
@@ -35,7 +35,7 @@ final class Tags {
         }
 
         TagResolver of(@NotNull final Audience audience, @NotNull final Audience otherAudience){
-            return new TagResolver(){
+            return new TagResolver() {
                 @Override
                 public @Nullable Tag resolve(@NotNull String name, @NotNull ArgumentQueue arguments,
                         @NotNull Context ctx) throws ParsingException {
@@ -53,10 +53,10 @@ final class Tags {
         }
 
         @Override
-        public boolean equals(Object o){
-            if(o == this) return true;
-            if(!(o instanceof Relational)) return false;
-            return ((Relational)o).key.equals(this.key);
+        public boolean equals(final Object o) {
+            if (o == this) return true;
+            if (!(o instanceof final Relational that)) return false;
+            return that.key.equalsIgnoreCase(this.key);
         }
 
         @Override
@@ -93,10 +93,10 @@ final class Tags {
         }
 
         @Override
-        public boolean equals(Object o){
-            if(o == this) return true;
-            if(!(o instanceof Single)) return false;
-            return ((Single)o).key.equals(this.key);
+        public boolean equals(final Object o) {
+            if (o == this) return true;
+            if (!(o instanceof final Single that)) return false;
+            return that.key.equalsIgnoreCase(this.key);
         }
 
         @Override

api/src/main/java/io/github/miniplaceholders/api/enums/Platform.java

@@ -9,5 +9,7 @@ public enum Platform {
     /**Krypton Platform */
     KRYPTON,
     /**Fabric Platform */
-    FABRIC
+    FABRIC,
+    /**Sponge Platform */
+    SPONGE
 }

api/src/main/java/io/github/miniplaceholders/api/utils/Conditions.java

@@ -1,36 +1,73 @@
 package io.github.miniplaceholders.api.utils;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.function.Supplier;
 
 /** Checks required for the correct operation of the expansions*/
 public final class Conditions {
-    private Conditions(){}
+    private Conditions() {}
 
     /**
-     * Checks if a string is null or empty or consists of whitespace characters only
+     * Checks if a string is null or empty or consists of whitespace characters only.
+     *
      * @param string the string
      * @param name the name supplier
      * @return the string if it is not null or empty
      * @since 1.0.0
+     * @throws IllegalStateException if the provided string is empty
      */
-    public static String nonNullOrEmptyString(String string, Supplier<String> name){
+    public static String nonNullOrEmptyString(@Nullable String string, @NotNull Supplier<@NotNull String> name){
         if (string == null)
-            throw new NullPointerException("the " + name.get() + " cannot be null");
+            throw new NullPointerException(name.get() + " cannot be null");
         if (string.isBlank())
-            throw new IllegalStateException("the " + name.get() + "cannot be an empty string");
+            throw new IllegalStateException(name.get() + "cannot be an empty string");
         return string;
     }
 
     /**
-     * Check if a string is empty or consists of whitespace characters only
+     * Checks if a string is null or empty or consists of whitespace characters only.
+     *
+     * @param string the string
+     * @param name the name
+     * @return the string if it is not null or empty
+     * @since 2.2.0
+     * @throws IllegalStateException if the provided string is empty
+     */
+    public static String nonNullOrEmptyString(@Nullable String string, @NotNull String name){
+        if (string == null)
+            throw new NullPointerException(name + " cannot be null");
+        if (string.isBlank())
+            throw new IllegalStateException(name + "cannot be an empty string");
+        return string;
+    }
+
+    /**
+     * Check if a string is empty or consists of whitespace characters only.
+     *
      * @param string the string
      * @param reason the reason supplier
      * @return the string if it not empty
      * @since 1.0.0
+     * @throws IllegalStateException if the provided string is empty
      */
-    public static String nonEmptyString(String string, Supplier<String> reason){
-        if (string.isBlank())
-            throw new IllegalStateException(reason.get());
+    public static String nonEmptyString(@NotNull String string, @NotNull Supplier<@NotNull String> reason){
+        if (string.isBlank()) throw new IllegalStateException(reason.get());
+        return string;
+    }
+
+    /**
+     * Check if a string is empty or consists of whitespace characters only.
+     *
+     * @param string the string
+     * @param reason the reason
+     * @return the string if it not empty
+     * @since 2.2.0
+     * @throws IllegalStateException if the provided string is empty
+     */
+    public static String nonEmptyString(@NotNull String string, @NotNull String reason){
+        if (string.isBlank()) throw new IllegalStateException(reason);
         return string;
     }
     

api/src/main/java/io/github/miniplaceholders/api/utils/LegacyUtils.java

@@ -1,10 +1,15 @@
 package io.github.miniplaceholders.api.utils;
 
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.Context;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Function;
+
+import static java.util.Objects.requireNonNull;
 import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 
 /**
@@ -25,20 +30,138 @@ public final class LegacyUtils {
             .build();
 
     /**
-     * Parse a string with possible legacy symbols
+     * Parse a string with possible legacy Ampersand/Section symbols
+     * <br>
+     * <p><b>
+     * This method should only be used in case a String is provided from a legacy plugin/mod
+     * or legacy source, where it is very likely to get a legacy string.
+     * It is not recommended to use this method regularly in any sense
+     * </b></p>
      *
      * @param string the string
      * @return a parsed string
      * @since 1.0.0
      */
     public static @NotNull Component parsePossibleLegacy(@Nullable String string) {
-        if (string == null || string.isBlank()) return Component.empty();
-        if (string.indexOf('&') != 0) {
-            return miniMessage().deserialize(
-                    miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
-            );
-        } else {
+        if (string == null || string.isEmpty()) return Component.empty();
+        if (string.indexOf(LegacyComponentSerializer.SECTION_CHAR) != -1) {
+            string = string.replace(LegacyComponentSerializer.SECTION_CHAR, LegacyComponentSerializer.AMPERSAND_CHAR);
+        }
+        if (string.indexOf(LegacyComponentSerializer.AMPERSAND_CHAR) == -1) {
             return miniMessage().deserialize(string);
         }
+        return miniMessage().deserialize(
+                miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
+                        .replace("\\<", "<")
+                        .replace("\\>", ">")
+        );
+    }
+
+    /**
+     * Parse a string with possible legacy Ampersand/Section symbols
+     * using a parsing Context
+     * <p><b>
+     * This method should only be used in case a String is provided from a legacy plugin/mod
+     * or legacy source, where it is very likely to get a legacy string.
+     * It is not recommended to use this method regularly in any sense
+     * </b></p>
+     *
+     * @param string  the string
+     * @param context the provided parsing context
+     * @return a parsed string
+     * @since 2.2.1
+     */
+    public static @NotNull Component parsePossibleLegacy(
+            @Nullable String string,
+            final @NotNull Context context
+    ) {
+        if (string == null || string.isEmpty()) return Component.empty();
+        if (string.indexOf(LegacyComponentSerializer.SECTION_CHAR) != -1) {
+            string = string.replace(LegacyComponentSerializer.SECTION_CHAR, LegacyComponentSerializer.AMPERSAND_CHAR);
+        }
+        if (string.indexOf(LegacyComponentSerializer.AMPERSAND_CHAR) == -1) {
+            return context.deserialize(string);
+        }
+        return context.deserialize(
+                miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
+                        .replace("\\<", "<")
+                        .replace("\\>", ">")
+        );
+    }
+
+    /**
+     * Parse a string with possible legacy Ampersand/Section symbols
+     * using the provided resolver
+     * <p><b>
+     * This method should only be used in case a String is provided from a legacy plugin/mod
+     * or legacy source, where it is very likely to get a legacy string.
+     * It is not recommended to use this method regularly in any sense
+     * </b></p>
+     *
+     * @param string   the string
+     * @param resolver a resolver
+     * @return a parsed string
+     * @since 2.2.1
+     */
+    public static @NotNull Component parsePossibleLegacy(
+            @Nullable String string,
+            final @NotNull TagResolver resolver
+    ) {
+        if (string == null || string.isEmpty()) return Component.empty();
+        if (string.indexOf(LegacyComponentSerializer.SECTION_CHAR) != -1) {
+            string = string.replace(LegacyComponentSerializer.SECTION_CHAR, LegacyComponentSerializer.AMPERSAND_CHAR);
+        }
+        if (string.indexOf(LegacyComponentSerializer.AMPERSAND_CHAR) == -1) {
+            return miniMessage().deserialize(string, resolver);
+        }
+        return miniMessage().deserialize(
+                miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
+                        .replace("\\<", "<")
+                        .replace("\\>", ">"),
+                resolver
+        );
+    }
+
+    /**
+     * Checks if the provided string contains legacy formatting.
+     *
+     * @param string the string input
+     * @return whether the string has legacy content
+     * @see LegacyComponentSerializer#AMPERSAND_CHAR
+     * @see LegacyComponentSerializer#SECTION_CHAR
+     * @since 2.3.0
+     */
+    public static boolean hasLegacyFormat(final String string) {
+        requireNonNull(string, "string");
+        return string.indexOf(LegacyComponentSerializer.SECTION_CHAR) != -1
+                || string.indexOf(LegacyComponentSerializer.AMPERSAND_CHAR) != -1;
+    }
+
+    /**
+     * Maps the input to a type depending on whether it contains legacy formatting or not.
+     *
+     * @param string the string input
+     * @param legacyMapping the mapping function in case the string contains legacy formatting
+     * @param modernMapping the mapping function in case the string does not contain any legacy character type,
+     *                    being safe to use with MiniMessage
+     * @return the mapped result
+     * @param <R> the result type
+     * @see LegacyComponentSerializer#AMPERSAND_CHAR
+     * @see LegacyComponentSerializer#SECTION_CHAR
+     * @see #hasLegacyFormat(String)
+     * @since 2.3.0
+     */
+    public static <R> R mapLegacyOrElse(
+            final @NotNull String string,
+            final @NotNull Function<String, R> legacyMapping,
+            final @NotNull Function<String, R> modernMapping
+    ) {
+        requireNonNull(legacyMapping, "legacyMapping");
+        requireNonNull(modernMapping, "modernInput");
+        if (hasLegacyFormat(string)) {
+            return legacyMapping.apply(string);
+        } else {
+            return modernMapping.apply(string);
+        }
     }
 }

api/src/main/java/io/github/miniplaceholders/api/utils/TagsUtils.java

@@ -41,6 +41,7 @@ public final class TagsUtils {
      * @return a new basic self closing Tag of a string
      * @since 1.1.0
      */
+    @Deprecated
     public static @NotNull Tag staticTag(@NotNull String string) {
         return Tag.selfClosingInserting(Component.text(string));
     }
@@ -51,6 +52,7 @@ public final class TagsUtils {
      * @return a new basic self closing Tag of a component
      * @since 1.1.0
      */
+    @Deprecated
     public static @NotNull Tag staticTag(@NotNull Component component) {
         return Tag.selfClosingInserting(component);
     }

api/src/main/java/module-info.java

@@ -1,11 +1,13 @@
 /** MiniPlaceholders API Module */
 open module io.github.miniplaceholders.api {
+    requires io.github.miniplaceholders.connect;
+
     requires net.kyori.adventure;
     requires net.kyori.adventure.text.minimessage;
-    requires net.kyori.examination.api;
-    requires static org.jetbrains.annotations;
-    requires io.github.miniplaceholders.connect;
     requires net.kyori.adventure.text.serializer.legacy;
+    requires net.kyori.examination.api;
+
+    requires static org.jetbrains.annotations;
 
     exports io.github.miniplaceholders.api;
     exports io.github.miniplaceholders.api.enums;

api/src/test/java/io/github/miniplaceholders/test/ExpansionsTest.java

@@ -1,12 +1,17 @@
 package io.github.miniplaceholders.test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
 import io.github.miniplaceholders.api.Expansion;
 import io.github.miniplaceholders.api.utils.TagsUtils;
+import io.github.miniplaceholders.test.testobjects.TestAudienceHolder;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static io.github.miniplaceholders.test.PlaceholderTest.assertContentEquals;
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class ExpansionsTest {
     @Test
@@ -21,4 +26,20 @@ class ExpansionsTest {
 
         assertEquals(firstExpansion, secondExpansion);
     }
+
+    @Test
+    void nullForwardedAudience() {
+        TestAudienceHolder audience = new TestAudienceHolder(null);
+
+        final Expansion expansion = Expansion.builder("test")
+                .filter(aud -> aud.toString().isBlank())
+                .audiencePlaceholder("testing", (aud, queue, ctx) -> Tag.selfClosingInserting(Component.text(aud.toString())))
+                .build();
+
+        Component result = assertDoesNotThrow(
+                () -> miniMessage().deserialize("<test_testing>", expansion.audiencePlaceholders(audience))
+        );
+
+        assertContentEquals(result, Component.text("<test_testing>"));
+    }
 }

api/src/test/java/io/github/miniplaceholders/test/LegacyTest.java

@@ -0,0 +1,42 @@
+package io.github.miniplaceholders.test;
+
+import io.github.miniplaceholders.api.utils.LegacyUtils;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Inserting;
+import net.kyori.adventure.text.minimessage.tag.PreProcess;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class LegacyTest {
+    @Test
+    void testLegacyParsing() {
+        final String string = "<rainbow>hello... i &8hate legacy format §bso much";
+        final Component parsed = LegacyUtils.parsePossibleLegacy(string);
+        final String result = PlainTextComponentSerializer.plainText().serialize(parsed);
+        final String expected = "hello... i hate legacy format so much";
+
+        assertEquals(expected, result);
+    }
+
+    @Test
+    void testMapLegacyOrElse() {
+        final String legacyInput = "&fhi <red>aaaa";
+        Tag legacyProcessedTag = LegacyUtils.mapLegacyOrElse(
+                legacyInput,
+                legacy -> Tag.inserting(LegacyUtils.parsePossibleLegacy(legacy)),
+                Tag::preProcessParsed
+        );
+        assertInstanceOf(Inserting.class, legacyProcessedTag);
+
+        final String modernInput = "<rainbow>aaaaaaaaaaaaa";
+        Tag modernProcessedTag = LegacyUtils.mapLegacyOrElse(
+                modernInput,
+                __ -> fail(),
+                Tag::preProcessParsed
+        );
+        assertInstanceOf(PreProcess.class, modernProcessedTag);
+    }
+}

api/src/test/java/io/github/miniplaceholders/test/PlaceholderTest.java

@@ -1,8 +1,10 @@
 package io.github.miniplaceholders.test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
+import static org.junit.jupiter.api.Assertions.*;
 
 import io.github.miniplaceholders.test.testobjects.TestAudience;
+import io.github.miniplaceholders.test.testobjects.TestAudienceHolder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.DisplayName;
 
@@ -23,12 +25,15 @@ class PlaceholderTest {
         TestAudience player = new TestAudience("4drian3d");
 
         Expansion expansion = Expansion.builder("example")
-            .audiencePlaceholder("name", (aud, queue, ctx) -> Tag.selfClosingInserting(Component.text(((TestAudience)aud).name()))).build();
+            .audiencePlaceholder("name", (aud, queue, ctx) -> {
+                TestAudience audience = (TestAudience) aud;
+                return Tag.selfClosingInserting(Component.text(audience.name()));
+            }).build();
 
         final Component expected = Component.text("Player Name: 4drian3d");
-        final Component result = MiniMessage.miniMessage().deserialize("Player Name: <example_name>", expansion.audiencePlaceholders(player));
+        final Component result = miniMessage().deserialize("Player Name: <example_name>", expansion.audiencePlaceholders(player));
 
-        assertEquals(expected, result);
+        assertContentEquals(expected, result);
     }
 
     @Test
@@ -59,7 +64,7 @@ class PlaceholderTest {
         final Component expected = Component.text("Online players: 1305 | Servers: 7");
         final Component actual = MiniMessage.miniMessage().deserialize("Online players: <global_players> | Servers: <global_servers>", expansion.globalPlaceholders());
 
-        assertEquals(expected, actual);
+        assertContentEquals(expected, actual);
     }
 
     @Test
@@ -92,13 +97,50 @@ class PlaceholderTest {
         Component playerExpected = Component.text("Player Name: TestPlayer04");
         Component emptyExpected = Component.text("Player Name: <filter_name>");
 
-        assertEquals(playerExpected, MiniMessage.miniMessage().deserialize(string, expansion.audiencePlaceholders(player)));
-        assertEquals(emptyExpected, MiniMessage.miniMessage().deserialize(string, expansion.audiencePlaceholders(emptyAudience)));
-
-
+        assertContentEquals(playerExpected, MiniMessage.miniMessage().deserialize(string, expansion.audiencePlaceholders(player)));
+        assertContentEquals(emptyExpected, MiniMessage.miniMessage().deserialize(string, expansion.audiencePlaceholders(emptyAudience)));
     }
 
-    void assertContentEquals(Component first, Component second){
+    @Test
+    @DisplayName("Empty Arguments")
+    void testEmptyArguments() {
+        final Expansion expansion = Expansion.builder("test")
+                .globalPlaceholder("testing", (queue, ctx) -> {
+                    int arguments = 0;
+                    while (queue.hasNext()) {
+                        arguments++;
+                        Tag.Argument argument = queue.pop();
+                        assertTrue(argument.value().isBlank());
+                    }
+                    return Tag.selfClosingInserting(Component.text("Arguments: "+arguments));
+                })
+                .build();
+
+        Component parsed = miniMessage().deserialize("<test_testing::>", expansion.globalPlaceholders());
+
+        assertContentEquals(parsed, Component.text("Arguments: 2"));
+    }
+
+    @Test
+    @DisplayName("Forwarding Audience Parsing Test")
+    void forwardingAudienceTest() {
+        Expansion expansion = Expansion.builder("test")
+                .filter(TestAudience.class)
+                .audiencePlaceholder("testing", (audience, queue, ctx) -> {
+                    TestAudience testAudience = (TestAudience) audience;
+                    return Tag.selfClosingInserting(Component.text("Name: "+testAudience.name()));
+                }).build();
+
+        TestAudience testAudience = new TestAudience("4drian3d");
+        Audience forward = new TestAudienceHolder(testAudience);
+
+        Component parsed = miniMessage().deserialize("<test_testing>.", expansion.audiencePlaceholders(forward));
+        Component expected = Component.text("Name: 4drian3d.");
+
+        assertContentEquals(parsed, expected);
+    }
+
+    static void assertContentEquals(Component first, Component second){
         String firstSerialized = PlainTextComponentSerializer.plainText().serialize(first);
         String secondSerialized = PlainTextComponentSerializer.plainText().serialize(second);
 

api/src/test/java/io/github/miniplaceholders/test/testobjects/TestAudienceHolder.java

@@ -0,0 +1,11 @@
+package io.github.miniplaceholders.test.testobjects;
+
+import net.kyori.adventure.audience.ForwardingAudience;
+import org.jetbrains.annotations.NotNull;
+
+public record TestAudienceHolder(TestAudience audience) implements ForwardingAudience.Single {
+    @Override
+    public @NotNull TestAudience audience() {
+        return audience;
+    }
+}

build-logic/settings.gradle.kts

@@ -12,4 +12,8 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }

build-logic/src/main/kotlin/extensions.kt

@@ -0,0 +1,7 @@
+import org.gradle.api.Project
+import org.gradle.configurationcache.extensions.capitalized
+
+val Project.capitalizeName: String
+    get() = this.name.substring(17).capitalized()
+
+fun Project.simpleName(): String = this.name.substring(17)

build-logic/src/main/kotlin/miniplaceholders.auto.module.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    id("miniplaceholders.base")
+}
+
+tasks {
+    jar {
+        manifest {
+            attributes("Automatic-Module-Name" to "io.github.miniplaceholders.${project.simpleName()}")
+        }
+    }
+}

build-logic/src/main/kotlin/miniplaceholders.base.gradle.kts

@@ -0,0 +1,28 @@
+import java.util.Date
+
+plugins {
+    java
+}
+
+tasks {
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    jar {
+        manifest {
+            attributes(
+                    "Specification-Version" to project.version,
+                    "Specification-Vendor" to "MiniPlaceholders",
+                    "Implementation-Build-Date" to Date()
+            )
+        }
+    }
+}
+
+java{
+    toolchain{
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+}

build-logic/src/main/kotlin/miniplaceholders.kotlin.publish.gradle.kts

@@ -36,8 +36,8 @@ publishing {
                 url.set("https://github.com/MiniPlaceholders/MiniPlaceholders")
                 licenses {
                     license {
-                        name.set("GNU General Public License version 3 or later")
-                        url.set("https://opensource.org/licenses/GPL-3.0")
+                        name.set("Apache License 2.0")
+                        url.set("https://opensource.org/license/apache-2-0/")
                     }
                 }
                 scm {

build-logic/src/main/kotlin/miniplaceholders.publish.gradle.kts

@@ -27,8 +27,8 @@ publishing {
                 url.set("https://github.com/MiniPlaceholders/MiniPlaceholders")
                 licenses {
                     license {
-                        name.set("GNU General Public License version 3 or later")
-                        url.set("https://opensource.org/licenses/GPL-3.0")
+                        name.set("Apache License 2.0")
+                        url.set("https://opensource.org/license/apache-2-0/")
                     }
                 }
                 scm {

build-logic/src/main/kotlin/miniplaceholders.shadow.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    id("miniplaceholders.base")
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    shadowJar {
+        archiveBaseName.set("MiniPlaceholders-${project.capitalizeName}")
+        archiveClassifier.set("")
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        relocate("net.william278.desertwell", "io.github.miniplaceholders.libs.desertwell")
+        relocate("cloud.commandframework", "io.github.miniplaceholders.libs.cloud")
+        if (project.simpleName() != "sponge") {
+            relocate("io.leangen.geantyref", "io.github.miniplaceholders.libs.geantyref")
+        }
+        destinationDirectory.set(file("${project.rootDir}/jar"))
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}

build.gradle.kts

@@ -1,35 +1,9 @@
 plugins {
-    java
-    alias(libs.plugins.shadow)
-    kotlin("jvm") version "1.8.21" apply false
-}
-
-allprojects {
-    apply<JavaPlugin>()
-    repositories {
-        maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://repo.maven.apache.org/maven2/")
-        maven("https://jitpack.io") {
-            mavenContent {
-                includeGroup("net.william278")
-            }
-        }
-    }
-}
-
-dependencies {
-    implementation(projects.miniplaceholdersVelocity)
-    implementation(project(":miniplaceholders-paper", "reobf"))
-    implementation(projects.miniplaceholdersKrypton)
+    kotlin("jvm") version "1.9.22" apply false
 }
 
 tasks {
-    shadowJar {
-        archiveFileName.set("MiniPlaceholders-${project.version}.jar")
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        relocate("net.william278.desertwell", "io.github.miniplaceholders.libs.desertwell")
-    }
-    build {
-        dependsOn(shadowJar)
+    delete {
+        delete("jar")
     }
 }

common/build.gradle.kts

@@ -1,38 +1,28 @@
 plugins {
+    id("miniplaceholders.auto.module")
+    alias(libs.plugins.idea.ext)
     alias(libs.plugins.blossom)
 }
 
-repositories {
-    maven("https://libraries.minecraft.net") {
-        mavenContent {
-            includeGroup("com.mojang")
-        }
-    }
-}
-
 dependencies {
     implementation(projects.miniplaceholdersApi)
     implementation(libs.desertwell) {
         exclude("org.json")
     }
+    implementation(libs.cloud.core)
+    implementation(libs.cloud.extras) {
+        isTransitive = false
+    }
     compileOnly(libs.adventure.api)
     compileOnly(libs.adventure.minimesssage)
-    compileOnly(libs.brigadier)
 }
 
-blossom{
-    replaceToken("{version}", project.version)
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/common/PluginConstants.java")
-}
-
-tasks {
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
-    }
-    jar {
-        manifest {
-            attributes("Automatic-Module-Name" to "io.github.miniplaceholders.common")
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+            }
         }
     }
 }

common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb

@@ -0,0 +1,7 @@
+package io.github.miniplaceholders.common;
+
+public final class PluginConstants {
+    public static final String VERSION = "{{ version }}";
+
+    private PluginConstants() {}
+}

common/src/main/java/io/github/miniplaceholders/common/PlaceholdersCommand.java

@@ -1,76 +1,75 @@
 package io.github.miniplaceholders.common;
 
-import com.mojang.brigadier.Command;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import com.mojang.brigadier.tree.LiteralCommandNode;
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.Command;
+import cloud.commandframework.CommandManager;
+import cloud.commandframework.arguments.CommandArgument;
+import cloud.commandframework.arguments.standard.StringArgument;
+import cloud.commandframework.minecraft.extras.AudienceProvider;
+import cloud.commandframework.minecraft.extras.MinecraftExceptionHandler;
 import io.github.miniplaceholders.api.MiniPlaceholders;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.builder.AbstractBuilder;
 import net.kyori.adventure.permission.PermissionChecker;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.TextColor;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.util.TriState;
 import net.william278.desertwell.about.AboutMenu;
 import net.william278.desertwell.util.Version;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static com.mojang.brigadier.arguments.StringArgumentType.*;
 import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.CompletableFuture.supplyAsync;
-import static net.kyori.adventure.text.Component.*;
+import static net.kyori.adventure.text.Component.newline;
+import static net.kyori.adventure.text.Component.text;
 import static net.kyori.adventure.text.format.NamedTextColor.RED;
 import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 
-public final class PlaceholdersCommand<A> {
-    private final Supplier<Collection<String>> playersSuggestions;
+public final class PlaceholdersCommand<A extends Audience> {
+    private final Supplier<ArrayList<String>> playersSuggestions;
     private final Function<String, Audience> toAudience;
-    private final Function<A, Audience> sourceToAudience;
     private final BiPredicate<A, String> hasPermission;
+    private final String command;
+    private final CommandManager<A> commandManager;
 
     private PlaceholdersCommand(
-            final Supplier<Collection<String>> playersSuggestions,
+            final Supplier<ArrayList<String>> playersSuggestions,
             final Function<String, Audience> toAudience,
-            final Function<A, Audience> sourceToAudience,
-            final BiPredicate<A, String> hasPermission
+            final BiPredicate<A, String> hasPermission,
+            final String command,
+            final CommandManager<A> commandManager
     ) {
         this.playersSuggestions = playersSuggestions;
         this.toAudience = toAudience;
-        this.sourceToAudience = sourceToAudience;
         this.hasPermission = hasPermission;
+        this.command = command;
+        this.commandManager = commandManager;
     }
 
+    private static final Component TITLE = miniMessage().deserialize("<gradient:#4d8bff:#a4ff96>MiniPlaceholders</gradient>");
     private static final Component HELP = text()
-            .append(newline())
-            .append(miniMessage()
-                    .deserialize("<gradient:aqua:white:aqua><st><b>             </st> <gradient:#4d8bff:#a4ff96>MiniPlaceholders</gradient> <st><b>             </st>"))
-            .append(newline())
-            .append(miniMessage()
-                    .deserialize(
-                            "<gradient:#9694ff:#5269ff>Commands:</gradient>"))
-            .append(newline())
-            .append(miniMessage()
-                    .deserialize(
-                            "<gradient:aqua:#94d1ff>/miniplaceholders</gradient> <aqua>help</aqua>"))
-            .append(newline())
-            .append(miniMessage()
-                    .deserialize(
-                            "<gradient:aqua:#94d1ff>/miniplaceholders</gradient> <aqua>parse</aqua> <#8fadff><player | me></#8fadff> <#99ffb6><player></#99ffb6>"))
-            .append(newline())
-            .append(miniMessage()
-                    .deserialize("<gradient:aqua:white:aqua><st><b>                                                 "))
+            .append(newline(), miniMessage().deserialize(
+                    "<gradient:aqua:white:aqua><st><b>             </st> <title> <st><b>             </st>", Placeholder.component("title", TITLE)))
+            .append(newline(), miniMessage().deserialize(
+                    "<gradient:#9694ff:#5269ff>Commands:</gradient>"))
+            .append(newline(), miniMessage().deserialize(
+                    "<gradient:aqua:#94d1ff>/miniplaceholders</gradient> <aqua>help</aqua>"))
+            .append(newline(), miniMessage().deserialize(
+                    "<gradient:aqua:#94d1ff>/miniplaceholders</gradient> <aqua>parse</aqua> <#8fadff><player | me></#8fadff> <#99ffb6><player></#99ffb6>"))
+            .append(newline(), miniMessage().deserialize(
+                    "<gradient:aqua:white:aqua><st><b>                                                 "))
             .build();
 
     private static final Component INFO = AboutMenu.builder()
-            .title(miniMessage().deserialize("<gradient:#4d8bff:#a4ff96>MiniPlaceholders</gradient>"))
-            .description(text("MiniMessage Component-based Placeholders for PaperMC, Folia, Fabric, Velocity and Krypton platforms"))
+            .title(TITLE)
+            .description(text("MiniMessage Component-based Placeholders for Paper, Folia, Fabric, Velocity, Sponge and Krypton platforms"))
             .credits("Author", AboutMenu.Credit.of("4drian3d").url("https://github.com/4drian3d"))
             .credits("Contributors", AboutMenu.Credit.of("Sliman4"))
             .buttons(
@@ -81,105 +80,86 @@ public final class PlaceholdersCommand<A> {
             .build()
             .toComponent();
 
-    public LiteralArgumentBuilder<A> asBuilder(String commandName){
-        return LiteralArgumentBuilder.<A>literal(commandName)
-            .requires(a -> permissionValue(a, "miniplaceholders.command") != TriState.FALSE)
-            .executes(cmd -> {
-                Audience source = getAudience(cmd.getSource());
-                source.sendMessage(INFO);
-                return Command.SINGLE_SUCCESS;
-            })
-            .then(LiteralArgumentBuilder.<A>literal("help")
-                .requires(src -> permissionValue(src, "miniplaceholders.command.help").toBooleanOrElse(false))
-                .executes(cmd -> {
-                    getAudience(cmd.getSource()).sendMessage(HELP);
-                    return Command.SINGLE_SUCCESS;
+    private Command.Builder<A> rootBuilder() {
+        return commandManager.commandBuilder(command);
+    }
+
+    public void register() {
+        new MinecraftExceptionHandler<A>()
+                .withDefaultHandlers()
+                .withDecorator(component -> Component.text().append(TITLE).appendSpace().append(component).build())
+                .apply(commandManager, AudienceProvider.nativeAudience());
+
+        commandManager.command(rootBuilder()
+                .permission(src -> {
+                    if (hasPermission != null) {
+                        return hasPermission.test(src, "miniplaceholders.command");
+                    }
+                    return src
+                            .get(PermissionChecker.POINTER)
+                            .map(checker -> checker.value("miniplaceholders.command"))
+                            .orElse(TriState.FALSE) != TriState.FALSE;
                 })
-            )
-            .then(LiteralArgumentBuilder.<A>literal("parse")
-                .requires(cmd -> permissionValue(cmd, "miniplaceholders.command.parse").toBooleanOrElse(false))
-                .then(LiteralArgumentBuilder.<A>literal("me")
-                    .requires(cmd -> permissionValue(cmd, "miniplaceholders.command.parse.me").toBooleanOrElse(false))
-                    .then(RequiredArgumentBuilder.<A, String>argument("string", string())
-                        .executes(cmd -> {
-                            final String toParse = getString(cmd, "string");
-                            final Component parsed = parseGlobal(toParse, getAudience(cmd.getSource()));
-                            getAudience(cmd.getSource()).sendMessage(parsed);
-                            return Command.SINGLE_SUCCESS;
+                .handler(handler -> handler.getSender().sendMessage(INFO)));
+        final CommandArgument<A, String> sourceArgument = StringArgument.<A>builder("source")
+                .single()
+                .withDefaultDescription(ArgumentDescription.of("The source from which the message will be parsed"))
+                .withSuggestionsProvider((ctx, st) -> {
+                    final List<String> suggestions = playersSuggestions.get();
+                    suggestions.add("me");
+                    return suggestions;
+                })
+                .build();
+        final CommandArgument<A, String> stringArgument = StringArgument.<A>builder("message")
+                .greedy()
+                .withDefaultDescription(ArgumentDescription.of("Message to be parsed"))
+                .build();
+
+        commandManager.command(
+                rootBuilder().literal("parse")
+                        .argument(sourceArgument)
+                        .argument(stringArgument)
+                        .permission("miniplaceholders.command.parse")
+                        .handler(handler -> {
+                            final String source = handler.get(sourceArgument);
+
+                            final Audience objective = "me".equals(source)
+                                    ? handler.getSender()
+                                    : toAudience.apply(source);
+                            if (objective == null){
+                                handler.getSender().sendMessage(text("You must specify a valid player", RED));
+                                return;
+                            }
+                            final String toParse = handler.get(stringArgument);
+
+                            final Component parsed = miniMessage().deserialize(
+                                    toParse,
+                                    MiniPlaceholders.getAudienceGlobalPlaceholders(objective)
+                            );
+                            handler.getSender().sendMessage(parsed);
                         })
-                    )
-                )
-                .then(LiteralArgumentBuilder.<A>literal("player")
-                    .requires(cmd -> permissionValue(cmd, "miniplaceholders.command.parse.player").toBooleanOrElse(false))
-                    .then(RequiredArgumentBuilder.<A, String>argument("source", word())
-                        .suggests((argument, builder) -> supplyAsync(() -> {
-                                playersSuggestions.get().forEach(builder::suggest);
-                                return builder.build();
-                        }))
-                        .then(RequiredArgumentBuilder.<A, String>argument("string", string())
-                            .executes(cmd -> {
-                                final Audience objective = toAudience.apply(getString(cmd, "source"));
-                                if (objective == null){
-                                    getAudience(cmd.getSource()).sendMessage(text("You must specify a valid player", RED));
-                                    return -1;
-                                }
-                                final String toParse = cmd.getArgument("string", String.class);
-
-                                final Component parsed = parseGlobal(toParse, objective);
-                                getAudience(cmd.getSource()).sendMessage(parsed);
-                                return Command.SINGLE_SUCCESS;
-                            })
-                        )
-                    )
-                )
-            );
-    }
-
-    public LiteralCommandNode<A> asNode(String command) {
-        return asBuilder(command).build();
-    }
-
-    private Component parseGlobal(final String string, final Audience audience) {
-        return miniMessage().deserialize(
-            string,
-            TagResolver.resolver(
-                MiniPlaceholders.getGlobalPlaceholders(),
-                MiniPlaceholders.getAudiencePlaceholders(audience)
-            )
+        );
+        commandManager.command(
+                rootBuilder().literal("help")
+                        .permission("miniplaceholders.command.help")
+                        .handler(handler -> handler.getSender().sendMessage(HELP))
         );
     }
 
-    private Audience getAudience(final A possibleAudience) {
-        if (possibleAudience instanceof Audience audience) {
-            return audience;
-        }
-        final Audience audience = sourceToAudience.apply(possibleAudience);
-        return audience != null ? audience : Audience.empty();
-    }
-
-    private TriState permissionValue(final A source, final String permission) {
-        if (hasPermission != null) {
-            return TriState.byBoolean(hasPermission.test(source, permission));
-        }
-        return getAudience(source)
-                .get(PermissionChecker.POINTER)
-                .map(checker -> checker.value(permission))
-                .orElse(TriState.FALSE);
-    }
-
-    public static <A> Builder<A> builder() {
+    public static <A extends Audience> Builder<A> builder() {
         return new Builder<>();
     }
 
-    public final static class Builder<A> implements AbstractBuilder<PlaceholdersCommand<A>> {
-        private Supplier<Collection<String>> playersSuggestions;
+    public final static class Builder<A extends Audience> implements AbstractBuilder<PlaceholdersCommand<A>> {
+        private Supplier<ArrayList<String>> playersSuggestions;
         private Function<String, Audience> toAudience;
-        private Function<A, Audience> fromAToAudience = a -> Audience.empty();
         private BiPredicate<A, String> hasPermission;
+        private String command;
+        private CommandManager<A> commandManager;
 
         private Builder() {}
 
-        public Builder<A> playerSuggestions(final Supplier<@NotNull Collection<@NotNull String>> playersSuggestions) {
+        public Builder<A> playerSuggestions(final Supplier<@NotNull ArrayList<@NotNull String>> playersSuggestions) {
             this.playersSuggestions = playersSuggestions;
             return this;
         }
@@ -189,13 +169,18 @@ public final class PlaceholdersCommand<A> {
             return this;
         }
 
-        public Builder<A> fromSourceToAudience(final @NotNull Function<@NotNull A, @Nullable Audience> sourceToAudience) {
-            this.fromAToAudience = sourceToAudience;
+        public Builder<A> hasPermissionCheck(final @NotNull BiPredicate<@NotNull A, @NotNull String> hasPermission) {
+            this.hasPermission = hasPermission;
             return this;
         }
 
-        public Builder<A> hasPermissionCheck(final @NotNull BiPredicate<@NotNull A, @NotNull String> hasPermission) {
-            this.hasPermission = hasPermission;
+        public Builder<A> command(final String command) {
+            this.command = command;
+            return this;
+        }
+
+        public Builder<A> manager(CommandManager<A> commandManager) {
+            this.commandManager = commandManager;
             return this;
         }
 
@@ -204,8 +189,9 @@ public final class PlaceholdersCommand<A> {
             return new PlaceholdersCommand<>(
                     requireNonNull(playersSuggestions),
                     requireNonNull(toAudience),
-                    requireNonNull(fromAToAudience),
-                    hasPermission
+                    hasPermission,
+                    command,
+                    commandManager
             );
         }
     }

common/src/main/java/io/github/miniplaceholders/common/PluginConstants.java

@@ -1,7 +0,0 @@
-package io.github.miniplaceholders.common;
-
-public final class PluginConstants {
-    public static final String VERSION = "{version}";
-
-    private PluginConstants(){}
-}

connect/build.gradle.kts

@@ -1,7 +1,3 @@
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
-
-tasks.compileJava {
-    options.encoding = Charsets.UTF_8.name()
-
-    options.release.set(11)
+plugins {
+    id("miniplaceholders.base")
 }

connect/src/main/java/io/github/miniplaceholders/connect/InternalPlatform.java

@@ -2,7 +2,7 @@ package io.github.miniplaceholders.connect;
 
 public enum InternalPlatform {
 
-    PAPER, VELOCITY, KRYPTON, FABRIC;
+    PAPER, VELOCITY, KRYPTON, FABRIC, SPONGE;
 
     private static InternalPlatform actualPlatform;
 

fabric/.gitignore

@@ -0,0 +1 @@
+/run

fabric/build.gradle.kts

@@ -1,12 +1,9 @@
 plugins {
-    id("fabric-loom") version "1.2.5"
+    id("miniplaceholders.auto.module")
+    id("fabric-loom")
     alias(libs.plugins.shadow)
 }
 
-repositories {
-    maven("https://oss.sonatype.org/content/repositories/snapshots")
-}
-
 val shade: Configuration by configurations.creating
 
 dependencies {
@@ -14,18 +11,32 @@ dependencies {
     mappings(loom.officialMojangMappings())
     modImplementation(libs.fabric.loader)
     modImplementation(libs.fabric.api)
-    modImplementation(libs.adventure.platform.fabric)
-    include(libs.adventure.platform.fabric)
-    modImplementation(libs.luckopermissionsapi)
-    include(libs.luckopermissionsapi)
-    shadeModule(projects.miniplaceholdersCommon)
+
+    includeDependency(libs.adventure.platform.fabric)
+    includeDependency(libs.adventure.serializer.legacy)
+    includeDependency(libs.luckopermissionsapi)
+    includeDependency(libs.cloud.fabric)
+    includeDependency(libs.cloud.core)
+    includeDependency(libs.cloud.extras)
+    includeDependency(libs.desertwell)
+
     shadeModule(projects.miniplaceholdersApi)
+    shadeModule(projects.miniplaceholdersCommon)
     shadeModule(projects.miniplaceholdersConnect)
 }
 
 fun DependencyHandlerScope.shadeModule(module: ProjectDependency) {
-    shade(module)
-    implementation(module)
+    shade(module) {
+        isTransitive = false
+    }
+    implementation(module) {
+        isTransitive = false
+    }
+}
+
+fun DependencyHandlerScope.includeDependency(dependency: Any) {
+    modImplementation(dependency)
+    include(dependency)
 }
 
 tasks {
@@ -35,13 +46,10 @@ tasks {
             expand("version" to project.version)
         }
     }
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
-    }
     remapJar {
         inputFile.set(shadowJar.get().archiveFile)
-        archiveFileName.set("MiniPlaceholders-Fabric-mc${libs.versions.minecraft.get()}-v${project.version}.jar")
+        archiveFileName.set("MiniPlaceholders-Fabric-${project.version}.jar")
+        destinationDirectory.set(file("${project.rootDir}/jar"))
     }
     shadowJar {
         configurations = listOf(shade)
@@ -50,5 +58,4 @@ tasks {
 
 java {
     withSourcesJar()
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }

fabric/src/main/java/io/github/miniplaceholders/fabric/FabricMod.java

@@ -1,12 +1,13 @@
 package io.github.miniplaceholders.fabric;
 
+import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator;
+import cloud.commandframework.fabric.FabricServerCommandManager;
 import io.github.miniplaceholders.api.Expansion;
 import io.github.miniplaceholders.common.PlaceholdersCommand;
 import io.github.miniplaceholders.common.PlaceholdersPlugin;
 import io.github.miniplaceholders.connect.InternalPlatform;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -19,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
 
 public class FabricMod implements ModInitializer, PlaceholdersPlugin {
     private final Logger logger = LoggerFactory.getLogger("miniplaceholders");
@@ -44,15 +47,15 @@ public class FabricMod implements ModInitializer, PlaceholdersPlugin {
     @Override
     public void loadDefaultExpansions() {
         Expansion.builder("server")
-                .globalPlaceholder("name", Tag.selfClosingInserting(Component.text(this.minecraftServer.getServerModName())))
+                .globalPlaceholder("name", Tag.preProcessParsed(this.minecraftServer.getServerModName()))
                 .globalPlaceholder("online", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.minecraftServer.getPlayerCount())))
-                .globalPlaceholder("version", (ctx, queue) -> Tag.selfClosingInserting(Component.text(this.minecraftServer.getServerVersion())))
-                .globalPlaceholder("max_players", (ctx, queue) -> Tag.selfClosingInserting(Component.text(this.minecraftServer.getMaxPlayers())))
+                .globalPlaceholder("version", (ctx, queue) -> Tag.preProcessParsed(this.minecraftServer.getServerVersion()))
+                .globalPlaceholder("max_players", (ctx, queue) -> Tag.preProcessParsed(Integer.toString(this.minecraftServer.getMaxPlayers())))
                 .globalPlaceholder("unique_joins", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.minecraftServer.getProfileCache().load().size())))
                 .globalPlaceholder("tps_1m", (ctx, queue) -> Tag.preProcessParsed(tickManager.getTps1m().formattedAverage()))
                 .globalPlaceholder("tps_5m", (ctx, queue) -> Tag.preProcessParsed(tickManager.getTps5m().formattedAverage()))
                 //.globalPlaceholder("tps_15m", (ctx, queue) -> Tag.preProcessParsed(tickManager.getTps15m().formattedAverage()))
-                .globalPlaceholder("tick_count", (queue, ctx) -> Tag.selfClosingInserting(Component.text(this.minecraftServer.getTickCount())))
+                .globalPlaceholder("tick_count", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.minecraftServer.getTickCount())))
                 .globalPlaceholder("has_whitelist", (queue, ctx) -> Tag.preProcessParsed(Boolean.toString(this.minecraftServer.getPlayerList().isUsingWhitelist())))
                 .globalPlaceholder("total_chunks", (queue, ctx) -> {
                     int chunks = 0;
@@ -93,13 +96,18 @@ public class FabricMod implements ModInitializer, PlaceholdersPlugin {
 
     @Override
     public void registerPlatformCommand() {
-        CommandRegistrationCallback.EVENT.register((dispatcher, commandBuildContext, commandSelection) ->
-            dispatcher.register(PlaceholdersCommand.<CommandSourceStack>builder()
-                    .hasPermissionCheck((source, permission) -> Permissions.check(source, permission, 4))
-                    .toAudience(string -> this.minecraftServer.getPlayerList().getPlayerByName(string))
-                    .playerSuggestions(() -> Arrays.asList(this.minecraftServer.getPlayerNames()))
-                    .build()
-                    .asBuilder("miniplaceholders"))
+        final FabricServerCommandManager<CommandSourceStack> commandManager = new FabricServerCommandManager<>(
+                AsynchronousCommandExecutionCoordinator.simpleCoordinator(),
+                Function.identity(),
+                Function.identity()
         );
+        PlaceholdersCommand.<CommandSourceStack>builder()
+                .hasPermissionCheck((source, permission) -> Permissions.check(source, permission, 4))
+                .toAudience(string -> this.minecraftServer.getPlayerList().getPlayerByName(string))
+                .playerSuggestions(() -> new ArrayList<>(List.of(this.minecraftServer.getPlayerNames())))
+                .manager(commandManager)
+                .command("miniplaceholders")
+                .build()
+                .register();
     }
 }

fabric/src/main/java/io/github/miniplaceholders/fabric/TickManager.java

@@ -8,7 +8,7 @@ import java.math.RoundingMode;
 final class TickManager {
     private static final int TICK_DURATION = 20;
 
-    private static final BigDecimal TPS_BASE = new BigDecimal(1E9).multiply(new BigDecimal(TICK_DURATION));
+    private static final BigDecimal TPS_BASE = new BigDecimal("1E9").multiply(new BigDecimal(TICK_DURATION));
 
     private final RollingAverage tps1m = new RollingAverage(60);
     private final RollingAverage tps5m = new RollingAverage(60 * 5);

fabric/src/main/resources/fabric.mod.json

@@ -12,7 +12,7 @@
     "sources": "https://github.com/MiniPlaceholders/MiniPlaceholders",
     "issues": "https://github.com/MiniPlaceholders/MiniPlaceholders/issues"
   },
-  "license": "GPL",
+  "license": "Apache-2",
   "environment": "server",
   "entrypoints": {
     "main": [
@@ -23,7 +23,7 @@
     "fabricloader": ">=0.14.19",
     "fabric": "*",
     "java": ">=17",
-    "minecraft": "~1.19.4",
+    "minecraft": ">=1.20.2",
     "fabric-permissions-api-v0": "*"
   }
 }

gradle.properties

@@ -1,5 +1,5 @@
 group = io.github.miniplaceholders
-version = 2.1.0
-description = MiniMessage Component-based Placeholders for PaperMC, Krypton and Velocity platforms
+version = 2.3.0-SNAPSHOT
+description = MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms
 
 org.gradle.jvmargs=-Xmx2G

gradle/libs.versions.toml

@@ -3,34 +3,33 @@ metadata.format.version = "1.1"
 [versions]
 
 velocity = "3.2.0-SNAPSHOT"
-paper = "1.19.4-R0.1-SNAPSHOT"
-krypton = "cbfaff4aa4"
-minecraft = "1.19.4"
+paper = "1.20.2-R0.1-SNAPSHOT"
+minecraft = "1.20.2"
 
-runtask = "2.1.0"
-pluginyml = "0.5.3"
-userdev = "1.5.4"
-blossom = "1.3.1"
-indra = "3.0.1"
+runtask = "2.2.3"
+pluginyml = "0.6.0"
+userdev = "1.7.1"
+blossom = "2.1.0"
+indra = "3.1.3"
 shadow = "8.1.1"
-jmh = "0.7.1"
-dokka = "1.8.10"
+jmh = "0.7.2"
+dokka = "1.9.10"
 
-adventure = "4.13.1"
-adventurefabric = "5.8.0"
+cloud = "1.8.4"
+adventure = "4.15.0"
+adventurefabric = "5.12.0"
 brigadier = "1.0.500"
-kotlin="1.8.21"
+kotlin="1.9.22"
 
-fabric-api = "0.79.0+1.20"
-fabric-loader = "0.14.19"
+fabric-api = "0.96.4+1.20.5"
+fabric-loader = "0.15.7"
 
-desertwell = "2.0.2"
+desertwell = "2.0.4"
 
 [libraries]
 
 velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
 paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
-krypton-server = { group = "org.kryptonmc", name = "krypton-server", version.ref = "krypton" }
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
 
 fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
@@ -40,19 +39,29 @@ luckopermissionsapi = { group = "me.lucko", name = "fabric-permissions-api", ver
 adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
 adventure-minimesssage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
 adventure-platform-fabric = { group = "net.kyori", name = "adventure-platform-fabric", version.ref = "adventurefabric" }
+adventure-serializer-legacy = { group = "net.kyori", name = "adventure-text-serializer-legacy", version.ref = "adventure" }
+adventure-serializer-plain = { group = "net.kyori", name = "adventure-text-serializer-plain", version.ref = "adventure" }
+
+cloud-core = { group = "cloud.commandframework", name = "cloud-core", version.ref = "cloud" }
+cloud-annotations = { group = "cloud.commandframework", name = "cloud-annotations", version.ref = "cloud" }
+cloud-velocity = { group = "cloud.commandframework", name = "cloud-velocity", version.ref = "cloud" }
+cloud-paper = { group = "cloud.commandframework", name = "cloud-paper", version.ref = "cloud" }
+cloud-fabric = { group = "cloud.commandframework", name = "cloud-fabric", version.ref = "cloud" }
+cloud-sponge = { group = "cloud.commandframework", name = "cloud-sponge", version = "1.8.0-SNAPSHOT" }
+cloud-extras = { group = "cloud.commandframework", name = "cloud-minecraft-extras", version.ref = "cloud" }
 
 brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
 
-krypton-annotation = { group = "org.kryptonmc", name = "krypton-annotation-processor", version.ref = "krypton" }
-
 plugin-shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
 plugin-kotlin =  { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-indra-common = { module = "net.kyori:indra-common", version.ref = "indra" }
 plugin-indra-spotless = { module = "net.kyori:indra-licenser-spotless", version.ref = "indra" }
-plugin-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
+plugin-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
 
 desertwell = { group = "net.william278", name = "DesertWell", version.ref = "desertwell" }
 
+junit-bom = "org.junit:junit-bom:5.10.2"
+
 [plugins]
 
 pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
@@ -63,3 +72,4 @@ blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmh" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

krypton/build.gradle.kts

@@ -1,27 +0,0 @@
-plugins {
-    kotlin("jvm")
-    kotlin("kapt")
-    alias(libs.plugins.shadow)
-}
-
-repositories {
-    maven("https://repo.kryptonmc.org/releases")
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://repo.kryptonmc.org/snapshots")
-}
-
-dependencies {
-    compileOnly(libs.krypton.server)
-    compileOnly(kotlin("stdlib"))
-    kapt(libs.krypton.annotation)
-    implementation(projects.miniplaceholdersCommon)
-    implementation(projects.miniplaceholdersApi)
-    implementation(projects.miniplaceholdersConnect)
-    implementation(projects.miniplaceholdersKotlinExt)
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}

krypton/src/main/kotlin/io/github/miniplaceholders/krypton/KotlinKryptonPlugin.kt

@@ -1,85 +0,0 @@
-package io.github.miniplaceholders.krypton
-
-import com.google.inject.Inject
-import io.github.miniplaceholders.api.utils.TagsUtils
-import io.github.miniplaceholders.common.PlaceholdersCommand
-import io.github.miniplaceholders.common.PlaceholdersPlugin
-import io.github.miniplaceholders.common.PluginConstants
-import io.github.miniplaceholders.connect.InternalPlatform
-import io.github.miniplaceholders.kotlin.asClosingTag
-import io.github.miniplaceholders.kotlin.expansion
-import net.kyori.adventure.text.Component
-import org.apache.logging.log4j.Logger
-import org.kryptonmc.api.command.BrigadierCommand
-import org.kryptonmc.api.command.CommandExecutionContext
-import org.kryptonmc.api.event.Listener
-import org.kryptonmc.api.event.server.ServerStartEvent
-import org.kryptonmc.api.plugin.annotation.Plugin
-import org.kryptonmc.krypton.KryptonServer
-import org.kryptonmc.krypton.command.KryptonCommandMeta
-
-@Plugin(
-    name = "MiniPlaceholders",
-    id = "miniplaceholders",
-    version = PluginConstants.VERSION,
-    authors = ["4drian3d"]
-)
-class KotlinKryptonPlugin @Inject constructor(
-    private val server: KryptonServer,
-    private val logger: Logger
-) : PlaceholdersPlugin {
-
-    init {
-        InternalPlatform.platform(InternalPlatform.KRYPTON)
-    }
-
-    @Listener
-    @Suppress("UNUSED")
-    fun onServerStart(event: ServerStartEvent) {
-        logger.info("Starting MiniPlaceholders Krypton")
-        this.loadDefaultExpansions()
-        this.registerPlatformCommand()
-    }
-
-    override fun loadDefaultExpansions() {
-        expansion("server") {
-            globalPlaceholder("total_entities") { _, _ ->
-                var entityCount = 0
-                for ((_, value) in server.worldManager.worlds) {
-                    entityCount += value.entities.size
-                }
-                Component.text(entityCount).asClosingTag()
-            }
-            globalPlaceholder("total_chunks") { _, _ ->
-                var chunkCount = 0
-                for ((_, value) in server.worldManager.worlds) {
-                    chunkCount += value.chunks.size
-                }
-                Component.text(chunkCount).asClosingTag()
-            }
-            globalPlaceholder("name", TagsUtils.staticTag(server.platform.name))
-            globalPlaceholder("online") { queue, _ ->
-                if (queue.hasNext()) {
-                    val worldName = queue.pop().value()
-                    val players = server.players.filter { it.world.name == worldName }
-
-                    return@globalPlaceholder Component.text(players.joinToString(", ")).asClosingTag()
-                }
-                Component.text(server.players.size).asClosingTag()
-            }
-            globalPlaceholder("version", TagsUtils.staticTag(server.platform.version))
-            globalPlaceholder("max_players", Component.text(server.config.maxPlayers).asClosingTag())
-        }.register()
-    }
-
-    override fun registerPlatformCommand() {
-        val command = PlaceholdersCommand.builder<CommandExecutionContext>()
-            .fromSourceToAudience { it.sender }
-            .playerSuggestions { server.players.map { it.name } }
-            .toAudience { server.getPlayer(it) }
-            .build()
-        val brigadierCMD = BrigadierCommand.of(command.asNode("miniplaceholders"))
-        val meta = KryptonCommandMeta.Builder("miniplaceholders").build()
-        server.commandManager.register(brigadierCMD, meta)
-    }
-}

paper/build.gradle.kts

@@ -1,34 +1,20 @@
 plugins {
-    alias(libs.plugins.userdev)
+    id("miniplaceholders.auto.module")
+    id("miniplaceholders.shadow")
     alias(libs.plugins.runpaper)
-    alias(libs.plugins.shadow)
 }
 
 dependencies {
-    paperweight.paperDevBundle(libs.versions.paper.get())
+    compileOnly(libs.paper)
     implementation(projects.miniplaceholdersCommon)
     implementation(projects.miniplaceholdersApi)
     implementation(projects.miniplaceholdersConnect)
+    implementation(libs.cloud.paper)
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
 tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-
-        options.release.set(17)
-    }
     runServer {
-        minecraftVersion("1.19.4")
-    }
-    jar {
-        manifest {
-            attributes("Automatic-Module-Name" to "io.github.miniplaceholders.paper")
-        }
+        minecraftVersion("1.20.2")
     }
     processResources {
         filesMatching("paper-plugin.yml") {

paper/src/main/java/io/github/miniplaceholders/paper/PaperPlugin.java

@@ -1,7 +1,8 @@
 package io.github.miniplaceholders.paper;
 
+import cloud.commandframework.execution.AsynchronousCommandExecutionCoordinator;
+import cloud.commandframework.paper.PaperCommandManager;
 import io.github.miniplaceholders.api.Expansion;
-import io.github.miniplaceholders.api.utils.TagsUtils;
 import io.github.miniplaceholders.common.PlaceholdersCommand;
 import io.github.miniplaceholders.common.PlaceholdersPlugin;
 import io.github.miniplaceholders.connect.InternalPlatform;
@@ -9,14 +10,17 @@ import io.papermc.paper.datapack.Datapack;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.tag.Tag;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.server.MinecraftServer;
 import org.bukkit.World;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
 public final class PaperPlugin extends JavaPlugin implements PlaceholdersPlugin {
@@ -39,38 +43,38 @@ public final class PaperPlugin extends JavaPlugin implements PlaceholdersPlugin
     @Override
     public void loadDefaultExpansions() {
         Expansion.builder("server")
-            .globalPlaceholder("name", TagsUtils.staticTag(Component.text(this.getServer().getName())))
-            .globalPlaceholder("online", (queue, ctx) -> TagsUtils.staticTag(Component.text(this.getServer().getOnlinePlayers().size())))
-            .globalPlaceholder("version", TagsUtils.staticTag(this.getServer().getVersion()))
-            .globalPlaceholder("max_players", (queue, ctx) -> TagsUtils.staticTag(Component.text(this.getServer().getMaxPlayers())))
-            .globalPlaceholder("unique_joins", (queue, ctx) -> TagsUtils.staticTag(Component.text(this.getServer().getOfflinePlayers().length)))
-            .globalPlaceholder("tps_1", (queue, ctx) -> TagsUtils.staticTag(TPS_FORMAT.format(this.getServer().getTPS()[0])))
-            .globalPlaceholder("tps_5", (queue, ctx) -> TagsUtils.staticTag(TPS_FORMAT.format(this.getServer().getTPS()[1])))
-            .globalPlaceholder("tps_15", (queue, ctx) -> TagsUtils.staticTag(TPS_FORMAT.format(this.getServer().getTPS()[2])))
-            .globalPlaceholder("has_whitelist", (queue, ctx) -> TagsUtils.staticTag(Component.text(this.getServer().hasWhitelist())))
+            .globalPlaceholder("name", Tag.preProcessParsed(this.getServer().getName()))
+            .globalPlaceholder("online", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.getServer().getOnlinePlayers().size())))
+            .globalPlaceholder("version", Tag.preProcessParsed(this.getServer().getVersion()))
+            .globalPlaceholder("max_players", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.getServer().getMaxPlayers())))
+            .globalPlaceholder("unique_joins", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.getServer().getOfflinePlayers().length)))
+            .globalPlaceholder("tps_1", (queue, ctx) -> Tag.preProcessParsed(TPS_FORMAT.format(this.getServer().getTPS()[0])))
+            .globalPlaceholder("tps_5", (queue, ctx) -> Tag.preProcessParsed(TPS_FORMAT.format(this.getServer().getTPS()[1])))
+            .globalPlaceholder("tps_15", (queue, ctx) -> Tag.preProcessParsed(TPS_FORMAT.format(this.getServer().getTPS()[2])))
+            .globalPlaceholder("has_whitelist", (queue, ctx) -> Tag.preProcessParsed(Boolean.toString(this.getServer().hasWhitelist())))
             .globalPlaceholder("total_chunks", (queue, ctx) -> {
                 int chunkCount = 0;
                 for (World world : this.getServer().getWorlds()){
                     chunkCount += world.getLoadedChunks().length;
                 }
-                return TagsUtils.staticTag(Component.text(chunkCount));
+                return Tag.preProcessParsed(Integer.toString(chunkCount));
             })
             .globalPlaceholder("total_entities", (queue, ctx) -> {
                 int entityCount = 0;
                 for (World world : this.getServer().getWorlds()){
                     entityCount += world.getEntityCount();
                 }
-                return TagsUtils.staticTag(Component.text(entityCount));
+                return Tag.preProcessParsed(Integer.toString(entityCount));
             })
-            .globalPlaceholder("mspt", (queue, ctx) -> TagsUtils.staticTag(MSPT_FORMAT.format(this.getServer().getAverageTickTime())))
+            .globalPlaceholder("mspt", (queue, ctx) -> Tag.preProcessParsed(MSPT_FORMAT.format(this.getServer().getAverageTickTime())))
             .globalPlaceholder("datapack_list", (queue, ctx) -> {
                 final TextComponent.Builder builder = Component.text();
-                for (Datapack datapack : this.getServer().getDatapackManager().getEnabledPacks()){
+                for (final Datapack datapack : this.getServer().getDatapackManager().getEnabledPacks()) {
                     builder.append(Component.text("[").append(Component.text(datapack.getName()).append(Component.text("] "))));
                 }
                 return Tag.selfClosingInserting(builder.build());
             })
-            .globalPlaceholder("datapack_count", (queue, ctx) -> Tag.selfClosingInserting(Component.text(this.getServer().getDatapackManager().getEnabledPacks().size())))
+            .globalPlaceholder("datapack_count", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(this.getServer().getDatapackManager().getEnabledPacks().size())))
         .build()
         .register();
     }
@@ -78,19 +82,28 @@ public final class PaperPlugin extends JavaPlugin implements PlaceholdersPlugin
     @Override
     @SuppressWarnings({"sonarlint(java:s1874)"})
     public void registerPlatformCommand() {
-        MinecraftServer.getServer()
-            .getCommands()
-            .getDispatcher()
-            .register(PlaceholdersCommand.<CommandSourceStack>builder()
+        try {
+            PaperCommandManager<CommandSender> commandManager = new PaperCommandManager<>(
+                    this,
+                    AsynchronousCommandExecutionCoordinator.simpleCoordinator(),
+                    Function.identity(),
+                    Function.identity()
+            );
+            commandManager.registerBrigadier();
+
+            PlaceholdersCommand.<CommandSender>builder()
                     .playerSuggestions(() -> getServer().getOnlinePlayers()
                             .stream()
                             .map(Player::getName)
-                            .toList())
+                            .collect(Collectors.toCollection(ArrayList::new)))
                     .toAudience(st -> getServer().getPlayer(st))
-                    .hasPermissionCheck((source, permission) -> source.getBukkitSender().hasPermission(permission))
-                    .fromSourceToAudience(CommandSourceStack::getBukkitSender)
+                    .hasPermissionCheck(Permissible::hasPermission)
+                    .manager(commandManager)
+                    .command("miniplaceholders")
                     .build()
-                    .asBuilder("miniplaceholders")
-            );
+                    .register();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 }

settings.gradle.kts

@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "miniplaceholders-parent"
@@ -12,8 +14,25 @@ pluginManagement {
     }
 }
 
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.maven.apache.org/maven2/")
+        maven("https://jitpack.io") {
+            mavenContent {
+                includeGroup("net.william278")
+            }
+        }
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://repo.jpenilla.xyz/snapshots/")
+    }
+}
+
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("fabric-loom") version "1.5.8"
+    id("org.spongepowered.gradle.plugin") version "2.2.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 arrayOf(
@@ -23,8 +42,9 @@ arrayOf(
     "common",
     "paper",
     "velocity",
-    "krypton",
-    "fabric"
+    //"krypton",
+    "fabric",
+    "sponge"
 ).forEach {
     include("miniplaceholders-$it")
     project(":miniplaceholders-$it").projectDir = file(it)

sponge/.gitignore

@@ -0,0 +1,2 @@
+# run-paper files
+/run

sponge/build.gradle.kts

@@ -0,0 +1,47 @@
+import org.spongepowered.gradle.plugin.config.PluginLoaders
+import org.spongepowered.plugin.metadata.model.PluginDependency
+
+plugins {
+    id("miniplaceholders.auto.module")
+    id("miniplaceholders.shadow")
+    id("org.spongepowered.gradle.plugin")
+}
+
+dependencies {
+    implementation(projects.miniplaceholdersCommon)
+    implementation(projects.miniplaceholdersApi)
+    implementation(projects.miniplaceholdersConnect)
+    implementation(libs.cloud.sponge)
+}
+
+sponge {
+    apiVersion("8.1.0")
+    license("GPL-3")
+    loader {
+        name(PluginLoaders.JAVA_PLAIN)
+        version("1.0")
+    }
+    plugin("miniplaceholders") {
+        displayName("MiniPlaceholders")
+        entrypoint("io.github.miniplaceholders.sponge.SpongePlugin")
+        description(project.description)
+        links {
+            homepage("https://github.com/MiniPlaceholders/MiniPlaceholders")
+            source("https://github.com/MiniPlaceholders/MiniPlaceholders")
+            issues("https://github.com/MiniPlaceholders/MiniPlaceholders/issues")
+        }
+        contributor("4drian3d") {
+            description("Lead Developer")
+        }
+        dependency("spongeapi") {
+            loadOrder(PluginDependency.LoadOrder.AFTER)
+            optional(false)
+        }
+    }
+}
+
+tasks {
+    shadowJar {
+        exclude("io/leangen/geantyref/**")
+    }
+}

sponge/src/main/java/io/github/miniplaceholders/sponge/SpongePlugin.java

@@ -0,0 +1,115 @@
+package io.github.miniplaceholders.sponge;
+
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+import cloud.commandframework.sponge.SpongeCommandManager;
+import com.google.inject.Inject;
+import io.github.miniplaceholders.api.Expansion;
+import io.github.miniplaceholders.common.PlaceholdersCommand;
+import io.github.miniplaceholders.common.PlaceholdersPlugin;
+import io.github.miniplaceholders.connect.InternalPlatform;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.audience.ForwardingAudience;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.api.Server;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandCause;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
+import org.spongepowered.api.event.lifecycle.StartingEngineEvent;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.plugin.PluginContainer;
+import org.spongepowered.plugin.builtin.jvm.Plugin;
+
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Plugin("miniplaceholders")
+public class SpongePlugin implements PlaceholdersPlugin {
+
+    @Inject
+    private PluginContainer pluginContainer;
+    @Inject
+    private Logger logger;
+
+    private Server server;
+
+    @Listener
+    public void onServerStart(final StartingEngineEvent<Server> event) {
+        this.server = event.engine();
+        logger.info("Starting MiniPlaceholders Sponge");
+        InternalPlatform.platform(InternalPlatform.SPONGE);
+
+        this.loadDefaultExpansions();
+    }
+
+    private final AtomicInteger registration = new AtomicInteger(0);
+
+    @Listener
+    public void onCommandRegister(final RegisterCommandEvent<Command.Parameterized> event) {
+        if (registration.getAndIncrement() == 0) {
+            this.registerPlatformCommand();
+        }
+    }
+
+    @Override
+    public void loadDefaultExpansions() {
+        Expansion.builder("server")
+                .globalPlaceholder("name", Tag.preProcessParsed("Sponge"))
+                .globalPlaceholder("online", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(server.onlinePlayers().size())))
+                .globalPlaceholder("max_players", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(server.maxPlayers())))
+                .globalPlaceholder("unique_joins", (queue, ctx) -> Tag.preProcessParsed(Long.toString(server.userManager().streamAll().count())))
+                .globalPlaceholder("has_whitelist", (queue, ctx) -> Tag.preProcessParsed(Boolean.toString(server.isWhitelistEnabled())))
+                .globalPlaceholder("total_chunks", (queue, ctx) -> {
+                    int chunkCount = 0;
+                    for (ServerWorld world : server.worldManager().worlds()){
+                        chunkCount += world.entities().size();
+                    }
+                    return Tag.preProcessParsed(Integer.toString(chunkCount));
+                })
+                .globalPlaceholder("total_entities", (queue, ctx) -> {
+                    int entityCount = 0;
+                    for (ServerWorld world : server.worldManager().worlds()){
+                        entityCount += world.entities().size();
+                    }
+                    return Tag.preProcessParsed(Integer.toString(entityCount));
+                })
+                .globalPlaceholder("mspt", (queue, ctx) -> Tag.preProcessParsed(Double.toString(server.averageTickTime())))
+                .build()
+                .register();
+
+    }
+
+    @Override
+    public void registerPlatformCommand() {
+        final SpongeCommandManager<AudienceHolder> commandManager = new SpongeCommandManager<>(
+                pluginContainer,
+                CommandExecutionCoordinator.simpleCoordinator(),
+                AudienceHolder::cause,
+                AudienceHolder::new
+        );
+
+        PlaceholdersCommand.<AudienceHolder>builder()
+                .manager(commandManager)
+                .command("miniplaceholders")
+                .playerSuggestions(() -> server.onlinePlayers()
+                        .stream()
+                        .map(ServerPlayer::name)
+                        .collect(Collectors.toCollection(ArrayList::new)))
+                .toAudience(st -> server.player(st).orElse(null))
+                .hasPermissionCheck((holder, permission) -> holder.cause.hasPermission(permission))
+                .build()
+                .register();
+    }
+
+    record AudienceHolder(@NotNull CommandCause cause) implements ForwardingAudience.Single {
+
+        @Override
+        public @NotNull Audience audience() {
+            return cause.audience();
+        }
+    }
+}

velocity/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
+    id("miniplaceholders.shadow")
+    id("miniplaceholders.auto.module")
     alias(libs.plugins.runvelocity)
-    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -9,23 +10,10 @@ dependencies {
     implementation(projects.miniplaceholdersCommon)
     implementation(projects.miniplaceholdersApi)
     implementation(projects.miniplaceholdersConnect)
+    implementation(libs.cloud.velocity)
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-
 tasks {
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-
-        options.release.set(17)
-    }
-
-    jar {
-        manifest {
-            attributes("Automatic-Module-Name" to "io.github.miniplaceholders.velocity")
-        }
-    }
-
     runVelocity {
         velocityVersion(libs.versions.velocity.get())
     }

velocity/src/main/java/io/github/miniplaceholders/velocity/VelocityPlugin.java

@@ -1,7 +1,12 @@
 package io.github.miniplaceholders.velocity;
 
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+import cloud.commandframework.velocity.CloudInjectionModule;
+import cloud.commandframework.velocity.VelocityCommandManager;
 import com.google.inject.Inject;
-import com.velocitypowered.api.command.BrigadierCommand;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
@@ -10,15 +15,17 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import io.github.miniplaceholders.api.Expansion;
 import io.github.miniplaceholders.api.utils.Components;
-import io.github.miniplaceholders.api.utils.TagsUtils;
 import io.github.miniplaceholders.common.PlaceholdersCommand;
 import io.github.miniplaceholders.common.PlaceholdersPlugin;
 import io.github.miniplaceholders.common.PluginConstants;
 import io.github.miniplaceholders.connect.InternalPlatform;
-import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 @Plugin(
         name = "MiniPlaceholders",
         id = "miniplaceholders",
@@ -28,6 +35,8 @@ import org.slf4j.Logger;
 public final class VelocityPlugin implements PlaceholdersPlugin {
     private final Logger logger;
     private final ProxyServer proxy;
+    @Inject
+    private Injector injector;
 
     @Inject
     public VelocityPlugin(final Logger logger, final ProxyServer proxy) {
@@ -51,33 +60,44 @@ public final class VelocityPlugin implements PlaceholdersPlugin {
                 .globalPlaceholder("online_players", (queue, ctx) -> {
                     if (queue.hasNext()) {
                         String server = queue.pop().value();
-                        return Tag.selfClosingInserting(Component.text(proxy.getServer(server).map(sv -> sv.getPlayersConnected().size()).orElse(0)));
+                        return Tag.preProcessParsed(proxy.getServer(server)
+                                .map(sv -> sv.getPlayersConnected().size())
+                                .map(size -> Integer.toString(size))
+                                .orElse("0"));
                     }
-                    return Tag.selfClosingInserting(Component.text(proxy.getPlayerCount()));
+                    return Tag.preProcessParsed(Integer.toString(proxy.getPlayerCount()));
                 })
-                .globalPlaceholder("server_count", (queue, ctx) -> Tag.selfClosingInserting(Component.text(proxy.getAllServers().size())))
+                .globalPlaceholder("server_count", (queue, ctx) -> Tag.preProcessParsed(Integer.toString(proxy.getAllServers().size())))
                 .globalPlaceholder("is_player_online", (queue, ctx) -> {
                     String playerName = queue.popOr(() -> "you need to introduce an argument").value();
-                    return TagsUtils.staticTag(proxy.getPlayer(playerName).isPresent() ? Components.YES_COMPONENT : Components.NO_COMPONENT);
+                    return Tag.selfClosingInserting(proxy.getPlayer(playerName).isPresent() ? Components.YES_COMPONENT : Components.NO_COMPONENT);
                 })
-                .globalPlaceholder("version", TagsUtils.staticTag(proxy.getVersion().getVersion()))
+                .globalPlaceholder("version", Tag.preProcessParsed(proxy.getVersion().getVersion()))
                 .build()
                 .register();
     }
 
     @Override
     public void registerPlatformCommand() {
-        final BrigadierCommand brigadierCMD = new BrigadierCommand(
-                PlaceholdersCommand.<CommandSource>builder()
-                        .playerSuggestions(() -> proxy.getAllPlayers()
-                                .stream()
-                                .map(Player::getUsername)
-                                .toList())
-                        .toAudience(st -> proxy.getPlayer(st).orElse(null))
-                        .build()
-                        .asNode("vminiplaceholders")
+        injector = injector.createChildInjector(
+            new CloudInjectionModule<>(
+                    CommandSource.class,
+                    CommandExecutionCoordinator.simpleCoordinator(),
+                    Function.identity(),
+                    Function.identity()
+            )
         );
-
-        proxy.getCommandManager().register(brigadierCMD);
+        final VelocityCommandManager<CommandSource> commandManager = injector.getInstance(
+                Key.get(new TypeLiteral<>() {})
+        );
+        PlaceholdersCommand.<CommandSource>builder()
+                .playerSuggestions(() -> proxy.getAllPlayers()
+                        .stream()
+                        .map(Player::getUsername)
+                        .collect(Collectors.toCollection(ArrayList::new)))
+                .toAudience(st -> proxy.getPlayer(st).orElse(null))
+                .command("vminiplaceholders")
+                .manager(commandManager)
+                .build().register();
     }
 }