added missing entries

Elytra flight time as human readable format

.github/workflows/hangar.yml

@@ -0,0 +1,31 @@
+name: Update Hangar Description
+on:
+  push:
+    branches: [ master ]
+jobs:
+  update-hangar-page:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Authenticate with Hangar
+        id: authenticate
+        run: |
+          RESPONSE=$(curl -s -X POST "https://hangar.papermc.io/api/v1/authenticate?apiKey=${{ secrets.HANGAR }}" -H 'accept: application/json')
+          TOKEN=$(echo $RESPONSE | jq -r '.token')
+          if [[ "$TOKEN" == "null" ]]; then
+            echo "Error: Unable to fetch JWT token"
+            exit 1
+          fi
+          echo "::add-mask::$TOKEN"
+          echo "token=$TOKEN" >> $GITHUB_OUTPUT
+
+      - name: Update Project Description
+        run: |
+          README_CONTENT=$(cat README.md | jq -Rs .)
+          curl -s -X PATCH "https://hangar.papermc.io/api/v1/pages/editmain/ToolStats" \
+            -H "content-type: application/json" \
+            -H "Authorization: HangarAuth ${{ steps.authenticate.outputs.token }}" \
+            -d "{\"content\":$README_CONTENT}"

.github/workflows/maven.yml

@@ -15,10 +15,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

.github/workflows/modrinth.yml

@@ -1,3 +1,4 @@
+name: Update Modrinth Description
 on:
   push:
     branches: [ master ]
@@ -9,4 +10,4 @@ jobs:
     - uses: funnyboy-roks/modrinth-auto-desc@v1.6
       with:
         auth-token: ${{ secrets.MODRINTH }}
-        slug: 'oBZj9E15'
+        slug: 'oBZj9E15'

LICENSE

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

README.md

@@ -1,28 +1,28 @@
 <h1 align="center">ToolStats</h1>
 
 <p align="center">
-	<img src="https://img.shields.io/badge/Minecraft-1.15--1.21-orange" alt="Minecraft versions">
-	<img src="https://img.shields.io/github/v/release/hyperdefined/ToolStats" alt="GitHub release (latest by date)">
-	<a href="https://github.com/hyperdefined/ToolStats/releases"><img src="https://img.shields.io/github/downloads/hyperdefined/ToolStats/total?logo=github" alt="Downloads"></a>
-	<img src="https://img.shields.io/badge/made%20with-love%20&%20fluff-red" alt="Made with love & fluff">
-	<a href="https://ko-fi.com/hyperdefined"><img src="https://img.shields.io/badge/Donate-Ko--fi-red" alt="Donate via Ko-fi"></a>
-	<a href="https://www.gnu.org/licenses/gpl-3.0"><img src="https://img.shields.io/badge/License-GPLv3-blue.svg" alt="License: GPL v3"></a>
-	<a href="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4"><img src="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4.svg" alt="wakatime"></a>
+	<a href="https://modrinth.com/plugin/ToolStats"><img alt="modrinth" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg"></a>
+	<a href="https://hangar.papermc.io/hyperdefined/ToolStats"><img alt="hangar" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/hangar_vector.svg"></a>
+	<a href="https://papermc.io"><img alt="paper" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg"></a>
+	<a href="https://github.com/hyperdefined/ToolStats/wiki"><img alt="ghpages" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/documentation/ghpages_vector.svg"></a>
+	<a href="https://discord.gg/rJuQXVcJz8"><img alt="discord-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/discord-singular_vector.svg"></a>
+	<a href="https://buymeacoffee.com/hyperdefined"><img alt="buymeacoffee-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/donate/buymeacoffee-singular_vector.svg"></a>
 </p>
 
-ToolStats is a small plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can disable/enable which stats are shown on which tools via the config. Note: stats are tracked regardless of config setting. The config is to disable the lore on the item.
+ToolStats is a Paper plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can either track all statistics by default, or a use a token system to add statistics to tool/armor. You can configure how each statistic is shown on the item, or disable it!
 
 Here is everything it tracks:
 * Blocks mined (pickaxes, shovels, axes, hoes, shears)
 * Crops mined (hoes)
-* Player/mob kills (swords, axes, tridents, bows/crossbows)
+* Player/mob kills (swords, axes, tridents, bows/crossbows, mace)
 * Ownership of items when crafted, looted (from chests), traded, spawned via creative, and caught from fishing.
 * Armor damage taken.
 * Fish caught.
 * Sheep sheared.
 * Arrows shot (bows/crossbows)
+* Flight time with elytras.
 
-The best part is, this data is stored on the item itself. You can also change how the lore is displayed on the items!
+The best part is, this data is stored on the item itself.
 
 If item lore is ever incorrect/missing, you can run `/toolstats reset`. This command fixes the lore on whatever item you are holding.
 
