Update 1.18.1

PATCHES-LICENSE

@@ -1,165 +1,621 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
+                    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
 
-  This version of the GNU Lesser General Public License incorporates
+  The GNU General Public License is a free, copyleft license for
-the terms and conditions of version 3 of the GNU General Public
+software and other kinds of works.
-License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions.
+  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.
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
+  When we speak of free software, we are referring to freedom, not
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
+price.  Our General Public Licenses are designed to make sure that you
-General Public License.
+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.
 
-  "The Library" refers to a covered work governed by this License,
+  To protect your rights, we need to prevent others from denying you
-other than an Application or a Combined Work as defined below.
+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.
 
-  An "Application" is any work that makes use of an interface provided
+  For example, if you distribute copies of such a program, whether
-by the Library, but which is not otherwise based on the Library.
+gratis or for a fee, you must pass on to the recipients the same
-Defining a subclass of a class defined by the Library is deemed a mode
+freedoms that you received.  You must make sure that they, too, receive
-of using an interface provided by the Library.
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  A "Combined Work" is a work produced by combining or linking an
+  Developers that use the GNU GPL protect your rights with two steps:
-Application with the Library.  The particular version of the Library
+(1) assert copyright on the software, and (2) offer you this License
-with which the Combined Work was made is also called the "Linked
+giving you legal permission to copy, distribute and/or modify it.
-Version".
 
-  The "Minimal Corresponding Source" for a Combined Work means the
+  For the developers' and authors' protection, the GPL clearly explains
-Corresponding Source for the Combined Work, excluding any source code
+that there is no warranty for this free software.  For both users' and
-for portions of the Combined Work that, considered in isolation, are
+authors' sake, the GPL requires that modified versions be marked as
-based on the Application, and not on the Linked Version.
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  The "Corresponding Application Code" for a Combined Work means the
+  Some devices are designed to deny users access to install or run
-object code and/or source code for the Application, including any data
+modified versions of the software inside them, although the manufacturer
-and utility programs needed for reproducing the Combined Work from the
+can do so.  This is fundamentally incompatible with the aim of
-Application, but excluding the System Libraries of the Combined Work.
+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.
 
-  1. Exception to Section 3 of the GNU GPL.
+  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.
 
-  You may convey a covered work under sections 3 and 4 of this License
+  The precise terms and conditions for copying, distribution and
-without being bound by section 3 of the GNU GPL.
+modification follow.
 
-  2. Conveying Modified Versions.
+                       TERMS AND CONDITIONS
 
-  If you modify a copy of the Library, and, in your modifications, a
+  0. Definitions.
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
 
-   a) under this License, provided that you make a good faith effort to
+  "This License" refers to version 3 of the GNU General Public License.
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
 
-   b) under the GNU GPL, with none of the additional permissions of
+  "Copyright" also means copyright-like laws that apply to other kinds of
-   this License applicable to that copy.
+works, such as semiconductor masks.
 
-  3. Object Code Incorporating Material from Library Header Files.
+  "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.
 
-  The object code form of an Application may incorporate material from
+  To "modify" a work means to copy from or adapt all or part of the work
-a header file that is part of the Library.  You may convey such object
+in a fashion requiring copyright permission, other than the making of an
-code under terms of your choice, provided that, if the incorporated
+exact copy.  The resulting work is called a "modified version" of the
-material is not limited to numerical parameters, data structure
+earlier work or a work "based on" the earlier work.
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
 
-   a) Give prominent notice with each copy of the object code that the
+  A "covered work" means either the unmodified Program or a work based
-   Library is used in it and that the Library and its use are
+on the Program.
-   covered by this License.
 
-   b) Accompany the object code with a copy of the GNU GPL and this license
+  To "propagate" a work means to do anything with it that, without
-   document.
+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.
 
-  4. Combined Works.
+  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.
 
-  You may convey a Combined Work under terms of your choice that,
+  An interactive user interface displays "Appropriate Legal Notices"
-taken together, effectively do not restrict modification of the
+to the extent that it includes a convenient and prominently visible
-portions of the Library contained in the Combined Work and reverse
+feature that (1) displays an appropriate copyright notice, and (2)
-engineering for debugging such modifications, if you also do each of
+tells the user that there is no warranty for the work (except to the
-the following:
+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.
 
-   a) Give prominent notice with each copy of the Combined Work that
+  1. Source Code.
-   the Library is used in it and that the Library and its use are
-   covered by this License.
 
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+  The "source code" for a work means the preferred form of the work
-   document.
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-   c) For a Combined Work that displays copyright notices during
+  A "Standard Interface" means an interface that either is an official
-   execution, include the copyright notice for the Library among
+standard defined by a recognized standards body, or, in the case of
-   these notices, as well as a reference directing the user to the
+interfaces specified for a particular programming language, one that
-   copies of the GNU GPL and this license document.
+is widely used among developers working in that language.
 
-   d) Do one of the following:
+  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.
 
-       0) Convey the Minimal Corresponding Source under the terms of this
+  The "Corresponding Source" for a work in object code form means all
-       License, and the Corresponding Application Code in a form
+the source code needed to generate, install, and (for an executable
-       suitable for, and under terms that permit, the user to
+work) run the object code and to modify the work, including scripts to
-       recombine or relink the Application with a modified version of
+control those activities.  However, it does not include the work's
-       the Linked Version to produce a modified Combined Work, in the
+System Libraries, or general-purpose tools or generally available free
-       manner specified by section 6 of the GNU GPL for conveying
+programs which are used unmodified in performing those activities but
-       Corresponding Source.
+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.
 
-       1) Use a suitable shared library mechanism for linking with the
+  The Corresponding Source need not include anything that users
-       Library.  A suitable mechanism is one that (a) uses at run time
+can regenerate automatically from other parts of the Corresponding
-       a copy of the Library already present on the user's computer
+Source.
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
 
