Add GPLv3 license to project root

Merge pull request #46 from NotPatch/dev
update: bump PacketEvents to version 2.11.2
2026-05-25 03:48:47 -04:00 · 2026-03-29 12:28:33 -07:00 · 2026-03-02 00:14:52 +03:00 · 2026-01-17 04:45:09 -05:00 · 2025-12-17 22:53:11 -05:00 · 2025-12-17 18:19:23 -05:00
81 changed files with 2085 additions and 1258 deletions
@@ -19,40 +19,17 @@ jobs:
      - name: Checkout main repository
        uses: actions/checkout@v2

+      # 2. Install JDK 21 – NO Gradle cache here
      - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
        with:
-          java-version: '21'
-          distribution: 'adopt'
-          cache: gradle
+          distribution: temurin
+          java-version: 21
+          cache: ''                          # ← disable Maven/Gradle cache

-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 8.8
-
-      # Temporary workaround to packetevents bugs, use custom fork build
-      - name: Checkout packetevents repository
-        uses: actions/checkout@v3
-        with:
-          repository: Axionize/packetevents
-          ref: 2.0-fabric-serverside-fix
-          path: packetevents
-
-      - name: Update version in packetevents
-        run: |
-          cd packetevents
-          sed -i 's/val fullVersion = ".*"/val fullVersion = "2.5.8"/' build.gradle.kts
-
-      - name: Build packetevents with Gradle
-        run: |
-          cd packetevents
-          gradle build -x test
-
-      - name: Publish packetevents to Maven Local
-        run: |
-          cd packetevents
-          gradle publishToMavenLocal
+      # 3. Set up Gradle + dependency cache
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v5

      - name: Generate build number
        id: buildnumber
@@ -76,39 +53,26 @@ jobs:
          # Ensure snapshot is set to false
          sed -i "s/val snapshot = .*/val snapshot = false/" build.gradle.kts

-      - name: Build with Gradle
-        run: gradle clean build -x test
+      - name: Build without PE shaded
+        run: ./gradlew build -PshadePE=false -x test
        env:
          GITHUB_REPOSITORY: ${{ github.repository }}

-      - name: Rename shaded jar to overwrite non-shaded jar
-        run: mv bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}-all.jar bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar
+      - name: Build with PE shaded Gradle
+        run: ./gradlew build -PshadePE=true -x test
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}

-      # Download PaperSpigot (Choose version for reproducibility
-      - name: Download PaperSpigot
-        run: |
-          mkdir -p paper-server/plugins
-          curl -o paperclip.jar https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/120/downloads/paper-1.21.1-120.jar 
-          mv paperclip.jar paper-server/
-
-      # Copy Plugin into Plugins Folder and Start Server
-      - name: Copy Plugin and Start Paper Server
-        run: |
-          cp bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar paper-server/plugins/
-          cd paper-server
-          # Start the server to remap the plugin
-          timeout 60 java -Xms3G -Xmx3G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -jar -Dcom.mojang.eula.agree=true paperclip.jar --nogui || true
-
-      # Get the Hashes of the Original and Remapped JARs
+      # Get the Hashes of the Original and Lite JARs
      - name: Calculate Hashes
        run: |
          # Calculate hash for the original JAR
-          ORIGINAL_HASH=$(sha256sum bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar | awk '{print $1}')
-          echo "ORIGINAL_HASH=$ORIGINAL_HASH" >> $GITHUB_ENV
-          # Calculate hash for the remapped JAR
-          REMAPPED_HASH=$(sha256sum paper-server/plugins/.paper-remapped/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar | awk '{print $1}')
-          echo "REMAPPED_HASH=$REMAPPED_HASH" >> $GITHUB_ENV
-          # Calculate hash for the remapped JAR
+          BUKKIT_HASH=$(sha256sum bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar | awk '{print $1}')
+          echo "BUKKIT_HASH=$BUKKIT_HASH" >> $GITHUB_ENV
+          # Calculate hash for the lite JAR
+          BUKKIT_LITE_HASH=$(sha256sum bukkit/build/libs/knockbacksync-bukkit-lite-${{ env.NEW_VERSION }}.jar | awk '{print $1}')
+          echo "BUKKIT_LITE_HASH=$BUKKIT_LITE_HASH" >> $GITHUB_ENV
+          # Calculate hash for the lite JAR
          FABRIC_HASH=$(sha256sum fabric/build/libs/knockbacksync-fabric-${{ env.NEW_VERSION }}.jar | awk '{print $1}')
          echo "FABRIC_HASH=$FABRIC_HASH" >> $GITHUB_ENV

@@ -134,8 +98,8 @@ jobs:
          }
          
          # Add new hashes if they don't exist
-          add_hash_if_new "${{ env.ORIGINAL_HASH }}"
-          add_hash_if_new "${{ env.REMAPPED_HASH }}"
+          add_hash_if_new "${{ env.BUKKIT_HASH }}"
+          add_hash_if_new "${{ env.BUKKIT_LITE_HASH }}"
          add_hash_if_new "${{ env.FABRIC_HASH }}"
          
          # Check if the file has changed
@@ -166,23 +130,25 @@ jobs:
          # Clean up
          rm dev-builds.txt.original

