Began eco 5.0.0 rework

CONTRIBUTING.md

@@ -1,29 +1,37 @@
 # How to contribute to EcoEnchants
 
 ## Codestyle
+
 1. The EcoEnchants checkstyle is in /config/checkstyle.xml
+
 - The pull request must not have any checkstyle issues.
 - Every method and field must have a javadoc attached.
 
 2. Use lombok wherever possible.
+
 - As of 6.0.0, EcoEnchants is now built with lombok.
 - @Getter, @Setter, @ToString, @EqualsAndHashCode, @UtilityClass are the most important.
 
 3. Use JetBrains annotations
+
 - Every parameter should be annotated with @NotNull or @Nullable
 - Use @NotNull over lombok @NonNull
 
 4. Imports
+
 - No group (*) imports.
 - No static imports.
 
 ## Dependency Injection
+
 - EcoEnchants uses Dependency Injection since 6.0.0.
 - Any calls to AbstractEcoPlugin#getInstance are code smells and should never be used unless **absolutely necessary**.
 - NamespacedKeys, FixedMetadataValues, Runnables, and Schedules should be managed using EcoEnchantsPlugin through DI.
-- Any DI class should extend PluginDependent where possible. If the class extends another, then you **must** store the plugin instance in a private final variable called **plugin** with a private or protected getter.
+- Any DI class should extend PluginDependent where possible. If the class extends another, then you **must** store the
+  plugin instance in a private final variable called **plugin** with a private or protected getter.
 
 ## Other
+
 - All drops **must** be sent through a DropQueue - calls to World#dropItem will get your PR rejected.
 - EcoEnchants is built with java 8. Usage of J9+ will get your PR rejected.
 - Any non-plugin-specific changes **must** be made to eco-util, or core-proxy, rather than core-plugin.

LICENSE.md

@@ -2,71 +2,52 @@
                        Version 3, 29 June 2007
 
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-of this license document, but changing it is not allowed.
 
                             Preamble
 
-The GNU General Public License is a free, copyleft license for
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
-software and other kinds of works.
 
-The licenses for most software and other practical works are designed
+The licenses for most software and other practical works are designed to take away your freedom to share and change the
-to take away your freedom to share and change the works.  By contrast,
+works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all
-the GNU General Public License is intended to guarantee your freedom to
+versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use
-share and change all versions of a program--to make sure it remains free
+the GNU General Public License for most of our software; it applies also to any other work released this way by its
-software for all its users.  We, the Free Software Foundation, use the
+authors. You can apply it to your programs, too.
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
 
-When we speak of free software, we are referring to freedom, not
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make
-price.  Our General Public Licenses are designed to make sure that you
+sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive
-have the freedom to distribute copies of free software (and charge for
+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
-them if you wish), that you receive source code or can get it if you
+that you know you can do these things.
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
 
-To protect your rights, we need to prevent others from denying you
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights.
-these rights or asking you to surrender the rights.  Therefore, you have
+Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it:
-certain responsibilities if you distribute copies of the software, or if
+responsibilities to respect the freedom of others.
-you modify it: responsibilities to respect the freedom of others.
 
-For example, if you distribute copies of such a program, whether
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients
-gratis or for a fee, you must pass on to the recipients the same
+the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must
-freedoms that you received.  You must make sure that they, too, receive
+show them these terms so they know their rights.
-or can get the source code.  And you must show them these terms so they
-know their rights.
 
 Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
