Compare commits
22 Commits
Author | SHA1 | Date |
---|---|---|
Bea | 21f613bbe7 | |
Bea | 85cecca263 | |
Bea | 122b4b064c | |
Bea | 7f792b5ca8 | |
Bea | 0839161bb2 | |
Bea | 48b2043dda | |
Bea | 01dc420e64 | |
Bea | 553f508d1c | |
Bea | 3e17b49d1c | |
Bea | 552e12a813 | |
Bea | f92bfbac74 | |
Bea | 919305e0e8 | |
Bea | 94d811bed3 | |
Bea | b80cd4b1c9 | |
Bea | 6ea6628587 | |
Bea | 6017c2db6d | |
Beatrice | 55f5f28edd | |
Bea | 877aa5561b | |
Bea | 96f8ef153f | |
Bea | ff8f52720d | |
Bea | 779ef61b4f | |
Bea | 40399655b1 |
|
@ -0,0 +1,12 @@
|
|||
kind: pipeline
|
||||
name: default
|
||||
platform:
|
||||
os: linux
|
||||
arch: arm64
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
image: maven:3-eclipse-temurin-17
|
||||
commands:
|
||||
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
|
||||
- mvn test -B
|
|
@ -1,3 +1,4 @@
|
|||
.idea/
|
||||
out/
|
||||
target/
|
||||
target/
|
||||
*.iml
|
|
@ -1,41 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module-library">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/17.0.0/annotations-17.0.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="module-library" scope="PROVIDED">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://D:/Coding/# Server per Test Plugins #/spigot-1.15.2.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://D:/Coding/# Server per Test Plugins #/spigot-1.15.2.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
|
||||
</component>
|
||||
</module>
|
22
HubThat.iml
22
HubThat.iml
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
|
||||
</component>
|
||||
</module>
|
|
@ -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>.
|
|
@ -0,0 +1,31 @@
|
|||
# HubThat
|
||||
|
||||
![banner](https://i.ibb.co/KNyJTMq/hubthat-new-banner.png)
|
||||
|
||||
*A hub for one world, a spawn for each world!*
|
||||
|
||||
## Project info
|
||||
|
||||
HubThat is a Bukkit/SpigotMC plugin that allows players to manage
|
||||
different spawn points in multiple worlds, and connects all
|
||||
worlds together through a hub. This is useful to emulate a
|
||||
small-scale network, where players can play different game modes
|
||||
in different sub-servers - which in this case, are worlds.
|
||||
|
||||
Spawn points can also be grouped and shared through different
|
||||
worlds. Every message is configurable and the plugin also
|
||||
includes features such as teleportation cool-downs (useful for
|
||||
PvP) and Multiverse-Core support.
|
||||
|
||||
## Configuration
|
||||
|
||||
Full configuration information and setup guide can be found
|
||||
on the official [SpigotMC forum thread](https://www.spigotmc.org/resources/hubthat.1166/).
|
||||
|
||||
## Building from source
|
||||
|
||||
- clone the git repository
|
||||
- move into the cloned directory
|
||||
- run `mvn clean package`
|
||||
|
||||
The compiled JAR file will be located in the `/target` directory.
|
|
@ -1,3 +1,3 @@
|
|||
#maven.buildNumber.plugin properties file
|
||||
#Thu Jun 25 19:47:56 CEST 2020
|
||||
buildNumber=180
|
||||
#Sat Feb 11 20:48:42 CET 2023
|
||||
buildNumber=198
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -4,7 +4,7 @@
|
|||
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>
|
||||
|
||||
<groupId>net.mindoverflow.hubthat</groupId>
|
||||
<groupId>wtf.beatrice.hubthat</groupId>
|
||||
<artifactId>HubThat</artifactId>
|
||||
<version>10.1</version>
|
||||
<scm>
|
||||
|
@ -84,11 +84,13 @@
|
|||
|
||||
<!--This adds the Bukkit API artifact to the build -->
|
||||
<!-- Do not include this in the pom.xml file if the Spigot API is already added -->
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
<version>1.15.2-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
</project>
|
|
@ -1,90 +0,0 @@
|
|||
package net.mindoverflow.hubthat.utils.files;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.LocalizedMessages;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class OldConfigConversion
|
||||
{
|
||||
|
||||
public static void checkOldConfig(HubThat plugin, Logger logger)
|
||||
{
|
||||
|
||||
|
||||
logger.warning(plugin.getName() + ": Checking if config exists...");
|
||||
File oldConfigFile = FileUtils.FileType.CONFIG_YAML.file;
|
||||
if(!oldConfigFile.exists()) return;
|
||||
|
||||
|
||||
logger.warning("Loading config...");
|
||||
YamlConfiguration oldConfig = YamlConfiguration.loadConfiguration(oldConfigFile);
|
||||
if(!oldConfig.getKeys(true).contains("global.VERSION")) return;
|
||||
|
||||
|
||||
logger.warning("WARNING! Old Configuration Detected!");
|
||||
logger.warning("Starting conversion now!");
|
||||
String configDir = plugin.getDataFolder().getAbsolutePath();
|
||||
|
||||
logger.warning("Renaming old config...");
|
||||
oldConfigFile.renameTo(new File( configDir + File.separator + "config.old"));
|
||||
|
||||
logger.warning("generating new files...");
|
||||
FileUtils.checkFiles();
|
||||
|
||||
// newPath, oldPath
|
||||
HashMap<ConfigEntries, String>newAndOldConfigEntries = new HashMap<>();
|
||||
logger.warning("Loading config entries...");
|
||||
newAndOldConfigEntries.put(ConfigEntries.HUB_DELAY, "hub.delay");
|
||||
newAndOldConfigEntries.put(ConfigEntries.SPAWN_DELAY, "spawn.delay");
|
||||
newAndOldConfigEntries.put(ConfigEntries.WORLD_RELATED_CHAT, "global.world-related-chat");
|
||||
newAndOldConfigEntries.put(ConfigEntries.UPDATE_CHECKER_ENABLED, "updates.update-notify");
|
||||
newAndOldConfigEntries.put(ConfigEntries.MOVEMENT_DETECTION_ENABLED, "global.move-detect");
|
||||
newAndOldConfigEntries.put(ConfigEntries.GAMEMODE_SET_ON_JOIN, "global.set-gamemode-on-join");
|
||||
newAndOldConfigEntries.put(ConfigEntries.GAMEMODE, "global.gamemode");
|
||||
newAndOldConfigEntries.put(ConfigEntries.TELEPORTATION_TP_HUB_ON_JOIN, "global.tp-hub-on-join");
|
||||
newAndOldConfigEntries.put(ConfigEntries.TELEPORTATION_TP_HUB_ON_RESPAWN, "global.tp-hub-on-respawn");
|
||||
newAndOldConfigEntries.put(ConfigEntries.TELEPORTATION_RESPAWN_HANDLER, "global.respawn-handler");
|
||||
|
||||
logger.warning("Converting config entries...");
|
||||
for(ConfigEntries entry : newAndOldConfigEntries.keySet())
|
||||
{
|
||||
logger.warning("Entry: " + entry.path);
|
||||
FileUtils.FileType.CONFIG_YAML.yaml.set(entry.path, oldConfig.get(newAndOldConfigEntries.get(entry)));
|
||||
}
|
||||
|
||||
logger.warning("Saving file...");
|
||||
FileUtils.saveExistingYaml(FileUtils.FileType.CONFIG_YAML);
|
||||
logger.warning("Done with config.yml!");
|
||||
|
||||
logger.warning("Loading lang entries...");
|
||||
HashMap<LocalizedMessages, String>newAndOldLangEntries = new HashMap<>();
|
||||
newAndOldLangEntries.put(LocalizedMessages.ERROR_ALREADY_TELEPORTING, "global.ALREADY-TELEPORTING");
|
||||
newAndOldLangEntries.put(LocalizedMessages.ERROR_HUB_NOT_SET, "hub.HUB_NOT_SET");
|
||||
newAndOldLangEntries.put(LocalizedMessages.ERROR_SPAWN_NOT_SET, "spawn.SPAWN_NOT_SET");
|
||||
newAndOldLangEntries.put(LocalizedMessages.ERROR_WORLD_NOT_EXISTING, "worldtp.UNKNOWN_WORLD");
|
||||
newAndOldLangEntries.put(LocalizedMessages.WARNING_TELEPORTATION_CANCELLED, "global.MOVED");
|
||||
newAndOldLangEntries.put(LocalizedMessages.INFO_HUB_TELEPORTED, "hub.TELEPORTED");
|
||||
newAndOldLangEntries.put(LocalizedMessages.INFO_SPAWN_TELEPORTED, "spawn.TELEPORTED");
|
||||
newAndOldLangEntries.put(LocalizedMessages.INFO_WORLDTP_TELEPORTED, "worldtp.TELEPORTED");
|
||||
|
||||
logger.warning("Converting lang entries...");
|
||||
for(LocalizedMessages message : newAndOldLangEntries.keySet())
|
||||
{
|
||||
logger.warning("Entry: " + message.path);
|
||||
FileUtils.FileType.LANG_YAML.yaml.set(message.path, oldConfig.get(newAndOldLangEntries.get(message)));
|
||||
}
|
||||
|
||||
|
||||
logger.warning("Saving file...");
|
||||
FileUtils.saveExistingYaml(FileUtils.FileType.LANG_YAML);
|
||||
logger.warning("Done with lang.yml!");
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -1,19 +1,19 @@
|
|||
package net.mindoverflow.hubthat;
|
||||
package wtf.beatrice.hubthat;
|
||||
|
||||
import net.mindoverflow.hubthat.commands.*;
|
||||
import net.mindoverflow.hubthat.completers.InfoCompleter;
|
||||
import net.mindoverflow.hubthat.completers.SpawnCompleter;
|
||||
import net.mindoverflow.hubthat.listeners.PlayerChatListener;
|
||||
import net.mindoverflow.hubthat.listeners.PlayerJoinListener;
|
||||
import net.mindoverflow.hubthat.listeners.PlayerMoveListener;
|
||||
import net.mindoverflow.hubthat.listeners.PlayerRespawnListener;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.Debugger;
|
||||
import net.mindoverflow.hubthat.utils.TeleportUtils;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import net.mindoverflow.hubthat.utils.files.OldConfigConversion;
|
||||
import net.mindoverflow.hubthat.utils.statistics.Metrics;
|
||||
import net.mindoverflow.hubthat.utils.statistics.UpdateChecker;
|
||||
import wtf.beatrice.hubthat.commands.*;
|
||||
import wtf.beatrice.hubthat.completers.InfoCompleter;
|
||||
import wtf.beatrice.hubthat.completers.SpawnCompleter;
|
||||
import wtf.beatrice.hubthat.listeners.PlayerChatListener;
|
||||
import wtf.beatrice.hubthat.listeners.PlayerJoinListener;
|
||||
import wtf.beatrice.hubthat.listeners.PlayerMoveListener;
|
||||
import wtf.beatrice.hubthat.listeners.PlayerRespawnListener;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.Debugger;
|
||||
import wtf.beatrice.hubthat.utils.TeleportUtils;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.utils.files.OldConfigConversion;
|
||||
import wtf.beatrice.hubthat.utils.metrics.Metrics;
|
||||
import wtf.beatrice.hubthat.utils.metrics.UpdateChecker;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
@ -42,18 +42,22 @@ public class HubThat extends JavaPlugin
|
|||
public void onEnable()
|
||||
{
|
||||
|
||||
// Give the initialized variables their respective values. Absolutely don't do this before as they will look good in the IDE but will result null.
|
||||
// Initialize the variables with their respective values.
|
||||
// Don't do this in the constructor as they will result null.
|
||||
logger = getLogger();
|
||||
pluginManager = getServer().getPluginManager();
|
||||
|
||||
// Check and report if the Debugger is enabled (the method itself does the checking). Would do it before but we need the logger to be initialized! :(
|
||||
// If debugging is enabled, this will be printed.
|
||||
debugger.sendDebugMessage(Level.WARNING, "---[ DEBUGGER IS ENABLED! ]---");
|
||||
debugger.sendDebugMessage(Level.WARNING, "---[ INITIALIZING PLUGIN ]---");
|
||||
debugger.sendDebugMessage(Level.INFO, "Logger and PluginManager already initialized.");
|
||||
debugger.sendDebugMessage(Level.INFO, "Logger and PluginManager initialized.");
|
||||
|
||||
// Initialize command classes.
|
||||
debugger.sendDebugMessage(Level.INFO, "Loading classes...");
|
||||
|
||||
// Register instances and give them the plugin parameter (this, because this class is the JavaPlugin) so they can access all of its info.
|
||||
debugger.sendDebugMessage(Level.INFO, "Instantiating some classes that need to access to plugin data...");
|
||||
FileUtils fileUtilsInstance = new FileUtils(this);
|
||||
// todo: ^ this is bad, utils should not be instantiated.
|
||||
|
||||
HubThatCommand hubThatCommandInstance = new HubThatCommand(this);
|
||||
HubCommand hubCommandInstance = new HubCommand(this);
|
||||
SpawnCommand spawnCommandInstance = new SpawnCommand(this);
|
||||
|
@ -61,11 +65,11 @@ public class HubThat extends JavaPlugin
|
|||
WorldListCommand worldListCommandInstance = new WorldListCommand(this);
|
||||
WorldTpCommand worldTpCommandInstance = new WorldTpCommand(this);
|
||||
|
||||
// We need to instantiate Utils classes because they need to access plugin data and server.
|
||||
// We need to instantiate Utils classes because they need to access the plugin instance.
|
||||
// todo: this is bad, utils should not be instantiated.
|
||||
TeleportUtils teleportUtilsInstance = new TeleportUtils(this);
|
||||
UpdateChecker updateCheckerInstance = new UpdateChecker(this);
|
||||
updateChecker = new UpdateChecker(this);
|
||||
debugger.sendDebugMessage(Level.INFO, "Done instantiating classes!");
|
||||
debugger.sendDebugMessage(Level.INFO, "Classes loaded!");
|
||||
|
||||
// Register Listeners
|
||||
debugger.sendDebugMessage(Level.INFO, "Registering listeners...");
|
||||
|
@ -75,7 +79,7 @@ public class HubThat extends JavaPlugin
|
|||
pluginManager.registerEvents(new PlayerRespawnListener(this), this);
|
||||
|
||||
|
||||
debugger.sendDebugMessage(Level.INFO, "Done registering listeners!");
|
||||
debugger.sendDebugMessage(Level.INFO, "Listeners registered!");
|
||||
|
||||
// Register Commands
|
||||
debugger.sendDebugMessage(Level.INFO, "Registering commands...");
|
||||
|
@ -98,11 +102,11 @@ public class HubThat extends JavaPlugin
|
|||
getCommand("worldtp").setExecutor(worldTpCommandInstance);
|
||||
getCommand("worldtp").setTabCompleter(new SpawnCompleter());
|
||||
|
||||
debugger.sendDebugMessage(Level.INFO, "Done registering commands!");
|
||||
debugger.sendDebugMessage(Level.INFO, "Commands registered!");
|
||||
|
||||
OldConfigConversion.checkOldConfig(this, logger);
|
||||
// Check if all needed files exist and work correctly, also loading their YAMLs.
|
||||
debugger.sendDebugMessage(Level.INFO, "Checking files...");
|
||||
OldConfigConversion.checkOldConfig(this, logger);
|
||||
FileUtils.checkFiles();
|
||||
debugger.sendDebugMessage(Level.INFO, "Done checking files!");
|
||||
|
||||
|
@ -110,16 +114,16 @@ public class HubThat extends JavaPlugin
|
|||
Load all the YAML files. We are already loading them in FileUtils's checkFiles() method but we are loading them singularly.
|
||||
With this method we are sure that all the files get successfully loaded. Better twice than never...
|
||||
*/
|
||||
debugger.sendDebugMessage(Level.INFO, "Reloading YAML config...");
|
||||
debugger.sendDebugMessage(Level.INFO, "Loading configuration...");
|
||||
FileUtils.reloadYamls();
|
||||
debugger.sendDebugMessage(Level.INFO, "Done!");
|
||||
debugger.sendDebugMessage(Level.INFO, "Configuration loaded!");
|
||||
|
||||
debugger.sendDebugMessage(Level.INFO, "Setting up Metrics...");
|
||||
setupMetrics();
|
||||
debugger.sendDebugMessage(Level.INFO, "Done setting up Metrics!");
|
||||
|
||||
// Send success output message to console.
|
||||
logger.log(Level.INFO, "Plugin " + getDescription().getName() + " Successfully Loaded!");
|
||||
logger.log(Level.INFO, getDescription().getName() + " successfully loaded!");
|
||||
debugger.sendDebugMessage(Level.WARNING, "---[ INITIALIZATION DONE ]---");
|
||||
|
||||
}
|
||||
|
@ -131,26 +135,28 @@ public class HubThat extends JavaPlugin
|
|||
debugger.sendDebugMessage(Level.WARNING, "---[ DEBUGGER IS ENABLED! ]---");
|
||||
debugger.sendDebugMessage(Level.WARNING, "---[ DISABLING PLUGIN ]---");
|
||||
getServer().getScheduler().cancelTasks(this);
|
||||
logger.log(Level.INFO, "Plugin " + getDescription().getName() + " Successfully Unloaded!");
|
||||
logger.log(Level.INFO, getDescription().getName() + " unloaded!");
|
||||
debugger.sendDebugMessage(Level.WARNING, "---[ PLUGIN DISABLED ]---");
|
||||
}
|
||||
|
||||
private void setupMetrics()
|
||||
{
|
||||
|
||||
Metrics metrics = new Metrics(this);
|
||||
|
||||
YamlConfiguration config = FileUtils.FileType.CONFIG_YAML.yaml;
|
||||
metrics.addCustomChart(new Metrics.SimplePie("respawn-handler", () -> config.getString(ConfigEntries.TELEPORTATION_RESPAWN_HANDLER.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("world-related-chat", () -> config.getString(ConfigEntries.WORLD_RELATED_CHAT.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("update-notify", () -> config.getString(ConfigEntries.UPDATE_CHECKER_ENABLED.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("set-gamemode-on-join", () -> config.getString(ConfigEntries.GAMEMODE_SET_ON_JOIN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("tp-hub-on-join", () -> config.getString(ConfigEntries.TELEPORTATION_TP_HUB_ON_JOIN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("tp-hub-on-respawn", () -> config.getString(ConfigEntries.TELEPORTATION_TP_HUB_ON_RESPAWN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("respawn-handler", () -> config.getString(ConfigEntry.TELEPORTATION_RESPAWN_HANDLER.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("world-related-chat", () -> config.getString(ConfigEntry.WORLD_RELATED_CHAT.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("update-notify", () -> config.getString(ConfigEntry.UPDATE_CHECKER_ENABLED.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("set-gamemode-on-join", () -> config.getString(ConfigEntry.GAMEMODE_SET_ON_JOIN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("tp-hub-on-join", () -> config.getString(ConfigEntry.TELEPORTATION_TP_HUB_ON_JOIN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("tp-hub-on-respawn", () -> config.getString(ConfigEntry.TELEPORTATION_TP_HUB_ON_RESPAWN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("multiverse-bypass", () -> config.getString(ConfigEntry.MULTIVERSE_BYPASS.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("send-tp-message-on-join", () -> config.getString(ConfigEntry.TELEPORTATION_TP_MESSAGE_ON_JOIN.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("fix-invisible-after-tp", () -> config.getString(ConfigEntry.INVISIBILITY_FIX.path)));
|
||||
|
||||
if (config.getBoolean(ConfigEntries.GAMEMODE_SET_ON_JOIN.path))
|
||||
if (config.getBoolean(ConfigEntry.GAMEMODE_SET_ON_JOIN.path))
|
||||
{
|
||||
metrics.addCustomChart(new Metrics.SimplePie("join-gamemode", () -> config.getString(ConfigEntries.GAMEMODE.path)));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("join-gamemode", () -> config.getString(ConfigEntry.GAMEMODE.path)));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
|
@ -13,8 +13,6 @@ import java.util.logging.Level;
|
|||
|
||||
public class HubCommand implements CommandExecutor
|
||||
{
|
||||
|
||||
|
||||
// Initialize the debugger so I can debug the plugin.
|
||||
private static final Debugger debugger = new Debugger(HubCommand.class.getName());
|
||||
|
||||
|
@ -34,7 +32,6 @@ public class HubCommand implements CommandExecutor
|
|||
// Store the commandSender name for easy access.
|
||||
String username = commandSender.getName();
|
||||
|
||||
|
||||
if(args.length > 0)
|
||||
{
|
||||
// Check if the player has permission to teleport to the hub.
|
||||
|
@ -44,7 +41,7 @@ public class HubCommand implements CommandExecutor
|
|||
Player teleportingPlayer = plugin.getServer().getPlayer(teleportingPlayerName);
|
||||
if(teleportingPlayer == null)
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_PLAYER_OFFLINE, true).replace("%player%", teleportingPlayerName);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_PLAYER_OFFLINE, true).replace("%player%", teleportingPlayerName);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
||||
|
@ -57,7 +54,7 @@ public class HubCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Warn the player he doesn't have permissions to teleport others to the hub.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_TELEPORT_OTHERS.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_TELEPORT_OTHERS.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
||||
|
@ -68,7 +65,7 @@ public class HubCommand implements CommandExecutor
|
|||
boolean senderIsConsole = !(commandSender instanceof Player);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -93,11 +90,11 @@ public class HubCommand implements CommandExecutor
|
|||
// Put the player in the ArrayList of players waiting to be teleported.
|
||||
PluginCache.teleporting.add(username);
|
||||
// Load the teleportation delay.
|
||||
int delay = FileUtils.FileType.CONFIG_YAML.yaml.getInt(ConfigEntries.HUB_DELAY.path);
|
||||
int delay = FileUtils.FileType.CONFIG_YAML.yaml.getInt(ConfigEntry.HUB_DELAY.path);
|
||||
|
||||
|
||||
// Warn the player about the delay.
|
||||
String delayMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_TELEPORT_DELAY, false);
|
||||
String delayMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_TELEPORT_DELAY, false);
|
||||
delayMessage = delayMessage.replace("%delay%", delay + "");
|
||||
MessageUtils.sendColorizedMessage(commandSender, delayMessage);
|
||||
|
||||
|
@ -121,7 +118,7 @@ public class HubCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Send a message to the player stating it, and do nothing.
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_ALREADY_TELEPORTING);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_ALREADY_TELEPORTING);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -129,7 +126,7 @@ public class HubCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Warn the player he doesn't have permissions to go to the hub.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_TELEPORT.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_TELEPORT.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.commands.hubthatcommands.HelpCommand;
|
||||
import net.mindoverflow.hubthat.commands.hubthatcommands.ReloadCommand;
|
||||
import net.mindoverflow.hubthat.utils.Debugger;
|
||||
import net.mindoverflow.hubthat.utils.MessageUtils;
|
||||
import net.mindoverflow.hubthat.utils.PluginCache;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.commands.hubthatcommands.HelpCommand;
|
||||
import wtf.beatrice.hubthat.commands.hubthatcommands.ReloadCommand;
|
||||
import wtf.beatrice.hubthat.utils.Debugger;
|
||||
import wtf.beatrice.hubthat.utils.MessageUtils;
|
||||
import wtf.beatrice.hubthat.utils.PluginCache;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
@ -36,19 +36,11 @@ public class HubThatCommand implements CommandExecutor
|
|||
// Log who is using the command.
|
||||
debugger.sendDebugMessage(Level.INFO, "Sender is instance of: " + commandSender.getClass().getName());
|
||||
|
||||
// If the command comes from Console, give a warning.
|
||||
// We need no warning because this command is not player reliant.
|
||||
/*boolean senderIsConsole = (commandSender instanceof ConsoleCommandSender);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender.getName(), LocalizedMessages.WARNING_CONSOLE_ACCESS);
|
||||
}*/
|
||||
|
||||
// Check if there are any args.
|
||||
if(args.length == 0)
|
||||
{
|
||||
MessageUtils.sendColorizedMessage(commandSender, "&6" + plugin.getName() +"&7 version &6" + plugin.getDescription().getVersion() + "&7 for &6SpigotMC/CraftBukkit &6" + PluginCache.minSupportedVersion + "&7-&6" + PluginCache.maxSupportedVersion + "&7.");
|
||||
MessageUtils.sendColorizedMessage(commandSender, "&7Coded by &6" + debugger.authorName + "&7, all rights reserved (&6Copyright © '20&7).");
|
||||
MessageUtils.sendColorizedMessage(commandSender, "&7Coded by &6" + debugger.authorName + "&7, &6GNU GPLv3&7.");
|
||||
commandSender.sendMessage("");
|
||||
MessageUtils.sendColorizedMessage(commandSender, "&7Write &6/"+ plugin.getName().toLowerCase() + " help&7 to see plugin commands.");
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
|
@ -29,7 +29,7 @@ public class SetHubCommand implements CommandExecutor
|
|||
boolean senderIsConsole = (commandSender instanceof ConsoleCommandSender);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -61,7 +61,7 @@ public class SetHubCommand implements CommandExecutor
|
|||
FileUtils.saveExistingYaml(FileUtils.FileType.HUB_YAML);
|
||||
|
||||
// Tell the player he set the hub successfully.
|
||||
String hubSetMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_HUB_SET, false);
|
||||
String hubSetMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_HUB_SET, false);
|
||||
hubSetMessage = hubSetMessage.replace("%w%", worldName);
|
||||
hubSetMessage = hubSetMessage.replace("%x%", (int)x + "");
|
||||
hubSetMessage = hubSetMessage.replace("%y%", (int)y + "");
|
||||
|
@ -70,7 +70,7 @@ public class SetHubCommand implements CommandExecutor
|
|||
}
|
||||
else
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_SET.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.HUB_SET.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
}
|
||||
return true;
|
|
@ -1,8 +1,8 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.Command;
|
||||
|
@ -41,7 +41,7 @@ public class SetSpawnCommand implements CommandExecutor
|
|||
boolean senderIsConsole = (commandSender instanceof ConsoleCommandSender);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -83,7 +83,7 @@ public class SetSpawnCommand implements CommandExecutor
|
|||
{
|
||||
// Warn the player and stop.
|
||||
// Tell the player that the world does not exist.
|
||||
String errorWorldNotExistingMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_WORLD_NOT_EXISTING, false);
|
||||
String errorWorldNotExistingMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_WORLD_NOT_EXISTING, false);
|
||||
errorWorldNotExistingMessage = errorWorldNotExistingMessage.replace("%w%", worldYouAreSettingTheSpawnOf);
|
||||
MessageUtils.sendColorizedMessage(commandSender, errorWorldNotExistingMessage);
|
||||
return true;
|
||||
|
@ -104,7 +104,7 @@ public class SetSpawnCommand implements CommandExecutor
|
|||
FileUtils.saveExistingYaml(FileUtils.FileType.SPAWN_YAML);
|
||||
|
||||
// Tell the player he set the spawn successfully.
|
||||
String spawnSetMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_SPAWN_SET, false)
|
||||
String spawnSetMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_SPAWN_SET, false)
|
||||
.replace("%dw%", worldYouAreSettingTheSpawnOf)
|
||||
.replace("%cw%", currentWorldName)
|
||||
.replace("%x%", (int)x + "")
|
||||
|
@ -115,7 +115,7 @@ public class SetSpawnCommand implements CommandExecutor
|
|||
}
|
||||
else
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_SET.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_SET.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
|
@ -42,7 +42,7 @@ public class SpawnCommand implements CommandExecutor
|
|||
boolean senderIsConsole = (commandSender instanceof ConsoleCommandSender);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -56,14 +56,14 @@ public class SpawnCommand implements CommandExecutor
|
|||
Player teleportPlayer = plugin.getServer().getPlayer(teleportingPlayerName);
|
||||
if(teleportPlayer == null)
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_PLAYER_OFFLINE, true).replace("%player%", teleportingPlayerName);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_PLAYER_OFFLINE, true).replace("%player%", teleportingPlayerName);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
||||
|
||||
if(plugin.getServer().getWorld(worldName) == null)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_SPAWN_NOT_SET);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_SPAWN_NOT_SET);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -73,7 +73,7 @@ public class SpawnCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Warn the player he doesn't have permissions to teleport others to the hub.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT_OTHERS.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT_OTHERS.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
||||
|
@ -103,14 +103,14 @@ public class SpawnCommand implements CommandExecutor
|
|||
if(!PermissionUtils.playerHasPermission(commandSender, Permissions.SPAWN_TELEPORT_ANOTHER_WORLD))
|
||||
{
|
||||
// Tell the player he has no permission to teleport to another world's spawn.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT_ANOTHER_WORLD.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT_ANOTHER_WORLD.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return true;
|
||||
}
|
||||
|
||||
if(plugin.getServer().getWorld(args[0]) == null)
|
||||
{
|
||||
String erroMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_WORLD_NOT_EXISTING, true).replace("%w%", args[0]);
|
||||
String erroMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_WORLD_NOT_EXISTING, true).replace("%w%", args[0]);
|
||||
commandSender.sendMessage(erroMessage);
|
||||
return true;
|
||||
}
|
||||
|
@ -118,10 +118,10 @@ public class SpawnCommand implements CommandExecutor
|
|||
|
||||
|
||||
// Load the teleportation delay.
|
||||
int delay = FileUtils.FileType.CONFIG_YAML.yaml.getInt(ConfigEntries.SPAWN_DELAY.path);
|
||||
int delay = FileUtils.FileType.CONFIG_YAML.yaml.getInt(ConfigEntry.SPAWN_DELAY.path);
|
||||
|
||||
// Warn the player about the delay.
|
||||
String delayMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_TELEPORT_DELAY, false);
|
||||
String delayMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_TELEPORT_DELAY, false);
|
||||
delayMessage = delayMessage.replace("%delay%", delay + "");
|
||||
MessageUtils.sendColorizedMessage(commandSender, delayMessage);
|
||||
|
||||
|
@ -146,7 +146,7 @@ public class SpawnCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Send a message to the player stating it, and do nothing.
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_ALREADY_TELEPORTING);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_ALREADY_TELEPORTING);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -154,7 +154,7 @@ public class SpawnCommand implements CommandExecutor
|
|||
else
|
||||
{
|
||||
// Warn the player he doesn't have permissions to go to the spawn.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.SPAWN_TELEPORT.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldCreator;
|
|
@ -1,13 +1,12 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import org.bukkit.Difficulty;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
|
@ -37,7 +36,7 @@ public class WorldListCommand implements CommandExecutor
|
|||
if(PermissionUtils.playerHasPermission(commandSender, Permissions.WORLD_LIST))
|
||||
{
|
||||
// send the translated title.
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.INFO_WORLDS_LIST);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.INFO_WORLDS_LIST);
|
||||
MessageUtils.sendColorizedMessage(commandSender, "&7---------");
|
||||
|
||||
|
||||
|
@ -78,7 +77,7 @@ public class WorldListCommand implements CommandExecutor
|
|||
else // If player doesn't have permissions...
|
||||
{
|
||||
// Tell him.
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.WORLD_LIST.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.WORLD_LIST.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
}
|
||||
return true;
|
|
@ -1,7 +1,6 @@
|
|||
package net.mindoverflow.hubthat.commands;
|
||||
package wtf.beatrice.hubthat.commands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.Command;
|
||||
|
@ -9,11 +8,12 @@ import org.bukkit.command.CommandExecutor;
|
|||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
import static net.mindoverflow.hubthat.utils.TeleportUtils.fixInvisibilityAfter;
|
||||
import static net.mindoverflow.hubthat.utils.TeleportUtils.fixInvisibilityBefore;
|
||||
import static wtf.beatrice.hubthat.utils.TeleportUtils.fixInvisibilityAfter;
|
||||
import static wtf.beatrice.hubthat.utils.TeleportUtils.fixInvisibilityBefore;
|
||||
|
||||
public class WorldTpCommand implements CommandExecutor
|
||||
{
|
||||
|
@ -40,7 +40,7 @@ public class WorldTpCommand implements CommandExecutor
|
|||
boolean senderIsConsole = (commandSender instanceof ConsoleCommandSender);
|
||||
if(senderIsConsole)
|
||||
{
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessages.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
MessageUtils.sendLocalizedMessage(commandSender, LocalizedMessage.ERROR_CONSOLE_ACCESS_BLOCKED);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@ public class WorldTpCommand implements CommandExecutor
|
|||
if(args.length != 1)
|
||||
{
|
||||
// Warn the player in case it's wrong.
|
||||
String wrongUsageMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_WRONG_USAGE, false).replace("%usage%", "/worldtp <world>");
|
||||
String wrongUsageMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_WRONG_USAGE, false).replace("%usage%", "/worldtp <world>");
|
||||
MessageUtils.sendColorizedMessage(commandSender, wrongUsageMessage);
|
||||
return true;
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ public class WorldTpCommand implements CommandExecutor
|
|||
// If the world does not exist, warn the player.
|
||||
if(destinationWorld == null)
|
||||
{
|
||||
String worldDoesNotExistMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_WORLD_NOT_EXISTING, false);
|
||||
String worldDoesNotExistMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_WORLD_NOT_EXISTING, false);
|
||||
worldDoesNotExistMessage = worldDoesNotExistMessage.replace("%w%", destinationWorldName);
|
||||
MessageUtils.sendColorizedMessage(commandSender, worldDoesNotExistMessage);
|
||||
return true;
|
||||
|
@ -77,7 +77,7 @@ public class WorldTpCommand implements CommandExecutor
|
|||
plugin.getServer().getScheduler().runTaskLater(plugin, () -> player.teleport(destinationLocation), 1);
|
||||
fixInvisibilityAfter(player);
|
||||
// Tell the player he has been teleported.
|
||||
String teleportedMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_WORLDTP_TELEPORTED, false);
|
||||
String teleportedMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_WORLDTP_TELEPORTED, false);
|
||||
teleportedMessage = teleportedMessage.replace("%world%", destinationWorldName).replace("%w%", destinationWorldName);
|
||||
MessageUtils.sendColorizedMessage(commandSender, teleportedMessage);
|
||||
}
|
|
@ -1,9 +1,9 @@
|
|||
package net.mindoverflow.hubthat.commands.hubthatcommands;
|
||||
package wtf.beatrice.hubthat.commands.hubthatcommands;
|
||||
|
||||
import net.mindoverflow.hubthat.utils.LocalizedMessages;
|
||||
import net.mindoverflow.hubthat.utils.MessageUtils;
|
||||
import net.mindoverflow.hubthat.utils.PermissionUtils;
|
||||
import net.mindoverflow.hubthat.utils.Permissions;
|
||||
import wtf.beatrice.hubthat.utils.LocalizedMessage;
|
||||
import wtf.beatrice.hubthat.utils.MessageUtils;
|
||||
import wtf.beatrice.hubthat.utils.PermissionUtils;
|
||||
import wtf.beatrice.hubthat.utils.Permissions;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
|
@ -13,7 +13,7 @@ public class HelpCommand
|
|||
{
|
||||
if(!PermissionUtils.playerHasPermission(commandSender, Permissions.HELP_MESSAGE))
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.HELP_MESSAGE.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.HELP_MESSAGE.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
return;
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
package net.mindoverflow.hubthat.commands.hubthatcommands;
|
||||
package wtf.beatrice.hubthat.commands.hubthatcommands;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
@ -28,7 +28,7 @@ public class ReloadCommand
|
|||
}
|
||||
else
|
||||
{
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.NO_PERMISSION, true).replace("%permission%", Permissions.RELOAD_CONFIG.permission);
|
||||
String errorMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.NO_PERMISSION, true).replace("%permission%", Permissions.RELOAD_CONFIG.permission);
|
||||
commandSender.sendMessage(errorMessage);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.completers;
|
||||
package wtf.beatrice.hubthat.completers;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.completers;
|
||||
package wtf.beatrice.hubthat.completers;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
|
@ -1,9 +1,9 @@
|
|||
package net.mindoverflow.hubthat.listeners;
|
||||
package wtf.beatrice.hubthat.listeners;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.Debugger;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.Debugger;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
|
@ -27,7 +27,7 @@ public class PlayerChatListener implements Listener
|
|||
Player messageSender = event.getPlayer();
|
||||
|
||||
// Check if the world-related chat is enabled.
|
||||
if(FileUtils.FileType.CONFIG_YAML.yaml.getBoolean(ConfigEntries.WORLD_RELATED_CHAT.path))
|
||||
if(FileUtils.FileType.CONFIG_YAML.yaml.getBoolean(ConfigEntry.WORLD_RELATED_CHAT.path))
|
||||
{
|
||||
|
||||
// Store the sender's world spawn name in a string. Fallback to "__UNSET__".
|
|
@ -1,12 +1,12 @@
|
|||
package net.mindoverflow.hubthat.listeners;
|
||||
package wtf.beatrice.hubthat.listeners;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.commands.HubCommand;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.Debugger;
|
||||
import net.mindoverflow.hubthat.utils.MessageUtils;
|
||||
import net.mindoverflow.hubthat.utils.PluginCache;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.commands.HubCommand;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.Debugger;
|
||||
import wtf.beatrice.hubthat.utils.MessageUtils;
|
||||
import wtf.beatrice.hubthat.utils.PluginCache;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -49,10 +49,10 @@ public class PlayerJoinListener implements Listener
|
|||
plugin.updateChecker.playerMessage(player);
|
||||
|
||||
// Check if gamemode has to be set on join.
|
||||
if(configYaml.getBoolean(ConfigEntries.GAMEMODE_SET_ON_JOIN.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.GAMEMODE_SET_ON_JOIN.path))
|
||||
{
|
||||
// Load the gamemode int from config.
|
||||
int gamemodeInt = configYaml.getInt(ConfigEntries.GAMEMODE.path);
|
||||
int gamemodeInt = configYaml.getInt(ConfigEntry.GAMEMODE.path);
|
||||
GameMode gamemode;
|
||||
|
||||
// Set the gamemode accordingly.
|
||||
|
@ -72,7 +72,7 @@ public class PlayerJoinListener implements Listener
|
|||
break;
|
||||
}
|
||||
|
||||
if(configYaml.getBoolean(ConfigEntries.MULTIVERSE_BYPASS.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.MULTIVERSE_BYPASS.path))
|
||||
{
|
||||
plugin.getServer().getScheduler().runTaskLater(plugin, ()-> player.setGameMode(gamemode), 10L);
|
||||
}
|
||||
|
@ -83,10 +83,10 @@ public class PlayerJoinListener implements Listener
|
|||
}
|
||||
|
||||
// Check if we have to teleport the player to the Hub on join.
|
||||
if(configYaml.getBoolean(ConfigEntries.TELEPORTATION_TP_HUB_ON_JOIN.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.TELEPORTATION_TP_HUB_ON_JOIN.path))
|
||||
{
|
||||
|
||||
if(configYaml.getBoolean(ConfigEntries.MULTIVERSE_BYPASS.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.MULTIVERSE_BYPASS.path))
|
||||
{
|
||||
plugin.getServer().getScheduler().runTaskLater(plugin, ()-> HubCommand.teleportToHub(player, player, PluginCache.sendJoinTpMessage), 10L);
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
package net.mindoverflow.hubthat.listeners;
|
||||
package wtf.beatrice.hubthat.listeners;
|
||||
|
||||
import net.mindoverflow.hubthat.utils.PluginCache;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.LocalizedMessages;
|
||||
import net.mindoverflow.hubthat.utils.MessageUtils;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.utils.PluginCache;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.LocalizedMessage;
|
||||
import wtf.beatrice.hubthat.utils.MessageUtils;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
|
@ -17,7 +17,7 @@ public class PlayerMoveListener implements Listener
|
|||
{
|
||||
|
||||
// Check if the movement detection is enabled.
|
||||
if(FileUtils.FileType.CONFIG_YAML.yaml.getBoolean(ConfigEntries.MOVEMENT_DETECTION_ENABLED.path))
|
||||
if(FileUtils.FileType.CONFIG_YAML.yaml.getBoolean(ConfigEntry.MOVEMENT_DETECTION_ENABLED.path))
|
||||
{
|
||||
// We are only going to allocate the playerName string and not the whole Player because we want efficiency.
|
||||
String playerName = event.getPlayer().getName();
|
||||
|
@ -33,7 +33,7 @@ public class PlayerMoveListener implements Listener
|
|||
// Remove the player from the list and warn him.
|
||||
PluginCache.teleporting.remove(playerName);
|
||||
PluginCache.cancelRunnable.add(playerName);
|
||||
MessageUtils.sendLocalizedMessage(event.getPlayer(), LocalizedMessages.WARNING_TELEPORTATION_CANCELLED);
|
||||
MessageUtils.sendLocalizedMessage(event.getPlayer(), LocalizedMessage.WARNING_TELEPORTATION_CANCELLED);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
package net.mindoverflow.hubthat.listeners;
|
||||
package wtf.beatrice.hubthat.listeners;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.commands.HubCommand;
|
||||
import net.mindoverflow.hubthat.commands.SpawnCommand;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.commands.HubCommand;
|
||||
import wtf.beatrice.hubthat.commands.SpawnCommand;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -31,7 +31,7 @@ public class PlayerRespawnListener implements Listener
|
|||
|
||||
|
||||
|
||||
if(configYaml.getBoolean(ConfigEntries.MULTIVERSE_BYPASS.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.MULTIVERSE_BYPASS.path))
|
||||
{
|
||||
plugin.getServer().getScheduler().runTaskLater(plugin, ()-> tpPlayer(event.getPlayer(), configYaml), 5L);
|
||||
|
||||
|
@ -48,11 +48,11 @@ public class PlayerRespawnListener implements Listener
|
|||
private void tpPlayer(Player player, YamlConfiguration configYaml)
|
||||
{
|
||||
// Check if the respawn handler is enabled in config.
|
||||
if(configYaml.getBoolean(ConfigEntries.TELEPORTATION_RESPAWN_HANDLER.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.TELEPORTATION_RESPAWN_HANDLER.path))
|
||||
{
|
||||
|
||||
// Check if the player has to be teleported to Hub on respawn.
|
||||
if(configYaml.getBoolean(ConfigEntries.TELEPORTATION_TP_HUB_ON_RESPAWN.path))
|
||||
if(configYaml.getBoolean(ConfigEntry.TELEPORTATION_TP_HUB_ON_RESPAWN.path))
|
||||
{
|
||||
HubCommand.teleportToHub(player, player);
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
public enum ConfigEntries
|
||||
public enum ConfigEntry
|
||||
{
|
||||
HUB_DELAY("hub.delay"),
|
||||
|
||||
|
@ -13,27 +13,21 @@ public enum ConfigEntries
|
|||
MOVEMENT_DETECTION_ENABLED("movement-detection.enable"),
|
||||
|
||||
GAMEMODE_SET_ON_JOIN("gamemode.set-on-join"),
|
||||
|
||||
GAMEMODE("gamemode.mode"),
|
||||
|
||||
TELEPORTATION_RESPAWN_HANDLER("teleportation.respawn-handler"),
|
||||
|
||||
TELEPORTATION_TP_HUB_ON_JOIN("teleportation.teleport-to-hub-on-join"),
|
||||
|
||||
TELEPORTATION_TP_MESSAGE_ON_JOIN("teleportation.send-tp-message-on-join"),
|
||||
|
||||
TELEPORTATION_TP_HUB_ON_RESPAWN("teleportation.teleport-to-hub-on-respawn"),
|
||||
|
||||
MULTIVERSE_BYPASS("settings.multiverse-bypass"),
|
||||
|
||||
INVISIBILITY_FIX("settings.fix-invisible-after-tp"),
|
||||
|
||||
//UPDATE_CHECKER_ENABLE("updates.enable-update-checker"),
|
||||
;
|
||||
|
||||
public String path;
|
||||
|
||||
ConfigEntries(String path)
|
||||
ConfigEntry(String path)
|
||||
{
|
||||
this.path = path;
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -16,11 +16,11 @@ public class Debugger
|
|||
private String className;
|
||||
private String packageName;
|
||||
|
||||
// Save my UUID and current Username somewhere so I can get debug messages too.
|
||||
// Save my UUID and current Username somewhere, so I can get debug messages too.
|
||||
public UUID authorUUID = UUID.fromString("297a1dc8-c0a3-485a-ad21-8956c749f927");
|
||||
public String authorName = "mind_overflow";
|
||||
|
||||
// Make a constructor requiring to be given a class so we exactly know which class has made an instance of it and all of its properties.
|
||||
// Make a constructor requiring to be given a class, so we exactly know which class has made an instance of it and all of its properties.
|
||||
public Debugger(String instanceClassName)
|
||||
{
|
||||
// Only run this code and actually make a whole instance of the class only if debugging is active.
|
|
@ -1,6 +1,6 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
public enum LocalizedMessages
|
||||
public enum LocalizedMessage
|
||||
{
|
||||
|
||||
|
||||
|
@ -49,7 +49,7 @@ public enum LocalizedMessages
|
|||
|
||||
public String path;
|
||||
|
||||
LocalizedMessages(String path)
|
||||
LocalizedMessage(String path)
|
||||
{
|
||||
this.path = path;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
@ -14,7 +14,7 @@ public class MessageUtils
|
|||
private static final Debugger debugger = new Debugger(MessageUtils.class.getName());
|
||||
|
||||
// Method to automatically load and send a localized message to the CommandSender.
|
||||
public static void sendLocalizedMessage(CommandSender sender, LocalizedMessages messageEnum)
|
||||
public static void sendLocalizedMessage(CommandSender sender, LocalizedMessage messageEnum)
|
||||
{
|
||||
// If we actually have a sender, send it the message and color it!
|
||||
if(sender != null) sender.sendMessage(getLocalizedMessage(messageEnum, true));
|
||||
|
@ -32,7 +32,7 @@ public class MessageUtils
|
|||
else debugger.sendDebugMessage(Level.SEVERE, "Sender is null!");
|
||||
}
|
||||
|
||||
public static String getLocalizedMessage(LocalizedMessages messageEnum, boolean applyColor)
|
||||
public static String getLocalizedMessage(LocalizedMessage messageEnum, boolean applyColor)
|
||||
{
|
||||
|
||||
/*
|
||||
|
@ -47,7 +47,7 @@ public class MessageUtils
|
|||
YamlConfiguration langFile = FileUtils.FileType.LANG_YAML.yaml;
|
||||
|
||||
// Initialize the message string and store the String from the lang file to it.
|
||||
String localizedMessage = langFile.getString(LocalizedMessages.INFO_PREFIX.path) + langFile.getString(path);
|
||||
String localizedMessage = langFile.getString(LocalizedMessage.INFO_PREFIX.path) + langFile.getString(path);
|
||||
|
||||
// Check if the message is null and if we have to color the message or leave the symbols inside for further elaboration.
|
||||
if (localizedMessage != null)
|
|
@ -1,10 +1,9 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public class PermissionUtils
|
||||
{
|
||||
|
||||
// Method to get the permission string from the Permissions enum.
|
||||
public static boolean playerHasPermission(CommandSender user, Permissions permission)
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
public enum Permissions
|
||||
{
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
@ -7,8 +7,6 @@ import java.util.ArrayList;
|
|||
|
||||
public class PluginCache
|
||||
{
|
||||
|
||||
|
||||
public static ArrayList<String> teleporting = new ArrayList<>();
|
||||
public static ArrayList<String>cancelRunnable = new ArrayList<>();
|
||||
|
||||
|
@ -17,6 +15,6 @@ public class PluginCache
|
|||
public static boolean sendJoinTpMessage = true;
|
||||
public static final ItemStack AIR = new ItemStack(Material.AIR, 1);
|
||||
|
||||
public static final double minSupportedVersion = 1.7;
|
||||
public static final double maxSupportedVersion = 1.16;
|
||||
public static final String minSupportedVersion = "1.7";
|
||||
public static final String maxSupportedVersion = "1.20";
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package net.mindoverflow.hubthat.utils;
|
||||
package wtf.beatrice.hubthat.utils;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.files.FileUtils;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.files.FileUtils;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
@ -88,12 +88,12 @@ public class TeleportUtils
|
|||
if(type == FileUtils.FileType.HUB_YAML)
|
||||
{
|
||||
// send a message about the hub being not set
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessages.ERROR_HUB_NOT_SET);
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessage.ERROR_HUB_NOT_SET);
|
||||
}
|
||||
else if(type == FileUtils.FileType.SPAWN_YAML)
|
||||
{
|
||||
// send a message about the spawn being not set.
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessages.ERROR_SPAWN_NOT_SET);
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessage.ERROR_SPAWN_NOT_SET);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ public class TeleportUtils
|
|||
if(worldName.equals("__UNSET__") && type == FileUtils.FileType.HUB_YAML)
|
||||
{
|
||||
// Warn the player about the hub not being set.
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessages.ERROR_HUB_NOT_SET);
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(sender, LocalizedMessage.ERROR_HUB_NOT_SET);
|
||||
// Stop.
|
||||
return;
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ public class TeleportUtils
|
|||
// Tell the player that the world does not exist.
|
||||
if(sendMessage)
|
||||
{
|
||||
String errorWorldNotExistingMessage = MessageUtils.getLocalizedMessage(LocalizedMessages.ERROR_WORLD_NOT_EXISTING, false);
|
||||
String errorWorldNotExistingMessage = MessageUtils.getLocalizedMessage(LocalizedMessage.ERROR_WORLD_NOT_EXISTING, false);
|
||||
errorWorldNotExistingMessage = errorWorldNotExistingMessage.replace("%w%", worldName);
|
||||
MessageUtils.sendColorizedMessage(player, errorWorldNotExistingMessage);
|
||||
}
|
||||
|
@ -143,21 +143,21 @@ public class TeleportUtils
|
|||
if(type == FileUtils.FileType.HUB_YAML)
|
||||
{
|
||||
// Send a message to the player about him being successfully teleported.
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(player, LocalizedMessages.INFO_HUB_TELEPORTED);
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(player, LocalizedMessage.INFO_HUB_TELEPORTED);
|
||||
|
||||
if((sender != player) && (sendMessage))
|
||||
{
|
||||
String message = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_HUB_TELEPORTED_OTHER, true).replace("%player%", player.getName());
|
||||
String message = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_HUB_TELEPORTED_OTHER, true).replace("%player%", player.getName());
|
||||
sender.sendMessage(message);
|
||||
}
|
||||
}
|
||||
else //if(type == FileUtils.FileType.SPAWN_YAML) // left here but commented, for easy understanding
|
||||
{
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(player, LocalizedMessages.INFO_SPAWN_TELEPORTED);
|
||||
if(sendMessage) MessageUtils.sendLocalizedMessage(player, LocalizedMessage.INFO_SPAWN_TELEPORTED);
|
||||
|
||||
if((sender != player) && (sendMessage))
|
||||
{
|
||||
String message = MessageUtils.getLocalizedMessage(LocalizedMessages.INFO_SPAWN_TELEPORTED_OTHER, true).replace("%player%", player.getName()).replace("%world%", worldName);
|
||||
String message = MessageUtils.getLocalizedMessage(LocalizedMessage.INFO_SPAWN_TELEPORTED_OTHER, true).replace("%player%", player.getName()).replace("%world%", worldName);
|
||||
sender.sendMessage(message);
|
||||
}
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
package net.mindoverflow.hubthat.utils.files;
|
||||
package wtf.beatrice.hubthat.utils.files;
|
||||
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.PluginCache;
|
||||
import net.mindoverflow.hubthat.utils.ConfigEntries;
|
||||
import net.mindoverflow.hubthat.utils.Debugger;
|
||||
import net.mindoverflow.hubthat.utils.statistics.UpdateChecker;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.PluginCache;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.Debugger;
|
||||
import wtf.beatrice.hubthat.utils.metrics.UpdateChecker;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.*;
|
||||
|
@ -59,7 +59,7 @@ public class FileUtils
|
|||
|
||||
YamlConfiguration config = FileType.CONFIG_YAML.yaml;
|
||||
|
||||
if(config.getBoolean(ConfigEntries.UPDATE_CHECKER_ENABLED.path))
|
||||
if(config.getBoolean(ConfigEntry.UPDATE_CHECKER_ENABLED.path))
|
||||
{
|
||||
PluginCache.updateChecker = true;
|
||||
if(UpdateChecker.task != null)
|
||||
|
@ -67,11 +67,15 @@ public class FileUtils
|
|||
plugin.getServer().getScheduler().cancelTask(UpdateChecker.task.getTaskId());
|
||||
}
|
||||
|
||||
UpdateChecker.task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, plugin.updateChecker, 1, 20 * 60 * 60 * 12);
|
||||
UpdateChecker.task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, plugin.updateChecker, 1, 20 * 60 * 60 * 12); // 12 hours
|
||||
}
|
||||
else
|
||||
{
|
||||
PluginCache.updateChecker = false;
|
||||
}
|
||||
|
||||
PluginCache.invisibilityFix = config.getBoolean(ConfigEntries.INVISIBILITY_FIX.path);
|
||||
PluginCache.sendJoinTpMessage = config.getBoolean(ConfigEntries.TELEPORTATION_TP_MESSAGE_ON_JOIN.path);
|
||||
PluginCache.invisibilityFix = config.getBoolean(ConfigEntry.INVISIBILITY_FIX.path);
|
||||
PluginCache.sendJoinTpMessage = config.getBoolean(ConfigEntry.TELEPORTATION_TP_MESSAGE_ON_JOIN.path);
|
||||
}
|
||||
|
||||
// Only reload the needed File.
|
|
@ -0,0 +1,90 @@
|
|||
package wtf.beatrice.hubthat.utils.files;
|
||||
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import wtf.beatrice.hubthat.utils.ConfigEntry;
|
||||
import wtf.beatrice.hubthat.utils.LocalizedMessage;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class OldConfigConversion
|
||||
{
|
||||
|
||||
public static void checkOldConfig(HubThat plugin, Logger logger)
|
||||
{
|
||||
|
||||
|
||||
logger.warning(plugin.getName() + ": Checking if config exists...");
|
||||
File oldConfigFile = FileUtils.FileType.CONFIG_YAML.file;
|
||||
if(!oldConfigFile.exists()) return;
|
||||
|
||||
|
||||
logger.warning("Loading config...");
|
||||
YamlConfiguration oldConfig = YamlConfiguration.loadConfiguration(oldConfigFile);
|
||||
if(!oldConfig.getKeys(true).contains("global.VERSION")) return;
|
||||
|
||||
|
||||
logger.warning("WARNING! Old Configuration Detected!");
|
||||
logger.warning("Starting conversion now!");
|
||||
String configDir = plugin.getDataFolder().getAbsolutePath();
|
||||
|
||||
logger.warning("Renaming old config...");
|
||||
oldConfigFile.renameTo(new File( configDir + File.separator + "config.old"));
|
||||
|
||||
logger.warning("generating new files...");
|
||||
FileUtils.checkFiles();
|
||||
|
||||
// newPath, oldPath
|
||||
HashMap<ConfigEntry, String>newAndOldConfigEntries = new HashMap<>();
|
||||
logger.warning("Loading config entries...");
|
||||
newAndOldConfigEntries.put(ConfigEntry.HUB_DELAY, "hub.delay");
|
||||
newAndOldConfigEntries.put(ConfigEntry.SPAWN_DELAY, "spawn.delay");
|
||||
newAndOldConfigEntries.put(ConfigEntry.WORLD_RELATED_CHAT, "global.world-related-chat");
|
||||
newAndOldConfigEntries.put(ConfigEntry.UPDATE_CHECKER_ENABLED, "updates.update-notify");
|
||||
newAndOldConfigEntries.put(ConfigEntry.MOVEMENT_DETECTION_ENABLED, "global.move-detect");
|
||||
newAndOldConfigEntries.put(ConfigEntry.GAMEMODE_SET_ON_JOIN, "global.set-gamemode-on-join");
|
||||
newAndOldConfigEntries.put(ConfigEntry.GAMEMODE, "global.gamemode");
|
||||
newAndOldConfigEntries.put(ConfigEntry.TELEPORTATION_TP_HUB_ON_JOIN, "global.tp-hub-on-join");
|
||||
newAndOldConfigEntries.put(ConfigEntry.TELEPORTATION_TP_HUB_ON_RESPAWN, "global.tp-hub-on-respawn");
|
||||
newAndOldConfigEntries.put(ConfigEntry.TELEPORTATION_RESPAWN_HANDLER, "global.respawn-handler");
|
||||
|
||||
logger.warning("Converting config entries...");
|
||||
for(ConfigEntry entry : newAndOldConfigEntries.keySet())
|
||||
{
|
||||
logger.warning("Entry: " + entry.path);
|
||||
FileUtils.FileType.CONFIG_YAML.yaml.set(entry.path, oldConfig.get(newAndOldConfigEntries.get(entry)));
|
||||
}
|
||||
|
||||
logger.warning("Saving file...");
|
||||
FileUtils.saveExistingYaml(FileUtils.FileType.CONFIG_YAML);
|
||||
logger.warning("Done with config.yml!");
|
||||
|
||||
logger.warning("Loading lang entries...");
|
||||
HashMap<LocalizedMessage, String>newAndOldLangEntries = new HashMap<>();
|
||||
newAndOldLangEntries.put(LocalizedMessage.ERROR_ALREADY_TELEPORTING, "global.ALREADY-TELEPORTING");
|
||||
newAndOldLangEntries.put(LocalizedMessage.ERROR_HUB_NOT_SET, "hub.HUB_NOT_SET");
|
||||
newAndOldLangEntries.put(LocalizedMessage.ERROR_SPAWN_NOT_SET, "spawn.SPAWN_NOT_SET");
|
||||
newAndOldLangEntries.put(LocalizedMessage.ERROR_WORLD_NOT_EXISTING, "worldtp.UNKNOWN_WORLD");
|
||||
newAndOldLangEntries.put(LocalizedMessage.WARNING_TELEPORTATION_CANCELLED, "global.MOVED");
|
||||
newAndOldLangEntries.put(LocalizedMessage.INFO_HUB_TELEPORTED, "hub.TELEPORTED");
|
||||
newAndOldLangEntries.put(LocalizedMessage.INFO_SPAWN_TELEPORTED, "spawn.TELEPORTED");
|
||||
newAndOldLangEntries.put(LocalizedMessage.INFO_WORLDTP_TELEPORTED, "worldtp.TELEPORTED");
|
||||
|
||||
logger.warning("Converting lang entries...");
|
||||
for(LocalizedMessage message : newAndOldLangEntries.keySet())
|
||||
{
|
||||
logger.warning("Entry: " + message.path);
|
||||
FileUtils.FileType.LANG_YAML.yaml.set(message.path, oldConfig.get(newAndOldLangEntries.get(message)));
|
||||
}
|
||||
|
||||
|
||||
logger.warning("Saving file...");
|
||||
FileUtils.saveExistingYaml(FileUtils.FileType.LANG_YAML);
|
||||
logger.warning("Done with lang.yml!");
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package net.mindoverflow.hubthat.utils.statistics;
|
||||
package wtf.beatrice.hubthat.utils.metrics;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
|
@ -1,14 +1,14 @@
|
|||
package net.mindoverflow.hubthat.utils.statistics;
|
||||
package wtf.beatrice.hubthat.utils.metrics;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import net.mindoverflow.hubthat.HubThat;
|
||||
import net.mindoverflow.hubthat.utils.*;
|
||||
import wtf.beatrice.hubthat.HubThat;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import wtf.beatrice.hubthat.utils.*;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
import java.io.IOException;
|
||||
|
@ -87,8 +87,7 @@ public class UpdateChecker implements Runnable
|
|||
|
||||
} catch (IOException e)
|
||||
{
|
||||
|
||||
setAndSendErrorCode("null json", console);
|
||||
setAndSendErrorCode(e.getMessage(), console);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -97,11 +96,10 @@ public class UpdateChecker implements Runnable
|
|||
JsonObject json = (JsonObject)jsonParser.parse(new InputStreamReader(jsonIS, StandardCharsets.UTF_8));
|
||||
|
||||
// Close the input stream...
|
||||
/*try {
|
||||
try {
|
||||
jsonIS.close();
|
||||
} catch (IOException ignored)
|
||||
{
|
||||
}*/
|
||||
{}
|
||||
|
||||
// Check if the "version" String is present...
|
||||
newVersion = null;
|
||||
|
@ -181,7 +179,6 @@ public class UpdateChecker implements Runnable
|
|||
|
||||
}
|
||||
|
||||
|
||||
public void sendUnreachableCode(CommandSender sender)
|
||||
{
|
||||
String pluginName = plugin.getName();
|
||||
|
@ -248,7 +245,8 @@ public class UpdateChecker implements Runnable
|
|||
}
|
||||
|
||||
if(isServerUnreachable)
|
||||
{sendUnreachableCode(player);
|
||||
{
|
||||
sendUnreachableCode(player);
|
||||
}
|
||||
|
||||
if(errorCode != null)
|
|
@ -1,6 +1,6 @@
|
|||
error:
|
||||
console-access-blocked: '&cSorry, but this command is not available via console.'
|
||||
already-teleporting: '&cYou are already in the teleportation queue!'
|
||||
already-teleporting: '&cYou are already being teleported!'
|
||||
hub-not-set: '&cThe hub is not set.'
|
||||
spawn-not-set: '&cThe spawn is not set.'
|
||||
unknown-world: '&cError: world "%w%" does not exist!'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
name: HubThat
|
||||
version: ${versionName}.${buildNumber}
|
||||
author: mind_overflow
|
||||
main: net.mindoverflow.hubthat.HubThat
|
||||
main: wtf.beatrice.hubthat.HubThat
|
||||
api-version: 1.13
|
||||
commands:
|
||||
hubthat:
|
||||
|
|
Loading…
Reference in New Issue