-   e) Provide Installation Information, but only if you would otherwise
+  The Corresponding Source for a work in source code form is that
-   be required to provide such information under section 6 of the
+same work.
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
 
-  5. Combined Libraries.
+  2. Basic Permissions.
 
-  You may place library facilities that are a work based on the
+  All rights granted under this License are granted for the term of
-Library side by side in a single library together with other library
+copyright on the Program, and are irrevocable provided the stated
-facilities that are not Applications and are not covered by this
+conditions are met.  This License explicitly affirms your unlimited
-License, and convey such a combined library under terms of your
+permission to run the unmodified Program.  The output from running a
-choice, if you do both of the following:
+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.
 
-   a) Accompany the combined library with a copy of the same work based
+  You may make, run and propagate covered works that you do not
-   on the Library, uncombined with any other library facilities,
+convey, without conditions so long as your license otherwise remains
-   conveyed under the terms of this License.
+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.
 
-   b) Give prominent notice with the combined library that part of it
+  Conveying under any other circumstances is permitted solely under
-   is a work based on the Library, and explaining where to find the
+the conditions stated below.  Sublicensing is not allowed; section 10
-   accompanying uncombined form of the same work.
+makes it unnecessary.
 
-  6. Revised Versions of the GNU Lesser General Public License.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-  The Free Software Foundation may publish revised and/or new versions
+  No covered work shall be deemed part of an effective technological
-of the GNU Lesser General Public License from time to time. Such new
+measure under any applicable law fulfilling obligations under article
-versions will be similar in spirit to the present version, but may
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-differ in detail to address new problems or concerns.
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-  Each version is given a distinguishing version number. If the
+  When you convey a covered work, you waive any legal power to forbid
-Library as you received it specifies that a certain numbered version
+circumvention of technological measures to the extent such circumvention
-of the GNU Lesser General Public License "or any later version"
+is effected by exercising rights under this License with respect to
-applies to it, you have the option of following the terms and
+the covered work, and you disclaim any intention to limit operation or
-conditions either of that published version or of any later version
+modification of the work as a means of enforcing, against the work's
-published by the Free Software Foundation. If the Library as you
+users, your or third parties' legal rights to forbid circumvention of
-received it does not specify a version number of the GNU Lesser
+technological measures.
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
 
-  If the Library as you received it specifies that a proxy can decide
+  4. Conveying Verbatim Copies.
-whether future versions of the GNU Lesser General Public License shall
+
-apply, that proxy's public statement of acceptance of any version is
+  You may convey verbatim copies of the Program's source code as you
-permanent authorization for you to choose that version for the
+receive it, in any medium, provided that you conspicuously and
-Library.
+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

README.md

@@ -7,12 +7,10 @@ Leaves
 
 > Waring: This fork will have low mspt as Paper
 
-> It will be edit
-
 ## How To (Server Admins)
 Leaves use the same paperclip jar system that Paper uses.
 
-You can download the latest build (1.17.x) of Leaves by going [here](null)
+You can download the latest build (1.18.x) of Leaves by going [here](null)
 
 You can also [build it yourself](https://github.com/LeavesMC/Leaves#building).
 
@@ -25,7 +23,7 @@ Leaves-API maven dependency:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves-api</artifactId>
-    <version>1.17.1-R0.1-SNAPSHOT</version>
+    <version>1.18.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
  </dependency>
  ```
@@ -35,13 +33,13 @@ Leaves-Server maven dependency:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves</artifactId>
-    <version>1.17.1-R0.1-SNAPSHOT</version>
+    <version>1.18.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
 
 ## Building
-Java16+
+Java17+
 
 `./gradlew applyPatches`
 

README_cn.md

@@ -10,7 +10,7 @@ Leaves
 ## 对于服务器管理员
 此分支使用与Paper一致的paperclip分发
 
-你可以从 [此处](null) 下载最新的构建结果 (1.17.x)
+你可以从 [此处](null) 下载最新的构建结果 (1.18.x)
 
 也可以通过 [此处](https://github.com/LeavesMC/Leaves/blob/master/README_cn.md#自行构建) 的指南自行构建
 
@@ -24,7 +24,7 @@ Leaves-API:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves-api</artifactId>
-    <version>1.17.1-R0.1-SNAPSHOT</version>
+    <version>1.18.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
  </dependency>
  ```
@@ -34,12 +34,12 @@ Leaves-Server:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves</artifactId>
-    <version>1.17.1-R0.1-SNAPSHOT</version>
+    <version>1.18.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
 ## 自行构建
-Java16+
+Java17+
 
 `./gradlew applyPatches`
 

build.gradle.kts

@@ -1,25 +1,20 @@
-import io.papermc.paperweight.patcher.tasks.SimpleRebuildGitPatches
-import io.papermc.paperweight.util.constants.*
-
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    id("com.github.johnrengelman.shadow") version "7.1.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.1.9"
+    id("io.papermc.paperweight.patcher") version "1.3.3"
 }
 
 repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/") {
-        content { onlyForConfigurations(PAPERCLIP_CONFIG) }
+        content { onlyForConfigurations("paperclip") }
-    }
-    maven("https://maven.quiltmc.org/repository/release/") {
-        content { onlyForConfigurations(REMAPPER_CONFIG) }
     }
 }
 
 dependencies {
-    remapper("org.quiltmc:tiny-remapper:0.4.1")
+    remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
-    paperclip("io.papermc:paperclip:2.0.1")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.22")
+    paperclip("io.papermc:paperclip:3.0.2")
 }
 
 subprojects {
@@ -27,13 +22,13 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(16))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(16)
+        options.release.set(17)
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -43,6 +38,7 @@ subprojects {
     }
 
     repositories {
+        mavenLocal()
         mavenCentral()
         maven("https://oss.sonatype.org/content/groups/public/")
         maven("https://papermc.io/repo/repository/maven-public/")
@@ -50,28 +46,23 @@ subprojects {
         maven("https://repo.aikar.co/content/groups/aikar")
         maven("https://repo.md-5.net/content/repositories/releases/")
         maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+        maven("https://jitpack.io")
     }
 }
 
 paperweight {
-    serverProject.set(project(":Leaves-Server"))
+    serverProject.set(project(":leaves-server"))
 
-    usePaperUpstream(provider { file("current-paper").readText().trim() }) {
+	remapRepo.set("https://maven.fabricmc.net/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
+
+    usePaperUpstream(providers.gradleProperty("paperRef")) {
         withPaperPatcher {
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("Leaves-API"))
+            apiOutputDir.set(layout.projectDirectory.dir("leaves-api"))
 
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("Leaves-Server"))
+            serverOutputDir.set(layout.projectDirectory.dir("leaves-server"))
         }
     }
-}
+}
-
-tasks.paperclipJar {
-    destinationDirectory.set(rootProject.layout.projectDirectory)
-    archiveFileName.set("leaves-paperclip.jar")
-}
-
-tasks.withType<SimpleRebuildGitPatches> {
-    filterPatches.set(false)
-}