-      - name: Create artifacts directory
-        run: mkdir -p artifacts
-
-      - name: Copy bukkit artifact
-        run: cp bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar artifacts/
-
-      - name: Copy fabric artifact
-        run: cp fabric/build/libs/knockbacksync-fabric-${{ env.NEW_VERSION }}.jar artifacts/
-
-      - name: Zip the artifacts
-        run: zip -r KnockbackSync-${{ env.NEW_VERSION }}.zip artifacts/*
-
-      - name: Upload artifacts zip
+      - name: Upload Bukkit Artifact
        uses: actions/upload-artifact@v4
        with:
-          name: KnockbackSync-${{ env.NEW_VERSION }}.zip
-          path: KnockbackSync-${{ env.NEW_VERSION }}.zip
+          name: knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar
+          path: bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar
+          retention-days: 90
+
+      - name: Upload Bukkit Lite Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: knockbacksync-bukkit-lite-${{ env.NEW_VERSION }}.jar
+          path: bukkit/build/libs/knockbacksync-bukkit-lite-${{ env.NEW_VERSION }}.jar
+          retention-days: 90
+
+      - name: Upload Fabric Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: knockbacksync-fabric-${{ env.NEW_VERSION }}.jar
+          path: fabric/build/libs/knockbacksync-fabric-${{ env.NEW_VERSION }}.jar
          retention-days: 90

      - uses: Kir-Antipov/mc-publish@v3.3
@@ -194,6 +160,7 @@ jobs:

          files: |
            bukkit/build/libs/knockbacksync-bukkit-${{ env.NEW_VERSION }}.jar
+            bukkit/build/libs/knockbacksync-bukkit-lite-${{ env.NEW_VERSION }}.jar

          name: KnockbackSync-${{ env.NEW_VERSION }}
          version: ${{ env.NEW_VERSION }}
@@ -231,7 +198,10 @@ jobs:
            fabric

          game-versions: |
-            >=1.21
+            1.21.11
+
+          dependencies: |
+            fabric-api

          retry-attempts: 2
          retry-delay: 10000
@@ -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>.
@@ -2,27 +2,54 @@ import java.io.ByteArrayOutputStream

 plugins {
    id("java")
-    id("com.gradleup.shadow") version "8.3.3" apply false
-    id("fabric-loom") version "1.7.4" apply false
+    id("com.gradleup.shadow") version "9.2.2" apply false
+    id("fabric-loom") version "1.14.6" apply false
+}
+
+fun getGitCommitHash(project: Project): String? {
+    // Only try to get the hash if the .git directory exists
+    if (!project.file(".git").isDirectory) {
+        return null
+    }
+    return try {
+        val process = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+            .redirectOutput(ProcessBuilder.Redirect.PIPE)
+            .redirectError(ProcessBuilder.Redirect.PIPE)
+            .start()
+
+        process.waitFor(5, TimeUnit.SECONDS)
+
+        if (process.exitValue() == 0) {
+            process.inputStream.bufferedReader().readText().trim().takeIf { it.isNotEmpty() }
+        } else {
+            null
+        }
+    } catch (e: Exception) {
+        null
+    }
 }

 val fullVersion = "1.3.5"
 val snapshot = true
 val githubRepo = System.getenv("GITHUB_REPOSITORY") ?: project.findProperty("githubRepo").toString()

+extra["shadePE"] = project.findProperty("shadePE")?.toString()?.toBoolean()
+    ?: System.getenv("SHADE_PE")?.toBoolean()
+    ?: true
+
+extra["relocate"] = project.findProperty("relocate")?.toString()?.toBoolean()
+    ?: System.getenv("RELOCATE_JAR")?.toBoolean()
+    ?: true
+
 allprojects {
    fun getVersionMeta(includeHash: Boolean): String {
        if (!snapshot) {
            return ""
        }
-        var commitHash = ""
-        if (includeHash && file(".git").isDirectory) {
-            val stdout = ByteArrayOutputStream()
-            exec {
-                commandLine("git", "rev-parse", "--short", "HEAD")
-                standardOutput = stdout
-            }
-            commitHash = "+${stdout.toString().trim()}"
+        val commitHash = if (includeHash) {
+            getGitCommitHash(project)?.let { "+$it" } ?: ""
+        } else {
+            ""
        }
        return "$commitHash-SNAPSHOT"
    }
@@ -33,7 +60,8 @@ allprojects {
    ext["githubRepo"] = githubRepo

    repositories {
-        mavenLocal()
+//        mavenLocal()
+        maven("https://repo.grim.ac/snapshots")
        mavenCentral()
        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
        maven("https://repo.codemc.io/repository/maven-releases/")
@@ -4,8 +4,10 @@ plugins {
    id("com.gradleup.shadow")
 }

+val shadePE: Boolean by rootProject.extra
+
 base {
-    archivesName.set("${rootProject.property("archives_base_name")}-bukkit")
+    archivesName.set("${rootProject.property("archives_base_name")}-bukkit${if (shadePE) "" else "-lite"}")
 }

 val shadeThisThing: Configuration by configurations.creating {
@@ -31,14 +33,18 @@ dependencies {

    compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
    compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
+    compileOnly("io.netty:netty-all:4.1.72.Final")

    compileOnly("org.projectlombok:lombok:1.18.34")
    annotationProcessor("org.projectlombok:lombok:1.18.34")

    shadeThisThing(implementation("org.kohsuke:github-api:1.326")!!)
-    shadeThisThing(implementation("com.github.retrooper:packetevents-spigot:2.5.0")!!)
-//    shadeThisThing(implementation("net.kyori:adventure-platform-bukkit:4.3.4")!!)
-    shadeThisThing(implementation("org.incendo:cloud-paper:2.0.0-beta.10")!!)
+    if (shadePE) {
+        shadeThisThing(implementation("com.github.retrooper:packetevents-spigot:2.11.2")!!)
+    } else {
+        compileOnly("com.github.retrooper:packetevents-spigot:2.11.2")
+    }
+    shadeThisThing(implementation("org.incendo:cloud-paper:2.0.0-beta.14")!!)
    shadeThisThing(implementation("org.incendo:cloud-core:2.0.0")!!)

    // Required for 1.14.4 support because gson is too old to have JosnParser.parseString()
@@ -46,8 +52,15 @@ dependencies {
 }

 tasks.withType<ShadowJar> {
+    manifest {
+        attributes["paperweight-mappings-namespace"] = "mojang"
+    }
+
+    // Remove the -all suffix from the output JAR file name
+    archiveClassifier.set("")
+
    configurations = listOf(shadeThisThing)
-    isEnableRelocation = false
+    enableAutoRelocation = true
    relocationPrefix = "${project.property("maven_group")}.${project.property("archives_base_name")}.shaded"
 }

@@ -58,11 +71,14 @@ tasks.build {
 tasks.processResources {
    from(project(":common").sourceSets.main.get().resources)
    inputs.property("version", project.version)
+    inputs.property("shadePE", shadePE) // Add shadePE as an input to trigger reprocessing if it changes
    filteringCharset = "UTF-8"

+
    filesMatching("plugin.yml") {
        expand(
            "version" to project.version,
+            "depends" to if (shadePE) "[]" else listOf("packetevents")
        )
    }
 }
@@ -2,6 +2,7 @@ package me.caseload.knockbacksync;

 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.world.Location;
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
 import me.caseload.knockbacksync.event.KBSyncEventHandler;
@@ -18,20 +19,30 @@ import me.caseload.knockbacksync.stats.custom.BukkitStatsManager;
 import me.caseload.knockbacksync.stats.custom.PluginJarHashProvider;
 import me.caseload.knockbacksync.world.BukkitServer;
 import org.bukkit.Bukkit;
+import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.Vector;
 import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.paper.LegacyPaperCommandManager;

 import java.io.File;
 import java.io.InputStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 import java.util.logging.Logger;

@@ -43,14 +54,36 @@ public class BukkitBase extends Base {

    private int playerUpdateInterval;

+    private final MethodHandle tickRateMethodHandle;
+
    public BukkitBase(JavaPlugin plugin) {
        this.plugin = plugin;
        super.configManager = new ConfigManager();
        super.playerSelectorParser = new BukkitPlayerSelectorParser<>();
-        super.statsManager = new BukkitStatsManager();
+        super.statsManager = new BukkitStatsManager(plugin);
        super.platformServer = new BukkitServer();
        super.pluginJarHashProvider = new PluginJarHashProvider(this.getClass().getProtectionDomain().getCodeSource().getLocation());
        this.playerUpdateInterval = this.getConfigManager().getConfigWrapper().getInt("entity_tick_intervals.player", 2);
+
+        MethodHandle handle = null;
+        try {
+            Server craftServer = Bukkit.getServer();
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+            // Get handle for getServerTickManager
+            MethodHandle getServerTickManager = lookup.findVirtual(craftServer.getClass(),
+                    "getServerTickManager", MethodType.methodType(Object.class));
+
+            Object serverTickManager = getServerTickManager.invoke(craftServer);
+
+            // Get handle for getTickRate
+            handle = lookup.findVirtual(serverTickManager.getClass(),
+                    "getTickRate", MethodType.methodType(float.class));
+
+        } catch (Throwable t) {
+            // If anything fails, handle will remain null
+        }
+        this.tickRateMethodHandle = handle;
    }

    @Override
@@ -77,21 +110,15 @@ public class BukkitBase extends Base {
    @Override
    public void enable() {
        super.enable();
-        initializeScheduler();
-        saveDefaultConfig();
-        configManager.updateConfig();
-        configManager.loadConfig(false);
-        statsManager.init();
-        checkForUpdates();
-        super.simpleEventBus.registerListeners(this);
-        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_5)) {
+        super.eventBus.registerListeners(this);
+        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_5) && this.getPlatform() == Platform.BUKKIT) {
            scheduler.runTaskTimerAsynchronously(this::setUpdateIntervals, 1, 1);
        }
    }

    @Override
    public void initializeScheduler() {
-        switch (platform) {
+        switch (getPlatform()) {
            case BUKKIT:
                super.scheduler = new BukkitSchedulerAdapter(this.plugin);
                break;
@@ -105,8 +132,7 @@ public class BukkitBase extends Base {
    protected void registerPlatformListeners() {
        registerPluginListeners(
                new BukkitPlayerDamageListener(),
-                new BukkitPlayerKnockbackListener(),
-                new BukkitPlayerJoinQuitListener()
+                new BukkitPlayerKnockbackListener()
        );
    }

@@ -143,6 +169,30 @@ public class BukkitBase extends Base {
        return permissionChecker;
    }

+    @Override
+    public float getTickRate() {
+        if (tickRateMethodHandle != null) {
+            try {
+                return (float) tickRateMethodHandle.invoke();
+            } catch (Throwable t) {
+                return 20.0f;
+            }
+        }
+        return 20.0f;
+    }
+
+    public URL getJarURL() {
+        try {
+            String path = getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
+            File pluginJarFile = new File(path);
+
+            return Paths.get(getDataFolder().getParentFile().getAbsolutePath(), pluginJarFile.getName()).toUri().toURL();
+        } catch (Exception e) {
+            LOGGER.severe("Couldn't find plugin file: " + e.getMessage());
+            return null;
+        }
+    }
+
    private void registerPluginListeners(Listener... listeners) {
        PluginManager pluginManager = this.plugin.getServer().getPluginManager();
        for (Listener listener : listeners)
@@ -193,4 +243,21 @@ public class BukkitBase extends Base {
    public void onConfigReload(ConfigReloadEvent event) {
        playerUpdateInterval = event.getConfigManager().getConfigWrapper().getInt("entity_tick_intervals.player", 2);
    }
+
+    public void restartServer() {
+        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart");
+    }
+
+    public boolean hasRestartScript() {
+        File spigotFile = new File("spigot.yml");
+        if (!spigotFile.exists())
+            return false;
+
+        FileConfiguration spigotConfig = YamlConfiguration.loadConfiguration(spigotFile);
+        String scriptValue = spigotConfig.getString("settings.restart-script");
+        if (scriptValue == null || scriptValue.isEmpty())
+            return false;
+
+        return Paths.get(scriptValue).toAbsolutePath().normalize().toFile().exists();
+    }
 }
@@ -1,36 +0,0 @@
-package me.caseload.knockbacksync.listener.bukkit;
-
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import me.caseload.knockbacksync.listener.PlayerJoinQuitListener;
-import me.caseload.knockbacksync.player.BukkitPlayer;
-import me.caseload.knockbacksync.player.PlayerData;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class BukkitPlayerJoinQuitListener extends PlayerJoinQuitListener implements Listener {
-
-    public static List<Object> chunkMapList = new ArrayList<>();
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        onPlayerJoin(new PlayerData(new BukkitPlayer(event.getPlayer())));
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        onPlayerQuit(event.getPlayer().getUniqueId());
-    }
-}
@@ -2,8 +2,13 @@ package me.caseload.knockbacksync.player;

 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.BoundingBox;
 import com.github.retrooper.packetevents.util.Vector3d;
+import com.google.common.base.Preconditions;
+import me.caseload.knockbacksync.BukkitBase;
+import me.caseload.knockbacksync.Platform;
+import me.caseload.knockbacksync.world.FoliaWorld;
 import me.caseload.knockbacksync.world.PlatformWorld;
 import me.caseload.knockbacksync.world.SpigotWorld;
 import org.bukkit.Bukkit;
@@ -21,17 +26,19 @@ import java.util.UUID;

 public class BukkitPlayer implements PlatformPlayer {
    public final Player bukkitPlayer;
+    public final User user;
+    private String clientBrand = "vanilla";

    // Reflection variables
    private static Class<?> craftPlayerClass;
    private static Method getHandleMethod;
    private static Method getAttackStrengthScaleMethod;
-    private static ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();
+    private static final ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();

    // 1.12.2 support
    static {
        try {
-            // Check the current server versio
+            // Check the current server version

            // If the version is greater than 1.14.4, use the Player method directly
            if (currentVersion.isOlderThan(ServerVersion.V_1_15)) {
@@ -68,7 +75,9 @@ public class BukkitPlayer implements PlatformPlayer {
    }

    public BukkitPlayer(Player player) {
+        Preconditions.checkArgument(player != null);
        this.bukkitPlayer = player;
+        this.user = PacketEvents.getAPI().getPlayerManager().getUser(bukkitPlayer);
    }

    @Override
@@ -133,7 +142,7 @@ public class BukkitPlayer implements PlatformPlayer {

    @Override
    public PlatformWorld getWorld() {
-        return new SpigotWorld(bukkitPlayer.getWorld());
+        return BukkitBase.INSTANCE.getPlatform() == Platform.FOLIA ? new FoliaWorld(bukkitPlayer.getWorld()): new SpigotWorld(bukkitPlayer.getWorld());
    }

    @Override
@@ -208,4 +217,19 @@ public class BukkitPlayer implements PlatformPlayer {
        org.bukkit.util.BoundingBox boundingBox = bukkitPlayer.getBoundingBox();
        return new BoundingBox(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
    }
+
+    @Override
+    public @Nullable User getUser() {
+        return this.user;
+    }
+
+    @Override
+    public void setClientBrand(String brand) {
+        this.clientBrand = brand;
+    }
+
+    @Override
+    public String getClientBrand() {
+        return this.clientBrand;
+    }
 }
@@ -1,55 +1,46 @@
 package me.caseload.knockbacksync.scheduler;

+import io.github.retrooper.packetevents.util.folia.FoliaScheduler;
 import io.github.retrooper.packetevents.util.folia.GlobalRegionScheduler;
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;

 public class FoliaSchedulerAdapter implements SchedulerAdapter {
    private final Plugin plugin;
-    private GlobalRegionScheduler scheduler = null;

    public FoliaSchedulerAdapter(Plugin plugin) {
        this.plugin = plugin;
-        try {
-            // Attempt to find and call the `getGlobalRegionScheduler` method
-            Method getSchedulerMethod = Bukkit.getServer().getClass().getMethod("getGlobalRegionScheduler");
-            scheduler = (GlobalRegionScheduler) getSchedulerMethod.invoke(Bukkit.getServer());
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            plugin.getLogger().severe("Failed to access GlobalRegionScheduler: " + e.getMessage());
-        }
    }

    @Override
    public AbstractTaskHandle runTask(Runnable task) {
-        return new FoliaTaskHandle(scheduler.run(plugin, scheduledTask -> task.run()));
+        return new FoliaTaskHandle(FoliaScheduler.getGlobalRegionScheduler().run(plugin, scheduledTask -> task.run()));
    }

    @Override
    public AbstractTaskHandle runTaskAsynchronously(Runnable task) {
-        return new FoliaTaskHandle(scheduler.run(plugin, scheduledTask -> task.run()));
+        return new FoliaTaskHandle(FoliaScheduler.getAsyncScheduler().runNow(plugin, scheduledTask -> task.run()));
    }

    @Override
    public AbstractTaskHandle runTaskLater(Runnable task, long delayTicks) {
-        return new FoliaTaskHandle(scheduler.runDelayed(plugin, scheduledTask -> task.run(), delayTicks));
+        return new FoliaTaskHandle(FoliaScheduler.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> task.run(), delayTicks));
    }

    @Override
    public AbstractTaskHandle runTaskTimer(Runnable task, long delayTicks, long periodTicks) {
-        return new FoliaTaskHandle(scheduler.runAtFixedRate(plugin, scheduledTask -> task.run(), delayTicks, periodTicks));
+        return new FoliaTaskHandle(FoliaScheduler.getGlobalRegionScheduler().runAtFixedRate(plugin, scheduledTask -> task.run(), delayTicks, periodTicks));
    }

    @Override
    public AbstractTaskHandle runTaskLaterAsynchronously(Runnable task, long delay) {
-        return new FoliaTaskHandle(scheduler.runDelayed(plugin, scheduledTask -> task.run(), delay));
+        return new FoliaTaskHandle(FoliaScheduler.getAsyncScheduler().runDelayed(plugin, scheduledTask -> task.run(), delay * 50, TimeUnit.MILLISECONDS));
    }

    @Override
    public AbstractTaskHandle runTaskTimerAsynchronously(Runnable task, long delay, long period) {
-        return new FoliaTaskHandle(scheduler.runAtFixedRate(plugin, scheduledTask -> task.run(), delay, period));
+        return new FoliaTaskHandle(FoliaScheduler.getAsyncScheduler().runAtFixedRate(plugin, scheduledTask -> task.run(), delay, period));
    }

    // Folia takes care of this
@@ -1,41 +1,19 @@
 package me.caseload.knockbacksync.scheduler;

+import io.github.retrooper.packetevents.util.folia.TaskWrapper;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-
 public class FoliaTaskHandle implements AbstractTaskHandle {
-    private static final MethodHandle GET_OWNING_PLUGIN;
-    private static final MethodHandle CANCEL;

-    static {
-        try {
-            Class<?> scheduledTaskClass = Class.forName("io.papermc.paper.threadedregions.scheduler.ScheduledTask");
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-            GET_OWNING_PLUGIN = lookup.findVirtual(scheduledTaskClass, "getOwningPlugin", MethodType.methodType(Plugin.class));
-            CANCEL = lookup.findVirtual(scheduledTaskClass, "cancel", MethodType.methodType(void.class));
-        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-            throw new RuntimeException("Failed to initialize FoliaTaskHandle reflection", e);
-        }
-    }
-
-    private final Object scheduledTask; // Store as Object instead of ScheduledTask
+    private final TaskWrapper scheduledTask; // Store as Object instead of ScheduledTask
    private boolean cancelled;

-    public FoliaTaskHandle(@NotNull Object scheduledTask) {
+    public FoliaTaskHandle(@NotNull TaskWrapper scheduledTask) {
        this.scheduledTask = scheduledTask;
    }

    public Plugin getOwner() {
-        try {
-            return (Plugin) GET_OWNING_PLUGIN.invoke(scheduledTask);
-        } catch (Throwable e) {
-            throw new RuntimeException("Failed to invoke getOwningPlugin", e);
-        }
+        return scheduledTask.getOwner();
    }

    @Override
@@ -45,11 +23,7 @@ public class FoliaTaskHandle implements AbstractTaskHandle {

    @Override
    public void cancel() {
-        try {
-            CANCEL.invoke(scheduledTask);
-        } catch (Throwable e) {
-            throw new RuntimeException("Failed to invoke cancel", e);
-        }
+        scheduledTask.cancel();
        this.cancelled = true;
    }
 }
@@ -1,17 +1,11 @@
 package me.caseload.knockbacksync.stats.custom;

 import me.caseload.knockbacksync.Base;
+import org.bukkit.plugin.Plugin;

 public class BukkitStatsManager extends StatsManager {

-    @Override
-    public void init() {
-        Base.INSTANCE.getScheduler().runTaskAsynchronously(() -> {
-            BuildTypePie.determineBuildType(); // Function to calculate hash
-            MetricsBukkit metrics = new MetricsBukkit(23568);
-            metrics.addCustomChart(new PlayerVersionsPie());
-            metrics.addCustomChart(new BuildTypePie());
-            super.metrics = metrics;
-        });
+    public BukkitStatsManager(Plugin plugin) {
+        super(new MetricsBukkit(plugin, 23568));
    }
 }
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.stats.custom;

+
 /*
 * This Metrics class was auto-generated and can be copied into your project if you are
 * not using a build tool like Gradle or Maven for dependency management.
@@ -34,12 +35,11 @@ import java.util.logging.Level;
 public class MetricsBukkit implements Metrics {

    private final Plugin plugin;
-
    private final MetricsBase metricsBase;


-    public MetricsBukkit(int serviceId) {
-        this.plugin = BukkitLoaderPlugin.getPlugin(BukkitLoaderPlugin.class);
+    public MetricsBukkit(Plugin plugin, int serviceId) {
+        this.plugin = plugin;
        // Get the config file
        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
        File configFile = new File(bStatsFolder, "config.yml");
@@ -3,6 +3,7 @@ package me.caseload.knockbacksync.world;
 import me.caseload.knockbacksync.player.BukkitPlayer;
 import me.caseload.knockbacksync.player.PlatformPlayer;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;

 import java.util.Collection;
 import java.util.UUID;
@@ -19,4 +20,9 @@ public class BukkitServer implements PlatformServer {
    public PlatformPlayer getPlayer(UUID uuid) {
        return new BukkitPlayer(Bukkit.getPlayer(uuid));
    }
+
+    @Override
+    public PlatformPlayer getPlayer(Object nativePlatformPlayer) {
+        return new BukkitPlayer((Player) nativePlatformPlayer);
+    }
 }
@@ -0,0 +1,18 @@
+package me.caseload.knockbacksync.world;
+
+import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
+import io.github.retrooper.packetevents.util.SpigotConversionUtil;
+import org.bukkit.World;
+import org.bukkit.block.BlockState;
+
+public class FoliaWorld extends SpigotWorld {
+    public FoliaWorld(World world) {
+        super(world);
+    }
+
+    @Override
+    public WrappedBlockState getBlockStateAt(int x, int y, int z) {
+        BlockState block = this.world.getBlockState(x, y, z);
+        return SpigotConversionUtil.fromBukkitBlockData(block.getBlockData());
+    }
+}
@@ -18,7 +18,7 @@ import org.bukkit.util.Vector;
 import java.lang.reflect.Method;

 public class SpigotWorld implements PlatformWorld {
-    private final World world;
+    protected final World world;

    // Reflection variables
    private static Class<?> craftWorldClass;
@@ -85,7 +85,7 @@ public class SpigotWorld implements PlatformWorld {

    @Override
    public WrappedBlockState getBlockStateAt(Vector3d loc) {
-        return getBlockStateAt((int) Math.floor(loc.x), (int) Math.floor(loc.x), (int) Math.floor(loc.x));
+        return getBlockStateAt((int) Math.floor(loc.x), (int) Math.floor(loc.y), (int) Math.floor(loc.z));
    }

    @Override
@@ -5,6 +5,7 @@ api-version: '1.13' # We actually support 1.12.2, api-version was added later th
 authors: [ Caseload, Axionize ]
 description: Synchronizes player knockback for smoother gameplay.
 folia-supported: true
+depends: ${depends}
 permissions:
  knockbacksync.update:
    default: op
@@ -1,25 +1,24 @@
 plugins {
-    id("fabric-loom")
    id("com.github.gmazzo.buildconfig") version "3.1.0"
 }

-dependencies {
-    minecraft("com.mojang:minecraft:1.16.5")
-    mappings(loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.16.5:2022.03.06")
-    })
+val shadePE: Boolean by rootProject.extra

+dependencies {
    // True compileOnly deps
    compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
+    compileOnly("io.netty:netty-all:4.1.72.Final")
    compileOnly("org.projectlombok:lombok:1.18.34")
    annotationProcessor("org.projectlombok:lombok:1.18.34")

    // Shaded in or bundled by platform-specific code
-    implementation("com.github.retrooper:packetevents-api:2.5.0")
+    if (shadePE) {
+        implementation("com.github.retrooper:packetevents-api:2.11.1+60a2c34-SNAPSHOT")
+    } else {
+        compileOnly("com.github.retrooper:packetevents-api:2.11.1+60a2c34-SNAPSHOT")
+    }
+
    implementation("org.yaml:snakeyaml:2.0")
-//    implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
-//    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2")
    implementation("org.kohsuke:github-api:1.326") {
        exclude(group = "commons-io", module = "commons-io")
        exclude(group = "org.apache.commons", module = "commons-lang3")
@@ -29,14 +28,6 @@ dependencies {
    implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.10")
 }

-repositories {
-    maven("https://maven.neoforged.net/releases")
-}
-
-tasks.named("remapJar").configure {
-    enabled = false
-}
-
 buildConfig {
    buildConfigField("String", "GITHUB_REPO", "\"${project.rootProject.ext["githubRepo"]}\"")
 }
@@ -13,20 +13,26 @@ import me.caseload.knockbacksync.command.subcommand.ToggleOffGroundSubcommand;
 import me.caseload.knockbacksync.event.Event;
 import me.caseload.knockbacksync.event.EventBus;
 import me.caseload.knockbacksync.event.OptimizedEventBus;
-import me.caseload.knockbacksync.listener.packetevents.AttributeChangeListener;
-import me.caseload.knockbacksync.listener.packetevents.PingReceiveListener;
+import me.caseload.knockbacksync.listener.packetevents.*;
 import me.caseload.knockbacksync.manager.ConfigManager;
 import me.caseload.knockbacksync.permission.PermissionChecker;
 import me.caseload.knockbacksync.scheduler.SchedulerAdapter;
 import me.caseload.knockbacksync.sender.Sender;
+import me.caseload.knockbacksync.stats.custom.ClientBrandsPie;
 import me.caseload.knockbacksync.stats.custom.PluginJarHashProvider;
 import me.caseload.knockbacksync.stats.custom.StatsManager;
 import me.caseload.knockbacksync.world.PlatformServer;
 import org.incendo.cloud.CommandManager;
 import org.kohsuke.github.GitHub;

+import java.io.DataInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.logging.Logger;

@@ -35,24 +41,24 @@ public abstract class Base {
    public static Logger LOGGER;
    public static Base INSTANCE;

-    public final Platform platform;
-    public StatsManager statsManager;
-    public PlatformServer platformServer;
+    @Getter private final Platform platform;
+    @Getter protected StatsManager statsManager;
+    @Getter protected PlatformServer platformServer;
    @Getter protected PluginJarHashProvider pluginJarHashProvider;
    @Getter protected SchedulerAdapter scheduler;
    @Getter protected ConfigManager configManager;
-    protected CommandManager<Sender> commandManager;
-    @Getter protected final EventBus simpleEventBus = new OptimizedEventBus();
+    @Getter protected CommandManager<Sender> commandManager;
+    @Getter protected final EventBus eventBus = new OptimizedEventBus();

    @Getter
    protected AbstractPlayerSelectorParser<Sender> playerSelectorParser;

    protected Base() {
-        this.platform = getPlatform();
+        this.platform = detectPlatform();
        INSTANCE = this;
    }

-    private Platform getPlatform() {
+    private Platform detectPlatform() {
        final Map<String, Platform> platforms = Collections.unmodifiableMap(new HashMap<String, Platform>() {{
            put("io.papermc.paper.threadedregions.RegionizedServer", Platform.FOLIA);
            put("org.bukkit.Bukkit", Platform.BUKKIT);
@@ -90,6 +96,10 @@ public abstract class Base {
        registerCommonListeners();
        registerPlatformListeners();
        registerCommands();
+        initializeScheduler();
+        configManager.loadConfig(false);
+        statsManager.init();
+        checkForUpdates();
    }

    public abstract void initializeScheduler();
@@ -105,9 +115,12 @@ public abstract class Base {
    protected void registerCommonListeners() {
        PacketEvents.getAPI().getEventManager().registerListeners(
                new AttributeChangeListener(),
-                new PingReceiveListener()
+                new PingSendListener(),
+                new PingReceiveListener(),
+                new PacketPlayerJoinQuit(),
+                new ClientBrandListener()
        );
-        Event.setEventBus(simpleEventBus);
+        Event.setEventBus(eventBus);
    }

    protected abstract void registerPlatformListeners();
@@ -124,7 +137,6 @@ public abstract class Base {
        list.forEach(command -> command.register(commandManager));
    }

-
    protected abstract String getVersion();

    protected void checkForUpdates() {
@@ -145,15 +157,25 @@ public abstract class Base {
                    LOGGER.warning("You are running an older version. A new update is available for download at: https://github.com/CASELOAD7000/knockback-sync/releases/latest");
                    configManager.setUpdateAvailable(true);
                } else if (comparisonResult > 0) {
-                    if (currentVersion.contains("-dev")) {
+                    if (currentVersion.contains("-dev")) 
                        LOGGER.info("You are running a development build newer than the latest release.");
-                    } else {
+                    else {
                        LOGGER.info("You are running a version newer than the latest release.");
                    }
-                    configManager.setUpdateAvailable(false);
                } else {
                    LOGGER.info("You are running the latest release.");
-                    configManager.setUpdateAvailable(false);
+                }
+
+                if (configManager.isUpdateAvailable() && configManager.isAutoUpdate()) {
+                    LOGGER.info("Updating...");
+                    byte[] bytes = downloadLatestRelease(github);
+                    updatePlugin(bytes);
+
+                    if (hasRestartScript())
+                        scheduler.runTask(this::restartServer);
+                    else {
+                        // Yeah
+                    }
                }
            } catch (Exception e) {
                LOGGER.severe("Failed to check for updates: " + e.getMessage());
@@ -161,6 +183,44 @@ public abstract class Base {
        });
    }

+    private void updatePlugin(byte[] pluginBytes) throws URISyntaxException {
+        File file = new File(getJarURL().toURI());
+
+        try (FileOutputStream outputStream = new FileOutputStream(file)) {
+            outputStream.write(pluginBytes);
+            LOGGER.info("Successfully updated the plugin!");
+        } catch (Exception e) {
+            LOGGER.severe("Failed to update: " + e.getMessage());
+        }
+    }
+
+    private byte[] downloadLatestRelease(GitHub github) {
+        try {
+            return github.getRepository("CASELOAD7000/knockback-sync")
+                    .getLatestRelease()
+                    .getAssets().stream()
+                    .filter(asset -> asset.getName().endsWith(".jar")
+                            && asset.getName().contains(platform.equals(Platform.FABRIC)
+                            ? "fabric" : "bukkit"))
+                    .findFirst()
+                    .map(asset -> {
+                        try (InputStream inputStream = new URL(asset.getBrowserDownloadUrl()).openStream()) {
+                            inputStream.reset();
+                            byte[] bytes = new byte[inputStream.available()];
+                            DataInputStream dataInputStream = new DataInputStream(inputStream);
+                            dataInputStream.readFully(bytes);
+                            return bytes;
+                        } catch (Exception e) {
+                            LOGGER.severe("Failed to download latest release: " + e.getMessage());
+                            return null;
+                        }
+                    }).orElse(null);
+        } catch (Exception e) {
+            LOGGER.severe("Failed to locate latest release: " + e.getMessage());
+            return null;
+        }
+    }
+
    private int compareVersions(String version1, String version2) {
        String[] v1Parts = version1.split("[-.]");
        String[] v2Parts = version2.split("[-.]");
@@ -220,6 +280,13 @@ public abstract class Base {

    public abstract PermissionChecker getPermissionChecker();

+    public abstract float getTickRate();
+
+    public abstract URL getJarURL();
+
+    public abstract void restartServer();
+
+    public abstract boolean hasRestartScript();
 }


@@ -1,16 +1,40 @@
 package me.caseload.knockbacksync.command.subcommand;

+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.ConfigWrapper;
 import me.caseload.knockbacksync.command.generic.BuilderCommand;
 import me.caseload.knockbacksync.command.generic.PlayerSelector;
+import me.caseload.knockbacksync.event.KBSyncEventHandler;
+import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
+import me.caseload.knockbacksync.manager.ConfigManager;
+import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PlayerData;
 import me.caseload.knockbacksync.sender.Sender;
 import me.caseload.knockbacksync.util.ChatUtil;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.permission.PredicatePermission;

+import java.util.UUID;
 import java.util.function.Predicate;

 public class PingCommand implements BuilderCommand {
+
+    private static final ConfigManager configManager = Base.INSTANCE.getConfigManager();
+
+    private String pingSelfAvailableMessage;
+    private String pingSelfUnavailableMessage;
+    private String pingOtherAvailableMessage;
+    private String pingOtherUnavailableMessage;
+
+    private String mustSpecifyPlayerFromConsoleMessage;
+    private String knockbacksyncDisabledForYouMessage;
+    private String knockbacksyncDisabledForTargetMessage;
+
+    public PingCommand() {
+        loadConfig();
+    }
+
    public void register(CommandManager<Sender> manager) {
        manager.command(
            manager.commandBuilder("knockbacksync", "kbsync", "kbs")
@@ -29,16 +53,77 @@ public class PingCommand implements BuilderCommand {

                    if (targetSelector == null) {
                        if (context.sender().isConsole()) {
-                            context.sender().sendMessage("You must specify a player to use this command from the console.");
+                            context.sender().sendMessage(ChatUtil.translateAlternateColorCodes('&', mustSpecifyPlayerFromConsoleMessage));
                        } else {
-                            context.sender().sendMessage(ChatUtil.getPingMessage(context.sender().getUniqueId(), null));
+                            context.sender().sendMessage(getPingMessage(context.sender().getUniqueId(), context.sender().getName(), null, null));
                        }
                    } else {
-                        context.sender().sendMessage(ChatUtil.getPingMessage(context.sender().getUniqueId(), targetSelector.getSinglePlayer().getUUID()));
+                        context.sender().sendMessage(getPingMessage(context.sender().getUniqueId(), context.sender().getName(), targetSelector.getSinglePlayer().getUUID(), targetSelector.getSinglePlayer().getName()));
                    }
                })
        );
+        Base.INSTANCE.getEventBus().registerListeners(this);
+    }
+    private void loadConfig() {
+        ConfigWrapper configWrapper = configManager.getConfigWrapper();
+        pingSelfAvailableMessage = configWrapper.getString("messages.ping.self.available",
+                "Your real ping is &b%ping%&rms. Jitter: &b%jitter%&rms. Spike: &b%spike%&r. Compensated ping: &b%compensated%&rms.");
+        pingSelfUnavailableMessage = configWrapper.getString("messages.ping.self.unavailable",
+                "Accurate ping unavailable. Your estimated ping is &b%ping%&rms.");
+        pingOtherAvailableMessage = configWrapper.getString("messages.ping.other.available",
+                "%player%'s real ping is &b%ping%&rms. Jitter: &b%jitter%&rms. Spike: &b%spike%&r. Compensated ping: &b%compensated%&rms.");
+        pingOtherUnavailableMessage = configWrapper.getString("messages.ping.other.unavailable",
+                "Accurate ping unavailable. %player%'s estimated ping is &b%ping%&rms.");
+        mustSpecifyPlayerFromConsoleMessage = configWrapper.getString("messages.console.must_specify_player",
+                "&cYou must specify a player to use the knockbacksync ping command from the console.");
+        knockbacksyncDisabledForYouMessage = configWrapper.getString("messages.disabled.self",
+                "&cKnockback synchronization is currently disabled for you!");
+        knockbacksyncDisabledForTargetMessage = configWrapper.getString("messages.disabled.target",
+                "&cKnockback synchronization is currently disabled for the target player.");
    }

+    private String getPingMessage(UUID senderUUID, String senderName, UUID targetUUID, String targetName) {
+        boolean isSelf = senderUUID.equals(targetUUID) || targetUUID == null;
+        String message;
+        if (isSelf) {
+            message = knockbacksyncDisabledForYouMessage;
+            targetUUID = senderUUID;
+            targetName = senderName;
+        } else {
+            message = knockbacksyncDisabledForTargetMessage;
+        }

+        User targetUser = Base.INSTANCE.getPlatformServer().getPlayer(targetUUID).getUser();
+        if (targetUser == null)
+            return ChatUtil.translateAlternateColorCodes('&',
+                    configManager.getPlayerDisconnectedWhileExecutingCommand()
+            ).replace("%player%", targetName);
+
+        PlayerData playerData = PlayerDataManager.getPlayerData(targetUser);
+        if (playerData == null)
+            return ChatUtil.translateAlternateColorCodes('&', message);
+
+        String rawReturnString;
+        if (playerData.getPing() == null) {
+            rawReturnString = isSelf ? pingSelfUnavailableMessage : pingOtherUnavailableMessage;
+        } else {
+            rawReturnString = isSelf ? pingSelfAvailableMessage : pingOtherAvailableMessage;
+        }
+
+        rawReturnString = rawReturnString
+                .replace("%player%", playerData.getPlatformPlayer().getName())
+                .replace("%ping%", playerData.getPing() == null ?
+                        String.valueOf(playerData.getPlatformPlayer().getPing()) :
+                        String.format("%.3f", playerData.getPing()))
+                .replace("%jitter%", String.format("%.3f", playerData.getJitter()))
+                .replace("%spike%", String.valueOf(playerData.isSpike()))
+                .replace("%compensated%", String.format("%.3f", playerData.getCompensatedPing()));
+
+        return ChatUtil.translateAlternateColorCodes('&', rawReturnString);
+    }
+
+    @KBSyncEventHandler
+    public void onConfigReload(ConfigReloadEvent event) {
+        loadConfig();
+    }
 }
@@ -14,8 +14,8 @@ import java.util.function.Predicate;

 public class ReloadCommand implements BuilderCommand {

-    private final ConfigManager configManager = Base.INSTANCE.getConfigManager();
-    private String rawReloadMessage = configManager.getConfigWrapper().getString("reload_message", "&aSuccessfully reloaded KnockbackSync.");
+    private static final ConfigManager configManager = Base.INSTANCE.getConfigManager();
+    private String rawReloadMessage = configManager.getConfigWrapper().getString("messages.reload.success", "&aSuccessfully reloaded KnockbackSync.");

    public void register(CommandManager<Sender> manager) {
        manager.command(
@@ -40,11 +40,11 @@ public class ReloadCommand implements BuilderCommand {
                            context.sender().sendMessage(reloadMessage);
                        })
        );
-        Base.INSTANCE.getSimpleEventBus().registerListeners(this);
+        Base.INSTANCE.getEventBus().registerListeners(this);
    }

    @KBSyncEventHandler
    public void onConfigReload(ConfigReloadEvent event) {
-        rawReloadMessage = event.getConfigManager().getConfigWrapper().getString("reload_message", "&aSuccessfully reloaded KnockbackSync.");
+        rawReloadMessage = event.getConfigManager().getConfigWrapper().getString("messages.reload.success", "&aSuccessfully reloaded KnockbackSync.");
    }
 }
@@ -14,7 +14,6 @@ import me.caseload.knockbacksync.util.ChatUtil;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.permission.PredicatePermission;

-import java.util.UUID;
 import java.util.function.Predicate;

 public class StatusCommand implements BuilderCommand {
@@ -23,9 +22,15 @@ public class StatusCommand implements BuilderCommand {
    private static final String STATUS_SELF_PERMISSION = "knockbacksync.status.self";
    private static final String STATUS_OTHER_PERMISSION = "knockbacksync.status.other";

-    private String globalStatusMessage;
-    private String playerStatusMessage;
-    private String playerDisabledGlobalMessage;
+    private String globalStatusEnabledMessage;
+    private String globalStatusDisabledMessage;
+    private String globalOffGroundStatusEnabledMessage;
+    private String globalOffGroundStatusDisabledMessage;
+    private String playerStatusEnabledMessage;
+    private String playerStatusDisabledMessage;
+    private String playerStatusGlobalDisabledMessage;
+    private String noSelfPermissionMessage;
+    private String noOtherPermissionMessage;

    public StatusCommand() {
        updateConfigValues();
@@ -49,47 +54,53 @@ public class StatusCommand implements BuilderCommand {
                            if (targetSelector == null) {
                                // Show global status
                                boolean globalStatus = configManager.isToggled();
-                                sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', globalStatusMessage) +
-                                        (globalStatus
-                                                ? ChatUtil.translateAlternateColorCodes('&', "&aEnabled")
-                                                : ChatUtil.translateAlternateColorCodes('&', "&cDisabled")));
+                                sender.sendMessage(
+                                        ChatUtil.translateAlternateColorCodes('&',
+                                                (globalStatus ? globalStatusEnabledMessage : globalStatusDisabledMessage))
+                                        + "\n"
+                                        + ChatUtil.translateAlternateColorCodes('&',
+                                                ToggleOffGroundSubcommand.offGroundSyncEnabled ? globalOffGroundStatusEnabledMessage : globalOffGroundStatusDisabledMessage)
+                                );

                                    if (sender.hasPermission(STATUS_SELF_PERMISSION, true)) {
                                        // Show player status for the sender (no target specified)
                                        if (!sender.isConsole()) {
-                                            showPlayerStatus(sender, Base.INSTANCE.platformServer.getPlayer(sender.getUniqueId()));
+                                            showPlayerStatus(sender, Base.INSTANCE.getPlatformServer().getPlayer(sender.getUniqueId()));
                                        }
                                    } else {
-                                        sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', "&cYou do not have permisssion to check your knockbacksync status."));
+                                        sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', noSelfPermissionMessage));
                                    }
                            } else {
                                if (sender.hasPermission(STATUS_OTHER_PERMISSION, true)) {
                                    PlatformPlayer target = targetSelector.getSinglePlayer();
                                    showPlayerStatus(sender, target);
                                } else {
-                                    sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', "&cYou do not have permission to check the status of other players!"));
+                                    sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', noOtherPermissionMessage));
                                }
                            }
                        })
        );
-        Base.INSTANCE.getSimpleEventBus().registerListeners(this);
+        Base.INSTANCE.getEventBus().registerListeners(this);
    }

    private void showPlayerStatus(Sender sender, PlatformPlayer target) {
-        boolean globalStatus = configManager.isToggled();
-        UUID uuid = target.getUUID();
-        boolean playerStatus = PlayerDataManager.containsPlayerData(uuid);
-
-        String statusMessage = ChatUtil.translateAlternateColorCodes('&', playerStatusMessage.replace("%player%", target.getName()));
-
-        if (!globalStatus) {
-            sender.sendMessage(statusMessage + ChatUtil.translateAlternateColorCodes('&', playerDisabledGlobalMessage));
-        } else {
-            sender.sendMessage(statusMessage +
-                    (playerStatus
-                            ? ChatUtil.translateAlternateColorCodes('&', "&aEnabled")
-                            : ChatUtil.translateAlternateColorCodes('&', "&cDisabled")));
+        if (target.getUser() == null) {
+            String message = ChatUtil.translateAlternateColorCodes('&',
+                    configManager.getPlayerDisconnectedWhileExecutingCommand()
+            ).replace("%player%", target.getName());
+            sender.sendMessage(message);
        }
+
+        boolean globalStatus = configManager.isToggled();
+        boolean playerStatus = PlayerDataManager.containsPlayerData(target.getUser());
+
+        String statusMessage;
+        if (!globalStatus) {
+            statusMessage = playerStatusGlobalDisabledMessage.replace("%player%", target.getName());
+        } else {
+           statusMessage = (playerStatus ? this.playerStatusEnabledMessage : this.playerStatusDisabledMessage).replace("%player%", target.getName());
+        }
+        sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', statusMessage));
    }

    @KBSyncEventHandler
@@ -99,8 +110,23 @@ public class StatusCommand implements BuilderCommand {

    private void updateConfigValues() {
        ConfigWrapper config = configManager.getConfigWrapper();
-        this.globalStatusMessage = config.getString("global_status_message", "&eGlobal KnockbackSync status: ");
-        this.playerStatusMessage = config.getString("player_status_message", "&e%player%'s KnockbackSync status: ");
-        this.playerDisabledGlobalMessage = config.getString("player_disabled_global_message", "&cDisabled (Global toggle is off)");
+        this.globalStatusEnabledMessage = config.getString("messages.status.global.enabled",
+                "&eKnockbackSync global status: &aEnabled");
+        this.globalStatusDisabledMessage = config.getString("messages.status.global.disabled",
+                "&eKnockbackSync global status: &cDisabled");
+        this.globalOffGroundStatusEnabledMessage = config.getString("messages.status.offground.enabled",
+                "&eKnockbackSync off-ground status: &aEnabled");
+        this.globalOffGroundStatusDisabledMessage = config.getString("messages.status.offground.disabled",
+                "&eKnockbackSync off-ground status: &cDisabled");
+        this.playerStatusEnabledMessage = config.getString("messages.status.player.enabled",
+                "&e%player%'s KnockbackSync status: &aEnabled");
+        this.playerStatusDisabledMessage = config.getString("messages.status.player.disabled",
+                "&e%player%'s KnockbackSync status: &cDisabled");
+        this.playerStatusGlobalDisabledMessage = config.getString("messages.status.player.global_disabled",
+                "&e%player%'s KnockbackSync status: &cDisabled (Global toggle is off)");
+        this.noSelfPermissionMessage = config.getString("messages.status.permission.no_self",
+                "&cYou do not have permission to check your knockbacksync status.");
+        this.noOtherPermissionMessage = config.getString("messages.status.permission.no_other",
+                "&cYou do not have permission to check the status of other players!");
    }
 }
@@ -1,19 +1,20 @@
 package me.caseload.knockbacksync.command.subcommand;
+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.ConfigWrapper;
 import me.caseload.knockbacksync.command.generic.BuilderCommand;
 import me.caseload.knockbacksync.command.generic.PlayerSelector;
 import me.caseload.knockbacksync.event.events.ToggleOnOffEvent;
+import me.caseload.knockbacksync.manager.CombatManager;
 import me.caseload.knockbacksync.manager.ConfigManager;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
 import me.caseload.knockbacksync.permission.PermissionChecker;
 import me.caseload.knockbacksync.player.PlatformPlayer;
-import me.caseload.knockbacksync.player.PlayerData;
 import me.caseload.knockbacksync.sender.Sender;
 import me.caseload.knockbacksync.util.ChatUtil;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.permission.PredicatePermission;

-import java.util.UUID;
 import java.util.function.Predicate;

 public class ToggleCommand implements BuilderCommand {
@@ -24,6 +25,26 @@ public class ToggleCommand implements BuilderCommand {
    private static final String TOGGLE_SELF_PERMISSION = "knockbacksync.toggle.self";
    private static final String TOGGLE_OTHER_PERMISSION = "knockbacksync.toggle.other";

+    private String noGlobalPermissionMessage;
+    private String noSelfPermissionMessage;
+    private String noOtherPermissionMessage;
+    private String serverDisabledMessage;
+
+    public ToggleCommand() {
+        loadConfig();
+    }
+
+    private void loadConfig() {
+        ConfigWrapper configWrapper = configManager.getConfigWrapper();
+        noGlobalPermissionMessage = configWrapper.getString("messages.toggle.permission.no_global",
+                "&cYou don't have permission to toggle the global setting.");
+        noSelfPermissionMessage = configWrapper.getString("messages.toggle.permission.no_self",
+                "&cYou do not have permission to toggle your knockback.");
+        noOtherPermissionMessage = configWrapper.getString("messages.toggle.permission.no_other",
+                "&cYou do not have permission to toggle the knockback of other player's.");
+        serverDisabledMessage = configWrapper.getString("messages.toggle.server_disabled",
+                "&cKnockbacksync is currently disabled on this server. Contact your server administrator for more information.");
+    }

    @Override
    public void register(CommandManager<Sender> manager) {
@@ -46,25 +67,25 @@ public class ToggleCommand implements BuilderCommand {
                    if (targetSelector == null) {
                        // Global toggle
                        if (permissionChecker.hasPermission(sender, TOGGLE_GLOBAL_PERMISSION, false)) {
-                            toggleGlobalKnockback(configManager, sender);
+                            toggleGlobalKnockback(sender);
                        } else {
-                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', "&cYou don't have permission to toggle the global setting."));
+                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', noGlobalPermissionMessage));
                        }
                    } else {
                        PlatformPlayer target = targetSelector.getSinglePlayer();
                        boolean senderIsTarget = sender.getUniqueId() == target.getUUID();
                        if (!senderIsTarget && !permissionChecker.hasPermission(sender, TOGGLE_OTHER_PERMISSION, false)) {
-                            sender.sendMessage("You do not have permission to toggle the knockback of other player's.");
+                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', noOtherPermissionMessage));
                            return;
                        } else if (senderIsTarget && !permissionChecker.hasPermission(sender, TOGGLE_SELF_PERMISSION, true)) {
-                            sender.sendMessage("You do not have permission to toggle your knockback.");
+                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', noSelfPermissionMessage));
                            return;
                        }

                        if (!configManager.isToggled()) {
-                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', "&cKnockbacksync is currently disabled on this server. Contact your server administrator for more information."));
+                            sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', serverDisabledMessage));
                        } else {
-                            togglePlayerKnockback(target, configManager, sender);
+                            togglePlayerKnockback(target, sender);
                        }
                    }
                })
@@ -72,7 +93,7 @@ public class ToggleCommand implements BuilderCommand {
    }


-    private static void toggleGlobalKnockback(ConfigManager configManager, Sender sender) {
+    private static void toggleGlobalKnockback(Sender sender) {
        boolean toggledState = !configManager.isToggled();
        ToggleOnOffEvent toggleOnOffEvent = new ToggleOnOffEvent(toggledState);
        toggleOnOffEvent.post();
@@ -82,8 +103,8 @@ public class ToggleCommand implements BuilderCommand {
        toggledState = toggleOnOffEvent.getStatus();
        configManager.setToggled(toggledState);

-        Base.INSTANCE.getConfigManager().getConfigWrapper().set("enabled", toggledState);
-        Base.INSTANCE.getConfigManager().saveConfig();
+        configManager.getConfigWrapper().set("enabled", toggledState);
+        configManager.saveConfig();

        String message = ChatUtil.translateAlternateColorCodes('&',
                toggledState ? configManager.getEnableMessage() : configManager.getDisableMessage()
@@ -91,10 +112,16 @@ public class ToggleCommand implements BuilderCommand {
        sender.sendMessage(ChatUtil.translateAlternateColorCodes('&', message));
    }

-    private static void togglePlayerKnockback(PlatformPlayer target, ConfigManager configManager, Sender sender) {
-        UUID uuid = target.getUUID();
+    private static void togglePlayerKnockback(PlatformPlayer target, Sender sender) {
+        User user = target.getUser();
+        if (user == null) {
+            String message = ChatUtil.translateAlternateColorCodes('&',
+                    configManager.getPlayerDisconnectedWhileExecutingCommand()
+            ).replace("%player%", target.getName());
+            sender.sendMessage(message);
+        }

-        if (PlayerDataManager.shouldExempt(uuid)) {
+        if (PlayerDataManager.shouldExempt(target.getUUID())) {
            String message = ChatUtil.translateAlternateColorCodes('&',
                    configManager.getPlayerIneligibleMessage()
            ).replace("%player%", target.getName());
@@ -103,11 +130,14 @@ public class ToggleCommand implements BuilderCommand {
            return;
        }

-        boolean hasPlayerData = PlayerDataManager.containsPlayerData(uuid);
-        if (hasPlayerData)
-            PlayerDataManager.removePlayerData(uuid);
-        else {
-            PlayerDataManager.addPlayerData(uuid, new PlayerData(Base.INSTANCE.platformServer.getPlayer(uuid)));
+        boolean hasPlayerData = PlayerDataManager.containsPlayerData(user);
+        if (hasPlayerData) {
+            if (CombatManager.getPlayers().contains(user)) {
+                CombatManager.removePlayer(user);
+            }
+            PlayerDataManager.removePlayerData(user);
+        } else {
+            PlayerDataManager.addPlayerData(user, target);
        }

        String message = ChatUtil.translateAlternateColorCodes('&',
@@ -15,9 +15,9 @@ import java.util.function.Predicate;

 public class ToggleOffGroundSubcommand implements BuilderCommand {

-    private String enableOffGroundSyncMessage;
-    private String disableOffGroundSyncMessage;
-    private boolean offGroundSyncEnabled;
+    public static boolean offGroundSyncEnabled = true;
+    private String offGroundSyncEnableMessage;
+    private String offGroundSyncDisableMessage;

    public ToggleOffGroundSubcommand() {
        loadConfigSettings();
@@ -36,11 +36,11 @@ public class ToggleOffGroundSubcommand implements BuilderCommand {
                    return PredicatePermission.of(senderPredicate).testPermission(sender);
                }))
                .handler(commandContext -> {
-                    boolean toggledState = !offGroundSyncEnabled;
-                    Base.INSTANCE.getConfigManager().getConfigWrapper().set("enable_offground_synchronization", toggledState);
+                    offGroundSyncEnabled = !offGroundSyncEnabled;
+                    Base.INSTANCE.getConfigManager().getConfigWrapper().set("enable_offground_synchronization", offGroundSyncEnabled);
                    Base.INSTANCE.getConfigManager().saveConfig();
                    String message = ChatUtil.translateAlternateColorCodes('&',
-                            toggledState ? enableOffGroundSyncMessage : disableOffGroundSyncMessage);
+                            offGroundSyncEnabled ? offGroundSyncEnableMessage : offGroundSyncDisableMessage);
                    commandContext.sender().sendMessage(message);
                }));
    }
@@ -52,8 +52,10 @@ public class ToggleOffGroundSubcommand implements BuilderCommand {

    private void loadConfigSettings() {
        ConfigWrapper configWrapper = Base.INSTANCE.getConfigManager().getConfigWrapper();
-        offGroundSyncEnabled = configWrapper.getBoolean("enable_offground_synchronization", false);
-        enableOffGroundSyncMessage = configWrapper.getString("enable_offground_synchronization_message", "&aSuccessfully enabled offground experiment.");
-        disableOffGroundSyncMessage = configWrapper.getString("disable_offground_synchronization_message", "&cSuccessfully disabled offground experiment.");
+        offGroundSyncEnabled = configWrapper.getBoolean("enable_offground_synchronization", true);
+        this.offGroundSyncEnableMessage = configWrapper.getString("messages.offground.enable",
+                "&aSuccessfully enabled offground synchronization.");
+        this.offGroundSyncDisableMessage = configWrapper.getString("messages.offground.disable",
+                "&cSuccessfully disabled offground synchronization.");
    }
-}
+}
@@ -8,9 +8,12 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;

 public class OptimizedEventBus implements EventBus {
-    private final Map<Class<? extends Event>, List<OptimizedListener>> listenerMap = new HashMap<>();
+    // ordinarily this would just be a hashmap since we don't modify it on different threads, but Folia forces us to make it concurrent
+    private final Map<Class<? extends Event>, List<OptimizedListener>> listenerMap = new ConcurrentHashMap<>();
    private final MethodHandles.Lookup lookup = MethodHandles.lookup();

    @Override
@@ -37,7 +40,8 @@ public class OptimizedEventBus implements EventBus {

                        MethodHandle handle = lookup.unreflect(method);
                        OptimizedListener optimizedListener = new OptimizedListener(instance, handle, annotation.priority(), method.getDeclaringClass());
-                        listenerMap.computeIfAbsent((Class<? extends Event>) eventType, k -> new ArrayList<>()).add(optimizedListener);
+                        // Yes the CopyOnWriteArrayList is slow, yes we need to for thread safety on Folia, we'll replace when performance problems actually crop up
+                        listenerMap.computeIfAbsent((Class<? extends Event>) eventType, k -> new CopyOnWriteArrayList<>()).add(optimizedListener);
                    } catch (IllegalAccessException e) {
                        e.printStackTrace();
                    }
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.listener;

+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
 import me.caseload.knockbacksync.player.PlatformPlayer;
@@ -10,7 +11,10 @@ public abstract class PlayerDamageListener {
        if (!Base.INSTANCE.getConfigManager().isToggled())
            return;

-        PlayerData playerData = PlayerDataManager.getPlayerData(victim.getUUID());
+        User user = victim.getUser();
+        if (user == null) return; // Prevent errors with players disconnecting while this is running (or with fake player?)
+
+        PlayerData playerData = PlayerDataManager.getPlayerData(user);
        if (playerData == null)
            return;

@@ -19,6 +23,6 @@ public abstract class PlayerDamageListener {
        playerData.updateCombat();

        if (!Base.INSTANCE.getConfigManager().isRunnableEnabled())
-            playerData.sendPing(false);
+            playerData.sendPing(true);
    }
 }
@@ -1,33 +0,0 @@
-package me.caseload.knockbacksync.listener;
-
-import me.caseload.knockbacksync.Base;
-import me.caseload.knockbacksync.manager.PlayerDataManager;
-import me.caseload.knockbacksync.player.PlatformPlayer;
-import me.caseload.knockbacksync.player.PlayerData;
-import me.caseload.knockbacksync.util.ChatUtil;
-
-import java.util.UUID;
-
-public abstract class PlayerJoinQuitListener {
-    public void onPlayerJoin(PlayerData player) {
-        PlayerDataManager.addPlayerData(player.getUuid(), player);
-        PlatformPlayer platformPlayer = player.getPlatformPlayer();
-
-        if (Base.INSTANCE.getConfigManager().isUpdateAvailable() && Base.INSTANCE.getConfigManager().isNotifyUpdate() && Base.INSTANCE.getPermissionChecker().hasPermission(platformPlayer, "knockbacksync.update"))
-            platformPlayer.sendMessage(ChatUtil.translateAlternateColorCodes(
-                    '&',
-                    "&6An updated version of &eKnockbackSync &6is now available for download at: &bhttps://github.com/CASELOAD7000/knockback-sync/releases/latest"
-            ));
-    }
-
-    public void onPlayerQuit(UUID uuid) {
-        PlayerData playerData = PlayerDataManager.getPlayerData(uuid);
-        if (playerData == null)
-            return;
-
-        if (playerData.isInCombat())
-            playerData.quitCombat();
-
-        PlayerDataManager.removePlayerData(uuid);
-    }
-}
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.listener;

+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 import com.github.retrooper.packetevents.util.Vector3d;
@@ -14,14 +15,13 @@ public abstract class PlayerKnockbackListener {
        if (!Base.INSTANCE.getConfigManager().isToggled())
            return;

-        PlayerData victimPlayerData = PlayerDataManager.getPlayerData(victim.getUUID());
+        User user = victim.getUser();
+        if (user == null) return; // Prevent errors with players disconnecting while this is running (or with fake player?)
+
+        PlayerData victimPlayerData = PlayerDataManager.getPlayerData(user);
        if (victimPlayerData == null)
            return;

-/*        Integer damageTicks = playerData.getLastDamageTicks();
-        if (damageTicks != null && damageTicks > 8)
-            return;*/
-
        if (victimPlayerData.getNotNullPing() < PlayerData.PING_OFFSET)
            return;