+(1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute
-giving you legal permission to copy, distribute and/or modify it.
+and/or modify it.
 
-For the developers' and authors' protection, the GPL clearly explains
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software.
-that there is no warranty for this free software.  For both users' and
+For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems
-authors' sake, the GPL requires that modified versions be marked as
+will not be attributed erroneously to authors of previous versions.
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
 
-Some devices are designed to deny users access to install or run
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although
-modified versions of the software inside them, although the manufacturer
+the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the
-can do so.  This is fundamentally incompatible with the aim of
+software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely
-protecting users' freedom to change the software.  The systematic
+where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those
-pattern of such abuse occurs in the area of products for individuals to
+products. If such problems arise substantially in other domains, we stand ready to extend this provision to those
-use, which is precisely where it is most unacceptable.  Therefore, we
+domains in future versions of the GPL, as needed to protect the freedom of users.
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
 
-Finally, every program is threatened constantly by software patents.
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict
-States should not allow patents to restrict development and use of
+development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger
-software on general-purpose computers, but in those that do, we wish to
+that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
 
-The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and modification follow.
-modification follow.
 
                        TERMS AND CONDITIONS
 
@@ -74,142 +55,106 @@ modification follow.
 
 "This License" refers to version 3 of the GNU General Public License.
 
-"Copyright" also means copyright-like laws that apply to other kinds of
+"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-works, such as semiconductor masks.
 
-"The Program" refers to any copyrightable work licensed under this
+"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you".  "
-License.  Each licensee is addressed as "you".  "Licensees" and
+Licensees" and
 "recipients" may be individuals or organizations.
 
-To "modify" a work means to copy from or adapt all or part of the work
+To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission,
-in a fashion requiring copyright permission, other than the making of an
+other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a
-exact copy.  The resulting work is called a "modified version" of the
+work "based on" the earlier work.
-earlier work or a work "based on" the earlier work.
 
-A "covered work" means either the unmodified Program or a work based
+A "covered work" means either the unmodified Program or a work based on the Program.
-on the Program.
 
-To "propagate" a work means to do anything with it that, without
+To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily
-permission, would make you directly or secondarily liable for
+liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy.
-infringement under applicable copyright law, except executing it on a
+Propagation includes copying, distribution (with or without modification), making available to the public, and in some
-computer or modifying a private copy.  Propagation includes copying,
+countries other activities as well.
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
 
-To "convey" a work means any kind of propagation that enables other
+To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction
-parties to make or receive copies.  Mere interaction with a user through
+with a user through a computer network, with no transfer of a copy, is not conveying.
-a computer network, with no transfer of a copy, is not conveying.
 
 An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
+to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright
-feature that (1) displays an appropriate copyright notice, and (2)
+notice, and (2)
-tells the user that there is no warranty for the work (except to the
+tells the user that there is no warranty for the work (except to the extent that warranties are provided), that
-extent that warranties are provided), that licensees may convey the
+licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a
-work under this License, and how to view a copy of this License.  If
+list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
 
 1. Source Code.
 
-The "source code" for a work means the preferred form of the work
+The "source code" for a work means the preferred form of the work for making modifications to it.  "Object code" means
-for making modifications to it.  "Object code" means any non-source
+any non-source form of a work.
-form of a work.
 
-A "Standard Interface" means an interface that either is an official
+A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body,
-standard defined by a recognized standards body, or, in the case of
+or, in the case of interfaces specified for a particular programming language, one that is widely used among developers
-interfaces specified for a particular programming language, one that
+working in that language.
-is widely used among developers working in that language.
 
-The "System Libraries" of an executable work include anything, other
+The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in
-than the work as a whole, that (a) is included in the normal form of
+the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to
-packaging a Major Component, but which is not part of that Major
+enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is
-Component, and (b) serves only to enable use of the work with that
+available to the public in source code form. A
-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
+(if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used
-produce the work, or an object code interpreter used to run it.
+to run it.
 
-The "Corresponding Source" for a work in object code form means all
+The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (
-the source code needed to generate, install, and (for an executable
+for an executable work) run the object code and to modify the work, including scripts to control those activities.
-work) run the object code and to modify the work, including scripts to
+However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs
-control those activities.  However, it does not include the work's
+which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding
-System Libraries, or general-purpose tools or generally available free
+Source includes interface definition files associated with source files for the work, and the source code for shared
-programs which are used unmodified in performing those activities but
+libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data
-which are not part of the work.  For example, Corresponding Source
+communication or control flow between those subprograms and other parts of the work.
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
 
-The Corresponding Source need not include anything that users
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the
-can regenerate automatically from other parts of the Corresponding
+Corresponding Source.
-Source.
 
-The Corresponding Source for a work in source code form is that
+The Corresponding Source for a work in source code form is that same work.
-same work.
 
 2. Basic Permissions.
 
-All rights granted under this License are granted for the term of
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided
-copyright on the Program, and are irrevocable provided the stated
+the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program.
-conditions are met.  This License explicitly affirms your unlimited
+The output from running a covered work is covered by this License only if the output, given its content, constitutes a
-permission to run the unmodified Program.  The output from running a
+covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
 
-You may make, run and propagate covered works that you do not
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license
-convey, without conditions so long as your license otherwise remains
+otherwise remains in force. You may convey covered works to others for the sole purpose of having them make
-in force.  You may convey covered works to others for the sole purpose
+modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with
-of having them make modifications exclusively for you, or provide you
+the terms of this License in conveying all material for which you do not control copyright. Those thus making or running
-with facilities for running those works, provided that you comply with
+the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that
-the terms of this License in conveying all material for which you do
+prohibit them from making any copies of your copyrighted material outside their relationship with you.
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
 
-Conveying under any other circumstances is permitted solely under
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not
-the conditions stated below.  Sublicensing is not allowed; section 10
+allowed; section 10 makes it unnecessary.
-makes it unnecessary.
 
 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-No covered work shall be deemed part of an effective technological
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling
-measure under any applicable law fulfilling obligations under article
+obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+restricting circumvention of such measures.
-similar laws prohibiting or restricting circumvention of such
-measures.
 
-When you convey a covered work, you waive any legal power to forbid
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the
-circumvention of technological measures to the extent such circumvention
+extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you
-is effected by exercising rights under this License with respect to
+disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users,
-the covered work, and you disclaim any intention to limit operation or
+your or third parties' legal rights to forbid circumvention of technological measures.
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
 
 4. Conveying Verbatim Copies.
 
-You may convey verbatim copies of the Program's source code as you
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you
-receive it, in any medium, provided that you conspicuously and
+conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating
-appropriately publish on each copy an appropriate copyright notice;
+that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices
-keep intact all notices stating that this License and any
+of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-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,
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for
-and you may offer support or warranty protection for a fee.
+a fee.
 
 5. Conveying Modified Source Versions.
 
-You may convey a work based on the Program, or the modifications to
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source
-produce it from the Program, in the form of source code under the
+code under the terms of section 4, provided that you also meet all of these conditions:
-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.
@@ -232,22 +177,17 @@ terms of section 4, provided that you also meet all of these conditions:
     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
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of
-works, which are not by their nature extensions of the covered work,
+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
-and which are not combined with it such as to form a larger program,
+distribution medium, is called an
-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
-"aggregate" if the compilation and its resulting copyright are not
+compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause
-used to limit the access or legal rights of the compilation's users
+this License to apply to the other parts of the aggregate.
-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
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the
-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:
-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
@@ -290,77 +230,55 @@ in one of these ways:
     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
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library,
-from the Corresponding Source as a System Library, need not be
+need not be included in conveying the object code work.
-included in conveying the object code work.
 
-A "User Product" is either (1) a "consumer product", which means any
+A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used
-tangible personal property which is normally used for personal, family,
+for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In
-or household purposes, or (2) anything designed or sold for incorporation
+determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a
-into a dwelling.  In determining whether a product is a consumer product,
+particular product received by a particular user, "normally used" refers to a typical or common use of that class of
-doubtful cases shall be resolved in favor of coverage.  For a particular
+product, regardless of the status of the particular user or of the way in which the particular user actually uses, or
-product received by a particular user, "normally used" refers to a
+expects or is expected to use, the product. A product is a consumer product regardless of whether the product has
-typical or common use of that class of product, regardless of the status
+substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of
-of the particular user or of the way in which the particular user
+the product.
-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,
+"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information
-procedures, authorization keys, or other information required to install
+required to install and execute modified versions of a covered work in that User Product from a modified version of its
-and execute modified versions of a covered work in that User Product from
+Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code
-a modified version of its Corresponding Source.  The information must
+is in no case prevented or interfered with solely because modification has been made.
-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
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the
-specifically for use in, a User Product, and the conveying occurs as
+conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to
-part of a transaction in which the right of possession and use of the
+the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding
-User Product is transferred to the recipient in perpetuity or for a
+Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not
-fixed term (regardless of how the transaction is characterized), the
+apply if neither you nor any third party retains the ability to install modified object code on the User Product (for
-Corresponding Source conveyed under this section must be accompanied
+example, the work has been installed in ROM).
-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
+The requirement to provide Installation Information does not include a requirement to continue to provide support
-requirement to continue to provide support service, warranty, or updates
+service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product
-for a work that has been modified or installed by the recipient, or for
+in which it has been modified or installed. Access to a network may be denied when the modification itself materially
-the User Product in which it has been modified or installed.  Access to a
+and adversely affects the operation of the network or violates the rules and protocols for communication across the
-network may be denied when the modification itself materially and
+network.
-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,
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format
-in accord with this section must be in a format that is publicly
+that is publicly documented (and with an implementation available to the public in source code form), and must require
-documented (and with an implementation available to the public in
+no special password or key for unpacking, reading or copying.
-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
+"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of
-License by making exceptions from one or more of its conditions.
+its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were
-Additional permissions that are applicable to the entire Program shall
+included in this License, to the extent that they are valid under applicable law. If additional permissions apply only
-be treated as though they were included in this License, to the extent
+to part of the Program, that part may be used separately under those permissions, but the entire Program remains
-that they are valid under applicable law.  If additional permissions
+governed by this License without regard to the 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
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or
-remove any additional permissions from that copy, or from any part of
+from any part of it.  (Additional permissions may be written to require their own removal in certain cases when you
-it.  (Additional permissions may be written to require their own
+modify the work.)  You may place additional permissions on material, added by you to a covered work, for which you have
-removal in certain cases when you modify the work.)  You may place
+or can give appropriate copyright permission.
-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
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by
-add to a covered work, you may (if authorized by the copyright holders of
+the copyright holders of that material) supplement the terms of this License with terms:
-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
@@ -385,251 +303,182 @@ that material) supplement the terms of this License with terms:
     any liability that these contractual assumptions directly impose on
     those licensors and authors.
 
-All other non-permissive additional terms are considered "further
+All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the
-restrictions" within the meaning of section 10.  If the Program as you
+Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with
-received it, or any part of it, contains a notice stating that it is
+a term that is a further restriction, you may remove that term. If a license document contains a further restriction but
-governed by this License along with a term that is a further
+permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of
-restriction, you may remove that term.  If a license document contains
+that license document, provided that the further restriction does not survive such relicensing or conveying.
-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
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a
-must place, in the relevant source files, a statement of the
+statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-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
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as
-form of a separately written license, or stated as exceptions;
+exceptions; the above requirements apply either way.
-the above requirements apply either way.
 
 8. Termination.
 
-You may not propagate or modify a covered work except as expressly
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to
-provided under this License.  Any attempt otherwise to propagate or
+propagate or modify it is void, and will automatically terminate your rights under this License (including any patent
-modify it is void, and will automatically terminate your rights under
+licenses granted under the third paragraph of section 11).
-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
+However, if you cease all violation of this License, then your license from a particular copyright holder is
-license from a particular copyright holder is reinstated (a)
+reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
+provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b)
-finally terminates your license, and (b) permanently, if the copyright
+permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days
-holder fails to notify you of the violation by some reasonable means
+after the cessation.
-prior to 60 days after the cessation.
 
-Moreover, your license from a particular copyright holder is
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you
-reinstated permanently if the copyright holder notifies you of the
+of the violation by some reasonable means, this is the first time you have received notice of violation of this
-violation by some reasonable means, this is the first time you have
+License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the
-received notice of violation of this License (for any work) from that
+notice.
-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
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or
-licenses of parties who have received copies or rights from you under
+rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not
-this License.  If your rights have been terminated and not permanently
+qualify to receive new licenses for the same material under section 10.
-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
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a
-run a copy of the Program.  Ancillary propagation of a covered work
+covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not
-occurring solely as a consequence of using peer-to-peer transmission
+require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered
-to receive a copy likewise does not require acceptance.  However,
+work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a
-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
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run,
-receives a license from the original licensors, to run, modify and
+modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third
-propagate that work, subject to this License.  You are not responsible
+parties with this License.
-for enforcing compliance by third parties with this License.
 
-An "entity transaction" is a transaction transferring control of an
+An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or
-organization, or substantially all assets of one, or subdividing an
+subdividing an organization, or merging organizations. If propagation of a covered work results from an entity
-organization, or merging organizations.  If propagation of a covered
+transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work
-work results from an entity transaction, each party to that
+the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the
-transaction who receives a copy of the work also receives whatever
+Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with
-licenses to the work the party's predecessor in interest had or could
+reasonable efforts.
-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
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For
-rights granted or affirmed under this License.  For example, you may
+example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License,
-not impose a license fee, royalty, or other charge for exercise of
+and you may not initiate litigation
-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,
-(including a cross-claim or counterclaim in a lawsuit) alleging that
+selling, offering for sale, or importing the Program or any portion of it.
-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
+A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the
-License of the Program or a work on which the Program is based.  The
+Program is based. The work thus licensed is called the contributor's "contributor version".
-work thus licensed is called the contributor's "contributor version".
 
-A contributor's "essential patent claims" are all patent claims
+A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already
-owned or controlled by the contributor, whether already acquired or
+acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or
-hereafter acquired, that would be infringed by some manner, permitted
+selling its contributor version, but do not include claims that would be infringed only as a consequence of further
-by this License, of making, using, or selling its contributor version,
+modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent
-but do not include claims that would be infringed only as a
+sublicenses in a manner consistent with the requirements of this License.
-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
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential
-patent license under the contributor's essential patent claims, to
+patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its
-make, use, sell, offer for sale, import and otherwise run, modify and
+contributor version.
-propagate the contents of its contributor version.
 
-In the following three paragraphs, a "patent license" is any express
+In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not
-agreement or commitment, however denominated, not to enforce a patent
+to enforce a patent
-(such as an express permission to practice a patent or covenant not to
+(such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a
-sue for patent infringement).  To "grant" such a patent license to a
+patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-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,
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not
-and the Corresponding Source of the work is not available for anyone
+available for anyone to copy, free of charge and under the terms of this License, through a publicly available network
-to copy, free of charge and under the terms of this License, through a
+server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available,
-publicly available network server or other readily accessible means,
+or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a
-then you must either (1) cause the Corresponding Source to be so
+manner consistent with the requirements of this License, to extend the patent license to downstream recipients.  "
-available, or (2) arrange to deprive yourself of the benefit of the
+Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in
-patent license for this particular work, or (3) arrange, in a manner
+a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in
-consistent with the requirements of this License, to extend the patent
+that country that you have reason to believe are valid.
-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
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring
-arrangement, you convey, or propagate by procuring conveyance of, a
+conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing
-covered work, and grant a patent license to some of the parties
+them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is
-receiving the covered work authorizing them to use, propagate, modify
+automatically extended to all recipients of the covered work and works based on it.
-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
+A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of,
-the scope of its coverage, prohibits the exercise of, or is
+or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You
-conditioned on the non-exercise of one or more of the rights that are
+may not convey a covered work if you are a party to an arrangement with a third party that is in the business of
-specifically granted under this License.  You may not convey a covered
+distributing software, under which you make payment to the third party based on the extent of your activity of conveying
-work if you are a party to an arrangement with a third party that is
+the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a
-in the business of distributing software, under which you make payment
+discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from
-to the third party based on the extent of your activity of conveying
+those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered
-the work, and under which the third party grants, to any of the
+work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-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
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to
-any implied license or other defenses to infringement that may
+infringement that may otherwise be available to you under applicable patent law.
-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
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this
-otherwise) that contradict the conditions of this License, they do not
+License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to
-excuse you from the conditions of this License.  If you cannot convey a
+satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence
-covered work so as to satisfy simultaneously your obligations under this
+you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further
-License and any other pertinent obligations, then as a consequence you may
+conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License
-not convey it at all.  For example, if you agree to terms that obligate you
+would be to refrain entirely from conveying the Program.
-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
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work
-permission to link or combine any covered work with a work licensed
+licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the
-under version 3 of the GNU Affero General Public License into a single
+resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special
-combined work, and to convey the resulting work.  The terms of this
+requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply
-License will continue to apply to the part which is the covered work,
+to the combination as such.
-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 Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to
-the GNU General Public License from time to time.  Such new versions will
+time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new
-be similar in spirit to the present version, but may differ in detail to
+problems or concerns.
-address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the
-Program specifies that a certain numbered version of the GNU General
+GNU General Public License "or any later version" applies to it, you have the option of following the terms and
-Public License "or any later version" applies to it, you have the
+conditions either of that numbered version or of any later version published by the Free Software Foundation. If the
-option of following the terms and conditions either of that numbered
+Program does not specify a version number of the GNU General Public License, you may choose any version ever published
-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
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used,
-versions of the GNU General Public License can be used, that proxy's
+that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the
-public statement of acceptance of a version permanently authorizes you
+Program.
-to choose that version for the Program.
 
-Later license versions may give you additional or different
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed
-permissions.  However, no additional obligations are imposed on any
+on any author or copyright holder as a result of your choosing to follow a later version.
-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
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-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
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+DAMAGES.
-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
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to
-above cannot be given local legal effect according to their terms,
+their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil
-reviewing courts shall apply local law that most closely approximates
+liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program
-an absolute waiver of all civil liability in connection with the
+in return for a fee.
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
 
             How to Apply These Terms to Your New Programs
 
-If you develop a new program, and you want it to be of the greatest
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve
-possible use to the public, the best way to achieve this is to make it
+this is to make it free software which everyone can redistribute and change under these terms.
-free software which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to
-to attach them to the start of each source file to most effectively
+most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer
-state the exclusion of warranty; and each file should have at least
+to where the full notice is found.
-the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
@@ -649,26 +498,21 @@ the "copyright" line and a pointer to where the full notice is found.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-notice like this when it starts in an interactive mode:
 
     <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the appropriate
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of
-parts of the General Public License.  Of course, your program's commands
+course, your program's commands might be different; for a GUI interface, you would use an "about box".
-might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or school,
+You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for
-if any, to sign a "copyright disclaimer" for the program, if necessary.
+the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see
-For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
 
-The GNU General Public License does not permit incorporating your program
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is
-into proprietary programs.  If your program is a subroutine library, you
+a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If
-may consider it more useful to permit linking proprietary applications with
+this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -31,6 +31,7 @@
 [![Compatibility](https://i.imgur.com/mlAGlKn.png)]()
 
 ## License
+
 *Click here to read [the entire license](https://github.com/Auxilor/EcoEnchants/blob/master/LICENSE.md).*
 
 Distributing compiled versions of the plugin is not permitted.

build.gradle

@@ -49,7 +49,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:4.3.1'
+        compileOnly 'com.willfp:eco:5.0.0'
 
         compileOnly 'org.jetbrains:annotations:19.0.0'
 

eco-core/core-nms/v1_15_R1/build.gradle

@@ -1,6 +0,0 @@
-group 'com.willfp'
-version rootProject.version
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot:1.15.2-R0.1-SNAPSHOT'
-}

eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/FastGetEnchants.java

@@ -1,53 +0,0 @@
-package com.willfp.ecoenchants.proxy.v1_15_R1;
-
-import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy;
-import net.minecraft.server.v1_15_R1.NBTBase;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
-import net.minecraft.server.v1_15_R1.NBTTagList;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_15_R1.util.CraftNamespacedKey;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class FastGetEnchants implements FastGetEnchantsProxy {
-    @Override
-    public Map<Enchantment, Integer> getEnchantmentsOnItem(@NotNull final ItemStack itemStack) {
-        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
-        NBTTagList enchantmentNBT = nmsStack.getEnchantments();
-        HashMap<Enchantment, Integer> foundEnchantments = new HashMap<>();
-
-        for (NBTBase base : enchantmentNBT) {
-            NBTTagCompound compound = (NBTTagCompound) base;
-            String key = compound.getString("id");
-            int level = '\uffff' & compound.getShort("lvl");
-
-            Enchantment found = Enchantment.getByKey(CraftNamespacedKey.fromStringOrNull(key));
-            if (found != null) {
-                foundEnchantments.put(found, level);
-            }
-        }
-        return foundEnchantments;
-    }
-
-    @Override
-    public int getLevelOnItem(@NotNull final ItemStack itemStack,
-                              @NotNull final Enchantment enchantment) {
-        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
-        NBTTagList enchantmentNBT = nmsStack.getEnchantments();
-
-        for (NBTBase base : enchantmentNBT) {
-            NBTTagCompound compound = (NBTTagCompound) base;
-            String key = compound.getString("id");
-            if (!key.equals(enchantment.getKey().toString())) {
-                continue;
-            }
-
-            return '\uffff' & compound.getShort("lvl");
-        }
-        return 0;
-    }
-}

eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/OpenInventory.java

@@ -1,13 +0,0 @@
-package com.willfp.ecoenchants.proxy.v1_15_R1;
-
-import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public final class OpenInventory implements OpenInventoryProxy {
-    @Override
-    public Object getOpenInventory(@NotNull final Player player) {
-        return ((CraftPlayer) player).getHandle().activeContainer;
-    }
-}

eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/RepairCost.java

@@ -1,22 +0,0 @@
-package com.willfp.ecoenchants.proxy.v1_15_R1;
-
-import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-public final class RepairCost implements RepairCostProxy {
-    @Override
-    public ItemStack setRepairCost(@NotNull final ItemStack itemStack,
-                                   final int cost) {
-        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
-        nmsStack.setRepairCost(cost);
-        return CraftItemStack.asBukkitCopy(nmsStack);
-    }
-
-    @Override
-    public int getRepairCost(@NotNull final ItemStack itemStack) {
-        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
-        return nmsStack.getRepairCost();
-    }
-}

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java

@@ -1,18 +1,19 @@
 package com.willfp.ecoenchants;
 
-import com.willfp.eco.util.bukkit.scheduling.TimedRunnable;
+import com.willfp.eco.core.AbstractPacketAdapter;
-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.display.DisplayModule;
+import com.willfp.eco.core.command.AbstractCommand;
-import com.willfp.eco.util.drops.telekinesis.TelekinesisUtils;
+import com.willfp.eco.core.display.DisplayModule;
-import com.willfp.eco.util.integrations.IntegrationLoader;
+import com.willfp.eco.core.integrations.IntegrationLoader;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.util.TelekinesisUtils;
-import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
 import com.willfp.ecoenchants.command.commands.CommandEcodebug;
 import com.willfp.ecoenchants.command.commands.CommandEcoreload;
 import com.willfp.ecoenchants.command.commands.CommandEnchantinfo;
 import com.willfp.ecoenchants.command.commands.CommandRandomenchant;
 import com.willfp.ecoenchants.command.tabcompleters.TabCompleterEnchantinfo;
 import com.willfp.ecoenchants.config.EcoEnchantsConfigs;
+import com.willfp.ecoenchants.config.configs.RarityYml;
+import com.willfp.ecoenchants.config.configs.TargetYml;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
@@ -25,6 +26,7 @@ import com.willfp.ecoenchants.enchantments.support.obtaining.EnchantingListeners
 import com.willfp.ecoenchants.enchantments.support.obtaining.LootPopulator;
 import com.willfp.ecoenchants.enchantments.support.obtaining.VillagerListeners;
 import com.willfp.ecoenchants.enchantments.util.ItemConversions;
+import com.willfp.ecoenchants.enchantments.util.TimedRunnable;
 import com.willfp.ecoenchants.enchantments.util.WatcherTriggers;
 import com.willfp.ecoenchants.integrations.essentials.EssentialsManager;
 import com.willfp.ecoenchants.integrations.essentials.plugins.IntegrationEssentials;
@@ -42,19 +44,34 @@ import java.util.Arrays;
 import java.util.List;
 
 @SuppressWarnings("unused")
-public class EcoEnchantsPlugin extends AbstractEcoPlugin {
+public class EcoEnchantsPlugin extends EcoPlugin {
     /**
      * Instance of the plugin.
      */
     @Getter
     private static EcoEnchantsPlugin instance;
 
+    /**
+     * Rarity.yml.
+     */
+    @Getter
+    private final RarityYml rarityYml;
+
+    /**
+     * Target.yml.
+     */
+    @Getter
+    private final TargetYml targetYml;
+
     /**
      * Internal constructor called by bukkit on plugin load.
      */
     public EcoEnchantsPlugin() {
         super("EcoEnchants", 79573, 7666, "com.willfp.ecoenchants.proxy", "&a");
         instance = this;
+
+        rarityYml = new RarityYml(this);
+        targetYml = new TargetYml(this);
     }
 
     /**
@@ -65,13 +82,13 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin {
         this.getExtensionLoader().loadExtensions();
 
         if (this.getExtensionLoader().getLoadedExtensions().isEmpty()) {
-            this.getLog().info("&cNo extensions found");
+            this.getLogger().info("&cNo extensions found");
         } else {
-            this.getLog().info("Extensions Loaded:");
+            this.getLogger().info("Extensions Loaded:");
-            this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLog().info("- " + extension.getName() + " v" + extension.getVersion()));
+            this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLogger().info("- " + extension.getName() + " v" + extension.getVersion()));
         }
 
-        this.getLog().info(EcoEnchants.values().size() + " Enchantments Loaded");
+        this.getLogger().info(EcoEnchants.values().size() + " Enchantments Loaded");
 
         TelekinesisUtils.registerTest(player -> ProxyUtils.getProxy(FastGetEnchantsProxy.class).getLevelOnItem(player.getInventory().getItemInMainHand(), EcoEnchants.TELEKINESIS) > 0);
     }
@@ -106,6 +123,8 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin {
      */
     @Override
     public void onReload() {
+        targetYml.update();
+        rarityYml.update();
         ((EnchantDisplay) this.getDisplayModule()).update();
         EcoEnchants.values().forEach((ecoEnchant -> {
             HandlerList.unregisterAll(ecoEnchant);

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java

@@ -2,9 +2,9 @@ package com.willfp.ecoenchants.command.commands;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.ListenerPriority;
-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.command.AbstractCommand;
-import com.willfp.eco.util.proxy.ProxyConstants;
+import com.willfp.eco.core.proxy.ProxyConstants;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
@@ -32,7 +32,7 @@ public class CommandEcodebug extends AbstractCommand {
      *
      * @param plugin The plugin for the commands to listen for.
      */
-    public CommandEcodebug(@NotNull final AbstractEcoPlugin plugin) {
+    public CommandEcodebug(@NotNull final EcoPlugin plugin) {
         super(plugin, "ecodebug", "ecoenchants.ecodebug", false);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.command.commands;
 
-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.command.AbstractCommand;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,7 +13,7 @@ public class CommandEcoreload extends AbstractCommand {
      *
      * @param plugin The plugin for the commands to listen for.
      */
-    public CommandEcoreload(@NotNull final AbstractEcoPlugin plugin) {
+    public CommandEcoreload(@NotNull final EcoPlugin plugin) {
         super(plugin, "ecoreload", "ecoenchants.reload", false);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java

@@ -1,9 +1,9 @@
 package com.willfp.ecoenchants.command.commands;
 
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractTabCompleter;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.command.AbstractCommand;
-import com.willfp.eco.util.command.AbstractTabCompleter;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecoenchants.command.tabcompleters.TabCompleterEnchantinfo;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
@@ -26,7 +26,7 @@ public class CommandEnchantinfo extends AbstractCommand {
      *
      * @param plugin The plugin for the commands to listen for.
      */
-    public CommandEnchantinfo(@NotNull final AbstractEcoPlugin plugin) {
+    public CommandEnchantinfo(@NotNull final EcoPlugin plugin) {
         super(plugin, "enchantinfo", "ecoenchants.enchantinfo", false);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandRandomenchant.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.command.commands;
 
-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.command.AbstractTabCompleter;
+import com.willfp.eco.core.command.AbstractCommand;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.command.AbstractTabCompleter;
 import com.willfp.ecoenchants.command.tabcompleters.TabCompleterRandomEnchant;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
@@ -28,7 +28,7 @@ public class CommandRandomenchant extends AbstractCommand {
      *
      * @param plugin The plugin for the commands to listen for.
      */
-    public CommandRandomenchant(@NotNull final AbstractEcoPlugin plugin) {
+    public CommandRandomenchant(@NotNull final EcoPlugin plugin) {
         super(plugin, "randomenchant", "ecoenchants.randomenchant", false);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java

@@ -1,9 +1,9 @@
 package com.willfp.ecoenchants.command.tabcompleters;
 
+import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractTabCompleter;
+import com.willfp.eco.core.config.ConfigUpdater;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.command.AbstractCommand;
-import com.willfp.eco.util.command.AbstractTabCompleter;
-import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import org.bukkit.ChatColor;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterRandomEnchant.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.command.tabcompleters;
 
-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractCommand;
-import com.willfp.eco.util.command.AbstractTabCompleter;
+import com.willfp.eco.core.command.AbstractTabCompleter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java

@@ -1,9 +1,7 @@
 package com.willfp.ecoenchants.config;
 
-import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.core.config.ConfigUpdater;
 import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
-import com.willfp.ecoenchants.config.configs.Rarity;
-import com.willfp.ecoenchants.config.configs.Target;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
@@ -13,16 +11,6 @@ import java.util.Set;
 
 @UtilityClass
 public class EcoEnchantsConfigs {
-    /**
-     * target.yml.
-     */
-    public static final Target TARGET = new Target();
-
-    /**
-     * rarity.yml.
-     */
-    public static final Rarity RARITY = new Rarity();
-
     /**
      * All enchantment-specific configs.
      */
@@ -34,8 +22,6 @@ public class EcoEnchantsConfigs {
      */
     @ConfigUpdater
     public void updateConfigs() {
-        TARGET.update();
-        RARITY.update();
         enchantmentConfigs.forEach(EnchantmentConfig::update);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.config.configs;
 
-import com.willfp.eco.util.config.ExtendableConfig;
+import com.willfp.eco.core.config.ExtendableConfig;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity;
@@ -92,10 +92,10 @@ public class EnchantmentConfig extends ExtendableConfig {
             return;
         }
 
-        this.config.set("name", this.getPlugin().getLangYml().getString("enchantments." + this.getName() + ".name"));
+        this.set("name", this.getPlugin().getLangYml().getString("enchantments." + this.getName() + ".name"));
-        this.config.set("description", this.getPlugin().getLangYml().getString("enchantments." + this.getName() + ".description"));
+        this.set("description", this.getPlugin().getLangYml().getString("enchantments." + this.getName() + ".description"));
         try {
-            this.config.save(this.getConfigFile());
+            this.save();
         } catch (IOException e) {
             e.printStackTrace();
         }

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/RarityYml.java

@@ -1,16 +1,19 @@
 package com.willfp.ecoenchants.config.configs;
 
-import com.willfp.eco.util.config.BaseConfig;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.ecoenchants.EcoEnchantsPlugin;
+import com.willfp.eco.core.config.BaseConfig;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public class Rarity extends BaseConfig {
+public class RarityYml extends BaseConfig {
     /**
      * Instantiate rarity.yml.
+     *
+     * @param plugin Instance of EcoEnchants.
      */
-    public Rarity() {
+    public RarityYml(@NotNull final EcoPlugin plugin) {
-        super("rarity", false, EcoEnchantsPlugin.getInstance());
+        super("rarity", false, plugin);
     }
 
     /**

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/TargetYml.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.config.configs;
 
-import com.willfp.eco.util.config.BaseConfig;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.ecoenchants.EcoEnchantsPlugin;
+import com.willfp.eco.core.config.BaseConfig;
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
@@ -9,12 +9,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class Target extends BaseConfig {
+public class TargetYml extends BaseConfig {
     /**
      * Instantiate target.yml.
+     *
+     * @param plugin Instance of EcoEnchants.
      */
-    public Target() {
+    public TargetYml(@NotNull final EcoPlugin plugin) {
-        super("target", false, EcoEnchantsPlugin.getInstance());
+        super("target", false, plugin);
     }
 
     /**

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java

@@ -1,11 +1,11 @@
 package com.willfp.ecoenchants.display;
 
 import com.google.common.collect.Lists;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.display.Display;
+import com.willfp.eco.core.display.DisplayModule;
+import com.willfp.eco.core.display.DisplayPriority;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.display.Display;
-import com.willfp.eco.util.display.DisplayModule;
-import com.willfp.eco.util.display.DisplayPriority;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecoenchants.display.options.DisplayOptions;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
@@ -60,7 +60,7 @@ public class EnchantDisplay extends DisplayModule {
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public EnchantDisplay(@NotNull final AbstractEcoPlugin plugin) {
+    public EnchantDisplay(@NotNull final EcoPlugin plugin) {
         super(plugin, DisplayPriority.HIGH);
         keySkip = this.getPlugin().getNamespacedKeyFactory().create("ecoenchantlore-skip");
         legacyV = this.getPlugin().getNamespacedKeyFactory().create("ecoenchantlore-v");

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java

@@ -1,9 +1,8 @@
 package com.willfp.ecoenchants.display;
 
 import com.google.common.collect.ImmutableMap;
-import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.core.config.ConfigUpdater;
-import com.willfp.eco.util.display.Display;
+import com.willfp.eco.core.display.Display;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
@@ -31,7 +30,7 @@ public class EnchantmentCache {
     /**
      * Instance of EcoEnchants.
      */
-    public static final AbstractEcoPlugin PLUGIN = EcoEnchantsPlugin.getInstance();
+    public static final EcoEnchantsPlugin PLUGIN = EcoEnchantsPlugin.getInstance();
 
     /**
      * The physical cache.

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DescriptionOptions.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.display.options;
 
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
@@ -30,7 +30,7 @@ public class DescriptionOptions extends PluginDependent {
      *
      * @param plugin EcoEnchants.
      */
-    public DescriptionOptions(@NotNull final AbstractEcoPlugin plugin) {
+    public DescriptionOptions(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DisplayOptions.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
 import com.willfp.ecoenchants.display.options.sorting.SortParameters;
 import com.willfp.ecoenchants.display.options.sorting.SorterManager;
@@ -19,42 +19,36 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 public class DisplayOptions extends PluginDependent {
-    /**
-     * The enchantment sorter being used.
-     */
-    @Getter
-    private EnchantmentSorter sorter;
-
     /**
      * The description options being used.
      */
     @Getter
     private final DescriptionOptions descriptionOptions = new DescriptionOptions(this.getPlugin());
-
     /**
      * The enchantment level options being used.
      */
     @Getter
     private final NumbersOptions numbersOptions = new NumbersOptions(this.getPlugin());
-
     /**
      * The shrink options being used.
      */
     @Getter
     private final ShrinkOptions shrinkOptions = new ShrinkOptions(this.getPlugin());
-
     /**
      * The enchantment types, sorted according to config.
      */
     @Getter
     private final List<EnchantmentType> sortedTypes = new ArrayList<>();
-
     /**
      * The enchantment rarities, sorted according to config.
      */
     @Getter
     private final List<EnchantmentRarity> sortedRarities = new ArrayList<>();
-
+    /**
+     * The enchantment sorter being used.
+     */
+    @Getter
+    private EnchantmentSorter sorter;
     /**
      * Allow reading enchantments from lore-based plugins.
      */
@@ -97,7 +91,7 @@ public class DisplayOptions extends PluginDependent {
      * @param plugin EcoEnchants.
      */
     @ApiStatus.Internal
-    public DisplayOptions(@NotNull final AbstractEcoPlugin plugin) {
+    public DisplayOptions(@NotNull final EcoPlugin plugin) {
         super(plugin);
         update();
     }

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/NumbersOptions.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,7 +25,7 @@ public class NumbersOptions extends PluginDependent {
      *
      * @param plugin EcoEnchants.
      */
-    public NumbersOptions(@NotNull final AbstractEcoPlugin plugin) {
+    public NumbersOptions(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/ShrinkOptions.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,7 +29,7 @@ public class ShrinkOptions extends PluginDependent {
      *
      * @param plugin EcoEnchants.
      */
-    public ShrinkOptions(@NotNull final AbstractEcoPlugin plugin) {
+    public ShrinkOptions(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/SorterManager.java

@@ -23,6 +23,18 @@ public class SorterManager {
      */
     private static final Set<EnchantmentSorter> REGISTERED = new HashSet<>();
 
+    static {
+        EcoEnchantsPlugin instance = EcoEnchantsPlugin.getInstance(); // Really dirty and janky.
+        REGISTERED.add(new AlphabeticSorter(instance));
+        REGISTERED.add(new LengthSorter(instance));
+        REGISTERED.add(new TypeAlphabeticSorter(instance));
+        REGISTERED.add(new TypeLengthSorter(instance));
+        REGISTERED.add(new RarityAlphabeticSorter(instance));
+        REGISTERED.add(new RarityLengthSorter(instance));
+        REGISTERED.add(new RarityTypeAlphabeticSorter(instance));
+        REGISTERED.add(new RarityTypeLengthSorter(instance));
+    }
+
     /**
      * Get a sorter based off of parameters.
      * <p>
@@ -37,16 +49,4 @@ public class SorterManager {
                 .findFirst()
                 .orElse(new AlphabeticSorter(EcoEnchantsPlugin.getInstance()));
     }
-
-    static {
-        EcoEnchantsPlugin instance = EcoEnchantsPlugin.getInstance(); // Really dirty and janky.
-        REGISTERED.add(new AlphabeticSorter(instance));
-        REGISTERED.add(new LengthSorter(instance));
-        REGISTERED.add(new TypeAlphabeticSorter(instance));
-        REGISTERED.add(new TypeLengthSorter(instance));
-        REGISTERED.add(new RarityAlphabeticSorter(instance));
-        REGISTERED.add(new RarityLengthSorter(instance));
-        REGISTERED.add(new RarityTypeAlphabeticSorter(instance));
-        REGISTERED.add(new RarityTypeLengthSorter(instance));
-    }
 }

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/AlphabeticSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
 import com.willfp.ecoenchants.display.options.sorting.SortParameters;
@@ -16,7 +16,7 @@ public class AlphabeticSorter extends PluginDependent implements EnchantmentSort
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public AlphabeticSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public AlphabeticSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/LengthSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
 import com.willfp.ecoenchants.display.options.sorting.SortParameters;
@@ -17,7 +17,7 @@ public class LengthSorter extends PluginDependent implements EnchantmentSorter {
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public LengthSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public LengthSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/RarityAlphabeticSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -18,7 +18,7 @@ public class RarityAlphabeticSorter extends PluginDependent implements Enchantme
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public RarityAlphabeticSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public RarityAlphabeticSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/RarityLengthSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -19,7 +19,7 @@ public class RarityLengthSorter extends PluginDependent implements EnchantmentSo
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public RarityLengthSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public RarityLengthSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/RarityTypeAlphabeticSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -18,7 +18,7 @@ public class RarityTypeAlphabeticSorter extends PluginDependent implements Encha
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public RarityTypeAlphabeticSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public RarityTypeAlphabeticSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/RarityTypeLengthSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -19,7 +19,7 @@ public class RarityTypeLengthSorter extends PluginDependent implements Enchantme
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public RarityTypeLengthSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public RarityTypeLengthSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/TypeAlphabeticSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -18,7 +18,7 @@ public class TypeAlphabeticSorter extends PluginDependent implements Enchantment
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public TypeAlphabeticSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public TypeAlphabeticSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/sorting/implementations/TypeLengthSorter.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.display.options.sorting.implementations;
 
-import com.willfp.eco.util.internal.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.display.EnchantmentCache;
 import com.willfp.ecoenchants.display.options.sorting.EnchantmentSorter;
@@ -18,7 +18,7 @@ public class TypeLengthSorter extends PluginDependent implements EnchantmentSort
      *
      * @param plugin Instance of EcoEnchants.
      */
-    public TypeLengthSorter(@NotNull final AbstractEcoPlugin plugin) {
+    public TypeLengthSorter(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java

@@ -1,9 +1,7 @@
 package com.willfp.ecoenchants.enchantments;
 
-
+import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.optional.Prerequisite;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.config.EcoEnchantsConfigs;
 import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
@@ -45,102 +43,85 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche
      * Instance of EcoEnchants for enchantments to be able to access.
      */
     @Getter(AccessLevel.PROTECTED)
-    private final AbstractEcoPlugin plugin = EcoEnchantsPlugin.getInstance();
+    private final EcoEnchantsPlugin plugin = EcoEnchantsPlugin.getInstance();
-
-    /**
-     * The display name of the enchantment.
-     */
-    private String name;
-
-    /**
-     * The description of the enchantment.
-     */
-    @Getter
-    private String description;
-
     /**
      * The permission/config name of the enchantment.
      */
     @Getter
     private final String permissionName;
-
     /**
      * The type of the enchantment.
      */
     @Getter
     private final EnchantmentType type;
-
     /**
      * The enchantment's config.
      */
     @Getter
     private final EnchantmentConfig config;
-
-    /**
-     * If the enchantment can be removed in a grindstone.
-     */
-    @Getter
-    private boolean grindstoneable;
-
-    /**
-     * If the enchantment can be obtained from an enchanting table.
-     */
-    @Getter
-    private boolean availableFromTable;
-
-    /**
-     * If the enchantment can be obtained from a villager.
-     */
-    @Getter
-    private boolean availableFromVillager;
-
-    /**
-     * If the enchantment can be obtained from a loot chest.
-     */
-    @Getter
-    private boolean availableFromLoot;
-
-    /**
-     * The maximum level for the enchantment to be obtained naturally.
-     */
-    private int maxLevel;
-
-    /**
-     * The enchantments that conflict with this enchantment.
-     */
-    @Getter
-    private Set<Enchantment> conflicts;
-
-    /**
-     * The rarity of the enchantment.
-     */
-    @Getter
-    private EnchantmentRarity rarity;
-
     /**
      * The targets of the enchantment.
      */
     @Getter
     private final Set<EnchantmentTarget> targets = new HashSet<>();
-
     /**
      * The materials of the targets.
      */
     @Getter
     private final Set<Material> targetMaterials = new HashSet<>();
-
     /**
      * The names of the worlds that this enchantment is disabled in.
      */
     @Getter
     private final Set<String> disabledWorldNames = new HashSet<>();
-
     /**
      * The worlds that this enchantment is disabled in.
      */
     @Getter
     private final List<World> disabledWorlds = new ArrayList<>();
-
+    /**
+     * The display name of the enchantment.
+     */
+    private String name;
+    /**
+     * The description of the enchantment.
+     */
+    @Getter
+    private String description;
+    /**
+     * If the enchantment can be removed in a grindstone.
+     */
+    @Getter
+    private boolean grindstoneable;
+    /**
+     * If the enchantment can be obtained from an enchanting table.
+     */
+    @Getter
+    private boolean availableFromTable;
+    /**
+     * If the enchantment can be obtained from a villager.
+     */
+    @Getter
+    private boolean availableFromVillager;
+    /**
+     * If the enchantment can be obtained from a loot chest.
+     */
+    @Getter
+    private boolean availableFromLoot;
+    /**
+     * The maximum level for the enchantment to be obtained naturally.
+     */
+    private int maxLevel;
+    /**
+     * The enchantments that conflict with this enchantment.
+     */
+    @Getter
+    private Set<Enchantment> conflicts;
+    /**
+     * The rarity of the enchantment.
+     */
+    @Getter
+    private EnchantmentRarity rarity;
     /**
      * If the enchantment is enabled.
      */

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java

@@ -1,10 +1,9 @@
 package com.willfp.ecoenchants.enchantments;
 
-
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
-import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.core.config.ConfigUpdater;
 import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AngerArtifact;
 import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact;
 import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.BarrierArtifact;
@@ -161,6 +160,7 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Quadrilateralism;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Radiance;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Rage;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Rapid;
+import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Reaper;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Reel;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Reinforcement;
 import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Rejuvenation;
@@ -224,7 +224,6 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.special.Pentashot;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Preservation;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Prosperity;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Razor;
-import com.willfp.ecoenchants.enchantments.ecoenchants.normal.Reaper;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Repairing;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Soulbound;
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Spring;
@@ -255,10 +254,6 @@ public class EcoEnchants {
     public static final String CONFIG_LOCATION = "config.";
     public static final String OBTAINING_LOCATION = "obtaining.";
     public static final String GENERAL_LOCATION = "general-config.";
-
-    private static final BiMap<NamespacedKey, EcoEnchant> BY_KEY = HashBiMap.create();
-    private static final BiMap<String, EcoEnchant> BY_NAME = HashBiMap.create();
-
     public static final EcoEnchant TELEKINESIS = new Telekinesis();
     public static final EcoEnchant MARKSMAN = new Marksman();
     public static final EcoEnchant INFERNAL_TOUCH = new InfernalTouch();
@@ -490,6 +485,8 @@ public class EcoEnchants {
     public static final EcoEnchant SWEEP_ARTIFACT = new SweepArtifact();
     public static final EcoEnchant REAPER = new Reaper();
     public static final EcoEnchant WOOD_SWITCHER = new WoodSwitcher();
+    private static final BiMap<NamespacedKey, EcoEnchant> BY_KEY = HashBiMap.create();
+    private static final BiMap<String, EcoEnchant> BY_NAME = HashBiMap.create();
 
     /**
      * Get all registered {@link EcoEnchant}s.

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AshArtifact.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
 import org.bukkit.Particle;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +7,7 @@ import org.jetbrains.annotations.NotNull;
 public class AshArtifact extends Artifact {
     public AshArtifact() {
         super(
-                "ash_artifact",
+                "ash_artifact"
-                Prerequisite.MINIMUM_1_16
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/CrimsonArtifact.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
 import org.bukkit.Particle;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +7,7 @@ import org.jetbrains.annotations.NotNull;
 public class CrimsonArtifact extends Artifact {
     public CrimsonArtifact() {
         super(
-                "crimson_artifact",
+                "crimson_artifact"
-                Prerequisite.MINIMUM_1_16
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulArtifact.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
 import org.bukkit.Particle;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +7,7 @@ import org.jetbrains.annotations.NotNull;
 public class SoulArtifact extends Artifact {
     public SoulArtifact() {
         super(
-                "soul_artifact",
+                "soul_artifact"
-                Prerequisite.MINIMUM_1_16
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulFireArtifact.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
 import org.bukkit.Particle;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +7,7 @@ import org.jetbrains.annotations.NotNull;
 public class SoulFireArtifact extends Artifact {
     public SoulFireArtifact() {
         super(
-                "soul_fire_artifact",
+                "soul_fire_artifact"
-                Prerequisite.MINIMUM_1_16
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/WarpedArtifact.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
 import org.bukkit.Particle;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +7,7 @@ import org.jetbrains.annotations.NotNull;
 public class WarpedArtifact extends Artifact {
     public WarpedArtifact() {
         super(
-                "warped_artifact",
+                "warped_artifact"
-                Prerequisite.MINIMUM_1_16
         );
     }
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java

@@ -1,12 +1,12 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.curse;
 
+import com.willfp.eco.core.events.ArmorEquipEvent;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.bukkit.scheduling.TimedRunnable;
-import com.willfp.eco.util.events.armorequip.ArmorEquipEvent;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
+import com.willfp.ecoenchants.enchantments.util.TimedRunnable;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.PigZombie;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java

@@ -1,11 +1,11 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.curse;
 
 import com.willfp.eco.util.DurabilityUtils;
-import com.willfp.eco.util.bukkit.scheduling.TimedRunnable;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
+import com.willfp.ecoenchants.enchantments.util.TimedRunnable;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityDropItemEvent;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java

@@ -16,6 +16,7 @@ public class FragilityCurse extends EcoEnchant {
                 "fragility_curse", EnchantmentType.CURSE
         );
     }
+
     @EventHandler
     public void onItemDamage(@NotNull final PlayerItemDamageEvent event) {
         ItemStack item = event.getItem();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java

@@ -15,6 +15,7 @@ public class HungerCurse extends EcoEnchant {
                 "hunger_curse", EnchantmentType.CURSE
         );
     }
+
     @EventHandler
     public void onHunger(@NotNull final FoodLevelChangeEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java

@@ -12,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+
 public class Abrasion extends EcoEnchant {
     public Abrasion() {
         super(

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arborist.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.drops.DropQueue;
+import com.willfp.eco.core.drops.DropQueue;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java

@@ -13,6 +13,7 @@ public class Arcanic extends EcoEnchant {
                 "arcanic", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onDamageWearingArmor(@NotNull final LivingEntity victim,
                                      final int level,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.drops.DropQueue;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
@@ -20,7 +19,9 @@ public class Beheading extends EcoEnchant {
         super(
                 "beheading", EnchantmentType.NORMAL
         );
-    }    @EventHandler
+    }
+
+    @EventHandler
     public void onDeath(@NotNull final EntityDeathEvent event) {
         if (event.getEntity().getKiller() == null) {
             return;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.BlockUtils;
-import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java

@@ -1,12 +1,10 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.jetbrains.annotations.NotNull;
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Buckshot.java

@@ -22,6 +22,7 @@ public class Buckshot extends EcoEnchant {
                 "buckshot", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onBowShoot(@NotNull final LivingEntity shooter,
                            @NotNull final Arrow arrow,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java

@@ -14,6 +14,7 @@ public class Cleave extends EcoEnchant {
                 "cleave", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Corrosive.java

@@ -19,6 +19,7 @@ public class Corrosive extends EcoEnchant {
                 "corrosive", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onArrowDamage(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity uncastVictim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cubism.java

@@ -14,6 +14,7 @@ public class Cubism extends EcoEnchant {
                 "cubism", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java

@@ -1,12 +1,9 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
-import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disappear.java

@@ -15,6 +15,7 @@ public class Disappear extends EcoEnchant {
                 "disappear", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onDamageWearingArmor(@NotNull final LivingEntity victim,
                                      final int level,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java

@@ -14,6 +14,7 @@ public class Diurnal extends EcoEnchant {
                 "diurnal", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java

@@ -1,9 +1,9 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.BlockUtils;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -19,6 +19,7 @@ public class Drill extends EcoEnchant {
                 "drill", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onBlockBreak(@NotNull final Player player,
                              @NotNull final Block block,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java

@@ -16,6 +16,7 @@ public class Dullness extends EcoEnchant {
                 "dullness", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dweller.java

@@ -14,6 +14,7 @@ public class Dweller extends EcoEnchant {
                 "dweller", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
 import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
-import com.willfp.eco.util.optional.Prerequisite;
+import com.willfp.eco.core.Prerequisite;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java

@@ -16,6 +16,7 @@ public class Electroshock extends EcoEnchant {
                 "electroshock", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onDeflect(@NotNull final Player blocker,
                           @NotNull final LivingEntity attacker,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EnderSlayer.java

@@ -10,12 +10,8 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
+
 public class EnderSlayer extends EcoEnchant {
-    public EnderSlayer() {
-        super(
-                "ender_slayer", EnchantmentType.NORMAL
-        );
-    }
     private static final Set<EntityType> END_MOBS = new ImmutableSet.Builder<EntityType>()
             .add(EntityType.ENDERMITE)
             .add(EntityType.ENDERMAN)
@@ -23,6 +19,11 @@ public class EnderSlayer extends EcoEnchant {
             .add(EntityType.SHULKER)
             .build();
 
+    public EnderSlayer() {
+        super(
+                "ender_slayer", EnchantmentType.NORMAL
+        );
+    }
 
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extinguishing.java

@@ -13,6 +13,7 @@ public class Extinguishing extends EcoEnchant {
                 "extinguishing", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onDamageWearingArmor(@NotNull final LivingEntity victim,
                                      final int level,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.DurabilityUtils;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -24,6 +24,7 @@ public class Farmhand extends EcoEnchant {
                 "farmhand", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onTill(@NotNull final PlayerInteractEvent event) {
         Player player = event.getPlayer();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.drops.DropQueue;
+import com.willfp.eco.core.drops.DropQueue;
-import com.willfp.eco.util.events.entitydeathbyentity.EntityDeathByEntityEvent;
+import com.willfp.eco.core.events.EntityDeathByEntityEvent;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -22,6 +22,7 @@ public class Fetching extends EcoEnchant {
                 "fetching", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onWolfKill(@NotNull final EntityDeathByEntityEvent event) {
         LivingEntity entity = event.getVictim();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java

@@ -14,6 +14,7 @@ public class FirstStrike extends EcoEnchant {
                 "first_strike", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java

@@ -1,12 +1,12 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.events.ArmorEquipEvent;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.events.armorequip.ArmorEquipEvent;
-import com.willfp.eco.util.bukkit.scheduling.TimedRunnable;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
+import com.willfp.ecoenchants.enchantments.util.TimedRunnable;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java

@@ -19,6 +19,7 @@ public class Frozen extends EcoEnchant {
                 "frozen", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onHurt(@NotNull final EntityDamageByEntityEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.eco.util.VectorUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
@@ -10,7 +9,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.PigZombie;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
@@ -21,6 +19,7 @@ public class Fury extends EcoEnchant {
                 "fury", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity victim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java

@@ -19,6 +19,7 @@ public class Graceful extends EcoEnchant {
                 "graceful", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onFall(@NotNull final PlayerMoveEvent event) {
         Player player = event.getPlayer();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.DurabilityUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -19,6 +19,7 @@ public class GreenThumb extends EcoEnchant {
                 "green_thumb", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onInteract(@NotNull final PlayerInteractEvent event) {
         Player player = event.getPlayer();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.DurabilityUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java

@@ -1,12 +1,9 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
-import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -18,6 +18,7 @@ public class Incandescence extends EcoEnchant {
                 "incandescence", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onIncandescenceHurt(@NotNull final EntityDamageByEntityEvent event) {
         if (event.getCause() == EntityDamageEvent.DamageCause.THORNS) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.drops.DropQueue;
+import com.willfp.eco.core.drops.DropQueue;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
-import com.willfp.eco.util.tuples.Pair;
+import com.willfp.eco.core.tuples.Pair;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -39,12 +39,6 @@ public class InfernalTouch extends EcoEnchant {
             )
     );
 
-    public InfernalTouch() {
-        super(
-                "infernal_touch", EnchantmentType.NORMAL
-        );
-    }
-
     static {
         Iterator<Recipe> iterator = Bukkit.recipeIterator();
         while (iterator.hasNext()) {
@@ -58,6 +52,12 @@ public class InfernalTouch extends EcoEnchant {
         }
     }
 
+    public InfernalTouch() {
+        super(
+                "infernal_touch", EnchantmentType.NORMAL
+        );
+    }
+
     @NotNull
     private static Pair<Material, Integer> getOutput(@NotNull final Material input) {
         Pair<Material, Integer> toReturn = RECIPES.get(input);

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java

@@ -16,6 +16,7 @@ public class Invigoration extends EcoEnchant {
                 "invigoration", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onInvigorationHurt(@NotNull final EntityDamageEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.BlockUtils;
-import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -24,6 +24,7 @@ public class MagmaWalker extends EcoEnchant {
                 "magma_walker", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onLavaWalk(@NotNull final PlayerMoveEvent event) {
         Player player = event.getPlayer();

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java

@@ -1,12 +1,12 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.events.ArmorEquipEvent;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.bukkit.scheduling.TimedRunnable;
-import com.willfp.eco.util.events.armorequip.ArmorEquipEvent;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
+import com.willfp.ecoenchants.enchantments.util.TimedRunnable;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.entity.Item;
@@ -20,9 +20,9 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 
 public class Magnetic extends EcoEnchant implements TimedRunnable {
+    private final HashMap<Player, Integer> players = new HashMap<>();
     private double initialDistance = 1;
     private double bonus = 1;
-    private final HashMap<Player, Integer> players = new HashMap<>();
 
     public Magnetic() {
         super(

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java

@@ -4,8 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
@@ -18,6 +16,7 @@ public class Marksman extends EcoEnchant {
                 "marksman", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onMarksmanShoot(@NotNull final ProjectileLaunchEvent event) {
 

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.drops.DropQueue;
+import com.willfp.eco.core.drops.DropQueue;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
@@ -19,6 +19,7 @@ public class Necrotic extends EcoEnchant {
                 "necrotic", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void necroticKill(@NotNull final EntityDeathEvent event) {
         if (event.getEntity().getKiller() == null) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java

@@ -15,6 +15,7 @@ public class Parry extends EcoEnchant {
                 "parry", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void parryHit(@NotNull final EntityDamageByEntityEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Plasmic.java

@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -14,15 +13,9 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Arrays;
 
 public class Plasmic extends EcoEnchant {
-    public Plasmic() {
-        super(
-                "plasmic", EnchantmentType.NORMAL
-        );
-    }
     private static final Material[] ITEMS;
 
     static {
-        if (Prerequisite.MINIMUM_1_16.isMet()) {
         ITEMS = new Material[]{
                 Material.DIAMOND_HELMET,
                 Material.DIAMOND_CHESTPLATE,
@@ -34,14 +27,12 @@ public class Plasmic extends EcoEnchant {
                 Material.NETHERITE_LEGGINGS,
                 Material.NETHERITE_BOOTS
         };
-        } else {
-            ITEMS = new Material[]{
-                    Material.DIAMOND_HELMET,
-                    Material.DIAMOND_CHESTPLATE,
-                    Material.DIAMOND_LEGGINGS,
-                    Material.DIAMOND_BOOTS
-            };
     }
+
+    public Plasmic() {
+        super(
+                "plasmic", EnchantmentType.NORMAL
+        );
     }
 
     @Override

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Protector.java

@@ -13,6 +13,7 @@ public class Protector extends EcoEnchant {
                 "protector", EnchantmentType.NORMAL
         );
     }
+
     @Override
     public void onMeleeAttack(@NotNull final LivingEntity attacker,
                               @NotNull final LivingEntity uncastVictim,

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.VectorUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -19,6 +19,7 @@ public class Reel extends EcoEnchant {
                 "reel", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onFish(@NotNull final PlayerFishEvent event) {
         if (!event.getState().equals(PlayerFishEvent.State.CAUGHT_ENTITY)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java

@@ -15,6 +15,7 @@ public class Rejuvenation extends EcoEnchant {
                 "rejuvenation", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onRejuvenationHeal(@NotNull final EntityRegainHealthEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java

@@ -15,6 +15,7 @@ public class Sating extends EcoEnchant {
                 "sating", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onSatingHunger(@NotNull final FoodLevelChangeEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.TridentUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -21,6 +21,7 @@ public class Shockwave extends EcoEnchant {
                 "shockwave", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onShoot(@NotNull final ProjectileLaunchEvent event) {
         if (!(event.getEntity() instanceof AbstractArrow)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java

@@ -14,13 +14,15 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+
 public class Slicing extends EcoEnchant {
+    private final ArrayList<LivingEntity> entities = new ArrayList<>();
+
     public Slicing() {
         super(
                 "slicing", EnchantmentType.NORMAL
         );
     }
-    private final ArrayList<LivingEntity> entities = new ArrayList<>();
 
     @EventHandler
     public void onPlayerCollide(@NotNull final PlayerMoveEvent event) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java

@@ -1,8 +1,8 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.drops.DropQueue;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.TridentUtils;
-import com.willfp.eco.util.drops.DropQueue;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java

@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@@ -17,6 +17,7 @@ public class Spiked extends EcoEnchant {
                 "spiked", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onFish(@NotNull final PlayerFishEvent event) {
         if (!event.getState().equals(PlayerFishEvent.State.CAUGHT_ENTITY)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.TridentUtils;
-import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java

@@ -15,6 +15,7 @@ public class Stamina extends EcoEnchant {
                 "stamina", EnchantmentType.NORMAL
         );
     }
+
     @EventHandler
     public void onStaminaHunger(@NotNull final FoodLevelChangeEvent event) {
         if (!(event.getEntity() instanceof Player)) {

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java

@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
+import com.willfp.eco.core.drops.DropQueue;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.drops.DropQueue;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java

@@ -1,12 +1,10 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java

@@ -1,12 +1,10 @@
 package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
 
-import com.willfp.eco.util.PlayerUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.jetbrains.annotations.NotNull;