Compare commits
186 Commits
6.56.0
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5595e95701 | ||
|
|
9ad12c2578 | ||
|
|
24d9052080 | ||
|
|
e2d2e955a4 | ||
|
|
c5cbdc2449 | ||
|
|
1a4e8be1b2 | ||
|
|
1a75dd8e5b | ||
|
|
77de51b1fd | ||
|
|
3495d2317d | ||
|
|
0284aec119 | ||
|
|
0d4289b756 | ||
|
|
6931ba0393 | ||
|
|
cb49fa2690 | ||
|
|
4898ca4a25 | ||
|
|
12d6ff180e | ||
|
|
1c0f40880f | ||
|
|
6625385e1c | ||
|
|
75ca3dc9a6 | ||
|
|
1db2671bc5 | ||
|
|
70dd3c0d64 | ||
|
|
8665df51cc | ||
|
|
e306190109 | ||
|
|
3e0a8b1838 | ||
|
|
29d69d77b4 | ||
|
|
9e625c004e | ||
|
|
59dfeeb012 | ||
|
|
6fdbb2d63f | ||
|
|
e77c8ab9aa | ||
|
|
48e1618c84 | ||
|
|
19f60afaf9 | ||
|
|
26e2282385 | ||
|
|
2e9d5c36f2 | ||
|
|
b4fb66ffa0 | ||
|
|
ba0bf5ee8f | ||
|
|
3bf9589cd2 | ||
|
|
510034af0d | ||
|
|
8052ffa706 | ||
|
|
ed41c1091c | ||
|
|
4fcf8c0368 | ||
|
|
4ae4af6f1d | ||
|
|
bba0900183 | ||
|
|
641aee3965 | ||
|
|
18ea6cc568 | ||
|
|
8335f6bae5 | ||
|
|
514a8e76f9 | ||
|
|
f34af36690 | ||
|
|
143148d93e | ||
|
|
4f6c023217 | ||
|
|
620e1d3042 | ||
|
|
d3c831c19b | ||
|
|
47e87fa6ce | ||
|
|
22d9dbdf66 | ||
|
|
238ea86e09 | ||
|
|
5cfb87e03c | ||
|
|
ff61527939 | ||
|
|
7ff578f89b | ||
|
|
27da03e8db | ||
|
|
f1bef38046 | ||
|
|
ee237f9c58 | ||
|
|
0a80518755 | ||
|
|
134859fea0 | ||
|
|
5c267d500a | ||
|
|
4c9735583c | ||
|
|
739d9cfffb | ||
|
|
4301d83e91 | ||
|
|
84d5c5e665 | ||
|
|
50f217eebe | ||
|
|
041fce69cc | ||
|
|
238bd08502 | ||
|
|
940e6e8b5b | ||
|
|
eb07622496 | ||
|
|
841ed52bdd | ||
|
|
342f6dbc7b | ||
|
|
245b577adc | ||
|
|
1258305755 | ||
|
|
cd8ed5a823 | ||
|
|
795ead57bf | ||
|
|
910cdaf992 | ||
|
|
85c02d3402 | ||
|
|
b4ad2fd4d7 | ||
|
|
3c5190da3a | ||
|
|
0f0f003f23 | ||
|
|
7e5e5162c3 | ||
|
|
09417d0834 | ||
|
|
c85b8c08c7 | ||
|
|
a65ac0aa4f | ||
|
|
9d03ba2bd2 | ||
|
|
8eb62d65b4 | ||
|
|
178f21b1f3 | ||
|
|
a3fe4f97ff | ||
|
|
ff356fcde5 | ||
|
|
59b57b17ba | ||
|
|
c8f710161d | ||
|
|
f840a55734 | ||
|
|
36677fe503 | ||
|
|
7e74223352 | ||
|
|
b6f2b9d4ea | ||
|
|
f320e77008 | ||
|
|
c8b255b358 | ||
|
|
5b5e161062 | ||
|
|
ffa511176f | ||
|
|
8515ff2b7b | ||
|
|
74aeaec257 | ||
|
|
0ce3d294d1 | ||
|
|
7c7052f5b9 | ||
|
|
a6b7dda82d | ||
|
|
04aaefb9ea | ||
|
|
d2fdb4f8e0 | ||
|
|
87f90d8b26 | ||
|
|
899d5cc054 | ||
|
|
c1ed771eb3 | ||
|
|
08a4d9d6b1 | ||
|
|
7ef8dcfd64 | ||
|
|
5bedf88b4c | ||
|
|
1d241651b5 | ||
|
|
3ff2bfa412 | ||
|
|
3a508c693b | ||
|
|
a4c5ff921e | ||
|
|
137e9dc7d6 | ||
|
|
710cec4bc1 | ||
|
|
fa0ec7d6b0 | ||
|
|
5093799775 | ||
|
|
8535f23ede | ||
|
|
8e09ae7f4c | ||
|
|
bbc2513b40 | ||
|
|
c7f8063a3a | ||
|
|
14b0f1be0c | ||
|
|
af20bb315b | ||
|
|
6645e216d5 | ||
|
|
eddf240f0c | ||
|
|
4f406353ba | ||
|
|
095494dd2e | ||
|
|
fd92645500 | ||
|
|
1a6ac29083 | ||
|
|
7edc00d459 | ||
|
|
a51bad058f | ||
|
|
89ebb8ba59 | ||
|
|
f0ae8f4f84 | ||
|
|
7d6cf78442 | ||
|
|
780d8f3b86 | ||
|
|
146a0130f9 | ||
|
|
df8c3411cb | ||
|
|
4fc3c22a7d | ||
|
|
cfc4808bb8 | ||
|
|
4ac6325a41 | ||
|
|
4aed33751d | ||
|
|
3fe1c2c69f | ||
|
|
5feaa84b2c | ||
|
|
d8793bc2bb | ||
|
|
15c512f3ca | ||
|
|
15ff2fb1d6 | ||
|
|
862b588c8d | ||
|
|
3c2a99b5f4 | ||
|
|
2d23c05c47 | ||
|
|
8fc55d3393 | ||
|
|
5900a756e4 | ||
|
|
c18b85f223 | ||
|
|
85116108c2 | ||
|
|
044f141bd0 | ||
|
|
9ca7f99fdb | ||
|
|
7aa7770a3e | ||
|
|
10202917fa | ||
|
|
43df79e3b1 | ||
|
|
5ef244f0bc | ||
|
|
861f076c11 | ||
|
|
7bed43059f | ||
|
|
37e271c96c | ||
|
|
3dad48e24d | ||
|
|
ae77e4810b | ||
|
|
3d50e37c37 | ||
|
|
421fd3bd04 | ||
|
|
5ecae0a366 | ||
|
|
5de4914fd7 | ||
|
|
0f9bf094ae | ||
|
|
e67680f397 | ||
|
|
73c0a5d655 | ||
|
|
220ed26f4a | ||
|
|
edf2ea41c7 | ||
|
|
16859b8ce5 | ||
|
|
10fe7d190a | ||
|
|
60a1f2429c | ||
|
|
cc6dc1e67c | ||
|
|
f4f5941691 | ||
|
|
f973281dd9 | ||
|
|
8acd76f363 | ||
|
|
4a165a86dc |
1
.github/CODEOWNERS
vendored
Normal file
1
.github/CODEOWNERS
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
* @WillFP
|
||||||
21
.github/workflows/master-pr.yml
vendored
Normal file
21
.github/workflows/master-pr.yml
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
name: PR Alert for Master Branch
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
alert:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Comment PR
|
||||||
|
uses: actions/github-script@v5
|
||||||
|
with:
|
||||||
|
github-token: ${{secrets.GITHUB_TOKEN}}
|
||||||
|
script: |
|
||||||
|
github.issues.createComment({
|
||||||
|
issue_number: context.issue.number,
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
body: '⚠️ PRs should not be opened against the `master` branch directly. Please use the `develop` branch as the base for your PRs. ⚠️'
|
||||||
|
})
|
||||||
697
LICENSE.md
697
LICENSE.md
@@ -1,674 +1,23 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
The MIT License (MIT)
|
||||||
Version 3, 29 June 2007
|
=====================
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
Permission is hereby granted, free of charge, to any person
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
obtaining a copy of this software and associated documentation
|
||||||
of this license document, but changing it is not allowed.
|
files (the “Software”), to deal in the Software without
|
||||||
|
restriction, including without limitation the rights to use,
|
||||||
Preamble
|
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the
|
||||||
The GNU General Public License is a free, copyleft license for
|
Software is furnished to do so, subject to the following
|
||||||
software and other kinds of works.
|
conditions:
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
The above copyright notice and this permission notice shall be
|
||||||
to take away your freedom to share and change the works. By contrast,
|
included in all copies or substantial portions of the Software.
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
GNU General Public License for most of our software; it applies also to
|
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
any other work released this way by its authors. You can apply it to
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
your programs, too.
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
When we speak of free software, we are referring to freedom, not
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
OTHER DEALINGS IN THE SOFTWARE.
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
||||||
@@ -127,7 +127,7 @@ cd eco
|
|||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
eco is licensed under GNU GPL3. *Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
|
eco is licensed under the MIT license. *Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
|
||||||
|
|
||||||
<h1 align="center">
|
<h1 align="center">
|
||||||
Check out our partners!
|
Check out our partners!
|
||||||
|
|||||||
@@ -4,16 +4,16 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("java-library")
|
id("java-library")
|
||||||
id("com.github.johnrengelman.shadow") version "7.1.2"
|
id("com.github.johnrengelman.shadow") version "8.1.1"
|
||||||
id("maven-publish")
|
id("maven-publish")
|
||||||
id("java")
|
id("java")
|
||||||
kotlin("jvm") version "1.7.10"
|
kotlin("jvm") version "1.9.21"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -27,6 +27,8 @@ dependencies {
|
|||||||
implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_19_R1", configuration = "reobf"))
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_19_R2", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_19_R2", configuration = "reobf"))
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_19_R3", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_19_R3", configuration = "reobf"))
|
||||||
|
implementation(project(path = ":eco-core:core-nms:v1_20_R1", configuration = "reobf"))
|
||||||
|
implementation(project(path = ":eco-core:core-nms:v1_20_R2", configuration = "reobf"))
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
@@ -40,6 +42,7 @@ allprojects {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
maven("https://jitpack.io")
|
maven("https://jitpack.io")
|
||||||
|
maven("https://repo.auxilor.io/repository/maven-public/")
|
||||||
|
|
||||||
// CustomCrafting
|
// CustomCrafting
|
||||||
maven("https://maven.wolfyscript.com/repository/public/")
|
maven("https://maven.wolfyscript.com/repository/public/")
|
||||||
@@ -80,9 +83,6 @@ allprojects {
|
|||||||
// LibsDisguises
|
// LibsDisguises
|
||||||
maven("https://repo.md-5.net/content/groups/public/")
|
maven("https://repo.md-5.net/content/groups/public/")
|
||||||
|
|
||||||
// UltraEconomy
|
|
||||||
maven("https://repo.techscode.com/repository/maven-releases/")
|
|
||||||
|
|
||||||
// PlayerPoints
|
// PlayerPoints
|
||||||
maven("https://repo.rosewooddev.io/repository/public/")
|
maven("https://repo.rosewooddev.io/repository/public/")
|
||||||
|
|
||||||
@@ -92,16 +92,16 @@ allprojects {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Kotlin
|
// Kotlin
|
||||||
implementation(kotlin("stdlib", version = "1.7.10"))
|
implementation(kotlin("stdlib", version = "1.9.21"))
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
|
||||||
|
|
||||||
// Included in spigot jar, no need to move to implementation
|
// Included in spigot jar, no need to move to implementation
|
||||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||||
compileOnly("com.google.guava:guava:31.1-jre")
|
compileOnly("com.google.guava:guava:31.1-jre")
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
|
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
|
||||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
|
||||||
|
|
||||||
// Adventure
|
// Adventure
|
||||||
implementation("net.kyori:adventure-api:4.10.1")
|
implementation("net.kyori:adventure-api:4.10.1")
|
||||||
@@ -111,8 +111,8 @@ allprojects {
|
|||||||
implementation("net.kyori:adventure-text-serializer-legacy:4.10.1")
|
implementation("net.kyori:adventure-text-serializer-legacy:4.10.1")
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
|
implementation("com.github.ben-manes.caffeine:caffeine:3.1.5")
|
||||||
implementation("org.apache.maven:maven-artifact:3.8.5")
|
implementation("org.apache.maven:maven-artifact:3.9.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<JavaCompile> {
|
tasks.withType<JavaCompile> {
|
||||||
@@ -170,6 +170,7 @@ allprojects {
|
|||||||
relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
|
relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
|
||||||
relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
|
relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
|
||||||
relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
|
relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
|
||||||
|
relocate("com.willfp.modelenginebridge", "com.willfp.eco.libs.modelenginebridge")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
|
Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ dependencies {
|
|||||||
compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")
|
compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
|
||||||
|
compileOnly("commons-lang:commons-lang:2.6")
|
||||||
compileOnly("com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT")
|
compileOnly("com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT")
|
||||||
compileOnly("com.google.code.gson:gson:2.8.8")
|
compileOnly("com.google.code.gson:gson:2.8.8")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,11 +30,13 @@ import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
|||||||
import com.willfp.eco.core.proxy.ProxyFactory;
|
import com.willfp.eco.core.proxy.ProxyFactory;
|
||||||
import com.willfp.eco.core.scheduling.Scheduler;
|
import com.willfp.eco.core.scheduling.Scheduler;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Mob;
|
import org.bukkit.entity.Mob;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
@@ -135,6 +137,14 @@ public interface Eco {
|
|||||||
@NotNull
|
@NotNull
|
||||||
Logger createLogger(@NotNull EcoPlugin plugin);
|
Logger createLogger(@NotNull EcoPlugin plugin);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get NOOP logger.
|
||||||
|
*
|
||||||
|
* @return The logger.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
Logger getNOOPLogger();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a PAPI integration.
|
* Create a PAPI integration.
|
||||||
*
|
*
|
||||||
@@ -170,7 +180,7 @@ public interface Eco {
|
|||||||
* @return The PluginCommandBase implementation
|
* @return The PluginCommandBase implementation
|
||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
PluginCommandBase createPluginCommand(@NotNull CommandBase parentDelegate,
|
PluginCommandBase createPluginCommand(@NotNull PluginCommandBase parentDelegate,
|
||||||
@NotNull EcoPlugin plugin,
|
@NotNull EcoPlugin plugin,
|
||||||
@NotNull String name,
|
@NotNull String name,
|
||||||
@NotNull String permission,
|
@NotNull String permission,
|
||||||
@@ -393,15 +403,6 @@ public interface Eco {
|
|||||||
@NotNull
|
@NotNull
|
||||||
ServerProfile getServerProfile();
|
ServerProfile getServerProfile();
|
||||||
|
|
||||||
/**
|
|
||||||
* Unload a player profile from memory.
|
|
||||||
* <p>
|
|
||||||
* This will not save the profile first.
|
|
||||||
*
|
|
||||||
* @param uuid The uuid.
|
|
||||||
*/
|
|
||||||
void unloadPlayerProfile(@NotNull UUID uuid);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create dummy entity - never spawned, exists purely in code.
|
* Create dummy entity - never spawned, exists purely in code.
|
||||||
*
|
*
|
||||||
@@ -528,9 +529,10 @@ public interface Eco {
|
|||||||
*
|
*
|
||||||
* @param expression The expression.
|
* @param expression The expression.
|
||||||
* @param context The context.
|
* @param context The context.
|
||||||
* @return The value of the expression, or zero if invalid.
|
* @return The value of the expression, or null if invalid.
|
||||||
*/
|
*/
|
||||||
double evaluate(@NotNull String expression,
|
@Nullable
|
||||||
|
Double evaluate(@NotNull String expression,
|
||||||
@NotNull PlaceholderContext context);
|
@NotNull PlaceholderContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -587,6 +589,19 @@ public interface Eco {
|
|||||||
@NotNull String args,
|
@NotNull String args,
|
||||||
@NotNull PlaceholderContext context);
|
@NotNull PlaceholderContext context);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a client-side entity display name.
|
||||||
|
*
|
||||||
|
* @param entity The entity.
|
||||||
|
* @param player The player.
|
||||||
|
* @param name The display name.
|
||||||
|
* @param visible If the display name should be forcibly visible.
|
||||||
|
*/
|
||||||
|
void setClientsideDisplayName(@NotNull LivingEntity entity,
|
||||||
|
@NotNull Player player,
|
||||||
|
@NotNull Component name,
|
||||||
|
boolean visible);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the instance of eco; the bridge between the api frontend and the implementation backend.
|
* Get the instance of eco; the bridge between the api frontend and the implementation backend.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
@@ -125,7 +126,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
/**
|
/**
|
||||||
* The logger for the plugin.
|
* The logger for the plugin.
|
||||||
*/
|
*/
|
||||||
private final Logger logger;
|
private Logger logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the server is running an outdated version of the plugin.
|
* If the server is running an outdated version of the plugin.
|
||||||
@@ -163,6 +164,11 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
*/
|
*/
|
||||||
private final ListMap<LifecyclePosition, Runnable> afterLoad = new ListMap<>();
|
private final ListMap<LifecyclePosition, Runnable> afterLoad = new ListMap<>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The tasks to run on task creation.
|
||||||
|
*/
|
||||||
|
private final ListMap<LifecyclePosition, Runnable> createTasks = new ListMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new plugin.
|
* Create a new plugin.
|
||||||
* <p>
|
* <p>
|
||||||
@@ -424,7 +430,18 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
|
|
||||||
this.loadPluginCommands().forEach(PluginCommand::register);
|
this.loadPluginCommands().forEach(PluginCommand::register);
|
||||||
|
|
||||||
this.getScheduler().runLater(this::afterLoad, 1);
|
// Run preliminary reload to resolve load order issues
|
||||||
|
this.getScheduler().runLater(() -> {
|
||||||
|
Logger before = this.getLogger();
|
||||||
|
// Temporary silence logger.
|
||||||
|
this.logger = Eco.get().getNOOPLogger();
|
||||||
|
|
||||||
|
this.reload(false);
|
||||||
|
|
||||||
|
this.logger = before;
|
||||||
|
}, 1);
|
||||||
|
|
||||||
|
this.getScheduler().runLater(this::afterLoad, 2);
|
||||||
|
|
||||||
if (this.isSupportingExtensions()) {
|
if (this.isSupportingExtensions()) {
|
||||||
this.getExtensionLoader().loadExtensions();
|
this.getExtensionLoader().loadExtensions();
|
||||||
@@ -600,14 +617,30 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
* Reload the plugin.
|
* Reload the plugin.
|
||||||
*/
|
*/
|
||||||
public final void reload() {
|
public final void reload() {
|
||||||
|
this.reload(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reload the plugin.
|
||||||
|
*
|
||||||
|
* @param cancelTasks If tasks should be cancelled.
|
||||||
|
*/
|
||||||
|
public final void reload(final boolean cancelTasks) {
|
||||||
this.getConfigHandler().updateConfigs();
|
this.getConfigHandler().updateConfigs();
|
||||||
|
|
||||||
this.getScheduler().cancelAll();
|
if (cancelTasks) {
|
||||||
|
this.getScheduler().cancelAll();
|
||||||
|
}
|
||||||
|
|
||||||
this.getConfigHandler().callUpdate();
|
this.getConfigHandler().callUpdate();
|
||||||
this.getConfigHandler().callUpdate(); // Call twice to fix issues
|
this.getConfigHandler().callUpdate(); // Call twice to fix issues
|
||||||
|
|
||||||
this.handleLifecycle(this.onReload, this::handleReload);
|
this.handleLifecycle(this.onReload, this::handleReload);
|
||||||
|
|
||||||
|
if (cancelTasks) {
|
||||||
|
this.handleLifecycle(this.createTasks, this::createTasks);
|
||||||
|
}
|
||||||
|
|
||||||
for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
|
for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
|
||||||
extension.handleReload();
|
extension.handleReload();
|
||||||
}
|
}
|
||||||
@@ -721,6 +754,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The plugin-specific code to create tasks.
|
||||||
|
* <p>
|
||||||
|
* Override when needed.
|
||||||
|
*/
|
||||||
|
protected void createTasks() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The plugin-specific code to be executed after the server is up.
|
* The plugin-specific code to be executed after the server is up.
|
||||||
* <p>
|
* <p>
|
||||||
@@ -1085,7 +1127,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
*
|
*
|
||||||
* @return The config handler.
|
* @return The config handler.
|
||||||
*/
|
*/
|
||||||
public ConfigHandler getConfigHandler() {
|
public @NotNull ConfigHandler getConfigHandler() {
|
||||||
return this.configHandler;
|
return this.configHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1149,9 +1191,24 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
return this.getMetadataValueFactory().create(value);
|
return this.getMetadataValueFactory().create(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get if all {@link com.willfp.eco.core.data.keys.PersistentDataKey}'s for this
|
||||||
|
* plugin should be saved locally (via data.yml.) even if eco is using a database.
|
||||||
|
*
|
||||||
|
* @return If using local storage.
|
||||||
|
*/
|
||||||
|
public boolean isUsingLocalStorage() {
|
||||||
|
return this.configYml.isUsingLocalStorage();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@NotNull
|
@NotNull
|
||||||
public final String getID() {
|
public final String getID() {
|
||||||
return Registry.tryFitPattern(this.getName());
|
return Registry.tryFitPattern(this.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull File getFile() {
|
||||||
|
return super.getFile();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.willfp.eco.core;
|
package com.willfp.eco.core;
|
||||||
|
|
||||||
import com.willfp.eco.core.config.updating.ConfigHandler;
|
import com.willfp.eco.core.config.updating.ConfigHandler;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
@@ -13,12 +15,13 @@ import java.util.logging.Logger;
|
|||||||
*/
|
*/
|
||||||
public interface PluginLike {
|
public interface PluginLike {
|
||||||
/**
|
/**
|
||||||
* Get the data folder of the object.
|
* Get the data folder.
|
||||||
* <p>
|
* <p>
|
||||||
* Returns the plugin data folder for a plugin, or the extension's parent plugin's folder
|
* Returns the plugin data folder for a plugin, or the extension's parent plugin's folder
|
||||||
*
|
*
|
||||||
* @return The data folder.
|
* @return The data folder.
|
||||||
*/
|
*/
|
||||||
|
@NotNull
|
||||||
File getDataFolder();
|
File getDataFolder();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,6 +29,7 @@ public interface PluginLike {
|
|||||||
*
|
*
|
||||||
* @return The config handler.
|
* @return The config handler.
|
||||||
*/
|
*/
|
||||||
|
@NotNull
|
||||||
ConfigHandler getConfigHandler();
|
ConfigHandler getConfigHandler();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -33,5 +37,16 @@ public interface PluginLike {
|
|||||||
*
|
*
|
||||||
* @return The logger.
|
* @return The logger.
|
||||||
*/
|
*/
|
||||||
|
@NotNull
|
||||||
Logger getLogger();
|
Logger getLogger();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the actual file.
|
||||||
|
*
|
||||||
|
* @return The file, i.e. the jar file.
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
default File getFile() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public final class PluginProps {
|
|||||||
private final Map<String, String> environment = new HashMap<>();
|
private final Map<String, String> environment = new HashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the plugin uses reflective reload (via {@link com.willfp.eco.core.config.updating.ConfigUpdater}).
|
* If the plugin uses reflective reload.
|
||||||
*/
|
*/
|
||||||
private boolean usesReflectiveReload = true;
|
private boolean usesReflectiveReload = true;
|
||||||
|
|
||||||
|
|||||||
@@ -37,11 +37,19 @@ public class Prerequisite {
|
|||||||
"Requires server to have ProtocolLib"
|
"Requires server to have ProtocolLib"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Requires the server to be running 1.20.
|
||||||
|
*/
|
||||||
|
public static final Prerequisite HAS_1_20 = new Prerequisite(
|
||||||
|
() -> ProxyConstants.NMS_VERSION.contains("20"),
|
||||||
|
"Requires server to be running 1.20+"
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Requires the server to be running 1.19.4.
|
* Requires the server to be running 1.19.4.
|
||||||
*/
|
*/
|
||||||
public static final Prerequisite HAS_1_19_4 = new Prerequisite(
|
public static final Prerequisite HAS_1_19_4 = new Prerequisite(
|
||||||
() -> ProxyConstants.NMS_VERSION.contains("19_R3"),
|
() -> ProxyConstants.NMS_VERSION.contains("19_R3") || HAS_1_20.isMet(),
|
||||||
"Requires server to be running 1.19.4+"
|
"Requires server to be running 1.19.4+"
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -49,7 +57,7 @@ public class Prerequisite {
|
|||||||
* Requires the server to be running 1.19.
|
* Requires the server to be running 1.19.
|
||||||
*/
|
*/
|
||||||
public static final Prerequisite HAS_1_19 = new Prerequisite(
|
public static final Prerequisite HAS_1_19 = new Prerequisite(
|
||||||
() -> ProxyConstants.NMS_VERSION.contains("19"),
|
() -> ProxyConstants.NMS_VERSION.contains("19") || HAS_1_20.isMet(),
|
||||||
"Requires server to be running 1.19+"
|
"Requires server to be running 1.19+"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,11 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
* Default plugin config.yml.
|
* Default plugin config.yml.
|
||||||
*/
|
*/
|
||||||
public class ConfigYml extends BaseConfig {
|
public class ConfigYml extends BaseConfig {
|
||||||
|
/**
|
||||||
|
* The use local storage key.
|
||||||
|
*/
|
||||||
|
public static final String KEY_USES_LOCAL_STORAGE = "use-local-storage";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Config.yml.
|
* Config.yml.
|
||||||
*
|
*
|
||||||
@@ -52,4 +57,13 @@ public class ConfigYml extends BaseConfig {
|
|||||||
final boolean removeUnused) {
|
final boolean removeUnused) {
|
||||||
super(name, plugin, removeUnused, ConfigType.YAML);
|
super(name, plugin, removeUnused, ConfigType.YAML);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get if the plugin is using local storage.
|
||||||
|
*
|
||||||
|
* @return The prefix.
|
||||||
|
*/
|
||||||
|
public boolean isUsingLocalStorage() {
|
||||||
|
return this.getBool(KEY_USES_LOCAL_STORAGE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -596,7 +597,10 @@ public interface Config extends Cloneable, PlaceholderInjectable {
|
|||||||
*/
|
*/
|
||||||
default double getDoubleFromExpression(@NotNull String path,
|
default double getDoubleFromExpression(@NotNull String path,
|
||||||
@NotNull PlaceholderContext context) {
|
@NotNull PlaceholderContext context) {
|
||||||
return NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this));
|
return Objects.requireNonNullElseGet(
|
||||||
|
this.getDoubleOrNull(path),
|
||||||
|
() -> NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -648,6 +652,32 @@ public interface Config extends Cloneable, PlaceholderInjectable {
|
|||||||
@Nullable
|
@Nullable
|
||||||
List<? extends Config> getSubsectionsOrNull(@NotNull String path);
|
List<? extends Config> getSubsectionsOrNull(@NotNull String path);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a big decimal from config.
|
||||||
|
*
|
||||||
|
* @param path The key to fetch the value from.
|
||||||
|
* @return The found value, or 0 if not found.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
default BigDecimal getBigDecimal(@NotNull final String path) {
|
||||||
|
return Objects.requireNonNullElse(getBigDecimalOrNull(path), BigDecimal.ZERO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a big decimal from config.
|
||||||
|
*
|
||||||
|
* @param path The key to fetch the value from.
|
||||||
|
* @return The found value, or null if not found.
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
default BigDecimal getBigDecimalOrNull(@NotNull final String path) {
|
||||||
|
if (this.has(path)) {
|
||||||
|
return new BigDecimal(this.getString(path));
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get config type.
|
* Get config type.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -38,12 +38,16 @@ import java.lang.annotation.Target;
|
|||||||
* <p>
|
* <p>
|
||||||
* By having a plugin as a parameter, you shouldn't really need getInstance()
|
* By having a plugin as a parameter, you shouldn't really need getInstance()
|
||||||
* calls in your code.
|
* calls in your code.
|
||||||
*
|
* <p>
|
||||||
* While flexible, this can lead to long initialization times, so this feature
|
* While flexible, this can lead to long initialization times, so this feature
|
||||||
* can be disabled in eco.yml with the uses-reflective-reload option.
|
* can be disabled in eco.yml with the uses-reflective-reload option.
|
||||||
|
*
|
||||||
|
* @deprecated This has been deprecated due to the poor control flow and long startup times.
|
||||||
*/
|
*/
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
@Target(ElementType.METHOD)
|
@Target(ElementType.METHOD)
|
||||||
@Documented
|
@Documented
|
||||||
|
@Deprecated(since = "6.67.0", forRemoval = true)
|
||||||
|
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||||
public @interface ConfigUpdater {
|
public @interface ConfigUpdater {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,22 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
* Profiles save automatically, so there is no need to save after changes.
|
* Profiles save automatically, so there is no need to save after changes.
|
||||||
*/
|
*/
|
||||||
public interface ServerProfile extends Profile {
|
public interface ServerProfile extends Profile {
|
||||||
|
/**
|
||||||
|
* Get the server ID.
|
||||||
|
*
|
||||||
|
* @return The server ID.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
String getServerID();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the local server ID.
|
||||||
|
*
|
||||||
|
* @return The local server ID.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
String getLocalServerID();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the server profile.
|
* Load the server profile.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -29,6 +29,31 @@ public final class PersistentDataKey<T> {
|
|||||||
*/
|
*/
|
||||||
private final PersistentDataKeyType<T> type;
|
private final PersistentDataKeyType<T> type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the key uses local storage.
|
||||||
|
*/
|
||||||
|
private final boolean isLocal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new Persistent Data Key.
|
||||||
|
*
|
||||||
|
* @param key The key.
|
||||||
|
* @param type The data type.
|
||||||
|
* @param defaultValue The default value.
|
||||||
|
* @param isLocal If the key uses local storage.
|
||||||
|
*/
|
||||||
|
public PersistentDataKey(@NotNull final NamespacedKey key,
|
||||||
|
@NotNull final PersistentDataKeyType<T> type,
|
||||||
|
@NotNull final T defaultValue,
|
||||||
|
final boolean isLocal) {
|
||||||
|
this.key = key;
|
||||||
|
this.defaultValue = defaultValue;
|
||||||
|
this.type = type;
|
||||||
|
this.isLocal = isLocal;
|
||||||
|
|
||||||
|
Eco.get().registerPersistentKey(this);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new Persistent Data Key.
|
* Create a new Persistent Data Key.
|
||||||
*
|
*
|
||||||
@@ -42,6 +67,7 @@ public final class PersistentDataKey<T> {
|
|||||||
this.key = key;
|
this.key = key;
|
||||||
this.defaultValue = defaultValue;
|
this.defaultValue = defaultValue;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
|
this.isLocal = false;
|
||||||
|
|
||||||
Eco.get().registerPersistentKey(this);
|
Eco.get().registerPersistentKey(this);
|
||||||
}
|
}
|
||||||
@@ -82,6 +108,15 @@ public final class PersistentDataKey<T> {
|
|||||||
return this.type;
|
return this.type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get if the key uses local storage.
|
||||||
|
*
|
||||||
|
* @return If the key uses local storage.
|
||||||
|
*/
|
||||||
|
public boolean isLocal() {
|
||||||
|
return this.isLocal;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all persistent data keys.
|
* Get all persistent data keys.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.willfp.eco.core.config.interfaces.Config;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -49,6 +50,11 @@ public final class PersistentDataKeyType<T> {
|
|||||||
*/
|
*/
|
||||||
public static final PersistentDataKeyType<Config> CONFIG = new PersistentDataKeyType<>("CONFIG");
|
public static final PersistentDataKeyType<Config> CONFIG = new PersistentDataKeyType<>("CONFIG");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Big Decimal.
|
||||||
|
*/
|
||||||
|
public static final PersistentDataKeyType<BigDecimal> BIG_DECIMAL = new PersistentDataKeyType<>("BIG_DECIMAL");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the key type.
|
* The name of the key type.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.willfp.eco.core.display;
|
package com.willfp.eco.core.display;
|
||||||
|
|
||||||
|
import com.willfp.eco.core.Eco;
|
||||||
import com.willfp.eco.core.fast.FastItemStack;
|
import com.willfp.eco.core.fast.FastItemStack;
|
||||||
import com.willfp.eco.core.integrations.guidetection.GUIDetectionManager;
|
import com.willfp.eco.core.integrations.guidetection.GUIDetectionManager;
|
||||||
import com.willfp.eco.util.NamespacedKeyUtils;
|
import com.willfp.eco.util.NamespacedKeyUtils;
|
||||||
@@ -68,8 +69,10 @@ public final class Display {
|
|||||||
|
|
||||||
Display.revert(itemStack);
|
Display.revert(itemStack);
|
||||||
|
|
||||||
if (!itemStack.hasItemMeta()) {
|
if (!Eco.get().getEcoPlugin().getConfigYml().getBool("display-without-meta")) {
|
||||||
return itemStack;
|
if (!itemStack.hasItemMeta()) {
|
||||||
|
return itemStack;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack original = itemStack.clone();
|
ItemStack original = itemStack.clone();
|
||||||
|
|||||||
@@ -135,20 +135,26 @@ public abstract class Extension implements PluginLike {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File getDataFolder() {
|
public @NotNull File getDataFolder() {
|
||||||
return this.plugin.getDataFolder();
|
return this.plugin.getDataFolder();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ConfigHandler getConfigHandler() {
|
public @NotNull ConfigHandler getConfigHandler() {
|
||||||
return this.plugin.getConfigHandler();
|
return this.plugin.getConfigHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Logger getLogger() {
|
public @NotNull Logger getLogger() {
|
||||||
return this.plugin.getLogger();
|
return this.plugin.getLogger();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull File getFile() {
|
||||||
|
Validate.notNull(metadata, "Metadata cannot be null!");
|
||||||
|
return this.metadata.file();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the plugin for the extension.
|
* Get the plugin for the extension.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.willfp.eco.core.extensions;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generic exception in extension loading.
|
||||||
|
*/
|
||||||
|
public class ExtensionLoadException extends RuntimeException {
|
||||||
|
/**
|
||||||
|
* Create a new ExtensionLoadException.
|
||||||
|
*
|
||||||
|
* @param errorMessage The error message to show.
|
||||||
|
*/
|
||||||
|
public ExtensionLoadException(@NotNull final String errorMessage) {
|
||||||
|
super(errorMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
package com.willfp.eco.core.extensions;
|
package com.willfp.eco.core.extensions;
|
||||||
|
|
||||||
|
import com.willfp.eco.core.version.Version;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The extension's metadata.
|
* The extension's metadata.
|
||||||
* <p>
|
* <p>
|
||||||
@@ -13,6 +16,23 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
*/
|
*/
|
||||||
public record ExtensionMetadata(@NotNull String version,
|
public record ExtensionMetadata(@NotNull String version,
|
||||||
@NotNull String name,
|
@NotNull String name,
|
||||||
@NotNull String author) {
|
@NotNull String author,
|
||||||
|
@NotNull File file,
|
||||||
|
@NotNull Version minimumPluginVersion) {
|
||||||
|
/**
|
||||||
|
* Legacy constructor.
|
||||||
|
*
|
||||||
|
* @param version The extension version.
|
||||||
|
* @param name The extension name.
|
||||||
|
* @param author The extension's author.
|
||||||
|
* @deprecated Use {@link ExtensionMetadata#ExtensionMetadata(String, String, String, File, Version)} instead.
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
|
@Deprecated(since = "6.57.0", forRemoval = true)
|
||||||
|
public ExtensionMetadata(@NotNull String version,
|
||||||
|
@NotNull String name,
|
||||||
|
@NotNull String author) {
|
||||||
|
this(version, name, author, null, null);
|
||||||
|
throw new UnsupportedOperationException("Legacy constructor is not supported.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
* Missing or invalid extension.yml.
|
* Missing or invalid extension.yml.
|
||||||
* Invalid filetype.
|
* Invalid filetype.
|
||||||
*/
|
*/
|
||||||
public class MalformedExtensionException extends RuntimeException {
|
public class MalformedExtensionException extends ExtensionLoadException {
|
||||||
/**
|
/**
|
||||||
* Create a new MalformedExtensionException.
|
* Create a new MalformedExtensionException.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -142,6 +142,26 @@ public interface MenuBuilder extends PageBuilder {
|
|||||||
return this.onRender((player, menu) -> menu.setState(player, Page.MAX_PAGE_KEY, pages.apply(player)));
|
return this.onRender((player, menu) -> menu.setState(player, Page.MAX_PAGE_KEY, pages.apply(player)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the default page.
|
||||||
|
*
|
||||||
|
* @param page The page.
|
||||||
|
* @return The builder.
|
||||||
|
*/
|
||||||
|
default MenuBuilder defaultPage(final int page) {
|
||||||
|
return this.maxPages(player -> page);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the default page dynamically for a player.
|
||||||
|
*
|
||||||
|
* @param page The default page.
|
||||||
|
* @return The builder.
|
||||||
|
*/
|
||||||
|
default MenuBuilder defaultPage(@NotNull final Function<Player, Integer> page) {
|
||||||
|
return this.onOpen((player, menu) -> menu.setState(player, Page.PAGE_KEY, page.apply(player)));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a menu close handler.
|
* Add a menu close handler.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.core.gui.slot;
|
|||||||
|
|
||||||
import com.willfp.eco.core.gui.menu.Menu;
|
import com.willfp.eco.core.gui.menu.Menu;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.inventory.ClickType;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -76,6 +77,15 @@ public abstract class CustomSlot implements Slot {
|
|||||||
return delegate;
|
return delegate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldRenderOnClick(@NotNull final ClickType clickType) {
|
||||||
|
if (delegate == null) {
|
||||||
|
throw new IllegalStateException("Custom Slot was not initialized!");
|
||||||
|
}
|
||||||
|
|
||||||
|
return delegate.shouldRenderOnClick(clickType);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final int getRows() {
|
public final int getRows() {
|
||||||
return Slot.super.getRows();
|
return Slot.super.getRows();
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.willfp.eco.core.gui.slot.functional.SlotProvider;
|
|||||||
import com.willfp.eco.core.items.TestableItem;
|
import com.willfp.eco.core.items.TestableItem;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.inventory.ClickType;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -92,6 +93,27 @@ public interface Slot extends GUIComponent {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the slot should re-render the menu if clicked.
|
||||||
|
*
|
||||||
|
* @return If the slot should re-render.
|
||||||
|
* @deprecated Use {@link Slot#shouldRenderOnClick(ClickType)} instead.
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "6.66.0", forRemoval = true)
|
||||||
|
default boolean shouldRenderOnClick() {
|
||||||
|
return shouldRenderOnClick(ClickType.LEFT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the slot should re-render the menu if clicked.
|
||||||
|
*
|
||||||
|
* @param clickType The click type.
|
||||||
|
* @return If the slot should re-render.
|
||||||
|
*/
|
||||||
|
default boolean shouldRenderOnClick(@NotNull final ClickType clickType) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
default int getRows() {
|
default int getRows() {
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -196,6 +196,7 @@ public interface SlotBuilder {
|
|||||||
* @deprecated Use {@link SlotBuilder#setUpdater(SlotUpdater)} instead.
|
* @deprecated Use {@link SlotBuilder#setUpdater(SlotUpdater)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||||
default SlotBuilder setModifier(@NotNull SlotModifier modifier) {
|
default SlotBuilder setModifier(@NotNull SlotModifier modifier) {
|
||||||
return setUpdater((player, menu, previous) -> {
|
return setUpdater((player, menu, previous) -> {
|
||||||
modifier.modify(player, menu, previous);
|
modifier.modify(player, menu, previous);
|
||||||
|
|||||||
@@ -17,6 +17,13 @@ import java.util.function.Supplier;
|
|||||||
* @param <T> The type of integration.
|
* @param <T> The type of integration.
|
||||||
*/
|
*/
|
||||||
public class IntegrationRegistry<T extends Integration> extends Registry<T> {
|
public class IntegrationRegistry<T extends Integration> extends Registry<T> {
|
||||||
|
/**
|
||||||
|
* Create a new integration registry.
|
||||||
|
*/
|
||||||
|
public IntegrationRegistry() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull T register(@NotNull final T element) {
|
public @NotNull T register(@NotNull final T element) {
|
||||||
return executeSafely(() -> super.register(element), element);
|
return executeSafely(() -> super.register(element), element);
|
||||||
@@ -110,7 +117,7 @@ public class IntegrationRegistry<T extends Integration> extends Registry<T> {
|
|||||||
@Nullable final R defaultValue) {
|
@Nullable final R defaultValue) {
|
||||||
try {
|
try {
|
||||||
return action.get();
|
return action.get();
|
||||||
} catch (final Exception e) {
|
} catch (final Exception | LinkageError e) {
|
||||||
Eco.get().getEcoPlugin().getLogger().warning("Integration for " + integration.getPluginName() + " threw an exception!");
|
Eco.get().getEcoPlugin().getLogger().warning("Integration for " + integration.getPluginName() + " threw an exception!");
|
||||||
Eco.get().getEcoPlugin().getLogger().warning("The integration will be disabled.");
|
Eco.get().getEcoPlugin().getLogger().warning("The integration will be disabled.");
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ public final class PlaceholderManager {
|
|||||||
// Storing as immutable set leads to slower times to register placeholders, but much
|
// Storing as immutable set leads to slower times to register placeholders, but much
|
||||||
// faster times to access registrations.
|
// faster times to access registrations.
|
||||||
Set<Placeholder> pluginPlaceholders = new HashSet<>(REGISTERED_PLACEHOLDERS.get(placeholder.getPlugin()));
|
Set<Placeholder> pluginPlaceholders = new HashSet<>(REGISTERED_PLACEHOLDERS.get(placeholder.getPlugin()));
|
||||||
|
pluginPlaceholders.removeIf(p -> p.getPattern().equals(placeholder.getPattern()));
|
||||||
pluginPlaceholders.add(placeholder);
|
pluginPlaceholders.add(placeholder);
|
||||||
REGISTERED_PLACEHOLDERS.put(placeholder.getPlugin(), ImmutableSet.copyOf(pluginPlaceholders));
|
REGISTERED_PLACEHOLDERS.put(placeholder.getPlugin(), ImmutableSet.copyOf(pluginPlaceholders));
|
||||||
}
|
}
|
||||||
@@ -149,6 +150,7 @@ public final class PlaceholderManager {
|
|||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.56.0", forRemoval = true)
|
@Deprecated(since = "6.56.0", forRemoval = true)
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||||
public static String translatePlaceholders(@NotNull final String text,
|
public static String translatePlaceholders(@NotNull final String text,
|
||||||
@Nullable final Player player) {
|
@Nullable final Player player) {
|
||||||
return translatePlaceholders(text, player, EMPTY_INJECTABLE);
|
return translatePlaceholders(text, player, EMPTY_INJECTABLE);
|
||||||
@@ -165,10 +167,19 @@ public final class PlaceholderManager {
|
|||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.56.0", forRemoval = true)
|
@Deprecated(since = "6.56.0", forRemoval = true)
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||||
public static String translatePlaceholders(@NotNull final String text,
|
public static String translatePlaceholders(@NotNull final String text,
|
||||||
@Nullable final Player player,
|
@Nullable final Player player,
|
||||||
@NotNull final PlaceholderInjectable context) {
|
@NotNull final PlaceholderInjectable context) {
|
||||||
return translatePlaceholders(text, player, context, new ArrayList<>());
|
return translatePlaceholders(
|
||||||
|
text,
|
||||||
|
new PlaceholderContext(
|
||||||
|
player,
|
||||||
|
null,
|
||||||
|
context,
|
||||||
|
new ArrayList<>()
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -183,6 +194,7 @@ public final class PlaceholderManager {
|
|||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.56.0", forRemoval = true)
|
@Deprecated(since = "6.56.0", forRemoval = true)
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@SuppressWarnings("DeprecatedIsStillUsed")
|
||||||
public static String translatePlaceholders(@NotNull final String text,
|
public static String translatePlaceholders(@NotNull final String text,
|
||||||
@Nullable final Player player,
|
@Nullable final Player player,
|
||||||
@NotNull final PlaceholderInjectable context,
|
@NotNull final PlaceholderInjectable context,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.willfp.eco.core.items;
|
package com.willfp.eco.core.items;
|
||||||
|
|
||||||
import com.willfp.eco.core.Eco;
|
import com.willfp.eco.core.Eco;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -55,7 +54,7 @@ public class CustomItem implements TestableItem {
|
|||||||
*/
|
*/
|
||||||
Eco.get().getEcoPlugin().getScheduler().runLater(() -> {
|
Eco.get().getEcoPlugin().getScheduler().runLater(() -> {
|
||||||
if (!matches(getItem())) {
|
if (!matches(getItem())) {
|
||||||
Bukkit.getLogger().severe("Item with key " + key + " is invalid!");
|
Eco.get().getEcoPlugin().getLogger().severe("Item with key " + key + " is invalid!");
|
||||||
}
|
}
|
||||||
}, 1);
|
}, 1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ public class DefaultMap<K, V> implements Map<K, V> {
|
|||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
public static <K, K1, V> DefaultMap<K, Map<K1, V>> createNestedMap() {
|
public static <K, K1, V> DefaultMap<K, Map<K1, V>> createNestedMap() {
|
||||||
return new DefaultMap<>(new HashMap<>());
|
return new DefaultMap<>(HashMap::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -163,6 +163,6 @@ public class DefaultMap<K, V> implements Map<K, V> {
|
|||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
public static <K, K1, V> DefaultMap<K, ListMap<K1, V>> createNestedListMap() {
|
public static <K, K1, V> DefaultMap<K, ListMap<K1, V>> createNestedListMap() {
|
||||||
return new DefaultMap<>(new ListMap<>());
|
return new DefaultMap<>(ListMap::new);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.core.placeholder;
|
|||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin;
|
import com.willfp.eco.core.EcoPlugin;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -40,7 +41,7 @@ public final class PlayerPlaceholder implements RegistrablePlaceholder {
|
|||||||
@NotNull final String identifier,
|
@NotNull final String identifier,
|
||||||
@NotNull final Function<@NotNull Player, @Nullable String> function) {
|
@NotNull final Function<@NotNull Player, @Nullable String> function) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.willfp.eco.core.placeholder;
|
package com.willfp.eco.core.placeholder;
|
||||||
|
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import com.willfp.eco.util.StringUtils;
|
import com.willfp.eco.util.StringUtils;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -38,7 +39,7 @@ public final class PlayerStaticPlaceholder implements InjectablePlaceholder {
|
|||||||
public PlayerStaticPlaceholder(@NotNull final String identifier,
|
public PlayerStaticPlaceholder(@NotNull final String identifier,
|
||||||
@NotNull final Function<@NotNull Player, @Nullable String> function) {
|
@NotNull final Function<@NotNull Player, @Nullable String> function) {
|
||||||
this.identifier = "%" + identifier + "%";
|
this.identifier = "%" + identifier + "%";
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.core.placeholder;
|
|||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin;
|
import com.willfp.eco.core.EcoPlugin;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -39,7 +40,7 @@ public final class PlayerlessPlaceholder implements RegistrablePlaceholder {
|
|||||||
@NotNull final String identifier,
|
@NotNull final String identifier,
|
||||||
@NotNull final Supplier<@Nullable String> function) {
|
@NotNull final Supplier<@Nullable String> function) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.willfp.eco.core.placeholder;
|
package com.willfp.eco.core.placeholder;
|
||||||
|
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import com.willfp.eco.util.StringUtils;
|
import com.willfp.eco.util.StringUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -37,7 +38,7 @@ public final class StaticPlaceholder implements InjectablePlaceholder {
|
|||||||
public StaticPlaceholder(@NotNull final String identifier,
|
public StaticPlaceholder(@NotNull final String identifier,
|
||||||
@NotNull final Supplier<@Nullable String> function) {
|
@NotNull final Supplier<@Nullable String> function) {
|
||||||
this.identifier = "%" + identifier + "%";
|
this.identifier = "%" + identifier + "%";
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ package com.willfp.eco.core.placeholder.context;
|
|||||||
import com.willfp.eco.core.placeholder.InjectablePlaceholder;
|
import com.willfp.eco.core.placeholder.InjectablePlaceholder;
|
||||||
import com.willfp.eco.core.placeholder.PlaceholderInjectable;
|
import com.willfp.eco.core.placeholder.PlaceholderInjectable;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,4 +69,24 @@ public class MergedInjectableContext implements PlaceholderInjectable {
|
|||||||
|
|
||||||
return injections;
|
return injections;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(@Nullable final Object o) {
|
||||||
|
if (this == o) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(o instanceof MergedInjectableContext that)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Objects.equals(baseContext, that.baseContext)
|
||||||
|
&& Objects.equals(additionalContext, that.additionalContext)
|
||||||
|
&& Objects.equals(extraInjections, that.extraInjections);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(baseContext, additionalContext, extraInjections);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.core.placeholder.templates;
|
|||||||
|
|
||||||
import com.willfp.eco.core.placeholder.InjectablePlaceholder;
|
import com.willfp.eco.core.placeholder.InjectablePlaceholder;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -28,7 +29,7 @@ public abstract class SimpleInjectablePlaceholder implements InjectablePlacehold
|
|||||||
*/
|
*/
|
||||||
protected SimpleInjectablePlaceholder(@NotNull final String identifier) {
|
protected SimpleInjectablePlaceholder(@NotNull final String identifier) {
|
||||||
this.identifier = identifier;
|
this.identifier = identifier;
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.willfp.eco.core.placeholder.templates;
|
|||||||
import com.willfp.eco.core.EcoPlugin;
|
import com.willfp.eco.core.EcoPlugin;
|
||||||
import com.willfp.eco.core.placeholder.RegistrablePlaceholder;
|
import com.willfp.eco.core.placeholder.RegistrablePlaceholder;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
|
import com.willfp.eco.util.PatternUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -37,7 +38,7 @@ public abstract class SimplePlaceholder implements RegistrablePlaceholder {
|
|||||||
@NotNull final String identifier) {
|
@NotNull final String identifier) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.identifier = identifier;
|
this.identifier = identifier;
|
||||||
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
this.pattern = PatternUtils.compileLiteral(identifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.willfp.eco.core.price;
|
package com.willfp.eco.core.price;
|
||||||
|
|
||||||
|
import com.willfp.eco.core.Eco;
|
||||||
import com.willfp.eco.core.config.interfaces.Config;
|
import com.willfp.eco.core.config.interfaces.Config;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
import com.willfp.eco.core.price.impl.PriceFree;
|
import com.willfp.eco.core.price.impl.PriceFree;
|
||||||
@@ -158,12 +159,27 @@ public final class ConfiguredPrice implements Price {
|
|||||||
if (!(
|
if (!(
|
||||||
config.has("value")
|
config.has("value")
|
||||||
&& config.has("type")
|
&& config.has("type")
|
||||||
&& config.has("display")
|
|
||||||
)) {
|
)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
String formatString = config.getString("display");
|
String formatString;
|
||||||
|
|
||||||
|
String langConfig = Eco.get().getEcoPlugin().getLangYml()
|
||||||
|
.getSubsections("price-display")
|
||||||
|
.stream()
|
||||||
|
.filter(section -> section.getString("type").equalsIgnoreCase(config.getString("type")))
|
||||||
|
.findFirst()
|
||||||
|
.map(section -> section.getString("display"))
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
if (langConfig != null) {
|
||||||
|
formatString = langConfig;
|
||||||
|
} else if (config.has("display")) {
|
||||||
|
formatString = config.getString("display");
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
Price price = Prices.create(
|
Price price = Prices.create(
|
||||||
config.getString("value"),
|
config.getString("value"),
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ public final class ProxyConstants {
|
|||||||
"v1_18_R2",
|
"v1_18_R2",
|
||||||
"v1_19_R1",
|
"v1_19_R1",
|
||||||
"v1_19_R2",
|
"v1_19_R2",
|
||||||
"v1_19_R3"
|
"v1_19_R3",
|
||||||
|
"v1_20_R1",
|
||||||
|
"v1_20_R2"
|
||||||
);
|
);
|
||||||
|
|
||||||
private ProxyConstants() {
|
private ProxyConstants() {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import com.willfp.eco.core.items.Items;
|
|||||||
import com.willfp.eco.core.recipe.recipes.CraftingRecipe;
|
import com.willfp.eco.core.recipe.recipes.CraftingRecipe;
|
||||||
import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
|
import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
|
||||||
import com.willfp.eco.util.NamespacedKeyUtils;
|
import com.willfp.eco.util.NamespacedKeyUtils;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -127,8 +126,8 @@ public final class Recipes {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (builder.isAir()) {
|
if (builder.isAir()) {
|
||||||
Bukkit.getLogger().warning("RECIPE ERROR! " + plugin.getName() + ":" + key + " consists only");
|
plugin.getLogger().warning("Crafting recipe " + plugin.getID() + ":" + key + " consists only");
|
||||||
Bukkit.getLogger().warning("of air or invalid items! Please change that or disable this recipe.");
|
plugin.getLogger().warning("of air or invalid items! It will not be registered.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,10 @@ public class Registry<T extends Registrable> implements Iterable<T> {
|
|||||||
* @param locker The locker.
|
* @param locker The locker.
|
||||||
*/
|
*/
|
||||||
public void lock(@Nullable final Object locker) {
|
public void lock(@Nullable final Object locker) {
|
||||||
|
if (this.isLocked && this.locker != locker) {
|
||||||
|
throw new IllegalArgumentException("Registry is already locked with a different locker!");
|
||||||
|
}
|
||||||
|
|
||||||
this.locker = locker;
|
this.locker = locker;
|
||||||
isLocked = true;
|
isLocked = true;
|
||||||
}
|
}
|
||||||
@@ -162,6 +166,8 @@ public class Registry<T extends Registrable> implements Iterable<T> {
|
|||||||
if (this.locker != locker) {
|
if (this.locker != locker) {
|
||||||
throw new IllegalArgumentException("Cannot unlock registry!");
|
throw new IllegalArgumentException("Cannot unlock registry!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.locker = null;
|
||||||
isLocked = false;
|
isLocked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package com.willfp.eco.core.web;
|
package com.willfp.eco.core.web;
|
||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin;
|
import com.willfp.eco.core.EcoPlugin;
|
||||||
import org.bukkit.util.Consumer;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to check for updates of a plugin on spigot.
|
* Class to check for updates of a plugin on spigot.
|
||||||
|
|||||||
31
eco-api/src/main/java/com/willfp/eco/util/EntityUtils.java
Normal file
31
eco-api/src/main/java/com/willfp/eco/util/EntityUtils.java
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
package com.willfp.eco.util;
|
||||||
|
|
||||||
|
import com.willfp.eco.core.Eco;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
import org.bukkit.entity.LivingEntity;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utilities / API methods for entities.
|
||||||
|
*/
|
||||||
|
public final class EntityUtils {
|
||||||
|
/**
|
||||||
|
* Set a client-side entity display name.
|
||||||
|
*
|
||||||
|
* @param entity The entity.
|
||||||
|
* @param player The player.
|
||||||
|
* @param name The display name.
|
||||||
|
* @param visible If the display name should be forcibly visible.
|
||||||
|
*/
|
||||||
|
public static void setClientsideDisplayName(@NotNull final LivingEntity entity,
|
||||||
|
@NotNull final Player player,
|
||||||
|
@NotNull final Component name,
|
||||||
|
final boolean visible) {
|
||||||
|
Eco.get().setClientsideDisplayName(entity, player, name, visible);
|
||||||
|
}
|
||||||
|
|
||||||
|
private EntityUtils() {
|
||||||
|
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import java.text.DecimalFormat;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
|
|
||||||
@@ -251,12 +252,15 @@ public final class NumberUtils {
|
|||||||
@Nullable final Player player,
|
@Nullable final Player player,
|
||||||
@Nullable final PlaceholderInjectable context,
|
@Nullable final PlaceholderInjectable context,
|
||||||
@NotNull final Collection<AdditionalPlayer> additionalPlayers) {
|
@NotNull final Collection<AdditionalPlayer> additionalPlayers) {
|
||||||
return Eco.get().evaluate(expression, new PlaceholderContext(
|
return evaluateExpression(
|
||||||
player,
|
expression,
|
||||||
null,
|
new PlaceholderContext(
|
||||||
context,
|
player,
|
||||||
additionalPlayers
|
null,
|
||||||
));
|
context,
|
||||||
|
additionalPlayers
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -268,7 +272,7 @@ public final class NumberUtils {
|
|||||||
* @deprecated Use {@link #evaluateExpression(String, PlaceholderContext)} instead.
|
* @deprecated Use {@link #evaluateExpression(String, PlaceholderContext)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.56.0", forRemoval = true)
|
@Deprecated(since = "6.56.0", forRemoval = true)
|
||||||
@SuppressWarnings("removal")
|
@SuppressWarnings({"removal", "DeprecatedIsStillUsed"})
|
||||||
public static double evaluateExpression(@NotNull final String expression,
|
public static double evaluateExpression(@NotNull final String expression,
|
||||||
@NotNull final com.willfp.eco.core.math.MathContext context) {
|
@NotNull final com.willfp.eco.core.math.MathContext context) {
|
||||||
return evaluateExpression(expression, context.toPlaceholderContext());
|
return evaluateExpression(expression, context.toPlaceholderContext());
|
||||||
@@ -283,6 +287,22 @@ public final class NumberUtils {
|
|||||||
*/
|
*/
|
||||||
public static double evaluateExpression(@NotNull final String expression,
|
public static double evaluateExpression(@NotNull final String expression,
|
||||||
@NotNull final PlaceholderContext context) {
|
@NotNull final PlaceholderContext context) {
|
||||||
|
return Objects.requireNonNullElse(
|
||||||
|
evaluateExpressionOrNull(expression, context),
|
||||||
|
0.0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Evaluate an expression in a context.
|
||||||
|
*
|
||||||
|
* @param expression The expression.
|
||||||
|
* @param context The context.
|
||||||
|
* @return The value of the expression, or zero if invalid.
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
public static Double evaluateExpressionOrNull(@NotNull final String expression,
|
||||||
|
@NotNull final PlaceholderContext context) {
|
||||||
return Eco.get().evaluate(expression, context);
|
return Eco.get().evaluate(expression, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
35
eco-api/src/main/java/com/willfp/eco/util/PatternUtils.java
Normal file
35
eco-api/src/main/java/com/willfp/eco/util/PatternUtils.java
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
package com.willfp.eco.util;
|
||||||
|
|
||||||
|
import com.github.benmanes.caffeine.cache.Cache;
|
||||||
|
import com.github.benmanes.caffeine.cache.Caffeine;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utilities / API methods for patterns.
|
||||||
|
*/
|
||||||
|
public final class PatternUtils {
|
||||||
|
/**
|
||||||
|
* Cache of compiled literal patterns.
|
||||||
|
*/
|
||||||
|
private static final Cache<String, Pattern> LITERAL_PATTERN_CACHE = Caffeine.newBuilder()
|
||||||
|
.expireAfterAccess(1, TimeUnit.MINUTES)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compile a literal pattern.
|
||||||
|
*
|
||||||
|
* @param pattern The pattern.
|
||||||
|
* @return The compiled pattern.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
public static Pattern compileLiteral(@NotNull final String pattern) {
|
||||||
|
return LITERAL_PATTERN_CACHE.get(pattern, (it) -> Pattern.compile(it, Pattern.LITERAL));
|
||||||
|
}
|
||||||
|
|
||||||
|
private PatternUtils() {
|
||||||
|
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ public final class PotionUtils {
|
|||||||
* @param data The data.
|
* @param data The data.
|
||||||
* @return The duration.
|
* @return The duration.
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public static int getDuration(@NotNull final PotionData data) {
|
public static int getDuration(@NotNull final PotionData data) {
|
||||||
if (data.isExtended()) {
|
if (data.isExtended()) {
|
||||||
return switch (data.getType()) {
|
return switch (data.getType()) {
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import com.willfp.eco.core.Eco;
|
|||||||
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
|
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
|
import net.kyori.adventure.text.JoinConfiguration;
|
||||||
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.format.TextDecoration;
|
import net.kyori.adventure.text.format.TextDecoration;
|
||||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||||
@@ -784,6 +786,127 @@ public final class StringUtils {
|
|||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Line wrap a list of strings while preserving formatting.
|
||||||
|
*
|
||||||
|
* @param input The input list.
|
||||||
|
* @param lineLength The length of each line.
|
||||||
|
* @return The wrapped list.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
public static List<String> lineWrap(@NotNull final List<String> input,
|
||||||
|
final int lineLength) {
|
||||||
|
return lineWrap(input, lineLength, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Line wrap a list of strings while preserving formatting.
|
||||||
|
*
|
||||||
|
* @param input The input list.
|
||||||
|
* @param lineLength The length of each line.
|
||||||
|
* @param preserveMargin If the string has a margin, add it to the next line.
|
||||||
|
* @return The wrapped list.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
public static List<String> lineWrap(@NotNull final List<String> input,
|
||||||
|
final int lineLength,
|
||||||
|
final boolean preserveMargin) {
|
||||||
|
return input.stream()
|
||||||
|
.flatMap(line -> lineWrap(line, lineLength, preserveMargin).stream())
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Line wrap a string while preserving formatting.
|
||||||
|
*
|
||||||
|
* @param input The input list.
|
||||||
|
* @param lineLength The length of each line.
|
||||||
|
* @return The wrapped list.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
public static List<String> lineWrap(@NotNull final String input,
|
||||||
|
final int lineLength) {
|
||||||
|
return lineWrap(input, lineLength, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Line wrap a string while preserving formatting.
|
||||||
|
*
|
||||||
|
* @param input The input string.
|
||||||
|
* @param lineLength The length of each line.
|
||||||
|
* @param preserveMargin If the string has a margin, add it to the start of each line.
|
||||||
|
* @return The wrapped string.
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
public static List<String> lineWrap(@NotNull final String input,
|
||||||
|
final int lineLength,
|
||||||
|
final boolean preserveMargin) {
|
||||||
|
int margin = preserveMargin ? getMargin(input) : 0;
|
||||||
|
TextComponent space = Component.text(" ");
|
||||||
|
|
||||||
|
Component asComponent = toComponent(input);
|
||||||
|
|
||||||
|
// The component contains the text as its children, so the child components
|
||||||
|
// are accessed like this:
|
||||||
|
List<TextComponent> children = new ArrayList<>();
|
||||||
|
|
||||||
|
if (asComponent instanceof TextComponent) {
|
||||||
|
children.add((TextComponent) asComponent);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Component child : asComponent.children()) {
|
||||||
|
children.add((TextComponent) child);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start by splitting the component into individual characters.
|
||||||
|
List<TextComponent> letters = new ArrayList<>();
|
||||||
|
for (TextComponent child : children) {
|
||||||
|
for (char c : child.content().toCharArray()) {
|
||||||
|
letters.add(Component.text(c).mergeStyle(child));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Component> lines = new ArrayList<>();
|
||||||
|
List<TextComponent> currentLine = new ArrayList<>();
|
||||||
|
boolean isFirstLine = true;
|
||||||
|
|
||||||
|
for (TextComponent letter : letters) {
|
||||||
|
if (currentLine.size() > lineLength && letter.content().isBlank()) {
|
||||||
|
lines.add(Component.join(JoinConfiguration.noSeparators(), currentLine));
|
||||||
|
currentLine.clear();
|
||||||
|
isFirstLine = false;
|
||||||
|
} else {
|
||||||
|
// Add margin if starting a new line.
|
||||||
|
if (currentLine.isEmpty() && !isFirstLine) {
|
||||||
|
if (preserveMargin) {
|
||||||
|
for (int i = 0; i < margin; i++) {
|
||||||
|
currentLine.add(space);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentLine.add(letter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Push last line.
|
||||||
|
lines.add(Component.join(JoinConfiguration.noSeparators(), currentLine));
|
||||||
|
|
||||||
|
// Convert back to legacy strings.
|
||||||
|
return lines.stream().map(StringUtils::toLegacy)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a string's margin.
|
||||||
|
*
|
||||||
|
* @param input The input string.
|
||||||
|
* @return The margin.
|
||||||
|
*/
|
||||||
|
public static int getMargin(@NotNull final String input) {
|
||||||
|
return input.indexOf(input.trim());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Options for formatting.
|
* Options for formatting.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package com.willfp.eco.core.map
|
|||||||
* @see ListMap
|
* @see ListMap
|
||||||
*/
|
*/
|
||||||
@Suppress("RedundantOverride")
|
@Suppress("RedundantOverride")
|
||||||
class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
|
class MutableListMap<K : Any, V> : ListMap<K, V>() {
|
||||||
/**
|
/**
|
||||||
* Override with enforced MutableList type.
|
* Override with enforced MutableList type.
|
||||||
*/
|
*/
|
||||||
@@ -18,7 +18,7 @@ class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
|
|||||||
/**
|
/**
|
||||||
* Override with enforced MutableList type.
|
* Override with enforced MutableList type.
|
||||||
*/
|
*/
|
||||||
override fun getOrDefault(key: K, defaultValue: MutableList<V>?): MutableList<V> {
|
override fun getOrDefault(key: K, defaultValue: MutableList<V>): MutableList<V> {
|
||||||
return super.getOrDefault(key, defaultValue)
|
return super.getOrDefault(key, defaultValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,12 @@ class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
|
|||||||
fun <K : Any, V : Any> defaultMap(defaultValue: V) =
|
fun <K : Any, V : Any> defaultMap(defaultValue: V) =
|
||||||
DefaultMap<K, V>(defaultValue)
|
DefaultMap<K, V>(defaultValue)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see DefaultMap
|
||||||
|
*/
|
||||||
|
fun <K : Any, V : Any> defaultMap(defaultValue: () -> V) =
|
||||||
|
DefaultMap<K, V>(defaultValue())
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ListMap
|
* @see ListMap
|
||||||
*/
|
*/
|
||||||
@@ -38,11 +44,13 @@ fun <K : Any, V : Any> listMap() =
|
|||||||
/**
|
/**
|
||||||
* @see DefaultMap.createNestedMap
|
* @see DefaultMap.createNestedMap
|
||||||
*/
|
*/
|
||||||
fun <K : Any, K1 : Any, V : Any> nestedMap() =
|
fun <K : Any, K1 : Any, V> nestedMap() =
|
||||||
DefaultMap.createNestedMap<K, K1, V>()
|
DefaultMap.createNestedMap<K, K1, V>()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see DefaultMap.createNestedListMap
|
* @see DefaultMap.createNestedListMap
|
||||||
*/
|
*/
|
||||||
fun <K : Any, K1 : Any, V : Any> nestedListMap() =
|
fun <K : Any, K1 : Any, V> nestedListMap() =
|
||||||
DefaultMap<K, MutableListMap<K1, V>>(MutableListMap())
|
DefaultMap<K, MutableListMap<K1, V>>() {
|
||||||
|
MutableListMap()
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
@file:JvmName("PlaceholderExtensions")
|
||||||
|
|
||||||
|
package com.willfp.eco.core.placeholder
|
||||||
|
|
||||||
|
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
||||||
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
||||||
|
|
||||||
|
/** @see PlaceholderManager.translatePlaceholders */
|
||||||
|
fun String.translatePlaceholders(context: PlaceholderContext) =
|
||||||
|
PlaceholderManager.translatePlaceholders(this, context)
|
||||||
|
|
||||||
|
/** @see PlaceholderManager.findPlaceholdersIn */
|
||||||
|
fun String.findPlaceholders(): List<String> =
|
||||||
|
PlaceholderManager.findPlaceholdersIn(this)
|
||||||
12
eco-api/src/main/kotlin/com/willfp/eco/util/EntityUtils.kt
Normal file
12
eco-api/src/main/kotlin/com/willfp/eco/util/EntityUtils.kt
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
@file:JvmName("EntityUtilsExtensions")
|
||||||
|
|
||||||
|
package com.willfp.eco.util
|
||||||
|
|
||||||
|
import net.kyori.adventure.text.Component
|
||||||
|
import org.bukkit.entity.LivingEntity
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
|
||||||
|
/** @see EntityUtils.setClientsideDisplayName */
|
||||||
|
fun LivingEntity.setClientsideDisplayName(player: Player, displayName: Component, visible: Boolean) {
|
||||||
|
EntityUtils.setClientsideDisplayName(this, player, displayName, visible)
|
||||||
|
}
|
||||||
@@ -15,5 +15,5 @@ fun <T> create2DList(rows: Int, columns: Int): MutableList<MutableList<T>> =
|
|||||||
ListUtils.create2DList(rows, columns)
|
ListUtils.create2DList(rows, columns)
|
||||||
|
|
||||||
/** @see ListUtils.toSingletonList */
|
/** @see ListUtils.toSingletonList */
|
||||||
fun <T> T.toSingletonList(): List<T> =
|
fun <T> T?.toSingletonList(): List<T> =
|
||||||
ListUtils.toSingletonList(this)
|
ListUtils.toSingletonList(this)
|
||||||
|
|||||||
@@ -2,6 +2,36 @@
|
|||||||
|
|
||||||
package com.willfp.eco.util
|
package com.willfp.eco.util
|
||||||
|
|
||||||
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
||||||
|
|
||||||
/** @see NumberUtils.toNumeral */
|
/** @see NumberUtils.toNumeral */
|
||||||
fun Number.toNumeral(): String =
|
fun Number.toNumeral(): String =
|
||||||
NumberUtils.toNumeral(this.toInt())
|
NumberUtils.toNumeral(this.toInt())
|
||||||
|
|
||||||
|
/** @see NumberUtils.fromNumeral */
|
||||||
|
fun String.parseNumeral(): Int =
|
||||||
|
NumberUtils.fromNumeral(this)
|
||||||
|
|
||||||
|
/** @see NumberUtils.randInt */
|
||||||
|
fun randInt(min: Int, max: Int) =
|
||||||
|
NumberUtils.randInt(min, max)
|
||||||
|
|
||||||
|
/** @see NumberUtils.randFloat */
|
||||||
|
fun randDouble(min: Double, max: Double) =
|
||||||
|
NumberUtils.randFloat(min, max)
|
||||||
|
|
||||||
|
/** @see NumberUtils.randFloat */
|
||||||
|
fun randFloat(min: Float, max: Float) =
|
||||||
|
NumberUtils.randFloat(min.toDouble(), max.toDouble()).toFloat()
|
||||||
|
|
||||||
|
/** @see NumberUtils.evaluateExpression */
|
||||||
|
fun evaluateExpression(expression: String) =
|
||||||
|
NumberUtils.evaluateExpression(expression)
|
||||||
|
|
||||||
|
/** @see NumberUtils.evaluateExpression */
|
||||||
|
fun evaluateExpression(expression: String, context: PlaceholderContext) =
|
||||||
|
NumberUtils.evaluateExpression(expression, context)
|
||||||
|
|
||||||
|
/** @see NumberUtils.evaluateExpressionOrNull */
|
||||||
|
fun evaluateExpressionOrNull(expression: String, context: PlaceholderContext) =
|
||||||
|
NumberUtils.evaluateExpressionOrNull(expression, context)
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
package com.willfp.eco.util
|
package com.willfp.eco.util
|
||||||
|
|
||||||
import org.bukkit.potion.PotionData
|
|
||||||
|
|
||||||
/** @see PotionData.duration */
|
/** @see PotionUtils.getDuration */
|
||||||
val PotionData.duration: Int
|
@Suppress("DEPRECATION")
|
||||||
|
val org.bukkit.potion.PotionData.duration: Int
|
||||||
get() = PotionUtils.getDuration(this)
|
get() = PotionUtils.getDuration(this)
|
||||||
|
|||||||
@@ -69,3 +69,15 @@ fun Any?.toNiceString(): String =
|
|||||||
/** @see StringUtils.replaceQuickly */
|
/** @see StringUtils.replaceQuickly */
|
||||||
fun String.replaceQuickly(target: String, replacement: String): String =
|
fun String.replaceQuickly(target: String, replacement: String): String =
|
||||||
StringUtils.replaceQuickly(this, target, replacement)
|
StringUtils.replaceQuickly(this, target, replacement)
|
||||||
|
|
||||||
|
/** @see StringUtils.lineWrap */
|
||||||
|
fun String.lineWrap(width: Int, preserveMargin: Boolean = true): List<String> =
|
||||||
|
StringUtils.lineWrap(this, width, preserveMargin)
|
||||||
|
|
||||||
|
/** @see StringUtils.lineWrap */
|
||||||
|
fun List<String>.lineWrap(width: Int, preserveMargin: Boolean = true): List<String> =
|
||||||
|
StringUtils.lineWrap(this, width, preserveMargin)
|
||||||
|
|
||||||
|
/** @see StringUtils.getMargin */
|
||||||
|
val String.margin: Int
|
||||||
|
get() = StringUtils.getMargin(this)
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ dependencies {
|
|||||||
implementation("org.reflections:reflections:0.9.12")
|
implementation("org.reflections:reflections:0.9.12")
|
||||||
implementation("org.objenesis:objenesis:3.2")
|
implementation("org.objenesis:objenesis:3.2")
|
||||||
|
|
||||||
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
|
||||||
compileOnly("me.clip:placeholderapi:2.10.10")
|
compileOnly("me.clip:placeholderapi:2.11.4")
|
||||||
compileOnly("net.kyori:adventure-text-minimessage:4.10.0")
|
compileOnly("net.kyori:adventure-text-minimessage:4.10.0")
|
||||||
compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")
|
compileOnly("net.kyori:adventure-platform-bukkit:4.1.0")
|
||||||
compileOnly("org.yaml:snakeyaml:1.33")
|
compileOnly("org.yaml:snakeyaml:1.33")
|
||||||
|
|||||||
@@ -8,10 +8,12 @@ import org.bukkit.command.TabCompleter
|
|||||||
|
|
||||||
class DelegatedBukkitCommand(
|
class DelegatedBukkitCommand(
|
||||||
private val delegate: EcoPluginCommand
|
private val delegate: EcoPluginCommand
|
||||||
) : Command(delegate.name), TabCompleter, PluginIdentifiableCommand {
|
) : Command(
|
||||||
private var _aliases: List<String>? = null
|
delegate.name,
|
||||||
private var _description: String? = null
|
delegate.description ?: "",
|
||||||
|
"/${delegate.name}",
|
||||||
|
delegate.aliases
|
||||||
|
), TabCompleter, PluginIdentifiableCommand {
|
||||||
override fun execute(sender: CommandSender, label: String, args: Array<out String>?): Boolean {
|
override fun execute(sender: CommandSender, label: String, args: Array<out String>?): Boolean {
|
||||||
return delegate.onCommand(sender, this, label, args)
|
return delegate.onCommand(sender, this, label, args)
|
||||||
}
|
}
|
||||||
@@ -36,16 +38,4 @@ class DelegatedBukkitCommand(
|
|||||||
|
|
||||||
override fun getPlugin() = delegate.plugin
|
override fun getPlugin() = delegate.plugin
|
||||||
override fun getPermission() = delegate.permission
|
override fun getPermission() = delegate.permission
|
||||||
override fun getDescription() = _description ?: delegate.description ?: ""
|
|
||||||
override fun getAliases(): List<String> = _aliases ?: delegate.aliases
|
|
||||||
|
|
||||||
override fun setDescription(description: String): Command {
|
|
||||||
this._description = description
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun setAliases(aliases: List<String>): Command {
|
|
||||||
this._aliases = aliases
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import com.willfp.eco.core.command.PluginCommandBase
|
|||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
|
|
||||||
class EcoPluginCommand(
|
class EcoPluginCommand(
|
||||||
parentDelegate: CommandBase,
|
private val parentDelegate: PluginCommandBase,
|
||||||
plugin: EcoPlugin,
|
plugin: EcoPlugin,
|
||||||
name: String,
|
name: String,
|
||||||
permission: String,
|
permission: String,
|
||||||
@@ -39,6 +39,9 @@ class EcoPluginCommand(
|
|||||||
|
|
||||||
Eco.get().syncCommands()
|
Eco.get().syncCommands()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun getAliases(): List<String> = parentDelegate.aliases
|
||||||
|
override fun getDescription(): String? = parentDelegate.description
|
||||||
}
|
}
|
||||||
|
|
||||||
class EcoSubcommand(
|
class EcoSubcommand(
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ abstract class HandledCommand(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
notifyFalse(!isPlayersOnly || sender is Player, LangYml.KEY_NOT_PLAYER)
|
notifyFalse(!isPlayersOnly || sender is Player, "not-player")
|
||||||
|
|
||||||
onExecute(sender, args)
|
onExecute(sender, args)
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ internal fun Any?.constrainConfigTypes(type: ConfigType): Any? = when (this) {
|
|||||||
this.toMutableList()
|
this.toMutableList()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is Float -> this.toDouble() // Should prevent !!float from being written
|
||||||
else -> this
|
else -> this
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,6 +112,7 @@ private object YamlConfigTypeHandler : ConfigTypeHandler(ConfigType.YAML) {
|
|||||||
representer.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
|
representer.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
|
||||||
|
|
||||||
return Yaml(
|
return Yaml(
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
YamlConstructor(),
|
YamlConstructor(),
|
||||||
representer,
|
representer,
|
||||||
yamlOptions,
|
yamlOptions,
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
|||||||
import com.willfp.eco.internal.fast.listView
|
import com.willfp.eco.internal.fast.listView
|
||||||
import com.willfp.eco.util.StringUtils
|
import com.willfp.eco.util.StringUtils
|
||||||
import org.bukkit.configuration.file.YamlConfiguration
|
import org.bukkit.configuration.file.YamlConfiguration
|
||||||
import java.util.Objects
|
|
||||||
import java.util.concurrent.ConcurrentHashMap
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
open class EcoConfig(
|
open class EcoConfig(
|
||||||
@@ -18,11 +16,16 @@ open class EcoConfig(
|
|||||||
private val values = ConcurrentHashMap<String, Any?>()
|
private val values = ConcurrentHashMap<String, Any?>()
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
var injections = ConcurrentHashMap<Pattern, InjectablePlaceholder>()
|
private val injections = mutableMapOf<String, InjectablePlaceholder>()
|
||||||
|
|
||||||
fun init(values: Map<String, Any?>) {
|
@Transient
|
||||||
|
private var injectionHash = 0
|
||||||
|
|
||||||
|
fun init(values: Map<String, Any?>, injections: Map<String, InjectablePlaceholder>) {
|
||||||
this.values.clear()
|
this.values.clear()
|
||||||
this.values.putAll(values.normalizeToConfig(this.type))
|
this.values.putAll(values.normalizeToConfig(this.type))
|
||||||
|
|
||||||
|
this.addInjectablePlaceholder(injections.values)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toPlaintext(): String {
|
override fun toPlaintext(): String {
|
||||||
@@ -180,7 +183,8 @@ open class EcoConfig(
|
|||||||
|
|
||||||
override fun addInjectablePlaceholder(placeholders: Iterable<InjectablePlaceholder>) {
|
override fun addInjectablePlaceholder(placeholders: Iterable<InjectablePlaceholder>) {
|
||||||
for (placeholder in placeholders) {
|
for (placeholder in placeholders) {
|
||||||
injections[placeholder.pattern] = placeholder
|
injections[placeholder.pattern.pattern()] = placeholder
|
||||||
|
injectionHash = injectionHash xor placeholder.hashCode()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,6 +194,7 @@ open class EcoConfig(
|
|||||||
|
|
||||||
override fun clearInjectedPlaceholders() {
|
override fun clearInjectedPlaceholders() {
|
||||||
injections.clear()
|
injections.clear()
|
||||||
|
injectionHash = 0 // Reset the hash
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toMap(): MutableMap<String, Any?> {
|
override fun toMap(): MutableMap<String, Any?> {
|
||||||
@@ -236,22 +241,14 @@ open class EcoConfig(
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if (configType != other.configType) {
|
// Hey! Don't care. This works.
|
||||||
return false
|
return this.hashCode() == other.hashCode()
|
||||||
}
|
|
||||||
|
|
||||||
if (values != other.values) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (injections != other.injections) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
override fun hashCode(): Int {
|
||||||
return Objects.hash(values, configType, injections)
|
// hashCode() has to compute extremely quickly, so we're using bitwise, because why not?
|
||||||
|
// Fucking filthy to use identityHashCode here, but it should be extremely fast
|
||||||
|
val identityHash = System.identityHashCode(this)
|
||||||
|
return (identityHash shl 5) - (identityHash xor configType.hashCode()) + injectionHash
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,13 @@ package com.willfp.eco.internal.config
|
|||||||
import com.willfp.eco.core.config.ConfigType
|
import com.willfp.eco.core.config.ConfigType
|
||||||
import com.willfp.eco.core.placeholder.InjectablePlaceholder
|
import com.willfp.eco.core.placeholder.InjectablePlaceholder
|
||||||
import java.util.concurrent.ConcurrentHashMap
|
import java.util.concurrent.ConcurrentHashMap
|
||||||
import java.util.regex.Pattern
|
|
||||||
|
|
||||||
class EcoConfigSection(
|
class EcoConfigSection(
|
||||||
type: ConfigType,
|
type: ConfigType,
|
||||||
values: Map<String, Any?> = emptyMap(),
|
values: Map<String, Any?> = emptyMap(),
|
||||||
injections: Map<Pattern, InjectablePlaceholder> = emptyMap()
|
injections: Map<String, InjectablePlaceholder> = emptyMap()
|
||||||
) : EcoConfig(type) {
|
) : EcoConfig(type) {
|
||||||
init {
|
init {
|
||||||
this.init(values)
|
this.init(values, injections)
|
||||||
this.injections = ConcurrentHashMap(injections)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ open class EcoLoadableConfig(
|
|||||||
protected fun init(reader: Reader) {
|
protected fun init(reader: Reader) {
|
||||||
val string = reader.readToString()
|
val string = reader.readToString()
|
||||||
makeHeader(string)
|
makeHeader(string)
|
||||||
super.init(type.toMap(string))
|
super.init(type.toMap(string), emptyMap())
|
||||||
}
|
}
|
||||||
|
|
||||||
fun init(file: File) {
|
fun init(file: File) {
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
package com.willfp.eco.internal.config
|
package com.willfp.eco.internal.config
|
||||||
|
|
||||||
import com.willfp.eco.core.config.interfaces.Config
|
import com.willfp.eco.core.config.interfaces.Config
|
||||||
|
import org.yaml.snakeyaml.DumperOptions
|
||||||
import org.yaml.snakeyaml.nodes.Node
|
import org.yaml.snakeyaml.nodes.Node
|
||||||
import org.yaml.snakeyaml.representer.Represent
|
import org.yaml.snakeyaml.representer.Represent
|
||||||
import org.yaml.snakeyaml.representer.Representer
|
import org.yaml.snakeyaml.representer.Representer
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
class EcoRepresenter : Representer(DumperOptions()) {
|
||||||
class EcoRepresenter : Representer() {
|
|
||||||
init {
|
init {
|
||||||
multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!)
|
multiRepresenters[Config::class.java] = RepresentConfig(multiRepresenters[Map::class.java]!!)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ open class EcoUpdatableConfig(
|
|||||||
val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
|
val reader = BufferedReader(InputStreamReader(newIn, StandardCharsets.UTF_8))
|
||||||
|
|
||||||
val config = EcoConfigSection(type, emptyMap())
|
val config = EcoConfigSection(type, emptyMap())
|
||||||
config.init(type.toMap(reader.readToString()))
|
config.init(type.toMap(reader.readToString()), emptyMap())
|
||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.willfp.eco.internal.config.handler
|
package com.willfp.eco.internal.config.handler
|
||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin
|
import com.willfp.eco.core.EcoPlugin
|
||||||
import com.willfp.eco.core.config.updating.ConfigUpdater
|
|
||||||
import org.reflections.Reflections
|
import org.reflections.Reflections
|
||||||
import org.reflections.scanners.MethodAnnotationsScanner
|
import org.reflections.scanners.MethodAnnotationsScanner
|
||||||
|
|
||||||
@@ -14,7 +13,8 @@ class ReflectiveConfigHandler(
|
|||||||
)
|
)
|
||||||
|
|
||||||
override fun callUpdate() {
|
override fun callUpdate() {
|
||||||
for (method in reflections.getMethodsAnnotatedWith(ConfigUpdater::class.java)) {
|
@Suppress("DEPRECATION", "REMOVAL")
|
||||||
|
for (method in reflections.getMethodsAnnotatedWith(com.willfp.eco.core.config.updating.ConfigUpdater::class.java)) {
|
||||||
runCatching {
|
runCatching {
|
||||||
when (method.parameterCount) {
|
when (method.parameterCount) {
|
||||||
0 -> method.invoke(null)
|
0 -> method.invoke(null)
|
||||||
|
|||||||
@@ -2,12 +2,14 @@ package com.willfp.eco.internal.events
|
|||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin
|
import com.willfp.eco.core.EcoPlugin
|
||||||
import com.willfp.eco.core.events.EventManager
|
import com.willfp.eco.core.events.EventManager
|
||||||
|
import com.willfp.eco.core.map.listMap
|
||||||
import com.willfp.eco.core.packet.PacketEvent
|
import com.willfp.eco.core.packet.PacketEvent
|
||||||
import com.willfp.eco.core.packet.PacketListener
|
import com.willfp.eco.core.packet.PacketListener
|
||||||
import com.willfp.eco.core.packet.PacketPriority
|
import com.willfp.eco.core.packet.PacketPriority
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.event.HandlerList
|
import org.bukkit.event.HandlerList
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
|
import java.lang.Exception
|
||||||
|
|
||||||
|
|
||||||
private class RegisteredPacketListener(
|
private class RegisteredPacketListener(
|
||||||
@@ -15,20 +17,48 @@ private class RegisteredPacketListener(
|
|||||||
val listener: PacketListener
|
val listener: PacketListener
|
||||||
)
|
)
|
||||||
|
|
||||||
private val listeners = mutableMapOf<PacketPriority, MutableList<RegisteredPacketListener>>()
|
private val listeners = listMap<PacketPriority, RegisteredPacketListener>()
|
||||||
|
|
||||||
fun PacketEvent.handleSend() {
|
fun PacketEvent.handleSend() {
|
||||||
for (priority in PacketPriority.values()) {
|
for (priority in PacketPriority.values()) {
|
||||||
for (listener in listeners[priority] ?: continue) {
|
for (listener in listeners[priority]) {
|
||||||
listener.listener.onSend(this)
|
try {
|
||||||
|
listener.listener.onSend(this)
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
listener.plugin.logger.warning(
|
||||||
|
"Exception in packet listener ${listener.listener.javaClass.name}" +
|
||||||
|
" for packet ${packet.handle.javaClass.name}!"
|
||||||
|
)
|
||||||
|
e.printStackTrace()
|
||||||
|
} catch (e: LinkageError) {
|
||||||
|
listener.plugin.logger.warning(
|
||||||
|
"Error in packet listener ${listener.listener.javaClass.name}" +
|
||||||
|
" for packet ${packet.handle.javaClass.name}!"
|
||||||
|
)
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun PacketEvent.handleReceive() {
|
fun PacketEvent.handleReceive() {
|
||||||
for (priority in PacketPriority.values()) {
|
for (priority in PacketPriority.values()) {
|
||||||
for (listener in listeners[priority] ?: continue) {
|
for (listener in listeners[priority]) {
|
||||||
listener.listener.onReceive(this)
|
try {
|
||||||
|
listener.listener.onReceive(this)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
listener.plugin.logger.warning(
|
||||||
|
"Exception in packet listener ${listener.listener.javaClass.name}" +
|
||||||
|
" for packet ${packet.handle.javaClass.name}!"
|
||||||
|
)
|
||||||
|
e.printStackTrace()
|
||||||
|
} catch (e: LinkageError) {
|
||||||
|
listener.plugin.logger.warning(
|
||||||
|
"Error in packet listener ${listener.listener.javaClass.name}" +
|
||||||
|
" for packet ${packet.handle.javaClass.name}!"
|
||||||
|
)
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,11 +80,9 @@ class EcoEventManager(private val plugin: EcoPlugin) : EventManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun registerPacketListener(listener: PacketListener) {
|
override fun registerPacketListener(listener: PacketListener) {
|
||||||
listeners.getOrPut(listener.priority) { mutableListOf() }.add(
|
listeners[listener.priority] += RegisteredPacketListener(
|
||||||
RegisteredPacketListener(
|
plugin,
|
||||||
plugin,
|
listener
|
||||||
listener
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,11 @@ import com.willfp.eco.core.Eco
|
|||||||
import com.willfp.eco.core.EcoPlugin
|
import com.willfp.eco.core.EcoPlugin
|
||||||
import com.willfp.eco.core.config.toConfig
|
import com.willfp.eco.core.config.toConfig
|
||||||
import com.willfp.eco.core.extensions.Extension
|
import com.willfp.eco.core.extensions.Extension
|
||||||
|
import com.willfp.eco.core.extensions.ExtensionLoadException
|
||||||
import com.willfp.eco.core.extensions.ExtensionLoader
|
import com.willfp.eco.core.extensions.ExtensionLoader
|
||||||
import com.willfp.eco.core.extensions.ExtensionMetadata
|
import com.willfp.eco.core.extensions.ExtensionMetadata
|
||||||
import com.willfp.eco.core.extensions.MalformedExtensionException
|
import com.willfp.eco.core.extensions.MalformedExtensionException
|
||||||
|
import com.willfp.eco.core.version.Version
|
||||||
import org.bukkit.configuration.file.YamlConfiguration
|
import org.bukkit.configuration.file.YamlConfiguration
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.InputStreamReader
|
import java.io.InputStreamReader
|
||||||
@@ -32,7 +34,7 @@ class EcoExtensionLoader(
|
|||||||
}
|
}
|
||||||
|
|
||||||
runCatching { loadExtension(extensionJar) }.onFailure {
|
runCatching { loadExtension(extensionJar) }.onFailure {
|
||||||
this.plugin.logger.warning(extensionJar.name + " caused an error!")
|
this.plugin.logger.warning(extensionJar.name + " caused an error: ${it.message ?: "Unknown error"}")
|
||||||
if (Eco.get().ecoPlugin.configYml.getBool("log-full-extension-errors")) {
|
if (Eco.get().ecoPlugin.configYml.getBool("log-full-extension-errors")) {
|
||||||
it.printStackTrace()
|
it.printStackTrace()
|
||||||
}
|
}
|
||||||
@@ -54,7 +56,12 @@ class EcoExtensionLoader(
|
|||||||
var name = extensionYml.getStringOrNull("name")
|
var name = extensionYml.getStringOrNull("name")
|
||||||
var version = extensionYml.getStringOrNull("version")
|
var version = extensionYml.getStringOrNull("version")
|
||||||
var author = extensionYml.getStringOrNull("author")
|
var author = extensionYml.getStringOrNull("author")
|
||||||
|
val pluginVersion = Version(extensionYml.getStringOrNull("plugin-version") ?: "0.0.0")
|
||||||
|
val pluginName = extensionYml.getStringOrNull("plugin")
|
||||||
|
|
||||||
|
if (pluginName != null && !pluginName.equals(this.plugin.description.name, ignoreCase = true)) {
|
||||||
|
throw ExtensionLoadException("${extensionJar.name} is only compatible with $pluginName!")
|
||||||
|
}
|
||||||
|
|
||||||
if (mainClass == null) {
|
if (mainClass == null) {
|
||||||
throw MalformedExtensionException("Invalid extension.yml found in " + extensionJar.name)
|
throw MalformedExtensionException("Invalid extension.yml found in " + extensionJar.name)
|
||||||
@@ -75,7 +82,11 @@ class EcoExtensionLoader(
|
|||||||
author = "Unnamed Author"
|
author = "Unnamed Author"
|
||||||
}
|
}
|
||||||
|
|
||||||
val metadata = ExtensionMetadata(version, name, author)
|
if (Version(this.plugin.description.version) < pluginVersion) {
|
||||||
|
throw ExtensionLoadException("Plugin version is too low for ${extensionJar.name}!")
|
||||||
|
}
|
||||||
|
|
||||||
|
val metadata = ExtensionMetadata(version, name, author, extensionJar, pluginVersion)
|
||||||
|
|
||||||
val cls: Class<*> = classLoader.loadClass(mainClass)
|
val cls: Class<*> = classLoader.loadClass(mainClass)
|
||||||
val extension: Extension = cls.getConstructor(EcoPlugin::class.java).newInstance(this.plugin) as Extension
|
val extension: Extension = cls.getConstructor(EcoPlugin::class.java).newInstance(this.plugin) as Extension
|
||||||
@@ -85,7 +96,7 @@ class EcoExtensionLoader(
|
|||||||
extensions[extension] = classLoader
|
extensions[extension] = classLoader
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getLoadedExtensions(): MutableSet<Extension> {
|
override fun getLoadedExtensions(): Set<Extension> {
|
||||||
return ImmutableSet.copyOf(extensions.keys)
|
return ImmutableSet.copyOf(extensions.keys)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,4 +108,4 @@ class EcoExtensionLoader(
|
|||||||
|
|
||||||
extensions.clear()
|
extensions.clear()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,4 +34,6 @@ open class EcoSlot(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getActionableSlot(player: Player, menu: Menu): EcoSlot = this
|
override fun getActionableSlot(player: Player, menu: Menu): EcoSlot = this
|
||||||
|
|
||||||
|
override fun shouldRenderOnClick(clickType: ClickType) = !handlers[clickType].isNullOrEmpty()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.willfp.eco.core.gui.slot.functional.CaptiveFilter
|
|||||||
import com.willfp.eco.core.gui.slot.functional.SlotHandler
|
import com.willfp.eco.core.gui.slot.functional.SlotHandler
|
||||||
import com.willfp.eco.core.gui.slot.functional.SlotProvider
|
import com.willfp.eco.core.gui.slot.functional.SlotProvider
|
||||||
import com.willfp.eco.core.gui.slot.functional.SlotUpdater
|
import com.willfp.eco.core.gui.slot.functional.SlotUpdater
|
||||||
|
import com.willfp.eco.core.map.listMap
|
||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.event.inventory.ClickType
|
import org.bukkit.event.inventory.ClickType
|
||||||
import java.util.function.Predicate
|
import java.util.function.Predicate
|
||||||
@@ -15,14 +16,14 @@ class EcoSlotBuilder(private val provider: SlotProvider) : SlotBuilder {
|
|||||||
private var captiveFromEmpty = false
|
private var captiveFromEmpty = false
|
||||||
private var updater: SlotUpdater = SlotUpdater { player, menu, _ -> provider.provide(player, menu) }
|
private var updater: SlotUpdater = SlotUpdater { player, menu, _ -> provider.provide(player, menu) }
|
||||||
|
|
||||||
private val handlers = mutableMapOf<ClickType, MutableList<SlotHandler>>()
|
private val handlers = listMap<ClickType, SlotHandler>()
|
||||||
|
|
||||||
private var captiveFilter =
|
private var captiveFilter =
|
||||||
CaptiveFilter { _, _, _ -> true }
|
CaptiveFilter { _, _, _ -> true }
|
||||||
private var notCaptiveFor: (Player) -> Boolean = { _ -> false}
|
private var notCaptiveFor: (Player) -> Boolean = { _ -> false}
|
||||||
|
|
||||||
override fun onClick(type: ClickType, action: SlotHandler): SlotBuilder {
|
override fun onClick(type: ClickType, action: SlotHandler): SlotBuilder {
|
||||||
handlers.computeIfAbsent(type) { mutableListOf() } += action
|
handlers[type] += action
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.internal.integrations
|
|||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin
|
import com.willfp.eco.core.EcoPlugin
|
||||||
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
||||||
|
import com.willfp.eco.core.placeholder.context.placeholderContext
|
||||||
import me.clip.placeholderapi.expansion.PlaceholderExpansion
|
import me.clip.placeholderapi.expansion.PlaceholderExpansion
|
||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
|
|
||||||
@@ -33,7 +34,19 @@ class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
|
|||||||
override fun onPlaceholderRequest(
|
override fun onPlaceholderRequest(
|
||||||
player: Player?,
|
player: Player?,
|
||||||
identifier: String
|
identifier: String
|
||||||
): String {
|
): String? {
|
||||||
return PlaceholderManager.getResult(player, identifier, plugin)
|
return PlaceholderManager.getResult(
|
||||||
|
plugin,
|
||||||
|
identifier,
|
||||||
|
placeholderContext(
|
||||||
|
player = player,
|
||||||
|
item = player?.inventory?.itemInMainHand
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getPlaceholders(): List<String> {
|
||||||
|
return PlaceholderManager.getRegisteredPlaceholders(plugin)
|
||||||
|
.map { "%${this.plugin.name.lowercase()}_${it.pattern.pattern()}%" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package com.willfp.eco.internal.items
|
||||||
|
|
||||||
|
import com.willfp.eco.core.items.args.LookupArgParser
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.inventory.meta.ItemMeta
|
||||||
|
import org.bukkit.inventory.meta.SkullMeta
|
||||||
|
import java.util.function.Predicate
|
||||||
|
|
||||||
|
object ArgParserHead : LookupArgParser {
|
||||||
|
override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
|
||||||
|
if (meta !is SkullMeta) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
var playerName: String? = null
|
||||||
|
|
||||||
|
for (arg in args) {
|
||||||
|
val argSplit = arg.split(":")
|
||||||
|
if (!argSplit[0].equals("head", ignoreCase = true)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (argSplit.size < 2) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
playerName = argSplit[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
playerName ?: return null
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
val player = Bukkit.getOfflinePlayer(playerName)
|
||||||
|
|
||||||
|
meta.owningPlayer = player
|
||||||
|
|
||||||
|
return Predicate {
|
||||||
|
val testMeta = it.itemMeta as? SkullMeta ?: return@Predicate false
|
||||||
|
testMeta.owningPlayer?.uniqueId == player.uniqueId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serializeBack(meta: ItemMeta): String? {
|
||||||
|
if (meta !is SkullMeta) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
if (meta.owningPlayer == null) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
if (meta.owningPlayer!!.name.equals("null", true) || meta.owningPlayer!!.name == null) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return "head:${meta.owningPlayer?.name}"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package com.willfp.eco.internal.items
|
||||||
|
|
||||||
|
import com.willfp.eco.core.items.args.LookupArgParser
|
||||||
|
import org.bukkit.Color
|
||||||
|
import org.bukkit.NamespacedKey
|
||||||
|
import org.bukkit.Registry
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.inventory.meta.ArmorMeta
|
||||||
|
import org.bukkit.inventory.meta.ItemMeta
|
||||||
|
import org.bukkit.inventory.meta.LeatherArmorMeta
|
||||||
|
import org.bukkit.inventory.meta.trim.ArmorTrim
|
||||||
|
import org.bukkit.inventory.meta.trim.TrimMaterial
|
||||||
|
import org.bukkit.inventory.meta.trim.TrimPattern
|
||||||
|
import java.util.function.Predicate
|
||||||
|
|
||||||
|
object ArgParserTrim : LookupArgParser {
|
||||||
|
override fun parseArguments(args: Array<out String>, meta: ItemMeta): Predicate<ItemStack>? {
|
||||||
|
if (meta !is ArmorMeta) return null
|
||||||
|
|
||||||
|
var material: TrimMaterial? = null
|
||||||
|
var pattern: TrimPattern? = null
|
||||||
|
|
||||||
|
for (arg in args) {
|
||||||
|
val argSplit = arg.split(":")
|
||||||
|
if (!argSplit[0].equals("trim", ignoreCase = true)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
material = Registry.TRIM_MATERIAL.get(NamespacedKey.minecraft(argSplit.getOrElse(1) {""}))
|
||||||
|
pattern = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft(argSplit.getOrElse(2) {""}))
|
||||||
|
}
|
||||||
|
|
||||||
|
if (material == null || pattern == null) return null
|
||||||
|
|
||||||
|
|
||||||
|
meta.trim = ArmorTrim(material, pattern)
|
||||||
|
|
||||||
|
return Predicate {
|
||||||
|
val testMeta = it.itemMeta as? ArmorMeta ?: return@Predicate false
|
||||||
|
val trim = testMeta.trim ?: return@Predicate false
|
||||||
|
return@Predicate trim.material == material
|
||||||
|
&& trim.pattern == pattern
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun serializeBack(meta: ItemMeta): String? {
|
||||||
|
val trim = (meta as? ArmorMeta)?.trim ?: return null
|
||||||
|
|
||||||
|
return "trim:${trim.material.key.key.lowercase()}:${trim.pattern.key.key.lowercase()}"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.willfp.eco.internal.logging
|
||||||
|
|
||||||
|
import java.util.logging.LogRecord
|
||||||
|
import java.util.logging.Logger
|
||||||
|
|
||||||
|
object NOOPLogger : Logger("eco_noop", null as String?) {
|
||||||
|
override fun log(record: LogRecord?) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,8 +4,23 @@ import com.willfp.eco.core.EcoPlugin
|
|||||||
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
|
||||||
import com.willfp.eco.core.placeholder.InjectablePlaceholder
|
import com.willfp.eco.core.placeholder.InjectablePlaceholder
|
||||||
import com.willfp.eco.core.placeholder.Placeholder
|
import com.willfp.eco.core.placeholder.Placeholder
|
||||||
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
||||||
|
import com.willfp.eco.core.placeholder.templates.SimpleInjectablePlaceholder
|
||||||
import java.util.regex.Pattern
|
import java.util.regex.Pattern
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
A set of global placeholders that are always available.
|
||||||
|
|
||||||
|
*/
|
||||||
|
private val globalPlaceholders = setOf<Placeholder>(
|
||||||
|
object : SimpleInjectablePlaceholder("player") {
|
||||||
|
override fun getValue(args: String, context: PlaceholderContext): String? {
|
||||||
|
return context.player?.name
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
class PlaceholderLookup(
|
class PlaceholderLookup(
|
||||||
val args: String,
|
val args: String,
|
||||||
val plugin: EcoPlugin?,
|
val plugin: EcoPlugin?,
|
||||||
@@ -29,6 +44,12 @@ class PlaceholderLookup(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (placeholder in globalPlaceholders) {
|
||||||
|
if (placeholder.matches(this)) {
|
||||||
|
return placeholder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import com.willfp.eco.core.placeholder.InjectablePlaceholder
|
|||||||
import com.willfp.eco.core.placeholder.Placeholder
|
import com.willfp.eco.core.placeholder.Placeholder
|
||||||
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
import com.willfp.eco.core.placeholder.context.PlaceholderContext
|
||||||
import com.willfp.eco.util.StringUtils
|
import com.willfp.eco.util.StringUtils
|
||||||
import java.util.Optional
|
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -23,7 +22,7 @@ class PlaceholderParser {
|
|||||||
|
|
||||||
private val placeholderLookupCache = Caffeine.newBuilder()
|
private val placeholderLookupCache = Caffeine.newBuilder()
|
||||||
.expireAfterWrite(1, TimeUnit.SECONDS)
|
.expireAfterWrite(1, TimeUnit.SECONDS)
|
||||||
.build<PlaceholderLookup, Optional<Placeholder>>()
|
.build<PlaceholderLookup, Placeholder?>()
|
||||||
|
|
||||||
fun translatePlacholders(text: String, context: PlaceholderContext): String {
|
fun translatePlacholders(text: String, context: PlaceholderContext): String {
|
||||||
return translatePlacholders(text, context, context.injectableContext.placeholderInjections)
|
return translatePlacholders(text, context, context.injectableContext.placeholderInjections)
|
||||||
@@ -122,10 +121,10 @@ class PlaceholderParser {
|
|||||||
val lookup = PlaceholderLookup(args, plugin, injections)
|
val lookup = PlaceholderLookup(args, plugin, injections)
|
||||||
|
|
||||||
val placeholder = placeholderLookupCache.get(lookup) {
|
val placeholder = placeholderLookupCache.get(lookup) {
|
||||||
Optional.ofNullable(it.findMatchingPlaceholder())
|
it.findMatchingPlaceholder()
|
||||||
}.orElse(null) ?: return null
|
}
|
||||||
|
|
||||||
return placeholder.getValue(args, context)
|
return placeholder?.getValue(args, context)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun translateEcoPlaceholdersIn(
|
private fun translateEcoPlaceholdersIn(
|
||||||
|
|||||||
@@ -9,18 +9,28 @@ import java.util.UUID
|
|||||||
|
|
||||||
private lateinit var setProfile: Method
|
private lateinit var setProfile: Method
|
||||||
private lateinit var profile: Field
|
private lateinit var profile: Field
|
||||||
|
private lateinit var value: Field
|
||||||
|
|
||||||
var SkullMeta.texture: String?
|
var SkullMeta.texture: String?
|
||||||
get() {
|
get() {
|
||||||
|
if (!::value.isInitialized) {
|
||||||
|
// Doing it this way because Property was changed to be a record and this is
|
||||||
|
// a quick hack to get around that
|
||||||
|
value = Property::class.java.getDeclaredField("value")
|
||||||
|
value.isAccessible = true
|
||||||
|
}
|
||||||
|
|
||||||
if (!::profile.isInitialized) {
|
if (!::profile.isInitialized) {
|
||||||
// Assumes instance of CraftMetaSkull; package-private class so can't do manual type check
|
// Assumes instance of CraftMetaSkull; package-private class so can't do manual type check
|
||||||
profile = this.javaClass.getDeclaredField("profile")
|
profile = this.javaClass.getDeclaredField("profile")
|
||||||
profile.isAccessible = true
|
profile.isAccessible = true
|
||||||
}
|
}
|
||||||
|
|
||||||
val profile = profile[this] as GameProfile? ?: return null
|
val profile = profile[this] as GameProfile? ?: return null
|
||||||
val properties = profile.properties ?: return null
|
val properties = profile.properties ?: return null
|
||||||
val prop = properties["textures"] ?: return null
|
val props = properties["textures"] ?: return null
|
||||||
return prop.toMutableList().firstOrNull()?.value
|
val prop = props.toMutableList().firstOrNull() ?: return null
|
||||||
|
return value[prop] as String?
|
||||||
}
|
}
|
||||||
set(base64) {
|
set(base64) {
|
||||||
if (!::setProfile.isInitialized) {
|
if (!::setProfile.isInitialized) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.willfp.eco.internal.spigot.proxy.common.ai
|
|||||||
|
|
||||||
import com.willfp.eco.core.entities.ai.CustomGoal
|
import com.willfp.eco.core.entities.ai.CustomGoal
|
||||||
import com.willfp.eco.core.entities.ai.GoalFlag
|
import com.willfp.eco.core.entities.ai.GoalFlag
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.toBukkitEntity
|
||||||
import net.minecraft.world.entity.PathfinderMob
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
import net.minecraft.world.entity.ai.goal.Goal
|
import net.minecraft.world.entity.ai.goal.Goal
|
||||||
import java.util.EnumSet
|
import java.util.EnumSet
|
||||||
@@ -51,7 +52,7 @@ private class NMSCustomGoal<T : org.bukkit.entity.Mob>(
|
|||||||
) : Goal() {
|
) : Goal() {
|
||||||
init {
|
init {
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
customEntityGoal.initialize(entity.bukkitMob as T)
|
customEntityGoal.initialize(entity.toBukkitEntity() as T)
|
||||||
this.setFlags(EnumSet.copyOf(customEntityGoal.flags.toNMSFlags()))
|
this.setFlags(EnumSet.copyOf(customEntityGoal.flags.toNMSFlags()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
39
eco-core/core-nms/v1_20_R1/build.gradle.kts
Normal file
39
eco-core/core-nms/v1_20_R1/build.gradle.kts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
plugins {
|
||||||
|
id("io.papermc.paperweight.userdev")
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "com.willfp"
|
||||||
|
version = rootProject.version
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation(project(":eco-core:core-nms:nms-common"))
|
||||||
|
paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
|
||||||
|
|
||||||
|
implementation("net.kyori:adventure-text-minimessage:4.11.0") {
|
||||||
|
version {
|
||||||
|
strictly("4.11.0")
|
||||||
|
}
|
||||||
|
exclude(group = "net.kyori", module = "adventure-api")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
build {
|
||||||
|
dependsOn(reobfJar)
|
||||||
|
}
|
||||||
|
|
||||||
|
reobfJar {
|
||||||
|
mustRunAfter(shadowJar)
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
relocate(
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.common",
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.v1_20_R1.common"
|
||||||
|
)
|
||||||
|
relocate(
|
||||||
|
"net.kyori.adventure.text.minimessage",
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.v1_20_R1.minimessage"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.command.PluginCommandBase
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.command.Command
|
||||||
|
import org.bukkit.command.SimpleCommandMap
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftServer
|
||||||
|
import java.lang.reflect.Field
|
||||||
|
|
||||||
|
class BukkitCommands : BukkitCommandsProxy {
|
||||||
|
private val knownCommandsField: Field by lazy {
|
||||||
|
SimpleCommandMap::class.java.getDeclaredField("knownCommands")
|
||||||
|
.apply {
|
||||||
|
isAccessible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
private val knownCommands: MutableMap<String, Command>
|
||||||
|
get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
|
||||||
|
|
||||||
|
override fun getCommandMap(): SimpleCommandMap {
|
||||||
|
return (Bukkit.getServer() as CraftServer).commandMap
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun syncCommands() {
|
||||||
|
(Bukkit.getServer() as CraftServer).syncCommands()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun unregisterCommand(command: PluginCommandBase) {
|
||||||
|
knownCommands.remove(command.name)
|
||||||
|
knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.EcoPlugin
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.PacketInjectorListener
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.toResourceLocation
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries
|
||||||
|
import net.minecraft.nbt.CompoundTag
|
||||||
|
import net.minecraft.nbt.Tag
|
||||||
|
import net.minecraft.resources.ResourceLocation
|
||||||
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
|
import net.minecraft.world.item.Item
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.Material
|
||||||
|
import org.bukkit.NamespacedKey
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftServer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftMob
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataContainer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataTypeRegistry
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey
|
||||||
|
import org.bukkit.entity.LivingEntity
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.persistence.PersistentDataContainer
|
||||||
|
import java.lang.reflect.Field
|
||||||
|
|
||||||
|
class CommonsInitializer : CommonsInitializerProxy {
|
||||||
|
override fun init(plugin: EcoPlugin) {
|
||||||
|
CommonsProvider.setIfNeeded(CommonsProviderImpl)
|
||||||
|
plugin.onEnable {
|
||||||
|
plugin.eventManager.registerListener(PacketInjectorListener)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
object CommonsProviderImpl : CommonsProvider {
|
||||||
|
private val cisHandle: Field = CraftItemStack::class.java.getDeclaredField("handle").apply {
|
||||||
|
isAccessible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private val pdcRegsitry = Class.forName("org.bukkit.craftbukkit.v1_20_R1.inventory.CraftMetaItem")
|
||||||
|
.getDeclaredField("DATA_TYPE_REGISTRY")
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as CraftPersistentDataTypeRegistry
|
||||||
|
|
||||||
|
override val nbtTagString = CraftMagicNumbers.NBT.TAG_STRING
|
||||||
|
|
||||||
|
override fun toPathfinderMob(mob: Mob): PathfinderMob? {
|
||||||
|
val craft = mob as? CraftMob ?: return null
|
||||||
|
return craft.handle as? PathfinderMob
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toResourceLocation(namespacedKey: NamespacedKey): ResourceLocation =
|
||||||
|
CraftNamespacedKey.toMinecraft(namespacedKey)
|
||||||
|
|
||||||
|
override fun asNMSStack(itemStack: ItemStack): net.minecraft.world.item.ItemStack {
|
||||||
|
return if (itemStack !is CraftItemStack) {
|
||||||
|
CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
} else {
|
||||||
|
cisHandle[itemStack] as net.minecraft.world.item.ItemStack? ?: CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
|
||||||
|
return CraftItemStack.asCraftMirror(itemStack)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
|
||||||
|
if (itemStack !is CraftItemStack) {
|
||||||
|
itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toBukkitEntity(entity: net.minecraft.world.entity.LivingEntity): LivingEntity? =
|
||||||
|
CraftEntity.getEntity(Bukkit.getServer() as CraftServer, entity) as? LivingEntity
|
||||||
|
|
||||||
|
override fun makePdc(tag: CompoundTag, base: Boolean): PersistentDataContainer {
|
||||||
|
fun emptyPdc(): CraftPersistentDataContainer = CraftPersistentDataContainer(pdcRegsitry)
|
||||||
|
|
||||||
|
fun CompoundTag?.toPdc(): PersistentDataContainer {
|
||||||
|
val pdc = emptyPdc()
|
||||||
|
this ?: return pdc
|
||||||
|
val keys = this.allKeys
|
||||||
|
for (key in keys) {
|
||||||
|
pdc.put(key, this[key])
|
||||||
|
}
|
||||||
|
|
||||||
|
return pdc
|
||||||
|
}
|
||||||
|
|
||||||
|
return if (base) {
|
||||||
|
tag.toPdc()
|
||||||
|
} else {
|
||||||
|
if (tag.contains("PublicBukkitValues")) {
|
||||||
|
tag.getCompound("PublicBukkitValues").toPdc()
|
||||||
|
} else {
|
||||||
|
emptyPdc()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setPdc(
|
||||||
|
tag: CompoundTag,
|
||||||
|
pdc: PersistentDataContainer?,
|
||||||
|
item: net.minecraft.world.item.ItemStack?
|
||||||
|
) {
|
||||||
|
fun CraftPersistentDataContainer.toTag(): CompoundTag {
|
||||||
|
val compound = CompoundTag()
|
||||||
|
val rawPublicMap: Map<String, Tag> = this.raw
|
||||||
|
for ((key, value) in rawPublicMap) {
|
||||||
|
compound.put(key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
return compound
|
||||||
|
}
|
||||||
|
|
||||||
|
val container = when (pdc) {
|
||||||
|
is CraftPersistentDataContainer? -> pdc
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item != null) {
|
||||||
|
if (container != null && !container.isEmpty) {
|
||||||
|
for (key in tag.allKeys.toSet()) {
|
||||||
|
tag.remove(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
tag.merge(container.toTag())
|
||||||
|
} else {
|
||||||
|
item.tag = null
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (container != null && !container.isEmpty) {
|
||||||
|
tag.put("PublicBukkitValues", container.toTag())
|
||||||
|
} else {
|
||||||
|
tag.remove("PublicBukkitValues")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun materialToItem(material: Material): Item =
|
||||||
|
BuiltInRegistries.ITEM.getOptional(material.key.toResourceLocation())
|
||||||
|
.orElseThrow { IllegalArgumentException("Material is not item!") }
|
||||||
|
|
||||||
|
override fun itemToMaterial(item: Item) =
|
||||||
|
Material.getMaterial(BuiltInRegistries.ITEM.getKey(item).path.uppercase())
|
||||||
|
?: throw IllegalArgumentException("Invalid material!")
|
||||||
|
|
||||||
|
override fun toNMS(player: Player): ServerPlayer {
|
||||||
|
return (player as CraftPlayer).handle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.packet.Packet
|
||||||
|
import com.willfp.eco.core.packet.sendPacket
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.DisplayNameProxy
|
||||||
|
import io.papermc.paper.adventure.PaperAdventure
|
||||||
|
import net.kyori.adventure.text.Component
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket
|
||||||
|
import net.minecraft.network.syncher.EntityDataAccessor
|
||||||
|
import net.minecraft.network.syncher.SynchedEntityData
|
||||||
|
import net.minecraft.world.entity.Entity
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftLivingEntity
|
||||||
|
import org.bukkit.entity.LivingEntity
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
import java.util.Optional
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
class DisplayName : DisplayNameProxy {
|
||||||
|
private val displayNameAccessor = Entity::class.java
|
||||||
|
.declaredFields
|
||||||
|
.filter { it.type == EntityDataAccessor::class.java }
|
||||||
|
.toList()[2]
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as EntityDataAccessor<Optional<net.minecraft.network.chat.Component>>
|
||||||
|
|
||||||
|
private val customNameVisibleAccessor = Entity::class.java
|
||||||
|
.declaredFields
|
||||||
|
.filter { it.type == EntityDataAccessor::class.java }
|
||||||
|
.toList()[3]
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as EntityDataAccessor<Boolean>
|
||||||
|
|
||||||
|
override fun setClientsideDisplayName(
|
||||||
|
entity: LivingEntity,
|
||||||
|
player: Player,
|
||||||
|
displayName: Component,
|
||||||
|
visible: Boolean
|
||||||
|
) {
|
||||||
|
if (entity !is CraftLivingEntity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val nmsComponent = PaperAdventure.asVanilla(displayName)
|
||||||
|
?: throw IllegalStateException("Display name component is null!")
|
||||||
|
|
||||||
|
val nmsEntity = entity.handle
|
||||||
|
nmsEntity.isCustomNameVisible
|
||||||
|
val entityData = SynchedEntityData(nmsEntity)
|
||||||
|
|
||||||
|
entityData.forceSet(displayNameAccessor, Optional.of(nmsComponent))
|
||||||
|
entityData.forceSet(customNameVisibleAccessor, visible)
|
||||||
|
|
||||||
|
val packet = ClientboundSetEntityDataPacket(
|
||||||
|
nmsEntity.id,
|
||||||
|
entityData.packDirty() ?: throw IllegalStateException("No packed entity data")
|
||||||
|
)
|
||||||
|
|
||||||
|
player.sendPacket(Packet(packet))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun <T : Any> SynchedEntityData.forceSet(
|
||||||
|
accessor: EntityDataAccessor<T>,
|
||||||
|
value: T
|
||||||
|
) {
|
||||||
|
if (!this.hasItem(accessor)) {
|
||||||
|
this.define(accessor, value)
|
||||||
|
}
|
||||||
|
this[accessor] = value
|
||||||
|
this.markDirty(accessor)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.internal.entities.EcoDummyEntity
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
|
||||||
|
import org.bukkit.Location
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld
|
||||||
|
import org.bukkit.entity.Entity
|
||||||
|
import org.bukkit.entity.EntityType
|
||||||
|
|
||||||
|
class DummyEntityFactory : DummyEntityFactoryProxy {
|
||||||
|
override fun createDummyEntity(location: Location): Entity {
|
||||||
|
val world = location.world as CraftWorld
|
||||||
|
@Suppress("UsePropertyAccessSyntax")
|
||||||
|
return EcoDummyEntity(world.createEntity(location, EntityType.ZOMBIE.entityClass).getBukkitEntity())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.entities.ai.EntityController
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.v1_20_R1.entity.EcoEntityController
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
|
||||||
|
class EntityControllerFactory : EntityControllerFactoryProxy {
|
||||||
|
override fun <T : Mob> createEntityController(entity: T): EntityController<T> {
|
||||||
|
return EcoEntityController(entity)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.data.ExtendedPersistentDataContainer
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
|
||||||
|
import net.minecraft.nbt.Tag
|
||||||
|
import org.bukkit.Material
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataContainer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.persistence.CraftPersistentDataTypeRegistry
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.persistence.PersistentDataContainer
|
||||||
|
import org.bukkit.persistence.PersistentDataType
|
||||||
|
|
||||||
|
class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy {
|
||||||
|
private val registry: CraftPersistentDataTypeRegistry
|
||||||
|
|
||||||
|
init {
|
||||||
|
/*
|
||||||
|
Can't grab actual instance since it's in CraftMetaItem (which is package-private)
|
||||||
|
And getting it would mean more janky reflection
|
||||||
|
*/
|
||||||
|
val item = CraftItemStack.asCraftCopy(ItemStack(Material.STONE))
|
||||||
|
val pdc = item.itemMeta!!.persistentDataContainer
|
||||||
|
this.registry = CraftPersistentDataContainer::class.java.getDeclaredField("registry")
|
||||||
|
.apply { isAccessible = true }.get(pdc) as CraftPersistentDataTypeRegistry
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
|
||||||
|
return when (pdc) {
|
||||||
|
is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
|
||||||
|
else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun newPdc(): PersistentDataContainer {
|
||||||
|
return CraftPersistentDataContainer(registry)
|
||||||
|
}
|
||||||
|
|
||||||
|
inner class EcoPersistentDataContainer(
|
||||||
|
private val handle: CraftPersistentDataContainer
|
||||||
|
) : ExtendedPersistentDataContainer {
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
private val customDataTags: MutableMap<String, Tag> =
|
||||||
|
CraftPersistentDataContainer::class.java.getDeclaredField("customDataTags")
|
||||||
|
.apply { isAccessible = true }.get(handle) as MutableMap<String, Tag>
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
|
||||||
|
customDataTags[key] =
|
||||||
|
registry.wrap(dataType.primitiveType, dataType.toPrimitive(value, handle.adapterContext))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean {
|
||||||
|
val value = customDataTags[key] ?: return false
|
||||||
|
return registry.isInstanceOf(dataType.primitiveType, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? {
|
||||||
|
val value = customDataTags[key] ?: return null
|
||||||
|
return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> getOrDefault(
|
||||||
|
key: String,
|
||||||
|
dataType: PersistentDataType<T, Z>,
|
||||||
|
defaultValue: Z
|
||||||
|
): Z {
|
||||||
|
return get(key, dataType) ?: defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun remove(key: String) {
|
||||||
|
customDataTags.remove(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getAllKeys(): MutableSet<String> {
|
||||||
|
return customDataTags.keys
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getBase(): PersistentDataContainer {
|
||||||
|
return handle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.fast.FastItemStack
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.item.EcoFastItemStack
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
|
class FastItemStackFactory : FastItemStackFactoryProxy {
|
||||||
|
override fun create(itemStack: ItemStack): FastItemStack {
|
||||||
|
return EcoFastItemStack(itemStack)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.display.Display
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
|
||||||
|
import com.willfp.eco.util.toLegacy
|
||||||
|
import net.kyori.adventure.text.minimessage.MiniMessage
|
||||||
|
|
||||||
|
class MiniMessageTranslator : MiniMessageTranslatorProxy {
|
||||||
|
override fun format(message: String): String {
|
||||||
|
var mut = message
|
||||||
|
|
||||||
|
val startsWithPrefix = mut.startsWith(Display.PREFIX)
|
||||||
|
if (startsWithPrefix) {
|
||||||
|
mut = mut.substring(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
mut = mut.replace('§', '&')
|
||||||
|
|
||||||
|
val miniMessage = runCatching {
|
||||||
|
MiniMessage.miniMessage().deserialize(
|
||||||
|
mut
|
||||||
|
).toLegacy()
|
||||||
|
}.getOrNull() ?: mut
|
||||||
|
|
||||||
|
mut = if (startsWithPrefix) {
|
||||||
|
Display.PREFIX + miniMessage
|
||||||
|
} else {
|
||||||
|
miniMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
return mut
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.EcoPlugin
|
||||||
|
import com.willfp.eco.core.packet.PacketListener
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.PacketHandlerProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketAutoRecipe
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketHeldItemSlot
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketOpenWindowMerchant
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketSetCreativeSlot
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketSetSlot
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.PacketWindowItems
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.display.frame.clearFrames
|
||||||
|
import net.minecraft.network.protocol.Packet
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
|
||||||
|
class PacketHandler : PacketHandlerProxy {
|
||||||
|
override fun sendPacket(player: Player, packet: com.willfp.eco.core.packet.Packet) {
|
||||||
|
if (player !is CraftPlayer) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val handle = packet.handle
|
||||||
|
|
||||||
|
if (handle !is Packet<*>) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
player.handle.connection.send(handle)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun clearDisplayFrames() {
|
||||||
|
clearFrames()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getPacketListeners(plugin: EcoPlugin): List<PacketListener> {
|
||||||
|
return listOf(
|
||||||
|
PacketAutoRecipe(plugin),
|
||||||
|
PacketHeldItemSlot,
|
||||||
|
PacketOpenWindowMerchant,
|
||||||
|
PacketSetCreativeSlot,
|
||||||
|
PacketSetSlot,
|
||||||
|
PacketWindowItems(plugin)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.core.items.TestableItem
|
||||||
|
import com.willfp.eco.core.recipe.parts.EmptyTestableItem
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.SNBTConverterProxy
|
||||||
|
import net.minecraft.nbt.CompoundTag
|
||||||
|
import net.minecraft.nbt.SnbtPrinterTagVisitor
|
||||||
|
import net.minecraft.nbt.TagParser
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
|
class SNBTConverter : SNBTConverterProxy {
|
||||||
|
override fun fromSNBT(snbt: String): ItemStack? {
|
||||||
|
val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return null
|
||||||
|
val nms = net.minecraft.world.item.ItemStack.of(nbt)
|
||||||
|
return CraftItemStack.asBukkitCopy(nms)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toSNBT(itemStack: ItemStack): String {
|
||||||
|
val nms = CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
return SnbtPrinterTagVisitor().visit(nms.save(CompoundTag()))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun makeSNBTTestable(snbt: String): TestableItem {
|
||||||
|
val nbt = runCatching { TagParser.parseTag(snbt) }.getOrNull() ?: return EmptyTestableItem()
|
||||||
|
val nms = net.minecraft.world.item.ItemStack.of(nbt)
|
||||||
|
if (nms == net.minecraft.world.item.ItemStack.EMPTY) {
|
||||||
|
return EmptyTestableItem()
|
||||||
|
}
|
||||||
|
|
||||||
|
nbt.remove("Count")
|
||||||
|
return SNBTTestableItem(CraftItemStack.asBukkitCopy(nms), nbt)
|
||||||
|
}
|
||||||
|
|
||||||
|
class SNBTTestableItem(
|
||||||
|
private val item: ItemStack,
|
||||||
|
private val tag: CompoundTag
|
||||||
|
) : TestableItem {
|
||||||
|
override fun matches(itemStack: ItemStack?): Boolean {
|
||||||
|
if (itemStack == null) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
val nms = CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
val nmsTag = nms.save(CompoundTag())
|
||||||
|
nmsTag.remove("Count")
|
||||||
|
return tag.copy().merge(nmsTag) == nmsTag && itemStack.type == item.type
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getItem(): ItemStack = item
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.SkullProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.texture
|
||||||
|
import org.bukkit.inventory.meta.SkullMeta
|
||||||
|
|
||||||
|
class Skull : SkullProxy {
|
||||||
|
override fun setSkullTexture(
|
||||||
|
meta: SkullMeta,
|
||||||
|
base64: String
|
||||||
|
) {
|
||||||
|
meta.texture = base64
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getSkullTexture(
|
||||||
|
meta: SkullMeta
|
||||||
|
): String? = meta.texture
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1
|
||||||
|
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.TPSProxy
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftServer
|
||||||
|
|
||||||
|
class TPS : TPSProxy {
|
||||||
|
override fun getTPS(): Double {
|
||||||
|
return (Bukkit.getServer() as CraftServer).handle.server.recentTps[0]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R1.entity
|
||||||
|
|
||||||
|
import com.willfp.eco.core.entities.ai.CustomGoal
|
||||||
|
import com.willfp.eco.core.entities.ai.EntityController
|
||||||
|
import com.willfp.eco.core.entities.ai.EntityGoal
|
||||||
|
import com.willfp.eco.core.entities.ai.TargetGoal
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.ai.CustomGoalFactory
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.ai.getGoalFactory
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.toPathfinderMob
|
||||||
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
|
import net.minecraft.world.entity.ai.goal.Goal
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
|
||||||
|
class EcoEntityController<T : Mob>(
|
||||||
|
private val handle: T
|
||||||
|
) : EntityController<T> {
|
||||||
|
override fun addEntityGoal(priority: Int, goal: EntityGoal<in T>): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
|
||||||
|
nms.goalSelector.addGoal(
|
||||||
|
priority,
|
||||||
|
goal.getGoalFactory()?.create(goal, nms) ?: return this
|
||||||
|
)
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun removeEntityGoal(goal: EntityGoal<in T>): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
|
||||||
|
val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
|
||||||
|
{ CustomGoalFactory.isGoalOfType(it, goal) }
|
||||||
|
} else {
|
||||||
|
{ goal.getGoalFactory()?.isGoalOfType(it) == true }
|
||||||
|
}
|
||||||
|
|
||||||
|
for (wrapped in nms.goalSelector.availableGoals.toSet()) {
|
||||||
|
if (predicate(wrapped.goal)) {
|
||||||
|
nms.goalSelector.removeGoal(wrapped.goal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun clearEntityGoals(): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
nms.goalSelector.availableGoals.clear()
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun addTargetGoal(priority: Int, goal: TargetGoal<in T>): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
|
||||||
|
nms.targetSelector.addGoal(
|
||||||
|
priority, goal.getGoalFactory()?.create(goal, nms) ?: return this
|
||||||
|
)
|
||||||
|
|
||||||
|
nms.targetSelector
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun removeTargetGoal(goal: TargetGoal<in T>): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
|
||||||
|
val predicate: (Goal) -> Boolean = if (goal is CustomGoal<*>) {
|
||||||
|
{ CustomGoalFactory.isGoalOfType(it, goal) }
|
||||||
|
} else {
|
||||||
|
{ goal.getGoalFactory()?.isGoalOfType(it) == true }
|
||||||
|
}
|
||||||
|
|
||||||
|
for (wrapped in nms.targetSelector.availableGoals.toSet()) {
|
||||||
|
if (predicate(wrapped.goal)) {
|
||||||
|
nms.targetSelector.removeGoal(wrapped.goal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun clearTargetGoals(): EntityController<T> {
|
||||||
|
val nms = getNms() ?: return this
|
||||||
|
nms.targetSelector.availableGoals.clear()
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getNms(): PathfinderMob? {
|
||||||
|
return handle.toPathfinderMob()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getEntity(): T {
|
||||||
|
return handle
|
||||||
|
}
|
||||||
|
}
|
||||||
39
eco-core/core-nms/v1_20_R2/build.gradle.kts
Normal file
39
eco-core/core-nms/v1_20_R2/build.gradle.kts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
plugins {
|
||||||
|
id("io.papermc.paperweight.userdev")
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "com.willfp"
|
||||||
|
version = rootProject.version
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation(project(":eco-core:core-nms:nms-common"))
|
||||||
|
paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
|
||||||
|
|
||||||
|
implementation("net.kyori:adventure-text-minimessage:4.11.0") {
|
||||||
|
version {
|
||||||
|
strictly("4.11.0")
|
||||||
|
}
|
||||||
|
exclude(group = "net.kyori", module = "adventure-api")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
build {
|
||||||
|
dependsOn(reobfJar)
|
||||||
|
}
|
||||||
|
|
||||||
|
reobfJar {
|
||||||
|
mustRunAfter(shadowJar)
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
relocate(
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.common",
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.v1_20_R2.common"
|
||||||
|
)
|
||||||
|
relocate(
|
||||||
|
"net.kyori.adventure.text.minimessage",
|
||||||
|
"com.willfp.eco.internal.spigot.proxy.v1_20_R2.minimessage"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.command.PluginCommandBase
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.BukkitCommandsProxy
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.command.Command
|
||||||
|
import org.bukkit.command.SimpleCommandMap
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.CraftServer
|
||||||
|
import java.lang.reflect.Field
|
||||||
|
|
||||||
|
class BukkitCommands : BukkitCommandsProxy {
|
||||||
|
private val knownCommandsField: Field by lazy {
|
||||||
|
SimpleCommandMap::class.java.getDeclaredField("knownCommands")
|
||||||
|
.apply {
|
||||||
|
isAccessible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
private val knownCommands: MutableMap<String, Command>
|
||||||
|
get() = knownCommandsField.get(getCommandMap()) as MutableMap<String, Command>
|
||||||
|
|
||||||
|
override fun getCommandMap(): SimpleCommandMap {
|
||||||
|
return (Bukkit.getServer() as CraftServer).commandMap
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun syncCommands() {
|
||||||
|
(Bukkit.getServer() as CraftServer).syncCommands()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun unregisterCommand(command: PluginCommandBase) {
|
||||||
|
knownCommands.remove(command.name)
|
||||||
|
knownCommands.remove("${command.plugin.name.lowercase()}:${command.name}")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.EcoPlugin
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.packet.PacketInjectorListener
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.toResourceLocation
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries
|
||||||
|
import net.minecraft.nbt.CompoundTag
|
||||||
|
import net.minecraft.nbt.Tag
|
||||||
|
import net.minecraft.resources.ResourceLocation
|
||||||
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.world.entity.PathfinderMob
|
||||||
|
import net.minecraft.world.item.Item
|
||||||
|
import org.bukkit.Bukkit
|
||||||
|
import org.bukkit.Material
|
||||||
|
import org.bukkit.NamespacedKey
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.CraftServer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftMob
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataContainer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataTypeRegistry
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.util.CraftMagicNumbers
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.util.CraftNamespacedKey
|
||||||
|
import org.bukkit.entity.LivingEntity
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.persistence.PersistentDataContainer
|
||||||
|
import java.lang.reflect.Field
|
||||||
|
|
||||||
|
class CommonsInitializer : CommonsInitializerProxy {
|
||||||
|
override fun init(plugin: EcoPlugin) {
|
||||||
|
CommonsProvider.setIfNeeded(CommonsProviderImpl)
|
||||||
|
plugin.onEnable {
|
||||||
|
plugin.eventManager.registerListener(PacketInjectorListener)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
object CommonsProviderImpl : CommonsProvider {
|
||||||
|
private val cisHandle: Field = CraftItemStack::class.java.getDeclaredField("handle").apply {
|
||||||
|
isAccessible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private val pdcRegsitry = Class.forName("org.bukkit.craftbukkit.v1_20_R2.inventory.CraftMetaItem")
|
||||||
|
.getDeclaredField("DATA_TYPE_REGISTRY")
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as CraftPersistentDataTypeRegistry
|
||||||
|
|
||||||
|
override val nbtTagString = CraftMagicNumbers.NBT.TAG_STRING
|
||||||
|
|
||||||
|
override fun toPathfinderMob(mob: Mob): PathfinderMob? {
|
||||||
|
val craft = mob as? CraftMob ?: return null
|
||||||
|
return craft.handle as? PathfinderMob
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toResourceLocation(namespacedKey: NamespacedKey): ResourceLocation =
|
||||||
|
CraftNamespacedKey.toMinecraft(namespacedKey)
|
||||||
|
|
||||||
|
override fun asNMSStack(itemStack: ItemStack): net.minecraft.world.item.ItemStack {
|
||||||
|
return if (itemStack !is CraftItemStack) {
|
||||||
|
CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
} else {
|
||||||
|
cisHandle[itemStack] as net.minecraft.world.item.ItemStack? ?: CraftItemStack.asNMSCopy(itemStack)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun asBukkitStack(itemStack: net.minecraft.world.item.ItemStack): ItemStack {
|
||||||
|
return CraftItemStack.asCraftMirror(itemStack)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun mergeIfNeeded(itemStack: ItemStack, nmsStack: net.minecraft.world.item.ItemStack) {
|
||||||
|
if (itemStack !is CraftItemStack) {
|
||||||
|
itemStack.itemMeta = CraftItemStack.asCraftMirror(nmsStack).itemMeta
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toBukkitEntity(entity: net.minecraft.world.entity.LivingEntity): LivingEntity? =
|
||||||
|
CraftEntity.getEntity(Bukkit.getServer() as CraftServer, entity) as? LivingEntity
|
||||||
|
|
||||||
|
override fun makePdc(tag: CompoundTag, base: Boolean): PersistentDataContainer {
|
||||||
|
fun emptyPdc(): CraftPersistentDataContainer = CraftPersistentDataContainer(pdcRegsitry)
|
||||||
|
|
||||||
|
fun CompoundTag?.toPdc(): PersistentDataContainer {
|
||||||
|
val pdc = emptyPdc()
|
||||||
|
this ?: return pdc
|
||||||
|
val keys = this.allKeys
|
||||||
|
for (key in keys) {
|
||||||
|
pdc.put(key, this[key])
|
||||||
|
}
|
||||||
|
|
||||||
|
return pdc
|
||||||
|
}
|
||||||
|
|
||||||
|
return if (base) {
|
||||||
|
tag.toPdc()
|
||||||
|
} else {
|
||||||
|
if (tag.contains("PublicBukkitValues")) {
|
||||||
|
tag.getCompound("PublicBukkitValues").toPdc()
|
||||||
|
} else {
|
||||||
|
emptyPdc()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setPdc(
|
||||||
|
tag: CompoundTag,
|
||||||
|
pdc: PersistentDataContainer?,
|
||||||
|
item: net.minecraft.world.item.ItemStack?
|
||||||
|
) {
|
||||||
|
fun CraftPersistentDataContainer.toTag(): CompoundTag {
|
||||||
|
val compound = CompoundTag()
|
||||||
|
val rawPublicMap: Map<String, Tag> = this.raw
|
||||||
|
for ((key, value) in rawPublicMap) {
|
||||||
|
compound.put(key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
return compound
|
||||||
|
}
|
||||||
|
|
||||||
|
val container = when (pdc) {
|
||||||
|
is CraftPersistentDataContainer? -> pdc
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item != null) {
|
||||||
|
if (container != null && !container.isEmpty) {
|
||||||
|
for (key in tag.allKeys.toSet()) {
|
||||||
|
tag.remove(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
tag.merge(container.toTag())
|
||||||
|
} else {
|
||||||
|
item.tag = null
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (container != null && !container.isEmpty) {
|
||||||
|
tag.put("PublicBukkitValues", container.toTag())
|
||||||
|
} else {
|
||||||
|
tag.remove("PublicBukkitValues")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun materialToItem(material: Material): Item =
|
||||||
|
BuiltInRegistries.ITEM.getOptional(material.key.toResourceLocation())
|
||||||
|
.orElseThrow { IllegalArgumentException("Material is not item!") }
|
||||||
|
|
||||||
|
override fun itemToMaterial(item: Item) =
|
||||||
|
Material.getMaterial(BuiltInRegistries.ITEM.getKey(item).path.uppercase())
|
||||||
|
?: throw IllegalArgumentException("Invalid material!")
|
||||||
|
|
||||||
|
override fun toNMS(player: Player): ServerPlayer {
|
||||||
|
return (player as CraftPlayer).handle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.packet.Packet
|
||||||
|
import com.willfp.eco.core.packet.sendPacket
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.DisplayNameProxy
|
||||||
|
import io.papermc.paper.adventure.PaperAdventure
|
||||||
|
import net.kyori.adventure.text.Component
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket
|
||||||
|
import net.minecraft.network.syncher.EntityDataAccessor
|
||||||
|
import net.minecraft.network.syncher.SynchedEntityData
|
||||||
|
import net.minecraft.world.entity.Entity
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftLivingEntity
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.entity.CraftMob
|
||||||
|
import org.bukkit.entity.LivingEntity
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
import org.bukkit.entity.Player
|
||||||
|
import java.util.Optional
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
class DisplayName : DisplayNameProxy {
|
||||||
|
private val displayNameAccessor = Entity::class.java
|
||||||
|
.declaredFields
|
||||||
|
.filter { it.type == EntityDataAccessor::class.java }
|
||||||
|
.toList()[2]
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as EntityDataAccessor<Optional<net.minecraft.network.chat.Component>>
|
||||||
|
|
||||||
|
private val customNameVisibleAccessor = Entity::class.java
|
||||||
|
.declaredFields
|
||||||
|
.filter { it.type == EntityDataAccessor::class.java }
|
||||||
|
.toList()[3]
|
||||||
|
.apply { isAccessible = true }
|
||||||
|
.get(null) as EntityDataAccessor<Boolean>
|
||||||
|
|
||||||
|
override fun setClientsideDisplayName(entity: LivingEntity, player: Player, displayName: Component, visible: Boolean) {
|
||||||
|
if (entity !is CraftLivingEntity) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val nmsComponent = PaperAdventure.asVanilla(displayName)
|
||||||
|
?: throw IllegalStateException("Display name component is null!")
|
||||||
|
|
||||||
|
val nmsEntity = entity.handle
|
||||||
|
nmsEntity.isCustomNameVisible
|
||||||
|
val entityData = SynchedEntityData(nmsEntity)
|
||||||
|
|
||||||
|
entityData.forceSet(displayNameAccessor, Optional.of(nmsComponent))
|
||||||
|
entityData.forceSet(customNameVisibleAccessor, visible)
|
||||||
|
|
||||||
|
val packet = ClientboundSetEntityDataPacket(
|
||||||
|
nmsEntity.id,
|
||||||
|
entityData.packDirty() ?: throw IllegalStateException("No packed entity data")
|
||||||
|
)
|
||||||
|
|
||||||
|
player.sendPacket(Packet(packet))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun <T: Any> SynchedEntityData.forceSet(
|
||||||
|
accessor: EntityDataAccessor<T>,
|
||||||
|
value: T
|
||||||
|
) {
|
||||||
|
if (!this.hasItem(accessor)) {
|
||||||
|
this.define(accessor, value)
|
||||||
|
}
|
||||||
|
this[accessor] = value
|
||||||
|
this.markDirty(accessor)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.internal.entities.EcoDummyEntity
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.DummyEntityFactoryProxy
|
||||||
|
import org.bukkit.Location
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.CraftWorld
|
||||||
|
import org.bukkit.entity.Entity
|
||||||
|
import org.bukkit.entity.EntityType
|
||||||
|
|
||||||
|
class DummyEntityFactory : DummyEntityFactoryProxy {
|
||||||
|
override fun createDummyEntity(location: Location): Entity {
|
||||||
|
val world = location.world as CraftWorld
|
||||||
|
@Suppress("UsePropertyAccessSyntax")
|
||||||
|
return EcoDummyEntity(world.createEntity(location, EntityType.ZOMBIE.entityClass).getBukkitEntity())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.entities.ai.EntityController
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.EntityControllerFactoryProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.v1_20_R2.entity.EcoEntityController
|
||||||
|
import org.bukkit.entity.Mob
|
||||||
|
|
||||||
|
class EntityControllerFactory : EntityControllerFactoryProxy {
|
||||||
|
override fun <T : Mob> createEntityController(entity: T): EntityController<T> {
|
||||||
|
return EcoEntityController(entity)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.data.ExtendedPersistentDataContainer
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.ExtendedPersistentDataContainerFactoryProxy
|
||||||
|
import net.minecraft.nbt.Tag
|
||||||
|
import org.bukkit.Material
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataContainer
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R2.persistence.CraftPersistentDataTypeRegistry
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
import org.bukkit.persistence.PersistentDataContainer
|
||||||
|
import org.bukkit.persistence.PersistentDataType
|
||||||
|
|
||||||
|
class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy {
|
||||||
|
private val registry: CraftPersistentDataTypeRegistry
|
||||||
|
|
||||||
|
init {
|
||||||
|
/*
|
||||||
|
Can't grab actual instance since it's in CraftMetaItem (which is package-private)
|
||||||
|
And getting it would mean more janky reflection
|
||||||
|
*/
|
||||||
|
val item = CraftItemStack.asCraftCopy(ItemStack(Material.STONE))
|
||||||
|
val pdc = item.itemMeta!!.persistentDataContainer
|
||||||
|
this.registry = CraftPersistentDataContainer::class.java.getDeclaredField("registry")
|
||||||
|
.apply { isAccessible = true }.get(pdc) as CraftPersistentDataTypeRegistry
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun adapt(pdc: PersistentDataContainer): ExtendedPersistentDataContainer {
|
||||||
|
return when (pdc) {
|
||||||
|
is CraftPersistentDataContainer -> EcoPersistentDataContainer(pdc)
|
||||||
|
else -> throw IllegalArgumentException("Custom PDC instance ims not supported!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun newPdc(): PersistentDataContainer {
|
||||||
|
return CraftPersistentDataContainer(registry)
|
||||||
|
}
|
||||||
|
|
||||||
|
inner class EcoPersistentDataContainer(
|
||||||
|
private val handle: CraftPersistentDataContainer
|
||||||
|
) : ExtendedPersistentDataContainer {
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
private val customDataTags: MutableMap<String, Tag> =
|
||||||
|
CraftPersistentDataContainer::class.java.getDeclaredField("customDataTags")
|
||||||
|
.apply { isAccessible = true }.get(handle) as MutableMap<String, Tag>
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> set(key: String, dataType: PersistentDataType<T, Z>, value: Z) {
|
||||||
|
customDataTags[key] =
|
||||||
|
registry.wrap(dataType.primitiveType, dataType.toPrimitive(value, handle.adapterContext))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> has(key: String, dataType: PersistentDataType<T, Z>): Boolean {
|
||||||
|
val value = customDataTags[key] ?: return false
|
||||||
|
return registry.isInstanceOf(dataType.primitiveType, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> get(key: String, dataType: PersistentDataType<T, Z>): Z? {
|
||||||
|
val value = customDataTags[key] ?: return null
|
||||||
|
return dataType.fromPrimitive(registry.extract(dataType.primitiveType, value), handle.adapterContext)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun <T : Any, Z : Any> getOrDefault(
|
||||||
|
key: String,
|
||||||
|
dataType: PersistentDataType<T, Z>,
|
||||||
|
defaultValue: Z
|
||||||
|
): Z {
|
||||||
|
return get(key, dataType) ?: defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun remove(key: String) {
|
||||||
|
customDataTags.remove(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getAllKeys(): MutableSet<String> {
|
||||||
|
return customDataTags.keys
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getBase(): PersistentDataContainer {
|
||||||
|
return handle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.fast.FastItemStack
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.FastItemStackFactoryProxy
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.common.item.EcoFastItemStack
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
|
class FastItemStackFactory : FastItemStackFactoryProxy {
|
||||||
|
override fun create(itemStack: ItemStack): FastItemStack {
|
||||||
|
return EcoFastItemStack(itemStack)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package com.willfp.eco.internal.spigot.proxy.v1_20_R2
|
||||||
|
|
||||||
|
import com.willfp.eco.core.display.Display
|
||||||
|
import com.willfp.eco.internal.spigot.proxy.MiniMessageTranslatorProxy
|
||||||
|
import com.willfp.eco.util.toLegacy
|
||||||
|
import net.kyori.adventure.text.minimessage.MiniMessage
|
||||||
|
|
||||||
|
class MiniMessageTranslator : MiniMessageTranslatorProxy {
|
||||||
|
override fun format(message: String): String {
|
||||||
|
var mut = message
|
||||||
|
|
||||||
|
val startsWithPrefix = mut.startsWith(Display.PREFIX)
|
||||||
|
if (startsWithPrefix) {
|
||||||
|
mut = mut.substring(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
mut = mut.replace('§', '&')
|
||||||
|
|
||||||
|
val miniMessage = runCatching {
|
||||||
|
MiniMessage.miniMessage().deserialize(
|
||||||
|
mut
|
||||||
|
).toLegacy()
|
||||||
|
}.getOrNull() ?: mut
|
||||||
|
|
||||||
|
mut = if (startsWithPrefix) {
|
||||||
|
Display.PREFIX + miniMessage
|
||||||
|
} else {
|
||||||
|
miniMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
return mut
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user