current-paper

@@ -1 +0,0 @@
-80836709e7fd3f63edb6fd8a2b85022ba90b45f7

gradle.properties

@@ -1,6 +1,7 @@
 group = top.leavesmc.leaves
-version = 1.17.1-R0.1-SNAPSHOT
+version = 1.18.1-R0.1-SNAPSHOT
 
-mcVersion = 1.17.1
+mcVersion = 1.18.1
-packageVersion = 1_17_R1
+packageVersion = 1_18_R1
 org.gradle.jvmargs=-Xmx2G
+paperRef=64f9225c94f3cd1b7793cb5234fa78423f222f23

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

patches/api/0001-Leaves-Server-Config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 83870d54a5ff1017ad7455e9c931fdee54354434..79711cc88ebf77d686f5b14f30d66372206511a6 100644
+index e48af3822e9f118399c3a1c9358c56efae12e0da..be0b0191a8ba6a6499709b312d45a451e2c96549 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1678,6 +1678,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1777,6 +1777,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end

patches/server/0001-Build-changes.patch

@@ -5,21 +5,25 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 83ce7b299033806297095028989976259f9c2a92..d3cdf313dd3030d597c44763af65185da567b569 100644
+index 028f6a1795ceb99d1760c73b0980238677b4b8bc..faad9bc347dc8237a88f38bcc2f18aa28dbc903d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -28,8 +28,8 @@ repositories {
+@@ -18,8 +18,12 @@ repositories {
  }
  
  dependencies {
--    implementation(project(":Paper-API"))
+-    implementation(project(":paper-api"))
--    implementation(project(":Paper-MojangAPI"))
+-    implementation(project(":paper-mojangapi"))
-+	implementation(project(":Leaves-API")) // Leaves
++	implementation(project(":leaves-api")) // Leaves
-+	implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Leaves
++	// Leaves start
++	implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") {
++		exclude("io.papermc.paper", "paper-api")
++	}
++	// Leaves end
      // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.12.1")
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.2.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -74,13 +74,13 @@ tasks.jar {
+@@ -62,13 +66,13 @@ tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -31,34 +35,33 @@ index 83ce7b299033806297095028989976259f9c2a92..d3cdf313dd3030d597c44763af65185d
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
 -            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Version" to "git-Leaves-$implementationVersion", // Leaves
++            "Implementation-Version" to "git-Leaves-$implementationVersion",
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -176,7 +176,7 @@ tasks.test {
+@@ -156,7 +160,7 @@ fun TaskContainer.registerRunTask(
- fun TaskContainer.registerRunTask(
+     name: String,
-     name: String, block: JavaExec.() -> Unit
+     block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
 -    group = "paper"
 +    group = "paperweight"
+     mainClass.set("org.bukkit.craftbukkit.Main")
      standardInput = System.`in`
-     workingDir = rootProject.layout.projectDirectory.dir(
+     workingDir = rootProject.layout.projectDirectory
-         providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..94a0806037c7aa8f375deaf9527490a2aae9324c 100644
+index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec58822564af2a43 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -593,8 +593,7 @@ public class Metrics {
+@@ -593,7 +593,7 @@ public class Metrics {
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
 -                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
--
++                Metrics metrics = new Metrics("Leaves", serverUUID, logFailedRequests, Bukkit.getLogger()); // Leaves - we have our own bstats page
-+				Metrics metrics = new Metrics("Leaves", serverUUID, logFailedRequests, Bukkit.getLogger()); // Leaves - we have our own bstats page
+ 
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
-                     minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1);
+@@ -603,7 +603,7 @@ public class Metrics {
-@@ -603,7 +602,7 @@ public class Metrics {
  
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
                  metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
@@ -68,23 +71,23 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..94a0806037c7aa8f375deaf9527490a2
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3dded5c491ace6b073a7bc3178976bd70f0b9393..bee35a59b144774ad6d67ce86da8f7fa85ed5a14 100644
+index 481a5dbad82f3f8dd5b1bf8ab207d82ec73d5bbd..cfd0a619cf4a2757f537aa6fc554a4c799229637 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1651,7 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
 +        return "Leaves"; // Leaves - Leaves > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6d7f16fede01c19f638e1dcdae8b07b79cd86dc0..3a08ae262844788b69460ce5e795db4c2034aa3a 100644
+index ba7023e7ca5d29375ff53c2951892138d155f69f..561d321338d8d79f76ebd8babb62618419dfda9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -240,7 +240,7 @@ import javax.annotation.Nullable; // Paper
+@@ -254,7 +254,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -94,7 +97,7 @@ index 6d7f16fede01c19f638e1dcdae8b07b79cd86dc0..3a08ae262844788b69460ce5e795db4c
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c099de7d625144711bd720c4364949ead3f17f3e..d5495827f4b4b7d7b05d5e18a26ab5ca7a67546a 100644
+index 55bae3efbc630be6d40d415509de4c3e744a5004..5d36e1fe6fcb8faa70f07a2f50077a121ab3be7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -269,7 +269,7 @@ public class Main {
@@ -107,7 +110,7 @@ index c099de7d625144711bd720c4364949ead3f17f3e..d5495827f4b4b7d7b05d5e18a26ab5ca
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..941424b4025151b0b15ea0137a1689acb3fe290a 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..ca166161ef919c559de9cc02bdf435cbfcc972df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {

patches/server/0002-Update-version-fetcher-repo.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Update version fetcher repo
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 580bae0d414d371a07a6bfeefc41fdd989dc0083..f5d6cc340e56af41210630ca6ff168467c22f728 100644
+index ece77f5ea4b14bbed7c070131b3251ea86764538..dde1105ede055a17725a4c820ddb3a014f67f145 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -29,8 +29,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -19,7 +19,7 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..f5d6cc340e56af41210630ca6ff16846
          final Component history = getHistory();
  
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -54,14 +54,12 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -56,14 +56,12 @@ public class PaperVersionFetcher implements VersionFetcher {
  
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
          int distance;

patches/server/0003-Leaves-Server-Config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index cfe293881f68c8db337c3a48948362bb7b3e3522..23cb712f7dbeb446d3da9d4a5da251f287401c72 100644
+index 5e3b7fb2e0b7608610555cd23e7ad25a05883181..c419bf7d5bbc5ee1ad001040815de8c8f16f0547 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -228,7 +228,8 @@ public class TimingsExport extends Thread {
+@@ -227,7 +227,8 @@ public class TimingsExport extends Thread {
          parent.put("config", createObject(
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -19,10 +19,10 @@ index cfe293881f68c8db337c3a48948362bb7b3e3522..23cb712f7dbeb446d3da9d4a5da251f2
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bee35a59b144774ad6d67ce86da8f7fa85ed5a14..366e7a2ed858fcc1fb7ed56b52f00f2abc69a61d 100644
+index cfd0a619cf4a2757f537aa6fc554a4c799229637..97ca545b4a30893a1d403a8c3a94de564d850f2c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1140,7 +1140,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1216,7 +1216,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  String doneTime = String.format(java.util.Locale.ROOT, "%.3fs", (double) (Util.getNanos() - serverStartTime) / 1.0E9D);
                  LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
                  // Paper end
@@ -33,12 +33,12 @@ index bee35a59b144774ad6d67ce86da8f7fa85ed5a14..366e7a2ed858fcc1fb7ed56b52f00f2a
                  org.spigotmc.WatchdogThread.hasStarted = true; // Paper
                  Arrays.fill( recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..3d01b2c086b44ded3ea78c206e99b41bf634c07d 100644
+index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..eda9ce9953943996ca000d762e15b7e6d5f45825 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -223,6 +223,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -232,6 +232,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
+         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 +		
 +		top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
@@ -46,10 +46,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..3d01b2c086b44ded3ea78c206e99b41b
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 474078b68f1bf22037495f42bae59b790fd8cb46..2f0d2e338931d24c3062e844b771d5494c9d5ad4 100644
+index 4247dcb003626535dbb997f48ad9f61380bd17e9..9dc517509a3f7deaaa64343a26f52f66945017cb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
@@ -58,29 +58,27 @@ index 474078b68f1bf22037495f42bae59b790fd8cb46..2f0d2e338931d24c3062e844b771d549
  
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
-@@ -206,7 +208,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -311,6 +313,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
--        this.generator = gen;
++		this.leavesConfig = new top.leavesmc.leaves.LeavesConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Leaves - World Config
-+        this.leavesConfig = new top.leavesmc.leaves.LeavesConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Leaves - World Config
+         this.generator = gen;
-+		this.generator = gen;
+         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
-         this.world = new CraftWorld((ServerLevel) this, gen, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
-         this.ticksPerMonsterSpawns = this.getCraftServer().getTicksPerMonsterSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3a08ae262844788b69460ce5e795db4c2034aa3a..854816c2c115a1bf72ea5f23c8584bb7bb446fdd 100644
+index 561d321338d8d79f76ebd8babb62618419dfda9f..df90534c5ff5d61d04afbaab6b238e0101cb80c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -886,6 +886,7 @@ public final class CraftServer implements Server {
+@@ -952,6 +952,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
 +		top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
          for (ServerLevel world : this.console.getAllLevels()) {
-             world.serverLevelData.setDifficulty(config.difficulty);
+             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-             world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
+             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -920,6 +921,7 @@ public final class CraftServer implements Server {
+@@ -992,6 +993,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -88,7 +86,7 @@ index 3a08ae262844788b69460ce5e795db4c2034aa3a..854816c2c115a1bf72ea5f23c8584bb7
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2452,6 +2454,14 @@ public final class CraftServer implements Server {
+@@ -2661,6 +2663,14 @@ public final class CraftServer implements Server {
          {
              return com.destroystokyo.paper.PaperConfig.config;
          }
@@ -104,13 +102,14 @@ index 3a08ae262844788b69460ce5e795db4c2034aa3a..854816c2c115a1bf72ea5f23c8584bb7
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d5495827f4b4b7d7b05d5e18a26ab5ca7a67546a..3370e8771564d2656b9dd5004f98a202253f6073 100644
+index 5d36e1fe6fcb8faa70f07a2f50077a121ab3be7f..58e21a1b8987b1668bedbad251254b602b49b1d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -147,6 +147,14 @@ public class Main {
+@@ -145,6 +145,14 @@ public class Main {
+                         .ofType(File.class)
+                         .defaultsTo(new File("paper.yml"))
                          .describedAs("Yml file");
-                 // Paper end
++						
- 
 +				// Leaves start - Server Config
 +				acceptsAll(asList("leaves", "leaves-settings"), "File for leaves settings")
 +                        .withRequiredArg()
@@ -118,9 +117,8 @@ index d5495827f4b4b7d7b05d5e18a26ab5ca7a67546a..3370e8771564d2656b9dd5004f98a202
 +                        .defaultsTo(new File("leaves.yml"))
 +                        .describedAs("Yml file");
 +				// Leaves end - Server Config
-+				
+ 
-                 // Paper start
+                 acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
-                 acceptsAll(asList("server-name"), "Name of the server")
                          .withRequiredArg()
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 new file mode 100644

patches/server/0003-MC-Dev-Fix.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Wed, 27 Oct 2021 20:46:44 +0800
-Subject: [PATCH] MC Dev Fix
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-index 75c1c4671fedb425dea20dc4fb0c6cb2304dee83..1e378d566721192b0c8711dacd3549737549087f 100644
---- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-@@ -30,7 +30,7 @@ public class PoiSection {
-     private boolean isValid;
- 
-     public static Codec<PoiSection> codec(Runnable updateListener) {
--        return RecordCodecBuilder.create((instance) -> {
-+        return RecordCodecBuilder.<PoiSection>create((instance) -> { // Leaves - dev fix
-             return instance.group(RecordCodecBuilder.point(updateListener), Codec.BOOL.optionalFieldOf("Valid", Boolean.valueOf(false)).forGetter((poiSet) -> {
-                 return poiSet.isValid;
-             }), PoiRecord.codec(updateListener).listOf().fieldOf("Records").forGetter((poiSet) -> {

patches/server/0004-Fix-gravity-block-duper.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 895c8d8c676bfd3e11cd8371b2ac115b6a2e52b4..f87ecc86046d8cc410a271c29651c56a68c2daec 100644
+index 8ea81f6ac7503c68f0aea34802843bc545f46db0..1e291f1d36253a35ec480e6465b64fa23e378ab8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -361,36 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -388,36 +388,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+         return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
      // Paper end - optimise entity tracking
- 
 -    // Paper start - make end portalling safe
 -    public BlockPos portalBlock;
 -    public ServerLevel portalWorld;
@@ -28,8 +28,8 @@ index 895c8d8c676bfd3e11cd8371b2ac115b6a2e52b4..f87ecc86046d8cc410a271c29651c56a
 -        if (this.isPassenger() || this.isVehicle() || !this.canChangeDimensions() || this.isRemoved() || !this.valid || !this.isAlive()) {
 -            return;
 -        }
--
+ 
--        ResourceKey<Level> resourcekey = world.getTypeKey() == DimensionType.END_LOCATION ? Level.OVERWORLD : Level.END; // CraftBukkit - SPIGOT-6152: send back to main overworld in custom ends
+-        ResourceKey<Level> resourcekey = world.getTypeKey() == LevelStem.END ? Level.OVERWORLD : Level.END; // CraftBukkit - SPIGOT-6152: send back to main overworld in custom ends
 -        ServerLevel worldserver = world.getServer().getLevel(resourcekey);
 -
 -        org.bukkit.event.entity.EntityPortalEnterEvent event = new org.bukkit.event.entity.EntityPortalEnterEvent(this.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
@@ -42,44 +42,24 @@ index 895c8d8c676bfd3e11cd8371b2ac115b6a2e52b4..f87ecc86046d8cc410a271c29651c56a
 -        this.teleportTo(worldserver, null);
 -    }
 -    // Paper end - make end portalling safe
-+    // Leaves - fix gravity block duper
++	// Leaves - fix gravity block duper
  
-     public Entity(EntityType<?> type, Level world) {
+     // Paper start
-         this.id = Entity.ENTITY_COUNTER.incrementAndGet();
+     /**
-@@ -2542,7 +2513,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2746,7 +2718,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              }
  
              this.processPortalCooldown();
 -            this.tickEndPortal(); // Paper - make end portalling safe
-+            // Leaves - fix gravity block duper
++			// Leaves - fix gravity block duper
          }
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..31744a9c550c9fa36d456235701d5dad121e1ffa 100644
+index 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..ef147a7dc3d233e33435d94e238619e749f9704d 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -1,7 +1,5 @@
+@@ -110,11 +110,7 @@ public class FallingBlockEntity extends Entity {
- package net.minecraft.world.entity.item;
- 
--import java.util.Iterator;
--import java.util.function.Predicate;
- import net.minecraft.CrashReportCategory;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
-@@ -43,7 +41,10 @@ import net.minecraft.world.level.material.Fluids;
- import net.minecraft.world.phys.BlockHitResult;
- import net.minecraft.world.phys.HitResult;
- import net.minecraft.world.phys.Vec3;
--import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
-+import org.bukkit.craftbukkit.event.CraftEventFactory;
-+
-+import java.util.Iterator;
-+import java.util.function.Predicate;
- 
- public class FallingBlockEntity extends Entity {
- 
-@@ -106,11 +107,7 @@ public class FallingBlockEntity extends Entity {
  
      @Override
      public void tick() {
@@ -88,11 +68,11 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..31744a9c550c9fa36d456235701d5dad
 -            return;
 -        }
 -        // Paper end - fix sand duping
-+        // Leaves - fix gravity block duper
++		// Leaves - fix gravity block duper
          if (this.blockState.isAir()) {
              this.discard();
-         } else {
+         } else if (this.level.isClientSide && this.removeAtMillis > 0L) {
-@@ -143,11 +140,7 @@ public class FallingBlockEntity extends Entity {
+@@ -152,11 +148,7 @@ public class FallingBlockEntity extends Entity {
  
              this.move(MoverType.SELF, this.getDeltaMovement());
  
@@ -101,31 +81,15 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..31744a9c550c9fa36d456235701d5dad
 -                return;
 -            }
 -            // Paper end - fix sand duping
-+            // Leaves - fix gravity block duper
++			// Leaves - fix gravity block duper
  
              // Paper start - Configurable EntityFallingBlock height nerf
              if (this.level.paperConfig.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig.fallingBlockHeightNerf) {
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 62c2f947a77570228dfdf4dae16c64eb97ee2f40..9b84c84e2427bc5584fd0ddb94321776d6831957 100644
+index 19892cb3cb290add4f094dc87bb22106e4f07a24..e2172172019af22b3474456b6d6cc6bd3ff4351a 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -1,6 +1,5 @@
+@@ -53,12 +53,19 @@ public class EndPortalBlock extends BaseEntityBlock {
- package net.minecraft.world.level.block;
- 
--import java.util.Random;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.particles.ParticleTypes;
- import net.minecraft.resources.ResourceKey;
-@@ -22,6 +21,8 @@ import net.minecraft.world.phys.shapes.Shapes;
- import net.minecraft.world.phys.shapes.VoxelShape;
- import org.bukkit.event.entity.EntityPortalEnterEvent;
- import org.bukkit.event.player.PlayerTeleportEvent;
-+
-+import java.util.Random;
- // CraftBukkit end
- 
- public class EndPortalBlock extends BaseEntityBlock {
-@@ -53,10 +54,18 @@ public class EndPortalBlock extends BaseEntityBlock {
                  // return; // CraftBukkit - always fire event in case plugins wish to change it
              }
  
@@ -133,11 +97,12 @@ index 62c2f947a77570228dfdf4dae16c64eb97ee2f40..9b84c84e2427bc5584fd0ddb94321776
 -            entity.portalWorld = ((ServerLevel)world);
 -            entity.portalBlock = pos.immutable();
 -            // Paper end - move all of this logic into portal tick
+-        }
 +            // Leaves start - fix gravity block duper
 +            // CraftBukkit start - Entity in portal
 +            EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
 +            world.getCraftServer().getPluginManager().callEvent(event);
-+
+ 
 +            if (entity instanceof ServerPlayer) {
 +                ((ServerPlayer) entity).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
 +                return;
@@ -145,6 +110,7 @@ index 62c2f947a77570228dfdf4dae16c64eb97ee2f40..9b84c84e2427bc5584fd0ddb94321776
 +            // CraftBukkit end
 +            entity.changeDimension(worldserver);
 +            // Leaves end - fix gravity block duper
-         }
++        }
- 
      }
+ 
+     @Override

patches/server/0006-Support-Java16.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Sun, 31 Oct 2021 09:33:38 +0800
-Subject: [PATCH] Support Java16+
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3370e8771564d2656b9dd5004f98a202253f6073..fb03995b2c2d94779a9ea8d5faed82adb71e78cb 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -231,8 +231,7 @@ public class Main {
-                 return;
-             }
-             if (javaVersion > 60.0) {
--                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 16 is supported.");
--                if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
-+                System.err.println("Unsupported Java detected (" + javaVersion + "). "); // Leaves - support Java16+
-             }
- 
-             try {

scripts/apply.sh

@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-# get base dir regardless of execution location
-# resolve shell-specifics
-case "$(echo "$SHELL" | sed -E 's|/usr(/local)?||g')" in
-    "/bin/zsh")
-        RCPATH="$HOME/.zshrc"
-        SOURCE="${BASH_SOURCE[0]:-${(%):-%N}}"
-    ;;
-    *)
-        RCPATH="$HOME/.bashrc"
-        if [[ -f "$HOME/.bash_aliases" ]]; then
-            RCPATH="$HOME/.bash_aliases"
-        fi
-        SOURCE="${BASH_SOURCE[0]}"
-    ;;
-esac
-
-# get base dir regardless of execution location
-
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-PS1="$"
-
-paperVer=$(cat current-paper)
-gpgsign="$(git config commit.gpgsign || echo "false")"
-echo "Rebuilding Forked projects.... "
-function applyPatch {
-    what=$1
-    what_name=$(basename $what)
-    target=$2
-    branch=$3
-    patch_folder=$4
-
-    cd "$basedir/$what"
-    git fetch --all
-    git branch -f upstream "$branch" >/dev/null
-
-    cd "$basedir"
-    if [ ! -d  "$basedir/$target" ]; then
-        mkdir "$basedir/$target"
-        cd "$basedir/$target"
-        git init
-        git remote add origin "$5"
-        cd "$basedir"
-    fi
-    cd "$basedir/$target"
-
-    # Disable GPG signing before AM, slows things down and doesn't play nicely.
-    # There is also zero rational or logical reason to do so for these sub-repo AMs.
-    # Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
-    git config commit.gpgsign false
-
-    echo "Resetting $target to $what_name..."
-    git remote rm upstream > /dev/null 2>&1
-    git remote add upstream "$basedir/$what" >/dev/null 2>&1
-    git checkout master 2>/dev/null || git checkout -b master
-    git fetch upstream >/dev/null 2>&1
-    git reset --hard upstream/upstream
-    echo "  Applying patches to $target..."
-    git am --abort >/dev/null 2>&1
-    git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
-    if [ "$?" != "0" ]; then
-        echo "  Something did not apply cleanly to $target."
-        echo "  Please review above details and finish the apply then"
-        echo "  save the changes with rebuildPatches.sh"
-        exit 1
-    else
-        echo "  Patches applied cleanly to $target"
-    fi
-}
-
-function enableCommitSigningIfNeeded {
-    if [[ "$gpgsign" == "true" ]]; then
-        git config commit.gpgsign true
-    fi
-}
-
-    echo "Importing MC-DEV"
-    ./scripts/importmcdev.sh "$basedir" || exit 1
-(
-    (applyPatch Paper/Paper-API ${FORK_NAME}-API HEAD api $API_REPO &&
-    applyPatch Paper/Paper-Server ${FORK_NAME}-Server HEAD server $SERVER_REPO) || exit 1
-    enableCommitSigningIfNeeded
-) || (
-    echo "Failed to apply patches"
-    enableCommitSigningIfNeeded
-    exit 1
-) || exit 1

scripts/generatesources.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-
-
-cd $basedir
-paperVer=$(cat current-paper)
-
-minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-decompile="Paper/work/Minecraft/$minecraftversion/spigot"
-
-mkdir -p mc-dev/src/net/minecraft
-
-cd mc-dev
-if [ ! -d ".git" ]; then
-    git init
-fi
-
-rm src/net/minecraft/*.java
-cp -r $basedir/$decompile/net/minecraft/* src/net/minecraft
-
-base="$basedir/Paper/Paper-Server/src/main/java/net/minecraft"
-cd $basedir/mc-dev/src/net/minecraft/
-for file in $(/bin/ls $base)
-do
-    if [ -f "$file" ]; then
-        rm -f "$file"
-    fi
-done
-cd $basedir/mc-dev
-git add . -A
-git commit . -m "mc-dev"
-git tag -a "$paperVer" -m "$paperVer" 2>/dev/null
-pushRepo . $MCDEV_REPO $paperVer

scripts/importmcdev.sh

@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-
-workdir="$basedir"/Paper/work
-minecraftversion=$(cat "$basedir"/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-decompiledir=$workdir/Minecraft/$minecraftversion/spigot
-
-nms="net/minecraft"
-export MODLOG=""
-cd "$basedir"
-
-function containsElement {
-    local e
-    for e in "${@:2}"; do
-        [[ "$e" == "$1" ]] && return 0;
-    done
-    return 1
-}
-
-export importedmcdev=""
-function import {
-    if [ -f "$basedir/Paper/Paper-Server/src/main/java/$nms/$1.java" ]; then
-        echo "ALREADY IMPORTED $1"
-        return 0
-    fi
-    export importedmcdev="$importedmcdev $1"
-    file="${1}.java"
-    target="$basedir/Paper/Paper-Server/src/main/java/$nms/$file"
-    base="$decompiledir/$nms/$file"
-
-    if [[ ! -f "$target" ]]; then
-        export MODLOG="$MODLOG  Imported $file from mc-dev\n";
-        mkdir -p "$(dirname "$target")"
-        echo "$(bashColor 1 32) Copying $(bashColor 1 34)$base $(bashColor 1 32)to$(bashColor 1 34) $target $(bashColorReset)"
-        cp "$base" "$target"
-    else
-        echo "$(bashColor 1 33) UN-NEEDED IMPORT STATEMENT:$(bashColor 1 34) $file $(bashColorReset)"
-    fi
-}
-
-function importLibrary {
-    group=$1
-    lib=$2
-    prefix=$3
-    shift 3
-    for file in "$@"; do
-        file="$prefix/$file"
-        target="$basedir/Paper/Paper-Server/src/main/java/$file"
-        targetdir=$(dirname "$target")
-        mkdir -p "${targetdir}"
-        base="$workdir/Minecraft/$minecraftversion/libraries/${group}/${lib}/$file"
-        if [ ! -f "$base" ]; then
-            echo "Missing $base"
-            exit 1
-        fi
-        export MODLOG="$MODLOG  Imported $file from $lib\n";
-        sed 's/\r$//' "$base" > "$target" || exit 1
-    done
-}
-
-(
-    cd Paper/Paper-Server/
-    lastlog=$(git log -1 --oneline)
-    if [[ "$lastlog" = *"Leaves-Extra mc-dev Imports"* ]]; then
-        git reset --hard HEAD^
-    fi
-)
-
-
-files=$(cat patches/server/* | grep "+++ b/src/main/java/net/minecraft/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\///g')
-
-nonnms=$(grep -R "new file mode" -B 1 "$basedir/patches/server/" | grep -v "new file mode" | grep -oE --color=none "net\/minecraft\/.*.java" | sed 's/.*\/net\/minecraft\///g')
-
-for f in $files; do
-    containsElement "$f" ${nonnms[@]}
-    if [ "$?" == "1" ]; then
-        if [ ! -f "$basedir/Paper/Paper-Server/src/main/java/net/minecraft/$f" ]; then
-            f="$(echo "$f" | sed 's/.java//g')"
-            if [ ! -f "$decompiledir/$nms/$f.java" ]; then
-                echo "$(bashColor 1 31) ERROR!!! Missing NMS$(bashColor 1 34) $f $(bashColorReset)";
-                error=true
-            else
-                import $f
-            fi
-        fi
-    fi
-done
-if [ -n "$error" ]; then
-  exit 1
-fi
-
-###############################################################################################
-###############################################################################################
-#################### ADD TEMPORARY ADDITIONS HERE #############################################
-###############################################################################################
-###############################################################################################
-
-# import Foo
-
-########################################################
-########################################################
-########################################################
-#              LIBRARY IMPORTS
-# These must always be mapped manually, no automatic stuff
-#
-#             # group    # lib          # prefix               # many files
-
-#importLibrary com.mojang datafixerupper com/mojang/datafixers/util Either.java
-importLibrary com.mojang brigadier  com/mojang/brigadier CommandDispatcher.java
-importLibrary com.mojang brigadier  com/mojang/brigadier/tree LiteralCommandNode.java
-importLibrary com.mojang brigadier  com/mojang/brigadier/suggestion SuggestionsBuilder.java
-importLibrary com.mojang brigadier  com/mojang/brigadier/arguments BoolArgumentType.java
-################
-(
-    cd Paper/Paper-Server/
-    rm -rf nms-patches
-    git add src -A
-    echo -e "Leaves-Extra mc-dev Imports\n\n$MODLOG" | git commit src -F -
-    exit 0
-)

scripts/init.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-# BEGIN config
-FORK_NAME="Leaves"
-API_REPO=""
-SERVER_REPO=""
-PAPER_API_REPO=""
-PAPER_SERVER_REPO=""
-MCDEV_REPO=""
-# END config
-
-sourceBase=$(dirname $SOURCE)/../
-cd "${basedir:-$sourceBase}"
-
-basedir=$(pwd -P)
-cd -
-
-
-function bashColor {
-if [ $2 ]; then
-    echo -e "\e[$1;$2m"
-else
-    echo -e "\e[$1m"
-fi
-}
-function bashColorReset {
-    echo -e "\e[m"
-}
-
-function cleanupPatches {
-    cd "$1"
-    for patch in *.patch; do
-        gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
-        diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index|Date\: )")
-
-        testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
-        if [ "x$testver" != "x" ]; then
-            diffs=$(echo "$diffs" | tail -n +3)
-        fi
-
-        if [ "x$diffs" == "x" ] ; then
-            git reset HEAD $patch >/dev/null
-            git checkout -- $patch >/dev/null
-        fi
-    done
-}
-function pushRepo {
-    if [ "$(git config minecraft.push-${FORK_NAME})" == "1" ]; then
-    echo "Pushing - $1 ($3) to $2"
-    (
-        cd "$1"
-        git remote rm emc-push > /dev/null 2>&1
-        git remote add emc-push $2 >/dev/null 2>&1
-        git push emc-push $3 -f
-    )
-    fi
-}
-function basedir {
-    cd "$basedir"
-}
-function gethead {
-    (
-        cd "$1"
-        git log -1 --oneline
-    )
-}

scripts/paperclip.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Copied from https://github.com/PaperMC/Paper/blob/d54ce6c17fb7a35238d6b9f734d30a4289886773/scripts/paperclip.sh
-# License from Paper applies to this file
-
-(
-set -e
-basedir="$(cd "$1" && pwd -P)"
-workdir="$basedir/Paper/work"
-mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-paperjar="$basedir/Leaves-Server/target/leaves-$mcver.jar"
-vanillajar="$workdir/Minecraft/$mcver/$mcver.jar"
-
-(
-    cd "$workdir/Paperclip"
-    mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar"
-)
-cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/leaves-paperclip.jar"
-
-echo ""
-echo ""
-echo ""
-echo "Build success!"
-echo "Copied final jar to $(cd "$basedir" && pwd -P)/leaves-paperclip.jar"
-) || exit 1

scripts/push.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# get base dir regardless of execution location
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-
-minecraftversion=$(cat $basedir/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-
-basedir
-pushRepo ${FORK_NAME}-API $API_REPO master:$minecraftversion
-pushRepo ${FORK_NAME}-Server $SERVER_REPO master:$minecraftversion

scripts/rebuildpatches.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# get base dir regardless of execution location
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-
-PS1="$"
-echo "Rebuilding patch files from current fork state..."
-function savePatches {
-    what=$1
-    cd $basedir/$what/
-
-    mkdir -p $basedir/patches/$2
-    if [ -d ".git/rebase-apply" ]; then
-        # in middle of a rebase, be smarter
-        echo "REBASE DETECTED - PARTIAL SAVE"
-        last=$(cat ".git/rebase-apply/last")
-        next=$(cat ".git/rebase-apply/next")
-        declare -a files=("$basedir/patches/$2/"*.patch)
-        for i in $(seq -f "%04g" 1 1 $last)
-        do
-            if [ $i -lt $next ]; then
-                rm "${files[`expr $i - 1`]}"
-            fi
-        done
-    else
-        rm $basedir/patches/$2/*.patch
-    fi
-
-    git format-patch --no-signature --zero-commit --full-index --no-stat -N -o $basedir/patches/$2 upstream/upstream
-    cd $basedir
-    git add -A $basedir/patches/$2
-    echo "  Patches saved for $what to patches/$2"
-}
-
-savePatches ${FORK_NAME}-API api
-savePatches ${FORK_NAME}-Server server
-
-$basedir/scripts/push.sh

scripts/upstream.sh

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-# get base dir regardless of execution location
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-. $(dirname $SOURCE)/init.sh
-
-git submodule update --init --recursive
-
-if [[ "$1" == up* ]]; then
-    (
-        cd "$basedir/Paper/"
-        git fetch origin master && git reset --hard origin/master
-        cd ../
-        git add Paper
-    )
-fi
-
-paperVer=$(gethead Paper)
-cd "$basedir/Paper/"
-
-./paper patch
-
-cd "Paper-Server"
-mcVer=$(mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')
-
-basedir
-. "$basedir"/scripts/importmcdev.sh
-
-minecraftversion=$(cat "$basedir"/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
-version=$(echo -e "Paper: $paperVer\nmc-dev:$importedmcdev")
-tag="${minecraftversion}-${mcVer}-$(echo -e $version | shasum | awk '{print $1}')"
-echo "$tag" > "$basedir"/current-paper
-
-"$basedir"/scripts/generatesources.sh
-
-cd Paper/
-
-function tag {
-(
-    cd $1
-    if [ "$2" == "1" ]; then
-        git tag -d "$tag" 2>/dev/null
-    fi
-    echo -e "$(date)\n\n$version" | git tag -a "$tag" -F - 2>/dev/null
-)
-}
-echo "Tagging as $tag"
-echo -e "$version"
-
-forcetag=0
-if [ "$(cat "$basedir"/current-paper)" != "$tag" ]; then
-    forcetag=1
-fi
-
-tag Paper-API $forcetag
-tag Paper-Server $forcetag
-
-pushRepo Paper-API $PAPER_API_REPO $tag
-pushRepo Paper-Server $PAPER_SERVER_REPO $tag
-

scripts/upstreamCommit.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-(
-set -e
-PS1="$"
-
-function changelog() {
-    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
-    cd $1 && git log --oneline ${base}...HEAD
-}
-paper=$(changelog Paper)
-
-updated=""
-logsuffix=""
-if [ ! -z "$paper" ]; then
-    logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
-    if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
-fi
-disclaimer="Upstream has released updates that appears to apply and compile correctly"
-
-if [ ! -z "$1" ]; then
-    disclaimer="$@"
-fi
-
-log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
-
-echo -e "$log" | git commit -F -
-
-) || exit 1

settings.gradle.kts

@@ -7,4 +7,4 @@ pluginManagement {
 
 rootProject.name = "Leaves"
 
-include("Leaves-API", "Leaves-Server")
+include("leaves-api", "leaves-server")