@@ -38,8 +38,13 @@ public abstract class PlayerKnockbackListener {
            return;

        Vector3d adjustedVelocity;
-        if (victimPlayerData.isOnGroundClientSide(velocity.getY(), distanceToGround))
+        if (victimPlayerData.isOnGroundClientSide(velocity.getY(), distanceToGround)) {
+            Integer damageTicks = victimPlayerData.getLastDamageTicks();
+            if (damageTicks != null && damageTicks > 8)
+                return;
+
            adjustedVelocity = velocity.withY(victimPlayerData.getVerticalVelocity()); // Should be impossible to produce a NPE in this context
+        }
        else if (victimPlayerData.isOffGroundSyncEnabled())
            adjustedVelocity = velocity.withY(victimPlayerData.getCompensatedOffGroundVelocity());
        else
@@ -5,6 +5,7 @@ import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.protocol.attribute.Attributes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerUpdateAttributes;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
@@ -36,17 +37,16 @@ public class AttributeChangeListener extends PacketListenerAbstract {

            WrapperPlayServerUpdateAttributes packet = new WrapperPlayServerUpdateAttributes(event);

-            UUID uuid = event.getUser().getUUID();
-            if (!PlayerDataManager.containsPlayerData(uuid))
-                return;
+            User user = event.getUser();
+            if (!PlayerDataManager.containsPlayerData(user)) return;

            // Get the attributes from the packet
            for (WrapperPlayServerUpdateAttributes.Property property : packet.getProperties()) {
                // You can now check for specific attributes
                if (property.getAttribute().equals(Attributes.GENERIC_GRAVITY)) {
-                    onPlayerGravityChange(uuid, calculateValueWithModifiers(property));
+                    onPlayerGravityChange(user, calculateValueWithModifiers(property));
                } else if (property.getAttribute().equals(Attributes.GENERIC_KNOCKBACK_RESISTANCE)) {
-                    onPlayerKnockBackChange(uuid, calculateValueWithModifiers(property));
+                    onPlayerKnockBackChange(user, calculateValueWithModifiers(property));
                }
            }
        }
@@ -87,8 +87,8 @@ public class AttributeChangeListener extends PacketListenerAbstract {

    // Yes this is not properly latency compensated, that would require including a proper simulation engine
    // Laggy players will just have to deal with being on the wrong gravity for a few hundred ms, too bad!
-    public void onPlayerGravityChange(UUID uuid, double newGravity) {
-        PlayerData playerData = PlayerDataManager.getPlayerData(uuid);
+    public void onPlayerGravityChange(User user, double newGravity) {
+        PlayerData playerData = PlayerDataManager.getPlayerData(user);
        if (playerData.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_5)) {
            playerData.setGravityAttribute(newGravity);
        } else {
@@ -96,8 +96,8 @@ public class AttributeChangeListener extends PacketListenerAbstract {
        }
    }

-    private void onPlayerKnockBackChange(UUID uuid, double newKnockbackResistance) {
-        PlayerData playerData = PlayerDataManager.getPlayerData(uuid);
+    private void onPlayerKnockBackChange(User user, double newKnockbackResistance) {
+        PlayerData playerData = PlayerDataManager.getPlayerData(user);
        playerData.setKnockbackResistanceAttribute(newKnockbackResistance);
    }
 }
@@ -0,0 +1,41 @@
+package me.caseload.knockbacksync.listener.packetevents;
+
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage;
+import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PlayerData;
+
+public class ClientBrandListener extends PacketListenerAbstract {
+    String brand = "vanilla";
+    boolean hasBrand = false;
+
+    @Override
+    public void onPacketReceive(final PacketReceiveEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.PLUGIN_MESSAGE) {
+            WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
+            String channelName = packet.getChannelName();
+            handle(channelName, packet.getData());
+            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser());
+            if (playerData == null) return;
+            playerData.getPlatformPlayer().setClientBrand(brand);
+        }
+    }
+
+    public void handle(String channel, byte[] data) {
+        if (channel.equalsIgnoreCase("minecraft:brand") || // 1.13+
+                channel.equals("MC|Brand")) { // 1.12
+            if (data.length > 64 || data.length == 0) {
+                brand = "sent " + data.length + " bytes as brand";
+            } else if (!hasBrand) {
+                byte[] minusLength = new byte[data.length - 1];
+                System.arraycopy(data, 1, minusLength, 0, minusLength.length);
+                brand = new String(minusLength).replace(" (Velocity)", ""); //removes velocity's brand suffix
+            }
+            hasBrand = true;
+        }
+    }
+}
+
@@ -0,0 +1,51 @@
+package me.caseload.knockbacksync.listener.packetevents;
+
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.UserDisconnectEvent;
+import com.github.retrooper.packetevents.event.UserLoginEvent;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.google.common.base.Preconditions;
+import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PlatformPlayer;
+import me.caseload.knockbacksync.player.PlayerData;
+import me.caseload.knockbacksync.util.ChatUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+
+public class PacketPlayerJoinQuit extends PacketListenerAbstract {
+    @Override
+    public void onUserLogin(UserLoginEvent event) {
+        Object nativePlayerObject = event.getPlayer();
+        Preconditions.checkArgument(nativePlayerObject != null);
+
+        @NotNull PlatformPlayer platformPlayer = Base.INSTANCE.getPlatformServer().getPlayer(nativePlayerObject);
+        onPlayerJoin(event.getUser(), platformPlayer);
+    }
+
+    @Override
+    public void onUserDisconnect(UserDisconnectEvent event) {
+        onPlayerQuit(event.getUser());
+    }
+
+    public void onPlayerJoin(User user, PlatformPlayer player) {
+        PlayerDataManager.addPlayerData(user, player);
+
+        if (Base.INSTANCE.getConfigManager().isUpdateAvailable() && Base.INSTANCE.getConfigManager().isNotifyUpdate() && Base.INSTANCE.getPermissionChecker().hasPermission(player, "knockbacksync.update"))
+            player.sendMessage(ChatUtil.translateAlternateColorCodes(
+                    '&',
+                    "&6An updated version of &eKnockbackSync &6is now available for download at: &bhttps://github.com/CASELOAD7000/knockback-sync/releases/latest"
+            ));
+    }
+
+    public void onPlayerQuit(@NotNull User user) {
+        PlayerData playerData = PlayerDataManager.getPlayerData(user);
+        if (playerData == null)
+            return;
+
+        playerData.quitCombat(true);
+        PlayerDataManager.removePlayerData(user);
+    }
+}
@@ -1,55 +1,25 @@
 package me.caseload.knockbacksync.listener.packetevents;

-import com.github.retrooper.packetevents.event.PacketListenerAbstract;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.event.*;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientKeepAlive;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPong;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientWindowConfirmation;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerKeepAlive;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPing;
-import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerWindowConfirmation;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PingStrategy;
 import me.caseload.knockbacksync.player.PlayerData;
 import me.caseload.knockbacksync.util.data.Pair;

-import java.util.List;
+import java.util.Queue;
+import java.util.UUID;

 public class PingReceiveListener extends PacketListenerAbstract {

-    @Override
-    public void onPacketSend(PacketSendEvent event) {
-        if (!Base.INSTANCE.getConfigManager().isToggled()) return;
-
-        PacketTypeCommon packetType = event.getPacketType();
-        if (packetType.equals(PacketType.Play.Server.KEEP_ALIVE)) {
-            WrapperPlayServerKeepAlive keepAlive = new WrapperPlayServerKeepAlive(event);
-            long id = keepAlive.getId();
-
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
-            playerData.keepaliveMap.add(new Pair<>(id, System.nanoTime()));
-        } else if (packetType.equals(PacketType.Play.Server.PING)) {
-            WrapperPlayServerPing ping = new WrapperPlayServerPing(event);
-            int id = ping.getId();
-
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
-            playerData.transactionsSent.add(new Pair<>(id, System.nanoTime()));
-        } else if (packetType.equals(PacketType.Play.Server.WINDOW_CONFIRMATION)) {
-            WrapperPlayServerWindowConfirmation confirmation = new WrapperPlayServerWindowConfirmation(event);
-            int id = confirmation.getActionId();
-
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
-            playerData.transactionsSent.add(new Pair<>(id, System.nanoTime()));
-        }
+    public PingReceiveListener() {
+        super(PacketListenerPriority.LOWEST);
    }

    @Override
@@ -58,55 +28,65 @@ public class PingReceiveListener extends PacketListenerAbstract {
        // And then receive a response we have to ensure that if the packet was sent by us we cancel it
        // otherwise the server will likely kick the player
        PacketTypeCommon packetType = event.getPacketType();
-        if (packetType == PacketType.Play.Client.KEEP_ALIVE) {
+        User user = event.getUser();
+        if (user == null) return;
+        PlayerData playerData = PlayerDataManager.getPlayerData(user);
+        if (playerData == null) return;

+        if (playerData.pingStrategy == PingStrategy.KEEPALIVE && packetType == PacketType.Play.Client.KEEP_ALIVE) {
            WrapperPlayClientKeepAlive keepAlive = new WrapperPlayClientKeepAlive(event);
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
            long receivedId = keepAlive.getId();

            handlePingCalculationPackets(event, playerData, receivedId, playerData.keepaliveMap);
-        } else if (packetType == PacketType.Play.Client.PONG) {
+        } else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType == PacketType.Play.Client.PONG) {
            WrapperPlayClientPong pong = new WrapperPlayClientPong(event);
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
            int id = pong.getId();

            handlePingCalculationPackets(event, playerData, id, playerData.transactionsSent);
-        } else if (packetType == PacketType.Play.Client.WINDOW_CONFIRMATION) {
+        } else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType == PacketType.Play.Client.WINDOW_CONFIRMATION) {
            WrapperPlayClientWindowConfirmation windowConfirmation = new WrapperPlayClientWindowConfirmation(event);
-            PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser().getUUID());
-            if (playerData == null) return;
-
            int id = windowConfirmation.getActionId();

            handlePingCalculationPackets(event, playerData, id, playerData.transactionsSent);
        }
    }

-    private <T extends Number> void handlePingCalculationPackets(PacketReceiveEvent event, PlayerData playerData, long id, List<Pair<T, Long>> packetSentList) {
-        // We can cancel for all 3 cases
+    private <T extends Number> void handlePingCalculationPackets(PacketReceiveEvent event, PlayerData playerData, long id, Queue<Pair<T, Long>> packetSentList) {
+//        System.out.println("Received response ID: " + id + " Queue size before: " + packetSentList.size());
+//        System.out.println("Current queue contents: " + packetSentList.toString());
+
        if (playerData.didWeSendThatPacket(id)) {
-            // Pong not needed as vanilla ignores the packet, its needed for packet limiters
-            // We want to cancel Window Confirmations that we send, and ...
-            // Minecraft kicks players that send invalid keepAliveID packets
-            // Since Minecraft doesn't know we just sent a keepalive, we gotta cancel it
-            // To stop MC from processing it and kicking the player
            event.setCancelled(true);
        }

        if (!Base.INSTANCE.getConfigManager().isToggled()) return;

-        long pingNanos = (System.nanoTime() - packetSentList.remove(0).getSecond());
-        double diffMillisDouble = pingNanos / 1_000_000.0;
+        Pair<T, Long> data = null;
+        int cleared = 0;
+        // Keep polling until we find the matching ID
+        do {
+            data = packetSentList.poll();
+            cleared++;

-        playerData.setPreviousPing(playerData.getPing());
-        playerData.setPing(diffMillisDouble);
+            if (data == null) {
+//                System.out.println("No data found in queue!");
+                break;
+            }

-        playerData.getJitterCalculator().addPing(pingNanos);
-        double jitter = playerData.getJitterCalculator().calculateJitter();
-        playerData.setJitter(jitter);
+//            System.out.println("Cleared entry " + cleared + ": ID=" + data.getFirst() + " Time=" + data.getSecond());
+
+            long pingNanos = (System.nanoTime() - data.getSecond());
+            double diffMillisDouble = pingNanos / 1_000_000.0;
+
+            playerData.setPreviousPing(playerData.getPing());
+            playerData.setPing(diffMillisDouble);
+
+            playerData.getJitterCalculator().addPing(pingNanos);
+            double jitter = playerData.getJitterCalculator().calculateJitter();
+            playerData.setJitter(jitter);
+
+        } while (data.getFirst().longValue() != id);
+
+//        System.out.println("Finished processing - Cleared " + cleared + " entries. Queue size after: " + packetSentList.size());
    }
 }
@@ -0,0 +1,57 @@
+package me.caseload.knockbacksync.listener.packetevents;
+
+import com.github.retrooper.packetevents.event.*;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientKeepAlive;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPong;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientWindowConfirmation;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerKeepAlive;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPing;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerWindowConfirmation;
+import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PingStrategy;
+import me.caseload.knockbacksync.player.PlayerData;
+import me.caseload.knockbacksync.util.data.Pair;
+
+import java.util.Queue;
+import java.util.UUID;
+
+public class PingSendListener extends PacketListenerAbstract {
+
+    public PingSendListener() {
+        // See all actually outgoing, not cancelled, ping packets
+        super(PacketListenerPriority.MONITOR);
+    }
+
+    @Override
+    public void onPacketSend(PacketSendEvent event) {
+        if (!Base.INSTANCE.getConfigManager().isToggled()) return;
+        if (event.isCancelled()) return;
+
+        PacketTypeCommon packetType = event.getPacketType();
+        UUID playerUUID = event.getUser().getUUID();
+        if (playerUUID == null) return;
+        PlayerData playerData = PlayerDataManager.getPlayerData(event.getUser());
+        if (playerData == null) return;
+
+        if (playerData.pingStrategy == PingStrategy.KEEPALIVE && packetType.equals(PacketType.Play.Server.KEEP_ALIVE)) {
+            WrapperPlayServerKeepAlive keepAlive = new WrapperPlayServerKeepAlive(event);
+            long id = keepAlive.getId();
+
+//            System.out.println("Adding ping to queue - ID: " + id + " Time: " + System.nanoTime() + " Queue size before: " + playerData.keepaliveMap.size());
+            playerData.keepaliveMap.add(new Pair<>(id, System.nanoTime()));
+        } else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType.equals(PacketType.Play.Server.PING)) {
+            WrapperPlayServerPing ping = new WrapperPlayServerPing(event);
+            int id = ping.getId();
+
+            playerData.transactionsSent.add(new Pair<>(id, System.nanoTime()));
+        } else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType.equals(PacketType.Play.Server.WINDOW_CONFIRMATION)) {
+            WrapperPlayServerWindowConfirmation confirmation = new WrapperPlayServerWindowConfirmation(event);
+            int id = confirmation.getActionId();
+
+            playerData.transactionsSent.add(new Pair<>(id, System.nanoTime()));
+        }
+    }
+}
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.manager;

