Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55fc6d762f | ||
|
|
b9c5eb2b4e | ||
|
|
393d0031c7 |
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
@@ -1 +0,0 @@
|
|||||||
* @WillFP
|
|
||||||
6
.github/workflows/java-ci.yml
vendored
6
.github/workflows/java-ci.yml
vendored
@@ -1,6 +1,6 @@
|
|||||||
name: Java CI
|
name: Java CI
|
||||||
|
|
||||||
on: [ push, pull_request, workflow_dispatch ]
|
on: [ push, pull_request ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -14,11 +14,11 @@ jobs:
|
|||||||
id: vars
|
id: vars
|
||||||
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v2
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: 21
|
java-version: 17
|
||||||
|
|
||||||
- name: Setup build cache
|
- name: Setup build cache
|
||||||
uses: actions/cache@v2.1.6
|
uses: actions/cache@v2.1.6
|
||||||
|
|||||||
21
.github/workflows/master-pr.yml
vendored
21
.github/workflows/master-pr.yml
vendored
@@ -1,21 +0,0 @@
|
|||||||
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. ⚠️'
|
|
||||||
})
|
|
||||||
4
.github/workflows/publish-release.yml
vendored
4
.github/workflows/publish-release.yml
vendored
@@ -12,11 +12,11 @@ jobs:
|
|||||||
- name: Checkout latest code
|
- name: Checkout latest code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v2
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: 21
|
java-version: 17
|
||||||
|
|
||||||
- name: Setup build cache
|
- name: Setup build cache
|
||||||
uses: actions/cache@v2.1.6
|
uses: actions/cache@v2.1.6
|
||||||
|
|||||||
4
.github/workflows/test-publish.yml
vendored
4
.github/workflows/test-publish.yml
vendored
@@ -14,11 +14,11 @@ jobs:
|
|||||||
id: vars
|
id: vars
|
||||||
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
- name: Set up JDK 21
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v2
|
uses: actions/setup-java@v2
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: 21
|
java-version: 17
|
||||||
|
|
||||||
- name: Setup build cache
|
- name: Setup build cache
|
||||||
uses: actions/cache@v2.1.6
|
uses: actions/cache@v2.1.6
|
||||||
|
|||||||
691
LICENSE.md
691
LICENSE.md
@@ -1,23 +1,674 @@
|
|||||||
The MIT License (MIT)
|
GNU GENERAL PUBLIC LICENSE
|
||||||
=====================
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
obtaining a copy of this software and associated documentation
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
files (the “Software”), to deal in the Software without
|
of this license document, but changing it is not allowed.
|
||||||
restriction, including without limitation the rights to use,
|
|
||||||
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the
|
|
||||||
Software is furnished to do so, subject to the following
|
|
||||||
conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
Preamble
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
The GNU General Public License is a free, copyleft license for
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
software and other kinds of works.
|
||||||
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
The licenses for most software and other practical works are designed
|
||||||
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
to take away your freedom to share and change the works. By contrast,
|
||||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
share and change all versions of a program--to make sure it remains free
|
||||||
OTHER DEALINGS IN THE SOFTWARE.
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ cd eco
|
|||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
eco is licensed under the MIT license. *Click here to read [the entire license](https://github.com/Auxilor/eco/blob/master/LICENSE.md).*
|
eco is licensed under GNU GPL3. *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!
|
||||||
|
|||||||
137
build.gradle.kts
137
build.gradle.kts
@@ -4,17 +4,16 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("java-library")
|
id("java-library")
|
||||||
id("io.github.goooler.shadow") version "8.1.7"
|
id("com.github.johnrengelman.shadow") version "7.1.2"
|
||||||
id("maven-publish")
|
id("maven-publish")
|
||||||
id("java")
|
id("java")
|
||||||
kotlin("jvm") version "1.9.21"
|
kotlin("jvm") version "1.7.10"
|
||||||
kotlin("plugin.serialization") version "1.9.21"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -22,33 +21,28 @@ dependencies {
|
|||||||
implementation(project(path = ":eco-core:core-plugin", configuration = "shadow"))
|
implementation(project(path = ":eco-core:core-plugin", configuration = "shadow"))
|
||||||
implementation(project(":eco-core:core-proxy"))
|
implementation(project(":eco-core:core-proxy"))
|
||||||
implementation(project(":eco-core:core-backend"))
|
implementation(project(":eco-core:core-backend"))
|
||||||
implementation(project(":eco-core:core-backend-modern"))
|
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_17_R1", configuration = "reobf"))
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_18_R1", configuration = "reobf"))
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
|
implementation(project(path = ":eco-core:core-nms:v1_18_R2", configuration = "reobf"))
|
||||||
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"))
|
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_20_R3", configuration = "reobf"))
|
|
||||||
implementation(project(path = ":eco-core:core-nms:v1_21", configuration = "reobf"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply(plugin = "java")
|
apply(plugin = "java")
|
||||||
apply(plugin = "java-library")
|
apply(plugin = "java-library")
|
||||||
apply(plugin = "maven-publish")
|
apply(plugin = "maven-publish")
|
||||||
apply(plugin = "io.github.goooler.shadow")
|
apply(plugin = "com.github.johnrengelman.shadow")
|
||||||
apply(plugin = "kotlin")
|
apply(plugin = "kotlin")
|
||||||
apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://repo.auxilor.io/repository/maven-public/")
|
mavenLocal()
|
||||||
maven("https://jitpack.io") {
|
maven("https://jitpack.io")
|
||||||
content { includeGroupByRegex("com\\.github\\..*") }
|
|
||||||
}
|
// CustomCrafting
|
||||||
|
maven("https://maven.wolfyscript.com/repository/public/")
|
||||||
|
|
||||||
// SuperiorSkyblock2
|
// SuperiorSkyblock2
|
||||||
maven("https://repo.bg-software.com/repository/api/")
|
maven("https://repo.bg-software.com/repository/api/")
|
||||||
@@ -86,31 +80,28 @@ 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/")
|
||||||
|
|
||||||
// Denizen
|
// Denizen
|
||||||
maven("https://maven.citizensnpcs.co/repo")
|
maven("https://maven.citizensnpcs.co/repo")
|
||||||
|
|
||||||
// IridiumSkyblock
|
|
||||||
maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
|
|
||||||
|
|
||||||
// HuskPlugins
|
|
||||||
maven("https://repo.william278.net/releases")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Kotlin
|
// Kotlin
|
||||||
implementation(kotlin("stdlib", version = "1.9.21"))
|
implementation(kotlin("stdlib", version = "1.7.10"))
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
|
||||||
|
|
||||||
// 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.9.2")
|
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
|
||||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
|
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
||||||
|
|
||||||
// Adventure
|
// Adventure
|
||||||
implementation("net.kyori:adventure-api:4.10.1")
|
implementation("net.kyori:adventure-api:4.10.1")
|
||||||
@@ -120,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.5")
|
implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
|
||||||
implementation("org.apache.maven:maven-artifact:3.9.0")
|
implementation("org.apache.maven:maven-artifact:3.8.5")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<JavaCompile> {
|
tasks.withType<JavaCompile> {
|
||||||
@@ -145,21 +136,58 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
withType<Jar> {
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.WARN
|
|
||||||
}
|
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "17"
|
jvmTarget = "17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
relocate("org.bstats", "com.willfp.eco.libs.bstats")
|
||||||
|
relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
|
||||||
|
relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
|
||||||
|
relocate("org.apache.maven", "com.willfp.eco.libs.maven")
|
||||||
|
relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
|
||||||
|
relocate("org.intellij", "com.willfp.eco.libs.intellij")
|
||||||
|
relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
|
||||||
|
//relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
|
||||||
|
relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
|
||||||
|
relocate("org.reflections", "com.willfp.eco.libs.reflections")
|
||||||
|
relocate("javassist", "com.willfp.eco.libs.javassist")
|
||||||
|
relocate("javax.annotation", "com.willfp.eco.libs.annotation")
|
||||||
|
relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
|
||||||
|
relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
|
||||||
|
relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
|
||||||
|
relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
|
||||||
|
relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
|
||||||
|
relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
|
||||||
|
//relocate("com.mysql", "com.willfp.eco.libs.mysql")
|
||||||
|
relocate("de.undercouch.bson4jackson", "com.willfp.eco.libs.bson4jackson")
|
||||||
|
relocate("com.fasterxml.jackson", "com.willfp.eco.libs.jackson")
|
||||||
|
relocate("com.mongodb", "com.willfp.eco.libs.mongodb")
|
||||||
|
relocate("org.bson", "com.willfp.eco.libs.bson")
|
||||||
|
relocate("org.litote", "com.willfp.eco.libs.litote")
|
||||||
|
relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
|
||||||
|
relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
|
||||||
|
relocate("com.moandjiezana.toml", "com.willfp.eco.libs.toml")
|
||||||
|
|
||||||
|
/*
|
||||||
|
Kotlin and caffeine are not shaded so that they can be accessed directly by eco plugins.
|
||||||
|
Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
compileJava {
|
compileJava {
|
||||||
dependsOn(clean)
|
dependsOn(clean)
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
withSourcesJar()
|
||||||
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
|
|
||||||
@@ -172,53 +200,6 @@ allprojects {
|
|||||||
build {
|
build {
|
||||||
dependsOn(shadowJar)
|
dependsOn(shadowJar)
|
||||||
}
|
}
|
||||||
|
|
||||||
withType<JavaCompile>().configureEach {
|
|
||||||
options.release = 17
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
|
||||||
withSourcesJar()
|
|
||||||
toolchain {
|
|
||||||
languageVersion = JavaLanguageVersion.of(21)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks {
|
|
||||||
shadowJar {
|
|
||||||
relocate("org.bstats", "com.willfp.eco.libs.bstats")
|
|
||||||
relocate("redempt.crunch", "com.willfp.eco.libs.crunch")
|
|
||||||
relocate("org.apache.commons.lang3", "com.willfp.eco.libs.lang3")
|
|
||||||
relocate("org.apache.maven", "com.willfp.eco.libs.maven")
|
|
||||||
relocate("org.checkerframework", "com.willfp.eco.libs.checkerframework")
|
|
||||||
relocate("org.intellij", "com.willfp.eco.libs.intellij")
|
|
||||||
relocate("org.jetbrains.annotations", "com.willfp.eco.libs.jetbrains.annotations")
|
|
||||||
//relocate("org.jetbrains.exposed", "com.willfp.eco.libs.exposed")
|
|
||||||
relocate("org.objenesis", "com.willfp.eco.libs.objenesis")
|
|
||||||
relocate("org.reflections", "com.willfp.eco.libs.reflections")
|
|
||||||
relocate("javassist", "com.willfp.eco.libs.javassist")
|
|
||||||
relocate("javax.annotation", "com.willfp.eco.libs.annotation")
|
|
||||||
relocate("com.google.errorprone", "com.willfp.eco.libs.errorprone")
|
|
||||||
relocate("com.google.j2objc", "com.willfp.eco.libs.j2objc")
|
|
||||||
relocate("com.google.thirdparty", "com.willfp.eco.libs.google.thirdparty")
|
|
||||||
relocate("com.google.protobuf", "com.willfp.eco.libs.google.protobuf") // No I don't know either
|
|
||||||
relocate("google.protobuf", "com.willfp.eco.libs.protobuf") // Still don't know
|
|
||||||
relocate("com.zaxxer.hikari", "com.willfp.eco.libs.hikari")
|
|
||||||
//relocate("com.mysql", "com.willfp.eco.libs.mysql")
|
|
||||||
relocate("com.mongodb", "com.willfp.eco.libs.mongodb")
|
|
||||||
relocate("org.bson", "com.willfp.eco.libs.bson")
|
|
||||||
relocate("org.litote", "com.willfp.eco.libs.litote")
|
|
||||||
relocate("org.reactivestreams", "com.willfp.eco.libs.reactivestreams")
|
|
||||||
relocate("reactor.", "com.willfp.eco.libs.reactor.") // Dot in name to be safe
|
|
||||||
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.
|
|
||||||
Also, not relocating adventure, because it's a pain in the ass, and it doesn't *seem* to be causing loader constraint violations.
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ 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.20.2-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.17.1-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,13 +30,11 @@ 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;
|
||||||
@@ -137,14 +135,6 @@ 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.
|
||||||
*
|
*
|
||||||
@@ -180,7 +170,7 @@ public interface Eco {
|
|||||||
* @return The PluginCommandBase implementation
|
* @return The PluginCommandBase implementation
|
||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
PluginCommandBase createPluginCommand(@NotNull PluginCommandBase parentDelegate,
|
PluginCommandBase createPluginCommand(@NotNull CommandBase parentDelegate,
|
||||||
@NotNull EcoPlugin plugin,
|
@NotNull EcoPlugin plugin,
|
||||||
@NotNull String name,
|
@NotNull String name,
|
||||||
@NotNull String permission,
|
@NotNull String permission,
|
||||||
@@ -403,6 +393,15 @@ 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.
|
||||||
*
|
*
|
||||||
@@ -529,10 +528,9 @@ 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 null if invalid.
|
* @return The value of the expression, or zero if invalid.
|
||||||
*/
|
*/
|
||||||
@Nullable
|
double evaluate(@NotNull String expression,
|
||||||
Double evaluate(@NotNull String expression,
|
|
||||||
@NotNull PlaceholderContext context);
|
@NotNull PlaceholderContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -589,19 +587,6 @@ 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.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
/**
|
/**
|
||||||
* The logger for the plugin.
|
* The logger for the plugin.
|
||||||
*/
|
*/
|
||||||
private Logger logger;
|
private final Logger logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the server is running an outdated version of the plugin.
|
* If the server is running an outdated version of the plugin.
|
||||||
@@ -164,11 +164,6 @@ 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> onCreateTasks = new ListMap<>();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new plugin.
|
* Create a new plugin.
|
||||||
* <p>
|
* <p>
|
||||||
@@ -430,18 +425,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
|
|
||||||
this.loadPluginCommands().forEach(PluginCommand::register);
|
this.loadPluginCommands().forEach(PluginCommand::register);
|
||||||
|
|
||||||
// Run preliminary reload to resolve load order issues
|
this.getScheduler().runLater(this::afterLoad, 1);
|
||||||
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();
|
||||||
@@ -575,9 +559,8 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
this.getLogger().severe("");
|
this.getLogger().severe("");
|
||||||
this.getLogger().severe("You don't seem to be running paper!");
|
this.getLogger().severe("You don't seem to be running paper!");
|
||||||
this.getLogger().severe("Paper is strongly recommended for all servers,");
|
this.getLogger().severe("Paper is strongly recommended for all servers,");
|
||||||
this.getLogger().severe("and many features may not function properly without it");
|
this.getLogger().severe("and some things may not function properly without it");
|
||||||
this.getLogger().severe("Download Paper from https://papermc.io");
|
this.getLogger().severe("Download Paper from &fhttps://papermc.io");
|
||||||
this.getLogger().severe("It's a drop-in replacement for Spigot, so it's easy to switch.");
|
|
||||||
this.getLogger().severe("");
|
this.getLogger().severe("");
|
||||||
this.getLogger().severe("----------------------------");
|
this.getLogger().severe("----------------------------");
|
||||||
this.getLogger().severe("");
|
this.getLogger().severe("");
|
||||||
@@ -618,30 +601,14 @@ 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();
|
||||||
|
|
||||||
if (cancelTasks) {
|
this.getScheduler().cancelAll();
|
||||||
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.onCreateTasks, this::createTasks);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
|
for (Extension extension : this.extensionLoader.getLoadedExtensions()) {
|
||||||
extension.handleReload();
|
extension.handleReload();
|
||||||
}
|
}
|
||||||
@@ -667,26 +634,6 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
|
|||||||
this.onReload.append(position, task);
|
this.onReload.append(position, task);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Add new task to run on createTasks.
|
|
||||||
*
|
|
||||||
* @param task The task.
|
|
||||||
*/
|
|
||||||
public final void onCreateTasks(@NotNull final Runnable task) {
|
|
||||||
this.onCreateTasks(LifecyclePosition.END, task);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add new task to run on createTasks.
|
|
||||||
*
|
|
||||||
* @param position The position to run the task.
|
|
||||||
* @param task The task.
|
|
||||||
*/
|
|
||||||
public final void onCreateTasks(@NotNull final LifecyclePosition position,
|
|
||||||
@NotNull final Runnable task) {
|
|
||||||
this.onCreateTasks.append(position, task);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reload the plugin and return the time taken to reload.
|
* Reload the plugin and return the time taken to reload.
|
||||||
*
|
*
|
||||||
@@ -775,15 +722,6 @@ 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>
|
||||||
@@ -1212,16 +1150,6 @@ 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() {
|
||||||
|
|||||||
@@ -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.
|
* If the plugin uses reflective reload (via {@link com.willfp.eco.core.config.updating.ConfigUpdater}).
|
||||||
*/
|
*/
|
||||||
private boolean usesReflectiveReload = true;
|
private boolean usesReflectiveReload = true;
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class Prerequisite {
|
|||||||
*/
|
*/
|
||||||
public static final Prerequisite HAS_PAPER = new Prerequisite(
|
public static final Prerequisite HAS_PAPER = new Prerequisite(
|
||||||
() -> ClassUtils.exists("com.destroystokyo.paper.event.block.BeaconEffectEvent"),
|
() -> ClassUtils.exists("com.destroystokyo.paper.event.block.BeaconEffectEvent"),
|
||||||
"Requires server to be running paper (or a fork)"
|
"Requires server to be running paper"
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,44 +37,11 @@ public class Prerequisite {
|
|||||||
"Requires server to have ProtocolLib"
|
"Requires server to have ProtocolLib"
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
|
||||||
* Requires the server to be running 1.21.
|
|
||||||
*/
|
|
||||||
public static final Prerequisite HAS_1_21 = new Prerequisite(
|
|
||||||
() -> ProxyConstants.NMS_VERSION.contains("1_21"),
|
|
||||||
"Requires server to be running 1.21+"
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Requires the server to be running 1.20.5.
|
|
||||||
*/
|
|
||||||
public static final Prerequisite HAS_1_20_5 = new Prerequisite(
|
|
||||||
() -> (ProxyConstants.NMS_VERSION.contains("1_20_") && !ProxyConstants.NMS_VERSION.contains("R"))
|
|
||||||
|| HAS_1_21.isMet(),
|
|
||||||
"Requires server to be running 1.20.5+"
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Requires the server to be running 1.20.3.
|
|
||||||
*/
|
|
||||||
public static final Prerequisite HAS_1_20_3 = new Prerequisite(
|
|
||||||
() -> ProxyConstants.NMS_VERSION.contains("20_R3") || HAS_1_20_5.isMet(),
|
|
||||||
"Requires server to be running 1.20.3+"
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Requires the server to be running 1.20.
|
|
||||||
*/
|
|
||||||
public static final Prerequisite HAS_1_20 = new Prerequisite(
|
|
||||||
() -> ProxyConstants.NMS_VERSION.contains("20") || HAS_1_20_3.isMet(),
|
|
||||||
"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") || HAS_1_20.isMet(),
|
() -> ProxyConstants.NMS_VERSION.contains("19_R3"),
|
||||||
"Requires server to be running 1.19.4+"
|
"Requires server to be running 1.19.4+"
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -82,7 +49,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") || HAS_1_20.isMet(),
|
() -> ProxyConstants.NMS_VERSION.contains("19"),
|
||||||
"Requires server to be running 1.19+"
|
"Requires server to be running 1.19+"
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -102,7 +69,7 @@ public class Prerequisite {
|
|||||||
@Deprecated(since = "6.49.0", forRemoval = true)
|
@Deprecated(since = "6.49.0", forRemoval = true)
|
||||||
public static final Prerequisite HAS_BUNGEECORD = new Prerequisite(
|
public static final Prerequisite HAS_BUNGEECORD = new Prerequisite(
|
||||||
() -> ClassUtils.exists("net.md_5.bungee.api.event.ServerConnectedEvent"),
|
() -> ClassUtils.exists("net.md_5.bungee.api.event.ServerConnectedEvent"),
|
||||||
"Requires server to be running BungeeCord (or a fork)"
|
"Requires server to be running BungeeCord"
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -113,7 +80,15 @@ public class Prerequisite {
|
|||||||
@Deprecated(since = "6.49.0", forRemoval = true)
|
@Deprecated(since = "6.49.0", forRemoval = true)
|
||||||
public static final Prerequisite HAS_VELOCITY = new Prerequisite(
|
public static final Prerequisite HAS_VELOCITY = new Prerequisite(
|
||||||
() -> ClassUtils.exists("com.velocitypowered.api.event.player.ServerConnectedEvent"),
|
() -> ClassUtils.exists("com.velocitypowered.api.event.player.ServerConnectedEvent"),
|
||||||
"Requires server to be running Velocity (or a fork)"
|
"Requires server to be running Velocity"
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Requires the server to be running an implementation of Folia.
|
||||||
|
*/
|
||||||
|
public static final Prerequisite HAS_FOLIA = new Prerequisite(
|
||||||
|
() -> ClassUtils.exists("io.papermc.paper.threadedregions.scheduler.RegionisedScheduler"),
|
||||||
|
"Requires server to be running Folia!"
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ 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.
|
||||||
*
|
*
|
||||||
@@ -57,13 +52,4 @@ 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,7 +15,6 @@ 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;
|
||||||
@@ -597,10 +596,7 @@ 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 Objects.requireNonNullElseGet(
|
return NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this));
|
||||||
this.getDoubleOrNull(path),
|
|
||||||
() -> NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -652,32 +648,6 @@ 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.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -29,22 +29,6 @@ public interface LoadableConfig extends Config {
|
|||||||
*/
|
*/
|
||||||
void save() throws IOException;
|
void save() throws IOException;
|
||||||
|
|
||||||
/**
|
|
||||||
* Save the config asynchronously.
|
|
||||||
*/
|
|
||||||
default void saveAsync() {
|
|
||||||
// This default implementation exists purely for backwards compatibility
|
|
||||||
// with legacy Config implementations that don't have saveAsync().
|
|
||||||
// Default eco implementations of Config have saveAsync() implemented.
|
|
||||||
new Thread(() -> {
|
|
||||||
try {
|
|
||||||
this.save();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the config file.
|
* Get the config file.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -38,16 +38,12 @@ 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 {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,10 +87,6 @@ public interface ExtendedPersistentDataContainer {
|
|||||||
* @return The extended container.
|
* @return The extended container.
|
||||||
*/
|
*/
|
||||||
static ExtendedPersistentDataContainer extend(@NotNull PersistentDataContainer base) {
|
static ExtendedPersistentDataContainer extend(@NotNull PersistentDataContainer base) {
|
||||||
if (base instanceof ExtendedPersistentDataContainer) {
|
|
||||||
return (ExtendedPersistentDataContainer) base;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Eco.get().adaptPdc(base);
|
return Eco.get().adaptPdc(base);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,22 +9,6 @@ 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,31 +29,6 @@ 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.
|
||||||
*
|
*
|
||||||
@@ -67,7 +42,6 @@ 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);
|
||||||
}
|
}
|
||||||
@@ -108,15 +82,6 @@ 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,7 +4,6 @@ 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;
|
||||||
@@ -50,11 +49,6 @@ 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,6 +1,5 @@
|
|||||||
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;
|
||||||
@@ -69,10 +68,8 @@ public final class Display {
|
|||||||
|
|
||||||
Display.revert(itemStack);
|
Display.revert(itemStack);
|
||||||
|
|
||||||
if (!Eco.get().getEcoPlugin().getConfigYml().getBool("display-without-meta")) {
|
if (!itemStack.hasItemMeta()) {
|
||||||
if (!itemStack.hasItemMeta()) {
|
return itemStack;
|
||||||
return itemStack;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack original = itemStack.clone();
|
ItemStack original = itemStack.clone();
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
|
|||||||
/**
|
/**
|
||||||
* The items.
|
* The items.
|
||||||
*/
|
*/
|
||||||
private Collection<? extends ItemStack> items;
|
private final Collection<? extends ItemStack> items;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The xp.
|
* The xp.
|
||||||
@@ -114,15 +114,6 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
|
|||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the items to be dropped.
|
|
||||||
*
|
|
||||||
* @param items The items.
|
|
||||||
*/
|
|
||||||
public void setItems(Collection<? extends ItemStack> items) {
|
|
||||||
this.items = items;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the xp to be dropped.
|
* Get the xp to be dropped.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ import java.io.File;
|
|||||||
* @param version The extension version.
|
* @param version The extension version.
|
||||||
* @param name The extension name.
|
* @param name The extension name.
|
||||||
* @param author The extension's author.
|
* @param author The extension's author.
|
||||||
* @param file The extension's file.
|
|
||||||
* @param minimumPluginVersion The minimum plugin version required for this extension.
|
|
||||||
*/
|
*/
|
||||||
public record ExtensionMetadata(@NotNull String version,
|
public record ExtensionMetadata(@NotNull String version,
|
||||||
@NotNull String name,
|
@NotNull String name,
|
||||||
|
|||||||
@@ -164,23 +164,15 @@ public interface FastItemStack extends PersistentDataHolder {
|
|||||||
* The returned PersistentDataContainer will not modify the item until the tag is set.
|
* The returned PersistentDataContainer will not modify the item until the tag is set.
|
||||||
*
|
*
|
||||||
* @return The base NBT tag.
|
* @return The base NBT tag.
|
||||||
* @deprecated Items are now component-based.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "6.70.0")
|
PersistentDataContainer getBaseTag();
|
||||||
default PersistentDataContainer getBaseTag() {
|
|
||||||
throw new UnsupportedOperationException("Not supported in 1.20.5+");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the base NBT tag (Not PublicBukkitValues, the base) from a PersistentDataContainer.
|
* Set the base NBT tag (Not PublicBukkitValues, the base) from a PersistentDataContainer.
|
||||||
*
|
*
|
||||||
* @param container The PersistentDataContainer.
|
* @param container The PersistentDataContainer.
|
||||||
* @deprecated Items are now component-based.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "6.70.0")
|
void setBaseTag(@Nullable PersistentDataContainer container);
|
||||||
default void setBaseTag(@Nullable PersistentDataContainer container) {
|
|
||||||
throw new UnsupportedOperationException("Not supported in 1.20.5+");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the type of the item.
|
* Get the type of the item.
|
||||||
|
|||||||
@@ -142,26 +142,6 @@ 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.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles menu events.
|
* Handles menu events.
|
||||||
*
|
|
||||||
* @param <T> The type of event to handle.x
|
|
||||||
*/
|
*/
|
||||||
public abstract class MenuEventHandler<T extends MenuEvent> {
|
public abstract class MenuEventHandler<T extends MenuEvent> {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ public class ConfigSlot extends CustomSlot {
|
|||||||
for (String command : config.getStrings(configKey)) {
|
for (String command : config.getStrings(configKey)) {
|
||||||
if (command.startsWith("console:")) {
|
if (command.startsWith("console:")) {
|
||||||
commands.add(new CommandToDispatch(
|
commands.add(new CommandToDispatch(
|
||||||
StringUtils.removePrefix(command, "console:"),
|
StringUtils.removePrefix("console:", command),
|
||||||
true
|
true
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ 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;
|
||||||
@@ -77,15 +76,6 @@ 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,7 +7,6 @@ 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;
|
||||||
@@ -93,27 +92,6 @@ 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,7 +196,6 @@ 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,13 +17,6 @@ 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);
|
||||||
@@ -117,7 +110,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 | LinkageError e) {
|
} catch (final Exception 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,7 +98,6 @@ 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));
|
||||||
}
|
}
|
||||||
@@ -150,7 +149,6 @@ 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);
|
||||||
@@ -167,19 +165,10 @@ 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(
|
return translatePlaceholders(text, player, context, new ArrayList<>());
|
||||||
text,
|
|
||||||
new PlaceholderContext(
|
|
||||||
player,
|
|
||||||
null,
|
|
||||||
context,
|
|
||||||
new ArrayList<>()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -194,7 +183,6 @@ 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,6 +1,7 @@
|
|||||||
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;
|
||||||
@@ -54,7 +55,7 @@ public class CustomItem implements TestableItem {
|
|||||||
*/
|
*/
|
||||||
Eco.get().getEcoPlugin().getScheduler().runLater(() -> {
|
Eco.get().getEcoPlugin().getScheduler().runLater(() -> {
|
||||||
if (!matches(getItem())) {
|
if (!matches(getItem())) {
|
||||||
Eco.get().getEcoPlugin().getLogger().severe("Item with key " + key + " is invalid!");
|
Bukkit.getLogger().severe("Item with key " + key + " is invalid!");
|
||||||
}
|
}
|
||||||
}, 1);
|
}, 1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import com.willfp.eco.core.recipe.parts.TestableStack;
|
|||||||
import com.willfp.eco.core.recipe.parts.UnrestrictedMaterialTestableItem;
|
import com.willfp.eco.core.recipe.parts.UnrestrictedMaterialTestableItem;
|
||||||
import com.willfp.eco.util.NamespacedKeyUtils;
|
import com.willfp.eco.util.NamespacedKeyUtils;
|
||||||
import com.willfp.eco.util.NumberUtils;
|
import com.willfp.eco.util.NumberUtils;
|
||||||
import kotlin.Suppress;
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.NamespacedKey;
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
@@ -516,11 +515,8 @@ public final class Items {
|
|||||||
*
|
*
|
||||||
* @param itemStack The ItemStack.
|
* @param itemStack The ItemStack.
|
||||||
* @return The base NBT.
|
* @return The base NBT.
|
||||||
* @deprecated Items are now component-based.
|
|
||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
@Deprecated(since = "6.70.0", forRemoval = true)
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
public static PersistentDataContainer getBaseNBT(@NotNull final ItemStack itemStack) {
|
public static PersistentDataContainer getBaseNBT(@NotNull final ItemStack itemStack) {
|
||||||
return FastItemStack.wrap(itemStack).getBaseTag();
|
return FastItemStack.wrap(itemStack).getBaseTag();
|
||||||
}
|
}
|
||||||
@@ -531,11 +527,8 @@ public final class Items {
|
|||||||
* @param itemStack The ItemStack.
|
* @param itemStack The ItemStack.
|
||||||
* @param container The base NBT tag.
|
* @param container The base NBT tag.
|
||||||
* @return The ItemStack, modified. Not required to use, as this modifies the instance.¬
|
* @return The ItemStack, modified. Not required to use, as this modifies the instance.¬
|
||||||
* @deprecated Items are now component-based.
|
|
||||||
*/
|
*/
|
||||||
@NotNull
|
@NotNull
|
||||||
@Deprecated(since = "6.70.0", forRemoval = true)
|
|
||||||
@SuppressWarnings("removal")
|
|
||||||
public static ItemStack setBaseNBT(@NotNull final ItemStack itemStack,
|
public static ItemStack setBaseNBT(@NotNull final ItemStack itemStack,
|
||||||
@Nullable final PersistentDataContainer container) {
|
@Nullable final PersistentDataContainer container) {
|
||||||
FastItemStack fis = FastItemStack.wrap(itemStack);
|
FastItemStack fis = FastItemStack.wrap(itemStack);
|
||||||
|
|||||||
@@ -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<>(HashMap::new);
|
return new DefaultMap<>(new HashMap<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -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<>(ListMap::new);
|
return new DefaultMap<>(new ListMap<>());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ 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;
|
||||||
@@ -41,7 +40,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
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;
|
||||||
@@ -39,7 +38,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ 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;
|
||||||
|
|
||||||
@@ -40,7 +39,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
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;
|
||||||
@@ -38,7 +37,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
this.function = function;
|
this.function = function;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ 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;
|
||||||
@@ -29,7 +28,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ 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;
|
||||||
@@ -38,7 +37,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 = PatternUtils.compileLiteral(identifier);
|
this.pattern = Pattern.compile(identifier, Pattern.LITERAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
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;
|
||||||
@@ -120,12 +119,8 @@ public final class ConfiguredPrice implements Price {
|
|||||||
*/
|
*/
|
||||||
public String getDisplay(@NotNull final Player player,
|
public String getDisplay(@NotNull final Player player,
|
||||||
final double multiplier) {
|
final double multiplier) {
|
||||||
double value = this.getPrice().getValue(player, multiplier);
|
|
||||||
|
|
||||||
return StringUtils.format(
|
return StringUtils.format(
|
||||||
formatString
|
formatString.replace("%value%", NumberUtils.format(this.getPrice().getValue(player, multiplier))),
|
||||||
.replace("%value%", NumberUtils.format(value))
|
|
||||||
.replace("%value_commas%", NumberUtils.formatWithCommas(value)),
|
|
||||||
player,
|
player,
|
||||||
StringUtils.FormatOption.WITH_PLACEHOLDERS
|
StringUtils.FormatOption.WITH_PLACEHOLDERS
|
||||||
);
|
);
|
||||||
@@ -163,27 +158,12 @@ 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;
|
String formatString = config.getString("display");
|
||||||
|
|
||||||
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"),
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.willfp.eco.core.proxy;
|
package com.willfp.eco.core.proxy;
|
||||||
|
|
||||||
import com.willfp.eco.core.version.Version;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -13,7 +12,7 @@ public final class ProxyConstants {
|
|||||||
/**
|
/**
|
||||||
* The NMS version that the server is running on.
|
* The NMS version that the server is running on.
|
||||||
*/
|
*/
|
||||||
public static final String NMS_VERSION;
|
public static final String NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All supported NMS versions.
|
* All supported NMS versions.
|
||||||
@@ -24,27 +23,10 @@ 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",
|
|
||||||
"v1_20_R3",
|
|
||||||
"v1_21"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
private ProxyConstants() {
|
private ProxyConstants() {
|
||||||
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
|
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
|
||||||
String currentMinecraftVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
|
|
||||||
String nmsVersion;
|
|
||||||
|
|
||||||
if (new Version(currentMinecraftVersion).compareTo(new Version("1.20.5")) < 0) {
|
|
||||||
nmsVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
|
|
||||||
} else {
|
|
||||||
nmsVersion = "v" + currentMinecraftVersion.replace(".", "_");
|
|
||||||
}
|
|
||||||
|
|
||||||
NMS_VERSION = nmsVersion;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ 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;
|
||||||
@@ -126,8 +127,8 @@ public final class Recipes {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (builder.isAir()) {
|
if (builder.isAir()) {
|
||||||
plugin.getLogger().warning("Crafting recipe " + plugin.getID() + ":" + key + " consists only");
|
Bukkit.getLogger().warning("Crafting recipe " + plugin.getID() + ":" + key + " consists only");
|
||||||
plugin.getLogger().warning("of air or invalid items! It will not be registered.");
|
Bukkit.getLogger().warning("of air or invalid items! It will not be registered.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ public class Registry<T extends Registrable> implements Iterable<T> {
|
|||||||
registry.put(element.getID(), element);
|
registry.put(element.getID(), element);
|
||||||
|
|
||||||
element.onRegister();
|
element.onRegister();
|
||||||
onRegister(element);
|
|
||||||
|
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
@@ -79,7 +78,6 @@ public class Registry<T extends Registrable> implements Iterable<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
element.onRemove();
|
element.onRemove();
|
||||||
onRemove(element);
|
|
||||||
|
|
||||||
registry.remove(element.getID());
|
registry.remove(element.getID());
|
||||||
|
|
||||||
@@ -101,10 +99,10 @@ public class Registry<T extends Registrable> implements Iterable<T> {
|
|||||||
T element = registry.get(id);
|
T element = registry.get(id);
|
||||||
|
|
||||||
if (element != null) {
|
if (element != null) {
|
||||||
return remove(element);
|
element.onRemove();
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return registry.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -151,10 +149,6 @@ 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;
|
||||||
}
|
}
|
||||||
@@ -168,29 +162,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Run when an element is registered.
|
|
||||||
*
|
|
||||||
* @param element The element.
|
|
||||||
*/
|
|
||||||
protected void onRegister(@NotNull final T element) {
|
|
||||||
// Override this method to do something when an element is registered.
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run when an element is removed.
|
|
||||||
*
|
|
||||||
* @param element The element.
|
|
||||||
*/
|
|
||||||
protected void onRemove(@NotNull final T element) {
|
|
||||||
// Override this method to do something when an element is removed.
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get if the registry is empty.
|
* Get if the registry is empty.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.willfp.eco.core.scheduling;
|
package com.willfp.eco.core.scheduling;
|
||||||
|
|
||||||
import com.willfp.eco.core.EcoPlugin;
|
import com.willfp.eco.core.EcoPlugin;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Location;
|
||||||
import org.bukkit.scheduler.BukkitTask;
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
@@ -14,9 +16,13 @@ public interface Scheduler {
|
|||||||
* @param runnable The lambda to run.
|
* @param runnable The lambda to run.
|
||||||
* @param ticksLater The amount of ticks to wait before execution.
|
* @param ticksLater The amount of ticks to wait before execution.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
BukkitTask runLater(@NotNull Runnable runnable,
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
long ticksLater);
|
default BukkitTask runLater(@NotNull Runnable runnable,
|
||||||
|
long ticksLater) {
|
||||||
|
return runLater(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), (int) ticksLater, runnable);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the task after a specified tick delay.
|
* Run the task after a specified tick delay.
|
||||||
@@ -26,10 +32,12 @@ public interface Scheduler {
|
|||||||
* @param runnable The lambda to run.
|
* @param runnable The lambda to run.
|
||||||
* @param ticksLater The amount of ticks to wait before execution.
|
* @param ticksLater The amount of ticks to wait before execution.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
default BukkitTask runLater(long ticksLater,
|
default BukkitTask runLater(long ticksLater,
|
||||||
@NotNull Runnable runnable) {
|
@NotNull Runnable runnable) {
|
||||||
return runLater(runnable, ticksLater);
|
return runLater(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), (int) ticksLater, runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,10 +47,14 @@ public interface Scheduler {
|
|||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
BukkitTask runTimer(@NotNull Runnable runnable,
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
long delay,
|
default BukkitTask runTimer(@NotNull Runnable runnable,
|
||||||
long repeat);
|
long delay,
|
||||||
|
long repeat) {
|
||||||
|
return runTimer(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), (int) delay, (int) repeat, runnable);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the task repeatedly on a timer.
|
* Run the task repeatedly on a timer.
|
||||||
@@ -53,11 +65,13 @@ public interface Scheduler {
|
|||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
default BukkitTask runTimer(long delay,
|
default BukkitTask runTimer(long delay,
|
||||||
long repeat,
|
long repeat,
|
||||||
@NotNull Runnable runnable) {
|
@NotNull Runnable runnable) {
|
||||||
return runTimer(runnable, delay, repeat);
|
return runTimer(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), (int) delay, (int) repeat, runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,10 +81,14 @@ public interface Scheduler {
|
|||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
BukkitTask runAsyncTimer(@NotNull Runnable runnable,
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
long delay,
|
default BukkitTask runAsyncTimer(@NotNull Runnable runnable,
|
||||||
long repeat);
|
long delay,
|
||||||
|
long repeat) {
|
||||||
|
return runTimerAsync((int) delay, (int) repeat, runnable);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the task repeatedly and asynchronously on a timer.
|
* Run the task repeatedly and asynchronously on a timer.
|
||||||
@@ -81,11 +99,13 @@ public interface Scheduler {
|
|||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
default BukkitTask runAsyncTimer(long delay,
|
default BukkitTask runAsyncTimer(long delay,
|
||||||
long repeat,
|
long repeat,
|
||||||
@NotNull Runnable runnable) {
|
@NotNull Runnable runnable) {
|
||||||
return runAsyncTimer(runnable, delay, repeat);
|
return runTimerAsync((int) delay, (int) repeat, runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,28 +113,28 @@ public interface Scheduler {
|
|||||||
*
|
*
|
||||||
* @param runnable The lambda to run.
|
* @param runnable The lambda to run.
|
||||||
* @return The created {@link BukkitTask}.
|
* @return The created {@link BukkitTask}.
|
||||||
|
* @deprecated Does not work with Folia.
|
||||||
*/
|
*/
|
||||||
BukkitTask run(@NotNull Runnable runnable);
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
|
default BukkitTask run(@NotNull Runnable runnable) {
|
||||||
|
return run(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), runnable);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the task asynchronously.
|
* Schedule the task to be run repeatedly on a timer.
|
||||||
*
|
|
||||||
* @param runnable The lambda to run.
|
|
||||||
* @return The created {@link BukkitTask}.
|
|
||||||
*/
|
|
||||||
BukkitTask runAsync(@NotNull Runnable runnable);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule the task to be ran repeatedly on a timer.
|
|
||||||
*
|
*
|
||||||
* @param runnable The lambda to run.
|
* @param runnable The lambda to run.
|
||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The id of the task.
|
* @return The id of the task.
|
||||||
|
* @deprecated Not needed.
|
||||||
*/
|
*/
|
||||||
int syncRepeating(@NotNull Runnable runnable,
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
long delay,
|
default int syncRepeating(@NotNull Runnable runnable,
|
||||||
long repeat);
|
long delay,
|
||||||
|
long repeat) {
|
||||||
|
return runTimer(runnable, delay, repeat).getTaskId();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Schedule the task to be ran repeatedly on a timer.
|
* Schedule the task to be ran repeatedly on a timer.
|
||||||
@@ -125,15 +145,73 @@ public interface Scheduler {
|
|||||||
* @param delay The amount of ticks to wait before the first execution.
|
* @param delay The amount of ticks to wait before the first execution.
|
||||||
* @param repeat The amount of ticks to wait between executions.
|
* @param repeat The amount of ticks to wait between executions.
|
||||||
* @return The id of the task.
|
* @return The id of the task.
|
||||||
|
* @deprecated Not needed.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "6.53.0", forRemoval = true)
|
||||||
default int syncRepeating(long delay,
|
default int syncRepeating(long delay,
|
||||||
long repeat,
|
long repeat,
|
||||||
@NotNull Runnable runnable) {
|
@NotNull Runnable runnable) {
|
||||||
return syncRepeating(runnable, delay, repeat);
|
return runTimer(runnable, delay, repeat).getTaskId();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cancel all running tasks from the linked {@link EcoPlugin}.
|
* Cancel all running tasks from the linked {@link EcoPlugin}.
|
||||||
*/
|
*/
|
||||||
void cancelAll();
|
void cancelAll();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a task asynchronously.
|
||||||
|
*
|
||||||
|
* @param task The lambda to run.
|
||||||
|
* @return The created {@link BukkitTask}.
|
||||||
|
*/
|
||||||
|
BukkitTask runAsync(@NotNull Runnable task);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a task.
|
||||||
|
*
|
||||||
|
* @param location The location.
|
||||||
|
* @param task The task.
|
||||||
|
* @return The created {@link BukkitTask}.
|
||||||
|
*/
|
||||||
|
BukkitTask run(@NotNull Location location,
|
||||||
|
@NotNull Runnable task);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a task after a delay.
|
||||||
|
*
|
||||||
|
* @param location The location.
|
||||||
|
* @param ticksLater The delay.
|
||||||
|
* @param task The task.
|
||||||
|
* @return The created {@link BukkitTask}.
|
||||||
|
*/
|
||||||
|
BukkitTask runLater(@NotNull Location location,
|
||||||
|
int ticksLater,
|
||||||
|
@NotNull Runnable task);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a task on a timer.
|
||||||
|
*
|
||||||
|
* @param location The location.
|
||||||
|
* @param delay The delay.
|
||||||
|
* @param repeat The repeat delay.
|
||||||
|
* @param task The task.
|
||||||
|
* @return The created {@link BukkitTask}.
|
||||||
|
*/
|
||||||
|
BukkitTask runTimer(@NotNull Location location,
|
||||||
|
int delay,
|
||||||
|
int repeat,
|
||||||
|
@NotNull Runnable task);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a task asynchronously on a timer.
|
||||||
|
*
|
||||||
|
* @param delay The delay.
|
||||||
|
* @param repeat The repeat delay.
|
||||||
|
* @param task The task.
|
||||||
|
* @return The created {@link BukkitTask}.
|
||||||
|
*/
|
||||||
|
BukkitTask runTimerAsync(int delay,
|
||||||
|
int repeat,
|
||||||
|
@NotNull Runnable task);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -158,8 +158,11 @@ public final class DurabilityUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (item.getItemMeta() instanceof Damageable meta) {
|
if (item.getItemMeta() instanceof Damageable meta) {
|
||||||
meta.setDamage(Math.max(0, meta.getDamage() - repair));
|
meta.setDamage(meta.getDamage() - repair);
|
||||||
|
|
||||||
|
if (meta.getDamage() < 0) {
|
||||||
|
meta.setDamage(0);
|
||||||
|
}
|
||||||
item.setItemMeta((ItemMeta) meta);
|
item.setItemMeta((ItemMeta) meta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
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,7 +12,6 @@ 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;
|
||||||
|
|
||||||
@@ -203,20 +202,6 @@ public final class NumberUtils {
|
|||||||
return formatted.endsWith("00") ? String.valueOf((int) toFormat) : formatted;
|
return formatted.endsWith("00") ? String.valueOf((int) toFormat) : formatted;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Format double to string with commas.
|
|
||||||
*
|
|
||||||
* @param toFormat The number to format.
|
|
||||||
* @return Formatted.
|
|
||||||
*/
|
|
||||||
@NotNull
|
|
||||||
public static String formatWithCommas(final double toFormat) {
|
|
||||||
DecimalFormat df = new DecimalFormat("#,##0.00");
|
|
||||||
String formatted = df.format(toFormat);
|
|
||||||
|
|
||||||
return formatted.endsWith(".00") ? formatted.substring(0, formatted.length() - 3) : formatted;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Evaluate an expression.
|
* Evaluate an expression.
|
||||||
*
|
*
|
||||||
@@ -266,15 +251,12 @@ 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 evaluateExpression(
|
return Eco.get().evaluate(expression, new PlaceholderContext(
|
||||||
expression,
|
player,
|
||||||
new PlaceholderContext(
|
null,
|
||||||
player,
|
context,
|
||||||
null,
|
additionalPlayers
|
||||||
context,
|
));
|
||||||
additionalPlayers
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -286,7 +268,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", "DeprecatedIsStillUsed"})
|
@SuppressWarnings("removal")
|
||||||
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());
|
||||||
@@ -301,22 +283,6 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
package com.willfp.eco.util;
|
|
||||||
|
|
||||||
import com.github.benmanes.caffeine.cache.Cache;
|
|
||||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
|
||||||
import com.willfp.eco.core.Eco;
|
|
||||||
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(Eco.get().getEcoPlugin().getConfigYml().getInt("literal-cache-ttl"), 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,7 +13,6 @@ 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,8 +10,6 @@ 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;
|
||||||
@@ -786,127 +784,6 @@ 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.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ fun ItemMeta.mergeFrom(other: ItemMeta): ItemMeta =
|
|||||||
* @see Items.getBaseNBT
|
* @see Items.getBaseNBT
|
||||||
* @see Items.setBaseNBT
|
* @see Items.setBaseNBT
|
||||||
*/
|
*/
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
@Deprecated("Not supported in 1.20.5+", level = DeprecationLevel.ERROR)
|
|
||||||
var ItemStack.baseNBT: PersistentDataContainer
|
var ItemStack.baseNBT: PersistentDataContainer
|
||||||
get() = Items.getBaseNBT(this)
|
get() = Items.getBaseNBT(this)
|
||||||
set(value) {
|
set(value) {
|
||||||
@@ -31,8 +29,6 @@ var ItemStack.baseNBT: PersistentDataContainer
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @see Items.setBaseNBT */
|
/** @see Items.setBaseNBT */
|
||||||
@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
|
|
||||||
@Deprecated("Not supported in 1.20.5+", level = DeprecationLevel.ERROR)
|
|
||||||
fun ItemStack.clearNBT() =
|
fun ItemStack.clearNBT() =
|
||||||
Items.setBaseNBT(this, null)
|
Items.setBaseNBT(this, null)
|
||||||
|
|
||||||
@@ -41,14 +37,9 @@ fun ItemStack.toSNBT() =
|
|||||||
Items.toSNBT(this)
|
Items.toSNBT(this)
|
||||||
|
|
||||||
/** @see Items.isEmpty */
|
/** @see Items.isEmpty */
|
||||||
@Deprecated("Use ItemStack.isEcoEmpty", ReplaceWith("Items.isEmpty(this)"))
|
|
||||||
val ItemStack?.isEmpty: Boolean
|
val ItemStack?.isEmpty: Boolean
|
||||||
get() = Items.isEmpty(this)
|
get() = Items.isEmpty(this)
|
||||||
|
|
||||||
/** @see Items.isEmpty */
|
|
||||||
val ItemStack?.isEcoEmpty: Boolean
|
|
||||||
get() = Items.isEmpty(this)
|
|
||||||
|
|
||||||
/** @see Items.matchesAny */
|
/** @see Items.matchesAny */
|
||||||
fun Collection<TestableItem>.matches(item: ItemStack): Boolean =
|
fun Collection<TestableItem>.matches(item: ItemStack): Boolean =
|
||||||
Items.matchesAny(item, this)
|
Items.matchesAny(item, this)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package com.willfp.eco.core.map
|
|||||||
* @see ListMap
|
* @see ListMap
|
||||||
*/
|
*/
|
||||||
@Suppress("RedundantOverride")
|
@Suppress("RedundantOverride")
|
||||||
class MutableListMap<K : Any, V> : ListMap<K, V>() {
|
class MutableListMap<K : Any, V : Any> : ListMap<K, V>() {
|
||||||
/**
|
/**
|
||||||
* Override with enforced MutableList type.
|
* Override with enforced MutableList type.
|
||||||
*/
|
*/
|
||||||
@@ -18,7 +18,7 @@ class MutableListMap<K : Any, V> : 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,12 +29,6 @@ class MutableListMap<K : Any, V> : 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
|
||||||
*/
|
*/
|
||||||
@@ -44,13 +38,11 @@ fun <K : Any, V : Any> listMap() =
|
|||||||
/**
|
/**
|
||||||
* @see DefaultMap.createNestedMap
|
* @see DefaultMap.createNestedMap
|
||||||
*/
|
*/
|
||||||
fun <K : Any, K1 : Any, V> nestedMap() =
|
fun <K : Any, K1 : Any, V : Any> nestedMap() =
|
||||||
DefaultMap.createNestedMap<K, K1, V>()
|
DefaultMap.createNestedMap<K, K1, V>()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see DefaultMap.createNestedListMap
|
* @see DefaultMap.createNestedListMap
|
||||||
*/
|
*/
|
||||||
fun <K : Any, K1 : Any, V> nestedListMap() =
|
fun <K : Any, K1 : Any, V : Any> nestedListMap() =
|
||||||
DefaultMap<K, MutableListMap<K1, V>>() {
|
DefaultMap<K, MutableListMap<K1, V>>(MutableListMap())
|
||||||
MutableListMap()
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
@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)
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
@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,40 +2,6 @@
|
|||||||
|
|
||||||
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.formatWithCommas */
|
|
||||||
fun Number.formatWithCommas(): String =
|
|
||||||
NumberUtils.formatWithCommas(this.toDouble())
|
|
||||||
|
|
||||||
/** @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 PotionUtils.getDuration */
|
/** @see PotionData.duration */
|
||||||
@Suppress("DEPRECATION")
|
val PotionData.duration: Int
|
||||||
val org.bukkit.potion.PotionData.duration: Int
|
|
||||||
get() = PotionUtils.getDuration(this)
|
get() = PotionUtils.getDuration(this)
|
||||||
|
|||||||
@@ -69,15 +69,3 @@ 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,7 +6,7 @@ public class NumberUtilsTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testFormatDouble() {
|
public void testFormatDouble() {
|
||||||
Assertions.assertEquals("3", NumberUtils.format(3.0D));
|
Assertions.assertEquals("3", NumberUtils.format(3.0D));
|
||||||
//Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
|
Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
group = "com.willfp"
|
|
||||||
version = rootProject.version
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(project(":eco-core:core-backend"))
|
|
||||||
compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks {
|
|
||||||
compileJava {
|
|
||||||
options.release = 21
|
|
||||||
}
|
|
||||||
|
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "21"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.entities
|
|
||||||
|
|
||||||
import com.willfp.eco.core.entities.Entities
|
|
||||||
import com.willfp.eco.internal.compat.modern.entities.parsers.EntityArgParserJumpStrength
|
|
||||||
import com.willfp.eco.internal.compat.modern.entities.parsers.EntityArgParserScale
|
|
||||||
import com.willfp.eco.internal.entities.ModernEntityArgParsers
|
|
||||||
|
|
||||||
class ModernEntityArgParsersImpl: ModernEntityArgParsers {
|
|
||||||
override fun registerAll() {
|
|
||||||
Entities.registerArgParser(EntityArgParserScale)
|
|
||||||
Entities.registerArgParser(EntityArgParserJumpStrength)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.entities.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.core.entities.args.EntityArgParseResult
|
|
||||||
import com.willfp.eco.core.entities.args.EntityArgParser
|
|
||||||
import org.bukkit.attribute.Attribute
|
|
||||||
import org.bukkit.entity.LivingEntity
|
|
||||||
import org.bukkit.entity.Phantom
|
|
||||||
import org.bukkit.entity.Slime
|
|
||||||
|
|
||||||
object EntityArgParserScale : EntityArgParser {
|
|
||||||
override fun parseArguments(args: Array<out String>): EntityArgParseResult? {
|
|
||||||
var attributeValue: Double? = null
|
|
||||||
|
|
||||||
for (arg in args) {
|
|
||||||
val argSplit = arg.split(":")
|
|
||||||
if (!argSplit[0].equals("scale", ignoreCase = true)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if (argSplit.size < 2) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
attributeValue = argSplit[1].toDoubleOrNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
attributeValue ?: return null
|
|
||||||
|
|
||||||
return EntityArgParseResult(
|
|
||||||
{
|
|
||||||
if (it !is LivingEntity) {
|
|
||||||
return@EntityArgParseResult false
|
|
||||||
}
|
|
||||||
|
|
||||||
val inst = it.getAttribute(Attribute.GENERIC_SCALE) ?: return@EntityArgParseResult false
|
|
||||||
inst.value >= attributeValue
|
|
||||||
},
|
|
||||||
{
|
|
||||||
if (it !is LivingEntity) {
|
|
||||||
return@EntityArgParseResult
|
|
||||||
}
|
|
||||||
|
|
||||||
it.getAttribute(Attribute.GENERIC_SCALE)?.baseValue = attributeValue
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items
|
|
||||||
|
|
||||||
import com.willfp.eco.core.items.Items
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserFireResistant
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserGlint
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserItemName
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserMaxDamage
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserMaxStackSize
|
|
||||||
import com.willfp.eco.internal.compat.modern.items.parsers.ArgParserTrim
|
|
||||||
import com.willfp.eco.internal.items.ModernItemArgParsers
|
|
||||||
|
|
||||||
class ModernItemArgParsersImpl : ModernItemArgParsers {
|
|
||||||
override fun registerAll() {
|
|
||||||
Items.registerArgParser(ArgParserTrim)
|
|
||||||
Items.registerArgParser(ArgParserFireResistant)
|
|
||||||
Items.registerArgParser(ArgParserGlint)
|
|
||||||
Items.registerArgParser(ArgParserItemName)
|
|
||||||
Items.registerArgParser(ArgParserMaxDamage)
|
|
||||||
Items.registerArgParser(ArgParserMaxStackSize)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.items.templates.FlagArgParser
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta
|
|
||||||
|
|
||||||
object ArgParserFireResistant : FlagArgParser("fire_resistant") {
|
|
||||||
override fun apply(meta: ItemMeta) {
|
|
||||||
meta.isFireResistant = true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun test(meta: ItemMeta): Boolean {
|
|
||||||
return meta.isFireResistant
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.items.templates.FlagArgParser
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta
|
|
||||||
|
|
||||||
object ArgParserGlint : FlagArgParser("glint") {
|
|
||||||
override fun apply(meta: ItemMeta) {
|
|
||||||
meta.setEnchantmentGlintOverride(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun test(meta: ItemMeta): Boolean {
|
|
||||||
return meta.hasEnchantmentGlintOverride()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.items.templates.ValueArgParser
|
|
||||||
import com.willfp.eco.util.StringUtils
|
|
||||||
import net.kyori.adventure.text.Component
|
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta
|
|
||||||
|
|
||||||
object ArgParserItemName : ValueArgParser<Component>("item_name") {
|
|
||||||
override fun parse(arg: String): Component {
|
|
||||||
return StringUtils.formatToComponent(arg)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(meta: ItemMeta, value: Component) {
|
|
||||||
meta.itemName(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun test(meta: ItemMeta): String? {
|
|
||||||
if (!meta.hasItemName()) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
val name = MiniMessage.miniMessage().serialize(meta.itemName())
|
|
||||||
|
|
||||||
return name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.items.templates.ValueArgParser
|
|
||||||
import org.bukkit.inventory.meta.Damageable
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta
|
|
||||||
|
|
||||||
object ArgParserMaxDamage : ValueArgParser<Int>("max_damage") {
|
|
||||||
override fun parse(arg: String): Int? {
|
|
||||||
return arg.toIntOrNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(meta: ItemMeta, value: Int) {
|
|
||||||
if (meta !is Damageable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
meta.setMaxDamage(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun test(meta: ItemMeta): String? {
|
|
||||||
if (meta !is Damageable) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!meta.hasMaxDamage()) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return meta.maxDamage.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.items.templates.ValueArgParser
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta
|
|
||||||
|
|
||||||
object ArgParserMaxStackSize : ValueArgParser<Int>("max_stack_size") {
|
|
||||||
override fun parse(arg: String): Int? {
|
|
||||||
return arg.toIntOrNull()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(meta: ItemMeta, value: Int) {
|
|
||||||
meta.setMaxStackSize(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun test(meta: ItemMeta): String? {
|
|
||||||
if (!meta.hasMaxStackSize()) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return meta.maxStackSize.toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.items.parsers
|
|
||||||
|
|
||||||
import com.willfp.eco.core.items.args.LookupArgParser
|
|
||||||
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.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
|
|
||||||
}
|
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
material = Registry.TRIM_MATERIAL.get(NamespacedKey.minecraft(argSplit.getOrElse(1) {""}))
|
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
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
|
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
val materialKey = Registry.TRIM_MATERIAL.getKey(trim.material) ?: return null
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
val patternKey = Registry.TRIM_PATTERN.getKey(trim.pattern) ?: return null
|
|
||||||
|
|
||||||
return "trim:${materialKey.key.lowercase()}:${patternKey.key.lowercase()}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,22 +6,10 @@ 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("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
|
||||||
compileOnly("me.clip:placeholderapi:2.11.4")
|
compileOnly("me.clip:placeholderapi:2.10.10")
|
||||||
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")
|
||||||
compileOnly("com.moandjiezana.toml:toml4j:0.7.2")
|
compileOnly("com.moandjiezana.toml:toml4j:0.7.2")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
|
||||||
compileJava {
|
|
||||||
options.release = 17
|
|
||||||
}
|
|
||||||
|
|
||||||
compileKotlin {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "17"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -8,12 +8,10 @@ import org.bukkit.command.TabCompleter
|
|||||||
|
|
||||||
class DelegatedBukkitCommand(
|
class DelegatedBukkitCommand(
|
||||||
private val delegate: EcoPluginCommand
|
private val delegate: EcoPluginCommand
|
||||||
) : Command(
|
) : Command(delegate.name), TabCompleter, PluginIdentifiableCommand {
|
||||||
delegate.name,
|
private var _aliases: List<String>? = null
|
||||||
delegate.description ?: "",
|
private var _description: String? = null
|
||||||
"/${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)
|
||||||
}
|
}
|
||||||
@@ -38,4 +36,16 @@ 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(
|
||||||
private val parentDelegate: PluginCommandBase,
|
parentDelegate: CommandBase,
|
||||||
plugin: EcoPlugin,
|
plugin: EcoPlugin,
|
||||||
name: String,
|
name: String,
|
||||||
permission: String,
|
permission: String,
|
||||||
@@ -39,9 +39,6 @@ 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(
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.willfp.eco.internal.command
|
|||||||
import com.willfp.eco.core.EcoPlugin
|
import com.willfp.eco.core.EcoPlugin
|
||||||
import com.willfp.eco.core.command.CommandBase
|
import com.willfp.eco.core.command.CommandBase
|
||||||
import com.willfp.eco.core.command.NotificationException
|
import com.willfp.eco.core.command.NotificationException
|
||||||
|
import com.willfp.eco.core.config.base.LangYml
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.command.Command
|
import org.bukkit.command.Command
|
||||||
import org.bukkit.command.CommandExecutor
|
import org.bukkit.command.CommandExecutor
|
||||||
@@ -105,7 +106,7 @@ abstract class HandledCommand(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
notifyFalse(!isPlayersOnly || sender is Player, "not-player")
|
notifyFalse(!isPlayersOnly || sender is Player, LangYml.KEY_NOT_PLAYER)
|
||||||
|
|
||||||
onExecute(sender, args)
|
onExecute(sender, args)
|
||||||
|
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
package com.willfp.eco.internal.compat
|
|
||||||
|
|
||||||
import com.willfp.eco.core.Prerequisite
|
|
||||||
import com.willfp.eco.core.proxy.exceptions.ProxyError
|
|
||||||
|
|
||||||
private const val BASE_PACKAGE = "com.willfp.eco.internal.compat.modern"
|
|
||||||
private val isModern = Prerequisite.HAS_PAPER.isMet && Prerequisite.HAS_1_21.isMet
|
|
||||||
|
|
||||||
internal annotation class ModernCompatibilityProxy(
|
|
||||||
val location: String
|
|
||||||
)
|
|
||||||
|
|
||||||
private val cache = mutableMapOf<Class<*>, Any>()
|
|
||||||
|
|
||||||
object ModernCompatibilityScope {
|
|
||||||
inline fun <reified T> loadProxy(): T {
|
|
||||||
return loadCompatibilityProxy(T::class.java)
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun <reified T> useProxy(block: T.() -> Any?) {
|
|
||||||
val proxy = loadProxy<T>()
|
|
||||||
|
|
||||||
with(proxy) {
|
|
||||||
block()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun <R> ifModern(block: ModernCompatibilityScope.() -> R) {
|
|
||||||
if (!isModern) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
block(ModernCompatibilityScope)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun <T> loadCompatibilityProxy(clazz: Class<T>): T {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return cache.getOrPut(clazz) {
|
|
||||||
loadProxyUncached(clazz)
|
|
||||||
} as T
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun loadProxyUncached(clazz: Class<*>): Any {
|
|
||||||
val proxy = clazz.getAnnotation(ModernCompatibilityProxy::class.java)
|
|
||||||
val location = proxy?.location ?: throw IllegalArgumentException("Class ${clazz.name} is not a proxy")
|
|
||||||
val className = "$BASE_PACKAGE.$location"
|
|
||||||
|
|
||||||
try {
|
|
||||||
val found = Class.forName(className)
|
|
||||||
|
|
||||||
val constructor = found.getConstructor()
|
|
||||||
val instance = constructor.newInstance()
|
|
||||||
|
|
||||||
if (!clazz.isInstance(instance)) {
|
|
||||||
throw ProxyError(
|
|
||||||
"Modern compatibility proxy class $className does not implement ${clazz.name}",
|
|
||||||
ClassCastException()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return instance
|
|
||||||
} catch (e: ClassNotFoundException) {
|
|
||||||
throw ProxyError("Could not find modern compatibility proxy class $className", e)
|
|
||||||
} catch (e: NoSuchMethodException) {
|
|
||||||
throw ProxyError("Could not find no-args constructor for modern compatibility proxy class $className", e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -30,8 +30,6 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,7 +110,6 @@ 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,
|
||||||
|
|||||||
@@ -16,16 +16,11 @@ open class EcoConfig(
|
|||||||
private val values = ConcurrentHashMap<String, Any?>()
|
private val values = ConcurrentHashMap<String, Any?>()
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private val injections = mutableMapOf<String, InjectablePlaceholder>()
|
var injections = ConcurrentHashMap<String, InjectablePlaceholder>()
|
||||||
|
|
||||||
@Transient
|
fun init(values: Map<String, Any?>) {
|
||||||
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 {
|
||||||
@@ -184,7 +179,6 @@ 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.pattern()] = placeholder
|
injections[placeholder.pattern.pattern()] = placeholder
|
||||||
injectionHash = injectionHash xor placeholder.hashCode()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,7 +188,6 @@ 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?> {
|
||||||
@@ -246,6 +239,18 @@ open class EcoConfig(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
override fun hashCode(): Int {
|
||||||
|
/*
|
||||||
|
The keys are completely redundant, as they are only used to prevent
|
||||||
|
duplicate keys in the map. Therefore, we can ignore them and just
|
||||||
|
hash the actual placeholder values.
|
||||||
|
*/
|
||||||
|
|
||||||
|
var injectionHash = 0
|
||||||
|
|
||||||
|
injections.forEachValue(5) {
|
||||||
|
injectionHash = injectionHash xor (it.hashCode() shl 5)
|
||||||
|
}
|
||||||
|
|
||||||
// hashCode() has to compute extremely quickly, so we're using bitwise, because why not?
|
// 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
|
// Fucking filthy to use identityHashCode here, but it should be extremely fast
|
||||||
val identityHash = System.identityHashCode(this)
|
val identityHash = System.identityHashCode(this)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ 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
|
||||||
|
|
||||||
class EcoConfigSection(
|
class EcoConfigSection(
|
||||||
type: ConfigType,
|
type: ConfigType,
|
||||||
@@ -9,6 +10,7 @@ class EcoConfigSection(
|
|||||||
injections: Map<String, InjectablePlaceholder> = emptyMap()
|
injections: Map<String, InjectablePlaceholder> = emptyMap()
|
||||||
) : EcoConfig(type) {
|
) : EcoConfig(type) {
|
||||||
init {
|
init {
|
||||||
this.init(values, injections)
|
this.init(values)
|
||||||
|
this.injections = ConcurrentHashMap(injections)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,10 @@ import java.io.IOException
|
|||||||
import java.io.InputStreamReader
|
import java.io.InputStreamReader
|
||||||
import java.io.OutputStream
|
import java.io.OutputStream
|
||||||
import java.io.Reader
|
import java.io.Reader
|
||||||
import java.nio.ByteBuffer
|
|
||||||
import java.nio.channels.AsynchronousFileChannel
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.StandardOpenOption
|
import java.nio.file.StandardOpenOption
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
open class EcoLoadableConfig(
|
open class EcoLoadableConfig(
|
||||||
type: ConfigType,
|
type: ConfigType,
|
||||||
configName: String,
|
configName: String,
|
||||||
@@ -75,20 +74,6 @@ open class EcoLoadableConfig(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun saveAsync() {
|
|
||||||
// Save asynchronously using NIO
|
|
||||||
AsynchronousFileChannel.open(
|
|
||||||
configFile.toPath(),
|
|
||||||
StandardOpenOption.WRITE,
|
|
||||||
StandardOpenOption.CREATE
|
|
||||||
).use { channel ->
|
|
||||||
channel.write(
|
|
||||||
ByteBuffer.wrap(this.toPlaintext().toByteArray()),
|
|
||||||
0
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun makeHeader(contents: String) {
|
private fun makeHeader(contents: String) {
|
||||||
header.clear()
|
header.clear()
|
||||||
|
|
||||||
@@ -106,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), emptyMap())
|
super.init(type.toMap(string))
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
class EcoRepresenter : Representer(DumperOptions()) {
|
@Suppress("DEPRECATION")
|
||||||
|
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()), emptyMap())
|
config.init(type.toMap(reader.readToString()))
|
||||||
return config
|
return config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
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
|
||||||
|
|
||||||
@@ -13,8 +14,7 @@ class ReflectiveConfigHandler(
|
|||||||
)
|
)
|
||||||
|
|
||||||
override fun callUpdate() {
|
override fun callUpdate() {
|
||||||
@Suppress("DEPRECATION", "REMOVAL")
|
for (method in reflections.getMethodsAnnotatedWith(ConfigUpdater::class.java)) {
|
||||||
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)
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.willfp.eco.internal.drops
|
package com.willfp.eco.internal.drops
|
||||||
|
|
||||||
import com.willfp.eco.core.Prerequisite
|
|
||||||
import com.willfp.eco.core.drops.DropQueue
|
import com.willfp.eco.core.drops.DropQueue
|
||||||
import com.willfp.eco.core.events.DropQueuePushEvent
|
import com.willfp.eco.core.events.DropQueuePushEvent
|
||||||
import com.willfp.eco.core.integrations.antigrief.AntigriefManager
|
import com.willfp.eco.core.integrations.antigrief.AntigriefManager
|
||||||
@@ -54,16 +53,13 @@ open class EcoDropQueue(val player: Player) : DropQueue() {
|
|||||||
hasTelekinesis = false
|
hasTelekinesis = false
|
||||||
}
|
}
|
||||||
|
|
||||||
val pushEvent = DropQueuePushEvent(player, items.toMutableList(), location, xp, hasTelekinesis)
|
val pushEvent = DropQueuePushEvent(player, items, location, xp, hasTelekinesis)
|
||||||
Bukkit.getServer().pluginManager.callEvent(pushEvent)
|
Bukkit.getServer().pluginManager.callEvent(pushEvent)
|
||||||
|
|
||||||
if (pushEvent.isCancelled) {
|
if (pushEvent.isCancelled) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
items.clear()
|
|
||||||
items.addAll(pushEvent.items)
|
|
||||||
|
|
||||||
val world = location.world!!
|
val world = location.world!!
|
||||||
location = location.add(0.5, 0.5, 0.5)
|
location = location.add(0.5, 0.5, 0.5)
|
||||||
items.removeIf { itemStack: ItemStack -> itemStack.type == Material.AIR }
|
items.removeIf { itemStack: ItemStack -> itemStack.type == Material.AIR }
|
||||||
@@ -76,17 +72,10 @@ open class EcoDropQueue(val player: Player) : DropQueue() {
|
|||||||
world.dropItem(location, drop!!).velocity = Vector()
|
world.dropItem(location, drop!!).velocity = Vector()
|
||||||
}
|
}
|
||||||
if (xp > 0) {
|
if (xp > 0) {
|
||||||
if (Prerequisite.HAS_PAPER.isMet) {
|
val orb =
|
||||||
player.giveExp(xp, true)
|
world.spawnEntity(player.location.add(0.0, 0.2, 0.0), EntityType.EXPERIENCE_ORB) as ExperienceOrb
|
||||||
} else {
|
orb.velocity = Vector(0, 0, 0)
|
||||||
val orb =
|
orb.experience = xp
|
||||||
world.spawnEntity(
|
|
||||||
player.location.add(0.0, 0.2, 0.0),
|
|
||||||
EntityType.EXPERIENCE_ORB
|
|
||||||
) as ExperienceOrb
|
|
||||||
orb.velocity = Vector(0, 0, 0)
|
|
||||||
orb.experience = xp
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (drop in items) {
|
for (drop in items) {
|
||||||
|
|||||||
@@ -40,4 +40,4 @@ object EntityArgParserFlySpeed : EntityArgParser {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.willfp.eco.internal.compat.modern.entities.parsers
|
package com.willfp.eco.internal.entities
|
||||||
|
|
||||||
import com.willfp.eco.core.entities.args.EntityArgParseResult
|
import com.willfp.eco.core.entities.args.EntityArgParseResult
|
||||||
import com.willfp.eco.core.entities.args.EntityArgParser
|
import com.willfp.eco.core.entities.args.EntityArgParser
|
||||||
@@ -28,7 +28,7 @@ object EntityArgParserJumpStrength : EntityArgParser {
|
|||||||
return@EntityArgParseResult false
|
return@EntityArgParseResult false
|
||||||
}
|
}
|
||||||
|
|
||||||
val inst = it.getAttribute(Attribute.GENERIC_JUMP_STRENGTH) ?: return@EntityArgParseResult false
|
val inst = it.getAttribute(Attribute.HORSE_JUMP_STRENGTH) ?: return@EntityArgParseResult false
|
||||||
inst.value >= attributeValue
|
inst.value >= attributeValue
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -36,8 +36,8 @@ object EntityArgParserJumpStrength : EntityArgParser {
|
|||||||
return@EntityArgParseResult
|
return@EntityArgParseResult
|
||||||
}
|
}
|
||||||
|
|
||||||
it.getAttribute(Attribute.GENERIC_JUMP_STRENGTH)?.baseValue = attributeValue
|
it.getAttribute(Attribute.HORSE_JUMP_STRENGTH)?.baseValue = attributeValue
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,6 @@ object EntityArgParserName : EntityArgParser {
|
|||||||
|
|
||||||
val formatted = StringUtils.format(name)
|
val formatted = StringUtils.format(name)
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
return EntityArgParseResult(
|
return EntityArgParseResult(
|
||||||
{ it.customName == formatted },
|
{ it.customName == formatted },
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
package com.willfp.eco.internal.entities
|
|
||||||
|
|
||||||
import com.willfp.eco.internal.compat.ModernCompatibilityProxy
|
|
||||||
|
|
||||||
@ModernCompatibilityProxy("entities.ModernEntityArgParsersImpl")
|
|
||||||
interface ModernEntityArgParsers {
|
|
||||||
fun registerAll()
|
|
||||||
}
|
|
||||||
@@ -2,14 +2,12 @@ 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(
|
||||||
@@ -17,48 +15,20 @@ private class RegisteredPacketListener(
|
|||||||
val listener: PacketListener
|
val listener: PacketListener
|
||||||
)
|
)
|
||||||
|
|
||||||
private val listeners = listMap<PacketPriority, RegisteredPacketListener>()
|
private val listeners = mutableMapOf<PacketPriority, MutableList<RegisteredPacketListener>>()
|
||||||
|
|
||||||
fun PacketEvent.handleSend() {
|
fun PacketEvent.handleSend() {
|
||||||
for (priority in PacketPriority.values()) {
|
for (priority in PacketPriority.values()) {
|
||||||
for (listener in listeners[priority]) {
|
for (listener in listeners[priority] ?: continue) {
|
||||||
try {
|
listener.listener.onSend(this)
|
||||||
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]) {
|
for (listener in listeners[priority] ?: continue) {
|
||||||
try {
|
listener.listener.onReceive(this)
|
||||||
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()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,9 +50,11 @@ class EcoEventManager(private val plugin: EcoPlugin) : EventManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun registerPacketListener(listener: PacketListener) {
|
override fun registerPacketListener(listener: PacketListener) {
|
||||||
listeners[listener.priority] += RegisteredPacketListener(
|
listeners.getOrPut(listener.priority) { mutableListOf() }.add(
|
||||||
plugin,
|
RegisteredPacketListener(
|
||||||
listener
|
plugin,
|
||||||
|
listener
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ class EcoExtensionLoader(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
@Throws(MalformedExtensionException::class)
|
@Throws(MalformedExtensionException::class)
|
||||||
private fun loadExtension(extensionJar: File) {
|
private fun loadExtension(extensionJar: File) {
|
||||||
val url = extensionJar.toURI().toURL()
|
val url = extensionJar.toURI().toURL()
|
||||||
@@ -60,7 +59,6 @@ class EcoExtensionLoader(
|
|||||||
val pluginVersion = Version(extensionYml.getStringOrNull("plugin-version") ?: "0.0.0")
|
val pluginVersion = Version(extensionYml.getStringOrNull("plugin-version") ?: "0.0.0")
|
||||||
val pluginName = extensionYml.getStringOrNull("plugin")
|
val pluginName = extensionYml.getStringOrNull("plugin")
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
if (pluginName != null && !pluginName.equals(this.plugin.description.name, ignoreCase = true)) {
|
if (pluginName != null && !pluginName.equals(this.plugin.description.name, ignoreCase = true)) {
|
||||||
throw ExtensionLoadException("${extensionJar.name} is only compatible with $pluginName!")
|
throw ExtensionLoadException("${extensionJar.name} is only compatible with $pluginName!")
|
||||||
}
|
}
|
||||||
@@ -84,7 +82,6 @@ class EcoExtensionLoader(
|
|||||||
author = "Unnamed Author"
|
author = "Unnamed Author"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
if (Version(this.plugin.description.version) < pluginVersion) {
|
if (Version(this.plugin.description.version) < pluginVersion) {
|
||||||
throw ExtensionLoadException("Plugin version is too low for ${extensionJar.name}!")
|
throw ExtensionLoadException("Plugin version is too low for ${extensionJar.name}!")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,6 @@ import org.bukkit.NamespacedKey
|
|||||||
|
|
||||||
class EcoNamespacedKeyFactory(private val plugin: EcoPlugin) : NamespacedKeyFactory {
|
class EcoNamespacedKeyFactory(private val plugin: EcoPlugin) : NamespacedKeyFactory {
|
||||||
override fun create(key: String): NamespacedKey {
|
override fun create(key: String): NamespacedKey {
|
||||||
return NamespacedKeyUtils.create(plugin.id, key)
|
return NamespacedKeyUtils.create(plugin.name, key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,4 +14,4 @@ class EcoRunnableFactory(private val plugin: EcoPlugin) : RunnableFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class FastInternalNamespacedKeyFactory : InternalNamespacedKeyFactory {
|
|||||||
|
|
||||||
class SafeInternalNamespacedKeyFactory : InternalNamespacedKeyFactory {
|
class SafeInternalNamespacedKeyFactory : InternalNamespacedKeyFactory {
|
||||||
override fun create(namespace: String, key: String): NamespacedKey {
|
override fun create(namespace: String, key: String): NamespacedKey {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
return NamespacedKey(namespace, key)
|
return NamespacedKey(namespace, key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ class EcoMenu(
|
|||||||
getPossiblyReactiveSlot(row, column, player)
|
getPossiblyReactiveSlot(row, column, player)
|
||||||
|
|
||||||
override fun open(player: Player): Inventory {
|
override fun open(player: Player): Inventory {
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
val inventory = if (columns == 9) {
|
val inventory = if (columns == 9) {
|
||||||
Bukkit.createInventory(null, rows * columns, title)
|
Bukkit.createInventory(null, rows * columns, title)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package com.willfp.eco.internal.gui.menu
|
package com.willfp.eco.internal.gui.menu
|
||||||
|
|
||||||
import com.willfp.eco.core.Eco
|
|
||||||
import com.willfp.eco.core.Prerequisite
|
|
||||||
import com.willfp.eco.core.gui.menu.events.CaptiveItemChangeEvent
|
import com.willfp.eco.core.gui.menu.events.CaptiveItemChangeEvent
|
||||||
import com.willfp.eco.core.items.isEcoEmpty
|
import com.willfp.eco.core.items.isEmpty
|
||||||
import com.willfp.eco.core.recipe.parts.EmptyTestableItem
|
import com.willfp.eco.core.recipe.parts.EmptyTestableItem
|
||||||
import com.willfp.eco.util.MenuUtils
|
import com.willfp.eco.util.MenuUtils
|
||||||
import com.willfp.eco.util.openMenu
|
import com.willfp.eco.util.openMenu
|
||||||
@@ -22,23 +20,9 @@ fun Player.forceRenderedInventory(menu: RenderedInventory) {
|
|||||||
trackedForceRendered[this.uniqueId] = menu
|
trackedForceRendered[this.uniqueId] = menu
|
||||||
}
|
}
|
||||||
|
|
||||||
// Workaround because 1.21 has OpenInventory as an interface instead of an abstract class like in previous versions
|
|
||||||
interface TopInventoryProxy {
|
|
||||||
fun getTopInventory(player: Player): Inventory
|
|
||||||
}
|
|
||||||
|
|
||||||
private val Player.topInventory: Inventory
|
|
||||||
get() {
|
|
||||||
return if (!Prerequisite.HAS_1_21.isMet) {
|
|
||||||
Eco.get().ecoPlugin.getProxy(TopInventoryProxy::class.java).getTopInventory(this)
|
|
||||||
} else {
|
|
||||||
this.openInventory.topInventory
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val Player.renderedInventory: RenderedInventory?
|
val Player.renderedInventory: RenderedInventory?
|
||||||
get() = trackedForceRendered[this.uniqueId]
|
get() = trackedForceRendered[this.uniqueId]
|
||||||
?: this.topInventory.asRenderedInventory()
|
?: this.openInventory.topInventory.asRenderedInventory()
|
||||||
|
|
||||||
class RenderedInventory(
|
class RenderedInventory(
|
||||||
val menu: EcoMenu,
|
val menu: EcoMenu,
|
||||||
@@ -71,7 +55,7 @@ class RenderedInventory(
|
|||||||
val actualItem = inventory.getItem(bukkit) ?: continue
|
val actualItem = inventory.getItem(bukkit) ?: continue
|
||||||
|
|
||||||
if (slot.isCaptiveFromEmpty) {
|
if (slot.isCaptiveFromEmpty) {
|
||||||
if (!actualItem.isEcoEmpty) {
|
if (!actualItem.isEmpty) {
|
||||||
newCaptive[position] = actualItem
|
newCaptive[position] = actualItem
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -34,6 +34,4 @@ 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,7 +6,6 @@ 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
|
||||||
@@ -16,14 +15,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 = listMap<ClickType, SlotHandler>()
|
private val handlers = mutableMapOf<ClickType, MutableList<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[type] += action
|
handlers.computeIfAbsent(type) { mutableListOf() } += action
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ 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
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
|
class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
|
||||||
init {
|
init {
|
||||||
register()
|
register()
|
||||||
@@ -21,17 +20,14 @@ class PAPIExpansion(private val plugin: EcoPlugin) : PlaceholderExpansion() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun getAuthor(): String {
|
override fun getAuthor(): String {
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
return java.lang.String.join(", ", plugin.description.authors)
|
return java.lang.String.join(", ", plugin.description.authors)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getIdentifier(): String {
|
override fun getIdentifier(): String {
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
return plugin.description.name.lowercase()
|
return plugin.description.name.lowercase()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getVersion(): String {
|
override fun getVersion(): String {
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
return plugin.description.version
|
return plugin.description.version
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user