forked from trueog/KnockbackSync-OG
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c5b8bcc31
|
||
|
|
31a7b7c087
|
||
|
|
eff7e517a6 | ||
|
|
2a34066187 | ||
|
|
35bbe9ecba | ||
|
|
7197787ad3 | ||
|
|
f93401ff26 | ||
|
|
6169116dc7 |
No files matched your search
@@ -0,0 +1 @@
|
||||
.gitea/CODEOWNERS linguist-detectable=false
|
||||
@@ -0,0 +1,3 @@
|
||||
# Pull requests request review from the eligible staff team(s).
|
||||
# One approval from either an Admin or Developer satisfies branch protection.
|
||||
* @trueog/Admins @trueog/Developers
|
||||
+5
-1
@@ -7,8 +7,12 @@ dependency-reduced-pom.xml
|
||||
# Ignore maven build files
|
||||
target/
|
||||
|
||||
# Eclipse files
|
||||
.classpath
|
||||
.project
|
||||
.settings/
|
||||
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
run/
|
||||
run/
|
||||
-674
@@ -1,674 +0,0 @@
|
||||
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>.
|
||||
@@ -0,0 +1,37 @@
|
||||
KnockbackSync
|
||||
=============
|
||||
|
||||
KnockbackSync is licensed under the GNU General Public License v3.0 or later.
|
||||
See README.md (section "License") and https://www.gnu.org/licenses/gpl-3.0.en.html.
|
||||
|
||||
Bundled / ported third-party code
|
||||
----------------------------------
|
||||
|
||||
This distribution contains a port of the 1.8 melee knockback formula from:
|
||||
|
||||
BukkitOldCombatMechanics (OldCombatMechanics)
|
||||
Copyright (c) the OldCombatMechanics contributors (kernitus et al.)
|
||||
https://github.com/kernitus/BukkitOldCombatMechanics
|
||||
Licensed under the Mozilla Public License, Version 2.0 (MPL-2.0)
|
||||
https://mozilla.org/MPL/2.0/
|
||||
|
||||
The ported code lives in:
|
||||
|
||||
common/src/main/java/me/caseload/knockbacksync/util/LegacyKnockback.java
|
||||
|
||||
It is derived from OldCombatMechanics' module
|
||||
`kernitus.plugin.OldCombatMechanics.module.ModulePlayerKnockback`.
|
||||
|
||||
License compatibility
|
||||
---------------------
|
||||
|
||||
The OldCombatMechanics source files are distributed under the standard MPL-2.0
|
||||
notice (Exhibit A) and do NOT carry the "Incompatible With Secondary Licenses"
|
||||
notice (Exhibit B). Under MPL-2.0 section 3.3, such Covered Software may be
|
||||
distributed as part of a Larger Work governed by a "Secondary License" — which
|
||||
MPL-2.0 section 1.12 defines to include the GNU General Public License, Version
|
||||
3. Accordingly, the ported file may be combined with and distributed alongside
|
||||
the GPL-3.0-or-later code that makes up the rest of KnockbackSync.
|
||||
|
||||
The terms of the MPL-2.0 continue to govern the ported file itself; its MPL
|
||||
header is retained. The combined/Larger Work is offered under GPL-3.0-or-later.
|
||||
@@ -1,169 +1,15 @@
|
||||
[](https://modrinth.com/plugin/knockbacksync)
|
||||
# KnockbackSync-OG
|
||||
|
||||
Tired of inconsistent knockback ruining your PvP experience? Our plugin recalculates knockback as if it were done clientside, leveling the playing field and ensuring every player enjoys a fair fight, no matter their connection quality.
|
||||
|
||||
Minecraft doesn’t factor in network latency when determining a player's actions on the server. This causes the server to receive outdated information that doesn’t reflect the player's clientside position, leading to varying knockback effects based on connection quality.
|
||||
|
||||
This plugin intercepts and adjusts knockback calculations to match what would occur clientside, effectively mitigating the disadvantages caused by high latency. By synchronizing knockback handling, we ensure that players experience consistent and fair knockback, providing a balanced and competitive environment for all."
|
||||
|
||||
Showcase: https://www.youtube.com/watch?v=SVokpr3v-TA
|
||||
|
||||
Official Discord: https://discord.gg/nnpqpAtyVW
|
||||
|
||||
## Frequently Asked Questions (FAQ)
|
||||
|
||||
### Does this change put high ping players at a disadvantage?
|
||||
**It depends on the player.** Some may notice a difference if they're used to relying on high ping to reduce knockback. For others, it could actually be an advantage.
|
||||
|
||||
### How does this change benefit high ping players?
|
||||
**Knockback control.** For example, it will be easier to escape crit chains and punish crit.
|
||||
|
||||
### Why was the configurability of ping offset removed?
|
||||
**It promotes consistency across all servers.** Extensive testing with top players has shown that an offset of 25 provides a balanced experience for everyone.
|
||||
|
||||
### How do I change the ping offset?
|
||||
**You must run a modified build of KnockbackSync.** The variable can be changed inside of the [PlayerData](common/src/main/java/me/caseload/knockbacksync/player/PlayerData.java) class.
|
||||
|
||||
## What servers are using this plugin?
|
||||
| IP | Location | Region | Ping Offset | spike_threshold |
|
||||
|------------------|-----------------------------------|--------|-------------|-----------------|
|
||||
| `pvparcade.club` | Ashburn, Virginia, United States | NA | 20 | 15 |
|
||||
| `stray.gg` | Ashburn, Virginia, United States | NA | 25 | 20 |
|
||||
| `eu.stray.gg` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `valed.gg` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `eu.catpvp.xyz` | Frankfurt, Hesse, Germany | EU | 25 | 20 |
|
||||
| `as.catpvp.xyz` | Singapore | AS | 25 | 20 |
|
||||
| `na.catpvp.xyz` | New York, New York, United States | NA | 25 | 20 |
|
||||
| `hyperium.pl` | Wrocław, Dolnośląskie, Poland | EU | 25 | 20 |
|
||||
|
||||
## Commands
|
||||
---
|
||||
### /knockbacksync ping [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to check the ping of a player, including jitter. If no target is specified, it will check your own ping.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.ping` (defaults to true for players)
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync ping`: Checks your own ping.
|
||||
* `/knockbacksync ping Steve`: Checks the ping of a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* If a pong packet has been received: "Your last ping packet took [ping]ms. Jitter: [jitter]ms." or "[Player]'s last ping packet took [ping]ms. Jitter: [jitter]ms."
|
||||
* If a pong packet has not been received: "Pong not received. Your estimated ping is [estimated ping]ms." or "Pong not received. [Player]'s estimated ping is [estimated ping]ms."
|
||||
|
||||
**Notes:**
|
||||
|
||||
* The estimated ping is based on the player's platform reported ping.
|
||||
* Jitter represents the variation in ping over time.
|
||||
---
|
||||
### /knockbacksync status [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to check the KnockbackSync status of a player or the server. If no target is specified, it will show both the global status and your own status.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.status.self` (defaults to true for players): Allows checking your own status.
|
||||
* `knockbacksync.status.other` (defaults to op only): Allows checking the status of other players.
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync status`: Shows the global status and your own status.
|
||||
* `/knockbacksync status Steve`: Shows the status of a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* **Global status:** "Global KnockbackSync status: [Enabled/Disabled]"
|
||||
* **Player status:** "[Player]'s KnockbackSync status: [Enabled/Disabled]" (or "Disabled (Global toggle is off)" if the global toggle is off)
|
||||
|
||||
**Notes:**
|
||||
|
||||
* The player status will be "Disabled" if the global toggle is off, even if the player has individually enabled KnockbackSync.
|
||||
* The messages displayed by this command are configurable in the `config.yml` file.
|
||||
---
|
||||
### /knockbacksync toggle [target]
|
||||
|
||||
**Description:**
|
||||
|
||||
This command allows you to toggle KnockbackSync for yourself, another player, or globally.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.toggle.self` (defaults to true for players): Allows toggling KnockbackSync for yourself.
|
||||
* `knockbacksync.toggle.other` (defaults to op only): Allows toggling KnockbackSync for other players.
|
||||
* `knockbacksync.toggle.global` (defaults to op only): Allows toggling KnockbackSync globally for the server.
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync toggle`: Toggles KnockbackSync globally (if you have permission) or for yourself.
|
||||
* `/knockbacksync toggle Steve`: Toggles KnockbackSync for a player named Steve.
|
||||
|
||||
**Output:**
|
||||
|
||||
* **Global toggle:** Sends a message indicating whether KnockbackSync has been enabled or disabled globally. The messages are configurable in the `config.yml` file.
|
||||
* **Player toggle:** Sends a message indicating whether KnockbackSync has been enabled or disabled for the specified player. The messages are configurable in the `config.yml` file.
|
||||
* **Ineligible player:** If a player is ineligible for KnockbackSync (e.g., due to permissions), a configurable message will be sent.
|
||||
* **KnockbackSync disabled:** If KnockbackSync is disabled globally and you try to toggle it for a player, a message will be sent indicating that KnockbackSync is disabled.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* If KnockbackSync is disabled globally, toggling it for a player will have no effect until KnockbackSync is enabled globally.
|
||||
* Players can only toggle KnockbackSync for themselves if they have the `knockbacksync.toggle.self` permission.
|
||||
* Operators can toggle KnockbackSync for other players and globally.
|
||||
---
|
||||
### /knockbacksync reload
|
||||
|
||||
**Description:**
|
||||
|
||||
This command reloads the KnockbackSync plugin's configuration file.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.reload` (defaults to op only)
|
||||
|
||||
**Examples:**
|
||||
* `/knockbacksync reload`
|
||||
|
||||
**Output:**
|
||||
|
||||
* Sends a message to the command sender indicating that the configuration has been reloaded. The message is configurable in the `config.yml` file.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* This command is useful for applying changes made to the configuration file without restarting the server.
|
||||
---
|
||||
### /knockbacksync toggleoffground
|
||||
|
||||
**Description:**
|
||||
|
||||
This command toggles the experimental off-ground knockback synchronization feature.
|
||||
|
||||
**Permissions:**
|
||||
|
||||
* `knockbacksync.toggleoffground` (defaults to op only)
|
||||
|
||||
**Examples:**
|
||||
|
||||
* `/knockbacksync toggleoffground`
|
||||
|
||||
**Output:**
|
||||
|
||||
* Sends a message indicating whether the experimental off-ground knockback synchronization has been enabled or disabled. The messages are configurable in the `config.yml` file.
|
||||
|
||||
**Notes:**
|
||||
|
||||
* **This command currently does not do anything as off-ground synchronization has yet to be implemented.**
|
||||
* This feature is experimental and may not work as expected.
|
||||
Soft fork of KnockbackSync to ensure compatibility with OldCombatMechanics on Purpur 1.19.4.
|
||||
|
||||
## License
|
||||
GNU General Public License v3.0 or later
|
||||
|
||||
See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html) to see the full text.
|
||||
See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html) to see the full text.
|
||||
|
||||
The optional legacy (1.8) knockback formula
|
||||
(`common/src/main/java/me/caseload/knockbacksync/util/LegacyKnockback.java`) is a
|
||||
port from [OldCombatMechanics](https://github.com/kernitus/BukkitOldCombatMechanics),
|
||||
which is licensed under the Mozilla Public License 2.0 (MPL-2.0). MPL-2.0 permits
|
||||
combining that code into this GPL-3.0-or-later work as a Larger Work (MPL-2.0
|
||||
§3.3 / §1.12). See the [NOTICE](NOTICE) file for details.
|
||||
+22
-2
@@ -1,9 +1,10 @@
|
||||
import java.io.ByteArrayOutputStream
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
|
||||
plugins {
|
||||
id("java")
|
||||
eclipse
|
||||
id("com.gradleup.shadow") version "9.2.2" apply false
|
||||
id("fabric-loom") version "1.14.6" apply false
|
||||
}
|
||||
|
||||
fun getGitCommitHash(project: Project): String? {
|
||||
@@ -33,9 +34,10 @@ val fullVersion = "1.3.5"
|
||||
val snapshot = true
|
||||
val githubRepo = System.getenv("GITHUB_REPOSITORY") ?: project.findProperty("githubRepo").toString()
|
||||
|
||||
// Suite default external provider; shaded standalone via -PshadePE=true.
|
||||
extra["shadePE"] = project.findProperty("shadePE")?.toString()?.toBoolean()
|
||||
?: System.getenv("SHADE_PE")?.toBoolean()
|
||||
?: true
|
||||
?: false
|
||||
|
||||
extra["relocate"] = project.findProperty("relocate")?.toString()?.toBoolean()
|
||||
?: System.getenv("RELOCATE_JAR")?.toBoolean()
|
||||
@@ -83,3 +85,21 @@ subprojects {
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
}
|
||||
|
||||
tasks.jar {
|
||||
// The root project has no plugin entrypoint; do not emit an empty deployable-looking JAR.
|
||||
enabled = false
|
||||
}
|
||||
|
||||
val copyBukkitPluginJar by tasks.registering(Copy::class) {
|
||||
val bukkitShadowJar = project(":bukkit").tasks.named<ShadowJar>("shadowJar")
|
||||
|
||||
dependsOn(bukkitShadowJar)
|
||||
from(bukkitShadowJar.flatMap { it.archiveFile })
|
||||
into(layout.buildDirectory.dir("libs"))
|
||||
rename { "KnockbackSync-OG-$fullVersion${if (snapshot) "-SNAPSHOT" else ""}.jar" }
|
||||
}
|
||||
|
||||
tasks.assemble {
|
||||
dependsOn(copyBukkitPluginJar)
|
||||
}
|
||||
@@ -64,6 +64,11 @@ tasks.withType<ShadowJar> {
|
||||
relocationPrefix = "${project.property("maven_group")}.${project.property("archives_base_name")}.shaded"
|
||||
}
|
||||
|
||||
tasks.jar {
|
||||
// The shaded archive is the runtime plugin; do not emit a misleading thin plugin JAR.
|
||||
enabled = false
|
||||
}
|
||||
|
||||
tasks.build {
|
||||
dependsOn(tasks.shadowJar)
|
||||
}
|
||||
@@ -78,7 +83,8 @@ tasks.processResources {
|
||||
filesMatching("plugin.yml") {
|
||||
expand(
|
||||
"version" to project.version,
|
||||
"depends" to if (shadePE) "[]" else listOf("packetevents")
|
||||
// Bukkit accepts `depend` only; `depends` is silently ignored.
|
||||
"depend" to if (shadePE) "[]" else listOf("PacketEvents")
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ 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.common.BuildConfig;
|
||||
import me.caseload.knockbacksync.event.events.ConfigReloadEvent;
|
||||
import me.caseload.knockbacksync.event.KBSyncEventHandler;
|
||||
import me.caseload.knockbacksync.listener.bukkit.*;
|
||||
@@ -103,6 +104,10 @@ public class BukkitBase extends Base {
|
||||
|
||||
@Override
|
||||
public void load() {
|
||||
// External-provider mode delegates PacketEvents lifecycle to the installed PE plugin.
|
||||
if (!BuildConfig.SHADE_PE) {
|
||||
return;
|
||||
}
|
||||
PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this.plugin));
|
||||
PacketEvents.getAPI().load();
|
||||
}
|
||||
@@ -132,8 +137,12 @@ public class BukkitBase extends Base {
|
||||
protected void registerPlatformListeners() {
|
||||
registerPluginListeners(
|
||||
new BukkitPlayerDamageListener(),
|
||||
new BukkitPlayerKnockbackListener()
|
||||
new BukkitPlayerKnockbackListener(),
|
||||
new me.caseload.knockbacksync.listener.bukkit.KnockbackResistanceNullifier()
|
||||
);
|
||||
// Reconcile away any leftover owned knockback-resistance marker for players already
|
||||
// online (e.g. across a /reload), so none is stranded.
|
||||
me.caseload.knockbacksync.listener.bukkit.KnockbackResistanceNullifier.cleanupAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package me.caseload.knockbacksync;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import me.caseload.knockbacksync.common.BuildConfig;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
public final class BukkitLoaderPlugin extends JavaPlugin {
|
||||
@@ -19,6 +20,14 @@ public final class BukkitLoaderPlugin extends JavaPlugin {
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
PacketEvents.getAPI().terminate();
|
||||
// Reconcile away any leftover owned knockback-resistance marker so no player is left
|
||||
// with reduced resistance after the plugin unloads.
|
||||
me.caseload.knockbacksync.listener.bukkit.KnockbackResistanceNullifier.cleanupAll();
|
||||
// Drop listener handles before any lifecycle decision; the shared API may outlive this plugin.
|
||||
core.unregisterPacketListeners();
|
||||
// Terminate only when this plugin owns the PacketEvents lifecycle (shaded build).
|
||||
if (BuildConfig.SHADE_PE) {
|
||||
PacketEvents.getAPI().terminate();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package me.caseload.knockbacksync.api;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.player.User;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.BukkitPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
/**
|
||||
* Stable, reflection-friendly entry point for other plugins (notably OldCombatMechanics'
|
||||
* old-fishing-knockback module) to hand KnockbackSync a pre-computed knockback vector, so that
|
||||
* KnockbackSync owns the final velocity and applies the same latency Y-correction it gives melee
|
||||
* knockback.
|
||||
*
|
||||
* <p>Why this exists: a fishing-rod hit reaches KnockbackSync as an ordinary player-vs-player
|
||||
* damage event. KnockbackSync cannot tell it apart from a sword hit, so it computes a melee vector
|
||||
* and the caller's own {@code setVelocity} either fights it or is re-corrected with melee-tuned
|
||||
* latency logic — the rod pop ends up flattened/inconsistent under latency. Routing the
|
||||
* bobber-direction vector through here makes the rod feel like 1.8, latency-synced like melee.</p>
|
||||
*
|
||||
* <p>Resolved by callers via reflection; keep the class name, package, and method signature
|
||||
* stable.</p>
|
||||
*/
|
||||
public final class KnockbackSyncRodApi {
|
||||
|
||||
private KnockbackSyncRodApi() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a fishing-rod knockback vector for {@code victim}, to be applied and latency-synced
|
||||
* by the {@code PlayerVelocityEvent} produced by the caller's subsequent damage tick.
|
||||
*
|
||||
* <p>MUST be called on the main thread, immediately before the caller deals the rod's damage.</p>
|
||||
*
|
||||
* @param victim the player being knocked back
|
||||
* @param rodKnockback the 1.8 bobber-direction knockback vector
|
||||
* @return {@code true} if KnockbackSync will own this knockback (caller must NOT also call
|
||||
* {@code setVelocity}); {@code false} if KnockbackSync is disabled or not tracking this
|
||||
* player, in which case the caller should apply the knockback itself.
|
||||
*/
|
||||
public static boolean applyRodKnockback(Player victim, Vector rodKnockback) {
|
||||
if (victim == null || rodKnockback == null) return false;
|
||||
|
||||
final Base base = Base.INSTANCE;
|
||||
if (base == null) return false;
|
||||
|
||||
final ConfigManager config = base.getConfigManager();
|
||||
if (config == null || !config.isToggled() || !config.isLegacyKnockbackEnabled())
|
||||
return false;
|
||||
|
||||
final User user = new BukkitPlayer(victim).getUser();
|
||||
if (user == null) return false;
|
||||
|
||||
final PlayerData playerData = PlayerDataManager.getPlayerData(user);
|
||||
if (playerData == null) return false; // not tracked (exempt/Geyser/etc.) — caller falls back
|
||||
|
||||
final Vector3d kb = new Vector3d(rodKnockback.getX(), rodKnockback.getY(), rodKnockback.getZ());
|
||||
playerData.setRodKnockback(kb);
|
||||
// On-ground sync should target the rod's vertical, mirroring the melee damage path.
|
||||
playerData.setVerticalVelocity(kb.getY());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+42
-1
@@ -1,16 +1,57 @@
|
||||
package me.caseload.knockbacksync.listener.bukkit;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.listener.PlayerDamageListener;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.player.BukkitPlayer;
|
||||
import me.caseload.knockbacksync.util.MultiLibUtil;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
|
||||
public class BukkitPlayerDamageListener extends PlayerDamageListener implements Listener {
|
||||
|
||||
/**
|
||||
* D3 — projectile PvP knockback-resistance nullification.
|
||||
*
|
||||
* <p>For a hit that {@link PvpSource} classifies as {@code PROJECTILE} PvP, zero the
|
||||
* victim's effective knockback resistance BEFORE vanilla computes the knockback, so a
|
||||
* netherite victim takes full (diamond-level) projectile knockback. Runs at {@code LOW}
|
||||
* so it precedes OCM's {@code projectile-knockback} damage raise ({@code NORMAL}) and
|
||||
* vanilla knockback. The decision is gated on classification + config only — never on the
|
||||
* current event damage, because OCM may not have raised snowball/egg/ender-pearl damage
|
||||
* yet at this priority.</p>
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
||||
public void onProjectilePvpDamage(EntityDamageByEntityEvent event) {
|
||||
final ConfigManager config = Base.INSTANCE.getConfigManager();
|
||||
// Single source of truth: active only when toggled on, legacy knockback enabled,
|
||||
// and knockback resistance is NOT being kept (matching OCM's default).
|
||||
if (!config.isToggled() || !config.isLegacyKnockbackEnabled() || config.isLegacyKnockbackResistanceEnabled())
|
||||
return;
|
||||
|
||||
if (PvpSource.classify(event) != PvpSource.Type.PROJECTILE)
|
||||
return;
|
||||
|
||||
final Player victim = (Player) event.getEntity();
|
||||
if (MultiLibUtil.isExternalPlayer(victim))
|
||||
return;
|
||||
|
||||
KnockbackResistanceNullifier.nullify(victim);
|
||||
}
|
||||
|
||||
/**
|
||||
* Melee PvP: KnockbackSync owns the 1.8 melee velocity via {@code LegacyKnockback}
|
||||
* (applied at {@code PlayerVelocityEvent}), so melee already delivers full knockback
|
||||
* without touching the resistance attribute. The previous {@code stripKnockbackResistance()}
|
||||
* (which removed the victim's {@code KNOCKBACK_RESISTANCE} modifiers and never restored them,
|
||||
* leaking into PvE) has been deleted. Projectile/explosion/fishing hits are NOT routed
|
||||
* through this melee path (their damager is not a player), so no stale legacy-knockback
|
||||
* vector can be stored for them.
|
||||
*/
|
||||
@EventHandler(ignoreCancelled = true)
|
||||
public void onPlayerDamage(EntityDamageByEntityEvent event) {
|
||||
Entity victim = event.getEntity();
|
||||
@@ -23,4 +64,4 @@ public class BukkitPlayerDamageListener extends PlayerDamageListener implements
|
||||
|
||||
onPlayerDamage(new BukkitPlayer((Player) victim), new BukkitPlayer((Player) attacker));
|
||||
}
|
||||
}
|
||||
}
|
||||
+12
-4
@@ -16,7 +16,11 @@ import org.bukkit.util.Vector;
|
||||
|
||||
public class BukkitPlayerKnockbackListener extends PlayerKnockbackListener implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||
// HIGHEST so KnockbackSync is the last writer in the event chain: it owns the final
|
||||
// melee velocity. We read and write the EVENT velocity (not player.getVelocity()/
|
||||
// player.setVelocity()) so we integrate with the chain instead of fighting it. See
|
||||
// knockback-sync issue #7 (kernitus, Krymonota, Axionize).
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onPlayerVelocity(PlayerVelocityEvent event) {
|
||||
Player victim = event.getPlayer();
|
||||
EntityDamageEvent entityDamageEvent = victim.getLastDamageCause();
|
||||
@@ -34,7 +38,11 @@ public class BukkitPlayerKnockbackListener extends PlayerKnockbackListener imple
|
||||
if (MultiLibUtil.isExternalPlayer(victim))
|
||||
return;
|
||||
|
||||
Vector vector = victim.getVelocity();
|
||||
onPlayerVelocity(new BukkitPlayer(victim), new Vector3d(vector.getX(), vector.getY(), vector.getZ()));
|
||||
Vector eventVelocity = event.getVelocity();
|
||||
Vector3d result = onPlayerVelocity(new BukkitPlayer(victim),
|
||||
new Vector3d(eventVelocity.getX(), eventVelocity.getY(), eventVelocity.getZ()));
|
||||
|
||||
if (result != null)
|
||||
event.setVelocity(new Vector(result.getX(), result.getY(), result.getZ()));
|
||||
}
|
||||
}
|
||||
}
|
||||
+121
@@ -0,0 +1,121 @@
|
||||
package me.caseload.knockbacksync.listener.bukkit;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.attribute.AttributeInstance;
|
||||
import org.bukkit.attribute.AttributeModifier;
|
||||
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.util.UUID;
|
||||
|
||||
/**
|
||||
* D3 — Resistance Nullification (M1).
|
||||
*
|
||||
* <p>For player-vs-player projectile hits (classified by {@link PvpSource}), forces the
|
||||
* victim's effective {@code generic.knockback_resistance} to 0 for the duration of the
|
||||
* hit by adding a single plugin-owned {@code MULTIPLY_SCALAR_1} {@code -1.0} modifier,
|
||||
* lets vanilla compute full knockback, then removes the owned marker on the next tick.
|
||||
* Equipment and other plugins' modifiers are never read, captured, or removed — only the
|
||||
* owned marker (identified by a constant UUID) is added/removed.</p>
|
||||
*
|
||||
* <p>Melee PvP is owned by {@code LegacyKnockback} (which already ignores resistance when
|
||||
* {@code enable_knockback_resistance=false}) and needs no attribute work; fishing PvP is
|
||||
* owned by OCM's {@code old-fishing-knockback}. Explosions are out of scope on 1.19.4.</p>
|
||||
*
|
||||
* <p>The marker is permanent NMS state until removed, so a leftover marker is reconciled
|
||||
* away on join/quit and on plugin enable/disable (see {@link #cleanupAll()}), guaranteeing
|
||||
* a player is never left permanently with reduced resistance.</p>
|
||||
*/
|
||||
public final class KnockbackResistanceNullifier implements Listener {
|
||||
|
||||
// Constant, plugin-owned modifier identity. Add skips if this UUID is already present;
|
||||
// removal matches by this UUID. Equipment/foreign modifiers are never touched.
|
||||
private static final UUID MODIFIER_UUID = UUID.fromString("7b2a1c84-4d3e-4f0a-9c6b-1e5a9d8c7f30");
|
||||
private static final String MODIFIER_NAME = "knockbacksync_pvp_kb_nullify";
|
||||
|
||||
// Mirrors the previous stripKnockbackResistance guard: if the attribute is unavailable
|
||||
// on this server version, disable for the session and warn once (no per-hit log spam).
|
||||
private static volatile boolean unsupported = false;
|
||||
|
||||
/**
|
||||
* Force the victim's effective knockback resistance to 0 for the current hit by adding the
|
||||
* owned marker, then schedule its removal on the next tick. Idempotent and re-entrancy safe:
|
||||
* if the marker is already present (e.g. a second hit in the same tick) the add is skipped.
|
||||
*
|
||||
* <p>Must be called before vanilla computes the hit's knockback (i.e. during the damage
|
||||
* event at an early priority).</p>
|
||||
*/
|
||||
public static void nullify(Player victim) {
|
||||
final AttributeInstance attribute = resolve(victim);
|
||||
if (attribute == null) return;
|
||||
if (hasOwnedModifier(attribute)) return;
|
||||
|
||||
try {
|
||||
attribute.addModifier(new AttributeModifier(
|
||||
MODIFIER_UUID, MODIFIER_NAME, -1.0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
|
||||
} catch (IllegalArgumentException alreadyApplied) {
|
||||
return; // raced — modifier already present; nothing to add
|
||||
}
|
||||
|
||||
// Remove on the NEXT tick. Same-event (MONITOR/finally) removal is forbidden: vanilla
|
||||
// computes the knockback after the event returns, so an in-event removal would restore
|
||||
// the attribute before vanilla reads it. On the non-Folia target this is a main-thread
|
||||
// next-tick task; it stays compile-safe (no Player#getScheduler()).
|
||||
Base.INSTANCE.getScheduler().runTaskLater(() -> remove(victim), 1L);
|
||||
}
|
||||
|
||||
/** Remove the owned marker if present. Idempotent; never touches foreign/equipment modifiers. */
|
||||
public static void remove(Player victim) {
|
||||
final AttributeInstance attribute = resolve(victim);
|
||||
if (attribute == null) return;
|
||||
for (AttributeModifier modifier : attribute.getModifiers()) {
|
||||
if (MODIFIER_UUID.equals(modifier.getUniqueId())) {
|
||||
attribute.removeModifier(modifier);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Strip the owned marker from every online player (plugin enable/disable reconciliation). */
|
||||
public static void cleanupAll() {
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
remove(player);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean hasOwnedModifier(AttributeInstance attribute) {
|
||||
for (AttributeModifier modifier : attribute.getModifiers()) {
|
||||
if (MODIFIER_UUID.equals(modifier.getUniqueId())) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static AttributeInstance resolve(Player victim) {
|
||||
if (unsupported || victim == null) return null;
|
||||
try {
|
||||
return victim.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE);
|
||||
} catch (Throwable t) {
|
||||
unsupported = true;
|
||||
Base.INSTANCE.getLogger().warning(
|
||||
"Could not access KNOCKBACK_RESISTANCE attribute; PvP knockback-resistance "
|
||||
+ "nullification disabled for this session: " + t.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ── R7 fail-safe: reconcile away any leftover owned marker ──────────────────────────────
|
||||
|
||||
@EventHandler
|
||||
public void onJoin(PlayerJoinEvent event) {
|
||||
remove(event.getPlayer());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onQuit(PlayerQuitEvent event) {
|
||||
remove(event.getPlayer());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
package me.caseload.knockbacksync.listener.bukkit;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.player.User;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.BukkitPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Projectile;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.projectiles.ProjectileSource;
|
||||
|
||||
/**
|
||||
* D1 — PvP Source Attribution.
|
||||
*
|
||||
* <p>Classifies a damage event on a player victim into a source class so the
|
||||
* knockback-resistance nullifier (D3) knows whether and how to act. Attribution is
|
||||
* self-inclusive: the victim's own projectile (e.g. their own arrow) still counts as
|
||||
* PvP. This classifier only answers "is this player-attributed, and by what source
|
||||
* class?" — it does not modify damage or knockback.</p>
|
||||
*
|
||||
* <p>Scope note (Purpur 1.19.4 target): netherite {@code generic.knockback_resistance}
|
||||
* only reduces knockback applied through {@code LivingEntity.knockback(...)} (melee and
|
||||
* projectile). Explosion knockback is not reduced by it on 1.19.4 (Blast Protection
|
||||
* governs that), and wind charges do not exist, so explosion/wind-charge sources are
|
||||
* classified {@link Type#NONE}.</p>
|
||||
*/
|
||||
public final class PvpSource {
|
||||
|
||||
public enum Type {
|
||||
/** Direct player melee. Owned by {@code LegacyKnockback}; no attribute nullification. */
|
||||
MELEE,
|
||||
/** Player-shot projectile (arrow, spectral arrow, trident, snowball, egg, ender pearl, ...). Nullified by D3. */
|
||||
PROJECTILE,
|
||||
/** Fishing-rod hit (OCM {@code old-fishing-knockback}); owned by the rod sync. No nullification. */
|
||||
FISHING,
|
||||
/** Not attributable to a player (mob, environment, explosion, ...). */
|
||||
NONE
|
||||
}
|
||||
|
||||
private PvpSource() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param event a damage-by-entity event (the caller has not necessarily checked the victim type)
|
||||
* @return the PvP source class; {@link Type#NONE} when the damage is not attributable to a player
|
||||
*/
|
||||
public static Type classify(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getEntity() instanceof Player)) return Type.NONE;
|
||||
final Player victim = (Player) event.getEntity();
|
||||
final Entity damager = event.getDamager();
|
||||
|
||||
// Direct player damager: either a melee hit, or an OCM fishing-rod hit.
|
||||
// old-fishing-knockback deals its damage via damage(victim, rodder), so the
|
||||
// damager is the rodding player (not the bobber). Distinguish the rod hit via
|
||||
// the rod-pending marker KnockbackSync stores for the rod path. Both MELEE and
|
||||
// FISHING are owned elsewhere and get no attribute nullification, so a mislabel
|
||||
// between the two cannot change knockback behaviour.
|
||||
if (damager instanceof Player) {
|
||||
return isRodPending(victim) ? Type.FISHING : Type.MELEE;
|
||||
}
|
||||
|
||||
// Player-shot projectile, resolved generically via ProjectileSource so any
|
||||
// player-shot projectile type is covered without a per-type list (including
|
||||
// types absent from the compile-time API). Self-inclusive: the shooter may be
|
||||
// the victim. A non-player projectile source (e.g. a dispenser's
|
||||
// BlockProjectileSource) or a null shooter is not PvP. Note: the ender pearl's
|
||||
// post-teleport fall damage is a separate non-by-entity event, so it never
|
||||
// reaches this projectile branch.
|
||||
if (damager instanceof Projectile) {
|
||||
final ProjectileSource shooter = ((Projectile) damager).getShooter();
|
||||
return (shooter instanceof Player) ? Type.PROJECTILE : Type.NONE;
|
||||
}
|
||||
|
||||
// Explosions (TNT, end crystal, fireball), mobs, environment: out of scope on 1.19.4.
|
||||
return Type.NONE;
|
||||
}
|
||||
|
||||
private static boolean isRodPending(Player victim) {
|
||||
final User user = new BukkitPlayer(victim).getUser();
|
||||
if (user == null) return false;
|
||||
final PlayerData data = PlayerDataManager.getPlayerData(user);
|
||||
return data != null && data.isRodKnockbackPending();
|
||||
}
|
||||
}
|
||||
@@ -183,6 +183,16 @@ public class BukkitPlayer implements PlatformPlayer {
|
||||
return bukkitPlayer.getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.KNOCKBACK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getWeaponKnockbackLevel() {
|
||||
// OCM parity: use the main hand item, or the off hand when the main hand is empty.
|
||||
org.bukkit.inventory.ItemStack mainHand = bukkitPlayer.getInventory().getItemInMainHand();
|
||||
org.bukkit.inventory.ItemStack weapon = mainHand.getType() == org.bukkit.Material.AIR
|
||||
? bukkitPlayer.getInventory().getItemInOffHand()
|
||||
: mainHand;
|
||||
return weapon.getEnchantmentLevel(Enchantment.KNOCKBACK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Integer getNoDamageTicks() {
|
||||
return bukkitPlayer.getNoDamageTicks();
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
name: KnockbackSync
|
||||
name: KnockbackSync-OG
|
||||
version: ${version}
|
||||
main: me.caseload.knockbacksync.BukkitLoaderPlugin
|
||||
api-version: '1.13' # We actually support 1.12.2, api-version was added later though
|
||||
authors: [ Caseload, Axionize ]
|
||||
description: Synchronizes player knockback for smoother gameplay.
|
||||
folia-supported: true
|
||||
depends: ${depends}
|
||||
depend: ${depend}
|
||||
permissions:
|
||||
knockbacksync.update:
|
||||
default: op
|
||||
|
||||
@@ -11,11 +11,11 @@ dependencies {
|
||||
compileOnly("org.projectlombok:lombok:1.18.34")
|
||||
annotationProcessor("org.projectlombok:lombok:1.18.34")
|
||||
|
||||
// Shaded in or bundled by platform-specific code
|
||||
// Upstream 2.11.2 API; runtime impl is the externally installed True-OG fork or the shaded bundle.
|
||||
if (shadePE) {
|
||||
implementation("com.github.retrooper:packetevents-api:2.11.1+60a2c34-SNAPSHOT")
|
||||
implementation("com.github.retrooper:packetevents-api:2.11.2")
|
||||
} else {
|
||||
compileOnly("com.github.retrooper:packetevents-api:2.11.1+60a2c34-SNAPSHOT")
|
||||
compileOnly("com.github.retrooper:packetevents-api:2.11.2")
|
||||
}
|
||||
|
||||
implementation("org.yaml:snakeyaml:2.0")
|
||||
@@ -30,4 +30,6 @@ dependencies {
|
||||
|
||||
buildConfig {
|
||||
buildConfigField("String", "GITHUB_REPO", "\"${project.rootProject.ext["githubRepo"]}\"")
|
||||
// Exposes shadePE to source code as a compile-time constant.
|
||||
buildConfigField("boolean", "SHADE_PE", shadePE.toString())
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package me.caseload.knockbacksync;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import com.github.retrooper.packetevents.event.PacketListenerCommon;
|
||||
import lombok.Getter;
|
||||
import me.caseload.knockbacksync.command.MainCommand;
|
||||
import me.caseload.knockbacksync.common.BuildConfig;
|
||||
import me.caseload.knockbacksync.command.generic.AbstractPlayerSelectorParser;
|
||||
import me.caseload.knockbacksync.command.generic.BuilderCommand;
|
||||
import me.caseload.knockbacksync.command.subcommand.PingCommand;
|
||||
@@ -53,6 +55,9 @@ public abstract class Base {
|
||||
@Getter
|
||||
protected AbstractPlayerSelectorParser<Sender> playerSelectorParser;
|
||||
|
||||
// Tracked so onDisable can unregister exactly the listeners registered against the shared provider.
|
||||
private final java.util.List<PacketListenerCommon> peListenerHandles = new java.util.ArrayList<>();
|
||||
|
||||
protected Base() {
|
||||
this.platform = detectPlatform();
|
||||
INSTANCE = this;
|
||||
@@ -105,6 +110,10 @@ public abstract class Base {
|
||||
public abstract void initializeScheduler();
|
||||
|
||||
public void initializePacketEvents() {
|
||||
// External-provider mode skips lifecycle ownership entirely.
|
||||
if (!BuildConfig.SHADE_PE) {
|
||||
return;
|
||||
}
|
||||
PacketEvents.getAPI().getSettings()
|
||||
.checkForUpdates(false)
|
||||
.debug(false);
|
||||
@@ -113,16 +122,34 @@ public abstract class Base {
|
||||
}
|
||||
|
||||
protected void registerCommonListeners() {
|
||||
PacketEvents.getAPI().getEventManager().registerListeners(
|
||||
new AttributeChangeListener(),
|
||||
new PingSendListener(),
|
||||
new PingReceiveListener(),
|
||||
new PacketPlayerJoinQuit(),
|
||||
new ClientBrandListener()
|
||||
);
|
||||
registerTrackedPacketListener(new AttributeChangeListener());
|
||||
registerTrackedPacketListener(new PingSendListener());
|
||||
registerTrackedPacketListener(new PingReceiveListener());
|
||||
registerTrackedPacketListener(new PacketPlayerJoinQuit());
|
||||
registerTrackedPacketListener(new ClientBrandListener());
|
||||
Event.setEventBus(eventBus);
|
||||
}
|
||||
|
||||
/** Register a PacketEvents listener and remember its handle for unregister on disable. */
|
||||
protected void registerTrackedPacketListener(PacketListenerCommon listener) {
|
||||
PacketEvents.getAPI().getEventManager().registerListener(listener);
|
||||
peListenerHandles.add(listener);
|
||||
}
|
||||
|
||||
/** Unregister every tracked PacketEvents listener. */
|
||||
public void unregisterPacketListeners() {
|
||||
for (PacketListenerCommon handle : peListenerHandles) {
|
||||
try {
|
||||
PacketEvents.getAPI().getEventManager().unregisterListener(handle);
|
||||
} catch (Throwable t) {
|
||||
if (LOGGER != null) {
|
||||
LOGGER.warning("Failed to unregister PE listener: " + t.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
peListenerHandles.clear();
|
||||
}
|
||||
|
||||
protected abstract void registerPlatformListeners();
|
||||
|
||||
protected void registerCommands() {
|
||||
|
||||
@@ -34,6 +34,19 @@ public class ConfigWrapper {
|
||||
return NumberConversions.toLong(value, def);
|
||||
}
|
||||
|
||||
public double getDouble(String path, double def) {
|
||||
Object value = getValue(path);
|
||||
if (value instanceof Number) return ((Number) value).doubleValue();
|
||||
if (value instanceof String) {
|
||||
try {
|
||||
return Double.parseDouble((String) value);
|
||||
} catch (NumberFormatException ignored) {
|
||||
return def;
|
||||
}
|
||||
}
|
||||
return def;
|
||||
}
|
||||
|
||||
public void set(String path, Object value) {
|
||||
setValue(path, value);
|
||||
}
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
package me.caseload.knockbacksync.listener;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.player.User;
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import me.caseload.knockbacksync.util.LegacyKnockback;
|
||||
|
||||
public abstract class PlayerDamageListener {
|
||||
public void onPlayerDamage(PlatformPlayer victim, PlatformPlayer attacker) {
|
||||
if (!Base.INSTANCE.getConfigManager().isToggled())
|
||||
ConfigManager config = Base.INSTANCE.getConfigManager();
|
||||
if (!config.isToggled())
|
||||
return;
|
||||
|
||||
User user = victim.getUser();
|
||||
@@ -18,7 +22,22 @@ public abstract class PlayerDamageListener {
|
||||
if (playerData == null)
|
||||
return;
|
||||
|
||||
playerData.setVerticalVelocity(playerData.calculateVerticalVelocity(attacker)); // do not move this calculation
|
||||
if (config.isLegacyKnockbackEnabled()) {
|
||||
if (playerData.isRodKnockbackPending()) {
|
||||
// A fishing-rod (bobber-direction) knockback was already supplied for this hit via
|
||||
// the rod API. Keep it instead of overwriting with the melee formula; the velocity
|
||||
// event still owns + latency-syncs it. Its vertical was set by the API call.
|
||||
} else {
|
||||
// KnockbackSync owns the full 1.8 melee velocity. Compute it now (we have the
|
||||
// attacker here) and store it for the PlayerVelocityEvent to apply + sync.
|
||||
Vector3d legacy = LegacyKnockback.compute(victim, attacker, playerData, config);
|
||||
playerData.setLegacyKnockback(legacy);
|
||||
// On-ground sync should target the legacy vertical value, not the 1.9 one.
|
||||
playerData.setVerticalVelocity(legacy.getY());
|
||||
}
|
||||
} else {
|
||||
playerData.setVerticalVelocity(playerData.calculateVerticalVelocity(attacker)); // do not move this calculation
|
||||
}
|
||||
playerData.setLastDamageTicks(victim.getNoDamageTicks());
|
||||
playerData.updateCombat();
|
||||
|
||||
|
||||
+42
-15
@@ -5,29 +5,56 @@ 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 me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.manager.PlayerDataManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public abstract class PlayerKnockbackListener {
|
||||
|
||||
public void onPlayerVelocity(PlatformPlayer victim, Vector3d velocity) {
|
||||
if (!Base.INSTANCE.getConfigManager().isToggled())
|
||||
return;
|
||||
/**
|
||||
* Computes the melee velocity to apply to the victim.
|
||||
*
|
||||
* <p>The returned value, when non-null, MUST be written back by the platform layer.
|
||||
* Bukkit writes it to the {@code PlayerVelocityEvent} (so KnockbackSync is the last,
|
||||
* authoritative writer in the event chain rather than reading/writing the player's
|
||||
* live velocity out-of-band — see issue #7).</p>
|
||||
*
|
||||
* <p>When legacy (1.8) knockback is enabled, the 1.8 vector computed at damage time
|
||||
* replaces vanilla X/Z/Y, and latency Y-correction is applied on top of it. In that
|
||||
* mode this method always returns a velocity (the raw 1.8 vector when no correction
|
||||
* applies), so KnockbackSync owns the final melee velocity.</p>
|
||||
*
|
||||
* @return the velocity to apply, or {@code null} to leave the velocity unchanged.
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d onPlayerVelocity(PlatformPlayer victim, Vector3d velocity) {
|
||||
ConfigManager config = Base.INSTANCE.getConfigManager();
|
||||
if (!config.isToggled())
|
||||
return null;
|
||||
|
||||
User user = victim.getUser();
|
||||
if (user == null) return; // Prevent errors with players disconnecting while this is running (or with fake player?)
|
||||
if (user == null) return null; // Prevent errors with players disconnecting while this is running (or with fake player?)
|
||||
|
||||
PlayerData victimPlayerData = PlayerDataManager.getPlayerData(user);
|
||||
if (victimPlayerData == null)
|
||||
return;
|
||||
return null;
|
||||
|
||||
// Legacy 1.8 knockback: KnockbackSync owns the melee velocity. The 1.8 vector
|
||||
// (computed at damage time) replaces vanilla X/Z/Y. We still apply latency
|
||||
// Y-correction on top when conditions allow; otherwise the raw 1.8 vector is
|
||||
// applied. legacyKb == null means either legacy is off or none is pending, in
|
||||
// which case behaviour falls back to the original (Y-sync of the event velocity).
|
||||
Vector3d legacyKb = config.isLegacyKnockbackEnabled() ? victimPlayerData.consumeLegacyKnockback() : null;
|
||||
Vector3d base = (legacyKb != null) ? legacyKb : velocity;
|
||||
|
||||
if (victimPlayerData.getNotNullPing() < PlayerData.PING_OFFSET)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
double distanceToGround = victimPlayerData.getDistanceToGround();
|
||||
if (distanceToGround <= 0)
|
||||
return; // minecraft already does the work for us
|
||||
return legacyKb; // minecraft already does the work for us
|
||||
|
||||
WrappedBlockState blockState = victim.getWorld().getBlockStateAt(victim.getLocation());
|
||||
if (victim.isGliding() ||
|
||||
@@ -35,21 +62,21 @@ public abstract class PlayerKnockbackListener {
|
||||
blockState.getType() == StateTypes.LAVA ||
|
||||
blockState.getType() == StateTypes.COBWEB ||
|
||||
blockState.getType() == StateTypes.SCAFFOLDING)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
Vector3d adjustedVelocity;
|
||||
if (victimPlayerData.isOnGroundClientSide(velocity.getY(), distanceToGround)) {
|
||||
if (victimPlayerData.isOnGroundClientSide(base.getY(), distanceToGround)) {
|
||||
Integer damageTicks = victimPlayerData.getLastDamageTicks();
|
||||
if (damageTicks != null && damageTicks > 8)
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
adjustedVelocity = velocity.withY(victimPlayerData.getVerticalVelocity()); // Should be impossible to produce a NPE in this context
|
||||
adjustedVelocity = base.withY(victimPlayerData.getVerticalVelocity()); // Should be impossible to produce a NPE in this context
|
||||
}
|
||||
else if (victimPlayerData.isOffGroundSyncEnabled())
|
||||
adjustedVelocity = velocity.withY(victimPlayerData.getCompensatedOffGroundVelocity());
|
||||
adjustedVelocity = base.withY(victimPlayerData.getCompensatedOffGroundVelocity());
|
||||
else
|
||||
return;
|
||||
return legacyKb;
|
||||
|
||||
victim.setVelocity(adjustedVelocity);
|
||||
return adjustedVelocity;
|
||||
}
|
||||
}
|
||||
}
|
||||
+20
-11
@@ -33,32 +33,41 @@ public class PingReceiveListener extends PacketListenerAbstract {
|
||||
PlayerData playerData = PlayerDataManager.getPlayerData(user);
|
||||
if (playerData == null) return;
|
||||
|
||||
if (playerData.pingStrategy == PingStrategy.KEEPALIVE && packetType == PacketType.Play.Client.KEEP_ALIVE) {
|
||||
// Cancel echoes of injected packets before any strategy check: on 1.20.2+ an unexpected keepalive is an instant "Timed out" kick, so a strategy switch mid-flight must not leak one.
|
||||
if (packetType == PacketType.Play.Client.KEEP_ALIVE) {
|
||||
WrapperPlayClientKeepAlive keepAlive = new WrapperPlayClientKeepAlive(event);
|
||||
long receivedId = keepAlive.getId();
|
||||
|
||||
handlePingCalculationPackets(event, playerData, receivedId, playerData.keepaliveMap);
|
||||
} else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType == PacketType.Play.Client.PONG) {
|
||||
if (playerData.didWeSendThatPacket(receivedId))
|
||||
event.setCancelled(true);
|
||||
|
||||
if (playerData.pingStrategy == PingStrategy.KEEPALIVE)
|
||||
handlePingCalculationPackets(playerData, receivedId, playerData.keepaliveMap);
|
||||
} else if (packetType == PacketType.Play.Client.PONG) {
|
||||
WrapperPlayClientPong pong = new WrapperPlayClientPong(event);
|
||||
int id = pong.getId();
|
||||
|
||||
handlePingCalculationPackets(event, playerData, id, playerData.transactionsSent);
|
||||
} else if (playerData.pingStrategy == PingStrategy.TRANSACTION && packetType == PacketType.Play.Client.WINDOW_CONFIRMATION) {
|
||||
if (playerData.didWeSendThatPacket(id))
|
||||
event.setCancelled(true);
|
||||
|
||||
if (playerData.pingStrategy == PingStrategy.TRANSACTION)
|
||||
handlePingCalculationPackets(playerData, id, playerData.transactionsSent);
|
||||
} else if (packetType == PacketType.Play.Client.WINDOW_CONFIRMATION) {
|
||||
WrapperPlayClientWindowConfirmation windowConfirmation = new WrapperPlayClientWindowConfirmation(event);
|
||||
int id = windowConfirmation.getActionId();
|
||||
|
||||
handlePingCalculationPackets(event, playerData, id, playerData.transactionsSent);
|
||||
if (playerData.didWeSendThatPacket(id))
|
||||
event.setCancelled(true);
|
||||
|
||||
if (playerData.pingStrategy == PingStrategy.TRANSACTION)
|
||||
handlePingCalculationPackets(playerData, id, playerData.transactionsSent);
|
||||
}
|
||||
}
|
||||
|
||||
private <T extends Number> void handlePingCalculationPackets(PacketReceiveEvent event, PlayerData playerData, long id, Queue<Pair<T, Long>> packetSentList) {
|
||||
private <T extends Number> void handlePingCalculationPackets(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)) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
if (!Base.INSTANCE.getConfigManager().isToggled()) return;
|
||||
|
||||
Pair<T, Long> data = null;
|
||||
|
||||
@@ -19,7 +19,7 @@ import java.util.Map;
|
||||
@Setter
|
||||
public class ConfigManager {
|
||||
|
||||
public static final long CONFIG_VERSION = 7;
|
||||
public static final long CONFIG_VERSION = 9;
|
||||
|
||||
private boolean toggled;
|
||||
private boolean runnableEnabled;
|
||||
@@ -27,6 +27,16 @@ public class ConfigManager {
|
||||
private boolean notifyUpdate;
|
||||
private boolean autoUpdate;
|
||||
|
||||
// Legacy (1.8) knockback: makes KnockbackSync the single owner of melee velocity,
|
||||
// reproducing OldCombatMechanics' old-player-knockback values while still latency-syncing.
|
||||
private boolean legacyKnockbackEnabled;
|
||||
private double legacyKnockbackHorizontal;
|
||||
private double legacyKnockbackVertical;
|
||||
private double legacyKnockbackVerticalLimit;
|
||||
private double legacyKnockbackExtraHorizontal;
|
||||
private double legacyKnockbackExtraVertical;
|
||||
private boolean legacyKnockbackResistanceEnabled;
|
||||
|
||||
private long runnableInterval;
|
||||
private long combatTimer;
|
||||
private long spikeThreshold;
|
||||
@@ -93,11 +103,11 @@ public class ConfigManager {
|
||||
|
||||
toggled = configWrapper.getBoolean("enabled", true);
|
||||
|
||||
// Checks to see if the runnable was enabled...
|
||||
// and if we now want to disable it
|
||||
boolean newRunnableEnabled = configWrapper.getBoolean("runnable.enabled", true);
|
||||
if (runnableEnabled && newRunnableEnabled && pingTask != null) { // null check for first startup
|
||||
// Always stop the previous ping task on reload (reschedule below only if still enabled); gating the cancel on staying enabled leaked the task when disabling via reload.
|
||||
if (pingTask != null) { // null on first startup
|
||||
pingTask.cancel();
|
||||
pingTask = null;
|
||||
}
|
||||
|
||||
runnableEnabled = newRunnableEnabled;
|
||||
@@ -114,9 +124,17 @@ public class ConfigManager {
|
||||
pingTask = Base.INSTANCE.getScheduler().runTaskTimerAsynchronously(new PingRunnable(), initialDelay, pingTaskRunnableInterval);
|
||||
}
|
||||
|
||||
legacyKnockbackEnabled = configWrapper.getBoolean("legacy_knockback.enabled", false);
|
||||
legacyKnockbackHorizontal = configWrapper.getDouble("legacy_knockback.horizontal", 0.4);
|
||||
legacyKnockbackVertical = configWrapper.getDouble("legacy_knockback.vertical", 0.4);
|
||||
legacyKnockbackVerticalLimit = configWrapper.getDouble("legacy_knockback.vertical_limit", 0.4);
|
||||
legacyKnockbackExtraHorizontal = configWrapper.getDouble("legacy_knockback.extra_horizontal", 0.5);
|
||||
legacyKnockbackExtraVertical = configWrapper.getDouble("legacy_knockback.extra_vertical", 0.1);
|
||||
legacyKnockbackResistanceEnabled = configWrapper.getBoolean("legacy_knockback.enable_knockback_resistance", false);
|
||||
|
||||
notifyUpdate = configWrapper.getBoolean("notify_updates", true);
|
||||
autoUpdate = configWrapper.getBoolean("auto_update", true);
|
||||
combatTimer = configWrapper.getLong("runnable.timer", 30L);
|
||||
combatTimer = configWrapper.getLong("runnable.combat_timer", 30L);
|
||||
spikeThreshold = configWrapper.getLong("spike_threshold", 20L);
|
||||
enableMessage = configWrapper.getString("messages.toggle.global.enable", "&aSuccessfully enabled KnockbackSync.");
|
||||
disableMessage = configWrapper.getString("messages.toggle.global.disable", "&cSuccessfully disabled KnockbackSync.");
|
||||
|
||||
@@ -42,6 +42,16 @@ public interface PlatformPlayer {
|
||||
|
||||
int getMainHandKnockbackLevel();
|
||||
|
||||
/**
|
||||
* Knockback enchant level used for legacy (1.8) knockback bonus calculation.
|
||||
* Mirrors OldCombatMechanics: the main hand item, or the off hand item when the
|
||||
* main hand is empty. Defaults to the main hand level for platforms that do not
|
||||
* override it.
|
||||
*/
|
||||
default int getWeaponKnockbackLevel() {
|
||||
return getMainHandKnockbackLevel();
|
||||
}
|
||||
|
||||
@Nullable Integer getNoDamageTicks();
|
||||
|
||||
void setVelocity(Vector3d adjustedVelocity);
|
||||
|
||||
@@ -84,6 +84,14 @@ public class PlayerData {
|
||||
@Nullable @Setter private Double ping, previousPing;
|
||||
@Nullable @Setter private Double verticalVelocity;
|
||||
@Nullable @Setter private Integer lastDamageTicks;
|
||||
// Legacy (1.8) knockback computed at damage time, consumed by the next PlayerVelocityEvent.
|
||||
// Guarded by a short expiry so a stale value never affects an unrelated velocity event.
|
||||
@Nullable private Vector3d legacyKnockback;
|
||||
private long legacyKnockbackExpiryNanos;
|
||||
// True when the pending legacyKnockback is a fishing-rod (bobber-direction) vector supplied
|
||||
// via the rod API rather than the melee formula. Lets the damage listener keep the rod vector
|
||||
// instead of overwriting it with melee, while still latency-syncing it. See api.KnockbackSyncRodApi.
|
||||
private boolean legacyKnockbackIsRod;
|
||||
@Setter private double gravityAttribute = 0.08;
|
||||
@Setter private double knockbackResistanceAttribute = 0.0;
|
||||
public PingStrategy pingStrategy; // this is currently shared between all instances, but can be made per-player later
|
||||
@@ -95,6 +103,63 @@ public class PlayerData {
|
||||
this.pingStrategy = loadPingStrategy(Base.INSTANCE.getConfigManager());
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores the legacy (1.8) knockback to apply on the next PlayerVelocityEvent.
|
||||
* Expires shortly after so it can never be applied to an unrelated velocity event
|
||||
* (explosions, other plugins, etc.) if the expected velocity event never fires.
|
||||
*/
|
||||
public void setLegacyKnockback(@Nullable Vector3d legacyKnockback) {
|
||||
this.legacyKnockback = legacyKnockback;
|
||||
this.legacyKnockbackIsRod = false;
|
||||
// 100ms window: damage and the resulting velocity event fire in the same tick.
|
||||
this.legacyKnockbackExpiryNanos = System.nanoTime() + 100_000_000L;
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores a fishing-rod (bobber-direction) knockback to apply + latency-sync on the next
|
||||
* PlayerVelocityEvent, flagged so the damage listener keeps it instead of overwriting it with
|
||||
* the melee formula. Must be set immediately before the rod's damage tick. See
|
||||
* {@code api.KnockbackSyncRodApi}.
|
||||
*/
|
||||
public void setRodKnockback(@NotNull Vector3d rodKnockback) {
|
||||
this.legacyKnockback = rodKnockback;
|
||||
this.legacyKnockbackIsRod = true;
|
||||
this.legacyKnockbackExpiryNanos = System.nanoTime() + 100_000_000L;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if an unexpired fishing-rod knockback is pending (so the damage listener must
|
||||
* not overwrite it with melee knockback).
|
||||
*/
|
||||
public boolean isRodKnockbackPending() {
|
||||
return peekLegacyKnockback() != null && legacyKnockbackIsRod;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the pending legacy knockback if present and not expired, otherwise {@code null}.
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d peekLegacyKnockback() {
|
||||
if (legacyKnockback == null) return null;
|
||||
if (System.nanoTime() > legacyKnockbackExpiryNanos) {
|
||||
legacyKnockback = null;
|
||||
legacyKnockbackIsRod = false;
|
||||
return null;
|
||||
}
|
||||
return legacyKnockback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns and clears the pending legacy knockback (if present and not expired).
|
||||
*/
|
||||
@Nullable
|
||||
public Vector3d consumeLegacyKnockback() {
|
||||
Vector3d v = peekLegacyKnockback();
|
||||
legacyKnockback = null;
|
||||
legacyKnockbackIsRod = false;
|
||||
return v;
|
||||
}
|
||||
|
||||
public double getNotNullPing() {
|
||||
return ping != null ? ping : platformPlayer.getPing();
|
||||
}
|
||||
@@ -156,12 +221,13 @@ public class PlayerData {
|
||||
packet = new WrapperPlayServerWindowConfirmation((byte) 0, pingTransactionID, false);
|
||||
}
|
||||
|
||||
// sendPacket (write + flush) rather than writePacket: an unflushed write sits in the channel until the next flush and inflates the measured ping.
|
||||
if (async) {
|
||||
ChannelHelper.runInEventLoop(user.getChannel(), () -> {
|
||||
user.writePacket(packet);
|
||||
user.sendPacket(packet);
|
||||
});
|
||||
} else {
|
||||
user.writePacket(packet);
|
||||
user.sendPacket(packet);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -351,7 +417,8 @@ public class PlayerData {
|
||||
}
|
||||
|
||||
private PingStrategy loadPingStrategy(ConfigManager configManager) {
|
||||
String pingStrategy = configManager.getConfigWrapper().getString("ping_strategy", "KEEPALIVE");
|
||||
// Default PING: vanilla ignores unintercepted pong echoes, while unintercepted keepalive echoes kick ("Timed out") on 1.20.2+.
|
||||
String pingStrategy = configManager.getConfigWrapper().getString("ping_strategy", "PING");
|
||||
switch (pingStrategy) {
|
||||
case "KEEPALIVE":
|
||||
return PingStrategy.KEEPALIVE;
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
/*
|
||||
* Legacy (Minecraft 1.8) melee knockback formula.
|
||||
*
|
||||
* This file is a port of the knockback calculation from BukkitOldCombatMechanics
|
||||
* (kernitus/BukkitOldCombatMechanics), module ModulePlayerKnockback, which is
|
||||
* licensed under the Mozilla Public License, v. 2.0:
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* The MPL-2.0 does not carry the "Incompatible With Secondary Licenses" notice
|
||||
* (Exhibit B), so per MPL-2.0 §3.3 this Covered Software may be distributed as
|
||||
* part of a Larger Work under the GNU General Public License v3.0-or-later that
|
||||
* governs the rest of KnockbackSync. The terms of the MPL continue to apply to
|
||||
* this file. See the NOTICE file at the project root for attribution details.
|
||||
*/
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import com.github.retrooper.packetevents.util.Vector3d;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
import me.caseload.knockbacksync.player.PlayerData;
|
||||
|
||||
/**
|
||||
* Computes the exact 1.8-style melee knockback vector applied to a victim, so that
|
||||
* KnockbackSync can own the final melee velocity (horizontal + vertical) and then
|
||||
* latency-correct it, rather than letting vanilla knockback win.
|
||||
*
|
||||
* <p>The math is a faithful reproduction of OldCombatMechanics' legacy player
|
||||
* knockback so that values are identical to running OCM's old-player-knockback
|
||||
* module, while KnockbackSync remains the single writer of the velocity.</p>
|
||||
*/
|
||||
public final class LegacyKnockback {
|
||||
|
||||
private LegacyKnockback() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param victim the player receiving knockback
|
||||
* @param attacker the attacking player
|
||||
* @param victimData the victim's tracked data (for knockback resistance attribute)
|
||||
* @param config the plugin configuration (legacy knockback tunables)
|
||||
* @return the 1.8-style velocity to apply to the victim, before latency Y-correction
|
||||
*/
|
||||
public static Vector3d compute(PlatformPlayer victim, PlatformPlayer attacker,
|
||||
PlayerData victimData, ConfigManager config) {
|
||||
final double knockbackHorizontal = config.getLegacyKnockbackHorizontal();
|
||||
final double knockbackVertical = config.getLegacyKnockbackVertical();
|
||||
final double knockbackVerticalLimit = config.getLegacyKnockbackVerticalLimit();
|
||||
final double knockbackExtraHorizontal = config.getLegacyKnockbackExtraHorizontal();
|
||||
final double knockbackExtraVertical = config.getLegacyKnockbackExtraVertical();
|
||||
final boolean netheriteKnockbackResistance = config.isLegacyKnockbackResistanceEnabled();
|
||||
|
||||
// Figure out base knockback direction (attacker -> victim) with vanilla jitter
|
||||
// when the two are stacked on the exact same column.
|
||||
double d0 = attacker.getX() - victim.getX();
|
||||
double d1;
|
||||
for (d1 = attacker.getZ() - victim.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D;
|
||||
d1 = (Math.random() - Math.random()) * 0.01D) {
|
||||
d0 = (Math.random() - Math.random()) * 0.01D;
|
||||
}
|
||||
|
||||
final double magnitude = Math.sqrt(d0 * d0 + d1 * d1);
|
||||
|
||||
// Player velocity before any friction is applied (pre-knockback motion).
|
||||
final Vector3d v = victim.getVelocity();
|
||||
|
||||
// Apply friction (halve), then add base knockback.
|
||||
double vx = (v.getX() / 2) - (d0 / magnitude * knockbackHorizontal);
|
||||
double vy = (v.getY() / 2) + knockbackVertical;
|
||||
double vz = (v.getZ() / 2) - (d1 / magnitude * knockbackHorizontal);
|
||||
|
||||
// Bonus knockback for sprinting and the Knockback enchantment.
|
||||
int bonusKnockback = attacker.getWeaponKnockbackLevel();
|
||||
if (attacker.isSprinting()) {
|
||||
bonusKnockback++;
|
||||
}
|
||||
|
||||
// NOTE: vanilla caps vertical BEFORE adding the sprint/enchant bonus vertical.
|
||||
if (vy > knockbackVerticalLimit) {
|
||||
vy = knockbackVerticalLimit;
|
||||
}
|
||||
|
||||
if (bonusKnockback > 0) {
|
||||
final float yaw = attacker.getYaw();
|
||||
vx += -Math.sin(yaw * 3.1415927F / 180.0F) * (float) bonusKnockback * knockbackExtraHorizontal;
|
||||
vy += knockbackExtraVertical;
|
||||
vz += Math.cos(yaw * 3.1415927F / 180.0F) * (float) bonusKnockback * knockbackExtraHorizontal;
|
||||
}
|
||||
|
||||
if (netheriteKnockbackResistance) {
|
||||
// Each piece of netherite armour yields 10% horizontal resistance.
|
||||
final double resistance = 1 - victimData.getKnockbackResistanceAttribute();
|
||||
vx *= resistance;
|
||||
vz *= resistance;
|
||||
}
|
||||
|
||||
return new Vector3d(vx, vy, vz);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
#########################################
|
||||
|
||||
# Do not modify!
|
||||
config_version: 7
|
||||
config_version: 9
|
||||
|
||||
# Plugin enabled state
|
||||
# Toggleable using /knockbacksync toggle
|
||||
@@ -30,21 +30,46 @@ runnable:
|
||||
# the threshold, the previous ping value is used to avoid calculation inaccuracies.
|
||||
spike_threshold: 20
|
||||
|
||||
# OPTIONS: KEEPALIVE, PING, TRANSACTION - PING and TRANSACTION are aliases for each other and are effectively the same
|
||||
# The packet type used to measure ping by the runnable.
|
||||
# KEEPALIVE is the most accurate however sending too many of them too often (such as using a runnable with a low interval)
|
||||
# - May disconnect players, especially laggy ones if sent too often
|
||||
# - The default interval of 20 ticks or 1 second
|
||||
# means it is in theory possible for a player to have a ping spike in-between two sword attacks
|
||||
# and have it immediately spike back down, slightly throwing off knockback synchronization
|
||||
# in practice this is very rare and the extra ping accuracy and precision is more valued
|
||||
# PING/TRANSACTION can be sent more often (and therefore better detect ping spikes) but are less precise
|
||||
# ping measured in ms with PING/TRANSACTION is typically within ± 5ms of actual but can be up to 50ms off
|
||||
ping_strategy: "KEEPALIVE"
|
||||
# OPTIONS: PING, TRANSACTION (aliases), KEEPALIVE. PING is safe (vanilla ignores unexpected pongs, ViaVersion translates for 1.8-1.16, ± 5ms); KEEPALIVE is slightly more precise but any unintercepted echo kicks ("Timed out") on 1.20.2+ and anticheat NET checks may kick for the extra traffic.
|
||||
ping_strategy: "PING"
|
||||
|
||||
# Whether to try to detect when player is offground and apply less kb
|
||||
enable_offground_synchronization: true
|
||||
|
||||
# Legacy (1.8) melee knockback.
|
||||
# When enabled, KnockbackSync computes the exact 1.8 player-vs-player knockback
|
||||
# (horizontal + vertical) itself and becomes the single owner of melee velocity,
|
||||
# then latency-syncs it as usual. This reproduces OldCombatMechanics'
|
||||
# old-player-knockback values for ALL clients 1.8+ while keeping them synced.
|
||||
#
|
||||
# IMPORTANT: if you enable this, DISABLE OldCombatMechanics' old-player-knockback
|
||||
# module (remove it from the active modeset). Running both at once makes two
|
||||
# plugins fight over PlayerVelocityEvent. KnockbackSync owns the velocity here.
|
||||
# OCM can still provide its other features (attack cooldown removal, etc.).
|
||||
legacy_knockback:
|
||||
enabled: true # Master toggle for legacy knockback
|
||||
horizontal: 0.4 # Base horizontal knockback (OCM: knockback-horizontal)
|
||||
vertical: 0.4 # Base vertical knockback (OCM: knockback-vertical)
|
||||
vertical_limit: 0.4 # Vertical cap before sprint/enchant bonus (OCM: knockback-vertical-limit)
|
||||
extra_horizontal: 0.5 # Bonus horizontal per sprint/Knockback level (OCM: knockback-extra-horizontal)
|
||||
extra_vertical: 0.1 # Bonus vertical when sprint/Knockback applies (OCM: knockback-extra-vertical)
|
||||
# When false (default, matching OCM), netherite/armour knockback resistance is
|
||||
# ignored so the velocity event always fires and full 1.8 knockback is applied.
|
||||
# When true, horizontal knockback is reduced by the victim's resistance attribute.
|
||||
#
|
||||
# Scope of the false setting:
|
||||
# - Melee PvP: LegacyKnockback already ignores resistance (it owns the velocity).
|
||||
# - Projectile PvP (bow/arrow, trident, and snowball/egg/ender pearl once
|
||||
# OldCombatMechanics' projectile-knockback gives them damage): KnockbackSync
|
||||
# temporarily nullifies the victim's knockback-resistance attribute for the hit
|
||||
# so vanilla applies full knockback, then restores it (PvE is unaffected).
|
||||
# - Fishing-rod PvP: owned by OCM old-fishing-knockback + the rod API (already 1.8).
|
||||
# - Explosions are NOT affected by knockback resistance on 1.19.4, so they are
|
||||
# out of scope here.
|
||||
# Ownership: KnockbackSync owns player knockback; keep OCM's old-player-knockback
|
||||
# module DISABLED (see the IMPORTANT note above).
|
||||
enable_knockback_resistance: false
|
||||
|
||||
# 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
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
plugins {
|
||||
id("fabric-loom")
|
||||
}
|
||||
|
||||
loom {
|
||||
accessWidenerPath = file("src/main/resources/knockbacksync.accesswidener")
|
||||
}
|
||||
|
||||
base {
|
||||
archivesName.set("${rootProject.property("archives_base_name")}-fabric")
|
||||
}
|
||||
|
||||
// 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 {
|
||||
source(project(":common").sourceSets.main.get().allSource)
|
||||
}
|
||||
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
source(project(":common").sourceSets.main.get().allJava)
|
||||
}
|
||||
|
||||
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("net.fabricmc:yarn:${rootProject.property("yarn_mappings")}")
|
||||
modImplementation("net.fabricmc:fabric-loader:${rootProject.property("loader_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.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
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")!!)
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2")!!)
|
||||
include(implementation("com.fasterxml.jackson.core:jackson-core:2.17.2")!!)
|
||||
// Not requires in modern Minecraft. May be needed if fabric version is backported to older versions
|
||||
// include(implementation("org.apache.commons:commons-lang3:3.17.0")!!)
|
||||
// include(implementation("commons-io:commons-io:2.16.1")!!)
|
||||
|
||||
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.processResources {
|
||||
from(project(":common").sourceSets.main.get().resources)
|
||||
|
||||
inputs.property("version", project.version)
|
||||
inputs.property("minecraft_version", rootProject.property("minecraft_version"))
|
||||
inputs.property("loader_version", rootProject.property("loader_version"))
|
||||
filteringCharset = "UTF-8"
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand(
|
||||
"version" to project.version,
|
||||
"minecraft_version" to rootProject.property("minecraft_version")!!,
|
||||
"loader_version" to rootProject.property("loader_version")!!
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
package me.caseload.knockbacksync;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
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.FabricPlayerKnockbackListener;
|
||||
import me.caseload.knockbacksync.listener.fabric.FabricTickRateChangeListener;
|
||||
import me.caseload.knockbacksync.manager.ConfigManager;
|
||||
import me.caseload.knockbacksync.permission.FabricPermissionChecker;
|
||||
import me.caseload.knockbacksync.permission.PermissionChecker;
|
||||
import me.caseload.knockbacksync.scheduler.FabricSchedulerAdapter;
|
||||
import me.caseload.knockbacksync.sender.FabricPlayerSelectorParser;
|
||||
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;
|
||||
import org.incendo.cloud.fabric.FabricServerCommandManager;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Optional;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class FabricBase extends Base {
|
||||
|
||||
private final Logger logger = Logger.getLogger(FabricLoaderMod.class.getName());
|
||||
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();
|
||||
super.playerSelectorParser = new FabricPlayerSelectorParser<>();
|
||||
super.commandManager = new FabricServerCommandManager<>(
|
||||
ExecutionCoordinator.simpleCoordinator(),
|
||||
fabricSenderFactory
|
||||
);
|
||||
super.statsManager = new FabricStatsManager();
|
||||
super.platformServer = new FabricServer();
|
||||
super.pluginJarHashProvider = new PluginJarHashProvider(getJarURL());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Logger getLogger() {
|
||||
return logger;
|
||||
}
|
||||
|
||||
@Override
|
||||
public File getDataFolder() {
|
||||
return FabricLoader.getInstance().getConfigDir().toFile();
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getResource(String filename) {
|
||||
return getClass().getResourceAsStream("/config.yml");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void 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
|
||||
public void initializeScheduler() {
|
||||
scheduler = new FabricSchedulerAdapter();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPlatformListeners() {
|
||||
new FabricPlayerDamageListener().register();
|
||||
new FabricPlayerKnockbackListener().register();
|
||||
new FabricTickRateChangeListener().register();
|
||||
super.eventBus.registerStaticListeners(EntityTickManager.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getVersion() {
|
||||
return FabricLoader.getInstance().getModContainer("knockbacksync")
|
||||
.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString())
|
||||
.orElse("unknown");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveDefaultConfig() {
|
||||
File configFile = new File(FabricLoader.getInstance().getConfigDir().toFile(), "config.yml");
|
||||
if (!configFile.exists()) {
|
||||
try (InputStream inputStream = getClass().getResourceAsStream("/config.yml")) {
|
||||
if (inputStream != null) {
|
||||
Files.copy(inputStream, configFile.toPath());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionChecker getPermissionChecker() {
|
||||
return permissionChecker;
|
||||
}
|
||||
|
||||
@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()) {
|
||||
String jarPath = modContainer.get().getRootPath().getFileSystem().toString();
|
||||
jarPath = jarPath.replaceAll("^jar:", "").replaceAll("!/$", "");
|
||||
try {
|
||||
jarUrl = new File(jarPath).toURI().toURL();
|
||||
} catch (MalformedURLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
return jarUrl;
|
||||
}
|
||||
|
||||
public void restartServer() {
|
||||
|
||||
}
|
||||
|
||||
public boolean hasRestartScript() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
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;
|
||||
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class FabricLoaderMod implements PreLaunchEntrypoint, ModInitializer {
|
||||
|
||||
private final Base core = new FabricBase();
|
||||
|
||||
public static MinecraftServer getServer() {
|
||||
return (MinecraftServer) FabricLoader.getInstance().getGameInstance();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPreLaunch() {
|
||||
ensureServer();
|
||||
core.load();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
ensureServer();
|
||||
core.enable();
|
||||
ServerLifecycleEvents.SERVER_STOPPING.register((server) -> {
|
||||
core.scheduler.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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package me.caseload.knockbacksync.callback;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
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) {
|
||||
ActionResult result = listener.onVelocityChange(player, velocity);
|
||||
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult onVelocityChange(ServerPlayerEntity player, Vec3d velocity);
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package me.caseload.knockbacksync.callback;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
||||
public interface TickRateChangeEvent {
|
||||
Event<TickRateChangeEvent> EVENT = EventFactory.createArrayBacked(TickRateChangeEvent.class,
|
||||
(listeners) -> (oldTickRate, newTickRate) -> {
|
||||
for (TickRateChangeEvent listener : listeners) {
|
||||
listener.onTickRateChange(oldTickRate, newTickRate);
|
||||
}
|
||||
});
|
||||
|
||||
void onTickRateChange(float oldTickRate, float newTickRate);
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
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 java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
public class EntityTickManager {
|
||||
private static final Map<EntityType<?>, Integer> customTickIntervals = new HashMap<>();
|
||||
|
||||
static {
|
||||
updateTickIntervals(Base.INSTANCE.getConfigManager().getConfigWrapper());
|
||||
}
|
||||
|
||||
@KBSyncEventHandler
|
||||
public static void updateTickIntervals(ConfigReloadEvent event) {
|
||||
ConfigWrapper configWrapper = event.getConfigManager().getConfigWrapper();
|
||||
updateTickIntervals(configWrapper);
|
||||
|
||||
// Map<String, Integer> entityIntervals = CustomUpdateIntervals.loadEntityIntervalsFromConfig();
|
||||
// for (ServerLevel level : FabricLoaderMod.getServer().getAllLevels()) {
|
||||
// CustomUpdateIntervals.updateIntervals(level, entityIntervals);
|
||||
// }
|
||||
}
|
||||
|
||||
private static void updateTickIntervals(ConfigWrapper configWrapper) {
|
||||
customTickIntervals.clear();
|
||||
for (String entityKey : configWrapper.getKeys("entity_tick_intervals")) {
|
||||
try {
|
||||
Optional<EntityType<?>> entityType = EntityType.get(entityKey.toLowerCase());
|
||||
if (entityType.isPresent()) {
|
||||
int interval = configWrapper.getInt("entity_tick_intervals." + entityKey, entityType.get().getTrackTickInterval());
|
||||
customTickIntervals.put(entityType.get(), interval);
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
System.err.println("Invalid entity type in config: " + entityKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int getCustomUpdateInterval(EntityType<?> entityType) {
|
||||
return customTickIntervals.getOrDefault(entityType, entityType.getTrackTickInterval());
|
||||
}
|
||||
}
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
|
||||
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.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((ServerPlayerEntity) player, entity);
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
}
|
||||
|
||||
private void onPlayerDamage(ServerPlayerEntity attacker, Entity victimEntity) {
|
||||
if (victimEntity instanceof PlayerEntity victim) {
|
||||
PlatformPlayer platformAttacker = new FabricPlayer(attacker);
|
||||
PlatformPlayer platformVictim = new FabricPlayer((ServerPlayerEntity) victim);
|
||||
super.onPlayerDamage(platformVictim, platformAttacker); // Call the shared method
|
||||
}
|
||||
}
|
||||
}
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
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.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.getRecentDamageSource();
|
||||
if (lastDamageSource == null)
|
||||
return ActionResult.PASS;
|
||||
|
||||
// Check if the damage is from a player attack
|
||||
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 ActionResult.PASS;
|
||||
});
|
||||
}
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package me.caseload.knockbacksync.listener.fabric;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.FabricBase;
|
||||
import me.caseload.knockbacksync.callback.TickRateChangeEvent;
|
||||
|
||||
public class FabricTickRateChangeListener {
|
||||
public void register() {
|
||||
TickRateChangeEvent.EVENT.register((oldTickRate, newTickRate) -> {
|
||||
if (oldTickRate != newTickRate) {
|
||||
((FabricBase) Base.INSTANCE).setTickRate(newTickRate);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.entity.EntityTickManager;
|
||||
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(ServerChunkLoadingManager.class)
|
||||
public abstract class ChunkMapMixin {
|
||||
|
||||
@Redirect(method = "loadEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/EntityType;getTrackTickInterval()I"))
|
||||
private int getCustomUpdateInterval(EntityType<?> entityType) {
|
||||
return EntityTickManager.getCustomUpdateInterval(entityType);
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
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,63 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.callback.PlayerVelocityEvent;
|
||||
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(PlayerEntity.class)
|
||||
public class PlayerMixin {
|
||||
|
||||
@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) {
|
||||
|
||||
// 1. Get the "Proposed" Velocity (The knockback calculated lines above)
|
||||
Vec3d proposedVelocity = target.getVelocity();
|
||||
|
||||
// 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,21 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
import me.caseload.knockbacksync.callback.TickRateChangeEvent;
|
||||
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(TickManager.class)
|
||||
public class TickRateManagerMixin {
|
||||
@Shadow
|
||||
protected float tickRate;
|
||||
|
||||
@Inject(method = "setTickRate", at = @At("HEAD"))
|
||||
private void onSetTickRate(float tickRate, CallbackInfo ci) {
|
||||
float oldTickRate = this.tickRate;
|
||||
TickRateChangeEvent.EVENT.invoker().onTickRateChange(oldTickRate, tickRate);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package me.caseload.knockbacksync.mixin;
|
||||
|
||||
public interface UpdateIntervalAccessor {
|
||||
void setUpdateInterval(int interval);
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
package me.caseload.knockbacksync.permission;
|
||||
|
||||
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.server.command.ServerCommandSource;
|
||||
|
||||
public class FabricPermissionChecker implements PermissionChecker {
|
||||
|
||||
public boolean hasPermission(ServerCommandSource source, String permission) {
|
||||
return Permissions.check(source, permission, false);
|
||||
}
|
||||
|
||||
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 ServerCommandSource commandSourceStack) {
|
||||
return Permissions.check(commandSourceStack, s, defaultIfUnset);
|
||||
}
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(Sender source, String s, boolean defaultIfUnset) {
|
||||
return source.hasPermission(s);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(PlatformPlayer platformPlayer, String s) {
|
||||
return Permissions.check(((FabricPlayer) platformPlayer).fabricPlayer, s);
|
||||
}
|
||||
}
|
||||
@@ -1,174 +0,0 @@
|
||||
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.util.Vector3d;
|
||||
import com.google.common.base.Preconditions;
|
||||
import me.caseload.knockbacksync.world.FabricWorld;
|
||||
import me.caseload.knockbacksync.world.PlatformWorld;
|
||||
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;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public class FabricPlayer implements PlatformPlayer {
|
||||
public final ServerPlayerEntity fabricPlayer;
|
||||
public final User user;
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return fabricPlayer.getName().getString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getX() {
|
||||
return fabricPlayer.getX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getY() {
|
||||
return fabricPlayer.getY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getZ() {
|
||||
return fabricPlayer.getZ();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPitch() {
|
||||
return fabricPlayer.getPitch();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getYaw() {
|
||||
return fabricPlayer.getYaw();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOnGround() {
|
||||
return fabricPlayer.isOnGround();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPing() {
|
||||
return fabricPlayer.networkHandler.getLatency();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGliding() {
|
||||
return fabricPlayer.isGliding();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformWorld getWorld() {
|
||||
return new FabricWorld(fabricPlayer.getEntityWorld());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector3d getLocation() {
|
||||
return new Vector3d(fabricPlayer.getX(), fabricPlayer.getY(), fabricPlayer.getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(@NotNull String s) {
|
||||
fabricPlayer.sendMessage(Text.literal(s));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getAttackCooldown() {
|
||||
// this is what paper does I have no idea how this works
|
||||
return fabricPlayer.getAttackCooldownProgress(0.5f);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSprinting() {
|
||||
return fabricPlayer.isSprinting();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMainHandKnockbackLevel() {
|
||||
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.timeUntilRegen;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setVelocity(Vector3d adjustedVelocity) {
|
||||
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.velocityDirty = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Vector3d getVelocity() {
|
||||
final Vec3d fabricVelocity = fabricPlayer.getVelocity();
|
||||
return new Vector3d(fabricVelocity.x, fabricVelocity.y, fabricVelocity.z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getJumpPower() {
|
||||
double jumpVelocity = 0.42;
|
||||
StatusEffectInstance jumpEffect = fabricPlayer.getStatusEffect(StatusEffects.JUMP_BOOST);
|
||||
if (jumpEffect != null) {
|
||||
int amplifier = jumpEffect.getAmplifier();
|
||||
jumpVelocity += (amplifier + 1) * 0.1F;
|
||||
}
|
||||
|
||||
return jumpVelocity;
|
||||
}
|
||||
@Override
|
||||
public BoundingBox getBoundingBox() {
|
||||
Box boundingBox = fabricPlayer.getBoundingBox();
|
||||
return new BoundingBox(boundingBox.minX, boundingBox.minY, boundingBox.minZ, boundingBox.maxX, boundingBox.minY, boundingBox.maxZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable User getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientBrand(String brand) {
|
||||
this.clientBrand = brand;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getClientBrand() {
|
||||
return this.clientBrand;
|
||||
}
|
||||
}
|
||||
@@ -1,144 +0,0 @@
|
||||
package me.caseload.knockbacksync.scheduler;
|
||||
|
||||
import me.caseload.knockbacksync.FabricLoaderMod;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class FabricSchedulerAdapter implements SchedulerAdapter {
|
||||
// private final MinecraftServer server;
|
||||
private final Map<ScheduledTask, Runnable> taskMap = new HashMap<>();
|
||||
private final Map<Thread, Runnable> asyncTasks = new HashMap<>();
|
||||
|
||||
public FabricSchedulerAdapter() {
|
||||
ServerTickEvents.END_SERVER_TICK.register(this::handleTasks);
|
||||
}
|
||||
|
||||
private void handleTasks(MinecraftServer server) {
|
||||
Iterator<ScheduledTask> iterator = taskMap.keySet().iterator();
|
||||
while (iterator.hasNext()) {
|
||||
ScheduledTask task = iterator.next();
|
||||
if (server.getTicks() >= task.nextRunTick) {
|
||||
task.task.run();
|
||||
if (task.isPeriodic) {
|
||||
task.nextRunTick = server.getTicks() + task.period;
|
||||
} else {
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTask(Runnable task) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks(), 0, false);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskAsynchronously(Runnable task) {
|
||||
Thread thread = new Thread(task);
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskLater(Runnable task, long delayTicks) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, 0, false);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskTimer(Runnable task, long delayTicks, long periodTicks) {
|
||||
ScheduledTask scheduledTask = new ScheduledTask(task, FabricLoaderMod.getServer().getTicks() + delayTicks, periodTicks, true);
|
||||
Runnable cancellationTask = () -> taskMap.remove(scheduledTask);
|
||||
taskMap.put(scheduledTask, cancellationTask);
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskLaterAsynchronously(Runnable task, long delay) {
|
||||
Thread thread = new Thread(() -> {
|
||||
try {
|
||||
Thread.sleep(delay * 50); // Convert ticks to milliseconds
|
||||
task.run();
|
||||
} catch (InterruptedException e) {
|
||||
// Handle interruption
|
||||
}
|
||||
});
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractTaskHandle runTaskTimerAsynchronously(Runnable task, long delay, long period) {
|
||||
Thread thread = new Thread(() -> {
|
||||
try {
|
||||
Thread.sleep(delay * 50); // Convert ticks to milliseconds
|
||||
while (!Thread.currentThread().isInterrupted()) {
|
||||
task.run();
|
||||
Thread.sleep(period * 50); // Convert ticks to milliseconds
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
// Handle interruption
|
||||
}
|
||||
});
|
||||
Runnable cancellationTask = () -> {
|
||||
thread.interrupt();
|
||||
asyncTasks.remove(thread);
|
||||
};
|
||||
asyncTasks.put(thread, cancellationTask);
|
||||
thread.start();
|
||||
return new FabricTaskHandle(cancellationTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown() {
|
||||
// Create a new list to store the tasks that need to be executed
|
||||
List<Runnable> tasksToExecute = new ArrayList<>();
|
||||
|
||||
// Add the tasks from the taskMap to the tasksToExecute list
|
||||
tasksToExecute.addAll(taskMap.values());
|
||||
|
||||
// Add the tasks from the asyncTasks to the tasksToExecute list
|
||||
tasksToExecute.addAll(asyncTasks.values());
|
||||
|
||||
// Clear the taskMap and asyncTasks to avoid further modifications
|
||||
taskMap.clear();
|
||||
asyncTasks.clear();
|
||||
|
||||
// Execute the tasks in the tasksToExecute list
|
||||
for (Runnable task : tasksToExecute) {
|
||||
task.run();
|
||||
}
|
||||
}
|
||||
|
||||
private static class ScheduledTask {
|
||||
final Runnable task;
|
||||
final long period;
|
||||
final boolean isPeriodic;
|
||||
long nextRunTick;
|
||||
|
||||
ScheduledTask(Runnable task, long nextRunTick, long period, boolean isPeriodic) {
|
||||
this.task = task;
|
||||
this.nextRunTick = nextRunTick;
|
||||
this.period = period;
|
||||
this.isPeriodic = isPeriodic;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package me.caseload.knockbacksync.scheduler;
|
||||
|
||||
public class FabricTaskHandle implements AbstractTaskHandle {
|
||||
private final Runnable cancellationTask;
|
||||
private boolean cancelled = false;
|
||||
|
||||
public FabricTaskHandle(Runnable cancellationTask) {
|
||||
this.cancellationTask = cancellationTask;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getCancelled() {
|
||||
return this.cancelled;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cancel() {
|
||||
this.cancellationTask.run();
|
||||
this.cancelled = true;
|
||||
}
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.command.generic.PlayerSelector;
|
||||
import me.caseload.knockbacksync.player.FabricPlayer;
|
||||
import me.caseload.knockbacksync.player.PlatformPlayer;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public class FabricPlayerSelectorAdapter implements PlayerSelector {
|
||||
private final org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector fabricSelector;
|
||||
|
||||
public FabricPlayerSelectorAdapter(org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector fabricSelector) {
|
||||
this.fabricSelector = fabricSelector;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSingle() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getSinglePlayer() {
|
||||
return new FabricPlayer(fabricSelector.single()); // Assuming your ServerPlayer can be cast to Player
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<PlatformPlayer> getPlayers() {
|
||||
return Collections.singletonList(new FabricPlayer(fabricSelector.single())); // Assuming your ServerPlayer can be cast to Player
|
||||
}
|
||||
|
||||
@Override
|
||||
public String inputString() {
|
||||
return fabricSelector.inputString();
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.command.generic.AbstractPlayerSelectorParser;
|
||||
import me.caseload.knockbacksync.command.generic.PlayerSelector;
|
||||
import org.incendo.cloud.context.CommandContext;
|
||||
import org.incendo.cloud.minecraft.modded.parser.VanillaArgumentParsers;
|
||||
import org.incendo.cloud.parser.ParserDescriptor;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class FabricPlayerSelectorParser<C> extends AbstractPlayerSelectorParser<C> {
|
||||
|
||||
@Override
|
||||
public ParserDescriptor<C, PlayerSelector> descriptor() {
|
||||
return createDescriptor();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ParserDescriptor<C, ?> getPlatformSpecificDescriptor() {
|
||||
return VanillaArgumentParsers.singlePlayerSelectorParser();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected CompletableFuture<PlayerSelector> adaptToCommonSelector(CommandContext<C> context, Object platformSpecificSelector) {
|
||||
return CompletableFuture.completedFuture(new FabricPlayerSelectorAdapter((org.incendo.cloud.minecraft.modded.data.SinglePlayerSelector) platformSpecificSelector));
|
||||
}
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
package me.caseload.knockbacksync.sender;
|
||||
|
||||
import me.caseload.knockbacksync.FabricBase;
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.permission.FabricPermissionChecker;
|
||||
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, ServerCommandSource> implements SenderMapper<ServerCommandSource, Sender> {
|
||||
private final FabricBase plugin;
|
||||
|
||||
public FabricSenderFactory(FabricBase kbSyncFabricBase) {
|
||||
super(kbSyncFabricBase);
|
||||
this.plugin = kbSyncFabricBase;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected FabricBase getPlugin() {
|
||||
return this.plugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected UUID getUniqueId(ServerCommandSource commandSource) {
|
||||
if (commandSource.getEntity() != null) {
|
||||
return commandSource.getEntity().getUuid();
|
||||
}
|
||||
return Sender.CONSOLE_UUID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getName(ServerCommandSource commandSource) {
|
||||
String name = commandSource.getName();
|
||||
if (commandSource.getEntity() != null && name.equals("Server")) {
|
||||
return Sender.CONSOLE_NAME;
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void sendMessage(ServerCommandSource sender, String message) {
|
||||
// final Locale locale;
|
||||
// if (sender.getEntity() instanceof ServerPlayer) {
|
||||
// String language = ((ServerPlayer) sender.getEntity()).clientInformation().language();
|
||||
// locale = language == null ? null : TranslationManager.parseLocale(language);
|
||||
// } else {
|
||||
// locale = null;
|
||||
// }
|
||||
// sender.sendFeedback(() -> toNativeText(TranslationManager.render(message, locale)), false);
|
||||
sender.sendFeedback(() -> Text.literal(message), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasPermission(ServerCommandSource commandSource, String node) {
|
||||
return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasPermission(ServerCommandSource commandSource, String node, boolean defaultIfUnset) {
|
||||
return ((FabricPermissionChecker) Base.INSTANCE.getPermissionChecker()).hasPermission(commandSource, node, defaultIfUnset);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void performCommand(ServerCommandSource sender, String command) {
|
||||
// sender.getServer().getCommandManager().executeWithPrefix(sender, command);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isConsole(ServerCommandSource sender) {
|
||||
CommandOutput output = sender.output;
|
||||
return output == sender.getServer() || // Console
|
||||
output.getClass() == RconCommandOutput.class || // Rcon
|
||||
(output == CommandOutput.DUMMY && sender.getName().equals("")); // Functions
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull Sender map(@NonNull ServerCommandSource base) {
|
||||
return this.wrap(base);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull ServerCommandSource reverse(@NonNull Sender mapped) {
|
||||
return this.unwrap(mapped);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws Exception {
|
||||
|
||||
}
|
||||
|
||||
// public static Text toNativeText(Component component) {
|
||||
// return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY);
|
||||
// }
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package me.caseload.knockbacksync.stats.custom;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
|
||||
public class FabricStatsManager extends StatsManager {
|
||||
public FabricStatsManager() {
|
||||
super(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
// no op remove bstats
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public class CommandUtil {
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message) {
|
||||
sendSuccessMessage(context, () -> getComponent(message), false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, String message, boolean allowLogging) {
|
||||
sendSuccessMessage(context, () -> getComponent(message), allowLogging);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message) {
|
||||
sendSuccessMessage(context, () -> message, false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Text message, boolean allowLogging) {
|
||||
sendSuccessMessage(context, () -> message, allowLogging);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier) {
|
||||
sendSuccessMessage(context, messageSupplier, false);
|
||||
}
|
||||
|
||||
public static void sendSuccessMessage(CommandContext<ServerCommandSource> context, Supplier<Text> messageSupplier, boolean allowLogging) {
|
||||
context.getSource().sendFeedback(messageSupplier, allowLogging);
|
||||
}
|
||||
|
||||
public static void sendFailureMessage(CommandContext<ServerCommandSource> context, String message) {
|
||||
sendFailureMessage(context, getComponent(message));
|
||||
}
|
||||
|
||||
public static void sendFailureMessage(CommandContext<ServerCommandSource> context, Text message) {
|
||||
context.getSource().sendError(message);
|
||||
}
|
||||
|
||||
public static Text getComponent(String message) {
|
||||
return Text.literal(message);
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package me.caseload.knockbacksync.util;
|
||||
|
||||
import me.caseload.knockbacksync.Base;
|
||||
import me.caseload.knockbacksync.ConfigWrapper;
|
||||
import me.caseload.knockbacksync.mixin.UpdateIntervalAccessor;
|
||||
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;
|
||||
|
||||
public class CustomUpdateIntervals {
|
||||
private static final Map<String, Integer> entityIntervals = new HashMap<>();
|
||||
|
||||
public static void setInterval(String entityType, int interval) {
|
||||
entityIntervals.put(entityType, interval);
|
||||
}
|
||||
|
||||
public static int getInterval(String entityType, int defaultInterval) {
|
||||
return entityIntervals.getOrDefault(entityType, defaultInterval);
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
entityIntervals.clear();
|
||||
}
|
||||
|
||||
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)) {
|
||||
ServerChunkLoadingManager.EntityTracker serverEntity = ((ServerChunkManager) entity.getEntityWorld().getChunkManager()).chunkLoadingManager.entityTrackers.get(entity.getId());
|
||||
if (serverEntity != null) {
|
||||
((UpdateIntervalAccessor) serverEntity).setUpdateInterval(entityIntervals.get(entityType));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Map<String, Integer> loadEntityIntervalsFromConfig() {
|
||||
Map<String, Integer> intervals = new HashMap<>();
|
||||
ConfigWrapper config = Base.INSTANCE.getConfigManager().getConfigWrapper();
|
||||
|
||||
String basePath = "entity_update_intervals";
|
||||
if (config.contains(basePath)) {
|
||||
for (String entityType : config.getKeys(basePath)) {
|
||||
int interval = config.getInt(basePath + "." + entityType, -1);
|
||||
if (interval > 0) {
|
||||
intervals.put(entityType, interval);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return intervals;
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
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().getPlayerManager().getPlayerList().stream()
|
||||
.map(FabricPlayer::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getPlayer(UUID uuid) {
|
||||
return new FabricPlayer(FabricLoaderMod.getServer().getPlayerManager().getPlayer(uuid));
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlatformPlayer getPlayer(Object nativePlatformPlayer) {
|
||||
return new FabricPlayer((ServerPlayerEntity) nativePlatformPlayer);
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package me.caseload.knockbacksync.world;
|
||||
|
||||
import com.github.retrooper.packetevents.protocol.world.BlockFace;
|
||||
import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
|
||||
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.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 World 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.STATE_IDS.getRawId(blockState));
|
||||
}
|
||||
|
||||
@Override
|
||||
public WrappedBlockState getBlockStateAt(Vector3d loc) {
|
||||
return getBlockStateAt((int) Math.floor(loc.x), (int) Math.floor(loc.x), (int) Math.floor(loc.x));
|
||||
}
|
||||
|
||||
@Override
|
||||
public RayTraceResult rayTraceBlocks(Vector3d start, Vector3d direction, double maxDistance, FluidHandling fluidHandling, boolean ignorePassableBlocks) {
|
||||
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.raycast(new RaycastContext(
|
||||
startVec,
|
||||
endVec,
|
||||
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;
|
||||
|
||||
Vec3d hitLocation = result.getPos();
|
||||
BlockPos blockPos = result.getBlockPos();
|
||||
return new RayTraceResult(
|
||||
new Vector3d(hitLocation.x, hitLocation.y, hitLocation.z),
|
||||
BlockFace.getBlockFaceByValue(result.getSide().ordinal()),
|
||||
new Vector3i(blockPos.getX(), blockPos.getY(), blockPos.getZ()),
|
||||
getBlockStateAt(blockPos.getX(), blockPos.getY(), blockPos.getZ())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "knockbacksync",
|
||||
"version": "${version}",
|
||||
"name": "Knockback Sync",
|
||||
"description": "",
|
||||
"authors": [],
|
||||
"contact": {},
|
||||
"license": "All-Rights-Reserved",
|
||||
"icon": "assets/knockbacksync/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"preLaunch": [
|
||||
"me.caseload.knockbacksync.FabricLoaderMod"
|
||||
],
|
||||
"main": [
|
||||
"me.caseload.knockbacksync.FabricLoaderMod"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"knockbacksync.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.15.11",
|
||||
"fabric-lifecycle-events-v1": "*",
|
||||
"fabric-events-interaction-v0": "*",
|
||||
"minecraft": "~${minecraft_version}",
|
||||
"packetevents": "*"
|
||||
},
|
||||
"accessWidener": "knockbacksync.accesswidener"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
accessWidener v2 named
|
||||
|
||||
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
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "me.caseload.knockbacksync.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"mixins": [
|
||||
"ChunkMapMixin",
|
||||
"EntityTrackerEntryMixin",
|
||||
"PlayerMixin",
|
||||
"TickRateManagerMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
+3
-13
@@ -2,18 +2,8 @@
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
org.gradle.parallel=true
|
||||
|
||||
# Fabric Properties
|
||||
# check these on https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.21.11
|
||||
yarn_mappings=1.21.11+build.3:v2
|
||||
loader_version=0.16.13
|
||||
|
||||
# Mod Properties
|
||||
# Plugin Properties
|
||||
maven_group=me.caseload
|
||||
archives_base_name=knockbacksync
|
||||
archives_base_name=knockbacksync-og
|
||||
|
||||
# Dependencies
|
||||
# check this on https://modmuss50.me/fabric.html
|
||||
fabric_version=0.140.0+1.21.11
|
||||
|
||||
githubRepo=CASELOAD7000/knockback-sync
|
||||
githubRepo=CASELOAD7000/knockback-sync
|
||||
+2
-2
@@ -7,6 +7,6 @@ pluginManagement {
|
||||
}
|
||||
}
|
||||
|
||||
include("common", "fabric", "bukkit")
|
||||
include("common", "bukkit")
|
||||
|
||||
rootProject.name = "KnockbackSync"
|
||||
rootProject.name = "KnockbackSync-OG"
|
||||
Reference in new issue
Block a user