+import com.github.retrooper.packetevents.protocol.player.User;
 import org.jetbrains.annotations.NotNull;

 import java.util.Set;
@@ -8,17 +9,17 @@ import java.util.concurrent.ConcurrentHashMap;

 public class CombatManager {

-    private static final Set<UUID> combatPlayers = ConcurrentHashMap.newKeySet();
+    private static final Set<@NotNull User> combatPlayers = ConcurrentHashMap.newKeySet();

-    public static @NotNull Set<UUID> getPlayers() {
+    public static @NotNull Set<@NotNull User> getPlayers() {
        return combatPlayers;
    }

-    public static void addPlayer(UUID uuid) {
-        combatPlayers.add(uuid);
+    public static void addPlayer(@NotNull User user) {
+        combatPlayers.add(user);
    }

-    public static void removePlayer(UUID uuid) {
-        combatPlayers.remove(uuid);
+    public static void removePlayer(@NotNull User user) {
+        combatPlayers.remove(user);
    }
 }
@@ -19,12 +19,13 @@ import java.util.Map;
@Setter
 public class ConfigManager {

-    public static final long CONFIG_VERSION = 4;
+    public static final long CONFIG_VERSION = 7;

    private boolean toggled;
    private boolean runnableEnabled;
    private boolean updateAvailable;
    private boolean notifyUpdate;
+    private boolean autoUpdate;

    private long runnableInterval;
    private long combatTimer;
@@ -35,6 +36,7 @@ public class ConfigManager {
    private String playerEnableMessage;
    private String playerDisableMessage;
    private String playerIneligibleMessage;
+    private String playerDisconnectedWhileExecutingCommand;

    private AbstractTaskHandle pingTask;

@@ -105,7 +107,7 @@ public class ConfigManager {
            long initialDelay = 0L;
            long pingTaskRunnableInterval = runnableInterval;
            // Folia does not allow 0 ticks of wait time
-            if (Base.INSTANCE.platform == Platform.FOLIA) {
+            if (Base.INSTANCE.getPlatform() == Platform.FOLIA) {
                initialDelay = 1L;
                pingTaskRunnableInterval = Math.max(pingTaskRunnableInterval, 1L);
            }
@@ -113,13 +115,15 @@ public class ConfigManager {
        }

        notifyUpdate = configWrapper.getBoolean("notify_updates", true);
+        autoUpdate = configWrapper.getBoolean("auto_update", true);
        combatTimer = configWrapper.getLong("runnable.timer", 30L);
        spikeThreshold = configWrapper.getLong("spike_threshold", 20L);
-        enableMessage = configWrapper.getString("enable_message", "&aSuccessfully enabled KnockbackSync.");
-        disableMessage = configWrapper.getString("disable_message", "&cSuccessfully disabled KnockbackSync.");
-        playerEnableMessage = configWrapper.getString("player_enable_message", "&aSuccessfully enabled KnockbackSync for %player%.");
-        playerDisableMessage = configWrapper.getString("player_disable_message", "&cSuccessfully disabled KnockbackSync for %player%.");
-        playerIneligibleMessage = configWrapper.getString("player_ineligible_message", "&c%player% is ineligible for KnockbackSync. If you believe this is in error, please contact your server administrators.");
+        enableMessage = configWrapper.getString("messages.toggle.global.enable", "&aSuccessfully enabled KnockbackSync.");
+        disableMessage = configWrapper.getString("messages.toggle.global.disable", "&cSuccessfully disabled KnockbackSync.");
+        playerEnableMessage = configWrapper.getString("messages.toggle.player.enable", "&aSuccessfully enabled KnockbackSync for %player%.");
+        playerDisableMessage = configWrapper.getString("messages.toggle.player.disable", "&aSuccessfully &cdisabled &aKnockbackSync for %player%.");
+        playerIneligibleMessage = configWrapper.getString("messages.toggle.player.ineligible", "&c%player% is ineligible for KnockbackSync. If you believe this is in error, please contact your server administrators.");
+        playerDisconnectedWhileExecutingCommand = configWrapper.getString("messages.toggle.player.disconnected-while-executing-command", "&c%player% disconnected while executing command.");
    }

    public void updateConfig() {
@@ -1,10 +1,13 @@
 package me.caseload.knockbacksync.manager;

+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.player.PlatformPlayer;
 import me.caseload.knockbacksync.player.PlayerData;
 import me.caseload.knockbacksync.util.FloodgateUtil;
 import me.caseload.knockbacksync.util.GeyserUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 import java.util.Map;
 import java.util.UUID;
@@ -12,27 +15,28 @@ import java.util.concurrent.ConcurrentHashMap;

 public class PlayerDataManager {

-    private static final Map<UUID, PlayerData> playerDataMap = new ConcurrentHashMap<>();
+    private static final Map<User, PlayerData> playerDataMap = new ConcurrentHashMap<>();

-    public static PlayerData getPlayerData(@NotNull UUID uuid) {
-        return playerDataMap.get(uuid);
+    public static @Nullable PlayerData getPlayerData(@NotNull User user) {
+        return playerDataMap.get(user);
    }

-    public static void addPlayerData(@NotNull UUID uuid, @NotNull PlayerData playerData) {
-        if (!shouldExempt(uuid)) {
-            playerDataMap.put(uuid, playerData);
-            Base.INSTANCE.getSimpleEventBus().registerListeners(playerData);
+    public static void addPlayerData(@NotNull User user, @NotNull PlatformPlayer platformPlayer) {
+        if (!shouldExempt(platformPlayer.getUUID())) {
+            PlayerData playerData = new PlayerData(user, platformPlayer);
+            playerDataMap.put(user, playerData);
+            Base.INSTANCE.getEventBus().registerListeners(playerData);
        }
    }

-    public static void removePlayerData(@NotNull UUID uuid) {
-        PlayerData playerData = playerDataMap.remove(uuid);
+    public static void removePlayerData(@NotNull User user) {
+        PlayerData playerData = playerDataMap.remove(user);
        if (playerData != null)
-            Base.INSTANCE.getSimpleEventBus().unregisterListeners(playerData);
+            Base.INSTANCE.getEventBus().unregisterListeners(playerData);
    }

-    public static boolean containsPlayerData(@NotNull UUID uuid) {
-        return playerDataMap.containsKey(uuid);
+    public static boolean containsPlayerData(@NotNull User user) {
+        return playerDataMap.containsKey(user);
    }

    public static boolean shouldExempt(@NotNull UUID uuid) {
@@ -0,0 +1,6 @@
+package me.caseload.knockbacksync.player;
+
+public enum PingStrategy {
+    KEEPALIVE,
+    TRANSACTION
+}
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.player;

+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.BoundingBox;
 import com.github.retrooper.packetevents.util.Vector3d;
 import me.caseload.knockbacksync.world.PlatformWorld;
@@ -50,5 +51,16 @@ public interface PlatformPlayer {
    double getJumpPower();

    BoundingBox getBoundingBox();
+
+    /**
+     * If a player disconnects while we are running the constructor of a PlatformPlayer
+     * PacketEvents.getAPI().getPlayerManager().getUser(bukkitPlayer) may return null
+     * This will make the internal field null and thus this function may return null.
+     */
+    @Nullable User getUser();
+
+    void setClientBrand(String brand);
+
+    String getClientBrand();
    // Add more methods as needed
 }
@@ -8,8 +8,6 @@ import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.BoundingBox;
-import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 import com.github.retrooper.packetevents.util.Vector3d;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerKeepAlive;
@@ -18,11 +16,14 @@ import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerWi
 import lombok.Getter;
 import lombok.Setter;
 import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.command.subcommand.ToggleOffGroundSubcommand;
 import me.caseload.knockbacksync.event.KBSyncEventHandler;
 import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
 import me.caseload.knockbacksync.event.events.ToggleOnOffEvent;
 import me.caseload.knockbacksync.manager.CombatManager;
+import me.caseload.knockbacksync.manager.ConfigManager;
 import me.caseload.knockbacksync.scheduler.AbstractTaskHandle;
+import me.caseload.knockbacksync.scheduler.NettyTaskHandle;
 import me.caseload.knockbacksync.util.MathUtil;
 import me.caseload.knockbacksync.util.data.Pair;
 import me.caseload.knockbacksync.world.PlatformWorld;
@@ -32,24 +33,27 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.lang.reflect.Field;
+import io.netty.channel.Channel;
 import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;

@Getter
 public class PlayerData {

    // Please read the GitHub FAQ before adjusting.
-    public static final long PING_OFFSET = 25;
-    public static float TICK_RATE = 20.0F;
-    private static Field playerField;
-    public final List<Pair<Integer, Long>> transactionsSent = new LinkedList<>();
-    public final List<Pair<Long, Long>> keepaliveMap = new LinkedList<>();
-
    private static final short MAIN_THREAD_TRANSACTION_ID = 31407;
    private static final short NETTY_THREAD_TRANSACTION_ID = 31408;
+    public static final long PING_OFFSET = 25;
+
+    private static Field playerField;
+
+    public final Queue<Pair<Integer, Long>> transactionsSent = new ConcurrentLinkedQueue<>();
+    public final Queue<Pair<Long, Long>> keepaliveMap = new ConcurrentLinkedQueue<>();

    static {
        try {
-            switch (Base.INSTANCE.platform) {
+            switch (Base.INSTANCE.getPlatform()) {
                case BUKKIT:
                case FOLIA:
                    Class<?> bukkitPlayerClass = Class.forName("me.caseload.knockbacksync.player.BukkitPlayer");
@@ -60,7 +64,7 @@ public class PlayerData {
                    playerField = fabricPlayerClass.getDeclaredField("fabricPlayer");
                    break;
                default:
-                    throw new IllegalStateException("Unexpected platform: " + Base.INSTANCE.platform);
+                    throw new IllegalStateException("Unexpected platform: " + Base.INSTANCE.getPlatform());
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -76,34 +80,19 @@ public class PlayerData {
    @Getter private final JitterCalculator jitterCalculator = new JitterCalculator();
    @Setter private double jitter;
    @Nullable private AbstractTaskHandle combatTask;
+    @NotNull private final Object combatTaskLock = new Object(); // Lock object for synchronization
    @Nullable @Setter private Double ping, previousPing;
    @Nullable @Setter private Double verticalVelocity;
    @Nullable @Setter private Integer lastDamageTicks;
    @Setter private double gravityAttribute = 0.08;
    @Setter private double knockbackResistanceAttribute = 0.0;
-    private boolean offGroundSyncEnabled;
+    public PingStrategy pingStrategy; // this is currently shared between all instances, but can be made per-player later

-    public PlayerData(PlatformPlayer platformPlayer) {
+    public PlayerData(User user, PlatformPlayer platformPlayer) {
        this.uuid = platformPlayer.getUUID();
+        this.user = user;
        this.platformPlayer = platformPlayer;
-
-        User tempUser = null;
-
-        PlayerManager playerManager = PacketEvents.getAPI().getPlayerManager();
-        Object player = null;
-        try {
-            player = playerField.get(platformPlayer);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-
-        if (player != null) {
-            tempUser = playerManager.getUser(player);
-        }
-
-        this.user = tempUser;
-        this.offGroundSyncEnabled = Base.INSTANCE.getConfigManager().getConfigWrapper().getBoolean("enable_offground_synchronization",
-                true);
+        this.pingStrategy = loadPingStrategy(Base.INSTANCE.getConfigManager());
    }

    public double getNotNullPing() {
@@ -130,11 +119,11 @@ public class PlayerData {
    }

    public int getCompensatedTicks() {
-        return (int) Math.ceil(getCompensatedPing() * TICK_RATE / 1000); // Multiply ping by seconds per tick
+        return (int) Math.ceil(getCompensatedPing() * Base.INSTANCE.getTickRate() / 1000); // Multiply ping by seconds per tick
    }

    public int getTicks() {
-        return (int) Math.ceil(getNotNullPing() * TICK_RATE / 1000); // Multiply ping by seconds per tick
+        return (int) Math.ceil(getNotNullPing() * Base.INSTANCE.getTickRate() / 1000); // Multiply ping by seconds per tick
    }

    public boolean isSpike() {
@@ -144,9 +133,8 @@ public class PlayerData {
    public void sendPing(boolean async) {
        if (user == null || user.getEncoderState() != ConnectionState.PLAY) return;

-       String pingStrategy = Base.INSTANCE.getConfigManager().getConfigWrapper().getString("ping_strategy", "KEEPALIVE");
       switch (pingStrategy) {
-           case "KEEPALIVE":
+           case KEEPALIVE:
               long keepAliveID = async ? NETTY_THREAD_TRANSACTION_ID : MAIN_THREAD_TRANSACTION_ID;
               if (async) {
                   ChannelHelper.runInEventLoop(user.getChannel(), () -> {
@@ -159,8 +147,7 @@ public class PlayerData {
                   user.sendPacket(new WrapperPlayServerKeepAlive(keepAliveID));
               }
               break;
-           case "PING":
-           case "TRANSACTION":
+           case TRANSACTION:
               PacketWrapper<?> packet;
               short pingTransactionID = async ? NETTY_THREAD_TRANSACTION_ID : MAIN_THREAD_TRANSACTION_ID;
               if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_17)) {
@@ -216,7 +203,7 @@ public class PlayerData {
     */
    public boolean isOffGroundSyncEnabled() {
        // TODO, per-player offground sync toggles?
-        return offGroundSyncEnabled;
+        return ToggleOffGroundSubcommand.offGroundSyncEnabled;
    }

    /**
@@ -294,28 +281,41 @@ public class PlayerData {
        return yAxis;
    }

-    public boolean isInCombat() {
-        return combatTask != null;
-    }
-
    public void updateCombat() {
-        if (isInCombat())
-            combatTask.cancel();
-
-        combatTask = newCombatTask();
-        CombatManager.addPlayer(uuid);
+        Channel channel = (Channel) user.getChannel();
+        channel.eventLoop().execute(() -> {
+            if (combatTask != null) {
+                combatTask.cancel();
+            }
+            combatTask = newCombatTask(channel);
+            CombatManager.addPlayer(user);
+        });
    }

-    public void quitCombat() {
-        combatTask.cancel(); // should do nothing
-        combatTask = null;
-        CombatManager.removePlayer(uuid);
+    /**
+     * Cancels the combatTask quit task. This prevents quitCombat() from being called later against a new combat task
+     * Or against a player that has disconnected already
+     * @param async Whether we are already in the players netty thread
+     */
+    public void quitCombat(boolean async) {
+        Channel channel = (Channel) user.getChannel();
+        Runnable runnable = () -> {
+            if (combatTask != null) {
+                combatTask.cancel();
+                combatTask = null;
+            }
+            CombatManager.removePlayer(user);
+        };
+        if (async) {
+            channel.eventLoop().execute(runnable);
+        } else {
+            runnable.run();
+        }
    }

    @NotNull
-    private AbstractTaskHandle newCombatTask() {
-        return Base.INSTANCE.getScheduler().runTaskLaterAsynchronously(
-                this::quitCombat, Base.INSTANCE.getConfigManager().getCombatTimer());
+    private AbstractTaskHandle newCombatTask(Channel channel) {
+        return new NettyTaskHandle(channel.eventLoop().schedule(() -> quitCombat(false), convertTicksToMilliseconds(Base.INSTANCE.getConfigManager().getCombatTimer()), TimeUnit.MILLISECONDS));
    }

    public ClientVersion getClientVersion() {
@@ -339,7 +339,7 @@ public class PlayerData {

    @KBSyncEventHandler
    public void onToggledEvent(ToggleOnOffEvent event) {
-        if (event.getStatus() == false) {
+        if (!event.getStatus()) {
            transactionsSent.clear();
            keepaliveMap.clear();
        }
@@ -347,7 +347,23 @@ public class PlayerData {

    @KBSyncEventHandler
    public void onConfigReloadEvent(ConfigReloadEvent event) {
-        this.offGroundSyncEnabled = Base.INSTANCE.getConfigManager().getConfigWrapper().getBoolean("enable_offground_synchronization",
-                true);
+        this.pingStrategy = loadPingStrategy(event.getConfigManager());
+    }
+
+    private PingStrategy loadPingStrategy(ConfigManager  configManager) {
+        String pingStrategy = configManager.getConfigWrapper().getString("ping_strategy", "KEEPALIVE");
+        switch (pingStrategy) {
+            case "KEEPALIVE":
+                return PingStrategy.KEEPALIVE;
+            case "PING":
+            case "TRANSACTION":
+                return PingStrategy.TRANSACTION;
+            default:
+                throw new IllegalStateException("Unknown ping_strategy: " + pingStrategy);
+        }
+    }
+
+    private long convertTicksToMilliseconds(long ticks) {
+        return ticks * 50;
    }
 }
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync.runnable;

+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.manager.CombatManager;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
@@ -14,9 +15,10 @@ public class PingRunnable implements Runnable {
        if (!Base.INSTANCE.getConfigManager().isToggled())
            return;

-        for (UUID uuid : CombatManager.getPlayers()) {
-            PlayerData playerData = PlayerDataManager.getPlayerData(uuid);
-            playerData.sendPing(true);
+        for (User user : CombatManager.getPlayers()) {
+            PlayerData playerData = PlayerDataManager.getPlayerData(user);
+            if (playerData != null)
+                playerData.sendPing(true);
        }
    }
 }
@@ -0,0 +1,22 @@
+package me.caseload.knockbacksync.scheduler;
+
+import io.netty.util.concurrent.ScheduledFuture;
+
+public class NettyTaskHandle implements AbstractTaskHandle {
+
+    private final ScheduledFuture scheduledFuture;
+
+    public NettyTaskHandle(ScheduledFuture<?> scheduledFuture) {
+        this.scheduledFuture = scheduledFuture;
+    }
+
+    @Override
+    public boolean getCancelled() {
+        return scheduledFuture.isCancelled();
+    }
+
+    @Override
+    public void cancel() {
+        scheduledFuture.cancel(true);
+    }
+}
@@ -0,0 +1,31 @@
+package me.caseload.knockbacksync.stats.custom;
+
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
+import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.manager.PlayerDataManager;
+import me.caseload.knockbacksync.player.PlatformPlayer;
+import me.caseload.knockbacksync.player.PlayerData;
+import me.caseload.knockbacksync.stats.AdvancedPie;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClientBrandsPie extends AdvancedPie {
+
+    // Gets the client versions of players online
+    public ClientBrandsPie() {
+        super("client_brands", () -> {
+            Map<String, Integer> valueMap = new HashMap<>();
+            for (PlatformPlayer player : Base.INSTANCE.getPlatformServer().getOnlinePlayers()) {
+                User user = player.getUser();
+                if (user == null || user.getClientVersion() == null) {
+                    valueMap.put("vanilla", valueMap.getOrDefault("vanilla", 0) + 1);
+                } else {
+                    valueMap.put(player.getClientBrand(), valueMap.getOrDefault(player.getClientBrand(), 0) + 1);
+                }
+            }
+            return valueMap;
+        });
+    }
+}
@@ -1,5 +1,9 @@
 package me.caseload.knockbacksync.stats.custom;

+import me.caseload.knockbacksync.stats.CustomChart;
+
 public interface Metrics {
+
+    void addCustomChart(CustomChart chart);
    void shutdown();
 }
@@ -1,5 +1,7 @@
 package me.caseload.knockbacksync.stats.custom;

+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.manager.PlayerDataManager;
 import me.caseload.knockbacksync.player.PlatformPlayer;
@@ -15,9 +17,13 @@ public class PlayerVersionsPie extends AdvancedPie {
    public PlayerVersionsPie() {
        super("player_version", () -> {
            Map<String, Integer> valueMap = new HashMap<>();
-            for (PlatformPlayer player : Base.INSTANCE.platformServer.getOnlinePlayers()) {
-                PlayerData playerData = PlayerDataManager.getPlayerData(player.getUUID());
-                valueMap.put(playerData.getClientVersion().toString(), valueMap.getOrDefault(playerData.getClientVersion().toString(), 0) + 1);
+            for (PlatformPlayer player : Base.INSTANCE.getPlatformServer().getOnlinePlayers()) {
+                User user = player.getUser();
+                if (user == null || user.getClientVersion() == null) {
+                    valueMap.put(ClientVersion.UNKNOWN.toString(), valueMap.getOrDefault(ClientVersion.UNKNOWN.toString(), 0) + 1);
+                } else {
+                    valueMap.put(user.getClientVersion().toString(), valueMap.getOrDefault(user.getClientVersion().toString(), 0) + 1);
+                }
            }
            return valueMap;
        });
@@ -1,13 +1,23 @@
 package me.caseload.knockbacksync.stats.custom;

 import lombok.Getter;
+import me.caseload.knockbacksync.Base;

@Getter
 public abstract class StatsManager {

    Metrics metrics;

+    public StatsManager(Metrics metrics) {
+        this.metrics = metrics;
+    }
+
    public void init() {
-        throw new IllegalStateException("Empty stats class!");
+        Base.INSTANCE.getScheduler().runTaskAsynchronously(() -> {
+            BuildTypePie.determineBuildType(); // Function to calculate hash
+            metrics.addCustomChart(new PlayerVersionsPie());
+            metrics.addCustomChart(new BuildTypePie());
+            metrics.addCustomChart(new ClientBrandsPie());
+        });
    }
 }
@@ -1,13 +1,10 @@
 package me.caseload.knockbacksync.util;

 import com.google.common.base.Preconditions;
-import me.caseload.knockbacksync.manager.PlayerDataManager;
-import me.caseload.knockbacksync.player.PlayerData;
 import org.jetbrains.annotations.NotNull;

-import java.util.UUID;
-
 public class ChatUtil {
+
    public static @NotNull String translateAlternateColorCodes(char altColorChar, @NotNull String textToTranslate) {
        Preconditions.checkArgument(textToTranslate != null, "Cannot translate null text");
        char[] b = textToTranslate.toCharArray();
@@ -21,35 +18,4 @@ public class ChatUtil {

        return new String(b);
    }
-
-    public static String getPingMessage(UUID senderUUID, UUID targetUUID) {
-
-        String noun = "";
-        PlayerData playerData = null;
-        if (senderUUID == null) {
-            senderUUID = targetUUID;
-        }
-
-        if (senderUUID.equals(targetUUID) || targetUUID == null) {
-            playerData = PlayerDataManager.getPlayerData(senderUUID);
-            if (playerData == null) {
-                return ChatUtil.translateAlternateColorCodes('&', "&cKnockback synchronization is currently disabled for you!");
-            }
-            noun = "Your";
-        } else {
-            playerData = PlayerDataManager.getPlayerData(targetUUID);
-            if (playerData == null) {
-                return ChatUtil.translateAlternateColorCodes('&', "&cKnockback synchronization is currently disabled for the target player.");
-            }
-            noun = playerData.getPlatformPlayer().getName() + "'s";
-        }
-
-        String rawReturnString = null;
-        if (playerData.getPing() == null) {
-            rawReturnString = String.format("Accurate ping unavailable. %s estimated ping is &b" + playerData.getPlatformPlayer().getPing() + "&rms.", noun);
-        } else {
-            rawReturnString = String.format("%s real ping is &b%.3f&rms. Jitter: &b%.3f&rms. Spike: &b%s&r. Compensated ping: &b%.3f&rms.", noun, playerData.getPing(), playerData.getJitter(), playerData.isSpike(), playerData.getCompensatedPing());
-        }
-        return ChatUtil.translateAlternateColorCodes('&', rawReturnString);
-    }
 }
@@ -19,18 +19,9 @@ public class GeyserUtil {
    public static boolean isGeyserPlayer(UUID uuid) {
        if (!CHECKED_FOR_GEYSER) {
            try {
-                switch (Base.INSTANCE.platform) {
-                    case BUKKIT:
-                    case FOLIA:
-                        ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
-                        GEYSER_CLASS = classLoader.loadClass("org.geysermc.api.Geyser");
-                        break;
-                    case FABRIC:
-                        GEYSER_CLASS = Class.forName("org.geysermc.api.Geyser");
-                        GEYSER_PRESENT = true;
-                        break;
-                }
-
+                ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
+                GEYSER_CLASS = classLoader.loadClass("org.geysermc.api.Geyser");
+                GEYSER_PRESENT = true;
            } catch (ClassNotFoundException e) {
                GEYSER_PRESENT = false;
            }
@@ -40,17 +31,8 @@ public class GeyserUtil {
        if (GEYSER_PRESENT) {
            if (GEYSER_API_CLASS == null) {
                try {
-                    switch (Base.INSTANCE.platform) {
-                        case BUKKIT:
-                        case FOLIA:
-                            ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
-                            GEYSER_API_CLASS = classLoader.loadClass("org.geysermc.api.GeyserApiBase");
-                            break;
-                        case FABRIC:
-                            GEYSER_CLASS = Class.forName("org.geysermc.api.GeyserApiBase");
-                            GEYSER_PRESENT = true;
-                            break;
-                    }
+                    ClassLoader classLoader = PacketEvents.getAPI().getPlugin().getClass().getClassLoader();
+                    GEYSER_API_CLASS = classLoader.loadClass("org.geysermc.api.GeyserApiBase");
                } catch (ClassNotFoundException e) {
                    e.printStackTrace();
                }
@@ -2,7 +2,7 @@ package me.caseload.knockbacksync.util;

 import me.caseload.knockbacksync.player.PlayerData;

-import static me.caseload.knockbacksync.player.PlayerData.TICK_RATE;
+import me.caseload.knockbacksync.Base;

 public class MathUtil {

@@ -10,18 +10,5 @@ public interface PlatformServer {

    PlatformPlayer getPlayer(UUID uuid);

-//        switch (KnockbackSyncBase.INSTANCE.platform) {
-//            case BUKKIT:
-//            case FOLIA:
-//                return Bukkit.getOnlinePlayers().stream()
-//                        .map(BukkitPlayer::new)
-//                        .collect(Collectors.toList());
-//            case FABRIC:
-//                MinecraftServer server = (MinecraftServer) FabricLoader.getInstance().getGameInstance();
-//                return server.getPlayerList().getPlayers().stream()
-//                        .map(FabricPlayer::new)
-//                        .collect(Collectors.toList());
-//            default:
-//                throw new IllegalStateException("Unexpected platform: " + KnockbackSyncBase.INSTANCE.platform);
-//        }
+    PlatformPlayer getPlayer(Object nativePlatformPlayer);
 }
@@ -3,7 +3,7 @@
 #########################################

 # Do not modify!
-config_version: 5
+config_version: 7

 # Plugin enabled state
 # Toggleable using /knockbacksync toggle
@@ -14,6 +14,10 @@ enabled: true
 # Required permission: knockbacksync.update
 notify_updates: true

+# Automatically updates the plugin
+# Only servers with restart compatibility can use this feature
+auto_update: false
+
 # Grabs the ping of combat-tagged players every x ticks
 # Disabling this may lead to inaccuracies in calculations
 runnable:
@@ -41,23 +45,11 @@ ping_strategy: "KEEPALIVE"
 # Whether to try to detect when player is offground and apply less kb
 enable_offground_synchronization: true

-enable_message: "&aSuccessfully enabled KnockbackSync."
-disable_message: "&cSuccessfully disabled KnockbackSync."
-player_enable_message: "&aSuccessfully enabled KnockbackSync for %player%."
-player_disable_message: "&aSuccessfully &cdisabled &aKnockbackSync for %player%."
-player_ineligible_message: '&c%player% is ineligible for KnockbackSync. If you believe this is in error, please contact your server administrators.'
-reload_message: "&aSuccessfully reloaded KnockbackSync config."
-global_status_message: "&eGlobal KnockbackSync status: "
-player_status_message: "&e%player%'s KnockbackSync status: "
-player_disabled_global_message: "&cDisabled (Global toggle is off)"
-enable_offground_synchronization_message: "&aSuccessfully enabled offground synchronization."
-disable_offground_synchronization_message: "&cSuccessfully disabled offground synchronization."
-
 # This is the rate the server will use for (amongst other things) sending packets about entities to players
 # In other words it defines how often clients get updated velocity for other entities in the world
 # Note that certain events mark velocity as dirty and causes it to be immediately updated for 1 tick regardless of the tick interval
 # These include but are not limited to jumping, taking knockback, swimming, and a target entity being affected by a special mob attack
-# Such as the enderdragon's huge knockback
+# Such as the Ender Dragon's knockback attacks
 # If an entity below doesn't exist in the version of the game your server is running in, changing the config for it will do nothing
 # Currently only modifying the player's tick interval is supported on Bukkit/Spigot/Paper + Folia
 # Modifying the tick interval of any entity is supported on Fabric.
@@ -193,3 +185,56 @@ entity_tick_intervals:
  zombified_piglin: 3
  fishing_bobber: 5

+messages:
+  toggle:
+    global:
+      enable: "&aSuccessfully enabled KnockbackSync."
+      disable: "&cSuccessfully disabled KnockbackSync."
+    player:
+      enable: "&aSuccessfully enabled KnockbackSync for %player%."
+      disable: "&aSuccessfully &cdisabled &aKnockbackSync for %player%."
+      ineligible: "&c%player% is ineligible for KnockbackSync. If you believe this is in error, please contact your server administrators."
+      disconnected-while-executing-command: "&c%player% disconnected while executing command."
+    permission:
+      no_global: "&cYou don't have permission to toggle the global setting."
+      no_self: "&cYou do not have permission to toggle your knockback."
+      no_other: "&cYou do not have permission to toggle the knockback of other player's."
+    self:
+      enable: "&aSuccessfully enabled KnockbackSync."
+      disable: "&cSuccessfully disabled KnockbackSync."
+    other:
+      enable: "&aSuccessfully enabled KnockbackSync for %player%."
+      disable: "&aSuccessfully &cdisabled &aKnockbackSync for %player%."
+      ineligible: "&c%player% is ineligible for KnockbackSync. If you believe this is in error, please contact your server administrators."
+  server_disabled: "&cKnockbacksync is currently disabled on this server. Contact your server administrator for more information."
+  offground:
+    enable: "&aSuccessfully enabled offground synchronization."
+    disable: "&cSuccessfully disabled offground synchronization."
+  reload:
+    success: "&aSuccessfully reloaded KnockbackSync."
+  status:
+    global:
+      enabled: "&eKnockbackSync global status: &aEnabled"
+      disabled: "&eKnockbackSync global status: &cDisabled"
+    offground:
+      enabled: "&eKnockbackSync off-ground status: &aEnabled"
+      disabled: "&eKnockbackSync off-ground status: &cDisabled"
+    player:
+      enabled: "&e%player%'s KnockbackSync status: &aEnabled"
+      disabled: "&e%player%'s KnockbackSync status: &cDisabled"
+      global_disabled: "&e%player%'s KnockbackSync status: &cDisabled (Global toggle is off)"
+    permission:
+      no_self: "&cYou do not have permission to check your knockbacksync status."
+      no_other: "&cYou do not have permission to check the status of other players!"
+  console:
+    must_specify_player: "&cYou must specify a player to use the knockbacksync ping command from the console."
+  disabled:
+    self: "&cKnockback synchronization is currently disabled for you!"
+    target: "&cKnockback synchronization is currently disabled for the target player."
+  ping:
+    self:
+      unavailable: "Accurate ping unavailable. Your estimated ping is &b%ping%&rms."
+      available: "Your real ping is &b%ping%&rms. Jitter: &b%jitter%&rms. Spike: &b%spike%&r. Compensated ping: &b%compensated%&rms."
+    other:
+      unavailable: "Accurate ping unavailable. %player%'s estimated ping is &b%ping%&rms."
+      available: "%player%'s real ping is &b%ping%&rms. Jitter: &b%jitter%&rms. Spike: &b%spike%&r. Compensated ping: &b%compensated%&rms."
@@ -1,6 +1,5 @@
 plugins {
    id("fabric-loom")
-    id("com.gradleup.shadow")
 }

 loom {
@@ -11,11 +10,6 @@ base {
    archivesName.set("${rootProject.property("archives_base_name")}-fabric")
 }

-val shadeThisThing: Configuration by configurations.creating {
-    isCanBeConsumed = true
-    isTransitive = true
-}
-
 // TODO migrate to only including sourceset for compile, test and javadoc tasks
 // Currently must build with gradle build -x test to skip test
 tasks.withType<JavaCompile>().configureEach {
@@ -30,21 +24,24 @@ tasks.named<JavaCompile>("compileTestJava") {
    exclude("**/*")
 }

+repositories {
+    maven("https://jitpack.io") // Conditional Mixin
+}
+
 dependencies {
    implementation(project(":common"))

    minecraft("com.mojang:minecraft:${rootProject.property("minecraft_version")}")
-    mappings(loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.21:${rootProject.property("parchment_mappings")}")
-    })
+    mappings("net.fabricmc:yarn:${rootProject.property("yarn_mappings")}")
    modImplementation("net.fabricmc:fabric-loader:${rootProject.property("loader_version")}")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${rootProject.property("fabric_version")}")
+    modImplementation(fabricApi.module("fabric-lifecycle-events-v1", "${rootProject.property("fabric_version")}"))
+    modImplementation(fabricApi.module("fabric-events-interaction-v0", "${rootProject.property("fabric_version")}"))

-    include(modImplementation("me.lucko:fabric-permissions-api:0.3.1")!!)
-    include(modImplementation("com.github.retrooper:packetevents-fabric:2.5.0")!!)
-    include(modImplementation("org.incendo:cloud-fabric:2.0.0-beta.9")!!)
+    include(modImplementation("me.lucko:fabric-permissions-api:0.6.1")!!)
+    include(modImplementation("com.github.retrooper:packetevents-fabric:2.11.1+60a2c34-SNAPSHOT")!!)
+    include(modImplementation("org.incendo:cloud-fabric:2.0.0-beta.15")!!)

+    include(implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.10")!!)
    include(implementation("org.yaml:snakeyaml:2.0")!!)
    include(implementation("org.kohsuke:github-api:1.326")!!)
    // Required for org.kohsuke.github
@@ -57,22 +54,10 @@ dependencies {

    compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
    compileOnly("org.projectlombok:lombok:1.18.34")
+    compileOnly("io.netty:netty-all:4.1.72.Final")
    annotationProcessor("org.projectlombok:lombok:1.18.34")
 }

-tasks.shadowJar {
-    archiveClassifier.set("dev")
-    configurations = listOf(shadeThisThing)
-    isEnableRelocation = true
-    relocationPrefix = "${project.property("maven_group")}.${project.property("archives_base_name")}.shaded"
-    finalizedBy(tasks.remapJar)
-}
-tasks.remapJar {
-    archiveClassifier.set(null as String?)
-    dependsOn(tasks.shadowJar)
-    inputFile = tasks.shadowJar.get().archiveFile
-}
-
 tasks.processResources {
    from(project(":common").sourceSets.main.get().resources)

@@ -84,8 +69,8 @@ tasks.processResources {
    filesMatching("fabric.mod.json") {
        expand(
            "version" to project.version,
-            "minecraft_version" to rootProject.property("minecraft_version"),
-            "loader_version" to rootProject.property("loader_version")
+            "minecraft_version" to rootProject.property("minecraft_version")!!,
+            "loader_version" to rootProject.property("loader_version")!!
        )
    }
 }
@@ -1,15 +1,13 @@
 package me.caseload.knockbacksync;

 import com.github.retrooper.packetevents.PacketEvents;
-import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsBuilder;
+import io.github.retrooper.packetevents.factory.fabric.FabricPacketEventsAPI;
 import lombok.Getter;
 import me.caseload.knockbacksync.entity.EntityTickManager;
 import me.caseload.knockbacksync.listener.fabric.FabricPlayerDamageListener;
-import me.caseload.knockbacksync.listener.fabric.FabricPlayerJoinQuitListener;
 import me.caseload.knockbacksync.listener.fabric.FabricPlayerKnockbackListener;
 import me.caseload.knockbacksync.listener.fabric.FabricTickRateChangeListener;
 import me.caseload.knockbacksync.manager.ConfigManager;
-import me.caseload.knockbacksync.mixin.ServerEntityMixin;
 import me.caseload.knockbacksync.permission.FabricPermissionChecker;
 import me.caseload.knockbacksync.permission.PermissionChecker;
 import me.caseload.knockbacksync.scheduler.FabricSchedulerAdapter;
@@ -18,6 +16,7 @@ import me.caseload.knockbacksync.sender.FabricSenderFactory;
 import me.caseload.knockbacksync.stats.custom.FabricStatsManager;
 import me.caseload.knockbacksync.stats.custom.PluginJarHashProvider;
 import me.caseload.knockbacksync.world.FabricServer;
+import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import org.incendo.cloud.execution.ExecutionCoordinator;
@@ -38,6 +37,7 @@ public class FabricBase extends Base {
    private final FabricPermissionChecker permissionChecker = new FabricPermissionChecker();
    @Getter
    private final FabricSenderFactory fabricSenderFactory = new FabricSenderFactory(this);
+    private float tickRate = 20.0F;

    public FabricBase() {
        super.configManager = new ConfigManager();
@@ -68,8 +68,13 @@ public class FabricBase extends Base {

    @Override
    public void load() {
-        PacketEvents.setAPI(FabricPacketEventsBuilder.build("knockbacksync"));
-        PacketEvents.getAPI().load();
+        // Since we JiJ PacketEvents and depend on it on Fabric, we can always just get the API instance since it loads firsts
+        // No need to make an API instance and load it
+    }
+
+    @Override
+    public void enable() {
+        super.enable();
    }

    @Override
@@ -79,11 +84,10 @@ public class FabricBase extends Base {

    @Override
    protected void registerPlatformListeners() {
-        new FabricPlayerJoinQuitListener().register();
        new FabricPlayerDamageListener().register();
        new FabricPlayerKnockbackListener().register();
        new FabricTickRateChangeListener().register();
-        super.simpleEventBus.registerStaticListeners(EntityTickManager.class);
+        super.eventBus.registerStaticListeners(EntityTickManager.class);
    }

    @Override
@@ -112,7 +116,16 @@ public class FabricBase extends Base {
        return permissionChecker;
    }

-    private URL getJarURL() {
+    @Override
+    public float getTickRate() {
+        return this.tickRate;
+    }
+
+    public void setTickRate(float tickRate) {
+        this.tickRate = tickRate;
+    }
+
+    public URL getJarURL() {
        URL jarUrl = null;
        Optional<ModContainer> modContainer = FabricLoader.getInstance().getModContainer("knockbacksync");
        if (modContainer.isPresent()) {
@@ -126,4 +139,12 @@ public class FabricBase extends Base {
        }
        return jarUrl;
    }
+
+    public void restartServer() {
+
+    }
+
+    public boolean hasRestartScript() {
+        return false;
+    }
 }
@@ -1,5 +1,6 @@
 package me.caseload.knockbacksync;

+import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
@@ -16,15 +17,24 @@ public class FabricLoaderMod implements PreLaunchEntrypoint, ModInitializer {

    @Override
    public void onPreLaunch() {
+        ensureServer();
        core.load();
    }

    @Override
    public void onInitialize() {
+        ensureServer();
        core.enable();
        ServerLifecycleEvents.SERVER_STOPPING.register((server) -> {
            core.scheduler.shutdown();
-            core.statsManager.getMetrics().shutdown();
+            // bstats removal
+//            core.statsManager.getMetrics().shutdown();
        });
    }
+
+    private void ensureServer() {
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            throw new IllegalStateException("This mod can only be run on servers");
+        }
+    }
 }
@@ -2,23 +2,23 @@ package me.caseload.knockbacksync.callback;

 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.Vec3d;

 public interface PlayerVelocityEvent {
    Event<PlayerVelocityEvent> EVENT = EventFactory.createArrayBacked(PlayerVelocityEvent.class,
            (listeners) -> (player, velocity) -> {
                for (PlayerVelocityEvent listener : listeners) {
-                    InteractionResult result = listener.onVelocityChange(player, velocity);
+                    ActionResult result = listener.onVelocityChange(player, velocity);

-                    if (result != InteractionResult.PASS) {
+                    if (result != ActionResult.PASS) {
                        return result;
                    }
                }

-                return InteractionResult.PASS;
+                return ActionResult.PASS;
            });

-    InteractionResult onVelocityChange(ServerPlayer player, Vec3 velocity);
+    ActionResult onVelocityChange(ServerPlayerEntity player, Vec3d velocity);
 }
@@ -3,9 +3,8 @@ package me.caseload.knockbacksync.entity;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.ConfigWrapper;
 import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
+import net.minecraft.entity.EntityType;
 import me.caseload.knockbacksync.event.KBSyncEventHandler;
-import net.minecraft.world.entity.EntityType;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -32,9 +31,9 @@ public class EntityTickManager {
        customTickIntervals.clear();
        for (String entityKey : configWrapper.getKeys("entity_tick_intervals")) {
            try {
-                Optional<EntityType<?>> entityType = EntityType.byString(entityKey.toLowerCase());
+                Optional<EntityType<?>> entityType = EntityType.get(entityKey.toLowerCase());
                if (entityType.isPresent()) {
-                    int interval = configWrapper.getInt("entity_tick_intervals." + entityKey, entityType.get().updateInterval());
+                    int interval = configWrapper.getInt("entity_tick_intervals." + entityKey, entityType.get().getTrackTickInterval());
                    customTickIntervals.put(entityType.get(), interval);
                }
            } catch (IllegalArgumentException e) {
@@ -44,6 +43,6 @@ public class EntityTickManager {
    }

    public static int getCustomUpdateInterval(EntityType<?> entityType) {
-        return customTickIntervals.getOrDefault(entityType, entityType.updateInterval());
+        return customTickIntervals.getOrDefault(entityType, entityType.getTrackTickInterval());
    }
 }
@@ -5,24 +5,24 @@ import me.caseload.knockbacksync.listener.PlayerDamageListener;
 import me.caseload.knockbacksync.player.FabricPlayer;
 import me.caseload.knockbacksync.player.PlatformPlayer;
 import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;

 public class FabricPlayerDamageListener extends PlayerDamageListener {

    public void register() {
        AttackEntityCallback.EVENT.register((player, world, hand, entity, source) -> {
-            onPlayerDamage((ServerPlayer) player, entity);
-            return InteractionResult.PASS;
+            onPlayerDamage((ServerPlayerEntity) player, entity);
+            return ActionResult.PASS;
        });
    }

-    private void onPlayerDamage(ServerPlayer attacker, Entity victimEntity) {
-        if (victimEntity instanceof Player victim) {
+    private void onPlayerDamage(ServerPlayerEntity attacker, Entity victimEntity) {
+        if (victimEntity instanceof PlayerEntity victim) {
            PlatformPlayer platformAttacker = new FabricPlayer(attacker);
-            PlatformPlayer platformVictim = new FabricPlayer((ServerPlayer) victim);
+            PlatformPlayer platformVictim = new FabricPlayer((ServerPlayerEntity) victim);
            super.onPlayerDamage(platformVictim, platformAttacker); // Call the shared method
        }
    }
@@ -1,17 +0,0 @@
-package me.caseload.knockbacksync.listener.fabric;
-
-import me.caseload.knockbacksync.listener.PlayerJoinQuitListener;
-import me.caseload.knockbacksync.player.FabricPlayer;
-import me.caseload.knockbacksync.player.PlayerData;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-
-public class FabricPlayerJoinQuitListener extends PlayerJoinQuitListener {
-    public void register() {
-        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
-            onPlayerJoin(new PlayerData(new FabricPlayer(handler.player)));
-        });
-        ServerPlayConnectionEvents.DISCONNECT.register(((handler, server) -> {
-            onPlayerQuit(handler.player.getUUID());
-        }));
-    }
-}
@@ -4,27 +4,27 @@ import com.github.retrooper.packetevents.util.Vector3d;
 import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
 import me.caseload.knockbacksync.listener.PlayerKnockbackListener;
 import me.caseload.knockbacksync.player.FabricPlayer;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageTypes;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.damage.DamageTypes;
+import net.minecraft.util.ActionResult;

 public class FabricPlayerKnockbackListener extends PlayerKnockbackListener {

    public void register() {
        PlayerVelocityEvent.EVENT.register((player, velocity) -> {
-            DamageSource lastDamageSource = player.getLastDamageSource();
+            DamageSource lastDamageSource = player.getRecentDamageSource();
            if (lastDamageSource == null)
-                return InteractionResult.PASS;
+                return ActionResult.PASS;

            // Check if the damage is from a player attack
-            if (!lastDamageSource.is(DamageTypes.PLAYER_ATTACK))
-                return InteractionResult.PASS;
+            if (!lastDamageSource.isOf(DamageTypes.PLAYER_ATTACK))
+                return ActionResult.PASS;

            onPlayerVelocity(new FabricPlayer(player), new Vector3d(velocity.x, velocity.y, velocity.z));
            // This SHOULD mean we return original velocity for Fabric (no modification here)
            // But since we set it ourselves due to following bukkit's design patterns and doing victim
            // We return a pass so velocity isn't set twice
-            return InteractionResult.PASS;
+            return ActionResult.PASS;
        });
    }
 }
@@ -1,13 +1,14 @@
 package me.caseload.knockbacksync.listener.fabric;

+import me.caseload.knockbacksync.Base;
+import me.caseload.knockbacksync.FabricBase;
 import me.caseload.knockbacksync.callback.TickRateChangeEvent;
-import me.caseload.knockbacksync.player.PlayerData;

 public class FabricTickRateChangeListener {
    public void register() {
        TickRateChangeEvent.EVENT.register((oldTickRate, newTickRate) -> {
            if (oldTickRate != newTickRate) {
-                PlayerData.TICK_RATE = newTickRate;
+                ((FabricBase) Base.INSTANCE).setTickRate(newTickRate);
            }
        });
    }
@@ -1,16 +1,16 @@
 package me.caseload.knockbacksync.mixin;

 import me.caseload.knockbacksync.entity.EntityTickManager;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.world.entity.EntityType;
+import net.minecraft.entity.EntityType;
+import net.minecraft.server.world.ServerChunkLoadingManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;

-@Mixin(ChunkMap.class)
+@Mixin(ServerChunkLoadingManager.class)
 public abstract class ChunkMapMixin {

-    @Redirect(method = "addEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/EntityType;updateInterval()I"))
+    @Redirect(method = "loadEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/EntityType;getTrackTickInterval()I"))
    private int getCustomUpdateInterval(EntityType<?> entityType) {
        return EntityTickManager.getCustomUpdateInterval(entityType);
    }
@@ -1,86 +0,0 @@
-//package me.caseload.knockbacksync.mixin;
-//
-//import me.caseload.knockbacksync.ConfigWrapper;
-//import me.caseload.knockbacksync.KnockbackSyncBase;
-//import me.caseload.knockbacksync.event.ConfigReloadEvent;
-//import me.caseload.knockbacksync.event.KBSyncEventHandler;
-//import me.caseload.knockbacksync.util.CustomUpdateIntervals;
-//import net.minecraft.Util;
-//import net.minecraft.server.level.ChunkMap;
-//import net.minecraft.server.level.ServerLevel;
-//import net.minecraft.server.level.ServerPlayer;
-//import net.minecraft.world.entity.Entity;
-//import net.minecraft.world.entity.EntityType;
-//import net.minecraft.world.entity.boss.EnderDragonPart;
-//import org.spongepowered.asm.mixin.Final;
-//import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.Shadow;
-//import org.spongepowered.asm.mixin.injection.At;
-//import org.spongepowered.asm.mixin.injection.Inject;
-//import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Mixin(ChunkMap.class)
-//public class ChunkMapMixin {
-//
-//    @Shadow @Final
-//    private Map<Integer, ChunkMap.TrackedEntity> entityMap;
-//    @Shadow @Final private ServerLevel level;
-//
-//    @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
-//    private void onAddEntity(Entity entity, CallbackInfo ci) {
-//        if (!(entity instanceof EnderDragonPart)) {
-//            EntityType<?> entityType = entity.getType();
-//            int trackingRange = entityType.clientTrackingRange() * 16;
-//
-//            if (trackingRange != 0) {
-//                String entityTypeName = entityType.builtInRegistryHolder().getRegisteredName();
-//                ConfigWrapper config = KnockbackSyncBase.INSTANCE.getConfigManager().getConfigWrapper();
-//
-//                int defaultInterval = entityType.updateInterval();
-//                int customInterval = config.getInt("entity_update_intervals." + entityTypeName, defaultInterval);
-//
-//                if (this.entityMap.containsKey(entity.getId())) {
-//                    throw (IllegalStateException) Util.pauseInIde(new IllegalStateException("Entity is already tracked!"));
-//                } else {
-//                    ChunkMap.TrackedEntity trackedEntity = new ChunkMap.TrackedEntity(entity, trackingRange, customInterval, entityType.trackDeltas());
-//                    this.entityMap.put(entity.getId(), trackedEntity);
-//                    trackedEntity.updatePlayers(this.level.players());
-//
-//                    if (entity instanceof ServerPlayer serverPlayer) {
-//                        this.updatePlayerStatus(serverPlayer, true);
-//
-//                        for (ChunkMap.TrackedEntity trackedEntity2 : this.entityMap.values()) {
-//                            if (trackedEntity2.entity != serverPlayer) {
-//                                trackedEntity2.updatePlayer(serverPlayer);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//
-//        ci.cancel();
-//    }
-//
-//    @Shadow
-//    private void updatePlayerStatus(ServerPlayer player, boolean track) {
-//        // This is a shadow method, implementation is provided by Minecraft
-//    }
-//
-//    @KBSyncEventHandler
-//    public void onConfigReload(ConfigReloadEvent event) {
-//        Map<String, Integer> newIntervals = CustomUpdateIntervals.loadEntityIntervalsFromConfig();
-//
-//        for (ChunkMap.TrackedEntity trackedEntity : this.entityMap.values()) {
-//            Entity entity = trackedEntity.entity;
-//            String entityTypeName = entity.getType().builtInRegistryHolder().getRegisteredName();
-//            int newInterval = newIntervals.getOrDefault(entityTypeName, entity.getType().updateInterval());
-//
-//            // Assuming TrackedEntity has a method to update its update interval
-//            trackedEntity.setUpdateInterval(newInterval);
-//        }
-//    }
-//}
@@ -1,14 +0,0 @@
-package me.caseload.knockbacksync.mixin;
-
-import net.minecraft.commands.CommandSource;
-import net.minecraft.commands.CommandSourceStack;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(CommandSourceStack.class)
-public interface CommandStackSourceAccessor {
-
-    @Accessor("source")
-    CommandSource getSource();
-
-}
@@ -0,0 +1,59 @@
+package me.caseload.knockbacksync.mixin;
+
+import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.network.EntityTrackerEntry;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.Vec3d;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityTrackerEntry.class)
+public class EntityTrackerEntryMixin {
+
+    @Shadow @Final private Entity entity;
+
+    // We inject exactly where 'this.entity.knockedBack = false' is about to happen.
+    @Inject(method = "tick",
+            at = @At(value = "FIELD",
+                    target = "Lnet/minecraft/entity/Entity;knockedBack:Z",
+                    opcode = Opcodes.PUTFIELD),
+            cancellable = true)
+    private void onKnockbackSync(CallbackInfo ci) {
+        // This check ensures we are in the "if (entity.knockedBack)" block
+        // and operating on a Player.
+        if (this.entity instanceof ServerPlayerEntity serverPlayer) {
+
+            // 1. Capture the velocity CURRENTLY on the player
+            Vec3d currentVelocity = serverPlayer.getVelocity();
+
+            // 2. Fire the event
+            ActionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(serverPlayer, currentVelocity);
+
+            if (result == ActionResult.FAIL) {
+                // CASE: CANCELLED
+                // We want to STOP the packet from sending.
+                // We also want to keep 'knockedBack' as true (technically),
+                // effectively acting like the block never happened.
+                ci.cancel();
+            }
+            else if (result == ActionResult.SUCCESS) {
+                // CASE: MODIFIED
+                // The event handler has already updated the player's velocity:
+                // player.setVelocity(newVel);
+
+                // We do NOT cancel. We let Vanilla proceed.
+                // Vanilla will:
+                // 1. Set knockedBack = false;
+                // 2. Create a NEW packet reading the current velocity (which is now your custom velocity).
+                // 3. Send it.
+            }
+        }
+    }
+}
@@ -1,37 +1,63 @@
 package me.caseload.knockbacksync.mixin;

 import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
-import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-@Mixin(Player.class)
+@Mixin(PlayerEntity.class)
 public class PlayerMixin {

-    @Inject(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/game/ClientboundSetEntityMotionPacket;<init>(Lnet/minecraft/world/entity/Entity;)V"), cancellable = true)
-    private void onAttack(Entity target, CallbackInfo ci) {
-        if (target instanceof ServerPlayer serverPlayer && target.hurtMarked) {
-            Vec3 velocity = target.getDeltaMovement();
+    @Inject(method = "knockbackTarget",
+            at = @At(value = "INVOKE",
+                    target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"),
+            cancellable = true)
+    private void onKnockback(Entity target, float strength, Vec3d playerTargetVelocity, CallbackInfo ci) {
+        if (target instanceof ServerPlayerEntity serverPlayer && target.knockedBack) {

-            InteractionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(serverPlayer, velocity);
+            // 1. Get the "Proposed" Velocity (The knockback calculated lines above)
+            Vec3d proposedVelocity = target.getVelocity();

-            if (result == InteractionResult.FAIL) {
-                target.hurtMarked = false;
-                ci.cancel(); // Prevent sending the velocity packet
-            } else if (result == InteractionResult.SUCCESS) {
-                // Currently unnecessary since we do this in the handler, will move later
-                target.setDeltaMovement(velocity);
-                serverPlayer.connection.send(new ClientboundSetEntityMotionPacket(target));
-                target.hurtMarked = false;
-                ci.cancel(); // Prevent sending the original velocity packet
+            // 2. Fire the Event
+            ActionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(serverPlayer, proposedVelocity);
+
+            if (result == ActionResult.FAIL) {
+                // --- REPLICATING PAPER: CANCELLED ---
+                // In Paper: if (event.isCancelled()) { cancelled = true; }
+                // In Paper: if (!cancelled) { sendPacket; cleanup; }
+
+                // So, if cancelled, we stop EVERYTHING. We do not send packet, we do not reset velocity.
+                ci.cancel();
+                return;
            }
+
+            if (result == ActionResult.SUCCESS) {
+                // --- REPLICATING PAPER: MODIFIED ---
+                // In Paper: if (!velocity.equals(event.getVelocity())) { player.setVelocity(...) }
+                // In Paper: if (!cancelled) { sendPacket; setDeltaMovement(currentMovement); }
+
+                // 1. The event listener should have already set the new velocity on the entity.
+                // 2. We must send a NEW packet (because the one on the stack is old).
+                serverPlayer.networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(target));
+
+                // 3. Replicate the Cleanup: Paper resets velocity to 'currentMovement' (playerTargetVelocity)
+                // This prevents the server from thinking the player is flying, maintaining Client Authority.
+                target.knockedBack = false;
+                target.setVelocity(playerTargetVelocity);
+
+                // 4. Cancel the original logic so Vanilla doesn't send the old packet or do double cleanup.
+                ci.cancel();
+            }
+
+            // CASE: PASS
+            // Vanilla behaves normally (Sends packet, does cleanup).
        }
    }
-}
+}
@@ -1,59 +0,0 @@
-package me.caseload.knockbacksync.mixin;
-
-import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.Vec3;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ServerEntity.class)
-public class ServerEntityMixin {
-
-    @Shadow
-    @Final
-    private Entity entity;
-
-    // Velocity event
-    @Inject(method = "sendChanges", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/Entity;hurtMarked:Z", ordinal = 1), cancellable = true)
-    private void onSendChanges(CallbackInfo ci) {
-        if (this.entity.hurtMarked && this.entity instanceof ServerPlayer player) {
-            Vec3 velocity = player.getDeltaMovement();
-
-            InteractionResult result = PlayerVelocityEvent.EVENT.invoker().onVelocityChange(player, velocity);
-
-            if (result == InteractionResult.FAIL) {
-                this.entity.hurtMarked = false;
-                ci.cancel();
-            } else if (result == InteractionResult.SUCCESS) {
-                // Currently unnecessary since we do this in the handler, will move later
-                player.setDeltaMovement(velocity);
-            }
-        }
-    }
-
-    // Custom tick intervals
-//    @Shadow
-//    private int updateInterval;
-
-//    @Accessor("entity")
-//    Entity getEntity() {
-//        return null;
-//    }
-
-//    @Invoker("sendChanges")
-//    void invokeSendChanges() {
-//
-//    }
-
-//    @Override
-//    public void setUpdateInterval(int interval) {
-//        this.updateInterval = interval;
-//    }
-}
@@ -1,22 +1,21 @@
 package me.caseload.knockbacksync.mixin;

 import me.caseload.knockbacksync.callback.TickRateChangeEvent;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.TickRateManager;
+import net.minecraft.world.tick.TickManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-@Mixin(TickRateManager.class)
+@Mixin(TickManager.class)
 public class TickRateManagerMixin {
    @Shadow
-    protected float tickrate;
+    protected float tickRate;

    @Inject(method = "setTickRate", at = @At("HEAD"))
    private void onSetTickRate(float tickRate, CallbackInfo ci) {
-        float oldTickRate = this.tickrate;
+        float oldTickRate = this.tickRate;
        TickRateChangeEvent.EVENT.invoker().onTickRateChange(oldTickRate, tickRate);
    }
 }
@@ -1,41 +0,0 @@
-//package me.caseload.knockbacksync.mixin;
-//
-//import me.caseload.knockbacksync.ConfigWrapper;
-//import me.caseload.knockbacksync.KnockbackSyncBase;
-//import net.minecraft.core.SectionPos;
-//import net.minecraft.server.level.ChunkMap;
-//import net.minecraft.server.level.ServerEntity;
-//import net.minecraft.world.entity.Entity;
-//import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.Shadow;
-//import org.spongepowered.asm.mixin.gen.Accessor;
-//import org.spongepowered.asm.mixin.injection.At;
-//import org.spongepowered.asm.mixin.injection.Inject;
-//import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-//
-//@Mixin(ChunkMap.TrackedEntity.class)
-//public class TrackedEntityMixin {
-//    @Shadow
-//    ServerEntity serverEntity;
-//    Entity entity;
-//    int range;
-//    SectionPos lastSectionPos;
-//
-//    @Inject(method = "<init>", at = @At("HEAD"))
-//    private void onInit(ChunkMap outer, Entity entity, int range, int updateInterval, boolean trackDelta, CallbackInfo ci) {
-//
-//        String entityTypeName = entity.getType().builtInRegistryHolder().getRegisteredName();
-//        ConfigWrapper config = KnockbackSyncBase.INSTANCE.getConfigManager().getConfigWrapper();
-//        int customInterval = config.getInt("entity_update_intervals." + entityTypeName, updateInterval);
-//
-//        this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, customInterval, trackDelta, this::broadcast);
-//        this.entity = entity;
-//        this.range = range;
-//        this.lastSectionPos = SectionPos.of(entity);
-//    }
-//
-////    @Accessor("updateInterval")
-////    public void setUpdateInterval(int interval) {
-//        // This method will be implemented by the mixin system
-////    }
-//}
@@ -4,21 +4,21 @@ import me.caseload.knockbacksync.player.FabricPlayer;
 import me.caseload.knockbacksync.player.PlatformPlayer;
 import me.caseload.knockbacksync.sender.Sender;
 import me.lucko.fabric.api.permissions.v0.Permissions;
-import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.command.ServerCommandSource;

 public class FabricPermissionChecker implements PermissionChecker {

-    public boolean hasPermission(CommandSourceStack source, String permission) {
+    public boolean hasPermission(ServerCommandSource source, String permission) {
        return Permissions.check(source, permission, false);
    }

-    public boolean hasPermission(CommandSourceStack source, String permission, boolean defaultIfUnset) {
+    public boolean hasPermission(ServerCommandSource source, String permission, boolean defaultIfUnset) {
        return Permissions.check(source, permission, defaultIfUnset);
    }

    @Override
    public boolean hasPermission(Object nativeType, String s, boolean defaultIfUnset) {
-        if (nativeType instanceof CommandSourceStack commandSourceStack) {
+        if (nativeType instanceof ServerCommandSource commandSourceStack) {
            return Permissions.check(commandSourceStack, s, defaultIfUnset);
        }
        throw new IllegalArgumentException();
@@ -1,22 +1,26 @@
 package me.caseload.knockbacksync.player;

+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.BoundingBox;
-import com.github.retrooper.packetevents.protocol.world.Location;
 import com.github.retrooper.packetevents.util.Vector3d;
+import com.google.common.base.Preconditions;
 import me.caseload.knockbacksync.world.FabricWorld;
 import me.caseload.knockbacksync.world.PlatformWorld;
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.item.enchantment.Enchantments;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.registry.BuiltinRegistries;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -24,15 +28,20 @@ import java.util.Optional;
 import java.util.UUID;

 public class FabricPlayer implements PlatformPlayer {
-    public final ServerPlayer fabricPlayer;
+    public final ServerPlayerEntity fabricPlayer;
+    public final User user;

-    public FabricPlayer(ServerPlayer player) {
+    private String clientBrand = "vanilla";
+
+    public FabricPlayer(ServerPlayerEntity player) {
+        Preconditions.checkArgument(player != null);
        this.fabricPlayer = player;
+        this.user = PacketEvents.getAPI().getPlayerManager().getUser(fabricPlayer);
    }

    @Override
    public UUID getUUID() {
-        return fabricPlayer.getUUID();
+        return fabricPlayer.getUuid();
    }

    @Override
@@ -57,32 +66,32 @@ public class FabricPlayer implements PlatformPlayer {

    @Override
    public float getPitch() {
-        return fabricPlayer.getXRot();
+        return fabricPlayer.getPitch();
    }

    @Override
    public float getYaw() {
-        return fabricPlayer.getYRot();
+        return fabricPlayer.getYaw();
    }

    @Override
    public boolean isOnGround() {
-        return fabricPlayer.onGround();
+        return fabricPlayer.isOnGround();
    }

    @Override
    public int getPing() {
-        return fabricPlayer.connection.latency();
+        return fabricPlayer.networkHandler.getLatency();
    }

    @Override
    public boolean isGliding() {
-        return fabricPlayer.isFallFlying();
+        return fabricPlayer.isGliding();
    }

    @Override
    public PlatformWorld getWorld() {
-        return new FabricWorld(fabricPlayer.level());
+        return new FabricWorld(fabricPlayer.getEntityWorld());
    }

    @Override
@@ -92,13 +101,13 @@ public class FabricPlayer implements PlatformPlayer {

    @Override
    public void sendMessage(@NotNull String s) {
-        fabricPlayer.sendSystemMessage(Component.literal(s));
+        fabricPlayer.sendMessage(Text.literal(s));
    }

    @Override
    public double getAttackCooldown() {
        // this is what paper does I have no idea how this works
-        return fabricPlayer.getAttackStrengthScale(0.5f);
+        return fabricPlayer.getAttackCooldownProgress(0.5f);
    }

    @Override
@@ -108,37 +117,33 @@ public class FabricPlayer implements PlatformPlayer {

    @Override
    public int getMainHandKnockbackLevel() {
-        Optional<Holder.Reference<Enchantment>>
-                entry = VanillaRegistries.createLookup().asGetterLookup().get(
-                Registries.ENCHANTMENT, Enchantments.KNOCKBACK
-        );
-        Holder<Enchantment> registryEntry1 = entry.orElseThrow(); // Reference implements RegistryEntry, this is fine
-        return EnchantmentHelper.getItemEnchantmentLevel(registryEntry1, fabricPlayer.getMainHandItem());
+        RegistryEntry<Enchantment> knockbackEntry = fabricPlayer.getEntityWorld().getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(Enchantments.KNOCKBACK);
+        return EnchantmentHelper.getLevel(knockbackEntry, fabricPlayer.getMainHandStack());
    }

    @Override
    public @Nullable Integer getNoDamageTicks() {
-        return fabricPlayer.invulnerableTime;
+        return fabricPlayer.timeUntilRegen;
    }

    @Override
    public void setVelocity(Vector3d adjustedVelocity) {
-        fabricPlayer.setDeltaMovement(adjustedVelocity.x, adjustedVelocity.y, adjustedVelocity.z);
+        fabricPlayer.setVelocity(adjustedVelocity.x, adjustedVelocity.y, adjustedVelocity.z);
        // TODO
        // fix paper-ism? for some reason setVelocity() in paper marks the entity as hurt marked every time its called?
-        fabricPlayer.hurtMarked = true;
+        fabricPlayer.velocityDirty = true;
    }

    @Override
    public Vector3d getVelocity() {
-        final Vec3 fabricVelocity = fabricPlayer.getDeltaMovement();
+        final Vec3d fabricVelocity = fabricPlayer.getVelocity();
        return new Vector3d(fabricVelocity.x, fabricVelocity.y, fabricVelocity.z);
    }

    @Override
    public double getJumpPower() {
        double jumpVelocity = 0.42;
-        MobEffectInstance jumpEffect = fabricPlayer.getEffect(MobEffects.JUMP);
+        StatusEffectInstance jumpEffect = fabricPlayer.getStatusEffect(StatusEffects.JUMP_BOOST);
        if (jumpEffect != null) {
            int amplifier = jumpEffect.getAmplifier();
            jumpVelocity += (amplifier + 1) * 0.1F;
@@ -148,9 +153,22 @@ public class FabricPlayer implements PlatformPlayer {
    }
    @Override
    public BoundingBox getBoundingBox() {
-        AABB boundingBox = fabricPlayer.getBoundingBox();
+        Box boundingBox = fabricPlayer.getBoundingBox();
        return new BoundingBox(boundingBox.minX, boundingBox.minY, boundingBox.minZ, boundingBox.maxX, boundingBox.minY, boundingBox.maxZ);
    }

-    // Implement other methods
+    @Override
+    public @Nullable User getUser() {
+        return user;
+    }
+
+    @Override
+    public void setClientBrand(String brand) {
+        this.clientBrand = brand;
+    }
+
+    @Override
+    public String getClientBrand() {
+        return this.clientBrand;
+    }
 }
@@ -19,10 +19,10 @@ public class FabricSchedulerAdapter implements SchedulerAdapter {
        Iterator<ScheduledTask> iterator = taskMap.keySet().iterator();
        while (iterator.hasNext()) {
            ScheduledTask task = iterator.next();
-            if (server.getTickCount() >= task.nextRunTick) {
+            if (server.getTicks() >= task.nextRunTick) {
                task.task.run();
                if (task.isPeriodic) {
-                    task.nextRunTick = server.getTickCount() + task.period;
+                    task.nextRunTick = server.getTicks() + task.period;
                } else {
                    iterator.remove();
                }
@@ -32,7 +32,7 @@ public class FabricSchedulerAdapter implements SchedulerAdapter {

    @Override
    public AbstractTaskHandle runTask(Runnable task) {
-        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTickCount(), 0, false);
+        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks(), 0, false);
        Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
        taskMap.put(scheduledTask, cancellationTask);
        return new FabricTaskHandle(cancellationTask);
@@ -52,7 +52,7 @@ public class FabricSchedulerAdapter implements SchedulerAdapter {

    @Override
    public AbstractTaskHandle runTaskLater(Runnable task, long delayTicks) {
-        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTickCount() + delayTicks, 0, false);
+        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, 0, false);
        Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
        taskMap.put(scheduledTask, cancellationTask);
        return new FabricTaskHandle(cancellationTask);
@@ -60,7 +60,7 @@ public class FabricSchedulerAdapter implements SchedulerAdapter {

    @Override
    public AbstractTaskHandle runTaskTimer(Runnable task, long delayTicks, long periodTicks) {
-        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTickCount() + delayTicks, periodTicks, true);
+        ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, periodTicks, true);
        Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
        taskMap.put(scheduledTask, cancellationTask);
        return new FabricTaskHandle(cancellationTask);
@@ -2,18 +2,17 @@ package me.caseload.knockbacksync.sender;

 import me.caseload.knockbacksync.FabricBase;
 import me.caseload.knockbacksync.Base;
-import me.caseload.knockbacksync.mixin.CommandStackSourceAccessor;
 import me.caseload.knockbacksync.permission.FabricPermissionChecker;
-import net.minecraft.commands.CommandSource;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.rcon.RconConsoleSource;
+import net.minecraft.server.command.CommandOutput;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.rcon.RconCommandOutput;
+import net.minecraft.text.Text;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.SenderMapper;

 import java.util.UUID;

-public class FabricSenderFactory extends SenderFactory<FabricBase, CommandSourceStack> implements SenderMapper<CommandSourceStack, Sender> {
+public class FabricSenderFactory extends SenderFactory<FabricBase, ServerCommandSource> implements SenderMapper<ServerCommandSource, Sender> {
    private final FabricBase plugin;

    public FabricSenderFactory(FabricBase kbSyncFabricBase) {
@@ -27,16 +26,16 @@ public class FabricSenderFactory extends SenderFactory<FabricBase, CommandSource
    }

    @Override
-    protected UUID getUniqueId(CommandSourceStack commandSource) {
+    protected UUID getUniqueId(ServerCommandSource commandSource) {
        if (commandSource.getEntity() != null) {
-            return commandSource.getEntity().getUUID();
+            return commandSource.getEntity().getUuid();
        }
        return Sender.CONSOLE_UUID;
    }

    @Override
-    protected String getName(CommandSourceStack commandSource) {
-        String name = commandSource.getTextName();
+    protected String getName(ServerCommandSource commandSource) {
+        String name = commandSource.getName();
        if (commandSource.getEntity() != null && name.equals("Server")) {
            return Sender.CONSOLE_NAME;
        }
@@ -44,7 +43,7 @@ public class FabricSenderFactory extends SenderFactory<FabricBase, CommandSource
    }

    @Override
-    protected void sendMessage(CommandSourceStack sender, String message) {
+    protected void sendMessage(ServerCommandSource sender, String message) {
 //        final Locale locale;
 //        if (sender.getEntity() instanceof ServerPlayer) {
 //            String language = ((ServerPlayer) sender.getEntity()).clientInformation().language();
@@ -53,39 +52,39 @@ public class FabricSenderFactory extends SenderFactory<FabricBase, CommandSource
 //            locale = null;
 //        }
 //        sender.sendFeedback(() -> toNativeText(TranslationManager.render(message, locale)), false);
-        sender.sendSuccess(() -> Component.literal(message), false);
+        sender.sendFeedback(() -> Text.literal(message), false);
    }

    @Override
-    protected boolean hasPermission(CommandSourceStack commandSource, String node) {
+    protected boolean hasPermission(ServerCommandSource commandSource, String node) {
        return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node);
    }

    @Override
-    protected boolean hasPermission(CommandSourceStack commandSource, String node, boolean defaultIfUnset) {
+    protected boolean hasPermission(ServerCommandSource commandSource, String node, boolean defaultIfUnset) {
        return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node, defaultIfUnset);
    }

    @Override
-    protected void performCommand(CommandSourceStack sender, String command) {
+    protected void performCommand(ServerCommandSource sender, String command) {
 //        sender.getServer().getCommandManager().executeWithPrefix(sender, command);
    }

    @Override
-    protected boolean isConsole(CommandSourceStack sender) {
-        CommandSource output = ((CommandStackSourceAccessor) sender).getSource();
+    protected boolean isConsole(ServerCommandSource sender) {
+        CommandOutput output = sender.output;
        return output == sender.getServer() || // Console
-                output.getClass() == RconConsoleSource.class || // Rcon
-                (output == CommandSource.NULL && sender.getTextName().equals("")); // Functions
+                output.getClass() == RconCommandOutput.class || // Rcon
+                (output == CommandOutput.DUMMY && sender.getName().equals("")); // Functions
    }

    @Override
-    public @NonNull Sender map(@NonNull CommandSourceStack base) {
+    public @NonNull Sender map(@NonNull ServerCommandSource base) {
        return this.wrap(base);
    }

    @Override
-    public @NonNull CommandSourceStack reverse(@NonNull Sender mapped) {
+    public @NonNull ServerCommandSource reverse(@NonNull Sender mapped) {
        return this.unwrap(mapped);
    }

@@ -1,97 +0,0 @@
-package me.caseload.knockbacksync.stats.custom;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import net.fabricmc.loader.api.FabricLoader;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public class BStatsConfig {
-    private static final String HEADER = """
-            # bStats (https://bStats.org) collects some basic information for plugin authors, like how
-            # many people use their plugin and their total player count. It's recommended to keep bStats
-            # enabled, but if you're not comfortable with this, you can turn this setting off. There is no
-            # performance penalty associated with having metrics enabled, and data sent to bStats is fully
-            # anonymous.
-            """;
-
-    public static Config loadConfig() {
-        File bStatsFolder = new File(FabricLoader.getInstance().getConfigDir().toString(), "bStats");
-        File configFile = new File(bStatsFolder, "config.yml");
-
-        DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        options.setPrettyFlow(true);
-        Yaml yaml = new Yaml(options);
-
-        Map<String, Object> data;
-        Config config = new Config();
-
-        try {
-            if (!configFile.exists()) {
-                bStatsFolder.mkdirs();
-
-                // Create default config
-                data = new LinkedHashMap<>();
-                data.put("enabled", true);
-                data.put("serverUuid", UUID.randomUUID().toString());
-                data.put("logFailedRequests", false);
-                data.put("logSentData", false);
-                data.put("logResponseStatusText", false);
-
-                // Write config with header
-                try (Writer writer = new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8)) {
-                    writer.write(HEADER);
-                    yaml.dump(data, writer);
-                }
-            } else {
-                // Load existing config
-                data = yaml.load(new FileInputStream(configFile));
-                if (data == null) {
-                    data = new LinkedHashMap<>();
-                }
-            }
-
-            // Map the data to Config object
-            config.enabled = getBoolean(data, "enabled", true);
-            config.serverUuid = getString(data, "serverUuid", UUID.randomUUID().toString());
-            config.logFailedRequests = getBoolean(data, "logFailedRequests", false);
-            config.logSentData = getBoolean(data, "logSentData", false);
-            config.logResponseStatusText = getBoolean(data, "logResponseStatusText", false);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-            // Fallback to default values
-            config.enabled = true;
-            config.serverUuid = UUID.randomUUID().toString();
-            config.logFailedRequests = false;
-            config.logSentData = false;
-            config.logResponseStatusText = false;
-        }
-
-        return config;
-    }
-
-    private static boolean getBoolean(Map<String, Object> map, String key, boolean defaultValue) {
-        Object value = map.get(key);
-        return value instanceof Boolean ? (Boolean) value : defaultValue;
-    }
-
-    private static String getString(Map<String, Object> map, String key, String defaultValue) {
-        Object value = map.get(key);
-        return value instanceof String ? (String) value : defaultValue;
-    }
-
-    // Your existing Config class
-    public static class Config {
-        public boolean enabled = true;
-        public String serverUuid;
-        public boolean logFailedRequests = false;
-        public boolean logSentData = false;
-        public boolean logResponseStatusText = false;
-    }
-}
@@ -3,14 +3,12 @@ package me.caseload.knockbacksync.stats.custom;
 import me.caseload.knockbacksync.Base;

 public class FabricStatsManager extends StatsManager {
+    public FabricStatsManager() {
+        super(null);
+    }
+
    @Override
    public void init() {
-        Base.INSTANCE.getScheduler().runTaskAsynchronously(() -> {
-            BuildTypePie.determineBuildType(); // Function to calculate hash
-            MetricsFabric metrics = new MetricsFabric(23568);
-            metrics.addCustomChart(new PlayerVersionsPie());
-            metrics.addCustomChart(new BuildTypePie());
-            super.metrics = metrics;
-        });
+        // no op remove bstats
    }
 }
@@ -1,111 +0,0 @@
-package me.caseload.knockbacksync.stats.custom;
-
-/*
- * This Metrics class was auto-generated and can be copied into your project if you are
- * not using a build tool like Gradle or Maven for dependency management.
- *
- * IMPORTANT: You are not allowed to modify this class, except changing the package.
- *
- * Disallowed modifications include but are not limited to:
- *  - Remove the option for users to opt-out
- *  - Change the frequency for data submission
- *  - Obfuscate the code (every obfuscator should allow you to make an exception for specific files)
- *  - Reformat the code (if you use a linter, add an exception)
- *
- * Violations will result in a ban of your plugin and account from bStats.
- */
-
-import me.caseload.knockbacksync.FabricLoaderMod;
-import me.caseload.knockbacksync.Base;
-import me.caseload.knockbacksync.stats.CustomChart;
-import me.caseload.knockbacksync.stats.JsonObjectBuilder;
-import net.fabricmc.loader.api.FabricLoader;
-
-import java.util.logging.Level;
-
-public class MetricsFabric implements Metrics {
-
-    private final MetricsBase metricsBase;
-
-    /**
-     * Creates a new Metrics instance.
-     *
-     * @param serviceId The id of the service. It can be found at <a
-     *                  href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
-     */
-    public MetricsFabric(int serviceId) {
-        // Get the config file
-        BStatsConfig.Config config = BStatsConfig.loadConfig();
-
-        // Load the data
-        boolean enabled = config.enabled;
-        String serverUUID = config.serverUuid;
-        boolean logErrors = config.logFailedRequests;
-        boolean logSentData = config.logSentData;
-        boolean logResponseStatusText = config.logResponseStatusText;
-
-        metricsBase =
-                new // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        // See https://github.com/Bastian/bstats-metrics/pull/126
-                        MetricsBase(
-                        "fabric",
-                        serverUUID,
-                        serviceId,
-                        enabled,
-                        this::appendPlatformData,
-                        this::appendServiceData,
-                        submitDataTask -> Base.INSTANCE.getScheduler().runTask(submitDataTask),
-                        () -> true,
-                        (message, error) -> Base.INSTANCE.getLogger().log(Level.WARNING, message, error),
-                        (message) -> Base.INSTANCE.getLogger().log(Level.INFO, message),
-                        logErrors,
-                        logSentData,
-                        logResponseStatusText,
-                        false);
-    }
-
-    /**
-     * Shuts down the underlying scheduler service.
-     */
-    public void shutdown() {
-        metricsBase.shutdown();
-    }
-
-    /**
-     * Adds a custom chart.
-     *
-     * @param chart The chart to add.
-     */
-    public void addCustomChart(CustomChart chart) {
-        metricsBase.addCustomChart(chart);
-    }
-
-    private void appendPlatformData(JsonObjectBuilder builder) {
-        builder.appendField("playerAmount", getPlayerAmount());
-        builder.appendField("onlineMode", FabricLoaderMod.getServer().usesAuthentication() ? 0 : 1);
-        builder.appendField("bukkitVersion", "Fabric " + FabricLoader.getInstance().getModContainer("fabricloader").get().getMetadata().getVersion().getFriendlyString() + " (MC: " + FabricLoaderMod.getServer().getServerVersion() + ")");
-        builder.appendField("bukkitName", "Fabric");
-        builder.appendField("javaVersion", System.getProperty("java.version"));
-        builder.appendField("osName", System.getProperty("os.name"));
-        builder.appendField("osArch", System.getProperty("os.arch"));
-        builder.appendField("osVersion", System.getProperty("os.version"));
-        builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
-    }
-
-    private void appendServiceData(JsonObjectBuilder builder) {
-        builder.appendField("pluginVersion", FabricLoader.getInstance().getModContainer("knockbacksync").get().getMetadata().getVersion().getFriendlyString());
-    }
-
-    private int getPlayerAmount() {
-        if (FabricLoaderMod.getServer().isRunning()) {
-            return FabricLoaderMod.getServer().getPlayerCount();
-        } else {
-            return 0;
-        }
-    }
-}
@@ -1,46 +1,45 @@
 package me.caseload.knockbacksync.util;

 import com.mojang.brigadier.context.CommandContext;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.network.chat.Component;
-
 import java.util.function.Supplier;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;

 public class CommandUtil {

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, String message) {
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message) {
        sendSuccessMessage(context, () -> getComponent(message), false);
    }

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, String message, boolean allowLogging) {
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message, boolean allowLogging) {
        sendSuccessMessage(context, () -> getComponent(message), allowLogging);
    }

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, Component message) {
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message) {
        sendSuccessMessage(context, () -> message, false);
    }

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, Component message, boolean allowLogging) {
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message, boolean allowLogging) {
        sendSuccessMessage(context, () -> message, allowLogging);
    }

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, Supplier<Component> messageSupplier) {
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier) {
        sendSuccessMessage(context, messageSupplier, false);
    }

-    public static void sendSuccessMessage(CommandContext<CommandSourceStack> context, Supplier<Component> messageSupplier, boolean allowLogging) {
-        context.getSource().sendSuccess(messageSupplier, allowLogging);
+    public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier, boolean allowLogging) {
+        context.getSource().sendFeedback(messageSupplier, allowLogging);
    }

-    public static void sendFailureMessage(CommandContext<CommandSourceStack> context, String message) {
+    public static void sendFailureMessage(CommandContext<ServerCommandSource> context, String message) {
        sendFailureMessage(context, getComponent(message));
    }

-    public static void sendFailureMessage(CommandContext<CommandSourceStack> context, Component message) {
-        context.getSource().sendFailure(message);
+    public static void sendFailureMessage(CommandContext<ServerCommandSource> context, Text message) {
+        context.getSource().sendError(message);
    }

-    public static Component getComponent(String message) {
-        return Component.literal(message);
+    public static Text getComponent(String message) {
+        return Text.literal(message);
    }
 }
@@ -3,12 +3,10 @@ package me.caseload.knockbacksync.util;
 import me.caseload.knockbacksync.Base;
 import me.caseload.knockbacksync.ConfigWrapper;
 import me.caseload.knockbacksync.mixin.UpdateIntervalAccessor;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerChunkCache;
-import net.minecraft.server.level.ServerEntity;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-
+import net.minecraft.entity.Entity;
+import net.minecraft.server.world.ServerChunkLoadingManager;
+import net.minecraft.server.world.ServerChunkManager;
+import net.minecraft.server.world.ServerWorld;
 import java.util.HashMap;
 import java.util.Map;

@@ -27,11 +25,11 @@ public class CustomUpdateIntervals {
        entityIntervals.clear();
    }

-    public static void updateIntervals(ServerLevel level, Map<String, Integer> entityIntervals) {
-        for (Entity entity : level.getAllEntities()) {
-            String entityType = entity.getType().builtInRegistryHolder().getRegisteredName();
+    public static void updateIntervals(ServerWorld level, Map<String, Integer> entityIntervals) {
+        for (Entity entity : level.iterateEntities()) {
+            String entityType = entity.getType().getRegistryEntry().getIdAsString();
            if (entityIntervals.containsKey(entityType)) {
-                ChunkMap.TrackedEntity serverEntity = ((ServerChunkCache) entity.level().getChunkSource()).chunkMap.entityMap.get(entity.getId());
+                ServerChunkLoadingManager.EntityTracker serverEntity = ((ServerChunkManager) entity.getEntityWorld().getChunkManager()).chunkLoadingManager.entityTrackers.get(entity.getId());
                if (serverEntity != null) {
                    ((UpdateIntervalAccessor) serverEntity).setUpdateInterval(entityIntervals.get(entityType));
                }
@@ -3,21 +3,25 @@ package me.caseload.knockbacksync.world;
 import me.caseload.knockbacksync.FabricLoaderMod;
 import me.caseload.knockbacksync.player.FabricPlayer;
 import me.caseload.knockbacksync.player.PlatformPlayer;
-
+import net.minecraft.server.network.ServerPlayerEntity;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.stream.Collectors;

 public class FabricServer implements PlatformServer {
    public Collection<PlatformPlayer> getOnlinePlayers() {
-        return FabricLoaderMod.getServer().getPlayerList().getPlayers().stream()
+        return FabricLoaderMod.getServer().getPlayerManager().getPlayerList().stream()
                .map(FabricPlayer::new)
                .collect(Collectors.toList());
    }

    @Override
    public PlatformPlayer getPlayer(UUID uuid) {
-        return new FabricPlayer(FabricLoaderMod.getServer().getPlayerList().getPlayer(uuid));
+        return new FabricPlayer(FabricLoaderMod.getServer().getPlayerManager().getPlayer(uuid));
    }

+    @Override
+    public PlatformPlayer getPlayer(Object nativePlatformPlayer) {
+        return new FabricPlayer((ServerPlayerEntity) nativePlatformPlayer);
+    }
 }
@@ -6,28 +6,27 @@ import com.github.retrooper.packetevents.util.Vector3d;
 import com.github.retrooper.packetevents.util.Vector3i;
 import me.caseload.knockbacksync.world.raytrace.FluidHandling;
 import me.caseload.knockbacksync.world.raytrace.RayTraceResult;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RaycastContext;
+import net.minecraft.world.World;

 public class FabricWorld implements PlatformWorld {
-    private final Level world;
+    private final World world;

-    public FabricWorld(Level world) {
+    public FabricWorld(World world) {
        this.world = world;
    }

    @Override
    public WrappedBlockState getBlockStateAt(int x, int y, int z) {
        BlockState blockState = this.world.getBlockState(new BlockPos(x, y, z));
-        return WrappedBlockState.getByGlobalId(Block.BLOCK_STATE_REGISTRY.getId(blockState));
+        return WrappedBlockState.getByGlobalId(Block.STATE_IDS.getRawId(blockState));
    }

    @Override
@@ -37,26 +36,26 @@ public class FabricWorld implements PlatformWorld {

    @Override
    public RayTraceResult rayTraceBlocks(Vector3d start, Vector3d direction, double maxDistance, FluidHandling fluidHandling, boolean ignorePassableBlocks) {
-        Vec3 startVec = new Vec3(start.getX(), start.getY(), start.getZ());
-        Vec3 endVec = startVec.add(direction.getX() * maxDistance, direction.getY() * maxDistance, direction.getZ() * maxDistance);
+        Vec3d startVec = new Vec3d(start.getX(), start.getY(), start.getZ());
+        Vec3d endVec = startVec.add(direction.getX() * maxDistance, direction.getY() * maxDistance, direction.getZ() * maxDistance);

-        BlockHitResult result = world.clip(new ClipContext(
+        BlockHitResult result = world.raycast(new RaycastContext(
                startVec,
                endVec,
-                ClipContext.Block.OUTLINE,
-                fluidHandling == FluidHandling.NONE ? ClipContext.Fluid.NONE :
-                        fluidHandling == FluidHandling.SOURCE_ONLY ? ClipContext.Fluid.SOURCE_ONLY :
-                                ClipContext.Fluid.ANY,
-                CollisionContext.empty()
+                RaycastContext.ShapeType.OUTLINE,
+                fluidHandling == FluidHandling.NONE ? RaycastContext.FluidHandling.NONE :
+                        fluidHandling == FluidHandling.SOURCE_ONLY ? RaycastContext.FluidHandling.SOURCE_ONLY :
+                                RaycastContext.FluidHandling.ANY,
+                ShapeContext.absent()
        ));

        if (result.getType() == HitResult.Type.MISS) return null;

-        Vec3 hitLocation = result.getLocation();
+        Vec3d hitLocation = result.getPos();
        BlockPos blockPos = result.getBlockPos();
        return new RayTraceResult(
                new Vector3d(hitLocation.x, hitLocation.y, hitLocation.z),
-                BlockFace.getBlockFaceByValue(result.getDirection().ordinal()),
+                BlockFace.getBlockFaceByValue(result.getSide().ordinal()),
                new Vector3i(blockPos.getX(), blockPos.getY(), blockPos.getZ()),
                getBlockStateAt(blockPos.getX(), blockPos.getY(), blockPos.getZ())
        );
@@ -10,6 +10,9 @@
  "icon": "assets/knockbacksync/icon.png",
  "environment": "*",
  "entrypoints": {
+    "preLaunch": [
+      "me.caseload.knockbacksync.FabricLoaderMod"
+    ],
    "main": [
      "me.caseload.knockbacksync.FabricLoaderMod"
    ]
@@ -18,9 +21,11 @@
    "knockbacksync.mixins.json"
  ],
  "depends": {
-    "fabricloader": ">=${loader_version}",
-    "fabric": "*",
-    "minecraft": "~${minecraft_version}"
+    "fabricloader": ">=0.15.11",
+    "fabric-lifecycle-events-v1": "*",
+    "fabric-events-interaction-v0": "*",
+    "minecraft": "~${minecraft_version}",
+    "packetevents": "*"
  },
  "accessWidener": "knockbacksync.accesswidener"
 }
@@ -1,6 +1,6 @@
 accessWidener v2 named

-# We don't actually need this right now, but it's useful to keep an access widener around for when we do need one
-accessible field net/minecraft/server/level/ChunkMap entityMap Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-accessible class net/minecraft/server/level/ChunkMap$TrackedEntity
-accessible method net/minecraft/server/level/ChunkMap$TrackedEntity updatePlayers (Ljava/util/List;)V
+accessible field net/minecraft/server/command/ServerCommandSource output Lnet/minecraft/server/command/CommandOutput;
+accessible field net/minecraft/server/world/ServerChunkLoadingManager entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+accessible class net/minecraft/server/world/ServerChunkLoadingManager$EntityTracker
+#accessible method net/minecraft/server/level/ChunkMap$TrackedEntity updatePlayers (Ljava/util/List;)V
@@ -5,9 +5,8 @@
  "compatibilityLevel": "JAVA_21",
  "mixins": [
    "ChunkMapMixin",
-    "CommandStackSourceAccessor",
+    "EntityTrackerEntryMixin",
    "PlayerMixin",
-    "ServerEntityMixin",
    "TickRateManagerMixin"
  ],
  "injectors": {
@@ -4,11 +4,9 @@ org.gradle.parallel=true

 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21
-parchment_mappings=2024.07.28
-parchment_minecraft_version=1.21
-yarn_mappings=1.21+build.9
-loader_version=0.15.11
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.3:v2
+loader_version=0.16.13

 # Mod Properties
 maven_group=me.caseload
@@ -16,6 +14,6 @@ archives_base_name=knockbacksync

 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.102.0+1.21
+fabric_version=0.140.0+1.21.11

 githubRepo=CASELOAD7000/knockback-sync
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
Author	SHA1	Message	Date
NotAlexNoyle	82fdf6ced0	Add GPLv3 license to project root	2026-05-25 03:48:47 -04:00
caseload	3b13e277f7	Merge pull request #46 from NotPatch/dev update: bump PacketEvents to version 2.11.2	2026-03-29 12:28:33 -07:00
NotPatch	a8bb0f159a	update: bump PacketEvents to version 2.11.2 Fixed packetevents could not initalize issue	2026-03-02 00:14:52 +03:00
Jyguy	aa76e82b16	Fix incorrect config path for offground sync (#45 )	2026-01-17 04:45:09 -05:00
Axionize	9c6f94c10b	fix: 1.21.11 Fabric support	2025-12-17 22:53:11 -05:00
Axionize	fec77fba15	update: 1.21.11	2025-12-17 18:19:23 -05:00
Axionize	3a5625508b	Improve fabric dependency specificity	2025-11-23 20:14:19 -05:00
Axionize	cb864f7eba	Fix infinite netty listener relocation bug by bumping PacketEvents	2025-11-23 19:01:32 -05:00
Axionize	9d50254dec	Fix buildscript issues with gradle version	2025-11-13 04:04:08 -05:00
Axionize	2bfd3c48b6	Fix buildscript, update shadowJar to V9	2025-11-13 03:54:29 -05:00
Axionize	c6df9f029a	1.21.9/10 support	2025-11-13 03:04:35 -05:00
Axionize	cc6e38c7f2	1.21.8 support	2025-08-11 00:21:57 -04:00
Axionize	c22f4f0efe	Make Modrinth Fabric version marked as 1.21.4-1.21.7	2025-07-07 00:17:09 -04:00
Axionize	71cd756337	1.21.6/1.21.7 Update	2025-07-01 02:04:28 -04:00
Axionize	4a5543da2a	Remove Fabric bstats	2025-04-29 14:54:34 -04:00
Axionize	5a8682dc26	Bump PE for 1.21.5 Update	2025-04-20 22:23:23 -04:00
Axionize	0ed4e78afd	Fix actions buildscript	2025-04-20 22:17:43 -04:00
Axionize	6b049d98b0	Update gradle wrapper	2025-04-20 22:14:49 -04:00
Axionize	791e0575a9	Fix another rare NPE in PingRunnable	2025-04-20 21:57:06 -04:00
Axionize	35faf08cfa	Common: - Fix rare NPE occurs when players disconnect while KB is being processed or a command is being run Fabric: - Check if native player object is null before constructing PlatformPlayer	2025-04-01 05:25:43 -04:00
Axionize	622c23a729	Bukkit: - Add new build option -Prelocate / RELOCATE_JAR that defines whether to relocate dependencies. Make the default KB Sync jar relocate all deps. Fabric: - Clean up build script - bump cloud-fabric-command version	2025-03-29 05:38:53 -04:00
Axionize	2eba6ec2ab	Add support to stop erroring on Carpet Mod fake players	2025-03-23 10:06:00 -04:00
Axionize	8783dd0683	Migrate to yarn mappings + 1.21.4 Update	2025-03-23 09:54:59 -04:00
Axionize	e861daa8c1	Fabric: - Fix Geyser detection - Force rebuild with new PE - Build with only used FabricAPI modules	2025-03-23 08:15:30 -04:00
Axionize	c970c1af6f	Disable manually loading instance of FabricAPI; let PE dep do it	2025-03-23 03:05:44 -04:00
Axionize	921c009a59	Fix client brand NPE	2025-03-23 00:45:19 -04:00
Axionize	ea0c2736e1	Fix Java 8 compatability in updater	2025-03-17 05:50:59 -04:00
Axionize	25411ba54f	Common: - Major internal refactor to use PE user object Folia: - Fix sometimes NPEing on Disconnect Fabric: - Fix default client brand	2025-03-17 05:42:32 -04:00
Axionize	715013d90f	Refactor login event to use UserLoginEvent() with PE, prevents unneccessary stacktrace from PE join errors	2025-03-16 00:56:55 -04:00
Axionize	a59ff6e625	Common: - Fix NPE with combat task pings. All combat task management is now done in player netty threads. Bukkit: - Disable paper plugin remapping - Build a "lite" version that doesn't shade PacketEvents, allows multiple plugins to share PacketEvents or for you to update PacketEvents without rebuilding KnockbackSync Fabric: - Actually call onLoad() to init PE - Explicitly prevent loading on Client	2025-03-14 23:19:13 -04:00
Axionize	bf609a1964	Fix rare NPE	2025-03-03 13:08:58 -05:00
Axionize	af5446f33e	- NPE and ping patches - Fix NPE when toggling for player who is in combat - Fix packet queue filling up from unprocessed pings (sending pings to fast for client to process)	2025-01-05 05:47:27 -05:00
Axionize	da3ceeca55	Fix NPE caused from loading new PingSTrategy	2024-12-17 01:25:52 -05:00
Axionize	f665d1e13e	Fix NPE on startup when players join due to event UUID being null; introduced by new folia support	2024-12-17 00:30:22 -05:00
Axionize	8e52dae5b2	Pump PacketEvents to better support 1.21.4	2024-12-16 21:20:09 -05:00
Axionize	01188bc79f	Only handly the packet type (KeepAlive/Transaction) our ping strategy cares about	2024-12-16 16:46:17 -05:00
Axionize	664d3899d7	Use CopyOnWriteArrayList() for thread safety on Folia	2024-12-16 14:37:17 -05:00
Axionize	60f0b37adc	Fix CME when modifing listenerMap from different threads	2024-12-15 13:22:38 -05:00
Axionize	511c634c41	Attempt #3 to fix getBlockStateAt() in Folia	2024-12-14 14:59:29 -05:00
Axionize	a3b5999de3	Revert "Fix more Folia compat issues" This reverts commit `1beedd84`	2024-12-14 14:14:02 -05:00
Axionize	1666d815b2	Revert "use Folia world on Folia servers" This reverts commit `6d1ab1acbe`.	2024-12-14 14:13:39 -05:00
Axionize	b447154d52	Revert "Full Folia async support" This reverts commit `73e862a782`.	2024-12-14 14:13:38 -05:00
Axionize	73e862a782	Full Folia async support	2024-11-30 16:06:10 -05:00
Axionize	6d1ab1acbe	use Folia world on Folia servers	2024-11-30 12:58:55 -05:00
Axionize	151eb58fb6	Fix a mistake in getBlockStateAt()	2024-11-30 12:51:23 -05:00
Axionize	1beedd84d0	Fix more Folia compat issues	2024-11-30 12:50:49 -05:00
Axionize	bc3175faed	Once again fix IllegalStateException packetSentList/packet conflict error	2024-11-30 02:55:26 -05:00
Axionize	58f61073c6	Fix reloading on Folia	2024-11-29 20:25:15 -05:00
Axionize	26c72b5490	Make updateInterval() improvement only work on Bukkit	2024-11-29 20:12:42 -05:00
Axionize	991e70e676	Fix Folia compatability	2024-11-29 19:58:39 -05:00
Axionize	c8519f4d74	Bump fabric tools versions; make debugging easier	2024-11-29 18:41:51 -05:00
Axionize	c9fef78eac	Bump packetevents for 1.21.2/1.21.3 support	2024-11-22 13:01:58 -05:00
Axionize	0ce7104f72	Merge remote-tracking branch 'origin/dev' into dev	2024-11-22 12:58:31 -05:00
CASELOAD7000	74e7c3930c	Add platform specific downloads, damage tick check	2024-11-07 18:26:16 -06:00
CASELOAD7000	31ab0aa7ff	Remove debug again...	2024-11-06 23:28:16 -06:00
CASELOAD7000	fc34b3402e	Add changes to auto updater	2024-11-06 23:27:39 -06:00
Axionize	db6440d87c	Fix ping priority and not checking for cancelled packets on send	2024-11-06 23:22:13 -05:00
CASELOAD7000	0119309ffb	Remove debug	2024-11-06 03:22:21 -06:00
CASELOAD7000	f31fcc437f	Add unfinished auto-updater	2024-11-06 03:18:27 -06:00
Axionize	ab4d9d13c9	Code Cleanup	2024-11-03 22:09:25 -05:00
Axionize	052454fee0	Enable relocation to prevent library conflicts	2024-11-03 21:33:48 -05:00
Axionize	0f0b9f2cec	Split up Ping send and Recieve listeners; Add priorities to listeners to be first to send/receive packets	2024-11-03 21:28:52 -05:00
Axionize	2eb1fff556	Remove loom from common sources	2024-11-01 23:52:49 -04:00
Axionize	b4f8786683	Fix IndexOutofBoundsException that may occur in handler for ping packets. It has very limited impact on plugin functionality besides potentailly affecting ping measurements	2024-10-31 22:13:31 -04:00
Axionize	5c7f314071	Tix offground status	2024-10-29 16:25:19 -04:00
Axionize	73ab2388dc	Remove building packetevents from actions script	2024-10-27 05:38:39 -04:00
Axionize	7c129185c5	Fix plugin loading on bukkit after refactor	2024-10-26 22:48:25 -04:00
Axionize	ac5bd598f0	Bump gradle version in github actions to min required for packetevents-fabric 2.6.0	2024-10-26 22:32:47 -04:00
Axionize	98f23966db	Fix clientBrand for fabricPlayer	2024-10-26 22:27:57 -04:00
Axionize	0803d2800f	Remove redundant code	2024-10-26 22:26:34 -04:00
Axionize	83dab3cb8c	Merge branch 'booky-packets' into dev	2024-10-26 22:25:45 -04:00
Axionize	768bc20e14	Packetevents 2.6.0 fabric fixes	2024-10-26 22:25:28 -04:00
Axionize	f3bd42ff2f	Add new ClientBrands pie	2024-10-26 22:14:17 -04:00
Axionize	a56fd79d29	Initial work to port to 2.6.0 packetevents-fabric	2024-10-26 21:24:00 -04:00
Axionize	e1b2487396	Try booky10 fabric fail	2024-10-26 18:34:00 -04:00
Axionize	f19499205f	Add showing offground sync status	2024-10-26 18:05:06 -04:00
Axionize	39e8cbddcb	Config fixes - Fix reloading toggleoffground	2024-10-26 17:45:21 -04:00
Axionize	42c3129060	Merge remote-tracking branch 'origin/workspace' into dev-upstream # Conflicts: # common/src/main/java/me/caseload/knockbacksync/listener/PlayerKnockbackListener.java # common/src/main/java/me/caseload/knockbacksync/player/PlayerData.java # common/src/main/java/me/caseload/knockbacksync/util/ChatUtil.java # common/src/main/java/me/caseload/knockbacksync/util/MathUtil.java	2024-10-26 17:27:20 -04:00
Axionize	a6a2577e07	Config fixes	2024-10-26 17:11:19 -04:00
Axionize	619e50dd6a	Revert to getHitBlockPosition()	2024-10-26 17:08:53 -04:00
Axionize	98cbf4adfc	Make every message besides root configureable	2024-10-26 17:00:59 -04:00
Axionize	7b5949dba6	/tick rate support on Bukkit	2024-10-26 15:40:18 -04:00
Axionize	0be787c1e2	Make all base variables consistently encapsulated	2024-10-26 15:08:08 -04:00