@@ -37,10 +37,12 @@ If item lore is ever incorrect/missing, you can run `/toolstats reset`. This com
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image9.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image10.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image11.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image13.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image14.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image12.png)
 
 ## Documentation
 Visit the [wiki](https://github.com/hyperdefined/ToolStats/wiki) for help.
 
 ## License
-This plugin is released under GNU General Public License v3. See [LICENSE](https://github.com/hyperdefined/ToolStats/blob/master/LICENSE).
+This plugin is released under GNU General Public License v3. See [LICENSE](https://github.com/hyperdefined/ToolStats/blob/master/LICENSE).

pom.xml

@@ -23,13 +23,13 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.8.2</version>
+    <version>1.9.3</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -37,7 +37,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>auto-clean</id>
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -67,18 +67,10 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>lol.hyper.toolstats.bstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>net.kyori.adventure</pattern>
-                            <shadedPattern>lol.hyper.toolstats.adventure</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>lol.hyper.githubreleaseapi</pattern>
                             <shadedPattern>lol.hyper.toolstats.updater</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>space.arim.morepaperlib</pattern>
-                            <shadedPattern>lol.hyper.toolstats.morepaperlib</shadedPattern>
-                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -104,26 +96,22 @@
 
     <repositories>
         <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>arim-mvn-lgpl3</id>
-            <url>https://mvn-repo.arim.space/lesser-gpl3/</url>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.3</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -132,29 +120,5 @@
             <version>1.0.5</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.17.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>space.arim.morepaperlib</groupId>
-            <artifactId>morepaperlib</artifactId>
-            <version>0.4.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-chat</artifactId>
-            <version>1.20-R0.2</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -19,28 +19,24 @@ package lol.hyper.toolstats;
 
 import lol.hyper.githubreleaseapi.GitHubRelease;
 import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
+import lol.hyper.githubreleaseapi.ReleaseNotFoundException;
 import lol.hyper.toolstats.commands.CommandToolStats;
 import lol.hyper.toolstats.events.*;
-import lol.hyper.toolstats.tools.HashMaker;
-import lol.hyper.toolstats.tools.ItemChecker;
-import lol.hyper.toolstats.tools.ItemLore;
-import lol.hyper.toolstats.tools.NumberFormat;
+import lol.hyper.toolstats.tools.*;
 import lol.hyper.toolstats.tools.config.ConfigTools;
 import lol.hyper.toolstats.tools.config.ConfigUpdater;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import lol.hyper.toolstats.tools.config.TokenItems;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.NamespacedKey;
-import org.bukkit.World;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import space.arim.morepaperlib.MorePaperLib;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.logging.Logger;
 
 public final class ToolStats extends JavaPlugin {
@@ -48,7 +44,7 @@ public final class ToolStats extends JavaPlugin {
     /**
      * Stores who created an item.
      */
-    public final NamespacedKey genericOwner = new NamespacedKey(this, "owner");
+    public final NamespacedKey itemOwner = new NamespacedKey(this, "owner");
     /**
      * Stores when the item was created.
      */
@@ -56,15 +52,15 @@ public final class ToolStats extends JavaPlugin {
     /**
      * Stores how many player kills.
      */
-    public final NamespacedKey swordPlayerKills = new NamespacedKey(this, "player-kills");
+    public final NamespacedKey playerKills = new NamespacedKey(this, "player-kills");
     /**
      * Stores how many mob kills.
      */
-    public final NamespacedKey swordMobKills = new NamespacedKey(this, "mob-kills");
+    public final NamespacedKey mobKills = new NamespacedKey(this, "mob-kills");
     /**
      * Stores how many blocks were mined.
      */
-    public final NamespacedKey genericMined = new NamespacedKey(this, "generic-mined");
+    public final NamespacedKey blocksMined = new NamespacedKey(this, "generic-mined");
     /**
      * Stores how many crops were harvested.
      */
@@ -72,19 +68,19 @@ public final class ToolStats extends JavaPlugin {
     /**
      * Stores how many fish were caught.
      */
-    public final NamespacedKey fishingRodCaught = new NamespacedKey(this, "fish-caught");
+    public final NamespacedKey fishCaught = new NamespacedKey(this, "fish-caught");
     /**
      * Stores how many sheep were sheared.
      */
-    public final NamespacedKey shearsSheared = new NamespacedKey(this, "sheared");
+    public final NamespacedKey sheepSheared = new NamespacedKey(this, "sheared");
     /**
      * Stores how much damage an armor piece has taken.
      */
     public final NamespacedKey armorDamage = new NamespacedKey(this, "damage-taken");
     /**
-     * Stores how much damage an armor piece has taken (as an int).
+     * Stores how much damage a weapon has done.
      */
-    public final NamespacedKey armorDamageInt = new NamespacedKey(this, "damage-taken-int");
+    public final NamespacedKey damageDone = new NamespacedKey(this, "damage-done");
     /**
      * Key for tracking new elytras that spawn.
      */
@@ -101,6 +97,14 @@ public final class ToolStats extends JavaPlugin {
      * Key for tracking flight time.
      */
     public final NamespacedKey flightTime = new NamespacedKey(this, "flightTime");
+    /**
+     * Key for token type. This is for the token itself.
+     */
+    public final NamespacedKey tokenType = new NamespacedKey(this, "token-type");
+    /**
+     * Key for applied token. This is what goes onto the tool/armor to record the type.
+     */
+    public final NamespacedKey tokenApplied = new NamespacedKey(this, "token-applied");
     /**
      * Stores how an item was created.
      * 0 = crafted.
@@ -113,11 +117,13 @@ public final class ToolStats extends JavaPlugin {
      */
     public final NamespacedKey originType = new NamespacedKey(this, "origin");
 
-    public final int CONFIG_VERSION = 7;
+    public final int CONFIG_VERSION = 11;
     public final Logger logger = this.getLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
+    public boolean tokens = false;
+    public final Set<NamespacedKey> tokenKeys = new HashSet<>();
 
-    public BlocksMined blocksMined;
+    public BlockBreak blockBreak;
     public ChunkPopulate chunkPopulate;
     public CraftItem craftItem;
     public EntityDeath entityDeath;
@@ -134,26 +140,36 @@ public final class ToolStats extends JavaPlugin {
     public PlayerJoin playerJoin;
     public NumberFormat numberFormat;
     public YamlConfiguration config;
-    private BukkitAudiences adventure;
-    public MorePaperLib morePaperLib;
     public HashMaker hashMaker;
     public CreativeEvent creativeEvent;
     public PlayerMove playerMove;
     public ItemChecker itemChecker;
     public ShootBow shootBow;
     public ConfigTools configTools;
+    public TokenItems tokenItems;
+    public TokenCrafting tokenCrafting;
+    public AnvilEvent anvilEvent;
+    public PrepareCraft prepareCraft;
 
     @Override
     public void onEnable() {
-        this.adventure = BukkitAudiences.create(this);
-        morePaperLib = new MorePaperLib(this);
         if (!configFile.exists()) {
             this.saveResource("config.yml", true);
             logger.info("Copying default config!");
         }
+
         loadConfig();
+        configTools = new ConfigTools(this);
+        tokenItems = new TokenItems(this);
+        tokenCrafting = new TokenCrafting(this);
+        tokenCrafting.setup();
+        for (ShapedRecipe recipe : tokenCrafting.getRecipes()) {
+            if (tokens && config.getBoolean("tokens.craft-tokens")) {
+                Bukkit.addRecipe(recipe);
+            }
+        }
         hashMaker = new HashMaker(this);
-        blocksMined = new BlocksMined(this);
+        blockBreak = new BlockBreak(this);
         craftItem = new CraftItem(this);
         chunkPopulate = new ChunkPopulate(this);
         entityDeath = new EntityDeath(this);
@@ -170,11 +186,24 @@ public final class ToolStats extends JavaPlugin {
         playerJoin = new PlayerJoin(this);
         creativeEvent = new CreativeEvent(this);
         playerMove = new PlayerMove(this);
-        itemChecker = new ItemChecker();
+        itemChecker = new ItemChecker(this);
+        itemChecker.setup();
         shootBow = new ShootBow(this);
-        configTools = new ConfigTools(this);
+        anvilEvent = new AnvilEvent(this);
+        prepareCraft = new PrepareCraft(this);
 
-        Bukkit.getServer().getPluginManager().registerEvents(blocksMined, this);
+        // save which stat can be used by a reset token
+        tokenKeys.add(blocksMined);
+        tokenKeys.add(playerKills);
+        tokenKeys.add(mobKills);
+        tokenKeys.add(cropsHarvested);
+        tokenKeys.add(sheepSheared);
+        tokenKeys.add(fishCaught);
+        tokenKeys.add(flightTime);
+        tokenKeys.add(arrowsShot);
+        tokenKeys.add(armorDamage);
+
+        Bukkit.getServer().getPluginManager().registerEvents(blockBreak, this);
         Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
         Bukkit.getServer().getPluginManager().registerEvents(craftItem, this);
         Bukkit.getServer().getPluginManager().registerEvents(entityDeath, this);
@@ -190,12 +219,13 @@ public final class ToolStats extends JavaPlugin {
         Bukkit.getServer().getPluginManager().registerEvents(creativeEvent, this);
         Bukkit.getServer().getPluginManager().registerEvents(shootBow, this);
         Bukkit.getServer().getPluginManager().registerEvents(playerMove, this);
+        Bukkit.getServer().getPluginManager().registerEvents(anvilEvent, this);
+        Bukkit.getServer().getPluginManager().registerEvents(prepareCraft, this);
 
         this.getCommand("toolstats").setExecutor(commandToolStats);
 
         new Metrics(this, 14110);
-
-        morePaperLib.scheduling().asyncScheduler().run(this::checkForUpdates);
+        Bukkit.getAsyncScheduler().runNow(this, scheduledTask -> checkForUpdates());
     }
 
     public void loadConfig() {
@@ -206,6 +236,14 @@ public final class ToolStats extends JavaPlugin {
             configUpdater.updateConfig();
         }
 
+        if (config.getBoolean("tokens.enabled")) {
+            logger.info("The token system is enabled! This means you must apply tokens to items in order for them to track.");
+            logger.info("Item origins (crafted, traded, found, etc) will still apply to items.");
+            logger.info("https://github.com/hyperdefined/ToolStats/wiki/Token-System");
+        }
+
+        tokens = config.getBoolean("tokens.enabled");
+
         numberFormat = new NumberFormat(this);
     }
 
@@ -218,12 +256,14 @@ public final class ToolStats extends JavaPlugin {
             e.printStackTrace();
             return;
         }
-        GitHubRelease current = api.getReleaseByTag(this.getDescription().getVersion());
-        GitHubRelease latest = api.getLatestVersion();
-        if (current == null) {
+        GitHubRelease current;
+        try {
+            current = api.getReleaseByTag(this.getPluginMeta().getVersion());
+        } catch (ReleaseNotFoundException e) {
             logger.warning("You are running a version that does not exist on GitHub. If you are in a dev environment, you can ignore this. Otherwise, this is a bug!");
             return;
         }
+        GitHubRelease latest = api.getLatestVersion();
         int buildsBehind = api.getBuildsBehind(current);
         if (buildsBehind == 0) {
             logger.info("You are running the latest version.");
@@ -231,23 +271,4 @@ public final class ToolStats extends JavaPlugin {
             logger.warning("A new version is available (" + latest.getTagVersion() + ")! You are running version " + current.getTagVersion() + ". You are " + buildsBehind + " version(s) behind.");
         }
     }
-
-    public BukkitAudiences getAdventure() {
-        if (this.adventure == null) {
-            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
-        }
-        return this.adventure;
-    }
-
-    public void scheduleEntity(BukkitRunnable runnable, Entity entity, int delay) {
-        morePaperLib.scheduling().entitySpecificScheduler(entity).runDelayed(runnable, null, delay);
-    }
-
-    public void scheduleGlobal(BukkitRunnable runnable, int delay) {
-        morePaperLib.scheduling().globalRegionalScheduler().runDelayed(runnable, delay);
-    }
-
-    public void scheduleRegion(BukkitRunnable runnable, World world, Chunk chunk, int delay) {
-        morePaperLib.scheduling().regionSpecificScheduler(world, chunk.getX(), chunk.getZ()).runDelayed(runnable, delay);
-    }
 }

src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java

@@ -19,7 +19,6 @@ package lol.hyper.toolstats.commands;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -31,6 +30,7 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
@@ -42,65 +42,130 @@ import java.util.*;
 public class CommandToolStats implements TabExecutor {
 
     private final ToolStats toolStats;
-    private final BukkitAudiences audiences;
 
     public CommandToolStats(ToolStats toolStats) {
         this.toolStats = toolStats;
-        this.audiences = toolStats.getAdventure();
     }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
         if (!sender.hasPermission("toolstats.command")) {
-            audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+            sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
             return true;
         }
         if (args.length == 0) {
-            audiences.sender(sender).sendMessage(Component.text("ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
+            sender.sendMessage(Component.text("ToolStats version " + toolStats.getPluginMeta().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
             return true;
         }
         switch (args[0]) {
             case "reload": {
                 if (sender.hasPermission("toolstats.reload")) {
+                    boolean oldTokensStatus = toolStats.tokens;
                     toolStats.loadConfig();
-                    audiences.sender(sender).sendMessage(Component.text("Configuration reloaded!", NamedTextColor.GREEN));
+                    toolStats.tokenCrafting.getRecipes().clear();
+                    toolStats.tokenCrafting.setup();
+                    // if the server went from tokens off -> on, add the recipes
+                    // if the server went from tokens on -> off, remove the recipes
+                    if (toolStats.tokens != oldTokensStatus) {
+                        // tokens are now enabled
+                        if (toolStats.tokens) {
+                            sender.sendMessage(Component.text("It looks like you ENABLED the token system. While this is fine, it can break. Please restart your server instead.", NamedTextColor.YELLOW));
+                            if (toolStats.config.getBoolean("tokens.craft-token")) {
+                                for (ShapedRecipe recipe : toolStats.tokenCrafting.getRecipes()) {
+                                    Bukkit.addRecipe(recipe);
+                                }
+                            }
+                        } else {
+                            // tokens are now disabled
+                            sender.sendMessage(Component.text("It looks like you DISABLED the token system. While this is fine, it can break. Please restart your server instead.", NamedTextColor.YELLOW));
+                            for (ShapedRecipe recipe : toolStats.tokenCrafting.getRecipes()) {
+                                Bukkit.removeRecipe(recipe.getKey());
+                            }
+                        }
+                    }
+                    sender.sendMessage(Component.text("Configuration reloaded!", NamedTextColor.GREEN));
                 } else {
-                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
                 }
                 return true;
             }
             case "reset": {
                 if (!sender.hasPermission("toolstats.reset")) {
-                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
                     return true;
                 }
                 if (sender instanceof ConsoleCommandSender) {
-                    audiences.sender(sender).sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
+                    sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
                     return true;
                 }
                 if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
                     if (!sender.hasPermission("toolstats.reset.confirm")) {
-                        audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                        sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
                         return true;
                     }
                     Player player = (Player) sender;
                     ItemStack heldItem = player.getInventory().getItemInMainHand();
                     if (!toolStats.itemChecker.isValidItem(heldItem.getType())) {
-                        audiences.sender(sender).sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
+                        sender.sendMessage(Component.text("You must hold a valid item.", NamedTextColor.RED));
                         return true;
                     }
                     fixItemLore(heldItem, player);
-                    audiences.sender(sender).sendMessage(Component.text("The lore was reset!", NamedTextColor.GREEN));
+                    sender.sendMessage(Component.text("The lore was reset!", NamedTextColor.GREEN));
                     return true;
                 }
-                audiences.sender(sender).sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.", NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("If the owner of the item is broken, it will reset to the person holding it.", NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("Only use this if the tags on the tool are incorrect.", NamedTextColor.GREEN));
-                audiences.sender(sender).sendMessage(Component.text("Type /toolstats reset confirm to confirm this.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("If the owner of the item is broken, it will reset to the person holding it.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("Only use this if the tags on the tool are incorrect.", NamedTextColor.GREEN));
+                sender.sendMessage(Component.text("Type /toolstats reset confirm to confirm this.", NamedTextColor.GREEN));
+                return true;
+            }
+            case "givetokens": {
+                if (!sender.hasPermission("toolstats.givetokens")) {
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                    return true;
+                }
+                // Make sure /toolstats givetoken <player> <token> is present
+                if (args.length < 3) {
+                    sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats givetokens <player> <token>", NamedTextColor.RED));
+                    return true;
+                }
+                Player target = Bukkit.getPlayerExact(args[1]);
+                if (target == null) {
+                    sender.sendMessage(Component.text("Player not found.", NamedTextColor.RED));
+                    return true;
+                }
+                String tokenType = args[2];
+                if (!toolStats.tokenCrafting.getTokenTypes().contains(tokenType)) {
+                    sender.sendMessage(Component.text("Invalid token type.", NamedTextColor.RED));
+                    return true;
+                }
+                // make sure tokens are enabled before giving
+                if (!toolStats.config.getBoolean("tokens.enabled")) {
+                    sender.sendMessage(Component.text("Unable to give tokens. Tokens are disabled", NamedTextColor.RED));
+                    return true;
+                }
+                // if the user does not send in a number, default to 1
+                int amount = 1;
+                if (args.length >= 4) {
+                    try {
+                        amount = Integer.parseInt(args[3]);
+                        if (amount <= 0) { // Optional: Prevent negative or zero values
+                            sender.sendMessage(Component.text("Token quantity must be above or 1.", NamedTextColor.RED));
+                            return true;
+                        }
+                    } catch (NumberFormatException exception) {
+                        sender.sendMessage(Component.text("Invalid token quantity.", NamedTextColor.RED));
+                        return true;
+                    }
+                }
+                giveToken(target, tokenType, amount);
+                if (sender instanceof Player) {
+                    sender.sendMessage(Component.text("Gave " + target.getName() + " " + amount + " " + tokenType + " tokens.", NamedTextColor.GREEN));
+                }
                 return true;
             }
             default: {
-                audiences.sender(sender).sendMessage(Component.text("Invalid sub-command.", NamedTextColor.RED));
+                sender.sendMessage(Component.text("Invalid sub-command.", NamedTextColor.RED));
             }
         }
         return true;
@@ -119,7 +184,7 @@ public class CommandToolStats implements TabExecutor {
             return;
         }
         PersistentDataContainer container = finalMeta.getPersistentDataContainer();
-        List<String> lore = new ArrayList<>();
+        List<Component> lore = new ArrayList<>();
 
         // set how the item was obtained
         Integer origin = -1;
@@ -145,27 +210,28 @@ public class CommandToolStats implements TabExecutor {
 
             if (flightTime != null) {
                 if (toolStats.config.getBoolean("enabled.flight-time")) {
-                    String line = toolStats.configTools.formatLore("flight-time", "{time}", toolStats.numberFormat.formatDouble((double) flightTime / 1000));
+                    Map<String, String> flightTimeFormatted = toolStats.numberFormat.formatTime(flightTime);
+                    Component line = toolStats.configTools.formatLoreMultiplePlaceholders("flight-time", flightTimeFormatted);
                     lore.add(line);
                 }
             }
 
             if (timeCreated != null) {
-                String timeCreatedLine = toolStats.configTools.formatLore("looted.found-by", "{player}", player.getName());
-                String playerOwnerLine = toolStats.configTools.formatLore("looted.found-on", "{date}", toolStats.numberFormat.formatDate(new Date(timeCreated)));
+                Component timeCreatedLine = toolStats.configTools.formatLore("looted.found-by", "{player}", player.getName());
+                Component playerOwnerLine = toolStats.configTools.formatLore("looted.found-on", "{date}", toolStats.numberFormat.formatDate(new Date(timeCreated)));
                 lore.add(timeCreatedLine);
                 lore.add(playerOwnerLine);
             }
 
-            finalMeta.setLore(lore);
+            finalMeta.lore(lore);
             finalItem.setItemMeta(finalMeta);
             int slot = player.getInventory().getHeldItemSlot();
             player.getInventory().setItem(slot, finalItem);
         }
 
         if (toolStats.configTools.checkConfig(original.getType(), "created-by")) {
-            if (container.has(toolStats.genericOwner, new UUIDDataType())) {
-                UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
+            if (container.has(toolStats.itemOwner, new UUIDDataType())) {
+                UUID owner = container.get(toolStats.itemOwner, new UUIDDataType());
                 String ownerName = null;
                 // if we can read the current owner
                 if (owner != null) {
@@ -176,9 +242,9 @@ public class CommandToolStats implements TabExecutor {
                 // if the owner's name is null for whatever reason, set the new owner
                 // to the current player running the command
                 if (ownerName == null) {
-                    audiences.player(player).sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
+                    player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
                     ownerName = player.getName();
-                    container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
+                    container.set(toolStats.itemOwner, new UUIDDataType(), player.getUniqueId());
                 }
 
                 // show how the item was created based on the previous lore
@@ -246,16 +312,16 @@ public class CommandToolStats implements TabExecutor {
             }
         }
         if (toolStats.configTools.checkConfig(original.getType(), "player-kills")) {
-            if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
-                Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
+            if (container.has(toolStats.playerKills, PersistentDataType.INTEGER)) {
+                Integer kills = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
                 if (kills != null) {
                     lore.add(toolStats.configTools.formatLore("kills.player", "{kills}", toolStats.numberFormat.formatInt(kills)));
                 }
             }
         }
         if (toolStats.configTools.checkConfig(original.getType(), "mob-kills")) {
-            if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
-                Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
+            if (container.has(toolStats.mobKills, PersistentDataType.INTEGER)) {
+                Integer kills = container.get(toolStats.mobKills, PersistentDataType.INTEGER);
                 if (kills != null) {
                     lore.add(toolStats.configTools.formatLore("kills.mob", "{kills}", toolStats.numberFormat.formatInt(kills)));
                 }
@@ -270,24 +336,24 @@ public class CommandToolStats implements TabExecutor {
                     }
                 }
             }
-            if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
-                Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
+            if (container.has(toolStats.blocksMined, PersistentDataType.INTEGER)) {
+                Integer blocksMined = container.get(toolStats.blocksMined, PersistentDataType.INTEGER);
                 if (blocksMined != null) {
                     lore.add(toolStats.configTools.formatLore("blocks-mined", "{blocks}", toolStats.numberFormat.formatInt(blocksMined)));
                 }
             }
         }
         if (toolStats.config.getBoolean("enabled.fish-caught")) {
-            if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
-                Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
+            if (container.has(toolStats.fishCaught, PersistentDataType.INTEGER)) {
+                Integer fish = container.get(toolStats.fishCaught, PersistentDataType.INTEGER);
                 if (fish != null) {
                     lore.add(toolStats.configTools.formatLore("fished.fish-caught", "{fish}", toolStats.numberFormat.formatInt(fish)));
                 }
             }
         }
         if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
-            if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
-                Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
+            if (container.has(toolStats.sheepSheared, PersistentDataType.INTEGER)) {
+                Integer sheep = container.get(toolStats.sheepSheared, PersistentDataType.INTEGER);
                 if (sheep != null) {
                     lore.add(toolStats.configTools.formatLore("sheep-sheared", "{sheep}", toolStats.numberFormat.formatInt(sheep)));
                 }
@@ -309,30 +375,119 @@ public class CommandToolStats implements TabExecutor {
                 }
             }
         }
-        finalMeta.setLore(lore);
+        finalMeta.lore(lore);
         finalItem.setItemMeta(finalMeta);
         int slot = player.getInventory().getHeldItemSlot();
         player.getInventory().setItem(slot, finalItem);
     }
 
+    /**
+     * Gives a player a token.
+     *
+     * @param target    The player.
+     * @param tokenType The token type.
+     */
+    private void giveToken(Player target, String tokenType, int amount) {
+        switch (tokenType) {
+            case "crops-mined": {
+                ItemStack itemStack = toolStats.tokenItems.cropsMined();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "blocks-mined": {
+                ItemStack itemStack = toolStats.tokenItems.blocksMined();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "damage-taken": {
+                ItemStack itemStack = toolStats.tokenItems.damageTaken();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "damage-done": {
+                ItemStack itemStack = toolStats.tokenItems.damageDone();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "mob-kills": {
+                ItemStack itemStack = toolStats.tokenItems.mobKills();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "player-kills": {
+                ItemStack itemStack = toolStats.tokenItems.playerKills();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "arrows-shot": {
+                ItemStack itemStack = toolStats.tokenItems.arrowsShot();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "sheep-sheared": {
+                ItemStack itemStack = toolStats.tokenItems.sheepSheared();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "flight-time": {
+                ItemStack itemStack = toolStats.tokenItems.flightTime();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "fish-caught": {
+                ItemStack itemStack = toolStats.tokenItems.fishCaught();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "reset": {
+                ItemStack itemStack = toolStats.tokenItems.resetToken();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+            case "remove": {
+                ItemStack itemStack = toolStats.tokenItems.removeToken();
+                itemStack.setAmount(amount);
+                target.getInventory().addItem(itemStack);
+                break;
+            }
+        }
+    }
+
     @Nullable
     @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String @NotNull [] args) {
         if (args.length == 1) {
+            List<String> suggestions = new ArrayList<>();
             if (sender.hasPermission("toolstats.reload")) {
-                return Arrays.asList("reset", "reload");
+                suggestions.add("reload");
             }
             if (sender.hasPermission("toolstats.reset")) {
-                return Collections.singletonList("reset");
+                suggestions.add("reset");
             }
-        }
-        if (args.length == 2) {
-            if (args[0].equalsIgnoreCase("reset")) {
-                if (sender.hasPermission("toolstats.reset.confirm")) {
-                    return Collections.singletonList("confirm");
-                }
+            if (sender.hasPermission("toolstats.givetokens")) {
+                suggestions.add("givetokens");
             }
+            return suggestions.isEmpty() ? null : suggestions;
         }
+
+        if (args.length == 2 && args[0].equalsIgnoreCase("reset") && sender.hasPermission("toolstats.reset.confirm")) {
+            return Collections.singletonList("confirm");
+        }
+        if (args.length == 3 && args[0].equalsIgnoreCase("givetokens") && sender.hasPermission("toolstats.givetokens")) {
+            return toolStats.tokenCrafting.getTokenTypes();
+        }
+
         return null;
     }
 }

src/main/java/lol/hyper/toolstats/events/AnvilEvent.java

@@ -0,0 +1,545 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.PrepareAnvilEvent;
+import org.bukkit.inventory.AnvilInventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.Locale;
+
+public class AnvilEvent implements Listener {
+
+    private final ToolStats toolStats;
+
+    public AnvilEvent(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onAnvilEvent(PrepareAnvilEvent event) {
+        // only listen if the token system is enabled
+        if (!toolStats.config.getBoolean("tokens.enabled")) {
+            return;
+        }
+        AnvilInventory inventory = event.getInventory();
+
+        ItemStack firstSlot = inventory.getItem(0);
+        ItemStack secondSlot = inventory.getItem(1);
+
+        // make sure both slots have items
+        if (firstSlot == null || secondSlot == null) {
+            return;
+        }
+
+        Material firstSlotMaterial = firstSlot.getType();
+        Material secondSlotMaterial = secondSlot.getType();
+
+        // make sure the first item is a valid item
+        if (!toolStats.itemChecker.isValidItem(firstSlotMaterial)) {
+            return;
+        }
+
+        PersistentDataContainer secondSlotContainer = secondSlot.getItemMeta().getPersistentDataContainer();
+
+        // make sure the 2nd item is one of ours
+        if (secondSlotMaterial != Material.PAPER || !secondSlotContainer.has(toolStats.tokenType, PersistentDataType.STRING)) {
+            return;
+        }
+
+        // get the type from the token
+        String tokenType = secondSlotContainer.get(toolStats.tokenType, PersistentDataType.STRING);
+        if (tokenType == null) {
+            return;
+        }
+
+        // don't let the player use more than one
+        if (secondSlot.getAmount() > 1) {
+            return;
+        }
+
+        // clone the item
+        ItemStack clone = firstSlot.clone();
+
+        if (tokenType.equalsIgnoreCase("reset")) {
+            reset(event, clone);
+            return;
+        }
+
+        if (tokenType.equalsIgnoreCase("remove")) {
+            remove(event, clone);
+            return;
+        }
+
+        // if the item is a mining tool
+        if (toolStats.itemChecker.isMineTool(firstSlotMaterial)) {
+            if (firstSlotMaterial.toString().toLowerCase(Locale.ROOT).contains("hoe")) {
+                // the item is a hoe
+                if (tokenType.equalsIgnoreCase("blocks-mined")) {
+                    addToken(event, tokenType, "blocks-mined", clone);
+                }
+                if (tokenType.equalsIgnoreCase("crops-mined")) {
+                    addToken(event, tokenType, "crops-mined", clone);
+                }
+            } else {
+                // since shears will fall under here, check if the token is for sheep sheared
+                if (firstSlotMaterial == Material.SHEARS && tokenType.equals("sheep-sheared")) {
+                    addToken(event, tokenType, "sheep-sheared", clone);
+                    return;
+                }
+                addToken(event, tokenType, "blocks-mined", clone);
+            }
+            // axes are a mining tool, so double check them here for player/mob kills
+            if (firstSlotMaterial.toString().toLowerCase(Locale.ROOT).contains("_axe")) {
+                if (tokenType.equalsIgnoreCase("player-kills")) {
+                    addToken(event, tokenType, "player-kills", clone);
+                    return;
+                }
+                if (tokenType.equalsIgnoreCase("mob-kills")) {
+                    addToken(event, tokenType, "mob-kills", clone);
+                    return;
+                }
+            }
+            return;
+        }
+        if (toolStats.itemChecker.isArmor(firstSlotMaterial)) {
+            addToken(event, tokenType, "damage-taken", clone);
+            return;
+        }
+        if (toolStats.itemChecker.isMeleeWeapon(firstSlotMaterial)) {
+            if (tokenType.equalsIgnoreCase("player-kills")) {
+                addToken(event, tokenType, "player-kills", clone);
+                return;
+            }
+            if (tokenType.equalsIgnoreCase("mob-kills")) {
+                addToken(event, tokenType, "mob-kills", clone);
+                return;
+            }
+            if (tokenType.equalsIgnoreCase("damage-done")) {
+                addToken(event, tokenType, "damage-done", clone);
+                return;
+            }
+            return;
+        }
+        if (firstSlotMaterial == Material.BOW || firstSlotMaterial == Material.CROSSBOW) {
+            if (tokenType.equalsIgnoreCase("player-kills")) {
+                addToken(event, tokenType, "player-kills", clone);
+                return;
+            }
+            if (tokenType.equalsIgnoreCase("mob-kills")) {
+                addToken(event, tokenType, "mob-kills", clone);
+                return;
+            }
+            if (tokenType.equalsIgnoreCase("arrows-shot")) {
+                addToken(event, tokenType, "arrows-shot", clone);
+                return;
+            }
+            if (tokenType.equalsIgnoreCase("damage-done")) {
+                addToken(event, tokenType, "damage-done", clone);
+                return;
+            }
+            return;
+        }
+        if (firstSlotMaterial == Material.ELYTRA) {
+            addToken(event, tokenType, "flight-time", clone);
+            return;
+        }
+        if (firstSlotMaterial == Material.FISHING_ROD) {
+            addToken(event, tokenType, "fish-caught", clone);
+        }
+    }
+
+    /**
+     * Add token to an item.
+     *
+     * @param event         The anvil event.
+     * @param attemptToken  The token in the 2nd slot of the anvil. The one the player wants to add.
+     * @param targetToken   The token we are checking for. This should match the tool.
+     * @param firstSlotItem The item in the first slot.
+     */
+    private void addToken(PrepareAnvilEvent event, String attemptToken, String targetToken, ItemStack firstSlotItem) {
+        // make sure the token we are using is for this tool
+        if (!attemptToken.equalsIgnoreCase(targetToken)) {
+            event.setResult(null);
+            return;
+        }
+
+        // if the item already has the token, ignore
+        if (toolStats.itemChecker.checkTokens(firstSlotItem.getItemMeta().getPersistentDataContainer(), targetToken)) {
+            event.setResult(null);
+            return;
+        }
+
+        // apply the token and set the result
+        ItemStack newItem = toolStats.itemChecker.addToken(firstSlotItem, targetToken);
+        switch (targetToken) {
+            case "crops-mined": {
+                if (toolStats.config.getBoolean("enabled.crops-harvested")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateCropsMined(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "blocks-mined": {
+                if (toolStats.configTools.checkConfig(newItem.getType(), "blocks-mined")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateBlocksMined(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "damage-taken": {
+                if (toolStats.config.getBoolean("enabled.armor-damage")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateArmorDamage(newItem, 0.0, false));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "damage-done": {
+                if (toolStats.configTools.checkConfig(newItem.getType(), "damage-done")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateWeaponDamage(newItem, 0.0, false));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "mob-kills": {
+                if (toolStats.configTools.checkConfig(newItem.getType(), "mob-kills")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateMobKills(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "player-kills": {
+                if (toolStats.configTools.checkConfig(newItem.getType(), "player-kills")) {
+                    newItem.setItemMeta(toolStats.itemLore.updatePlayerKills(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "arrows-shot": {
+                if (toolStats.config.getBoolean("enabled.arrows-shot")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateArrowsShot(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "sheep-sheared": {
+                if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateSheepSheared(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "flight-time": {
+                if (toolStats.config.getBoolean("enabled.flight-time")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateFlightTime(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+            case "fish-caught": {
+                if (toolStats.config.getBoolean("enabled.fish-caught")) {
+                    newItem.setItemMeta(toolStats.itemLore.updateFishCaught(newItem, 0));
+                } else {
+                    event.setResult(null);
+                    return;
+                }
+                break;
+            }
+        }
+        event.setResult(newItem);
+        event.getView().setRepairCost(toolStats.itemChecker.getCost(targetToken));
+    }
+
+    /**
+     * Reset an item's stats. This function is... gross.
+     * Because of how the lore system is set up, we have to basically revert the stats.
+     * The lore function requires the old value, then adds x to the current stat.
+     * This is required, so it can find the old line in the lore and update it.
+     * So we simply make the stat negative, and add it to reset it to zero.
+     * Gross? Yeah, but I don't want to rewrite the lore system again...
+     *
+     * @param event     The PrepareAnvilEvent event.
+     * @param inputItem The input item to reset.
+     */
+    private void reset(PrepareAnvilEvent event, ItemStack inputItem) {
+        ItemStack finalItem = inputItem.clone();
+        ItemMeta meta = finalItem.getItemMeta();
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        if (container.has(toolStats.playerKills)) {
+            Integer playerKills = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+            if (playerKills == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updatePlayerKills(finalItem, -playerKills);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.mobKills)) {
+            Integer mobKills = container.get(toolStats.mobKills, PersistentDataType.INTEGER);
+            if (mobKills == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateMobKills(finalItem, -mobKills);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.blocksMined)) {
+            Integer blocksMined = container.get(toolStats.blocksMined, PersistentDataType.INTEGER);
+            if (blocksMined == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateBlocksMined(finalItem, -blocksMined);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.cropsHarvested)) {
+            Integer cropsHarvested = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+            if (cropsHarvested == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateCropsMined(finalItem, -cropsHarvested);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.fishCaught)) {
+            Integer fishCaught = container.get(toolStats.fishCaught, PersistentDataType.INTEGER);
+            if (fishCaught == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateFishCaught(finalItem, -fishCaught);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.sheepSheared)) {
+            Integer sheepSheared = container.get(toolStats.sheepSheared, PersistentDataType.INTEGER);
+            if (sheepSheared == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateSheepSheared(finalItem, -sheepSheared);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.armorDamage)) {
+            Double armorDamage = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+            if (armorDamage == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateArmorDamage(finalItem, -armorDamage, true);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.damageDone)) {
+            Double damageDone = container.get(toolStats.damageDone, PersistentDataType.DOUBLE);
+            if (damageDone == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateArmorDamage(finalItem, -damageDone, true);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.arrowsShot)) {
+            Integer arrowsShot = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
+            if (arrowsShot == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateArrowsShot(finalItem, -arrowsShot);
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.flightTime)) {
+            Long flightTime = container.get(toolStats.flightTime, PersistentDataType.LONG);
+            if (flightTime == null) {
+                return;
+            }
+            meta = toolStats.itemLore.updateFlightTime(finalItem, -flightTime);
+            finalItem.setItemMeta(meta);
+        }
+        event.setResult(finalItem);
+        event.getView().setRepairCost(toolStats.itemChecker.getCost("reset"));
+    }
+
+    /**
+     * Remove all stats from an item.
+     *
+     * @param event     The PrepareAnvilEvent event.
+     * @param inputItem The input item to remove stats from.
+     */
+    private void remove(PrepareAnvilEvent event, ItemStack inputItem) {
+        ItemStack finalItem = inputItem.clone();
+        ItemMeta meta = finalItem.getItemMeta();
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+
+        // remove the applied tokens
+        if (container.has(toolStats.tokenApplied)) {
+            container.remove(toolStats.tokenApplied);
+        }
+
+        if (container.has(toolStats.playerKills)) {
+            Integer playerKills = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+            if (playerKills == null) {
+                return;
+            }
+
+            container.remove(toolStats.playerKills);
+
+            String playerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
+            Component lineToRemove = toolStats.configTools.formatLore("kills.player", "{kills}", playerKillsFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.mobKills)) {
+            Integer mobKills = container.get(toolStats.mobKills, PersistentDataType.INTEGER);
+            if (mobKills == null) {
+                return;
+            }
+
+            container.remove(toolStats.mobKills);
+
+            String mobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
+            Component lineToRemove = toolStats.configTools.formatLore("kills.mob", "{kills}", mobKillsFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.blocksMined)) {
+            Integer blocksMined = container.get(toolStats.blocksMined, PersistentDataType.INTEGER);
+            if (blocksMined == null) {
+                return;
+            }
+
+            container.remove(toolStats.blocksMined);
+
+            String blocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
+            Component lineToRemove = toolStats.configTools.formatLore("blocks-mined", "{blocks}", blocksMinedFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.cropsHarvested)) {
+            Integer cropsHarvested = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+            if (cropsHarvested == null) {
+                return;
+            }
+
+            container.remove(toolStats.cropsHarvested);
+
+            String cropsHarvestedFormatted = toolStats.numberFormat.formatInt(cropsHarvested);
+            Component lineToRemove = toolStats.configTools.formatLore("crops-harvested", "{crops}", cropsHarvestedFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.fishCaught)) {
+            Integer fishCaught = container.get(toolStats.fishCaught, PersistentDataType.INTEGER);
+            if (fishCaught == null) {
+                return;
+            }
+
+            container.remove(toolStats.fishCaught);
+
+            String fishCaughtFormatted = toolStats.numberFormat.formatInt(fishCaught);
+            Component lineToRemove = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", fishCaughtFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.sheepSheared)) {
+            Integer sheepSheared = container.get(toolStats.sheepSheared, PersistentDataType.INTEGER);
+            if (sheepSheared == null) {
+                return;
+            }
+
+            container.remove(toolStats.sheepSheared);
+
+            String sheepShearedFormatted = toolStats.numberFormat.formatInt(sheepSheared);
+            Component lineToRemove = toolStats.configTools.formatLore("sheep.sheared", "{sheep}", sheepShearedFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.armorDamage)) {
+            Double armorDamage = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+            if (armorDamage == null) {
+                return;
+            }
+
+            container.remove(toolStats.armorDamage);
+
+            String armorDamageFormatted = toolStats.numberFormat.formatDouble(armorDamage);
+            Component lineToRemove = toolStats.configTools.formatLore("damage-taken", "{damage}", armorDamageFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.damageDone)) {
+            Double damageDone = container.get(toolStats.damageDone, PersistentDataType.DOUBLE);
+            if (damageDone == null) {
+                return;
+            }
+
+            container.remove(toolStats.damageDone);
+
+            String damageDoneFormatted = toolStats.numberFormat.formatDouble(damageDone);
+            Component lineToRemove = toolStats.configTools.formatLore("damage-done", "{damage}", damageDoneFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.arrowsShot)) {
+            Integer arrowsShot = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
+            if (arrowsShot == null) {
+                return;
+            }
+
+            container.remove(toolStats.arrowsShot);
+
+            String arrowsShotFormatted = toolStats.numberFormat.formatInt(arrowsShot);
+            Component lineToRemove = toolStats.configTools.formatLore("arrows-shot", "{arrows}", arrowsShotFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+        if (container.has(toolStats.flightTime)) {
+            Long flightTime = container.get(toolStats.flightTime, PersistentDataType.LONG);
+            if (flightTime == null) {
+                return;
+            }
+
+            container.remove(toolStats.flightTime);
+
+            String flightTimeFormatted = toolStats.numberFormat.formatDouble(flightTime);
+            Component lineToRemove = toolStats.configTools.formatLore("flight-time", "{time}", flightTimeFormatted);
+            meta.lore(toolStats.itemLore.removeLore(meta.lore(), lineToRemove));
+            finalItem.setItemMeta(meta);
+        }
+
+        event.setResult(finalItem);
+        event.getView().setRepairCost(toolStats.itemChecker.getCost("remove"));
+    }
+}

src/main/java/lol/hyper/toolstats/events/BlockBreak.java

@@ -0,0 +1,99 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.Ageable;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.Locale;
+
+public class BlockBreak implements Listener {
+
+    private final ToolStats toolStats;
+
+    public BlockBreak(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onBreak(BlockBreakEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
+        PlayerInventory inventory = player.getInventory();
+        ItemStack heldItem = inventory.getItemInMainHand();
+        Block block = event.getBlock();
+
+        if (block.getType() == Material.CHEST) {
+            toolStats.playerInteract.openedChests.put(block, player);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> toolStats.playerInteract.openedChests.remove(block), 20);
+        }
+
+        // only check certain items
+        if (!toolStats.itemChecker.isMineTool(heldItem.getType())) {
+            return;
+        }
+
+        // if the item is a hoe
+        if (heldItem.getType().toString().toLowerCase(Locale.ROOT).contains("hoe")) {
+            // player is breaking crops with a hoe
+            if (block.getBlockData() instanceof Ageable ageable) {
+                // ignore crops that are not fully grown
+                if (ageable.getAge() != ageable.getMaximumAge()) {
+                    return;
+                }
+                ItemMeta newMeta = toolStats.itemLore.updateCropsMined(heldItem, 1);
+                if (newMeta != null) {
+                    // replace item in main hand
+                    heldItem.setItemMeta(newMeta);
+                }
+            } else {
+                // item is a hoe, but not breaking crops
+                ItemMeta newMeta = toolStats.itemLore.updateBlocksMined(heldItem, 1);
+                if (newMeta != null) {
+                    // replace item in main hand
+                    heldItem.setItemMeta(newMeta);
+                }
+            }
+        } else {
+            // item is not a hoe
+            // update the blocks mined
+            ItemMeta newMeta = toolStats.itemLore.updateBlocksMined(heldItem, 1);
+            if (newMeta != null) {
+                // replace item in main hand
+                heldItem.setItemMeta(newMeta);
+            }
+        }
+    }
+}

src/main/java/lol/hyper/toolstats/events/BlocksMined.java

@@ -1,164 +0,0 @@
-/*
- * This file is part of ToolStats.
- *
- * ToolStats is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ToolStats is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package lol.hyper.toolstats.events;
-
-import lol.hyper.toolstats.ToolStats;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.Ageable;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.List;
-import java.util.Locale;
-
-public class BlocksMined implements Listener {
-
-    private final ToolStats toolStats;
-
-    public BlocksMined(ToolStats toolStats) {
-        this.toolStats = toolStats;
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onBreak(BlockBreakEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-        Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
-            return;
-        }
-        PlayerInventory inventory = player.getInventory();
-        ItemStack heldItem = inventory.getItemInMainHand();
-        Block block = event.getBlock();
-
-        if (block.getType() == Material.CHEST) {
-            toolStats.playerInteract.openedChests.put(block, player);
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    toolStats.playerInteract.openedChests.remove(block);
-                }
-            };
-            toolStats.scheduleGlobal(runnable, 20);
-        }
-
-        // only check certain items
-        if (!toolStats.itemChecker.isMineTool(heldItem.getType())) {
-            return;
-        }
-
-        if (heldItem.getType().toString().toLowerCase(Locale.ROOT).contains("hoe")) {
-            // player is breaking crops with a hoe
-            if (block.getBlockData() instanceof Ageable) {
-                updateCropsMined(heldItem, (Ageable) block.getBlockData());
-            }
-        } else {
-            // update the blocks mined
-            updateBlocksMined(heldItem);
-        }
-    }
-
-    private void updateBlocksMined(ItemStack playerTool) {
-        ItemMeta meta = playerTool.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(playerTool + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-        // read the current stats from the item
-        // if they don't exist, then start from 0
-        Integer blocksMined = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
-            blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
-        }
-
-        if (blocksMined == null) {
-            blocksMined = 0;
-            toolStats.logger.warning(playerTool + " does not have valid generic-mined set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(playerTool.getType(), "blocks-mined")) {
-            String oldBlocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined);
-            String newBlocksMinedFormatted = toolStats.numberFormat.formatInt(blocksMined + 1);
-            String oldLine = toolStats.configTools.formatLore("blocks-mined", "{blocks}", oldBlocksMinedFormatted);
-            String newLine = toolStats.configTools.formatLore("blocks-mined", "{blocks}", newBlocksMinedFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        playerTool.setItemMeta(meta);
-    }
-
-    private void updateCropsMined(ItemStack playerTool, Ageable block) {
-        // ignore crops that are not fully grown
-        if (block.getAge() != block.getMaximumAge()) {
-            return;
-        }
-
-        ItemMeta meta = playerTool.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(playerTool + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-        // read the current stats from the item
-        // if they don't exist, then start from 0
-        Integer cropsMined = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.cropsHarvested, PersistentDataType.INTEGER)) {
-            cropsMined = container.get(toolStats.cropsHarvested, PersistentDataType.INTEGER);
-        }
-
-        if (cropsMined == null) {
-            cropsMined = 0;
-            toolStats.logger.warning(playerTool + " does not have valid crops-mined set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.cropsHarvested, PersistentDataType.INTEGER, cropsMined + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(playerTool.getType(), "blocks-mined")) {
-            String oldCropsMinedFormatted = toolStats.numberFormat.formatInt(cropsMined);
-            String newCropsMinedFormatted = toolStats.numberFormat.formatInt(cropsMined + 1);
-            String oldLine = toolStats.configTools.formatLore("crops-harvested", "{crops}", oldCropsMinedFormatted);
-            String newLine = toolStats.configTools.formatLore("crops-harvested", "{crops}", newCropsMinedFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        playerTool.setItemMeta(meta);
-    }
-}

src/main/java/lol/hyper/toolstats/events/ChunkPopulate.java

@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -31,7 +32,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class ChunkPopulate implements Listener {
 
@@ -49,34 +49,30 @@ public class ChunkPopulate implements Listener {
         if (event.getChunk().getWorld().getEnvironment() != World.Environment.THE_END) {
             return;
         }
+        World world = event.getChunk().getWorld();
         // this is delayed because entities are not loaded instantly
         // we just check 1 second later
         Chunk chunk = event.getChunk();
-        BukkitRunnable runnable = new BukkitRunnable() {
-            @Override
-            public void run() {
-                for (Entity entity : chunk.getEntities()) {
-                    // if there is a new item frame
-                    if (!(entity instanceof ItemFrame)) {
+        Bukkit.getRegionScheduler().runDelayed(toolStats, world, chunk.getX(), chunk.getZ(), scheduledTask -> {
+            for (Entity entity : chunk.getEntities()) {
+                // if there is a new item frame
+                if (!(entity instanceof ItemFrame itemFrame)) {
+                    continue;
+                }
+                // if the item frame has an elytra
+                if (itemFrame.getItem().getType() == Material.ELYTRA) {
+                    ItemStack elytraCopy = itemFrame.getItem();
+                    ItemMeta meta = elytraCopy.getItemMeta();
+                    if (meta == null) {
                         continue;
                     }
-                    ItemFrame itemFrame = (ItemFrame) entity;
-                    // if the item frame has an elytra
-                    if (itemFrame.getItem().getType() == Material.ELYTRA) {
-                        ItemStack elytraCopy = itemFrame.getItem();
-                        ItemMeta meta = elytraCopy.getItemMeta();
-                        if (meta == null) {
-                            continue;
-                        }
-                        // add the new tag so we know it's new
-                        PersistentDataContainer container = meta.getPersistentDataContainer();
-                        container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
-                        elytraCopy.setItemMeta(meta);
-                        itemFrame.setItem(elytraCopy);
-                    }
+                    // add the new tag so we know it's new
+                    PersistentDataContainer container = meta.getPersistentDataContainer();
+                    container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
+                    elytraCopy.setItemMeta(meta);
+                    itemFrame.setItem(elytraCopy);
                 }
             }
-        };
-        toolStats.scheduleRegion(runnable, chunk.getWorld(), chunk, 20);
+        }, 20);
     }
 }

src/main/java/lol/hyper/toolstats/events/CraftItem.java

@@ -19,7 +19,7 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -32,7 +32,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 public class CraftItem implements Listener {
 
@@ -51,26 +53,51 @@ public class CraftItem implements Listener {
         if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
-        ItemStack itemStack = event.getCurrentItem();
-        if (itemStack == null || itemStack.getType() == Material.AIR) {
+        ItemStack craftedItem = event.getCurrentItem();
+        if (craftedItem == null || craftedItem.getType() == Material.AIR) {
             return;
         }
+        Material craftedMaterial = craftedItem.getType();
         // only check certain items
-        if (!toolStats.itemChecker.isValidItem(itemStack.getType())) {
+        if (!toolStats.itemChecker.isValidItem(craftedMaterial)) {
             return;
         }
 
-        // if the player shift clicks, send them this warning
+        // if the player shift clicks
         if (event.isShiftClick()) {
-            String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
-            if (configMessage != null) {
-                if (!configMessage.isEmpty()) {
-                    event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
+            // store the player inventory before they craft the items
+            ItemStack[] beforeCraft = player.getInventory().getContents();
+            // run a tick after to see the changes
+            player.getScheduler().runDelayed(toolStats, scheduledTask -> {
+                // get their inventory after the craft
+                ItemStack[] afterCraft = player.getInventory().getContents();
+                for (int i = 0; i < afterCraft.length; i++) {
+                    ItemStack newSlotItem = afterCraft[i];
+                    ItemStack oldSlotItem = beforeCraft[i];
+
+                    // if this slot is empty after crafting, skip it
+                    if (newSlotItem == null) {
+                        continue;
+                    }
+
+                    // if the item matches what we crafted
+                    if (newSlotItem.getType() == craftedMaterial) {
+                        // if the slot was empty before we crafted, this means we just made it
+                        if (oldSlotItem == null) {
+                            // add the lore
+                            ItemStack newItem = addCraftOrigin(newSlotItem, player);
+                            if (newItem != null) {
+                                player.getInventory().setItem(i, newItem);
+                            }
+                        }
+                    }
                 }
-            }
+            }, null, 1);
+            return;
         }
-        // test the item before setting it
-        ItemStack newItem = addLore(itemStack, player);
+
+        // the player did not shift click
+        ItemStack newItem = addCraftOrigin(craftedItem, player);
         if (newItem != null) {
             // set the result
             event.setCurrentItem(newItem);
@@ -84,7 +111,7 @@ public class CraftItem implements Listener {
      * @param owner     The player crafting.
      * @return A copy of the item with the tags + lore.
      */
-    private ItemStack addLore(ItemStack itemStack, Player owner) {
+    private ItemStack addCraftOrigin(ItemStack itemStack, Player owner) {
         // clone the item
         ItemStack newItem = itemStack.clone();
         ItemMeta meta = newItem.getItemMeta();
@@ -99,44 +126,49 @@ public class CraftItem implements Listener {
 
         // if the item already has the tag
         // this is to prevent duplicate tags
-        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
-        // only make the hash if it's enabled
-        if (toolStats.config.getBoolean("generate-hash-for-items")) {
-            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
-            container.set(toolStats.hash, PersistentDataType.STRING, hash);
-        }
-
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
-
-        List<String> lore;
         // get the current lore the item
+        List<Component> lore;
         if (meta.hasLore()) {
-            lore = meta.getLore();
+            lore = meta.lore();
         } else {
             lore = new ArrayList<>();
         }
-        // do we add the lore based on the config?
+
+        // if creation date is enabled, add it
         if (toolStats.configTools.checkConfig(itemStack.getType(), "created-date")) {
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
+
             String date = toolStats.numberFormat.formatDate(finalDate);
-            String newLine = toolStats.configTools.formatLore("created.created-on", "{date}", date);
+            Component newLine = toolStats.configTools.formatLore("created.created-on", "{date}", date);
             if (newLine == null) {
                 return null;
             }
             lore.add(newLine);
-            meta.setLore(lore);
+            meta.lore(lore);
         }
+
+        // if creation owner is enabled, add it
         if (toolStats.configTools.checkConfig(itemStack.getType(), "created-by")) {
-            String newLine = toolStats.configTools.formatLore("created.created-by", "{player}", owner.getName());
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
+
+            Component newLine = toolStats.configTools.formatLore("created.created-by", "{player}", owner.getName());
             if (newLine == null) {
                 return null;
             }
             lore.add(newLine);
-            meta.setLore(lore);
+            meta.lore(lore);
+        }
+
+        // if hash is enabled, add it
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
         newItem.setItemMeta(meta);
         return newItem;

src/main/java/lol/hyper/toolstats/events/CreativeEvent.java

@@ -19,6 +19,7 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -64,50 +65,53 @@ public class CreativeEvent implements Listener {
         }
 
         // add the tags to the item
-        ItemStack newItem = addLore(spawnedItem, player);
+        ItemStack newItem = addCreativeOrigin(spawnedItem, player);
         if (newItem != null) {
             event.setCursor(newItem);
         }
     }
 
     /**
-     * Adds tags to newly spawned items in creative.
+     * Adds spawned in tags to item.
      *
-     * @param spawnedItem The item.
+     * @param itemStack The item add item to.
+     * @param owner     The player spawning in.
+     * @return A copy of the item with the tags + lore.
      */
-    private ItemStack addLore(ItemStack spawnedItem, Player owner) {
-        ItemStack newSpawnedItem = spawnedItem.clone();
+    private ItemStack addCreativeOrigin(ItemStack itemStack, Player owner) {
+        ItemStack newSpawnedItem = itemStack.clone();
         ItemMeta meta = newSpawnedItem.getItemMeta();
         if (meta == null) {
-            toolStats.logger.warning(newSpawnedItem + " does NOT have any meta! Unable to update stats.");
+            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
             return null;
         }
-
+        // get the current time
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
-        // if the item already has an origin set, don't add it again
-        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
+        // if the item already has the tag
+        // this is to prevent duplicate tags
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
-        // only make the hash if it's enabled
+        // if hash is enabled, add it
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
-            String hash = toolStats.hashMaker.makeHash(spawnedItem.getType(), owner.getUniqueId(), timeCreated);
+            String hash = toolStats.hashMaker.makeHash(newSpawnedItem.getType(), owner.getUniqueId(), timeCreated);
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
-
+        // if spawned in is enabled, add it
         if (toolStats.configTools.checkConfig(newSpawnedItem.getType(), "spawned-in")) {
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.setLore(newLore);
-        }
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
 
+            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+            meta.lore(newLore);
+        }
         newSpawnedItem.setItemMeta(meta);
         return newSpawnedItem;
     }

src/main/java/lol/hyper/toolstats/events/EntityDamage.java

@@ -18,26 +18,26 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.projectiles.ProjectileSource;
 
 import java.util.*;
 
 public class EntityDamage implements Listener {
 
     private final ToolStats toolStats;
+    // track mobs that are killed by a player
     public final Set<UUID> trackedMobs = new HashSet<>();
     private final List<EntityDamageEvent.DamageCause> ignoredCauses = Arrays.asList(EntityDamageEvent.DamageCause.SUICIDE, EntityDamageEvent.DamageCause.VOID, EntityDamageEvent.DamageCause.CUSTOM, EntityDamageEvent.DamageCause.KILL);
 
@@ -51,10 +51,9 @@ public class EntityDamage implements Listener {
             return;
         }
 
-        if (!(event.getEntity() instanceof LivingEntity)) {
+        if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
             return;
         }
-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
 
         // ignore void and /kill damage
         EntityDamageEvent.DamageCause cause = event.getCause();
@@ -62,106 +61,90 @@ public class EntityDamage implements Listener {
             return;
         }
 
-        // mob is going to die
-        if (mobBeingAttacked.getHealth() - event.getFinalDamage() <= 0) {
-            // a player is killing something
-            if (event.getDamager() instanceof Player) {
-                Player attackingPlayer = (Player) event.getDamager();
-                if (attackingPlayer.getGameMode() == GameMode.CREATIVE || attackingPlayer.getGameMode() == GameMode.SPECTATOR) {
-                    return;
-                }
-                PlayerInventory attackingPlayerInventory = attackingPlayer.getInventory();
-                ItemStack heldItem = attackingPlayerInventory.getItemInMainHand();
-                // only check certain items
-                if (!toolStats.itemChecker.isMeleeWeapon(heldItem.getType())) {
-                    return;
-                }
-                // a player is killing another player
-                if (mobBeingAttacked instanceof Player) {
-                    updatePlayerKills(heldItem);
-                    return;
-                }
-                // player is killing regular mob
-                updateMobKills(heldItem);
-                trackedMobs.add(mobBeingAttacked.getUniqueId());
-            }
-            // trident is being thrown at something
-            if (event.getDamager() instanceof Trident) {
-                Trident trident = (Trident) event.getDamager();
-                ItemStack newTrident;
-                // trident is killing player
-                if (mobBeingAttacked instanceof Player) {
-                    newTrident = tridentPlayerKills(trident.getItem());
-                } else {
-                    // trident is killing a mob
-                    newTrident = tridentMobKills(trident.getItem());
-                    trackedMobs.add(mobBeingAttacked.getUniqueId());
-                }
-                if (newTrident != null) {
-                    trident.setItem(newTrident);
-                }
-            }
-            // arrow is being shot
-            if (event.getDamager() instanceof Arrow) {
-                Arrow arrow = (Arrow) event.getDamager();
-                // if the shooter is a player
-                if (arrow.getShooter() instanceof Player) {
-                    Player shootingPlayer = (Player) arrow.getShooter();
-                    if (shootingPlayer.getGameMode() == GameMode.CREATIVE || shootingPlayer.getGameMode() == GameMode.SPECTATOR) {
-                        return;
-                    }
-                    PlayerInventory inventory = shootingPlayer.getInventory();
-                    boolean isMainHand = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
-                    boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
-                    ItemStack heldBow = null;
-                    if (isMainHand) {
-                        heldBow = inventory.getItemInMainHand();
-                    }
-                    if (isOffHand) {
-                        heldBow = inventory.getItemInOffHand();
-                    }
+        Entity damager = event.getDamager();
+        boolean playerAttacking = damager instanceof Player;
+        boolean playerBeingAttacked = mobBeingAttacked instanceof Player;
+        double finalDamage = event.getFinalDamage();
+        boolean modDied = mobBeingAttacked.getHealth() - finalDamage <= 0;
 
-                    // if the player is holding a bow in both hands
-                    // default to main hand since that takes priority
-                    if (isMainHand && isOffHand) {
-                        heldBow = inventory.getItemInMainHand();
-                    }
-
-                    // player swapped
-                    if (heldBow == null) {
-                        return;
-                    }
-
-                    // player is shooting another player
-                    if (mobBeingAttacked instanceof Player) {
-                        updatePlayerKills(heldBow);
-                    } else {
-                        updateMobKills(heldBow);
-                        trackedMobs.add(mobBeingAttacked.getUniqueId());
-                    }
-                }
-            }
-        }
-        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
-            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
+        // player attacks something
+        if (playerAttacking) {
+            PlayerInventory playerAttackingInventory = ((Player) damager).getInventory();
+            // make sure the item the player used is an item we want
+            if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) {
                 return;
             }
-            PlayerInventory playerInventory = playerTakingDamage.getInventory();
-            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
-                if (armorPiece != null) {
-                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
-                        updateDamage(armorPiece, event.getFinalDamage());
+
+            // update their weapon's damage
+            updateWeaponDamage(playerAttackingInventory, event.getFinalDamage());
+
+            // the mob the player attacked died
+            if (modDied) {
+                // player killed another player
+                if (playerBeingAttacked) {
+                    updateWeaponKills(playerAttackingInventory, "player");
+                } else {
+                    // player kills a regular mob
+                    updateWeaponKills(playerAttackingInventory, "mob");
+                }
+            }
+
+            trackedMobs.add(mobBeingAttacked.getUniqueId());
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
+        }
+
+        // something was hit by a trident
+        if (damager instanceof Trident trident) {
+            ProjectileSource source = trident.getShooter();
+            if (source instanceof Player) {
+                // update the trident's tracked damage
+                updateTridentDamage(trident, finalDamage);
+
+                // if the mob died from the trident
+                if (modDied) {
+                    // if the trident killed a player, update the kills
+                    if (playerBeingAttacked) {
+                        updateTridentKills(trident, "player");
+                    } else {
+                        // the trident killed a mob, update the kills
+                        updateTridentKills(trident, "mob");
                     }
                 }
+
+                trackedMobs.add(mobBeingAttacked.getUniqueId());
+                Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
+            }
+        }
+
+        // something was hit by an arrow
+        if (damager instanceof Arrow arrow) {
+            ProjectileSource source = arrow.getShooter();
+
+            // a player shot the arrow
+            if (source instanceof Player shootingPlayer) {
+                // update the player's bow damage
+                updateBowDamage(shootingPlayer.getInventory(), finalDamage);
+
+                // if the mob died from the arrow
+                if (modDied) {
+                    if (playerBeingAttacked) {
+                        // player killed another player with an arrow
+                        updateBowKills(shootingPlayer.getInventory(), "player");
+                    } else {
+                        // player killed mob with an arrow
+                        updateBowKills(shootingPlayer.getInventory(), "mob");
+                    }
+                }
+
+                trackedMobs.add(mobBeingAttacked.getUniqueId());
+                Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
             }
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onDamage(EntityDamageEvent event) {
-        if (!(event.getEntity() instanceof LivingEntity)) {
+        if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
             return;
         }
 
@@ -171,254 +154,133 @@ public class EntityDamage implements Listener {
             return;
         }
 
-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
-        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
+        // player is taking damage
+        if (mobBeingAttacked instanceof Player playerTakingDamage) {
             if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
                 return;
             }
-            PlayerInventory playerInventory = playerTakingDamage.getInventory();
-            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
-                if (armorPiece != null) {
-                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
-                        updateDamage(armorPiece, event.getFinalDamage());
+            updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
+        }
+    }
+
+    private void updateArmorDamage(PlayerInventory playerInventory, double damage) {
+        ItemStack[] armorContents = playerInventory.getArmorContents();
+        for (ItemStack armorPiece : armorContents) {
+            if (armorPiece != null) {
+                if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
+                    ItemMeta newItem = toolStats.itemLore.updateArmorDamage(armorPiece, damage, false);
+                    if (newItem != null) {
+                        armorPiece.setItemMeta(newItem);
                     }
                 }
             }
         }
+        // apply the new armor
+        playerInventory.setArmorContents(armorContents);
+    }
+
+    private void updateBowDamage(PlayerInventory playerInventory, double damage) {
+        ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
+        if (heldBow == null) {
+            return;
+        }
+
+        boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
+        boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
+        ItemMeta newBowDamage = toolStats.itemLore.updateWeaponDamage(playerInventory.getItemInMainHand(), damage, false);
+        //toolStats.logger.info(newBowDamage.toString());
+
+        // player is shooting another player
+        if (newBowDamage != null) {
+            if (isMain && isOffHand) {
+                playerInventory.getItemInMainHand().setItemMeta(newBowDamage);
+            } else if (isMain) {
+                playerInventory.getItemInMainHand().setItemMeta(newBowDamage);
+            } else if (isOffHand) {
+                playerInventory.getItemInOffHand().setItemMeta(newBowDamage);
+            }
+        }
+    }
+
+    private void updateBowKills(PlayerInventory playerInventory, String type) {
+        ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
+        if (heldBow == null) {
+            return;
+        }
+
+        boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
+        boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
+
+        if (type.equalsIgnoreCase("mob")) {
+            // player is shooting a mob
+            ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
+            if (newBow != null) {
+                if (isMain && isOffHand) {
+                    playerInventory.getItemInMainHand().setItemMeta(newBow);
+                } else if (isMain) {
+                    playerInventory.getItemInMainHand().setItemMeta(newBow);
+                } else if (isOffHand) {
+                    playerInventory.getItemInOffHand().setItemMeta(newBow);
+                }
+            }
+        }
+
+        if (type.equalsIgnoreCase("player")) {
+            ItemMeta newBowKills = toolStats.itemLore.updatePlayerKills(heldBow, 1);
+            if (newBowKills != null) {
+                if (isMain && isOffHand) {
+                    playerInventory.getItemInMainHand().setItemMeta(newBowKills);
+                } else if (isMain) {
+                    playerInventory.getItemInMainHand().setItemMeta(newBowKills);
+                } else if (isOffHand) {
+                    playerInventory.getItemInOffHand().setItemMeta(newBowKills);
+                }
+            }
+        }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onDamage(EntityDamageByBlockEvent event) {
-        if (!(event.getEntity() instanceof LivingEntity)) {
-            return;
+    private void updateTridentKills(Trident trident, String type) {
+        ItemStack newTrident = trident.getItemStack();
+        ItemMeta newKills;
+        if (type.equalsIgnoreCase("player")) {
+            newKills = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
+        } else {
+            newKills = toolStats.itemLore.updateMobKills(trident.getItemStack(), 1);
         }
-
-        // ignore void and /kill damage
-        EntityDamageEvent.DamageCause cause = event.getCause();
-        if (ignoredCauses.contains(cause)) {
-            return;
-        }
-
-        LivingEntity mobBeingAttacked = (LivingEntity) event.getEntity();
-        // player is taken damage but not being killed
-        if (mobBeingAttacked instanceof Player) {
-            Player playerTakingDamage = (Player) mobBeingAttacked;
-            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
-                return;
-            }
-            PlayerInventory playerInventory = playerTakingDamage.getInventory();
-            for (ItemStack armorPiece : playerInventory.getArmorContents()) {
-                if (armorPiece != null) {
-                    if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
-                        updateDamage(armorPiece, event.getFinalDamage());
-                    }
-                }
-            }
+        if (newKills != null) {
+            newTrident.setItemMeta(newKills);
+            trident.setItemStack(newTrident);
         }
     }
 
-    /**
-     * Updates a weapon's player kills.
-     *
-     * @param itemStack The item to update.
-     */
-    private void updatePlayerKills(ItemStack itemStack) {
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
-            return;
+    private void updateTridentDamage(Trident trident, double damage) {
+        ItemStack newTrident = trident.getItemStack();
+        ItemMeta newDamage = toolStats.itemLore.updateWeaponDamage(trident.getItemStack(), damage, false);
+        if (newDamage != null) {
+            newTrident.setItemMeta(newDamage);
+            trident.setItemStack(newTrident);
         }
-        Integer playerKills = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
-            playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
-        }
-
-        if (playerKills == null) {
-            playerKills = 0;
-            toolStats.logger.warning(itemStack + " does not have valid player-kills set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(itemStack.getType(), "player-kills")) {
-            String oldPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
-            String newPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills + 1);
-            String oldLine = toolStats.configTools.formatLore("kills.player", "{kills}", oldPlayerKillsFormatted);
-            String newLine = toolStats.configTools.formatLore("kills.player", "{kills}", newPlayerKillsFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        itemStack.setItemMeta(meta);
     }
 
-    /**
-     * Updates a weapon's mob kills.
-     *
-     * @param itemStack The item to update.
-     */
-    private void updateMobKills(ItemStack itemStack) {
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
-            return;
+    private void updateWeaponDamage(PlayerInventory playerInventory, double damage) {
+        ItemStack heldWeapon = playerInventory.getItemInMainHand();
+        ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateWeaponDamage(heldWeapon, damage, false);
+        if (newHeldWeaponMeta != null) {
+            playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
         }
-        Integer mobKills = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
-            mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
-        }
-
-        if (mobKills == null) {
-            mobKills = 0;
-            toolStats.logger.warning(itemStack + " does not have valid mob-kills set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(itemStack.getType(), "mob-kills")) {
-            String oldMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
-            String newMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills + 1);
-            String oldLine = toolStats.configTools.formatLore("kills.mob", "{kills}", oldMobKillsFormatted);
-            String newLine = toolStats.configTools.formatLore("kills.mob", "{kills}", newMobKillsFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        itemStack.setItemMeta(meta);
     }
 
-    /**
-     * Updates a player's armor damage stats.
-     *
-     * @param itemStack The armor piece.
-     * @param damage    How much damage is being added.
-     */
-    private void updateDamage(ItemStack itemStack, double damage) {
-        // ignore if the damage is zero or negative
-        if (damage < 0) {
-            return;
+    private void updateWeaponKills(PlayerInventory playerInventory, String type) {
+        ItemStack heldWeapon = playerInventory.getItemInMainHand();
+        ItemMeta newHeldWeaponMeta = null;
+        if (type.equalsIgnoreCase("player")) {
+            newHeldWeaponMeta = toolStats.itemLore.updatePlayerKills(heldWeapon, 1);
         }
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
-            return;
+        if (type.equalsIgnoreCase("mob")) {
+            newHeldWeaponMeta = toolStats.itemLore.updateMobKills(heldWeapon, 1);
         }
-        Double damageTaken = 0.0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
-            damageTaken = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+        if (newHeldWeaponMeta != null) {
+            playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
         }
-
-        if (damageTaken == null) {
-            damageTaken = 0.0;
-            toolStats.logger.warning(itemStack + " does not have valid damage-taken set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken + damage);
-
-        if (toolStats.config.getBoolean("enabled.armor-damage")) {
-            String oldDamageFormatted = toolStats.numberFormat.formatDouble(damageTaken);
-            String newDamageFormatted = toolStats.numberFormat.formatDouble(damageTaken + damage);
-            String oldLine = toolStats.configTools.formatLore("damage-taken", "{damage}", oldDamageFormatted);
-            String newLine = toolStats.configTools.formatLore("damage-taken", "{damage}", newDamageFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        itemStack.setItemMeta(meta);
-    }
-
-    /**
-     * Updates a trident's mob kills.
-     *
-     * @param trident The item to update.
-     */
-    private ItemStack tridentMobKills(ItemStack trident) {
-        ItemStack newTrident = trident.clone();
-        ItemMeta meta = newTrident.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(newTrident + " does NOT have any meta! Unable to update stats.");
-            return null;
-        }
-        Integer mobKills = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
-            mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
-        }
-
-        if (mobKills == null) {
-            mobKills = 0;
-            toolStats.logger.warning(newTrident + " does not have valid mob-kills set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(newTrident.getType(), "mob-kills")) {
-            String oldMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills);
-            String newMobKillsFormatted = toolStats.numberFormat.formatInt(mobKills + 1);
-            String oldLine = toolStats.configTools.formatLore("kills.mob", "{kills}", oldMobKillsFormatted);
-            String newLine = toolStats.configTools.formatLore("kills.mob", "{kills}", newMobKillsFormatted);
-            if (oldLine == null || newLine == null) {
-                return null;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        newTrident.setItemMeta(meta);
-        return newTrident;
-    }
-
-    /**
-     * Updates a trident's player kills.
-     *
-     * @param trident The item to update.
-     */
-    private ItemStack tridentPlayerKills(ItemStack trident) {
-        ItemStack newTrident = trident.clone();
-        ItemMeta meta = newTrident.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(newTrident + " does NOT have any meta! Unable to update stats.");
-            return null;
-        }
-        Integer playerKills = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
-            playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
-        }
-
-        if (playerKills == null) {
-            playerKills = 0;
-            toolStats.logger.warning(newTrident + " does not have valid player-kills set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.configTools.checkConfig(newTrident.getType(), "player-kills")) {
-            String oldPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills);
-            String newPlayerKillsFormatted = toolStats.numberFormat.formatInt(playerKills + 1);
-            String oldLine = toolStats.configTools.formatLore("kills.player", "{kills}", oldPlayerKillsFormatted);
-            String newLine = toolStats.configTools.formatLore("kills.player", "{kills}", newPlayerKillsFormatted);
-            if (oldLine == null || newLine == null) {
-                return null;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        newTrident.setItemMeta(meta);
-        return newTrident;
     }
 }

src/main/java/lol/hyper/toolstats/events/EntityDeath.java

@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -29,7 +30,8 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
 
 public class EntityDeath implements Listener {
 
@@ -53,13 +55,13 @@ public class EntityDeath implements Listener {
                 ItemMeta droppedItemMeta = droppedItem.getItemMeta();
                 if (droppedItemMeta != null) {
                     PersistentDataContainer container = droppedItemMeta.getPersistentDataContainer();
-                    if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                    if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
                         continue; // ignore any items that have our tags
                     }
 
                 }
                 if (toolStats.itemChecker.isValidItem(droppedItem.getType())) {
-                    ItemStack newItem = addLore(droppedItem, livingEntity.getName());
+                    ItemStack newItem = addLore(droppedItem, livingEntity);
                     if (newItem != null) {
                         event.getDrops().set(i, newItem);
                     }
@@ -73,23 +75,28 @@ public class EntityDeath implements Listener {
      * Adds "drop by" tag to item.
      *
      * @param oldItem The item to add lore to.
-     * @param mob     The mob or player name.
+     * @param entity  The mob dying.
      */
-    private ItemStack addLore(ItemStack oldItem, String mob) {
+    private ItemStack addLore(ItemStack oldItem, LivingEntity entity) {
         ItemStack newItem = oldItem.clone();
         ItemMeta meta = newItem.getItemMeta();
         if (meta == null) {
             return null;
         }
 
+        if (!toolStats.config.getBoolean("enabled.dropped-by")) {
+            return null;
+        }
+
         PersistentDataContainer container = meta.getPersistentDataContainer();
         container.set(toolStats.originType, PersistentDataType.INTEGER, 1);
-
-        if (toolStats.config.getBoolean("enabled.dropped-by")) {
-            String newLine = toolStats.configTools.formatLore("dropped-by", "{name}", mob);
-            List<String> newLore = toolStats.itemLore.addItemLore(meta, newLine);
-            meta.setLore(newLore);
+        String mobName = toolStats.config.getString("messages.mob." + entity.getType());
+        if (mobName == null) {
+            mobName = entity.getName();
         }
+        Component newLine = toolStats.configTools.formatLore("dropped-by", "{name}", mobName);
+        List<Component> newLore = toolStats.itemLore.addItemLore(meta, newLine);
+        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

src/main/java/lol/hyper/toolstats/events/GenerateLoot.java

@@ -19,6 +19,7 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -76,8 +77,7 @@ public class GenerateLoot implements Listener {
             Player player = toolStats.playerInteract.openedChests.get(openedChest);
             setLoot(event.getLoot(), player);
         }
-        if (inventoryHolder instanceof StorageMinecart) {
-            StorageMinecart mineCart = (StorageMinecart) inventoryHolder;
+        if (inventoryHolder instanceof StorageMinecart mineCart) {
             if (toolStats.playerInteract.openedMineCarts.containsKey(mineCart)) {
                 Player player = toolStats.playerInteract.openedMineCarts.get(mineCart);
                 setLoot(event.getLoot(), player);
@@ -92,7 +92,7 @@ public class GenerateLoot implements Listener {
      * @param owner     The player that found the item.
      * @return The item with the lore.
      */
-    private ItemStack addLore(ItemStack itemStack, Player owner) {
+    private ItemStack addLootedOrigin(ItemStack itemStack, Player owner) {
         ItemStack newItem = itemStack.clone();
         ItemMeta meta = itemStack.getItemMeta();
         if (meta == null) {
@@ -102,7 +102,11 @@ public class GenerateLoot implements Listener {
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
-        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+        if (!toolStats.configTools.checkConfig(newItem.getType(), "looted-tag")) {
+            return null;
+        }
+
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
@@ -113,14 +117,11 @@ public class GenerateLoot implements Listener {
         }
 
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
         container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
-
-        if (toolStats.configTools.checkConfig(newItem.getType(), "looted-tag")) {
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.setLore(newLore);
-        }
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }
@@ -139,7 +140,7 @@ public class GenerateLoot implements Listener {
                 continue;
             }
             if (toolStats.itemChecker.isValidItem(itemStack.getType())) {
-                ItemStack newItem = addLore(itemStack, player);
+                ItemStack newItem = addLootedOrigin(itemStack, player);
                 if (newItem != null) {
                     loot.set(i, newItem);
                 }

src/main/java/lol/hyper/toolstats/events/InventoryOpen.java

@@ -19,16 +19,16 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.Location;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.UUID;
 
@@ -47,7 +47,12 @@ public class InventoryOpen implements Listener {
         }
 
         Inventory inventory = event.getInventory();
-        Location location = event.getInventory().getLocation();
+        // only check these
+        if (inventory.getType() != InventoryType.CHEST || inventory.getType() != InventoryType.BARREL || inventory.getType() != InventoryType.SHULKER_BOX || inventory.getType() != InventoryType.ENDER_CHEST) {
+            return;
+        }
+
+        Player player = (Player) event.getPlayer();
         for (ItemStack itemStack : inventory) {
             if (itemStack == null) {
                 continue;
@@ -62,35 +67,47 @@ public class InventoryOpen implements Listener {
             }
             PersistentDataContainer container = itemMeta.getPersistentDataContainer();
 
-            // generate a hash if the item doesn't have one (if it's enabled in the config)
+            if (toolStats.config.getBoolean("tokens.enabled")) {
+                // if the token system is on and the item doesn't have stat keys
+                if (toolStats.itemChecker.keyCheck(container) && !container.has(toolStats.tokenType)) {
+                    // add the tokens
+                    String newTokens = toolStats.itemChecker.addTokensToExisting(itemStack);
+                    if (newTokens == null) {
+                        return;
+                    }
+                    container.set(toolStats.tokenApplied, PersistentDataType.STRING, newTokens);
+                    itemStack.setItemMeta(itemMeta);
+                }
+            }
+
+            // generate a hash if the item doesn't have one (and enabled)
+            // if hashes are disabled and the item has one, remove it.
             if (toolStats.config.getBoolean("generate-hash-for-items")) {
                 if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
-                    // make sure the item has an owner
-                    if (!container.has(toolStats.genericOwner, new UUIDDataType())) {
-                        continue;
+                    UUID owner = null;
+                    // get the current owner if there is one.
+                    if (container.has(toolStats.itemOwner, new UUIDDataType())) {
+                        owner = container.get(toolStats.itemOwner, new UUIDDataType());
                     }
-                    UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
+                    // if there is no owner, use the player holding it
                     if (owner == null) {
-                        continue;
+                        owner = player.getUniqueId();
                     }
                     Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
                     if (timestamp == null) {
-                        continue;
+                        // if there is no time created, use now
+                        timestamp = System.currentTimeMillis();
                     }
                     String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
-                    toolStats.logger.info(hash);
                     container.set(toolStats.hash, PersistentDataType.STRING, hash);
+                    itemStack.setItemMeta(itemMeta);
                 }
-            }
-            ItemMeta clone = itemMeta.clone();
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    itemStack.setItemMeta(clone);
+            } else {
+                // if hashes are disabled but the item has one, remove it.
+                if (container.has(toolStats.hash, PersistentDataType.STRING)) {
+                    container.remove(toolStats.hash);
+                    itemStack.setItemMeta(itemMeta);
                 }
-            };
-            if (location != null) {
-                toolStats.scheduleRegion(runnable, location.getWorld(), location.getChunk(), 1);
             }
         }
     }

src/main/java/lol/hyper/toolstats/events/PickupItem.java

@@ -19,9 +19,13 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -48,13 +52,12 @@ public class PickupItem implements Listener {
             return;
         }
         Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            Player player = (Player) entity;
+        if (entity instanceof Player player) {
             if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
                 return;
             }
             Item item = event.getItem();
-            if (item.getType() == EntityType.DROPPED_ITEM) {
+            if (item.getType() == EntityType.ITEM) {
                 ItemStack itemStack = event.getItem().getItemStack();
                 ItemMeta meta = itemStack.getItemMeta();
                 if (meta == null) {
@@ -64,7 +67,7 @@ public class PickupItem implements Listener {
                 if (itemStack.getType() == Material.ELYTRA) {
                     // the elytra has the new key, set the lore to it
                     if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
-                        ItemStack newElytra = addLore(itemStack, (Player) event.getEntity());
+                        ItemStack newElytra = addElytraOrigin(itemStack, (Player) event.getEntity());
                         if (newElytra != null) {
                             item.setItemStack(newElytra);
                         }
@@ -80,7 +83,7 @@ public class PickupItem implements Listener {
      * @param itemStack The elytra to add lore to.
      * @param owner     The player who found it.
      */
-    private ItemStack addLore(ItemStack itemStack, Player owner) {
+    private ItemStack addElytraOrigin(ItemStack itemStack, Player owner) {
         ItemStack finalItem = itemStack.clone();
         ItemMeta meta = finalItem.getItemMeta();
         if (meta == null) {
@@ -90,6 +93,10 @@ public class PickupItem implements Listener {
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
+        if (!toolStats.config.getBoolean("enabled.elytra-tag")) {
+            return null;
+        }
+
         // only make the hash if it's enabled
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
             String hash = toolStats.hashMaker.makeHash(finalItem.getType(), owner.getUniqueId(), timeCreated);
@@ -97,15 +104,12 @@ public class PickupItem implements Listener {
         }
 
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
         container.set(toolStats.originType, PersistentDataType.INTEGER, 4);
         container.remove(toolStats.newElytra);
-
-        if (toolStats.config.getBoolean("enabled.elytra-tag")) {
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.setLore(newLore);
-        }
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+        meta.lore(newLore);
         finalItem.setItemMeta(meta);
         return finalItem;
     }

src/main/java/lol/hyper/toolstats/events/PlayerFish.java

@@ -19,6 +19,7 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Item;
@@ -32,7 +33,6 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Date;
 import java.util.List;
@@ -60,14 +60,26 @@ public class PlayerFish implements Listener {
             return;
         }
 
-        ItemStack fishingRod = getItemStack(player);
+        ItemStack fishingRod = toolStats.itemChecker.getFishingRod(player.getInventory());
         // player swapped items?
         if (fishingRod == null) {
             return;
         }
 
         // update the fishing rod!
-        updateFishCount(fishingRod);
+        ItemMeta newFishingRod = toolStats.itemLore.updateFishCaught(fishingRod, 1);
+        if (newFishingRod != null) {
+            PlayerInventory inventory = player.getInventory();
+            boolean isMain = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
+            boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
+            if (isMain && isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newFishingRod);
+            } else if (isMain) {
+                inventory.getItemInMainHand().setItemMeta(newFishingRod);
+            } else if (isOffHand) {
+                inventory.getItemInOffHand().setItemMeta(newFishingRod);
+            }
+        }
 
         // check if the player caught an item
         if (event.getCaught() == null) {
@@ -83,64 +95,6 @@ public class PlayerFish implements Listener {
         }
     }
 
-    private static @Nullable ItemStack getItemStack(Player player) {
-        PlayerInventory inventory = player.getInventory();
-        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
-        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
-        ItemStack fishingRod = null;
-        if (isMainHand) {
-            fishingRod = inventory.getItemInMainHand();
-        }
-        if (isOffHand) {
-            fishingRod = inventory.getItemInOffHand();
-        }
-
-        // if the player is hold fishing rods in both hands
-        // default to main hand since that takes priority
-        if (isMainHand && isOffHand) {
-            fishingRod = inventory.getItemInMainHand();
-        }
-        return fishingRod;
-    }
-
-    /**
-     * Update a fishing rod's fish count.
-     *
-     * @param fishingRod The fishing rod to update.
-     */
-    private void updateFishCount(ItemStack fishingRod) {
-        ItemMeta meta = fishingRod.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(fishingRod + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-        Integer fishCaught = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
-            fishCaught = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
-        }
-
-        if (fishCaught == null) {
-            fishCaught = 0;
-            toolStats.logger.warning(fishingRod + " does not have valid fish-caught set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught + 1);
-
-        if (toolStats.config.getBoolean("enabled.fish-caught")) {
-            String oldFishFormatted = toolStats.numberFormat.formatInt(fishCaught);
-            String newFishFormatted = toolStats.numberFormat.formatInt(fishCaught + 1);
-            String oldLine = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", oldFishFormatted);
-            String newLine = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", newFishFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        fishingRod.setItemMeta(meta);
-    }
-
     /**
      * Add lore to newly caught item.
      *
@@ -158,22 +112,26 @@ public class PlayerFish implements Listener {
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
-        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+        if (!toolStats.configTools.checkConfig(newItem.getType(), "fished-tag")) {
             return null;
         }
 
-        String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
-
-        container.set(toolStats.hash, PersistentDataType.STRING, hash);
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 5);
-
-        if (toolStats.configTools.checkConfig(newItem.getType(), "fished-tag")) {
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.setLore(newLore);
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
+            return null;
         }
+
+        // only make the hash if it's enabled
+        if (toolStats.config.getBoolean("generate-hash-for-items")) {
+            String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
+            container.set(toolStats.hash, PersistentDataType.STRING, hash);
+        }
+
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.originType, PersistentDataType.INTEGER, 5);
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

src/main/java/lol/hyper/toolstats/events/PlayerInteract.java

@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -30,7 +31,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -64,13 +64,7 @@ public class PlayerInteract implements Listener {
         // store when a player opens a chest
         if (block.getType() != Material.AIR && block.getType() == Material.CHEST) {
             openedChests.put(block, player);
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    openedChests.remove(block);
-                }
-            };
-            toolStats.scheduleGlobal(runnable, 20);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> openedChests.remove(block), 20);
         }
     }
 
@@ -82,16 +76,10 @@ public class PlayerInteract implements Listener {
             return;
         }
         // store when a player opens a minecart
-        if (clicked.getType() == EntityType.MINECART_CHEST) {
+        if (clicked.getType() == EntityType.CHEST_MINECART) {
             StorageMinecart storageMinecart = (StorageMinecart) clicked;
             openedMineCarts.put(storageMinecart, player);
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    openedMineCarts.remove(storageMinecart);
-                }
-            };
-            toolStats.scheduleGlobal(runnable, 20);
+            Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> openedMineCarts.remove(storageMinecart), 20);
         }
     }
 }

src/main/java/lol/hyper/toolstats/events/PlayerJoin.java

@@ -28,7 +28,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.UUID;
 
@@ -59,31 +58,47 @@ public class PlayerJoin implements Listener {
             }
             PersistentDataContainer container = itemMeta.getPersistentDataContainer();
 
-            // generate a hash if the item doesn't have one
-            if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
-                // make sure the item has an owner
-                if (!container.has(toolStats.genericOwner, new UUIDDataType())) {
-                    continue;
+            if (toolStats.config.getBoolean("tokens.enabled")) {
+                // if the token system is on and the item doesn't have stat keys
+                if (toolStats.itemChecker.keyCheck(container) && !container.has(toolStats.tokenType)) {
+                    // add the tokens
+                    String newTokens = toolStats.itemChecker.addTokensToExisting(itemStack);
+                    if (newTokens == null) {
+                        return;
+                    }
+                    container.set(toolStats.tokenApplied, PersistentDataType.STRING, newTokens);
+                    itemStack.setItemMeta(itemMeta);
                 }
-                UUID owner = container.get(toolStats.genericOwner, new UUIDDataType());
-                if (owner == null) {
-                    continue;
-                }
-                Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
-                if (timestamp == null) {
-                    continue;
-                }
-                String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
-                container.set(toolStats.hash, PersistentDataType.STRING, hash);
             }
-            ItemMeta clone = itemMeta.clone();
-            BukkitRunnable runnable = new BukkitRunnable() {
-                @Override
-                public void run() {
-                    itemStack.setItemMeta(clone);
+
+            // generate a hash if the item doesn't have one
+            if (toolStats.config.getBoolean("generate-hash-for-items")) {
+                if (!container.has(toolStats.hash, PersistentDataType.STRING)) {
+                    UUID owner = null;
+                    // get the current owner if there is one.
+                    if (container.has(toolStats.itemOwner, new UUIDDataType())) {
+                        owner = container.get(toolStats.itemOwner, new UUIDDataType());
+                    }
+                    // if there is no owner, use the player holding it
+                    if (owner == null) {
+                        owner = player.getUniqueId();
+                    }
+                    Long timestamp = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                    if (timestamp == null) {
+                        // if there is no time created, use now
+                        timestamp = System.currentTimeMillis();
+                    }
+                    String hash = toolStats.hashMaker.makeHash(itemStack.getType(), owner, timestamp);
+                    container.set(toolStats.hash, PersistentDataType.STRING, hash);
+                    itemStack.setItemMeta(itemMeta);
                 }
-            };
-            toolStats.scheduleEntity(runnable, player, 1);
+            } else {
+                // if hashes are disabled but the item has one, remove it.
+                if (container.has(toolStats.hash, PersistentDataType.STRING)) {
+                    container.remove(toolStats.hash);
+                    itemStack.setItemMeta(itemMeta);
+                }
+            }
         }
     }
 }

src/main/java/lol/hyper/toolstats/events/PlayerMove.java

@@ -25,12 +25,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class PlayerMove implements Listener {
@@ -54,54 +52,18 @@ public class PlayerMove implements Listener {
         } else {
             // player is not flying
             if (playerStartFlight.containsKey(player)) {
-                trackFlight(player, playerStartFlight.get(player));
+                PlayerInventory inventory = player.getInventory();
+                ItemStack chest = inventory.getChestplate();
+                // make sure the player is wearing an elytra
+                if (chest != null && chest.getType() == Material.ELYTRA) {
+                    long duration = (System.currentTimeMillis() - playerStartFlight.get(player));
+                    ItemMeta newItem = toolStats.itemLore.updateFlightTime(chest, duration);
+                    if (newItem != null) {
+                        inventory.getChestplate().setItemMeta(newItem);
+                    }
+                }
                 playerStartFlight.remove(player);
             }
         }
     }
-
-    private void trackFlight(Player player, long startTime) {
-        ItemStack chest = player.getInventory().getChestplate();
-        // make sure their chest piece is an elytra
-        if (chest == null || chest.getType() != Material.ELYTRA) {
-            return;
-        }
-        ItemMeta meta = chest.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(chest + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-
-        // read the current stats from the item
-        // if they don't exist, then start from 0
-        Long flightTime = 0L;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.flightTime, PersistentDataType.LONG)) {
-            flightTime = container.get(toolStats.flightTime, PersistentDataType.LONG);
-        }
-
-        if (flightTime == null) {
-            flightTime = 0L;
-            toolStats.logger.warning(flightTime + " does not have valid flight-time set! Resting to zero. This should NEVER happen.");
-        }
-
-        // get the duration of the flight
-        long duration = (System.currentTimeMillis() - startTime);
-        double newDuration = flightTime + duration;
-        container.set(toolStats.flightTime, PersistentDataType.LONG, flightTime + duration);
-
-        // do we add the lore based on the config?
-        if (toolStats.config.getBoolean("enabled.flight-time")) {
-            String oldFlightFormatted = toolStats.numberFormat.formatDouble((double) flightTime / 1000);
-            String newFlightFormatted = toolStats.numberFormat.formatDouble(newDuration / 1000);
-            String oldLine = toolStats.configTools.formatLore("flight-time", "{time}", oldFlightFormatted);
-            String newLine = toolStats.configTools.formatLore("flight-time", "{time}", newFlightFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
-            }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
-        }
-        chest.setItemMeta(meta);
-    }
 }

src/main/java/lol/hyper/toolstats/events/PrepareCraft.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.PrepareItemCraftEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+
+public class PrepareCraft implements Listener {
+
+    private final ToolStats toolStats;
+
+    public PrepareCraft(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onCraft(PrepareItemCraftEvent event) {
+        // get the items in the crafting grid
+        ItemStack[] grid = event.getInventory().getMatrix();
+        for (ItemStack item : grid) {
+            if (item == null || item.getType() != Material.PAPER) {
+                continue;
+            }
+            ItemMeta meta = item.getItemMeta();
+            if (meta == null) {
+                continue;
+            }
+            // if the paper item has our PDC, cancel it
+            PersistentDataContainer container = meta.getPersistentDataContainer();
+            if (container.has(toolStats.tokenType)) {
+                event.getInventory().setResult(null);
+            }
+        }
+    }
+}

src/main/java/lol/hyper/toolstats/events/SheepShear.java

@@ -30,11 +30,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public class SheepShear implements Listener {
 
@@ -54,82 +49,34 @@ public class SheepShear implements Listener {
             return;
         }
         Entity entity = event.getRightClicked();
-        if (!(entity instanceof Sheep)) {
+        if (!(entity instanceof Sheep sheep)) {
             return;
         }
 
-        ItemStack shears = getShears(player);
-        // player swapped items?
-        if (shears == null) {
+        ItemStack heldShears = toolStats.itemChecker.getShears(player.getInventory());
+        // player swapped or we can't get the shears
+        if (heldShears == null) {
             return;
         }
 
-        Sheep sheep = (Sheep) entity;
         // make sure the sheep is not sheared
         if (sheep.isSheared()) {
             return;
         }
 
         // update the stats
-        ItemStack finalShears = shears;
-        addLore(finalShears);
-    }
-
-    private static @Nullable ItemStack getShears(Player player) {
-        PlayerInventory inventory = player.getInventory();
-        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.SHEARS;
-        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
-        ItemStack shears = null;
-        if (isMainHand) {
-            shears = inventory.getItemInMainHand();
-        }
-        if (isOffHand) {
-            shears = inventory.getItemInOffHand();
-        }
-
-        // if the player is hold shears in both hands
-        // default to main hand since that takes priority
-        if (isMainHand && isOffHand) {
-            shears = inventory.getItemInMainHand();
-        }
-        return shears;
-    }
-
-    /**
-     * Adds tags to shears.
-     *
-     * @param newShears The shears.
-     */
-    private void addLore(ItemStack newShears) {
-        ItemMeta meta = newShears.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(newShears + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-        Integer sheepSheared = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
-            sheepSheared = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
-        }
-
-        if (sheepSheared == null) {
-            sheepSheared = 0;
-            toolStats.logger.warning(newShears + " does not have valid sheared set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared + 1);
-
-        if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
-            String oldSheepFormatted = toolStats.numberFormat.formatInt(sheepSheared);
-            String newSheepFormatted = toolStats.numberFormat.formatInt(sheepSheared + 1);
-            String oldLine = toolStats.configTools.formatLore("sheep-sheared", "{sheep}", oldSheepFormatted);
-            String newLine = toolStats.configTools.formatLore("sheep-sheared", "{sheep}", newSheepFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
+        ItemMeta newShears = toolStats.itemLore.updateSheepSheared(heldShears, 1);
+        if (newShears != null) {
+            PlayerInventory inventory = player.getInventory();
+            boolean isMain = inventory.getItemInMainHand().getType() == Material.SHEARS;
+            boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
+            if (isMain && isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newShears);
+            } else if (isMain) {
+                inventory.getItemInMainHand().setItemMeta(newShears);
+            } else if (isOffHand) {
+                inventory.getItemInOffHand().setItemMeta(newShears);
             }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
         }
-        newShears.setItemMeta(meta);
     }
 }

src/main/java/lol/hyper/toolstats/events/ShootBow.java

@@ -29,11 +29,6 @@ import org.bukkit.event.entity.EntityShootBowEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public class ShootBow implements Listener {
 
@@ -47,78 +42,32 @@ public class ShootBow implements Listener {
     public void onShoot(EntityShootBowEvent event) {
         Entity shooter = event.getEntity();
         // only listen for players
-        if (!(shooter instanceof Player)) {
+        if (!(shooter instanceof Player player)) {
             return;
         }
 
-        Player player = (Player) shooter;
         if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.ADVENTURE) {
             return;
         }
 
-        PlayerInventory inventory = player.getInventory();
-        ItemStack heldBow = getBow(inventory);
-
-        // player swapped
+        ItemStack heldBow = toolStats.itemChecker.getBow(player.getInventory());
+        // player swapped or we can't get the bow
         if (heldBow == null) {
             return;
         }
 
-        updateArrowsShot(heldBow);
-    }
-
-    private static @Nullable ItemStack getBow(PlayerInventory inventory) {
-        boolean isMainHand = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
-        boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
-        ItemStack heldBow = null;
-        if (isMainHand) {
-            heldBow = inventory.getItemInMainHand();
-        }
-        if (isOffHand) {
-            heldBow = inventory.getItemInOffHand();
-        }
-
-        // if the player is holding a bow in both hands
-        // default to main hand since that takes priority
-        if (isMainHand && isOffHand) {
-            heldBow = inventory.getItemInMainHand();
-        }
-        return heldBow;
-    }
-
-    private void updateArrowsShot(ItemStack bow) {
-        ItemMeta meta = bow.getItemMeta();
-        if (meta == null) {
-            toolStats.logger.warning(bow + " does NOT have any meta! Unable to update stats.");
-            return;
-        }
-        // read the current stats from the item
-        // if they don't exist, then start from 0
-        Integer arrowsShot = 0;
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-        if (container.has(toolStats.arrowsShot, PersistentDataType.INTEGER)) {
-            arrowsShot = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
-        }
-
-        if (arrowsShot == null) {
-            arrowsShot = 0;
-            toolStats.logger.warning(arrowsShot + " does not have valid arrows-shot set! Resting to zero. This should NEVER happen.");
-        }
-
-        container.set(toolStats.arrowsShot, PersistentDataType.INTEGER, arrowsShot + 1);
-
-        // do we add the lore based on the config?
-        if (toolStats.config.getBoolean("enabled.arrows-shot")) {
-            String oldArrowsFormatted = toolStats.numberFormat.formatInt(arrowsShot);
-            String newArrowsFormatted = toolStats.numberFormat.formatInt(arrowsShot + 1);
-            String oldLine = toolStats.configTools.formatLore("arrows-shot", "{arrows}", oldArrowsFormatted);
-            String newLine = toolStats.configTools.formatLore("arrows-shot", "{arrows}", newArrowsFormatted);
-            if (oldLine == null || newLine == null) {
-                return;
+        ItemMeta newBow = toolStats.itemLore.updateArrowsShot(heldBow, 1);
+        if (newBow != null) {
+            PlayerInventory inventory = player.getInventory();
+            boolean isMain = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
+            boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInOffHand().getType() == Material.CROSSBOW;
+            if (isMain && isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newBow);
+            } else if (isMain) {
+                inventory.getItemInMainHand().setItemMeta(newBow);
+            } else if (isOffHand) {
+                inventory.getItemInOffHand().setItemMeta(newBow);
             }
-            List<String> newLore = toolStats.itemLore.updateItemLore(meta, oldLine, newLine);
-            meta.setLore(newLore);
         }
-        bow.setItemMeta(meta);
     }
 }

src/main/java/lol/hyper/toolstats/events/VillagerTrade.java

@@ -19,8 +19,9 @@ package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -51,35 +52,62 @@ public class VillagerTrade implements Listener {
             return;
         }
         Inventory inventory = event.getClickedInventory();
-        if (!(event.getWhoClicked() instanceof Player)) {
+        if (!(event.getWhoClicked() instanceof Player player)) {
             return;
         }
-        Player player = (Player) event.getWhoClicked();
         if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
         // only check villager inventories
-        if (inventory instanceof MerchantInventory) {
-            // only check the result slot (the item you receive)
-            if (event.getSlotType() == InventoryType.SlotType.RESULT) {
-                ItemStack item = event.getCurrentItem();
-                // only check items we want
-                if (!toolStats.itemChecker.isValidItem(item.getType())) {
-                    return;
-                }
-                // if the player shift clicks, show the warning
-                if (event.isShiftClick()) {
-                    String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
-                    if (configMessage != null) {
-                        player.sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
+        if (!(inventory instanceof MerchantInventory)) {
+            return;
+        }
+        // only check the result slot (the item you receive)
+        if (event.getSlotType() != InventoryType.SlotType.RESULT) {
+            return;
+        }
+        ItemStack tradedItem = event.getCurrentItem();
+        Material tradedMaterial = tradedItem.getType();
+        // only check items we want
+        if (!toolStats.itemChecker.isValidItem(tradedMaterial)) {
+            return;
+        }
+        // if the player shift clicks
+        if (event.isShiftClick()) {
+            // store the player inventory before they trade the items
+            ItemStack[] beforeTrade = player.getInventory().getContents();
+            // run a tick after to see the changes
+            player.getScheduler().runDelayed(toolStats, scheduledTask -> {
+                // get their inventory after the trade
+                ItemStack[] afterTrade = player.getInventory().getContents();
+                for (int i = 0; i < afterTrade.length; i++) {
+                    ItemStack newSlotItem = afterTrade[i];
+                    ItemStack oldSlotItem = beforeTrade[i];
+
+                    // if this slot is empty after trading, skip it
+                    if (newSlotItem == null) {
+                        continue;
+                    }
+
+                    // if the item matches what we traded
+                    if (newSlotItem.getType() == tradedMaterial) {
+                        // if the slot was empty before we traded, this means we just traded it
+                        if (oldSlotItem == null) {
+                            // add the lore
+                            ItemStack newItem = addTradeOrigin(newSlotItem, player);
+                            if (newItem != null) {
+                                player.getInventory().setItem(i, newItem);
+                            }
+                        }
                     }
                 }
-                ItemStack newItem = addLore(item, player);
-                if (newItem != null) {
-                    // set the new item
-                    inventory.setItem(event.getSlot(), newItem);
-                }
-            }
+            }, null, 1);
+            return;
+        }
+        ItemStack newItem = addTradeOrigin(tradedItem, player);
+        if (newItem != null) {
+            // set the new item
+            inventory.setItem(event.getSlot(), newItem);
         }
     }
 
@@ -90,7 +118,7 @@ public class VillagerTrade implements Listener {
      * @param owner   The player who traded.
      * @return The item with lore.
      */
-    private ItemStack addLore(ItemStack oldItem, Player owner) {
+    private ItemStack addTradeOrigin(ItemStack oldItem, Player owner) {
         ItemStack newItem = oldItem.clone();
         ItemMeta meta = newItem.getItemMeta();
         if (meta == null) {
@@ -101,7 +129,11 @@ public class VillagerTrade implements Listener {
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
-        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
+            return null;
+        }
+
+        if (!toolStats.configTools.checkConfig(newItem.getType(), "traded-tag")) {
             return null;
         }
 
@@ -112,14 +144,11 @@ public class VillagerTrade implements Listener {
         }
 
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
         container.set(toolStats.originType, PersistentDataType.INTEGER, 3);
-
-        if (toolStats.configTools.checkConfig(newItem.getType(), "traded-tag")) {
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<String> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.setLore(newLore);
-        }
+        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
+        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
+        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

src/main/java/lol/hyper/toolstats/tools/ItemChecker.java

@@ -17,9 +17,18 @@
 
 package lol.hyper.toolstats.tools;
 
+import lol.hyper.toolstats.ToolStats;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -29,11 +38,16 @@ public class ItemChecker {
     private final List<Material> armorItems = new ArrayList<>();
     private final List<Material> meleeItems = new ArrayList<>();
     private final List<Material> mineItems = new ArrayList<>();
+    private final ToolStats toolStats;
+
+    public ItemChecker(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
 
     /**
-     * Creates an item checker and saves all valid items we want.
+     * Set up the item checker.
      */
-    public ItemChecker() {
+    public void setup() {
         for (Material material : Material.values()) {
             String lowerCase = material.toString().toLowerCase(Locale.ROOT);
             if (lowerCase.contains("_pickaxe") || lowerCase.contains("_axe") || lowerCase.contains("_hoe") || lowerCase.contains("_shovel")) {
@@ -52,9 +66,11 @@ public class ItemChecker {
         // hardcode these
         mineItems.add(Material.SHEARS);
         meleeItems.add(Material.TRIDENT);
+        meleeItems.add(Material.MACE);
+
         validItems.add(Material.BOW);
-        validItems.add(Material.FISHING_ROD);
         validItems.add(Material.CROSSBOW);
+        validItems.add(Material.FISHING_ROD);
         validItems.add(Material.ELYTRA);
 
         // combine the lists
@@ -102,4 +118,240 @@ public class ItemChecker {
     public boolean isMineTool(Material itemType) {
         return mineItems.contains(itemType);
     }
+
+    /**
+     * Check a given item for a target token.
+     *
+     * @param container   The PDC of the item.
+     * @param targetToken The target to look for.
+     * @return True if the item has a given token, false if not.
+     */
+    public boolean checkTokens(PersistentDataContainer container, String targetToken) {
+        // make sure the item has tokens
+        if (!container.has(toolStats.tokenApplied, PersistentDataType.STRING)) {
+            return false;
+        }
+
+        // get the tokens for this item
+        String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+        if (tokens == null) {
+            return false;
+        }
+
+        return tokens.contains(targetToken);
+    }
+
+    /**
+     * Get the tokens for a given item.
+     *
+     * @param item The item.
+     * @return An array of the tokens, empty if there are none.
+     */
+    private String[] getTokens(ItemStack item) {
+        // make sure the item has tokens
+        ItemMeta meta = item.getItemMeta();
+        if (meta == null) {
+            return new String[0];
+        }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        if (!container.has(toolStats.tokenApplied, PersistentDataType.STRING)) {
+            return new String[0];
+        }
+
+        // get the tokens for this item
+        String tokensRaw = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+        if (tokensRaw == null) {
+            return new String[0];
+        }
+
+        return tokensRaw.split(",");
+    }
+
+    /**
+     * Add a token to an item.
+     *
+     * @param item  The item.
+     * @param token The token to add.
+     * @return The new PDC with the new token. Null if something went wrong.
+     */
+    public ItemStack addToken(ItemStack item, String token) {
+        ItemMeta meta = item.getItemMeta();
+        if (meta == null) {
+            return null;
+        }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        String[] tokens = getTokens(item);
+        // there are no tokens
+        if (tokens.length == 0) {
+            container.set(toolStats.tokenApplied, PersistentDataType.STRING, token);
+        } else {
+            // other tokens exist, so add
+            String[] newTokens = Arrays.copyOf(tokens, tokens.length + 1);
+            newTokens[tokens.length] = token;
+            container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+        }
+        item.setItemMeta(meta);
+        return item;
+    }
+
+    /**
+     * Get the XP levels required to use token in anvil.
+     *
+     * @param tokenType The token type.
+     * @return The amount of levels to use.
+     */
+    public int getCost(String tokenType) {
+        return toolStats.config.getInt("tokens.data." + tokenType + ".levels");
+    }
+
+    /**
+     * Get the player's bow/crossbow.
+     *
+     * @param inventory Their inventory.
+     * @return Their bow/crossbow, either main or offhand.
+     */
+    public @Nullable ItemStack getBow(PlayerInventory inventory) {
+        ItemStack main = inventory.getItemInMainHand();
+        ItemStack offHand = inventory.getItemInOffHand();
+
+        boolean isMain = main.getType() == Material.BOW || main.getType() == Material.CROSSBOW;
+        boolean isOffHand = offHand.getType() == Material.BOW || offHand.getType() == Material.CROSSBOW;
+
+        // if the player is holding a bow in their main hand, use that one
+        // if the bow is in their offhand instead, use that one after checking main hand
+        // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
+        if (isMain) {
+            return main;
+        }
+        if (isOffHand) {
+            return offHand;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the player's shears.
+     *
+     * @param inventory Their inventory.
+     * @return Their shears, either main or offhand.
+     */
+    public @Nullable ItemStack getShears(PlayerInventory inventory) {
+        ItemStack main = inventory.getItemInMainHand();
+        ItemStack offHand = inventory.getItemInOffHand();
+
+        boolean isMain = main.getType() == Material.SHEARS;
+        boolean isOffHand = offHand.getType() == Material.SHEARS;
+
+        // if the player is holding shears in their main hand, use that one
+        // if the shears are in their offhand instead, use that one after checking main hand
+        // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
+        if (isMain) {
+            return main;
+        }
+        if (isOffHand) {
+            return offHand;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the player's fishing rod.
+     *
+     * @param inventory Their inventory.
+     * @return Their fishing rod, either main or offhand.
+     */
+    public @Nullable ItemStack getFishingRod(PlayerInventory inventory) {
+        ItemStack main = inventory.getItemInMainHand();
+        ItemStack offHand = inventory.getItemInOffHand();
+
+        boolean isMain = main.getType() == Material.FISHING_ROD;
+        boolean isOffHand = offHand.getType() == Material.FISHING_ROD;
+
+        // if the player is holding a fishing rod in their main hand, use that one
+        // if the fishing rod is in their offhand instead, use that one after checking main hand
+        // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
+        if (isMain) {
+            return main;
+        }
+        if (isOffHand) {
+            return offHand;
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks the keys of the item and returns the tokens we should add.
+     * If the server swaps token systems this should allow compatability.
+     *
+     * @param item The input item.
+     * @return The tokens we should add.
+     */
+    public String addTokensToExisting(ItemStack item) {
+        ItemStack clone = item.clone();
+        ItemMeta meta = clone.getItemMeta();
+        if (meta == null) {
+            return null;
+        }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        ArrayList<String> tokens = new ArrayList<>();
+        if (container.has(toolStats.playerKills)) {
+            tokens.add("player-kills");
+        }
+        if (container.has(toolStats.mobKills)) {
+            tokens.add("mob-kills");
+        }
+        if (container.has(toolStats.blocksMined)) {
+            tokens.add("blocks-mined");
+        }
+        if (container.has(toolStats.cropsHarvested)) {
+            tokens.add("crops-mined");
+        }
+        if (container.has(toolStats.fishCaught)) {
+            tokens.add("fish-caught");
+        }
+        if (container.has(toolStats.sheepSheared)) {
+            tokens.add("sheep-sheared");
+        }
+        if (container.has(toolStats.armorDamage)) {
+            tokens.add("damage-taken");
+        }
+        if (container.has(toolStats.arrowsShot)) {
+            tokens.add("arrows-shot");
+        }
+        if (container.has(toolStats.flightTime)) {
+            tokens.add("flight-time");
+        }
+        if (container.has(toolStats.damageDone)) {
+            tokens.add("damage-done");
+        }
+        if (tokens.isEmpty()) {
+            return null;
+        }
+
+        return String.join(",", tokens);
+    }
+
+    /**
+     * Check to see if a given container has our keys for stats.
+     *
+     * @param container The container.
+     * @return True/false if the container has keys.
+     */
+    public boolean keyCheck(PersistentDataContainer container) {
+        return container.getKeys().stream()
+                .map(NamespacedKey::getKey)
+                .anyMatch(key -> toolStats.tokenKeys.stream().anyMatch(tokenKey -> tokenKey.getKey().equalsIgnoreCase(key)));
+    }
 }

src/main/java/lol/hyper/toolstats/tools/NumberFormat.java

@@ -23,7 +23,9 @@ import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 public class NumberFormat {
 
@@ -65,7 +67,7 @@ public class NumberFormat {
         }
 
         if (decimalFormat == null) {
-            decimalFormat = "#,###.00";
+            decimalFormat = "#,##0.00";
             toolStats.logger.warning("number-formats.comma-separator is missing! Using default #,###.00 instead.");
         }
 
@@ -136,4 +138,59 @@ public class NumberFormat {
     public String formatDate(Date date) {
         return DATE_FORMAT.format(date);
     }
+
+    /**
+     * Returns a human readable form of time in milliseconds.
+     * E.g. given 3752348000L outputs 1 years, 5 months, 3 days, 14 hours, 12 minutes, 28 seconds.
+     * @param time The time in ms.
+     * @return Map with units as keys and time value, e.g. "years" (key) -> 1 (value)
+     */
+    public Map<String, String> formatTime(Long time) {
+        final int SECONDS_PER_MINUTE = 60;
+        final int MINUTES_PER_HOUR = 60;
+        final int HOURS_PER_DAY = 24;
+        final int DAYS_PER_MONTH = 30;  // Approximation
+        final int DAYS_PER_YEAR = 365;  // Approximation
+
+        long totalSeconds = time / 1000;
+
+        Map<String, String> timeUnits = new HashMap<>();
+        
+        long years = totalSeconds / (DAYS_PER_YEAR * HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+        if (years > 0) {
+            timeUnits.put("years", Long.toString(years));
+        }
+        totalSeconds %= (DAYS_PER_YEAR * HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+
+        long months = totalSeconds / (DAYS_PER_MONTH * HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+        if (months > 0) {
+            timeUnits.put("months", Long.toString(months));
+        }
+        totalSeconds %= (DAYS_PER_MONTH * HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+
+        long days = totalSeconds / (HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+        if (days > 0) {
+            timeUnits.put("days", Long.toString(days));
+        }
+        totalSeconds %= (HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+
+        long hours = totalSeconds / (MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+        if (hours > 0) {
+            timeUnits.put("hours", Long.toString(hours));
+        }
+        totalSeconds %= (MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
+
+        long minutes = totalSeconds / SECONDS_PER_MINUTE;
+        if (minutes > 0) {
+            timeUnits.put("minutes", Long.toString(minutes));
+        }
+        totalSeconds %= SECONDS_PER_MINUTE;
+
+        long seconds = totalSeconds;
+        if (seconds > 0 || timeUnits.isEmpty()) {  // Always include seconds if everything else is zero
+            timeUnits.put("seconds", Long.toString(seconds));
+        }
+        
+        return timeUnits;
+    }
 }

src/main/java/lol/hyper/toolstats/tools/TokenCrafting.java

@@ -0,0 +1,143 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.ShapedRecipe;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+public class TokenCrafting {
+
+    private final ToolStats toolStats;
+    private final Set<ShapedRecipe> recipes = new HashSet<>();
+    private final ArrayList<String> tokenTypes = new ArrayList<>();
+
+    public TokenCrafting(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    public void setup() {
+        NamespacedKey playerKillsKey = new NamespacedKey(toolStats, "player-kills-token");
+        ShapedRecipe playerKillRecipe = new ShapedRecipe(playerKillsKey, toolStats.tokenItems.playerKills());
+        playerKillRecipe.shape(" P ", "PSP", " P ");
+        playerKillRecipe.setIngredient('P', Material.PAPER);
+        playerKillRecipe.setIngredient('S', Material.WOODEN_SWORD);
+        recipes.add(playerKillRecipe);
+
+        NamespacedKey mobKillsKey = new NamespacedKey(toolStats, "mob-kills-token");
+        ShapedRecipe mobKillsRecipe = new ShapedRecipe(mobKillsKey, toolStats.tokenItems.mobKills());
+        mobKillsRecipe.shape(" P ", "PRP", " P ");
+        mobKillsRecipe.setIngredient('P', Material.PAPER);
+        mobKillsRecipe.setIngredient('R', Material.ROTTEN_FLESH);
+        recipes.add(mobKillsRecipe);
+
+        NamespacedKey blocksMinedKey = new NamespacedKey(toolStats, "blocks-mined-token");
+        ShapedRecipe blocksMinedRecipe = new ShapedRecipe(blocksMinedKey, toolStats.tokenItems.blocksMined());
+        blocksMinedRecipe.shape(" P ", "PSP", " P ");
+        blocksMinedRecipe.setIngredient('P', Material.PAPER);
+        blocksMinedRecipe.setIngredient('S', Material.WOODEN_PICKAXE);
+        recipes.add(blocksMinedRecipe);
+
+        NamespacedKey cropsMinedKey = new NamespacedKey(toolStats, "crops-mined-token");
+        ShapedRecipe cropsMinedRecipe = new ShapedRecipe(cropsMinedKey, toolStats.tokenItems.cropsMined());
+        cropsMinedRecipe.shape(" P ", "PHP", " P ");
+        cropsMinedRecipe.setIngredient('P', Material.PAPER);
+        cropsMinedRecipe.setIngredient('H', Material.WOODEN_HOE);
+        recipes.add(cropsMinedRecipe);
+
+        NamespacedKey fishCaughtKey = new NamespacedKey(toolStats, "fish-caught-token");
+        ShapedRecipe fishCaughtRecipe = new ShapedRecipe(fishCaughtKey, toolStats.tokenItems.fishCaught());
+        fishCaughtRecipe.shape(" P ", "PCP", " P ");
+        fishCaughtRecipe.setIngredient('P', Material.PAPER);
+        fishCaughtRecipe.setIngredient('C', Material.COD);
+        recipes.add(fishCaughtRecipe);
+
+        NamespacedKey sheepShearedKey = new NamespacedKey(toolStats, "sheep-sheared-token");
+        ShapedRecipe sheepShearedRecipe = new ShapedRecipe(sheepShearedKey, toolStats.tokenItems.sheepSheared());
+        sheepShearedRecipe.shape(" P ", "PWP", " P ");
+        sheepShearedRecipe.setIngredient('P', Material.PAPER);
+        sheepShearedRecipe.setIngredient('W', Material.WHITE_WOOL);
+        recipes.add(sheepShearedRecipe);
+
+        NamespacedKey armorDamageKey = new NamespacedKey(toolStats, "damage-taken-token");
+        ShapedRecipe armorDamageRecipe = new ShapedRecipe(armorDamageKey, toolStats.tokenItems.damageTaken());
+        armorDamageRecipe.shape(" P ", "PCP", " P ");
+        armorDamageRecipe.setIngredient('P', Material.PAPER);
+        armorDamageRecipe.setIngredient('C', Material.LEATHER_CHESTPLATE);
+        recipes.add(armorDamageRecipe);
+
+        NamespacedKey damageDoneKey = new NamespacedKey(toolStats, "damage-done-token");
+        ShapedRecipe damageDoneRecipe = new ShapedRecipe(damageDoneKey, toolStats.tokenItems.damageDone());
+        damageDoneRecipe.shape(" P ", "PSP", " P ");
+        damageDoneRecipe.setIngredient('P', Material.PAPER);
+        damageDoneRecipe.setIngredient('S', Material.SHIELD);
+        recipes.add(damageDoneRecipe);
+
+        NamespacedKey arrowsShotKey = new NamespacedKey(toolStats, "arrows-shot-token");
+        ShapedRecipe arrowsShotRecipe = new ShapedRecipe(arrowsShotKey, toolStats.tokenItems.arrowsShot());
+        arrowsShotRecipe.shape(" P ", "PAP", " P ");
+        arrowsShotRecipe.setIngredient('P', Material.PAPER);
+        arrowsShotRecipe.setIngredient('A', Material.ARROW);
+        recipes.add(arrowsShotRecipe);
+
+        NamespacedKey flightTimeKey = new NamespacedKey(toolStats, "flight-time-token");
+        ShapedRecipe flightTimeRecipe = new ShapedRecipe(flightTimeKey, toolStats.tokenItems.flightTime());
+        flightTimeRecipe.shape(" P ", "PFP", " P ");
+        flightTimeRecipe.setIngredient('P', Material.PAPER);
+        flightTimeRecipe.setIngredient('F', Material.FEATHER);
+        recipes.add(flightTimeRecipe);
+
+        NamespacedKey resetKey = new NamespacedKey(toolStats, "reset-token");
+        ShapedRecipe resetRecipe = new ShapedRecipe(resetKey, toolStats.tokenItems.resetToken());
+        resetRecipe.shape(" P ", "PPP", " P ");
+        resetRecipe.setIngredient('P', Material.PAPER);
+        recipes.add(resetRecipe);
+
+        NamespacedKey removeKey = new NamespacedKey(toolStats, "remove-token");
+        ShapedRecipe removeRecipe = new ShapedRecipe(removeKey, toolStats.tokenItems.removeToken());
+        removeRecipe.shape(" P ", "P P", " P ");
+        removeRecipe.setIngredient('P', Material.PAPER);
+        recipes.add(removeRecipe);
+
+        tokenTypes.add("crops-mined");
+        tokenTypes.add("blocks-mined");
+        tokenTypes.add("damage-taken");
+        tokenTypes.add("damage-done");
+        tokenTypes.add("mob-kills");
+        tokenTypes.add("player-kills");
+        tokenTypes.add("arrows-shot");
+        tokenTypes.add("sheep-sheared");
+        tokenTypes.add("flight-time");
+        tokenTypes.add("fish-caught");
+        tokenTypes.add("reset");
+        tokenTypes.add("remove");
+    }
+
+    public Set<ShapedRecipe> getRecipes() {
+        return recipes;
+    }
+
+    public ArrayList<String> getTokenTypes() {
+        return tokenTypes;
+    }
+}

src/main/java/lol/hyper/toolstats/tools/UUIDDataType.java

@@ -15,23 +15,6 @@
  * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
- * This file is part of ToolStats.
- *
- * ToolStats is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ToolStats is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 package lol.hyper.toolstats.tools;
 
 import org.bukkit.persistence.PersistentDataAdapterContext;

src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java

@@ -18,9 +18,16 @@
 package lol.hyper.toolstats.tools.config;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Material;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -29,7 +36,6 @@ public class ConfigTools {
     private final ToolStats toolStats;
     public static final Pattern COLOR_CODES = Pattern.compile("[&§]([0-9a-fk-or])");
     public static final Pattern CONFIG_HEX_PATTERN = Pattern.compile("[&§]#([A-Fa-f0-9]{6})");
-    public static final Pattern MINECRAFT_HEX_PATTERN = Pattern.compile("§x(?:§[a-fA-F0-9]){6}|§[a-fA-F0-9]");
 
     public ConfigTools(ToolStats toolStats) {
         this.toolStats = toolStats;
@@ -40,7 +46,7 @@ public class ConfigTools {
      *
      * @param material   The item type to check.
      * @param configName The config we are checking under.
-     * @return If we want to allow lore or not.
+     * @return If we want to add data or not.
      */
     public boolean checkConfig(Material material, String configName) {
         String itemName = material.toString().toLowerCase();
@@ -70,43 +76,21 @@ public class ConfigTools {
             itemType = itemName.substring(itemName.indexOf('_') + 1);
         }
 
-        switch (itemType) {
-            case "pickaxe": {
-                return toolStats.config.getBoolean("enabled." + configName + ".pickaxe");
-            }
-            case "sword": {
-                return toolStats.config.getBoolean("enabled." + configName + ".sword");
-            }
-            case "shovel": {
-                return toolStats.config.getBoolean("enabled." + configName + ".shovel");
-            }
-            case "axe": {
-                return toolStats.config.getBoolean("enabled." + configName + ".axe");
-            }
-            case "hoe": {
-                return toolStats.config.getBoolean("enabled." + configName + ".hoe");
-            }
-            case "shears": {
-                return toolStats.config.getBoolean("enabled." + configName + ".shears");
-            }
-            case "crossbow":
-            case "bow": {
-                return toolStats.config.getBoolean("enabled." + configName + ".bow");
-            }
-            case "trident": {
-                return toolStats.config.getBoolean("enabled." + configName + ".trident");
-            }
-            case "fishing-rod": {
-                return toolStats.config.getBoolean("enabled." + configName + ".fishing-rod");
-            }
-            case "helmet":
-            case "chestplate":
-            case "leggings":
-            case "boots": {
-                return toolStats.config.getBoolean("enabled." + configName + ".armor");
-            }
-        }
-        return false;
+        return switch (itemType) {
+            case "pickaxe" -> toolStats.config.getBoolean("enabled." + configName + ".pickaxe");
+            case "sword" -> toolStats.config.getBoolean("enabled." + configName + ".sword");
+            case "shovel" -> toolStats.config.getBoolean("enabled." + configName + ".shovel");
+            case "axe" -> toolStats.config.getBoolean("enabled." + configName + ".axe");
+            case "hoe" -> toolStats.config.getBoolean("enabled." + configName + ".hoe");
+            case "shears" -> toolStats.config.getBoolean("enabled." + configName + ".shears");
+            case "crossbow", "bow" -> toolStats.config.getBoolean("enabled." + configName + ".bow");
+            case "trident" -> toolStats.config.getBoolean("enabled." + configName + ".trident");
+            case "fishing-rod" -> toolStats.config.getBoolean("enabled." + configName + ".fishing-rod");
+            case "mace" -> toolStats.config.getBoolean("enabled." + configName + ".mace");
+            case "helmet", "chestplate", "leggings", "boots" ->
+                    toolStats.config.getBoolean("enabled." + configName + ".armor");
+            default -> false;
+        };
     }
 
     /**
@@ -117,40 +101,158 @@ public class ConfigTools {
      * @param value       The value to set the placeholder.
      * @return Formatted string, null if the configName doesn't exist.
      */
-    public String formatLore(String configName, String placeHolder, Object value) {
+    public Component formatLore(String configName, String placeHolder, Object value) {
         String lore = toolStats.config.getString("messages." + configName);
         if (lore == null) {
+            toolStats.logger.warning("Unable to find config message for: messages." + configName);
             return null;
         }
 
+        // if the config message is empty, don't send it
+        if (lore.isEmpty()) {
+            return null;
+        }
+
+        // the final component for this lore
+        Component component;
+
         // set the placeholder to the value
-        lore = lore.replace(placeHolder, String.valueOf(value));
+        if (placeHolder != null && value != null) {
+            lore = lore.replace(placeHolder, String.valueOf(value));
+        }
 
+        // if we match the old color codes, then format them as so
         Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(lore);
-        while (hexMatcher.find()) {
-            String hexCode = hexMatcher.group(1);
-            lore = lore.replaceAll(hexMatcher.group(), net.md_5.bungee.api.ChatColor.of("#" + hexCode).toString());
-        }
-
         Matcher colorMatcher = COLOR_CODES.matcher(lore);
-        while (colorMatcher.find()) {
-            String colorCode = colorMatcher.group(1);
-            lore = lore.replaceAll("&" + colorCode, ChatColor.getByChar(colorCode).toString());
+        if (hexMatcher.find() || colorMatcher.find()) {
+            component = LegacyComponentSerializer.legacyAmpersand().deserialize(lore);
+        } else {
+            // otherwise format them normally
+            component = MiniMessage.miniMessage().deserialize(lore);
         }
 
-        return ChatColor.translateAlternateColorCodes('§', lore);
+        return component.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE);
     }
 
     /**
-     * Remove all color codes from a message.
+     * Format a string with several placeholders to be ready for lore usage.
      *
-     * @param message The message.
-     * @return The message without color codes.
+     * @param configName         The message to use.
+     * @param placeHoldersValues Map containing placeholders names as keys and values.
+     * @return Formatted string, null if the configName doesn't exist.
      */
-    public String removeColor(String message) {
-        message = MINECRAFT_HEX_PATTERN.matcher(message).replaceAll("");
-        message = COLOR_CODES.matcher(message).replaceAll("");
-        message = CONFIG_HEX_PATTERN.matcher(message).replaceAll("");
-        return message;
+    public Component formatLoreMultiplePlaceholders(String configName, Map<String, String> placeHoldersValues) {
+        String lore = toolStats.config.getString("messages." + configName);
+        if (lore == null) {
+            toolStats.logger.warning("Unable to find config message for: messages." + configName);
+            return null;
+        }
+
+        // if the config message is empty, don't send it
+        if (lore.isEmpty()) {
+            return null;
+        }
+
+        Pattern pattern = Pattern.compile("\\{([^}]+)\\}(\\S*)\\s*");
+        Matcher matcher = pattern.matcher(lore);
+
+        StringBuilder result = new StringBuilder();
+        int lastEnd = 0;
+
+        while (matcher.find()) {
+            String placeholder = matcher.group(1);
+            String unit = matcher.group(2);
+
+            result.append(lore, lastEnd, matcher.start());
+
+            if (placeHoldersValues.containsKey(placeholder)) {
+                result.append(placeHoldersValues.get(placeholder)).append(unit).append(" ");
+            }
+
+            // Update lastEnd to end of the match
+            lastEnd = matcher.end();
+        }
+        if (lastEnd < lore.length()) {
+            result.append(lore.substring(lastEnd));
+        }
+
+        Component component;
+        // Clean output text
+        String outputText = result.toString().replaceAll("\\s+", " ").trim();
+
+        // if we match the old color codes, then format them as so
+        Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(outputText);
+        Matcher colorMatcher = COLOR_CODES.matcher(outputText);
+        if (hexMatcher.find() || colorMatcher.find()) {
+            component = LegacyComponentSerializer.legacyAmpersand().deserialize(outputText);
+        } else {
+            // otherwise format them normally
+            component = MiniMessage.miniMessage().deserialize(outputText);
+        }
+
+        return component.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE);
+    }
+
+    /**
+     * Format a string from the config.
+     *
+     * @param configName The config to format.
+     * @return Formatted string, null if the configName doesn't exist.
+     */
+    public Component format(String configName) {
+        String message = toolStats.config.getString(configName);
+        if (message == null) {
+            toolStats.logger.warning("Unable to find config message for: " + configName);
+            return null;
+        }
+
+        // if the config message is empty, don't send it
+        if (message.isEmpty()) {
+            return null;
+        }
+
+        // the final component for this lore
+        Component component;
+        // if we match the old color codes, then format them as so
+        Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(message);
+        Matcher colorMatcher = COLOR_CODES.matcher(message);
+        if (hexMatcher.find() || colorMatcher.find()) {
+            component = LegacyComponentSerializer.legacyAmpersand().deserialize(message);
+        } else {
+            // otherwise format them normally
+            component = MiniMessage.miniMessage().deserialize(message);
+        }
+
+        return component.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE);
+    }
+
+    /**
+     * Get the token item's lore from config.
+     *
+     * @param tokenType The type.
+     * @return The lore.
+     */
+    public List<Component> getTokenLore(String tokenType) {
+        List<String> raw = toolStats.config.getStringList("tokens.data." + tokenType + ".lore");
+        if (raw.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Component> finalLore = new ArrayList<>();
+        for (String line : raw) {
+            Component component;
+            // if we match the old color codes, then format them as so
+            Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(line);
+            Matcher colorMatcher = COLOR_CODES.matcher(line);
+            if (hexMatcher.find() || colorMatcher.find()) {
+                component = LegacyComponentSerializer.legacyAmpersand().deserialize(line);
+            } else {
+                // otherwise format them normally
+                component = MiniMessage.miniMessage().deserialize(line);
+            }
+            component = component.decorationIfAbsent(TextDecoration.ITALIC, TextDecoration.State.FALSE);
+            finalLore.add(component);
+        }
+        return finalLore;
     }
 }

src/main/java/lol/hyper/toolstats/tools/config/ConfigUpdater.java

@@ -15,28 +15,10 @@
  * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*
- * This file is part of ToolStats.
- *
- * ToolStats is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ToolStats is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 package lol.hyper.toolstats.tools.config;
 
 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.tools.config.versions.Version6;
-import lol.hyper.toolstats.tools.config.versions.Version7;
+import lol.hyper.toolstats.tools.config.versions.*;
 
 public class ConfigUpdater {
 
@@ -49,17 +31,35 @@ public class ConfigUpdater {
     public void updateConfig() {
         int version = toolStats.config.getInt("config-version");
 
-        // this will be a switch in the future
-        // Upgrade 5 to 6
+        // Version 5 to 6
         if (version == 5) {
             Version6 version6 = new Version6(toolStats);
             version6.update();
         }
-
-        // Upgrade 6 to 7
+        // Version 6 to 7
         if (version == 6) {
             Version7 version7 = new Version7(toolStats);
             version7.update();
         }
+        // Version 7 to 8
+        if (version == 7) {
+            Version8 version8 = new Version8(toolStats);
+            version8.update();
+        }
+        // Version 8 to 9
+        if (version == 8) {
+            Version9 version9 = new Version9(toolStats);
+            version9.update();
+        }
+        // Version 9 to 10
+        if (version == 9) {
+            Version10 version10 = new Version10(toolStats);
+            version10.update();
+        }
+        // Version 10 to 11
+        if (version == 10) {
+            Version11 version11 = new Version11(toolStats);
+            version11.update();
+        }
     }
-}
+}

src/main/java/lol/hyper/toolstats/tools/config/TokenItems.java

@@ -0,0 +1,253 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config;
+
+import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+
+import java.util.List;
+
+public class TokenItems {
+
+    private final ToolStats toolStats;
+
+    public TokenItems(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    public ItemStack playerKills() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.player-kills.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("player-kills");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "player-kills");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack mobKills() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.mob-kills.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("mob-kills");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "mob-kills");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack blocksMined() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.blocks-mined.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("blocks-mined");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "blocks-mined");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack cropsMined() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.crops-mined.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("crops-mined");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "crops-mined");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack fishCaught() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.fish-caught.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("fight-caught");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "fish-caught");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack sheepSheared() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.sheep-sheared.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("sheep-sheared");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "sheep-sheared");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack damageTaken() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.damage-taken.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("damage-taken");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "damage-taken");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack damageDone() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.damage-done.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("damage-done");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "damage-done");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack arrowsShot() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.arrows-shot.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("arrows-shot");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "arrows-shot");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack flightTime() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.flight-time.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("flight-time");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "flight-time");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack resetToken() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.reset.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("reset");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "reset");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+
+    public ItemStack removeToken() {
+        // set up the item
+        ItemStack token = new ItemStack(Material.PAPER);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data.remove.title");
+        List<Component> lore = toolStats.configTools.getTokenLore("remove");
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "remove");
+        token.setItemMeta(tokenMeta);
+        return token;
+    }
+}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version10.java

@@ -0,0 +1,81 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Version10 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 9 to 10.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version10(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-9.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-9.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 10.");
+        toolStats.config.set("config-version", 10);
+
+        // Add missing values I forgot...
+        toolStats.logger.info("Adding entry for enabled.created-by.fishing-rod");
+        toolStats.config.set("enabled.created-by.fishing-rod", true);
+        toolStats.logger.info("Adding entry for enabled.created-date.fishing-rod");
+        toolStats.config.set("enabled.created-date.fishing-rod", true);
+        toolStats.logger.info("Adding entry for enabled.fished-tag.fishing-rod");
+        toolStats.config.set("enabled.fished-tag.fishing-rod", true);
+        toolStats.logger.info("Adding entry for enabled.looted-tag.fishing-rod");
+        toolStats.config.set("enabled.looted-tag.fishing-rod", true);
+        toolStats.logger.info("Adding entry for enabled.traded-tag.fishing-rod");
+        toolStats.config.set("enabled.traded-tag.fishing-rod", true);
+        toolStats.logger.info("Adding entry for enabled.spawned-in.fishing-rod");
+        toolStats.config.set("enabled.spawned-in.fishing-rod", true);
+
+        toolStats.logger.info("Adding entry for enabled.crops-harvested");
+        toolStats.config.set("enabled.crops-harvested", true);
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 10. A copy of version 9 has been saved as config-9.yml");
+    }
+}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version11.java

@@ -0,0 +1,104 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Version11 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 10 to 11.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version11(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-10.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-10.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 11.");
+        toolStats.config.set("config-version", 11);
+
+        // add new tokens
+        toolStats.logger.info("Adding tokens.data.damage-done.title to config.yml.");
+        toolStats.config.set("tokens.data.damage-done.title", "&7ToolStats: &8Damage Done Token");
+        List<String> damageDoneLore = new ArrayList<>();
+        damageDoneLore.add("&8Combine with a melee or ranged weapon in an anvil to track damage done.");
+        toolStats.config.set("tokens.data.damage-done.lore", damageDoneLore);
+        toolStats.logger.info("Adding tokens.data.damage-done.lore to config.yml.");
+        toolStats.config.set("tokens.data.damage-done.levels", 1);
+        toolStats.logger.info("Adding tokens.data.damage-done.levels to config.yml.");
+
+        toolStats.logger.info("Adding tokens.data.remove.title to config.yml.");
+        toolStats.config.set("tokens.data.remove.title", "&7ToolStats: &8Remove Token");
+        List<String> removeLore = new ArrayList<>();
+        removeLore.add("&8Combine in an anvil with to REMOVE ALL stats and tokens for this item.");
+        toolStats.config.set("tokens.data.remove.lore", removeLore);
+        toolStats.logger.info("Adding tokens.data.remove.lore to config.yml.");
+        toolStats.config.set("tokens.data.remove.levels", 1);
+        toolStats.logger.info("Adding tokens.data.remove.levels to config.yml.");
+
+        toolStats.logger.info("Adding messages.damage-done to config.yml.");
+        toolStats.config.set("messages.damage-done", "&7Damage done: &8{damage}");
+
+        toolStats.config.set("enabled.damage-done.sword", true);
+        toolStats.config.set("enabled.damage-done.axe", true);
+        toolStats.config.set("enabled.damage-done.trident", true);
+        toolStats.config.set("enabled.damage-done.bow", true);
+        toolStats.config.set("enabled.damage-done.mace", true);
+        toolStats.logger.info("Adding enabled.damage-done.sword to config.yml");
+        toolStats.logger.info("Adding enabled.damage-done.axe to config.yml");
+        toolStats.logger.info("Adding enabled.damage-done.trident to config.yml");
+        toolStats.logger.info("Adding enabled.damage-done.bow to config.yml");
+        toolStats.logger.info("Adding enabled.damage-done.mace to config.yml");
+
+        toolStats.logger.info("Updating entry for messages.flight-time");
+        String oldFlightTime = toolStats.config.getString("messages.flight-time");
+        toolStats.config.set("messages.flight-time-old", oldFlightTime);
+        toolStats.config.set("messages.flight-time", "&7Flight time: &8{years}y {months}m {days}d {hours}h {minutes}m {seconds}s");
+        
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 11. A copy of version 10 has been saved as config-10.yml");
+    }
+}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version7.java

@@ -43,7 +43,7 @@ public class Version7 {
         try {
             toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-6.yml");
         } catch (IOException exception) {
-            toolStats.logger.severe("Unable to save config-5.yml!");
+            toolStats.logger.severe("Unable to save config-6.yml!");
             throw new RuntimeException(exception);
         }
 
@@ -65,6 +65,6 @@ public class Version7 {
             throw new RuntimeException(exception);
         }
         toolStats.loadConfig();
-        toolStats.logger.info("Config has been updated to version 7. A copy of version 5 has been saved as config-6.yml");
+        toolStats.logger.info("Config has been updated to version 7. A copy of version 6 has been saved as config-6.yml");
     }
 }

src/main/java/lol/hyper/toolstats/tools/config/versions/Version8.java

@@ -0,0 +1,87 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Version8 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 7 to 8.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version8(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-7.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-7.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        // we make this super verbose so that admins can see what's being added
+        toolStats.logger.info("Updating config.yml to version 8.");
+        toolStats.config.set("config-version", 8);
+
+        // Add example to setting mob names
+        toolStats.logger.info("Adding example for messages.mob.ZOMBIE");
+        toolStats.config.set("messages.mob.ZOMBIE", "Zombie");
+
+        // Add mace to enabled sections
+        toolStats.logger.info("Adding entry for enabled.created-by.mace");
+        toolStats.config.set("enabled.created-by.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.created-date.mace");
+        toolStats.config.set("enabled.created-date.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.player-kills.mace");
+        toolStats.config.set("enabled.player-kills.mace", true);
+
+        toolStats.logger.info("Adding entry for enabled.mob-kills.mace");
+        toolStats.config.set("enabled.mob-kills.mace", true);
+
+        List<String> mobComments = new ArrayList<>();
+        mobComments.add("Set display name for mobs. See: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html");
+        toolStats.config.setComments("messages.mob", mobComments);
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 8. A copy of version 7 has been saved as config-7.yml");
+    }
+}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version9.java

@@ -0,0 +1,103 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Version9 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 8 to 9.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version9(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-8.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-8.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        toolStats.logger.info("Updating config.yml to version 9.");
+        toolStats.config.set("config-version", 9);
+
+        toolStats.logger.info("Adding new tokens configuration! Don't worry, this is disabled by default.");
+        toolStats.logger.info("You can find more information here: https://github.com/hyperdefined/ToolStats/wiki/Token-System");
+        // false by default so it doesn't break servers on updating
+        toolStats.config.set("tokens.enabled", false);
+        toolStats.config.set("tokens.craft-tokens", true);
+
+        List<String> tokenComments = new ArrayList<>();
+        tokenComments.add("Use token system for tracking stats.");
+        tokenComments.add("See https://github.com/hyperdefined/ToolStats/wiki/Token-System");
+        toolStats.config.setComments("tokens", tokenComments);
+
+        addToken("player-kills", "&7ToolStats: &8Player Kills Token", "&8Combine with a melee or ranged weapon in an anvil to track player kills.");
+        addToken("mob-kills", "&7ToolStats: &8Mob Kills Token", "&8Combine with a melee or ranged weapon in an anvil to track mob kills.");
+        addToken("blocks-mined", "&7ToolStats: &8Blocks Mined Token", "&8Combine with a pickaxe, axe, shovel, or shears in an anvil to track blocks mined.");
+        addToken("crops-mined", "&7ToolStats: &8Crops Mined Token", "&8Combine with a hoe in an anvil to track crops broken.");
+        addToken("fish-caught", "&7ToolStats: &8Fish Caught Token", "&8Combine with a fishing rod in an anvil to track fish caught.");
+        addToken("sheep-sheared", "&7ToolStats: &8Sheep Sheared Token", "&8Combine with shears in an anvil to track sheep sheared.");
+        addToken("damage-taken", "&7ToolStats: &8Damage Taken Token", "&8Combine with an armor piece in an anvil to track damage taken.");
+        addToken("arrows-shot", "&7ToolStats: &8Arrows Shot Token", "&8Combine with a bow or crossbow in an anvil to track arrows shot.");
+        addToken("flight-time", "&7ToolStats: &8Flight Time Token", "&8Combine with an elytra in an anvil to track flight time.");
+        addToken("reset", "&7ToolStats: &8Reset Token", "&8Combine in an anvil with to reset ALL stats for this item. Tokens on this item stay.");
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 9. A copy of version 8 has been saved as config-8.yml");
+    }
+
+    /**
+     * Add a given token to the config. Made this since I was lazy.
+     *
+     * @param tokenType The token type to add.
+     * @param title     The title for the item.
+     * @param lore      The lore of the item.
+     */
+    private void addToken(String tokenType, String title, String lore) {
+        toolStats.logger.info("Adding token type configuration for " + tokenType);
+        toolStats.config.set("tokens.data." + tokenType + ".title", title);
+        List<String> loreList = new ArrayList<>();
+        loreList.add(lore);
+        toolStats.config.set("tokens.data." + tokenType + ".lore", loreList);
+        toolStats.config.set("tokens.data." + tokenType + ".levels", 1);
+    }
+}

src/main/resources/config.yml

@@ -1,3 +1,70 @@
+# Use token system for tracking stats.
+# See https://github.com/hyperdefined/ToolStats/wiki/Token-System
+tokens:
+  enabled: false
+  craft-tokens: true
+  data:
+    player-kills:
+      title: "&7ToolStats: &8Player Kills Token"
+      lore:
+        - "&8Combine with a melee or ranged weapon in an anvil to track player kills."
+      levels: 1
+    mob-kills:
+      title: "&7ToolStats: &8Mob Kills Token"
+      lore:
+        - "&8Combine with a melee or ranged weapon in an anvil to track mob kills."
+      levels: 1
+    blocks-mined:
+      title: "&7ToolStats: &8Blocks Mined Token"
+      lore:
+        - "&8Combine with a pickaxe, axe, shovel, or shears in an anvil to track blocks mined."
+      levels: 1
+    crops-mined:
+      title: "&7ToolStats: &8Crops Mined Token"
+      lore:
+        - "&8Combine with a hoe in an anvil to track crops broken."
+      levels: 1
+    fish-caught:
+      title: "&7ToolStats: &8Fish Caught Token"
+      lore:
+        - "&8Combine with a fishing rod in an anvil to track fish caught."
+      levels: 1
+    sheep-sheared:
+      title: "&7ToolStats: &8Sheep Sheared Token"
+      lore:
+        - "&8Combine with shears in an anvil to track sheep sheared."
+      levels: 1
+    damage-taken:
+      title: "&7ToolStats: &8Damage Taken Token"
+      lore:
+        - "&8Combine with an armor piece in an anvil to track damage taken."
+      levels: 1
+    damage-done:
+      title: "&7ToolStats: &8Damage Done Token"
+      lore:
+        - "&8Combine with a melee or ranged weapon in an anvil to track damage done."
+      levels: 1
+    arrows-shot:
+      title: "&7ToolStats: &8Arrows Shot Token"
+      lore:
+        - "&8Combine with a bow or crossbow in an anvil to track arrows shot."
+      levels: 1
+    flight-time:
+      title: "&7ToolStats: &8Flight Time Token"
+      lore:
+        - "&8Combine with an elytra in an anvil to track flight time."
+      levels: 1
+    reset:
+      title: "&7ToolStats: &8Reset Token"
+      lore:
+        - "&8Combine in an anvil with to reset ALL stats for this item. Tokens on this item stay."
+      levels: 1
+    remove:
+      title: "&7ToolStats: &8Remove Token"
+      lore:
+        - "&8Combine in an anvil with to REMOVE ALL stats and tokens for this item."
+      levels: 1
+
 enabled:
   # Will show ownership of items when they are created/found.
   created-by:
@@ -9,6 +76,8 @@ enabled:
     shears: true
     bow: true
     armor: true
+    mace: true
+    fishing-rod: true
   # Will show time the item is created
   created-date:
     pickaxe: true
@@ -19,6 +88,8 @@ enabled:
     shears: true
     bow: true
     armor: true
+    mace: true
+    fishing-rod: true
   # Will show "Fished by <player>"
   fished-tag:
     pickaxe: true
@@ -29,6 +100,7 @@ enabled:
     shears: true
     bow: true
     armor: true
+    fishing-rod: true
   # Will show "Found by <player>"
   looted-tag:
     pickaxe: true
@@ -39,6 +111,7 @@ enabled:
     shears: true
     bow: true
     armor: true
+    fishing-rod: true
   # Will show "Trade by <player>"
   traded-tag:
     pickaxe: true
@@ -49,16 +122,25 @@ enabled:
     shears: true
     bow: true
     armor: true
+    fishing-rod: true
+  damage-done:
+    sword: true
+    axe: true
+    trident: true
+    bow: true
+    mace: true
   player-kills:
     sword: true
     axe: true
     trident: true
     bow: true
+    mace: true
   mob-kills:
     sword: true
     axe: true
     trident: true
     bow: true
+    mace: true
   blocks-mined:
     pickaxe: true
     shovel: true
@@ -75,6 +157,8 @@ enabled:
     shears: true
     bow: true
     armor: true
+    mace: true
+    fishing-rod: true
   fish-caught: true
   sheep-sheared: true
   armor-damage: true
@@ -82,6 +166,7 @@ enabled:
   elytra-tag: true
   arrows-shot: true
   flight-time: true
+  crops-harvested: true
 
 messages:
   created:
@@ -111,12 +196,11 @@ messages:
   dropped-by: "&7Dropped by: &8{name}" # name will be player/mob name
   damage-taken: "&7Damage taken: &8{damage}"
   arrows-shot: "&7Arrows shot: &8{arrows}"
-  flight-time: "&7Flight time: &8{time}"
-  # Display this message if the player shift click trades/crafts items. It's not really easy to get every single item
-  # that is crafted. The tag will only be added to the first item. If you don't want this message, simply replace them both with ""
-  shift-click-warning:
-    crafting: "&cCrafting items via shift clicking does not fully apply tags to each item. This is a limitation with the Bukkit API."
-    trading: "&cTrading items via shift clicking does not fully apply tags to each item. This is a limitation with the Bukkit API."
+  flight-time: "&7Flight time: &8{years}y {months}m {days}d {hours}h {minutes}m {seconds}s"
+  damage-done: "&7Damage done: &8{damage}"
+  # Set display name for mobs. See: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html
+  mobs:
+    ZOMBIE: "Zombie"
 
 # Change the default formatting for dates.
 # See: https://www.digitalocean.com/community/tutorials/java-simpledateformat-java-date-format
@@ -129,11 +213,11 @@ number-formats:
   comma-separator: ","
   decimal-separator: "."
   comma-format: "#,###"
-  decimal-format: "#,###.00"
+  decimal-format: "#,##0.00"
 
 # When any tool is created, it will generate a hash for the item.
 # This hash is not on the item lore, only stored in the NBT data.
 # This has no use currently, but can be used for future features for dupe detection.
-generate-hash-for-items: true
+generate-hash-for-items: false
 
-config-version: 7
+config-version: 11

src/main/resources/plugin.yml

@@ -1,9 +1,10 @@
 name: ToolStats
 version: '${project.version}'
 main: lol.hyper.toolstats.ToolStats
-api-version: 1.15
+api-version: 1.21
 author: hyperdefined
 description: Track various tool stats!
+website: https://github.com/hyperdefined/ToolStats
 folia-supported: true
 commands:
   toolstats:
@@ -21,4 +22,7 @@ permissions:
     default: true
   toolstats.reset.confirm:
     description: Allows the usage of /toolstats reset confirm.
-    default: true
+    default: true
+  toolstats.givetokens:
+    description: Allows the usage of /toolstats givetoken.
+    default: op