Use JDA LTS #8
25 arquivos alterados com 744 adições e 176 exclusões
Add embeds footer text to custom translations. (#3)
commit
59f40d2779
674
LICENSE
674
LICENSE
|
|
@ -1,21 +1,661 @@
|
||||||
The MIT License (MIT)
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
Copyright (c) 2021 AwakenedRedstone
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Preamble
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
all copies or substantial portions of the Software.
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
The licenses for most software and other practical works are designed
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
to take away your freedom to share and change the works. By contrast,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
share and change all versions of a program--to make sure it remains free
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
software for all its users.
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
|
||||||
5
README.md
Arquivo normal
5
README.md
Arquivo normal
|
|
@ -0,0 +1,5 @@
|
||||||
|
# AutoWhitelist
|
||||||
|
More information at:
|
||||||
|
https://awakened.glitch.me/mods/autowhitelist
|
||||||
|
###### (Missing tutorial gifs)
|
||||||
|
###### *It will _later_ be published to CurseForge and Modrinth with a tutorial
|
||||||
32
build.gradle
32
build.gradle
|
|
@ -1,19 +1,22 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "fabric-loom" version "0.6-SNAPSHOT"
|
id "fabric-loom" version "0.8-SNAPSHOT"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url 'https://jitpack.io' }
|
maven {
|
||||||
|
name 'm2-dv8tion'
|
||||||
|
url 'https://m2.dv8tion.net/releases'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
archivesBaseName = project.archives_base_name
|
archivesBaseName = project.archives_base_name
|
||||||
version = project.mod_version
|
version = project.mod_version
|
||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = 16
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = 16
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||||
|
|
@ -29,15 +32,15 @@ dependencies {
|
||||||
implementation include("com.jagrosh:jda-utilities-menu:3.0.5")
|
implementation include("com.jagrosh:jda-utilities-menu:3.0.5")
|
||||||
implementation include("com.jagrosh:jda-utilities-examples:3.0.5")
|
implementation include("com.jagrosh:jda-utilities-examples:3.0.5")
|
||||||
implementation include("com.jagrosh:jda-utilities-doc:3.0.5")
|
implementation include("com.jagrosh:jda-utilities-doc:3.0.5")
|
||||||
implementation include('net.dv8tion:JDA:4.2.0_231') {
|
implementation include('net.dv8tion:JDA:4.3.0_310') {
|
||||||
exclude module: 'opus-java'
|
exclude module: 'opus-java'
|
||||||
}
|
}
|
||||||
implementation include('org.apache.logging.log4j:log4j-slf4j-impl:2.8.1')
|
//implementation include('org.apache.logging.log4j:log4j-slf4j-impl:2.14.1')
|
||||||
|
|
||||||
include "net.sf.trove4j:trove4j:3.0.3"
|
include "net.sf.trove4j:trove4j:3.0.3"
|
||||||
include 'org.slf4j:slf4j-api:1.7.25'
|
//include 'org.slf4j:slf4j-api:1.7.25'
|
||||||
include 'org.apache.commons:commons-collections4:4.1'
|
include 'org.apache.commons:commons-collections4:4.1'
|
||||||
include 'com.neovisionaries:nv-websocket-client:2.10'
|
include 'com.neovisionaries:nv-websocket-client:2.14'
|
||||||
include 'com.squareup.okhttp3:okhttp:3.13.0'
|
include 'com.squareup.okhttp3:okhttp:3.13.0'
|
||||||
include 'com.squareup.okio:okio:1.17.2'
|
include 'com.squareup.okio:okio:1.17.2'
|
||||||
include 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
|
include 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
|
||||||
|
|
@ -52,16 +55,11 @@ compileJava {
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
inputs.property "version", project.version
|
inputs.property "version", project.version
|
||||||
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
filesMatching("fabric.mod.json") {
|
||||||
include "fabric.mod.json"
|
expand "version": project.version
|
||||||
expand "version": project.version
|
}
|
||||||
}
|
|
||||||
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
exclude "fabric.mod.json"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx1G
|
||||||
minecraft_version=21w10a
|
minecraft_version=1.17.1
|
||||||
yarn_mappings=21w10a+build.10
|
yarn_mappings=1.17.1+build.10
|
||||||
loader_version=0.11.3
|
loader_version=0.11.6
|
||||||
mod_version=0.2
|
mod_version=0.2.4
|
||||||
maven_group=com.awakenedredstone
|
maven_group=com.awakenedredstone
|
||||||
archives_base_name=autowhitelist
|
archives_base_name=autowhitelist
|
||||||
|
|
||||||
fabric_version=0.32.2+1.17
|
fabric_version=0.36.1+1.17
|
||||||
|
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
externo
BIN
gradle/wrapper/gradle-wrapper.jar
externo
Arquivo binário não exibido.
2
gradle/wrapper/gradle-wrapper.properties
externo
2
gradle/wrapper/gradle-wrapper.properties
externo
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
||||||
2
gradlew
externo
2
gradlew
externo
|
|
@ -130,7 +130,7 @@ fi
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
|
|
||||||
21
gradlew.bat
externo
21
gradlew.bat
externo
|
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
if "%ERRORLEVEL%" == "0" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
@ -54,7 +54,7 @@ goto fail
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
|
@ -64,21 +64,6 @@ echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
:init
|
|
||||||
@rem Get command-line arguments, handling Windows variants
|
|
||||||
|
|
||||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
|
||||||
|
|
||||||
:win9xME_args
|
|
||||||
@rem Slurp the command line arguments.
|
|
||||||
set CMD_LINE_ARGS=
|
|
||||||
set _SKIP=2
|
|
||||||
|
|
||||||
:win9xME_args_slurp
|
|
||||||
if "x%~1" == "x" goto execute
|
|
||||||
|
|
||||||
set CMD_LINE_ARGS=%*
|
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
|
|
@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,6 @@ import static com.awakenedredstone.autowhitelist.lang.JigsawLanguage.translation
|
||||||
|
|
||||||
public class AutoWhitelist implements ModInitializer {
|
public class AutoWhitelist implements ModInitializer {
|
||||||
|
|
||||||
public static Thread scheduledUpdateThread;
|
|
||||||
|
|
||||||
public static MinecraftServer server;
|
public static MinecraftServer server;
|
||||||
|
|
||||||
public static final Config config = new Config();
|
public static final Config config = new Config();
|
||||||
|
|
@ -62,7 +60,7 @@ public class AutoWhitelist implements ModInitializer {
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
for (GameProfile profile : profiles) {
|
for (GameProfile profile : profiles) {
|
||||||
GameProfile profile1 = server.getUserCache().getByUuid(profile.getId());
|
GameProfile profile1 = server.getUserCache().getByUuid(profile.getId()).orElse(null);
|
||||||
try {
|
try {
|
||||||
if (profile1 == null) {
|
if (profile1 == null) {
|
||||||
removePlayer((ExtendedGameProfile) profile);
|
removePlayer((ExtendedGameProfile) profile);
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ import static com.awakenedredstone.autowhitelist.util.Debugger.analyzeTimings;
|
||||||
public class AutoWhitelistCommand {
|
public class AutoWhitelistCommand {
|
||||||
|
|
||||||
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
|
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
|
||||||
dispatcher.register(CommandManager.literal("auto-whitelist").requires((source) -> {
|
dispatcher.register(CommandManager.literal("autowhitelist").requires((source) -> {
|
||||||
return source.hasPermissionLevel(4);
|
return source.hasPermissionLevel(4);
|
||||||
}).then((CommandManager.literal("reload").executes((source) -> {
|
}).then((CommandManager.literal("reload").executes((source) -> {
|
||||||
executeReload(source.getSource());
|
executeReload(source.getSource());
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,14 @@ import net.minecraft.text.LiteralText;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class Config {
|
public class Config {
|
||||||
|
|
||||||
private ConfigData configData;
|
private ConfigData configData;
|
||||||
private final File configFile = new File(getConfigDirectory(), "AutoWhitelist.json");
|
private final File configFile = new File(getConfigDirectory(), "AutoWhitelist.json");
|
||||||
private final int configVersion = 2;
|
private final float configVersion = 2.1f;
|
||||||
|
|
||||||
public File getConfigDirectory() {
|
public File getConfigDirectory() {
|
||||||
return new File(".", "config");
|
return new File(".", "config");
|
||||||
|
|
@ -29,26 +30,32 @@ public class Config {
|
||||||
StringReader stringReader = new StringReader(json);
|
StringReader stringReader = new StringReader(json);
|
||||||
|
|
||||||
JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
|
JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
|
||||||
if (jsonObject.get("version") == null || jsonObject.get("version").getAsInt() != configVersion) {
|
if (jsonObject.get("version") == null || jsonObject.get("version").getAsFloat() != configVersion) {
|
||||||
Files.copy(configFile.toPath(), new File(getConfigDirectory(), "AutoWhitelist_old.json").toPath());
|
|
||||||
JsonObject newJson = new JsonObject();
|
|
||||||
|
|
||||||
newJson.add("version", new JsonPrimitive(configVersion));
|
jsonObject.add("owners", new JsonArray());
|
||||||
newJson.add("whitelistScheduledVerificationSeconds", jsonObject.get("whitelist-auto-update-delay-seconds"));
|
|
||||||
newJson.add("prefix", jsonObject.get("prefix"));
|
|
||||||
newJson.add("token", jsonObject.get("token"));
|
|
||||||
newJson.add("clientId", jsonObject.get("application-id"));
|
|
||||||
newJson.add("discordServerId", jsonObject.get("discord-server-id"));
|
|
||||||
newJson.add("whitelist", jsonObject.get("whitelist"));
|
|
||||||
|
|
||||||
JsonHelper.writeJsonToFile(newJson, configFile);
|
JsonHelper.writeJsonToFile(jsonObject, configFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
configData = AutoWhitelist.GSON.fromJson(stringReader, ConfigData.class);
|
configData = AutoWhitelist.GSON.fromJson(stringReader, ConfigData.class);
|
||||||
|
|
||||||
if (configData.whitelistScheduledVerificationSeconds < 30) {
|
if (configData.whitelistScheduledVerificationSeconds <= 0) {
|
||||||
|
configData.whitelistScheduledVerificationSeconds = 30;
|
||||||
|
AutoWhitelist.LOGGER.warn("Whitelist scheduled verification time can't be equals to or lower than 0. It has been set to 30 (not on the file)");
|
||||||
|
try {
|
||||||
|
AutoWhitelist.server.getCommandSource().sendFeedback(new LiteralText("Whitelist scheduled verification time can't be equals to or lower than 0. It has been set to 30 (not on the file)"), true);
|
||||||
|
} catch (NullPointerException ignored) {}
|
||||||
|
} else if (configData.whitelistScheduledVerificationSeconds < 3) {
|
||||||
|
configData.whitelistScheduledVerificationSeconds = 30;
|
||||||
|
AutoWhitelist.LOGGER.warn("Whitelist scheduled verification time have to be at least 3 seconds. It has been set to 30 (not on the file)");
|
||||||
|
try {
|
||||||
|
AutoWhitelist.server.getCommandSource().sendFeedback(new LiteralText("Whitelist scheduled verification time have to be at least 3 seconds. It has been set to 30 (not on the file)"), true);
|
||||||
|
} catch (NullPointerException ignored) {}
|
||||||
|
} else if (configData.whitelistScheduledVerificationSeconds < 30) {
|
||||||
AutoWhitelist.LOGGER.warn("Whitelist scheduled verification time is really low. It is not recommended to have it lower than 30 seconds, since it can affect the server performance.");
|
AutoWhitelist.LOGGER.warn("Whitelist scheduled verification time is really low. It is not recommended to have it lower than 30 seconds, since it can affect the server performance.");
|
||||||
AutoWhitelist.server.getCommandSource().sendFeedback(new LiteralText("Whitelist scheduled verification time is really low. It is not recommended to have it lower than 30 seconds, since it can affect the server performance."), true);
|
try {
|
||||||
|
AutoWhitelist.server.getCommandSource().sendFeedback(new LiteralText("Whitelist scheduled verification time is really low. It is not recommended to have it lower than 30 seconds, since it can affect the server performance."), true);
|
||||||
|
} catch (NullPointerException ignored) {}
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
AutoWhitelist.LOGGER.error(e);
|
AutoWhitelist.LOGGER.error(e);
|
||||||
|
|
@ -60,6 +67,7 @@ public class Config {
|
||||||
JsonObject json = new JsonObject();
|
JsonObject json = new JsonObject();
|
||||||
json.add("version", new JsonPrimitive(configVersion));
|
json.add("version", new JsonPrimitive(configVersion));
|
||||||
json.add("whitelistScheduledVerificationSeconds", new JsonPrimitive(60L));
|
json.add("whitelistScheduledVerificationSeconds", new JsonPrimitive(60L));
|
||||||
|
json.add("owners", new JsonArray());
|
||||||
json.add("prefix", new JsonPrimitive("np!"));
|
json.add("prefix", new JsonPrimitive("np!"));
|
||||||
json.add("token", new JsonPrimitive("bot-token"));
|
json.add("token", new JsonPrimitive("bot-token"));
|
||||||
json.add("clientId", new JsonPrimitive("client-id"));
|
json.add("clientId", new JsonPrimitive("client-id"));
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@ import java.util.Map;
|
||||||
|
|
||||||
public class ConfigData {
|
public class ConfigData {
|
||||||
|
|
||||||
public long whitelistScheduledVerificationSeconds;
|
public short whitelistScheduledVerificationSeconds;
|
||||||
|
public String[] owners;
|
||||||
public String prefix;
|
public String prefix;
|
||||||
public String token;
|
public String token;
|
||||||
public String clientId;
|
public String clientId;
|
||||||
|
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
package com.awakenedredstone.autowhitelist.database;
|
|
||||||
|
|
||||||
import com.awakenedredstone.autowhitelist.AutoWhitelist;
|
|
||||||
import com.awakenedredstone.autowhitelist.util.ExtendedGameProfile;
|
|
||||||
import com.awakenedredstone.autowhitelist.whitelist.ExtendedWhitelistEntry;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.sql.*;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class SQLite {
|
|
||||||
private static Connection connection;
|
|
||||||
|
|
||||||
public void connect() {
|
|
||||||
File dir = new File("./config/AutoWhitelist");
|
|
||||||
if(!dir.exists() || !dir.isDirectory()) {
|
|
||||||
//AutoWhitelist.LOGGER.info("Could not find database. A new one will be created.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
File file = new File("./config/AutoWhitelist/users.db");
|
|
||||||
if (!file.exists()) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
String url = "jdbc:sqlite:config/AutoWhitelist/users.db";
|
|
||||||
connection = DriverManager.getConnection(url);
|
|
||||||
|
|
||||||
} catch (SQLException e) {
|
|
||||||
AutoWhitelist.LOGGER.error("Failed to load old database", e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
databaseChange();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void databaseChange() {
|
|
||||||
if (connection == null) {
|
|
||||||
AutoWhitelist.LOGGER.error("Connection to database not existent. Unable to query data.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
PreparedStatement statement = connection.prepareStatement("SELECT * FROM `data`");
|
|
||||||
ResultSet results = statement.executeQuery();
|
|
||||||
ArrayList<ExtendedGameProfile> players = new ArrayList<>();
|
|
||||||
while (results.next()) {
|
|
||||||
players.add(new ExtendedGameProfile(UUID.fromString(results.getString("UUID")), results.getString("USERNAME"), results.getString("TEAM"), results.getString("ID")));
|
|
||||||
}
|
|
||||||
AutoWhitelist.server.getPlayerManager().getWhitelist().values().clear();
|
|
||||||
players.forEach(v -> AutoWhitelist.server.getPlayerManager().getWhitelist().add(new ExtendedWhitelistEntry(v)));
|
|
||||||
connection.close();
|
|
||||||
new File("./config/AutoWhitelist/users.db").delete();
|
|
||||||
new File("./config/AutoWhitelist").delete();
|
|
||||||
} catch (SQLException e) {
|
|
||||||
AutoWhitelist.LOGGER.error("Failed to get the data from the old database", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -87,6 +87,8 @@ public class Bot implements Runnable {
|
||||||
instance = this;
|
instance = this;
|
||||||
} catch (LoginException e) {
|
} catch (LoginException e) {
|
||||||
AutoWhitelist.LOGGER.error("Failed to start bot, please verify the token.");
|
AutoWhitelist.LOGGER.error("Failed to start bot, please verify the token.");
|
||||||
}
|
} catch (Exception e) {
|
||||||
|
AutoWhitelist.LOGGER.error(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ import com.jagrosh.jdautilities.command.Command;
|
||||||
import com.jagrosh.jdautilities.command.CommandClient;
|
import com.jagrosh.jdautilities.command.CommandClient;
|
||||||
import com.jagrosh.jdautilities.command.CommandClientBuilder;
|
import com.jagrosh.jdautilities.command.CommandClientBuilder;
|
||||||
import com.jagrosh.jdautilities.command.CommandEvent;
|
import com.jagrosh.jdautilities.command.CommandEvent;
|
||||||
|
import com.jagrosh.jdautilities.examples.command.PingCommand;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.*;
|
import net.dv8tion.jda.api.entities.*;
|
||||||
import net.dv8tion.jda.api.events.ReadyEvent;
|
import net.dv8tion.jda.api.events.ReadyEvent;
|
||||||
|
|
@ -46,9 +47,11 @@ public class BotEventListener extends ListenerAdapter {
|
||||||
CommandClientBuilder builder = new CommandClientBuilder();
|
CommandClientBuilder builder = new CommandClientBuilder();
|
||||||
builder.setPrefix(prefix);
|
builder.setPrefix(prefix);
|
||||||
builder.setOwnerId("387745099204919297");
|
builder.setOwnerId("387745099204919297");
|
||||||
|
builder.setCoOwnerIds(AutoWhitelist.getConfigData().owners);
|
||||||
builder.setHelpConsumer(generateHelpConsumer());
|
builder.setHelpConsumer(generateHelpConsumer());
|
||||||
builder.addCommands(
|
builder.addCommands(
|
||||||
new RegisterCommand(),
|
new RegisterCommand(),
|
||||||
|
new PingCommand(),
|
||||||
|
|
||||||
//Developer commands
|
//Developer commands
|
||||||
new ServerStatusCommand(),
|
new ServerStatusCommand(),
|
||||||
|
|
@ -76,7 +79,7 @@ public class BotEventListener extends ListenerAdapter {
|
||||||
Command.Category category;
|
Command.Category category;
|
||||||
List<MessageEmbed.Field> fields = new ArrayList<>();
|
List<MessageEmbed.Field> fields = new ArrayList<>();
|
||||||
for (Command command : event.getClient().getCommands()) {
|
for (Command command : event.getClient().getCommands()) {
|
||||||
if (!command.isHidden() && (!command.isOwnerCommand() || event.isOwner())) {
|
if ((!command.isHidden() && !command.isOwnerCommand()) || event.isOwner()) {
|
||||||
|
|
||||||
String command_ = "\n`" +
|
String command_ = "\n`" +
|
||||||
event.getClient().getPrefix() +
|
event.getClient().getPrefix() +
|
||||||
|
|
@ -104,9 +107,11 @@ public class BotEventListener extends ListenerAdapter {
|
||||||
commands = "";
|
commands = "";
|
||||||
commands += "\n" + field.getValue();
|
commands += "\n" + field.getValue();
|
||||||
lastName = field.getName();
|
lastName = field.getName();
|
||||||
} else {
|
} else if (fields.size() > 1) {
|
||||||
commands += field.getValue();
|
commands += field.getValue();
|
||||||
lastName = field.getName();
|
lastName = field.getName();
|
||||||
|
} else {
|
||||||
|
mergedFields.add(new MessageEmbed.Field(field.getName(), field.getValue(), false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.awakenedredstone.autowhitelist.discord;
|
package com.awakenedredstone.autowhitelist.discord;
|
||||||
|
|
||||||
|
import com.awakenedredstone.autowhitelist.lang.TranslatableText;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.MessageBuilder;
|
import net.dv8tion.jda.api.MessageBuilder;
|
||||||
import net.dv8tion.jda.api.entities.Message;
|
import net.dv8tion.jda.api.entities.Message;
|
||||||
|
|
@ -18,7 +19,7 @@ public class BotHelper extends Bot {
|
||||||
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
||||||
embedBuilder.setTitle(title.getString());
|
embedBuilder.setTitle(title.getString());
|
||||||
embedBuilder.setDescription(message.getString());
|
embedBuilder.setDescription(message.getString());
|
||||||
embedBuilder.setFooter("Minecraft PhoenixSC Edition");
|
embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
|
||||||
MessageAction messageAction = channel.sendMessage(embedBuilder.build());
|
MessageAction messageAction = channel.sendMessage(embedBuilder.build());
|
||||||
messageAction.queue();
|
messageAction.queue();
|
||||||
}
|
}
|
||||||
|
|
@ -28,7 +29,7 @@ public class BotHelper extends Bot {
|
||||||
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
||||||
embedBuilder.setTitle(title.getString());
|
embedBuilder.setTitle(title.getString());
|
||||||
embedBuilder.setDescription(message.getString());
|
embedBuilder.setDescription(message.getString());
|
||||||
embedBuilder.setFooter("Minecraft PhoenixSC Edition");
|
embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
|
||||||
embedBuilder.setColor(type.hexColor);
|
embedBuilder.setColor(type.hexColor);
|
||||||
MessageAction messageAction = channel.sendMessage(embedBuilder.build());
|
MessageAction messageAction = channel.sendMessage(embedBuilder.build());
|
||||||
messageAction.queue();
|
messageAction.queue();
|
||||||
|
|
@ -49,7 +50,7 @@ public class BotHelper extends Bot {
|
||||||
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
||||||
embedBuilder.setTitle(title.getString());
|
embedBuilder.setTitle(title.getString());
|
||||||
embedBuilder.setDescription(message.getString());
|
embedBuilder.setDescription(message.getString());
|
||||||
embedBuilder.setFooter("Minecraft PhoenixSC Edition");
|
embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
|
||||||
return new MessageBuilder(embedBuilder.build()).build();
|
return new MessageBuilder(embedBuilder.build()).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -58,7 +59,7 @@ public class BotHelper extends Bot {
|
||||||
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
||||||
embedBuilder.setTitle(title.getString());
|
embedBuilder.setTitle(title.getString());
|
||||||
embedBuilder.setDescription(message.getString());
|
embedBuilder.setDescription(message.getString());
|
||||||
embedBuilder.setFooter("Minecraft PhoenixSC Edition");
|
embedBuilder.setFooter(new TranslatableText("command.feedback.message.signature").getString());
|
||||||
embedBuilder.setColor(type.hexColor);
|
embedBuilder.setColor(type.hexColor);
|
||||||
return new MessageBuilder(embedBuilder.build()).build();
|
return new MessageBuilder(embedBuilder.build()).build();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,7 @@ import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import com.awakenedredstone.autowhitelist.lang.TranslatableText;
|
import com.awakenedredstone.autowhitelist.lang.TranslatableText;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static com.awakenedredstone.autowhitelist.discord.Bot.whitelistDataMap;
|
import static com.awakenedredstone.autowhitelist.discord.Bot.whitelistDataMap;
|
||||||
|
|
@ -105,7 +102,7 @@ public class RegisterCommand extends Command {
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
GameProfile profile = server.getUserCache().findByName(arg);
|
GameProfile profile = server.getUserCache().findByName(arg).orElse(null);
|
||||||
if (profile == null) {
|
if (profile == null) {
|
||||||
BotHelper.sendFeedbackMessage(channel, new TranslatableText("command.fail.title"), new TranslatableText("command.register.fail.account_data", arg), BotHelper.MessageType.ERROR);
|
BotHelper.sendFeedbackMessage(channel, new TranslatableText("command.fail.title"), new TranslatableText("command.register.fail.account_data", arg), BotHelper.MessageType.ERROR);
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ public class BotStatusCommand extends DeveloperCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void execute(CommandEvent event) {
|
protected void execute(CommandEvent event) {
|
||||||
if (event.getChannelType() != ChannelType.PRIVATE) return;
|
|
||||||
analyzeTimings("BotStatusCommand#execute", () -> {
|
analyzeTimings("BotStatusCommand#execute", () -> {
|
||||||
|
|
||||||
EmbedBuilder embedBuilder = new EmbedBuilder();
|
EmbedBuilder embedBuilder = new EmbedBuilder();
|
||||||
|
|
@ -31,7 +30,7 @@ public class BotStatusCommand extends DeveloperCommand {
|
||||||
"\n" + "**Rest ping:** " + restPing + " ms";
|
"\n" + "**Rest ping:** " + restPing + " ms";
|
||||||
|
|
||||||
embedBuilder.addField("Discord timings", output, false);
|
embedBuilder.addField("Discord timings", output, false);
|
||||||
event.getChannel().sendMessage(embedBuilder.build()).queue();
|
event.getChannel().sendMessageEmbeds(embedBuilder.build()).queue();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,13 +23,11 @@ public class ServerStatusCommand extends DeveloperCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void execute(CommandEvent event) {
|
protected void execute(CommandEvent event) {
|
||||||
if (event.getChannelType() != ChannelType.PRIVATE) return;
|
|
||||||
|
|
||||||
analyzeTimings("ServerStatusCommand#execute", () -> {
|
analyzeTimings("ServerStatusCommand#execute", () -> {
|
||||||
MinecraftServer server = AutoWhitelist.server;
|
MinecraftServer server = AutoWhitelist.server;
|
||||||
PlayerManager playerManager = server.getPlayerManager();
|
PlayerManager playerManager = server.getPlayerManager();
|
||||||
|
|
||||||
long l = Util.getMeasuringTimeMs() - server.getServerStartTime();
|
long l = Util.getMeasuringTimeMs() - server.getTimeReference();
|
||||||
double MSPT = MathHelper.average(server.lastTickLengths) * 1.0E-6D;
|
double MSPT = MathHelper.average(server.lastTickLengths) * 1.0E-6D;
|
||||||
double TPS = 1000.0D / Math.max(50, MSPT);
|
double TPS = 1000.0D / Math.max(50, MSPT);
|
||||||
double MAX_POSSIBLE_TPS = 1000.0D / MSPT;
|
double MAX_POSSIBLE_TPS = 1000.0D / MSPT;
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,6 @@ import com.jagrosh.jdautilities.command.CommandEvent;
|
||||||
import net.dv8tion.jda.api.EmbedBuilder;
|
import net.dv8tion.jda.api.EmbedBuilder;
|
||||||
import net.dv8tion.jda.api.entities.ChannelType;
|
import net.dv8tion.jda.api.entities.ChannelType;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import oshi.SystemInfo;
|
|
||||||
import oshi.hardware.Processor;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -24,7 +22,6 @@ public class StatusCommand extends DeveloperCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void execute(CommandEvent event) {
|
protected void execute(CommandEvent event) {
|
||||||
if (event.getChannelType() != ChannelType.PRIVATE) return;
|
|
||||||
analyzeTimings("StatusCommand#execute", () -> {
|
analyzeTimings("StatusCommand#execute", () -> {
|
||||||
Runtime runtime = Runtime.getRuntime();
|
Runtime runtime = Runtime.getRuntime();
|
||||||
|
|
||||||
|
|
@ -32,15 +29,7 @@ public class StatusCommand extends DeveloperCommand {
|
||||||
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
embedBuilder.setAuthor(jda.getSelfUser().getName(), "https://discord.com", jda.getSelfUser().getAvatarUrl());
|
||||||
embedBuilder.setTitle("Status Log");
|
embedBuilder.setTitle("Status Log");
|
||||||
|
|
||||||
long[] processorsLoad;
|
String output1 = "**RAM: **" + (runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L + "MB / " + runtime.totalMemory() / 1024L / 1024L + "MB" + String.format(" (%s%% free)", Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory());
|
||||||
try {
|
|
||||||
processorsLoad = Arrays.stream(new SystemInfo().getHardware().getProcessors()).map(Processor::getLoad).mapToLong(v -> v.longValue() * 100L).toArray();
|
|
||||||
} catch (UnsupportedOperationException exception) {
|
|
||||||
processorsLoad = new long[]{-1};
|
|
||||||
}
|
|
||||||
String output1 = "" +
|
|
||||||
"\n" + "**CPU: **" + (processorsLoad[0] != -1L ? MathHelper.average(processorsLoad) + "%" : "Unknown") +
|
|
||||||
"\n" + "**RAM: **" + (runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L + "MB / " + runtime.totalMemory() / 1024L / 1024L + "MB" + String.format(" (%s%% free)", Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory());
|
|
||||||
|
|
||||||
embedBuilder.setDescription(output1);
|
embedBuilder.setDescription(output1);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package com.awakenedredstone.autowhitelist.server;
|
||||||
|
|
||||||
import com.awakenedredstone.autowhitelist.AutoWhitelist;
|
import com.awakenedredstone.autowhitelist.AutoWhitelist;
|
||||||
import com.awakenedredstone.autowhitelist.commands.AutoWhitelistCommand;
|
import com.awakenedredstone.autowhitelist.commands.AutoWhitelistCommand;
|
||||||
import com.awakenedredstone.autowhitelist.database.SQLite;
|
|
||||||
import com.awakenedredstone.autowhitelist.discord.Bot;
|
import com.awakenedredstone.autowhitelist.discord.Bot;
|
||||||
import com.awakenedredstone.autowhitelist.lang.JigsawLanguage;
|
import com.awakenedredstone.autowhitelist.lang.JigsawLanguage;
|
||||||
import net.fabricmc.api.DedicatedServerModInitializer;
|
import net.fabricmc.api.DedicatedServerModInitializer;
|
||||||
|
|
@ -25,11 +24,10 @@ public class AutoWhitelistServer implements DedicatedServerModInitializer {
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeServer() {
|
public void onInitializeServer() {
|
||||||
ServerLifecycleEvents.SERVER_STARTING.register(server -> AutoWhitelistCommand.register(server.getCommandManager().getDispatcher()));
|
ServerLifecycleEvents.SERVER_STARTING.register(server -> AutoWhitelistCommand.register(server.getCommandManager().getDispatcher()));
|
||||||
|
ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, serverResourceManager, success) -> AutoWhitelistCommand.register(server.getCommandManager().getDispatcher()));
|
||||||
ServerLifecycleEvents.SERVER_STOPPING.register((server -> Bot.stopBot()));
|
ServerLifecycleEvents.SERVER_STOPPING.register((server -> Bot.stopBot()));
|
||||||
ServerLifecycleEvents.SERVER_STARTED.register((server -> {
|
ServerLifecycleEvents.SERVER_STARTED.register((server -> {
|
||||||
AutoWhitelist.server = server;
|
AutoWhitelist.server = server;
|
||||||
new SQLite().connect();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
{
|
{
|
||||||
InputStream inputStream = AutoWhitelistServer.class.getResource("/messages.json").openStream();
|
InputStream inputStream = AutoWhitelistServer.class.getResource("/messages.json").openStream();
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ public class ExtendedWhitelist extends Whitelist {
|
||||||
super(file);
|
super(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
protected ServerConfigEntry<GameProfile> fromJson(JsonObject json) {
|
protected ServerConfigEntry<GameProfile> fromJson(JsonObject json) {
|
||||||
ExtendedWhitelistEntry entry = new ExtendedWhitelistEntry(json);
|
ExtendedWhitelistEntry entry = new ExtendedWhitelistEntry(json);
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -36,14 +36,14 @@ public class ExtendedWhitelistEntry extends WhitelistEntry {
|
||||||
if (json.has("uuid") && json.has("name") && json.has("discordId") && json.has("team")) {
|
if (json.has("uuid") && json.has("name") && json.has("discordId") && json.has("team")) {
|
||||||
String string = json.get("uuid").getAsString();
|
String string = json.get("uuid").getAsString();
|
||||||
|
|
||||||
UUID uUID2;
|
UUID uuid;
|
||||||
try {
|
try {
|
||||||
uUID2 = UUID.fromString(string);
|
uuid = UUID.fromString(string);
|
||||||
} catch (Throwable var4) {
|
} catch (Throwable var4) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new ExtendedGameProfile(uUID2, json.get("name").getAsString(), json.get("team").getAsString(), json.get("discordId").getAsString());
|
return new ExtendedGameProfile(uuid, json.get("name").getAsString(), json.get("team").getAsString(), json.get("discordId").getAsString());
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,6 @@
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.11.2",
|
"fabricloader": ">=0.11.2",
|
||||||
"minecraft": ">=1.17-alpha.21.8.b"
|
"minecraft": ">=1.17.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"command.register.success.title": "Welcome to the group!",
|
"command.register.success.title": "Welcome to the group!",
|
||||||
"command.register.success.message": "Your Minecraft account has been added to the whitelist.\nPlease remember that snapshots are buggy and unstable, so **please** verify before reporting them.\n\n_Please don't mess with what PhoenixSC is working on, you can get your entry removed._",
|
"command.register.success.message": "Your Minecraft account has been added to the whitelist.\nPlease verify before reporting bugs, it probably isn't caused by the mod.\n\n_Please remember that you can always get your entry removed if you break any rule._",
|
||||||
"command.register.last_steps.title": "Finishing some last things.",
|
"command.register.last_steps.title": "Finishing some last things.",
|
||||||
"command.register.last_steps.message": "You request has been accepted.\nPlease wait while I add you to the server whitelist.\nI'll let you know when everything is done.",
|
"command.register.last_steps.message": "You request has been accepted.\nPlease wait while I add you to the server whitelist.\nI'll let you know when everything is done.",
|
||||||
"command.register.username_already_registered.title": "This username is already registered.",
|
"command.register.username_already_registered.title": "This username is already registered.",
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
"command.register.invalid_username.message.too_short": "The username you inserted is too small, a **Minecraft Java Edition** username has to be at least 3 characters long.",
|
"command.register.invalid_username.message.too_short": "The username you inserted is too small, a **Minecraft Java Edition** username has to be at least 3 characters long.",
|
||||||
|
|
||||||
"command.register.fail.not_allowed.title": "Sorry, but I couldn't accept your request.",
|
"command.register.fail.not_allowed.title": "Sorry, but I couldn't accept your request.",
|
||||||
"command.register.fail.not_allowed.message": "It seams that you don't have the required subscription/member level or don't have your Twitch/Youtube account linked to your Discord account.",
|
"command.register.fail.not_allowed.message": "It seems that you don't have the required subscription/member level or don't have your Twitch/Youtube account linked to your Discord account.",
|
||||||
"command.register.fail.account_data": "I couldn't get the public account data of \"%s\". Is it a valid **Minecraft Java Edition** username?\n_It is only possible to register Minecraft Java Edition accounts._",
|
"command.register.fail.account_data": "I couldn't get the public account data of \"%s\". Is it a valid **Minecraft Java Edition** username?\n_It is only possible to register Minecraft Java Edition accounts._",
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -23,10 +23,11 @@
|
||||||
"command.few_args.title": "Not enough arguments.",
|
"command.few_args.title": "Not enough arguments.",
|
||||||
"command.few_args.message": "You didn't put the minimum amount of arguments required.\nCheck the help command to see the command usage.",
|
"command.few_args.message": "You didn't put the minimum amount of arguments required.\nCheck the help command to see the command usage.",
|
||||||
"command.too_many_args.title": "Too many arguments.",
|
"command.too_many_args.title": "Too many arguments.",
|
||||||
"command.too_many_args.message": "You put too many arguments on the command.\nCheck the help command to see the command usage.",
|
"command.too_many_args.message": "You have put too many arguments on the command.\nCheck the help command to see the command usage.",
|
||||||
"command.feedback.received.title": "Command feedback.",
|
"command.feedback.received.title": "Command feedback.",
|
||||||
"command.feedback.received.message": "Your request has been received and is being processed, if you don't get another feedback message in the next minute than please contact a moderator.",
|
"command.feedback.received.message": "Your request has been received and is being processed, if you don't get another feedback message in the next minute than please contact a moderator.",
|
||||||
|
"command.feedback.message.signature": "Minecraft PhoenixSC Edition",
|
||||||
|
|
||||||
"bot.activity.type": "DEFAULT",
|
"bot.activity.type": "DEFAULT",
|
||||||
"bot.activity.message": "on the Member Server"
|
"bot.activity.message": "on the Member Server"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Referência em uma nova issue