mirror of
https://github.com/CarmJos/MoeTeleport.git
synced 2026-06-05 00:28:16 +08:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8bc2f0dba5 | |||
| 9ee18d0f3c | |||
| b311820483 | |||
| b8d2d060dc | |||
| 3b3e678fc7 | |||
| 47dfad862b | |||
| aa723087d4 | |||
| 55a692243d | |||
| 7862a698bd | |||
| 351f9a8590 | |||
| ce3226ee18 | |||
| 5461063263 | |||
| c7b0bf8261 | |||
| d71a3ab6cd | |||
| 4da69909e3 | |||
| 9b2b673cd8 | |||
| affdb47034 | |||
| 5439c57dde |
@@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
name: 问题提交
|
||||||
|
about: 提交并描述问题,帮助我们对其进行检查与修复。
|
||||||
|
title: ''
|
||||||
|
labels: bug
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**问题简述**
|
||||||
|
用简短的话语描述一下大概问题。
|
||||||
|
|
||||||
|
**问题来源**
|
||||||
|
描述一下通过哪些操作才发现的问题,如:
|
||||||
|
1. 打开 '...'
|
||||||
|
2. 点击了 '....'
|
||||||
|
3. 出现了报错 '....'
|
||||||
|
|
||||||
|
**预期结果**(可选)
|
||||||
|
如果问题不发生,应该是什么情况
|
||||||
|
|
||||||
|
**问题截图/问题报错**
|
||||||
|
如果有报错或输出,请提供截图。
|
||||||
|
|
||||||
|
**操作环境**
|
||||||
|
请在后台输入 `version` 并复制相关输出。
|
||||||
|
|
||||||
|
|
||||||
|
**其他补充**
|
||||||
|
如有其他补充,可以在这里描述。
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
---
|
||||||
|
name: 功能需求
|
||||||
|
about: 希望我们提供更多的功能。
|
||||||
|
title: ''
|
||||||
|
labels: enhancement
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**功能简述**
|
||||||
|
简单的描述一下你想要的功能
|
||||||
|
|
||||||
|
**需求来源**
|
||||||
|
简单的描述一下为什么需要这个功能。
|
||||||
|
|
||||||
|
**功能参考**(可选)
|
||||||
|
如果有相关功能的参考,如文本、截图,请提供给我们。
|
||||||
|
|
||||||
|
**附加内容**
|
||||||
|
如果有什么小细节需要重点注意,请在这里告诉我们。
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
||||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
||||||
|
|
||||||
name: Build
|
name: Build & Tests
|
||||||
|
|
||||||
on:
|
on:
|
||||||
# 支持手动触发构建
|
# 支持手动触发构建
|
||||||
@@ -29,10 +29,15 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
- name: "Target Stage"
|
|
||||||
run: mkdir staging && cp target/*.jar staging
|
- name: "Target Staging"
|
||||||
|
run: |
|
||||||
|
mkdir artifacts
|
||||||
|
cp -vrf target/ artifacts/target/
|
||||||
|
cp -vrf asset/*.jar artifacts
|
||||||
|
|
||||||
- name: "Upload artifact"
|
- name: "Upload artifact"
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: Artifact
|
name: Artifact
|
||||||
path: staging
|
path: artifacts
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
name: Release Version
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types:
|
||||||
|
- published # 创建release的时候触发
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: "Set up JDK"
|
||||||
|
uses: actions/setup-java@v2
|
||||||
|
with:
|
||||||
|
java-version: '11'
|
||||||
|
distribution: 'adopt'
|
||||||
|
# cache: maven
|
||||||
|
server-id: github
|
||||||
|
server-username: MAVEN_USERNAME
|
||||||
|
server-password: MAVEN_TOKEN
|
||||||
|
- name: "Package"
|
||||||
|
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true -DskipTests
|
||||||
|
env:
|
||||||
|
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||||
|
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||||
|
|
||||||
|
- name: "Upload Release Asset"
|
||||||
|
id: upload-release-asset
|
||||||
|
uses: shogo82148/actions-upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: asset/*.jar
|
||||||
|
asset_content_type: application/java-archive
|
||||||
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -18,6 +18,8 @@
|
|||||||
## [依赖](https://github.com/CarmJos/MoeTeleport/network/dependencies)
|
## [依赖](https://github.com/CarmJos/MoeTeleport/network/dependencies)
|
||||||
|
|
||||||
- **[必须]** 插件本体基于 [Spigot-API](https://hub.spigotmc.org/stash/projects/SPIGOT) 、[BukkitAPI](http://bukkit.org/) 实现。
|
- **[必须]** 插件本体基于 [Spigot-API](https://hub.spigotmc.org/stash/projects/SPIGOT) 、[BukkitAPI](http://bukkit.org/) 实现。
|
||||||
|
- **[自带]** 消息格式基于 [MineDown](https://github.com/Phoenix616/MineDown) 实现。
|
||||||
|
- 所有 messages.yml 均支持 MineDown 语法。
|
||||||
- **[推荐]** 变量部分基于 [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) 实现。
|
- **[推荐]** 变量部分基于 [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) 实现。
|
||||||
|
|
||||||
详细依赖列表可见 [Dependencies](https://github.com/CarmJos/MoeTeleport/network/dependencies) 。
|
详细依赖列表可见 [Dependencies](https://github.com/CarmJos/MoeTeleport/network/dependencies) 。
|
||||||
@@ -28,6 +30,10 @@
|
|||||||
- 可选参数 `[参数]`
|
- 可选参数 `[参数]`
|
||||||
|
|
||||||
```text
|
```text
|
||||||
|
# /MoeTeleport reload
|
||||||
|
@ 管理指令 (MoeTeleport.admin)
|
||||||
|
- 重载插件配置文件。
|
||||||
|
|
||||||
# /back
|
# /back
|
||||||
- 返回上一个传送地点
|
- 返回上一个传送地点
|
||||||
|
|
||||||
@@ -41,7 +47,9 @@
|
|||||||
- 拒绝一个请求,可以限定某个玩家。
|
- 拒绝一个请求,可以限定某个玩家。
|
||||||
|
|
||||||
# /home [name]
|
# /home [name]
|
||||||
- 返回家 (不填name会返回第一个家,若存在home则优先返回home)
|
- 返回设定的家
|
||||||
|
- 不填name会返回第一个设置的家
|
||||||
|
- 若存在名为“home”的家则优先返回“home”。
|
||||||
# /listHome
|
# /listHome
|
||||||
- 列出所有家的位置
|
- 列出所有家的位置
|
||||||
# /setHome [name]
|
# /setHome [name]
|
||||||
@@ -58,7 +66,9 @@
|
|||||||
|
|
||||||
### 消息配置文件 ([messages.yml](src/main/resources/messages.yml))
|
### 消息配置文件 ([messages.yml](src/main/resources/messages.yml))
|
||||||
|
|
||||||
详见源文件。
|
支持 [MineDown 语法](https://wiki.phoenix616.dev/library:minedown:syntax),详见源文件。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### 玩家数据配置文件 (data/\<UUID\>.yml)
|
### 玩家数据配置文件 (data/\<UUID\>.yml)
|
||||||
|
|
||||||
@@ -79,3 +89,22 @@ homes:
|
|||||||
感谢您成为开源项目的支持者!
|
感谢您成为开源项目的支持者!
|
||||||
|
|
||||||
<img height=25% width=25% src="https://raw.githubusercontent.com/CarmJos/CarmJos/main/img/donate-code.jpg" alt=""/>
|
<img height=25% width=25% src="https://raw.githubusercontent.com/CarmJos/CarmJos/main/img/donate-code.jpg" alt=""/>
|
||||||
|
|
||||||
|
## 开源协议
|
||||||
|
|
||||||
|
本项目源码采用 [GNU General Public License v3.0](https://opensource.org/licenses/GPL-3.0) 开源协议。
|
||||||
|
> ### 关于 GPL 协议
|
||||||
|
> GNU General Public Licence (GPL) 有可能是开源界最常用的许可模式。GPL 保证了所有开发者的权利,同时为使用者提供了足够的复制,分发,修改的权利:
|
||||||
|
>
|
||||||
|
> #### 可自由复制
|
||||||
|
> 你可以将软件复制到你的电脑,你客户的电脑,或者任何地方。复制份数没有任何限制。
|
||||||
|
> #### 可自由分发
|
||||||
|
> 在你的网站提供下载,拷贝到U盘送人,或者将源代码打印出来从窗户扔出去(环保起见,请别这样做)。
|
||||||
|
> #### 可以用来盈利
|
||||||
|
> 你可以在分发软件的时候收费,但你必须在收费前向你的客户提供该软件的 GNU GPL 许可协议,以便让他们知道,他们可以从别的渠道免费得到这份软件,以及你收费的理由。
|
||||||
|
> #### 可自由修改
|
||||||
|
> 如果你想添加或删除某个功能,没问题,如果你想在别的项目中使用部分代码,也没问题,唯一的要求是,使用了这段代码的项目也必须使用 GPL 协议。
|
||||||
|
>
|
||||||
|
> 需要注意的是,分发的时候,需要明确提供源代码和二进制文件,另外,用于某些程序的某些协议有一些问题和限制,你可以看一下 @PierreJoye 写的 Practical Guide to GPL Compliance 一文。使用 GPL 协议,你必须在源代码代码中包含相应信息,以及协议本身。
|
||||||
|
>
|
||||||
|
> *以上文字来自 [五种开源协议GPL,LGPL,BSD,MIT,Apache](https://www.oschina.net/question/54100_9455) 。*
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
<maven.compiler.source>8</maven.compiler.source>
|
||||||
<maven.compiler.target>8</maven.compiler.target>
|
<maven.compiler.target>8</maven.compiler.target>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<groupId>cc.carm.plugin</groupId>
|
<groupId>cc.carm.plugin</groupId>
|
||||||
<artifactId>moeteleport</artifactId>
|
<artifactId>moeteleport</artifactId>
|
||||||
<version>1.0.1</version>
|
<version>2.0.0</version>
|
||||||
|
|
||||||
<name>MoeTeleport</name>
|
<name>MoeTeleport</name>
|
||||||
<description>喵喵传送,简单的传送、设置家的插件。</description>
|
<description>喵喵传送,简单的传送、设置家的插件。</description>
|
||||||
@@ -71,6 +71,11 @@
|
|||||||
<url>https://repo1.maven.org/maven2/</url>
|
<url>https://repo1.maven.org/maven2/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
|
||||||
|
<repository>
|
||||||
|
<id>minebench-repo</id>
|
||||||
|
<url>https://repo.minebench.de/</url>
|
||||||
|
</repository>
|
||||||
|
|
||||||
<repository>
|
<repository>
|
||||||
<id>github</id>
|
<id>github</id>
|
||||||
<name>GitHub Packages</name>
|
<name>GitHub Packages</name>
|
||||||
@@ -103,6 +108,13 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.themoep</groupId>
|
||||||
|
<artifactId>minedown</artifactId>
|
||||||
|
<version>1.7.1-SNAPSHOT</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
@@ -161,12 +173,12 @@
|
|||||||
<goals>
|
<goals>
|
||||||
<goal>shade</goal>
|
<goal>shade</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
|
||||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<finalName>${project.name}-${project.version}</finalName>
|
||||||
|
<outputDirectory>${project.basedir}/asset/</outputDirectory>
|
||||||
|
<createDependencyReducedPom>false</createDependencyReducedPom>
|
||||||
<filters>
|
<filters>
|
||||||
<filter>
|
<filter>
|
||||||
<artifact>*:*</artifact>
|
<artifact>*:*</artifact>
|
||||||
@@ -176,6 +188,12 @@
|
|||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</filter>
|
||||||
</filters>
|
</filters>
|
||||||
|
<relocations>
|
||||||
|
<relocation>
|
||||||
|
<pattern>de.themoep.minedown</pattern>
|
||||||
|
<shadedPattern>cc.carm.plugin.moeteleport.lib.minedown</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
@@ -1,21 +1,27 @@
|
|||||||
package cc.carm.plugin.moeteleport;
|
package cc.carm.plugin.moeteleport;
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.command.BackCommand;
|
import cc.carm.plugin.moeteleport.command.BackCommand;
|
||||||
|
import cc.carm.plugin.moeteleport.command.MoeTeleportCommand;
|
||||||
import cc.carm.plugin.moeteleport.command.completer.HomeNameCompleter;
|
import cc.carm.plugin.moeteleport.command.completer.HomeNameCompleter;
|
||||||
import cc.carm.plugin.moeteleport.command.completer.PlayerNameCompleter;
|
import cc.carm.plugin.moeteleport.command.completer.PlayerNameCompleter;
|
||||||
import cc.carm.plugin.moeteleport.command.completer.TpRequestCompleter;
|
import cc.carm.plugin.moeteleport.command.completer.TpRequestCompleter;
|
||||||
import cc.carm.plugin.moeteleport.command.home.*;
|
import cc.carm.plugin.moeteleport.command.home.DelHomeCommand;
|
||||||
import cc.carm.plugin.moeteleport.command.tpa.*;
|
import cc.carm.plugin.moeteleport.command.home.GoHomeCommand;
|
||||||
|
import cc.carm.plugin.moeteleport.command.home.ListHomeCommand;
|
||||||
|
import cc.carm.plugin.moeteleport.command.home.SetHomeCommand;
|
||||||
|
import cc.carm.plugin.moeteleport.command.tpa.TpHandleCommand;
|
||||||
|
import cc.carm.plugin.moeteleport.command.tpa.TpaCommand;
|
||||||
import cc.carm.plugin.moeteleport.listener.UserListener;
|
import cc.carm.plugin.moeteleport.listener.UserListener;
|
||||||
import cc.carm.plugin.moeteleport.manager.ConfigManager;
|
import cc.carm.plugin.moeteleport.manager.ConfigManager;
|
||||||
import cc.carm.plugin.moeteleport.manager.RequestManager;
|
import cc.carm.plugin.moeteleport.manager.RequestManager;
|
||||||
import cc.carm.plugin.moeteleport.manager.TeleportManager;
|
|
||||||
import cc.carm.plugin.moeteleport.manager.UserManager;
|
import cc.carm.plugin.moeteleport.manager.UserManager;
|
||||||
|
import cc.carm.plugin.moeteleport.model.UserData;
|
||||||
import cc.carm.plugin.moeteleport.util.ColorParser;
|
import cc.carm.plugin.moeteleport.util.ColorParser;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandExecutor;
|
import org.bukkit.command.CommandExecutor;
|
||||||
import org.bukkit.command.PluginCommand;
|
import org.bukkit.command.PluginCommand;
|
||||||
import org.bukkit.command.TabCompleter;
|
import org.bukkit.command.TabCompleter;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -23,108 +29,121 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
|
|
||||||
public class Main extends JavaPlugin {
|
public class Main extends JavaPlugin {
|
||||||
|
|
||||||
private static Main instance;
|
public static boolean debugMode = true;
|
||||||
public static boolean debugMode = true;
|
private static Main instance;
|
||||||
|
private UserManager userManager;
|
||||||
|
private RequestManager requestManager;
|
||||||
|
|
||||||
private UserManager userManager;
|
/**
|
||||||
private TeleportManager teleportManager;
|
* 注册监听器
|
||||||
private RequestManager requestManager;
|
*
|
||||||
|
* @param listener 监听器
|
||||||
|
*/
|
||||||
|
public static void regListener(Listener listener) {
|
||||||
|
Bukkit.getPluginManager().registerEvents(listener, getInstance());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
public static void log(String message) {
|
||||||
public void onEnable() {
|
Bukkit.getConsoleSender().sendMessage(ColorParser.parse("[" + getInstance().getName() + "] " + message));
|
||||||
instance = this;
|
}
|
||||||
log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
|
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
|
|
||||||
log("加载配置文件...");
|
public static void error(String message) {
|
||||||
ConfigManager.initConfig();
|
log("&4[ERROR] &r" + message);
|
||||||
|
}
|
||||||
|
|
||||||
log("加载用户管理器...");
|
public static void debug(String message) {
|
||||||
this.userManager = new UserManager(this);
|
if (debugMode) {
|
||||||
|
log("&b[DEBUG] &r" + message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
log("加载请求管理器...");
|
public static Main getInstance() {
|
||||||
this.requestManager = new RequestManager(this);
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
log("注册监听器...");
|
public static void registerCommand(String commandName,
|
||||||
regListener(new UserListener());
|
@NotNull CommandExecutor executor) {
|
||||||
|
registerCommand(commandName, executor, null);
|
||||||
|
}
|
||||||
|
|
||||||
log("注册指令...");
|
public static void registerCommand(String commandName,
|
||||||
registerCommand("back", new BackCommand());
|
@NotNull CommandExecutor executor,
|
||||||
|
@Nullable TabCompleter tabCompleter) {
|
||||||
|
PluginCommand command = Bukkit.getPluginCommand(commandName);
|
||||||
|
if (command == null) return;
|
||||||
|
command.setExecutor(executor);
|
||||||
|
if (tabCompleter != null) command.setTabCompleter(tabCompleter);
|
||||||
|
}
|
||||||
|
|
||||||
registerCommand("home", new GoHomeCommand(), new HomeNameCompleter());
|
public static UserManager getUserManager() {
|
||||||
registerCommand("delHome", new DelHomeCommand(), new HomeNameCompleter());
|
return Main.getInstance().userManager;
|
||||||
registerCommand("setHome", new SetHomeCommand());
|
}
|
||||||
registerCommand("listHome", new ListHomeCommand());
|
|
||||||
|
|
||||||
registerCommand("tpa", new TpaCommand(), new PlayerNameCompleter());
|
public static RequestManager getRequestManager() {
|
||||||
registerCommand("tpaHere", new TpaHereCommand(), new PlayerNameCompleter());
|
return Main.getInstance().requestManager;
|
||||||
registerCommand("tpAccept", new TpAcceptCommand(), new TpRequestCompleter());
|
}
|
||||||
registerCommand("tpDeny", new TpDenyCommand(), new TpRequestCompleter());
|
|
||||||
|
|
||||||
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
|
@Override
|
||||||
|
public void onEnable() {
|
||||||
|
instance = this;
|
||||||
|
log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
|
||||||
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
}
|
log("加载配置文件...");
|
||||||
|
ConfigManager.initConfig();
|
||||||
|
|
||||||
@Override
|
log("加载用户管理器...");
|
||||||
public void onDisable() {
|
this.userManager = new UserManager(this);
|
||||||
log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
|
|
||||||
long startTime = System.currentTimeMillis();
|
|
||||||
|
|
||||||
getRequestManager().shutdown();
|
if (Bukkit.getOnlinePlayers().size() > 0) {
|
||||||
|
log(" 加载现有用户数据...");
|
||||||
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
|
UserData data = Main.getUserManager().loadData(player.getUniqueId());
|
||||||
|
Main.getUserManager().getUserDataMap().put(player.getUniqueId(), data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
log("卸载监听器...");
|
log("加载请求管理器...");
|
||||||
Bukkit.getServicesManager().unregisterAll(this);
|
this.requestManager = new RequestManager(this);
|
||||||
|
|
||||||
log("卸载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
|
log("注册监听器...");
|
||||||
}
|
regListener(new UserListener());
|
||||||
|
|
||||||
/**
|
log("注册指令...");
|
||||||
* 注册监听器
|
registerCommand("MoeTeleport", new MoeTeleportCommand());
|
||||||
*
|
|
||||||
* @param listener 监听器
|
|
||||||
*/
|
|
||||||
public static void regListener(Listener listener) {
|
|
||||||
Bukkit.getPluginManager().registerEvents(listener, getInstance());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void log(String message) {
|
registerCommand("back", new BackCommand());
|
||||||
Bukkit.getConsoleSender().sendMessage(ColorParser.parse("[" + getInstance().getName() + "] " + message));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void error(String message) {
|
registerCommand("home", new GoHomeCommand(), new HomeNameCompleter());
|
||||||
log("&4[ERROR] &r" + message);
|
registerCommand("delHome", new DelHomeCommand(), new HomeNameCompleter());
|
||||||
}
|
registerCommand("setHome", new SetHomeCommand());
|
||||||
|
registerCommand("listHome", new ListHomeCommand());
|
||||||
|
|
||||||
public static void debug(String message) {
|
registerCommand("tpa", new TpaCommand(), new PlayerNameCompleter());
|
||||||
if (debugMode) {
|
registerCommand("tpaHere", new TpaCommand(), new PlayerNameCompleter());
|
||||||
log("&b[DEBUG] &r" + message);
|
registerCommand("tpAccept", new TpHandleCommand(), new TpRequestCompleter());
|
||||||
}
|
registerCommand("tpDeny", new TpHandleCommand(), new TpRequestCompleter());
|
||||||
}
|
|
||||||
|
|
||||||
public static Main getInstance() {
|
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerCommand(String commandName,
|
}
|
||||||
@NotNull CommandExecutor executor) {
|
|
||||||
registerCommand(commandName, executor, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void registerCommand(String commandName,
|
@Override
|
||||||
@NotNull CommandExecutor executor,
|
public void onDisable() {
|
||||||
@Nullable TabCompleter tabCompleter) {
|
log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
|
||||||
PluginCommand command = Bukkit.getPluginCommand(commandName);
|
long startTime = System.currentTimeMillis();
|
||||||
if (command == null) return;
|
|
||||||
command.setExecutor(executor);
|
|
||||||
if (tabCompleter != null) command.setTabCompleter(tabCompleter);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static UserManager getUserManager() {
|
log("关闭所有请求...");
|
||||||
return Main.getInstance().userManager;
|
getRequestManager().shutdown();
|
||||||
}
|
|
||||||
|
|
||||||
public static RequestManager getRequestManager() {
|
log("保存用户数据...");
|
||||||
return Main.getInstance().requestManager;
|
getUserManager().getUserDataMap().values().forEach(UserData::save);
|
||||||
}
|
getUserManager().getUserDataMap().clear();
|
||||||
|
|
||||||
|
log("卸载监听器...");
|
||||||
|
Bukkit.getServicesManager().unregisterAll(this);
|
||||||
|
|
||||||
|
log("卸载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,23 +12,17 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
public class BackCommand implements CommandExecutor {
|
public class BackCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return false;
|
if (!(sender instanceof Player)) return false;
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
UserData data = Main.getUserManager().getData(player);
|
UserData data = Main.getUserManager().getData(player);
|
||||||
if (data.getLastLocation() == null) {
|
if (data.getLastLocation() == null) {
|
||||||
PluginMessages.NO_LAST_LOCATION.send(player);
|
PluginMessages.NO_LAST_LOCATION.send(player);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!TeleportManager.isSafeLocation(data.getLastLocation())) {
|
TeleportManager.teleport(player, data.getLastLocation(), false);
|
||||||
PluginMessages.DANGEROUS.send(player);
|
return true;
|
||||||
return true;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
TeleportManager.teleport(player, data.getLastLocation());
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package cc.carm.plugin.moeteleport.command;
|
||||||
|
|
||||||
|
import cc.carm.plugin.moeteleport.manager.ConfigManager;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandExecutor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
public class MoeTeleportCommand implements CommandExecutor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command,
|
||||||
|
@NotNull String s, @NotNull String[] args) {
|
||||||
|
if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
|
||||||
|
commandSender.sendMessage("Reloading config...");
|
||||||
|
ConfigManager.reload();
|
||||||
|
commandSender.sendMessage("Config reloaded.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -14,17 +14,17 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public class HomeNameCompleter implements TabCompleter {
|
public class HomeNameCompleter implements TabCompleter {
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return ImmutableList.of();
|
if (!(sender instanceof Player)) return ImmutableList.of();
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
return Main.getUserManager().getData((Player) sender).getHomeLocations().keySet().stream()
|
return Main.getUserManager().getData((Player) sender).getHomeLocations().keySet().stream()
|
||||||
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
|
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[0]))
|
||||||
.limit(10).collect(Collectors.toList());
|
.limit(10).collect(Collectors.toList());
|
||||||
} else {
|
} else {
|
||||||
return ImmutableList.of();
|
return ImmutableList.of();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+22
-22
@@ -16,32 +16,32 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public class PlayerNameCompleter implements TabCompleter {
|
public class PlayerNameCompleter implements TabCompleter {
|
||||||
|
|
||||||
List<Integer> indexes;
|
List<Integer> indexes;
|
||||||
|
|
||||||
public PlayerNameCompleter() {
|
public PlayerNameCompleter() {
|
||||||
this(1);
|
this(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayerNameCompleter(Integer index) {
|
public PlayerNameCompleter(Integer index) {
|
||||||
this(new Integer[]{index});
|
this(new Integer[]{index});
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayerNameCompleter(Integer[] indexes) {
|
public PlayerNameCompleter(Integer[] indexes) {
|
||||||
this.indexes = Arrays.asList(indexes);
|
this.indexes = Arrays.asList(indexes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
public java.util.List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
||||||
if (args.length >= 1 && indexes.contains(args.length)) {
|
if (args.length >= 1 && indexes.contains(args.length)) {
|
||||||
return Bukkit.getOnlinePlayers().stream()
|
return Bukkit.getOnlinePlayers().stream()
|
||||||
.map(HumanEntity::getName)
|
.map(HumanEntity::getName)
|
||||||
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
|
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
|
||||||
.limit(10).collect(Collectors.toList());
|
.limit(10).collect(Collectors.toList());
|
||||||
} else {
|
} else {
|
||||||
return ImmutableList.of();
|
return ImmutableList.of();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+24
-24
@@ -20,34 +20,34 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
public class TpRequestCompleter implements TabCompleter {
|
public class TpRequestCompleter implements TabCompleter {
|
||||||
|
|
||||||
List<Integer> indexes;
|
List<Integer> indexes;
|
||||||
|
|
||||||
public TpRequestCompleter() {
|
public TpRequestCompleter() {
|
||||||
this(1);
|
this(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public TpRequestCompleter(Integer index) {
|
public TpRequestCompleter(Integer index) {
|
||||||
this(new Integer[]{index});
|
this(new Integer[]{index});
|
||||||
}
|
}
|
||||||
|
|
||||||
public TpRequestCompleter(Integer[] indexes) {
|
public TpRequestCompleter(Integer[] indexes) {
|
||||||
this.indexes = Arrays.asList(indexes);
|
this.indexes = Arrays.asList(indexes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return ImmutableList.of();
|
if (!(sender instanceof Player)) return ImmutableList.of();
|
||||||
if (args.length >= 1 && indexes.contains(args.length)) {
|
if (args.length >= 1 && indexes.contains(args.length)) {
|
||||||
UserData data = Main.getUserManager().getData((Player) sender);
|
UserData data = Main.getUserManager().getData((Player) sender);
|
||||||
return data.getReceivedRequests().keySet().stream()
|
return data.getReceivedRequests().keySet().stream()
|
||||||
.map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
|
.map(Bukkit::getPlayer).filter(Objects::nonNull).map(HumanEntity::getName)
|
||||||
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
|
.filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
|
||||||
.limit(10).collect(Collectors.toList());
|
.limit(10).collect(Collectors.toList());
|
||||||
} else {
|
} else {
|
||||||
return ImmutableList.of();
|
return ImmutableList.of();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,26 +14,26 @@ import java.util.Map;
|
|||||||
|
|
||||||
public class DelHomeCommand implements CommandExecutor {
|
public class DelHomeCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
@NotNull String label, @NotNull String[] args) {
|
@NotNull String label, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return false;
|
if (!(sender instanceof Player)) return false;
|
||||||
if (args.length < 1) return false;
|
if (args.length < 1) return false;
|
||||||
|
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
UserData data = Main.getUserManager().getData(player);
|
UserData data = Main.getUserManager().getData(player);
|
||||||
String homeName = args[0];
|
String homeName = args[0];
|
||||||
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
|
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
|
||||||
if (locationInfo == null) {
|
if (locationInfo == null) {
|
||||||
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
|
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
|
||||||
} else {
|
} else {
|
||||||
PluginMessages.Home.REMOVED.sendWithPlaceholders(player,
|
PluginMessages.Home.REMOVED.sendWithPlaceholders(player,
|
||||||
new String[]{"%(name)", "%(location)"},
|
new String[]{"%(name)", "%(location)"},
|
||||||
new Object[]{locationInfo.getKey(), locationInfo.getValue().toString()});
|
new Object[]{locationInfo.getKey(), locationInfo.getValue().toFlatString()});
|
||||||
data.delHomeLocation(homeName);
|
data.delHomeLocation(homeName);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -15,21 +15,21 @@ import java.util.Map;
|
|||||||
|
|
||||||
public class GoHomeCommand implements CommandExecutor {
|
public class GoHomeCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
@NotNull String label, @NotNull String[] args) {
|
@NotNull String label, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return false;
|
if (!(sender instanceof Player)) return false;
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
UserData data = Main.getUserManager().getData(player);
|
UserData data = Main.getUserManager().getData(player);
|
||||||
String homeName = args.length >= 1 ? args[0] : null;
|
String homeName = args.length >= 1 ? args[0] : null;
|
||||||
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
|
Map.Entry<String, DataLocation> locationInfo = data.getHomeLocation(homeName);
|
||||||
if (locationInfo == null) {
|
if (locationInfo == null) {
|
||||||
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
|
PluginMessages.Home.NOT_FOUND.sendWithPlaceholders(player);
|
||||||
} else {
|
} else {
|
||||||
TeleportManager.teleport(player, locationInfo.getValue());
|
TeleportManager.teleport(player, locationInfo.getValue(), false);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -11,19 +11,19 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
public class ListHomeCommand implements CommandExecutor {
|
public class ListHomeCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
@NotNull String label, @NotNull String[] args) {
|
@NotNull String label, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return false;
|
if (!(sender instanceof Player)) return false;
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
UserData data = Main.getUserManager().getData(player);
|
UserData data = Main.getUserManager().getData(player);
|
||||||
PluginMessages.Home.HEADER.sendWithPlaceholders(player);
|
PluginMessages.Home.HEADER.sendWithPlaceholders(player);
|
||||||
data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.LIST_OBJECT
|
data.getHomeLocations().forEach((name, loc) -> PluginMessages.Home.LIST_OBJECT
|
||||||
.sendWithPlaceholders(player,
|
.sendWithPlaceholders(player,
|
||||||
new String[]{"%(name)", "%(location)"},
|
new String[]{"%(id)", "%(location)"},
|
||||||
new Object[]{name, loc.toString()}
|
new Object[]{name, loc.toFlatString()}
|
||||||
));
|
));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -11,28 +11,28 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
public class SetHomeCommand implements CommandExecutor {
|
public class SetHomeCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
@NotNull String label, @NotNull String[] args) {
|
@NotNull String label, @NotNull String[] args) {
|
||||||
if (!(sender instanceof Player)) return false;
|
if (!(sender instanceof Player)) return false;
|
||||||
Player player = (Player) sender;
|
Player player = (Player) sender;
|
||||||
UserData data = Main.getUserManager().getData(player);
|
UserData data = Main.getUserManager().getData(player);
|
||||||
String homeName = args.length >= 1 ? args[0] : "home";
|
String homeName = args.length >= 1 ? args[0] : "home";
|
||||||
|
|
||||||
int maxHome = Main.getUserManager().getMaxHome(player);
|
int maxHome = Main.getUserManager().getMaxHome(player);
|
||||||
if (data.getHomeLocations().size() >= maxHome && data.getHomeLocation(homeName) == null) {
|
if (data.getHomeLocations().size() >= maxHome && data.getHomeLocation(homeName) == null) {
|
||||||
PluginMessages.Home.OVER_LIMIT.sendWithPlaceholders(sender,
|
PluginMessages.Home.OVER_LIMIT.sendWithPlaceholders(sender,
|
||||||
new String[]{"%(max)"}, new Object[]{maxHome}
|
new String[]{"%(max)"}, new Object[]{maxHome}
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
data.setHomeLocation(homeName, player.getLocation());
|
data.setHomeLocation(homeName, player.getLocation());
|
||||||
PluginMessages.Home.SET.sendWithPlaceholders(player,
|
PluginMessages.Home.SET.sendWithPlaceholders(player,
|
||||||
new String[]{"%(name)"}, new Object[]{homeName}
|
new String[]{"%(name)"}, new Object[]{homeName}
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package cc.carm.plugin.moeteleport.command.tpa;
|
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.Main;
|
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
|
||||||
import cc.carm.plugin.moeteleport.model.TeleportRequest;
|
|
||||||
import cc.carm.plugin.moeteleport.model.UserData;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandExecutor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
|
|
||||||
public class TpAcceptCommand implements CommandExecutor {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
|
||||||
if (!(sender instanceof Player)) return false;
|
|
||||||
Player player = (Player) sender;
|
|
||||||
UserData data = Main.getUserManager().getData(player);
|
|
||||||
if (data.getReceivedRequests().isEmpty()) {
|
|
||||||
PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
String targetName = args.length > 0 ? args[0] : null;
|
|
||||||
if (targetName != null) {
|
|
||||||
Player target = Bukkit.getPlayer(targetName);
|
|
||||||
if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
|
|
||||||
PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
|
|
||||||
new String[]{"%(player)"},
|
|
||||||
new Object[]{target == null ? targetName : target.getName()}
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
TeleportRequest request = data.getReceivedRequests().get(target.getUniqueId());
|
|
||||||
Main.getRequestManager().acceptRequest(request); // 交给Manager处理
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
data.getReceivedRequests().values().stream()
|
|
||||||
.min(Comparator.comparingLong(TeleportRequest::getActiveTime))
|
|
||||||
.ifPresent(request -> Main.getRequestManager().acceptRequest(request));
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
package cc.carm.plugin.moeteleport.command.tpa;
|
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.Main;
|
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
|
||||||
import cc.carm.plugin.moeteleport.model.TeleportRequest;
|
|
||||||
import cc.carm.plugin.moeteleport.model.UserData;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandExecutor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
|
|
||||||
public class TpDenyCommand implements CommandExecutor {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
|
||||||
if (!(sender instanceof Player)) return false;
|
|
||||||
Player player = (Player) sender;
|
|
||||||
UserData data = Main.getUserManager().getData(player);
|
|
||||||
if (data.getReceivedRequests().isEmpty()) {
|
|
||||||
PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
String targetName = args.length > 0 ? args[0] : null;
|
|
||||||
if (targetName != null) {
|
|
||||||
Player target = Bukkit.getPlayer(targetName);
|
|
||||||
if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
|
|
||||||
PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
|
|
||||||
new String[]{"%(player)"},
|
|
||||||
new Object[]{target == null ? targetName : target.getName()}
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
TeleportRequest request = data.getReceivedRequests().get(target.getUniqueId());
|
|
||||||
Main.getRequestManager().denyRequest(request); // 交给Manager处理
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
data.getReceivedRequests().values().stream()
|
|
||||||
.min(Comparator.comparingLong(TeleportRequest::getActiveTime))
|
|
||||||
.ifPresent(request -> Main.getRequestManager().denyRequest(request));
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package cc.carm.plugin.moeteleport.command.tpa;
|
||||||
|
|
||||||
|
import cc.carm.plugin.moeteleport.Main;
|
||||||
|
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
||||||
|
import cc.carm.plugin.moeteleport.model.TeleportRequest;
|
||||||
|
import cc.carm.plugin.moeteleport.model.UserData;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandExecutor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
|
|
||||||
|
public class TpHandleCommand implements CommandExecutor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
|
@NotNull String label, @NotNull String[] args) {
|
||||||
|
if (!(sender instanceof Player)) return false;
|
||||||
|
Player player = (Player) sender;
|
||||||
|
UserData data = Main.getUserManager().getData(player);
|
||||||
|
if (data.getReceivedRequests().isEmpty()) {
|
||||||
|
PluginMessages.Request.NOT_FOUND.sendWithPlaceholders(player);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
String targetName = args.length > 0 ? args[0] : null;
|
||||||
|
boolean accept = command.getName().equalsIgnoreCase("tpAccept");
|
||||||
|
data.setEnableAutoSelect(false);
|
||||||
|
if (targetName != null) {
|
||||||
|
Player target = Bukkit.getPlayer(targetName);
|
||||||
|
if (target == null || !data.getReceivedRequests().containsKey(target.getUniqueId())) {
|
||||||
|
PluginMessages.Request.NOT_FOUND_PLAYER.sendWithPlaceholders(player,
|
||||||
|
new String[]{"%(player)"},
|
||||||
|
new Object[]{target == null ? targetName : target.getName()}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
handle(data.getReceivedRequests().get(target.getUniqueId()), accept); // 交给Manager处理
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (data.getReceivedRequests().size() == 1 || data.isEnableAutoSelect()) {
|
||||||
|
data.getReceivedRequests().values().stream()
|
||||||
|
.min(Comparator.comparingLong(TeleportRequest::getActiveTime))
|
||||||
|
.ifPresent(request -> handle(request, accept));
|
||||||
|
} else {
|
||||||
|
PluginMessages.Request.MULTI.sendWithPlaceholders(player,
|
||||||
|
new String[]{"%(num)", "%(command)"},
|
||||||
|
new Object[]{data.getReceivedRequests().size(), command.getName()}
|
||||||
|
);
|
||||||
|
data.setEnableAutoSelect(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handle(TeleportRequest request, boolean accept) {
|
||||||
|
if (accept) {
|
||||||
|
Main.getRequestManager().acceptRequest(request);
|
||||||
|
} else {
|
||||||
|
Main.getRequestManager().denyRequest(request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -12,17 +12,32 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
public class TpaCommand implements CommandExecutor {
|
public class TpaCommand implements CommandExecutor {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
|
||||||
if (!(sender instanceof Player) || args.length < 1) return false;
|
@NotNull String label, @NotNull String[] args) {
|
||||||
Player player = (Player) sender;
|
if (!(sender instanceof Player) || args.length < 1) return false;
|
||||||
Player target = Bukkit.getPlayer(args[0]);
|
Player player = (Player) sender;
|
||||||
if (target == null) {
|
Player target = Bukkit.getPlayer(args[0]);
|
||||||
PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
|
if (target == null) {
|
||||||
return true;
|
PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
|
||||||
}
|
return true;
|
||||||
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
|
}
|
||||||
return true;
|
|
||||||
}
|
TeleportRequest request = Main.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
|
||||||
|
if (request != null) {
|
||||||
|
PluginMessages.Request.DUPLICATE.sendWithPlaceholders(sender,
|
||||||
|
new String[]{"%(player)", "%(expire)"},
|
||||||
|
new Object[]{target.getName(), request.getRemainSeconds()}
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (command.getName().equalsIgnoreCase("tpa")) {
|
||||||
|
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA);
|
||||||
|
} else {
|
||||||
|
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
package cc.carm.plugin.moeteleport.command.tpa;
|
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.Main;
|
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
|
||||||
import cc.carm.plugin.moeteleport.model.TeleportRequest;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandExecutor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
|
|
||||||
public class TpaHereCommand implements CommandExecutor {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
|
||||||
if (!(sender instanceof Player) || args.length < 1) return false;
|
|
||||||
Player player = (Player) sender;
|
|
||||||
Player target = Bukkit.getPlayer(args[0]);
|
|
||||||
if (target == null) {
|
|
||||||
PluginMessages.NOT_ONLINE.sendWithPlaceholders(player);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
Main.getRequestManager().sendRequest(player, target, TeleportRequest.RequestType.TPA_HERE);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -6,19 +6,24 @@ import cc.carm.plugin.moeteleport.configuration.values.ConfigValueMap;
|
|||||||
|
|
||||||
public class PluginConfig {
|
public class PluginConfig {
|
||||||
|
|
||||||
public static final ConfigValueMap<String, Integer> PERMISSIONS = new ConfigValueMap<>(
|
public static final ConfigValueMap<Integer, String> PERMISSIONS = new ConfigValueMap<>(
|
||||||
"permissions", s -> s, Integer.class
|
"permissions", Integer::parseInt, String.class
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(
|
public static final ConfigValueList<String> DANGEROUS_TYPES = new ConfigValueList<>(
|
||||||
"dangerousBlocks", String.class, new String[]{"LAVA"}
|
"dangerous-blocks", String.class, new String[]{"LAVA"}
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final ConfigValue<Integer> EXPIRE_TIME = new ConfigValue<>(
|
public static final ConfigValue<Integer> EXPIRE_TIME = new ConfigValue<>(
|
||||||
"expireTime", Integer.class, 30
|
"expireTime", Integer.class, 30
|
||||||
);
|
);
|
||||||
public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
|
|
||||||
"defaultHome", Integer.class, 1
|
public static final ConfigValue<Integer> DEFAULT_HOME = new ConfigValue<>(
|
||||||
);
|
"defaultHome", Integer.class, 1
|
||||||
|
);
|
||||||
|
|
||||||
|
public static final ConfigValue<Boolean> DEATH_GO_BACK = new ConfigValue<>(
|
||||||
|
"death-back", Boolean.class, true
|
||||||
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,50 +5,53 @@ import cc.carm.plugin.moeteleport.configuration.message.ConfigMessageList;
|
|||||||
|
|
||||||
public class PluginMessages {
|
public class PluginMessages {
|
||||||
|
|
||||||
public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
|
public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
|
||||||
|
|
||||||
public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
|
public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
|
||||||
|
|
||||||
public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
|
public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
|
||||||
public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
|
public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
|
||||||
|
|
||||||
public static final ConfigMessageList TP_ACCEPT = new ConfigMessageList("tpaccept");
|
public static final ConfigMessageList TP_ACCEPT = new ConfigMessageList("tpaccept");
|
||||||
public static final ConfigMessageList TP_DENY = new ConfigMessageList("tpdeny");
|
public static final ConfigMessageList TP_DENY = new ConfigMessageList("tpdeny");
|
||||||
|
|
||||||
public static final ConfigMessageList ACCEPTED = new ConfigMessageList("accepted");
|
public static final ConfigMessageList ACCEPTED = new ConfigMessageList("accepted");
|
||||||
public static final ConfigMessageList DENIED = new ConfigMessageList("denied");
|
public static final ConfigMessageList DENIED = new ConfigMessageList("denied");
|
||||||
|
|
||||||
public static final ConfigMessageList TELEPORTING = new ConfigMessageList("teleporting");
|
public static final ConfigMessageList TELEPORTING = new ConfigMessageList("teleporting");
|
||||||
public static final ConfigMessageList DANGEROUS = new ConfigMessageList("dangerous");
|
public static final ConfigMessageList DANGEROUS = new ConfigMessageList("dangerous");
|
||||||
public static final ConfigMessageList DANGEROUS_HERE = new ConfigMessageList("dangerous-here");
|
public static final ConfigMessageList DANGEROUS_HERE = new ConfigMessageList("dangerous-here");
|
||||||
|
|
||||||
public static final ConfigMessageList NOT_AVAILABLE = new ConfigMessageList("notAvailable");
|
public static final ConfigMessageList NOT_AVAILABLE = new ConfigMessageList("notAvailable");
|
||||||
|
|
||||||
public static class Request {
|
public static final ConfigMessageList DEATH_BACK = new ConfigMessageList("death-back");
|
||||||
public static final ConfigMessageList OFFLINE = new ConfigMessageList("offline");
|
|
||||||
|
|
||||||
public static final ConfigMessageList SENT = new ConfigMessageList("request-sent");
|
public static class Request {
|
||||||
public static final ConfigMessageList MULTI = new ConfigMessageList("multi-requests");
|
public static final ConfigMessageList DUPLICATE = new ConfigMessageList("request-duplicate");
|
||||||
public static final ConfigMessageList SENT_TIMEOUT = new ConfigMessageList("request-sent-timeout");
|
public static final ConfigMessageList OFFLINE = new ConfigMessageList("offline");
|
||||||
public static final ConfigMessageList RECEIVED_TIMEOUT = new ConfigMessageList("request-received-timeout");
|
|
||||||
|
|
||||||
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("no-request");
|
public static final ConfigMessageList SENT = new ConfigMessageList("request-sent");
|
||||||
public static final ConfigMessageList NOT_FOUND_PLAYER = new ConfigMessageList("no-request-player");
|
public static final ConfigMessageList MULTI = new ConfigMessageList("multi-requests");
|
||||||
}
|
public static final ConfigMessageList SENT_TIMEOUT = new ConfigMessageList("request-sent-timeout");
|
||||||
|
public static final ConfigMessageList RECEIVED_TIMEOUT = new ConfigMessageList("request-received-timeout");
|
||||||
|
|
||||||
public static class Home {
|
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("no-request");
|
||||||
public static final ConfigMessageList HEADER = new ConfigMessageList("home-list-header");
|
public static final ConfigMessageList NOT_FOUND_PLAYER = new ConfigMessageList("no-request-player");
|
||||||
public static final ConfigMessage LIST_OBJECT = new ConfigMessage("home-list-object");
|
}
|
||||||
|
|
||||||
public static final ConfigMessageList OVER_LIMIT = new ConfigMessageList("home-over-limit");
|
public static class Home {
|
||||||
|
public static final ConfigMessageList HEADER = new ConfigMessageList("home-list-header");
|
||||||
|
public static final ConfigMessage LIST_OBJECT = new ConfigMessage("home-list-object");
|
||||||
|
|
||||||
|
public static final ConfigMessageList OVER_LIMIT = new ConfigMessageList("home-over-limit");
|
||||||
|
|
||||||
|
|
||||||
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("home-not-found");
|
public static final ConfigMessageList NOT_FOUND = new ConfigMessageList("home-not-found");
|
||||||
public static final ConfigMessageList SET = new ConfigMessageList("home-set");
|
public static final ConfigMessageList SET = new ConfigMessageList("home-set");
|
||||||
|
|
||||||
public static final ConfigMessageList REMOVED = new ConfigMessageList("home-removed");
|
public static final ConfigMessageList REMOVED = new ConfigMessageList("home-removed");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,55 +10,55 @@ import java.io.IOException;
|
|||||||
|
|
||||||
public class FileConfig {
|
public class FileConfig {
|
||||||
|
|
||||||
private final JavaPlugin plugin;
|
private final JavaPlugin plugin;
|
||||||
private final String fileName;
|
private final String fileName;
|
||||||
|
|
||||||
|
|
||||||
private File file;
|
private File file;
|
||||||
private FileConfiguration config;
|
private FileConfiguration config;
|
||||||
|
|
||||||
public FileConfig(final JavaPlugin plugin) {
|
public FileConfig(final JavaPlugin plugin) {
|
||||||
this(plugin, "config.yml");
|
this(plugin, "config.yml");
|
||||||
}
|
}
|
||||||
|
|
||||||
public FileConfig(final JavaPlugin plugin, final String name) {
|
public FileConfig(final JavaPlugin plugin, final String name) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.fileName = name;
|
this.fileName = name;
|
||||||
initFile();
|
initFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initFile() {
|
private void initFile() {
|
||||||
this.file = new File(plugin.getDataFolder(), fileName);
|
this.file = new File(plugin.getDataFolder(), fileName);
|
||||||
if (!this.file.exists()) {
|
if (!this.file.exists()) {
|
||||||
if (!this.file.getParentFile().exists()) {
|
if (!this.file.getParentFile().exists()) {
|
||||||
boolean success = this.file.getParentFile().mkdirs();
|
boolean success = this.file.getParentFile().mkdirs();
|
||||||
}
|
}
|
||||||
plugin.saveResource(fileName, true);
|
plugin.saveResource(fileName, true);
|
||||||
}
|
}
|
||||||
this.config = YamlConfiguration.loadConfiguration(this.file);
|
this.config = YamlConfiguration.loadConfiguration(this.file);
|
||||||
}
|
}
|
||||||
|
|
||||||
public File getFile() {
|
public File getFile() {
|
||||||
return file;
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FileConfiguration getConfig() {
|
public FileConfiguration getConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void save() {
|
public void save() {
|
||||||
try {
|
try {
|
||||||
getConfig().save(getFile());
|
getConfig().save(getFile());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reload() {
|
public void reload() {
|
||||||
if (getFile().exists()) {
|
if (getFile().exists()) {
|
||||||
this.config = YamlConfiguration.loadConfiguration(getFile());
|
this.config = YamlConfiguration.loadConfiguration(getFile());
|
||||||
} else {
|
} else {
|
||||||
initFile();
|
initFile();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+129
-125
@@ -8,159 +8,163 @@ import org.bukkit.util.NumberConversions;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.text.DecimalFormat;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
public class DataLocation implements Cloneable {
|
public class DataLocation implements Cloneable {
|
||||||
|
|
||||||
private String worldName;
|
public static final DecimalFormat format = new DecimalFormat("0.00");
|
||||||
private double x;
|
private final String worldName;
|
||||||
private double y;
|
private double x;
|
||||||
private double z;
|
private double y;
|
||||||
private float yaw;
|
private double z;
|
||||||
private float pitch;
|
private float yaw;
|
||||||
|
private float pitch;
|
||||||
|
|
||||||
public DataLocation(Location location) {
|
public DataLocation(Location location) {
|
||||||
this(location.getWorld() != null ? location.getWorld().getName() : "", location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
|
this(location.getWorld() != null ? location.getWorld().getName() : "", location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
|
||||||
}
|
}
|
||||||
|
|
||||||
public DataLocation(final String worldName, final double x, final double y, final double z) {
|
public DataLocation(final String worldName, final double x, final double y, final double z) {
|
||||||
this(worldName, x, y, z, 0, 0);
|
this(worldName, x, y, z, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public DataLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
|
public DataLocation(final String worldName, final double x, final double y, final double z, final float yaw, final float pitch) {
|
||||||
this.worldName = worldName;
|
this.worldName = worldName;
|
||||||
this.x = x;
|
this.x = x;
|
||||||
this.y = y;
|
this.y = y;
|
||||||
this.z = z;
|
this.z = z;
|
||||||
this.pitch = pitch;
|
this.pitch = pitch;
|
||||||
this.yaw = yaw;
|
this.yaw = yaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getWorldName() {
|
public static DataLocation deserializeText(String s) {
|
||||||
return worldName;
|
if (s == null || !s.contains(";")) return null;
|
||||||
}
|
String[] args = StringUtils.split(s, ";");
|
||||||
|
if (args.length < 4) return null;
|
||||||
|
try {
|
||||||
|
String worldName = args[0];
|
||||||
|
double x = NumberConversions.toDouble(args[1]);
|
||||||
|
double y = NumberConversions.toDouble(args[2]);
|
||||||
|
double z = NumberConversions.toDouble(args[3]);
|
||||||
|
float yaw = 0;
|
||||||
|
float pitch = 0;
|
||||||
|
if (args.length == 6) {
|
||||||
|
yaw = NumberConversions.toFloat(args[4]);
|
||||||
|
pitch = NumberConversions.toFloat(args[5]);
|
||||||
|
}
|
||||||
|
return new DataLocation(worldName, x, y, z, yaw, pitch);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public double getX() {
|
@Deprecated
|
||||||
return x;
|
public static DataLocation parseString(String s) {
|
||||||
}
|
return deserializeText(s);
|
||||||
|
}
|
||||||
|
|
||||||
public void setX(double x) {
|
public String getWorldName() {
|
||||||
this.x = x;
|
return worldName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getY() {
|
public double getX() {
|
||||||
return y;
|
return x;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setY(double y) {
|
public void setX(double x) {
|
||||||
this.y = y;
|
this.x = x;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getZ() {
|
public double getY() {
|
||||||
return z;
|
return y;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setZ(double z) {
|
public void setY(double y) {
|
||||||
this.z = z;
|
this.y = y;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getYaw() {
|
public double getZ() {
|
||||||
return yaw;
|
return z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setYaw(float yaw) {
|
public void setZ(double z) {
|
||||||
this.yaw = yaw;
|
this.z = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float getPitch() {
|
public float getYaw() {
|
||||||
return pitch;
|
return yaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPitch(float pitch) {
|
public void setYaw(float yaw) {
|
||||||
this.pitch = pitch;
|
this.yaw = yaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public float getPitch() {
|
||||||
|
return pitch;
|
||||||
|
}
|
||||||
|
|
||||||
public @NotNull Location getBukkitLocation(World world) {
|
public void setPitch(float pitch) {
|
||||||
return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
|
this.pitch = pitch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public @NotNull Location getBukkitLocation(World world) {
|
||||||
|
return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
|
||||||
|
}
|
||||||
|
|
||||||
public @Nullable Location getBukkitLocation() {
|
public @Nullable Location getBukkitLocation() {
|
||||||
World world = Bukkit.getWorld(getWorldName());
|
World world = Bukkit.getWorld(getWorldName());
|
||||||
if (world == null) return null;
|
if (world == null) return null;
|
||||||
else return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
|
else return new Location(world, getX(), getY(), getZ(), getYaw(), getPitch());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object clone() {
|
public Object clone() {
|
||||||
try {
|
try {
|
||||||
return super.clone();
|
return super.clone();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
}
|
return null;
|
||||||
return null;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) return true;
|
if (this == o) return true;
|
||||||
if (!(o instanceof DataLocation)) return false;
|
if (!(o instanceof DataLocation)) return false;
|
||||||
DataLocation that = (DataLocation) o;
|
DataLocation that = (DataLocation) o;
|
||||||
return that.worldName.equals(worldName)
|
return that.worldName.equals(worldName)
|
||||||
&& Double.compare(that.x, x) == 0
|
&& Double.compare(that.x, x) == 0
|
||||||
&& Double.compare(that.y, y) == 0
|
&& Double.compare(that.y, y) == 0
|
||||||
&& Double.compare(that.z, z) == 0
|
&& Double.compare(that.z, z) == 0
|
||||||
&& Float.compare(that.pitch, pitch) == 0
|
&& Float.compare(that.pitch, pitch) == 0
|
||||||
&& Float.compare(that.yaw, yaw) == 0;
|
&& Float.compare(that.yaw, yaw) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash(x, y, z, yaw, pitch);
|
return Objects.hash(x, y, z, yaw, pitch);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return worldName + " " + x + " " + y + " " + z + " " + yaw + " " + pitch;
|
return worldName + " " + x + " " + y + " " + z + " " + yaw + " " + pitch;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
public String toFlatString() {
|
||||||
public String toSerializedString() {
|
return worldName + "@" + format.format(x) + ", " + format.format(y) + ", " + format.format(z);
|
||||||
return serializeToText();
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public String serializeToText() {
|
@Deprecated
|
||||||
if (getYaw() != 0 || getPitch() != 0) {
|
public String toSerializedString() {
|
||||||
return worldName + ";" + x + ";" + y + ";" + z + ";" + yaw + ";" + pitch;
|
return serializeToText();
|
||||||
} else {
|
}
|
||||||
return worldName + ";" + x + ";" + y + ";" + z;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static DataLocation deserializeText(String s) {
|
public String serializeToText() {
|
||||||
if (s == null || !s.contains(";")) return null;
|
if (getYaw() != 0 || getPitch() != 0) {
|
||||||
String[] args = StringUtils.split(s, ";");
|
return worldName + ";" + x + ";" + y + ";" + z + ";" + yaw + ";" + pitch;
|
||||||
if (args.length < 4) return null;
|
} else {
|
||||||
try {
|
return worldName + ";" + x + ";" + y + ";" + z;
|
||||||
String worldName = args[0];
|
}
|
||||||
double x = NumberConversions.toDouble(args[0]);
|
}
|
||||||
double y = NumberConversions.toDouble(args[1]);
|
|
||||||
double z = NumberConversions.toDouble(args[2]);
|
|
||||||
float yaw = 0;
|
|
||||||
float pitch = 0;
|
|
||||||
if (args.length == 5) {
|
|
||||||
yaw = NumberConversions.toFloat(args[3]);
|
|
||||||
pitch = NumberConversions.toFloat(args[4]);
|
|
||||||
}
|
|
||||||
return new DataLocation(worldName, x, y, z, yaw, pitch);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static DataLocation parseString(String s) {
|
|
||||||
return deserializeText(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -9,24 +9,24 @@ import java.util.Collections;
|
|||||||
|
|
||||||
public class ConfigMessage extends ConfigValue<String> {
|
public class ConfigMessage extends ConfigValue<String> {
|
||||||
|
|
||||||
public ConfigMessage(String configSection) {
|
public ConfigMessage(String configSection) {
|
||||||
this(configSection, null);
|
this(configSection, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigMessage(String configSection, String defaultValue) {
|
public ConfigMessage(String configSection, String defaultValue) {
|
||||||
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
|
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void send(CommandSender sender) {
|
public void send(CommandSender sender) {
|
||||||
MessageUtil.send(sender, get());
|
MessageUtil.send(sender, get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendWithPlaceholders(CommandSender sender) {
|
public void sendWithPlaceholders(CommandSender sender) {
|
||||||
MessageUtil.sendWithPlaceholders(sender, get());
|
MessageUtil.sendWithPlaceholders(sender, get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendWithPlaceholders(CommandSender sender, String[] params, Object[] values) {
|
public void sendWithPlaceholders(CommandSender sender, String[] params, Object[] values) {
|
||||||
MessageUtil.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
|
MessageUtil.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-15
@@ -8,23 +8,23 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
|
|
||||||
public class ConfigMessageList extends ConfigValueList<String> {
|
public class ConfigMessageList extends ConfigValueList<String> {
|
||||||
|
|
||||||
public ConfigMessageList(String configSection) {
|
public ConfigMessageList(String configSection) {
|
||||||
super(ConfigManager.getMessageConfig(), configSection, String.class);
|
super(ConfigManager.getMessageConfig(), configSection, String.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigMessageList(String configSection, String[] defaultValue) {
|
public ConfigMessageList(String configSection, String[] defaultValue) {
|
||||||
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
|
super(ConfigManager.getMessageConfig(), configSection, String.class, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void send(@Nullable CommandSender sender) {
|
public void send(@Nullable CommandSender sender) {
|
||||||
MessageUtil.send(sender, get());
|
MessageUtil.send(sender, get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendWithPlaceholders(@Nullable CommandSender sender) {
|
public void sendWithPlaceholders(@Nullable CommandSender sender) {
|
||||||
MessageUtil.sendWithPlaceholders(sender, get());
|
MessageUtil.sendWithPlaceholders(sender, get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendWithPlaceholders(@Nullable CommandSender sender, String[] params, Object[] values) {
|
public void sendWithPlaceholders(@Nullable CommandSender sender, String[] params, Object[] values) {
|
||||||
MessageUtil.sendWithPlaceholders(sender, get(), params, values);
|
MessageUtil.sendWithPlaceholders(sender, get(), params, values);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+47
-47
@@ -9,63 +9,63 @@ import java.util.Arrays;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ConfigValueList<V> {
|
public class ConfigValueList<V> {
|
||||||
FileConfig source;
|
FileConfig source;
|
||||||
String configSection;
|
String configSection;
|
||||||
Class<V> clazz;
|
Class<V> clazz;
|
||||||
|
|
||||||
V[] defaultValue;
|
V[] defaultValue;
|
||||||
|
|
||||||
public ConfigValueList(String configSection, Class<V> clazz) {
|
public ConfigValueList(String configSection, Class<V> clazz) {
|
||||||
this(ConfigManager.getPluginConfig(), configSection, clazz);
|
this(ConfigManager.getPluginConfig(), configSection, clazz);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigValueList(String configSection, Class<V> clazz, V[] defaultValue) {
|
public ConfigValueList(String configSection, Class<V> clazz, V[] defaultValue) {
|
||||||
this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
|
this(ConfigManager.getPluginConfig(), configSection, clazz, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz) {
|
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz) {
|
||||||
this(configuration, configSection, clazz, null);
|
this(configuration, configSection, clazz, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz, V[] defaultValue) {
|
public ConfigValueList(FileConfig configuration, String configSection, Class<V> clazz, V[] defaultValue) {
|
||||||
this.source = configuration;
|
this.source = configuration;
|
||||||
this.configSection = configSection;
|
this.configSection = configSection;
|
||||||
this.clazz = clazz;
|
this.clazz = clazz;
|
||||||
this.defaultValue = defaultValue;
|
this.defaultValue = defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FileConfiguration getConfiguration() {
|
public FileConfiguration getConfiguration() {
|
||||||
return this.source.getConfig();
|
return this.source.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<V> get() {
|
public ArrayList<V> get() {
|
||||||
List<?> list = getConfiguration().getList(this.configSection);
|
List<?> list = getConfiguration().getList(this.configSection);
|
||||||
if (list == null) {
|
if (list == null) {
|
||||||
if (defaultValue != null) {
|
if (defaultValue != null) {
|
||||||
return new ArrayList<>(Arrays.asList(defaultValue));
|
return new ArrayList<>(Arrays.asList(defaultValue));
|
||||||
} else {
|
} else {
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ArrayList<V> result = new ArrayList<>();
|
ArrayList<V> result = new ArrayList<>();
|
||||||
|
|
||||||
for (Object object : list) {
|
for (Object object : list) {
|
||||||
if (this.clazz.isInstance(object)) {
|
if (this.clazz.isInstance(object)) {
|
||||||
result.add(this.clazz.cast(object));
|
result.add(this.clazz.cast(object));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void set(ArrayList<V> value) {
|
public void set(ArrayList<V> value) {
|
||||||
getConfiguration().set(this.configSection, value);
|
getConfiguration().set(this.configSection, value);
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void save() {
|
public void save() {
|
||||||
this.source.save();
|
this.source.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import org.bukkit.configuration.file.FileConfiguration;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -15,65 +14,66 @@ import java.util.function.Function;
|
|||||||
|
|
||||||
public class ConfigValueMap<K, V> {
|
public class ConfigValueMap<K, V> {
|
||||||
|
|
||||||
@NotNull FileConfig source;
|
@NotNull FileConfig source;
|
||||||
@NotNull String configSection;
|
@NotNull String configSection;
|
||||||
|
|
||||||
@NotNull Function<String, K> keyCast;
|
@NotNull Function<String, K> keyCast;
|
||||||
@NotNull Class<V> valueClazz;
|
@NotNull Class<V> valueClazz;
|
||||||
|
|
||||||
@Nullable LinkedHashMap<K, V> valueCache;
|
@Nullable LinkedHashMap<K, V> valueCache;
|
||||||
|
|
||||||
public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
|
public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
|
||||||
@NotNull Class<V> valueClazz) {
|
@NotNull Class<V> valueClazz) {
|
||||||
this(ConfigManager.getPluginConfig(), configSection, keyCast, valueClazz);
|
this(ConfigManager.getPluginConfig(), configSection, keyCast, valueClazz);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigValueMap(@NotNull FileConfig configuration, @NotNull String configSection,
|
public ConfigValueMap(@NotNull FileConfig configuration, @NotNull String configSection,
|
||||||
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
|
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
|
||||||
this.source = configuration;
|
this.source = configuration;
|
||||||
this.configSection = configSection;
|
this.configSection = configSection;
|
||||||
this.keyCast = keyCast;
|
this.keyCast = keyCast;
|
||||||
this.valueClazz = valueClazz;
|
this.valueClazz = valueClazz;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public @NotNull FileConfiguration getConfiguration() {
|
public @NotNull FileConfiguration getConfiguration() {
|
||||||
return this.source.getConfig();
|
return this.source.getConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearCache() {
|
public void clearCache() {
|
||||||
this.valueCache = null;
|
this.valueCache = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public Map<K, V> get() {
|
public Map<K, V> get() {
|
||||||
if (valueCache != null) return valueCache;
|
if (valueCache != null) return valueCache;
|
||||||
ConfigurationSection section = getConfiguration().getConfigurationSection(this.configSection);
|
ConfigurationSection section = getConfiguration().getConfigurationSection(this.configSection);
|
||||||
if (section == null) return new LinkedHashMap<>();
|
if (section == null) return new LinkedHashMap<>();
|
||||||
Set<String> keys = getConfiguration().getKeys(false);
|
Set<String> keys = section.getKeys(false);
|
||||||
if (keys.isEmpty()) return new LinkedHashMap<>();
|
if (keys.isEmpty()) return new LinkedHashMap<>();
|
||||||
else {
|
else {
|
||||||
LinkedHashMap<K, V> result = new LinkedHashMap<>();
|
LinkedHashMap<K, V> result = new LinkedHashMap<>();
|
||||||
for (String key : keys) {
|
for (String key : keys) {
|
||||||
K finalKey = keyCast.apply(key);
|
K finalKey = keyCast.apply(key);
|
||||||
Object val = getConfiguration().get(this.configSection);
|
Object val = section.get(key);
|
||||||
V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
|
V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
|
||||||
if (finalKey != null && finalValue != null) {
|
if (finalKey != null && finalValue != null) {
|
||||||
result.put(finalKey, finalValue);
|
result.put(finalKey, finalValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.valueCache = result;
|
this.valueCache = result;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void set(HashMap<K, V> valuesMap) {
|
public void set(LinkedHashMap<K, V> valuesMap) {
|
||||||
getConfiguration().createSection(this.configSection, valuesMap);
|
this.valueCache = valuesMap;
|
||||||
this.save();
|
getConfiguration().createSection(this.configSection, valuesMap);
|
||||||
}
|
this.save();
|
||||||
|
}
|
||||||
|
|
||||||
public void save() {
|
public void save() {
|
||||||
this.source.save();
|
this.source.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package cc.carm.plugin.moeteleport.listener;
|
package cc.carm.plugin.moeteleport.listener;
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.Main;
|
import cc.carm.plugin.moeteleport.Main;
|
||||||
|
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
||||||
|
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
||||||
import cc.carm.plugin.moeteleport.model.UserData;
|
import cc.carm.plugin.moeteleport.model.UserData;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
@@ -12,19 +15,28 @@ import java.util.UUID;
|
|||||||
|
|
||||||
public class UserListener implements Listener {
|
public class UserListener implements Listener {
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PlayerJoinEvent event) {
|
public void onJoin(PlayerJoinEvent event) {
|
||||||
UUID uuid = event.getPlayer().getUniqueId();
|
UUID uuid = event.getPlayer().getUniqueId();
|
||||||
UserData data = Main.getUserManager().loadData(uuid);
|
UserData data = Main.getUserManager().loadData(uuid);
|
||||||
Main.getUserManager().getUserDataMap().put(uuid, data);
|
Main.getUserManager().getUserDataMap().put(uuid, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onQuit(PlayerQuitEvent event) {
|
public void onQuit(PlayerQuitEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
Main.getRequestManager().cancelAllRequests(player);
|
Main.getRequestManager().cancelAllRequests(player);
|
||||||
Main.getUserManager().getData(player).save(); //保存
|
Main.getUserManager().getData(player).save(); //保存
|
||||||
Main.getUserManager().getUserDataMap().remove(player.getUniqueId());
|
Main.getUserManager().getUserDataMap().remove(player.getUniqueId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onDeath(PlayerDeathEvent event) {
|
||||||
|
if (PluginConfig.DEATH_GO_BACK.get()) {
|
||||||
|
Player player = event.getEntity();
|
||||||
|
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
|
||||||
|
PluginMessages.DEATH_BACK.send(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,32 +6,32 @@ import cc.carm.plugin.moeteleport.configuration.file.FileConfig;
|
|||||||
|
|
||||||
public class ConfigManager {
|
public class ConfigManager {
|
||||||
|
|
||||||
private static FileConfig config;
|
private static FileConfig config;
|
||||||
private static FileConfig messageConfig;
|
private static FileConfig messageConfig;
|
||||||
|
|
||||||
public static void initConfig() {
|
public static void initConfig() {
|
||||||
ConfigManager.config = new FileConfig(Main.getInstance(), "config.yml");
|
ConfigManager.config = new FileConfig(Main.getInstance(), "config.yml");
|
||||||
ConfigManager.messageConfig = new FileConfig(Main.getInstance(), "messages.yml");
|
ConfigManager.messageConfig = new FileConfig(Main.getInstance(), "messages.yml");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FileConfig getPluginConfig() {
|
public static FileConfig getPluginConfig() {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static FileConfig getMessageConfig() {
|
public static FileConfig getMessageConfig() {
|
||||||
return messageConfig;
|
return messageConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void reload() {
|
public static void reload() {
|
||||||
getPluginConfig().reload();
|
getPluginConfig().reload();
|
||||||
getMessageConfig().reload();
|
getMessageConfig().reload();
|
||||||
PluginConfig.PERMISSIONS.clearCache();
|
PluginConfig.PERMISSIONS.clearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void saveConfig() {
|
public static void saveConfig() {
|
||||||
getPluginConfig().save();
|
getPluginConfig().save();
|
||||||
getMessageConfig().save();
|
getMessageConfig().save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,123 +14,127 @@ import java.util.UUID;
|
|||||||
|
|
||||||
public class RequestManager {
|
public class RequestManager {
|
||||||
|
|
||||||
public BukkitRunnable checkRunnable;
|
public BukkitRunnable checkRunnable;
|
||||||
|
|
||||||
public RequestManager(Main main) {
|
public RequestManager(Main main) {
|
||||||
this.checkRunnable = new BukkitRunnable() {
|
this.checkRunnable = new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
checkRequests();
|
checkRequests();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.checkRunnable.runTaskTimerAsynchronously(main, 100L, 20L);
|
this.checkRunnable.runTaskTimerAsynchronously(main, 100L, 20L);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void shutdown() {
|
public void shutdown() {
|
||||||
if (!this.checkRunnable.isCancelled()) {
|
if (!this.checkRunnable.isCancelled()) {
|
||||||
this.checkRunnable.cancel();
|
this.checkRunnable.cancel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void checkRequests() {
|
public void checkRequests() {
|
||||||
Main.getUserManager().getUserDataMap().values()
|
Main.getUserManager().getUserDataMap().values()
|
||||||
.forEach(data -> data.getReceivedRequests().entrySet().stream()
|
.forEach(data -> data.getReceivedRequests().entrySet().stream()
|
||||||
.filter(entry -> entry.getValue().isExpired())
|
.filter(entry -> entry.getValue().isExpired())
|
||||||
.peek(entry -> PluginMessages.Request.SENT_TIMEOUT.sendWithPlaceholders(
|
.peek(entry -> PluginMessages.Request.SENT_TIMEOUT.sendWithPlaceholders(
|
||||||
entry.getValue().getSender(), new String[]{"%(player)"},
|
entry.getValue().getSender(), new String[]{"%(player)"},
|
||||||
new Object[]{entry.getValue().getReceiver().getName()}))
|
new Object[]{entry.getValue().getReceiver().getName()}))
|
||||||
.peek(entry -> PluginMessages.Request.RECEIVED_TIMEOUT.sendWithPlaceholders(
|
.peek(entry -> PluginMessages.Request.RECEIVED_TIMEOUT.sendWithPlaceholders(
|
||||||
entry.getValue().getReceiver(), new String[]{"%(player)"},
|
entry.getValue().getReceiver(), new String[]{"%(player)"},
|
||||||
new Object[]{entry.getValue().getSender().getName()}))
|
new Object[]{entry.getValue().getSender().getName()}))
|
||||||
.forEach(entry -> data.getSentRequests().remove(entry.getKey()))
|
.peek(entry -> Main.getUserManager()
|
||||||
);
|
.getData(entry.getValue().getSender()).getSentRequests()
|
||||||
}
|
.remove(entry.getKey()))
|
||||||
|
.forEach(entry -> data.getReceivedRequests().remove(entry.getKey()))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
|
public void sendRequest(Player sender, Player receiver, TeleportRequest.RequestType type) {
|
||||||
int expireTime = PluginConfig.EXPIRE_TIME.get();
|
int expireTime = PluginConfig.EXPIRE_TIME.get();
|
||||||
|
|
||||||
PluginMessages.Request.SENT.sendWithPlaceholders(sender,
|
PluginMessages.Request.SENT.sendWithPlaceholders(sender,
|
||||||
new String[]{"%(player)", "%(expire)"},
|
new String[]{"%(player)", "%(expire)"},
|
||||||
new Object[]{receiver, expireTime}
|
new Object[]{receiver.getName(), expireTime}
|
||||||
);
|
);
|
||||||
switch (type) {
|
|
||||||
case TPA: {
|
|
||||||
PluginMessages.TPA.sendWithPlaceholders(receiver,
|
|
||||||
new String[]{"%(player)", "%(expire)"},
|
|
||||||
new Object[]{sender.getName(), expireTime}
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case TPA_HERE: {
|
|
||||||
PluginMessages.TPA_HERE.sendWithPlaceholders(receiver,
|
|
||||||
new String[]{"%(player)", "%(expire)"},
|
|
||||||
new Object[]{sender.getName(), expireTime}
|
|
||||||
);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
TeleportRequest request = new TeleportRequest(sender, receiver, type);
|
switch (type) {
|
||||||
Main.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
|
case TPA: {
|
||||||
Main.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
|
PluginMessages.TPA.sendWithPlaceholders(receiver,
|
||||||
|
new String[]{"%(player)", "%(expire)"},
|
||||||
|
new Object[]{sender.getName(), expireTime}
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case TPA_HERE: {
|
||||||
|
PluginMessages.TPA_HERE.sendWithPlaceholders(receiver,
|
||||||
|
new String[]{"%(player)", "%(expire)"},
|
||||||
|
new Object[]{sender.getName(), expireTime}
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
TeleportRequest request = new TeleportRequest(sender, receiver, type);
|
||||||
|
Main.getUserManager().getData(receiver).getReceivedRequests().put(sender.getUniqueId(), request);
|
||||||
|
Main.getUserManager().getData(sender).getSentRequests().add(receiver.getUniqueId());
|
||||||
|
|
||||||
public void acceptRequest(TeleportRequest request) {
|
}
|
||||||
PluginMessages.ACCEPTED.sendWithPlaceholders(request.getSender(),
|
|
||||||
new String[]{"%(player)"},
|
|
||||||
new Object[]{request.getReceiver().getName()}
|
|
||||||
);
|
|
||||||
PluginMessages.TP_ACCEPT.sendWithPlaceholders(request.getReceiver(),
|
|
||||||
new String[]{"%(player)"},
|
|
||||||
new Object[]{request.getSender().getName()}
|
|
||||||
);
|
|
||||||
TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation());
|
|
||||||
removeRequests(request);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void denyRequest(TeleportRequest request) {
|
public void acceptRequest(TeleportRequest request) {
|
||||||
PluginMessages.DENIED.sendWithPlaceholders(request.getSender(),
|
PluginMessages.ACCEPTED.sendWithPlaceholders(request.getSender(),
|
||||||
new String[]{"%(player)"},
|
new String[]{"%(player)"},
|
||||||
new Object[]{request.getReceiver().getName()}
|
new Object[]{request.getReceiver().getName()}
|
||||||
);
|
);
|
||||||
PluginMessages.TP_DENY.sendWithPlaceholders(request.getReceiver(),
|
PluginMessages.TP_ACCEPT.sendWithPlaceholders(request.getReceiver(),
|
||||||
new String[]{"%(player)"},
|
new String[]{"%(player)"},
|
||||||
new Object[]{request.getSender().getName()}
|
new Object[]{request.getSender().getName()}
|
||||||
);
|
);
|
||||||
removeRequests(request);
|
TeleportManager.teleport(request.getTeleportPlayer(), request.getTeleportLocation(), true);
|
||||||
}
|
removeRequests(request);
|
||||||
|
}
|
||||||
|
|
||||||
public void removeRequests(TeleportRequest request) {
|
public void denyRequest(TeleportRequest request) {
|
||||||
Main.getUserManager().getData(request.getSender())
|
PluginMessages.DENIED.sendWithPlaceholders(request.getSender(),
|
||||||
.getSentRequests()
|
new String[]{"%(player)"},
|
||||||
.remove(request.getReceiver().getUniqueId());
|
new Object[]{request.getReceiver().getName()}
|
||||||
Main.getUserManager().getData(request.getReceiver())
|
);
|
||||||
.getReceivedRequests()
|
PluginMessages.TP_DENY.sendWithPlaceholders(request.getReceiver(),
|
||||||
.remove(request.getSender().getUniqueId());
|
new String[]{"%(player)"},
|
||||||
}
|
new Object[]{request.getSender().getName()}
|
||||||
|
);
|
||||||
|
removeRequests(request);
|
||||||
|
}
|
||||||
|
|
||||||
public void cancelAllRequests(Player player) {
|
public void removeRequests(TeleportRequest request) {
|
||||||
UUID playerUUID = player.getUniqueId();
|
Main.getUserManager().getData(request.getSender())
|
||||||
UserData data = Main.getUserManager().getData(player);
|
.getSentRequests()
|
||||||
data.getReceivedRequests().keySet().stream()
|
.remove(request.getReceiver().getUniqueId());
|
||||||
.peek(senderUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
|
Main.getUserManager().getData(request.getReceiver())
|
||||||
Bukkit.getPlayer(senderUUID),
|
.getReceivedRequests()
|
||||||
new String[]{"%(player)"}, new Object[]{player.getName()}
|
.remove(request.getSender().getUniqueId());
|
||||||
)).map(senderUUID -> Main.getUserManager().getData(senderUUID))
|
}
|
||||||
.filter(Objects::nonNull).map(UserData::getSentRequests)
|
|
||||||
.forEach(receivers -> receivers.remove(playerUUID));
|
|
||||||
|
|
||||||
data.getSentRequests().stream()
|
public void cancelAllRequests(Player player) {
|
||||||
.peek(receiverUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
|
UUID playerUUID = player.getUniqueId();
|
||||||
Bukkit.getPlayer(receiverUUID),
|
UserData data = Main.getUserManager().getData(player);
|
||||||
new String[]{"%(player)"}, new Object[]{player.getName()}
|
data.getReceivedRequests().keySet().stream()
|
||||||
)).map(receiverUUID -> Main.getUserManager().getData(receiverUUID))
|
.peek(senderUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
|
||||||
.filter(Objects::nonNull).map(UserData::getReceivedRequests)
|
Bukkit.getPlayer(senderUUID),
|
||||||
.forEach(senders -> senders.remove(playerUUID));
|
new String[]{"%(player)"}, new Object[]{player.getName()}
|
||||||
|
)).map(senderUUID -> Main.getUserManager().getData(senderUUID))
|
||||||
|
.filter(Objects::nonNull).map(UserData::getSentRequests)
|
||||||
|
.forEach(receivers -> receivers.remove(playerUUID));
|
||||||
|
|
||||||
data.getSentRequests().clear();
|
data.getSentRequests().stream()
|
||||||
data.getReceivedRequests().clear();
|
.peek(receiverUUID -> PluginMessages.Request.OFFLINE.sendWithPlaceholders(
|
||||||
}
|
Bukkit.getPlayer(receiverUUID),
|
||||||
|
new String[]{"%(player)"}, new Object[]{player.getName()}
|
||||||
|
)).map(receiverUUID -> Main.getUserManager().getData(receiverUUID))
|
||||||
|
.filter(Objects::nonNull).map(UserData::getReceivedRequests)
|
||||||
|
.forEach(senders -> senders.remove(playerUUID));
|
||||||
|
|
||||||
|
data.getSentRequests().clear();
|
||||||
|
data.getReceivedRequests().clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package cc.carm.plugin.moeteleport.manager;
|
package cc.carm.plugin.moeteleport.manager;
|
||||||
|
|
||||||
|
import cc.carm.plugin.moeteleport.Main;
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
||||||
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
|
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
|
||||||
@@ -10,46 +11,50 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
public class TeleportManager {
|
public class TeleportManager {
|
||||||
|
|
||||||
public static void teleport(Player player, DataLocation targetLocation) {
|
public static void teleport(Player player, DataLocation targetLocation, boolean onlySafety) {
|
||||||
Location location = targetLocation.getBukkitLocation();
|
Location location = targetLocation.getBukkitLocation();
|
||||||
if (location == null) {
|
if (location == null) {
|
||||||
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
|
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
|
||||||
new String[]{"%(location)"},
|
new String[]{"%(location)"},
|
||||||
new Object[]{targetLocation.toString()}
|
new Object[]{targetLocation.toFlatString()}
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
teleport(player, location);
|
teleport(player, location, onlySafety);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void teleport(Player player, Location targetLocation) {
|
public static void teleport(Player player, Location targetLocation, boolean onlySafety) {
|
||||||
if (targetLocation.isWorldLoaded()) {
|
if (targetLocation.isWorldLoaded()) {
|
||||||
player.teleport(targetLocation);
|
if (!onlySafety || TeleportManager.isSafeLocation(targetLocation)) {
|
||||||
PluginMessages.TELEPORTING.sendWithPlaceholders(player,
|
Main.getUserManager().getData(player).setLastLocation(player.getLocation());
|
||||||
new String[]{"%(location)"},
|
player.teleport(targetLocation);
|
||||||
new Object[]{new DataLocation(targetLocation).toString()}
|
PluginMessages.TELEPORTING.sendWithPlaceholders(player,
|
||||||
);
|
new String[]{"%(location)"},
|
||||||
} else {
|
new Object[]{new DataLocation(targetLocation).toFlatString()}
|
||||||
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
|
);
|
||||||
new String[]{"%(location)"},
|
} else {
|
||||||
new Object[]{new DataLocation(targetLocation).toString()}
|
PluginMessages.DANGEROUS.send(player);
|
||||||
);
|
}
|
||||||
}
|
} else {
|
||||||
}
|
PluginMessages.NOT_AVAILABLE.sendWithPlaceholders(player,
|
||||||
|
new String[]{"%(location)"},
|
||||||
|
new Object[]{new DataLocation(targetLocation).toFlatString()}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isSafeLocation(Location location) {
|
public static boolean isSafeLocation(Location location) {
|
||||||
Block leg = location.getBlock();
|
Block leg = location.getBlock();
|
||||||
if (!leg.getType().isAir()) {
|
if (!leg.getType().isAir()) {
|
||||||
return false; // not transparent (will suffocate)
|
return false; // not transparent (will suffocate)
|
||||||
}
|
}
|
||||||
Block head = leg.getRelative(BlockFace.UP);
|
Block head = leg.getRelative(BlockFace.UP);
|
||||||
if (!head.getType().isAir()) {
|
if (!head.getType().isAir()) {
|
||||||
return false; // not transparent (will suffocate)
|
return false; // not transparent (will suffocate)
|
||||||
}
|
}
|
||||||
Block ground = leg.getRelative(BlockFace.DOWN);
|
Block ground = leg.getRelative(BlockFace.DOWN);
|
||||||
return ground.getType().isSolid()
|
return !PluginConfig.DANGEROUS_TYPES.get().contains(ground.getType().name());
|
||||||
&& !PluginConfig.DANGEROUS_TYPES.get().contains(ground.getType().name());
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,50 +14,51 @@ import java.util.UUID;
|
|||||||
|
|
||||||
public class UserManager {
|
public class UserManager {
|
||||||
|
|
||||||
private final File dataFolder;
|
private final File dataFolder;
|
||||||
|
|
||||||
private final HashMap<UUID, UserData> userDataMap = new HashMap<>();
|
private final HashMap<UUID, UserData> userDataMap = new HashMap<>();
|
||||||
|
|
||||||
public UserManager(Main main) {
|
public UserManager(Main main) {
|
||||||
this.dataFolder = new File(main.getDataFolder() + "/data");
|
this.dataFolder = new File(main.getDataFolder() + "/data");
|
||||||
if (!dataFolder.isDirectory() || !dataFolder.exists()) {
|
if (!dataFolder.isDirectory() || !dataFolder.exists()) {
|
||||||
boolean success = dataFolder.mkdir();
|
boolean success = dataFolder.mkdir();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public UserData loadData(UUID userUUID) {
|
public UserData loadData(UUID userUUID) {
|
||||||
return new UserData(getDataFolder(), userUUID);
|
return new UserData(getDataFolder(), userUUID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public UserData getData(UUID userUUID) {
|
public UserData getData(UUID userUUID) {
|
||||||
return getUserDataMap().get(userUUID);
|
return getUserDataMap().get(userUUID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public UserData getData(Player player) {
|
public UserData getData(Player player) {
|
||||||
return getUserDataMap().get(player.getUniqueId());
|
return getUserDataMap().get(player.getUniqueId());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getMaxHome(Player player) {
|
public int getMaxHome(Player player) {
|
||||||
Map<String, Integer> permissions = PluginConfig.PERMISSIONS.get();
|
Map<Integer, String> permissions = PluginConfig.PERMISSIONS.get();
|
||||||
int value = PluginConfig.DEFAULT_HOME.get();
|
int current = PluginConfig.DEFAULT_HOME.get();
|
||||||
for (Map.Entry<String, Integer> entry : permissions.entrySet()) {
|
|
||||||
if (entry.getValue() > value && player.hasPermission(
|
|
||||||
Main.getInstance().getName() + "." + entry.getKey()
|
|
||||||
)) {
|
|
||||||
value = entry.getValue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public HashMap<UUID, UserData> getUserDataMap() {
|
for (Map.Entry<Integer, String> entry : permissions.entrySet()) {
|
||||||
return userDataMap;
|
if (entry.getKey() > current && player.hasPermission(
|
||||||
}
|
Main.getInstance().getName() + "." + entry.getValue()
|
||||||
|
)) {
|
||||||
|
current = entry.getKey();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
public File getDataFolder() {
|
public HashMap<UUID, UserData> getUserDataMap() {
|
||||||
return dataFolder;
|
return userDataMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public File getDataFolder() {
|
||||||
|
return dataFolder;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,82 +1,71 @@
|
|||||||
package cc.carm.plugin.moeteleport.model;
|
package cc.carm.plugin.moeteleport.model;
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginMessages;
|
|
||||||
import cc.carm.plugin.moeteleport.manager.TeleportManager;
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
public class TeleportRequest {
|
public class TeleportRequest {
|
||||||
|
|
||||||
final @NotNull Player sender;
|
final @NotNull Player sender;
|
||||||
final @NotNull Player receiver;
|
final @NotNull Player receiver;
|
||||||
final @NotNull RequestType type;
|
final @NotNull RequestType type;
|
||||||
|
|
||||||
final long createTime;
|
final long createTime;
|
||||||
|
|
||||||
public TeleportRequest(@NotNull Player sender,
|
public TeleportRequest(@NotNull Player sender,
|
||||||
@NotNull Player receiver,
|
@NotNull Player receiver,
|
||||||
@NotNull RequestType type) {
|
@NotNull RequestType type) {
|
||||||
this.sender = sender;
|
this.sender = sender;
|
||||||
this.receiver = receiver;
|
this.receiver = receiver;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.createTime = System.currentTimeMillis();
|
this.createTime = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NotNull Player getSender() {
|
public @NotNull Player getSender() {
|
||||||
return sender;
|
return sender;
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NotNull Player getReceiver() {
|
public @NotNull Player getReceiver() {
|
||||||
return receiver;
|
return receiver;
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NotNull Player getTeleportPlayer() {
|
public @NotNull Player getTeleportPlayer() {
|
||||||
return getType() == RequestType.TPA ? getSender() : getReceiver();
|
return getType() == RequestType.TPA ? getSender() : getReceiver();
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NotNull Location getTeleportLocation() {
|
public @NotNull Location getTeleportLocation() {
|
||||||
return getType() == RequestType.TPA_HERE ? getSender().getLocation() : getReceiver().getLocation();
|
return getType() == RequestType.TPA_HERE ? getSender().getLocation() : getReceiver().getLocation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NotNull RequestType getType() {
|
public @NotNull RequestType getType() {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getCreateTime() {
|
public long getCreateTime() {
|
||||||
return createTime;
|
return createTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getActiveTime() {
|
public long getActiveTime() {
|
||||||
return System.currentTimeMillis() - getCreateTime();
|
return System.currentTimeMillis() - getCreateTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getRemainTime() {
|
||||||
|
return PluginConfig.EXPIRE_TIME.get() * 1000 - getActiveTime();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public long getRemainSeconds() {
|
||||||
* 尝试对玩家进行传送
|
return getRemainTime() / 1000;
|
||||||
*
|
}
|
||||||
* @return 是否传送成功
|
|
||||||
*/
|
|
||||||
public boolean tryTeleport(@NotNull Location location) {
|
|
||||||
if (!location.isWorldLoaded()) return false;
|
|
||||||
if (!TeleportManager.isSafeLocation(location)) {
|
|
||||||
PluginMessages.DANGEROUS.sendWithPlaceholders(getTeleportPlayer());
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
TeleportManager.teleport(getTeleportPlayer(), location);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isExpired() {
|
public boolean isExpired() {
|
||||||
return getActiveTime() > PluginConfig.EXPIRE_TIME.get() * 10000;
|
return getActiveTime() > PluginConfig.EXPIRE_TIME.get() * 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum RequestType {
|
public enum RequestType {
|
||||||
TPA,
|
TPA,
|
||||||
TPA_HERE
|
TPA_HERE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package cc.carm.plugin.moeteleport.model;
|
package cc.carm.plugin.moeteleport.model;
|
||||||
|
|
||||||
import cc.carm.plugin.moeteleport.Main;
|
import cc.carm.plugin.moeteleport.Main;
|
||||||
import cc.carm.plugin.moeteleport.configuration.PluginConfig;
|
|
||||||
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
|
import cc.carm.plugin.moeteleport.configuration.location.DataLocation;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
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;
|
||||||
|
|
||||||
@@ -17,118 +15,118 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||||||
|
|
||||||
public class UserData {
|
public class UserData {
|
||||||
|
|
||||||
private final @NotNull File dataFile;
|
private final @NotNull File dataFile;
|
||||||
private final @NotNull FileConfiguration dataConfig;
|
private final @NotNull FileConfiguration dataConfig;
|
||||||
|
private final HashSet<UUID/*receiverUUID*/> sentRequests = new HashSet<>(); // 记录发出的请求
|
||||||
|
private final ConcurrentHashMap<UUID/*senderUUID*/, TeleportRequest> receivedRequests = new ConcurrentHashMap<>(); // 记录收到的传送请求
|
||||||
|
public boolean enableAutoSelect = false;
|
||||||
|
private @Nullable Location lastLocation;
|
||||||
|
private LinkedHashMap<String, DataLocation> homeLocations;
|
||||||
|
|
||||||
private @Nullable Location lastLocation;
|
public UserData(@NotNull File dataFolder, @NotNull UUID uuid) {
|
||||||
|
this(new File(dataFolder, uuid + ".yml"));
|
||||||
|
}
|
||||||
|
|
||||||
private LinkedHashMap<String, DataLocation> homeLocations;
|
public UserData(@NotNull File file) {
|
||||||
|
if (!file.exists()) {
|
||||||
|
try {
|
||||||
|
boolean success = file.createNewFile();
|
||||||
|
} catch (IOException e) {
|
||||||
|
Main.error("在加载用户 " + file.getName() + " 的数据时出现异常。");
|
||||||
|
Main.error(e.getLocalizedMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.dataFile = file;
|
||||||
|
this.dataConfig = YamlConfiguration.loadConfiguration(dataFile);
|
||||||
|
loadHomeData();
|
||||||
|
}
|
||||||
|
|
||||||
private HashSet<UUID/*receiverUUID*/> sentRequests; // 记录发出的请求
|
public void loadHomeData() {
|
||||||
private ConcurrentHashMap<UUID/*senderUUID*/, TeleportRequest> receivedRequests; // 记录收到的传送请求
|
LinkedHashMap<String, DataLocation> data = new LinkedHashMap<>();
|
||||||
|
Optional.ofNullable(getDataConfig().getConfigurationSection("homes"))
|
||||||
|
.ifPresent(section -> section.getKeys(false).forEach(homeName -> {
|
||||||
|
DataLocation location = DataLocation.deserializeText(section.getString(homeName));
|
||||||
|
if (location != null) data.put(homeName, location);
|
||||||
|
}));
|
||||||
|
this.homeLocations = data;
|
||||||
|
}
|
||||||
|
|
||||||
public UserData(@NotNull File dataFolder, @NotNull UUID uuid) {
|
public LinkedHashMap<String, DataLocation> getHomeLocations() {
|
||||||
this(new File(dataFolder, uuid + ".yml"));
|
return homeLocations;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserData(@NotNull File file) {
|
public void setHomeLocation(String homeName, Location location) {
|
||||||
if (!file.exists()) {
|
delHomeLocation(homeName);
|
||||||
try {
|
getHomeLocations().put(homeName, new DataLocation(location));
|
||||||
boolean success = file.createNewFile();
|
}
|
||||||
} catch (IOException e) {
|
|
||||||
Main.error("在加载用户 " + file.getName() + " 的数据时出现异常。");
|
|
||||||
Main.error(e.getLocalizedMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.dataFile = file;
|
|
||||||
this.dataConfig = YamlConfiguration.loadConfiguration(dataFile);
|
|
||||||
loadHomeData();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void loadHomeData() {
|
public void delHomeLocation(String homeName) {
|
||||||
LinkedHashMap<String, DataLocation> data = new LinkedHashMap<>();
|
Map.Entry<String, DataLocation> lastLocation = getHomeLocation(homeName);
|
||||||
Optional.ofNullable(getDataConfig().getConfigurationSection("homes"))
|
if (lastLocation != null) getHomeLocations().remove(lastLocation.getKey());
|
||||||
.ifPresent(section -> section.getKeys(false).forEach(homeName -> {
|
}
|
||||||
DataLocation location = DataLocation.deserializeText(section.getString(homeName));
|
|
||||||
if (location != null) data.put(homeName, location);
|
|
||||||
}));
|
|
||||||
this.homeLocations = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LinkedHashMap<String, DataLocation> getHomeLocations() {
|
public Map.Entry<String, DataLocation> getHomeLocation(@Nullable String homeName) {
|
||||||
return homeLocations;
|
LinkedHashMap<String, DataLocation> homes = getHomeLocations();
|
||||||
}
|
if (homeName == null) {
|
||||||
|
if (homes.containsKey("home")) {
|
||||||
|
return new AbstractMap.SimpleEntry<>("home", homes.get("home"));
|
||||||
|
} else {
|
||||||
|
return homes.entrySet().stream().findFirst().orElse(null);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return homes.entrySet().stream()
|
||||||
|
.filter(entry -> entry.getKey().equalsIgnoreCase(homeName))
|
||||||
|
.findFirst().orElse(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void setHomeLocation(String homeName, Location location) {
|
public @Nullable Location getLastLocation() {
|
||||||
delHomeLocation(homeName);
|
return lastLocation;
|
||||||
getHomeLocations().put(homeName, new DataLocation(location));
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public void delHomeLocation(String homeName) {
|
public void setLastLocation(@Nullable Location lastLocation) {
|
||||||
Map.Entry<String, DataLocation> lastLocation = getHomeLocation(homeName);
|
this.lastLocation = lastLocation;
|
||||||
if (lastLocation != null) getHomeLocations().remove(lastLocation.getKey());
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public Map.Entry<String, DataLocation> getHomeLocation(@Nullable String homeName) {
|
public HashSet<UUID> getSentRequests() {
|
||||||
LinkedHashMap<String, DataLocation> homes = getHomeLocations();
|
return sentRequests;
|
||||||
if (homeName == null) {
|
}
|
||||||
if (homes.containsKey("home")) {
|
|
||||||
return new AbstractMap.SimpleEntry<>("home", homes.get("home"));
|
|
||||||
} else {
|
|
||||||
return homes.entrySet().stream().findFirst().orElse(null);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return homes.entrySet().stream()
|
|
||||||
.filter(entry -> entry.getKey().equalsIgnoreCase(homeName))
|
|
||||||
.findFirst().orElse(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public @Nullable Location getLastLocation() {
|
public ConcurrentHashMap<UUID, TeleportRequest> getReceivedRequests() {
|
||||||
return lastLocation;
|
return receivedRequests;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean backToLocation(Player player) {
|
public boolean isEnableAutoSelect() {
|
||||||
if (getLastLocation() == null) return false;
|
return enableAutoSelect;
|
||||||
else {
|
}
|
||||||
player.teleport(getLastLocation());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public HashSet<UUID> getSentRequests() {
|
public void setEnableAutoSelect(boolean enableAutoSelect) {
|
||||||
return sentRequests;
|
this.enableAutoSelect = enableAutoSelect;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConcurrentHashMap<UUID, TeleportRequest> getReceivedRequests() {
|
public @NotNull File getDataFile() {
|
||||||
return receivedRequests;
|
return dataFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public @NotNull FileConfiguration getDataConfig() {
|
||||||
|
return dataConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LinkedHashMap<String, String> saveToMap() {
|
||||||
|
LinkedHashMap<String, DataLocation> homeLocations = getHomeLocations();
|
||||||
|
LinkedHashMap<String, String> data = new LinkedHashMap<>();
|
||||||
|
if (homeLocations.isEmpty()) return data;
|
||||||
|
homeLocations.forEach((name, loc) -> data.put(name, loc.serializeToText()));
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
public @NotNull File getDataFile() {
|
public void save() {
|
||||||
return dataFile;
|
try {
|
||||||
}
|
getDataConfig().createSection("homes", saveToMap());
|
||||||
|
getDataConfig().save(getDataFile());
|
||||||
public @NotNull FileConfiguration getDataConfig() {
|
} catch (Exception ex) {
|
||||||
return dataConfig;
|
Main.error("在保存 " + getDataFile().getName() + " 时出现异常。");
|
||||||
}
|
Main.error(ex.getLocalizedMessage());
|
||||||
|
}
|
||||||
public LinkedHashMap<String, String> saveToMap() {
|
}
|
||||||
LinkedHashMap<String, DataLocation> homeLocations = getHomeLocations();
|
|
||||||
LinkedHashMap<String, String> data = new LinkedHashMap<>();
|
|
||||||
if (homeLocations.isEmpty()) return data;
|
|
||||||
homeLocations.forEach((name, loc) -> data.put(name, loc.serializeToText()));
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void save() {
|
|
||||||
try {
|
|
||||||
getDataConfig().createSection("homes", saveToMap());
|
|
||||||
getDataConfig().save(getDataFile());
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Main.error("在保存 " + getDataFile().getName() + " 时出现异常。");
|
|
||||||
Main.error(ex.getLocalizedMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package cc.carm.plugin.moeteleport.util;
|
package cc.carm.plugin.moeteleport.util;
|
||||||
|
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
@@ -7,8 +6,7 @@ import java.util.regex.Pattern;
|
|||||||
public class ColorParser {
|
public class ColorParser {
|
||||||
|
|
||||||
public static String parse(String text) {
|
public static String parse(String text) {
|
||||||
text = parseHexColor(text);
|
return parseColor(parseHexColor(text));
|
||||||
return parseColor(text);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String parseColor(final String text) {
|
public static String parseColor(final String text) {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package cc.carm.plugin.moeteleport.util;
|
package cc.carm.plugin.moeteleport.util;
|
||||||
|
|
||||||
|
import de.themoep.minedown.MineDown;
|
||||||
import me.clip.placeholderapi.PlaceholderAPI;
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@@ -10,67 +11,67 @@ import java.util.*;
|
|||||||
|
|
||||||
public class MessageUtil {
|
public class MessageUtil {
|
||||||
|
|
||||||
public static boolean hasPlaceholderAPI() {
|
public static boolean hasPlaceholderAPI() {
|
||||||
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
|
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void send(@Nullable CommandSender sender, List<String> messages) {
|
public static void send(@Nullable CommandSender sender, List<String> messages) {
|
||||||
if (messages == null || messages.isEmpty() || sender == null) return;
|
if (messages == null || messages.isEmpty() || sender == null) return;
|
||||||
for (String s : messages) {
|
for (String s : messages) {
|
||||||
sender.sendMessage(ColorParser.parse(s));
|
sender.spigot().sendMessage(MineDown.parse(s));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void send(@Nullable CommandSender sender, String... messages) {
|
public static void send(@Nullable CommandSender sender, String... messages) {
|
||||||
send(sender, Arrays.asList(messages));
|
send(sender, Arrays.asList(messages));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
|
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
|
||||||
sendWithPlaceholders(sender, Arrays.asList(messages));
|
sendWithPlaceholders(sender, Arrays.asList(messages));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
|
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
|
||||||
if (messages == null || messages.isEmpty() || sender == null) return;
|
if (messages == null || messages.isEmpty() || sender == null) return;
|
||||||
if (hasPlaceholderAPI() && sender instanceof Player) {
|
if (hasPlaceholderAPI() && sender instanceof Player) {
|
||||||
send(sender, PlaceholderAPI.setPlaceholders((Player) sender, messages));
|
send(sender, PlaceholderAPI.setPlaceholders((Player) sender, messages));
|
||||||
} else {
|
} else {
|
||||||
send(sender, messages);
|
send(sender, messages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
|
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
|
||||||
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
|
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
|
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
|
||||||
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
|
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
|
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
|
||||||
return setCustomParams(messages, new String[]{param}, new Object[]{value});
|
return setCustomParams(messages, new String[]{param}, new Object[]{value});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
|
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
|
||||||
if (params.length != values.length) return messages;
|
if (params.length != values.length) return messages;
|
||||||
HashMap<String, Object> paramsMap = new HashMap<>();
|
HashMap<String, Object> paramsMap = new HashMap<>();
|
||||||
for (int i = 0; i < params.length; i++) {
|
for (int i = 0; i < params.length; i++) {
|
||||||
paramsMap.put(params[i], values[i]);
|
paramsMap.put(params[i], values[i]);
|
||||||
}
|
}
|
||||||
return setCustomParams(messages, paramsMap);
|
return setCustomParams(messages, paramsMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
|
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
|
||||||
List<String> list = new ArrayList<>();
|
List<String> list = new ArrayList<>();
|
||||||
for (String message : messages) {
|
for (String message : messages) {
|
||||||
String afterMessage = message;
|
String afterMessage = message;
|
||||||
for (Map.Entry<String, Object> entry : params.entrySet()) {
|
for (Map.Entry<String, Object> entry : params.entrySet()) {
|
||||||
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
|
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
|
||||||
}
|
}
|
||||||
list.add(afterMessage);
|
list.add(afterMessage);
|
||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,14 +4,17 @@ defaultHome: 1
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
# 以下命令全部为 MoeTeleport 的子节点
|
# 以下命令全部为 MoeTeleport 的子节点
|
||||||
# 如 "home.1" 的权限全拼就是 "MoeTeleport.home.1"
|
# 如 "home.vip" 的权限全拼就是 "MoeTeleport.home.vip"
|
||||||
"home.1": 1 # 代表最多可以设置一个家
|
10: "home.vip" # 最多可以设置10个家
|
||||||
"home.vip": 10 # 最多可以设置10个家
|
|
||||||
|
|
||||||
# 传送请求过期时间
|
# 传送请求过期时间
|
||||||
expireTime: 30
|
expireTime: 30
|
||||||
|
|
||||||
|
# 返回死亡点
|
||||||
|
# 开启后将允许玩家输入 /back 返回死亡地点。
|
||||||
|
death-back: true
|
||||||
|
|
||||||
# 危险的方块类型,将判断目的地脚下的方块的类型是否在这个列表中
|
# 危险的方块类型,将判断目的地脚下的方块的类型是否在这个列表中
|
||||||
dangerousBlocks:
|
dangerous-blocks:
|
||||||
- LAVA
|
- LAVA
|
||||||
- AIR
|
- AIR
|
||||||
@@ -1,60 +1,68 @@
|
|||||||
no-last-location:
|
no-last-location:
|
||||||
- "&f您当前没有进行传送,无法返回上个地点。"
|
- "&f您当前没有进行传送,无法返回上个地点。"
|
||||||
|
|
||||||
|
death-back:
|
||||||
|
- "&f您可以输入 &5/back &f返回您的死亡地点。"
|
||||||
|
|
||||||
not-online:
|
not-online:
|
||||||
- "&f目标玩家并不在线,无法发送请求。"
|
- "&f目标玩家并不在线,无法发送请求。"
|
||||||
tpa:
|
tpa:
|
||||||
- "&6%(player) &f请求传送到您身边,您有%(expire)秒的时间回应。"
|
- "&d%(player) &f请求传送到您身边,您有 &5%(expire)秒 &f的时间回应。"
|
||||||
- "&a&l[同意] &f输入 &e/tpaccept &f同意该请求。"
|
- "[&a&l[同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f输入 &5/tpAccept &f同意该请求。"
|
||||||
- "&c&l[拒绝] &f输入 &e/tpdeny &f拒绝该请求。"
|
- "[&c&l[拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f输入 &5/tpDeny &f拒绝该请求。"
|
||||||
tpahere:
|
tpahere:
|
||||||
- "&6%(player) &f请求传送您到Ta身边,您有%(expire)秒的时间回应。"
|
- "&d%(player) &f请求传送您到Ta身边,您有 &5%(expire)秒 &f的时间回应。"
|
||||||
- "&a&l[同意] &f输入 &e/tpaccept &f同意该请求。"
|
- "[&a&l[同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f输入 &5/tpAccept &f同意该请求。"
|
||||||
- "&c&l[拒绝] &f输入 &e/tpdeny &f拒绝该请求。"
|
- "[&c&l[拒绝]](show_text=点击拒绝请求 run_command=/tpDeny %(player)) &f输入 &5/tpDeny &f拒绝该请求。"
|
||||||
tpaccept:
|
tpaccept:
|
||||||
- "&f您同意了 &6%(player) &f的传送请求。"
|
- "&f您同意了 &d%(player) &f的传送请求。"
|
||||||
tpdeny:
|
tpdeny:
|
||||||
- "&f您&c拒绝&f了 &6%(player) &f的传送请求。"
|
- "&f您&d拒绝&f了 &d%(player) &f的传送请求。"
|
||||||
accepted:
|
accepted:
|
||||||
- "&6%(player) &f同意了您的传送请求。"
|
- "&d%(player) &f同意了您的传送请求。"
|
||||||
denied:
|
denied:
|
||||||
- "&6%(player) &c拒绝&f了您的传送请求。"
|
- "&d%(player) &f拒绝了您的传送请求。"
|
||||||
offline:
|
|
||||||
- "&6%(player) &f离线,相关请求已自动取消。"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
offline:
|
||||||
|
- "&d%(player) &f离线,相关请求已自动取消。"
|
||||||
|
|
||||||
|
request-duplicate:
|
||||||
|
- "&f您已经向 &d%(player) &f发送过传送请求,对方仍有 &5%(expire)秒 &f的时间回应该请求。"
|
||||||
request-sent:
|
request-sent:
|
||||||
- "&f成功向玩家 &6%(player) 发送传送请求,对方有%(expire)秒的时间回应该请求。"
|
- "&f成功向玩家 &d%(player) &f发送传送请求,对方有 &5%(expire)秒 &f的时间回应该请求。"
|
||||||
no-request:
|
no-request:
|
||||||
- "&f您当前没有任何待处理的传送请求。"
|
- "&f您当前没有任何待处理的传送请求。"
|
||||||
no-request-player:
|
no-request-player:
|
||||||
- "&f您当前没有收到来自 &6%(player) &f的传送请求。"
|
- "&f您当前没有收到来自 &d%(player) &f的传送请求。"
|
||||||
multi-requests:
|
multi-requests:
|
||||||
- "&f您当前有条请求待处理,请输入 &6%(command) <玩家名> &f决定回应谁的请求。"
|
- "&f您当前有&d%(num)条请求&f待处理,请输入 &5/%(command) <玩家名> &f决定回应谁的请求。"
|
||||||
- "&f您也可以再次输入 &6%(command) &f直接回应最近的一条请求。"
|
- "&f您也可以再次输入 &5/%(command) &f快速回应最近的一条请求。"
|
||||||
request-sent-timeout:
|
request-sent-timeout:
|
||||||
- "&f发往 &6%(player) &f的传送请求已超时。"
|
- "&f发往 &d%(player) &f的传送请求已超时。"
|
||||||
request-received-timeout:
|
request-received-timeout:
|
||||||
- "&f来自 &6%(player) &f的传送请求已超时。"
|
- "&f来自 &d%(player) &f的传送请求已超时。"
|
||||||
teleporting:
|
teleporting:
|
||||||
- "&f正在传送到 &6%(location) &f..."
|
- "&f正在传送到 &d%(location) &f..."
|
||||||
dangerous:
|
dangerous:
|
||||||
- "&f目标地点不安全,传送被取消。"
|
- "&f目标地点不安全,传送被取消。"
|
||||||
dangerous-here:
|
dangerous-here:
|
||||||
- "&f当前地点不安全,无法发送传送请求。"
|
- "&f当前地点不安全,传送被取消。"
|
||||||
notAvailable:
|
notAvailable:
|
||||||
- "&f目标地点暂时无法前往,传送被取消。"
|
- "&f目标地点暂时无法前往,传送被取消。"
|
||||||
|
|
||||||
home-list-header:
|
home-list-header:
|
||||||
- "&f您当前设定的所有家:"
|
- "&f您当前设定的所有家:"
|
||||||
home-list-object: "&8#&f%(id) &6%(location)"
|
home-list-object: "&8# &f%(id) &d%(location) [&7✈](show_text=点击返回家 %(id) run_command=/home %(id))"
|
||||||
home-not-found:
|
home-not-found:
|
||||||
- "&f您还没有设置这个家,请先输入 &e/setHome <家名称> &f设置一个吧!"
|
- "&f您还没有设置这个家,请先输入 &5/setHome <家名称> &f设置一个吧!"
|
||||||
home-set:
|
home-set:
|
||||||
- "&f成功设定名为 &6%(name) &f的家传送点。"
|
- "&f成功设定名为 &d%(name) &f的家传送点。"
|
||||||
home-removed:
|
home-removed:
|
||||||
- "&f成功移除名为 &6%(name) &f的家传送点。"
|
- "&f成功移除名为 &d%(name) &f的家传送点。"
|
||||||
- "&7原先位置为 &f%(location) &7。"
|
- "&7原先位置为 &f%(location) &7。"
|
||||||
home-over-limit:
|
home-over-limit:
|
||||||
- "&f您最多只能设置 &6%(max) &f个家传送点!"
|
- "&f您最多只能设置 &d%(max) &f个家传送点!"
|
||||||
- "&7可以输入 &e/delHome <家名称> &7删除之前的家传送点,"
|
- "&7可以输入 &5/delHome <家名称> &7删除之前的家传送点,"
|
||||||
- "&7或输入 &e/setHome <家名称> &7覆盖之前的家传送点。"
|
- "&7或输入 &5/setHome <家名称> &7覆盖之前的家传送点。"
|
||||||
@@ -13,7 +13,16 @@ permissions:
|
|||||||
description: "插件的主权限节点"
|
description: "插件的主权限节点"
|
||||||
default: false
|
default: false
|
||||||
|
|
||||||
|
"MoeTeleport.admin":
|
||||||
|
description: "插件的管理员权限节点"
|
||||||
|
default: op
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
|
"MoeTeleport":
|
||||||
|
description: "插件的主命令,用于重载插件或查看插件信息。"
|
||||||
|
permission: "MoeTeleport.admin"
|
||||||
|
usage: "/MoeTeleport reload"
|
||||||
|
|
||||||
"back":
|
"back":
|
||||||
description: 返回传送前的上一个地点。
|
description: 返回传送前的上一个地点。
|
||||||
|
|
||||||
@@ -23,10 +32,10 @@ commands:
|
|||||||
"tpaHere":
|
"tpaHere":
|
||||||
usage: "/tpaHere <玩家>"
|
usage: "/tpaHere <玩家>"
|
||||||
description: 请求一个玩家传送到自己身边。
|
description: 请求一个玩家传送到自己身边。
|
||||||
"tpaAccept":
|
"tpAccept":
|
||||||
usage: "/tpAccept [玩家]"
|
usage: "/tpAccept [玩家]"
|
||||||
description: 同意一个请求,可以限定某个玩家。
|
description: 同意一个请求,可以限定某个玩家。
|
||||||
"tpaDeny":
|
"tpDeny":
|
||||||
usage: "/tpDeny [玩家]"
|
usage: "/tpDeny [玩家]"
|
||||||
description: 拒绝一个请求,可以限定某个玩家。
|
description: 拒绝一个请求,可以限定某个玩家。
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user