mirror of
https://github.com/DieReicheErethons/Brewery.git
synced 2024-11-14 10:15:38 +01:00
Merge branch 'master' into master
This commit is contained in:
commit
54a371c089
621
LICENSE
Normal file
621
LICENSE
Normal file
@ -0,0 +1,621 @@
|
||||
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
|
17
README.md
17
README.md
@ -1,14 +1,22 @@
|
||||
### Brewery is a Minecraft-Plugin for an alternate brewing process, including alcoholic Potions.
|
||||
|
||||
[![Build Status](https://travis-ci.org/DieReicheErethons/Brewery.png?branch=master)](https://travis-ci.org/DieReicheErethons/Brewery)
|
||||
![License: GPLv3](https://img.shields.io/badge/license-GPLv3-blue)
|
||||
[![Releases](https://img.shields.io/github/v/release/DieReicheErethons/Brewery)](https://github.com/DieReicheErethons/Brewery/releases/latest)
|
||||
|
||||
***
|
||||
|
||||
Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.3082/) or [Bukkit](https://dev.bukkit.org/projects/brewery)
|
||||
###Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.3082/) or [Bukkit](https://dev.bukkit.org/projects/brewery)
|
||||
|
||||
Also see [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master)
|
||||
###Also see [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master)
|
||||
|
||||
|
||||
***
|
||||
|
||||
### JavaDocs
|
||||
|
||||
[JavaDocs on Jitpack](https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/-3166f8c81b-1/javadoc/index.html)
|
||||
|
||||
### Maven
|
||||
|
||||
```XML
|
||||
@ -25,3 +33,8 @@ Also see [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases]
|
||||
</dependency>
|
||||
```
|
||||
_For older maven releases see [here](https://github.com/DieReicheErethons/Brewery/blob/v2.1.2/README.md)_
|
||||
|
||||
|
||||
### License
|
||||
|
||||
This Project is licensed under GPLv3
|
||||
|
110
pom.xml
110
pom.xml
@ -56,13 +56,13 @@
|
||||
<configuration>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>org.bstats:bstats-bukkit</include>
|
||||
<include>org.bstats:*</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>org.bstats.bukkit</pattern>
|
||||
<shadedPattern>com.dre.brewery.integration</shadedPattern>
|
||||
<pattern>org.bstats</pattern>
|
||||
<shadedPattern>com.dre.brewery.integration.bstats</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
@ -76,7 +76,7 @@
|
||||
<version>3.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>install</phase>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
@ -98,7 +98,7 @@
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>md_5-public</id>
|
||||
<url>http://repo.md-5.net/content/groups/public/</url>
|
||||
<url>https://repo.md-5.net/content/groups/public/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>spigot-repo</id>
|
||||
@ -106,11 +106,12 @@
|
||||
</repository>
|
||||
<repository>
|
||||
<id>vault-repo</id>
|
||||
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
|
||||
<url>https://nexus.hc.to/content/repositories/pub_releases</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<!-- WorldEdit, WorldGuard -->
|
||||
<id>sk89q-repo</id>
|
||||
<url>http://maven.sk89q.com/repo/</url>
|
||||
<url>https://maven.sk89q.com/repo/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
|
||||
@ -126,13 +127,13 @@
|
||||
<id>chestshop-repo</id>
|
||||
<url>https://repo.minebench.de/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<!-- BlockLocker -->
|
||||
<id>CodeMC</id>
|
||||
<url>https://repo.codemc.org/repository/maven-public</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<!-- bStats -->
|
||||
<id>CodeMC</id>
|
||||
<url>https://repo.codemc.org/repository/maven-public</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<!-- MMOLib -->
|
||||
<!-- MythicLib (MMOItems) -->
|
||||
<id>MMOPlugins</id>
|
||||
<url>https://mvn.lumine.io/repository/maven-releases/</url>
|
||||
</repository>
|
||||
@ -147,7 +148,7 @@
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>1.16.4-R0.1-SNAPSHOT</version>
|
||||
<version>1.17-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@ -160,11 +161,24 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://bstats.org/getting-started/include-metrics -->
|
||||
<groupId>org.bstats</groupId>
|
||||
<artifactId>bstats-bukkit</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.milkbowl.vault</groupId>
|
||||
<artifactId>VaultAPI</artifactId>
|
||||
<version>1.6</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>*</artifactId>
|
||||
<groupId>*</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sk89q</groupId>
|
||||
@ -179,9 +193,10 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://dev.bukkit.org/projects/worldedit/files -->
|
||||
<groupId>com.sk89q.worldedit</groupId>
|
||||
<artifactId>worldedit-bukkit</artifactId>
|
||||
<version>7.2.0-SNAPSHOT</version>
|
||||
<version>7.2.5</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@ -193,7 +208,7 @@
|
||||
<dependency>
|
||||
<groupId>com.sk89q.worldedit</groupId>
|
||||
<artifactId>worldedit-core</artifactId>
|
||||
<version>7.2.0-SNAPSHOT</version>
|
||||
<version>7.2.5</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@ -203,6 +218,7 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://dev.bukkit.org/projects/worldguard/files -->
|
||||
<groupId>com.sk89q.worldguard</groupId>
|
||||
<artifactId>worldguard-core</artifactId>
|
||||
<version>7.0.4</version>
|
||||
@ -215,22 +231,11 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.spigotmc.org/resources/lwc-extended.69551/history -->
|
||||
<groupId>com.griefcraft.lwc</groupId>
|
||||
<artifactId>LWCX</artifactId>
|
||||
<version>2.2.6</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.TechFortress</groupId>
|
||||
<artifactId>GriefPrevention</artifactId>
|
||||
<version>16.16.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.diddiz</groupId>
|
||||
<artifactId>logblock</artifactId>
|
||||
<version>1.16.1.1</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>*</artifactId>
|
||||
@ -239,9 +244,30 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.TheBusyBiscuit</groupId>
|
||||
<!-- https://www.spigotmc.org/resources/griefprevention.1884/history -->
|
||||
<groupId>com.github.TechFortress</groupId>
|
||||
<artifactId>GriefPrevention</artifactId>
|
||||
<version>16.17.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.spigotmc.org/resources/logblock.67333/history -->
|
||||
<groupId>de.diddiz</groupId>
|
||||
<artifactId>logblock</artifactId>
|
||||
<version>1.16.5.1</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>*</artifactId>
|
||||
<groupId>*</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://github.com/Slimefun/Slimefun4/releases -->
|
||||
<groupId>com.github.slimefun</groupId>
|
||||
<artifactId>Slimefun4</artifactId>
|
||||
<version>RC-17</version>
|
||||
<version>RC-24</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!--<dependency>
|
||||
@ -252,42 +278,42 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>-->
|
||||
<dependency>
|
||||
<groupId>net.Indyuce</groupId>
|
||||
<artifactId>MMOLib</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<!-- https://mythiccraft.io/index.php?pages/official-mythiclib-dev/ -->
|
||||
<groupId>io.lumine</groupId>
|
||||
<artifactId>MythicLib</artifactId>
|
||||
<version>1.0.19</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://github.com/ChestShop-authors/ChestShop-3/releases -->
|
||||
<groupId>com.acrobot.chestshop</groupId>
|
||||
<artifactId>chestshop</artifactId>
|
||||
<version>3.11</version>
|
||||
<version>3.12</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.spigotmc.org/resources/towny-advanced.72694/history -->
|
||||
<groupId>com.github.TownyAdvanced</groupId>
|
||||
<artifactId>Towny</artifactId>
|
||||
<version>0.96.3.0</version>
|
||||
<version>0.97.0.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.spigotmc.org/resources/shopkeepers.80756/history -->
|
||||
<groupId>com.nisovin.shopkeepers</groupId>
|
||||
<artifactId>ShopkeepersAPI</artifactId>
|
||||
<version>2.12.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.spigotmc.org/resources/blocklocker.3268/history -->
|
||||
<groupId>nl.rutgerkok</groupId>
|
||||
<artifactId>blocklocker</artifactId>
|
||||
<version>1.9</version>
|
||||
<version>1.9.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bstats</groupId>
|
||||
<artifactId>bstats-bukkit</artifactId>
|
||||
<version>1.5</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- https://www.jetbrains.com/help/idea/annotating-source-code.html -->
|
||||
<groupId>org.jetbrains</groupId>
|
||||
<artifactId>annotations</artifactId>
|
||||
<version>16.0.2</version>
|
||||
|
@ -440,6 +440,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Bestimmt schon eine Woche alt
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -509,6 +510,9 @@ openLargeBarrelEverywhere: true
|
||||
# Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Ob das Entleeren von Brewery Tränken mit Hilfe von Trichtern möglich ist, um die Glasflasche zurück zu bekommen [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Chat Veränderungs Einstellungen --
|
||||
|
||||
|
@ -442,6 +442,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probably a week old
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -510,6 +511,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Chat Distortion Settings --
|
||||
|
||||
|
@ -438,6 +438,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
- SPEED/1/30-140
|
||||
@ -505,6 +506,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Paramètres de la distorsion du Chat --
|
||||
|
||||
|
@ -429,6 +429,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
- SPEED/1/30-140
|
||||
@ -497,6 +498,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Imostazioni di distorsione della chat --
|
||||
|
||||
|
@ -740,6 +740,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Bestimmt schon eine Woche alt
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -821,6 +822,7 @@ recipes:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -843,7 +845,7 @@ recipes:
|
||||
# Pumpkin Spice Bier,
|
||||
# Melonen Vodka
|
||||
|
||||
# Es gibt noch viele Minecraft Items wie Ranken und items von anderen plugins die sich gut als Zutaten machen würden
|
||||
# Es gibt noch viele Minecraft Items wie Ranken, Milch und items von anderen plugins die sich gut als Zutaten machen würden
|
||||
|
||||
|
||||
|
||||
@ -906,6 +908,9 @@ openLargeBarrelEverywhere: true
|
||||
# Ob nur ein Minimum an Kessel-Partikeln dargestellt werden sollen [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Ob das Entleeren von Brewery Tränken mit Hilfe von Trichtern möglich ist, um die Glasflasche zurück zu bekommen [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Chat Veränderungs Einstellungen --
|
||||
|
||||
|
@ -739,6 +739,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probably a week old
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -816,6 +817,7 @@ recipes:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -838,7 +840,7 @@ recipes:
|
||||
# Pumpkin Spice Beer,
|
||||
# Melon Vodka
|
||||
|
||||
# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients.
|
||||
# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients.
|
||||
|
||||
|
||||
# -- Plugin Compatibility --
|
||||
@ -899,6 +901,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Chat Distortion Settings --
|
||||
|
||||
|
@ -739,6 +739,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probablemente una semana de edad
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -816,6 +817,7 @@ recipes:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -838,7 +840,7 @@ recipes:
|
||||
# Pumpkin Spice Beer,
|
||||
# Melon Vodka
|
||||
|
||||
# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients.
|
||||
# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients.
|
||||
|
||||
|
||||
# -- Plugin Compatibility --
|
||||
@ -898,6 +900,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Chat Distortion Settings --
|
||||
|
||||
|
@ -746,6 +746,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probably a week old
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -822,6 +823,7 @@ recipes:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -844,7 +846,7 @@ recipes:
|
||||
# Pumpkin Spice Beer,
|
||||
# Melon Vodka
|
||||
|
||||
# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients.
|
||||
# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients.
|
||||
|
||||
|
||||
# -- Compatibilité entre Plugins --
|
||||
@ -904,6 +906,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Paramètres de la distorsion du Chat --
|
||||
|
||||
|
@ -739,6 +739,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probably a week old
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -816,6 +817,7 @@ eggnog:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -838,7 +840,7 @@ eggnog:
|
||||
# Pumpkin Spice Beer,
|
||||
# Melon Vodka
|
||||
|
||||
# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients.
|
||||
# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients.
|
||||
|
||||
|
||||
# -- Compatibilità con altri plugin --
|
||||
@ -898,6 +900,9 @@ openLargeBarrelEverywhere: true
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- Imostazioni di distorsione della chat --
|
||||
|
||||
|
@ -743,6 +743,7 @@ recipes:
|
||||
cookingtime: 2
|
||||
color: BLACK
|
||||
difficulty: 3
|
||||
alcohol: -6
|
||||
lore: + &8Probably a week old
|
||||
effects:
|
||||
- REGENERATION/1/2-5
|
||||
@ -820,6 +821,7 @@ recipes:
|
||||
# cookingtime: 1
|
||||
# color: BLACK
|
||||
# difficulty: 4
|
||||
# alcohol: -8
|
||||
# effects:
|
||||
# - REGENERATION/30
|
||||
# - SPEED/10
|
||||
@ -842,7 +844,7 @@ recipes:
|
||||
# Pumpkin Spice Beer,
|
||||
# Melon Vodka
|
||||
|
||||
# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients.
|
||||
# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients.
|
||||
|
||||
|
||||
# -- 插件兼容性 --
|
||||
@ -902,6 +904,9 @@ openLargeBarrelEverywhere: false
|
||||
# If Cauldron Particles should be reduced to the bare minimum [false]
|
||||
minimalParticles: false
|
||||
|
||||
# Allow emptying brews into hoppers to discard brews while keeping the glass bottle [true]
|
||||
brewHopperDump: true
|
||||
|
||||
|
||||
# -- 口糊设置 --
|
||||
|
||||
|
@ -102,7 +102,7 @@ Player_WakeCreated: '&aWakeup Point with id: &6&v1 &awas created successfully!'
|
||||
Player_WakeDeleted: '&aThe Wakeup Point with the id: &6&v1 &awas successfully deleted!'
|
||||
Player_WakeFilled: '&cThe Wakeup Point with the id: &6&v1&c at position &6&v2 &v3, &v4, &v5&c is filled with Blocks!'
|
||||
Player_WakeHint1: 'To Next Wakeup Point: Punch your fist in the air'
|
||||
Player_WakeHint2: 'To Cancel: &9/br wakeup cancel'
|
||||
Player_WakeHint2: 'To Cancel: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&aThis was the last Wakeup Point'
|
||||
Player_WakeNoCheck: '&cNo Wakeup Point Check is currently active'
|
||||
Player_WakeNoPoints: '&cThere are no Wakeup Points!'
|
||||
|
@ -103,7 +103,7 @@ Player_WakeCreated: '&a¡Punto de activación con id: &6&v1 &afue creado con éx
|
||||
Player_WakeDeleted: '&aEl punto de activación con la id: &6&v1 &a¡ha sido eliminado con éxito!'
|
||||
Player_WakeFilled: '&cEl punto de activación con la id: &6&v1&c en la posición &6&v2 &v3, &v4, &v5&c ¡está lleno de bloques!'
|
||||
Player_WakeHint1: 'Al siguiente punto de activación: golpea el puño en el aire'
|
||||
Player_WakeHint2: 'Para cancelar: &9/br wakeup cancel'
|
||||
Player_WakeHint2: 'Para cancelar: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&aEste fue el último punto de activación'
|
||||
Player_WakeNoCheck: '&cNinguna verificación de punto de activación está activa actualmente'
|
||||
Player_WakeNoPoints: '&c¡No hay puntos de activación!'
|
||||
|
@ -102,7 +102,7 @@ Player_WakeCreated: '&aIl punto di risveglio con id &6&v1 &aè stato creato con
|
||||
Player_WakeDeleted: '&aIl punto di risveglio con id &6&v1 &aè stato rimosso con successo!'
|
||||
Player_WakeFilled: '&cIl punto di risveglio con id &6&v1&c alla posizione &6&v2 &v3, &v4, &v5&c è stato coperto da dei blocchi!'
|
||||
Player_WakeHint1: 'Per andare al prossimo punto di risveglio dai un pugno nell''aria o ripeti il comando'
|
||||
Player_WakeHint2: 'Per rimuoverlo: &9/br wakeup cancel'
|
||||
Player_WakeHint2: 'Per rimuoverlo: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&aQuesto era l''ultimo punto di risveglio.'
|
||||
Player_WakeNoCheck: '&cNessun punto di risveglio attivo al momento.'
|
||||
Player_WakeNoPoints: '&cNon ci sono punti di risveglio!'
|
||||
|
@ -102,7 +102,7 @@ Player_WakeCreated: '&aТочка пробуждения под номером:
|
||||
Player_WakeDeleted: '&aТочка Пробуждения под номером: &6&v1 &aбыла удалена!'
|
||||
Player_WakeFilled: '&cТочка Пробуждения под номером: &6&v1&c в точку &6&v2 &v3, &v4, &v5&c заполнена блоками!'
|
||||
Player_WakeHint1: 'Для следующей точки пробуждения: Ударь кулаком в воздух'
|
||||
Player_WakeHint2: 'Для отмены: &9/br wakeup cancel'
|
||||
Player_WakeHint2: 'Для отмены: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&aЭто была последняя точка пробуждения'
|
||||
Player_WakeNoCheck: '&cНет активных проверок Точек Пробуждения'
|
||||
Player_WakeNoPoints: '&cЗдесь нет Точки Пробуждения!'
|
||||
|
@ -102,7 +102,7 @@ Player_WakeCreated: '&a這個喚醒點 id: &6&v1 &a成功創建!'
|
||||
Player_WakeDeleted: '&a這個喚醒點 id: &6&v1 &a成功刪除!'
|
||||
Player_WakeFilled: '&c這個喚醒點 id: &6&v1&c 在位置 &6&v2 &v3, &v4, &v5&c 充滿了方塊!'
|
||||
Player_WakeHint1: '到下一個喚醒點:把拳頭打在空中'
|
||||
Player_WakeHint2: '取消: &9/br wakeup cancel'
|
||||
Player_WakeHint2: '取消: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&a這是最後一個喚醒點'
|
||||
Player_WakeNoCheck: '&c目前沒有喚醒點是處於活動狀態'
|
||||
Player_WakeNoPoints: '&c沒有喚醒點!'
|
||||
|
@ -102,7 +102,7 @@ Player_WakeCreated: '&aid为: &6&v1 &a的苏醒处被成功创建!'
|
||||
Player_WakeDeleted: '&aid为: &6&v1 &a的苏醒处被成功删除!'
|
||||
Player_WakeFilled: '&cid为: &6&v1 &c所在方位为: &6&v2 &v3, &v4, &v5 &c被填充了方块!'
|
||||
Player_WakeHint1: '前往下一个苏醒处, 请对空打拳.'
|
||||
Player_WakeHint2: '取消检查: &9/br wakeup cancel'
|
||||
Player_WakeHint2: '取消检查: &9/brew wakeup cancel'
|
||||
Player_WakeLast: '&a这是最后一个苏醒处了.'
|
||||
Player_WakeNoCheck: '&c目前没有执行苏醒处检查.'
|
||||
Player_WakeNoPoints: '&c目前没有设定任何一个苏醒处!'
|
||||
|
@ -129,3 +129,11 @@ permissions:
|
||||
description: Will despite config-setting not be kicked on overdrink
|
||||
brewery.bypass.teleport:
|
||||
description: Will despite config-setting not be teleported on login
|
||||
|
||||
# -- Modifiers --
|
||||
|
||||
brewery.sensitive.100:
|
||||
description: How sensitive to alcohol the player is in percent
|
||||
|
||||
brewery.recovery.2:
|
||||
description: How quickly the player will naturally reduce his drunkeness per minute
|
||||
|
@ -60,7 +60,7 @@ public class BCauldron {
|
||||
if (!BUtil.isChunkLoaded(block)) {
|
||||
increaseState();
|
||||
} else {
|
||||
if (block.getType() != Material.CAULDRON) {
|
||||
if (!LegacyUtil.isWaterCauldron(block.getType())) {
|
||||
// Catch any WorldEdit etc. removal
|
||||
return false;
|
||||
}
|
||||
@ -172,21 +172,34 @@ public class BCauldron {
|
||||
|
||||
if (P.use1_13) {
|
||||
BlockData data = block.getBlockData();
|
||||
if (!(data instanceof Levelled)) {
|
||||
bcauldrons.remove(block);
|
||||
return false;
|
||||
}
|
||||
Levelled cauldron = ((Levelled) data);
|
||||
if (cauldron.getLevel() <= 0) {
|
||||
bcauldrons.remove(block);
|
||||
return false;
|
||||
}
|
||||
cauldron.setLevel(cauldron.getLevel() - 1);
|
||||
// Update the new Level to the Block
|
||||
// We have to use the BlockData variable "data" here instead of the casted "cauldron"
|
||||
// otherwise < 1.13 crashes on plugin load for not finding the BlockData Class
|
||||
block.setBlockData(data);
|
||||
|
||||
if (cauldron.getLevel() <= 0) {
|
||||
// If the Water_Cauldron type exists and the cauldron is on last level
|
||||
if (LegacyUtil.WATER_CAULDRON != null && cauldron.getLevel() == 1) {
|
||||
// Empty Cauldron
|
||||
block.setType(Material.CAULDRON);
|
||||
bcauldrons.remove(block);
|
||||
} else {
|
||||
changed = true;
|
||||
cauldron.setLevel(cauldron.getLevel() - 1);
|
||||
|
||||
// Update the new Level to the Block
|
||||
// We have to use the BlockData variable "data" here instead of the casted "cauldron"
|
||||
// otherwise < 1.13 crashes on plugin load for not finding the BlockData Class
|
||||
block.setBlockData(data);
|
||||
|
||||
if (cauldron.getLevel() <= 0) {
|
||||
bcauldrons.remove(block);
|
||||
} else {
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -389,7 +402,7 @@ public class BCauldron {
|
||||
if (item.getAmount() > 1) {
|
||||
item.setAmount(item.getAmount() - 1);
|
||||
} else {
|
||||
setItemInHand(event, Material.AIR, false);
|
||||
BUtil.setItemInHand(event, Material.AIR, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -399,9 +412,10 @@ public class BCauldron {
|
||||
}
|
||||
return;
|
||||
|
||||
// reset cauldron when refilling to prevent unlimited source of potions
|
||||
// Ignore Water Buckets
|
||||
} else if (materialInHand == Material.WATER_BUCKET) {
|
||||
if (!P.use1_9) {
|
||||
// reset < 1.9 cauldron when refilling to prevent unlimited source of potions
|
||||
// We catch >=1.9 cases in the Cauldron Listener
|
||||
if (LegacyUtil.getFillLevel(clickedBlock) == 1) {
|
||||
// will only remove when existing
|
||||
@ -458,30 +472,17 @@ public class BCauldron {
|
||||
}
|
||||
} else {
|
||||
if (isBucket) {
|
||||
setItemInHand(event, Material.BUCKET, handSwap);
|
||||
BUtil.setItemInHand(event, Material.BUCKET, handSwap);
|
||||
} else if (isBottle) {
|
||||
setItemInHand(event, Material.GLASS_BOTTLE, handSwap);
|
||||
BUtil.setItemInHand(event, Material.GLASS_BOTTLE, handSwap);
|
||||
} else {
|
||||
setItemInHand(event, Material.AIR, handSwap);
|
||||
BUtil.setItemInHand(event, Material.AIR, handSwap);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public static void setItemInHand(PlayerInteractEvent event, Material mat, boolean swapped) {
|
||||
if (P.use1_9) {
|
||||
if ((event.getHand() == EquipmentSlot.OFF_HAND) != swapped) {
|
||||
event.getPlayer().getInventory().setItemInOffHand(new ItemStack(mat));
|
||||
} else {
|
||||
event.getPlayer().getInventory().setItemInMainHand(new ItemStack(mat));
|
||||
}
|
||||
} else {
|
||||
event.getPlayer().setItemInHand(new ItemStack(mat));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Recalculate the Cauldron Particle Recipe
|
||||
*/
|
||||
|
@ -175,7 +175,7 @@ public class BDistiller {
|
||||
BlockState now = standBlock.getState();
|
||||
if (now instanceof BrewingStand) {
|
||||
BrewingStand stand = (BrewingStand) now;
|
||||
if (brewTime == -1) { // only check at the beginning (and end) for distillables
|
||||
if (brewTime == -1) { // check at the beginning for distillables
|
||||
if (!prepareForDistillables(stand)) {
|
||||
return;
|
||||
}
|
||||
@ -185,7 +185,7 @@ public class BDistiller {
|
||||
stand.setBrewingTime((int) ((float) brewTime / ((float) runTime / (float) DISTILLTIME)) + 1);
|
||||
|
||||
if (brewTime <= 1) { // Done!
|
||||
contents = getDistillContents(stand.getInventory());
|
||||
contents = getDistillContents(stand.getInventory()); // Get the contents again at the end just in case
|
||||
stand.setBrewingTime(0);
|
||||
stand.update();
|
||||
if (!runDistill(stand.getInventory(), contents)) {
|
||||
@ -220,6 +220,7 @@ public class BDistiller {
|
||||
if (P.use1_11) {
|
||||
// The trick below doesnt work in 1.11, but we dont need it anymore
|
||||
// This should only happen with older Brews that have been made with the old Potion Color System
|
||||
// This causes standard potions to not brew in the brewing stand if put together with Brews, but the bubble animation will play
|
||||
stand.setBrewingTime(Short.MAX_VALUE);
|
||||
} else {
|
||||
// Brewing time is sent and stored as short
|
||||
|
@ -8,6 +8,7 @@ import com.dre.brewery.filedata.BConfig;
|
||||
import com.dre.brewery.lore.BrewLore;
|
||||
import com.dre.brewery.recipe.BEffect;
|
||||
import com.dre.brewery.utility.BUtil;
|
||||
import com.dre.brewery.utility.PermissionUtil;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.apache.commons.lang.mutable.MutableInt;
|
||||
@ -27,24 +28,19 @@ import org.bukkit.potion.PotionEffectType;
|
||||
import org.bukkit.util.Vector;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.*;
|
||||
|
||||
public class BPlayer {
|
||||
private static Map<String, BPlayer> players = new HashMap<>();// Players uuid and BPlayer
|
||||
private static Map<Player, MutableInt> pTasks = new HashMap<>();// Player and count
|
||||
private static int taskId;
|
||||
private static boolean modAge = true;
|
||||
private static Random pukeRand;
|
||||
private static Method itemHandle;
|
||||
private static Field age;
|
||||
|
||||
private final String uuid;
|
||||
private int quality = 0;// = quality of drunkeness * drunkeness
|
||||
private int drunkeness = 0;// = amount of drunkeness
|
||||
private int offlineDrunk = 0;// drunkeness when gone offline
|
||||
private int alcRecovery = -1; // Drunkeness reduce per minute
|
||||
private Vector push = new Vector(0, 0, 0);
|
||||
private int time = 20;
|
||||
|
||||
@ -161,6 +157,7 @@ public class BPlayer {
|
||||
if (bPlayer == null) {
|
||||
bPlayer = addPlayer(player);
|
||||
}
|
||||
// In this event the added alcohol amount is calculated, based on the sensitivity permission
|
||||
BrewDrinkEvent drinkEvent = new BrewDrinkEvent(brew, meta, player, bPlayer);
|
||||
if (meta != null) {
|
||||
P.p.getServer().getPluginManager().callEvent(drinkEvent);
|
||||
@ -181,30 +178,36 @@ public class BPlayer {
|
||||
int quality = drinkEvent.getQuality();
|
||||
List<PotionEffect> effects = getBrewEffects(brew.getEffects(), quality);
|
||||
|
||||
if (brewAlc < 1) {
|
||||
//no alcohol so we dont need to add a BPlayer
|
||||
applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK);
|
||||
if (bPlayer.drunkeness <= 0) {
|
||||
bPlayer.remove();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bPlayer.drunkeness += brewAlc;
|
||||
if (quality > 0) {
|
||||
bPlayer.quality += quality * brewAlc;
|
||||
} else {
|
||||
bPlayer.quality += brewAlc;
|
||||
}
|
||||
applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK);
|
||||
applyEffects(getQualityEffects(quality, brewAlc), player, PlayerEffectEvent.EffectType.QUALITY);
|
||||
if (brewAlc < 0) {
|
||||
// If the Drink has negative alcohol, drain some alcohol
|
||||
bPlayer.drain(player, -brewAlc);
|
||||
} else if (brewAlc > 0) {
|
||||
bPlayer.drunkeness += brewAlc;
|
||||
if (quality > 0) {
|
||||
bPlayer.quality += quality * brewAlc;
|
||||
} else {
|
||||
bPlayer.quality += brewAlc;
|
||||
}
|
||||
|
||||
applyEffects(getQualityEffects(quality, brewAlc), player, PlayerEffectEvent.EffectType.QUALITY);
|
||||
}
|
||||
|
||||
if (bPlayer.drunkeness > 100) {
|
||||
bPlayer.drinkCap(player);
|
||||
}
|
||||
bPlayer.syncToSQL(false);
|
||||
|
||||
if (BConfig.showStatusOnDrink) {
|
||||
bPlayer.showDrunkeness(player);
|
||||
// Only show the Player his drunkeness if he is already drunk, or this drink changed his drunkeness
|
||||
if (brewAlc != 0 || bPlayer.drunkeness > 0) {
|
||||
bPlayer.showDrunkeness(player);
|
||||
}
|
||||
}
|
||||
|
||||
if (bPlayer.drunkeness <= 0) {
|
||||
bPlayer.remove();
|
||||
} else {
|
||||
bPlayer.syncToSQL(false);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -343,7 +346,7 @@ public class BPlayer {
|
||||
}
|
||||
|
||||
// drain the drunkeness by amount, returns true when player has to be removed
|
||||
public boolean drain(Player player, int amount) {
|
||||
public boolean drain(@Nullable Player player, int amount) {
|
||||
if (drunkeness > 0) {
|
||||
quality -= getQuality() * amount;
|
||||
}
|
||||
@ -481,14 +484,13 @@ public class BPlayer {
|
||||
showDrunkeness(player);
|
||||
}
|
||||
if (drunkeness <= 0) {
|
||||
// wird der spieler noch gebraucht?
|
||||
remove(player);
|
||||
}
|
||||
|
||||
} else if (offlineDrunk - drunkeness >= 30) {
|
||||
Location randomLoc = Wakeup.getRandom(player.getLocation());
|
||||
if (randomLoc != null) {
|
||||
if (!player.hasPermission("brewery.bypass.teleport")) {
|
||||
if (BConfig.enableWake && !player.hasPermission("brewery.bypass.teleport")) {
|
||||
Location randomLoc = Wakeup.getRandom(player.getLocation());
|
||||
if (randomLoc != null) {
|
||||
player.teleport(randomLoc);
|
||||
P.p.msg(player, P.p.languageReader.get("Player_Wake"));
|
||||
}
|
||||
@ -523,6 +525,16 @@ public class BPlayer {
|
||||
}
|
||||
}
|
||||
|
||||
public void recalculateAlcRecovery(@Nullable Player player) {
|
||||
setAlcRecovery(2);
|
||||
if (player != null) {
|
||||
int rec = PermissionUtil.getAlcRecovery(player);
|
||||
if (rec > -1) {
|
||||
setAlcRecovery(rec);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// #### Puking ####
|
||||
|
||||
@ -604,39 +616,23 @@ public class BPlayer {
|
||||
item.setVelocity(direction);
|
||||
item.setPickupDelay(32767); // Item can never be picked up when pickup delay is 32767
|
||||
item.setMetadata("brewery_puke", new FixedMetadataValue(P.getInstance(), true));
|
||||
//item.setTicksLived(6000 - pukeDespawntime); // Well this does not work...
|
||||
if (modAge) {
|
||||
int pukeDespawntime = BConfig.pukeDespawntime;
|
||||
if (pukeDespawntime >= 5800) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (itemHandle == null) {
|
||||
itemHandle = Class.forName(P.p.getServer().getClass().getPackage().getName() + ".entity.CraftItem").getMethod("getHandle", (Class<?>[]) null);
|
||||
}
|
||||
Object entityItem = itemHandle.invoke(item, (Object[]) null);
|
||||
if (age == null) {
|
||||
age = entityItem.getClass().getDeclaredField("age");
|
||||
age.setAccessible(true);
|
||||
}
|
||||
if (P.use1_14) item.setPersistent(false); // No need to save Puke items
|
||||
|
||||
// Setting the age determines when an item is despawned. At age 6000 it is removed.
|
||||
if (pukeDespawntime <= 0) {
|
||||
// Just show the item for a tick
|
||||
age.setInt(entityItem, 5999);
|
||||
} else if (pukeDespawntime <= 120) {
|
||||
// it should despawn in less than 6 sec. Add up to half of that randomly
|
||||
age.setInt(entityItem, 6000 - pukeDespawntime + pukeRand.nextInt((int) (pukeDespawntime / 2F)));
|
||||
} else {
|
||||
// Add up to 5 sec randomly
|
||||
age.setInt(entityItem, 6000 - pukeDespawntime + pukeRand.nextInt(100));
|
||||
}
|
||||
return;
|
||||
} catch (InvocationTargetException | ClassNotFoundException | NoSuchFieldException | IllegalAccessException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
modAge = false;
|
||||
P.p.errorLog("Failed to set Despawn Time on item " + BConfig.pukeItem.name());
|
||||
int pukeDespawntime = BConfig.pukeDespawntime;
|
||||
if (pukeDespawntime >= 5800) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Setting the age determines when an item is despawned. At age 6000 it is removed.
|
||||
if (pukeDespawntime <= 0) {
|
||||
// Just show the item for a few ticks
|
||||
item.setTicksLived(5996);
|
||||
} else if (pukeDespawntime <= 120) {
|
||||
// it should despawn in less than 6 sec. Add up to half of that randomly
|
||||
item.setTicksLived(6000 - pukeDespawntime + pukeRand.nextInt((int) (pukeDespawntime / 2F)));
|
||||
} else {
|
||||
// Add up to 5 sec randomly
|
||||
item.setTicksLived(6000 - pukeDespawntime + pukeRand.nextInt(100));
|
||||
}
|
||||
}
|
||||
|
||||
@ -802,17 +798,18 @@ public class BPlayer {
|
||||
// decreasing drunkeness over time
|
||||
public static void onUpdate() {
|
||||
if (!players.isEmpty()) {
|
||||
int soberPerMin = 2;
|
||||
Iterator<Map.Entry<String, BPlayer>> iter = players.entrySet().iterator();
|
||||
while (iter.hasNext()) {
|
||||
Map.Entry<String, BPlayer> entry = iter.next();
|
||||
String uuid = entry.getKey();
|
||||
BPlayer bplayer = entry.getValue();
|
||||
if (bplayer.drunkeness == soberPerMin) {
|
||||
// Prevent 0 drunkeness
|
||||
soberPerMin++;
|
||||
Player playerIfOnline = BUtil.getPlayerfromString(uuid);
|
||||
|
||||
if (bplayer.getAlcRecovery() == -1) {
|
||||
bplayer.recalculateAlcRecovery(playerIfOnline);
|
||||
}
|
||||
if (bplayer.drain(BUtil.getPlayerfromString(uuid), soberPerMin)) {
|
||||
|
||||
if (bplayer.drain(playerIfOnline, bplayer.getAlcRecovery())) {
|
||||
iter.remove();
|
||||
if (BConfig.sqlDrunkSync && BConfig.sqlSync != null) {
|
||||
BConfig.sqlSync.removePlayer(UUID.fromString(uuid));
|
||||
@ -898,4 +895,11 @@ public class BPlayer {
|
||||
return offlineDrunk;
|
||||
}
|
||||
|
||||
public int getAlcRecovery() {
|
||||
return alcRecovery;
|
||||
}
|
||||
|
||||
public void setAlcRecovery(int alcRecovery) {
|
||||
this.alcRecovery = alcRecovery;
|
||||
}
|
||||
}
|
||||
|
@ -373,9 +373,7 @@ public class Brew implements Cloneable {
|
||||
// quality decides 10% - 100%
|
||||
alc *= ((float) quality / 10.0f);
|
||||
}
|
||||
if (alc > 0) {
|
||||
return alc;
|
||||
}
|
||||
return alc;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -516,7 +514,10 @@ public class Brew implements Cloneable {
|
||||
}
|
||||
|
||||
public int getOrCalcAlc() {
|
||||
return alc > 0 ? alc : (alc = calcAlcohol());
|
||||
if (alc == 0) {
|
||||
alc = calcAlcohol();
|
||||
}
|
||||
return alc;
|
||||
}
|
||||
|
||||
public void setAlc(int alc) {
|
||||
@ -1004,18 +1005,20 @@ public class Brew implements Cloneable {
|
||||
quality = 10;
|
||||
}
|
||||
alc = Math.min(alc, Short.MAX_VALUE);
|
||||
alc = Math.max(alc, Short.MIN_VALUE);
|
||||
|
||||
out.writeByte((byte) quality);
|
||||
int bools = 0;
|
||||
bools |= ((distillRuns != 0) ? 1 : 0);
|
||||
bools |= (ageTime > 0 ? 2 : 0);
|
||||
bools |= (wood != -1 ? 4 : 0);
|
||||
bools |= ((distillRuns != 0) ? 1 : 0);
|
||||
bools |= (ageTime > 0 ? 2 : 0);
|
||||
bools |= (wood != -1 ? 4 : 0);
|
||||
bools |= (currentRecipe != null ? 8 : 0);
|
||||
bools |= (unlabeled ? 16 : 0);
|
||||
bools |= (immutable ? 32 : 0);
|
||||
bools |= (alc > 0 ? 64 : 0);
|
||||
bools |= (stripped ? 128 : 0);
|
||||
bools |= (unlabeled ? 16 : 0);
|
||||
bools |= (immutable ? 32 : 0);
|
||||
bools |= (alc != 0 ? 64 : 0);
|
||||
bools |= (stripped ? 128 : 0);
|
||||
out.writeByte(bools);
|
||||
if (alc > 0) {
|
||||
if (alc != 0) {
|
||||
out.writeShort(alc);
|
||||
}
|
||||
if (distillRuns != 0) {
|
||||
@ -1142,7 +1145,7 @@ public class Brew implements Cloneable {
|
||||
if (brew.quality != 0) {
|
||||
idConfig.set("quality", brew.quality);
|
||||
}
|
||||
if (brew.alc > 0) {
|
||||
if (brew.alc != 0) {
|
||||
idConfig.set("alc", brew.alc);
|
||||
}
|
||||
if (brew.distillRuns != 0) {
|
||||
|
@ -1,3 +1,27 @@
|
||||
/**
|
||||
*
|
||||
* Brewery Minecraft-Plugin for an alternate Brewing Process
|
||||
* Copyright (C) 2021 Milan Albrecht
|
||||
*
|
||||
* This file is part of Brewery.
|
||||
*
|
||||
* Brewery 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.
|
||||
*
|
||||
* Brewery 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 Brewery. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package com.dre.brewery;
|
||||
|
||||
import com.dre.brewery.filedata.BConfig;
|
||||
@ -16,6 +40,7 @@ import com.dre.brewery.utility.BUtil;
|
||||
import com.dre.brewery.utility.LegacyUtil;
|
||||
import org.apache.commons.lang.math.NumberUtils;
|
||||
import org.bstats.bukkit.Metrics;
|
||||
import org.bstats.charts.*;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
@ -286,12 +311,12 @@ public class P extends JavaPlugin {
|
||||
|
||||
private void setupMetrics() {
|
||||
try {
|
||||
Metrics metrics = new Metrics(this);
|
||||
metrics.addCustomChart(new Metrics.SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
|
||||
metrics.addCustomChart(new Metrics.SingleLineChart("brews_in_existence", () -> brewsCreated));
|
||||
metrics.addCustomChart(new Metrics.SingleLineChart("barrels_built", () -> Barrel.barrels.size()));
|
||||
metrics.addCustomChart(new Metrics.SingleLineChart("cauldrons_boiling", () -> BCauldron.bcauldrons.size()));
|
||||
metrics.addCustomChart(new Metrics.AdvancedPie("brew_quality", () -> {
|
||||
Metrics metrics = new Metrics(this, 3494);
|
||||
metrics.addCustomChart(new SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
|
||||
metrics.addCustomChart(new SingleLineChart("brews_in_existence", () -> brewsCreated));
|
||||
metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.barrels::size));
|
||||
metrics.addCustomChart(new SingleLineChart("cauldrons_boiling", BCauldron.bcauldrons::size));
|
||||
metrics.addCustomChart(new AdvancedPie("brew_quality", () -> {
|
||||
Map<String, Integer> map = new HashMap<>(8);
|
||||
map.put("excellent", exc);
|
||||
map.put("good", good);
|
||||
@ -300,14 +325,14 @@ public class P extends JavaPlugin {
|
||||
map.put("terrible", terr);
|
||||
return map;
|
||||
}));
|
||||
metrics.addCustomChart(new Metrics.AdvancedPie("brews_created", () -> {
|
||||
metrics.addCustomChart(new AdvancedPie("brews_created", () -> {
|
||||
Map<String, Integer> map = new HashMap<>(4);
|
||||
map.put("by command", brewsCreatedCmd);
|
||||
map.put("brewing", brewsCreated - brewsCreatedCmd);
|
||||
return map;
|
||||
}));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("number_of_recipes", () -> {
|
||||
metrics.addCustomChart(new SimplePie("number_of_recipes", () -> {
|
||||
int recipes = BRecipe.getAllRecipes().size();
|
||||
if (recipes < 7) {
|
||||
return "Less than 7";
|
||||
@ -339,8 +364,8 @@ public class P extends JavaPlugin {
|
||||
|
||||
}));
|
||||
|
||||
metrics.addCustomChart(new Metrics.SimplePie("wakeups", () -> {
|
||||
if (!BConfig.enableHome) {
|
||||
metrics.addCustomChart(new SimplePie("wakeups", () -> {
|
||||
if (!BConfig.enableWake) {
|
||||
return "disabled";
|
||||
}
|
||||
int wakeups = Wakeup.wakeups.size();
|
||||
@ -356,7 +381,7 @@ public class P extends JavaPlugin {
|
||||
return "More than 20";
|
||||
}
|
||||
}));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("v2_mc_version", () -> {
|
||||
metrics.addCustomChart(new SimplePie("v2_mc_version", () -> {
|
||||
String mcv = Bukkit.getBukkitVersion();
|
||||
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
||||
int index = mcv.indexOf('-');
|
||||
@ -370,7 +395,7 @@ public class P extends JavaPlugin {
|
||||
return "undef";
|
||||
}
|
||||
}));
|
||||
metrics.addCustomChart(new Metrics.DrilldownPie("plugin_mc_version", () -> {
|
||||
metrics.addCustomChart(new DrilldownPie("plugin_mc_version", () -> {
|
||||
Map<String, Map<String, Integer>> map = new HashMap<>(3);
|
||||
String mcv = Bukkit.getBukkitVersion();
|
||||
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
||||
@ -389,9 +414,9 @@ public class P extends JavaPlugin {
|
||||
map.put(getDescription().getVersion(), innerMap);
|
||||
return map;
|
||||
}));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("language", () -> language));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("config_lore_color", () -> {
|
||||
metrics.addCustomChart(new SimplePie("language", () -> language));
|
||||
metrics.addCustomChart(new SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
|
||||
metrics.addCustomChart(new SimplePie("config_lore_color", () -> {
|
||||
if (BConfig.colorInBarrels) {
|
||||
if (BConfig.colorInBrewer) {
|
||||
return "both";
|
||||
@ -406,7 +431,7 @@ public class P extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
}));
|
||||
metrics.addCustomChart(new Metrics.SimplePie("config_always_show", () -> {
|
||||
metrics.addCustomChart(new SimplePie("config_always_show", () -> {
|
||||
if (BConfig.alwaysShowQuality) {
|
||||
if (BConfig.alwaysShowAlc) {
|
||||
return "both";
|
||||
@ -421,7 +446,7 @@ public class P extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
}));
|
||||
} catch (Throwable e) {
|
||||
} catch (Exception | LinkageError e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -10,6 +10,7 @@ import org.bukkit.entity.Player;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class Wakeup {
|
||||
|
||||
@ -31,15 +32,10 @@ public class Wakeup {
|
||||
return null;
|
||||
}
|
||||
|
||||
ArrayList<Wakeup> worldWakes = new ArrayList<>();
|
||||
|
||||
for (Wakeup wakeup : wakeups) {
|
||||
if (wakeup.active) {
|
||||
if (wakeup.loc.getWorld().equals(playerLoc.getWorld())) {
|
||||
worldWakes.add(wakeup);
|
||||
}
|
||||
}
|
||||
}
|
||||
List<Wakeup> worldWakes = wakeups.stream()
|
||||
.filter(w -> w.active)
|
||||
.filter(w -> w.loc.getWorld().equals(playerLoc.getWorld()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (worldWakes.isEmpty()) {
|
||||
return null;
|
||||
@ -74,14 +70,14 @@ public class Wakeup {
|
||||
}
|
||||
|
||||
|
||||
if (w1.loc.distance(playerLoc) > w2.loc.distance(playerLoc)) {
|
||||
if (w1.loc.distanceSquared(playerLoc) > w2.loc.distanceSquared(playerLoc)) {
|
||||
return w2.loc;
|
||||
}
|
||||
}
|
||||
return w1.loc;
|
||||
}
|
||||
|
||||
public static Wakeup calcRandom(ArrayList<Wakeup> worldWakes) {
|
||||
public static Wakeup calcRandom(List<Wakeup> worldWakes) {
|
||||
if (worldWakes.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
@ -2,10 +2,12 @@ package com.dre.brewery.api.events.brew;
|
||||
|
||||
import com.dre.brewery.BPlayer;
|
||||
import com.dre.brewery.Brew;
|
||||
import com.dre.brewery.utility.PermissionUtil;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.Cancellable;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
@ -25,10 +27,30 @@ public class BrewDrinkEvent extends BrewEvent implements Cancellable {
|
||||
super(brew, meta);
|
||||
this.player = player;
|
||||
this.bPlayer = bPlayer;
|
||||
alc = brew.getOrCalcAlc();
|
||||
alc = calcAlcWSensitivity(brew.getOrCalcAlc());
|
||||
quality = brew.getQuality();
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the Alcohol to add to the player using his sensitivity permission (if existing)
|
||||
*
|
||||
* <p>If the player has been given the brewery.sensitive.xx permission, will factor in the sensitivity to the given alcohol amount.
|
||||
* <p>Will return the calculated value without changing the event
|
||||
*
|
||||
* @param alc The base amount of alcohol
|
||||
* @return The amount of alcohol given the players alcohol-sensitivity
|
||||
*/
|
||||
@Contract(pure = true)
|
||||
public int calcAlcWSensitivity(int alc) {
|
||||
int sensitive = PermissionUtil.getDrinkSensitive(player);
|
||||
if (sensitive == 0) {
|
||||
alc = 0;
|
||||
} else if (sensitive > 0) {
|
||||
alc *= ((float) sensitive) / 100f;
|
||||
}
|
||||
return alc;
|
||||
}
|
||||
|
||||
public Player getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
@ -82,6 +82,7 @@ public class BConfig {
|
||||
public static boolean enableLoginDisallow;
|
||||
public static boolean enablePuke;
|
||||
public static String homeType;
|
||||
public static boolean enableWake;
|
||||
|
||||
//Brew
|
||||
public static boolean colorInBarrels; // color the Lore while in Barrels
|
||||
@ -89,6 +90,7 @@ public class BConfig {
|
||||
public static boolean enableEncode;
|
||||
public static boolean alwaysShowQuality; // Always show quality stars
|
||||
public static boolean alwaysShowAlc; // Always show alc%
|
||||
public static boolean brewHopperDump; // Allow Dumping of Brew liquid into Hoppers
|
||||
|
||||
//Features
|
||||
public static boolean craftSealingTable; // Allow Crafting of Sealing Table
|
||||
@ -228,6 +230,7 @@ public class BConfig {
|
||||
stumbleModifier = ((float) config.getInt("stumblePercent", 100)) / 100f;
|
||||
showStatusOnDrink = config.getBoolean("showStatusOnDrink", false);
|
||||
homeType = config.getString("homeType", null);
|
||||
enableWake = config.getBoolean("enableWake", false);
|
||||
craftSealingTable = config.getBoolean("craftSealingTable", false);
|
||||
enableSealingTable = config.getBoolean("enableSealingTable", false);
|
||||
colorInBarrels = config.getBoolean("colorInBarrels", false);
|
||||
@ -240,6 +243,7 @@ public class BConfig {
|
||||
minimalParticles = config.getBoolean("minimalParticles", false);
|
||||
useOffhandForCauldron = config.getBoolean("useOffhandForCauldron", false);
|
||||
loadDataAsync = config.getBoolean("loadDataAsync", true);
|
||||
brewHopperDump = config.getBoolean("brewHopperDump", false);
|
||||
|
||||
if (P.use1_14) {
|
||||
MCBarrel.maxBrews = config.getInt("maxBrewsInMCBarrels", 6);
|
||||
|
@ -15,7 +15,7 @@ import com.dre.brewery.integration.item.MMOItemsPluginItem;
|
||||
import com.dre.brewery.recipe.BCauldronRecipe;
|
||||
import com.dre.brewery.recipe.RecipeItem;
|
||||
import com.dre.brewery.utility.LegacyUtil;
|
||||
import net.mmogroup.mmolib.api.item.NBTItem;
|
||||
import io.lumine.mythic.lib.api.item.NBTItem;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
@ -318,12 +318,13 @@ public class IntegrationListener implements Listener {
|
||||
// Catch the Interact Event early, so MMOItems does not act before us and cancel the event while we try to add it to the Cauldron
|
||||
if (!P.use1_9) return;
|
||||
if (BConfig.hasMMOItems == null) {
|
||||
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems");
|
||||
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems")
|
||||
&& P.p.getServer().getPluginManager().isPluginEnabled("MythicLib");
|
||||
}
|
||||
if (!BConfig.hasMMOItems) return;
|
||||
try {
|
||||
if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasItem() && event.getHand() == EquipmentSlot.HAND) {
|
||||
if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CAULDRON) {
|
||||
if (event.getClickedBlock() != null && LegacyUtil.isWaterCauldron(event.getClickedBlock().getType())) {
|
||||
NBTItem item = NBTItem.get(event.getItem());
|
||||
if (item.hasType()) {
|
||||
for (RecipeItem rItem : BCauldronRecipe.acceptedCustom) {
|
||||
|
@ -3,7 +3,7 @@ package com.dre.brewery.integration.item;
|
||||
import com.dre.brewery.P;
|
||||
import com.dre.brewery.filedata.BConfig;
|
||||
import com.dre.brewery.recipe.PluginItem;
|
||||
import net.mmogroup.mmolib.api.item.NBTItem;
|
||||
import io.lumine.mythic.lib.api.item.NBTItem;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public class MMOItemsPluginItem extends PluginItem {
|
||||
@ -15,7 +15,8 @@ public class MMOItemsPluginItem extends PluginItem {
|
||||
@Override
|
||||
public boolean matches(ItemStack item) {
|
||||
if (BConfig.hasMMOItems == null) {
|
||||
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems");
|
||||
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems")
|
||||
&& P.p.getServer().getPluginManager().isPluginEnabled("MythicLib");
|
||||
}
|
||||
if (!BConfig.hasMMOItems) return false;
|
||||
|
||||
|
@ -23,9 +23,9 @@ public class SlimefunPluginItem extends PluginItem {
|
||||
try {
|
||||
SlimefunItem sfItem = SlimefunItem.getByItem(item);
|
||||
if (sfItem != null) {
|
||||
return sfItem.getID().equalsIgnoreCase(getItemId());
|
||||
return sfItem.getId().equalsIgnoreCase(getItemId());
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
} catch (Exception | LinkageError e) {
|
||||
e.printStackTrace();
|
||||
P.p.errorLog("Could not check Slimefun for Item ID");
|
||||
BConfig.hasSlimefun = false;
|
||||
|
@ -1,6 +1,11 @@
|
||||
package com.dre.brewery.listeners;
|
||||
|
||||
import com.dre.brewery.BCauldron;
|
||||
import com.dre.brewery.P;
|
||||
import com.dre.brewery.utility.LegacyUtil;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.BlockState;
|
||||
import org.bukkit.block.data.Levelled;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
@ -8,8 +13,44 @@ import org.bukkit.event.block.CauldronLevelChangeEvent;
|
||||
|
||||
public class CauldronListener implements Listener {
|
||||
|
||||
/**
|
||||
* Water in Cauldron gets filled up: remove BCauldron to disallow unlimited Brews
|
||||
* Water in Cauldron gets removed: remove BCauldron to remove Brew data and stop particles
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
|
||||
public void onCauldronChange(CauldronLevelChangeEvent event) {
|
||||
if (LegacyUtil.WATER_CAULDRON == null) {
|
||||
// < 1.17
|
||||
oldCauldronChange(event);
|
||||
return;
|
||||
}
|
||||
|
||||
Material currentType = event.getBlock().getType();
|
||||
BlockState newState = event.getNewState();
|
||||
Material newType = newState.getType();
|
||||
|
||||
if (currentType == Material.WATER_CAULDRON) {
|
||||
if (newType != Material.WATER_CAULDRON) {
|
||||
// Change from water to anything else
|
||||
if (event.getReason() != CauldronLevelChangeEvent.ChangeReason.BOTTLE_FILL) {
|
||||
BCauldron.remove(event.getBlock());
|
||||
}
|
||||
} else { // newType == Material.WATER_CAULDRON
|
||||
// Water level change
|
||||
Levelled oldCauldron = ((Levelled) event.getBlock().getBlockData());
|
||||
Levelled newCauldron = ((Levelled) newState.getBlockData());
|
||||
|
||||
// Water Level increased somehow, might be Bucket, Bottle, Rain, etc.
|
||||
if (newCauldron.getLevel() > oldCauldron.getLevel()) {
|
||||
BCauldron.remove(event.getBlock());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private void oldCauldronChange(CauldronLevelChangeEvent event) {
|
||||
if (event.getNewLevel() == 0 && event.getOldLevel() != 0) {
|
||||
if (event.getReason() == CauldronLevelChangeEvent.ChangeReason.BOTTLE_FILL) {
|
||||
return;
|
||||
|
@ -512,7 +512,8 @@ public class CommandListener implements CommandExecutor {
|
||||
int ingQ = ingredients.getIngredientQuality(recipe);
|
||||
int cookQ = ingredients.getCookingQuality(recipe, false);
|
||||
int cookDistQ = ingredients.getCookingQuality(recipe, true);
|
||||
P.p.log(recipe.getRecipeName() + ": ingQlty: " + ingQ + ", cookQlty:" + cookQ + ", cook+DistQlty: " + cookDistQ);
|
||||
int ageQ = ingredients.getAgeQuality(recipe, brew.getAgeTime());
|
||||
P.p.log(recipe.getRecipeName() + ": ingQlty: " + ingQ + ", cookQlty:" + cookQ + ", cook+DistQlty: " + cookDistQ + ", ageQlty: " + ageQ);
|
||||
}
|
||||
BRecipe distill = ingredients.getBestRecipe(brew.getWood(), brew.getAgeTime(), true);
|
||||
BRecipe nonDistill = ingredients.getBestRecipe(brew.getWood(), brew.getAgeTime(), false);
|
||||
@ -535,7 +536,8 @@ public class CommandListener implements CommandExecutor {
|
||||
int ingQ = ingredients.getIngredientQuality(recipe);
|
||||
int cookQ = ingredients.getCookingQuality(recipe, false);
|
||||
int cookDistQ = ingredients.getCookingQuality(recipe, true);
|
||||
P.p.log("ingQlty: " + ingQ + ", cookQlty:" + cookQ + ", cook+DistQlty: " + cookDistQ);
|
||||
int ageQ = ingredients.getAgeQuality(recipe, brew.getAgeTime());
|
||||
P.p.log("ingQlty: " + ingQ + ", cookQlty:" + cookQ + ", cook+DistQlty: " + cookDistQ + ", ageQlty: " + ageQ);
|
||||
}
|
||||
|
||||
P.p.msg(player, "Debug Info for item written into Log");
|
||||
|
@ -3,12 +3,15 @@ package com.dre.brewery.listeners;
|
||||
import com.dre.brewery.*;
|
||||
import com.dre.brewery.filedata.BConfig;
|
||||
import com.dre.brewery.filedata.UpdateChecker;
|
||||
import com.dre.brewery.utility.BUtil;
|
||||
import com.dre.brewery.utility.LegacyUtil;
|
||||
import com.dre.brewery.utility.PermissionUtil;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
@ -29,20 +32,31 @@ public class PlayerListener implements Listener {
|
||||
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
|
||||
|
||||
Player player = event.getPlayer();
|
||||
if (player.isSneaking()) return;
|
||||
|
||||
Material type = clickedBlock.getType();
|
||||
|
||||
// Interacting with a Cauldron
|
||||
if (type == Material.CAULDRON) {
|
||||
// Handle the Cauldron Interact
|
||||
// The Event might get cancelled in here
|
||||
BCauldron.clickCauldron(event);
|
||||
// -- Clicking an Hopper --
|
||||
if (type == Material.HOPPER) {
|
||||
if (BConfig.brewHopperDump && event.getPlayer().isSneaking()) {
|
||||
if (!P.use1_9 || event.getHand() == EquipmentSlot.HAND) {
|
||||
ItemStack item = event.getItem();
|
||||
if (Brew.isBrew(item)) {
|
||||
event.setCancelled(true);
|
||||
BUtil.setItemInHand(event, Material.GLASS_BOTTLE, false);
|
||||
if (P.use1_11) {
|
||||
clickedBlock.getWorld().playSound(clickedBlock.getLocation(), Sound.ITEM_BOTTLE_EMPTY, 1f, 1f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// -- Opening a Sealing Table --
|
||||
if (P.use1_14 && BSealer.isBSealer(clickedBlock)) {
|
||||
if (player.isSneaking()) {
|
||||
event.setUseInteractedBlock(Event.Result.DENY);
|
||||
return;
|
||||
}
|
||||
event.setCancelled(true);
|
||||
if (BConfig.enableSealingTable) {
|
||||
BSealer sealer = new BSealer(player);
|
||||
@ -52,6 +66,18 @@ public class PlayerListener implements Listener {
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.isSneaking()) return;
|
||||
|
||||
// -- Interacting with a Cauldron --
|
||||
if (LegacyUtil.isWaterCauldron(type)) {
|
||||
// Handle the Cauldron Interact
|
||||
// The Event might get cancelled in here
|
||||
BCauldron.clickCauldron(event);
|
||||
return;
|
||||
}
|
||||
|
||||
// -- Opening a Minecraft Barrel --
|
||||
if (P.use1_14 && type == Material.BARREL) {
|
||||
if (!player.hasPermission("brewery.openbarrel.mc")) {
|
||||
event.setCancelled(true);
|
||||
@ -65,7 +91,7 @@ public class PlayerListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// Access a Barrel
|
||||
// -- Access a Barrel --
|
||||
Barrel barrel = null;
|
||||
if (LegacyUtil.isWoodPlanks(type)) {
|
||||
if (BConfig.openEverywhere) {
|
||||
|
@ -275,7 +275,7 @@ public class BrewLore {
|
||||
}
|
||||
|
||||
public void updateAlc(boolean inDistiller) {
|
||||
if (!brew.isUnlabeled() && (inDistiller || BConfig.alwaysShowAlc) && (!brew.hasRecipe() || brew.getCurrentRecipe().getAlcohol() > 0)) {
|
||||
if (!brew.isUnlabeled() && (inDistiller || BConfig.alwaysShowAlc) && (!brew.hasRecipe() || brew.getCurrentRecipe().getAlcohol() != 0)) {
|
||||
int alc = brew.getOrCalcAlc();
|
||||
addOrReplaceLore(Type.ALC, "§8", P.p.languageReader.get("Brew_Alc", alc + ""));
|
||||
} else {
|
||||
|
@ -326,7 +326,7 @@ public class BRecipe {
|
||||
P.p.errorLog("Invalid distilltime '" + distillTime + "' in Recipe: " + getRecipeName());
|
||||
return false;
|
||||
}
|
||||
if (wood < 0 || wood > 6) {
|
||||
if (wood < 0 || wood > 8) {
|
||||
P.p.errorLog("Invalid wood type '" + wood + "' in Recipe: " + getRecipeName());
|
||||
return false;
|
||||
}
|
||||
@ -338,10 +338,6 @@ public class BRecipe {
|
||||
P.p.errorLog("Invalid difficulty '" + difficulty + "' in Recipe: " + getRecipeName());
|
||||
return false;
|
||||
}
|
||||
if (alcohol < 0) {
|
||||
P.p.errorLog("Invalid alcohol '" + alcohol + "' in Recipe: " + getRecipeName());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -13,6 +13,9 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.inventory.EquipmentSlot;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@ -78,6 +81,26 @@ public class BUtil {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the Item in the Players hand, depending on which hand he used and if the hand should be swapped
|
||||
*
|
||||
* @param event Interact Event to tell which hand the player used
|
||||
* @param mat The Material of the new item
|
||||
* @param swapped If true, will set the opposite Hand instead of the one he used
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public static void setItemInHand(PlayerInteractEvent event, Material mat, boolean swapped) {
|
||||
if (P.use1_9) {
|
||||
if ((event.getHand() == EquipmentSlot.OFF_HAND) != swapped) {
|
||||
event.getPlayer().getInventory().setItemInOffHand(new ItemStack(mat));
|
||||
} else {
|
||||
event.getPlayer().getInventory().setItemInMainHand(new ItemStack(mat));
|
||||
}
|
||||
} else {
|
||||
event.getPlayer().setItemInHand(new ItemStack(mat));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns either uuid or Name of player, depending on bukkit version
|
||||
*/
|
||||
@ -234,8 +257,11 @@ public class BUtil {
|
||||
* @return True if the Block can be destroyed
|
||||
*/
|
||||
public static boolean blockDestroy(Block block, Player player, BarrelDestroyEvent.Reason reason) {
|
||||
if (block == null || block.getType() == null) {
|
||||
return true;
|
||||
}
|
||||
Material type = block.getType();
|
||||
if (type == Material.CAULDRON) {
|
||||
if (type == Material.CAULDRON || type == LegacyUtil.WATER_CAULDRON) {
|
||||
// will only remove when existing
|
||||
BCauldron.remove(block);
|
||||
return true;
|
||||
|
@ -78,6 +78,7 @@ public class LegacyUtil {
|
||||
FENCES = fences;
|
||||
}
|
||||
|
||||
public static final Material WATER_CAULDRON = get("WATER_CAULDRON");
|
||||
public static final Material MAGMA_BLOCK = get("MAGMA_BLOCK", "MAGMA");
|
||||
public static final Material CAMPFIRE = get("CAMPFIRE");
|
||||
public static final Material SOUL_CAMPFIRE = get("SOUL_CAMPFIRE");
|
||||
@ -220,13 +221,20 @@ public class LegacyUtil {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test if this Material Type is a Cauldron filled with water, or any cauldron in 1.16 and lower
|
||||
*/
|
||||
public static boolean isWaterCauldron(Material type) {
|
||||
return WATER_CAULDRON != null ? type == WATER_CAULDRON : type == Material.CAULDRON;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get The Fill Level of a Cauldron Block, 0 = empty, 1 = something in, 2 = full
|
||||
*
|
||||
* @return 0 = empty, 1 = something in, 2 = full
|
||||
*/
|
||||
public static byte getFillLevel(Block block) {
|
||||
if (block.getType() != Material.CAULDRON) {
|
||||
if (!isWaterCauldron(block.getType())) {
|
||||
return EMPTY;
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,13 @@
|
||||
package com.dre.brewery.utility;
|
||||
|
||||
import org.apache.commons.lang.math.NumberUtils;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.permissions.Permissible;
|
||||
import org.bukkit.permissions.PermissionAttachmentInfo;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
public class PermissionUtil {
|
||||
|
||||
@ -76,6 +80,59 @@ public class PermissionUtil {
|
||||
return sender.hasPermission(bPerm.permission);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Sensitivity of the Player towards Alcohol in percent.
|
||||
* <p>Sensitivity describes how much of the alcohol gets transferred to the players drunkeness
|
||||
*
|
||||
* <p>100 means normal alcohol sensitivity
|
||||
* <p>less than 100 means less alcohol gets added.
|
||||
* <p>more than 100 means more alcohol gets added.
|
||||
* <p>0 means no alcohol gets added.
|
||||
*
|
||||
* @param player The player of whom to get the sensitivity of
|
||||
* @return The Players alcohol sensitivity
|
||||
*/
|
||||
public static int getDrinkSensitive(Permissible player) {
|
||||
return getRangedPermission(player, "brewery.sensitive.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Alcohol recovery rate of the player in drunkeness per minute.
|
||||
* <p>The default is 2 drunkeness per minute
|
||||
*
|
||||
*
|
||||
* @param player The player of whom to get the recovery rate of
|
||||
* @return The Players alcohol recovery rate
|
||||
*/
|
||||
public static int getAlcRecovery(Permissible player) {
|
||||
return getRangedPermission(player, "brewery.recovery.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the number behind the given permission
|
||||
* <p>i.e. for brewery.sensitive.100 it returns 100
|
||||
*
|
||||
* @param player The player to get the ranged permission of
|
||||
* @param subPermission The permission string before the number
|
||||
* @return The permission number as int
|
||||
*/
|
||||
public static int getRangedPermission(Permissible player, String subPermission) {
|
||||
Optional<PermissionAttachmentInfo> found = player.getEffectivePermissions().stream().
|
||||
filter(PermissionAttachmentInfo::getValue). // Only active permissions
|
||||
filter(x -> x.getPermission().startsWith(subPermission)).
|
||||
findFirst();
|
||||
|
||||
if (found.isPresent()) {
|
||||
String permission = found.get().getPermission();
|
||||
int lastDot = permission.lastIndexOf('.');
|
||||
int value = NumberUtils.toInt(permission.substring(lastDot + 1), -1);
|
||||
if (value >= 0) {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Brewery Permissions of _only_ the Commands
|
||||
|
Loading…
Reference in New Issue
Block a user