Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into patch-2

Browse Source
This commit is contained in:
Madis 2019-01-25 20:31:40 +02:00
commit 82df707c76
34 changed files with 1208 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
LICENSE-Apache.txt Normal file
View File

@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

674
LICENSE-GNU-GPL.txt Normal file
View File

@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

18
README.md Normal file
View File

@ -0,0 +1,18 @@
[![GitHub license](https://img.shields.io/badge/license-Apache-brightgreen.svg)](https://github.com/Zrips/Jobs/blob/master/LICENSE-Apache.txt) [![GitHub license](https://img.shields.io/badge/license-GNU--GPL-brightgreen.svg)](https://github.com/Zrips/Jobs/blob/master/LICENSE-GNU-GPL.txt)
[![GitHub Pre-Release](https://img.shields.io/github/release-pre/Zrips/Jobs.svg)](https://github.com/Zrips/Jobs/releases) [![Github All Releases](https://img.shields.io/github/downloads/Zrips/Jobs/total.svg)](https://github.com/Zrips/Jobs/releases)
[![GitHub issues](https://img.shields.io/github/issues/Zrips/Jobs.svg)](https://github.com/Zrips/Jobs/issues) [![GitHub pulls](https://img.shields.io/github/issues-pr/Zrips/Jobs.svg)](https://github.com/Zrips/Jobs/pulls)
Jobs Plugin for the BukkitAPI
***
# Jobs
![Image of Jobs](https://proxy.spigotmc.org/da30c0fefd44c6de51f2a8af16b15071184a4b3b?url=http%3A%2F%2Fltcraft.lt%2Fwp-content%2Fuploads%2F2016%2F06%2Fnewlogo5.jpg)
_Original author and manager of this was phrstbrn until [v2.12.0](https://dev.bukkit.org/projects/jobs/files/808311) version._
A fully configurable plugin that allows you to get paid for breaking, placing, killing, fishing, and crafting, and more. Class based professions, gain experience as you perform your job.
Main pages:
- Bukkit: https://dev.bukkit.org/projects/jobs-reborn
- Spigot: https://www.spigotmc.org/resources/4216/

BIN
libs/MythicMobs-4.5.0.jar → libs/MythicMobs-4.5.1.jar
View File

Binary file not shown.

2
pom.xml
View File

@ -66,7 +66,7 @@
<artifactId>MythicMobs</artifactId>
<version>4.5.1</version>
<scope>system</scope>
<systemPath>${basedir}/libs/MythicMobs-4.5.0.jar</systemPath>
<systemPath>${basedir}/libs/MythicMobs-4.5.1.jar</systemPath>
</dependency>
<!-- WorldGuard -->
<dependency>

30
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -52,7 +52,7 @@ public class ItemManager {
String mojangName = one.name();
try {
mojangName = ItemReflection.getItemMinecraftName(new ItemStack(mat));
} catch (Exception e) {
} catch (Throwable e) {
}
CMIItemStack cm = new CMIItemStack(one);
@ -93,7 +93,7 @@ public class ItemManager {
String mojangName = one.name();
try {
mojangName = ItemReflection.getItemMinecraftName(new ItemStack(one));
} catch (Exception e) {
} catch (Throwable e) {
}
cm.setMojangName(mojangName);
String n = mojangName.toLowerCase().replace("_", "").replace(" ", "").replace("minecraft:", "");
@ -139,7 +139,7 @@ public class ItemManager {
String a = name.split("-")[1];
try {
amount = Integer.parseInt(a);
} catch (Exception e) {
} catch (Throwable e) {
}
name = name.split("-")[0];
}
@ -149,13 +149,13 @@ public class ItemManager {
if (name.contains(":")) {
try {
data = (short) Integer.parseInt(name.split(":")[1]);
} catch (Exception e) {
} catch (Throwable e) {
}
try {
CMIEntityType e = CMIEntityType.getByName(name.split(":")[1]);
if (e != null)
data = e.getType().getTypeId();
} catch (Exception e) {
} catch (Throwable e) {
}
name = name.split(":")[0];
}
@ -184,7 +184,7 @@ public class ItemManager {
try {
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(UUID.fromString(d));
skullMeta.setOwner(offPlayer.getName());
} catch (Exception e) {
} catch (Throwable e) {
break main;
}
skull.setItemMeta(skullMeta);
@ -205,7 +205,7 @@ public class ItemManager {
if (cm == null) {
try {
cm = byId.get(Integer.parseInt(name));
} catch (Exception e) {
} catch (Throwable e) {
}
if (cm == null) {
@ -516,7 +516,7 @@ public class ItemManager {
Integer id = null;
try {
id = Integer.parseInt(main);
} catch (Exception e) {
} catch (Throwable e) {
}
for (CMIEntityType one : CMIEntityType.values()) {
@ -1263,9 +1263,9 @@ public class ItemManager {
POTION_SWIFTNESS_3(373, 8258, 24020, "Swiftness Potion 3"),
POTION_SWIFTNESS_4(373, 8290, 24020, "Swiftness Potion 4"),
POTION_THICK(373, 32, 24020, "Thick Potion"),
POTION_TURTLE_MASTER_1(-1, -1, 24020, "Turtle Master Potion"),
POTION_TURTLE_MASTER_2(-1, -1, 24020, "Turtle Master Potion 2"),
POTION_TURTLE_MASTER_3(-1, -1, 24020, "Turtle Master Potion 3"),
POTION_TURTLE_MASTER_1(-1, -1, -1, "Turtle Master Potion"),
POTION_TURTLE_MASTER_2(-1, -1, -1, "Turtle Master Potion 2"),
POTION_TURTLE_MASTER_3(-1, -1, -1, "Turtle Master Potion 3"),
POTION_WATER_BREATHING_1(373, 8205, 24020, "Water Breathing Potion"),
POTION_WATER_BREATHING_2(373, 8269, 24020, "Water Breathing Potion 2"),
POTION_WEAKNESS_1(373, 8200, 24020, "Weakness Potion"),
@ -1545,7 +1545,7 @@ public class ItemManager {
LEGACY_BURNING_FURNACE(62, 0, -1, "Burning Furnace"),
LEGACY_NETHER_WARTS(115, 0, -1, "Nether Warts"),
LEGACY_IRON_DOOR_BLOCK(71, 0, -1, "Iron Door Block"),
LEGACY_GLOWING_REDSTON_ORE(74, 0, -1, "Glowing Redstone Ore"),
LEGACY_GLOWING_REDSTONE_ORE(74, 0, -1, "Glowing Redstone Ore"),
LEGACY_SUGAR_CANE_BLOCK(83, 0, -1, "Sugar Cane Block"),
LEGACY_RAW_FISH(349, 0, -1, "Raw Fish"),
LEGACY_SKULL(144, 0, -1, "Skull"),
@ -1742,19 +1742,19 @@ public class ItemManager {
id = id.replace("_", "").replace(" ", "").toLowerCase();
try {
ids = Integer.parseInt(id);
} catch (Exception e) {
} catch (Throwable e) {
if (id.contains(":")) {
try {
ids = Integer.parseInt(id.split(":")[0]);
data = Integer.parseInt(id.split(":")[1]);
return get(ids, data);
} catch (Exception ex) {
} catch (Throwable ex) {
}
try {
data = Integer.parseInt(id.split(":")[1]);
id = id.split(":")[0];
} catch (Exception ex) {
} catch (Throwable ex) {
}
}
}

10
src/main/java/com/gamingmesh/jobs/CMILib/ItemReflection.java
View File

@ -77,7 +77,7 @@ public class ItemReflection {
Object res2 = secmeth.invoke(nmsStack);
Object res = meth.invoke(reg, res2);
return res.toString();
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -124,7 +124,7 @@ public class ItemReflection {
Method meth2 = res.getClass().getMethod(ff, IStack);
Object name = meth2.invoke(res, nmsStack);
return name.toString();
} catch (Exception e) {
} catch (Throwable e) {
return item != null ? item.getType().name() : "";
}
}
@ -138,7 +138,7 @@ public class ItemReflection {
Method nameThingy = Item.getMethod("j", IStack);
Object resThingy = nameThingy.invoke(res, nmsStack);
return resThingy.toString();
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -147,7 +147,7 @@ public class ItemReflection {
try {
Method meth = CraftItemStack.getMethod("asNMSCopy", ItemStack.class);
return meth.invoke(CraftItemStack, item);
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -156,7 +156,7 @@ public class ItemReflection {
try {
Method meth = CraftItemStack.getMethod("asBukkitCopy", IStack);
return meth.invoke(CraftItemStack, item);
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}

8
src/main/java/com/gamingmesh/jobs/CMILib/VersionChecker.java
View File

@ -42,13 +42,13 @@ public class VersionChecker {
try {
version = Integer.parseInt(lVersion);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
} else {
try {
version = Integer.parseInt(v);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -87,7 +87,7 @@ public class VersionChecker {
Version() {
try {
this.value = Integer.valueOf(this.name().replaceAll("[^\\d.]", ""));
} catch (Exception e) {
} catch (Throwable e) {
}
shortVersion = this.name().substring(0, this.name().length() - 3);
}
@ -181,7 +181,7 @@ public class VersionChecker {
String version = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
if (version.length() <= 7)
return version;
} catch (Exception ex) {
} catch (Throwable ex) {
Jobs.consoleMsg("&cFailed to check for " + plugin.getDescription().getName() + " update on spigot web page.");
}
return null;

12
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -579,7 +579,7 @@ public class Jobs extends JavaPlugin {
if (jPlayer == null)
continue;
pManager.addPlayerToCache(jPlayer);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -789,7 +789,7 @@ public class Jobs extends JavaPlugin {
consoleMsg("&ePlaceholderAPI was found - Enabling capabilities.");
PlaceholderAPIEnabled = true;
}
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
@ -863,7 +863,7 @@ public class Jobs extends JavaPlugin {
cManager.fillCommands();
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
System.out.println("There was some issues when starting plugin. Please contact dev about this. Plugin will be disabled.");
setEnabled(false);
@ -878,7 +878,7 @@ public class Jobs extends JavaPlugin {
dao.saveExplore();
dao.saveBlockProtection();
FurnaceBrewingHandling.save();
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
shutdown();
@ -955,7 +955,7 @@ public class Jobs extends JavaPlugin {
if (income == 0D && pointAmount == 0D)
return;
Boost boost = pManager.getFinalBonus(jPlayer, Jobs.getNoneJob());
Boost boost = pManager.getFinalBonus(jPlayer, noneJob);
// Calculate income
@ -1121,7 +1121,7 @@ public class Jobs extends JavaPlugin {
BBManager.ShowJobProgression(jPlayer, prog);
else
jPlayer.getUpdateBossBarFor().add(prog.getJob().getName());
} catch (Exception e) {
} catch (Throwable e) {
consoleMsg("&c[Jobs] Some issues with boss bar feature accured, try disabling it to avoid it.");
}

2
src/main/java/com/gamingmesh/jobs/PermissionManager.java
View File

@ -140,7 +140,7 @@ public class PermissionManager {
double t = Double.parseDouble(uno.getKey().replace(perm, ""));
if (amount == null || t > amount)
amount = t;
} catch (Exception e) {
} catch (Throwable e) {
}
}
}

14
src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java
View File

@ -87,7 +87,7 @@ public class Placeholder {
try {
int id = Integer.parseInt(matcher.group(1).substring(1));
groups.add(id);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -220,7 +220,7 @@ public class Placeholder {
for (Integer oneG : groups) {
lsInLs.add(matcher.group(oneG + 1));
}
} catch (Exception e) {
} catch (Throwable e) {
}
break;
}
@ -268,7 +268,7 @@ public class Placeholder {
if (placeholder.contains("%"))
if (!placeholder.equals(me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, placeholder)))
return JobsPlaceholderType.PAPI;
} catch (Exception e) {
} catch (Throwable e) {
}
}
@ -291,7 +291,7 @@ public class Placeholder {
try {
if (message.contains("%"))
message = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, message);
} catch (Exception e) {
} catch (Throwable e) {
}
}
@ -326,7 +326,7 @@ public class Placeholder {
with = "\\" + with;
message = message.replaceFirst(group, with);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -349,7 +349,7 @@ public class Placeholder {
int id = Integer.parseInt(value);
if (id > 0)
j = user.getJobProgression().get(id - 1);
} catch (Exception e) {
} catch (Throwable e) {
Job job = Jobs.getJob(value);
if (job != null)
j = user.getJobProgression(job);
@ -363,7 +363,7 @@ public class Placeholder {
int id = Integer.parseInt(value);
if (id > 0)
j = Jobs.getJobs().get(id - 1);
} catch (Exception e) {
} catch (Throwable e) {
j = Jobs.getJob(value);
}
return j;

15
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -545,7 +545,7 @@ public class PlayerManager {
} else
Jobs.consoleMsg("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
}
} catch (Exception e) {
} catch (Throwable e) {
}
String message;
@ -590,7 +590,7 @@ public class PlayerManager {
} else
Jobs.consoleMsg("[Jobs] Can't find sound by name: " + levelUpEvent.getTitleChangeSound().name() + ". Please update it");
}
} catch (Exception e) {
} catch (Throwable e) {
}
// user would skill up
if (Jobs.getGCManager().isBroadcastingSkillups())
@ -707,9 +707,8 @@ public class PlayerManager {
for (JobProgression progression : jPlayer.getJobProgression()) {
String jobName = progression.getJob().getName();
Job job = Jobs.getJob(jobName);
if (job != null) {
if (job != null)
progression.setJob(job);
}
}
if (jPlayer.isOnline()) {
jPlayer.reloadHonorific();
@ -727,13 +726,19 @@ public class PlayerManager {
public BoostMultiplier getItemBoostNBT(Player player, Job prog) {
HashMap<Job, ItemBonusCache> cj = cache.get(player.getUniqueId());
HashMap<Job, ItemBonusCache> cj = null;
if (cj == null) {
cj = new HashMap<>();
cache.put(player.getUniqueId(), cj);
}
if (cache.get(player.getUniqueId()) != null)
cj = cache.get(player.getUniqueId());
if (cj == null)
return null;
ItemBonusCache c = cj.get(prog);
if (c == null) {
c = new ItemBonusCache(player, prog);

16
src/main/java/com/gamingmesh/jobs/Reflections.java
View File

@ -108,7 +108,7 @@ public class Reflections {
Method meth2 = res.getClass().getMethod(ff, IStack);
Object name = meth2.invoke(res, nmsStack);
return name.toString();
} catch (Exception e) {
} catch (Throwable e) {
return item != null ? item.getType().name() : "";
}
}
@ -138,7 +138,7 @@ public class Reflections {
Method meth2 = nmsStack.getClass().getMethod("setTag", NBTTagCompound);
meth2.invoke(nmsStack, tag);
return (ItemStack) asBukkitCopy(nmsStack);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
return null;
}
@ -154,7 +154,7 @@ public class Reflections {
Method meth = nbt.getClass().getMethod("getCompound", String.class);
Object res = meth.invoke(nbt, base);
return res != null;
} catch (Exception e) {
} catch (Throwable e) {
return false;
}
}
@ -167,7 +167,7 @@ public class Reflections {
Method methTag = nmsStack.getClass().getMethod("getTag");
Object tag = methTag.invoke(nmsStack);
return tag;
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -189,7 +189,7 @@ public class Reflections {
Method meth = compoundRes.getClass().getMethod("getString", String.class);
Object res = meth.invoke(compoundRes, path);
return res;
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -219,7 +219,7 @@ public class Reflections {
Method meth2 = nmsStack.getClass().getMethod("setTag", NBTTagCompound);
meth2.invoke(nmsStack, tag);
return (ItemStack) asBukkitCopy(nmsStack);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
return null;
}
@ -229,7 +229,7 @@ public class Reflections {
try {
Method meth = CraftItemStack.getMethod("asNMSCopy", ItemStack.class);
return meth.invoke(CraftItemStack, item);
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}
@ -238,7 +238,7 @@ public class Reflections {
try {
Method meth = CraftItemStack.getMethod("asBukkitCopy", IStack);
return meth.invoke(CraftItemStack, item);
} catch (Exception e) {
} catch (Throwable e) {
return null;
}
}

4
src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
View File

@ -208,12 +208,12 @@ public class JobsCommands implements CommandExecutor {
listOfCommands.add(name);
}
}
} catch (Exception e) {
} catch (Throwable e) {
} finally {
if (jarFile != null)
try {
jarFile.close();
} catch (Exception e) {
} catch (Throwable e) {
}
}
return listOfCommands;

4
src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java
View File

@ -483,8 +483,8 @@ public class editjobs implements Cmd {
player.sendMessage(ChatColor.GOLD + "Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration.");
player.sendMessage(ChatColor.GOLD + "In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with.");
player.sendMessage(ChatColor.GOLD + "In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly.");
material = CMIMaterial.LEGACY_GLOWING_REDSTON_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTON_ORE && actionT == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
material = CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE && actionT == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
player.sendMessage(ChatColor.GOLD + "Job " + job.getName() + " is using GLOWING_REDSTONE_ORE instead of REDSTONE_ORE.");
player.sendMessage(ChatColor.GOLD + "Automatically changing block to REDSTONE_ORE. Please update your configuration.");
material = CMIMaterial.REDSTONE_ORE;

49
src/main/java/com/gamingmesh/jobs/commands/list/give.java
View File

@ -9,16 +9,29 @@ import com.gamingmesh.jobs.commands.Cmd;
import com.gamingmesh.jobs.commands.JobCommand;
import com.gamingmesh.jobs.container.Job;
import com.gamingmesh.jobs.container.JobItems;
import com.gamingmesh.jobs.container.JobLimitedItems;
import com.gamingmesh.jobs.stuff.GiveItem;
public class give implements Cmd {
private enum actions {
items, limiteditems;
public static actions getByname(String name) {
for (actions one : actions.values()) {
if (one.name().equalsIgnoreCase(name))
return one;
}
return null;
}
}
@Override
@JobCommand(2500)
public boolean perform(Jobs plugin, final CommandSender sender, final String[] args) {
Player player = null;
Job job = null;
actions name = null;
String itemName = null;
for (String one : args) {
@ -33,6 +46,12 @@ public class give implements Cmd {
if (job != null)
continue;
}
if (name == null) {
name = actions.getByname(one);
if (name != null)
continue;
}
itemName = one;
}
@ -44,19 +63,35 @@ public class give implements Cmd {
return true;
}
if (job == null || itemName == null) {
if (job == null || name == null || itemName == null) {
Jobs.getCommandManager().sendUsage(sender, "give");
return true;
}
JobItems jItem = job.getItemBonus(itemName);
switch (name) {
case items:
JobItems jItem = job.getItemBonus(itemName);
if (jItem == null || jItem.getItemStack(player) == null) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.give.output.noitem"));
return true;
if (jItem == null || jItem.getItemStack(player) == null) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.give.output.noitem"));
return true;
}
GiveItem.GiveItemForPlayer(player, jItem.getItemStack(player, job));
break;
case limiteditems:
JobLimitedItems jLItem = job.getLimitedItems().get(itemName.toLowerCase());
if (jLItem == null || jLItem.getItemStack(player) == null) {
sender.sendMessage(Jobs.getLanguage().getMessage("command.give.output.noitem"));
return true;
}
GiveItem.GiveItemForPlayer(player, jLItem.getItemStack(player));
break;
default:
break;
}
GiveItem.GiveItemForPlayer(player, jItem.getItemStack(player, job));
return true;
}
}

30
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -100,7 +100,7 @@ public class ConfigManager {
conf.load(s);
if (s != null)
s.close();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().severe("==================== Jobs ====================");
Jobs.getPluginLogger().severe("Unable to load jobConfig.yml!");
Jobs.getPluginLogger().severe("Check your config for formatting issues!");
@ -276,8 +276,8 @@ public class ConfigManager {
Jobs.getPluginLogger().warning("Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration.");
Jobs.getPluginLogger().warning("In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with.");
Jobs.getPluginLogger().warning("In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly.");
material = CMIMaterial.LEGACY_GLOWING_REDSTON_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTON_ORE && actionType == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
material = CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE && actionType == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
Jobs.getPluginLogger().warning("Job " + jobName + " is using GLOWING_REDSTONE_ORE instead of REDSTONE_ORE.");
Jobs.getPluginLogger().warning("Automatically changing block to REDSTONE_ORE. Please update your configuration.");
material = CMIMaterial.REDSTONE_ORE;
@ -420,7 +420,7 @@ public class ConfigManager {
try {
conf.load(s);
s.close();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().severe("==================== Jobs ====================");
Jobs.getPluginLogger().severe("Unable to load jobConfig.yml!");
Jobs.getPluginLogger().severe("Check your config for formatting issues!");
@ -522,7 +522,7 @@ public class ConfigManager {
maxExpEquation.setVariable("numjobs", 1);
maxExpEquation.setVariable("joblevel", 1);
maxExpEquation.getValue();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid leveling-progression-equation property. Skipping job!");
continue;
}
@ -537,7 +537,7 @@ public class ConfigManager {
incomeEquation.setVariable("joblevel", 1);
incomeEquation.setVariable("baseincome", 1);
incomeEquation.getValue();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid income-progression-equation property. Skipping job!");
continue;
}
@ -552,7 +552,7 @@ public class ConfigManager {
expEquation.setVariable("joblevel", 1);
expEquation.setVariable("baseexperience", 1);
expEquation.getValue();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid experience-progression-equation property. Skipping job!");
continue;
}
@ -567,7 +567,7 @@ public class ConfigManager {
pointsEquation.setVariable("joblevel", 1);
pointsEquation.setVariable("basepoints", 1);
pointsEquation.getValue();
} catch (Exception e) {
} catch (Throwable e) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid points-progression-equation property. Skipping job!");
continue;
}
@ -634,7 +634,7 @@ public class ConfigManager {
try {
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(UUID.fromString(skullOwner));
skullMeta.setOwner(offPlayer.getName());
} catch (Exception e) {
} catch (Throwable e) {
}
} else
skullMeta.setOwner(skullOwner);
@ -664,7 +664,7 @@ public class ConfigManager {
try {
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(UUID.fromString(skullOwner));
skullMeta.setOwner(offPlayer.getName());
} catch (Exception e) {
} catch (Throwable e) {
}
} else
skullMeta.setOwner(skullOwner);
@ -806,7 +806,7 @@ public class ConfigManager {
}
// Limited Items
ArrayList<JobLimitedItems> jobLimitedItems = new ArrayList<>();
HashMap<String, JobLimitedItems> jobLimitedItems = new HashMap<>();
ConfigurationSection LimitedItemsSection = jobSection.getConfigurationSection("limitedItems");
if (LimitedItemsSection != null) {
for (String itemKey : LimitedItemsSection.getKeys(false)) {
@ -850,7 +850,7 @@ public class ConfigManager {
int level = itemSection.getInt("level");
jobLimitedItems.add(new JobLimitedItems(node, id, name, lore, enchants, level));
jobLimitedItems.put(node.toLowerCase(), new JobLimitedItems(node, id, 0, 1, name, lore, enchants, level));
}
}
@ -904,7 +904,7 @@ public class ConfigManager {
quest.setDescription(desc);
quests.add(quest);
} catch (Exception e) {
} catch (Throwable e) {
Jobs.consoleMsg("&c[Jobs] Can't load " + one + " quest for " + jobName);
e.printStackTrace();
}
@ -1039,8 +1039,8 @@ public class ConfigManager {
Jobs.getPluginLogger().warning("Automatically changing block to GLOWING_REDSTONE_ORE. Please update your configuration.");
Jobs.getPluginLogger().warning("In vanilla minecraft, REDSTONE_ORE changes to GLOWING_REDSTONE_ORE when interacted with.");
Jobs.getPluginLogger().warning("In the future, Jobs using REDSTONE_ORE instead of GLOWING_REDSTONE_ORE may fail to work correctly.");
material = CMIMaterial.LEGACY_GLOWING_REDSTON_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTON_ORE && actionType == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
material = CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE;
} else if (material == CMIMaterial.LEGACY_GLOWING_REDSTONE_ORE && actionType == ActionType.BREAK && Version.isCurrentEqualOrHigher(Version.v1_13_R1)) {
Jobs.getPluginLogger().warning("Job " + job.getName() + " is using GLOWING_REDSTONE_ORE instead of REDSTONE_ORE.");
Jobs.getPluginLogger().warning("Automatically changing block to REDSTONE_ORE. Please update your configuration.");
material = CMIMaterial.REDSTONE_ORE;

6
src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -63,12 +63,12 @@ public class LanguageManager {
listOfCommands.add(name);
}
}
} catch (Exception e) {
} catch (Throwable e) {
} finally {
if (jarFile != null)
try {
jarFile.close();
} catch (Exception e) {
} catch (Throwable e) {
}
}
return listOfCommands;
@ -342,7 +342,7 @@ public class LanguageManager {
c.get("command.archive.error.nojob", "There is no jobs saved.");
c.get("command.give.help.info", "Gives item by jobs name and item category name. Player name is optional");
c.get("command.give.help.args", "[playername] [jobname] [jobitemname]");
c.get("command.give.help.args", "[playername] [jobname] [items/limiteditems] [jobitemname]");
Jobs.getGCManager().commandArgs.put("give", Arrays.asList("[playername]", "[jobname]", "[jobitemname]"));
c.get("command.give.output.notonline", "&4Player [%playername%] is not online!");
c.get("command.give.output.noitem", "&4Can't find any item by given name!");

2
src/main/java/com/gamingmesh/jobs/config/RestrictedBlockManager.java
View File

@ -29,7 +29,7 @@ public class RestrictedBlockManager {
ConfigReader cfg = null;
try {
cfg = new ConfigReader("restrictedBlocks.yml");
} catch (Exception e1) {
} catch (Throwable e1) {
e1.printStackTrace();
}
if (cfg == null)

2
src/main/java/com/gamingmesh/jobs/config/ScheduleManager.java
View File

@ -46,7 +46,7 @@ public class ScheduleManager {
public void run() {
try {
scheduler();
} catch (Exception e) {
} catch (Throwable e) {
}
}
};

2
src/main/java/com/gamingmesh/jobs/config/ShopManager.java
View File

@ -310,7 +310,7 @@ public class ShopManager {
@SuppressWarnings("deprecation")
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(item.getCustomHead());
skullMeta.setOwner(offPlayer.getName());
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}

2
src/main/java/com/gamingmesh/jobs/config/YmlMaker.java
View File

@ -43,7 +43,7 @@ public class YmlMaker {
if (f != null)
try {
f.close();
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}

12
src/main/java/com/gamingmesh/jobs/container/Job.java
View File

@ -46,7 +46,7 @@ public class Job {
// items
private HashMap<String, JobItems> jobItems;
// limited items
private List<JobLimitedItems> jobLimitedItems;
private HashMap<String, JobLimitedItems> jobLimitedItems;
// job name
private String jobName = "N/A";
// job short name (for use in multiple jobs)
@ -108,7 +108,7 @@ public class Job {
*/
public Job(String jobName, String jobShortName, String description, ChatColor jobColour, Parser maxExpEquation, DisplayMethod displayMethod, int maxLevel,
int vipmaxLevel, Integer maxSlots, List<JobPermission> jobPermissions, List<JobCommands> jobCommands, List<JobConditions> jobConditions, HashMap<String, JobItems> jobItems,
List<JobLimitedItems> jobLimitedItems, List<String> CmdOnJoin, List<String> CmdOnLeave, ItemStack GUIitem, String bossbar, Long rejoinCD) {
HashMap<String, JobLimitedItems> jobLimitedItems, List<String> CmdOnJoin, List<String> CmdOnLeave, ItemStack GUIitem, String bossbar, Long rejoinCD) {
this.jobName = jobName;
this.jobShortName = jobShortName;
this.description = description;
@ -379,8 +379,12 @@ public class Job {
* Get the limited item nodes for this job
* @return Limited items for this job
*/
public List<JobLimitedItems> getLimitedItems() {
return Collections.unmodifiableList(jobLimitedItems);
public HashMap<String, JobLimitedItems> getLimitedItems() {
return jobLimitedItems;
}
public JobLimitedItems getLimitedITems(String key) {
return jobLimitedItems.get(key.toLowerCase());
}
public String getBossbar() {

42
src/main/java/com/gamingmesh/jobs/container/JobLimitedItems.java
View File

@ -18,21 +18,34 @@
package com.gamingmesh.jobs.container;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.ChatColor;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
public class JobLimitedItems {
private String node;
private int id;
private int data;
private int amount;
private String name;
private List<String> lore;
private HashMap<Enchantment, Integer> enchants;
private int level;
public JobLimitedItems(String node, int id, String name, List<String> lore, HashMap<Enchantment, Integer> enchants, int level) {
public JobLimitedItems(String node, int id, int data, int amount, String name, List<String> lore, HashMap<Enchantment, Integer> enchants, int level) {
this.node = node;
this.id = id;
this.data = data;
this.amount = amount;
this.name = name;
this.lore = lore;
this.enchants = enchants;
@ -43,6 +56,33 @@ public class JobLimitedItems {
return node;
}
public ItemStack getItemStack(Player player) {
try {
CMIMaterial cm = CMIMaterial.get(id, data);
ItemStack item = cm.newItemStack();
item.setAmount(amount);
ItemMeta meta = item.getItemMeta();
if (this.name != null)
meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));
if (lore != null && !lore.isEmpty()) {
List<String> TranslatedLore = new ArrayList<>();
for (String oneLore : lore) {
TranslatedLore.add(ChatColor.translateAlternateColorCodes('&', oneLore.replace("[player]", player.getName())));
}
meta.setLore(TranslatedLore);
}
if (enchants != null)
for (Entry<Enchantment, Integer> OneEnchant : enchants.entrySet()) {
meta.addEnchant(OneEnchant.getKey(), OneEnchant.getValue(), true);
}
item.setItemMeta(meta);
return item;
} catch (Throwable e) {
}
return null;
}
public int getId() {
return id;
}

42
src/main/java/com/gamingmesh/jobs/dao/JobsManager.java
View File

@ -57,15 +57,15 @@ public class JobsManager {
public void start(LocaleReader c) {
c.getW().addComment("storage.method", "storage method, can be MySQL or sqlite");
String storageMethod = c.get("storage.method", "sqlite");
c.getW().addComment("mysql-username", "Requires Mysql.");
c.get("mysql-username", "root");
c.get("mysql-password", "");
c.get("mysql-hostname", "localhost:3306");
c.get("mysql-database", "minecraft");
c.get("mysql-table-prefix", "jobs_");
c.get("verify-server-certificate", false);
c.get("use-ssl", false);
c.get("auto-reconnect", false);
c.getW().addComment("mysql", "Requires Mysql.");
c.get("mysql.username", "root");
c.get("mysql.password", "");
c.get("mysql.hostname", "localhost:3306");
c.get("mysql.database", "minecraft");
c.get("mysql.table-prefix", "jobs_");
c.get("mysql.verify-server-certificate", false);
c.get("mysql.use-ssl", false);
c.get("mysql.auto-reconnect", false);
if (storageMethod.equalsIgnoreCase("mysql")) {
DbType = DataBaseType.MySQL;
@ -85,30 +85,30 @@ public class JobsManager {
private synchronized JobsMySQL startMysql() {
File f = new File(Jobs.getFolder(), "generalConfig.yml");
YamlConfiguration config = YamlConfiguration.loadConfiguration(f);
String legacyUrl = config.getString("mysql-url");
String legacyUrl = config.getString("mysql.url");
if (legacyUrl != null) {
String jdbcString = "jdbc:mysql://";
if (legacyUrl.toLowerCase().startsWith(jdbcString)) {
legacyUrl = legacyUrl.substring(jdbcString.length());
String[] parts = legacyUrl.split("/");
if (parts.length >= 2) {
config.set("mysql-hostname", parts[0]);
config.set("mysql-database", parts[1]);
config.set("mysql.hostname", parts[0]);
config.set("mysql.database", parts[1]);
}
}
}
String username = config.getString("mysql-username");
String username = config.getString("mysql.username");
if (username == null) {
Jobs.getPluginLogger().severe("mysql-username property invalid or missing");
Jobs.getPluginLogger().severe("mysql username property invalid or missing");
}
String password = config.getString("mysql-password");
String hostname = config.getString("mysql-hostname");
String database = config.getString("mysql-database");
String prefix = config.getString("mysql-table-prefix");
String password = config.getString("mysql.password");
String hostname = config.getString("mysql.hostname");
String database = config.getString("mysql.database");
String prefix = config.getString("mysql.table-prefix");
boolean certificate = config.getBoolean("verify-server-certificate", false);
boolean ssl = config.getBoolean("use-ssl", false);
boolean autoReconnect = config.getBoolean("auto-reconnect");
boolean certificate = config.getBoolean("mysql.verify-server-certificate", false);
boolean ssl = config.getBoolean("mysql.use-ssl", false);
boolean autoReconnect = config.getBoolean("mysql.auto-reconnect");
if (plugin.isEnabled()) {
JobsMySQL data = new JobsMySQL(plugin, hostname, database, username, password, prefix, certificate, ssl, autoReconnect);
data.initialize();

9
src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java
View File

@ -14,7 +14,8 @@ public class JobsMySQL extends JobsDAO {
private Jobs plugin;
JobsMySQL(Jobs plugin, String hostname, String database, String username, String password, String prefix, boolean certificate, boolean ssl, boolean autoReconnect) {
super(plugin, "com.mysql.jdbc.Driver", "jdbc:mysql://" + hostname + "/" + database + "?useUnicode=true&characterEncoding=UTF-8&autoReConnect=" + autoReconnect + "&useSSL=" + ssl + "&verifyServerCertificate=" + certificate, username, password, prefix);
super(plugin, "com.mysql.jdbc.Driver", "jdbc:mysql://" + hostname + "/" + database + "?useUnicode=true&characterEncoding=UTF-8&autoReConnect=" + autoReconnect + "&useSSL=" + ssl
+ "&verifyServerCertificate=" + certificate, username, password, prefix);
this.plugin = plugin;
this.database = database;
this.setDbType(DataBaseType.MySQL);
@ -43,7 +44,7 @@ public class JobsMySQL extends JobsDAO {
protected synchronized void setupConfig() throws SQLException {
JobsConnection conn = getConnection();
if (conn == null) {
Jobs.consoleMsg("&cCould not run database updates! Could not connect to MySQL!");
Jobs.consoleMsg("&cCould not run database updates! Could not connect to MySQL!");
return;
}
PreparedStatement prest = null;
@ -82,7 +83,7 @@ public class JobsMySQL extends JobsDAO {
protected synchronized void checkUpdate() throws SQLException {
JobsConnection conn = getConnection();
if (conn == null) {
Jobs.consoleMsg("&cCould not run database updates! Could not connect to MySQL!");
Jobs.consoleMsg("&cCould not run database updates! Could not connect to MySQL!");
return;
}
createDefaultUsersBase();
@ -170,7 +171,6 @@ public class JobsMySQL extends JobsDAO {
statement.close();
return true;
} catch (SQLException e) {
// e.printStackTrace();
Jobs.consoleMsg("Not a culumn |" + "SELECT " + collumn + " FROM " + table + "|");
close(statement);
return false;
@ -193,7 +193,6 @@ public class JobsMySQL extends JobsDAO {
return true;
} catch (SQLException e) {
close(statement);
// e.printStackTrace();
return false;
}
}

4
src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
View File

@ -658,7 +658,7 @@ public class JobsListener implements Listener {
Map<Enchantment, Integer> enchants = new HashMap<>();
try {
enchants = iih.getEnchantments();
} catch (Exception e) {
} catch (Throwable e) {
return;
}
if (enchants.isEmpty())
@ -675,7 +675,7 @@ public class JobsListener implements Listener {
String meinOk = null;
mein: for (JobProgression one : prog) {
for (JobLimitedItems oneItem : one.getJob().getLimitedItems()) {
for (JobLimitedItems oneItem : one.getJob().getLimitedItems().values()) {
if (one.getLevel() >= oneItem.getLevel())
continue;
if (!isThisItem(oneItem, iih.getType().getId(), name, lore, enchants))

8
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -861,7 +861,7 @@ public class JobsPaymentListener implements Listener {
if (block.hasMetadata(furnaceOwnerMetadata))
FurnaceBrewingHandling.removeFurnace(block);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -885,7 +885,7 @@ public class JobsPaymentListener implements Listener {
if (block.hasMetadata(brewingOwnerMetadata))
FurnaceBrewingHandling.removeBrewing(block);
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -915,7 +915,7 @@ public class JobsPaymentListener implements Listener {
UUID uuid = null;
try {
uuid = UUID.fromString(playerName);
} catch (Exception e) {
} catch (Throwable e) {
}
if (uuid == null)
return;
@ -1025,7 +1025,7 @@ public class JobsPaymentListener implements Listener {
try {
// So lets remove meta in case some plugin removes entity in wrong way.
lVictim.removeMetadata(Jobs.getPlayerManager().getMobSpawnerMetadata(), plugin);
} catch (Exception ex) {
} catch (Throwable t) {
}
return;
}

4
src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java
View File

@ -71,7 +71,7 @@ public class FurnaceBrewingHandling {
totalf += blist.size();
}
}
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -111,7 +111,7 @@ public class FurnaceBrewingHandling {
totalb += blist.size();
}
}
} catch (Exception e) {
} catch (Throwable e) {
e.printStackTrace();
}
}

4
src/main/java/com/gamingmesh/jobs/stuff/GiveItem.java
View File

@ -33,13 +33,13 @@ public class GiveItem {
ItemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name));
itemStack.setItemMeta(ItemMeta);
player.getInventory().addItem(itemStack);
player.getPlayer().updateInventory();
player.updateInventory();
return true;
}
public static boolean GiveItemForPlayer(Player player, ItemStack item) {
player.getInventory().addItem(item);
player.getPlayer().updateInventory();
player.updateInventory();
return true;
}
}

13
src/main/java/com/gamingmesh/jobs/stuff/TabComplete.java
View File

@ -16,6 +16,7 @@ import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.container.ActionType;
import com.gamingmesh.jobs.container.Job;
import com.gamingmesh.jobs.container.JobItems;
import com.gamingmesh.jobs.container.JobLimitedItems;
import com.gamingmesh.jobs.container.JobProgression;
import com.gamingmesh.jobs.container.JobsPlayer;
@ -76,9 +77,15 @@ public class TabComplete implements TabCompleter {
case "[jobitemname]":
Job oneJob = Jobs.getJob(args[i - 1]);
if (oneJob != null)
for (Entry<String, JobItems> item : oneJob.getItemBonus().entrySet()) {
temp.add(item.getValue().getNode());
}
if (args[3].equals("items")) {
for (Entry<String, JobItems> item : oneJob.getItemBonus().entrySet()) {
temp.add(item.getValue().getNode());
}
} else if (args[3].equals("limiteditems")) {
for (Entry<String, JobLimitedItems> limitedItem : oneJob.getLimitedItems().entrySet()) {
temp.add(limitedItem.getValue().getNode());
}
}
break;
case "[oldjob]":
JobsPlayer onePlayerJob = Jobs.getPlayerManager().getJobsPlayer(args[i - 1]);

2
src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java
View File

@ -76,7 +76,7 @@ public class blockLoc {
y = Integer.parseInt(split[2]);
z = Integer.parseInt(split[3]);
return true;
} catch (Exception e) {
} catch (Throwable e) {
return false;
}
}

220
src/main/resources/jobConfig.yml
View File

@ -167,50 +167,9 @@ Jobs:
#
# For kill tags (Kill and custom-kill), the name is the name of the
# mob.
# Available mobs:
# Bat
# Blaze
# Cave_spider
# Chicken
# Cow
# Creeper
# Ender_dragon
# Enderman
# Endermite
# Ghast
# Giant
# Guardian
# GuardianElder
# Horse
# HorseZombie
# HorseSkeleton
# Iron_golem
# Magma_cube
# Mushroom_cow
# Ocelot
# Pig
# Player
# Polar_Bear
# Rabbit
# Sheep
# Silverfish
# Skeleton
# SkeletonWither
# SkeletonStray
# Shulker
# Slime
# Snowman
# Spider
# Squid
# Villager
# Witch
# Wither
# Wolf
# Zombie
# ZombieVillager
# Husk
# Phantom
# Drowned
# To get a list of all available entity types, check the
# bukkit JavaDocs for a complete list of entity types
# https://minecraft.gamepedia.com/Mob#List_of_mobs
#
# NOTE: mob names are case sensitive.
#
@ -222,7 +181,7 @@ Jobs:
# payment for breaking a block
Break:
# block name/id (with optional sub-type)
LOG:
log:
# base income, can be not used if using point system
income: 5.0
# base points, can be not used if using income system
@ -243,39 +202,39 @@ Jobs:
experience: -1.0
# payment for drinking a potion
Drink:
POTION:
potion:
income: 0.5
experience: 2.0
POTION_REGENERATION_2:
potion_regeneration_2:
income: 1.3
experience: 2.0
POTION_HEALING_1:
potion_healing_1:
income: 1.4
experience: 2.0
# payment for breaking a block with tnt
TNTBreak:
LOG:
log:
income: 5.0
points: 5.0
experience: 5.0
# payment for placing a block
Place:
SAPLING:
sapling:
income: 1.0
points: 1.0
experience: 1.0
WOOD:
wood:
income: 2.0
points: 2.0
experience: 2.0
# Payment for trading a villager. Checks results only
VTrade:
EMERALD:
emerald:
income: 1.0
points: 1.0
experience: 2.0
# you can add enchanted book with sub-id
ENCHANTED_BOOK-12:
enchanted_book-12:
income: 1.0
experience: 2.0
# killing a mob
@ -377,16 +336,16 @@ Jobs:
experience: 5.0
# dyeing armor
Dye:
LEATHER_BOOTS:
leather_boots:
income: 1.0
experience: 1.0
LEATHER_CHESTPLATE:
leather_chestplate:
income: 1.0
experience: 1.0
LEATHER_HELMET:
leather_helmet:
income: 1.0
experience: 1.0
LEATHER_LEGGINGS:
leather_leggings:
income: 1.0
experience: 1.0
351:
@ -394,23 +353,27 @@ Jobs:
experience: 1.0
# Catching fish
Fish:
'349':
raw_fish:
income: 20.0
experience: 25.0
# If you are using below version 1.13
legacy_raw_fish:
income: 20.0
experience: 25.0
# Repairing items
Repair:
WOOD_SWORD:
wood_sword:
income: 1.0
experience: 1.0
IRON_SWORD:
iron_sword:
income: 2.0
experience: 2.0
# Crafting items
Craft:
WOOD_SWORD:
wood_sword:
income: 1.5
experience: 3.0
LEATHER_BOOTS:
leather_boots:
income: 1.0
experience: 6.0
# Add ! at front when you want to pay for crafted items with special names. Always use double quotation marks, same as example
@ -419,19 +382,19 @@ Jobs:
experience: 6.0
# Smelting ores
Smelt:
IRON_INGOT:
iron_ingot:
income: 2.0
experience: 8.0
GOLD_INGOT:
gold_ingot:
income: 4.5
experience: 12
# Enchanting items
Enchant:
# You can set item for which player will get money
WOOD_SWORD:
wood_sword:
income: 1.5
experience: 3.0
LEATHER_BOOTS:
leather_boots:
income: 1.0
experience: 6.0
# Or/and you can give money for each enchantment they got
@ -443,10 +406,10 @@ Jobs:
experience: 20.0
# Brewing potions
Brew:
NETHER_STALK:
nether_stalk:
income: 5.0
experience: 3.0
REDSTONE:
redstone:
income: 5.0
experience: 3.0
# Explore options. Each number represents players number in exploring that chunk
@ -703,7 +666,7 @@ Jobs:
points: 0.25
experience: 0.5
Break:
#new 1.13 blocks (some changed blocks are below
#new 1.13 blocks (some changed blocks are below)
tube_coral_block:
income: 2
points: 2
@ -865,7 +828,7 @@ Jobs:
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
Gui:
Item: BRICK_STAIRS
Item: brick_stairs
Place:
#new 1.13 blocks
stripped_oak_wood:
@ -916,7 +879,6 @@ Jobs:
income: 2
points: 2
experience: 3
#old blocks
stone:
income: 1.3
points: 1.3
@ -1663,7 +1625,7 @@ Jobs:
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
Gui:
Item: WOODEN_HOE
Item: wooden_hoe
Tame:
Wolf:
income: 5.0
@ -2036,7 +1998,6 @@ Jobs:
ChatColour: RED
chat-display: full
max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
@ -2182,7 +2143,6 @@ Jobs:
ChatColour: AQUA
chat-display: full
max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
@ -2223,14 +2183,13 @@ Jobs:
ChatColour: RED
chat-display: full
max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
Gui:
Item: CRAFTING_TABLE
Item: crafting_table
Craft:
stick:
income: 0.1
@ -2256,11 +2215,11 @@ Jobs:
income: 3.0
points: 3.0
experience: 3.0
'tnt':
tnt:
income: 4.0
points: 4.0
experience: 4.0
'chest':
chest:
income: 1.3
points: 1.3
experience: 1.3
@ -2472,7 +2431,7 @@ Jobs:
income: 2.5
points: 2.5
experience: 2.5
'hopper':
hopper:
income: 7.0
points: 7.0
experience: 7.0
@ -2745,7 +2704,7 @@ Jobs:
points: 7.0
experience: 7.0
Smelt:
COOKED_CHICKEN:
cooked_chicken:
income: 3.0
points: 3.0
experience: 3.0
@ -2761,14 +2720,13 @@ Jobs:
ChatColour: AQUA
chat-display: full
max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
Gui:
Item: FISHING_ROD
Item: fishing_rod
Fish:
cod:
income: 15.0
@ -2798,7 +2756,6 @@ Jobs:
ChatColour: DARK_PURPLE
chat-display: full
max-level: 200
#slots: 10
leveling-progression-equation: 10*(joblevel)+(joblevel*joblevel*4)
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
@ -2828,71 +2785,71 @@ Jobs:
income: 3.5
points: 3.5
experience: 7.0
IRON_SWORD:
iron_sword:
income: 4.0
points: 4.0
experience: 8.0
IRON_BOOTS:
iron_boots:
income: 8.0
points: 8.0
experience: 16.0
IRON_CHESTPLATE:
iron_chestplate:
income: 16.0
points: 16.0
experience: 32.0
IRON_HELMET:
iron_helmet:
income: 10.0
points: 10.0
experience: 20.0
IRON_LEGGINGS:
iron_leggings:
income: 14.0
points: 14.0
experience: 28.0
GOLD_SWORD:
gold_sword:
income: 6.0
points: 6.0
experience: 12.0
GOLD_BOOTS:
gold_boots:
income: 12.0
points: 12.0
experience: 24.0
GOLD_CHESTPLATE:
gold_chestplate:
income: 24.0
points: 24.0
experience: 48.0
GOLD_HELMET:
gold_helmet:
income: 15.0
points: 15.0
experience: 30.0
GOLD_LEGGINGS:
gold_leggings:
income: 21.0
points: 21.0
experience: 42.0
DIAMOND_SWORD:
diamond_sword:
income: 8.0
points: 8.0
experience: 16.0
DIAMOND_PICKAXE:
diamond_pickaxe:
income: 12.0
points: 12.0
experience: 24.0
DIAMOND_AXE:
diamond_axe:
income: 12.0
points: 12.0
experience: 24.0
DIAMOND_HELMET:
diamond_helmet:
income: 20.0
points: 20.0
experience: 40.0
DIAMOND_CHESTPLATE:
diamond_chestplate:
income: 32.0
points: 32.0
experience: 64.0
DIAMOND_LEGGINGS:
diamond_leggings:
income: 28.0
points: 28.0
experience: 40.0
DIAMOND_BOOTS:
diamond_boots:
income: 16.0
points: 16.0
experience: 32.0
@ -2901,32 +2858,32 @@ Jobs:
points: 20.0
experience: 40.0
Repair:
WOOD_SWORD:
wood_sword:
income: 1.0
points: 1.0
experience: 1.0
IRON_SWORD:
iron_sword:
income: 2.0
points: 2.0
experience: 2.0
GOLD_SWORD:
gold_sword:
income: 3.0
points: 3.0
experience: 3.0
DIAMOND_SWORD:
diamond_sword:
income: 4.0
points: 4.0
experience: 4.0
Smelt:
IRON_INGOT:
iron_ingot:
income: 1.3
points: 1.3
experience: 2.0
GOLD_INGOT:
gold_ingot:
income: 5.0
points: 5.0
experience: 10
DIAMOND:
diamond:
income: 7.0
points: 7.0
experience: 20
@ -3031,95 +2988,95 @@ Jobs:
Id: 116
Data: 0
Enchant:
WOOD_SWORD:
wood_sword:
income: 1.5
points: 1.5
experience: 3.0
LEATHER_BOOTS:
leather_boots:
income: 1.0
points: 1.0
experience: 6.0
LEATHER_CHESTPLATE:
leather_chestplate:
income: 2.0
points: 2.0
experience: 6.0
LEATHER_HELMET:
leather_helmet:
income: 1.0
points: 1.0
experience: 6.0
LEATHER_LEGGINGS:
leather_leggings:
income: 2.0
points: 2.0
experience: 6.0
IRON_SWORD:
iron_sword:
income: 3.0
points: 3.0
experience: 6.0
IRON_BOOTS:
iron_boots:
income: 2.5
points: 2.5
experience: 9.0
IRON_CHESTPLATE:
iron_chestplate:
income: 4.5
points: 4.5
experience: 9.0
IRON_HELMET:
iron_helmet:
income: 2.5
points: 2.5
experience: 9.0
IRON_LEGGINGS:
iron_leggings:
income: 4.5
points: 4.5
experience: 9.0
GOLD_SWORD:
gold_sword:
income: 4.5
points: 4.5
experience: 15.0
GOLD_BOOTS:
gold_boots:
income: 2.5
points: 2.5
experience: 15.0
GOLD_CHESTPLATE:
gold_chestplate:
income: 5.5
points: 5.5
experience: 15.0
GOLD_HELMET:
gold_helmet:
income: 2.5
points: 2.5
experience: 15.0
GOLD_LEGGINGS:
gold_leggings:
income: 5.5
points: 5.5
experience: 15.0
DIAMOND_SWORD:
diamond_sword:
income: 9.0
points: 9.0
experience: 30.0
DIAMOND_SPADE:
diamond_spade:
income: 5.0
points: 5.0
experience: 30.0
DIAMOND_PICKAXE:
diamond_pickaxe:
income: 10.0
points: 10.0
experience: 30.0
DIAMOND_AXE:
diamond_axe:
income: 10.0
points: 10.0
experience: 30.0
DIAMOND_HELMET:
diamond_helmet:
income: 6.0
points: 6.0
experience: 30.0
DIAMOND_CHESTPLATE:
diamond_chestplate:
income: 12.0
points: 12.0
experience: 50.0
DIAMOND_LEGGINGS:
diamond_leggings:
income: 12.0
points: 12.0
experience: 50.0
DIAMOND_BOOTS:
diamond_boots:
income: 6.0
points: 6.0
experience: 30.0
@ -3472,7 +3429,6 @@ Jobs:
income: 5
points: 5
experience: 5
#Frost Walker 2
frost_walker-1:
income: 10
points: 10
@ -3481,7 +3437,6 @@ Jobs:
income: 20
points: 20
experience: 20
#Impaling 5
impaling-1:
income: 10
points: 10
@ -3502,7 +3457,6 @@ Jobs:
income: 50
points: 50
experience: 50
#Loyalty 3
loyalty-1:
income: 10
points: 10

6
src/main/resources/locale/messages_hu.yml
View File

@ -103,7 +103,7 @@ command:
finalExplanation: ' &eNem tartalmazza a Petpay és az idéző bónusz/penaltyFinal bónuszt'
convert:
help:
info: 'Adatbázis-rendszert alakít át egyik rendszerről a másikra. Ha jelenleg SQLite fut, ez átalakul MySQL-re és vise versa.'
info: 'Adatbázis-rendszert alakít át egyik rendszerről a másikra. Ha jelenleg SQLite fut, ez átalakul MySQL-re és oda-vissza.'
args: ''
limit:
help:
@ -118,7 +118,7 @@ command:
pointsLimit: '&ePont limit: &2%current%&e/&2%total%'
reachedmoneylimit: '&4Elérted a pénzkorlátot az adott időben!'
reachedmoneylimit2: '&eA korlátot ellenőrizheted a &2/jobs limit &eparanccsal.'
reachedmoneylimit3: '&eA szerzett pénz most már exponenciálisan csökkentve... De még mindig egy kicsit keres!!'
reachedmoneylimit3: '&eA szerzett pénz most már exponenciálisan csökkentve... De még mindig egy kicsit keres!'
reachedexplimit: '&4Elérted a határidőt a meghatározott időben!'
reachedexplimit2: '&eA korlátot ellenőrizheted a &2/jobs limit &eparanccsal.'
reachedpointslimit: '&4Elérted a határidőt a meghatározott időben!'
@ -247,7 +247,7 @@ command:
give:
help:
info: 'A tárgyakat a feladatok neve és az elemek kategóriája alapján adja meg. A játékos neve opcionális.'
args: '[playername] [jobname] [jobitemname]'
args: '[playername] [jobname] [items/limiteditems] [jobitemname]'
output:
notonline: '&4[%playername%] nem elérhető!'
noitem: '&4Nincs találat ezzel a névvel lévő tárgyról!'