forked from upstream/RaycastedAntiESP
Compare commits
71
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1f70a296c | ||
|
|
3eccd69669 | ||
|
|
9f27f1c58f | ||
|
|
6e8d47b96e | ||
|
|
f04b79bb4a | ||
|
|
bf17a65246 | ||
|
|
3d4702e520 | ||
|
|
266302f09c | ||
|
|
ac130a739e | ||
|
|
dcc316e7e7 | ||
|
|
754214fa8d | ||
|
|
a6f47f137c | ||
|
|
97e43e65f8 | ||
|
|
ef81d97eef | ||
|
|
36d75c8933 | ||
|
|
b37f8465aa | ||
|
|
3d34992fcc | ||
|
|
4602dde7df | ||
|
|
a81d5caa45 | ||
|
|
7ef25e5dc3 | ||
|
|
529ab3f583 | ||
|
|
951883cb1b | ||
|
|
08113b57ba | ||
|
|
63e9c8bea1 | ||
|
|
1d14468924 | ||
|
|
5378fd5907 | ||
|
|
5e8d8bb43e | ||
|
|
da5c68b07c | ||
|
|
0f9af7c217 | ||
|
|
1fd227e8ba | ||
|
|
e4c653fe6a | ||
|
|
f2dc9f7d18 | ||
|
|
8998338563 | ||
|
|
361bbf84bc | ||
|
|
384393358c | ||
|
|
9c2d542f3c | ||
|
|
ab930c4c30 | ||
|
|
1f64514366 | ||
|
|
398592225e | ||
|
|
a95b79d428 | ||
|
|
67c9758a96 | ||
|
|
f555249cc9 | ||
|
|
5e4bc1f0fb | ||
|
|
53d49cf542 | ||
|
|
9b34fa51a0 | ||
|
|
573d8331dc | ||
|
|
333b211b00 | ||
|
|
81718b8848 | ||
|
|
6084a373c8 | ||
|
|
f22f6db331 | ||
|
|
4c7733420f | ||
|
|
88c004997d | ||
|
|
8eb18e8793 | ||
|
|
f56a4e147b | ||
|
|
651668b62e | ||
|
|
1e4f45d4ee | ||
|
|
0bab09e26b | ||
|
|
848e0ccbe8 | ||
|
|
ee402042e6 | ||
|
|
744bc97f0f | ||
|
|
c27da66cf0 | ||
|
|
0039ee0e0f | ||
|
|
1c8347ecb4 | ||
|
|
9e86c1680d | ||
|
|
065f2e2a17 | ||
|
|
3cba095d77 | ||
|
|
24f99bebfb | ||
|
|
f650cda9f6 | ||
|
|
392b503223 | ||
|
|
d66b270051 | ||
|
|
fa7fd4fdd7 |
No files matched your search
@@ -5,6 +5,8 @@
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
README.md
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
# mpeltonen/sbt-idea plugin
|
||||
|
||||
@@ -1,21 +1,661 @@
|
||||
MIT License
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (c) 2025 Cubicake
|
||||
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.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
Preamble
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are 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.
|
||||
|
||||
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.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
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 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 work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
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 AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
@@ -1,39 +1,21 @@
|
||||
Latest version: v1.2.2
|
||||
Latest version: v1.5.1
|
||||
|
||||
The latest version can currently only be found on Modrinth https://modrinth.com/plugin/raycasted-entity-occlusion/
|
||||
The latest version can currently only be found on Modrinth https://modrinth.com/plugin/raycasted-entity-occlusions/
|
||||
|
||||
This is an async plugin for PaperMC and its forks that hides/culls entities (and tile entities) from players if they do not have line-of-sight.
|
||||
|
||||
The supported versions are 1.21.x PaperMC and Pufferfish. Other server versions and software may work too.
|
||||
|
||||
This is a simple server-side plugin for PaperMC (May also work with Spigot, this is untested) that hides/culls entities from players if they do not have line-of-sight. All raycasts are run async to reduce performance impact.
|
||||
Use cases:
|
||||
|
||||
- To prevent mob nametags from being visible through walls
|
||||
- If the mobs don't exist, you can't see them
|
||||
- Act as an "anticheat" to block players from using mods such as freecam to find entities through walls
|
||||
- This is not an actual anticheat and will not detect freecam, instead just making freecam less useful
|
||||
- Freecam will still be useful for locating structures and features such as caves
|
||||
- Reduce client lag
|
||||
- In servers with large megabases full of item frames, armour stands and other entities, RaycastedEntityOcclusion will prevent these entities from lagging the client unless they are within line-of-sight
|
||||
|
||||
Default Config:
|
||||
|
||||
- AlwaysShowRadius: 8
|
||||
- RaycastRadius: 48
|
||||
- SearchRadius: 52
|
||||
- MoreChecks: false
|
||||
- OccludePlayers: false
|
||||
- RecheckInterval: 20
|
||||
|
||||
Entities inside the AlwaysShowRadius are always shown, even if occluded. This is to prevent nasty surprises when turning a corner quickly.
|
||||
|
||||
The SearchRadius is a cubic bounding box around the player within which entities will be checked. If an entity is within the SearchRadius but not the RaycastRadius, it will be automatically hidden.
|
||||
|
||||
The RaycastRadius is the radius where entities will be checked. If an entity is currently hidden it will run a raycast every tick. This is to quickly detect when the entity becomes visible. If the entity is currently visible, it will only run the raycast every {RecheckInterval} ticks to reduce performance impact.
|
||||
|
||||
MoreChecks toggles between two raycasting modes. By default (MoreChecks = false) the plugin runs one raycast from the center of each mob to the player. This means that if the center of the mob is hidden but some parts should be visible, the player won't be able to see the mob at all. Enabling MoreChecks runs a raycast from the top, bottom, left and right of the entity to the player.
|
||||
|
||||
OccludePlayers toggles whether players will be checked. Enabling this prevents ESP mods from revealing players.
|
||||
|
||||
- Prevent cheating (anti-esp hacks)
|
||||
- Block usage of pie-ray to locate underground bases
|
||||
- Prevent mods such as mini-maps or cheat clients from displaying the locations of hidden entities
|
||||
- Increase client-side performance for low-end devices
|
||||
- Massive megabases containing hundreds of armour stands, item frames, banners etc can cause performance issues on low-end devices unable to process so many entities. REO will cull those entities for the client, reducing the number of entities to process.
|
||||
- Hide nametags behind walls
|
||||
- Yes, this plugin is a bit overkill for doing that, yes you can do it anyways.
|
||||
|
||||
Known issues:
|
||||
- Due to the nature of the plugin, there will be a short delay once an entity should be visible before it appears, causing it to appear like it "popped" into view. This issue is partially resolved by turning MoreChecks on
|
||||
- If OccludePlayers is set to true any occluded players will be removed from tablist
|
||||
- When updating the plugin to a version with more config versions, no checks are performed to detect this and add the new configs to config.yml. This means that the config file will be missing several options. (This is an issue when updating to v1.1.0 or v1.2.0). To fix, just copy the new config options from the Default Config section above.
|
||||
- Due to the nature of the plugin, there will be a short delay once an entity should be visible before it appears, causing it to appear like it "popped" into view. This issue is partially resolved by turning engine-mode to 2
|
||||
- If cull-player is set to true any culled players will be removed from tablist. Potential solutions are being investigated, suggestions are welcome.
|
||||
+5
-1
@@ -3,7 +3,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = 'games.cubi'
|
||||
version = '1.3.0-dev'
|
||||
version = '1.6.0-dev-1'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@@ -15,10 +15,14 @@ repositories {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/groups/public/"
|
||||
}
|
||||
maven { url = uri("https://repo.codemc.io/repository/maven-releases/") }
|
||||
|
||||
maven { url = uri("https://repo.codemc.io/repository/maven-snapshots/") }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
|
||||
compileOnly("com.github.retrooper:packetevents-spigot:2.8.0")
|
||||
}
|
||||
|
||||
def targetJavaVersion = 21
|
||||
|
||||
@@ -1,168 +0,0 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class CheckEntityVisibility {
|
||||
RaycastedEntityOcclusion plugin;
|
||||
private int alwaysShowRadius;
|
||||
private int raycastRadius;
|
||||
private int searchRadius;
|
||||
private boolean moreChecks;
|
||||
private boolean occludePlayers;
|
||||
private int recheckInterval;
|
||||
private int tickCounter = 0;
|
||||
//ConcurrentHashMap allows for Thread-safe operations. Don't use regular hashmaps
|
||||
private final Map<Player, Set<Entity>> entitiesToShow = new ConcurrentHashMap<>();
|
||||
private final Map<Player, Set<Entity>> entitiesToHide = new ConcurrentHashMap<>();
|
||||
|
||||
public CheckEntityVisibility(RaycastedEntityOcclusion plugin) {
|
||||
this.plugin = plugin;
|
||||
this.alwaysShowRadius = plugin.alwaysShowRadius;
|
||||
this.raycastRadius = plugin.raycastRadius;
|
||||
this.searchRadius = plugin.searchRadius;
|
||||
this.moreChecks = plugin.moreChecks;
|
||||
this.occludePlayers = plugin.occludePlayers;
|
||||
this.recheckInterval = plugin.recheckInterval;
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
entitiesToShow.clear();
|
||||
entitiesToHide.clear();
|
||||
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
runVisibilityCheck(player);
|
||||
}
|
||||
|
||||
applyVisibilityChanges();
|
||||
|
||||
tickCounter++;
|
||||
if (tickCounter > 1000000) {
|
||||
tickCounter = 0;
|
||||
}
|
||||
}
|
||||
}.runTaskTimer(plugin, 0L, 1L);
|
||||
}
|
||||
|
||||
public void updateConfigValues() {
|
||||
this.alwaysShowRadius = plugin.alwaysShowRadius;
|
||||
this.raycastRadius = plugin.raycastRadius;
|
||||
this.searchRadius = plugin.searchRadius;
|
||||
this.moreChecks = plugin.moreChecks;
|
||||
this.occludePlayers = plugin.occludePlayers;
|
||||
this.recheckInterval = plugin.recheckInterval;
|
||||
}
|
||||
|
||||
public void runVisibilityCheck(Player player) {
|
||||
World world = player.getWorld();
|
||||
List<Entity> nearbyEntities = player.getNearbyEntities(searchRadius, searchRadius, searchRadius);
|
||||
|
||||
for (Entity entity : nearbyEntities) {
|
||||
if (world != player.getWorld()) {
|
||||
return;
|
||||
}
|
||||
if (entity instanceof Player && !occludePlayers) {
|
||||
continue;
|
||||
}
|
||||
double distance = player.getLocation().distance(entity.getLocation());
|
||||
if (distance <= alwaysShowRadius) {
|
||||
// Always show entities within this radius
|
||||
addEntityToShow(player, entity);
|
||||
continue;
|
||||
}
|
||||
if (distance > raycastRadius) {
|
||||
// Hide entities outside the raycast radius
|
||||
addEntityToHide(player, entity);
|
||||
continue;
|
||||
}
|
||||
Boolean canSee = player.canSee(entity);
|
||||
int check = tickCounter % recheckInterval;
|
||||
//plugin.getLogger().info("check: " + check + " cansee " + canSee);
|
||||
if (!canSee || check == 0) {
|
||||
//check whether to run intensive or light checks
|
||||
Double height = entity.getHeight();
|
||||
if (moreChecks) {
|
||||
Double width = entity.getWidth();
|
||||
Location checkOne = entity.getLocation().add(0, height - 0.01, 0);
|
||||
Location checkTwo = entity.getLocation().add(0, 0.01, 0);
|
||||
Location checkThree = entity.getLocation().add(width / 2, height / 2, 0);
|
||||
Location checkFour = entity.getLocation().add(-width / 2, height / 2, 0);
|
||||
|
||||
Raycast.asyncRaycast(player.getEyeLocation(), checkOne, plugin, canSeePlayer -> {
|
||||
if (canSeePlayer) {
|
||||
addEntityToShow(player, entity);
|
||||
} else {
|
||||
Raycast.asyncRaycast(player.getEyeLocation(), checkTwo, plugin, canSeePlayer2 -> {
|
||||
if (canSeePlayer2) addEntityToShow(player, entity);
|
||||
else {
|
||||
Raycast.asyncRaycast(player.getEyeLocation(), checkThree, plugin, canSeePlayer3 -> {
|
||||
if (canSeePlayer3) addEntityToShow(player, entity);
|
||||
else {
|
||||
Raycast.asyncRaycast(player.getEyeLocation(), checkFour, plugin, canSeePlayer4 -> {
|
||||
if (canSeePlayer4) addEntityToShow(player, entity);
|
||||
else addEntityToHide(player, entity);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Location entityLocation = entity.getLocation().add(0, height / 2, 0);
|
||||
|
||||
Raycast.asyncRaycast(player.getEyeLocation(), entityLocation, plugin, canSeePlayer -> {
|
||||
if (canSeePlayer) {
|
||||
addEntityToShow(player, entity);
|
||||
} else {
|
||||
addEntityToHide(player, entity);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void addEntityToShow(Player player, Entity entity) {
|
||||
entitiesToShow.computeIfAbsent(player, k -> ConcurrentHashMap.newKeySet()).add(entity);
|
||||
entitiesToHide.computeIfAbsent(player, k -> ConcurrentHashMap.newKeySet()).remove(entity);
|
||||
}
|
||||
|
||||
private void addEntityToHide(Player player, Entity entity) {
|
||||
entitiesToHide.computeIfAbsent(player, k -> ConcurrentHashMap.newKeySet()).add(entity);
|
||||
entitiesToShow.computeIfAbsent(player, k -> ConcurrentHashMap.newKeySet()).remove(entity);
|
||||
}
|
||||
|
||||
|
||||
private void applyVisibilityChanges() {
|
||||
for (Map.Entry<Player, Set<Entity>> entry : entitiesToShow.entrySet()) {
|
||||
Player player = entry.getKey();
|
||||
for (Entity entity : entry.getValue()) {
|
||||
if (entity instanceof Player p) {
|
||||
player.showPlayer(plugin, p);
|
||||
}
|
||||
else player.showEntity(plugin, entity);
|
||||
}
|
||||
}
|
||||
for (Map.Entry<Player, Set<Entity>> entry : entitiesToHide.entrySet()) {
|
||||
Player player = entry.getKey();
|
||||
for (Entity entity : entry.getValue()) {
|
||||
if (entity instanceof Player p) {
|
||||
player.hidePlayer(plugin, p);
|
||||
}
|
||||
else player.hideEntity(plugin, entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class CommandHandler implements CommandExecutor {
|
||||
RaycastedEntityOcclusion plugin;
|
||||
|
||||
public CommandHandler(RaycastedEntityOcclusion plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
if (args.length != 0 && args[0].equalsIgnoreCase("reload")) {
|
||||
plugin.loadConfig();
|
||||
plugin.getCheckEntityVisibility().updateConfigValues();
|
||||
sender.sendMessage("RaycastedEntityOcclusion config reloaded.");
|
||||
return true;
|
||||
}
|
||||
sender.sendMessage("RaycastedEntityOcclusion v" + plugin.getDescription().getVersion());
|
||||
sender.sendMessage("AlwaysShowRadius: " + plugin.alwaysShowRadius);
|
||||
sender.sendMessage("RaycastRadius: " + plugin.raycastRadius);
|
||||
sender.sendMessage("SearchRadius: " + plugin.searchRadius);
|
||||
sender.sendMessage("MoreChecks: " + plugin.moreChecks);
|
||||
sender.sendMessage("OccludePlayers: " + plugin.occludePlayers);
|
||||
sender.sendMessage("RecheckInterval: " + plugin.recheckInterval);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.context.CommandContext;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import com.mojang.brigadier.tree.LiteralCommandNode;
|
||||
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||
import io.papermc.paper.command.brigadier.Commands;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
|
||||
|
||||
public class CommandsManager {
|
||||
private final RaycastedEntityOcclusion plugin;
|
||||
private final ConfigManager cfg;
|
||||
|
||||
public CommandsManager(RaycastedEntityOcclusion plugin, ConfigManager cfg) {
|
||||
this.plugin = plugin;
|
||||
this.cfg = cfg;
|
||||
}
|
||||
|
||||
public LiteralCommandNode<CommandSourceStack> registerCommand() {
|
||||
//run help command if no context provided
|
||||
LiteralCommandNode<CommandSourceStack> buildCommand = Commands.literal("raycastedentityocclusions")
|
||||
.requires(sender -> sender.getSender().hasPermission("raycastedentityocclusions.command"))
|
||||
.executes(context -> {
|
||||
helpCommand(context);
|
||||
return Command.SINGLE_SUCCESS;
|
||||
})
|
||||
.then(Commands.literal("help")
|
||||
.executes(context -> helpCommand(context)))
|
||||
.then(Commands.literal("reload")
|
||||
.executes(context -> {
|
||||
cfg.load();
|
||||
context.getSource().getSender().sendMessage("[EntityOcclusions] Config reloaded.");
|
||||
return Command.SINGLE_SUCCESS;
|
||||
}))
|
||||
.then(Commands.literal("config-values")
|
||||
.executes(context -> {
|
||||
CommandSender sender = context.getSource().getSender();
|
||||
//dynamic config values
|
||||
sender.sendMessage("[EntityOcclusions] Config values: ");
|
||||
|
||||
ConfigurationSection root = cfg.cfg.getConfigurationSection("");
|
||||
for (String path : root.getKeys(true)) {
|
||||
Object val = cfg.cfg.get(path);
|
||||
|
||||
sender.sendMessage(MiniMessage.miniMessage().deserialize("<green>" + path + "<gray> = <white>" + val));
|
||||
}
|
||||
return Command.SINGLE_SUCCESS;
|
||||
}))
|
||||
|
||||
.then(Commands.literal("set")
|
||||
.executes(context -> {
|
||||
CommandSender sender = context.getSource().getSender();
|
||||
sender.sendRichMessage("<red>Usage: /raycastedentityocclusions set <key> <value>");;
|
||||
return 0;
|
||||
})
|
||||
.then(Commands.argument("key", StringArgumentType.string())
|
||||
.then(Commands.argument("value", StringArgumentType.string())
|
||||
.executes(context -> {
|
||||
CommandSender sender = context.getSource().getSender();
|
||||
String key = StringArgumentType.getString(context, "key");
|
||||
String value = StringArgumentType.getString(context, "value");
|
||||
|
||||
int result = cfg.setConfigValue(key, value);
|
||||
if (result == -1) {
|
||||
sender.sendRichMessage("<red>Invalid inputs");
|
||||
} else if (result == 0) {
|
||||
//Integer value out of bounds 0 - 256
|
||||
sender.sendRichMessage("<red>Invalid value for <white>" + key + "<red>, must be between 0 and 256");
|
||||
}
|
||||
else {
|
||||
sender.sendRichMessage("<white>Set <green>" + key + "<white> to <green>" + value);
|
||||
}
|
||||
return 0;
|
||||
})
|
||||
)
|
||||
)
|
||||
)
|
||||
.then(Commands.literal("test")
|
||||
.executes(context -> {
|
||||
testCommand(context);
|
||||
return Command.SINGLE_SUCCESS;
|
||||
})
|
||||
)
|
||||
.then(Commands.literal("check-for-updates")
|
||||
.executes(context -> {
|
||||
CommandSender sender = context.getSource().getSender();
|
||||
UpdateChecker.checkForUpdates(plugin, sender);
|
||||
return Command.SINGLE_SUCCESS;
|
||||
})
|
||||
)
|
||||
.build();
|
||||
return buildCommand;
|
||||
}
|
||||
|
||||
public int helpCommand(CommandContext<CommandSourceStack> context) {
|
||||
CommandSender sender = context.getSource().getSender();
|
||||
sender.sendRichMessage("<white>RaycastedEntityOcclusions <yellow>v" + plugin.getDescription().getVersion());
|
||||
sender.sendRichMessage("<white>Commands:");
|
||||
sender.sendRichMessage("<green>/raycastedentityocclusions reload <gray>- Reloads the config");
|
||||
sender.sendRichMessage("<green>/raycastedentityocclusions config-values <gray>- Shows all config values");
|
||||
sender.sendRichMessage("<green>/raycastedentityocclusions set <key> <value> <gray>- Sets a config value");
|
||||
return Command.SINGLE_SUCCESS;
|
||||
}
|
||||
|
||||
private void testCommand(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
public class ConfigManager {
|
||||
private final JavaPlugin plugin;
|
||||
public int snapshotRefreshInterval;
|
||||
public int engineMode;
|
||||
public int maxOccludingCount;
|
||||
public boolean debugMode;
|
||||
public int alwaysShowRadius;
|
||||
public int raycastRadius;
|
||||
public int searchRadius;
|
||||
public boolean cullPlayers;
|
||||
public boolean onlyCullSneakingPlayers;
|
||||
public int recheckInterval;
|
||||
public boolean checkTileEntities;
|
||||
public int tileEntityRecheckInterval;
|
||||
public FileConfiguration cfg;
|
||||
public boolean packetEventsPresent = false;
|
||||
|
||||
public static final int SNAPSHOT_REFRESH_INTERVAL_DEFAULT = 60;
|
||||
public static final int ENGINE_MODE_DEFAULT = 1;
|
||||
public static final int MAX_OCCLUDING_COUNT_DEFAULT = 3;
|
||||
public static final boolean DEBUG_MODE_DEFAULT = false;
|
||||
public static final int ALWAYS_SHOW_RADIUS_DEFAULT = 16;
|
||||
public static final int RAYCAST_RADIUS_DEFAULT = 48;
|
||||
public static final int SEARCH_RADIUS_DEFAULT = 48;
|
||||
public static final boolean CULL_PLAYERS_DEFAULT = false;
|
||||
public static final boolean ONLY_CULL_SNEAKING_PLAYERS_DEFAULT = false;
|
||||
public static final int RECHECK_INTERVAL_DEFAULT = 50;
|
||||
public static final boolean CHECK_TILE_ENTITIES_DEFAULT = true;
|
||||
public static final int TILE_ENTITY_RECHECK_INTERVAL_DEFAULT = 0;
|
||||
|
||||
public ConfigManager(JavaPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
load();
|
||||
}
|
||||
|
||||
public void load() {
|
||||
plugin.saveDefaultConfig();
|
||||
plugin.reloadConfig();
|
||||
cfg = plugin.getConfig();
|
||||
|
||||
snapshotRefreshInterval = cfg.getInt("snapshot-refresh-interval", SNAPSHOT_REFRESH_INTERVAL_DEFAULT);
|
||||
engineMode = cfg.getInt("engine-mode", ENGINE_MODE_DEFAULT);
|
||||
maxOccludingCount = cfg.getInt("max-occluding-count", MAX_OCCLUDING_COUNT_DEFAULT);
|
||||
debugMode = cfg.getBoolean("debug-mode", DEBUG_MODE_DEFAULT);
|
||||
|
||||
alwaysShowRadius = cfg.getInt("always-show-radius", ALWAYS_SHOW_RADIUS_DEFAULT);
|
||||
raycastRadius = cfg.getInt("raycast-radius", RAYCAST_RADIUS_DEFAULT);
|
||||
searchRadius = cfg.getInt("search-radius", SEARCH_RADIUS_DEFAULT);
|
||||
cullPlayers = cfg.getBoolean("cull-players", CULL_PLAYERS_DEFAULT);
|
||||
onlyCullSneakingPlayers = cfg.getBoolean("only-cull-sneaking-players", ONLY_CULL_SNEAKING_PLAYERS_DEFAULT);
|
||||
recheckInterval = cfg.getInt("recheck-interval", RECHECK_INTERVAL_DEFAULT);
|
||||
|
||||
checkTileEntities = cfg.getBoolean("check-tile-entities", CHECK_TILE_ENTITIES_DEFAULT);
|
||||
tileEntityRecheckInterval = cfg.getInt("tile-entity-recheck-interval", TILE_ENTITY_RECHECK_INTERVAL_DEFAULT);
|
||||
|
||||
// Write defaults if missing
|
||||
cfg.addDefault("snapshot-refresh-interval", SNAPSHOT_REFRESH_INTERVAL_DEFAULT);
|
||||
cfg.addDefault("engine-mode", ENGINE_MODE_DEFAULT);
|
||||
cfg.addDefault("max-occluding-count", MAX_OCCLUDING_COUNT_DEFAULT);
|
||||
cfg.addDefault("debug-mode", DEBUG_MODE_DEFAULT);
|
||||
cfg.addDefault("always-show-radius", ALWAYS_SHOW_RADIUS_DEFAULT);
|
||||
cfg.addDefault("raycast-radius", RAYCAST_RADIUS_DEFAULT);
|
||||
cfg.addDefault("search-radius", SEARCH_RADIUS_DEFAULT);
|
||||
cfg.addDefault("cull-players", CULL_PLAYERS_DEFAULT);
|
||||
cfg.addDefault("only-cull-sneaking-players", ONLY_CULL_SNEAKING_PLAYERS_DEFAULT);
|
||||
cfg.addDefault("recheck-interval", RECHECK_INTERVAL_DEFAULT);
|
||||
cfg.addDefault("check-tile-entities", CHECK_TILE_ENTITIES_DEFAULT);
|
||||
cfg.addDefault("tile-entity-recheck-interval", TILE_ENTITY_RECHECK_INTERVAL_DEFAULT);
|
||||
cfg.options().copyDefaults(true);
|
||||
plugin.saveConfig();
|
||||
}
|
||||
|
||||
public int setConfigValue(String path, String rawValue) {
|
||||
if (!cfg.contains(path)) return -1;
|
||||
Object current = cfg.get(path);
|
||||
Object parsed;
|
||||
if (current instanceof Boolean) {
|
||||
String lower = rawValue.toLowerCase();
|
||||
if (!lower.equals("true") && !lower.equals("false")) return -1;
|
||||
parsed = Boolean.parseBoolean(lower);
|
||||
} else if (current instanceof Number) {
|
||||
int intVal;
|
||||
try {
|
||||
intVal = Integer.parseInt(rawValue);
|
||||
} catch (NumberFormatException e) {
|
||||
return -1;
|
||||
}
|
||||
if (intVal < 0 || intVal > 256) return 0;
|
||||
parsed = intVal;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
cfg.set(path, parsed);
|
||||
plugin.saveConfig();
|
||||
load();
|
||||
return 1;
|
||||
/*
|
||||
-1 = invalid input
|
||||
0 = out of range
|
||||
1 = success
|
||||
*/
|
||||
}
|
||||
public void setPacketEventsPresent(boolean present) {
|
||||
this.packetEventsPresent = present;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.Packets.PacketProcessor;
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.block.BlockBurnEvent;
|
||||
import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import org.bukkit.event.world.ChunkLoadEvent;
|
||||
import org.bukkit.event.world.ChunkUnloadEvent;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.UUID;
|
||||
|
||||
import static games.cubi.raycastedEntityOcclusion.UpdateChecker.checkForUpdates;
|
||||
|
||||
public class EventListener implements Listener {
|
||||
private final ChunkSnapshotManager manager;
|
||||
private final ConfigManager config;
|
||||
private PacketProcessor packetProcessor;
|
||||
private final RaycastedEntityOcclusion plugin;
|
||||
|
||||
public EventListener(RaycastedEntityOcclusion plugin, ChunkSnapshotManager mgr, ConfigManager cfg) {
|
||||
this.manager = mgr;
|
||||
this.config = cfg;
|
||||
this.plugin = plugin;
|
||||
//load packet processor after 2 ticks in a bukkit runnable to ensure the plugin is fully loaded
|
||||
Bukkit.getScheduler().runTaskLater(plugin, () -> {
|
||||
if (config.packetEventsPresent) {
|
||||
packetProcessor = plugin.getPacketProcessor();
|
||||
} else {
|
||||
packetProcessor = null;
|
||||
}
|
||||
}, 2L);
|
||||
}
|
||||
|
||||
// Snapshot events
|
||||
|
||||
@EventHandler
|
||||
public void onChunkLoad(ChunkLoadEvent e) {
|
||||
manager.onChunkLoad(e.getChunk());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onChunkUnload(ChunkUnloadEvent e) {
|
||||
manager.onChunkUnload(e.getChunk());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlace(BlockPlaceEvent e) {
|
||||
manager.onBlockChange(e.getBlock().getLocation(), e.getBlock().getType());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBreak(BlockBreakEvent e) {
|
||||
manager.onBlockChange(e.getBlock().getLocation(), Material.AIR);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBurn(BlockBurnEvent e) {
|
||||
manager.onBlockChange(e.getBlock().getLocation(), Material.AIR);
|
||||
}
|
||||
// These events do not cover all cases, but I can't be bothered to figure out a better solution rn. Frequent snapshot refreshes is the solution. If anyone has a solution please let me know.
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerDisconnect(PlayerQuitEvent e) {
|
||||
if (config.packetEventsPresent && packetProcessor != null) {
|
||||
UUID player = e.getPlayer().getUniqueId();
|
||||
packetProcessor.sendPlayerInfoRemovePacket(player);
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
|
||||
if (event.getPlayer().hasPermission("raycastedentityocclusions.updatecheck")) {
|
||||
Player sender = event.getPlayer();
|
||||
checkForUpdates(plugin, sender);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Packets;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import com.github.retrooper.packetevents.event.PacketSendEvent;
|
||||
import com.github.retrooper.packetevents.manager.player.PlayerManager;
|
||||
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerPlayerInfoRemove;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PacketProcessor {
|
||||
private final RaycastedEntityOcclusion plugin;
|
||||
private final UUID key;
|
||||
|
||||
public PacketProcessor(RaycastedEntityOcclusion plugin) {
|
||||
this.plugin = plugin;
|
||||
key = UUID.randomUUID();
|
||||
}
|
||||
|
||||
public void processPlayerInfoRemovePacket(PacketSendEvent event) {
|
||||
WrapperPlayServerPlayerInfoRemove removePacket = new WrapperPlayServerPlayerInfoRemove(event);
|
||||
List<UUID> playersBeingRemoved = removePacket.getProfileIds();
|
||||
if (playersBeingRemoved.size() != 2) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
if (!playersBeingRemoved.contains(key)) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
public void sendPlayerInfoRemovePacket(UUID uuid) {
|
||||
WrapperPlayServerPlayerInfoRemove removePacket = new WrapperPlayServerPlayerInfoRemove(uuid, key);
|
||||
PlayerManager playerManager = PacketEvents.getAPI().getPlayerManager();
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
playerManager.sendPacket(player, removePacket);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Packets;
|
||||
|
||||
import com.github.retrooper.packetevents.event.PacketListener;
|
||||
import com.github.retrooper.packetevents.event.PacketSendEvent;
|
||||
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
|
||||
public class PacketsListener implements PacketListener {
|
||||
private RaycastedEntityOcclusion plugin;
|
||||
private PacketProcessor packetProcessor;
|
||||
public PacketsListener(RaycastedEntityOcclusion plugin) {
|
||||
// This is run on load, not on enable.
|
||||
this.plugin = plugin;
|
||||
|
||||
}
|
||||
@Override
|
||||
public void onPacketSend(PacketSendEvent event) {
|
||||
if (event.getPacketType() == PacketType.Play.Server.PLAYER_INFO_REMOVE) {
|
||||
if (packetProcessor == null) {
|
||||
// Initialize the PacketProcessor if it hasn't been initialized yet since the initialization of the PacketsListener is on load, not on enable.
|
||||
packetProcessor = plugin.getPacketProcessor();
|
||||
}
|
||||
packetProcessor.processPlayerInfoRemovePacket(event);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Packets;
|
||||
|
||||
import com.github.retrooper.packetevents.PacketEvents;
|
||||
import com.github.retrooper.packetevents.event.PacketListenerPriority;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
|
||||
public class Registrar {
|
||||
|
||||
public Registrar(RaycastedEntityOcclusion plugin) {
|
||||
// Register the packet listener
|
||||
PacketEvents.getAPI().getEventManager().registerListener(new PacketsListener(plugin), PacketListenerPriority.NORMAL);
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import org.bukkit.util.RayTraceResult;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
public class Raycast {
|
||||
public static void asyncRaycast(Location start, Location end, RaycastedEntityOcclusion plugin, RaycastCallback callback) {
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Vector direction = end.toVector().subtract(start.toVector()).normalize();
|
||||
double distance = start.distance(end);
|
||||
|
||||
|
||||
// Perform the ray trace
|
||||
RayTraceResult result = start.getWorld().rayTraceBlocks(start, direction, distance,
|
||||
FluidCollisionMode.NEVER, // Ignore fluids
|
||||
true, // Pass through transparent blocks
|
||||
// Check if the block is occluding
|
||||
(block) -> isOccluding(block.getType())
|
||||
);
|
||||
|
||||
// Check if the ray hit a solid block or reached the player
|
||||
if (result == null || result.getHitBlock() == null) {
|
||||
// No solid block was hit, so the ray reached the player
|
||||
callback.onResult(true);
|
||||
} else {
|
||||
// A solid block was hit
|
||||
callback.onResult(false);
|
||||
//plugin.getLogger().info("Raycast hit a solid block: " + result.getHitBlock().getType() + " at " + result.getHitBlock().getLocation());
|
||||
|
||||
}
|
||||
}
|
||||
}.runTaskAsynchronously(plugin);
|
||||
}
|
||||
|
||||
public interface RaycastCallback {
|
||||
void onResult(boolean canSeePlayer);
|
||||
}
|
||||
private static boolean isOccluding(Material material) {
|
||||
return material.isOccluding();
|
||||
}
|
||||
|
||||
public static boolean syncRaycast(Location start, Location end, RaycastedEntityOcclusion plugin) {
|
||||
Vector direction = end.toVector().subtract(start.toVector()).normalize();
|
||||
double distance = start.distance(end);
|
||||
|
||||
|
||||
// Perform the ray trace
|
||||
RayTraceResult result = start.getWorld().rayTraceBlocks(start, direction, distance,
|
||||
FluidCollisionMode.NEVER, // Ignore fluids
|
||||
true, // Pass through transparent blocks
|
||||
// Check if the block is occluding
|
||||
(block) -> isOccluding(block.getType())
|
||||
);
|
||||
|
||||
// Check if the ray hit a solid block or reached the player
|
||||
if (result == null || result.getHitBlock() == null) {
|
||||
// No solid block was hit, so the ray reached the player
|
||||
return true;
|
||||
} else {
|
||||
// A solid block was hit
|
||||
return false;
|
||||
//plugin.getLogger().info("Raycast hit a solid block: " + result.getHitBlock().getType() + " at " + result.getHitBlock().getLocation());
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,251 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Raycast;
|
||||
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
|
||||
import games.cubi.raycastedEntityOcclusion.ConfigManager;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.EntitySnapshotManager;
|
||||
import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
|
||||
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class Engine {
|
||||
|
||||
public static ConcurrentHashMap<Location, Set<Player>> canSeeTileEntity = new ConcurrentHashMap<>();
|
||||
|
||||
private static class RayJob {
|
||||
final Player player;
|
||||
final Entity target;
|
||||
final Location start, predictedStart, end;
|
||||
|
||||
RayJob(Player p, Entity e, Location s, Location pred, Location t) {
|
||||
player = p;
|
||||
target = e;
|
||||
start = s;
|
||||
predictedStart = pred;
|
||||
end = t;
|
||||
}
|
||||
}
|
||||
|
||||
private static class RayResult {
|
||||
final Player player;
|
||||
final Entity target;
|
||||
final boolean visible;
|
||||
|
||||
RayResult(Player p, Entity e, boolean v) {
|
||||
player = p;
|
||||
target = e;
|
||||
visible = v;
|
||||
}
|
||||
}
|
||||
private static class PlayerInfo {
|
||||
final Player player;
|
||||
final Location location;
|
||||
final Location predLoc;
|
||||
|
||||
PlayerInfo(Player p, Location loc, Location pred) {
|
||||
player = p;
|
||||
location = loc;
|
||||
predLoc = pred;
|
||||
}
|
||||
}
|
||||
|
||||
private static Consumer<ScheduledTask> raycastEntitiesAroundPlayer(Player player, Location eye, Location predEye){
|
||||
|
||||
return task -> { /* This is needed for it to return, idk why*/ };
|
||||
}
|
||||
|
||||
Map<UUID, RayResult> results = new ConcurrentHashMap<>();
|
||||
|
||||
public static void runEngine(ConfigManager cfg, ChunkSnapshotManager snapMgr, MovementTracker tracker, EntitySnapshotManager entitySnapshotManager, RaycastedEntityOcclusion plugin) {
|
||||
// ----- PHASE 1: SYNC GATHER -----
|
||||
List<PlayerInfo> info = new ArrayList<>();
|
||||
// TODO: Store players in EntitySnapshotManager and use that to avoid iterating through all players every tick
|
||||
AsyncScheduler asyncScheduler = plugin.getServer().getAsyncScheduler();
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
if (p.hasPermission("raycastedentityocclusions.bypass")) continue;
|
||||
Location eye = p.getEyeLocation().clone();
|
||||
Location predEye = null;
|
||||
if (cfg.engineMode == 2) {
|
||||
// getPredictedLocation returns null if insufficient data or too slow
|
||||
predEye = tracker.getPredictedLocation(p);
|
||||
}
|
||||
asyncScheduler.runNow(plugin, raycastEntitiesAroundPlayer(p, eye, predEye));
|
||||
}
|
||||
|
||||
// ----- PHASE 2: ASYNC RAYCASTS -----
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
List<RayResult> results = new ArrayList<>();
|
||||
|
||||
|
||||
|
||||
for (Entity e : entitySnapshotManager.getBukkitEntitiesNear(eye, cfg.searchRadius, cfg.searchRadius, cfg.searchRadius)) {
|
||||
if (e == p) continue;
|
||||
// Cull-players logic
|
||||
if (e instanceof Player pl && (!cfg.cullPlayers || (cfg.onlyCullSneakingPlayers && !pl.isSneaking()))) {
|
||||
//TODO: Add to result that player should be shown
|
||||
continue;
|
||||
}
|
||||
|
||||
Location target = e.getLocation().add(0, e.getHeight() / 2, 0).clone();
|
||||
double dist = eye.distance(target);
|
||||
if (dist <= cfg.alwaysShowRadius) {
|
||||
p.showEntity(plugin, e);
|
||||
} else if (dist > cfg.raycastRadius) {
|
||||
p.hideEntity(plugin, e);
|
||||
} else if (p.canSee(e) && plugin.tick % cfg.recheckInterval != 0) {
|
||||
// player can see entity, no need to raycast
|
||||
} else {
|
||||
// schedule for async raycast (with or without predEye)
|
||||
jobs.add(new RayJob(p, e, eye, predEye, target));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
for (RayJob job : jobs) {
|
||||
// if the player is not in the same world as the target, skip
|
||||
if (!job.player.getWorld().equals(job.target.getWorld())) {
|
||||
continue;
|
||||
}
|
||||
// first cast from real eye
|
||||
boolean vis = RaycastUtil.raycast(job.start, job.end, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
|
||||
|
||||
// if that fails and we have a predEye, cast again from predicted
|
||||
if (!vis && job.predictedStart != null) {
|
||||
if (cfg.debugMode) {
|
||||
job.predictedStart.getWorld().spawnParticle(Particle.DUST, job.predictedStart, 1, new Particle.DustOptions(Color.BLUE, 1f));
|
||||
}
|
||||
vis = RaycastUtil.raycast(job.predictedStart, job.end, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
|
||||
}
|
||||
|
||||
results.add(new RayResult(job.player, job.target, vis));
|
||||
}
|
||||
|
||||
// ----- PHASE 3: SYNC APPLY -----
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
for (RayResult r : results) {
|
||||
Player p = r.player;
|
||||
Entity ent = r.target;
|
||||
if (p != null && ent != null) {
|
||||
boolean currentState = p.canSee(ent);
|
||||
if (currentState == r.visible) continue;
|
||||
if (r.visible) p.showEntity(plugin, ent);
|
||||
else {
|
||||
p.hideEntity(plugin, ent);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public static void runTileEngine(ConfigManager cfg, ChunkSnapshotManager snapMgr, MovementTracker tracker, RaycastedEntityOcclusion plugin) {
|
||||
if (cfg.checkTileEntities) {
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
if (p.hasPermission("raycastedentityocclusions.bypass")) continue;
|
||||
String world = p.getWorld().getName();
|
||||
//get player's chunk location
|
||||
int chunkX = p.getLocation().getBlockX() >> 4;
|
||||
int chunkZ = p.getLocation().getBlockZ() >> 4;
|
||||
//async run with vars passed in
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
int chunksRadius = (cfg.searchRadius + 15) / 16;
|
||||
HashSet<Location> tileEntities = new HashSet<>();
|
||||
for (int x = (-chunksRadius/2)+chunkX; x <= chunksRadius+chunkX; x++) {
|
||||
for (int z = (-chunksRadius/2)+chunkZ; z <= chunksRadius+chunkZ; z++) {
|
||||
tileEntities.addAll(snapMgr.getTileEntitiesInChunk(world, x, z));
|
||||
}
|
||||
}
|
||||
for (Location loc : tileEntities) {
|
||||
Set<Player> seen = canSeeTileEntity.get(loc);
|
||||
if (seen != null && seen.contains(p)) {
|
||||
if (cfg.tileEntityRecheckInterval == 0) continue;
|
||||
if (plugin.tick % (cfg.tileEntityRecheckInterval*20) != 0) continue;
|
||||
}
|
||||
|
||||
if (snapMgr.getMaterialAt(loc).equals(Material.BEACON)) continue;
|
||||
|
||||
double distSquared = loc.distanceSquared(p.getLocation());
|
||||
if (distSquared > cfg.searchRadius * cfg.searchRadius) {
|
||||
hideTileEntity(p, loc);
|
||||
continue;
|
||||
}
|
||||
if (distSquared < cfg.alwaysShowRadius * cfg.alwaysShowRadius) {
|
||||
showTileEntity(p, loc);
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean result = RaycastUtil.raycast(p.getEyeLocation(), loc, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
|
||||
if (cfg.engineMode == 2) {
|
||||
Location predEye = tracker.getPredictedLocation(p);
|
||||
if (predEye != null) {
|
||||
boolean result2 = RaycastUtil.raycast(predEye, loc, cfg.maxOccludingCount, cfg.debugMode, snapMgr);
|
||||
if (result2) {
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
syncToggleTileEntity(p, loc, result, plugin);
|
||||
if (result) {
|
||||
canSeeTileEntity.computeIfAbsent(loc, k -> ConcurrentHashMap.newKeySet()).add(p);
|
||||
} else {
|
||||
Set<Player> seenPlayers = canSeeTileEntity.get(loc);
|
||||
if (seenPlayers != null) {
|
||||
seenPlayers.remove(p);
|
||||
if (seenPlayers.isEmpty()) {
|
||||
canSeeTileEntity.remove(loc);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void hideTileEntity(Player p, Location location) {
|
||||
if (p.hasPermission("raycastedentityocclusions.bypass")) return;
|
||||
BlockData fake;
|
||||
if (location.getBlockY() < 0) {
|
||||
fake = Material.DEEPSLATE.createBlockData();
|
||||
}
|
||||
else {
|
||||
fake = Material.STONE.createBlockData();
|
||||
}
|
||||
p.sendBlockChange(location, fake);
|
||||
}
|
||||
public static void showTileEntity(Player p, Location location) {
|
||||
Block block = location.getBlock();
|
||||
BlockData data = block.getBlockData();
|
||||
p.sendBlockChange(location, data);
|
||||
|
||||
}
|
||||
public static void syncToggleTileEntity(Player p, Location loc, boolean bool, RaycastedEntityOcclusion plugin) {
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
if (bool) {
|
||||
showTileEntity(p, loc);
|
||||
} else {
|
||||
hideTileEntity(p, loc);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Raycast;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.ConfigManager;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class MovementTracker {
|
||||
private final Map<Player, Deque<Location>> history = new ConcurrentHashMap<>();
|
||||
|
||||
public MovementTracker(RaycastedEntityOcclusion plugin, ConfigManager config) {
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (config.engineMode == 2) {
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
history.computeIfAbsent(p, k -> new ArrayDeque<>(5));
|
||||
Deque<Location> dq = history.get(p);
|
||||
if (dq.size() >= 5) dq.removeFirst();
|
||||
|
||||
dq.addLast(p.getEyeLocation());
|
||||
}
|
||||
}
|
||||
}
|
||||
}.runTaskTimer(plugin, 1L, 1L);
|
||||
}
|
||||
|
||||
/**
|
||||
* Predicts location 5 ticks ahead based on last 5 ticks. Returns null if insufficient or too slow.
|
||||
*/
|
||||
public Location getPredictedLocation(Player p) {
|
||||
//TODO: Make the predicted location incorporate ping
|
||||
Deque<Location> dq = history.get(p);
|
||||
if (dq == null || dq.size() < 5) return null;
|
||||
Location old = dq.peekFirst();
|
||||
Location now = dq.peekLast();
|
||||
if (old == null || now == null) return null;
|
||||
double dx = now.getX() - old.getX();
|
||||
double dy = now.getY() - old.getY();
|
||||
double dz = now.getZ() - old.getZ();
|
||||
double speed = Math.sqrt(dx*dx + dy*dy + dz*dz) / 5.0;
|
||||
if (speed < 0.1) return null;
|
||||
return now.clone().add(dx*2, dy, dz*2);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Raycast;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
public class RaycastUtil {
|
||||
private static final Particle.DustOptions DUST_RED = new Particle.DustOptions(org.bukkit.Color.RED, 1f);
|
||||
private static final Particle.DustOptions DUST_GREEN = new Particle.DustOptions(org.bukkit.Color.GREEN, 1f);;
|
||||
|
||||
public static boolean raycast(Location start, Location end, int maxOccluding, boolean debug, ChunkSnapshotManager snap) {
|
||||
double total = start.distance(end);
|
||||
double traveled = 0;
|
||||
Location curr = start.clone();
|
||||
Vector dir = end.toVector().subtract(start.toVector()).normalize();
|
||||
while (traveled < total) {
|
||||
curr.add(dir);
|
||||
traveled += 1;
|
||||
Material mat = snap.getMaterialAt(curr);
|
||||
if (mat == null) {
|
||||
continue;
|
||||
}
|
||||
if (mat.isOccluding()) {
|
||||
maxOccluding--;
|
||||
if (debug) {
|
||||
start.getWorld().spawnParticle(Particle.DUST, curr, 1, DUST_RED);
|
||||
}
|
||||
if (maxOccluding < 1) return false;
|
||||
}
|
||||
else if (debug) {
|
||||
start.getWorld().spawnParticle(Particle.DUST, curr, 1, DUST_GREEN);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,59 +1,112 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.tree.LiteralCommandNode;
|
||||
import games.cubi.raycastedEntityOcclusion.Packets.PacketProcessor;
|
||||
import games.cubi.raycastedEntityOcclusion.Packets.Registrar;
|
||||
import games.cubi.raycastedEntityOcclusion.Raycast.Engine;
|
||||
import games.cubi.raycastedEntityOcclusion.Raycast.MovementTracker;
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.ChunkSnapshotManager;
|
||||
import games.cubi.raycastedEntityOcclusion.Snapshot.EntitySnapshotManager;
|
||||
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||
import io.papermc.paper.command.brigadier.Commands;
|
||||
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
import games.cubi.raycastedEntityOcclusion.bStats.MetricsCollector;
|
||||
|
||||
public final class RaycastedEntityOcclusion extends JavaPlugin {
|
||||
public class RaycastedEntityOcclusion extends JavaPlugin implements CommandExecutor {
|
||||
private ConfigManager cfg;
|
||||
private ChunkSnapshotManager snapMgr;
|
||||
private EntitySnapshotManager entitySnapshotManager;
|
||||
private MovementTracker tracker;
|
||||
private CommandsManager commands;
|
||||
private boolean packetEventsPresent = false;
|
||||
private PacketProcessor packetProcessor = null;
|
||||
private UpdateChecker updateChecker;
|
||||
|
||||
public int alwaysShowRadius;
|
||||
public int raycastRadius;
|
||||
public int searchRadius;
|
||||
public boolean moreChecks;
|
||||
public boolean occludePlayers;
|
||||
public int recheckInterval;
|
||||
public int tickCounter = 0;
|
||||
public RaycastedEntityOcclusion plugin = this;
|
||||
public CheckEntityVisibility checkEntityVisibility;
|
||||
public int tick = 0;
|
||||
|
||||
@Override
|
||||
public void onLoad() {
|
||||
Plugin packetEvents = Bukkit.getPluginManager().getPlugin("packetevents");
|
||||
if (packetEvents != null) {
|
||||
packetEventsPresent = true;
|
||||
getLogger().info("PacketEvents detected.");
|
||||
new Registrar(this);
|
||||
|
||||
} else {
|
||||
getLogger().info("PacketEvents not detected, disabling packet-based tablist modification. Don't worry, the plugin will still work without it.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
loadConfig();
|
||||
cfg = new ConfigManager(this);
|
||||
snapMgr = new ChunkSnapshotManager(this);
|
||||
tracker = new MovementTracker(this, cfg);
|
||||
commands = new CommandsManager(this, cfg);
|
||||
updateChecker = new UpdateChecker(this);
|
||||
entitySnapshotManager = new EntitySnapshotManager();
|
||||
getServer().getPluginManager().registerEvents(new EventListener(this, snapMgr, cfg), this);
|
||||
//Brigadier API
|
||||
LiteralCommandNode<CommandSourceStack> buildCommand = commands.registerCommand();
|
||||
|
||||
int pluginId = 24553;
|
||||
new Metrics(this, pluginId);
|
||||
this.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, commands -> {
|
||||
commands.registrar().register(buildCommand);
|
||||
//alias "reo"
|
||||
commands.registrar().register(Commands.literal("reo")
|
||||
.requires(sender -> sender.getSender().hasPermission("raycastedentityocclusions.command"))
|
||||
.executes(context -> {
|
||||
new CommandsManager(this, cfg).helpCommand(context);
|
||||
return Command.SINGLE_SUCCESS;
|
||||
})
|
||||
.redirect(buildCommand).build());
|
||||
});
|
||||
|
||||
checkEntityVisibility = new CheckEntityVisibility(plugin);
|
||||
//bStats
|
||||
new MetricsCollector(this, cfg);
|
||||
|
||||
getCommand("raycastedentityocclusion").setExecutor(new CommandHandler(plugin));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
// Plugin shutdown logic
|
||||
// TODO: Move this somewhere else, the main class should be cleaner
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
tick++;
|
||||
Engine.runEngine(cfg, snapMgr, tracker, entitySnapshotManager, RaycastedEntityOcclusion.this);
|
||||
Engine.runTileEngine(cfg, snapMgr, tracker, RaycastedEntityOcclusion.this);
|
||||
}
|
||||
}.runTaskTimer(this, 0L, 1L);
|
||||
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (packetEventsPresent && Bukkit.getPluginManager().isPluginEnabled("packetevents")) {
|
||||
cfg.setPacketEventsPresent(true);
|
||||
packetProcessor = new PacketProcessor(RaycastedEntityOcclusion.this);
|
||||
getLogger().info("PacketEvents is enabled, enabling packet-based tablist modification.");
|
||||
}
|
||||
}
|
||||
}.runTaskLater(this, 1L);
|
||||
}
|
||||
|
||||
|
||||
public void loadConfig() {
|
||||
saveDefaultConfig();
|
||||
reloadConfig();
|
||||
FileConfiguration config = getConfig();
|
||||
|
||||
alwaysShowRadius = config.getInt("AlwaysShowRadius", 4);
|
||||
raycastRadius = config.getInt("RaycastRadius", 64);
|
||||
searchRadius = config.getInt("SearchRadius", 72);
|
||||
moreChecks = config.getBoolean("MoreChecks", false);
|
||||
occludePlayers = config.getBoolean("OccludePlayers", false);
|
||||
recheckInterval = config.getInt("RecheckInterval", 10);
|
||||
|
||||
|
||||
getLogger().info("AlwaysShowRadius: " + alwaysShowRadius);
|
||||
getLogger().info("RaycastRadius: " + raycastRadius);
|
||||
getLogger().info("SearchRadius: " + searchRadius);
|
||||
getLogger().info("MoreChecks: " + moreChecks);
|
||||
getLogger().info("OccludePlayers: " + occludePlayers);
|
||||
getLogger().info("RecheckInterval: " + recheckInterval);
|
||||
public ConfigManager getConfigManager() {
|
||||
return cfg;
|
||||
}
|
||||
public CheckEntityVisibility getCheckEntityVisibility() {
|
||||
return checkEntityVisibility;
|
||||
public ChunkSnapshotManager getChunkSnapshotManager() {
|
||||
return snapMgr;
|
||||
}
|
||||
public MovementTracker getMovementTracker() {
|
||||
return tracker;
|
||||
}
|
||||
public CommandsManager getCommandsManager() {
|
||||
return commands;
|
||||
}
|
||||
public PacketProcessor getPacketProcessor() {
|
||||
return packetProcessor;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,168 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Snapshot;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.ConfigManager;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.block.TileState;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class ChunkSnapshotManager {
|
||||
public static class Data {
|
||||
public final ChunkSnapshot snapshot;
|
||||
public final Map<Location, Material> delta = new ConcurrentHashMap<>();
|
||||
public final Set<Location> tileEntities = ConcurrentHashMap.newKeySet();
|
||||
public long lastRefresh;
|
||||
public int minHeight;
|
||||
public int maxHeight;
|
||||
|
||||
public Data(ChunkSnapshot snapshot, long time) {
|
||||
this.snapshot = snapshot;
|
||||
this.lastRefresh = time;
|
||||
}
|
||||
}
|
||||
|
||||
private final Map<String, Data> dataMap = new ConcurrentHashMap<>();
|
||||
private final ConfigManager cfg;
|
||||
|
||||
public ChunkSnapshotManager(RaycastedEntityOcclusion plugin) {
|
||||
cfg = plugin.getConfigManager();
|
||||
//get loaded chunks and add them to dataMap
|
||||
for (World w : plugin.getServer().getWorlds()) {
|
||||
for (Chunk c : w.getLoadedChunks()) {
|
||||
dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis()));
|
||||
}
|
||||
}
|
||||
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
long now = System.currentTimeMillis();
|
||||
int chunksRefreshed = 0;
|
||||
int chunksToRefreshMaximum = getNumberOfCachedChunks() / 3;
|
||||
for (Map.Entry<String, Data> e : dataMap.entrySet()) {
|
||||
if (now - e.getValue().lastRefresh >= cfg.snapshotRefreshInterval * 1000L && chunksRefreshed < chunksToRefreshMaximum) {
|
||||
chunksRefreshed++;
|
||||
String key = e.getKey();
|
||||
String[] parts = key.split(":");
|
||||
World w = plugin.getServer().getWorld(parts[0]);
|
||||
if (w == null) {
|
||||
plugin.getLogger().warning("ChunkSnapshotManager: World " + parts[0] + " not found. Please report this on our discord (discord.cubi.games)'");
|
||||
continue;
|
||||
}
|
||||
Chunk c = w.getChunkAt(
|
||||
Integer.parseInt(parts[1]),
|
||||
Integer.parseInt(parts[2])
|
||||
);
|
||||
e.setValue(takeSnapshot(c, now));
|
||||
}
|
||||
}
|
||||
if (cfg.debugMode) {
|
||||
plugin.getLogger().info("ChunkSnapshotManager: Refreshed " + chunksRefreshed + " chunks out of " + chunksToRefreshMaximum + " maximum.");
|
||||
}
|
||||
}
|
||||
}.runTaskTimerAsynchronously(plugin, cfg.snapshotRefreshInterval * 2L, cfg.snapshotRefreshInterval * 2L /* This runs 10 times per refreshInterval, spreading out the refreshes */);
|
||||
}
|
||||
|
||||
public void onChunkLoad(Chunk c) {
|
||||
dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis()));
|
||||
}
|
||||
|
||||
public void onChunkUnload(Chunk c) {
|
||||
dataMap.remove(key(c));
|
||||
}
|
||||
|
||||
// Used by EventListener to update the delta map when a block is placed or broken
|
||||
public void onBlockChange(Location loc, Material m) {
|
||||
if (cfg.debugMode) {
|
||||
Bukkit.getLogger().info("ChunkSnapshotManager: Block change at " + loc + " to " + m);
|
||||
}
|
||||
Data d = dataMap.get(key(loc.getChunk()));
|
||||
if (d != null) {
|
||||
d.delta.put(loc, m);
|
||||
if (cfg.checkTileEntities) {
|
||||
// Check if the block is a tile entity
|
||||
BlockState data = loc.getBlock().getState();
|
||||
loc = loc.clone().add(0.5, 0.5, 0.5);
|
||||
if (data instanceof TileState) {
|
||||
if (cfg.debugMode){
|
||||
Bukkit.getLogger().info("ChunkSnapshotManager: Tile entity at " + loc);
|
||||
}
|
||||
d.tileEntities.add(loc);
|
||||
} else {
|
||||
d.tileEntities.remove(loc);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Data takeSnapshot(Chunk c, long now) {
|
||||
World w = c.getWorld();
|
||||
Data data = new Data(c.getChunkSnapshot(), now);
|
||||
int chunkX = c.getX() * 16;
|
||||
int chunkZ = c.getZ() * 16;
|
||||
int minHeight = w.getMinHeight();
|
||||
int maxHeight = w.getMaxHeight();
|
||||
data.maxHeight = maxHeight;
|
||||
data.minHeight = minHeight;
|
||||
if (cfg.checkTileEntities) {
|
||||
for (int x = 0; x < 16; x++) {
|
||||
for (int y = minHeight; y < maxHeight; y++) {
|
||||
for (int z = 0; z < 16; z++) {
|
||||
BlockState bs = data.snapshot.getBlockData(x, y, z).createBlockState();
|
||||
|
||||
if (bs instanceof TileState) {
|
||||
data.tileEntities.add(new Location(w, x+ chunkX +0.5, y+0.5, z + chunkZ+0.5));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
private String key(Chunk c) {
|
||||
return c.getWorld().getName() + ":" + c.getX() + ":" + c.getZ();
|
||||
}
|
||||
|
||||
public Material getMaterialAt(Location loc) {
|
||||
Data d = dataMap.get(key(loc.getChunk()));
|
||||
if (d == null) {
|
||||
Chunk c = loc.getChunk();
|
||||
//dataMap.put(key(c), takeSnapshot(c, System.currentTimeMillis())); infinite loop
|
||||
System.err.println("ChunkSnapshotManager: No snapshot for " + c+ " Please report this on our discord (discord.cubi.games)'");
|
||||
return loc.getBlock().getType();
|
||||
}
|
||||
double yLevel = loc.getY();
|
||||
if (yLevel < d.minHeight || yLevel > d.maxHeight) {
|
||||
return null;
|
||||
}
|
||||
Material dm = d.delta.get(loc);
|
||||
if (dm != null) {
|
||||
return dm;
|
||||
}
|
||||
int x = loc.getBlockX() & 0xF;
|
||||
int y = loc.getBlockY();
|
||||
int z = loc.getBlockZ() & 0xF;
|
||||
|
||||
return d.snapshot.getBlockType(x, y, z);
|
||||
}
|
||||
|
||||
//get TileEntity Locations in chunk
|
||||
public Set<Location> getTileEntitiesInChunk(String worldName, int x, int z) {
|
||||
Data d = dataMap.get(worldName + ":" + x + ":" + z);
|
||||
if (d == null) {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
return d.tileEntities;
|
||||
}
|
||||
|
||||
public int getNumberOfCachedChunks() {
|
||||
return dataMap.size();
|
||||
//created to use in a debug command maybe
|
||||
}
|
||||
|
||||
}
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
package games.cubi.raycastedEntityOcclusion.Snapshot;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
|
||||
public class EntitySnapshotManager {
|
||||
|
||||
public static class EntityData {
|
||||
|
||||
//Entity data for a single entity in a world.
|
||||
|
||||
private volatile Location location;
|
||||
/** Player UUID → can-see flag (true/false). Absence = NOT_SET. */
|
||||
private final Map<UUID, Boolean> visibility = new ConcurrentHashMap<>();
|
||||
|
||||
public EntityData(Location initial) {
|
||||
this.location = initial.clone();
|
||||
}
|
||||
|
||||
/* ---- location ---- */
|
||||
public Location getLocation() { return location.clone(); }
|
||||
public void setLocation(Location loc) { this.location = loc.clone(); }
|
||||
|
||||
/* ---- visibility ---- */
|
||||
public void setVisibleFor(UUID playerId, boolean canSee) {
|
||||
visibility.put(playerId, canSee);
|
||||
}
|
||||
public void clearVisibility(UUID playerId) { visibility.remove(playerId); }
|
||||
|
||||
public Boolean getVisibility(UUID playerId) {
|
||||
return visibility.get(playerId); // may be null
|
||||
}
|
||||
}
|
||||
|
||||
// Cache: world-name → (entity-UUID → data)
|
||||
private final Map<String, Map<UUID, EntityData>> cache = new ConcurrentHashMap<>();
|
||||
|
||||
public void addEntity(Entity entity) {
|
||||
Objects.requireNonNull(entity, "EntitySnapshotManager: Cannot add null entity");
|
||||
cache.computeIfAbsent(entity.getWorld().getName(),
|
||||
w -> new ConcurrentHashMap<>())
|
||||
.putIfAbsent(entity.getUniqueId(),
|
||||
new EntityData(entity.getLocation()));
|
||||
}
|
||||
|
||||
public void removeEntity(Entity entity) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
|
||||
if (entitiesInWorld != null) {
|
||||
entitiesInWorld.remove(entity.getUniqueId());
|
||||
if (entitiesInWorld.isEmpty()) cache.remove(entity.getWorld().getName());
|
||||
}
|
||||
}
|
||||
|
||||
/** Updates (or inserts) the latest location for the entity. */
|
||||
public void updateLocation(Entity entity) {
|
||||
cache.computeIfAbsent(entity.getWorld().getName(),
|
||||
w -> new ConcurrentHashMap<>())
|
||||
.compute(entity.getUniqueId(), (id, data) -> {
|
||||
if (data == null) return new EntityData(entity.getLocation());
|
||||
data.setLocation(entity.getLocation());
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
// put anywhere inside EntitySnapshotManager
|
||||
public @Nullable Location getLocation(Entity entity) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
|
||||
if (entitiesInWorld == null) return null;
|
||||
EntityData data = entitiesInWorld.get(entity.getUniqueId());
|
||||
return (data == null) ? null : data.getLocation();
|
||||
}
|
||||
|
||||
|
||||
/* ---- visibility helpers ---- */
|
||||
public void setVisibility(Entity entity, Player player, boolean canSee) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
|
||||
if (entitiesInWorld != null) {
|
||||
EntityData d = entitiesInWorld.get(entity.getUniqueId());
|
||||
if (d != null) d.setVisibleFor(player.getUniqueId(), canSee);
|
||||
}
|
||||
}
|
||||
|
||||
public void clearVisibility(Entity entity, Player player) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
|
||||
if (entitiesInWorld != null) {
|
||||
EntityData d = entitiesInWorld.get(entity.getUniqueId());
|
||||
if (d != null) d.clearVisibility(player.getUniqueId());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public Boolean getVisibility(Entity entity, Player player) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(entity.getWorld().getName());
|
||||
if (entitiesInWorld == null) return null;
|
||||
EntityData d = entitiesInWorld.get(entity.getUniqueId());
|
||||
return (d == null) ? null : d.getVisibility(player.getUniqueId());
|
||||
}
|
||||
|
||||
/* ---- miscellaneous ---- */
|
||||
public Collection<EntityData> getEntitiesInWorld(World world) {
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(world.getName());
|
||||
return (entitiesInWorld == null) ? Collections.emptyList() : entitiesInWorld.values();
|
||||
}
|
||||
|
||||
public List<Entity> getBukkitEntitiesNear(Location origin, int radiusX, int radiusY, int radiusZ) {
|
||||
|
||||
World world = origin.getWorld();
|
||||
Map<UUID, EntityData> entitiesInWorld = cache.get(world.getName());
|
||||
if (entitiesInWorld == null || entitiesInWorld.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
double ox = origin.getX(), oy = origin.getY(), oz = origin.getZ();
|
||||
double minX = ox - radiusX, maxX = ox + radiusX;
|
||||
double minY = oy - radiusY, maxY = oy + radiusY;
|
||||
double minZ = oz - radiusZ, maxZ = oz + radiusZ;
|
||||
|
||||
List<Entity> result = new ArrayList<>();
|
||||
for (Map.Entry<UUID, EntityData> entry : entitiesInWorld.entrySet()) {
|
||||
EntityData data = entry.getValue();
|
||||
Location loc = data.getLocation();
|
||||
double x = loc.getX(), y = loc.getY(), z = loc.getZ();
|
||||
|
||||
if (x < minX || x > maxX || y < minY || y > maxY || z < minZ || z > maxZ) {
|
||||
|
||||
Entity live = world.getEntity(entry.getKey());
|
||||
if (live != null) {
|
||||
if (!live.isDead()) {
|
||||
result.add(live);
|
||||
}
|
||||
else removeEntity(live);
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public int size() {
|
||||
return cache.values().stream().mapToInt(Map::size).sum();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.URL;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
|
||||
public class UpdateChecker {
|
||||
private final RaycastedEntityOcclusion plugin;
|
||||
|
||||
public UpdateChecker(RaycastedEntityOcclusion plugin) {
|
||||
this.plugin = plugin;
|
||||
plugin.getLogger().info("Checking for updates...");
|
||||
checkForUpdates(plugin, Bukkit.getConsoleSender());
|
||||
}
|
||||
|
||||
|
||||
public static CompletableFuture<String> fetchFeaturedVersion(RaycastedEntityOcclusion plugin) {
|
||||
CompletableFuture<String> future = new CompletableFuture<>();
|
||||
|
||||
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
|
||||
|
||||
final String url = "https://api.modrinth.com/v2/project/raycasted-entity-occlusions/version?featured=true";
|
||||
try (final InputStreamReader reader = new InputStreamReader(new URL(url).openConnection().getInputStream())) {
|
||||
final JsonArray array = new JsonArray();
|
||||
array.add(new BufferedReader(reader).readLine());
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int i = 0; i < array.size(); i++) {
|
||||
|
||||
sb.append(array.get(i).getAsString());
|
||||
}
|
||||
String apiData = sb.toString();
|
||||
JsonArray jsonArray = JsonParser.parseString(apiData).getAsJsonArray();
|
||||
JsonObject firstObject = jsonArray.get(0).getAsJsonObject();
|
||||
String versionNumber = firstObject.get("version_number").getAsString();
|
||||
|
||||
future.complete(versionNumber);
|
||||
|
||||
} catch (IOException e) {
|
||||
future.completeExceptionally(new IllegalStateException("Unable to fetch latest version", e));
|
||||
}
|
||||
});
|
||||
return future;
|
||||
}
|
||||
|
||||
public static void checkForUpdates(RaycastedEntityOcclusion plugin, CommandSender audience) {
|
||||
//plugin.getLogger().info("Fetching latest version from Modrinth...");
|
||||
fetchFeaturedVersion(plugin).thenAccept(version -> {
|
||||
//plugin.getLogger().info("Latest version fetched: " + version);
|
||||
// This runs synchronously when the version is fetched
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
//plugin.getLogger().info("Checking if current version matches the latest version...");
|
||||
if (plugin.getDescription().getVersion().equals(version)) {
|
||||
audience.sendRichMessage("<green>You are using the latest version of Raycasted Entity Occlusions.");
|
||||
} else {
|
||||
audience.sendRichMessage("<red>You are not using the latest version of Raycasted Entity Occlusions. Please update to <green>v" + version);
|
||||
}
|
||||
});
|
||||
}).exceptionally(ex -> {
|
||||
// Handle error (e.g., log the exception)
|
||||
Bukkit.getScheduler().runTask(plugin, () -> {
|
||||
plugin.getLogger().warning("Failed to fetch version: " + ex.getMessage());
|
||||
});
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -1,4 +1,4 @@
|
||||
package games.cubi.raycastedEntityOcclusion;
|
||||
package games.cubi.raycastedEntityOcclusion.bStats;
|
||||
/*
|
||||
* This Metrics class was auto-generated and can be copied into your project if you are
|
||||
* not using a build tool like Gradle or Maven for dependency management.
|
||||
@@ -13,6 +13,7 @@ package games.cubi.raycastedEntityOcclusion;
|
||||
*
|
||||
* Violations will result in a ban of your plugin and account from bStats.
|
||||
*/
|
||||
// Note: I'm using the autogenerated class instead of using Gradle because it didn't work and this did and I can't be bothered to figure out why
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
@@ -0,0 +1,157 @@
|
||||
package games.cubi.raycastedEntityOcclusion.bStats;
|
||||
|
||||
import games.cubi.raycastedEntityOcclusion.ConfigManager;
|
||||
import games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class MetricsCollector {
|
||||
private final RaycastedEntityOcclusion plugin;
|
||||
private final Metrics metrics;
|
||||
private final ConfigManager config;
|
||||
|
||||
private List<Integer> playersOnline = new ArrayList<>();
|
||||
private List<Integer> entities = new ArrayList<>();
|
||||
|
||||
public MetricsCollector(RaycastedEntityOcclusion plugin, ConfigManager config) {
|
||||
this.plugin = plugin;
|
||||
int pluginId = 24553;
|
||||
metrics = new Metrics(plugin, pluginId);
|
||||
this.config = config;
|
||||
registerCustomMetrics();
|
||||
|
||||
plugin.getServer().getScheduler().runTaskTimer(plugin, this::collectMetrics, 0L, 6000L); // 6000 ticks = 5 minutes
|
||||
}
|
||||
|
||||
public void registerCustomMetrics() {
|
||||
metrics.addCustomChart(new Metrics.SimplePie("max_occluding_count", () -> String.valueOf(config.maxOccludingCount)));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("cull_players", this::getCullPlayersStatus));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("raycast_radius", () -> getRoundedValue(config.raycastRadius, ConfigManager.RAYCAST_RADIUS_DEFAULT)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("search_radius", () -> getRoundedValue(config.searchRadius, ConfigManager.SEARCH_RADIUS_DEFAULT)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("always_show_radius", () -> getRoundedValue(config.alwaysShowRadius, ConfigManager.ALWAYS_SHOW_RADIUS_DEFAULT)));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("engine_mode", () -> String.valueOf(config.engineMode)));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("snapshot_refresh_interval", () -> getRoundedValue(config.snapshotRefreshInterval, ConfigManager.SNAPSHOT_REFRESH_INTERVAL_DEFAULT)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("entity_recheck_interval", () -> getRoundedValue(config.recheckInterval, ConfigManager.RECHECK_INTERVAL_DEFAULT)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("tile_entity_recheck_interval", this::tileEntityCheckStatus));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("server_size", this::getPlayersOnline));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("entities", this::getEntities));
|
||||
}
|
||||
|
||||
public String getCullPlayersStatus() {
|
||||
if (config.cullPlayers) {
|
||||
if (config.onlyCullSneakingPlayers) {
|
||||
return "Sneaking";
|
||||
} else {
|
||||
return "Always";
|
||||
}
|
||||
} else {
|
||||
return "Never";
|
||||
}
|
||||
}
|
||||
|
||||
public String tileEntityCheckStatus() {
|
||||
if (config.checkTileEntities) {
|
||||
return getRoundedValue(config.tileEntityRecheckInterval, ConfigManager.TILE_ENTITY_RECHECK_INTERVAL_DEFAULT);
|
||||
} else {
|
||||
return "Disabled";
|
||||
}
|
||||
}
|
||||
|
||||
public String getRoundedValue(int value, int defaultValue) {
|
||||
if (value == defaultValue) {
|
||||
return defaultValue + ".0";
|
||||
} else {
|
||||
int roundedValue = Math.round(value / 5.0f) * 5;
|
||||
return String.valueOf(roundedValue);
|
||||
}
|
||||
}
|
||||
|
||||
public void collectMetrics() {
|
||||
playersOnline.add(Bukkit.getServer().getOnlinePlayers().size());
|
||||
// TODO: Cache all entities in Engine, and also use that here
|
||||
int totalEntities = 0;
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
totalEntities += world.getEntities().size();
|
||||
}
|
||||
entities.add(totalEntities);
|
||||
}
|
||||
public String getPlayersOnline() {
|
||||
if (playersOnline == null) {
|
||||
return "Null";
|
||||
}
|
||||
int averaged = (int) playersOnline.stream()
|
||||
.mapToInt(Integer::intValue)
|
||||
.average()
|
||||
.orElse(-1);
|
||||
playersOnline.clear();
|
||||
|
||||
if (averaged < 0) {
|
||||
return "Null";
|
||||
} else if (averaged < 4) {
|
||||
return String.valueOf(averaged);
|
||||
} else if (averaged < 7) {
|
||||
return "4-6";
|
||||
} else if (averaged < 11) {
|
||||
return "7-10";
|
||||
} else if (averaged < 16) {
|
||||
return "11-15";
|
||||
} else if (averaged < 26) {
|
||||
return "15-25";
|
||||
} else if (averaged < 40) {
|
||||
return "26-40";
|
||||
} else if (averaged < 71) {
|
||||
return "41-70";
|
||||
} else if (averaged < 101) {
|
||||
return "71-100";
|
||||
} else if (averaged < 201) {
|
||||
return "101-200";
|
||||
} else if (averaged < 301) {
|
||||
return "201-300";
|
||||
} else if (averaged < 501) {
|
||||
return "301-500";
|
||||
} else {
|
||||
return "500+";
|
||||
}
|
||||
|
||||
}
|
||||
public String getEntities() {
|
||||
if (entities == null) {
|
||||
return "Null";
|
||||
}
|
||||
int averaged = (int) entities.stream()
|
||||
.mapToInt(Integer::intValue)
|
||||
.average()
|
||||
.orElse(-1);
|
||||
entities.clear();
|
||||
|
||||
if (averaged < 0) {
|
||||
return "Null";
|
||||
} else if (averaged < 21) {
|
||||
return "0-20";
|
||||
} else if (averaged < 51) {
|
||||
return "21-50";
|
||||
} else if (averaged < 101) {
|
||||
return "51-100";
|
||||
} else if (averaged < 301) {
|
||||
return "101-300";
|
||||
} else if (averaged < 501) {
|
||||
return "301-500";
|
||||
} else if (averaged < 1001) {
|
||||
return "501-1000";
|
||||
} else if (averaged < 2001) {
|
||||
return "1001-2000";
|
||||
} else if (averaged < 5000) {
|
||||
return "2001-5000";
|
||||
} else {
|
||||
return "5000+";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,18 @@
|
||||
AlwaysShowRadius: 8
|
||||
RaycastRadius: 48
|
||||
SearchRadius: 52
|
||||
MoreChecks: false #This will enable more raycasts per mob, increasing performance hit but showing partially visible mobs
|
||||
OccludePlayers: false #Enabling this will make the plugin cull hidden players alongside entities
|
||||
RecheckInterval: 20 #Time in ticks between rechecking visible mobs
|
||||
snapshot-refresh-interval: 60 # seconds between chunk snapshot refresh, won't change without restart
|
||||
|
||||
engine-mode: 1 # 1 = straight-line; 2 = predictive and straight-line
|
||||
max-occluding-count: 3 # blocks before blocking
|
||||
|
||||
debug-mode: false # enable debug particles and more verbose logging
|
||||
|
||||
always-show-radius: 16 # radius to always show entities
|
||||
raycast-radius: 48 # beyond this, entities auto-hide
|
||||
search-radius: 48 # search radius for entities
|
||||
|
||||
cull-players: false # cull hidden players as well as other entities
|
||||
only-cull-sneaking-players: false # only cull sneaking players (requires cull-players)
|
||||
|
||||
recheck-interval: 50 # ticks between forced rechecks for visible entities
|
||||
|
||||
check-tile-entities: true # check tile entities for occlusion
|
||||
tile-entity-recheck-interval: 0 # seconds between forced rechecks for visible tile entities. If set to 0, they will never be rechecked.
|
||||
@@ -1,17 +1,20 @@
|
||||
name: RaycastedEntityOcclusion
|
||||
name: RaycastedEntityOcclusions
|
||||
version: ${version}
|
||||
main: games.cubi.raycastedEntityOcclusion.RaycastedEntityOcclusion
|
||||
api-version: '1.21'
|
||||
prefix: EntityOcclusion
|
||||
prefix: REO
|
||||
authors: [ _Cubicake ]
|
||||
load: STARTUP
|
||||
website: https://cubi.games
|
||||
commands:
|
||||
raycastedentityocclusion:
|
||||
description: RaycastedEntityOcclusion command
|
||||
usage: /<command>
|
||||
permission: raycastedentityocclusion.command
|
||||
aliases: [reo]
|
||||
permissions:
|
||||
raycastedentityocclusion.command:
|
||||
description: Permission to use the RaycastedEntityOcclusion command
|
||||
default: op
|
||||
raycastedentityocclusions.command:
|
||||
description: Permission to use the RaycastedEntityOcclusions command
|
||||
default: op
|
||||
raycastedentityocclusions.bypass:
|
||||
description: Permission to bypass all checks
|
||||
default: false
|
||||
raycastedentityocclusions.updatecheck:
|
||||
description: Permission to check for plugin updates
|
||||
default: op
|
||||
softdepend:
|
||||
- packetevents
|
||||
Reference in new issue
Block a user